]> git.mxchange.org Git - mailer.git/commitdiff
A lot more nice improvements!
authorRoland Häder <roland@mxchange.org>
Wed, 26 Nov 2008 01:33:18 +0000 (01:33 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 26 Nov 2008 01:33:18 +0000 (01:33 +0000)
- Extensions does no longer have $EXT_LANG_PREFIX which defaults now to the
  extension's name
- ADD_POINTS_REFSYSTEM() and SUB_POINTS() prepare for upcoming extension
  'booking' which gives the admin and users a list of all booked points
- In user admin profile (what=list_user&u_id=x) and with installed extension
  'country' the country will be displayed again
- Three dashes added below "lock reason" in user admin profile
- Direct registration link of extensions now no longer showed if the extension
  is already installed
- List of users w/o referal id (refid=0) are now handled by
  "what=list_user&mode=norefs" and is no longer available in member menu
- Page navigation and sorting for user list extended for above changes
- Same list again rewritten for list of confirmed/locked users.
  Confirmed/locked: what=list_user&status=confirmed/locked
- URL redirection extended with "a" tag
- Some minor fixes here and there...

86 files changed:
birthday_confirm.php
doubler.php
inc/doubler_send.php
inc/extensions.php
inc/extensions/ext-
inc/extensions/ext-active.php
inc/extensions/ext-admins.php
inc/extensions/ext-admintheme1.php
inc/extensions/ext-admintheme_default.php
inc/extensions/ext-autopurge.php
inc/extensions/ext-bank.php
inc/extensions/ext-beg.php
inc/extensions/ext-birthday.php
inc/extensions/ext-bonus.php
inc/extensions/ext-cache.php
inc/extensions/ext-country.php
inc/extensions/ext-debug.php
inc/extensions/ext-demo.php
inc/extensions/ext-doubler.php
inc/extensions/ext-holiday.php
inc/extensions/ext-html_mail.php
inc/extensions/ext-mailid.php
inc/extensions/ext-maintenance.php
inc/extensions/ext-mediadata.php
inc/extensions/ext-mods.php
inc/extensions/ext-mydata.php
inc/extensions/ext-newsletter.php
inc/extensions/ext-nickname.php
inc/extensions/ext-online.php
inc/extensions/ext-optimize.php
inc/extensions/ext-order.php
inc/extensions/ext-other.php
inc/extensions/ext-payout.php
inc/extensions/ext-primera.php
inc/extensions/ext-profile.php
inc/extensions/ext-rallye.php
inc/extensions/ext-refback.php
inc/extensions/ext-register.php
inc/extensions/ext-removeip.php
inc/extensions/ext-repair.php
inc/extensions/ext-rewrite.php
inc/extensions/ext-safe.php
inc/extensions/ext-sponsor.php
inc/extensions/ext-sql_patches.php
inc/extensions/ext-support.php
inc/extensions/ext-surfbar.php
inc/extensions/ext-task.php
inc/extensions/ext-theme.php
inc/extensions/ext-top10.php
inc/extensions/ext-transfer.php
inc/extensions/ext-user.php
inc/extensions/ext-wernis.php
inc/extensions/ext-yoomedia.php
inc/functions.php
inc/language/de.php
inc/libs/beg_functions.php
inc/libs/bonus_functions.php
inc/libs/rallye_functions.php
inc/libs/refback_functions.php
inc/libs/surfbar_functions.php
inc/libs/task_functions.php
inc/libs/user_functions.php
inc/modules/admin/admin-inc.php
inc/modules/admin/overview-inc.php
inc/modules/admin/what-add_points.php
inc/modules/admin/what-del_email.php
inc/modules/admin/what-list_norefs.php
inc/modules/admin/what-list_task.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-sub_points.php
inc/modules/guest/what-confirm.php
inc/modules/member/what-payout.php
inc/modules/member/what-primera.php
inc/modules/member/what-transfer.php
inc/modules/member/what-wernis.php
inc/modules/order.php
inc/monthly/monthly_beg.php
inc/monthly/monthly_bonus.php
inc/mysql-connect.php
inc/mysql-manager.php
inc/pool-update.php
install/menu-de.sql
install/menu-en.sql
mailid_top.php
templates/de/html/member/member_welcome.tpl
templates/de/html/redirect_url.tpl

index 954b8fdadb2ce3a53d1e67d776284999aabab070..22cd6bf61b76462d826c57cc3b958f29242a5581 100644 (file)
@@ -80,7 +80,7 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
 
                        // Add points to account
                        unset($DEPTH);
-                       ADD_POINTS_REFSYSTEM($uid, $data['points'], false, "0", $locked, strtolower($_CONFIG['birthday_mode']));
+                       ADD_POINTS_REFSYSTEM("birthday_confirm", $uid, $data['points'], false, "0", $locked, strtolower($_CONFIG['birthday_mode']));
 
                        // Remove entry from table
                        $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_birthday WHERE userid=%s AND chk_value='%s' LIMIT 1",
index 26dd0545c674db3b05d24c57cea623c11d7afd16..b779650b0e462b5688a0131b43672f307d0a1738 100644 (file)
@@ -134,7 +134,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                         array($uid, bigintval($GLOBALS['refid']), bigintval($_POST['points'] * 2)), __FILE__, __LINE__);
 
                                        // Subtract entered points
-                                       SUB_POINTS($uid, $_POST['points']);
+                                       SUB_POINTS("doubler", $uid, $_POST['points']);
 
                                        // Add points to "total payed" including charge
                                        $points = $_POST['points'] - $_POST['points'] * $_CONFIG['doubler_charge'];
index b6a7505e1d14aea7fee79adf323d558941bc1f54..fd5d61d29a676c9f30fb3f5bc85a792f2cffe661 100644 (file)
@@ -99,7 +99,7 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
                        // Exclude webmaster from doubling...
                        if ($uid != $_CONFIG['doubler_uid']) {
                                // Add points
-                               ADD_POINTS_REFSYSTEM($uid, $points, false, "0", false, "direct");
+                               ADD_POINTS_REFSYSTEM(sprintf("doubler_%s", strtolower($_CONFIG['doubler_send_mode'])), $uid, $points, false, "0", false, "direct");
                        } // END - if
 
                        // Set entry as "payed"
@@ -120,7 +120,7 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
                        // Exclude also webmaster's ID in taking points from webmaster's account
                        if (($user > 0) && ($user >= $points) && (!$OK) && ($_CONFIG['doubler_uid'] > 0) && ($uid != $_CONFIG['doubler_uid'])) {
                                // Add points to used points
-                               SUB_POINTS($_CONFIG['doubler_uid'], $points);
+                               SUB_POINTS("doubler_payout", $_CONFIG['doubler_uid'], $points);
 
                                // Okay, done!
                                $OK = true;
index c4d7a8e0b133555bdd20787d448e372afc3892de..18adcb0a2eaefa01c18601dfda55ea9e777f4224 100644 (file)
@@ -49,8 +49,12 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
        // This shall never do a non-admin user!
        if (!IS_ADMIN()) return false;
 
+       // By default the language prefix is the extension's name
+       // @TODO: Do we really need this one anymore? Can't we just take $ext_name and done?
+       $EXT_LANG_PREFIX = $ext_name;
+
        // By default we have no failtures
-       $EXT_REPORTS_FAILURE = true;
+       $EXT_REPORTS_FAILURE = false;
 
        // Is this extension already installed?
        if (EXT_IS_ACTIVE($ext_name)) return false;
@@ -169,7 +173,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
                $EXT_LOAD_MODE = "register";
 
                // Remains true if extension registration reports no failtures
-               $test = ($test && !$EXT_REPORTS_FAILTURE);
+               $test = ($test && !$EXT_REPORTS_FAILURE);
 
                // Does everthing before wents ok?
                if ($test) {
index c01dd2979b395bacc4b07540a7ad4460891dfc3a..668e7b87c6c4b8845edce87d0bb675b3bfef8885 100644 (file)
@@ -80,8 +80,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "xxx";
-
 //
 ?>
index c108fb0d332983d02670c6db9dc2c9d2cb0548cb..7d49d419edd8e6adf74e12ebf051e94be6dcc3f7 100644 (file)
@@ -124,8 +124,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "active";
-
 //
 ?>
index 51ddb9440c4601c843a2b94c2e16634c08020152..f1e3cca8b59cfd02908c492a9de644b6db733a9c 100644 (file)
@@ -289,8 +289,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "admins";
-
 //
 ?>
index 516ebaf98bc0c7892343e161112a1f496d2abb1d..0e0474705f9f29cbb0504ab0af3f650869b52991 100644 (file)
@@ -84,8 +84,6 @@ case "update": // Update an extension
 default: // Do stuff when extension is loaded
        break;
 }
-// Language file prefix
-$EXT_LANG_PREFIX = "admintheme";
 
 //
 ?>
index 189a43eb21e8e0f34b0a2ac7054c2da3c697248d..ef2c977899e5ec99ff8b35d7c96d269277eb23cc 100644 (file)
@@ -85,8 +85,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "admintheme";
-
 //
 ?>
index f908e68f1cbbf10fbafe042a9ab90e153f507932..fb44ddd0c9c42c204ad7f110968efcb5e4e753b5 100644 (file)
@@ -259,9 +259,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "autopurge";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "Y";
 
index 1f9d217f89d4759492bd838427551d4d653ea589..0e0c75c424a8dd1d13b0c72b9c7dc084a965b183 100644 (file)
@@ -145,11 +145,11 @@ UNIQUE (account_id, tan)
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank', NULL, 'Bank-Account','N','Y', 3)";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_infos','Angebotspakete','N','Y', 1)";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_create','Konto anlegen','N','Y', 2)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_deposit','Einzahlen','N','Y', 3)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_withdraw','Auszahlen','N','Y', 4)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_deposit','Auf Konto einzahlen','N','Y', 3)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_withdraw','Vom Konto abheben','N','Y', 4)";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_output','Kontoauszug','N','Y', 5)";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_change','Paket wechseln','N','Y', 6)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_remove','K&uuml;ndigen','N','Y', 7)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_remove','Konto K&uuml;ndigen','N','Y', 7)";
        break;
 
 case "remove": // Do stuff when removing extension
