Merge pull request #338 from CraftedRO/conf

Small cleanup
FusionGen · Oct 16, 2024 · 42536b7 · 42536b7
2 parents 24b2981 + a8eab78
commit 42536b7
Show file tree

Hide file tree

Showing 65 changed files with 112 additions and 191 deletions.
diff --git a/application/config/acl_defaults.php b/application/config/acl_defaults.php
@@ -1,4 +1,5 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------

diff --git a/application/config/autoload.php b/application/config/autoload.php
@@ -1,8 +1,6 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
 /*
 | -------------------------------------------------------------------
 | AUTO-LOADER

diff --git a/application/config/backups.php b/application/config/backups.php
@@ -1,8 +1,5 @@
 <?php
-
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/config/captcha.php b/application/config/captcha.php
@@ -1,4 +1,5 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  *

diff --git a/application/config/cdn.php b/application/config/cdn.php
@@ -1,8 +1,5 @@
 <?php
-
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/config/config.php b/application/config/config.php
@@ -1,8 +1,5 @@
 <?php
-
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------

diff --git a/application/config/constants.php b/application/config/constants.php
@@ -1,6 +1,5 @@
 <?php
-
-defined('BASEPATH') or exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------

diff --git a/application/config/doctypes.php b/application/config/doctypes.php
@@ -1,8 +1,5 @@
 <?php
-
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 $_doctypes = array(
                     'xhtml11'       => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',

diff --git a/application/config/emulator_names.php b/application/config/emulator_names.php
@@ -1,15 +1,15 @@
 <?php
 
 $emulators = array(
-    "azerothcore_soap"      => "(SRP6) AzerothCore (3.3.5a) - connected through SOAP",
-    "azerothcore_sph_soap"  => "(SPH) AzerothCore (3.3.5a) - connected through SOAP",
-    "trinity_rbac_soap"     => "(SRP6) TrinityCore (3.3.5a) with RBAC - connected through SOAP",
-    "trinity_rbac_df_soap"  => "(BNET) TrinityCore - Dragonflight (10.x.x) with RBAC - connected through SOAP",
-    "trinity_rbac_sl_soap"  => "(BNET) TrinityCore - Shadowlands (9.x.x) with RBAC - connected through SOAP",
+    "azerothcore_soap"        => "(SRP6) AzerothCore (3.3.5a) - connected through SOAP",
+    "azerothcore_sph_soap"    => "(SPH) AzerothCore (3.3.5a) - connected through SOAP",
+    "trinity_rbac_soap"       => "(SRP6) TrinityCore (3.3.5a) with RBAC - connected through SOAP",
+    "trinity_rbac_df_soap"    => "(BNET) TrinityCore - Dragonflight (10.x.x) with RBAC - connected through SOAP",
+    "trinity_rbac_sl_soap"    => "(BNET) TrinityCore - Shadowlands (9.x.x) with RBAC - connected through SOAP",
     "trinity_legion_soap"     => "(SPH) TrinityCore - Legion (7.x.x) - connected through SOAP",
     "cmangos_soap"            => "(HEX) CMangos (3.3.5a) - connected through SOAP",
     "mop_soap"                => "(SPH) MoP (5.4.8) - connected through SOAP",
     "mangos_zero_sph_soap"    => "(SPH) Mangos Zero (1.12.1) - connected through SOAP",
     "mangos_one_two_sph_soap" => "(SPH) Mangos One/Two (2.4.3/3.3.5a) - connected through SOAP",
-    "mangos_three_sph_soap" => "(SPH) Mangos Three (4.3.4) - connected through SOAP",
+    "mangos_three_sph_soap"   => "(SPH) Mangos Three (4.3.4) - connected through SOAP",
 );
diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php
@@ -1,8 +1,6 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
 /*
 | -------------------------------------------------------------------
 | Foreign Characters

diff --git a/application/config/fusion.php.dist b/application/config/fusion.php.dist
@@ -1,4 +1,5 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/config/fusioneditor.php b/application/config/fusioneditor.php
@@ -1,4 +1,5 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/config/language.php b/application/config/language.php
@@ -1,4 +1,5 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen
@@ -9,9 +10,6 @@
  * @link    http://fusiongen.net
  */
 
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
 
 /*
   |--------------------------------------------------------------------------

diff --git a/application/config/memcached.php b/application/config/memcached.php
@@ -1,6 +1,5 @@
 <?php
-
-defined('BASEPATH') or exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------------

diff --git a/application/config/message.php b/application/config/message.php
@@ -1,4 +1,5 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------

diff --git a/application/config/migration.php b/application/config/migration.php
@@ -1,6 +1,6 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-defined('BASEPATH') or exit('No direct script access allowed');
 /*
 |--------------------------------------------------------------------------
 | Enable/Disable Migrations

diff --git a/application/config/mimes.php b/application/config/mimes.php
@@ -1,6 +1,5 @@
 <?php
-
-defined('BASEPATH') or exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------

diff --git a/application/config/performance.php b/application/config/performance.php
@@ -1,8 +1,5 @@
 <?php
-
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/config/profiler.php b/application/config/profiler.php
@@ -1,8 +1,5 @@
 <?php
-
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/config/routes.php b/application/config/routes.php
@@ -1,8 +1,6 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
 /*
 | -------------------------------------------------------------------------
 | URI ROUTING

diff --git a/application/config/session.php b/application/config/session.php
@@ -1,8 +1,5 @@
 <?php
-
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 // Session namespace
 $config['sess_namespace'] = '';

diff --git a/application/config/smtp.php b/application/config/smtp.php
@@ -1,4 +1,5 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/config/social_media.php b/application/config/social_media.php
@@ -1,8 +1,5 @@
 <?php
-
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/config/user_agents.php b/application/config/user_agents.php
@@ -1,6 +1,5 @@
 <?php
-
-defined('BASEPATH') or exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------

diff --git a/application/config/version.php b/application/config/version.php
@@ -1 +1,4 @@
-<?php $config['FusionGENVersion'] = '1.0.7';
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$config['FusionGENVersion'] = '1.0.7';
diff --git a/application/config/wow_constants.php b/application/config/wow_constants.php
@@ -1,4 +1,5 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 $config['races'] = lang("races", "wow_constants");
 $config['classes'] = lang("classes", "wow_constants");
@@ -42,7 +43,7 @@
     3 => "Hunter",
     4 => "Rogue",
     5 => "Priest",
-    6 => "Death knight",
+    6 => "Death Knight",
     7 => "Shaman",
     8 => "Mage",
     9 => "Warlock",

diff --git a/application/config/wow_zones.php b/application/config/wow_zones.php
@@ -1,3 +1,4 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 $config['zones'] = lang("zones", "wow_zones");
diff --git a/application/core/MY_Input.php b/application/core/MY_Input.php
@@ -1,8 +1,5 @@
 <?php
-
-if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 class MY_Input extends CI_Input
 {

diff --git a/application/core/MY_Loader.php b/application/core/MY_Loader.php
@@ -1,6 +1,5 @@
 <?php
-
-(defined('BASEPATH')) or exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /* load the MX_Loader class */
 require APPPATH . "third_party/MX/Loader.php";

