chg: add newline character before EOF to non-minified (text-)files

pull/1218/head
Andreas Ziegler 2016-06-06 10:09:55 +02:00
parent 52cd830a4d
commit 1d06f25b38
224 changed files with 224 additions and 224 deletions

View File

@ -7,4 +7,4 @@ MISP writes (audit) log lines to syslog.
The log lines are of level LOG_NOTICE.
The format is 'description' and 'change'
conform the MISP MySQL log table format.
conform the MISP MySQL log table format.

View File

@ -49,4 +49,4 @@ chmod -R g+ws "$MISP_PATH/app/files"
cp -fa "$FILE_PATH/setup/config.php" "$MISP_PATH/app/Plugin/CakeResque/Config/config.php"
printf '\n\n=========================================================\n'
printf '| \e[34mI\e[39mnstallation \e[34mC\e[39momplete |\n'
printf '=========================================================\n\n'
printf '=========================================================\n\n'

View File

@ -29,4 +29,4 @@ Enabling background jobs via CakeResque
- ./start.sh
Make sure you configure your OS to start this script as boot time !
================================================================================================================================================
================================================================================================================================================

View File

@ -9,4 +9,4 @@ Alternative PhpBB in conjunction with CakePHP Users and Roles tables.
http://bakery.cakephp.org/articles/wilsonsheldon/2009/01/13/phpbb3-api-bridge
http://www.phpbb.com/community/viewtopic.php?f=71&t=993475
CakePHP and a PhpBB3 forum.
CakePHP and a PhpBB3 forum.

View File

@ -37,4 +37,4 @@ CREATE TABLE aros (
lft INTEGER(10) DEFAULT NULL,
rght INTEGER(10) DEFAULT NULL,
PRIMARY KEY (id)
);
);

View File

@ -23,4 +23,4 @@ CREATE TABLE i18n (
INDEX model (model),
INDEX row_id (foreign_key),
INDEX field (field)
);
);

View File

@ -13,4 +13,4 @@
+Users.role_id
+Roles
+Logs
0.2.3
0.2.3

View File

@ -146,4 +146,4 @@ CakeLog::config('error', array(
CakePlugin::loadAll(array(
'CakeResque' => array('bootstrap' => true)
));
));

View File

@ -278,4 +278,4 @@ Cache::config('_cake_model_', array(
'duration' => $duration
));
require_once dirname(__DIR__) . '/Vendor/autoload.php';
require_once dirname(__DIR__) . '/Vendor/autoload.php';

View File

@ -283,4 +283,4 @@ Cache::config('_cake_model_', array(
//Comment the following out if you do not with to use the background workers (not recommended)
require_once dirname(__DIR__) . '/Vendor/autoload.php';
require_once dirname(__DIR__) . '/Vendor/autoload.php';

View File

@ -70,4 +70,4 @@ class DATABASE_CONFIG {
'prefix' => '',
//'encoding' => 'utf8',
);
}
}

View File

@ -13,4 +13,4 @@ class Populate023Shell extends AppShell {
// on user data
$this->Users->execute();
}
}
}

View File

@ -13,4 +13,4 @@ class RoleIdTask extends Shell {
$this->Users->setRoleId($fk);
//$this->Users->generateAllForRoleId($fk); // TODO
}
}
}

View File

@ -16,4 +16,4 @@ class RoleToAroAcoTask extends Shell {
$this->Roles->saveAcl(array('model' => 'Role', 'foreign_key' => $role['Role']['id']), $role['Role']['perm_add'], $role['Role']['perm_modify'], $role['Role']['perm_publish'], $role['Role']['perm_admin'], $role['Role']['perm_sync'], $role['Role']['perm_auth'], $role['Role']['perm_audit']);
}
}
}
}

View File

@ -21,4 +21,4 @@ class RolesTask extends Shell {
$roles->create();
$roles->save(array('Role' => array('name' => 'Sync', 'perm_add' => true, 'perm_modify' => true, 'perm_publish' => true, 'perm_full' => false, 'perm_sync' => true, 'perm_audit' => true, 'perm_auth' =>true)));
}
}
}

View File

@ -15,4 +15,4 @@ class UsersTask extends Shell {
// perform clean
$users->checkAndCorrectPgps();
}
}
}

View File

@ -13,4 +13,4 @@ class Populate023Shell extends AppShell {
// on user data
$this->Users->execute();
}
}
}

View File

@ -463,4 +463,4 @@ class ACLComponent extends Component {
}
return $result;
}
}
}

View File

@ -96,4 +96,4 @@ class AdminCrudComponent extends AuthComponent {
public function startup(Controller $controller) {
$this->controller = $controller;
}
}
}

View File

