Fixes for unconfirmed mail list in admin

diff --git a/inc/databases.php b/inc/databases.php
index bbd258b26fe9cd1793073dec23f74e5d2b10f974..d9e4876e1c663de0ed68c4885ac8006dfc4bf846 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "318");
+define('CURR_SVN_REVISION', "319");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 2bfb044c7b1c3e1cb981a90a7aa2495d8bdd2b76..e7821b302615e11efd495390d54c9aeccf9cf52f 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -568,7 +568,7 @@ PRIMARY KEY (id)
        case "0.4.6": // SQL queries for v0.4.6
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD gender ENUM ('M','F') NOT NULL DEFAULT 'M'";
                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_user_data SET gender=sex WHERE sex != 'M'";
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data DROP gender";
+               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data DROP sex";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Offensives Wort "Sex" gegen "Gender" ausgetauscht.";

diff --git a/inc/functions.php b/inc/functions.php
index 2f1f10302237a13f0a533805513c6ec9528a6051..d9a2388fcb08bff8c790d39f182ef296fb475c5c 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -588,16 +588,20 @@ function TRANSLATE_GENDER ($gender) {
 }
 //
 function GET_POOL_TYPE($PT) {
-       switch ($PT)
-       {
-               case "TEMP"   : $ret = POOL_TEMP;    break;
-               case "SEND"   : $ret = POOL_SEND;    break;
-               case "NEW"    : $ret = POOL_NEW;     break;
-               case "ADMIN"  : $ret = POOL_ADMIN;   break;
-               case "ACTIVE" : $ret = POOL_ACTIVE;  break;
-               case "DELETED": $ret = POOL_DELETED; break;
-               default       : $ret = POOL_UNKNOWN." (".$PT.")"; break;
-       }
+       // Unknown pool type is default
+       $ret = POOL_UNKNOWN." (".$PT.")";
+
+       // Generate constant name
+       $constantName = sprintf("POOL_%s", $PT);
+
+       // Is the type known?
+       if (defined($constantName)) {
+               // Prepare eval command
+               $eval = sprintf("\$ret = %s;", $constantName);
+               eval($eval);
+       } // END - if
+
+       // Return result
        return $ret;
 }
 //

diff --git a/inc/language/de.php b/inc/language/de.php
index cbcff93b9ebef3279867addb39371b336229be7b..590803be7ddee6e752d160f472c6a8d2c88afe87 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -343,8 +343,8 @@ define('LAST_MODULE', "Ihr zuletzt ausgewähltes Modul");
 define('MEMBER_EDIT_PROFILE', "Profildaten ändern");
 define('GENDER', "Geschlecht");
 define('GUEST_GENDER', "Geschlecht");
-define('GENDER_M', "Männlich");
-define('GENDER_F', "Weiblich");
+define('GENDER_M', "Herr");
+define('GENDER_F', "Frau");
 define('GENDER_C', ""Firma"");
 define('SAVE_CHANGES', "Änderungen speichern");
 define('MYDATA_NOTE', "Geben Sie nur bei <strong>Passwort</strong> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <strong>Passwortbest&auml;tigung</strong> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
@@ -449,6 +449,7 @@ define('POOL_UNKNOWN', "Unbekannt");
 define('POOL_TEMP', "Neuer Auftrag");
 define('POOL_SEND', "Gesendet");
 define('POOL_NEW', "Wartet auf Versand");
+define('POOL_QUEUE', "Wird versendet");
 define('POOL_ADMIN', "Wartet auf Freischaltung");
 define('EMAIL_SENDER', "Versender");
 define('EMAIL_SUBJECT', "Betreffzeile");

diff --git a/modules.php b/modules.php
index 8368d269c1bfd7b44c8ba4f57d4c649a744287b9..ed8a25842f2b2385f4a7ad9ec5fafd81778606f9 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -31,8 +31,8 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// APD call (if you have this apache extension and want to debug this script for us)
-//apd_set_pprof_trace();
+// XDEBUG call
+//xdebug_start_trace();
 
 // Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
 require_once ("inc/libs/security_functions.php");