@@ -188,8 +188,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "bank";
-
 //
 ?>
index cc369ce4ba34781df0a20790a398d5219a8951bc..70d6e8066a1702ed0c2260a459c7f4c0fe21ecde 100644 (file)
@@ -273,8 +273,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "beg";
-
 //
 ?>
index db31e7deec7d4c2e531a421cef77604badfc2962..4042647e280ec978513e72c77678c3819947a93f 100644 (file)
@@ -198,8 +198,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "birthday";
-
 //
 ?>
index c8d31fc5ff51633ccd49878338ec1650ca34dce0..d2cdcb1c2e6b34ea500a4845d837d91be7945d7c 100644 (file)
@@ -557,8 +557,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "bonus";
-
 //
 ?>
index 63f80c97815d7cd6d7c43e29b7b18951a3db2d45..b5acab720e873c68742cbeb4d037f48017d6bf91 100644 (file)
@@ -206,9 +206,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "cache";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "Y";
 
index e2c8df89cb7faeb57862b7b622c342faebdaa32a..17bda731fe6301ef6692a55b673d700083e48f46 100644 (file)
@@ -114,9 +114,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "country";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "Y";
 
index 642a4ff0cffd7e0587a8817f2e5d52cbf12c9648..a086ed4ab69758aa5053c43f59f4e6475426c788 100644 (file)
@@ -168,9 +168,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "debug";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "Y";
 
index cf3d37c6c0393428f6392297c4e4d8728e3d8aa2..0fcbff1d50111e22138d789541a3ce6eafede551 100644 (file)
@@ -82,8 +82,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "demo";
-
 //
 ?>
index 8364994377e0d5a99b7d57027b6182df2c87b9f6..a55144659ae6bbe17273bb8d43cddd69a94c323b 100644 (file)
@@ -242,8 +242,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "doubler";
-
 //
 ?>
index 35770ecdb552cec5189fde18431a5fb616eb6348..c12bd04a3ee7ff1b06703865e35642a3b29a26c4 100644 (file)
@@ -226,8 +226,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "holiday";
-
 //
 ?>
index e499eb5c9bc39b80f612b1e9e803739412ed7e74..be5255955c9e5cf9cec1162c9c8dbd17d5349ca4 100644 (file)
@@ -164,8 +164,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "html_mail";
-
 //
 ?>
index d6c81a171491325dd2de6008f9c1655dd0ef9d93..16eb4cd4bcfe8bbcc2d08d309f90b90864002a69 100644 (file)
@@ -239,8 +239,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "mailid";
-
 //
 ?>
index 4e41fc8d29451c62a31735cdaf9291a841af66e7..2cbe12a4bd9dd29fcb2a8bd3528488a4709a6be0 100644 (file)
@@ -108,9 +108,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "maintenance";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "Y";
 
index df99e44be7e4c771395e4c8c4f2264882cacc03d..3b3e7149ef021ba5d510554721d3a701eb1f5abe 100644 (file)
@@ -140,9 +140,6 @@ if ((isset($dry_run)) && (isset($EXT_LOAD_MODE)))
        }
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "mediadata";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "Y";
 
index d22292a91a1ab30c77251ef883372bbce20d028f..c41087786736ec6ae62e6b02b8414fe989ae20e6 100644 (file)
@@ -116,8 +116,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "mods";
-
 //
 ?>
index 5dc0bd6a6262d448b05db45f96764fe356bbce76..ba2d35758affd644e2e06a1305f432271f6d5fa0 100644 (file)
@@ -167,8 +167,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "mydata";
-
 //
 ?>
index 3ad4f224e1d90e06a3512cc02455f62318c7574d..877e6ee7ce9786d443fa8b68c51563c3faa426c2 100644 (file)
@@ -172,8 +172,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "newsletter";
-
 //
 ?>
index f2e70756bc4be221939e99d193cef1bae4aec701..67236a2d2602537b2857dcaa19ffd787b282d81d 100644 (file)
@@ -207,8 +207,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "nickname";
-
 //
 ?>
index 804e4dc9b7d50e2e5054a4648f4340344c07d22a..f213def8a731a51d3a1622a1485b7633533552ae 100644 (file)
@@ -115,8 +115,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "online";
-
 //
 ?>
index dbc40d30c706f3750d36bc1821b2da074127bdf0..049244420be49d2a20929d2c8a9132b18f12672d 100644 (file)
@@ -113,9 +113,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "optimize";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "Y";
 
index ff09e7841bd3ad419bdc6991005e939a84d0b6e0..1ea7c1913b65e2768bde61f26efbf1e5d0c95c4c 100644 (file)
@@ -311,8 +311,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "order";
-
 //
 ?>
index e213c22c21dfa05af42539edff8ebcae783ac296..5a1a2919e816156d4411f946076c21ac5f49fe21 100644 (file)
@@ -194,9 +194,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "other";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "Y";
 
index fc56e138795ed8664dbeecee3bc7434c8e811369..5eb38ef5ab1bed56fba7216252bd3ead7897f723 100644 (file)
@@ -242,8 +242,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "payout";
-
 //
 ?>
index 4efe332a6d2bbac59780221ed82ac5af84791add..6610a3a104712148e9e99713c76163c5e9981e8f 100644 (file)
@@ -113,9 +113,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "primera";
-
 // Init array
 global $primera;
 $primera = array();
index 745eabfd02a8ffd512a96bd5c68610b5fb1091e1..9e4854d6c63774f08b9e182f8f8ff3e3c0fe0ff8 100644 (file)
@@ -127,8 +127,6 @@ default: // Do stuff when extension is loaded
        }
        break;
 }
-// Language file prefix
-$EXT_LANG_PREFIX = "profile";
 
 //
 ?>
index ffd56fe5116c5a0de1c0d3bd44afd734a8d95d7c..541692f87f44c38cb2ecb7f06c868d7aa1277d5d 100644 (file)
@@ -344,8 +344,5 @@ LIMIT 1", __FILE__, __LINE__);
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "rallye";
-
 //
 ?>
index de8861e21c6a25c5f163314fc58564e96713af02..164616d7688fb2461090868d7cf0b6c212e36b33 100644 (file)
@@ -111,9 +111,6 @@ if ($EXT_LOAD_MODE == "register") {
        $INC_POOL[] = PATH."inc/gen_refback.php";
 } // END - if
 
-// Language file prefix (hmmm, what shall I write with SQL fixes? ;-) )
-$EXT_LANG_PREFIX = "refback";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "N";
 
index 19385c7d1a321e3f6f5de69c1ad1ef71f7ddafab..26380abf2c0df83fb622bea5a1b6c6c9e23bbc2d 100644 (file)
@@ -325,8 +325,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "register";
-
 //
 ?>
index 18d9ebd918c4acd5472482a89decda9ebc723faf..cabc3e78cd7c2e41c7f25aca8d725cec62ad7a67 100644 (file)
@@ -91,8 +91,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "removeip";
-
 //
 ?>
index c31611dc46fa7dd8275a22ae2b4174f699db0c2e..da8d3baa7f228a82b25b1152f9bc8b8ab4738b07 100644 (file)
@@ -112,8 +112,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "repair";
-
 //
 ?>
index c440439df78dc31bfd2a13b18d5fceb1bfae89fb..2ead6792ff4c446ba316e010b9a7a79f28719ac0 100644 (file)
@@ -165,8 +165,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "rewrite";
-
 //
 ?>
index b747e64f2b6059c4942e2fe7ea80fa6a45135101..d8b9b855f5f9e11be5a95addd8d709887c55d648 100644 (file)
@@ -81,8 +81,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "safe";
-
 //
 ?>
index e1094ba006861f8258c2d901fec358f3ef5d6149..29e9f6487206884857d01dc41d107d4c38a3beba 100644 (file)
@@ -429,8 +429,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "sponsor";
-
 //
 ?>
index 78f1bf2aa8c36aa2a66eef286f3a67509be3ffd9..54cf35517415cb653c2c285671daa0e246466220 100644 (file)
@@ -38,13 +38,13 @@ if (!defined('__SECURITY')) {
 }
 
 // Version number