@ -154,4 +154,4 @@ class BlackListComponent extends Component {
$this->settings = Set::merge($this->settings, $settings);
parent::__construct($collection, $this->settings);
}
}
}

View File

@ -40,4 +40,4 @@ class CidrComponent extends Component {
}
return $results;
}
}
}

View File

@ -285,4 +285,4 @@ class FeedsController extends AppController {
$result['message'] = $fail ? 'Could not ' . $action . ' feed.' : 'Feed ' . $action . 'd.';
return $result;
}
}
}

View File

@ -236,4 +236,4 @@ class OrganisationsController extends AppController {
$this->render('ajax/merge');
}
}
}
}

View File

@ -237,4 +237,4 @@ class RegexpController extends AppController {
$this->Session->setFlash(__('All done! Found and cleaned ' . $changes . ' potentially malcious regexes.'));
$this->redirect('/pages/display/administration');
}
}
}

View File

@ -147,4 +147,4 @@ class WarninglistsController extends AppController {
$this->set('warninglist', $warninglist);
}
}
}
}

View File

@ -79,4 +79,4 @@ class WhitelistsController extends AppController {
$this->recursive = 0;
$this->set('list', $this->paginate());
}
}
}

View File

@ -49,4 +49,4 @@ class CamelCase {
//App::uses('Inflector', 'lib');
return Inflector::camelize($underscored);
}
}
}

View File

@ -83,4 +83,4 @@ class ColourPaletteTool {
}
return $number % 100 / 100;
}
}
}

View File

@ -97,4 +97,4 @@ class JSONConverterTool {
if ($mispVersion) $result .= ',' . PHP_EOL . '{"xml_version":"' . $mispVersion . '"}' . PHP_EOL;
return $result . ']}';
}
}
}

View File

@ -109,4 +109,4 @@ class PubSubTool {
if (!is_numeric($this->checkIfRunning())) return 'Failed starting the ZeroMQ script.';
return true;
}
}
}

View File

@ -13,4 +13,4 @@ class RequestRearrangeTool {
}
return $data;
}
}
}

View File

@ -173,4 +173,4 @@ class XMLConverterTool {
if ($mispVersion) $result .= '<xml_version>' . $mispVersion . '</xml_version>';
return $result . '</response>' . PHP_EOL;
}
}
}

View File

@ -4,4 +4,4 @@ App::uses('AppModel', 'Model');
class AdminSetting extends AppModel {
public $actsAs = array('Containable');
public $validate = array('setting' => 'isUnique');
}
}

View File

@ -35,4 +35,4 @@ class EventBlacklist extends AppModel{
}
return true;
}
}
}

View File

@ -114,4 +114,4 @@ class EventDelegation extends AppModel {
}
}
}
}
}

View File

@ -67,4 +67,4 @@ class EventTag extends AppModel {
}
return true;
}
}
}

View File

@ -19,4 +19,4 @@ class FavouriteTag extends AppModel {
);
public $belongsTo = array('Tag', 'User');
}
}

View File

@ -66,4 +66,4 @@ class Job extends AppModel {
$this->saveField('process_id', $process_id);
return $id;
}
}
}

View File

@ -118,4 +118,4 @@ class Log extends AppModel {
'model_id' => $model_id,
));
}
}
}

View File

@ -65,4 +65,4 @@ class Module extends AppModel {
private function queryModule() {
}
}
}

View File

@ -23,4 +23,4 @@ class News extends AppModel {
'className' => 'User',
)
);
}
}

View File

@ -30,4 +30,4 @@ class OrgBlacklist extends AppModel{
if (empty($this->data['OrgBlacklist']['id'])) $this->data['OrgBlacklist']['date_created'] = date('Y-m-d H:i:s');
return true;
}
}
}

View File

@ -92,4 +92,4 @@ class Regexp extends AppModel {
if ($orig === $string) return 2;
return 1;
}
}
}

View File

@ -109,4 +109,4 @@ class Role extends AppModel {
}
return true;
}
}
}

View File

@ -653,4 +653,4 @@ class ShadowAttribute extends AppModel {
));
}
}
}
}

View File

@ -145,4 +145,4 @@ class Sighting extends AppModel{
}
return $fn;
}
}
}

View File

@ -245,4 +245,4 @@ class Taxonomy extends AppModel{
}
return $taxonomies;
}
}
}

View File

@ -24,4 +24,4 @@ class TaxonomyEntry extends AppModel{
parent::beforeValidate();
return true;
}
}
}

View File

@ -26,4 +26,4 @@ class TaxonomyPredicate extends AppModel{
parent::beforeValidate();
return true;
}
}
}

View File

@ -25,4 +25,4 @@ class WarninglistEntry extends AppModel{
parent::beforeValidate();
return true;
}
}
}

