Naming conventions applied

diff --git a/inc/config.php b/inc/config.php
index 8c7af1fbfba12fe745e39cbb5fa2a7247dce962d..0d02f7041c7426417c2042982e076b3d6d50b906 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -99,10 +99,10 @@ define('PATH', $PATH);
 define('WEBMASTER', "you@some-hoster.tld.invalid");
 
 // CFG: INSTALLED
 define('WEBMASTER', "you@some-hoster.tld.invalid");
 
 // CFG: INSTALLED

-define('mxchange_installed', false);
+define('mxchange_installed', true);

 
 // CFG: ADMIN-SETUP
 
 // CFG: ADMIN-SETUP

-define('admin_registered', false);
+define('admin_registered', true);

 
 // CFG: DEBUG-MODE (if enabled all mails will be *displayed* and *not* send!)
 define('DEBUG_MODE', false);
 
 // CFG: DEBUG-MODE (if enabled all mails will be *displayed* and *not* send!)
 define('DEBUG_MODE', false);


@@ -115,11 +115,11 @@ $MySQL = array(
        // CFG: MYSQL-HOST
        'host'     => "localhost",
        // CFG: MYSQL-DBASE
        // CFG: MYSQL-HOST
        'host'     => "localhost",
        // CFG: MYSQL-DBASE

-       'dbase'    => "db",
+       'dbase'    => "mxchange3",

        // CFG: MYSQL-LOGIN
        // CFG: MYSQL-LOGIN

-       'login'    => "user",
+       'login'    => "root",

        // CFG: MYSQL-PASSWORD
        // CFG: MYSQL-PASSWORD

-       'password' => "pass",
+       'password' => "Y4g31N6",

 );
 
 // CFG: MYSQL-PREIFX
 );
 
 // CFG: MYSQL-PREIFX


@@ -136,7 +136,7 @@ define('LEAD_EXPIRY_TIME' , (30*24*60*60)); // == 30 days
 // CFG: SMTP-HOSTNAME
 define('SMTP_HOSTNAME', "");
 // CFG: SMTP-USER
 // CFG: SMTP-HOSTNAME
 define('SMTP_HOSTNAME', "");
 // CFG: SMTP-USER

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

 // CFG: SMTP-PASSWORD
 define('SMTP_PASSWORD', "");
 
 // CFG: SMTP-PASSWORD
 define('SMTP_PASSWORD', "");
 

diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php
index 01ad655b2cd8c6174f4256ed6911e5190db47b7f..13aa9d1a57628c423a1df922289b5361f6b48a20 100644 (file)
--- a/inc/extensions/ext-other.php
+++ b/inc/extensions/ext-other.php
@@ -39,13 +39,13 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])))
 }
 
 // Version number
 }
 
 // Version number

-$EXT_VERSION = "0.1.9";
+$EXT_VERSION = "0.2.0";

 
 // Auto-set extension version
 if (empty($EXT_VER)) $EXT_VER = $EXT_VERSION;
 
 // Version history array (add more with , "0.1" and so on)
 
 // Auto-set extension version
 if (empty($EXT_VER)) $EXT_VER = $EXT_VERSION;
 
 // Version history array (add more with , "0.1" and so on)

