From: Roland Häder Date: Sun, 12 Oct 2008 04:41:56 +0000 (+0000) Subject: Extension 'debug' introduced (dummy!), fix for guest/member menu sorting, typos fixed X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=aa106991e88b0dab33bf2a2d2409638e26a4c656 Extension 'debug' introduced (dummy!), fix for guest/member menu sorting, typos fixed --- diff --git a/.gitattributes b/.gitattributes index 601a343714..4d8da6f023 100644 --- a/.gitattributes +++ b/.gitattributes @@ -73,6 +73,7 @@ DOCS/validator.sh -text /click.php -text /confirm.php -text /css.php -text +/debug.php -text /doubler.php -text /img.php -text inc/.htaccess -text @@ -107,6 +108,7 @@ inc/extensions/ext-birthday.php -text inc/extensions/ext-bonus.php -text inc/extensions/ext-cache.php -text inc/extensions/ext-country.php -text +inc/extensions/ext-debug.php -text inc/extensions/ext-demo.php -text inc/extensions/ext-doubler.php -text inc/extensions/ext-holiday.php -text @@ -163,6 +165,7 @@ inc/language/bonus_de.php -text inc/language/cache_de.php -text inc/language/country_de.php -text inc/language/de.php -text +inc/language/debug_de.php -text inc/language/doubler_de.php -text inc/language/en.ph -text inc/language/en.php -text @@ -203,6 +206,7 @@ inc/libs/autopurge_functions.php -text inc/libs/bonus_functions.php -text inc/libs/cache_functions.php -text inc/libs/country_functions.php -text +inc/libs/debug_functions.php -text inc/libs/doubler_functions.php -text inc/libs/holiday_functions.php -text inc/libs/html_mail_functions.php -text @@ -1152,6 +1156,7 @@ templates/de/html/ext/ext_birthday.tpl -text templates/de/html/ext/ext_bonus.tpl -text templates/de/html/ext/ext_cache.tpl -text templates/de/html/ext/ext_country.tpl -text +templates/de/html/ext/ext_debug.tpl -text templates/de/html/ext/ext_demo.tpl -text templates/de/html/ext/ext_doubler.tpl -text templates/de/html/ext/ext_holiday.tpl -text diff --git a/debug.php b/debug.php new file mode 100644 index 0000000000..7fefdf8c6d --- /dev/null +++ b/debug.php @@ -0,0 +1,53 @@ + diff --git a/inc/databases.php b/inc/databases.php index 426a0ee578..437dab5071 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -113,7 +113,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "501"); +define('CURR_SVN_REVISION', "502"); // 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- b/inc/extensions/ext- index a60ee01b4b..c01dd2979b 100644 --- a/inc/extensions/ext- +++ b/inc/extensions/ext- @@ -50,9 +50,6 @@ switch ($EXT_LOAD_MODE) { case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run - - // Load CSS file? - $EXT_CSS = 'Y'; break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php index 7b3e4dafcc..c108fb0d33 100644 --- a/inc/extensions/ext-active.php +++ b/inc/extensions/ext-active.php @@ -97,7 +97,7 @@ case "update": // Update an extension case "0.0.5": // SQL queries for v0.0.5 $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD active_limit BIGINT(20) UNSIGNED NOT NULL DEFAULT '10'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_active','Aktiv-Liste','Einstellungen an der Aktiv-Liste (Heute Online im Gastbereich) vornehmen.', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_active','Aktiv-Liste','Einstellungen an der Aktiv-Liste (Heute Online im Gastbereich) vornehmen.', 8)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Aktiven-Liste im Gastbereich ist nun einschränkbar."; diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php index 192c9838a7..746aa0d227 100644 --- a/inc/extensions/ext-autopurge.php +++ b/inc/extensions/ext-autopurge.php @@ -262,7 +262,7 @@ default: // Do stuff when extension is loaded // Language file prefix $EXT_LANG_PREFIX = "autopurge"; -// Extension is always active? +// Keep this extension always active! $EXT_ALWAYS_ACTIVE = "Y"; // diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index 75416b5512..f959f1dc21 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -50,7 +50,7 @@ switch ($EXT_LOAD_MODE) { case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_beg','Bettel-Link','IP-Sperre, {!POINTS!}-Vergütung usw. können Sie hier einstellen.', 10)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_beg','Bettel-Link','IP-Sperre, {!POINTS!}-Vergütung usw. können Sie hier einstellen.', 10)"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','beg','{!POINTS!} erbetteln!',4,'Y','Y')"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','beg','Ihr Bettel-Link',6,'Y','Y')"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '600'"; @@ -162,7 +162,7 @@ case "update": // Update an extension $VIS = "N"; $LOCKED = "Y"; if (EXT_IS_ACTIVE("beg")) { $VIS = "Y"; $LOCKED = "N"; } $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','beg2','Bettel-Rallye','".$VIS."','".$LOCKED."','7')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('user','list_beg','Bettel-Rallye','Listet alle Teilnehmer der monatlichen Bettel-Rallye auf.','12')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_beg','Bettel-Rallye','Listet alle Teilnehmer der monatlichen Bettel-Rallye auf.','12')"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Optionale Bettel-Rallye möglich. Und die erbettelten {!POINTS!} können entweder nur dem bettelndem Mitglied direkt oder auch seinem Werber gutgeschrieben werden können."; diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php index d4516d5575..63f80c9781 100644 --- a/inc/extensions/ext-cache.php +++ b/inc/extensions/ext-cache.php @@ -209,7 +209,7 @@ default: // Do stuff when extension is loaded // Language file prefix $EXT_LANG_PREFIX = "cache"; -// Extension is always active? +// Keep this extension always active! $EXT_ALWAYS_ACTIVE = "Y"; // diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php index 85f5e932a2..e2c8df89cb 100644 --- a/inc/extensions/ext-country.php +++ b/inc/extensions/ext-country.php @@ -62,8 +62,8 @@ PRIMARY KEY(id) $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_countries (code, descr, is_active) VALUES ('DE','Deutschland','Y')"; // Admin menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('country', NULL, 'Ländercodes verwalten','Stellen Sie hier Ländercodes ein, damit auch internationale Mitglieder sich zu Ihrem ".MT_WORD." anmelden können.', 8)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('country','list_country','Verwalten','Hinzufügen, Ändern und Löschen von Ländercodes.', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('country', NULL, 'Ländercodes verwalten','Stellen Sie hier Ländercodes ein, damit auch internationale Mitglieder sich zu Ihrem ".MT_WORD." anmelden können.', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('country','list_country','Verwalten','Hinzufügen, Ändern und Löschen von Ländercodes.', 1)"; // Add entry to user table $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD country_code BIGINT(20) UNSIGNED NOT NULL DEFAULT '1'"; @@ -117,7 +117,7 @@ default: // Do stuff when extension is loaded // Language file prefix $EXT_LANG_PREFIX = "country"; -// Extension is always active? +// Keep this extension always active! $EXT_ALWAYS_ACTIVE = "Y"; // diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php new file mode 100644 index 0000000000..8339bd4482 --- /dev/null +++ b/inc/extensions/ext-debug.php @@ -0,0 +1,176 @@ + client connection + $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_debug_client_log`"; + $SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_debug_client_log` ( +`id` BIGINT(20) NOT NULL AUTO_INCREMENT, +`client_id` BIGINT(20) NOT NULL DEFAULT 1, +`log_id` BIGINT(20) NOT NULL DEFAULT 0, +INDEX `client_log` (`client_id`,`log_id`), +UNIQUE (`log_id`), +PRIMARY KEY (`id`) +) TYPE=MyISAM COMMENT='Debug client <-> log connection'"; + + // Guest menus + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug',NULL,'Debug-System','Y','Y',2)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_info','Informationen','Y','Y',1)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_reg','Anmeldung','Y','Y',2)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_unreg','Abmeldung','Y','Y',3)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_pilory','Pranger','Y','Y',4)"; + + // Admin menu + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug',NULL,'Debug-System','Verwalten Sie hier komfortabel das debug.log, welches sich im Verzeichnis inc/cache/ befindet.',10)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','import_debug','debug.log importieren','Importieren Sie hier manuell die debug.log, damit neue Einträge mit bestehenden abgeglichen werden können und dann evtl. hinzugefügt werden. Die debug.log wird nach dem Import automatisch vom Server entfernt. Dieser Vorgang wird für Sie nachts automatisch erledigt!',1)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','list_debug','Einträge anzeigen','Listet alle bereits importierten Einträge auf. Von hier aus versenden Sie noch nicht gemeldete Fehler an das Relay-Netzwerk, damt diese vom MXChange-Team geprüft werden können.',2)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','reg_debug','Am Server anmelden','Sie müssen zuerst Ihren Debug-Client (Ihr {!MT_WORD!} ist dies) oder Relay am Server von MXChange.org anmelden. Dies geschieht für Sie nicht automatisch, da Sie Ihre Daten zuvor überprüfen müssen, wie z.B. URL, eMail-Adresse und {!MT_WORD!}-Titel.',3)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','unreg_debug','Vom Server abmelden','Melden Sie bitte Ihren {!MT_WORD!} wieder vom MXChange-Server ab, damit das Team von MXChange.org weiss, welche Keys nicht mehr genutzt werden.',4)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','config_debug','Einstellungen','Ändern Sie hier alle Einstellungen, wie auch den Debug-Modus - ob Client, Hub oder selber Server sein. Lesen Sie dazu die Anleitung unter DOCs/de/debug/README.txt durch! Oder kommen Sie in's Forum. Das Team von MXChange.org hilft Ihnen gerne weiter.',5)"; + + // Config entries + $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `debug_id` BIGINT(20) NOT NULL DEFAULT 0"; + $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `debug_key` VARCHAR(255) NOT NULL DEFAULT ''"; + $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `debug_mode` ENUM('CLIENT','RELAY','SERVER') NOT NULL DEFAULT 'CLIENT'"; + $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `debug_new_log` ENUM('ACCEPT','FIRST','REG') NOT NULL DEFAULT 'FIRST'"; + $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `debug_new_client` ENUM('ACTIVE','NEW','REG') NOT NULL DEFAULT 'NEW'"; + $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `debug_reject_log` BIGINT(20) NOT NULL DEFAULT ".($_CONFIG['one_day'] * 30).""; + break; + +case "remove": // Do stuff when removing extension + // SQL commands to run + $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_debug_client_log`"; + $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_debug_client`"; + $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_debug_log`"; + $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_debug_log_abuse`"; + $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_guest_menu` WHERE `action`='debug' LIMIT 5"; + $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE `action`='debug' LIMIT 6"; + break; + +case "activate": // Do stuff when admin activates this extension + // SQL commands to run + $SQLs[] = "UPDATE `"._MYSQL_PREFIX."_guest_menu` SET `visible`='Y',`locked`='N' WHERE `action`='debug' LIMIT 5"; + break; + +case "deactivate": // Do stuff when admin deactivates this extension + // SQL commands to run + $SQLs[] = "UPDATE `"._MYSQL_PREFIX."_guest_menu` SET `locked`='Y' WHERE `action`='debug' LIMIT 5"; + break; + +case "update": // Update an extension + switch ($EXT_VER) + { + case "0.0.1": // SQL queries for v0.0.1 + $SQLs[] = ""; + + // Update notes (these will be set as task text!) + $UPDATE_NOTES = ""; + break; + } + break; + +default: // Do stuff when extension is loaded + break; +} + +// Language file prefix +$EXT_LANG_PREFIX = "debug"; + +// Keep this extension always active! +$EXT_ALWAYS_ACTIVE = "Y"; + +// +?> diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index 503e85e99e..35770ecdb5 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -83,7 +83,7 @@ case "remove": // Do stuff when removing extension $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE what='holiday' LIMIT 1"; $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='holiday' LIMIT 4"; $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_max_receive WHERE value='0' LIMIT 1"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_max_receive (value, comment) VALUES('0','Urlaub')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_max_receive (value, comment) VALUES ('0','Urlaub')"; break; case "activate": // Do stuff when admin activates this extension diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php index 02204d499d..4e41fc8d29 100644 --- a/inc/extensions/ext-maintenance.php +++ b/inc/extensions/ext-maintenance.php @@ -51,7 +51,7 @@ switch ($EXT_LOAD_MODE) case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD maintenance ENUM('Y','N') NOT NULL DEFAULT 'N';"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','maintenance','Wartungsmodus','Schalten Sie den Wartungsmodus ein, nur wenn sehr schwerwiegende Fehler vorliegen, die Sie oder mxchange.org nicht schenll genug beheben können.','10')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','maintenance','Wartungsmodus','Schalten Sie den Wartungsmodus ein, nur wenn sehr schwerwiegende Fehler vorliegen, die Sie oder mxchange.org nicht schenll genug beheben können.','10')"; break; case "remove": // Do stuff when removing extension @@ -111,7 +111,7 @@ default: // Do stuff when extension is loaded // Language file prefix $EXT_LANG_PREFIX = "maintenance"; -// Extension is always active? +// Keep this extension always active! $EXT_ALWAYS_ACTIVE = "Y"; // diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php index bdc66a1802..df99e44be7 100644 --- a/inc/extensions/ext-mediadata.php +++ b/inc/extensions/ext-mediadata.php @@ -113,7 +113,7 @@ PRIMARY KEY(media_key) case "0.0.7": // SQL queries for v0.0.7 $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD mt_start BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD mt_stage BIGINT(20) UNSIGNED NOT NULL DEFAULT '500'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_mediadata','Mediendaten','Stellen Sie allgemeine Einstellungen zu den Mediendaten ein.', 10)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_mediadata','Mediendaten','Stellen Sie allgemeine Einstellungen zu den Mediendaten ein.', 10)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Start des ".MT_WORD2." und Anzahl Anmeldungen aufgenommen. (Task #13)
@@ -143,7 +143,7 @@ if ((isset($dry_run)) && (isset($EXT_LOAD_MODE))) // Language file prefix $EXT_LANG_PREFIX = "mediadata"; -// Extension is always active? +// Keep this extension always active! $EXT_ALWAYS_ACTIVE = "Y"; // diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php index 642e8307cf..f2e70756bc 100644 --- a/inc/extensions/ext-nickname.php +++ b/inc/extensions/ext-nickname.php @@ -107,7 +107,7 @@ case "update": // Update an extension $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nickname_len TINYINT(3) UNSIGNED NOT NULL DEFAULT '5'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nickname_pattern VARCHAR(255) NOT NULL DEFAULT 'a-zA-Z0-9_'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nickname_chars VARCHAR(255) NOT NULL DEFAULT 'a-z, A-Z, 0-9, _'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_nickname','Nicknamen','Stellen Sie minimale Nicknamenlänge, sowie erlaubte Zeichen hier ein.', 12)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_nickname','Nicknamen','Stellen Sie minimale Nicknamenlänge, sowie erlaubte Zeichen hier ein.', 12)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Minimale Länge, sowie erlaubte Zeichen sind per Adminbereich änderbar. Setzen Sie als erlaubte Zeichen nur URL-konforme Zeichen ein!"; @@ -178,7 +178,7 @@ case "update": // Update an extension break; case "0.1.9": // SQL queries for v0.1.9 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('user','list_nickname','Nickname-Historie','Listet alle verwendeten Nicknames der Mitglieder auf.', 12)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_nickname','Nickname-Historie','Listet alle verwendeten Nicknames der Mitglieder auf.', 12)"; $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_nickname_history"; $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_nickname_history ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php index 7e450d82d1..804e4dc9b7 100644 --- a/inc/extensions/ext-online.php +++ b/inc/extensions/ext-online.php @@ -67,7 +67,7 @@ PRIMARY KEY(id), KEY(userid), KEY(refid) ) TYPE=MyISAM"; - $SQLs[]="INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('misc','usr_online','Online-Statistik','Eine Liste von derzeit "Online" Usern. Doppelte Einträge könnte auf mangelnden Cookie-Support des Browsers oder auf einen Spider hindeuten.', 1)"; + $SQLs[]="INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','usr_online','Online-Statistik','Eine Liste von derzeit "Online" Usern. Doppelte Einträge könnte auf mangelnden Cookie-Support des Browsers oder auf einen Spider hindeuten.', 1)"; break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-optimize.php b/inc/extensions/ext-optimize.php index b9e3053df0..dbc40d30c7 100644 --- a/inc/extensions/ext-optimize.php +++ b/inc/extensions/ext-optimize.php @@ -116,7 +116,7 @@ default: // Do stuff when extension is loaded // Language file prefix $EXT_LANG_PREFIX = "optimize"; -// Extension is always active? +// Keep this extension always active! $EXT_ALWAYS_ACTIVE = "Y"; // diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php index 0c84baa6ac..cccb167859 100644 --- a/inc/extensions/ext-other.php +++ b/inc/extensions/ext-other.php @@ -197,7 +197,7 @@ default: // Do stuff when extension is loaded // Language file prefix $EXT_LANG_PREFIX = "other"; -// Extension is always active? +// Keep this extension always active! $EXT_ALWAYS_ACTIVE = "Y"; // diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php index cb5b9bf1e6..fc56e13879 100644 --- a/inc/extensions/ext-payout.php +++ b/inc/extensions/ext-payout.php @@ -72,9 +72,9 @@ rate DOUBLE(22,3) UNSIGNED NOT NULL DEFAULT '0.000', min_points BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY(id) ) TYPE=MyISAM"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_payouts','Auszahlungen','Auszahlungsarten einstellen, neu anlegen oder löschen.','15')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('payouts','list_payouts','Anfragen auflisten','Listet alle Auszahlungsanfragen Ihrer Mitglieder auf.','16')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('main','payout','Auszahlungen','N','N','11')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_payouts','Auszahlungen','Auszahlungsarten einstellen, neu anlegen oder löschen.','15')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('payouts','list_payouts','Anfragen auflisten','Listet alle Auszahlungsanfragen Ihrer Mitglieder auf.','16')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','payout','Auszahlungen','N','N','11')"; break; case "remove": // Do stuff when removing extension @@ -99,7 +99,7 @@ case "update": // Update an extension switch ($EXT_VER) { case "0.1.2": // SQL queries for v0.1.2 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('payouts', NULL, 'Auszahlungsmanagement','Management der Auszahlungsarten.','8')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('payouts', NULL, 'Auszahlungsmanagement','Management der Auszahlungsarten.','8')"; $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET action='payouts', title='Einstellungen' WHERE action='setup' AND what='config_payouts' LIMIT 1"; break; diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php index eb378ec7f0..4efe332a6d 100644 --- a/inc/extensions/ext-primera.php +++ b/inc/extensions/ext-primera.php @@ -74,12 +74,12 @@ PRIMARY KEY(id) $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD primera_userid VARCHAR(255) NOT NULL DEFAULT ''"; // Admin menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('primera', NULL, 'Primera-Management','Konfiguration zur Primera-API einstellen, Auszahlungen auflisten usw..', 15)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('primera','config_primera','Primera-API-Einstellungen','Konfiguration zur Primera-API einstellen.', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('primera','list_primera','Primera-Anfragen auflisten','Listet alle Primera-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('primera', NULL, 'Primera-Management','Konfiguration zur Primera-API einstellen, Auszahlungen auflisten usw..', 15)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('primera','config_primera','Primera-API-Einstellungen','Konfiguration zur Primera-API einstellen.', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('primera','list_primera','Primera-Anfragen auflisten','Listet alle Primera-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)"; // Member menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('main','primera','Primera-Ein-/Auszahlungen','N','N','11')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','primera','Primera-Ein-/Auszahlungen','N','N','11')"; break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index 479f50667c..c1c60df94b 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -87,14 +87,14 @@ KEY (userid), PRIMARY KEY(id) ) TYPE=MyISAM"; // Admin menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.','9')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('rallye','add_rallye','Neue Rallye hinzufügen','Neue Ref-Rallye hinzufügen.','1')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('rallye','config_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.','2')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.','3')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.','9')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','add_rallye','Neue Rallye hinzufügen','Neue Ref-Rallye hinzufügen.','1')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','config_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.','2')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.','3')"; // Guest menu $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','rallyes','Ref-Rallyes','Y','Y','9')"; // Member menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('main','rallyes','Ref-Rallyes','Y','Y','9')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','rallyes','Ref-Rallyes','Y','Y','9')"; break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php index f14dfd5e9c..120aaf2560 100644 --- a/inc/extensions/ext-refback.php +++ b/inc/extensions/ext-refback.php @@ -91,8 +91,8 @@ case "update": // Update an extension $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD refback_enabled ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD refback_min_perc TINYINT(3) NOT NULL DEFAULT 0"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD refback_max_perc TINYINT(3) NOT NULL DEFAULT 100"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_refback','Refback','Ändern Sie Einstellungen zum Refback, wie z.B. Minium- und Maximum-Prozente, was die Mitglieder einstellen dürfen.',15)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('user','list_refback','Refback auflisten','Refback aller Mitglieder auflisten.',15)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_refback','Refback','Ändern Sie Einstellungen zum Refback, wie z.B. Minium- und Maximum-Prozente, was die Mitglieder einstellen dürfen.',15)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_refback','Refback auflisten','Refback aller Mitglieder auflisten.',15)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Refback-System ist nun ein-/ausschaltbar und minimale/maximale Refback-Prozente sind festlegbar."; @@ -114,7 +114,7 @@ if ($EXT_LOAD_MODE == "register") { // Language file prefix (hmmm, what shall I write with SQL fixes? ;-) ) $EXT_LANG_PREFIX = "refback"; -// Extension is always active? +// Keep this extension always active! $EXT_ALWAYS_ACTIVE = "N"; // diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index a9a071a9b3..f6d025021e 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -92,7 +92,7 @@ PRIMARY KEY(id) $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('city','Y')"; // Add admin menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_register','Pflichtfelder','Stellen Sie hier die Pflichtfelder sowohl im Anmeldeformular, als auch im Mitgliedsbereich unter Profildaten ändern ein.', 12)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_register','Pflichtfelder','Stellen Sie hier die Pflichtfelder sowohl im Anmeldeformular, als auch im Mitgliedsbereich unter Profildaten ändern ein.', 12)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Einstellbare Pflichtfelder hinzugefügt."; diff --git a/inc/extensions/ext-removeip.php b/inc/extensions/ext-removeip.php index 3e71c56f53..18d9ebd918 100644 --- a/inc/extensions/ext-removeip.php +++ b/inc/extensions/ext-removeip.php @@ -59,7 +59,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD `removeip_member_show` ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD `removeip_sponsor_show` ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD `anonymous_ip` ENUM('127.0.0.1','0.0.0.0','RANDOM') NOT NULL DEFAULT '127.0.0.1'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_removeip','Anonymität/Privatsphähre','Stellen Sie hier ein, ob die IP-Nummer, User-Agent und/oder Referer-Adresse anonymisiert im gesamten Script verwendet werden soll.',15)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_removeip','Anonymität/Privatsphähre','Stellen Sie hier ein, ob die IP-Nummer, User-Agent und/oder Referer-Adresse anonymisiert im gesamten Script verwendet werden soll.',15)"; break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index d9126a87c7..65f9888201 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -298,7 +298,7 @@ PRIMARY KEY(id) // Add default entries // $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_registry (ext_name, is_active, aid, stamp_added) VALUES ('sponsor','N','".GET_ADMIN_ID(get_session('admin_login'))."','UNIX_TIMESTAMP()')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_action_convert (ext_name, conv_rate, conv_name) VALUES('sponsor','10','Mails')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_action_convert (ext_name, conv_rate, conv_name) VALUES ('sponsor','10','Mails')"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_paytypes (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Standart-Paket', 5, 1000.00000, '€')"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_paytypes (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Spar-Paket', 1, 200.00000, '€')"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_paytypes (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Power-Paket', 10, 2000.00000, '€')"; @@ -344,24 +344,24 @@ PRIMARY KEY(id) // // Add default menus to sponsor menu // - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('main', NULL, 'Hauptauswahl','N', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('main','welcome','Willkommen','N', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('main','account','Ihr Account','N', 2)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('main','campaigns','Kampagnen','N', 3)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('main','urls','URL-Verwaltung','N', 4)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('main','banner','Banner-Verwaltung','N', 5)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('main','settings','Einstellungen','N', 6)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('main','fillup','Konto auffüllen','N', 7)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('main','stats','Statistiken','N', 8)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('main','inquiry','Kontaktanfrage','N', 9)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('main','refid','Referal-Link','N', 10)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('actions', NULL, 'Sponsorenaktionen','N', 2)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('actions','mail','Sponsor-Mail','N', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('actions','banner','Banner buchen','N', 2)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('actions','text','Textlink buchen','N', 3)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('logout', NULL, 'Ausloggen','N', 3)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('logout','logout','Ausloggen','N', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES('logout','guest','Zum Gastbereich','N', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main', NULL, 'Hauptauswahl','N', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','welcome','Willkommen','N', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','account','Ihr Account','N', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','campaigns','Kampagnen','N', 3)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','urls','URL-Verwaltung','N', 4)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','banner','Banner-Verwaltung','N', 5)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','settings','Einstellungen','N', 6)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','fillup','Konto auffüllen','N', 7)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','stats','Statistiken','N', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','inquiry','Kontaktanfrage','N', 9)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','refid','Referal-Link','N', 10)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('actions', NULL, 'Sponsorenaktionen','N', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('actions','mail','Sponsor-Mail','N', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('actions','banner','Banner buchen','N', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('actions','text','Textlink buchen','N', 3)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('logout', NULL, 'Ausloggen','N', 3)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('logout','logout','Ausloggen','N', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('logout','guest','Zum Gastbereich','N', 2)"; // // General configuration stuff // diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index 1a6e0b7ea6..9b0bed6a62 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -767,7 +767,7 @@ default: // Do stuff when extension is loaded // Language file prefix (hmmm, what shall I write with SQL fixes? ;-) ) $EXT_LANG_PREFIX = "sql_patches"; -// Extension is always active? +// Keep this extension always active! $EXT_ALWAYS_ACTIVE = "Y"; // diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index 7566b5a2ea..3b10fc0f06 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -119,28 +119,28 @@ INDEX (`status`) ) TYPE=MyISAM COMMENT='Surfbar Member Actions'"; // Member actions - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('PENDING','RETREAT','DELETED')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('PENDING','FRAMETEST',NULL)"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('ACTIVE','EDIT','PENDING')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('ACTIVE','DELETE','DELETED')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('ACTIVE','PAUSE','STOPPED')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('ACTIVE','FRAMETEST',NULL)"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('LOCKED','DELETE','DELETED')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('LOCKED','FRAMETEST',NULL)"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('LOCKED','RESUBMIT','PENDING')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('STOPPED','EDIT','PENDING')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('STOPPED','DELETE','DELETED')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('STOPPED','UNPAUSE','PENDING')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('DEPLETED','EDIT','PENDING')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('DEPLETED','DELETE','DELETED')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('REJECTED','EDIT','PENDING')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('REJECTED','DELETE','DELETED')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('REJECTED','FRAMETEST',NULL)"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('REJECTED','RESUBMIT','PENDING')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('MIGRATED','EDIT','PENDING')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('MIGRATED','DELETE','DELETED')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('MIGRATED','FRAMETEST',NULL)"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES('MIGRATED','BOOKNOW','PENDING')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','RETREAT','DELETED')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','FRAMETEST',NULL)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','EDIT','PENDING')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','DELETE','DELETED')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','PAUSE','STOPPED')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','FRAMETEST',NULL)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('LOCKED','DELETE','DELETED')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('LOCKED','FRAMETEST',NULL)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('LOCKED','RESUBMIT','PENDING')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('STOPPED','EDIT','PENDING')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('STOPPED','DELETE','DELETED')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('STOPPED','UNPAUSE','PENDING')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('DEPLETED','EDIT','PENDING')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('DEPLETED','DELETE','DELETED')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','EDIT','PENDING')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','DELETE','DELETED')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','FRAMETEST',NULL)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','RESUBMIT','PENDING')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','EDIT','PENDING')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','DELETE','DELETED')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','FRAMETEST',NULL)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','BOOKNOW','PENDING')"; // Config entries $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_pay_model` ENUM('STATIC','DYNAMIC') NOT NULL DEFAULT 'STATIC'"; diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index 9d3c4655b7..64a17c749f 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -138,7 +138,7 @@ case "update": // Update an extension case "0.2.1": // SQL queries for v0.2.1 $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD user_alpha TINYINT(3) UNSIGNED NOT NULL DEFAULT '10'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_user','Mitgliederliste','Anzahl Mitglieder pro Seite, Anzahl Buchstaben pro Zeile usw.', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_user','Mitgliederliste','Anzahl Mitglieder pro Seite, Anzahl Buchstaben pro Zeile usw.', 8)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "User-Liste ist konfigurierbar: Anzahl Mitglieder pro Seite und Anzahl Buchstaben pro Zeile; Template-Fehler beseitigt."; @@ -182,7 +182,7 @@ case "update": // Update an extension break; case "0.2.9": // SQL queries for v0.2.9 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('user','user_contct','Mitglied kontaktieren','Kontaktieren Sie hier Ihre Mitglieder ganz direkt über ein Webformular. Sie brauchen somit kein EMail-Programm mehr starten!', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','user_contct','Mitglied kontaktieren','Kontaktieren Sie hier Ihre Mitglieder ganz direkt über ein Webformular. Sie brauchen somit kein EMail-Programm mehr starten!', 8)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Admin-Kontaktformular hinzugefügt."; @@ -219,7 +219,7 @@ default: // Do stuff when extension is loaded // Language file prefix $EXT_LANG_PREFIX = "user"; -// Extension is always active? +// Keep this extension always active! $EXT_ALWAYS_ACTIVE = "Y"; // diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php index 097c7c879a..6cd48a34ee 100644 --- a/inc/extensions/ext-wernis.php +++ b/inc/extensions/ext-wernis.php @@ -76,15 +76,15 @@ PRIMARY KEY(id) $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD wernis_userid VARCHAR(6) NOT NULL DEFAULT ''"; // Admin menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('wernis', NULL, 'Wernis-Management','Konfiguration zur WDS66-API einstellen, Auszahlungen auflisten usw..', 15)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('wernis','config_wernis','WDS66-API-Einstellungen','Konfiguration zur WDS66-API einstellen.', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('wernis','list_wernis','Wernis-Anfragen auflisten','Listet alle Wernis-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('wernis', NULL, 'Wernis-Management','Konfiguration zur WDS66-API einstellen, Auszahlungen auflisten usw..', 15)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('wernis','config_wernis','WDS66-API-Einstellungen','Konfiguration zur WDS66-API einstellen.', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('wernis','list_wernis','Wernis-Anfragen auflisten','Listet alle Wernis-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)"; // Member menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('main','wernis','Wernis-Ein-/Auszahlungen','N','N', 11)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','wernis','Wernis-Ein-/Auszahlungen','N','N', 11)"; // Guest menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('main','wernis_portal','WDS66-News','N','N', 7)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','wernis_portal','WDS66-News','N','N', 7)"; break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php index f6d1876e65..b03e8fb64b 100644 --- a/inc/extensions/ext-yoomedia.php +++ b/inc/extensions/ext-yoomedia.php @@ -63,8 +63,8 @@ case "register": // Do stuff when installation is running (modules.php?module=ad $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_requests_remain` SMALLINT(6) NOT NULL DEFAULT 200"; // Admin menu - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_yoomedia','Yoo!Media Interface 2.0','Einstellungen zum Yoo!Media Interface 2.0, wie User-ID, Interface-Passwort und vieles mehr.',17)"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES('email','list_yoomedia_tm','Yoo!Media Textmails','Listet Textmail-Buchungen über das Interface 2.0 von Yoo!Media nach Ihren eingestellten Kriterien auf. Vorsicht: Jede Aktualisierung dieser Liste kostet Ihnen eine Abfrage!',10)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_yoomedia','Yoo!Media Interface 2.0','Einstellungen zum Yoo!Media Interface 2.0, wie User-ID, Interface-Passwort und vieles mehr.',17)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','list_yoomedia_tm','Yoo!Media Textmails','Listet Textmail-Buchungen über das Interface 2.0 von Yoo!Media nach Ihren eingestellten Kriterien auf. Vorsicht: Jede Aktualisierung dieser Liste kostet Ihnen eine Abfrage!',10)"; // Reload lock table $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_yoomedia_reload`"; @@ -135,7 +135,7 @@ default: // Do stuff when extension is loaded // Language file prefix $EXT_LANG_PREFIX = "yoomedia"; -// Extension is always active? +// Keep this extension always active! $EXT_ALWAYS_ACTIVE = "Y"; // diff --git a/inc/language/debug_de.php b/inc/language/debug_de.php new file mode 100644 index 0000000000..0804f3ded2 --- /dev/null +++ b/inc/language/debug_de.php @@ -0,0 +1,41 @@ + diff --git a/inc/libs/debug_functions.php b/inc/libs/debug_functions.php new file mode 100644 index 0000000000..946eee3884 --- /dev/null +++ b/inc/libs/debug_functions.php @@ -0,0 +1,41 @@ + diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index 3d2f171611..beebdc41cd 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -203,7 +203,7 @@ function SPONSOR_HANDLE_SPONSOR(&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_ST $VALUES = str_repeat("%s', '", count($DATA['values']) - 1); // Generate string - $SQL = "INSERT INTO "._MYSQL_PREFIX."_sponsor_data (".$KEYS.") VALUES('".$VALUES."%s')"; + $SQL = "INSERT INTO "._MYSQL_PREFIX."_sponsor_data (".$KEYS.") VALUES ('".$VALUES."%s')"; // Generate message $MSG = SPONSOR_SET_MESSAGE(ADMIN_SPONSOR_ADDED, "added", $MSGs); diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 4e7497906f..37d3c94306 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -466,7 +466,7 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) { if (empty($uid)) $uid = 0; // Just run the insert query for now - SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid,url,status,views_max,views_allowed) VALUES(%s,'%s','%s','%s','%s')", + SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid,url,status,views_max,views_allowed) VALUES (%s,'%s','%s','%s','%s')", array( $uid, $urlData['url'], @@ -806,7 +806,7 @@ function SURFBAR_LOCKDOWN_ID ($urlId) { //* //DEBUG: */ print "LOCK!"); ///* //DEBUG: */ return; // Just add it to the database - SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_locks (userid, url_id) VALUES(%s, %s)", + SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_locks (userid, url_id) VALUES (%s, %s)", array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__); // Remove the salt from database @@ -852,7 +852,7 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () { // Was that update okay? if (SQL_AFFECTEDROWS() < 1) { // No, then insert entry - SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_stats (userid,url_id,count) VALUES(%s,%s,1)", + SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_stats (userid,url_id,count) VALUES (%s,%s,1)", array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__); } // END - if @@ -880,7 +880,7 @@ function SURFBAR_UPDATE_SALT_STATS () { // Was that okay? if (SQL_AFFECTEDROWS() < 1) { // Insert missing entry! - SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_salts (url_id,userid,last_salt) VALUES(%s, %s, '%s')", + SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_salts (url_id,userid,last_salt) VALUES (%s, %s, '%s')", array(SURFBAR_GET_ID(), $GLOBALS['userid'], SURFBAR_GET_SALT()), __FILE__, __LINE__); } // END - if diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php index 4e05960e9a..2308b81fa5 100644 --- a/inc/libs/wernis_functions.php +++ b/inc/libs/wernis_functions.php @@ -328,7 +328,7 @@ function WERNIS_TRANSFER_STATUS ($status) { // Log the transfer function WERNIS_LOG_TRANSFER ($wdsId, $amount, $type = 'FAILED', $message = "", $status = "") { // Register this wernis movement - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_wernis (`userid`, `wernis_account`, `wernis_amount`, `wernis_timestamp`, `wernis_type`, `wernis_api_message`, `wernis_api_status`) VALUES(%d, %d, %d, UNIX_TIMESTAMP(), '%s', '%s', '%s')", + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_wernis (`userid`, `wernis_account`, `wernis_amount`, `wernis_timestamp`, `wernis_type`, `wernis_api_message`, `wernis_api_status`) VALUES (%d, %d, %d, UNIX_TIMESTAMP(), '%s', '%s', '%s')", array($GLOBALS['userid'], bigintval($wdsId), bigintval($amount), $type, $message, $status), __FILE__, __LINE__); } diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php index 54bc990178..10132b66d1 100644 --- a/inc/libs/yoomedia_functions.php +++ b/inc/libs/yoomedia_functions.php @@ -248,7 +248,7 @@ function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) { $mode = YOOMEDIA_CONVERT_MODE($mode); // Add the entry - $result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES('%s',%s,%s,'0000-00-00 00:00')", + $result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')", array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__); } // END - if } @@ -343,7 +343,7 @@ function YOOMEDIA_RELOAD_LOCK ($data, $mode) { $mode = YOOMEDIA_CONVERT_MODE($mode); // Add the entry - $result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES('%s',%s,%s)", + $result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES ('%s',%s,%s)", array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__); } // END - if } diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 51c43c1bd8..c0ba4d31da 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -45,7 +45,7 @@ function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) array($user), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 0) { // Ok, let's create the admin login - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins (login, password, email) VALUES('%s', '%s', '%s')", + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins (login, password, email) VALUES ('%s', '%s', '%s')", array($user, $md5, $email), __FILE__, __LINE__); $ret = "done"; } else { @@ -695,7 +695,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con $VALUEs = implode(", ", $VALUEs); // Generate SQL string - $SQL = "INSERT INTO "._MYSQL_PREFIX.$tableName." (".$KEYs.") VALUES(".$VALUEs.")"; + $SQL = "INSERT INTO "._MYSQL_PREFIX.$tableName." (".$KEYs.") VALUES (".$VALUEs.")"; } // Free memory diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php index b93cf05a0a..ca79dcea05 100644 --- a/inc/modules/admin/what-admin_add.php +++ b/inc/modules/admin/what-admin_add.php @@ -170,28 +170,28 @@ if (!isset($_POST['ok'])) if (!empty($_POST['menu'])) { // Add sub menu - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) -VALUES('%s','%s','%s','%s','%s')", - array( - $_POST['menu'], - $_POST['name'], - $_POST['title'], - addslashes($_POST['descr']), - bigintval($_POST['sort']), -), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('%s','%s','%s','%s','%s')", + array( + $_POST['menu'], + $_POST['name'], + $_POST['title'], + addslashes($_POST['descr']), + bigintval($_POST['sort']), + ), __FILE__, __LINE__ + ); CACHE_PURGE_ADMIN_MENU(0, $_POST['menu'], $_POST['name']); } else { // Add main menu - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, title, descr, sort) -VALUES('%s','%s','%s','%s')", - array( - $_POST['name'], - $_POST['title'], - addslashes($_POST['descr']), - bigintval($_POST['sort']), -), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, title, descr, sort) VALUES ('%s','%s','%s','%s')", + array( + $_POST['name'], + $_POST['title'], + addslashes($_POST['descr']), + bigintval($_POST['sort']), + ), __FILE__, __LINE__ + ); CACHE_PURGE_ADMIN_MENU(0, $_POST['name']); } LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE); diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php index a156f88f77..95e7507da0 100644 --- a/inc/modules/admin/what-guest_add.php +++ b/inc/modules/admin/what-guest_add.php @@ -175,9 +175,7 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort", // Insert new menu entry if (!empty($_POST['menu'])) { - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_guest_menu -(`action`,`what`,`title`,`sort`,`visible`,`locked`) -VALUES('%s','%s','%s','%s','%s','%s')", + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')", array( $_POST['menu'], $_POST['name'], @@ -189,9 +187,7 @@ VALUES('%s','%s','%s','%s','%s','%s')", } else { - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_guest_menu -(action, title, sort, visible, locked) -VALUES('%s','%s','%s','%s','%s')", + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')", array( $_POST['name'], $_POST['title'], diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php index d2e72fc793..ebbcad632d 100644 --- a/inc/modules/admin/what-guestedit.php +++ b/inc/modules/admin/what-guestedit.php @@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { ADD_DESCR("admin", __FILE__); // Do we edit/delete/change main menus or sub menus? -$AND = "what = ''"; $SUB = ""; +$AND = "(what = '' OR what IS NULL)"; $SUB = ""; if (!empty($_GET['sub'])) { $AND = sprintf("action='%s'", SQL_ESCAPE($_GET['sub'])); @@ -241,14 +241,10 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) // Load template LOAD_TEMPLATE("admin_gmenu_status"); -} - else -{ - if ((!empty($_GET['act'])) && (!empty($_GET['tid'])) && (!empty($_GET['fid']))) - { +} else { + if ((!empty($_GET['act'])) && (!empty($_GET['tid'])) && (!empty($_GET['fid']))) { // Get IDs - if (!empty($_GET['w'])) - { + if (!empty($_GET['w'])) { // Sub menus selected $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_guest_menu WHERE action='%s' AND sort='%s' LIMIT 1", array($_GET['act'], bigintval($_GET['tid'])), __FILE__, __LINE__); @@ -258,9 +254,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) array($_GET['act'], bigintval($_GET['fid'])), __FILE__, __LINE__); list($fid) = SQL_FETCHROW($result); SQL_FREERESULT($result); - } - else - { + } else { // Main menu selected $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_guest_menu WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1", array(bigintval($_GET['tid'])), __FILE__, __LINE__); @@ -272,24 +266,20 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) SQL_FREERESULT($result); } - if ((!empty($tid)) && (!empty($fid))) - { + if ((!empty($tid)) && (!empty($fid))) { // Sort menu $result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1", - array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__); + array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__); $result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1", - array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__); - } - } + array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__); + } // END - if + } // END - if // By default list menus - if (empty($SUB)) - { + if (empty($SUB)) { // List only main menus $query = SQL_QUERY("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_guest_menu WHERE (what='' OR what IS NULL) ORDER BY sort ASC", __FILE__, __LINE__); - } - else - { + } else { // List sub menus $query = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_guest_menu WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort ASC", array($SUB), __FILE__, __LINE__); diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php index d78fe0076b..7977ca3ba0 100644 --- a/inc/modules/admin/what-list_country.php +++ b/inc/modules/admin/what-list_country.php @@ -49,8 +49,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr' if (SQL_NUMROWS($result) == 0) { // Save entry - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_countries (code, descr, is_active) - VALUES('%s','%s','%s')", + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_countries (code, descr, is_active) VALUES ('%s','%s','%s')", array(strtoupper(substr($_POST['code'], 0, 2)), $_POST['descr'], $_POST['is_active']), __FILE__, __LINE__); // Country added diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php index eb89f34f77..d1d611cd90 100644 --- a/inc/modules/admin/what-mem_add.php +++ b/inc/modules/admin/what-mem_add.php @@ -175,9 +175,7 @@ if (!isset($_POST['ok'])) // Insert new menu entry if (!empty($_POST['menu'])) { - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_member_menu -(`action`,`what`,`title`,`visible`,`locked`,`sort`) -VALUES('%s','%s','%s','%s','%s','%s')", + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s','%s')", array( $_POST['menu'], $_POST['name'], @@ -189,9 +187,7 @@ VALUES('%s','%s','%s','%s','%s','%s')", } else { - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_member_menu -(`action`,`title`,`visible`,`locked`,`sort`) -VALUES('%s','%s','%s','%s','%s')", + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s')", array( $_POST['name'], $_POST['title'], diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php index a0d80e44e4..8e9fb5466c 100644 --- a/inc/modules/admin/what-memedit.php +++ b/inc/modules/admin/what-memedit.php @@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { ADD_DESCR("admin", __FILE__); // Do we edit/delete/change main menus or sub menus? -$AND = "what = ''"; $SUB = ""; +$AND = "(what = '' OR what IS NULL)"; $SUB = ""; if (!empty($_GET['sub'])) { @@ -195,7 +195,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) // An act is done... foreach ($_POST['sel'] as $sel => $menu) { - $AND = "what = ''"; + $AND = "(what = '' OR what IS NULL)"; $sel = bigintval($sel); if (!empty($SUB)) $AND = "action='".$SUB."'"; switch ($_POST['ok']) diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index c21e1275c5..cec98b6c1d 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -274,7 +274,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF // Add only when the line was not found (maybe some more secure?) $locked = "points"; if ($_CONFIG['ref_payout'] > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails! - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES(%s,0,'%s')", + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')", array(bigintval($userid), $_CONFIG['points_register']), __FILE__, __LINE__); // Update mediadata as well diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 2337fa7cca..230c4b91d9 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -56,18 +56,29 @@ require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the // Load extensions and language require_once(PATH."inc/extensions.php"); -// Init error handler +// Error handler function function __errorHandler ($errno, $errstr, $errfile, $errline) { + // Construct message $msg = sprintf("errno=%s,errstr=%s,errfile=%s,errline=%s", $errno, $errstr, basename($errfile), $errline ); + + // Write debug log message DEBUG_LOG(__FUNCTION__.":".$msg, true); - print "Please report this error at forum.mxchange.org:
";
-	debug_print_backtrace();
-	die("
Thanks for your help finding bugs."); + + // Output message to user and die + if (EXT_IS_ACTIVE("debug")) { + // Debug extension found! :-) + die("Error message written to debug.log. Please try to call the main page to continue."); + } else { + // No debug extension found + print("Please report this error at forum.mxchange.org:
");
+		debug_print_backtrace();
+		die("
Thanks for your help finding bugs."); + } } // Set error handler diff --git a/templates/de/html/ext/ext_debug.tpl b/templates/de/html/ext/ext_debug.tpl new file mode 100644 index 0000000000..9129897298 --- /dev/null +++ b/templates/de/html/ext/ext_debug.tpl @@ -0,0 +1,36 @@ +Diese Erweiterung soll die Datei inc/cache/debug.log an den +[MXChange-Server] +übertragen bzw. dort empfangen. Sie können also auch selber +debug.log Dateien empfangen und diese gebündelt an den +[MXChange-Server] +weitersenden. Dazu müssen Sie Ihren {!MT_WORD!} am [MXChange-Server] +einfach nur über Ihren Administrationsbereich anmelden. Dabei wird Ihrem +{!MT_WORD!} ein Key zugewiesen, der Sie immer wieder eindeutig erkennbar +macht.
+
+Geben Sie den Key unter keinen Umständen an Fremde weiter! +Auch MXChange.org wird Sie nicht nach diesen fragen!
+
+Wenn ein {!MT_WORD2!} die debug.log aussenden möchte, so +wird eine Liste an "Relays" - Ihr {!MT_WORD!}-Server kann als Relay +fungieren - an den anderen {!MT_WORD!} gesendet. Der andere {!MT_WORD!}-Admin +entscheidet dann, an welchen Server er das Logbuch aussenden will.
+
+Relays und auch der [MXChange-Server] können aufgrund des vergebenen Keys +das weitere Übertragen von Logbüchern auch ablehnen, falls dies +missbraucht werden sollte (z.B. zu Spamming-Attacken).
+
+Zudem kann das Empfangsscript so eingestellt werden, dass erstmal ein Eintrag +freigegeben werden muss, bevor weitere gesendet werden können.
+
+Es geht auch Vollmoderation. Dabei muss der {!MT_WORD!}-Admin (also z.B. Sie) +sich am [MXChange-Server] anmelden. Dieser verteilt dann automatisch +den Key an die Relays.
+
+Manipulationsversuche oder einfache Fehlversuche werden in einem Abuse-Log +geschrieben, damit diese nachvollziehbar sind und der vermeindliche {!MT_WORD!} +dann auf dem Relay und/oder [MXChange-Server] gesperrt werden kann.