View File

@ -21,4 +21,4 @@ class WarninglistType extends AppModel{
parent::beforeValidate();
return true;
}
}
}

View File

@ -532,4 +532,4 @@ class LogableBehavior extends ModelBehavior {
'validate' => false,
'callbacks' => false));
}
}
}

View File

@ -270,4 +270,4 @@ class CertificateAuthenticate extends BaseAuthenticate
return self::$client;
}
}
}

View File

@ -75,4 +75,4 @@ class SysLog {
return $result;
}
}
?>
?>

View File

@ -155,4 +155,4 @@ class UrlCacheManager {
}
}
}
}

View File

@ -1,4 +1,4 @@
https://github.com/markstory/acl_extras
https://github.com/eskil-saatvedt/CakePHP-Assets (LogableBehavior)
http://bakery.cakephp.org/articles/rikdc/2010/06/07/syslog-component
http://xp-dev.com/trac/cakephp/browser/cakephp/libs/magic_tools
http://xp-dev.com/trac/cakephp/browser/cakephp/libs/magic_tools

View File

@ -123,4 +123,4 @@ class OrphansProtectableBehavior extends ModelBehavior {
return implode($messageParts, ', ');
}
}
?>
?>

View File

@ -228,4 +228,4 @@ $(document).ready(function() {
<?php endif; ?>
});
</script>
<?php echo $this->Js->writeBuffer(); // Write cached scripts
<?php echo $this->Js->writeBuffer(); // Write cached scripts

View File

@ -191,4 +191,4 @@ $(function(){
);
</script>
<?php echo $this->Js->writeBuffer(); // Write cached scripts
<?php echo $this->Js->writeBuffer(); // Write cached scripts

View File

@ -22,4 +22,4 @@
<?php
echo $this->Form->end();
?>
</div>
</div>

View File

@ -16,4 +16,4 @@
));
echo $this->Form->end();
?>
</div>
</div>

View File

@ -16,4 +16,4 @@
));
echo $this->Form->end();
?>
</div>
</div>

View File

@ -135,4 +135,4 @@ $(document).ready(function() {
});
</script>
<?php echo $this->Js->writeBuffer(); // Write cached scripts
<?php echo $this->Js->writeBuffer(); // Write cached scripts

View File

@ -17,4 +17,4 @@
));
echo $this->Form->end();
?>
</div>
</div>

View File

@ -16,4 +16,4 @@
));
echo $this->Form->end();
?>
</div>
</div>

View File

@ -21,4 +21,4 @@
<?php
echo $this->Form->end();
?>
</div>
</div>

View File

@ -1,2 +1,2 @@
<?php
echo nl2br(h($value)) . '&nbsp;';
echo nl2br(h($value)) . '&nbsp;';

View File

@ -8,4 +8,4 @@
<?php
endforeach;
endforeach;
?>
?>

View File

@ -150,4 +150,4 @@ $(document).ready(function() {
});
});
</script>
<?php echo $this->Js->writeBuffer(); // Write cached scripts
<?php echo $this->Js->writeBuffer(); // Write cached scripts

View File

@ -8,4 +8,4 @@ if (0 == count($fails)):?>
</ul>
<?php
endif;?>
</div>
</div>

View File

@ -8,4 +8,4 @@ foreach ($results as $k => $v) {
);
$jsonArray['response']['Attribute'][] = $results[$k]['Attribute'];
}
echo json_encode($jsonArray);
echo json_encode($jsonArray);

View File

@ -7,4 +7,4 @@ foreach ($results as $k => $v) {
);
$jsonArray['response']['Attribute'][] = $results[$k];
}
echo json_encode($jsonArray);
echo json_encode($jsonArray);

View File

@ -16,4 +16,4 @@
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools'));
?>
?>

View File

@ -8,4 +8,4 @@ foreach ($results as $k => $v) {
$xmlArray['response']['Attribute'][] = $results[$k];
}
$xmlObject = Xml::fromArray($xmlArray, array('format' => 'tags'));
echo $xmlObject->asXML();
echo $xmlObject->asXML();

View File

@ -1,4 +1,4 @@
<?php
App::uses('RPZExport', 'Export');
$rpzExport = new RPZExport();
echo ($rpzExport->export($values, $rpzSettings));
echo ($rpzExport->export($values, $rpzSettings));

View File

@ -2,4 +2,4 @@
foreach ($attributes as $attribute) {
echo $attribute['Attribute']['value'];
echo PHP_EOL;
}
}

View File

@ -1,2 +1,2 @@
<?php
echo $this->element('eventattributerow', array('object' => $object));
echo $this->element('eventattributerow', array('object' => $object));

View File

