From 1d06f25b389bbc48d0ad31b1f9a1a63a97c7be44 Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Mon, 6 Jun 2016 10:09:55 +0200 Subject: [PATCH] chg: add newline character before EOF to non-minified (text-)files --- INSTALL/INSTALL.sysop.txt | 2 +- INSTALL/Upgrade_21_to_22/INSTALL.SH | 2 +- INSTALL/Upgrade_21_to_22/UPGRADE.txt | 2 +- INSTALL/build/technical_design/TD-forum.txt | 2 +- app/Config/Schema/db_acl.sql | 2 +- app/Config/Schema/i18n.sql | 2 +- app/Config/Schema/note.txt | 2 +- app/Config/bootstrap.b.default.php | 2 +- app/Config/core.b.default.php | 2 +- app/Config/core.default.php | 2 +- app/Config/database.default.php | 2 +- app/Console/Command/Populate023Shell.php | 2 +- app/Console/Command/Task/RoleIdTask.php | 2 +- app/Console/Command/Task/RoleToAroAcoTask.php | 2 +- app/Console/Command/Task/RolesTask.php | 2 +- app/Console/Command/Task/UsersTask.php | 2 +- app/Console/Command/populate20Shell.php | 2 +- app/Controller/Component/ACLComponent.php | 2 +- app/Controller/Component/AdminCrudComponent.php | 2 +- app/Controller/Component/BlackListComponent.php | 2 +- app/Controller/Component/CidrComponent.php | 2 +- app/Controller/FeedsController.php | 2 +- app/Controller/OrganisationsController.php | 2 +- app/Controller/RegexpController.php | 2 +- app/Controller/WarninglistsController.php | 2 +- app/Controller/WhitelistsController.php | 2 +- app/Lib/CamelCase.php | 2 +- app/Lib/Tools/ColourPaletteTool.php | 2 +- app/Lib/Tools/JSONConverterTool.php | 2 +- app/Lib/Tools/PubSubTool.php | 2 +- app/Lib/Tools/RequestRearrangeTool.php | 2 +- app/Lib/Tools/XMLConverterTool.php | 2 +- app/Model/AdminSettingModel.php | 2 +- app/Model/EventBlacklist.php | 2 +- app/Model/EventDelegation.php | 2 +- app/Model/EventTag.php | 2 +- app/Model/FavouriteTag.php | 2 +- app/Model/Job.php | 2 +- app/Model/Log.php | 2 +- app/Model/Module.php | 2 +- app/Model/News.php | 2 +- app/Model/OrgBlacklist.php | 2 +- app/Model/Regexp.php | 2 +- app/Model/Role.php | 2 +- app/Model/ShadowAttribute.php | 2 +- app/Model/Sighting.php | 2 +- app/Model/Taxonomy.php | 2 +- app/Model/TaxonomyEntry.php | 2 +- app/Model/TaxonomyPredicate.php | 2 +- app/Model/WarninglistEntry.php | 2 +- app/Model/WarninglistType.php | 2 +- app/Plugin/Assets/models/behaviors/LogableBehavior.php | 2 +- .../Controller/Component/Auth/CertificateAuthenticate.php | 2 +- app/Plugin/SysLog/Lib/SysLog.php | 2 +- app/Plugin/UrlCache/Lib/Routing/UrlCacheManager.php | 2 +- app/Plugin/index.txt | 2 +- app/Plugin/magic_tools/models/behaviors/orphans_protectable.php | 2 +- app/View/Attributes/add.ctp | 2 +- app/View/Attributes/add_attachment.ctp | 2 +- app/View/Attributes/ajax/attributeConfirmationForm.ctp | 2 +- app/View/Attributes/ajax/attributeEditCategoryForm.ctp | 2 +- app/View/Attributes/ajax/attributeEditDistributionForm.ctp | 2 +- app/View/Attributes/ajax/attributeEditMassForm.ctp | 2 +- app/View/Attributes/ajax/attributeEditTo_idsForm.ctp | 2 +- app/View/Attributes/ajax/attributeEditTypeForm.ctp | 2 +- app/View/Attributes/ajax/attributeRestorationForm.ctp | 2 +- app/View/Attributes/ajax/attributeViewFieldForm.ctp | 2 +- app/View/Attributes/ajax/hover_enrichment.ctp | 2 +- app/View/Attributes/attribute_replace.ctp | 2 +- app/View/Attributes/check_composites.ctp | 2 +- app/View/Attributes/json/rest_search.ctp | 2 +- app/View/Attributes/json/return_attributes.ctp | 2 +- app/View/Attributes/report_validation_issues_attributes.ctp | 2 +- app/View/Attributes/return_attributes.ctp | 2 +- app/View/Attributes/rpz.ctp | 2 +- app/View/Attributes/text.ctp | 2 +- app/View/Attributes/view.ctp | 2 +- app/View/Attributes/xml/index.ctp | 2 +- app/View/Attributes/xml/rest_search.ctp | 2 +- app/View/Attributes/xml/return_attributes.ctp | 2 +- app/View/Attributes/xml/view.ctp | 2 +- app/View/Elements/ajaxTemplateTag.ctp | 2 +- app/View/Elements/dashboard/dashboard_events.ctp | 2 +- app/View/Elements/dashboard/dashboard_notifications.ctp | 2 +- app/View/Elements/eventattribute.ctp | 2 +- app/View/Elements/eventattributecreation.ctp | 2 +- app/View/Elements/global_menu.ctp | 2 +- app/View/Elements/healthElements/files.ctp | 2 +- app/View/Elements/healthElements/overview.ctp | 2 +- app/View/Elements/healthElements/settings_row.ctp | 2 +- app/View/Elements/healthElements/settings_tab.ctp | 2 +- app/View/Elements/healthElements/tabs.ctp | 2 +- app/View/Elements/histogram.ctp | 2 +- app/View/Elements/img.ctp | 2 +- app/View/Elements/serverRuleElements/pull.ctp | 2 +- app/View/Elements/serverRuleElements/push.ctp | 2 +- .../Elements/templateElements/populateTemplateAttribute.ctp | 2 +- .../Elements/templateElements/populateTemplateDescription.ctp | 2 +- app/View/Elements/templateElements/populateTemplateFile.ctp | 2 +- app/View/Elements/templateElements/populateTemplateText.ctp | 2 +- app/View/Emails/html/default.ctp | 2 +- app/View/Emails/text/body.ctp | 2 +- app/View/Emails/text/default.ctp | 2 +- app/View/Emails/text/new_event.ctp | 2 +- app/View/Errors/error400.ctp | 2 +- app/View/Errors/error403.ctp | 2 +- app/View/Errors/missing_connection.ctp | 2 +- app/View/Errors/missing_datasource_config.ctp | 2 +- app/View/Errors/pdo_error.ctp | 2 +- app/View/EventBlacklists/index.ctp | 2 +- app/View/EventDelegations/ajax/accept_delegation.ctp | 2 +- app/View/EventDelegations/ajax/delete_delegation.ctp | 2 +- app/View/EventDelegations/ajax/view.ctp | 2 +- app/View/Events/add_i_o_c.ctp | 2 +- app/View/Events/add_misp_export_result.ctp | 2 +- app/View/Events/ajax/ajaxTags.ctp | 2 +- app/View/Events/ajax/enrichmentChoice.ctp | 2 +- app/View/Events/ajax/eventPublishConfirmationForm.ctp | 2 +- app/View/Events/ajax/exportChoice.ctp | 2 +- app/View/Events/csv.ctp | 2 +- app/View/Events/download_open_i_o_c_event.ctp | 2 +- app/View/Events/edit.ctp | 2 +- app/View/Events/export_alternate.ctp | 2 +- app/View/Events/filter_event_index.ctp | 2 +- app/View/Events/free_text_import.ctp | 2 +- app/View/Events/hids.ctp | 2 +- app/View/Events/json/filter_event_ids_for_push.ctp | 2 +- app/View/Events/json/index.ctp | 2 +- app/View/Events/json/stix.ctp | 2 +- app/View/Events/json/view.ctp | 2 +- app/View/Events/nids.ctp | 2 +- app/View/Events/proposal_event_index.ctp | 2 +- app/View/Events/report_validation_issues_events.ctp | 2 +- app/View/Events/show_i_o_c_results.ctp | 2 +- app/View/Events/stix.ctp | 2 +- app/View/Events/succes.ctp | 2 +- app/View/Events/view_graph.ctp | 2 +- app/View/Events/xml/stix.ctp | 2 +- app/View/FavouriteTags/ajax/getToggleField.ctp | 2 +- app/View/Feeds/add.ctp | 2 +- app/View/Feeds/edit.ctp | 2 +- app/View/Helper/CommandHelper.php | 2 +- app/View/Helper/HighlightHelper.php | 2 +- app/View/Helper/TextColourHelper.php | 2 +- app/View/Helper/UtilityHelper.php | 2 +- app/View/Helper/XmlOutputHelper.php | 2 +- app/View/Layouts/Emails/html/default.ctp | 2 +- app/View/Layouts/Emails/text/default.ctp | 2 +- app/View/Layouts/ajax.ctp | 2 +- app/View/Layouts/ajaxTemplate.ctp | 2 +- app/View/Layouts/flash.ctp | 2 +- app/View/Layouts/iframe.ctp | 2 +- app/View/Layouts/text/default.ctp | 2 +- app/View/Logs/admin_index.ctp | 2 +- app/View/OrgBlacklists/index.ctp | 2 +- app/View/Organisations/ajax/fetch_orgs_for_sg.ctp | 2 +- app/View/Organisations/ajax/merge.ctp | 2 +- app/View/Organisations/view.ctp | 2 +- app/View/Pages/doc/concepts.ctp | 2 +- app/View/Pages/doc/using_the_system.ctp | 2 +- app/View/Posts/edit.ctp | 2 +- app/View/Roles/admin_add.ctp | 2 +- app/View/Roles/admin_edit.ctp | 2 +- app/View/Roles/admin_index.ctp | 2 +- app/View/Roles/index.ctp | 2 +- app/View/Roles/view.ctp | 2 +- app/View/Servers/ajax/fetch_servers_for_sg.ctp | 2 +- app/View/Servers/ajax/zeromqstatus.ctp | 2 +- app/View/Servers/filter_event_index.ctp | 2 +- app/View/Servers/json/simple.ctp | 2 +- app/View/ShadowAttributes/ajax/attributeEditCategoryForm.ctp | 2 +- app/View/ShadowAttributes/ajax/attributeEditTo_idsForm.ctp | 2 +- app/View/ShadowAttributes/ajax/attributeEditTypeForm.ctp | 2 +- .../ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp | 2 +- .../ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp | 2 +- app/View/ShadowAttributes/edit.ctp | 2 +- app/View/ShadowAttributes/json/get_proposals_by_uuid_list.ctp | 2 +- app/View/SharingGroups/view.ctp | 2 +- app/View/Sightings/ajax/like_button.ctp | 2 +- app/View/Tags/add.ctp | 2 +- app/View/Tags/ajax/select_tag.ctp | 2 +- app/View/Tags/ajax/taxonomy_choice.ctp | 2 +- app/View/Tags/edit.ctp | 2 +- app/View/Tags/index.ctp | 2 +- app/View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp | 2 +- app/View/Taxonomies/index.ctp | 2 +- app/View/TemplateElements/ajax/ajaxIndex.ctp | 2 +- .../TemplateElements/ajax/templateElementConfirmationForm.ctp | 2 +- .../TemplateElements/ajax/template_element_add_attribute.ctp | 2 +- app/View/TemplateElements/ajax/template_element_add_choices.ctp | 2 +- app/View/TemplateElements/ajax/template_element_add_file.ctp | 2 +- app/View/TemplateElements/ajax/template_element_add_text.ctp | 2 +- .../TemplateElements/ajax/template_element_edit_attribute.ctp | 2 +- app/View/TemplateElements/ajax/template_element_edit_file.ctp | 2 +- app/View/TemplateElements/ajax/template_element_edit_text.ctp | 2 +- app/View/Templates/add.ctp | 2 +- app/View/Templates/ajax/template_choices.ctp | 2 +- app/View/Templates/edit.ctp | 2 +- app/View/Templates/index.ctp | 2 +- app/View/Templates/populate_event_from_template.ctp | 2 +- app/View/Templates/template_file_upload.ctp | 2 +- app/View/Templates/upload_file.ctp | 2 +- app/View/Templates/view.ctp | 2 +- app/View/Threads/view.ctp | 2 +- app/View/Users/admin_filter_user_index.ctp | 2 +- app/View/Users/ajax/fetchpgpkey.ctp | 2 +- app/View/Users/ajax/passwordResetConfirmationForm.ctp | 2 +- app/View/Users/check_and_correct_pgps.ctp | 2 +- app/View/Users/histogram.ctp | 2 +- app/View/Users/login.ctp | 2 +- app/View/Users/memberslist.ctp | 2 +- app/View/Users/statistics.ctp | 2 +- app/View/Users/terms.ctp | 2 +- app/View/Users/verify_g_p_g.ctp | 2 +- app/View/Warninglists/ajax/getToggleField.ctp | 2 +- app/View/Warninglists/index.ctp | 2 +- app/View/Whitelists/admin_add.ctp | 2 +- app/View/Whitelists/admin_edit.ctp | 2 +- app/View/Whitelists/index.ctp | 2 +- app/webroot/css/datepicker.css | 2 +- app/webroot/css/print.css | 2 +- app/webroot/js/bootstrap.js | 2 +- app/webroot/js/jquery-toc.js | 2 +- app/webroot/js/main.js | 2 +- 224 files changed, 224 insertions(+), 224 deletions(-) diff --git a/INSTALL/INSTALL.sysop.txt b/INSTALL/INSTALL.sysop.txt index b07ba11f8..ecaa2f027 100644 --- a/INSTALL/INSTALL.sysop.txt +++ b/INSTALL/INSTALL.sysop.txt @@ -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. \ No newline at end of file +conform the MISP MySQL log table format. diff --git a/INSTALL/Upgrade_21_to_22/INSTALL.SH b/INSTALL/Upgrade_21_to_22/INSTALL.SH index c110de827..ad3cf05e4 100644 --- a/INSTALL/Upgrade_21_to_22/INSTALL.SH +++ b/INSTALL/Upgrade_21_to_22/INSTALL.SH @@ -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' \ No newline at end of file +printf '=========================================================\n\n' diff --git a/INSTALL/Upgrade_21_to_22/UPGRADE.txt b/INSTALL/Upgrade_21_to_22/UPGRADE.txt index 2183348cb..d505ff51c 100644 --- a/INSTALL/Upgrade_21_to_22/UPGRADE.txt +++ b/INSTALL/Upgrade_21_to_22/UPGRADE.txt @@ -29,4 +29,4 @@ Enabling background jobs via CakeResque - ./start.sh Make sure you configure your OS to start this script as boot time ! -================================================================================================================================================ \ No newline at end of file +================================================================================================================================================ diff --git a/INSTALL/build/technical_design/TD-forum.txt b/INSTALL/build/technical_design/TD-forum.txt index 1e5ef6a1b..7cb7102ab 100644 --- a/INSTALL/build/technical_design/TD-forum.txt +++ b/INSTALL/build/technical_design/TD-forum.txt @@ -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. \ No newline at end of file + CakePHP and a PhpBB3 forum. diff --git a/app/Config/Schema/db_acl.sql b/app/Config/Schema/db_acl.sql index f50f3921e..3a8b7294f 100644 --- a/app/Config/Schema/db_acl.sql +++ b/app/Config/Schema/db_acl.sql @@ -37,4 +37,4 @@ CREATE TABLE aros ( lft INTEGER(10) DEFAULT NULL, rght INTEGER(10) DEFAULT NULL, PRIMARY KEY (id) -); \ No newline at end of file +); diff --git a/app/Config/Schema/i18n.sql b/app/Config/Schema/i18n.sql index 239e14623..3b3fecb17 100644 --- a/app/Config/Schema/i18n.sql +++ b/app/Config/Schema/i18n.sql @@ -23,4 +23,4 @@ CREATE TABLE i18n ( INDEX model (model), INDEX row_id (foreign_key), INDEX field (field) -); \ No newline at end of file +); diff --git a/app/Config/Schema/note.txt b/app/Config/Schema/note.txt index 73f348f50..015761bbc 100644 --- a/app/Config/Schema/note.txt +++ b/app/Config/Schema/note.txt @@ -13,4 +13,4 @@ +Users.role_id +Roles +Logs -0.2.3 \ No newline at end of file +0.2.3 diff --git a/app/Config/bootstrap.b.default.php b/app/Config/bootstrap.b.default.php index ca30ed5b1..644a88340 100644 --- a/app/Config/bootstrap.b.default.php +++ b/app/Config/bootstrap.b.default.php @@ -146,4 +146,4 @@ CakeLog::config('error', array( CakePlugin::loadAll(array( 'CakeResque' => array('bootstrap' => true) -)); \ No newline at end of file +)); diff --git a/app/Config/core.b.default.php b/app/Config/core.b.default.php index d3f4e6ec8..356e84b11 100644 --- a/app/Config/core.b.default.php +++ b/app/Config/core.b.default.php @@ -278,4 +278,4 @@ Cache::config('_cake_model_', array( 'duration' => $duration )); -require_once dirname(__DIR__) . '/Vendor/autoload.php'; \ No newline at end of file +require_once dirname(__DIR__) . '/Vendor/autoload.php'; diff --git a/app/Config/core.default.php b/app/Config/core.default.php index fceb21d83..efe9ac7ad 100644 --- a/app/Config/core.default.php +++ b/app/Config/core.default.php @@ -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'; \ No newline at end of file +require_once dirname(__DIR__) . '/Vendor/autoload.php'; diff --git a/app/Config/database.default.php b/app/Config/database.default.php index b5b8b0760..621cd8911 100644 --- a/app/Config/database.default.php +++ b/app/Config/database.default.php @@ -70,4 +70,4 @@ class DATABASE_CONFIG { 'prefix' => '', //'encoding' => 'utf8', ); -} \ No newline at end of file +} diff --git a/app/Console/Command/Populate023Shell.php b/app/Console/Command/Populate023Shell.php index 54c3018f3..b0a96a686 100644 --- a/app/Console/Command/Populate023Shell.php +++ b/app/Console/Command/Populate023Shell.php @@ -13,4 +13,4 @@ class Populate023Shell extends AppShell { // on user data $this->Users->execute(); } -} \ No newline at end of file +} diff --git a/app/Console/Command/Task/RoleIdTask.php b/app/Console/Command/Task/RoleIdTask.php index 343643fd3..731e5b9d5 100644 --- a/app/Console/Command/Task/RoleIdTask.php +++ b/app/Console/Command/Task/RoleIdTask.php @@ -13,4 +13,4 @@ class RoleIdTask extends Shell { $this->Users->setRoleId($fk); //$this->Users->generateAllForRoleId($fk); // TODO } -} \ No newline at end of file +} diff --git a/app/Console/Command/Task/RoleToAroAcoTask.php b/app/Console/Command/Task/RoleToAroAcoTask.php index 176edbb2e..fcbf5b545 100644 --- a/app/Console/Command/Task/RoleToAroAcoTask.php +++ b/app/Console/Command/Task/RoleToAroAcoTask.php @@ -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']); } } -} \ No newline at end of file +} diff --git a/app/Console/Command/Task/RolesTask.php b/app/Console/Command/Task/RolesTask.php index 7bc3148dc..d2754f426 100644 --- a/app/Console/Command/Task/RolesTask.php +++ b/app/Console/Command/Task/RolesTask.php @@ -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))); } -} \ No newline at end of file +} diff --git a/app/Console/Command/Task/UsersTask.php b/app/Console/Command/Task/UsersTask.php index 8a9086e57..9ec31a452 100644 --- a/app/Console/Command/Task/UsersTask.php +++ b/app/Console/Command/Task/UsersTask.php @@ -15,4 +15,4 @@ class UsersTask extends Shell { // perform clean $users->checkAndCorrectPgps(); } -} \ No newline at end of file +} diff --git a/app/Console/Command/populate20Shell.php b/app/Console/Command/populate20Shell.php index 54c3018f3..b0a96a686 100644 --- a/app/Console/Command/populate20Shell.php +++ b/app/Console/Command/populate20Shell.php @@ -13,4 +13,4 @@ class Populate023Shell extends AppShell { // on user data $this->Users->execute(); } -} \ No newline at end of file +} diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php index 88266a78b..04fcb94be 100644 --- a/app/Controller/Component/ACLComponent.php +++ b/app/Controller/Component/ACLComponent.php @@ -463,4 +463,4 @@ class ACLComponent extends Component { } return $result; } -} \ No newline at end of file +} diff --git a/app/Controller/Component/AdminCrudComponent.php b/app/Controller/Component/AdminCrudComponent.php index 8f898ae56..feb8f2926 100644 --- a/app/Controller/Component/AdminCrudComponent.php +++ b/app/Controller/Component/AdminCrudComponent.php @@ -96,4 +96,4 @@ class AdminCrudComponent extends AuthComponent { public function startup(Controller $controller) { $this->controller = $controller; } -} \ No newline at end of file +} diff --git a/app/Controller/Component/BlackListComponent.php b/app/Controller/Component/BlackListComponent.php index 76888824a..717d51f62 100644 --- a/app/Controller/Component/BlackListComponent.php +++ b/app/Controller/Component/BlackListComponent.php @@ -154,4 +154,4 @@ class BlackListComponent extends Component { $this->settings = Set::merge($this->settings, $settings); parent::__construct($collection, $this->settings); } -} \ No newline at end of file +} diff --git a/app/Controller/Component/CidrComponent.php b/app/Controller/Component/CidrComponent.php index 4ef40f680..7c571c615 100644 --- a/app/Controller/Component/CidrComponent.php +++ b/app/Controller/Component/CidrComponent.php @@ -40,4 +40,4 @@ class CidrComponent extends Component { } return $results; } -} \ No newline at end of file +} diff --git a/app/Controller/FeedsController.php b/app/Controller/FeedsController.php index 87f15c92a..4ab91b54d 100644 --- a/app/Controller/FeedsController.php +++ b/app/Controller/FeedsController.php @@ -285,4 +285,4 @@ class FeedsController extends AppController { $result['message'] = $fail ? 'Could not ' . $action . ' feed.' : 'Feed ' . $action . 'd.'; return $result; } -} \ No newline at end of file +} diff --git a/app/Controller/OrganisationsController.php b/app/Controller/OrganisationsController.php index c472806a7..8b45b08c9 100644 --- a/app/Controller/OrganisationsController.php +++ b/app/Controller/OrganisationsController.php @@ -236,4 +236,4 @@ class OrganisationsController extends AppController { $this->render('ajax/merge'); } } -} \ No newline at end of file +} diff --git a/app/Controller/RegexpController.php b/app/Controller/RegexpController.php index 09a553e3b..9d59e5892 100644 --- a/app/Controller/RegexpController.php +++ b/app/Controller/RegexpController.php @@ -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'); } -} \ No newline at end of file +} diff --git a/app/Controller/WarninglistsController.php b/app/Controller/WarninglistsController.php index ca2be1c73..2812c8a0d 100644 --- a/app/Controller/WarninglistsController.php +++ b/app/Controller/WarninglistsController.php @@ -147,4 +147,4 @@ class WarninglistsController extends AppController { $this->set('warninglist', $warninglist); } } -} \ No newline at end of file +} diff --git a/app/Controller/WhitelistsController.php b/app/Controller/WhitelistsController.php index f21ec1da0..5eba58c83 100644 --- a/app/Controller/WhitelistsController.php +++ b/app/Controller/WhitelistsController.php @@ -79,4 +79,4 @@ class WhitelistsController extends AppController { $this->recursive = 0; $this->set('list', $this->paginate()); } -} \ No newline at end of file +} diff --git a/app/Lib/CamelCase.php b/app/Lib/CamelCase.php index 197544742..744b48c34 100644 --- a/app/Lib/CamelCase.php +++ b/app/Lib/CamelCase.php @@ -49,4 +49,4 @@ class CamelCase { //App::uses('Inflector', 'lib'); return Inflector::camelize($underscored); } -} \ No newline at end of file +} diff --git a/app/Lib/Tools/ColourPaletteTool.php b/app/Lib/Tools/ColourPaletteTool.php index fc9847768..da8057504 100644 --- a/app/Lib/Tools/ColourPaletteTool.php +++ b/app/Lib/Tools/ColourPaletteTool.php @@ -83,4 +83,4 @@ class ColourPaletteTool { } return $number % 100 / 100; } -} \ No newline at end of file +} diff --git a/app/Lib/Tools/JSONConverterTool.php b/app/Lib/Tools/JSONConverterTool.php index 93e472b24..948909125 100644 --- a/app/Lib/Tools/JSONConverterTool.php +++ b/app/Lib/Tools/JSONConverterTool.php @@ -97,4 +97,4 @@ class JSONConverterTool { if ($mispVersion) $result .= ',' . PHP_EOL . '{"xml_version":"' . $mispVersion . '"}' . PHP_EOL; return $result . ']}'; } -} \ No newline at end of file +} diff --git a/app/Lib/Tools/PubSubTool.php b/app/Lib/Tools/PubSubTool.php index 0dd20d8bc..683831d49 100644 --- a/app/Lib/Tools/PubSubTool.php +++ b/app/Lib/Tools/PubSubTool.php @@ -109,4 +109,4 @@ class PubSubTool { if (!is_numeric($this->checkIfRunning())) return 'Failed starting the ZeroMQ script.'; return true; } -} \ No newline at end of file +} diff --git a/app/Lib/Tools/RequestRearrangeTool.php b/app/Lib/Tools/RequestRearrangeTool.php index 935e4c09f..5f6d3b813 100644 --- a/app/Lib/Tools/RequestRearrangeTool.php +++ b/app/Lib/Tools/RequestRearrangeTool.php @@ -13,4 +13,4 @@ class RequestRearrangeTool { } return $data; } -} \ No newline at end of file +} diff --git a/app/Lib/Tools/XMLConverterTool.php b/app/Lib/Tools/XMLConverterTool.php index 1bfa4e9df..f5e20417a 100644 --- a/app/Lib/Tools/XMLConverterTool.php +++ b/app/Lib/Tools/XMLConverterTool.php @@ -173,4 +173,4 @@ class XMLConverterTool { if ($mispVersion) $result .= '' . $mispVersion . ''; return $result . '' . PHP_EOL; } -} \ No newline at end of file +} diff --git a/app/Model/AdminSettingModel.php b/app/Model/AdminSettingModel.php index 62a88998f..2b8594299 100644 --- a/app/Model/AdminSettingModel.php +++ b/app/Model/AdminSettingModel.php @@ -4,4 +4,4 @@ App::uses('AppModel', 'Model'); class AdminSetting extends AppModel { public $actsAs = array('Containable'); public $validate = array('setting' => 'isUnique'); -} \ No newline at end of file +} diff --git a/app/Model/EventBlacklist.php b/app/Model/EventBlacklist.php index e156d2b6f..7add826ed 100644 --- a/app/Model/EventBlacklist.php +++ b/app/Model/EventBlacklist.php @@ -35,4 +35,4 @@ class EventBlacklist extends AppModel{ } return true; } -} \ No newline at end of file +} diff --git a/app/Model/EventDelegation.php b/app/Model/EventDelegation.php index e62f6f0ef..d4435efc6 100644 --- a/app/Model/EventDelegation.php +++ b/app/Model/EventDelegation.php @@ -114,4 +114,4 @@ class EventDelegation extends AppModel { } } } -} \ No newline at end of file +} diff --git a/app/Model/EventTag.php b/app/Model/EventTag.php index 49d752848..901156f73 100644 --- a/app/Model/EventTag.php +++ b/app/Model/EventTag.php @@ -67,4 +67,4 @@ class EventTag extends AppModel { } return true; } -} \ No newline at end of file +} diff --git a/app/Model/FavouriteTag.php b/app/Model/FavouriteTag.php index 977c28547..12efd9774 100644 --- a/app/Model/FavouriteTag.php +++ b/app/Model/FavouriteTag.php @@ -19,4 +19,4 @@ class FavouriteTag extends AppModel { ); public $belongsTo = array('Tag', 'User'); -} \ No newline at end of file +} diff --git a/app/Model/Job.php b/app/Model/Job.php index 54abc9113..667a4a325 100644 --- a/app/Model/Job.php +++ b/app/Model/Job.php @@ -66,4 +66,4 @@ class Job extends AppModel { $this->saveField('process_id', $process_id); return $id; } -} \ No newline at end of file +} diff --git a/app/Model/Log.php b/app/Model/Log.php index 2fa495980..ee97e47cf 100644 --- a/app/Model/Log.php +++ b/app/Model/Log.php @@ -118,4 +118,4 @@ class Log extends AppModel { 'model_id' => $model_id, )); } -} \ No newline at end of file +} diff --git a/app/Model/Module.php b/app/Model/Module.php index 3396ce0cd..1569cdfa3 100644 --- a/app/Model/Module.php +++ b/app/Model/Module.php @@ -65,4 +65,4 @@ class Module extends AppModel { private function queryModule() { } -} \ No newline at end of file +} diff --git a/app/Model/News.php b/app/Model/News.php index 98c0e6cf9..bbae216d2 100644 --- a/app/Model/News.php +++ b/app/Model/News.php @@ -23,4 +23,4 @@ class News extends AppModel { 'className' => 'User', ) ); -} \ No newline at end of file +} diff --git a/app/Model/OrgBlacklist.php b/app/Model/OrgBlacklist.php index cc4fbd5a7..55e44aa4c 100644 --- a/app/Model/OrgBlacklist.php +++ b/app/Model/OrgBlacklist.php @@ -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; } -} \ No newline at end of file +} diff --git a/app/Model/Regexp.php b/app/Model/Regexp.php index 08ce347b3..4c38c0d51 100644 --- a/app/Model/Regexp.php +++ b/app/Model/Regexp.php @@ -92,4 +92,4 @@ class Regexp extends AppModel { if ($orig === $string) return 2; return 1; } -} \ No newline at end of file +} diff --git a/app/Model/Role.php b/app/Model/Role.php index 13e7db3ab..abf162b4c 100644 --- a/app/Model/Role.php +++ b/app/Model/Role.php @@ -109,4 +109,4 @@ class Role extends AppModel { } return true; } -} \ No newline at end of file +} diff --git a/app/Model/ShadowAttribute.php b/app/Model/ShadowAttribute.php index 429611e1b..020dc3780 100644 --- a/app/Model/ShadowAttribute.php +++ b/app/Model/ShadowAttribute.php @@ -653,4 +653,4 @@ class ShadowAttribute extends AppModel { )); } } -} \ No newline at end of file +} diff --git a/app/Model/Sighting.php b/app/Model/Sighting.php index 5c8c357af..fa20c17f9 100644 --- a/app/Model/Sighting.php +++ b/app/Model/Sighting.php @@ -145,4 +145,4 @@ class Sighting extends AppModel{ } return $fn; } -} \ No newline at end of file +} diff --git a/app/Model/Taxonomy.php b/app/Model/Taxonomy.php index 5566a3205..06347440d 100644 --- a/app/Model/Taxonomy.php +++ b/app/Model/Taxonomy.php @@ -245,4 +245,4 @@ class Taxonomy extends AppModel{ } return $taxonomies; } -} \ No newline at end of file +} diff --git a/app/Model/TaxonomyEntry.php b/app/Model/TaxonomyEntry.php index d9962ea90..8c5dc1ada 100644 --- a/app/Model/TaxonomyEntry.php +++ b/app/Model/TaxonomyEntry.php @@ -24,4 +24,4 @@ class TaxonomyEntry extends AppModel{ parent::beforeValidate(); return true; } -} \ No newline at end of file +} diff --git a/app/Model/TaxonomyPredicate.php b/app/Model/TaxonomyPredicate.php index 188c8be85..6fa1c752f 100644 --- a/app/Model/TaxonomyPredicate.php +++ b/app/Model/TaxonomyPredicate.php @@ -26,4 +26,4 @@ class TaxonomyPredicate extends AppModel{ parent::beforeValidate(); return true; } -} \ No newline at end of file +} diff --git a/app/Model/WarninglistEntry.php b/app/Model/WarninglistEntry.php index 6cd4bde56..dd96fa016 100644 --- a/app/Model/WarninglistEntry.php +++ b/app/Model/WarninglistEntry.php @@ -25,4 +25,4 @@ class WarninglistEntry extends AppModel{ parent::beforeValidate(); return true; } -} \ No newline at end of file +} diff --git a/app/Model/WarninglistType.php b/app/Model/WarninglistType.php index dfa1bc748..8280c9645 100644 --- a/app/Model/WarninglistType.php +++ b/app/Model/WarninglistType.php @@ -21,4 +21,4 @@ class WarninglistType extends AppModel{ parent::beforeValidate(); return true; } -} \ No newline at end of file +} diff --git a/app/Plugin/Assets/models/behaviors/LogableBehavior.php b/app/Plugin/Assets/models/behaviors/LogableBehavior.php index 915efe749..ab6077be5 100644 --- a/app/Plugin/Assets/models/behaviors/LogableBehavior.php +++ b/app/Plugin/Assets/models/behaviors/LogableBehavior.php @@ -532,4 +532,4 @@ class LogableBehavior extends ModelBehavior { 'validate' => false, 'callbacks' => false)); } -} \ No newline at end of file +} diff --git a/app/Plugin/CertAuth/Controller/Component/Auth/CertificateAuthenticate.php b/app/Plugin/CertAuth/Controller/Component/Auth/CertificateAuthenticate.php index 8e1706ddd..ae301b261 100644 --- a/app/Plugin/CertAuth/Controller/Component/Auth/CertificateAuthenticate.php +++ b/app/Plugin/CertAuth/Controller/Component/Auth/CertificateAuthenticate.php @@ -270,4 +270,4 @@ class CertificateAuthenticate extends BaseAuthenticate return self::$client; } -} \ No newline at end of file +} diff --git a/app/Plugin/SysLog/Lib/SysLog.php b/app/Plugin/SysLog/Lib/SysLog.php index 6b60e5655..11da5f488 100644 --- a/app/Plugin/SysLog/Lib/SysLog.php +++ b/app/Plugin/SysLog/Lib/SysLog.php @@ -75,4 +75,4 @@ class SysLog { return $result; } } -?> \ No newline at end of file +?> diff --git a/app/Plugin/UrlCache/Lib/Routing/UrlCacheManager.php b/app/Plugin/UrlCache/Lib/Routing/UrlCacheManager.php index d47355fa5..7cfe883f9 100644 --- a/app/Plugin/UrlCache/Lib/Routing/UrlCacheManager.php +++ b/app/Plugin/UrlCache/Lib/Routing/UrlCacheManager.php @@ -155,4 +155,4 @@ class UrlCacheManager { } } -} \ No newline at end of file +} diff --git a/app/Plugin/index.txt b/app/Plugin/index.txt index 96470e1ca..3201498c2 100644 --- a/app/Plugin/index.txt +++ b/app/Plugin/index.txt @@ -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 \ No newline at end of file +http://xp-dev.com/trac/cakephp/browser/cakephp/libs/magic_tools diff --git a/app/Plugin/magic_tools/models/behaviors/orphans_protectable.php b/app/Plugin/magic_tools/models/behaviors/orphans_protectable.php index 58fb44fe9..81b26014b 100644 --- a/app/Plugin/magic_tools/models/behaviors/orphans_protectable.php +++ b/app/Plugin/magic_tools/models/behaviors/orphans_protectable.php @@ -123,4 +123,4 @@ class OrphansProtectableBehavior extends ModelBehavior { return implode($messageParts, ', '); } } -?> \ No newline at end of file +?> diff --git a/app/View/Attributes/add.ctp b/app/View/Attributes/add.ctp index e44ba776d..35ae677dd 100644 --- a/app/View/Attributes/add.ctp +++ b/app/View/Attributes/add.ctp @@ -228,4 +228,4 @@ $(document).ready(function() { }); -Js->writeBuffer(); // Write cached scripts \ No newline at end of file +Js->writeBuffer(); // Write cached scripts diff --git a/app/View/Attributes/add_attachment.ctp b/app/View/Attributes/add_attachment.ctp index 33c70ff72..710785103 100644 --- a/app/View/Attributes/add_attachment.ctp +++ b/app/View/Attributes/add_attachment.ctp @@ -191,4 +191,4 @@ $(function(){ ); -Js->writeBuffer(); // Write cached scripts \ No newline at end of file +Js->writeBuffer(); // Write cached scripts diff --git a/app/View/Attributes/ajax/attributeConfirmationForm.ctp b/app/View/Attributes/ajax/attributeConfirmationForm.ctp index ac44346eb..b30486f5b 100644 --- a/app/View/Attributes/ajax/attributeConfirmationForm.ctp +++ b/app/View/Attributes/ajax/attributeConfirmationForm.ctp @@ -22,4 +22,4 @@ Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/Attributes/ajax/attributeEditCategoryForm.ctp b/app/View/Attributes/ajax/attributeEditCategoryForm.ctp index 4cf9c6dcd..d0fb84294 100644 --- a/app/View/Attributes/ajax/attributeEditCategoryForm.ctp +++ b/app/View/Attributes/ajax/attributeEditCategoryForm.ctp @@ -16,4 +16,4 @@ )); echo $this->Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/Attributes/ajax/attributeEditDistributionForm.ctp b/app/View/Attributes/ajax/attributeEditDistributionForm.ctp index 8713b7773..ccf2d4ade 100644 --- a/app/View/Attributes/ajax/attributeEditDistributionForm.ctp +++ b/app/View/Attributes/ajax/attributeEditDistributionForm.ctp @@ -16,4 +16,4 @@ )); echo $this->Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/Attributes/ajax/attributeEditMassForm.ctp b/app/View/Attributes/ajax/attributeEditMassForm.ctp index 9f16261cf..88c3be39c 100644 --- a/app/View/Attributes/ajax/attributeEditMassForm.ctp +++ b/app/View/Attributes/ajax/attributeEditMassForm.ctp @@ -135,4 +135,4 @@ $(document).ready(function() { }); -Js->writeBuffer(); // Write cached scripts \ No newline at end of file +Js->writeBuffer(); // Write cached scripts diff --git a/app/View/Attributes/ajax/attributeEditTo_idsForm.ctp b/app/View/Attributes/ajax/attributeEditTo_idsForm.ctp index c628cd6a9..6916fbbf8 100644 --- a/app/View/Attributes/ajax/attributeEditTo_idsForm.ctp +++ b/app/View/Attributes/ajax/attributeEditTo_idsForm.ctp @@ -17,4 +17,4 @@ )); echo $this->Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/Attributes/ajax/attributeEditTypeForm.ctp b/app/View/Attributes/ajax/attributeEditTypeForm.ctp index 4370ea00e..05bd93e2a 100644 --- a/app/View/Attributes/ajax/attributeEditTypeForm.ctp +++ b/app/View/Attributes/ajax/attributeEditTypeForm.ctp @@ -16,4 +16,4 @@ )); echo $this->Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/Attributes/ajax/attributeRestorationForm.ctp b/app/View/Attributes/ajax/attributeRestorationForm.ctp index 892d3fec6..f0e05b9dd 100644 --- a/app/View/Attributes/ajax/attributeRestorationForm.ctp +++ b/app/View/Attributes/ajax/attributeRestorationForm.ctp @@ -21,4 +21,4 @@ Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/Attributes/ajax/attributeViewFieldForm.ctp b/app/View/Attributes/ajax/attributeViewFieldForm.ctp index d88dfa89e..c19b0b5a6 100644 --- a/app/View/Attributes/ajax/attributeViewFieldForm.ctp +++ b/app/View/Attributes/ajax/attributeViewFieldForm.ctp @@ -1,2 +1,2 @@ \ No newline at end of file +?> diff --git a/app/View/Attributes/attribute_replace.ctp b/app/View/Attributes/attribute_replace.ctp index ef8f8013a..615acd0c2 100644 --- a/app/View/Attributes/attribute_replace.ctp +++ b/app/View/Attributes/attribute_replace.ctp @@ -150,4 +150,4 @@ $(document).ready(function() { }); }); -Js->writeBuffer(); // Write cached scripts \ No newline at end of file +Js->writeBuffer(); // Write cached scripts diff --git a/app/View/Attributes/check_composites.ctp b/app/View/Attributes/check_composites.ctp index 371718fb5..7289dc2a2 100644 --- a/app/View/Attributes/check_composites.ctp +++ b/app/View/Attributes/check_composites.ctp @@ -8,4 +8,4 @@ if (0 == count($fails)):?> - \ No newline at end of file + diff --git a/app/View/Attributes/json/rest_search.ctp b/app/View/Attributes/json/rest_search.ctp index 07136ed7d..3d2174636 100644 --- a/app/View/Attributes/json/rest_search.ctp +++ b/app/View/Attributes/json/rest_search.ctp @@ -8,4 +8,4 @@ foreach ($results as $k => $v) { ); $jsonArray['response']['Attribute'][] = $results[$k]['Attribute']; } -echo json_encode($jsonArray); \ No newline at end of file +echo json_encode($jsonArray); diff --git a/app/View/Attributes/json/return_attributes.ctp b/app/View/Attributes/json/return_attributes.ctp index 9161fd97d..efaa37baf 100644 --- a/app/View/Attributes/json/return_attributes.ctp +++ b/app/View/Attributes/json/return_attributes.ctp @@ -7,4 +7,4 @@ foreach ($results as $k => $v) { ); $jsonArray['response']['Attribute'][] = $results[$k]; } -echo json_encode($jsonArray); \ No newline at end of file +echo json_encode($jsonArray); diff --git a/app/View/Attributes/report_validation_issues_attributes.ctp b/app/View/Attributes/report_validation_issues_attributes.ctp index ebcf8c916..c89b6bdce 100644 --- a/app/View/Attributes/report_validation_issues_attributes.ctp +++ b/app/View/Attributes/report_validation_issues_attributes.ctp @@ -16,4 +16,4 @@ element('side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools')); -?> \ No newline at end of file +?> diff --git a/app/View/Attributes/return_attributes.ctp b/app/View/Attributes/return_attributes.ctp index b2d30c8cd..d6f64025b 100644 --- a/app/View/Attributes/return_attributes.ctp +++ b/app/View/Attributes/return_attributes.ctp @@ -8,4 +8,4 @@ foreach ($results as $k => $v) { $xmlArray['response']['Attribute'][] = $results[$k]; } $xmlObject = Xml::fromArray($xmlArray, array('format' => 'tags')); -echo $xmlObject->asXML(); \ No newline at end of file +echo $xmlObject->asXML(); diff --git a/app/View/Attributes/rpz.ctp b/app/View/Attributes/rpz.ctp index 6f470aafd..0f0ca6dbc 100644 --- a/app/View/Attributes/rpz.ctp +++ b/app/View/Attributes/rpz.ctp @@ -1,4 +1,4 @@ export($values, $rpzSettings)); \ No newline at end of file + echo ($rpzExport->export($values, $rpzSettings)); diff --git a/app/View/Attributes/text.ctp b/app/View/Attributes/text.ctp index 0b71eefb5..0168e84fe 100644 --- a/app/View/Attributes/text.ctp +++ b/app/View/Attributes/text.ctp @@ -2,4 +2,4 @@ foreach ($attributes as $attribute) { echo $attribute['Attribute']['value']; echo PHP_EOL; -} \ No newline at end of file +} diff --git a/app/View/Attributes/view.ctp b/app/View/Attributes/view.ctp index cdd1629e6..1f1144f7b 100644 --- a/app/View/Attributes/view.ctp +++ b/app/View/Attributes/view.ctp @@ -1,2 +1,2 @@ element('eventattributerow', array('object' => $object)); \ No newline at end of file +echo $this->element('eventattributerow', array('object' => $object)); diff --git a/app/View/Attributes/xml/index.ctp b/app/View/Attributes/xml/index.ctp index bec0c1c18..637ff2c64 100644 --- a/app/View/Attributes/xml/index.ctp +++ b/app/View/Attributes/xml/index.ctp @@ -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. - --> \ No newline at end of file + --> diff --git a/app/View/Attributes/xml/rest_search.ctp b/app/View/Attributes/xml/rest_search.ctp index 32f0d01ff..3209d3e1b 100644 --- a/app/View/Attributes/xml/rest_search.ctp +++ b/app/View/Attributes/xml/rest_search.ctp @@ -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(); \ No newline at end of file +echo $xmlObject->asXML(); diff --git a/app/View/Attributes/xml/return_attributes.ctp b/app/View/Attributes/xml/return_attributes.ctp index b2d30c8cd..d6f64025b 100644 --- a/app/View/Attributes/xml/return_attributes.ctp +++ b/app/View/Attributes/xml/return_attributes.ctp @@ -8,4 +8,4 @@ foreach ($results as $k => $v) { $xmlArray['response']['Attribute'][] = $results[$k]; } $xmlObject = Xml::fromArray($xmlArray, array('format' => 'tags')); -echo $xmlObject->asXML(); \ No newline at end of file +echo $xmlObject->asXML(); diff --git a/app/View/Attributes/xml/view.ctp b/app/View/Attributes/xml/view.ctp index dde38019b..f3c9fe81a 100644 --- a/app/View/Attributes/xml/view.ctp +++ b/app/View/Attributes/xml/view.ctp @@ -1,4 +1,4 @@ 'tags')); -echo($xmlObject->asXml()); \ No newline at end of file +echo($xmlObject->asXml()); diff --git a/app/View/Elements/ajaxTemplateTag.ctp b/app/View/Elements/ajaxTemplateTag.ctp index db81ce388..3d27b54bd 100644 --- a/app/View/Elements/ajaxTemplateTag.ctp +++ b/app/View/Elements/ajaxTemplateTag.ctp @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/app/View/Elements/dashboard/dashboard_events.ctp b/app/View/Elements/dashboard/dashboard_events.ctp index 31a0b5364..aa479b380 100644 --- a/app/View/Elements/dashboard/dashboard_events.ctp +++ b/app/View/Elements/dashboard/dashboard_events.ctp @@ -11,4 +11,4 @@ $(document).ready(function() { var elem = $('.dashboard_notifications').width(); $('.dashboard_notifications').css({'height':elem+'px'}); }); - \ No newline at end of file + diff --git a/app/View/Elements/dashboard/dashboard_notifications.ctp b/app/View/Elements/dashboard/dashboard_notifications.ctp index f0bbd833e..774434b2c 100644 --- a/app/View/Elements/dashboard/dashboard_notifications.ctp +++ b/app/View/Elements/dashboard/dashboard_notifications.ctp @@ -17,4 +17,4 @@ $(document).ready(function() { var elem = $('.dashboard_notifications').width(); $('.dashboard_notifications').css({'height':elem+'px'}); }); - \ No newline at end of file + diff --git a/app/View/Elements/eventattribute.ctp b/app/View/Elements/eventattribute.ctp index 04de31c22..02d7d7c37 100644 --- a/app/View/Elements/eventattribute.ctp +++ b/app/View/Elements/eventattribute.ctp @@ -523,4 +523,4 @@ attributes or the appropriate distribution level. If you think there is a mistak Js->writeBuffer(); -?> \ No newline at end of file +?> diff --git a/app/View/Elements/eventattributecreation.ctp b/app/View/Elements/eventattributecreation.ctp index 6d9eb1424..aa3c559e0 100644 --- a/app/View/Elements/eventattributecreation.ctp +++ b/app/View/Elements/eventattributecreation.ctp @@ -207,4 +207,4 @@ Js->writeBuffer(); -?> \ No newline at end of file +?> diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp index 4a3c80bcd..b89a3e60d 100644 --- a/app/View/Elements/global_menu.ctp +++ b/app/View/Elements/global_menu.ctp @@ -235,4 +235,4 @@ function resizeLogo() { topBar.style.width = '100%'; } } - \ No newline at end of file + diff --git a/app/View/Elements/healthElements/files.ctp b/app/View/Elements/healthElements/files.ctp index 280f3e2b7..79ca92d0a 100644 --- a/app/View/Elements/healthElements/files.ctp +++ b/app/View/Elements/healthElements/files.ctp @@ -94,4 +94,4 @@ endforeach; ?> - \ No newline at end of file + diff --git a/app/View/Elements/healthElements/overview.ctp b/app/View/Elements/healthElements/overview.ctp index 527690b64..36c5e21a8 100644 --- a/app/View/Elements/healthElements/overview.ctp +++ b/app/View/Elements/healthElements/overview.ctp @@ -34,4 +34,4 @@ issues detected. Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies. - \ No newline at end of file + diff --git a/app/View/Elements/healthElements/settings_row.ctp b/app/View/Elements/healthElements/settings_row.ctp index 2a7116946..75d1d07bc 100644 --- a/app/View/Elements/healthElements/settings_row.ctp +++ b/app/View/Elements/healthElements/settings_row.ctp @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/app/View/Elements/healthElements/settings_tab.ctp b/app/View/Elements/healthElements/settings_tab.ctp index 8178f58fd..55e74e728 100644 --- a/app/View/Elements/healthElements/settings_tab.ctp +++ b/app/View/Elements/healthElements/settings_tab.ctp @@ -53,4 +53,4 @@ $(document).ready(function() { $('.subGroup_general').show(); }); - \ No newline at end of file + diff --git a/app/View/Elements/healthElements/tabs.ctp b/app/View/Elements/healthElements/tabs.ctp index 264282eaf..241fd14cb 100644 --- a/app/View/Elements/healthElements/tabs.ctp +++ b/app/View/Elements/healthElements/tabs.ctp @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/app/View/Elements/histogram.ctp b/app/View/Elements/histogram.ctp index 77d1226cd..58359cca6 100644 --- a/app/View/Elements/histogram.ctp +++ b/app/View/Elements/histogram.ctp @@ -35,4 +35,4 @@ ?> - \ No newline at end of file + diff --git a/app/View/Elements/img.ctp b/app/View/Elements/img.ctp index f991a08ac..df3941f7b 100644 --- a/app/View/Elements/img.ctp +++ b/app/View/Elements/img.ctp @@ -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)); -} \ No newline at end of file +} diff --git a/app/View/Elements/serverRuleElements/pull.ctp b/app/View/Elements/serverRuleElements/pull.ctp index a88dacd5e..70d225520 100644 --- a/app/View/Elements/serverRuleElements/pull.ctp +++ b/app/View/Elements/serverRuleElements/pull.ctp @@ -70,4 +70,4 @@ - \ No newline at end of file + diff --git a/app/View/Elements/serverRuleElements/push.ctp b/app/View/Elements/serverRuleElements/push.ctp index 6ac582c02..a5ec7ea13 100644 --- a/app/View/Elements/serverRuleElements/push.ctp +++ b/app/View/Elements/serverRuleElements/push.ctp @@ -74,4 +74,4 @@ - \ No newline at end of file + diff --git a/app/View/Elements/templateElements/populateTemplateAttribute.ctp b/app/View/Elements/templateElements/populateTemplateAttribute.ctp index 2122eeea9..7cba53776 100644 --- a/app/View/Elements/templateElements/populateTemplateAttribute.ctp +++ b/app/View/Elements/templateElements/populateTemplateAttribute.ctp @@ -68,4 +68,4 @@ - \ No newline at end of file + diff --git a/app/View/Elements/templateElements/populateTemplateDescription.ctp b/app/View/Elements/templateElements/populateTemplateDescription.ctp index 933eb3955..f07e899db 100644 --- a/app/View/Elements/templateElements/populateTemplateDescription.ctp +++ b/app/View/Elements/templateElements/populateTemplateDescription.ctp @@ -19,4 +19,4 @@ } ?> - \ No newline at end of file + diff --git a/app/View/Elements/templateElements/populateTemplateFile.ctp b/app/View/Elements/templateElements/populateTemplateFile.ctp index cae6a19a7..dde8bb844 100644 --- a/app/View/Elements/templateElements/populateTemplateFile.ctp +++ b/app/View/Elements/templateElements/populateTemplateFile.ctp @@ -25,4 +25,4 @@ var i_ = 0; var element_id_ = ; var batch_ = ""; - \ No newline at end of file + diff --git a/app/View/Elements/templateElements/populateTemplateText.ctp b/app/View/Elements/templateElements/populateTemplateText.ctp index 0075bb933..ab8a61f83 100644 --- a/app/View/Elements/templateElements/populateTemplateText.ctp +++ b/app/View/Elements/templateElements/populateTemplateText.ctp @@ -6,4 +6,4 @@

- \ No newline at end of file + diff --git a/app/View/Emails/html/default.ctp b/app/View/Emails/html/default.ctp index 0eb7f57c9..98e2298e9 100644 --- a/app/View/Emails/html/default.ctp +++ b/app/View/Emails/html/default.ctp @@ -22,4 +22,4 @@ $content = explode("\n", $content); foreach ($content as $line): echo '

' . $line . "

\n"; endforeach; -?> \ No newline at end of file +?> diff --git a/app/View/Emails/text/body.ctp b/app/View/Emails/text/body.ctp index 9a6d26343..cbcc2eae4 100644 --- a/app/View/Emails/text/body.ctp +++ b/app/View/Emails/text/body.ctp @@ -1 +1 @@ - \ No newline at end of file + diff --git a/app/View/Emails/text/default.ctp b/app/View/Emails/text/default.ctp index 56be8c13a..5ad64ce3d 100644 --- a/app/View/Emails/text/default.ctp +++ b/app/View/Emails/text/default.ctp @@ -16,4 +16,4 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> - \ No newline at end of file + diff --git a/app/View/Emails/text/new_event.ctp b/app/View/Emails/text/new_event.ctp index 7f966f1a3..021919a5a 100644 --- a/app/View/Emails/text/new_event.ctp +++ b/app/View/Emails/text/new_event.ctp @@ -14,4 +14,4 @@ Attributes : Extra info : - 0): echo $this->element('exception_stack_trace'); endif; -endif; \ No newline at end of file +endif; diff --git a/app/View/Errors/error403.ctp b/app/View/Errors/error403.ctp index 95faf2076..650071d20 100644 --- a/app/View/Errors/error403.ctp +++ b/app/View/Errors/error403.ctp @@ -2,4 +2,4 @@

: -

\ No newline at end of file +

diff --git a/app/View/Errors/missing_connection.ctp b/app/View/Errors/missing_connection.ctp index a60c99f42..abf0c3d98 100644 --- a/app/View/Errors/missing_connection.ctp +++ b/app/View/Errors/missing_connection.ctp @@ -7,4 +7,4 @@ Missing Database Connection 0 ): echo $this->element('exception_stack_trace'); -endif; \ No newline at end of file +endif; diff --git a/app/View/Errors/missing_datasource_config.ctp b/app/View/Errors/missing_datasource_config.ctp index a60c99f42..abf0c3d98 100644 --- a/app/View/Errors/missing_datasource_config.ctp +++ b/app/View/Errors/missing_datasource_config.ctp @@ -7,4 +7,4 @@ Missing Database Connection 0 ): echo $this->element('exception_stack_trace'); -endif; \ No newline at end of file +endif; diff --git a/app/View/Errors/pdo_error.ctp b/app/View/Errors/pdo_error.ctp index 853bc7c21..55b25f677 100644 --- a/app/View/Errors/pdo_error.ctp +++ b/app/View/Errors/pdo_error.ctp @@ -7,4 +7,4 @@ PDO error 0 ): echo $this->element('exception_stack_trace'); -endif; \ No newline at end of file +endif; diff --git a/app/View/EventBlacklists/index.ctp b/app/View/EventBlacklists/index.ctp index 4b1600460..9cf8fd2de 100644 --- a/app/View/EventBlacklists/index.ctp +++ b/app/View/EventBlacklists/index.ctp @@ -61,4 +61,4 @@ endforeach; ?> element('side_menu', array('menuList' => 'admin', 'menuItem' => 'eventBlacklists')); -?> \ No newline at end of file +?> diff --git a/app/View/EventDelegations/ajax/accept_delegation.ctp b/app/View/EventDelegations/ajax/accept_delegation.ctp index 4ac33506c..6202b650c 100644 --- a/app/View/EventDelegations/ajax/accept_delegation.ctp +++ b/app/View/EventDelegations/ajax/accept_delegation.ctp @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/app/View/EventDelegations/ajax/delete_delegation.ctp b/app/View/EventDelegations/ajax/delete_delegation.ctp index a430ca15c..dbc8adc20 100644 --- a/app/View/EventDelegations/ajax/delete_delegation.ctp +++ b/app/View/EventDelegations/ajax/delete_delegation.ctp @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/app/View/EventDelegations/ajax/view.ctp b/app/View/EventDelegations/ajax/view.ctp index 894eaf55c..0190ef9f6 100644 --- a/app/View/EventDelegations/ajax/view.ctp +++ b/app/View/EventDelegations/ajax/view.ctp @@ -23,4 +23,4 @@ $requester = $me['org_id'] == $delegation['RequesterOrg']['id'] ? 'Your organisa Discard Cancel - \ No newline at end of file + diff --git a/app/View/Events/add_i_o_c.ctp b/app/View/Events/add_i_o_c.ctp index c3c2ccf51..e3aa08f50 100644 --- a/app/View/Events/add_i_o_c.ctp +++ b/app/View/Events/add_i_o_c.ctp @@ -19,4 +19,4 @@ echo $this->Form->end(); $event['Event']['id'] = $id; $event['Event']['published'] = $published; echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addIOC', 'event' => $event)); -?> \ No newline at end of file +?> diff --git a/app/View/Events/add_misp_export_result.ctp b/app/View/Events/add_misp_export_result.ctp index 23005b50d..f33e5ddce 100644 --- a/app/View/Events/add_misp_export_result.ctp +++ b/app/View/Events/add_misp_export_result.ctp @@ -43,4 +43,4 @@ element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'addMISPExport')); -?> \ No newline at end of file +?> diff --git a/app/View/Events/ajax/ajaxTags.ctp b/app/View/Events/ajax/ajaxTags.ctp index d53272dc5..0a12b3b90 100644 --- a/app/View/Events/ajax/ajaxTags.ctp +++ b/app/View/Events/ajax/ajaxTags.ctp @@ -1,4 +1,4 @@ element('ajaxTags', array('event' => $event, 'tags' => $tags, 'tagAccess' => ($isSiteAdmin || $mayModify || $me['org_id'] == $event['Event']['org_id']))); -?> \ No newline at end of file +?> diff --git a/app/View/Events/ajax/enrichmentChoice.ctp b/app/View/Events/ajax/enrichmentChoice.ctp index bb24620f5..b426cd2a8 100644 --- a/app/View/Events/ajax/enrichmentChoice.ctp +++ b/app/View/Events/ajax/enrichmentChoice.ctp @@ -17,4 +17,4 @@ $(window).resize(function() { resizePopoverBody(); }); - \ No newline at end of file + diff --git a/app/View/Events/ajax/eventPublishConfirmationForm.ctp b/app/View/Events/ajax/eventPublishConfirmationForm.ctp index 5c9ac6b44..dca73b00c 100644 --- a/app/View/Events/ajax/eventPublishConfirmationForm.ctp +++ b/app/View/Events/ajax/eventPublishConfirmationForm.ctp @@ -27,4 +27,4 @@ if ($type == 'publish') $extraTitle = ' (no email)'; Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/Events/ajax/exportChoice.ctp b/app/View/Events/ajax/exportChoice.ctp index f2342b9a3..9c7d7b464 100644 --- a/app/View/Events/ajax/exportChoice.ctp +++ b/app/View/Events/ajax/exportChoice.ctp @@ -29,4 +29,4 @@ $(window).resize(function() { resizePopoverBody(); }); - \ No newline at end of file + diff --git a/app/View/Events/csv.ctp b/app/View/Events/csv.ctp index 07e623745..b29065347 100644 --- a/app/View/Events/csv.ctp +++ b/app/View/Events/csv.ctp @@ -10,4 +10,4 @@ foreach ($final as $line) { echo $line; echo PHP_EOL; - } \ No newline at end of file + } diff --git a/app/View/Events/download_open_i_o_c_event.ctp b/app/View/Events/download_open_i_o_c_event.ctp index 83fc31239..d3d382825 100644 --- a/app/View/Events/download_open_i_o_c_event.ctp +++ b/app/View/Events/download_open_i_o_c_event.ctp @@ -2,4 +2,4 @@ foreach ($final as $line) { echo $line . PHP_EOL; } -?> \ No newline at end of file +?> diff --git a/app/View/Events/edit.ctp b/app/View/Events/edit.ctp index d76850230..f7614fbce 100644 --- a/app/View/Events/edit.ctp +++ b/app/View/Events/edit.ctp @@ -117,4 +117,4 @@ $(document).ready(function() { }); -Js->writeBuffer(); \ No newline at end of file +Js->writeBuffer(); diff --git a/app/View/Events/export_alternate.ctp b/app/View/Events/export_alternate.ctp index 1b8ade84e..735d28048 100644 --- a/app/View/Events/export_alternate.ctp +++ b/app/View/Events/export_alternate.ctp @@ -86,4 +86,4 @@
  • Automation
    • - \ No newline at end of file + diff --git a/app/View/Events/filter_event_index.ctp b/app/View/Events/filter_event_index.ctp index fc165d4c5..cc8b49f6a 100644 --- a/app/View/Events/filter_event_index.ctp +++ b/app/View/Events/filter_event_index.ctp @@ -223,4 +223,4 @@ $(document).ready(function() { }); -Js->writeBuffer(); \ No newline at end of file +Js->writeBuffer(); diff --git a/app/View/Events/free_text_import.ctp b/app/View/Events/free_text_import.ctp index 1998eccd6..cfa7da7c1 100644 --- a/app/View/Events/free_text_import.ctp +++ b/app/View/Events/free_text_import.ctp @@ -47,4 +47,4 @@ $(document).ready(function() { }); }); -Js->writeBuffer(); // Write cached scripts \ No newline at end of file +Js->writeBuffer(); // Write cached scripts diff --git a/app/View/Events/hids.ctp b/app/View/Events/hids.ctp index 34a2e7591..439c0bed6 100644 --- a/app/View/Events/hids.ctp +++ b/app/View/Events/hids.ctp @@ -9,4 +9,4 @@ } else { echo "No exportable " . $type . "s found. " . PHP_EOL; } -?> \ No newline at end of file +?> diff --git a/app/View/Events/json/filter_event_ids_for_push.ctp b/app/View/Events/json/filter_event_ids_for_push.ctp index 865f4b21e..f3ed49f9c 100644 --- a/app/View/Events/json/filter_event_ids_for_push.ctp +++ b/app/View/Events/json/filter_event_ids_for_push.ctp @@ -1,2 +1,2 @@ $event) { unset($events[$key]['Orgc']); } } -echo json_encode($events); \ No newline at end of file +echo json_encode($events); diff --git a/app/View/Events/json/stix.ctp b/app/View/Events/json/stix.ctp index 3d470f7fb..9e0ef9858 100644 --- a/app/View/Events/json/stix.ctp +++ b/app/View/Events/json/stix.ctp @@ -1,2 +1,2 @@ event2JSON($event); \ No newline at end of file +echo $converter->event2JSON($event); diff --git a/app/View/Events/nids.ctp b/app/View/Events/nids.ctp index e99ba1157..f51607df4 100644 --- a/app/View/Events/nids.ctp +++ b/app/View/Events/nids.ctp @@ -5,4 +5,4 @@ echo $rule . PHP_EOL; } echo "# " . PHP_EOL; -?> \ No newline at end of file +?> diff --git a/app/View/Events/proposal_event_index.ctp b/app/View/Events/proposal_event_index.ctp index 1bd89a773..08de06a7d 100644 --- a/app/View/Events/proposal_event_index.ctp +++ b/app/View/Events/proposal_event_index.ctp @@ -103,4 +103,4 @@ element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'viewProposalIndex')); -?> \ No newline at end of file +?> diff --git a/app/View/Events/report_validation_issues_events.ctp b/app/View/Events/report_validation_issues_events.ctp index 36d14ecfa..b88273673 100644 --- a/app/View/Events/report_validation_issues_events.ctp +++ b/app/View/Events/report_validation_issues_events.ctp @@ -15,4 +15,4 @@ element('side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools')); -?> \ No newline at end of file +?> diff --git a/app/View/Events/show_i_o_c_results.ctp b/app/View/Events/show_i_o_c_results.ctp index 632aa500f..38538c4f3 100644 --- a/app/View/Events/show_i_o_c_results.ctp +++ b/app/View/Events/show_i_o_c_results.ctp @@ -56,4 +56,4 @@ endforeach; ?> $event['Event']['id'] = $eventId; $event['Event']['published'] = 0; echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addIOC', 'event' => $event)); -?> \ No newline at end of file +?> diff --git a/app/View/Events/stix.ctp b/app/View/Events/stix.ctp index 3d470f7fb..9e0ef9858 100644 --- a/app/View/Events/stix.ctp +++ b/app/View/Events/stix.ctp @@ -1,2 +1,2 @@ else:?>

    Succes, all done.

    - \ No newline at end of file + diff --git a/app/View/Events/view_graph.ctp b/app/View/Events/view_graph.ctp index b1559390f..41838eb1b 100644 --- a/app/View/Events/view_graph.ctp +++ b/app/View/Events/view_graph.ctp @@ -331,4 +331,4 @@ function dragend(d, i) { tick(); force.resume(); } - \ No newline at end of file + diff --git a/app/View/Events/xml/stix.ctp b/app/View/Events/xml/stix.ctp index 3d470f7fb..9e0ef9858 100644 --- a/app/View/Events/xml/stix.ctp +++ b/app/View/Events/xml/stix.ctp @@ -1,2 +1,2 @@ Form->create('FavouriteTag', array('id' => 'FavouriteTagIndexForm', 'url' => '/favourite_tags/toggle')); echo $this->Form->input('data', array('label' => false, 'style' => 'display:none;')); echo $this->Form->end(); -?> \ No newline at end of file +?> diff --git a/app/View/Feeds/add.ctp b/app/View/Feeds/add.ctp index 675acd748..3e1ad0f29 100644 --- a/app/View/Feeds/add.ctp +++ b/app/View/Feeds/add.ctp @@ -92,4 +92,4 @@ $(document).ready(function() { feedDistributionChange(); }); }); - \ No newline at end of file + diff --git a/app/View/Feeds/edit.ctp b/app/View/Feeds/edit.ctp index 2cbce7b15..7331d43ac 100644 --- a/app/View/Feeds/edit.ctp +++ b/app/View/Feeds/edit.ctp @@ -91,4 +91,4 @@ $(document).ready(function() { feedDistributionChange(); }); }); - \ No newline at end of file + diff --git a/app/View/Helper/CommandHelper.php b/app/View/Helper/CommandHelper.php index 6f2e3cb8b..504a782bd 100644 --- a/app/View/Helper/CommandHelper.php +++ b/app/View/Helper/CommandHelper.php @@ -29,4 +29,4 @@ App::uses('AppHelper', 'View/Helper'); return $string; } } -?> \ No newline at end of file +?> diff --git a/app/View/Helper/HighlightHelper.php b/app/View/Helper/HighlightHelper.php index 7a7b97bb8..db1351ba2 100644 --- a/app/View/Helper/HighlightHelper.php +++ b/app/View/Helper/HighlightHelper.php @@ -38,4 +38,4 @@ App::uses('AppHelper', 'View/Helper'); } } -?> \ No newline at end of file +?> diff --git a/app/View/Helper/TextColourHelper.php b/app/View/Helper/TextColourHelper.php index 7dbb0c3ba..d52a0a23e 100644 --- a/app/View/Helper/TextColourHelper.php +++ b/app/View/Helper/TextColourHelper.php @@ -17,4 +17,4 @@ App::uses('AppHelper', 'View/Helper'); } } } -?> \ No newline at end of file +?> diff --git a/app/View/Helper/UtilityHelper.php b/app/View/Helper/UtilityHelper.php index cf61acc94..fbcdc3a4d 100644 --- a/app/View/Helper/UtilityHelper.php +++ b/app/View/Helper/UtilityHelper.php @@ -8,4 +8,4 @@ App::uses('AppHelper', 'View/Helper'); return $string; } } -?> \ No newline at end of file +?> diff --git a/app/View/Helper/XmlOutputHelper.php b/app/View/Helper/XmlOutputHelper.php index 43d4aebef..05fce5b71 100644 --- a/app/View/Helper/XmlOutputHelper.php +++ b/app/View/Helper/XmlOutputHelper.php @@ -22,4 +22,4 @@ App::uses('AppHelper', 'View/Helper'); } } } -?> \ No newline at end of file +?> diff --git a/app/View/Layouts/Emails/html/default.ctp b/app/View/Layouts/Emails/html/default.ctp index b1a551b19..59fcb3104 100644 --- a/app/View/Layouts/Emails/html/default.ctp +++ b/app/View/Layouts/Emails/html/default.ctp @@ -25,4 +25,4 @@ fetch('content');?> - \ No newline at end of file + diff --git a/app/View/Layouts/Emails/text/default.ctp b/app/View/Layouts/Emails/text/default.ctp index def85befa..07b30eecf 100644 --- a/app/View/Layouts/Emails/text/default.ctp +++ b/app/View/Layouts/Emails/text/default.ctp @@ -16,4 +16,4 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -fetch('content');?> \ No newline at end of file +fetch('content');?> diff --git a/app/View/Layouts/ajax.ctp b/app/View/Layouts/ajax.ctp index 6a864838a..0d7187cb0 100644 --- a/app/View/Layouts/ajax.ctp +++ b/app/View/Layouts/ajax.ctp @@ -19,4 +19,4 @@ Html->css('bootstrap'); //echo $this->Html->css('main'); -echo $content_for_layout; ?> \ No newline at end of file +echo $content_for_layout; ?> diff --git a/app/View/Layouts/ajaxTemplate.ctp b/app/View/Layouts/ajaxTemplate.ctp index 323e56eb6..e3b0c4942 100644 --- a/app/View/Layouts/ajaxTemplate.ctp +++ b/app/View/Layouts/ajaxTemplate.ctp @@ -22,4 +22,4 @@ echo $this->Html->css('jquery-ui-1.10.4.min'); //echo $this->Html->css('bootstrap'); //echo $this->Html->css('main'); echo $this->Html->script('jquery-ui-1.10.4.min'); -echo $content_for_layout; ?> \ No newline at end of file +echo $content_for_layout; ?> diff --git a/app/View/Layouts/flash.ctp b/app/View/Layouts/flash.ctp index a6fd50258..b1c8b58b8 100644 --- a/app/View/Layouts/flash.ctp +++ b/app/View/Layouts/flash.ctp @@ -34,4 +34,4 @@ A:HOVER { text-decoration: underline; color:#44E }

    - \ No newline at end of file + diff --git a/app/View/Layouts/iframe.ctp b/app/View/Layouts/iframe.ctp index e68b8b97b..55df9dbfb 100644 --- a/app/View/Layouts/iframe.ctp +++ b/app/View/Layouts/iframe.ctp @@ -21,4 +21,4 @@ echo $this->Html->css('bootstrap'); echo $this->Html->css('main'); echo $this->Html->script('jquery-2.1.0.min'); echo $this->Html->script('misp' . $jsVersion); -echo $content_for_layout; ?> \ No newline at end of file +echo $content_for_layout; ?> diff --git a/app/View/Layouts/text/default.ctp b/app/View/Layouts/text/default.ctp index 3f290130e..27f20316b 100644 --- a/app/View/Layouts/text/default.ctp +++ b/app/View/Layouts/text/default.ctp @@ -1 +1 @@ - \ No newline at end of file + diff --git a/app/View/Logs/admin_index.ctp b/app/View/Logs/admin_index.ctp index e87199370..f1d2d92d5 100644 --- a/app/View/Logs/admin_index.ctp +++ b/app/View/Logs/admin_index.ctp @@ -121,4 +121,4 @@ $class = 'index'; } echo $this->element('side_menu', array('menuList' => 'logs', 'menuItem' => $class)); -?> \ No newline at end of file +?> diff --git a/app/View/OrgBlacklists/index.ctp b/app/View/OrgBlacklists/index.ctp index fdd97ecbe..c0babaece 100644 --- a/app/View/OrgBlacklists/index.ctp +++ b/app/View/OrgBlacklists/index.ctp @@ -59,4 +59,4 @@ endforeach; ?> element('side_menu', array('menuList' => 'admin', 'menuItem' => 'orgBlacklists')); -?> \ No newline at end of file +?> diff --git a/app/View/Organisations/ajax/fetch_orgs_for_sg.ctp b/app/View/Organisations/ajax/fetch_orgs_for_sg.ctp index 09a72d76b..c6b2c8945 100644 --- a/app/View/Organisations/ajax/fetch_orgs_for_sg.ctp +++ b/app/View/Organisations/ajax/fetch_orgs_for_sg.ctp @@ -37,4 +37,4 @@ $("#btnRight").click(function () { var selectedItem = $("#leftValues option:selected"); $("#rightValues").append(selectedItem); }); - \ No newline at end of file + diff --git a/app/View/Organisations/ajax/merge.ctp b/app/View/Organisations/ajax/merge.ctp index 521f21595..559fb84d9 100644 --- a/app/View/Organisations/ajax/merge.ctp +++ b/app/View/Organisations/ajax/merge.ctp @@ -79,4 +79,4 @@ $(document).ready(function() { }); -Js->writeBuffer(); \ No newline at end of file +Js->writeBuffer(); diff --git a/app/View/Organisations/view.ctp b/app/View/Organisations/view.ctp index 6d8ee39cf..4c1edcb96 100644 --- a/app/View/Organisations/view.ctp +++ b/app/View/Organisations/view.ctp @@ -91,4 +91,4 @@ $(document).ready(function () { organisationViewContent('', ''); }); - \ No newline at end of file + diff --git a/app/View/Pages/doc/concepts.ctp b/app/View/Pages/doc/concepts.ctp index 86f9e9032..3952acff9 100644 --- a/app/View/Pages/doc/concepts.ctp +++ b/app/View/Pages/doc/concepts.ctp @@ -42,4 +42,4 @@ What we call synchronisation is an exchange of data between two (or more) MISP i Users with tagging rights can assigned various dynamically created tags to events, allowing an arbitrary link between events to be created. It is possible to filter events based on these tags and they can also be used to filter events for the automation.

    Templating

    Users with templating rights can create easy to fill forms that help with the event creation process. - \ No newline at end of file + diff --git a/app/View/Pages/doc/using_the_system.ctp b/app/View/Pages/doc/using_the_system.ctp index 07f2eab38..8171002d4 100644 --- a/app/View/Pages/doc/using_the_system.ctp +++ b/app/View/Pages/doc/using_the_system.ctp @@ -619,4 +619,4 @@ Content-Type: application/xml <url>/The_meaning_of_life</url> </response> - \ No newline at end of file + diff --git a/app/View/Posts/edit.ctp b/app/View/Posts/edit.ctp index accfe684f..dd8f59b4c 100644 --- a/app/View/Posts/edit.ctp +++ b/app/View/Posts/edit.ctp @@ -22,4 +22,4 @@ echo $this->Form->end(); element('side_menu', array('menuList' => 'threads', 'menuItem' => 'edit')); -?> \ No newline at end of file +?> diff --git a/app/View/Roles/admin_add.ctp b/app/View/Roles/admin_add.ctp index bb7edb395..6596c0909 100644 --- a/app/View/Roles/admin_add.ctp +++ b/app/View/Roles/admin_add.ctp @@ -66,4 +66,4 @@ function checkPerms(id) { } } -Js->writeBuffer(); \ No newline at end of file +Js->writeBuffer(); diff --git a/app/View/Roles/admin_edit.ctp b/app/View/Roles/admin_edit.ctp index 93dd6650c..b1c625999 100644 --- a/app/View/Roles/admin_edit.ctp +++ b/app/View/Roles/admin_edit.ctp @@ -67,4 +67,4 @@ function checkPerms(id) { } } -Js->writeBuffer(); \ No newline at end of file +Js->writeBuffer(); diff --git a/app/View/Roles/admin_index.ctp b/app/View/Roles/admin_index.ctp index bfc57d933..fe30482f7 100644 --- a/app/View/Roles/admin_index.ctp +++ b/app/View/Roles/admin_index.ctp @@ -65,4 +65,4 @@ endforeach; ?> element('side_menu', array('menuList' => 'admin', 'menuItem' => 'indexRole')); -?> \ No newline at end of file +?> diff --git a/app/View/Roles/index.ctp b/app/View/Roles/index.ctp index 65760887e..7d57f3f3f 100644 --- a/app/View/Roles/index.ctp +++ b/app/View/Roles/index.ctp @@ -59,4 +59,4 @@ endforeach; ?> element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'roles')); -?> \ No newline at end of file +?> diff --git a/app/View/Roles/view.ctp b/app/View/Roles/view.ctp index ada8c6afd..af008c4d8 100644 --- a/app/View/Roles/view.ctp +++ b/app/View/Roles/view.ctp @@ -41,4 +41,4 @@ element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'roles')); -?> \ No newline at end of file +?> diff --git a/app/View/Servers/ajax/fetch_servers_for_sg.ctp b/app/View/Servers/ajax/fetch_servers_for_sg.ctp index 1b9256f59..8195fcfca 100644 --- a/app/View/Servers/ajax/fetch_servers_for_sg.ctp +++ b/app/View/Servers/ajax/fetch_servers_for_sg.ctp @@ -37,4 +37,4 @@ $("#btnRight").click(function () { var selectedItem = $("#leftValues option:selected"); $("#rightValues").append(selectedItem); }); - \ No newline at end of file + diff --git a/app/View/Servers/ajax/zeromqstatus.ctp b/app/View/Servers/ajax/zeromqstatus.ctp index 811aea231..e86764d30 100644 --- a/app/View/Servers/ajax/zeromqstatus.ctp +++ b/app/View/Servers/ajax/zeromqstatus.ctp @@ -10,4 +10,4 @@ OK - \ No newline at end of file + diff --git a/app/View/Servers/filter_event_index.ctp b/app/View/Servers/filter_event_index.ctp index 035c73259..a9270fa24 100644 --- a/app/View/Servers/filter_event_index.ctp +++ b/app/View/Servers/filter_event_index.ctp @@ -35,4 +35,4 @@ $(document).ready(function() { }); -Js->writeBuffer(); \ No newline at end of file +Js->writeBuffer(); diff --git a/app/View/Servers/json/simple.ctp b/app/View/Servers/json/simple.ctp index 5a9d76ca7..4ad4d47b8 100644 --- a/app/View/Servers/json/simple.ctp +++ b/app/View/Servers/json/simple.ctp @@ -1,2 +1,2 @@ Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/ShadowAttributes/ajax/attributeEditTo_idsForm.ctp b/app/View/ShadowAttributes/ajax/attributeEditTo_idsForm.ctp index 61df5f0c7..69549fdf9 100644 --- a/app/View/ShadowAttributes/ajax/attributeEditTo_idsForm.ctp +++ b/app/View/ShadowAttributes/ajax/attributeEditTo_idsForm.ctp @@ -17,4 +17,4 @@ )); echo $this->Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/ShadowAttributes/ajax/attributeEditTypeForm.ctp b/app/View/ShadowAttributes/ajax/attributeEditTypeForm.ctp index 7f3fc989f..2abd55f50 100644 --- a/app/View/ShadowAttributes/ajax/attributeEditTypeForm.ctp +++ b/app/View/ShadowAttributes/ajax/attributeEditTypeForm.ctp @@ -16,4 +16,4 @@ )); echo $this->Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp b/app/View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp index ebb962834..0cab58387 100644 --- a/app/View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp +++ b/app/View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp @@ -21,4 +21,4 @@ Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp b/app/View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp index 80a0a2051..6f3570106 100644 --- a/app/View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp +++ b/app/View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp @@ -21,4 +21,4 @@ echo $this->Form->create('ShadowAttribute', array('style' => 'margin:0px;', 'id' Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/ShadowAttributes/edit.ctp b/app/View/ShadowAttributes/edit.ctp index 2465ddb42..4c33fb9e1 100644 --- a/app/View/ShadowAttributes/edit.ctp +++ b/app/View/ShadowAttributes/edit.ctp @@ -183,4 +183,4 @@ formCategoryChanged("#ShadowAttributeCategory"); $('#ShadowAttributeType').val(type_value); -Js->writeBuffer(); // Write cached scripts \ No newline at end of file +Js->writeBuffer(); // Write cached scripts diff --git a/app/View/ShadowAttributes/json/get_proposals_by_uuid_list.ctp b/app/View/ShadowAttributes/json/get_proposals_by_uuid_list.ctp index 084ce2689..827a61b92 100644 --- a/app/View/ShadowAttributes/json/get_proposals_by_uuid_list.ctp +++ b/app/View/ShadowAttributes/json/get_proposals_by_uuid_list.ctp @@ -14,4 +14,4 @@ foreach ($result as &$temp) { } $temp = array('ShadowAttribute' => $temp['ShadowAttribute']); } -echo json_encode($result); \ No newline at end of file +echo json_encode($result); diff --git a/app/View/SharingGroups/view.ctp b/app/View/SharingGroups/view.ctp index 04154400a..cf65d686c 100644 --- a/app/View/SharingGroups/view.ctp +++ b/app/View/SharingGroups/view.ctp @@ -79,4 +79,4 @@ element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'viewSG')); -?> \ No newline at end of file +?> diff --git a/app/View/Sightings/ajax/like_button.ctp b/app/View/Sightings/ajax/like_button.ctp index 97c6f7fa2..a669ad586 100644 --- a/app/View/Sightings/ajax/like_button.ctp +++ b/app/View/Sightings/ajax/like_button.ctp @@ -1,4 +1,4 @@ Form->create('Sighting', array('id' => 'Sighting_' . $id, 'url' => '/sightings/add/' . $id, 'style' => 'display:none;')); echo $this->Form->end(); -?> \ No newline at end of file +?> diff --git a/app/View/Tags/add.ctp b/app/View/Tags/add.ctp index e995d0a29..66ade96c5 100644 --- a/app/View/Tags/add.ctp +++ b/app/View/Tags/add.ctp @@ -26,4 +26,4 @@ echo $this->Form->end(); $(function(){ $('#TagColour').colorpicker(); }); - \ No newline at end of file + diff --git a/app/View/Tags/ajax/select_tag.ctp b/app/View/Tags/ajax/select_tag.ctp index 93d947a67..f907947e5 100644 --- a/app/View/Tags/ajax/select_tag.ctp +++ b/app/View/Tags/ajax/select_tag.ctp @@ -29,4 +29,4 @@ $(window).resize(function() { resizePopoverBody(); }); - \ No newline at end of file + diff --git a/app/View/Tags/ajax/taxonomy_choice.ctp b/app/View/Tags/ajax/taxonomy_choice.ctp index 29d9aea86..2e9d650d4 100644 --- a/app/View/Tags/ajax/taxonomy_choice.ctp +++ b/app/View/Tags/ajax/taxonomy_choice.ctp @@ -27,4 +27,4 @@ $(window).resize(function() { resizePopoverBody(); }); - \ No newline at end of file + diff --git a/app/View/Tags/edit.ctp b/app/View/Tags/edit.ctp index 71ccdc086..99ba081c1 100644 --- a/app/View/Tags/edit.ctp +++ b/app/View/Tags/edit.ctp @@ -26,4 +26,4 @@ echo $this->Form->end(); $(function(){ $('#TagColour').colorpicker(); }); - \ No newline at end of file + diff --git a/app/View/Tags/index.ctp b/app/View/Tags/index.ctp index f10d6642b..5eeab07d1 100644 --- a/app/View/Tags/index.ctp +++ b/app/View/Tags/index.ctp @@ -82,4 +82,4 @@ endforeach; ?> element('side_menu', array('menuList' => 'tags', 'menuItem' => $menuItem)); -?> \ No newline at end of file +?> diff --git a/app/View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp b/app/View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp index aaf763e8f..dc8d9563b 100644 --- a/app/View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp +++ b/app/View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp @@ -34,4 +34,4 @@ Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/Taxonomies/index.ctp b/app/View/Taxonomies/index.ctp index 8680d578f..848ef1a42 100644 --- a/app/View/Taxonomies/index.ctp +++ b/app/View/Taxonomies/index.ctp @@ -68,4 +68,4 @@ endforeach; ?> element('side_menu', array('menuList' => 'taxonomies', 'menuItem' => 'index')); -?> \ No newline at end of file +?> diff --git a/app/View/TemplateElements/ajax/ajaxIndex.ctp b/app/View/TemplateElements/ajax/ajaxIndex.ctp index 51ed917bd..0177f9fd0 100644 --- a/app/View/TemplateElements/ajax/ajaxIndex.ctp +++ b/app/View/TemplateElements/ajax/ajaxIndex.ctp @@ -35,4 +35,4 @@ $(function() { } }).disableSelection(); }); - \ No newline at end of file + diff --git a/app/View/TemplateElements/ajax/templateElementConfirmationForm.ctp b/app/View/TemplateElements/ajax/templateElementConfirmationForm.ctp index 80bddef8f..7f1303f98 100644 --- a/app/View/TemplateElements/ajax/templateElementConfirmationForm.ctp +++ b/app/View/TemplateElements/ajax/templateElementConfirmationForm.ctp @@ -21,4 +21,4 @@ Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/TemplateElements/ajax/template_element_add_attribute.ctp b/app/View/TemplateElements/ajax/template_element_add_attribute.ctp index 2c9dd0f69..58f8e9a5e 100644 --- a/app/View/TemplateElements/ajax/template_element_add_attribute.ctp +++ b/app/View/TemplateElements/ajax/template_element_add_attribute.ctp @@ -146,4 +146,4 @@ templateElementAttributeTypeChange(); }); - \ No newline at end of file + diff --git a/app/View/TemplateElements/ajax/template_element_add_choices.ctp b/app/View/TemplateElements/ajax/template_element_add_choices.ctp index fef4590b5..32d4764ed 100644 --- a/app/View/TemplateElements/ajax/template_element_add_choices.ctp +++ b/app/View/TemplateElements/ajax/template_element_add_choices.ctp @@ -4,4 +4,4 @@
    File
    Text
    Cancel
    - \ No newline at end of file + diff --git a/app/View/TemplateElements/ajax/template_element_add_file.ctp b/app/View/TemplateElements/ajax/template_element_add_file.ctp index 6abcf61db..2a6798ccf 100644 --- a/app/View/TemplateElements/ajax/template_element_add_file.ctp +++ b/app/View/TemplateElements/ajax/template_element_add_file.ctp @@ -101,4 +101,4 @@ var category = $("#TemplateElementFileCategory").val(); templateElementFileCategoryChange(category); }); - \ No newline at end of file + diff --git a/app/View/TemplateElements/ajax/template_element_add_text.ctp b/app/View/TemplateElements/ajax/template_element_add_text.ctp index fdc1040df..06c3a5f5c 100644 --- a/app/View/TemplateElements/ajax/template_element_add_text.ctp +++ b/app/View/TemplateElements/ajax/template_element_add_text.ctp @@ -43,4 +43,4 @@ \ No newline at end of file + diff --git a/app/View/TemplateElements/ajax/template_element_edit_attribute.ctp b/app/View/TemplateElements/ajax/template_element_edit_attribute.ctp index d7f293a21..52becec2f 100644 --- a/app/View/TemplateElements/ajax/template_element_edit_attribute.ctp +++ b/app/View/TemplateElements/ajax/template_element_edit_attribute.ctp @@ -145,4 +145,4 @@ templateElementAttributeTypeChange(); }); - \ No newline at end of file + diff --git a/app/View/TemplateElements/ajax/template_element_edit_file.ctp b/app/View/TemplateElements/ajax/template_element_edit_file.ctp index 55283bbe7..680a33525 100644 --- a/app/View/TemplateElements/ajax/template_element_edit_file.ctp +++ b/app/View/TemplateElements/ajax/template_element_edit_file.ctp @@ -101,4 +101,4 @@ var category = $("#TemplateElementFileCategory").val(); templateElementFileCategoryChange(category); }); - \ No newline at end of file + diff --git a/app/View/TemplateElements/ajax/template_element_edit_text.ctp b/app/View/TemplateElements/ajax/template_element_edit_text.ctp index 8ef456ef1..98ff08cd6 100644 --- a/app/View/TemplateElements/ajax/template_element_edit_text.ctp +++ b/app/View/TemplateElements/ajax/template_element_edit_text.ctp @@ -43,4 +43,4 @@ \ No newline at end of file + diff --git a/app/View/Templates/add.ctp b/app/View/Templates/add.ctp index ffc519bb5..c4dd00561 100644 --- a/app/View/Templates/add.ctp +++ b/app/View/Templates/add.ctp @@ -61,4 +61,4 @@ var allTags = [ ?> ]; -Js->writeBuffer(); \ No newline at end of file +Js->writeBuffer(); diff --git a/app/View/Templates/ajax/template_choices.ctp b/app/View/Templates/ajax/template_choices.ctp index 4bd07219e..e35b179ec 100644 --- a/app/View/Templates/ajax/template_choices.ctp +++ b/app/View/Templates/ajax/template_choices.ctp @@ -25,4 +25,4 @@ $(document).ready(function() { $(window).resize(function() { resizePopoverBody(); }); - \ No newline at end of file + diff --git a/app/View/Templates/edit.ctp b/app/View/Templates/edit.ctp index ca4b67f3f..7fcfa1fc4 100644 --- a/app/View/Templates/edit.ctp +++ b/app/View/Templates/edit.ctp @@ -73,4 +73,4 @@ $(document).ready( function () { } }); -Js->writeBuffer(); \ No newline at end of file +Js->writeBuffer(); diff --git a/app/View/Templates/index.ctp b/app/View/Templates/index.ctp index 24745b359..cc93a60a8 100644 --- a/app/View/Templates/index.ctp +++ b/app/View/Templates/index.ctp @@ -71,4 +71,4 @@ endforeach; ?> element('side_menu', array('menuList' => 'templates', 'menuItem' => 'index')); -?> \ No newline at end of file +?> diff --git a/app/View/Templates/populate_event_from_template.ctp b/app/View/Templates/populate_event_from_template.ctp index 888d29e8a..e1c358967 100644 --- a/app/View/Templates/populate_event_from_template.ctp +++ b/app/View/Templates/populate_event_from_template.ctp @@ -45,4 +45,4 @@ $(document).ready(function() { populateTemplateFileBubbles(); }); - \ No newline at end of file + diff --git a/app/View/Templates/template_file_upload.ctp b/app/View/Templates/template_file_upload.ctp index ddbe0e7e5..18bdceff5 100644 --- a/app/View/Templates/template_file_upload.ctp +++ b/app/View/Templates/template_file_upload.ctp @@ -1,4 +1,4 @@ Form->create('', array('type' => 'file')); echo $this->Form->end(); -?> \ No newline at end of file +?> diff --git a/app/View/Templates/upload_file.ctp b/app/View/Templates/upload_file.ctp index 675950397..7bb84a34d 100644 --- a/app/View/Templates/upload_file.ctp +++ b/app/View/Templates/upload_file.ctp @@ -28,4 +28,4 @@ $(document).ready(function() { }); - \ No newline at end of file + diff --git a/app/View/Templates/view.ctp b/app/View/Templates/view.ctp index bd0e1305c..6baee3491 100644 --- a/app/View/Templates/view.ctp +++ b/app/View/Templates/view.ctp @@ -53,4 +53,4 @@ $(document).ready( function () { updateIndex(, 'template'); }); - \ No newline at end of file + diff --git a/app/View/Threads/view.ctp b/app/View/Threads/view.ctp index d0630099e..b66935ee4 100644 --- a/app/View/Threads/view.ctp +++ b/app/View/Threads/view.ctp @@ -12,4 +12,4 @@ element('side_menu', array('menuList' => 'threads', 'menuItem' => 'view')); -?> \ No newline at end of file +?> diff --git a/app/View/Users/admin_filter_user_index.ctp b/app/View/Users/admin_filter_user_index.ctp index 07268253a..937a8ddf9 100644 --- a/app/View/Users/admin_filter_user_index.ctp +++ b/app/View/Users/admin_filter_user_index.ctp @@ -140,4 +140,4 @@ $(document).ready(function() { indexEvaluateFiltering(); }); -Js->writeBuffer(); \ No newline at end of file +Js->writeBuffer(); diff --git a/app/View/Users/ajax/fetchpgpkey.ctp b/app/View/Users/ajax/fetchpgpkey.ctp index 85341f7d4..6e508f8f5 100644 --- a/app/View/Users/ajax/fetchpgpkey.ctp +++ b/app/View/Users/ajax/fetchpgpkey.ctp @@ -26,4 +26,4 @@ $(window).resize(function() { resizePopoverBody(); }); - \ No newline at end of file + diff --git a/app/View/Users/ajax/passwordResetConfirmationForm.ctp b/app/View/Users/ajax/passwordResetConfirmationForm.ctp index b464cbb98..31bb2afe3 100644 --- a/app/View/Users/ajax/passwordResetConfirmationForm.ctp +++ b/app/View/Users/ajax/passwordResetConfirmationForm.ctp @@ -25,4 +25,4 @@ Form->end(); ?> - \ No newline at end of file + diff --git a/app/View/Users/check_and_correct_pgps.ctp b/app/View/Users/check_and_correct_pgps.ctp index d6f9df3f9..4b1aeaa8e 100644 --- a/app/View/Users/check_and_correct_pgps.ctp +++ b/app/View/Users/check_and_correct_pgps.ctp @@ -8,4 +8,4 @@ if (0 == count($fails)):?> - \ No newline at end of file + diff --git a/app/View/Users/histogram.ctp b/app/View/Users/histogram.ctp index 286f8caac..b87af7a69 100644 --- a/app/View/Users/histogram.ctp +++ b/app/View/Users/histogram.ctp @@ -1,2 +1,2 @@ element('histogram', array()); \ No newline at end of file + echo $this->element('histogram', array()); diff --git a/app/View/Users/login.ctp b/app/View/Users/login.ctp index 8cf904fe2..bdfc67589 100644 --- a/app/View/Users/login.ctp +++ b/app/View/Users/login.ctp @@ -53,4 +53,4 @@ - \ No newline at end of file + diff --git a/app/View/Users/memberslist.ctp b/app/View/Users/memberslist.ctp index ae9aeeaa3..e75a47929 100644 --- a/app/View/Users/memberslist.ctp +++ b/app/View/Users/memberslist.ctp @@ -32,4 +32,4 @@ endforeach; ?> $(document).ready(function () { updateHistogram(''); }); - \ No newline at end of file + diff --git a/app/View/Users/statistics.ctp b/app/View/Users/statistics.ctp index 9868c492e..5234e321c 100644 --- a/app/View/Users/statistics.ctp +++ b/app/View/Users/statistics.ctp @@ -125,4 +125,4 @@ if (preg_match('/(?i)msie [2-9]/',$_SERVER['HTTP_USER_AGENT']) && !strpos($_SERV element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'statistics')); -?> \ No newline at end of file +?> diff --git a/app/View/Users/terms.ctp b/app/View/Users/terms.ctp index 698ce5530..baf04fa15 100644 --- a/app/View/Users/terms.ctp +++ b/app/View/Users/terms.ctp @@ -31,4 +31,4 @@ element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'terms')); -?> \ No newline at end of file +?> diff --git a/app/View/Users/verify_g_p_g.ctp b/app/View/Users/verify_g_p_g.ctp index 2e76f72ff..dd8017063 100644 --- a/app/View/Users/verify_g_p_g.ctp +++ b/app/View/Users/verify_g_p_g.ctp @@ -15,4 +15,4 @@ element('side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools')); -?> \ No newline at end of file +?> diff --git a/app/View/Warninglists/ajax/getToggleField.ctp b/app/View/Warninglists/ajax/getToggleField.ctp index 3f7496cf7..e1265f805 100644 --- a/app/View/Warninglists/ajax/getToggleField.ctp +++ b/app/View/Warninglists/ajax/getToggleField.ctp @@ -2,4 +2,4 @@ echo $this->Form->create('Warninglist', array('id' => 'WarninglistIndexForm', 'url' => '/warninglists/toggleEnable')); echo $this->Form->input('data', array('id' => 'WarninglistData', 'label' => false, 'style' => 'display:none;')); echo $this->Form->end(); -?> \ No newline at end of file +?> diff --git a/app/View/Warninglists/index.ctp b/app/View/Warninglists/index.ctp index b00bc3bea..001feff6f 100644 --- a/app/View/Warninglists/index.ctp +++ b/app/View/Warninglists/index.ctp @@ -76,4 +76,4 @@ endforeach; ?> element('side_menu', array('menuList' => 'warninglist', 'menuItem' => 'index')); -?> \ No newline at end of file +?> diff --git a/app/View/Whitelists/admin_add.ctp b/app/View/Whitelists/admin_add.ctp index c120a62cb..6f99b3641 100644 --- a/app/View/Whitelists/admin_add.ctp +++ b/app/View/Whitelists/admin_add.ctp @@ -16,4 +16,4 @@ echo $this->Form->end(); element('side_menu', array('menuList' => 'whitelist', 'menuItem' => 'add')); -?> \ No newline at end of file +?> diff --git a/app/View/Whitelists/admin_edit.ctp b/app/View/Whitelists/admin_edit.ctp index e513405e8..5e5c41a16 100644 --- a/app/View/Whitelists/admin_edit.ctp +++ b/app/View/Whitelists/admin_edit.ctp @@ -13,4 +13,4 @@ element('side_menu', array('menuList' => 'whitelist', 'menuItem' => 'edit', 'id' => $this->Form->value('Whitelist.id'))); -?> \ No newline at end of file +?> diff --git a/app/View/Whitelists/index.ctp b/app/View/Whitelists/index.ctp index 49a1cb099..8ad206c4f 100644 --- a/app/View/Whitelists/index.ctp +++ b/app/View/Whitelists/index.ctp @@ -47,4 +47,4 @@ endforeach;?> element('side_menu', array('menuList' => 'whitelist', 'menuItem' => 'index')); -?> \ No newline at end of file +?> diff --git a/app/webroot/css/datepicker.css b/app/webroot/css/datepicker.css index b7065b7d5..7990c3db8 100644 --- a/app/webroot/css/datepicker.css +++ b/app/webroot/css/datepicker.css @@ -179,4 +179,4 @@ cursor: pointer; width: 16px; height: 16px; -} \ No newline at end of file +} diff --git a/app/webroot/css/print.css b/app/webroot/css/print.css index f9b22646c..037342816 100644 --- a/app/webroot/css/print.css +++ b/app/webroot/css/print.css @@ -17,4 +17,4 @@ div.view, div.index{ a[href]:after, .tagSecondHalf{ content:none; -} \ No newline at end of file +} diff --git a/app/webroot/js/bootstrap.js b/app/webroot/js/bootstrap.js index b0d570c35..250626275 100644 --- a/app/webroot/js/bootstrap.js +++ b/app/webroot/js/bootstrap.js @@ -2277,4 +2277,4 @@ }) -}(window.jQuery); \ No newline at end of file +}(window.jQuery); diff --git a/app/webroot/js/jquery-toc.js b/app/webroot/js/jquery-toc.js index e7bb98caa..cf15addb6 100644 --- a/app/webroot/js/jquery-toc.js +++ b/app/webroot/js/jquery-toc.js @@ -41,4 +41,4 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ \ No newline at end of file +*/ diff --git a/app/webroot/js/main.js b/app/webroot/js/main.js index c80206aa0..e541d47ac 100644 --- a/app/webroot/js/main.js +++ b/app/webroot/js/main.js @@ -9,4 +9,4 @@ }); -}()); \ No newline at end of file +}());