-$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.6", "0.0.7", "0.0.8", "0.0.9", "0.1.0", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1.5", "0.1.6", "0.1.7", "0.1.8", "0.1.9");
+$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.6", "0.0.7", "0.0.8", "0.0.9", "0.1.0", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1.5", "0.1.6", "0.1.7", "0.1.8", "0.1.9", "0.2.0");

 
 switch ($EXT_LOAD_MODE)
 {
 
 switch ($EXT_LOAD_MODE)
 {


@@ -178,6 +178,13 @@ case "update": // Update an extension
        case "0.1.9": // SQL queries for v0.1.9
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD mailid_error_redirect ENUM('index', 'reject') NOT NULL DEFAULT 'index'";
 
        case "0.1.9": // SQL queries for v0.1.9
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD mailid_error_redirect ENUM('index', 'reject') NOT NULL DEFAULT 'index'";
 

+               // Update notes (these will be set as task text!)
+               $UPDATE_NOTES = "Bei fehlerhafter Mail während der Bestätigung kann wahlweise zur Hauptseite weitergeleitet oder auf die eingestellte Ablehnungsseite umgeleitet werden.";
+               break;
+
+       case "0.2.0": // SQL queries for v0.2.0
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` CHANGE `mailid_error_redirect` `mailid_error_redirect` ENUM( 'INDEX', 'REJECT' ) NOT NULL DEFAULT 'INDEX'";
+

                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei fehlerhafter Mail während der Bestätigung kann wahlweise zur Hauptseite weitergeleitet oder auf die eingestellte Ablehnungsseite umgeleitet werden.";
                break;
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei fehlerhafter Mail während der Bestätigung kann wahlweise zur Hauptseite weitergeleitet oder auf die eingestellte Ablehnungsseite umgeleitet werden.";
                break;

diff --git a/inc/language/order_de.php b/inc/language/order_de.php
index b0767dfb05a023e8af09b8f7491b3ca394daa3bd..1acea0adf703a608f119484cdc6f2be06b0ec4ae 100644 (file)
--- a/inc/language/order_de.php
+++ b/inc/language/order_de.php
@@ -76,7 +76,7 @@ define('MEMBER_AUTOSEND_ACTIVE', "Der Auto-Versand ist in unserem {!MT_WORD!} de
 // Repay deleted mails constants
 define('ADMIN_CFG_REPAY_POINTS_REPAY', "Dem Mitglied gutschreiben");
 define('ADMIN_CFG_REPAY_POINTS_JACKPOT', "In den Jackpot legen");
 // Repay deleted mails constants
 define('ADMIN_CFG_REPAY_POINTS_REPAY', "Dem Mitglied gutschreiben");
 define('ADMIN_CFG_REPAY_POINTS_JACKPOT', "In den Jackpot legen");

-define('ADMIN_CFG_REPAY_POINTS_NEVER', "Nicht gutschreiben (verfällt dann)");
+define('ADMIN_CFG_REPAY_POINTS_SHRED', "Nicht gutschreiben (verfällt dann)");

 define('ADMIN_REPAY_ON_DELETE_MODE', "Wie sollen {!POINTS!} von gelöschten Mails verbucht werden?");
 
 //
 define('ADMIN_REPAY_ON_DELETE_MODE', "Wie sollen {!POINTS!} von gelöschten Mails verbucht werden?");
 
 //

diff --git a/inc/modules/admin/what-config_order.php b/inc/modules/admin/what-config_order.php
index c864f160edfd71fd1c519233d0f93f491431e7a8..c9da993a16de8fbed49978437b13378b9bf2364a 100644 (file)
--- a/inc/modules/admin/what-config_order.php
+++ b/inc/modules/admin/what-config_order.php
@@ -91,19 +91,19 @@ if (isset($_POST['ok'])) {
                case "REPAY":
                        define('_CFG_REPAY_POINTS_REPAY'  , " selected=\"selected\"");
                        define('_CFG_REPAY_POINTS_JACKPOT', "");
                case "REPAY":
                        define('_CFG_REPAY_POINTS_REPAY'  , " selected=\"selected\"");
                        define('_CFG_REPAY_POINTS_JACKPOT', "");

-                       define('_CFG_REPAY_POINTS_NONE'   , "");
+                       define('_CFG_REPAY_POINTS_SHRED'  , "");

                        break;
 
                case "JACKPOT":
                        define('_CFG_REPAY_POINTS_REPAY'  , "");
                        define('_CFG_REPAY_POINTS_JACKPOT', " selected=\"selected\"");
                        break;
 
                case "JACKPOT":
                        define('_CFG_REPAY_POINTS_REPAY'  , "");
                        define('_CFG_REPAY_POINTS_JACKPOT', " selected=\"selected\"");

-                       define('_CFG_REPAY_POINTS_NONE'   , "");
+                       define('_CFG_REPAY_POINTS_SHRED'  , "");

                        break;
 
                        break;
 

-               case "NONE":
+               case "SHRED":

                        define('_CFG_REPAY_POINTS_REPAY'  , "");
                        define('_CFG_REPAY_POINTS_JACKPOT', "");
                        define('_CFG_REPAY_POINTS_REPAY'  , "");
                        define('_CFG_REPAY_POINTS_JACKPOT', "");

-                       define('_CFG_REPAY_POINTS_NONE'   , " selected=\"selected\"");
+                       define('_CFG_REPAY_POINTS_SHRED'  , " selected=\"selected\"");

                        break;
        }
 
                        break;
        }
 

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index ad5dc9e0c32973fb7e90487406b2373d80b962b7..72e13eab9a90145875e63dfec4ae6828e32b5f8a 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -171,7 +171,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_SHOW_TIMINGS_N', ' checked');
        }
 
                define('_CFG_SHOW_TIMINGS_N', ' checked');
        }
 

-       if ($_CONFIG['mailid_error_redirect'] == 'index') {
+       if ($_CONFIG['mailid_error_redirect'] == 'INDEX') {

                define('_CFG_MAILID_REDIRECT_INDEX', ' checked');
                define('_CFG_MAILID_REDIRECT_REJECT', "");
        } else {
                define('_CFG_MAILID_REDIRECT_INDEX', ' checked');
                define('_CFG_MAILID_REDIRECT_REJECT', "");
        } else {

diff --git a/mailid.php b/mailid.php
index 42280ee7afc3f17781790664262f2a341e269d97..c30f0f41fd98587ab4a3cd3bea998dbf241668ba 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -192,11 +192,11 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
        // Error code is set?
        if (!empty($msg)) {
                switch ($_CONFIG['mailid_error_redirect']) {
        // Error code is set?
        if (!empty($msg)) {
                switch ($_CONFIG['mailid_error_redirect']) {

-                       case "index": // Redirect to index page
+                       case "INDEX": // Redirect to index page

                                LOAD_URL("modules.php?module=index&msg=".$msg);
                                break;
 
                                LOAD_URL("modules.php?module=index&msg=".$msg);
                                break;
 

-                       case "reject": // Redirect to rejection page
+                       case "REJECT": // Redirect to rejection page

                                LOAD_URL($_CONFIG['reject_url']);
                                break;
                }
                                LOAD_URL($_CONFIG['reject_url']);
                                break;
                }

diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl
index d5f79b0646757b5c4fea6f8dc86ebf9a0a95266a..1433ffeffca07cc202c7efd017319fa577e39a39 100644 (file)
--- a/templates/de/html/admin/admin_config_order.tpl
+++ b/templates/de/html/admin/admin_config_order.tpl
@@ -127,9 +127,9 @@
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">
                        <SELECT name="repay_deleted_mails" class="admin_select" size="1">
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">
                        <SELECT name="repay_deleted_mails" class="admin_select" size="1">

-                               <OPTION value="repay"{--_CFG_REPAY_POINTS_REPAY--}">{--ADMIN_CFG_REPAY_POINTS_REPAY--}</OPTION>
-                               <OPTION value="jackpot"{--_CFG_REPAY_POINTS_JACKPOT--}">{--ADMIN_CFG_REPAY_POINTS_JACKPOT--}</OPTION>
-                               <OPTION value="never"{--_CFG_REPAY_POINTS_NEVER--}">{--ADMIN_CFG_REPAY_POINTS_NEVER--}</OPTION>
+                               <OPTION value="REPAY"{--_CFG_REPAY_POINTS_REPAY--}">{--ADMIN_CFG_REPAY_POINTS_REPAY--}</OPTION>
+                               <OPTION value="JACKPOT"{--_CFG_REPAY_POINTS_JACKPOT--}">{--ADMIN_CFG_REPAY_POINTS_JACKPOT--}</OPTION>
+                               <OPTION value="SHRED"{--_CFG_REPAY_POINTS_SHRED--}">{--ADMIN_CFG_REPAY_POINTS_SHRED--}</OPTION>

                        </SELECT>
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                        </SELECT>
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>

diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl
index 117a0d0d597d38aefad0463bc05ba21864df71ec..3b07d7d9d9072808f75338852ba8fce70daeb62f 100644 (file)
--- a/templates/de/html/admin/admin_config_other.tpl
+++ b/templates/de/html/admin/admin_config_other.tpl
@@ -197,9 +197,9 @@
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--ADMIN_OPTION_SHOW_TIMINGS--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--ADMIN_OPTION_SHOW_TIMINGS--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>

-               <TD><SPAN class="nobr"> <INPUT type="radio"
-                       name="mailid_error_redirect" value="Y"{--_CFG_SHOW_TIMINGS_Y--}>&nbsp;{--YES--}<BR>
-               <INPUT type="radio" name="mailid_error_redirect" value="N"{--_CFG_SHOW_TIMINGS_N--}>&nbsp;{--NO--}
+               <TD><SPAN class="nobr">
+                       <INPUT type="radio" name="show_timings" value="Y"{--_CFG_SHOW_TIMINGS_Y--} />&nbsp;{--YES--}<BR>
+                       <INPUT type="radio" name="show_timings" value="N"{--_CFG_SHOW_TIMINGS_N--} />&nbsp;{--NO--}

                </SPAN></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
                </SPAN></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>


@@ -213,8 +213,8 @@
                <TD align="right">{--ADMIN_OPTION_MAILID_REDIRECT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SPAN class="nobr"> <INPUT type="radio"
                <TD align="right">{--ADMIN_OPTION_MAILID_REDIRECT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SPAN class="nobr"> <INPUT type="radio"

-                       name="mailid_error_redirect" value="index"{--_CFG_MAILID_REDIRECT_INDEX--}>&nbsp;{--ADMIN_CONFIG_MAILID_REDIRECT_INDEX--}<BR>
-               <INPUT type="radio" name="mailid_error_redirect" value="reject"{--_CFG_MAILID_REDIRECT_REJECT--}>&nbsp;{--ADMIN_CONFIG_MAILID_REDIRECT_REJECT--}
+                       name="mailid_error_redirect" value="INDEX"{--_CFG_MAILID_REDIRECT_INDEX--}>&nbsp;{--ADMIN_CONFIG_MAILID_REDIRECT_INDEX--}<BR>
+               <INPUT type="radio" name="mailid_error_redirect" value="REJECT"{--_CFG_MAILID_REDIRECT_REJECT--}>&nbsp;{--ADMIN_CONFIG_MAILID_REDIRECT_REJECT--}

                </SPAN></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
                </SPAN></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>