@ -23,4 +23,4 @@ You can for example ask: /attributes/index/limit:999.xml to get the 999 first re
To export all the attributes at once, with their events, use the export functionality.
-->
-->

View File

@ -9,4 +9,4 @@ foreach ($results as $k => $v) {
$xmlArray['response']['Attribute'][] = $results[$k]['Attribute'];
}
$xmlObject = Xml::fromArray($xmlArray, array('format' => 'tags'));
echo $xmlObject->asXML();
echo $xmlObject->asXML();

View File

@ -8,4 +8,4 @@ foreach ($results as $k => $v) {
$xmlArray['response']['Attribute'][] = $results[$k];
}
$xmlObject = Xml::fromArray($xmlArray, array('format' => 'tags'));
echo $xmlObject->asXML();
echo $xmlObject->asXML();

View File

@ -1,4 +1,4 @@
<?php
App::uses('Xml', 'Utility');
$xmlObject = Xml::fromArray($response, array('format' => 'tags'));
echo($xmlObject->asXml());
echo($xmlObject->asXml());

View File

@ -13,4 +13,4 @@
</tr>
</table>
</div>
</td>
</td>

View File

@ -11,4 +11,4 @@ $(document).ready(function() {
var elem = $('.dashboard_notifications').width();
$('.dashboard_notifications').css({'height':elem+'px'});
});
</script>
</script>

View File

@ -17,4 +17,4 @@ $(document).ready(function() {
var elem = $('.dashboard_notifications').width();
$('.dashboard_notifications').css({'height':elem+'px'});
});
</script>
</script>

View File

@ -523,4 +523,4 @@ attributes or the appropriate distribution level. If you think there is a mistak
</script>
<?php
echo $this->Js->writeBuffer();
?>
?>

View File

@ -207,4 +207,4 @@
</div>
<?php
echo $this->Js->writeBuffer();
?>
?>

View File

@ -235,4 +235,4 @@ function resizeLogo() {
topBar.style.width = '100%';
}
}
</script>
</script>

View File

@ -94,4 +94,4 @@
endforeach;
?>
</div>
</div>

View File

@ -34,4 +34,4 @@
<td style="<?php echo $colour; ?>"><?php echo h($diagnostic_errors);?> issues detected.</td>
<td style="<?php echo $colour; ?>">Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies.</td>
</tr>
</table>
</table>

View File

@ -19,4 +19,4 @@
<?php endif; ?>
<td style="<?php echo $bgColour; ?>"><?php echo h($setting['description']);?></td>
<td class="short" style="<?php echo $bgColour; ?>"><?php if (isset($setting['error']) && $setting['level'] != 3) echo h($setting['errorMessage']); ?></td>
</tr>
</tr>

View File

@ -53,4 +53,4 @@
$(document).ready(function() {
$('.subGroup_general').show();
});
</script>
</script>

View File

@ -47,4 +47,4 @@
<span class="tabMenuFixed tabMenuFixedCenter tabMenuSides" style="margin-left:10px;">
<a href="<?php echo $baseurl;?>/servers/serverSettings/download" id="download-button" title="Download report" class="useCursorPointer discrete icon-download-alt"></a>
</span>
</div>
</div>

View File

@ -35,4 +35,4 @@
?>
</td>
</tr>
</table>
</table>

View File

@ -20,4 +20,4 @@ if (file_exists($imgAbsolutePath)) {
echo $this->Html->image($imgRelativePath, Set::merge(array('alt' => $imgId, 'style' => 'width:' . $imgSize . 'px; height:' . $imgSize . 'px', 'title' => $imgId), $imgExtraOptions));
} else {
echo $this->Html->tag('span', $imgId, Set::merge(array('class' => 'img'), $imgExtraOptions));
}
}

View File

@ -70,4 +70,4 @@
</table>
</div>
</div>
</div>
</div>

View File

@ -74,4 +74,4 @@
</table>
</div>
</div>
</div>
</div>

View File

@ -68,4 +68,4 @@
<?php echo 'Error: ' . $errors[$element_id]; ?>
</div>
</div>
</div>
</div>

View File

@ -19,4 +19,4 @@
}
?>
</div>
</div>
</div>

View File

@ -25,4 +25,4 @@
var i_<?php echo h($element_id); ?> = 0;
var element_id_<?php echo h($element_id); ?> = <?php echo h($element_id); ?>;
var batch_<?php echo h($element_id); ?> = "<?php echo ($element['batch'] ? 'yes' : 'no'); ?>";
</script>
</script>

View File

@ -6,4 +6,4 @@
<div id="populate_template_info_body" class="populate_template_div_body">
<div class="solo" style="float:left;"><?php echo h($element['text']); ?></div><br />
</div>
</div>
</div>

Some files were not shown because too many files have changed in this diff Show More