-$EXT_VERSION = "0.5.6";
+$EXT_VERSION = "0.5.7";
 
 // Auto-set extension version
 if (!isset($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", "0.2.0", "0.2.1", "0.2.2", "0.2.3", "0.2.4", "0.2.5", "0.2.6", "0.2.7", "0.2.8", "0.2.9", "0.3.0", "0.3.1", "0.3.2", "0.3.3", "0.3.4", "0.3.5", "0.3.6", "0.3.7", "0.3.8", "0.3.9", "0.4.0", "0.4.1", "0.4.2", "0.4.3", "0.4.4", "0.4.5", "0.4.6", "0.4.7", "0.4.8", "0.4.9", "0.5.0", "0.5.1", "0.5.2", "0.5.3", "0.5.4", "0.5.5", "0.5.6");
+$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", "0.2.1", "0.2.2", "0.2.3", "0.2.4", "0.2.5", "0.2.6", "0.2.7", "0.2.8", "0.2.9", "0.3.0", "0.3.1", "0.3.2", "0.3.3", "0.3.4", "0.3.5", "0.3.6", "0.3.7", "0.3.8", "0.3.9", "0.4.0", "0.4.1", "0.4.2", "0.4.3", "0.4.4", "0.4.5", "0.4.6", "0.4.7", "0.4.8", "0.4.9", "0.5.0", "0.5.1", "0.5.2", "0.5.3", "0.5.4", "0.5.5", "0.5.6", "0.5.7");
 
 switch ($EXT_LOAD_MODE)
 {
@@ -60,22 +60,22 @@ case "remove": // Do stuff when removing extension
        $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_admin_menu_las_data";
        $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_admin_menu_stats";
        $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_user_stats_data`";
+       $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_user_book`";
 
        // Delete admin menu entries
        $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE
-what='theme_import' OR
-what='theme_edit' OR
-what='config_extensions' OR
-what='config_home' OR
-what='list_unconfirmed' OR
-what='config_refid' OR
-what='config_title' OR
-what='sub_points' OR
-what='config_admin' OR
-what='config_proxy' OR
-what='config_session' OR
-what='list_norefs'
-LIMIT 14";
+`what`='theme_import' OR
+`what`='theme_edit' OR
+`what`='config_extensions' OR
+`what`='config_home' OR
+`what`='list_unconfirmed' OR
+`what`='config_refid' OR
+`what`='config_title' OR
+`what`='sub_points' OR
+`what`='config_admin' OR
+`what`='config_proxy' OR
+`what`='config_session' OR
+LIMIT 13";
 
        // Delete guest menu entries
        $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_guest_menu WHERE action='themes' LIMIT 1";
@@ -83,13 +83,13 @@ LIMIT 14";
        // Delete/update member menu entries
        $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE
 action='themes' OR
-what='themes' OR
-what='stats2' OR
-what='reflist' OR
-(action='stats' AND (what='' OR what IS NULL)) OR
-(action='extras' AND (what='' OR what IS NULL)) OR
-(action='rals' AND (what='' OR what IS NULL)) OR
-(action='account' AND (what='' OR what IS NULL))";
+`what`='themes' OR
+`what`='stats2' OR
+`what`='reflist' OR
+(action='stats' AND (`what`='' OR what IS NULL)) OR
+(action='extras' AND (`what`='' OR what IS NULL)) OR
+(action='rals' AND (`what`='' OR what IS NULL)) OR
+(action='account' AND (`what`='' OR what IS NULL))";
        $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='main' WHERE
 action='stats' OR
 action='extras' OR
@@ -216,12 +216,12 @@ case "update": // Update an extension
                break;
 
        case "0.1.1": // SQL queries for v0.1.1
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title='Home-/Eingangsseite', descr='Stellen Sie hier ein, welcher Men&uuml;punkt (what-welcome ist Standart) als Einstiegspunkt in das Men&uuml;system genutzt werden soll und wie die automatische Weiterleitung in der Eingangsseite funktionieren soll.' WHERE what='config_home' LIMIT 1";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title='Home-/Eingangsseite', descr='Stellen Sie hier ein, welcher Men&uuml;punkt (what-welcome ist Standart) als Einstiegspunkt in das Men&uuml;system genutzt werden soll und wie die automatische Weiterleitung in der Eingangsseite funktionieren soll.' WHERE `what`='config_home' LIMIT 1";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD index_delay TINYINT(3) UNSIGNED NOT NULL DEFAULT '-1'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD index_cookie BIGINT(20) UNSIGNED NOT NULL DEFAULT '31536000'";
 
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "Sie k&ouml;nnen nun <A href=\"".URL."/modules.php?module=admin&amp;what=config_home\">hier</A> die Verz&ouml;gerungszeit in der <A href=\"".URL."/index.php\">Eingangsseite</A> einstellen.";
+               $UPDATE_NOTES = "Sie k&ouml;nnen nun <A href=\"".URL."/modules.php?module=admin&amp;`what`=config_home\">hier</A> die Verz&ouml;gerungszeit in der <A href=\"".URL."/index.php\">Eingangsseite</A> einstellen.";
                break;
 
        case "0.1.2": // SQL queries for v0.1.2
@@ -361,7 +361,7 @@ PRIMARY KEY(id)
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','themes','Designs', 6,'Y','N')";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD curr_theme VARCHAR(255) NOT NULL DEFAULT 'default'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD stats_limit BIGINT(20) UNSIGNED NOT NULL DEFAULT '10'";
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET what='config_stats' WHERE what='stats' LIMIT 1";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET `what`='config_stats' WHERE `what`='stats' LIMIT 1";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "<OL>
@@ -387,8 +387,8 @@ PRIMARY KEY(id)
                break;
 
        case "0.3.0": // SQL queries for v0.3.0
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title='{!POINTS!}/Referal-Ebenen' WHERE what='config_points' LIMIT 1";
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title='Mailverg&uuml;tungen...' WHERE what='payments' LIMIT 1";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title='{!POINTS!}/Referal-Ebenen' WHERE `what`='config_points' LIMIT 1";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title='Mailverg&uuml;tungen...' WHERE `what`='payments' LIMIT 1";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Zwei Men&uuml;punkte umbenannt.";
@@ -489,11 +489,8 @@ PRIMARY KEY (id)
                break;
 
        case "0.3.4": // SQL queries for v0.3.4
-               // List accounts with no referal
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_norefs','Mitglieder ohne Werber','Finden Sie hier alle Mitglieder-Accounts, die von niemandem ({--MAIN_TITLE--} wird in der Mail als Werber angegebenen) geworben wurden.', 7)";
-
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "F&uuml;gt den Men&uuml;punkt &quot;Mitglieder ohne Werber&quot; in die Mitglieder-Management hinzu. Mit dieser neuen Funktion k&ouml;nnen Sie nach Mitglieder-Accounts ohne Werber suchen. TODO-ID #2 CLOSED";
+               $UPDATE_NOTES = "Veraltetes Update (what=list_user&amp;mode=noref)";
                break;
 
        case "0.3.5": // SQL queries for v0.3.5
@@ -504,9 +501,9 @@ PRIMARY KEY (id)
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('rals',NULL,'Rallyes',6,'Y','N')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('account',NULL,'Ihr Account',7,'Y','N')";
                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET sort='8' WHERE action='themes' LIMIT 1";
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='stats', sort='1', title='Klick-Mails' WHERE what='stats' LIMIT 1";
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='account', sort='1', title='Designs' WHERE what='themes' LIMIT 1";
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='extras', sort='3' WHERE what='reflinks' LIMIT 1";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='stats', sort='1', title='Klick-Mails' WHERE `what`='stats' LIMIT 1";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='account', sort='1', title='Designs' WHERE `what`='themes' LIMIT 1";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='extras', sort='3' WHERE `what`='reflinks' LIMIT 1";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";
@@ -552,7 +549,7 @@ PRIMARY KEY (id)
                break;
 
        case "0.4.0": // SQL queries for v0.4.0
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title = 'Email-Management' WHERE action = 'email' AND (what='' OR what IS NULL) LIMIT 1";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title = 'Email-Management' WHERE action = 'email' AND (`what`='' OR what IS NULL) LIMIT 1";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Email-Verwaltung nach Email-Management umbenannt.";
@@ -588,9 +585,9 @@ PRIMARY KEY (id)
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_admin_menu` CHANGE `what` `what` VARCHAR(255) NULL DEFAULT NULL";
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_guest_menu` CHANGE `what` `what` VARCHAR(255) NULL DEFAULT NULL";
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_member_menu` CHANGE `what` `what` VARCHAR(255) NULL DEFAULT NULL";
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET what=NULL WHERE what=''";
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_guest_menu SET what=NULL WHERE what=''";
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET what=NULL WHERE what=''";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET `what`=NULL WHERE `what`=''";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_guest_menu SET `what`=NULL WHERE `what`=''";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET `what`=NULL WHERE `what`=''";
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_admin_menu` DROP INDEX `what`, ADD UNIQUE (`what`)";
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_guest_menu` DROP INDEX `what`, ADD UNIQUE (`what`)";
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_member_menu` ADD INDEX `action` (`action`)";
@@ -704,6 +701,13 @@ INDEX (`stats_type`)
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitglieder k&ouml;nnnen nun z.B. in den Mail-Details zu jeder Mail sehen, wann sie diese best&auml;tigt haben. Die neue Statistik-Tabelle ist aber universell einsetzbar.";
                break;
+
+       case "0.5.7": // SQL queries for v0.5.7
+               $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE what='list_norefs' LIMIT 1";
+
+               // Update notes (these will be set as task text!)
+               $UPDATE_NOTES = "Auflistung der Mitglieder ohne Werber nach what=list_user&amp;mode=norefs verschoben.";
+               break;
        }
        break;
 
@@ -764,9 +768,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix (hmmm, what shall I write with SQL fixes? ;-) )
-$EXT_LANG_PREFIX = "sql_patches";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "Y";
 
index 3737987e321f2e1902ebda0cc970722f8b3ee51e..2c5de7e81b68015fd10211b518d3fe0c3bc29796 100644 (file)
@@ -129,8 +129,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "support";
-
 //
 ?>
index f5e8466ac1e29e9a30ecdbbc6190396f5b12d879..e18f2e011ef2b0e6fc3bc7422d35cd24c9567084 100644 (file)
@@ -230,8 +230,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "surfbar";
-
 //
 ?>
index daaa854ef53db36c6abdbb1a45ce0df585213aa4..7abb45a7762befd56d13805d7a01df301da0948b 100644 (file)
@@ -244,8 +244,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "task";
-
 //
 ?>
index 59a38db105a90c1f7dadc2939c3ef7064e2cbbd7..a49d2d6a26b73e8cd353251fc46c4f30af4036b7 100644 (file)
@@ -114,8 +114,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "theme";
-
 //
 ?>
index ae4028831ad3f17383026b180576c57da92727de..03c9a3de69db99de65c384aa434e635c8bfc3083 100644 (file)
@@ -143,8 +143,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "top10";
-
 //
 ?>
index c9f548d0697b5f5a2a95261d8f0d56f7dce516e7..a1b3d2c0959b76093a3650d4d6153a10463d4627 100644 (file)
@@ -284,8 +284,5 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "transfer";
-
 //
 ?>
index 203bd6e3c2e030ba8b4756454986765cd443e269..265c2135885b300d20f309faf95ff5a36d16d569 100644 (file)
@@ -250,9 +250,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "user";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "Y";
 
index e9d2356dc1392f6f019d43ab963d6288e69d1cd5..6fd0478df3806655c0cdd16538a09b8e5a417ef2 100644 (file)
@@ -135,9 +135,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "wernis";
-
 // Init array
 global $WERNIS;
 $WERNIS = array();
index b03e8fb64b602bd3ee822c0e83ef2e2b04e5d78b..33acb2852901fd2816c9baa6a58f2cee380c7cb2 100644 (file)
@@ -132,9 +132,6 @@ default: // Do stuff when extension is loaded
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "yoomedia";
-
 // Keep this extension always active!
 $EXT_ALWAYS_ACTIVE = "Y";
 
index 8f753838862de646d298e1971b848a5c36c9fcef..70694e75c449baf8e4f3ef561bacd470588d5019 100644 (file)
@@ -2238,7 +2238,7 @@ function mxchange_die ($msg) {
 
 // Display parsing time and number of SQL queries in footer
 function DISPLAY_PARSING_TIME_FOOTER() {
-       global $startTime, $_CONFIG;
+       global $_CONFIG;
        $endTime = microtime(true);
 
        // Is the timer started?
index c24661ff61c8e42871355607636a5b5a2709e9f5..529da02db89ee861181a7366556c030b95ed0f2a 100644 (file)
@@ -517,8 +517,6 @@ define('ACCOUNT_CONFIRMED', "<SPAN class=\"admin_green\">Best&auml;tigt</SPAN>")
 define('ACCOUNT_LOCKED', "Gesperrt");
 define('ACCOUNT_DELETED', "Gel&ouml;scht");
 define('ADMIN_ALL_ACCOUNTS', "Alle Mitglieder-Accounts auflisten");
-define('ADMIN_LIST_LOCKED_ACCOUNTS', "Alle gesperrten Mitglieder-Accounts auflisten");
-define('ADMIN_LIST_CONFIRMED_ACCOUNTS', "Alle best&auml;tigten Mitglieder-Accounts auflisten");
 define('ADMIN_NO_NONE_REGISTERED', "Ihre Suchkriterieren ergaben keine Treffer in der Mitgliederliste. ");
 define('ADMIN_MEMBER_404', "Mitglieds-Account <strong>%s</strong> existiert nicht!");
 define('ADMIN_LAST_ONLINE', "Zuletzt aktiv");
@@ -1223,6 +1221,10 @@ define('MEMBER_REFLIST_ACTIVITY', "Mitglied aktiv?");
 define('MEMBER_REFLIST_COUNTER_1', "In dieser Ebene haben Sie <u>");
 define('MEMBER_REFLIST_COUNTER_2', "</u> Mitglieder geworben.");
 
+// Special user lists (what=list_user)
+define('ADMIN_LIST_STATUS_LOCKED_ACCOUNTS', "Alle gesperrten Mitglieder-Accounts auflisten");
+define('ADMIN_LIST_STATUS_CONFIRMED_ACCOUNTS', "Alle best&auml;tigten Mitglieder-Accounts auflisten");
+define('ADMIN_LIST_MODE_NOREFS_ACCOUNTS', "Alle Mitglieder-Accounts ohne Referrals auflisten");
 
 //
 ?>
index 759c83d64cbf6a2374387d5b79a36ad4149df362..583ec4c8a817bbd5cf9b7055d2ca93d39f9c8729 100644 (file)
@@ -53,13 +53,13 @@ function BEG_ADD_POINTS($uid, $points) {
        } else {
                // Add points to account
                unset($DEPTH);
-               ADD_POINTS_REFSYSTEM($uid, $points, false, "0", $locked, strtolower($_CONFIG['beg_mode']));
+               ADD_POINTS_REFSYSTEM("beg", $uid, $points, false, "0", $locked, strtolower($_CONFIG['beg_mode']));
        }
 
        // Subtract begged points from member account if the admin has selected one
        if ($_CONFIG['beg_uid'] > 0) {
                // Subtract from this account
-               SUB_POINTS($_CONFIG['beg_uid'], $points);
+               SUB_POINTS("beg_payout", $_CONFIG['beg_uid'], $points);
        } // END - if
 }
 
index e6d3f69dd59e756881d2773af51a09296378bfca..3d3a648ebc49bc03874a3bf6242aded6e87fdbd3 100644 (file)
@@ -206,28 +206,23 @@ function BONUS_POINTS_HANDLER($MODE)
        switch ($_CONFIG['bonus_mode'])
        {
        case "JACKPOT": // ... jackpot
-               if ((SUB_JACKPOT($points) == -1) && ($_CONFIG['bonus_uid'] > 0))
-               {
+               if ((SUB_JACKPOT($points) == -1) && ($_CONFIG['bonus_uid'] > 0)) {
                        // Check points amount first...
                        $TOTAL = GET_TOTAL_DATA($_CONFIG['bonus_uid'], "user_points", "points") - GET_TOTAL_DATA($_CONFIG['bonus_uid'], "user_data", "used_points");
-                       if ($TOTAL >= $points)
-                       {
+                       if ($TOTAL >= $points) {
                                // Subtract points from userid's account
-                               SUB_POINTS($_CONFIG['bonus_uid'], $points);
-                       }
-               }
+                               SUB_POINTS("bonus_payout_jackpot", $_CONFIG['bonus_uid'], $points);
+                       } // END - if
+               } // END - if
                break;
 
        case "UID": // ... userid's account
                // Check his amount first
                $TOTAL = GET_TOTAL_DATA($_CONFIG['bonus_uid'], "user_points", "points") - GET_TOTAL_DATA($_CONFIG['bonus_uid'], "user_data", "used_points");
-               if ($TOTAL >= $points)
-               {
+               if ($TOTAL >= $points) {
                        // Subtract points from userid's account
-                       SUB_POINTS($_CONFIG['bonus_uid'], $points);
-               }
-                else
-               {
+                       SUB_POINTS("bonus_payout_uid", $_CONFIG['bonus_uid'], $points);
+               } else {
                        // Try to subtract from jackpot
                        $dummy = SUB_JACKPOT($points);
                }
index af9a01b440409726a0e0b1003fc4150149d577b3..960f78d67a25fa5886e58545e3f9368630783d44 100644 (file)
@@ -406,9 +406,24 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
                        $DATA['info']   = $prices['info'][$key];
                        $DATA['ref']    = $prices['ref'][$key];
 
+                       // Default is other
+                       $winnerLevel = "other";
+
+                       // Determine winner level
+                       if ($DATA['level'] == 1) {
+                               // The winner!
+                               $winnerLevel = "_gold";
+                       } elseif ($DATA['level'] == 2) {
+                               // The vice winner!
+                               $winnerLevel = "_silver";
+                       } elseif ($DATA['level'] == 3) {
+                               // The bronce winner
+                               $winnerLevel = "_bronce";
+                       }
+
                        if ($DATA['points'] > 0) {
                                // Add points directly to user's account
-                               ADD_POINTS_REFSYSTEM($uid, $DATA['points'], false, "0", false, "direct");
+                               ADD_POINTS_REFSYSTEM("rallye_winner" . $winnerLevel, $uid, $DATA['points'], false, "0", false, "direct");
                        } // END - if
 
                        if ($notify == "Y") {
@@ -422,17 +437,7 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
                                }
 
                                // Add suffix to template name
-                               $template = "member_rallye_expired";
-                               if ($DATA['level'] == 1) {
-                                       // The winner!
-                                       $template .= "_gold";
-                               } elseif ($DATA['level'] == 2) {
-                                       // The vice winner!
-                                       $template .= "_silver";
-                               } elseif ($DATA['level'] == 3) {
-                                       // The bronce winner
-                                       $template .= "_bronce";
-                               }
+                               $template = "member_rallye_expired".$winnerLevel;
 
                                // Load template
                                $msg = LOAD_EMAIL_TEMPLATE($template, $DATA, $uid);
index 5d04dde4814bacde57e6cc1a47350eb9f6e3d136..e7a2b5987bf3b957f851c299611117299e4f089e 100644 (file)
@@ -79,7 +79,7 @@ function ADD_REFBACK_POINTS ($uid, $ref, $points, $ref_points) {
 
                                // Add points again, but only directly
                                //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):refback={$refback}<br />\n";
-                               ADD_POINTS_REFSYSTEM($uid, $refback, false, "0", false, "direct");
+                               ADD_POINTS_REFSYSTEM(sprintf("refback:%s", $refid), $uid, $refback, false, "0", false, "direct");
 
                                // Reduce points if refid is found
                                if ($refid == $ref) {
index 3700fab3972bfde28056b928bf3c78979eea311a..2af19cbbb5d65f1779bdfae32f846e40a7be1766 100644 (file)
@@ -818,12 +818,12 @@ function SURFBAR_PAY_POINTS ($urlId) {
        // Remove it from the URL owner
        //DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".SURFBAR_GET_USERID().",costs=".SURFBAR_GET_COSTS()."", false);
        if (SURFBAR_GET_USERID() > 0) {
-               SUB_POINTS(SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
+               SUB_POINTS("surfbar", SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
        } // END - if
 
        // Book it to the user
        //DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".$GLOBALS['userid'].",reward=".SURFBAR_GET_REWARD()."", false);
-       ADD_POINTS_REFSYSTEM($GLOBALS['userid'], SURFBAR_GET_DATA('reward'));
+       ADD_POINTS_REFSYSTEM("surfbar", $GLOBALS['userid'], SURFBAR_GET_DATA('reward'));
 }
 // Updates the statistics of current URL/userid
 function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
index 4cdc14b83fd77c38e319e863ed783523fdc65213..b7c91c62ca47248a999178a92b7957fa8c1f2a08 100644 (file)
@@ -81,7 +81,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        SQL_FREERESULT($result);
 
        if ($value > 0) {
-               define('__CONFIRMED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;mode=confirmed\">".$value."</A>");
+               define('__CONFIRMED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=confirmed\">".$value."</A>");
        } else {
                define('__CONFIRMED_VALUE', "0");
        }
@@ -103,7 +103,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        SQL_FREERESULT($result);
 
        if ($value > 0) {
-               define('__LOCKED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;mode=locked\">".$value."</A>");
+               define('__LOCKED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=locked\">".$value."</A>");
        } else {
                define('__LOCKED_VALUE', "0");
        }
@@ -300,7 +300,7 @@ ORDER BY d.userid";
                $SQLs[]   = "SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE refid='0' ORDER BY userid";
                $DESCRs[] = TASK_ADMIN_LIST_ACCOUNT_NOREF;
                $TITLEs[] = TASK_ADMIN_LIST_ACCOUNT_NOREF_TITLE;
-               $WHATs[]  = "list_norefs";
+               $WHATs[]  = "list_user&amp;mode=norefs";
        }
 
        if (EXT_IS_ACTIVE("payout")) {
index faa279ca7d988c97fbbe148e18c1e22d655f6872..f00c096841e82d32954662a3293af96aef08a770 100644 (file)
@@ -42,7 +42,7 @@ function alpha($sortby, $colspan, $return=false)
 {
        global $_CONFIG;
        if (empty($_GET['offset'])) $_GET['offset'] = 0;
-       $ADD = "&amp;page=".$_GET['page']."&amp;offset=".$_GET['offset'];
+       $ADD = "&amp;page=".SQL_ESCAPE($_GET['page'])."&amp;offset=".SQL_ESCAPE($_GET['offset']);
        if (!empty($_GET['mode'])) $ADD .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
 
        /* Creates the list of letters and makes them a link. */
@@ -93,8 +93,14 @@ function SortLinks($letter, $sortby, $colspan, $return=false)
 {
        $OUT = "";
        if (empty($_GET['offset'])) $_GET['offset'] = 0;
-       $ADD = "&amp;page=".$_GET['page']."&amp;offset=".$_GET['offset'];
-       if (!empty($_GET['mode'])) $ADD .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
+       if (empty($_GET['page']))   $_GET['page'] = 0;
+
+       // Add page and offset
+       $ADD = "&amp;page=".SQL_ESCAPE($_GET['page'])."&amp;offset=".SQL_ESCAPE($_GET['offset']);
+
+       // Add status or mode
+       if (!empty($_GET['status'])) $ADD .= "&amp;mode=".SQL_ESCAPE($_GET['status']);
+        elseif (!empty($_GET['mode'])) $ADD .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
 
        // Makes order by links..
        if ($letter == "front") $letter = _ALL2;
@@ -138,41 +144,39 @@ function SortLinks($letter, $sortby, $colspan, $return=false)
 // Add page navigation
 function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false)
 {
-       if (!$show_form)
-       {
+       if (!$show_form) {
                // Empty row
                define('__FORM_HEADER', "<TR><TD colspan=\"".$colspan."\" class=\"seperator\">&nbsp;</TD></TR>");
-       }
-        else
-       {
+       } else {
                // Load form for changing number of lines
                define('__FORM_HEADER', LOAD_TEMPLATE("admin_list_user_sort_form", true));
        }
-       if (!$show_form)
-       {
+
+       if (!$show_form) {
                // Add line with bottom border
                define('__FORM_FOOTER', "<TR><TD colspan=\"".__COLSPAN2."\" class=\"seperator bottom2\">&nbsp;</TD></TR>");
-       }
-        else
-       {
+       } else {
                // Add line without bottom border
                define('__FORM_FOOTER', "<TR><TD colspan=\"".__COLSPAN2."\" class=\"seperator bottom2\">&nbsp;</TD></TR>");
        }
 
        $OUT = "";
-       for ($page = 1; $page <= $PAGES; $page++)
-       {
-               if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1")))
-               {
+       for ($page = 1; $page <= $PAGES; $page++) {
+               if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) {
                        $OUT .= "<STRONG>-";
-               }
-                else
-               {
+               } else {
                        if (empty($_GET['letter'])) $_GET['letter'] = _ALL2;
                        if (empty($_GET['sortby'])) $_GET['sortby'] = "userid";
+
+                       // Base link
                        $OUT .= "<A href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what'];
-                       if (!empty($_GET['mode'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
-                       $OUT .= "&amp;letter=".$_GET['letter']."&amp;sortby=".$_GET['sortby']."&amp;page=".$page."&amp;offset=".$offset."\">";
+
+                       // Add status or mode
+                       if (!empty($_GET['status'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['status']);
+                        elseif (!empty($_GET['mode'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
+
+                        // Letter and so on
+                       $OUT .= "&amp;letter=".SQL_ESCAPE($_GET['letter'])."&amp;sortby=".SQL_ESCAPE($_GET['sortby'])."&amp;page=".$page."&amp;offset=".$offset."\">";
                }
                $OUT .= $page;
                if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1")))
index b99efa4a150b4e6a4a65dddc33818e3759984183..b05d960fdb23b8be770afed119aa3ce9f64b52b8 100644 (file)
@@ -748,7 +748,7 @@ function ADMIN_MAKE_MENU_SELECTION($menu, $type, $name, $default="") {
        return $OUT;
 }
 //
-function ADMIN_USER_PROFILE_LINK($uid, $title="", $wht="list_user") {
+function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") {
        if (($title == "") && ($title != "0")) {
                // Set userid as title
                $title = $uid;
index db0af358c5b296fb8178d6fbd0e744d2d2c2bd2c..5e84a577fdcb41af2acc4c4111e159df6c7335ac 100644 (file)
@@ -445,7 +445,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                        );
 
                        // Do we have extension task?
-                       if ($type == "EXTENSION") {
+                       if (($type == "EXTENSION") && (!GET_EXT_VERSION($infos) == "")) {
                                // Load extension row template
                                LOAD_TEMPLATE("admin_overview_list_ext_rows", false, $content);
                        } else {
index 87ed2594efd9109fe1109b7ace618f59ef8fb668..f514b885cdee17f65e6ffebc4523d5000e16493f 100644 (file)
@@ -65,7 +65,7 @@ if ($_GET['u_id'] == "all") {
                                        unset($DEPTH);
 
                                        // Ok, add points and send an email to him...
-                                       ADD_POINTS_REFSYSTEM($uid, bigintval($_POST['points']), false, "0", false, "direct");
+                                       ADD_POINTS_REFSYSTEM("admin_all", $uid, bigintval($_POST['points']), false, "0", false, "direct");
 
                                        // Prepare content
                                        $content = array(
@@ -106,7 +106,7 @@ if ($_GET['u_id'] == "all") {
                        unset($DEPTH);
 
                        // Ok, add points and send an email to him...
-                       ADD_POINTS_REFSYSTEM(bigintval($_GET['u_id']), bigintval($_POST['points']), false, "0", false, "direct");
+                       ADD_POINTS_REFSYSTEM("admin_single", bigintval($_GET['u_id']), bigintval($_POST['points']), false, "0", false, "direct");
 
                        // Prepare content
                        $content = array(
index ca1e16b0c1e2154694c44576823e2d40b6a9020d..13d4b6ef0f947647e3ff6b843e92feb8ee3f9366 100644 (file)
@@ -105,7 +105,7 @@ WHERE s.pool_id=%s LIMIT 1",
 
                                        // Pay back points
                                        //* DEBUG: */ echo "PAYBACK:".$sender."<br />\n";
-                                       ADD_POINTS_REFSYSTEM($sender, $totalPoints, true, "0", false,"direct");
+                                       ADD_POINTS_REFSYSTEM("mail_deleted", $sender, $totalPoints, true, "0", false,"direct");
 
                                        // Output message
                                        if ($_CONFIG['repay_deleted_mails'] == 'REPAY') {
index a541084bacefccf7e0653f1571cce42d00bdf993..f87b68fd319130d505ca122256bd7490eb3d0a92 100644 (file)
@@ -1,190 +1,3 @@
 <?php
-/************************************************************************
- * MXChange v0.2.1                                    Start: 01/19/2006 *
- * ================                             Last change: 01/19/2006 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : what-list_norefs.php                             *
- * -------------------------------------------------------------------- *
- * Short description : Show all members w/o a referal                   *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Alle Mitgliederaccounts ohne Werber auflisten    *
- * -------------------------------------------------------------------- *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
- *                                                                      *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
- * (at your option) any later version.                                  *
- *                                                                      *
- * This program is distributed in the hope that it will be useful,      *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- * GNU General Public License for more details.                         *
- *                                                                      *
- * You should have received a copy of the GNU General Public License    *
- * along with this program; if not, write to the Free Software          *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
- * MA  02110-1301  USA                                                  *
- ************************************************************************/
-
-// Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
-} elseif ((!EXT_IS_ACTIVE("user")) || (GET_EXT_VERSION("user") == "")) {
-       // Not active!
-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));
-       return;
-}
-
-// Add description as navigation point
-ADD_DESCR("admin", __FILE__);
-
-$MORE = ", userid"; $colspan = "4"; //                 27
-if (EXT_IS_ACTIVE("nickname")) { $MORE = ", nickname"; }
-
-if (empty($_GET['letter'])) { $_GET['letter'] = _ALL2;    }
-if (empty($_GET['sortby'])) { $_GET['sortby'] = "userid"; }
-if (empty($_GET['page']))   { $_GET['page']   = "1";      }
-
-// Set base URL
-$BASE = "[<A href=\"".URL."/modules.php?module=admin";
-
-$whereStatement = " WHERE refid=0";
-if (($_GET['letter'] != _ALL2) && ($_GET['letter'] != _OTHERS) && (!empty($_GET['letter']))) {
-       // List only persons w
-       $whereStatement = " WHERE refid=0 AND family LIKE '".$_GET['letter']."%'";
-}
-
-// Fix sorter
-if ($_GET['sortby'] == "family_name") $_GET['sortby'] = "family";
-
-// Construct query
-$SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE."
-FROM "._MYSQL_PREFIX."_user_data
-".$whereStatement."
-ORDER BY ".SQL_ESCAPE($_GET['sortby']);
-
-// Start master query
-$result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
-
-// Calculate page count (0.5 fixes a bug with page count)
-$PAGES = round(SQL_NUMROWS($result_master) / $_CONFIG['user_limit'] + 0.5);
-
-if (empty($_GET['page']))   $_GET['page']   = "1";
-if (empty($_GET['offset'])) $_GET['offset'] = $_CONFIG['user_limit'];
-
-// Add limitation to SQL string and run him again
-$SQL .= " LIMIT ".($_GET['offset'] * $_GET['page'] - $_GET['offset']).", ".$_GET['offset'];
-$result = SQL_QUERY($SQL, __FILE__, __LINE__);
-
-$result_user = SQL_QUERY("SELECT emails_sent FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED'", __FILE__, __LINE__);
-$user_count = SQL_NUMROWS($result_user);
-SQL_FREERESULT($result_user);
-
-if (SQL_NUMROWS($result_master) > 0)
-{
-       // We have some (new?) registrations!
-       define('__COLSPAN1'  , $colspan);
-       define('__COLSPAN2'  , ($colspan + 2));
-       define('__USER_CNT'  , $user_count);
-       define('__ALPHA_SORT', alpha($_GET['sortby'], $colspan, true));
-       define('__SORT_LINKS', SortLinks($_GET['letter'], $_GET['sortby'], $colspan, true));
-       define('__TITLE'     , ADMIN_LIST_NOREFS_ACCOUNTS);
-
-       if ($PAGES > 1) {
-               // Add navigation
-               define('__PAGE_NAV', ADD_PAGENAV($PAGES, $_CONFIG['user_limit'], true, $colspan, true));
-       } else {
-               // No page navigation is required
-               define('__PAGE_NAV', "");
-       }
-
-       // Column with nickname when nickname extension is present
-       if (EXT_IS_ACTIVE("nickname")) {
-               // Nickname extension found
-               define('__NICKNAME_TH', "  <TD class=\"admin_title bottom2\" align=\"center\">".NICKNAME."</TD>");
-       } else {
-               // Not found
-               define('__NICKNAME_TH', "");
-       }
-
-       $SW = 2; $OUT = "";
-       while (list($uid, $gender, $sname, $fname, $email, $IP, $ref, $status, $emails_sent, $mails_confirmed, $emails_received, $nick) = SQL_FETCHROW($result)) {
-               // Get unconfirmed emails
-               $LINKS = GET_TOTAL_DATA($uid, "user_links", "id", "userid", true);
-
-               // Set link to unconfirmed emails
-               if ($LINKS > 0) {
-                       // Translate value
-                       $LINKS = TRANSLATE_COMMA($LINKS);
-
-                       // Add link
-                       $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".$LINKS."</A>]";
-               } // END - if
-
-               // Add nickname
-               if ((empty($nick)) || ($uid == $nick)) $nick = "---";
-
-               // Sent emails
-               $SENT = $emails_sent;
-               if ($emails_sent > 0) $SENT = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".TRANSLATE_COMMA($emails_sent)."</A>]";
-
-               // Calculate total points
-               $pointsTotal = GET_TOTAL_DATA($uid, "user_points", "points")  - GET_TOTAL_DATA($uid, "user_data", "used_points");
-
-               // Clickrate
-               $clickRate = 0;
-               if ($emails_received > 0) {
-                       $clickRate = $mails_confirmed / $emails_received * 100;
-               } // END - if
-
-               // Transfer data to array
-               $content = array(
-                       'sw'     => $SW,
-                       'uid'    => ADMIN_USER_PROFILE_LINK($uid),
-                       'gender' => TRANSLATE_GENDER($gender),
-                       'sname'  => $sname,
-                       'fname'  => $fname,
-                       'email'  => "[<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>]",
-                       'addr'   => $IP,
-                       'ref'    => $ref,
-                       'status' => TRANSLATE_STATUS($status),
-                       'links'  => $LINKS,
-                       'alinks' => MEMBER_ACTION_LINKS($uid, $status),
-                       'nick'   => $nick,
-                       'points' => TRANSLATE_COMMA($pointsTotal),
-                       'sent'   => $SENT,
-                       'rate'   => TRANSLATE_COMMA($clickRate),
-                       'locked' => TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "locked_points"))
-               );
-
-               // Load row template and switch colors
-               $OUT .= LOAD_TEMPLATE("admin_list_user_row", true, $content);
-               $SW = 3 - $SW;
-       } // END - while
-
-       // Free memory
-       SQL_FREERESULT($result);
-
-       define('__USER_ROWS', $OUT);
-
-       // Load main template
-       LOAD_TEMPLATE("admin_list_user");
-
-       // Free some memory
-       SQL_FREERESULT($result_master);
-} else {
-       // No one as registered so far! :-(
-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ACCOUNT_NOREFS_404);
-}
-
-// Free memory
-SQL_FREERESULT($result_master);
-
-//
+// DEPRECATED!
 ?>
index 22dd312f094242c0876578ad0cf94349dba66392..8c87950462018ddbd1a6a589006685b964502cd8 100644 (file)
@@ -184,7 +184,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                        );
 
                        // Do we have an extension task?
-                       if ($type == "EXTENSION") {
+                       if (($type == "EXTENSION") && (GET_EXT_VERSION($infos) == "")) {
                                // Load extension row template
                                LOAD_TEMPLATE("admin_list_task_ext_rows", false, $content);
                        } else {
index ea3997ab6eb46ff131441d3c5662edafdf21955a..7b7579ce63d2a17d10ad2493e5ea839dc685716f 100644 (file)
@@ -46,10 +46,13 @@ ADD_DESCR("admin", __FILE__);
 
 // Init title with "all accounts"
 $listHeader = ADMIN_ALL_ACCOUNTS;
-if (!empty($_GET['mode'])) {
+if (!empty($_GET['status'])) {
+       // Set title according to the "status"
+       $listHeader = constant(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(SQL_ESCAPE($_GET['status']))));
+} elseif (!empty($_GET['mode'])) {
        // Set title according to the "mode"
-       $listHeader = constant(sprintf("ADMIN_LIST_%s_ACCOUNTS", strtoupper(SQL_ESCAPE($_GET['mode']))));
-} // END - if
+       $listHeader = constant(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(SQL_ESCAPE($_GET['mode']))));
+}
 
 // Remember it
 define('__TITLE', $listHeader);
@@ -72,6 +75,12 @@ if (GET_EXT_VERSION("user") >= "0.3.4") {
        } // END - if
 } // END - if
 
+// Is the extension "country" installed?
+if (EXT_IS_ACTIVE("country")) {
+       // Add country code
+       $MORE .= ", country_code";
+} // END - if
+
 // Init unset data (bad that we change $_GET here!)
 if (empty($_GET['letter'])) { $_GET['letter'] = _ALL2;    }
 if (empty($_GET['sortby'])) { $_GET['sortby'] = "userid"; }
@@ -125,6 +134,9 @@ LIMIT 1",
                $DATA['locked']            = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "locked_points"));
                $DATA['lock_timestamp']    = MAKE_DATETIME($DATA['lock_timestamp'], "2");
 
+               // Is the lock reason not set?
+               if (!isset($DATA['lock_reason'])) $DATA['lock_reason'] = "---";
+
                // Nickname inclusion?
                if (EXT_IS_ACTIVE("nickname")) {
                        // Nickname not set or invalid? Then 
@@ -150,6 +162,15 @@ LIMIT 1",
                $DATA['mails_confirmed'] = TRANSLATE_COMMA($DATA['mails_confirmed']);
                $DATA['emails_received'] = TRANSLATE_COMMA($DATA['emails_received']);
 
+               // Is the extension "country" installed?
+               if (EXT_IS_ACTIVE("country")) {
+                       // Then overwrite country information
+                       $DATA['country'] = COUNTRY_GENERATE_INFO($DATA['country_code']);
+               } elseif ($DATA['country'] == 0) {
+                       // Zero ID???
+                       $DATA['country'] = "???";
+               }
+
                // Load user-details template
                LOAD_TEMPLATE("admin_user_details", false, $uid);
        } else {
@@ -167,17 +188,34 @@ LIMIT 1",
        } // END - if
        if ($_GET['sortby'] == "family_name") $_GET['sortby'] = "family";
 
-       // Parse the mode parameter
-       if (isset($_GET['mode'])) {
+       // Parse the status or mode parameter
+       if (isset($_GET['status'])) {
                // Is a WHERE statement already there?
                if (!empty($whereStatement)) {
                        // Then append the status column
-                       $whereStatement .= sprintf(" AND status='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['mode']))));
+                       $whereStatement .= sprintf(" AND status='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['status']))));
                } else {
                        // Start a new one
-                       $whereStatement = sprintf(" WHERE status='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['mode']))));
+                       $whereStatement = sprintf(" WHERE status='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['status']))));
                }
-       } // END - if
+       } elseif (isset($_GET['mode'])) {
+               // Choose what we need to list
+               switch ($_GET['mode']) {
+                       case "norefs": // Users w/o refs
+                               if (!empty($whereStatement)) {
+                                       // Add AND statement
+                                       $whereStatement .= " AND refid=0";
+                               } else {
+                                       // Add WHERE statement
+                                       $whereStatement = " WHERE refid=0";
+                               }
+                               break;
+
+                       default: // Invalid list mode
+                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", SQL_ESCAPE($_GET['mode'])));
+                               break;
+               }
+       } // END = if
 
        // Prepare SQL and run it
        $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".SQL_ESCAPE($_GET['sortby']);
@@ -270,13 +308,25 @@ LIMIT 1",
                        $content['gender'] = TRANSLATE_GENDER($content['gender']);
                        $content['email']  = "[<A href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</A>]";
                        $content['addr']   = $content['REMOTE_ADDR'];
-                       $content['status'] = TRANSLATE_STATUS($content['status']);
                        $content['links']  = $LINKS;
                        $content['alinks'] = MEMBER_ACTION_LINKS($content['userid'], $content['status']);
                        $content['points'] = TRANSLATE_COMMA($pointsTotal);
                        $content['rate']   = TRANSLATE_COMMA($clickRate);
                        $content['locked'] = TRANSLATE_COMMA(GET_TOTAL_DATA($content['userid'], "user_points", "locked_points"));
                        $content['lock_timestamp'] = MAKE_DATETIME($content['lock_timestamp'], "2");
+                       $content['status'] = TRANSLATE_STATUS($content['status']);
+
+                       // Is the lock reason not set?
+                       if (!isset($content['lock_reason'])) $content['lock_reason'] = "---";
+
+                       // Is the extension "country" installed?
+                       if (EXT_IS_ACTIVE("country")) {
+                               // Then overwrite country information
+                               $content['country'] = COUNTRY_GENERATE_INFO($content['country_code']);
+                       } elseif ($content['country'] == 0) {
+                               // Zero ID???
+                               $content['country'] = "???";
+                       }
 
                        // Load row template and switch colors
                        $OUT .= LOAD_TEMPLATE("admin_list_user_row", true, $content);
index 26731b6a5e39999e2237881ab1466618db0119c6..e16508200fc34bdcaa0a91897acb0c9fcf2a33f5 100644 (file)
@@ -64,7 +64,7 @@ if ($_GET['u_id'] == "all")
                                if ((isset($_POST['ok'])) && (!empty($_POST['points'])))
                                {
                                        // Ok, add points to used points and send an email to him...
-                                       SUB_POINTS($uid, $_POST['points']);
+                                       SUB_POINTS("admin_all", $uid, $_POST['points']);
 
                                        // Prepare content
                                        $content = array(
@@ -104,7 +104,7 @@ if ($_GET['u_id'] == "all")
                if ((isset($_POST['ok'])) && (!empty($_POST['points'])))
                {
                        // Ok, add to used points and send an email to him...
-                       SUB_POINTS(bigintval($_GET['u_id']), $_POST['points']);
+                       SUB_POINTS("admin_single", bigintval($_GET['u_id']), $_POST['points']);
 
                        // Prepare content
                        $content = array(
index 1eba1b02c7deb1b5694d35185f6190a387046253..a4b0bedfcca00ea4996524995b580a112723037b 100644 (file)
@@ -93,7 +93,7 @@ if (!empty($_GET['hash'])) {
 
                                        // Add one-time referal bonus over referal system or directly
                                        unset($DEPTH);
-                                       ADD_POINTS_REFSYSTEM($rid, $_CONFIG['points_ref'], true, bigintval($uid), $locked, $_CONFIG['reg_points_mode']);
+                                       ADD_POINTS_REFSYSTEM("referal_bonus", $rid, $_CONFIG['points_ref'], true, bigintval($uid), $locked, $_CONFIG['reg_points_mode']);
                                } // END - if
                        } // END - if
 
index 9a555afefac2caaced3f24cfa115067694a7b810..dccd81ffb80efda2ba69cd8a0761c0d6b5f67790 100644 (file)
@@ -192,7 +192,7 @@ ORDER BY p.payout_timestamp DESC",
                                define('PAYOUT_POINTS_VALUE', $PAYOUT);
 
                                // Subtract points from member's account
-                               SUB_POINTS($GLOBALS['userid'], $PAYOUT);
+                               SUB_POINTS("payout", $GLOBALS['userid'], $PAYOUT);
 
                                // Add entry to his tranfer history
                                if ($allow == "Y")
index ed27dd0bedb0f4656081cb75388fbe6f64e65f95..7b3a4f13f011fc25522277f921d644995fdfe50c 100644 (file)
@@ -194,7 +194,7 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
                                        } // END - if
 
                                        // Remove points from account
-                                       SUB_POINTS($GLOBALS['userid'], $_POST['amount']);
+                                       SUB_POINTS("primera_payout", $GLOBALS['userid'], $_POST['amount']);
 
                                        // Update primera nickname
                                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET `primera_userid`=%s WHERE userid=%s LIMIT 1",
index ffbe1fc3b8378e58b0c43b443f6b9dab855344f0..7af1122af8a3bd185fb0bfbb7c664c784cd9d413 100644 (file)
@@ -192,10 +192,10 @@ case "new": // Start new transfer
                                __FILE__, __LINE__);
 
                        // Add points to account *directly* ...
-                       ADD_POINTS_REFSYSTEM(bigintval($_POST['to_uid']), bigintval($_POST['points']), false, "0", false, "direct");
+                       ADD_POINTS_REFSYSTEM("member_transfer", bigintval($_POST['to_uid']), bigintval($_POST['points']), false, "0", false, "direct");
 
                        // ... and add it to current user's used points
-                       SUB_POINTS($GLOBALS['userid'], $_POST['points']);
+                       SUB_POINTS("transfer", $GLOBALS['userid'], $_POST['points']);
 
                        // First send email to recipient
                        $msg = LOAD_EMAIL_TEMPLATE("member_transfer_recipient", "", __RECIPIENT_UID);
index 627ac41651dea3f0093dba0ad5018d1bec572062..84ca9cd0353da9a9c092ca920ecb5ba6362de590 100644 (file)
@@ -233,7 +233,7 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
                                        if ($success) {
                                                // Add it to this amount
                                                unset($DEPTH);
-                                               ADD_POINTS_REFSYSTEM($GLOBALS['userid'], bigintval($_POST['amount']), false, 0, false, "direct");
+                                               ADD_POINTS_REFSYSTEM("wernis_withdraw", $GLOBALS['userid'], bigintval($_POST['amount']), false, 0, false, "direct");
 
                                                // Update the user data as well..
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET `wernis_userid`=%s WHERE userid=%s LIMIT 1",
@@ -268,7 +268,7 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
                                        $success = WERNIS_EXECUTE_PAYOUT($_POST['wds66_id'], $_POST['amount']);
                                        if ($success) {
                                                // Sub points
-                                               SUB_POINTS($GLOBALS['userid'], $_POST['amount']);
+                                               SUB_POINTS("wernis_payout", $GLOBALS['userid'], $_POST['amount']);
 
                                                // Update WDS66 id
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET `wernis_userid`=%s WHERE userid=%s LIMIT 1",
index 9d24c7d4eda36a12223b95d4944c17c41673a226..c2b8ad87324d4f7007d8b48852a3478d3faf6848 100644 (file)
@@ -87,7 +87,7 @@ if (empty($URL)) {
                // Update used points
                $ADD = "";
                if ($_CONFIG['order_max_full'] == "ORDER") $ADD = ", mail_orders=mail_orders+1";
-               SUB_POINTS($GLOBALS['userid'], $USED);
+               SUB_POINTS("order", $GLOBALS['userid'], $USED);
 
                // Prepare content
                $content = array(
index fde8d234f21ea8855fc3cf168be201bbe191c1c5..f9019b0cc0fb78bc057bee2046c475c9bb9f4950 100644 (file)
@@ -74,7 +74,7 @@ LIMIT %s",
                // Load our winners...
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Add points to user's account directly
-                       ADD_POINTS_REFSYSTEM($content['userid'], $content['points'], false, "0", false, "direct");
+                       ADD_POINTS_REFSYSTEM("monthly_beg", $content['userid'], $content['points'], false, "0", false, "direct");
 
                        // Translate gender/points
                        $content['gender'] = TRANSLATE_GENDER($content['gender']);
index c11ad3c823703cee6d2a9e64e5cd969416ddeacf..281c08a0438e3fbe2abe79cce500cc5fe08dec50 100644 (file)
@@ -88,7 +88,7 @@ ORDER BY active_bonus DESC, userid LIMIT %s",
                        // Make sure zero points are not mailed
                        if ($content['points'] > 0) {
                                // Add points to user's account directly
-                               ADD_POINTS_REFSYSTEM($content['uid'], $content['points'], false, "0", false, "direct");
+                               ADD_POINTS_REFSYSTEM("monthly_bonus", $content['uid'], $content['points'], false, "0", false, "direct");
 
                                // Translate gender/points
                                $content['gender'] = TRANSLATE_GENDER($content['gender']);
index 9db7dff257043192bb2cfd845fb5973c552fe54b..8f8e5cd41d760e6f51c304ea5c1e4da407626378 100644 (file)
@@ -148,7 +148,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                        // Administrative functions
                                        require_once(PATH."inc/modules/admin/admin-inc.php");
                                } // END - if
-                               //* DEBUG: */ ADD_POINTS_REFSYSTEM(36,1000);
+                               //* DEBUG: */ ADD_POINTS_REFSYSTEM("test", 36, 1000);
                                //* DEBUG: */ die();
 
                                // Get all values
index 9524124961ccf2dba68518fb007a2f45bb4d1183..02eeb4f87c6a07152a723363ad7dd903672be6c9 100644 (file)
@@ -1151,6 +1151,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
  *
  * Dynamic referal system, can also send mails!
  *
+ * subject     = Subject line, write in lower-case letters and underscore is allowed
  * uid         = Referal ID wich should receive...
  * points      = ... xxx points
  * send_notify = shall I send the referal an email or not?
@@ -1159,7 +1160,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
  * add_mode    = Add points only to $uid or also refs? (WARNING! Changing "ref" to "direct"
  *               for default value will cause no referal will get points ever!!!)
  */
-function ADD_POINTS_REFSYSTEM ($uid, $points, $send_notify=false, $rid="0", $locked=false, $add_mode="ref") {
+function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid="0", $locked=false, $add_mode="ref") {
        //* DEBUG: */ print "----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n";
        global $DEPTH, $_CONFIG, $DATA, $cacheArray;
 
@@ -1173,6 +1174,12 @@ function ADD_POINTS_REFSYSTEM ($uid, $points, $send_notify=false, $rid="0", $loc
                return;
        } // END - if
 
+       // Add booking record if extension is installed
+       if (EXT_IS_ACTIVE("booking")) {
+               // Add record
+               ADD_BOOKING_RECORD($subject, $uid, $points, "add");
+       } // END - if
+
        // Count up referal depth
        if (!isset($DEPTH)) {
                // Initialialize referal system
@@ -1271,7 +1278,7 @@ function ADD_POINTS_REFSYSTEM ($uid, $points, $send_notify=false, $rid="0", $loc
                        if (($ref > 0) && ($points > 0) && ($ref != $uid) && ($add_mode == "ref")) {
                                // Then let's credit him here...
                                //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},ref={$ref},points={$points} - ADVANCE!<br />\n";
-                               ADD_POINTS_REFSYSTEM($ref, $points, $send_notify, $ref, $locked);
+                               ADD_POINTS_REFSYSTEM(sprintf("%s_ref:%s", $subject, $DEPTH), $ref, $points, $send_notify, $ref, $locked);
                        } // END - if
                } // END - if
        } // END - if
@@ -1831,18 +1838,26 @@ function MODULE_HAS_MENU($mod, $forceDb = false)
        // Return status
        return $ret;
 }
+
 // Subtract points from database and mediadata cache
-function SUB_POINTS ($uid, $points) {
+function SUB_POINTS ($subject, $uid, $points) {
        // Add points to used points
        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET `used_points`=`used_points`+%s WHERE userid=%s LIMIT 1",
         array($points, bigintval($uid)), __FILE__, __LINE__);
 
+       // Insert booking record
+       if (EXT_IS_ACTIVE("booking")) {
+               // Add record
+               ADD_BOOKING_RECORD($subject, $uid, $points, "sub");
+       } // END - if
+
        // Update mediadata as well
        if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
                // Update database
                MEDIA_UPDATE_ENTRY(array("total_points"), "sub", $points);
        } // END - if
 }
+
 // Update config entries
 function UPDATE_CONFIG ($entries, $values, $updateMode="") {
        // Do we have multiple entries?
@@ -1887,6 +1902,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
        // Rebuild cache
        REBUILD_CACHE("config", "config");
 }
+
 // Creates a new task for updated extension
 function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $subject, $notes) {
        // Check if task is not there
@@ -1901,6 +1917,7 @@ function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $subject, $notes) {
        // Free memory
        SQL_FREERESULT($result);
 }
+
 // Creates a new task for newly installed extension
 function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) {
        // Not installed and do we have created a task for the admin?
index baa7f89c3e94d8ea72878a35ed156caf51b35df7..bc5ea6fd70f24a4611bac1df906d3e5e2b634650 100644 (file)
@@ -270,7 +270,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                                if ($uid > 0) {
                                                        // User does not exists, pay points back
                                                        $points = GET_PAY_POINTS($DATA[5]);
-                                                       ADD_POINTS_REFSYSTEM($DATA[1], $points, false, "0", false, "direct");
+                                                       ADD_POINTS_REFSYSTEM("pool_payback", $DATA[1], $points, false, "0", false, "direct");
 
                                                        // Add points together and remove user
                                                        $points_BACK[$DATA[1]] += $points;
index 94122d284caf97c66387dec648fae20a6bff16d8..840c381fe02d21ec8d3b383aa2ef10a8ee95b40f 100644 (file)
@@ -86,6 +86,9 @@ INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`lo
 INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N');\r
 INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','order','Mailbuchung',8,'Y','N');\r
 INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbest&auml;tigte Emails',5,'Y','N');\r
+INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','stats','Statistiken', 'Y','N',9);\r
+INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','support','Support ','Y','N',10);\r
+INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('logout','guest','Zum Gastmen&uuml;','Y','N',1000);\r
 \r
 INSERT INTO `mxchange_payments` VALUES (1,10,2.000,'Klick-Mail 10 Sek.',1.000);\r
 INSERT INTO `mxchange_payments` VALUES (2,20,10.000,'Klick-Mail 20 Sek.',9.000);\r
@@ -106,10 +109,6 @@ INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUE
 INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','updates','Updates pr&uuml;fen','Pr&uuml;ft, ob eine neue Version oder ein Patch auf dem Server exisitiert. Sie m&uuml;ssen dann die Patches/Updates selber herunterladen und einspielen. Dabei werden keine Daten von Ihrer Installation an uns gesendet!','8');\r
 INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, l&ouml;schen usw.','8');\r
 \r
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','stats','Statistiken', 'Y','N',9);\r
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','support','Support ','Y','N',10);\r
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('logout','guest','Zum Gastmen&uuml;','Y','N',1000);\r
-\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken','7','Y','N');\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('online',NULL,'Jetzt Online','2','Y','N');\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin',NULL,'Administrative Links','3','N','N');\r
index 94122d284caf97c66387dec648fae20a6bff16d8..840c381fe02d21ec8d3b383aa2ef10a8ee95b40f 100644 (file)
@@ -86,6 +86,9 @@ INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`lo
 INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N');\r
 INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','order','Mailbuchung',8,'Y','N');\r
 INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbest&auml;tigte Emails',5,'Y','N');\r
+INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','stats','Statistiken', 'Y','N',9);\r
+INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','support','Support ','Y','N',10);\r
+INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('logout','guest','Zum Gastmen&uuml;','Y','N',1000);\r
 \r
 INSERT INTO `mxchange_payments` VALUES (1,10,2.000,'Klick-Mail 10 Sek.',1.000);\r
 INSERT INTO `mxchange_payments` VALUES (2,20,10.000,'Klick-Mail 20 Sek.',9.000);\r
@@ -106,10 +109,6 @@ INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUE
 INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','updates','Updates pr&uuml;fen','Pr&uuml;ft, ob eine neue Version oder ein Patch auf dem Server exisitiert. Sie m&uuml;ssen dann die Patches/Updates selber herunterladen und einspielen. Dabei werden keine Daten von Ihrer Installation an uns gesendet!','8');\r
 INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, l&ouml;schen usw.','8');\r
 \r
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','stats','Statistiken', 'Y','N',9);\r
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','support','Support ','Y','N',10);\r
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('logout','guest','Zum Gastmen&uuml;','Y','N',1000);\r
-\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken','7','Y','N');\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('online',NULL,'Jetzt Online','2','Y','N');\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin',NULL,'Administrative Links','3','N','N');\r
index a61ce990cc9d81376faf058e81f654164c4720fb..921effc2eef02796b4b23e833fd231049f5ded3d 100644 (file)
@@ -239,7 +239,7 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
 
                                                                                // Add points
                                                                                unset($DEPTH);
-                                                                               ADD_POINTS_REFSYSTEM($url_uid, $payment, false, "0", $locked);
+                                                                               ADD_POINTS_REFSYSTEM("mailid_okay", $url_uid, $payment, false, "0", $locked);
 
                                                                                // Shall I add bonus points for "turbo clickers" ?
                                                                                if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (function_exists('BONUS_ADD_TURBO_POINTS'))) {
@@ -271,7 +271,7 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
                                                                        } else {
                                                                                // Wrong image code! So add points to sender's account
                                                                                unset($DEPTH);
-                                                                               ADD_POINTS_REFSYSTEM($sender, $payment, false, 0, false, "direct");
+                                                                               ADD_POINTS_REFSYSTEM("mailid_payback", $sender, $payment, false, 0, false, "direct");
 
                                                                                // Load template
                                                                                LOAD_TEMPLATE("mailid_points_failed");
index 89ec2ec01b18337199fdcfa75f2ce7b7ec382aa4..57fe6cf4362a8753917552fc37553f49adc075ec 100644 (file)
@@ -1,2 +1,2 @@
 Hier k&ouml;nnten Ihre News stehen. Das Template finden Sie unter
-<EM>{!PATH!}/templates/de/html/member/member_welcome.tpl</EM>
+<EM>{!PATH!}/templates/de/html/member/member_welcome.tpl</EM>.
index 0d27c59a2e04c88c5e5d403e13f88a916d852baf..e52df9a25c47b6b217c4a2d4c4c9ba2e3192c55c 100644 (file)
@@ -1,4 +1,4 @@
-<NOSCRIPT>{--LOAD_URL_ERROR_1--}$content{--LOAD_URL_ERROR_2--}</NOSCRIPT>
+<NOSCRIPT>{--LOAD_URL_ERROR_1--}<A href="$content" rel="external" title="$content">$content</A>{--LOAD_URL_ERROR_2--}</NOSCRIPT>
 <SCRIPT language="JavaScript" type="text/javascript">
 <!--
 document.location.href='$content';