diff --git a/application/core/MY_Router.php b/application/core/MY_Router.php
@@ -1,6 +1,5 @@
 <?php
-
-(defined('BASEPATH')) or exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /* load the MX_Router class */
 require APPPATH . "third_party/MX/Router.php";

diff --git a/application/helpers/breadcrumb_helper.php b/application/helpers/breadcrumb_helper.php
@@ -1,4 +1,5 @@
-<?php if (! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * Create a breadcrumb for headlines

diff --git a/application/helpers/email_helper.php b/application/helpers/email_helper.php
@@ -1,4 +1,5 @@
-<?php if (! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * Send a mail

diff --git a/application/helpers/emulator_helper.php b/application/helpers/emulator_helper.php
@@ -1,4 +1,5 @@
-<?php if (! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * Get the name of a table

diff --git a/application/helpers/lang_helper.php b/application/helpers/lang_helper.php
@@ -1,4 +1,5 @@
-<?php if (! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * Short-command to get the current language name

diff --git a/application/helpers/permission_helper.php b/application/helpers/permission_helper.php
@@ -1,4 +1,5 @@
-<?php if (! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * Check if a user has permission to do a certain task

diff --git a/application/helpers/tinymce_helper.php b/application/helpers/tinymce_helper.php
@@ -1,4 +1,5 @@
-<?php if (! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * Output TinyMCE script

diff --git a/application/language/english/wow_constants.php b/application/language/english/wow_constants.php
@@ -39,7 +39,7 @@
     3 => "Hunter",
     4 => "Rogue",
     5 => "Priest",
-    6 => "Death knight",
+    6 => "Death Knight",
     7 => "Shaman",
     8 => "Mage",
     9 => "Warlock",

diff --git a/application/libraries/Acl.php b/application/libraries/Acl.php
@@ -1,8 +1,5 @@
 <?php
-
-if (!defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/libraries/Administrator.php b/application/libraries/Administrator.php
@@ -1,8 +1,5 @@
 <?php
-
-if (!defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/libraries/Cache.php b/application/libraries/Cache.php
@@ -1,8 +1,5 @@
 <?php
-
-if (!defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/libraries/Captcha.php b/application/libraries/Captcha.php
@@ -1,4 +1,5 @@
 <?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/libraries/Ci_smarty.php b/application/libraries/Ci_smarty.php
@@ -1,9 +1,5 @@
 <?php
-
-
-if (!defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/libraries/Dbbackup.php b/application/libraries/Dbbackup.php
@@ -1,8 +1,5 @@
 <?php
-
-if (!defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen

diff --git a/application/libraries/Fusioneditor.php b/application/libraries/Fusioneditor.php
@@ -1,8 +1,5 @@
 <?php
-
-if (!defined('BASEPATH')) {
-    exit('No direct script access allowed');
-}
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * @package FusionGen
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     <?php
+    defined('BASEPATH') OR exit('No direct script access allowed');
     /**
      *
@@ Expand Down @@