Several constant fixes

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 22205b1fc325f64994669bf012e80efb4b72f42f..9bdd5f39f0393a019483229e2216c65bea1f97e2 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -372,24 +372,24 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                                }
 
                                                // Ok, all done. So we can write the config data to the php files
                                                }
 
                                                // Ok, all done. So we can write the config data to the php files

-                                               if ($_POST['spath'] != PATH) install_WriteData($_POST['spath']."inc/config.php", "SERVER-PATH", "define ('PATH', \"", "\");", $_POST['spath'], 0);
-                                               if ($_POST['burl']  != URL)  install_WriteData($_POST['spath']."inc/config.php", "HOST-URL", "define ('URL', \"", "\");", $_POST['burl'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "MAIN_TITLE", "define ('MAIN_TITLE', \"", "\");", $_POST['title'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "SLOGAN", "define ('SLOGAN', \"", "\");", $_POST['slogan'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "WEBMASTER", "define ('WEBMASTER', \"", "\");", $_POST['email'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "NULLPASS-WARNING", "define ('warn_no_pass', ", ");", $_POST['warn_no_pass'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "WRITE-FOOTER", "define ('WRITE_FOOTER', ", ");", $_POST['wfooter'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "BACKLINK", "define ('ENABLE_BACKLINK', ", ");", $_POST['blink'], 0);
-                                               // install_WriteData($_POST['spath']."inc/config.php", "OUTPUT-MODE", "define ('OUTPUT_MODE', \"", "\");", $_POST['omode'], 0);
+                                               if ($_POST['spath'] != PATH) install_WriteData($_POST['spath']."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", $_POST['spath'], 0);
+                                               if ($_POST['burl']  != URL)  install_WriteData($_POST['spath']."inc/config.php", "HOST-URL", "define('URL', \"", "\");", $_POST['burl'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "MAIN_TITLE", "define('MAIN_TITLE', \"", "\");", $_POST['title'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "SLOGAN", "define('SLOGAN', \"", "\");", $_POST['slogan'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "WEBMASTER", "define('WEBMASTER', \"", "\");", $_POST['email'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "NULLPASS-WARNING", "define('warn_no_pass', ", ");", $_POST['warn_no_pass'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "WRITE-FOOTER", "define('WRITE_FOOTER', ", ");", $_POST['wfooter'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "BACKLINK", "define('ENABLE_BACKLINK', ", ");", $_POST['blink'], 0);
+                                               // install_WriteData($_POST['spath']."inc/config.php", "OUTPUT-MODE", "define('OUTPUT_MODE', \"", "\");", $_POST['omode'], 0);

                                                install_WriteData($_POST['spath']."inc/config.php", "MYSQL-HOST", "     'host'     => \"", "\",", $mysql['host'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "MYSQL-DBASE", "    'dbase'    => \"", "\",", $mysql['dbase'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "MYSQL-LOGIN", "    'login'    => \"", "\",", $mysql['login'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PASSWORD", " 'password' => \"", "\",", $mysql['pass1'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "MYSQL-HOST", "     'host'     => \"", "\",", $mysql['host'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "MYSQL-DBASE", "    'dbase'    => \"", "\",", $mysql['dbase'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "MYSQL-LOGIN", "    'login'    => \"", "\",", $mysql['login'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PASSWORD", " 'password' => \"", "\",", $mysql['pass1'], 0);

-                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PREFIX", "define ('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "SMTP-HOSTNAME", "define ('SMTP_HOSTNAME', \"", "\");", $_POST['smtp_host'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "SMTP-USER", "define ('SMTP_USER', \"", "\");", $_POST['smtp_user'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "SMTP-PASSWORD", "define ('SMTP_PASSWORD', \"", "\");", $_POST['smtp_pass'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "INSTALLED", "define ('mxchange_installed', ", ");", "true", 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PREFIX", "define('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "SMTP-HOSTNAME", "define('SMTP_HOSTNAME', \"", "\");", $_POST['smtp_host'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "SMTP-USER", "define('SMTP_USER', \"", "\");", $_POST['smtp_user'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "SMTP-PASSWORD", "define('SMTP_PASSWORD', \"", "\");", $_POST['smtp_pass'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "INSTALLED", "define('mxchange_installed', ", ");", "true", 0);

 
                                                // Close the link
                                                SQL_CLOSE($link, __FILE__, __LINE__);
 
                                                // Close the link
                                                SQL_CLOSE($link, __FILE__, __LINE__);

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index ce4b5f6039b8fb7df39af7fd59e47cda03ff856c..7f103cad3cdb76083915eaeab8151d88a41149e7 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -63,12 +63,12 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
                SQL_FREERESULT($result);
 
                if ($value > 0) {
                SQL_FREERESULT($result);
 
                if ($value > 0) {

-                       define ('__TASK_UPDATE_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=updates\">".$value."</A>");
+                       define('__TASK_UPDATE_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=updates\">".$value."</A>");

                } else {
                } else {

-                       define ('__TASK_UPDATE_VALUE', "0");
+                       define('__TASK_UPDATE_VALUE', "0");

                }
        } else {
                }
        } else {

-               define ('__TASK_UPDATE_VALUE', "0");
+               define('__TASK_UPDATE_VALUE', "0");

        }
 
        //
        }
 
        //

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index e7aabd542decdb44844cb008233164661fd5712f..c364ae283a72072f29916304994b0c6fae4a2d21 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -67,7 +67,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                switch ($ret)
                {
                case "done":
                switch ($ret)
                {
                case "done":

-                       admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define ('admin_registered', ", ");", "true", 0);
+                       admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);

                        if (!_FATAL) {
                                // Registering is done
                                LOAD_URL(URL."/modules.php?module=admin&action=login&register=done");
                        if (!_FATAL) {
                                // Registering is done
                                LOAD_URL(URL."/modules.php?module=admin&action=login&register=done");


@@ -91,7 +91,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        }
                        if (!isBooleanConstantAndTrue('admin_registered')) {
                                // Write to config that registration is done
                        }
                        if (!isBooleanConstantAndTrue('admin_registered')) {
                                // Write to config that registration is done

-                               admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define ('admin_registered', ", ");", "true", 0);
+                               admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);

 
                                // Load URL for login
                                $URL = URL."/modules.php?module=admin&action=login";
 
                                // Load URL for login
                                $URL = URL."/modules.php?module=admin&action=login";

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index dd93fcee633ec8db69b8cc955b4fb49adeaa1347..6aba44b39868759a95758024e8c5e40a381b0600 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -199,17 +199,17 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0)
                                // Copy back tmp file and delete tmp :-)
                                @copy($tmp, $file);
                                @unlink($tmp);
                                // Copy back tmp file and delete tmp :-)
                                @copy($tmp, $file);
                                @unlink($tmp);

-                               define ('_FATAL', false);
+                               define('_FATAL', false);

                        }
                         elseif (!$found)
                        {
                                OUTPUT_HTML("<STRONG>CHANGE:</STRONG> 404!");
                        }
                         elseif (!$found)
                        {
                                OUTPUT_HTML("<STRONG>CHANGE:</STRONG> 404!");

-                               define ('_FATAL', true);
+                               define('_FATAL', true);

                        }
                         else
                        {
                                OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
                        }
                         else
                        {
                                OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");

-                               define ('_FATAL', true);
+                               define('_FATAL', true);

                        }
                }
        }
                        }
                }
        }

diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index d2ee8c934d57c7b0d9fb667ac5da92b91752816a..0b46d156de42cd30e6d0594d8c2876676dd4e7db 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -121,7 +121,7 @@ define('_END_MONTH', ADD_SELECTION("month", $M               , "end"));
 define('_END_YEAR' , ADD_SELECTION("year" , $Y               , "end"));
 
 // Transfer (maybe found) templates into constant for the template
 define('_END_YEAR' , ADD_SELECTION("year" , $Y               , "end"));
 
 // Transfer (maybe found) templates into constant for the template

-define ('_TEMPLATES', RALLYE_TEMPLATE_SELECTION());
+define('_TEMPLATES', RALLYE_TEMPLATE_SELECTION());

 
 // Load template
 LOAD_TEMPLATE("admin_add_rallye");
 
 // Load template
 LOAD_TEMPLATE("admin_add_rallye");

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 9aea8f972b276cbd4270e926cabd2de5e95b4af9..62450c81b6b2a728bc45617ef4ca97928feb88fa 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -328,12 +328,12 @@ if (IS_LOGGED_IN()) {
   </TD>
   <TD width=\"10\">&nbsp;</TD>
 </TR>\n";
   </TD>
   <TD width=\"10\">&nbsp;</TD>
 </TR>\n";

-               define ('LOGIN_FAILURE_MSG', $MSG);
+               define('LOGIN_FAILURE_MSG', $MSG);

        }
         else
        {
                // No problems, no output
        }
         else
        {
                // No problems, no output

-               define ('LOGIN_FAILURE_MSG', "");
+               define('LOGIN_FAILURE_MSG', "");

        }
        // Display login form with resend-password form
        if (EXT_IS_ACTIVE("nickname"))
        }
        // Display login form with resend-password form
        if (EXT_IS_ACTIVE("nickname"))

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 994a48fab85a4f48846b64d217c4aeddee9d5094..b6c41f637be159ef4256427211c4ae07c36694ca 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -133,7 +133,7 @@ define('user_stats', ($nmails + $bmails));
 define('sent'      , $sent);
 
 // All clicks
 define('sent'      , $sent);
 
 // All clicks

-define ('user_links', abs($sent - $clicks));
+define('user_links', abs($sent - $clicks));

 
 $clr = "0.00000";
 if ($sent > 0) $clr = $clicks / $sent * 100;
 
 $clr = "0.00000";
 if ($sent > 0) $clr = $clicks / $sent * 100;

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index eaad356ca9084a95b3ff98adae6550de714d7ffa..2ec132d5f93c0392ec6cf93fce0dc7e76df8167d 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -416,10 +416,10 @@ array(
        }
 
        // Adds a table for the guests with all visible categories
        }
 
        // Adds a table for the guests with all visible categories

-       define ('CATEGORY_SELECTION', REGISTER_ADD_CATEGORY_TABLE("guest", true));
+       define('CATEGORY_SELECTION', REGISTER_ADD_CATEGORY_TABLE("guest", true));

 
        // Adds maximum receiveable mails list... :)
 
        // Adds maximum receiveable mails list... :)

-       define ('MAX_RECEIVE_LIST', ADD_MAX_RECEIVE_LIST("guest", "", true));
+       define('MAX_RECEIVE_LIST', ADD_MAX_RECEIVE_LIST("guest", "", true));

 
        // Check if nickname extension is active and get state if nickname is selected or userid
        $nick = false;
 
        // Check if nickname extension is active and get state if nickname is selected or userid
        $nick = false;


@@ -443,7 +443,7 @@ array(
                define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid", true, $GLOBALS['refid']));
        } else {
                // Load "hide" form template
                define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid", true, $GLOBALS['refid']));
        } else {
                // Load "hide" form template

-               define ('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid_hide", true, $GLOBALS['refid']));
+               define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid_hide", true, $GLOBALS['refid']));

        }
 
        // You may want to modify the register_header.tpl.xx file and not this script when you add your scripts etc. :-)
        }
 
        // You may want to modify the register_header.tpl.xx file and not this script when you add your scripts etc. :-)

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index ee8c3d97156d12977889a46882c4a2c306023c02..fbcf7b56a84210e90eeae79ace50b4b947a830ad 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -96,8 +96,8 @@ case "show": // Show his data
        if (strlen($DATA[8]) == 1) $DATA[8] = "0".$DATA[8];
        switch (GET_LANGUAGE())
        {
        if (strlen($DATA[8]) == 1) $DATA[8] = "0".$DATA[8];
        switch (GET_LANGUAGE())
        {

-               case "de": define ('DOB', $DATA[7].".".$DATA[8].".".$DATA[9]); break;
-               default  : define ('DOB', $DATA[8]."-".$DATA[7]."-".$DATA[9]); break;
+               case "de": define('DOB', $DATA[7].".".$DATA[8].".".$DATA[9]); break;
+               default  : define('DOB', $DATA[8]."-".$DATA[7]."-".$DATA[9]); break;

        }
 
        if (EXT_IS_ACTIVE("country"))
        }
 
        if (EXT_IS_ACTIVE("country"))

diff --git a/install.php b/install.php
index 2dc4e84352de5d93ef35e95b3cbb0f6569958a08..3e394cc273f208739f3c670c590ec3651ee22c28 100644 (file)
--- a/install.php
+++ b/install.php
@@ -46,7 +46,7 @@
  ************************************************************************/
 
 // Tell every module / include file we are installing
  ************************************************************************/
 
 // Tell every module / include file we are installing

-define ('mxchange_installing', true);
+define('mxchange_installing', true);

 
 // Load security system
 require ("inc/libs/security_functions.php");
 
 // Load security system
 require ("inc/libs/security_functions.php");