From 8ba389b59f6d41f88752cae896143135e575f34a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 16 Sep 2008 13:28:13 +0000 Subject: [PATCH] Overall performance increased --- inc/autopurge/purge-inact.php | 6 +- inc/databases.php | 2 +- inc/extensions.php | 17 +- inc/extensions/ext-active.php | 4 +- inc/extensions/ext-admins.php | 20 +-- inc/extensions/ext-autopurge.php | 20 +-- inc/extensions/ext-bank.php | 60 +++---- inc/extensions/ext-beg.php | 24 +-- inc/extensions/ext-birthday.php | 6 +- inc/extensions/ext-bonus.php | 34 ++-- inc/extensions/ext-cache.php | 20 +-- inc/extensions/ext-country.php | 8 +- inc/extensions/ext-doubler.php | 22 +-- inc/extensions/ext-holiday.php | 18 +- inc/extensions/ext-html_mail.php | 10 +- inc/extensions/ext-maintenance.php | 4 +- inc/extensions/ext-mediadata.php | 2 +- inc/extensions/ext-mods.php | 6 +- inc/extensions/ext-newsletter.php | 18 +- inc/extensions/ext-nickname.php | 6 +- inc/extensions/ext-optimize.php | 2 +- inc/extensions/ext-order.php | 14 +- inc/extensions/ext-payout.php | 16 +- inc/extensions/ext-primera.php | 10 +- inc/extensions/ext-rallye.php | 22 +-- inc/extensions/ext-register.php | 16 +- inc/extensions/ext-repair.php | 10 +- inc/extensions/ext-rewrite.php | 2 +- inc/extensions/ext-sponsor.php | 180 +++++++++---------- inc/extensions/ext-sql_patches.php | 84 ++++----- inc/extensions/ext-surfbar.php | 2 +- inc/extensions/ext-task.php | 4 +- inc/extensions/ext-theme.php | 2 +- inc/extensions/ext-top10.php | 4 +- inc/extensions/ext-transfer.php | 14 +- inc/extensions/ext-user.php | 6 +- inc/extensions/ext-wernis.php | 16 +- inc/functions.php | 15 +- inc/libs/register_functions.php | 4 +- inc/libs/sponsor_functions.php | 2 +- inc/libs/task_functions.php | 22 +-- inc/modules/admin/what-autopurge.php | 8 +- inc/modules/admin/what-config_admin.php | 4 +- inc/modules/admin/what-config_autopurge.php | 4 +- inc/modules/admin/what-config_beg.php | 28 +-- inc/modules/admin/what-config_birthday.php | 8 +- inc/modules/admin/what-config_bonus.php | 40 ++--- inc/modules/admin/what-config_cache.php | 28 +-- inc/modules/admin/what-config_doubler.php | 16 +- inc/modules/admin/what-config_extensions.php | 4 +- inc/modules/admin/what-config_holiday.php | 4 +- inc/modules/admin/what-config_order.php | 16 +- inc/modules/admin/what-config_other.php | 40 ++--- inc/modules/admin/what-config_points.php | 8 +- inc/modules/admin/what-config_rewrite.php | 4 +- inc/modules/admin/what-list_autopurge.php | 4 +- inc/modules/member/what-categories.php | 6 +- inc/modules/member/what-html_mail.php | 4 +- inc/modules/member/what-transfer.php | 4 +- inc/mysql-manager.php | 14 +- install/menu-de.sql | 32 ++-- install/menu-en.sql | 32 ++-- install/tables.sql | 4 +- modules.php | 7 +- templates/de/html/guest/guest_register.tpl | 4 +- 65 files changed, 539 insertions(+), 538 deletions(-) diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php index 053148b5e5..b60277c422 100644 --- a/inc/autopurge/purge-inact.php +++ b/inc/autopurge/purge-inact.php @@ -47,7 +47,7 @@ if ((!EXT_IS_ACTIVE("autopurge")) || ($_CONFIG['auto_purge_active'] == "N")) { if ($_CONFIG['ap_inactive'] == "Y") { // Ok, let's have a look... $since = bigintval($_CONFIG['ap_in_since']); - $EXCLUDE_LIST = " AND d.userid != c.def_refid"; + $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid']; // Check for more extensions if (EXT_IS_ACTIVE("beg")) $EXCLUDE_LIST .= " AND d.userid != c.beg_uid"; @@ -62,7 +62,7 @@ if ($_CONFIG['ap_inactive'] == "Y") { // Check for all accounts $result_inactive = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.email, d.last_online -FROM "._MYSQL_PREFIX."_user_data AS d, "._MYSQL_PREFIX."_config AS c +FROM "._MYSQL_PREFIX."_user_data AS d WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - %s) AND d.last_online < (UNIX_TIMESTAMP() - %s) AND d.ap_notified < (UNIX_TIMESTAMP() - %s) ".$EXCLUDE_LIST." ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__); @@ -104,7 +104,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__); // here for e.g. excluding holiday users $time = bigintval($_CONFIG['ap_in_time']); $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online -FROM "._MYSQL_PREFIX."_user_data AS d, "._MYSQL_PREFIX."_config AS c +FROM "._MYSQL_PREFIX."_user_data AS d WHERE status='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND last_online < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s) ".$EXCLUDE_LIST." ORDER BY userid", diff --git a/inc/databases.php b/inc/databases.php index c1a528cb7a..102465d19a 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', "337"); +define('CURR_SVN_REVISION', "338"); // 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.php b/inc/extensions.php index 969d861709..168a3ae9cc 100644 --- a/inc/extensions.php +++ b/inc/extensions.php @@ -320,22 +320,17 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) { } // END - if } // Check if given extension is active -function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false) { +function EXT_IS_ACTIVE ($ext_name) { global $cacheArray, $_CONFIG; // Extensions are all inactive during installation if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (empty($ext_name))) return false; - // Extension's file name will also be checked - $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name); - if (!FILE_READABLE($file)) return false; - //* DEBUG: */ echo "*".$ext_name."(".count($cacheArray).")
"; - // Not active is the default $active = "N"; // Check cache - if ((!empty($cacheArray['extensions']['ext_active'][$ext_name])) && (!$ignore_cache)) { + if (!empty($cacheArray['extensions']['ext_active'][$ext_name])) { // Load from cache //* DEBUG: */ echo "CACHE! ext_name={$ext_name}
\n"; $active = $cacheArray['extensions']['ext_active'][$ext_name]; @@ -370,13 +365,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false) //DEBUG_LOG(__FUNCTION__.": ext_name={$ext_name},active={$active}"); // Is this extension activated? (For admins we always have active extensions...) - return ( - ( - $active == "Y" - ) && ( - FILE_READABLE($inc) - ) - ); + return ($active == "Y"); } // Get version from extensions function GET_EXT_VERSION ($ext_name) { diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php index 3891b61ff2..53c8231185 100644 --- a/inc/extensions/ext-active.php +++ b/inc/extensions/ext-active.php @@ -50,7 +50,7 @@ switch ($EXT_LOAD_MODE) { case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) // SQL commands to run - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('main', 'active', 'Heute Online', 10, 'N', 'Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('main','active','Heute Online', 10, 'N','Y')"; // Load CSS file? $EXT_CSS = "Y"; @@ -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-admins.php b/inc/extensions/ext-admins.php index 45963b297d..427830c0c4 100644 --- a/inc/extensions/ext-admins.php +++ b/inc/extensions/ext-admins.php @@ -51,9 +51,9 @@ switch ($EXT_LOAD_MODE) case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='admins' LIMIT 1"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins', NULL, 'Admin-Management', 'Administratoren anlegen, löschen oder Passwort/E-Mail Adresse ändern.', '1')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins', 'admins_add', 'Admin hinzufügen', 'Neuen Admin-Account anlegen', '0')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins', 'admins_edit', 'Admin-Account ändern', 'Bestehende Admin-Accounts bearbeiten: E-Mail-Adresse, Passwort und/oder Login-Name ändern.', '1')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins', NULL, 'Admin-Management','Administratoren anlegen, löschen oder Passwort/E-Mail Adresse ändern.','1')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins','admins_add','Admin hinzufügen','Neuen Admin-Account anlegen','0')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins','admins_edit','Admin-Account ändern','Bestehende Admin-Accounts bearbeiten: E-Mail-Adresse, Passwort und/oder Login-Name ändern.','1')"; break; case "remove": // Do stuff when removing extension @@ -77,7 +77,7 @@ case "update": // Update an extension switch ($EXT_VER) { case "0.2": // SQL queries for v0.2 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins', 'admins_contact', 'Admin kontaktieren', 'Kontaktiert einen Admin per Mail oder Nachricht (nur wenn messaging-Erweiterung installiert ist).', '2')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins','admins_contact','Admin kontaktieren','Kontaktiert einen Admin per Mail oder Nachricht (nur wenn messaging-Erweiterung installiert ist).','2')"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Fügt den Menüpunkt "Admin kontaktieren" hinzu."; @@ -85,13 +85,13 @@ case "update": // Update an extension case "0.3": // SQL queries for v0.3 // Add admin menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins', 'config_admins', 'ACL einstellen', 'Richten Sie Zugriffskontrollzeilen für jeden Admin individuell ein, um ihm nur bestimmte Bereiche des Admin-Bereiches zugänglich zu machen oder zu sperren.', '4')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins','config_admins','ACL einstellen','Richten Sie Zugriffskontrollzeilen für jeden Admin individuell ein, um ihm nur bestimmte Bereiche des Admin-Bereiches zugänglich zu machen oder zu sperren.','4')"; // Which is the default setting when you create a new admin login? - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD admins_default_acl ENUM('deny', 'allow') NOT NULL DEFAULT 'deny'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD admins_default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'"; // Default is deny everything - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_admins ADD default_acl ENUM('deny', 'allow') NOT NULL DEFAULT 'deny'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_admins ADD default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'"; // But allow current admin everything (THIS SHALL BE YOU!) $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admins SET default_acl='allow' WHERE login='".get_session('admin_login')."' LIMIT 1"; @@ -101,7 +101,7 @@ id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', action_menu VARCHAR(255) NOT NULL DEFAULT '', what_menu VARCHAR(255) NOT NULL DEFAULT '', -access_mode ENUM('deny', 'allow') NOT NULL DEFAULT 'deny', +access_mode ENUM('deny','allow') NOT NULL DEFAULT 'deny', KEY (admin_id), PRIMARY KEY (id) ) TYPE=MyISAM"; @@ -123,7 +123,7 @@ mail_template VARCHAR(255) NOT NULL, KEY (admin_id), PRIMARY KEY (id) ) TYPE=MyISAM"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins', 'admins_mails', 'Admin-Mails', 'Stellen Sie hier ein, welcher Admin welche Mail erhalten soll. Sie können dies (derzeit) jedoch erst, wenn einmal die Mail versendet wurde!', '5')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins','admins_mails','Admin-Mails','Stellen Sie hier ein, welcher Admin welche Mail erhalten soll. Sie können dies (derzeit) jedoch erst, wenn einmal die Mail versendet wurde!','5')"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Kontrollieren Sie, welche Mails welcher Admin oder alle (admin_id=0) bekommen soll oder im UserLog (admin_id=-1) verzeichnet werden soll. Standartmässig wird weiter an alle versendet."; @@ -257,7 +257,7 @@ PRIMARY KEY (id) break; case "0.6.7": // SQL queries for v0.6.7 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_admins ADD la_mode ENUM('global', 'OLD', 'NEW') NOT NULL DEFAULT 'global'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_admins ADD la_mode ENUM('global','OLD','NEW') NOT NULL DEFAULT 'global'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen admins und (kommender) contact. Beseitigung eines Fehlers HTTP_POSR_VARS beim Ändern von Administratoren."; diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php index 39631aef9d..8acd0f78c5 100644 --- a/inc/extensions/ext-autopurge.php +++ b/inc/extensions/ext-autopurge.php @@ -83,13 +83,13 @@ case "update": // Update an extension switch ($EXT_VER) { case "0.1": // SQL queries for v0.1 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_inactive ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_unconfirmed ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_inactive ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_unconfirmed ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_inactive_since BIGINT(20) UNSIGNED NOT NULL DEFAULT '2592000'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_inactive_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '25200'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_unconfirmed_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '432000'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_autopurge', 'Auto-Löschung', 'Automatisch inaktive oder nicht bestätigte Accounts löschen.', '12')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('user', 'list_autopurge', 'Inaktive finden', 'Lassen Sie sich vor dem täglichen Reset anzeigen, welche Mitglieder als inaktiv erkannt werden und welche gelöscht werden.', '10')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_autopurge','Auto-Löschung','Automatisch inaktive oder nicht bestätigte Accounts löschen.','12')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('user','list_autopurge','Inaktive finden','Lassen Sie sich vor dem täglichen Reset anzeigen, welche Mitglieder als inaktiv erkannt werden und welche gelöscht werden.','10')"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD ap_notified BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'"; // Update notes (these will be set as task text!) @@ -128,7 +128,7 @@ case "update": // Update an extension break; case "0.1.9": // SQL queries for v0.1.9 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_tasks ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_tasks ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_tasks_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(60*60*24*7)."'"; // Update notes (these will be set as task text!) @@ -136,9 +136,9 @@ case "update": // Update an extension break; case "0.2.0": // SQL queries for v0.2.0 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_in_notify ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_un_notify ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_tasks_notify ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_in_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_un_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_tasks_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Mail wird bei Löschung von Aufgaben ausgesendet.

Bitte aktualisieren Sie auch die Admin-Templates!"; @@ -205,8 +205,8 @@ case "update": // Update an extension break; case "0.3.3": // SQL queries for v0.3.3 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_del_mails ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_dm_notify ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_del_mails ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_dm_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_dm_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '86400'"; // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php index 79605267d8..4154f01a34 100644 --- a/inc/extensions/ext-bank.php +++ b/inc/extensions/ext-bank.php @@ -57,18 +57,18 @@ uid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', account_created BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', account_locked BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', locked_reason TINYTEXT, -status ENUM('NEW', 'ACTIVE', 'LOCKED') NOT NULL DEFAULT 'NEW', +status ENUM('NEW','ACTIVE','LOCKED') NOT NULL DEFAULT 'NEW', account_balance DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000', -output_mode ENUM('LOGIN', 'EMAIL', 'DISABLED'), +output_mode ENUM('LOGIN','EMAIL','DISABLED'), pin VARCHAR(50) NOT NULL DEFAULT '', -tan_mode ENUM('NORMAL', 'INDEXED'), -tan_list_status ENUM('PENDING', 'ACTIVE', 'INVALID', 'LOCKED') NOT NULL DEFAULT 'PENDING', +tan_mode ENUM('NORMAL','INDEXED'), +tan_list_status ENUM('PENDING','ACTIVE','INVALID','LOCKED') NOT NULL DEFAULT 'PENDING', tan_key VARCHAR(50) NOT NULL DEFAULT '', month_transfered BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', last_tan VARCHAR(5) NOT NULL DEFAULT '00000', last_tan_stamp BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', last_tan_purpose TINYTEXT, -account_type ENUM('CHECK', 'SAVING') NOT NULL DEFAULT 'CHECK', +account_type ENUM('CHECK','SAVING') NOT NULL DEFAULT 'CHECK', overdraft_credit DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000', PRIMARY KEY (id), UNIQUE KEY (pin), @@ -99,8 +99,8 @@ account_fee DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000', free_transfers INT(7) UNSIGNED NOT NULL DEFAULT '0', transfer_fee DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000', available TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, -output_system_mode ENUM('LOGIN', 'EMAIL', 'DISABLED'), -package_active ENUM('Y', 'N') NOT NULL DEFAULT 'N', +output_system_mode ENUM('LOGIN','EMAIL','DISABLED'), +package_active ENUM('Y','N') NOT NULL DEFAULT 'N', free_months_no_fee TINYINT(3) UNSIGNED NOT NULL DEFAULT '0', interest_plus FLOAT(7,5) UNSIGNED NOT NULL DEFAULT '0.00000', interest_minus FLOAT(7,5) UNSIGNED NOT NULL DEFAULT '0.00000', @@ -120,36 +120,36 @@ id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, idx TINYINT(3) UNSIGNED NOT NULL DEFAULT '0', account_id BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', tan VARCHAR(50) NOT NULL DEFAULT '', -used ENUM('Y', 'N') NOT NULL DEFAULT 'N', +used ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (id), UNIQUE (account_id, tan) ) TYPE=MyISAM"; // Admin menu queries - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', NULL, 'Bank-Accounts', 'Verwalten Sie hier alle Bank-Accounts Ihrer Mitglieder, sowie Angebotspakete und Überweisungen.', 6)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'add_bank_package', 'Angebotspaket hinzufügen', 'Neues Angebotspaket erstellen.', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'list_bank_package', 'Angebotspakete auflisten', 'Listet alle erstellten Angebotspakete auf.', 2)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'edit_bank_package', 'Angebotspaket ändern', 'Nach Auswahl eines Angebotspaketes können Sie dieses hier verändern. Bitte beachten Sie, dass Ihre Mitglieder keine Mail dabei erhalten!', 3)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'lock_bank_package', 'Angebotspaket ent-/sperren', 'Nehmen Sie Angebotspakete zur temporären Überarbeitung zuvor heraus, dann können Sie in Ruhe drüber nachdenken und Berechnungen anstellen. Freigabe ist hier auch möglich.', 4)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'del_bank_package', 'Angebotspaket löschen', 'Nach Auswahl eines Angebotspaketes können Sie mit abschliessender Bestätigung Angebotspakete ganz löschen. Bitte beachten Sie, dass dies nur möglich ist, wenn auch alle Accounts dieses nicht mehr nutzen!', 5)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'add_bank_account', 'Konto anlegen', 'Legen Sie hier Konten für die Mitglieder an (falls Ihre Mitglieder nicht zurecht kommen).', 6)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'list_bank_account', 'Konten auflisten', 'Auflistung aller Konto oder eines ausw&auuml;hlbaren Mitglieds.', 7)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'edit_bank_account', 'Konto ändern', 'Ändern Sie hier bestehende Konten, z.B. den Dispositionskredit usw. PINs und TANs sind hier nicht änderbar! Bestätigungsmails sind optional versendbar.', 8)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'lock_bank_account', 'Konto ent-/sperren', 'Sperren Sie hier Konten bei Bedarf. Auch das Freischalten ist hier möglich. Eine Benachrichtigung per Mail wird dann an das Mitglied ausgesendet.', 9)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'del_bank_account', 'Konto löschen', 'Löschen von Konten mit Bestätigungsmail. Wenn Sie ein Mitglieder-Account löschen, so müssen Sie derzeit seine angelegten Konten auch löschen!', 10)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'send_bank_tanlist', 'TAN-Liste aussenden', 'Listet zuerst Anfragen von Mitgliedern auf, die eine neue (i)TAN-Liste benötigen, anschliessend kann die Liste dann ausgesendet werden.', 11)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'lock_bank_tanlist', 'TAN-Liste ent-/sperren', 'Bestehende TAN-Listen können auf Kundenwunsch hin gesperrt und wieder entsperrt werden. Dies passiert auch, wenn der Kunde x-mal (siehe Angebotspakete) eine verkehrte TAN eingegeben hat. Einzelne TANs sind nicht ent-/sperrbar.', 12)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', 'list_bank_trans', 'Überweisungen auflisten', 'Nach Auswahl eines Mitgliedes und einem Konto (benötgt JavaScript!) können Sie seitenweise die Überweisungen durchschauen.', 13)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', NULL, 'Bank-Accounts','Verwalten Sie hier alle Bank-Accounts Ihrer Mitglieder, sowie Angebotspakete und Überweisungen.', 6)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','add_bank_package','Angebotspaket hinzufügen','Neues Angebotspaket erstellen.', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','list_bank_package','Angebotspakete auflisten','Listet alle erstellten Angebotspakete auf.', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','edit_bank_package','Angebotspaket ändern','Nach Auswahl eines Angebotspaketes können Sie dieses hier verändern. Bitte beachten Sie, dass Ihre Mitglieder keine Mail dabei erhalten!', 3)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','lock_bank_package','Angebotspaket ent-/sperren','Nehmen Sie Angebotspakete zur temporären Überarbeitung zuvor heraus, dann können Sie in Ruhe drüber nachdenken und Berechnungen anstellen. Freigabe ist hier auch möglich.', 4)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','del_bank_package','Angebotspaket löschen','Nach Auswahl eines Angebotspaketes können Sie mit abschliessender Bestätigung Angebotspakete ganz löschen. Bitte beachten Sie, dass dies nur möglich ist, wenn auch alle Accounts dieses nicht mehr nutzen!', 5)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','add_bank_account','Konto anlegen','Legen Sie hier Konten für die Mitglieder an (falls Ihre Mitglieder nicht zurecht kommen).', 6)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','list_bank_account','Konten auflisten','Auflistung aller Konto oder eines ausw&auuml;hlbaren Mitglieds.', 7)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','edit_bank_account','Konto ändern','Ändern Sie hier bestehende Konten, z.B. den Dispositionskredit usw. PINs und TANs sind hier nicht änderbar! Bestätigungsmails sind optional versendbar.', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','lock_bank_account','Konto ent-/sperren','Sperren Sie hier Konten bei Bedarf. Auch das Freischalten ist hier möglich. Eine Benachrichtigung per Mail wird dann an das Mitglied ausgesendet.', 9)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','del_bank_account','Konto löschen','Löschen von Konten mit Bestätigungsmail. Wenn Sie ein Mitglieder-Account löschen, so müssen Sie derzeit seine angelegten Konten auch löschen!', 10)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','send_bank_tanlist','TAN-Liste aussenden','Listet zuerst Anfragen von Mitgliedern auf, die eine neue (i)TAN-Liste benötigen, anschliessend kann die Liste dann ausgesendet werden.', 11)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','lock_bank_tanlist','TAN-Liste ent-/sperren','Bestehende TAN-Listen können auf Kundenwunsch hin gesperrt und wieder entsperrt werden. Dies passiert auch, wenn der Kunde x-mal (siehe Angebotspakete) eine verkehrte TAN eingegeben hat. Einzelne TANs sind nicht ent-/sperrbar.', 12)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','list_bank_trans','Überweisungen auflisten','Nach Auswahl eines Mitgliedes und einem Konto (benötgt JavaScript!) können Sie seitenweise die Überweisungen durchschauen.', 13)"; // Member menu - $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_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ündigen', 'N', 'Y', 7)"; + $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_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ündigen','N','Y', 7)"; break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index e50d0aeb6a..663f49da3b 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -50,9 +50,9 @@ switch ($EXT_LOAD_MODE) { case "register": // Do stuff when installtion 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."_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[] = "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'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_uid_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '1800'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_points DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00100'"; @@ -154,15 +154,15 @@ case "update": // Update an extension case "0.1.2": // SQL queries for v0.1.2 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_mode ENUM('DIRECT', 'REF') NOT NULL DEFAULT 'REF'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_mode ENUM('DIRECT','REF') NOT NULL DEFAULT 'REF'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_ranks TINYINT(3) UNSIGNED NOT NULL DEFAULT '10'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_active ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_rallye ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_active ENUM('Y','N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_rallye ENUM('Y','N') NOT NULL DEFAULT 'N'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD beg_points DOUBLE(21,5) NOT NULL DEFAULT '0.00000'"; $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."_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')"; // 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."; @@ -191,9 +191,9 @@ case "update": // Update an extension break; case "0.1.7": // SQL queries for v0.1.7 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_ral_en_notify ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_ral_di_notify ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_new_mem_notify ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_ral_en_notify ENUM('Y','N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_ral_di_notify ENUM('Y','N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_new_mem_notify ENUM('Y','N') NOT NULL DEFAULT 'N'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_notify_bonus DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_notify_wait BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD beg_ral_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'"; @@ -225,7 +225,7 @@ case "update": // Update an extension break; case "0.2.2": // SQL queries for v0.2.2 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_include_own ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_include_own ENUM('Y','N') NOT NULL DEFAULT 'N'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Eigene User-ID von Bettel-Rallye ausschliessbar."; diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php index 293531b5ca..9cf08d661e 100644 --- a/inc/extensions/ext-birthday.php +++ b/inc/extensions/ext-birthday.php @@ -89,7 +89,7 @@ chk_value VARCHAR(255) NOT NULL DEFAULT '', KEY(userid), PRIMARY KEY(id) ) Type=MyISAM"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_birthday', 'Geburtstagsmails', 'Stellen Sie hier ein, ob die Mitglieder {!POINTS!} (nicht automatisch) gutgeschrieben kommen sollen oder nicht.', 9)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_birthday','Geburtstagsmails','Stellen Sie hier ein, ob die Mitglieder {!POINTS!} (nicht automatisch) gutgeschrieben kommen sollen oder nicht.', 9)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Es kann nun eine Gutschrift an die Geburtstagmail angehängt werden. Diese wird erst beim Klick auf einen Bestätigungslink gutgeschrieben."; @@ -161,8 +161,8 @@ PRIMARY KEY(id) break; case "0.3.6": // SQL queries for v0.3.6 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD birthday_mode ENUM('DIRECT', 'REF') NOT NULL DEFAULT 'DIRECT'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD birthday_active ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD birthday_mode ENUM('DIRECT','REF') NOT NULL DEFAULT 'DIRECT'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD birthday_active ENUM('Y','N') NOT NULL DEFAULT 'N'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Vergütungsmodus des Geburtstagsbonus einstellbar."; diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index caff4d6560..d93b02a857 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -131,7 +131,7 @@ case "update": // Update an extension // Use actual month for this update $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD login_bonus DOUBLE(20,3) NOT NULL DEFAULT '0.000'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD turbo_bonus DOUBLE(20,3) NOT NULL DEFAULT '0.000'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_stats ADD bonus_stats ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_stats ADD bonus_stats ENUM('Y','N') NOT NULL DEFAULT 'N'"; $SQLs[] = "UPDATE "._MYSQL_PREFIX."_extensions SET ext_has_css='Y' WHERE ext_name='bonus' AND ext_has_css='N' LIMIT 1"; // Update notes (these will be set as task text!) @@ -160,7 +160,7 @@ KEY userid (userid) case "0.2.3": // SQL queries for v0.2.3 $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE action='main' AND what='bonus' LIMIT 1"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu VALUES (NULL,'main','bonus','Aktiv-Rallye',7,'Y','Y', '', 0)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu VALUES (NULL,'main','bonus','Aktiv-Rallye',7,'Y','Y','', 0)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Aktiv-Rallye mit Klick-Vergütung hinzugefügt."; @@ -227,14 +227,14 @@ KEY userid (userid) break; case "0.3.4": // SQL queries for v0.3.4 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('user', 'list_bonus', 'Aktiv-Rallye-Teilnehmer', 'Listet alle Mitglieder auf, die einen Aktiv-Bonus haben und zeigt die derzeit möglichen Gewinner an.', 10)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('user','list_bonus','Aktiv-Rallye-Teilnehmer','Listet alle Mitglieder auf, die einen Aktiv-Bonus haben und zeigt die derzeit möglichen Gewinner an.', 10)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Link Aktiv-Rallye-Teilnehmer hinzugefügt, inklusive manuelle Vorbereitung der Vergütung."; break; case "0.3.5": // SQL queries for v0.3.5 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_mode ENUM('UID', 'JACKPOT', 'ADD') NOT NULL DEFAULT 'ADD'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_mode ENUM('UID','JACKPOT','ADD') NOT NULL DEFAULT 'ADD'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'"; // Update notes (these will be set as task text!) @@ -288,11 +288,11 @@ KEY userid (userid) $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_order DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '15.00000'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_ref DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '100.00000'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_stats DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '5.00000'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_active ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_active ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD bonus_order DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD bonus_ref DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD bonus_stats DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_stats ADD is_stats ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_stats ADD is_stats ENUM('Y','N') NOT NULL DEFAULT 'N'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Bonus-{!POINTS!} für: Mailbestellung, Referral-Werbung (bei Best. der EMail-Adresse) und wenn 100% Klickrate jeder Mailbuchung erreicht wurde.
Template admin_config_bonus_pro.tpl ist überflüssig geworden. Bitte löschen Sie dies!
Eingestellte Bonus-{!POINTS!} für Rank 2 war um eins verschoben."; @@ -409,7 +409,7 @@ WHERE last_online < ".$mark." ORDER BY userid"; break; case "0.6.5": // SQL queries for v0.6.5 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_stats ADD bonus_stats ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_stats ADD bonus_stats ENUM('Y','N') NOT NULL DEFAULT 'N'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Fehler mit bonus_stats beseitigt."; @@ -431,11 +431,11 @@ WHERE last_online < ".$mark." ORDER BY userid"; break; case "0.6.9": // SQL queries for v0.6.9 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_order_yn ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_ref_yn ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_stats_yn ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_login_yn ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_click_yn ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_order_yn ENUM('Y','N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_ref_yn ENUM('Y','N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_stats_yn ENUM('Y','N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_login_yn ENUM('Y','N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_click_yn ENUM('Y','N') NOT NULL DEFAULT 'Y'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Es können nun auch die folgenden Vergütungen bei der Auswertung der monatlichen Aktiv-Rallye mit berücksichtigt werden: Mailbestätigung (war vorher schon), Login-, Mailbuchung, Referral und Statistik-Bonus (100% Klickrate erreicht)."; @@ -470,9 +470,9 @@ WHERE last_online < ".$mark." ORDER BY userid"; break; case "0.7.7": // SQL queries for v0.7.7 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_en_notify ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_di_notify ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_new_mem_notify ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_en_notify ENUM('Y','N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_di_notify ENUM('Y','N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_new_mem_notify ENUM('Y','N') NOT NULL DEFAULT 'N'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_notify_points DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_notify_wait BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD bonus_ral_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'"; @@ -501,8 +501,8 @@ WHERE last_online < ".$mark." ORDER BY userid"; break; case "0.8.2": // SQL queries for v0.8.2 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_include_own ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_bonus ADD is_notify ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD bonus_include_own ENUM('Y','N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_bonus ADD is_notify ENUM('Y','N') NOT NULL DEFAULT 'N'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Eigene User-ID von Aktiv-Rallye ausschliessbar. Benachrichtigungsmails sind von Aktiv-Rallye ausgeschlossen."; diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php index e7177b682a..cc8114cce8 100644 --- a/inc/extensions/ext-cache.php +++ b/inc/extensions/ext-cache.php @@ -54,7 +54,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_update BIGINT(20) UNSIGNED NOT NULL DEFAULT '3600'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_path VARCHAR(255) NOT NULL DEFAULT 'cache/'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_tested tinyint(1) NOT NULL DEFAULT '0'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_cache', 'Cache-Einstellungen', 'Update-Interval des Caches usw. können Sie hier ändern.', 9)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_cache','Cache-Einstellungen','Update-Interval des Caches usw. können Sie hier ändern.', 9)"; break; case "remove": // Do stuff when removing extension @@ -113,7 +113,7 @@ case "update": // Update an extension case "0.0.7": // SQL queries for v0.0.7 $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD db_hits BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_hits BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('stats', 'cache_stats', 'DB-Cache', 'Auf Cache und gesamte Datenbank registrierte Anfragen anzeigen.', 4)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('stats','cache_stats','DB-Cache','Auf Cache und gesamte Datenbank registrierte Anfragen anzeigen.', 4)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Hits auf den Cache werden gezählt."; @@ -145,13 +145,13 @@ case "update": // Update an extension break; case "0.1.3": // SQL queries for v0.1.3 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_admins ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_acls ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_exts ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_config ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_modreg ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_refdepth ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_refsys ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_admins ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_acls ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_exts ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_config ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_modreg ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_refdepth ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_refsys ENUM('Y','N') NOT NULL DEFAULT 'Y'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Alle cache-baren Tabellen sind nun einzelnt ein- bzw. ausschaltbar. Falls die eine oder andere ausgelagerte Tabelle also Fehler verursachen sollte, so können Sie diese hier abschalten. Beachten Sie aber bitte, dass dann mehr Abfragen an die Datenbank gestellt wird und dies bedeutend mehr Zeit braucht, als nur die Daten aus einem Datenfeld zu laden, das sich im Speicher aufhält."; @@ -178,7 +178,7 @@ case "update": // Update an extension break; case "0.1.8": // SQL queries for v0.1.8 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_theme ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_theme ENUM('Y','N') NOT NULL DEFAULT 'Y'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Daten von installierten Themes werden nun gecacht."; diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php index 33b40947d5..13052bde5d 100644 --- a/inc/extensions/ext-country.php +++ b/inc/extensions/ext-country.php @@ -55,15 +55,15 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, code CHAR(2) NOT NULL DEFAULT 'DE', descr VARCHAR(255) NOT NULL DEFAULT 'Deutschland', -is_active ENUM('Y', 'N') NOT NULL DEFAULT 'N', +is_active ENUM('Y','N') NOT NULL DEFAULT 'N', KEY(code), PRIMARY KEY(id) ) TYPE=MyISAM"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_countries (code, descr, is_active) VALUES ('DE', 'Deutschland', 'Y')"; + $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'"; diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index e4126862d7..66eadecfcb 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -58,8 +58,8 @@ refid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', points DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000', remote_ip VARCHAR(15) NOT NULL DEFAULT '0.0.0.0', timemark VARCHAR(10) NOT NULL DEFAULT '', -completed ENUM('Y', 'N') NOT NULL DEFAULT 'N', -is_ref ENUM('Y', 'N') NOT NULL DEFAULT 'N', +completed ENUM('Y','N') NOT NULL DEFAULT 'N', +is_ref ENUM('Y','N') NOT NULL DEFAULT 'N', KEY(refid), KEY(userid), PRIMARY KEY(id) @@ -79,14 +79,14 @@ PRIMARY KEY(id) // Referral percents $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_ref FLOAT(7,5) UNSIGNED NOT NULL DEFAULT '0.020'"; // Shall I use the jackpot to take points from? (Y/N, default=Y) - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_jackpot ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_jackpot ENUM('Y','N') NOT NULL DEFAULT 'Y'"; // A user account to take points from (default: 0->none) $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'"; // Total payed out points from your doublers $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_points DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000'"; // Sending mode of mails (immediately/daily reset) // --> This also means who fast the doubled points will be payed out! - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_send_mode ENUM('DIRECT', 'RESET') NOT NULL DEFAULT 'DIRECT'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_send_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'DIRECT'"; // Timeout for entries to be purged (default: one week) $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(60*60*24*7)."'"; // Number of newest entries to display @@ -104,15 +104,15 @@ PRIMARY KEY(id) // --- MENU SYSTEMS --- // // Admin menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler', NULL, '{!POINTS!}-Verdoppler', 'Einstellungen und Einträge auflisten.', 4)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler', 'list_doubler', 'Auflisten', 'Einträge aus der Verdiensttabelle auflisten', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler', 'config_doubler', 'Einstellungen', 'Prozentuale Gebühr usw. einstellen.', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler', NULL, '{!POINTS!}-Verdoppler','Einstellungen und Einträge auflisten.', 4)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler','list_doubler','Auflisten','Einträge aus der Verdiensttabelle auflisten', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler','config_doubler','Einstellungen','Prozentuale Gebühr usw. einstellen.', 2)"; // Guest menu (informations / default doubler link) - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('main', 'doubler', 'Verdoppeln!', 3, 'Y', 'Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('main','doubler','Verdoppeln!', 3, 'Y','Y')"; // Member menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main', 'doubler', 'Verdoppeln!', 'Y', 'Y', 7)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main','doubler','Verdoppeln!','Y','Y', 7)"; break; case "remove": // Do stuff when removing extension @@ -160,7 +160,7 @@ case "update": // Update an extension case "0.0.4": // SQL queries for v0.0.4 // Shall I use the doubler's account to take points from? (Y/N, default=Y) - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_own ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_own ENUM('Y','N') NOT NULL DEFAULT 'Y'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = POINTS."-Guthaben des Verdopplers kann optional nicht mit einbezogen werden."; @@ -174,7 +174,7 @@ case "update": // Update an extension case "0.0.6": // SQL queries for v0.0.6 $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_max_sent TINYINT(3) UNSIGNED NOT NULL DEFAULT '1'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_group_sent TINYINT(3) UNSIGNED NOT NULL DEFAULT '1'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_sent_all ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_sent_all ENUM('Y','N') NOT NULL DEFAULT 'Y'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Gebührenabzug wird beim Einzahlen abgezogen (wurde von Auszahlung abgezogen) und maximal bei Auszahlung zu kontrollierende Accounts einstellbar.
Template admin_config_doubler_pro.tpl ist überflüssig geworden. Bitte löschen Sie dies!"; diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index 7b6c0aeb7e..645aa6f295 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -65,13 +65,13 @@ PRIMARY KEY(id) $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD holiday_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'"; // Add member menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main', 'holiday', 'Urlaubsschaltung', '4', 'Y', 'Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main','holiday','Urlaubsschaltung','4','Y','Y')"; // Add admin menus - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('holiday', NULL, 'Urlaubsmanagement', '4', 'Hier können Sie Urlaubsschaltungen Ihrer Mitglieder auflisten oder auch wieder aufheben.')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('holiday', 'list_holiday', 'Auflisten', '1', 'Alle Urlaubsschaltungen auflisten.')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('holiday', 'del_holiday', 'Urlaub beenden', '2', 'Urlaubsschaltungen aufheben. Geben Sie bitte mehr als nur "Verstoss gegen unsere AGBs" ein!')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('holiday', 'config_holiday', 'Einstellungen', '3', 'Maximale Tage für Urlaub usw. einstellen.')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('holiday', NULL, 'Urlaubsmanagement','4','Hier können Sie Urlaubsschaltungen Ihrer Mitglieder auflisten oder auch wieder aufheben.')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('holiday','list_holiday','Auflisten','1','Alle Urlaubsschaltungen auflisten.')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('holiday','del_holiday','Urlaub beenden','2','Urlaubsschaltungen aufheben. Geben Sie bitte mehr als nur "Verstoss gegen unsere AGBs" ein!')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('holiday','config_holiday','Einstellungen','3','Maximale Tage für Urlaub usw. einstellen.')"; // Remove 0 max mails per day $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_max_receive WHERE value='0' LIMIT 1"; @@ -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 @@ -155,7 +155,7 @@ case "update": // Update an extension break; case "0.1.3": // SQL queries for v0.1.3 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD holiday_active ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD holiday_active ENUM('Y','N') NOT NULL DEFAULT 'N'"; $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_max_receive WHERE value='0' LIMIT 1"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD holiday_lock BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(60*60*24*2)."'"; @@ -164,14 +164,14 @@ case "update": // Update an extension break; case "0.1.4": // SQL queries for v0.1.4 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD holiday_mode ENUM('DIRECT', 'RESET') NOT NULL DEFAULT 'RESET'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD holiday_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'RESET'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Urlaubsschaltung wird erst Abends um 00:00 Uhr aktiv und nicht durch die Beantragung. Dies kann nun auch auf direkte Umstellung eingestellt werden."; break; case "0.1.5": // SQL queries for v0.1.5 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD holiday_mode ENUM('DIRECT', 'RESET') NOT NULL DEFAULT 'RESET'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD holiday_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'RESET'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Sicherheitsupdate für die Include-Befehle."; diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php index 3669fb8fc4..346f7429d0 100644 --- a/inc/extensions/ext-html_mail.php +++ b/inc/extensions/ext-html_mail.php @@ -53,7 +53,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD html ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_bonus ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_pool ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main', 'html_mail', 'HTML-Empfang', '3', 'Y', 'Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main','html_mail','HTML-Empfang','3','Y','Y')"; break; case "remove": // Do stuff when removing extension @@ -156,10 +156,10 @@ default: // Do stuff when extension is loaded // Valid email chars (without @, or do you want to have another @ inside your email addy?) $VALID_EMAIL_CHARS = array( - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', - 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', - 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '-', '.', '_', '0', '1', - '2', '3', '4', '5', '6', '7', '8', '9' + 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s', + 't','u','v','w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L', + 'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','-','.','_','0','1', + '2','3','4','5','6','7','8','9' ); break; } diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php index dbb32a3116..0b100a3f04 100644 --- a/inc/extensions/ext-maintenance.php +++ b/inc/extensions/ext-maintenance.php @@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE) { case "register": // Do stuff when installtion 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[] = "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')"; break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php index e9d21a7cd3..d585b7f71b 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)
diff --git a/inc/extensions/ext-mods.php b/inc/extensions/ext-mods.php index 417b987976..6d61d4afd6 100644 --- a/inc/extensions/ext-mods.php +++ b/inc/extensions/ext-mods.php @@ -50,9 +50,9 @@ switch ($EXT_LOAD_MODE) { case "register": // Do stuff when installtion 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 ('mods', NULL, 'Modul-Management', 'Verwalten Sie die Basis-Module index, login, admin usw.', 4)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('mods', 'config_mods', 'Module ändern', 'Ändern Sie hier die Zugtiffsrechte auf die Module. Was dennoch nicht geht: Mitglied- oder Gastzugriffsrtechte auf Admin-Module bzw. Gastzugriffsrechte auf Mitglieder-Module. Diese sind extra abgesichert.', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('mods', 'stats_mods', 'Modul-Statistiken', 'Sehen Sie sich hier die Statistiken der Module und die damit verknüpften action- und what-Dateien an. Bei einigen Modulen gibt es allerdings keine verknüpften Dateien und somit keine Extra-Statistik.', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('mods', NULL, 'Modul-Management','Verwalten Sie die Basis-Module index, login, admin usw.', 4)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('mods','config_mods','Module ändern','Ändern Sie hier die Zugtiffsrechte auf die Module. Was dennoch nicht geht: Mitglied- oder Gastzugriffsrtechte auf Admin-Module bzw. Gastzugriffsrechte auf Mitglieder-Module. Diese sind extra abgesichert.', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('mods','stats_mods','Modul-Statistiken','Sehen Sie sich hier die Statistiken der Module und die damit verknüpften action- und what-Dateien an. Bei einigen Modulen gibt es allerdings keine verknüpften Dateien und somit keine Extra-Statistik.', 2)"; break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php index c46af9d16b..fbb0581c90 100644 --- a/inc/extensions/ext-newsletter.php +++ b/inc/extensions/ext-newsletter.php @@ -73,13 +73,13 @@ case "update": // Update an extension switch ($EXT_VER) { case "0.0.1": // SQL queries for v0.0.1 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', NULL, 'Newsletter', 'Einstellungen am Newsletter, Newsletter versenden, Abbestellungen auflisten usw.', 3)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', 'list_newsletter', 'Abbestellungen', 'Alle Abbestellungen auflisten und bearbeiten.', 2)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', 'config_newsletter', 'Einstellungen', 'Gebühr zum Abbestellen des Newsletters usw. sind hier einstellbar.', 3)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', NULL, 'Newsletter','Einstellungen am Newsletter, Newsletter versenden, Abbestellungen auflisten usw.', 3)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter','list_newsletter','Abbestellungen','Alle Abbestellungen auflisten und bearbeiten.', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter','config_newsletter','Einstellungen','Gebühr zum Abbestellen des Newsletters usw. sind hier einstellbar.', 3)"; $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET action='newsletter', what='send_newsletter', title='Versenden', sort='1' WHERE what='newsletter' LIMIT 1"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main', 'newsletter', 'Newsletter-Empfang', 'N', 'Y', 10)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main','newsletter','Newsletter-Empfang','N','Y', 10)"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nl_charge FLOAT(10,2) UNSIGNED NOT NULL DEFAULT '5.00'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_receive ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_receive ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_until VARCHAR(10) NOT NULL DEFAULT '0'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_timespan VARCHAR(10) NOT NULL DEFAULT '0'"; @@ -158,10 +158,10 @@ default: // Do stuff when extension is loaded // Valid email chars (without @, or do you want to have another @ inside your email addy?) $VALID_EMAIL_CHARS = array( - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', - 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', - 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '-', '.', '_', '0', '1', - '2', '3', '4', '5', '6', '7', '8', '9' + 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s', + 't','u','v','w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L', + 'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','-','.','_','0','1', + '2','3','4','5','6','7','8','9' ); if (isBooleanConstantAndTrue('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1)) diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php index a5ec734bf7..de36467c6d 100644 --- a/inc/extensions/ext-nickname.php +++ b/inc/extensions/ext-nickname.php @@ -52,7 +52,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm // SQL commands to run $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nickname VARCHAR(255) NOT NULL DEFAULT ''"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nick_uid ENUM ('nick','uid') NOT NULL DEFAULT 'uid'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main', 'nickname', 'Nicknamen', '5', 'Y', 'Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main','nickname','Nicknamen','5','Y','Y')"; // Load CSS file? $EXT_CSS = "Y"; @@ -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-optimize.php b/inc/extensions/ext-optimize.php index 00a3528220..0437c75a02 100644 --- a/inc/extensions/ext-optimize.php +++ b/inc/extensions/ext-optimize.php @@ -55,7 +55,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm gain decimal(10,3) NOT NULL DEFAULT '0.000', PRIMARY KEY(id) ) TYPE=MyISAM"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('misc', 'optimize', 'DB optimieren', 'Führen Sie dies ab und an aus, damit überflüssige Daten aus der Datenbank entfernt werden.', '5')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('misc','optimize','DB optimieren','Führen Sie dies ab und an aus, damit überflüssige Daten aus der Datenbank entfernt werden.','5')"; break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php index 537f7b36cd..e23f1402a1 100644 --- a/inc/extensions/ext-order.php +++ b/inc/extensions/ext-order.php @@ -74,8 +74,8 @@ case "update": // Update an extension switch ($EXT_VER) { case "0.1": // SQL queries for v0.1 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD order_max_full ENUM('ORDER', 'MAX') NOT NULL DEFAULT 'MAX'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('setup', 'config_order', 'Mailbuchungsseite', '7', 'Einstellungen am Mailbuchungsformular.')"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD order_max_full ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('setup','config_order','Mailbuchungsseite','7','Einstellungen am Mailbuchungsformular.')"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Maximale Mailbuchungen sind nun vom maximalen Empfang abhägig."; @@ -83,7 +83,7 @@ case "update": // Update an extension case "0.1.1": // SQL queries for v0.1.1 $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE what='config_order' LIMIT 1"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('setup', 'config_order', 'Mailbuchungsseite', '7', 'Einstellungen am Mailbuchungsformular.')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('setup','config_order','Mailbuchungsseite','7','Einstellungen am Mailbuchungsformular.')"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD mail_orders BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'"; // Update notes (these will be set as task text!) @@ -194,7 +194,7 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us case "0.3.1": // SQL queries for v0.3.1 $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD order_select VARCHAR(255) NOT NULL DEFAULT 'userid'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD order_mode ENUM('ASC', 'DESC') NOT NULL DEFAULT 'DESC'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD order_mode ENUM('ASC','DESC') NOT NULL DEFAULT 'DESC'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Beworbene URL wird nun getestet."; @@ -271,8 +271,8 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us break; case "0.4.6": // SQL queries for v0.4.6 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('order', NULL, 'Mailbuchungen', 3, 'Y', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('order', 'order2', 'Framekiller-Mails', 2, 'Y', 'N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('order', NULL, 'Mailbuchungen', 3, 'Y','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('order','order2','Framekiller-Mails', 2, 'Y','N')"; $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='order', sort='1', title='Klick-Mails' WHERE what='order' LIMIT 1"; // Update notes (these will be set as task text!) @@ -292,7 +292,7 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us break; case "0.4.9": // SQL queries for v0.4.9 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD repay_deleted_mails ENUM('REPAY', 'JACKPOT', 'SHRED') NOT NULL DEFAULT 'REPAY'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD repay_deleted_mails ENUM('REPAY','JACKPOT','SHRED') NOT NULL DEFAULT 'REPAY'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Bei Löschung von Mailbuchungen kann nun global entschieden werden (Einstellungen also), ob die verbliebenen ".POINTS." wieder gutgeschrieben werden sollen oder in den Jackpot landen."; diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php index dfaf38b4b9..2951770584 100644 --- a/inc/extensions/ext-payout.php +++ b/inc/extensions/ext-payout.php @@ -59,7 +59,7 @@ target_account VARCHAR(255) NOT NULL DEFAULT '', target_bank VARCHAR(255) NOT NULL DEFAULT '', payout_id BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', payout_timestamp VARCHAR(10) NOT NULL DEFAULT '0', -status ENUM('NEW', 'ACCEPTED', 'REJECTED') NOT NULL DEFAULT 'NEW', +status ENUM('NEW','ACCEPTED','REJECTED') NOT NULL DEFAULT 'NEW', KEY(userid), KEY(payout_id), PRIMARY KEY(id) @@ -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; @@ -109,7 +109,7 @@ case "update": // Update an extension $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_payout_types ADD engine_url VARCHAR(255) NOT NULL DEFAULT ''"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_payout_types ADD engine_ret_ok VARCHAR(255) NOT NULL DEFAULT ''"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_payout_types ADD engine_ret_failed VARCHAR(255) NOT NULL DEFAULT ''"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_payout_types ADD pass_enc ENUM('md5', 'base64', 'none') NOT NULL DEFAULT 'md5'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_payout_types ADD pass_enc ENUM('md5','base64','none') NOT NULL DEFAULT 'md5'"; break; case "0.1.4": // SQL queries for v0.1.4 @@ -120,11 +120,11 @@ case "update": // Update an extension $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_payouts ADD target_url LONGBLOB NOT NULL"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_payouts ADD banner_url LONGBLOB NOT NULL"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_payouts ADD link_text VARCHAR(30) NOT NULL DEFAULT ''"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_payout_types ADD allow_url ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_payout_types ADD allow_url ENUM('Y','N') NOT NULL DEFAULT 'N'"; break; case "0.1.6": // SQL queries for v0.1.6 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_payout_types CHANGE pass_enc pass_enc ENUM('md5', 'base64', 'xxx') NOT NULL DEFAULT 'xxx'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_payout_types CHANGE pass_enc pass_enc ENUM('md5','base64','xxx') NOT NULL DEFAULT 'xxx'"; break; case "0.1.8": // SQL queries for v0.1.8 diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php index e8fdb16d5a..77638b908e 100644 --- a/inc/extensions/ext-primera.php +++ b/inc/extensions/ext-primera.php @@ -57,7 +57,7 @@ userid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', primera_account VARCHAR(255) NOT NULL DEFAULT '', primera_amount DOUBLE(22,5) UNSIGNED NOT NULL DEFAULT '0.00000', primera_timestamp VARCHAR(10) NOT NULL DEFAULT '0', -primera_type ENUM('IN','OUT', 'FAILED') NOT NULL DEFAULT 'FAILED', +primera_type ENUM('IN','OUT','FAILED') NOT NULL DEFAULT 'FAILED', primera_api_message TINYTEXT, primera_api_status VARCHAR(255) NULL DEFAULT NULL, KEY(userid), @@ -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 6b62de5e83..b6c1e76399 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -61,10 +61,10 @@ descr LONGBLOB NOT NULL, template VARCHAR(255) NOT NULL DEFAULT '', start_time VARCHAR(10) NOT NULL DEFAULT '0', end_time VARCHAR(10) NOT NULL DEFAULT '0', -auto_add_new_user ENUM('Y', 'N') NOT NULL DEFAULT 'Y', -is_active ENUM('Y', 'N') NOT NULL DEFAULT 'N', -send_notify ENUM('Y', 'N') NOT NULL DEFAULT 'Y', -notified ENUM('Y', 'N') NOT NULL DEFAULT 'N', +auto_add_new_user ENUM('Y','N') NOT NULL DEFAULT 'Y', +is_active ENUM('Y','N') NOT NULL DEFAULT 'N', +send_notify ENUM('Y','N') NOT NULL DEFAULT 'Y', +notified ENUM('Y','N') NOT NULL DEFAULT 'N', KEY (admin_id), PRIMARY KEY (id) ) TYPE=MyISAM"; @@ -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')"; + $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 @@ -123,7 +123,7 @@ case "update": // Update an extension switch ($EXT_VER) { case "0.0.1": // SQL queries for v0.0.1 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_data ADD expired ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_data ADD expired ENUM('Y','N') NOT NULL DEFAULT 'N'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Ablaufen der Rallyes intergriert."; diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index d334f152bd..f1c7adc7a0 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -79,20 +79,20 @@ case "update": // Update an extension $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_must_register ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, field_name VARCHAR(255) NOT NULL DEFAULT '', -field_required ENUM('Y', 'N') NOT NULL DEFAULT 'Y', +field_required ENUM('Y','N') NOT NULL DEFAULT 'Y', PRIMARY KEY(id) ) TYPE=MyISAM"; // Add all entries as required (DO NOT DELETE THEM FROM DATABASE!) - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('surname', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('family_name', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('street_nr', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('cntry', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('zip', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('city', 'Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('surname','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('family_name','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('street_nr','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('cntry','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('zip','Y')"; + $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-repair.php b/inc/extensions/ext-repair.php index 95d5801787..19675407be 100644 --- a/inc/extensions/ext-repair.php +++ b/inc/extensions/ext-repair.php @@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE) { case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) // SQL commands to run - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair', NULL, 'Reperaturen', '7', 'Repariert u.a. die Kategorie-Auswahlen der Mitglieder usw.')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair', 'repair_cats', 'Kategorieauswahlen', '1', 'Repariert die Kategorieauswahlen Ihrer Mitglieder.')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair', NULL, 'Reperaturen','7','Repariert u.a. die Kategorie-Auswahlen der Mitglieder usw.')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair','repair_cats','Kategorieauswahlen','1','Repariert die Kategorieauswahlen Ihrer Mitglieder.')"; break; case "remove": // Do stuff when removing extension @@ -73,9 +73,9 @@ case "update": // Update an extension switch ($EXT_VER) { case "0.1": // SQL queries for v0.1 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair', 'repair_amenu', 'Admin-Menü', 2, 'Repariert die Gewichtung des Admin-Menü-Systems')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair', 'repair_gmenu', 'Gast-Menü', 3, 'Repariert die Gewichtung des Gäste-Menü-Systems')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair', 'repair_mmenu', 'Mitglied-Menü', 4, 'Repariert die Gewichtung des Mitglieder-Menü-Systems')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair','repair_amenu','Admin-Menü', 2, 'Repariert die Gewichtung des Admin-Menü-Systems')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair','repair_gmenu','Gast-Menü', 3, 'Repariert die Gewichtung des Gäste-Menü-Systems')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair','repair_mmenu','Mitglied-Menü', 4, 'Repariert die Gewichtung des Mitglieder-Menü-Systems')"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Fügt ein Menüpunkt zur Reperatur der Gewichtung des Admin-Menüs hinzu."; diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php index 3c21b41f6f..e0776b6246 100644 --- a/inc/extensions/ext-rewrite.php +++ b/inc/extensions/ext-rewrite.php @@ -111,7 +111,7 @@ case "update": // Update an extension case "0.0.9": // SQL queries for v0.0.9 $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD rewrite_skip VARCHAR(255) NOT NULL DEFAULT 'login:admin:frametester:mailid'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_rewrite', 'Rewrite-Engine', 'Stellen Sie hier ein, welche Module übersprungen werden sollen, in denen also kein Umschreiben des HTML-Codes stattfinden soll.', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_rewrite','Rewrite-Engine','Stellen Sie hier ein, welche Module übersprungen werden sollen, in denen also kein Umschreiben des HTML-Codes stattfinden soll.', 8)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Zu überspringende Module können per Admin-Bereich eingestellt werden."; diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index 3e816331c7..ac3c4db799 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -65,7 +65,7 @@ id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, company VARCHAR(255) NOT NULL DEFAULT '', position VARCHAR(255) NOT NULL DEFAULT '', tax_ident VARCHAR(255) NOT NULL DEFAULT '', -gender ENUM('M', 'F', 'C') NOT NULL DEFAULT 'M', +gender ENUM('M','F','C') NOT NULL DEFAULT 'M', surname VARCHAR(255) NOT NULL DEFAULT '', family VARCHAR(255) NOT NULL DEFAULT '', street_nr1 VARCHAR(255) NOT NULL DEFAULT '', @@ -83,8 +83,8 @@ remote_addr VARCHAR(15) NOT NULL DEFAULT '0.0.0.0', sponsor_created VARCHAR(10) NOT NULL DEFAULT '0', last_online VARCHAR(10) NOT NULL DEFAULT '0', last_change VARCHAR(10) NOT NULL DEFAULT '0', -status ENUM('UNCONFIRMED', 'PENDING', 'CONFIRMED', 'LOCKED') NOT NULL DEFAULT 'UNCONFIRMED', -receive_warnings ENUM('Y', 'N') NOT NULL DEFAULT 'Y', +status ENUM('UNCONFIRMED','PENDING','CONFIRMED','LOCKED') NOT NULL DEFAULT 'UNCONFIRMED', +receive_warnings ENUM('Y','N') NOT NULL DEFAULT 'Y', warning_interval BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(ONE_DAY*7)."', points_amount DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000', points_used DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000', @@ -108,7 +108,7 @@ aid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', regid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', payid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', pay_count BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', -pay_status ENUM('PENDING', 'PAYED', 'UNPAYED', 'DELETED') NOT NULL DEFAULT 'PENDING', +pay_status ENUM('PENDING','PAYED','UNPAYED','DELETED') NOT NULL DEFAULT 'PENDING', pay_ordered VARCHAR(10) NOT NULL DEFAULT '0', pay_done VARCHAR(10) NOT NULL DEFAULT '0', KEY (payid), @@ -150,7 +150,7 @@ id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, action VARCHAR(255) NOT NULL DEFAULT '', what VARCHAR(255) NOT NULL DEFAULT '', title VARCHAR(255) NOT NULL DEFAULT '', -active ENUM('Y', 'N') NOT NULL DEFAULT 'N', +active ENUM('Y','N') NOT NULL DEFAULT 'N', sort BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', KEY(what), KEY(action), @@ -164,7 +164,7 @@ PRIMARY KEY(id) id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, aid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', ext_name VARCHAR(255) NOT NULL DEFAULT 'sponsor', -is_active ENUM('Y', 'N') NOT NULL DEFAULT 'N', +is_active ENUM('Y','N') NOT NULL DEFAULT 'N', stamp_added VARCHAR(10) NOT NULL DEFAULT '0', KEY(ext_name), KEY(aid), @@ -180,7 +180,7 @@ sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', url VARCHAR(255) NOT NULL DEFAULT 'http://', title VARCHAR(255) NOT NULL DEFAULT '', clicks BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', -status ENUM('PENDING', 'ACTIVE', 'LOCKED') NOT NULL DEFAULT 'PENDING', +status ENUM('PENDING','ACTIVE','LOCKED') NOT NULL DEFAULT 'PENDING', KEY(sponsorid), PRIMARY KEY(id) )TYPE=MyISAM"; @@ -196,7 +196,7 @@ alternate VARCHAR(255) NOT NULL DEFAULT '', width INT(7) NOT NULL DEFAULT '468', height INT(7) NOT NULL DEFAULT '60', views BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', -status ENUM('PENDING', 'ACTIVE', 'LOCKED') NOT NULL DEFAULT 'PENDING', +status ENUM('PENDING','ACTIVE','LOCKED') NOT NULL DEFAULT 'PENDING', KEY(sponsorid), PRIMARY KEY(id) )TYPE=MyISAM"; @@ -212,12 +212,12 @@ campaign_name VARCHAR(255) NOT NULL DEFAULT '', campaign_start VARCHAR(10) NOT NULL DEFAULT '0', campaign_end VARCHAR(10) NOT NULL DEFAULT '0', campaign_amount DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00000', -campaign_expired ENUM('Y', 'N') NOT NULL DEFAULT 'N', -campaign_locked ENUM('Y', 'N') NOT NULL DEFAULT 'Y', +campaign_expired ENUM('Y','N') NOT NULL DEFAULT 'N', +campaign_locked ENUM('Y','N') NOT NULL DEFAULT 'Y', campaign_ended VARCHAR(10) NOT NULL DEFAULT '0', locked_reason tinyblob, locked_timestamp VARCHAR(10) NOT NULL DEFAULT '0', -status ENUM('PENDING', 'ACTIVE', 'LOCKED') NOT NULL DEFAULT 'PENDING', +status ENUM('PENDING','ACTIVE','LOCKED') NOT NULL DEFAULT 'PENDING', KEY(aid), KEY(sponsorid), PRIMARY KEY(id) @@ -245,7 +245,7 @@ PRIMARY KEY(id) $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_admin_data ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, data_row VARCHAR(255) NOT NULL DEFAULT '', -display ENUM('Y', 'N') NOT NULL DEFAULT 'N', +display ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY(id) )TYPE=MyISAM"; // @@ -256,49 +256,49 @@ PRIMARY KEY(id) id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', data_row VARCHAR(255) NOT NULL DEFAULT '', -display ENUM('Y', 'N') NOT NULL DEFAULT 'N', +display ENUM('Y','N') NOT NULL DEFAULT 'N', KEY(sponsorid), PRIMARY KEY(id) )TYPE=MyISAM"; // // Default allowed data to display // - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('id', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('company', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('position', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('tax_ident', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('gender', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('surname', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('family', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('street_nr1', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('street_nr2', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('zip', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('city', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('country', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('phone', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('fax', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('email', 'Y')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('url', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('password', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('remote_addr', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('sponsor_created', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_online', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_change', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('status', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('receive_warnings', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('warning_interval', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('points_amount', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('points_used', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('refid', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('ref_count', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('hash', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_pay', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_curr', 'N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('id','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('company','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('position','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('tax_ident','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('gender','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('surname','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('family','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('street_nr1','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('street_nr2','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('zip','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('city','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('country','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('phone','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('fax','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('email','Y')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('url','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('password','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('remote_addr','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('sponsor_created','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_online','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_change','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('status','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('receive_warnings','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('warning_interval','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('points_amount','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('points_used','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('refid','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('ref_count','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('hash','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_pay','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_curr','N')"; // // 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_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_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, '€')"; @@ -306,62 +306,62 @@ PRIMARY KEY(id) // // Admin menu // - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', NULL, 'Sponsorenbereich', 'Den Sponsorenbereich verwalten. Hier können Sie auch Sonderaktionen seperat deakvieren oder wieder aktivieren, Sponsorenaccounts verwalten usw.', 7)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'add_sponsor', 'Neuer Sponsor', 'Neues Sponsorenaccount hinzufügen.', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'unlock_sponsor', 'Sponsor freischalten', 'Sponsorenaccounts freigeben / sperren.', 2)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'list_sponsor', 'Sponsoren auflisten', 'Listet alle verfügbaren Sponsorenaccounts auf.', 3)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'edit_sponsor', 'Sponsor ändern', 'Sponsorenaccount ändern (Grundaten, nicht Freigabe!).', 4)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'lock_sponsor', 'Sponsor ent-/sperren', 'Sponsorenaccount sperren und entsperren.', 5)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'del_sponsor', 'Sponsor löschen', 'Sponsorenaccount löschen.', 6)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'allow_sponsor_data', 'Datenverwaltung', 'Stellen Sie hier ein, welche Daten der Sponsor im Mitgliedsbereich über sicht anzeigen darf und welche nicht.', 7)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'list_sponsor_pays', 'Bestellungen...', 'Bestellungen der Sponsoren auflisten / bearbeiten.', 8)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'list_sponsor_menu', 'Sponsorenmenü', 'Das Sponsorenmenü kann hier geändert werden.', 9)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'list_sponsor_campaigns', 'Kampagnen...', 'Verwaltung aller von Ihren Sponsoren eingerichteten Kampagnen.', 10)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'list_sponsor_urls', 'URL-Verwaltung', 'Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten URLs.', 11)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'list_sponsor_banner', 'Banner-Verwaltung', 'Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten Bannern.', 12)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'list_sponsor_reg', 'Sponsor-Aktionen', 'Alle Sponsor-Aktionen auflisten und verwalten.', 13)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'list_sponsor_pay', 'Buchungspakete', 'Die Sponsoren können sich {--POINTS--}-Pakete kaufen. Hier können Sie diese verwalten.', 14)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'list_sponsor_conv', '{--POINTS--} umwandeln...', 'Mit den vom Sponsor gekauften {--POINTS--} kann er Aktionen buchen. Hier stellen Sie die Umrechnungsrate von {--POINTS--} nach Sponsoraktionen um. Beispiel: 1 {--POINTS--} = 10 Mails.', 15)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', 'config_sponsor', 'Einstellungen', 'Allgemeine Einstellungen am Sponsoring-System.', 16)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('repair', 'repr_sponsor', 'Sponsormenü', 'Gewichtung des Sponsormenüs reparieren.', 5)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', NULL, 'Sponsorenbereich','Den Sponsorenbereich verwalten. Hier können Sie auch Sonderaktionen seperat deakvieren oder wieder aktivieren, Sponsorenaccounts verwalten usw.', 7)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','add_sponsor','Neuer Sponsor','Neues Sponsorenaccount hinzufügen.', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','unlock_sponsor','Sponsor freischalten','Sponsorenaccounts freigeben / sperren.', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor','Sponsoren auflisten','Listet alle verfügbaren Sponsorenaccounts auf.', 3)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','edit_sponsor','Sponsor ändern','Sponsorenaccount ändern (Grundaten, nicht Freigabe!).', 4)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','lock_sponsor','Sponsor ent-/sperren','Sponsorenaccount sperren und entsperren.', 5)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','del_sponsor','Sponsor löschen','Sponsorenaccount löschen.', 6)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','allow_sponsor_data','Datenverwaltung','Stellen Sie hier ein, welche Daten der Sponsor im Mitgliedsbereich über sicht anzeigen darf und welche nicht.', 7)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_pays','Bestellungen...','Bestellungen der Sponsoren auflisten / bearbeiten.', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_menu','Sponsorenmenü','Das Sponsorenmenü kann hier geändert werden.', 9)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_campaigns','Kampagnen...','Verwaltung aller von Ihren Sponsoren eingerichteten Kampagnen.', 10)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_urls','URL-Verwaltung','Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten URLs.', 11)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_banner','Banner-Verwaltung','Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten Bannern.', 12)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_reg','Sponsor-Aktionen','Alle Sponsor-Aktionen auflisten und verwalten.', 13)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_pay','Buchungspakete','Die Sponsoren können sich {--POINTS--}-Pakete kaufen. Hier können Sie diese verwalten.', 14)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_conv','{--POINTS--} umwandeln...','Mit den vom Sponsor gekauften {--POINTS--} kann er Aktionen buchen. Hier stellen Sie die Umrechnungsrate von {--POINTS--} nach Sponsoraktionen um. Beispiel: 1 {--POINTS--} = 10 Mails.', 15)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','config_sponsor','Einstellungen','Allgemeine Einstellungen am Sponsoring-System.', 16)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('repair','repr_sponsor','Sponsormenü','Gewichtung des Sponsormenüs reparieren.', 5)"; // // Menu system (still admin menu) // - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('menu', 'sponsor_medit', 'Sponsor-Menü editieren', 'Hier können Sie das Sponsorenmenü verändern: Positionen verändern, Menütitel ändern usw.', 7)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('menu', 'sponsor_madd', 'Sponsor-Menü hinzufügen', 'Hier können Sie einen neuen Menüpunkt hinzufügen (falls Sie z.B. eigene Sponsoraktionen entwickelt haben oder welche versehendlich gelöscht haben.', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('menu','sponsor_medit','Sponsor-Menü editieren','Hier können Sie das Sponsorenmenü verändern: Positionen verändern, Menütitel ändern usw.', 7)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('menu','sponsor_madd','Sponsor-Menü hinzufügen','Hier können Sie einen neuen Menüpunkt hinzufügen (falls Sie z.B. eigene Sponsoraktionen entwickelt haben oder welche versehendlich gelöscht haben.', 8)"; // // Guest menu // $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort) VALUES ('sponsor', NULL, 'Sponsoren', 2)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort) VALUES ('sponsor', 'sponsor_reg', 'Anmeldung', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort) VALUES ('sponsor', 'sponsor_login', 'Einloggen', 2)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort) VALUES ('sponsor', 'sponsor_infos', 'Infos/Preise', 3)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort) VALUES ('sponsor', 'sponsor_agb', 'AGBs', 4)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort) VALUES ('sponsor','sponsor_reg','Anmeldung', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort) VALUES ('sponsor','sponsor_login','Einloggen', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort) VALUES ('sponsor','sponsor_infos','Infos/Preise', 3)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort) VALUES ('sponsor','sponsor_agb','AGBs', 4)"; // // Member menu // - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort) VALUES ('main', 'sponsor', 'Unsere Sponsoren', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort) VALUES ('main','sponsor','Unsere Sponsoren', 8)"; // // 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', 'Referral-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','Referral-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 // @@ -392,7 +392,7 @@ case "remove": // Do stuff when removing extension $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_campaign_assigns"; $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_admin_data"; $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_display_data"; - $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='sponsor' OR what IN('repr_sponsor', 'sponsor_medit', 'sponsor_madd') LIMIT 20"; + $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='sponsor' OR what IN('repr_sponsor','sponsor_medit','sponsor_madd') LIMIT 20"; $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_guest_menu WHERE action='sponsor' LIMIT 5"; $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE what='sponsor' LIMIT 1"; break; diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index d354faa54c..08fa584ef9 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -136,8 +136,8 @@ case "update": // Update an extension switch ($EXT_VER) { case "0.0.1": // SQL queries for v0.0.1 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ext_autopurge ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_extensions', 'Erweitungsmanagement', 'Alle Einstellungen am Erweiterungsmanagement.', 10)"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ext_autopurge ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_extensions','Erweitungsmanagement','Alle Einstellungen am Erweiterungsmanagement.', 10)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Es kann nun bestimmt werden, ob vom Server gelöschte ext-xxx.php erkannt werden sollen und die verknüpften Daten auch aus der Datenbank entfernt werden sollen."; @@ -166,21 +166,21 @@ case "update": // Update an extension case "0.0.5": // SQL queries for v0.0.5 $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD index_home VARCHAR(255) NOT NULL DEFAULT 'welcome'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_home', 'Home-Seite festlegen', 'Stellen Sie hier ein, welcher Menüpunkt (what-welcome ist Standart) als Einstiegspunkt in das Menüsystem genutzt werden soll.', 5)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_home','Home-Seite festlegen','Stellen Sie hier ein, welcher Menüpunkt (what-welcome ist Standart) als Einstiegspunkt in das Menüsystem genutzt werden soll.', 5)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Die what-welcome.php ist derzeit die "Home"-Seite (Eingangsseite). Dies kann nun per Datenbank geändert werden."; break; case "0.0.6": // SQL queries for v0.0.6 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_extensions ADD ext_has_css ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_extensions ADD ext_has_css ENUM('Y','N') NOT NULL DEFAULT 'N'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Es können nun SQL-Updates von einander abhängig gemacht werden und die CSS-Datei kann per Admin-Bereich (wegen Debuggings) ein- bzw. ausgeschaltet werden."; break; case "0.0.7": // SQL queries for v0.0.7 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD verbose_sql ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD verbose_sql ENUM('Y','N') NOT NULL DEFAULT 'Y'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Die SQL-Anweisungen werden bei eingeschalteter Verbose-Funktion detailiert angezeigt."; @@ -194,14 +194,14 @@ case "update": // Update an extension break; case "0.0.9": // SQL queries for v0.0.9 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('email', 'list_unconfirmed', 'Unbest. Mails auflisten', 'Schauen Sie sich hier unbestätigte Maillinks an. Bitte diesen Link nur über dem EMail-Archiv oder EMail-Details aufrufen, direkt aufgerufen bekommen Sie eine Fehlermeldung.', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('email','list_unconfirmed','Unbest. Mails auflisten','Schauen Sie sich hier unbestätigte Maillinks an. Bitte diesen Link nur über dem EMail-Archiv oder EMail-Details aufrufen, direkt aufgerufen bekommen Sie eine Fehlermeldung.', 8)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Unbestätigte Maillinks können unter Email-Management -> Unbest. Mails auflisten aufgelistet werden."; break; case "0.1.0": // SQL queries for v0.2.1 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD reg_points_mode ENUM('ref', 'direct') NOT NULL DEFAULT 'ref'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD reg_points_mode ENUM('ref','direct') NOT NULL DEFAULT 'ref'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Soll der einmalige Ref-Bonus über das Referral-System (also alle oberen Refs bekommen auch etwas davon ab) oder direkt dem Werber aufgebucht werden?"; @@ -217,7 +217,7 @@ case "update": // Update an extension break; case "0.1.2": // SQL queries for v0.1.2 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_refid', 'Standart-Ref-ID', 'Stellen Sie hier die User-ID ein, die genommen werden soll, wenn der Gast n icht per Referral-Link Ihren Mailtausch aufgerufen hat.', 7)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_refid','Standart-Ref-ID','Stellen Sie hier die User-ID ein, die genommen werden soll, wenn der Gast n icht per Referral-Link Ihren Mailtausch aufgerufen hat.', 7)"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD def_refid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'"; // Update notes (these will be set as task text!) @@ -225,7 +225,7 @@ case "update": // Update an extension break; case "0.1.3": // SQL queries for v0.1.3 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD refid_target ENUM('register', 'index') NOT NULL DEFAULT 'register'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD refid_target ENUM('register','index') NOT NULL DEFAULT 'register'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Auf welche Seite soll der Ref-Link zeigen? Eingangsseite oder Anmeldeformular?"; @@ -234,16 +234,16 @@ case "update": // Update an extension case "0.1.4": // SQL queries for v0.1.4 $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD default_theme VARCHAR(255) NOT NULL DEFAULT '".GET_CURR_THEME()."'"; $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='theme' LIMIT 3"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('theme', NULL, 'Themes', 'Verwalten Sie hier alle Designs (Themes) Ihres Mailtausch-Scriptes.', 8)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('theme', 'theme_import', 'Importieren', 'Es wird das Verzeichnis "theme" nach neuen Ordnern durchsucht und anschliessend in die Datenbank gesperrt aufgenommen.', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('theme', 'theme_edit', 'Modifizieren', 'Ändern Sie Titel, Freigaben usw. an den Themes. Sie können bis auf das Standart-Theme "default" auch Themes aus der Datenbank entfernen. Vorher sollten Sie es jedoch vom Server löschen, damit es niht erneut importiert werden kann.', 2)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('themes', NULL, 'Design-Auswahl', 4, 'Y', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('themes', NULL, 'Design-Auswahl', 3, 'Y', 'N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('theme', NULL, 'Themes','Verwalten Sie hier alle Designs (Themes) Ihres Mailtausch-Scriptes.', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('theme','theme_import','Importieren','Es wird das Verzeichnis "theme" nach neuen Ordnern durchsucht und anschliessend in die Datenbank gesperrt aufgenommen.', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('theme','theme_edit','Modifizieren','Ändern Sie Titel, Freigaben usw. an den Themes. Sie können bis auf das Standart-Theme "default" auch Themes aus der Datenbank entfernen. Vorher sollten Sie es jedoch vom Server löschen, damit es niht erneut importiert werden kann.', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('themes', NULL, 'Design-Auswahl', 4, 'Y','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('themes', NULL, 'Design-Auswahl', 3, 'Y','N')"; $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_themes"; $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_themes ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, theme_path VARCHAR(255) NOT NULL DEFAULT '', -theme_active ENUM('Y', 'N') NOT NULL DEFAULT 'N', +theme_active ENUM('Y','N') NOT NULL DEFAULT 'N', theme_ver VARCHAR(255) NOT NULL DEFAULT '0.0', PRIMARY KEY(id) ) TYPE=MyISAM"; @@ -260,13 +260,13 @@ PRIMARY KEY(id) break; case "0.1.6": // SQL queries for v0.1.6 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD enable_title_deco ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD enable_title_deco ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD title_left VARCHAR(10) NOT NULL DEFAULT '[--'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD title_middle VARCHAR(10) NOT NULL DEFAULT '-'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD title_right VARCHAR(10) NOT NULL DEFAULT '--]'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD enable_mod_title ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD enable_what_title ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_title', 'Seitentitel ändern', 'De-/aktivieren Sie hier die Dekorationen, sowie Modul-Titel und what-Titel im Seitentitel.', 8)"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD enable_mod_title ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD enable_what_title ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_title','Seitentitel ändern','De-/aktivieren Sie hier die Dekorationen, sowie Modul-Titel und what-Titel im Seitentitel.', 8)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Dekorationen des Seitentiteles lassen sich ein- und ausschalten und selber definieren; Modul-Titel und Titel der what-Dateien kann hinzugefügt werden."; @@ -302,7 +302,7 @@ PRIMARY KEY(id) break; case "0.2.1": // SQL queries for v0.2.1 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD css_php ENUM('DIRECT', 'FILE') NOT NULL DEFAULT 'FILE'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD css_php ENUM('DIRECT','FILE') NOT NULL DEFAULT 'FILE'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Ausgabe der CSS-Dateien entweder per css.php oder sie sind direkt eingebunden."; @@ -314,9 +314,9 @@ PRIMARY KEY(id) break; case "0.2.3": // SQL queries for v0.2.3 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD guest_menu ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD member_menu ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD youre_here ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD guest_menu ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD member_menu ENUM('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD youre_here ENUM('Y','N') NOT NULL DEFAULT 'Y'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Gast- und Mitgliedsmenüs lassen sich getrennt voneinander abschalten."; @@ -328,7 +328,7 @@ PRIMARY KEY(id) // Switch to JPEG format $auto_type = "jpg"; } - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD img_type ENUM('jpg', 'png') NOT NULL DEFAULT '".$auto_type."'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD img_type ENUM('jpg','png') NOT NULL DEFAULT '".$auto_type."'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Generierung des Mailbestätigungscodes hängt davon ab, ob die PHP-Funktion imagecreatefromjpeg() und das JPEG-Bild vorhanden sind oder nicht."; @@ -343,14 +343,14 @@ PRIMARY KEY(id) break; case "0.2.6": // SQL queries for v0.2.6 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('user', 'sub_points', '{!POINTS!} abziehen', 'Allen oder einem Mitglied {!POINTS!} abziehen.', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('user','sub_points','{!POINTS!} abziehen','Allen oder einem Mitglied {!POINTS!} abziehen.', 8)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Abzug von {!POINTS!} nun möglich."; break; case "0.2.7": // SQL queries for v0.2.7 - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort) VALUES ('main', 'themes', 'Designs', 6)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort) VALUES ('main','themes','Designs', 6)"; $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"; @@ -452,10 +452,10 @@ INDEX (la_posy), PRIMARY KEY(id) ) TYPE=MyISAM"; // Which menu do you like? - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD admin_menu ENUM('NEW', 'OLD') NOT NULL DEFAULT 'OLD'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD admin_menu ENUM('NEW','OLD') NOT NULL DEFAULT 'OLD'"; // Insert menus - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_admin', 'Adminmenü', 'Diverse Einstellungen am Adminmenü vornehmen.', 9)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_admin','Adminmenü','Diverse Einstellungen am Adminmenü vornehmen.', 9)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Logische Bereiche (Logical Areas = LAs) eingeführt. Dadurch wird das immer stärker anwachsende Admin-Menü in grosse Hauptgruppen unterteilt, wodurch ein Auffinden von Menüpunkten verbessert wird."; @@ -463,14 +463,14 @@ PRIMARY KEY(id) case "0.3.3": // SQL queries for v0.3.3 // Switch of the "intelligent menu sorter" when you want to have a fixed menu structure... - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD admin_menu_sorter ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD admin_menu_sorter ENUM('Y','N') NOT NULL DEFAULT 'Y'"; // The statistics table $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_admin_menu_stats"; $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_admin_menu_stats ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, aid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', -type ENUM('la', 'action', 'what') NOT NULL DEFAULT 'what', +type ENUM('la','action','what') NOT NULL DEFAULT 'what', clicks BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', INDEX (aid), PRIMARY KEY (id) @@ -482,7 +482,7 @@ PRIMARY KEY (id) case "0.3.4": // SQL queries for v0.3.4 // List accounts with no referral - $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)"; + $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ügt den Menüpunkt "Mitglieder ohne Werber" in die Mitglieder-Management hinzu. Mit dieser neuen Funktion können Sie nach Mitglieder-Accounts ohne Werber suchen. TODO-ID #2 CLOSED"; @@ -490,11 +490,11 @@ PRIMARY KEY (id) case "0.3.5": // SQL queries for v0.3.5 // List accounts with no referral - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('stats', NULL, 'Statistiken', 4, 'Y', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('stats', 'stats2', 'Framekiller-Mails', 2, 'Y', 'N')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('extras', NULL, 'Extras', 5, 'Y', 'N')"; - $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[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('stats', NULL, 'Statistiken', 4, 'Y','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('stats','stats2','Framekiller-Mails', 2, 'Y','N')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('extras', NULL, 'Extras', 5, 'Y','N')"; + $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"; @@ -514,7 +514,7 @@ PRIMARY KEY (id) $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD file_hash VARCHAR(255) NOT NULL DEFAULT ''"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD master_salt VARCHAR(255) NOT NULL DEFAULT ''"; $SQLs[] = "UPDATE "._MYSQL_PREFIX."_config SET rand_no=(ROUND(RAND() * 99999) + 100000) WHERE config=0 LIMIT 1"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_mod_reg ADD has_menu ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_mod_reg ADD has_menu ENUM('Y','N') NOT NULL DEFAULT 'N'"; $SQLs[] = "UPDATE "._MYSQL_PREFIX."_mod_reg SET has_menu='Y' WHERE module='admin' OR module='index' OR module='login' LIMIT 3"; // Update notes (these will be set as task text!) @@ -534,10 +534,10 @@ PRIMARY KEY (id) break; case "0.3.9": // SQL queries for v0.3.9 - $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title = REPLACE(title, '--POINTS--', '!POINTS!') WHERE title LIKE '%--POINTS--%'"; - $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET descr = REPLACE(descr, '--POINTS--', '!POINTS!') WHERE descr LIKE '%--POINTS--%'"; - $SQLs[] = "UPDATE "._MYSQL_PREFIX."_guest_menu SET title = REPLACE(title, '--POINTS--', '!POINTS!') WHERE title LIKE '%--POINTS--%'"; - $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET title = REPLACE(title, '--POINTS--', '!POINTS!') WHERE title LIKE '%--POINTS--%'"; + $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title = REPLACE(title, '--POINTS--','!POINTS!') WHERE title LIKE '%--POINTS--%'"; + $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET descr = REPLACE(descr, '--POINTS--','!POINTS!') WHERE descr LIKE '%--POINTS--%'"; + $SQLs[] = "UPDATE "._MYSQL_PREFIX."_guest_menu SET title = REPLACE(title, '--POINTS--','!POINTS!') WHERE title LIKE '%--POINTS--%'"; + $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET title = REPLACE(title, '--POINTS--','!POINTS!') WHERE title LIKE '%--POINTS--%'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Beschreibungstexte für Admin-Menüs können länger sein. Diverse Fixes."; @@ -570,7 +570,7 @@ PRIMARY KEY (id) $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `proxy_port` INT(5) UNSIGNED NOT NULL DEFAULT '0'"; $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `proxy_username` VARCHAR(255) NOT NULL DEFAULT ''"; $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `proxy_password` VARCHAR(255) NOT NULL DEFAULT ''"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_proxy', 'Proxy-Einstellungen', 'Sollte Ihr Webserver sich hinter einem Proxy befinden, so können Sie hier MXChange so konfigurieren, dass es Updates durch diesen hindurch sucht!', 15)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_proxy','Proxy-Einstellungen','Sollte Ihr Webserver sich hinter einem Proxy befinden, so können Sie hier MXChange so konfigurieren, dass es Updates durch diesen hindurch sucht!', 15)"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Proxy-Einstellungen hinzugefügt."; diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index 5930c2714c..61d463146b 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -59,7 +59,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm `reward` FLOAT(10,5) UNSIGNED NOT NULL DEFAULT '0.00000', `costs` FLOAT(10,5) UNSIGNED NOT NULL DEFAULT '0.00000', `views_total` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', -`status` ENUM('PENDING','CONFIRMED', 'LOCKED') NOT NULL DEFAULT 'CONFIRMED', +`status` ENUM('PENDING','CONFIRMED','LOCKED') NOT NULL DEFAULT 'CONFIRMED', `registered` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, `last_locked` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00', `lock_reason` VARCHAR(255) NOT NULL DEFAULT '', diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php index c2d909b568..1611eea800 100644 --- a/inc/extensions/ext-task.php +++ b/inc/extensions/ext-task.php @@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE) { case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) // SQL commands to run - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('task', NULL, 'Aufgaben-Management', '1', 'Erweitertes Aufgaben-Management zur leichten verwaltung der vom System erzeugten Aufgaben.')"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('task', 'list_task', 'Aufgaben auflisten', '1', 'Alle Ihnen zugewiesenen Aufgaben auflisten (keine Updates).')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('task', NULL, 'Aufgaben-Management','1','Erweitertes Aufgaben-Management zur leichten verwaltung der vom System erzeugten Aufgaben.')"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('task','list_task','Aufgaben auflisten','1','Alle Ihnen zugewiesenen Aufgaben auflisten (keine Updates).')"; $SQLs[] = "UPDATE "._MYSQL_PREFIX."_task_system SET status='SOLVED' WHERE status='CLOSED'"; // Enable CSS file? diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php index 471721f032..95ef218575 100644 --- a/inc/extensions/ext-theme.php +++ b/inc/extensions/ext-theme.php @@ -50,7 +50,7 @@ switch ($EXT_LOAD_MODE) { case "register": // Do stuff when installtion 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 ('theme', 'theme_check', 'Prüfen', 'Nach neuen Themes suchen bzw. nach Updates zu den Themes suchen.', 3)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('theme','theme_check','Prüfen','Nach neuen Themes suchen bzw. nach Updates zu den Themes suchen.', 3)"; break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php index 0cabb42e52..b888a9ad0d 100644 --- a/inc/extensions/ext-top10.php +++ b/inc/extensions/ext-top10.php @@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE) { case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) // SQL commands to run - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, visible, locked, sort) VALUES ('main', 'top10', 'TOP-10', 'Y', 'Y', 7)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_top10', 'TOP-10 Listen', 'Stellen Sie hier ein, wie lang die TOP-Listen sein sollen, also wie viele Plätze angezeigt werden sollen.', 8)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, visible, locked, sort) VALUES ('main','top10','TOP-10','Y','Y', 7)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_top10','TOP-10 Listen','Stellen Sie hier ein, wie lang die TOP-Listen sein sollen, also wie viele Plätze angezeigt werden sollen.', 8)"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD top10_max TINYINT(3) UNSIGNED NOT NULL DEFAULT '10'"; // Load CSS file? diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index d4d7573366..9b301b93b5 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -82,13 +82,13 @@ PRIMARY KEY(id) ) Type=MyISAM"; // Admin menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer', NULL, '{!POINTS!}-Transfer', 'Verwalten Sie hier die {!POINTS!}-Transaktionen zwischen Ihren Mitgliedern.', 7)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer', 'list_transfer', 'Auflisten', 'Hier bekommen Sie alle ein- und ausgehende Transaktionen aufgelistet.', 1)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer', 'config_transfer', 'Einstellungen', 'Stellen Sie ein, wie viele Transaktionen aufgelistet werden sollen und wie alt diese werden dürfen. Die evtl. installierte autopurge-Erweiterung kann dann automatisch die veralteten Transktionen löschen.', 2)"; - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer', 'del_transfer', 'Manuell löschen', 'Hier können Sie - abgesehen von der automatischen Löschung - Transaktionen selber löschen. Bitte beachten Sie, dass immer aus- und eingehende Transaktionen gleichzeitig gelöscht werden.', 3)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer', NULL, '{!POINTS!}-Transfer','Verwalten Sie hier die {!POINTS!}-Transaktionen zwischen Ihren Mitgliedern.', 7)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer','list_transfer','Auflisten','Hier bekommen Sie alle ein- und ausgehende Transaktionen aufgelistet.', 1)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer','config_transfer','Einstellungen','Stellen Sie ein, wie viele Transaktionen aufgelistet werden sollen und wie alt diese werden dürfen. Die evtl. installierte autopurge-Erweiterung kann dann automatisch die veralteten Transktionen löschen.', 2)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer','del_transfer','Manuell löschen','Hier können Sie - abgesehen von der automatischen Löschung - Transaktionen selber löschen. Bitte beachten Sie, dass immer aus- und eingehende Transaktionen gleichzeitig gelöscht werden.', 3)"; // Member menu - $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main', 'transfer', '{!POINTS!}-Transfer', 'Y', 'Y', 5)"; + $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main','transfer','{!POINTS!}-Transfer','Y','Y', 5)"; // Add config values $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD transfer_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '50'"; @@ -98,7 +98,7 @@ PRIMARY KEY(id) $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD transfer_code BIGINT(20) UNSIGNED NOT NULL DEFAULT '5'"; // Add row(s) to user's data - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD opt_in ENUM('Y', 'N') NOT NULL DEFAULT 'N'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD opt_in ENUM('Y','N') NOT NULL DEFAULT 'N'"; break; case "remove": // Do stuff when removing extension @@ -139,7 +139,7 @@ case "update": // Update an extension break; case "0.0.5": // SQL queries for v0.0.5 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_transfer ENUM('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_transfer ENUM('Y','N') NOT NULL DEFAULT 'Y'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Link Auflisten im Admin-Bereich hatte das eingeloggte Mitglied und nicht den eingeloggten Admin abgefragt. Automatisches Löschen von veraltete Einträgen kann unabhängig von der autopurge-Erweiterung de-/aktiviert werden. Bitte aktualisieren Sie auch die beiden Admin-Templates!"; diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index f482060374..159b71ad6a 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -138,14 +138,14 @@ 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."; break; case "0.2.2": // SQL queries for v0.2.2 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data CHANGE gender gender ENUM('M', 'F', 'C') NOT NULL DEFAULT 'M'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data CHANGE gender gender ENUM('M','F','C') NOT NULL DEFAULT 'M'"; // Update notes (these will be set as task text!) $UPDATE_NOTES = "Anrede "Firma" hinzugefügt."; @@ -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."; diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php index b0e59c5721..1e774e0287 100644 --- a/inc/extensions/ext-wernis.php +++ b/inc/extensions/ext-wernis.php @@ -57,7 +57,7 @@ userid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0', wernis_account VARCHAR(255) NOT NULL DEFAULT '', wernis_amount DOUBLE(22,5) UNSIGNED NOT NULL DEFAULT '0.00000', wernis_timestamp VARCHAR(10) NOT NULL DEFAULT '0', -wernis_type ENUM('IN','OUT', 'FAILED') NOT NULL DEFAULT 'FAILED', +wernis_type ENUM('IN','OUT','FAILED') NOT NULL DEFAULT 'FAILED', wernis_api_message TINYTEXT, wernis_api_status VARCHAR(255) NULL DEFAULT NULL, KEY(userid), @@ -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 @@ -109,8 +109,8 @@ case "update": // Update an extension switch ($EXT_VER) { case "0.0.1": // SQL queries for v0.0.1 - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD wernis_payout_active ENUM ('Y', 'N') NOT NULL DEFAULT 'Y'"; - $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD wernis_withdraw_active ENUM ('Y', 'N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD wernis_payout_active ENUM ('Y','N') NOT NULL DEFAULT 'Y'"; + $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD wernis_withdraw_active ENUM ('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD wernis_payout_factor DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT 1.00000"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD wernis_withdraw_factor DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT 1.00000"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD wernis_payout_fee_percent FLOAT(8,5) UNSIGNED NOT NULL DEFAULT 0.00000"; diff --git a/inc/functions.php b/inc/functions.php index 44fdf95282..9a9f9d195a 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -207,11 +207,8 @@ function LOAD_TEMPLATE($template, $return=false, $content="") { $_CONFIG['num_templates']++; // Init some data - $ACTION = SQL_ESCAPE($GLOBALS['action']); - $WHAT = SQL_ESCAPE($GLOBALS['what']); $ret = ""; if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0; - $REFID = $GLOBALS['refid']; // @DEPRECATED Try to remove this if() block if ($template == "member_support_form") { @@ -2239,13 +2236,21 @@ function isSessionVariableSet($var) { } // Returns wether the value of the session variable or NULL if not set function get_session($var) { + global $cacheArray; + // Default is not found! ;-) $value = null; - // Is the variable there? - if (isSessionVariableSet($var)) { + // Is the variable there or cached values? + if (isset($cacheArray['session'][$var])) { + // Get cached value (skips a lot SQL_ESCAPE() calles! + $value = $cacheArray['session'][$var]; + } elseif (isSessionVariableSet($var)) { // Then get it secured! $value = SQL_ESCAPE($_SESSION[$var]); + + // Cache the value + $cacheArray['session'][$var] = $value; } // END - if // Return the value diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index f3c140674a..a80cddd54c 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -135,11 +135,11 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) if (($_POST['cat'][$id] == "Y") || (($_CONFIG['register_default'] == "Y") && (empty($_POST['cat'][$id])))) { - $content['def_y'] = ' checked'; + $content['def_y'] = " checked"; } else { - $content['def_n'] = ' checked'; + $content['def_n'] = " checked"; } // Load template and switch color diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index 4ae38518e0..31a7578e6e 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -471,7 +471,7 @@ function SPONSOR_SAVE_DATA($POST, $content) // Unsecure data which we don't want $UNSAFE = array('password', 'id', 'remote_addr', 'sponsor_created', 'last_online', 'status', 'ref_count', - 'points_amount', 'points_used', 'refid', 'hash' , 'last_pay', 'last_curr', 'pass_old', + 'points_amount', 'points_used', 'refid', 'hash', 'last_pay', 'last_curr', 'pass_old', 'ok', 'pass1', 'pass2'); // Set default message ("not saved") diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index 6497d3c917..2eca98fd20 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -273,21 +273,17 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) if (EXT_IS_ACTIVE("autopurge")) { // Start finding them... $since = (time() - $_CONFIG['ap_in_since']); - $EXCLUDE_LIST = " AND d.userid != c.def_refid"; + $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid'].""; // Check for more extensions - if (EXT_IS_ACTIVE("beg")) $EXCLUDE_LIST .= " AND d.userid != c.beg_uid"; - if (EXT_IS_ACTIVE("bonus")) $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid"; - if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid"; - - // Check for new holiday system - if (GET_EXT_VERSION("holiday") >= "0.1.3") { - $EXCLUDE_LIST .= " AND d.holiday_active = 'N'"; - } + if (EXT_IS_ACTIVE("beg")) $EXCLUDE_LIST .= " AND d.userid != c.beg_uid"; + if (EXT_IS_ACTIVE("bonus")) $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid"; + if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid"; + if (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_active = 'N'"; // Check for all accounts $SQLs[] = "SELECT DISTINCT d.userid, d.email, d.last_online -FROM "._MYSQL_PREFIX."_user_data AS d, "._MYSQL_PREFIX."_config AS c +FROM "._MYSQL_PREFIX."_user_data AS d WHERE d.status='CONFIRMED' AND d.joined < ".$since." AND d.last_online < ".$since." AND d.ap_notified < ".$since." ".$EXCLUDE_LIST." ORDER BY d.userid"; @@ -559,7 +555,11 @@ function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){ foreach ($SQLs as $key => $sql) { // Run SQL command, get line numbers and free memory $result = SQL_QUERY($sql, __FILE__, __LINE__); + + // Get rows $value = SQL_NUMROWS($result); + + // Free result SQL_FREERESULT($result); $content = array( @@ -581,7 +581,7 @@ function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){ // And insert the final string into extras template $OUT .= LOAD_TEMPLATE("admin_overview_task_rows", true, $content); - } + } // END - if // Return output return LOAD_TEMPLATE("admin_overview_task_extras", true, $OUT); diff --git a/inc/modules/admin/what-autopurge.php b/inc/modules/admin/what-autopurge.php index 1a729d8e10..0ab6d46575 100644 --- a/inc/modules/admin/what-autopurge.php +++ b/inc/modules/admin/what-autopurge.php @@ -47,13 +47,13 @@ if (isset($_POST['ok'])) { // Setup constants for the template switch ($_CONFIG['ap_inactive']) { - case 'Y': define('__YES_IN', ' checked'); define('__NO_IN', ""); break; - case 'N': define('__YES_IN', ""); define('__NO_IN', ' checked'); break; + case 'Y': define('__YES_IN', " checked"); define('__NO_IN', ""); break; + case 'N': define('__YES_IN', ""); define('__NO_IN', " checked"); break; } switch ($_CONFIG['ap_unconfirmed']) { - case 'Y': define('__YES_UN', ' checked'); define('__NO_UN', ""); break; - case 'N': define('__YES_UN', ""); define('__NO_UN', ' checked'); break; + case 'Y': define('__YES_UN', " checked"); define('__NO_UN', ""); break; + case 'N': define('__YES_UN', ""); define('__NO_UN', " checked"); break; } define('__AP_IN_SINCE', $_CONFIG['ap_in_since']); define('__AP_IN_TIME' , $_CONFIG['ap_in_time']); diff --git a/inc/modules/admin/what-config_admin.php b/inc/modules/admin/what-config_admin.php index 6592affb88..f0a91040b9 100644 --- a/inc/modules/admin/what-config_admin.php +++ b/inc/modules/admin/what-config_admin.php @@ -47,13 +47,13 @@ if (isset($_POST['ok'])) { switch ($_CONFIG['admin_menu']) { case "NEW": - define('__ADMIN_MENU_NEW', ' checked'); + define('__ADMIN_MENU_NEW', " checked"); define('__ADMIN_MENU_OLD' , ""); break; case "OLD": define('__ADMIN_MENU_NEW', ""); - define('__ADMIN_MENU_OLD' , ' checked'); + define('__ADMIN_MENU_OLD' , " checked"); break; } diff --git a/inc/modules/admin/what-config_autopurge.php b/inc/modules/admin/what-config_autopurge.php index e29b37ed9d..4ab850216e 100644 --- a/inc/modules/admin/what-config_autopurge.php +++ b/inc/modules/admin/what-config_autopurge.php @@ -66,11 +66,11 @@ if (isset($_POST['ok'])) { // Mail confirmation links define('_CFG_AUTO_PURGE', CREATE_TIME_SELECTIONS($_CONFIG['auto_purge'], "auto_purge", "MWD")); if ($_CONFIG['auto_purge_active'] == "N") { - define('_CFG_AP_ACTIVE_N', ' checked'); + define('_CFG_AP_ACTIVE_N', " checked"); define('_CFG_AP_ACTIVE_Y', ""); } else { define('_CFG_AP_ACTIVE_N', ""); - define('_CFG_AP_ACTIVE_Y', ' checked'); + define('_CFG_AP_ACTIVE_Y', " checked"); } // Output template diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php index db38955655..f624247aa5 100644 --- a/inc/modules/admin/what-config_beg.php +++ b/inc/modules/admin/what-config_beg.php @@ -77,85 +77,85 @@ if (isset($_POST['ok'])) switch ($_CONFIG['beg_rallye']) { case 'Y': - define('__BEG_RALLYE_Y', ' checked'); + define('__BEG_RALLYE_Y', " checked"); define('__BEG_RALLYE_N', ""); break; case 'N': define('__BEG_RALLYE_Y', ""); - define('__BEG_RALLYE_N', ' checked'); + define('__BEG_RALLYE_N', " checked"); break; } switch ($_CONFIG['beg_active']) { case 'Y': - define('__BEG_ACTIVE_Y', ' checked'); + define('__BEG_ACTIVE_Y', " checked"); define('__BEG_ACTIVE_N', ""); break; case 'N': define('__BEG_ACTIVE_Y', ""); - define('__BEG_ACTIVE_N', ' checked'); + define('__BEG_ACTIVE_N', " checked"); break; } switch ($_CONFIG['beg_mode']) { case "DIRECT": - define('__BEG_MODE_DIRECT', ' checked'); + define('__BEG_MODE_DIRECT', " checked"); define('__BEG_MODE_REF' , ""); break; case "REF": define('__BEG_MODE_DIRECT', ""); - define('__BEG_MODE_REF' , ' checked'); + define('__BEG_MODE_REF' , " checked"); break; } switch ($_CONFIG['beg_ral_en_notify']) { case 'Y': - define('__BEG_RAL_EN_NOTIFY_Y', ' checked'); + define('__BEG_RAL_EN_NOTIFY_Y', " checked"); define('__BEG_RAL_EN_NOTIFY_N', ""); break; case 'N': define('__BEG_RAL_EN_NOTIFY_Y', ""); - define('__BEG_RAL_EN_NOTIFY_N', ' checked'); + define('__BEG_RAL_EN_NOTIFY_N', " checked"); break; } switch ($_CONFIG['beg_ral_di_notify']) { case 'Y': - define('__BEG_RAL_DI_NOTIFY_Y', ' checked'); + define('__BEG_RAL_DI_NOTIFY_Y', " checked"); define('__BEG_RAL_DI_NOTIFY_N', ""); break; case 'N': define('__BEG_RAL_DI_NOTIFY_Y', ""); - define('__BEG_RAL_DI_NOTIFY_N', ' checked'); + define('__BEG_RAL_DI_NOTIFY_N', " checked"); break; } switch ($_CONFIG['beg_new_mem_notify']) { case 'Y': - define('__BEG_NEW_MEMBER_NOTIFY_Y', ' checked'); + define('__BEG_NEW_MEMBER_NOTIFY_Y', " checked"); define('__BEG_NEW_MEMBER_NOTIFY_N', ""); break; case 'N': define('__BEG_NEW_MEMBER_NOTIFY_Y', ""); - define('__BEG_NEW_MEMBER_NOTIFY_N', ' checked'); + define('__BEG_NEW_MEMBER_NOTIFY_N', " checked"); break; } switch ($_CONFIG['beg_include_own']) { case 'Y': - define('__BEG_INCLUDE_OWN_Y', ' checked'); + define('__BEG_INCLUDE_OWN_Y', " checked"); define('__BEG_INCLUDE_OWN_N', ""); break; case 'N': define('__BEG_INCLUDE_OWN_Y', ""); - define('__BEG_INCLUDE_OWN_N', ' checked'); + define('__BEG_INCLUDE_OWN_N', " checked"); break; } diff --git a/inc/modules/admin/what-config_birthday.php b/inc/modules/admin/what-config_birthday.php index 1f56c6a9f5..0eedd1e1a2 100644 --- a/inc/modules/admin/what-config_birthday.php +++ b/inc/modules/admin/what-config_birthday.php @@ -49,25 +49,25 @@ if (isset($_POST['ok'])) { switch ($_CONFIG['birthday_active']) { case 'Y': - define('__BIRTHDAY_ACTIVE_Y', ' checked'); + define('__BIRTHDAY_ACTIVE_Y', " checked"); define('__BIRTHDAY_ACTIVE_N', ""); break; case 'N': define('__BIRTHDAY_ACTIVE_Y', ""); - define('__BIRTHDAY_ACTIVE_N', ' checked'); + define('__BIRTHDAY_ACTIVE_N', " checked"); break; } switch ($_CONFIG['birthday_mode']) { case "DIRECT": - define('__BIRTHDAY_MODE_DIRECT', ' checked'); + define('__BIRTHDAY_MODE_DIRECT', " checked"); define('__BIRTHDAY_MODE_REF' , ""); break; case "REF": define('__BIRTHDAY_MODE_DIRECT', ""); - define('__BIRTHDAY_MODE_REF' , ' checked'); + define('__BIRTHDAY_MODE_REF' , " checked"); break; } diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php index 1488a2b329..5c4b671a2d 100644 --- a/inc/modules/admin/what-config_bonus.php +++ b/inc/modules/admin/what-config_bonus.php @@ -116,122 +116,122 @@ if (isset($_POST['ok'])) switch ($_CONFIG['bonus_active']) { case 'Y': - define('__BONUS_ACTIVE_Y', ' checked'); + define('__BONUS_ACTIVE_Y', " checked"); define('__BONUS_ACTIVE_N', ""); break; case 'N': define('__BONUS_ACTIVE_Y', ""); - define('__BONUS_ACTIVE_N', ' checked'); + define('__BONUS_ACTIVE_N', " checked"); break; } // Other bonus to de-/activate switch ($_CONFIG['bonus_login_yn']) { case 'Y': - define('__BONUS_LOGIN_Y', ' checked'); + define('__BONUS_LOGIN_Y', " checked"); define('__BONUS_LOGIN_N', ""); break; case 'N': define('__BONUS_LOGIN_Y', ""); - define('__BONUS_LOGIN_N', ' checked'); + define('__BONUS_LOGIN_N', " checked"); break; } switch ($_CONFIG['bonus_stats_yn']) { case 'Y': - define('__BONUS_STATS_Y', ' checked'); + define('__BONUS_STATS_Y', " checked"); define('__BONUS_STATS_N', ""); break; case 'N': define('__BONUS_STATS_Y', ""); - define('__BONUS_STATS_N', ' checked'); + define('__BONUS_STATS_N', " checked"); break; } switch ($_CONFIG['bonus_order_yn']) { case 'Y': - define('__BONUS_ORDER_Y', ' checked'); + define('__BONUS_ORDER_Y', " checked"); define('__BONUS_ORDER_N', ""); break; case 'N': define('__BONUS_ORDER_Y', ""); - define('__BONUS_ORDER_N', ' checked'); + define('__BONUS_ORDER_N', " checked"); break; } switch ($_CONFIG['bonus_ref_yn']) { case 'Y': - define('__BONUS_REF_Y', ' checked'); + define('__BONUS_REF_Y', " checked"); define('__BONUS_REF_N', ""); break; case 'N': define('__BONUS_REF_Y', ""); - define('__BONUS_REF_N', ' checked'); + define('__BONUS_REF_N', " checked"); break; } switch ($_CONFIG['bonus_click_yn']) { case 'Y': - define('__BONUS_CLICK_Y', ' checked'); + define('__BONUS_CLICK_Y', " checked"); define('__BONUS_CLICK_N', ""); break; case 'N': define('__BONUS_CLICK_Y', ""); - define('__BONUS_CLICK_N', ' checked'); + define('__BONUS_CLICK_N', " checked"); break; } switch ($_CONFIG['bonus_en_notify']) { case 'Y': - define('__BONUS_EN_NOTIFY_Y', ' checked'); + define('__BONUS_EN_NOTIFY_Y', " checked"); define('__BONUS_EN_NOTIFY_N', ""); break; case 'N': define('__BONUS_EN_NOTIFY_Y', ""); - define('__BONUS_EN_NOTIFY_N', ' checked'); + define('__BONUS_EN_NOTIFY_N', " checked"); break; } switch ($_CONFIG['bonus_di_notify']) { case 'Y': - define('__BONUS_DI_NOTIFY_Y', ' checked'); + define('__BONUS_DI_NOTIFY_Y', " checked"); define('__BONUS_DI_NOTIFY_N', ""); break; case 'N': define('__BONUS_DI_NOTIFY_Y', ""); - define('__BONUS_DI_NOTIFY_N', ' checked'); + define('__BONUS_DI_NOTIFY_N', " checked"); break; } switch ($_CONFIG['bonus_new_mem_notify']) { case 'Y': - define('__BONUS_NEW_MEMBER_NOTIFY_Y', ' checked'); + define('__BONUS_NEW_MEMBER_NOTIFY_Y', " checked"); define('__BONUS_NEW_MEMBER_NOTIFY_N', ""); break; case 'N': define('__BONUS_NEW_MEMBER_NOTIFY_Y', ""); - define('__BONUS_NEW_MEMBER_NOTIFY_N', ' checked'); + define('__BONUS_NEW_MEMBER_NOTIFY_N', " checked"); break; } switch ($_CONFIG['bonus_include_own']) { case 'Y': - define('__BONUS_INCLUDE_OWN_Y', ' checked'); + define('__BONUS_INCLUDE_OWN_Y', " checked"); define('__BONUS_INCLUDE_OWN_N', ""); break; case 'N': define('__BONUS_INCLUDE_OWN_Y', ""); - define('__BONUS_INCLUDE_OWN_N', ' checked'); + define('__BONUS_INCLUDE_OWN_N', " checked"); break; } diff --git a/inc/modules/admin/what-config_cache.php b/inc/modules/admin/what-config_cache.php index 8b9047d05c..4f90be0865 100644 --- a/inc/modules/admin/what-config_cache.php +++ b/inc/modules/admin/what-config_cache.php @@ -90,38 +90,38 @@ if (isset($_POST['ok'])) // Prepare data switch ($_CONFIG['cache_admins']) { - case 'Y': define('__ADMINS_Y', ' checked'); define('__ADMINS_N', ""); break; - case 'N': define('__ADMINS_Y', ""); define('__ADMINS_N', ' checked'); break; + case 'Y': define('__ADMINS_Y', " checked"); define('__ADMINS_N', ""); break; + case 'N': define('__ADMINS_Y', ""); define('__ADMINS_N', " checked"); break; } switch ($_CONFIG['cache_acls']) { - case 'Y': define('__ACLS_Y', ' checked'); define('__ACLS_N', ""); break; - case 'N': define('__ACLS_Y', ""); define('__ACLS_N', ' checked'); break; + case 'Y': define('__ACLS_Y', " checked"); define('__ACLS_N', ""); break; + case 'N': define('__ACLS_Y', ""); define('__ACLS_N', " checked"); break; } switch ($_CONFIG['cache_exts']) { - case 'Y': define('__EXTS_Y', ' checked'); define('__EXTS_N', ""); break; - case 'N': define('__EXTS_Y', ""); define('__EXTS_N', ' checked'); break; + case 'Y': define('__EXTS_Y', " checked"); define('__EXTS_N', ""); break; + case 'N': define('__EXTS_Y', ""); define('__EXTS_N', " checked"); break; } switch ($_CONFIG['cache_config']) { - case 'Y': define('__CONFIG_Y', ' checked'); define('__CONFIG_N', ""); break; - case 'N': define('__CONFIG_Y', ""); define('__CONFIG_N', ' checked'); break; + case 'Y': define('__CONFIG_Y', " checked"); define('__CONFIG_N', ""); break; + case 'N': define('__CONFIG_Y', ""); define('__CONFIG_N', " checked"); break; } switch ($_CONFIG['cache_modreg']) { - case 'Y': define('__MODREG_Y', ' checked'); define('__MODREG_N', ""); break; - case 'N': define('__MODREG_Y', ""); define('__MODREG_N', ' checked'); break; + case 'Y': define('__MODREG_Y', " checked"); define('__MODREG_N', ""); break; + case 'N': define('__MODREG_Y', ""); define('__MODREG_N', " checked"); break; } switch ($_CONFIG['cache_refdepth']) { - case 'Y': define('__REFDEPTH_Y', ' checked'); define('__REFDEPTH_N', ""); break; - case 'N': define('__REFDEPTH_Y', ""); define('__REFDEPTH_N', ' checked'); break; + case 'Y': define('__REFDEPTH_Y', " checked"); define('__REFDEPTH_N', ""); break; + case 'N': define('__REFDEPTH_Y', ""); define('__REFDEPTH_N', " checked"); break; } switch ($_CONFIG['cache_refsys']) { - case 'Y': define('__REFSYS_Y', ' checked'); define('__REFSYS_N', ""); break; - case 'N': define('__REFSYS_Y', ""); define('__REFSYS_N', ' checked'); break; + case 'Y': define('__REFSYS_Y', " checked"); define('__REFSYS_N', ""); break; + case 'N': define('__REFSYS_Y', ""); define('__REFSYS_N', " checked"); break; } define('__PATH', $_CONFIG['cache_path']); diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php index 04355fd63d..c9b54ddaf1 100644 --- a/inc/modules/admin/what-config_doubler.php +++ b/inc/modules/admin/what-config_doubler.php @@ -71,13 +71,13 @@ if (isset($_POST['ok'])) { switch ($_CONFIG['doubler_jackpot']) { case 'Y': - define('__DOUBLER_JACKPOT_Y', ' checked'); + define('__DOUBLER_JACKPOT_Y', " checked"); define('__DOUBLER_JACKPOT_N', ""); break; case 'N': define('__DOUBLER_JACKPOT_Y', ""); - define('__DOUBLER_JACKPOT_N', ' checked'); + define('__DOUBLER_JACKPOT_N', " checked"); break; } @@ -85,13 +85,13 @@ if (isset($_POST['ok'])) { switch ($_CONFIG['doubler_own']) { case 'Y': - define('__DOUBLER_OWN_Y', ' checked'); + define('__DOUBLER_OWN_Y', " checked"); define('__DOUBLER_OWN_N', ""); break; case 'N': define('__DOUBLER_OWN_Y', ""); - define('__DOUBLER_OWN_N', ' checked'); + define('__DOUBLER_OWN_N', " checked"); break; } @@ -99,13 +99,13 @@ if (isset($_POST['ok'])) { switch ($_CONFIG['doubler_send_mode']) { case "DIRECT": - define('__DOUBLER_SEND_DIRECT', ' checked'); + define('__DOUBLER_SEND_DIRECT', " checked"); define('__DOUBLER_SEND_RESET' , ""); break; case "RESET": define('__DOUBLER_SEND_DIRECT', ""); - define('__DOUBLER_SEND_RESET' , ' checked'); + define('__DOUBLER_SEND_RESET' , " checked"); break; } @@ -113,13 +113,13 @@ if (isset($_POST['ok'])) { switch ($_CONFIG['doubler_sent_all']) { case 'Y': - define('__DOUBLER_SENT_ALL_Y', ' checked'); + define('__DOUBLER_SENT_ALL_Y', " checked"); define('__DOUBLER_SENT_ALL_N', ""); break; case 'N': define('__DOUBLER_SENT_ALL_Y', ""); - define('__DOUBLER_SENT_ALL_N', ' checked'); + define('__DOUBLER_SENT_ALL_N', " checked"); break; } diff --git a/inc/modules/admin/what-config_extensions.php b/inc/modules/admin/what-config_extensions.php index 4827207a74..2f457430ac 100644 --- a/inc/modules/admin/what-config_extensions.php +++ b/inc/modules/admin/what-config_extensions.php @@ -46,8 +46,8 @@ if (isset($_POST['ok'])) { } else { // Prepare data switch ($_CONFIG['verbose_sql']) { - case 'Y': define('__VERBOSE_Y', ' checked'); define('__VERBOSE_N', ""); break; - case 'N': define('__VERBOSE_Y', ""); define('__VERBOSE_N', ' checked'); break; + case 'Y': define('__VERBOSE_Y', " checked"); define('__VERBOSE_N', ""); break; + case 'N': define('__VERBOSE_Y', ""); define('__VERBOSE_N', " checked"); break; } // Load template diff --git a/inc/modules/admin/what-config_holiday.php b/inc/modules/admin/what-config_holiday.php index b2d824df2f..51878d2fcc 100644 --- a/inc/modules/admin/what-config_holiday.php +++ b/inc/modules/admin/what-config_holiday.php @@ -53,13 +53,13 @@ if (isset($_POST['ok'])) switch ($_CONFIG['holiday_mode']) { case "RESET": - define('__RESET_DEFAULT' , ' checked'); + define('__RESET_DEFAULT' , " checked"); define('__DIRECT_DEFAULT', ""); break; case "DIRECT": define('__RESET_DEFAULT' , ""); - define('__DIRECT_DEFAULT', ' checked'); + define('__DIRECT_DEFAULT', " checked"); break; } diff --git a/inc/modules/admin/what-config_order.php b/inc/modules/admin/what-config_order.php index 8f63c4488a..d31fef9e92 100644 --- a/inc/modules/admin/what-config_order.php +++ b/inc/modules/admin/what-config_order.php @@ -48,13 +48,13 @@ if (isset($_POST['ok'])) { switch ($_CONFIG['order_max_full']) { case "ORDER": - define('__ORDER_DEFAULT', ' checked'); + define('__ORDER_DEFAULT', " checked"); define('__MAX_DEFAULT' , ""); break; case "MAX": define('__ORDER_DEFAULT', ""); - define('__MAX_DEFAULT' , ' checked'); + define('__MAX_DEFAULT' , " checked"); break; } @@ -80,11 +80,11 @@ if (isset($_POST['ok'])) { define('_CFG_MAX_TLENGTH' , $_CONFIG['max_tlength']); if ($_CONFIG['test_text'] == "N") { - define('_CFG_TEST_TEXT_N', ' checked'); + define('_CFG_TEST_TEXT_N', " checked"); define('_CFG_TEST_TEXT_Y', ""); } else { define('_CFG_TEST_TEXT_N', ""); - define('_CFG_TEST_TEXT_Y', ' checked'); + define('_CFG_TEST_TEXT_Y', " checked"); } switch ($_CONFIG['repay_deleted_mails']) { @@ -108,19 +108,19 @@ if (isset($_POST['ok'])) { } if ($_CONFIG['test_subj'] == "N") { - define('_CFG_TEST_SUBJ_N', ' checked'); + define('_CFG_TEST_SUBJ_N', " checked"); define('_CFG_TEST_SUBJ_Y', ""); } else { define('_CFG_TEST_SUBJ_N', ""); - define('_CFG_TEST_SUBJ_Y', ' checked'); + define('_CFG_TEST_SUBJ_Y', " checked"); } if ($_CONFIG['url_blacklist'] == "N") { - define('_CFG_URL_BLIST_N', ' checked'); + define('_CFG_URL_BLIST_N', " checked"); define('_CFG_URL_BLIST_Y', ""); } else { define('_CFG_URL_BLIST_N', ""); - define('_CFG_URL_BLIST_Y', ' checked'); + define('_CFG_URL_BLIST_Y', " checked"); } // Selection list diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php index e9f43515ac..0aaf2106de 100644 --- a/inc/modules/admin/what-config_other.php +++ b/inc/modules/admin/what-config_other.php @@ -98,83 +98,83 @@ if (isset($_POST['ok'])) { } if ($_CONFIG['order_multi_page'] == "N") { - define('_CFG_ORDER_MULTI_N', ' checked'); + define('_CFG_ORDER_MULTI_N', " checked"); define('_CFG_ORDER_MULTI_Y', ""); } else { define('_CFG_ORDER_MULTI_N', ""); - define('_CFG_ORDER_MULTI_Y', ' checked'); + define('_CFG_ORDER_MULTI_Y', " checked"); } if ($_CONFIG['autosend_active'] == "N") { - define('_CFG_AUTOSEND_ACTIVE_N', ' checked'); + define('_CFG_AUTOSEND_ACTIVE_N', " checked"); define('_CFG_AUTOSEND_ACTIVE_Y', ""); } else { define('_CFG_AUTOSEND_ACTIVE_N', ""); - define('_CFG_AUTOSEND_ACTIVE_Y', ' checked'); + define('_CFG_AUTOSEND_ACTIVE_Y', " checked"); } if ($_CONFIG['send_prof_update'] == "N") { - define('_CFG_SEND_UPDATE_N', ' checked'); + define('_CFG_SEND_UPDATE_N', " checked"); define('_CFG_SEND_UPDATE_Y', ""); } else { define('_CFG_SEND_UPDATE_N', ""); - define('_CFG_SEND_UPDATE_Y', ' checked'); + define('_CFG_SEND_UPDATE_Y', " checked"); } if ($_CONFIG['admin_notify'] == "N") { - define('_CFG_ADMIN_NOTIFY_N', ' checked'); + define('_CFG_ADMIN_NOTIFY_N', " checked"); define('_CFG_ADMIN_NOTIFY_Y', ""); } else { define('_CFG_ADMIN_NOTIFY_N', ""); - define('_CFG_ADMIN_NOTIFY_Y', ' checked'); + define('_CFG_ADMIN_NOTIFY_Y', " checked"); } if ($_CONFIG['css_php'] == "DIRECT") { - define('_CFG_CSS_PHP_DIRECT', ' checked'); + define('_CFG_CSS_PHP_DIRECT', " checked"); define('_CFG_CSS_PHP_FILE', ""); } else { define('_CFG_CSS_PHP_DIRECT', ""); - define('_CFG_CSS_PHP_FILE', ' checked'); + define('_CFG_CSS_PHP_FILE', " checked"); } if ($_CONFIG['guest_menu'] == "Y") { - define('_CFG_GUEST_MENU_ACTIVE', ' checked'); + define('_CFG_GUEST_MENU_ACTIVE', " checked"); define('_CFG_GUEST_MENU_INACTIVE', ""); } else { define('_CFG_GUEST_MENU_ACTIVE', ""); - define('_CFG_GUEST_MENU_INACTIVE', ' checked'); + define('_CFG_GUEST_MENU_INACTIVE', " checked"); } if ($_CONFIG['member_menu'] == "Y") { - define('_CFG_MEMBER_MENU_ACTIVE', ' checked'); + define('_CFG_MEMBER_MENU_ACTIVE', " checked"); define('_CFG_MEMBER_MENU_INACTIVE', ""); } else { define('_CFG_MEMBER_MENU_ACTIVE', ""); - define('_CFG_MEMBER_MENU_INACTIVE', ' checked'); + define('_CFG_MEMBER_MENU_INACTIVE', " checked"); } if ($_CONFIG['youre_here'] == "Y") { - define('_CFG_YOURE_HERE_ACTIVE', ' checked'); + define('_CFG_YOURE_HERE_ACTIVE', " checked"); define('_CFG_YOURE_HERE_INACTIVE', ""); } else { define('_CFG_YOURE_HERE_ACTIVE', ""); - define('_CFG_YOURE_HERE_INACTIVE', ' checked'); + define('_CFG_YOURE_HERE_INACTIVE', " checked"); } if ($_CONFIG['show_timings'] == "Y") { - define('_CFG_SHOW_TIMINGS_Y', ' checked'); + define('_CFG_SHOW_TIMINGS_Y', " checked"); define('_CFG_SHOW_TIMINGS_N', ""); } else { define('_CFG_SHOW_TIMINGS_Y', ""); - define('_CFG_SHOW_TIMINGS_N', ' checked'); + define('_CFG_SHOW_TIMINGS_N', " checked"); } if ($_CONFIG['mailid_error_redirect'] == 'INDEX') { - define('_CFG_MAILID_REDIRECT_INDEX', ' checked'); + define('_CFG_MAILID_REDIRECT_INDEX', " checked"); define('_CFG_MAILID_REDIRECT_REJECT', ""); } else { define('_CFG_MAILID_REDIRECT_INDEX', ""); - define('_CFG_MAILID_REDIRECT_REJECT', ' checked'); + define('_CFG_MAILID_REDIRECT_REJECT', " checked"); } for ($i = 0; $i <= 5; $i++) { diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php index ca9a6e71da..a4f604a8ba 100644 --- a/inc/modules/admin/what-config_points.php +++ b/inc/modules/admin/what-config_points.php @@ -170,21 +170,21 @@ WHERE mails_confirmed < %s", $REF, $REF); switch ($_CONFIG['allow_direct_pay']) { case 'Y': - define('__DIRECT_Y', ' checked'); + define('__DIRECT_Y', " checked"); define('__DIRECT_N', ""); break; case 'N': define('__DIRECT_Y', ""); - define('__DIRECT_N', ' checked'); + define('__DIRECT_N', " checked"); break; } // One-time referral bonus add-mode switch ($_CONFIG['reg_points_mode']) { - case "ref" : define('__MODE_REF', ' checked'); define('__MODE_DIRECT', ""); break; - case "direct": define('__MODE_REF', ""); define('__MODE_DIRECT', ' checked'); break; + case "ref" : define('__MODE_REF', " checked"); define('__MODE_DIRECT', ""); break; + case "direct": define('__MODE_REF', ""); define('__MODE_DIRECT', " checked"); break; } // Referral payout value diff --git a/inc/modules/admin/what-config_rewrite.php b/inc/modules/admin/what-config_rewrite.php index 777ce50e4e..eac3619b2e 100644 --- a/inc/modules/admin/what-config_rewrite.php +++ b/inc/modules/admin/what-config_rewrite.php @@ -75,14 +75,14 @@ if (isset($_POST['ok'])) if (ereg($mod, $_CONFIG['rewrite_skip'])) { // Found - $y = ' checked'; + $y = " checked"; $n = ""; } else { // Not found $y = ""; - $n = ' checked'; + $n = " checked"; } // Remember data in array for the dynamic row template diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php index 3d6ef10b7a..afc35102c6 100644 --- a/inc/modules/admin/what-list_autopurge.php +++ b/inc/modules/admin/what-list_autopurge.php @@ -42,7 +42,7 @@ ADD_DESCR("admin", basename(__FILE__)); // Ok, let's have a look... $since = bigintval(time() - $_CONFIG['ap_in_since']); -$EXCLUDE_LIST = " AND d.userid != c.def_refid"; +$EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid'].""; // Check for more extensions if (EXT_IS_ACTIVE("beg")) $EXCLUDE_LIST .= " AND d.userid != c.beg_uid"; @@ -51,7 +51,7 @@ if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid"; // Check for all accounts $result = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.gender, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified -FROM "._MYSQL_PREFIX."_user_data AS d, "._MYSQL_PREFIX."_config AS c +FROM "._MYSQL_PREFIX."_user_data AS d WHERE d.status='CONFIRMED' AND d.joined < %s AND d.last_online < %s AND d.ap_notified < %s ".$EXCLUDE_LIST." ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__); diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php index cc902331e0..68d3dcbc39 100644 --- a/inc/modules/member/what-categories.php +++ b/inc/modules/member/what-categories.php @@ -118,7 +118,7 @@ if ($cats > 0) while (list($id, $cat) = SQL_FETCHROW($result)) { // Default he has not joined - $JOINED_N = ' checked'; $JOINED_Y = ""; + $JOINED_N = " checked"; $JOINED_Y = ""; // Check category selection $result_user = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%s AND cat_id=%s LIMIT 1", @@ -127,13 +127,13 @@ if ($cats > 0) // When we found an entry don't read it, just change the JOINED_x variables if (isset($_POST['cat'])) { - if ($_POST['cat'][$id] =='Y') { $JOINED_Y = ' checked'; $JOINED_N = ""; } + if ($_POST['cat'][$id] =='Y') { $JOINED_Y = " checked"; $JOINED_N = ""; } } else { if (SQL_NUMROWS($result_user) == 1) { - $JOINED_Y = ' checked'; $JOINED_N = ""; + $JOINED_Y = " checked"; $JOINED_N = ""; } // Free memory diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php index b5602693a2..f8f2293235 100644 --- a/inc/modules/member/what-html_mail.php +++ b/inc/modules/member/what-html_mail.php @@ -63,12 +63,12 @@ if (isset($_POST['ok'])) if ($mode == "Y") { - define('HTML_Y', ' checked'); + define('HTML_Y', " checked"); define('HTML_N', ""); } else { - define('HTML_N', ' checked'); + define('HTML_N', " checked"); define('HTML_Y', ""); } LOAD_TEMPLATE("member_html_mail_settings"); diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index ddbb47dd6f..943ea95444 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -577,14 +577,14 @@ case "": // Overview page switch ($opt_in) { case 'Y': - define('__TRANSFER_ALLOW_Y', ' checked'); + define('__TRANSFER_ALLOW_Y', " checked"); define('__TRANSFER_ALLOW_N', ""); define('__TRANSFER_NEW_LINK', "".TRANSFER_NOW_LINK.""); break; case 'N': define('__TRANSFER_ALLOW_Y', ""); - define('__TRANSFER_ALLOW_N', ' checked'); + define('__TRANSFER_ALLOW_N', " checked"); define('__TRANSFER_NEW_LINK', TRANSFER_PLEASE_ALLOW_OPT_IN); break; } diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index c32622cf8e..0739eabb2a 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -440,12 +440,18 @@ function IS_ADMIN($admin="") //* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."
"; // Search in array for entry - if ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) { + if (isset($cacheArray['admin_hash'])) { + // Use cached string + $valPass = $cacheArray['admin_hash']; + } elseif ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) { // Count cache hits $_CONFIG['cache_hits']++; // Login data is valid or not? $valPass = generatePassString($cacheArray['admins']['password'][$admin]); + + // Cache it away + $cacheArray['admin_hash'] = $valPass; } elseif (!empty($admin)) { // Search for admin $result = SQL_QUERY_ESC("SELECT HIGH_PRIORITY password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", @@ -624,9 +630,7 @@ function IS_MEMBER() // Free memory SQL_FREERESULT($result); - } - else - { + } else { // Cookie data is invalid! //* DEBUG: */ echo __LINE__."///
"; destroy_user_session(); @@ -634,6 +638,8 @@ function IS_MEMBER() // Remove array elements to prevent errors unset($GLOBALS['userid']); } + + // Return status return $ret; } // diff --git a/install/menu-de.sql b/install/menu-de.sql index c5a798760d..b820b545c3 100644 --- a/install/menu-de.sql +++ b/install/menu-de.sql @@ -96,22 +96,22 @@ INSERT INTO `mxchange_admin_menu` VALUES (NULL,'user','edit_user','Account editi INSERT INTO `mxchange_admin_menu` VALUES (NULL,'stats','logs','Aufruflogbücher',8,'Verwalten Sie Ihre Aufruflogbücher mit diesem Admin-Bereich! (Derzeit nur Download!)'); INSERT INTO `mxchange_admin_menu` VALUES (NULL,'stats','usage','Aufrufstatistik',9,'Erkennt automatisch Ihre Aufrufstatisiken und bindet diese in das Admin-Interface ein. (Derzeit nur Webalizer!)'); -INSERT INTO `mxchange_member_menu` VALUES (NULL, 'main', 'stats', 'Statistiken', 9, 'Y', 'N', '', 0); +INSERT INTO `mxchange_member_menu` VALUES (NULL, 'main','stats','Statistiken', 9, 'Y','N','', 0); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('email', 'email_archiv', 'E-Mail Archiv', 'Sehen Sie sich hier bereits gesendete Mails an.', '6'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user', 'list_links', 'Unbestätigte Mails', 'Mit diesem Menüpunkt können Sie die vom Mitglied nicht bestätigten Mails anzeigen.', '8'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user', 'list_refs', 'Referrals anzeigen', 'Mit diesem Menüpunkt können Sie die generierten Referrals eines Mitgliedes auflisten.', '7'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('email','email_archiv','E-Mail Archiv','Sehen Sie sich hier bereits gesendete Mails an.','6'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user','list_links','Unbestätigte Mails','Mit diesem Menüpunkt können Sie die vom Mitglied nicht bestätigten Mails anzeigen.','8'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user','list_refs','Referrals anzeigen','Mit diesem Menüpunkt können Sie die generierten Referrals eines Mitgliedes auflisten.','7'); -INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('main', 'stats', 'Statistiken', '7', 'Y', 'N'); -INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('online', '', 'Jetzt Online', '2', 'Y', 'N'); +INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('main','stats','Statistiken','7','Y','N'); +INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('online','','Jetzt Online','2','Y','N'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('email', 'del_email', 'E-Mail löschen', 'Löschen Sie hierrüber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem Mailtausch-System. Nur bei Normal-Mails: {!POINTS!} aus den unbestätigten Mails werden dem Werber wieder vergütet.', '7'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user', 'add_points', '{!POINTS!} gutschreiben', 'Buchen Sie einem Mitglied direkt {!POINTS!} auf. Sie können dazu auch einen Kommentar mitsenden.', '5'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user', 'list_cats', 'Kategorien anzeigen', 'Listet die ausgewählten Kategorien eines Mitgliedes auf.', '9'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('setup', 'config_other', 'Sonstige Einstellungen', 'Sonstige Einstellungen an Ihrem Mailtausch.', '13'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('misc', 'updates', 'Updates prüfen', 'Prüft, ob eine neue Version oder ein Patch auf dem Server exisitiert. Sie müssen dann die Patches/Updates selber herunterladen und einspielen. Dabei werden keine Daten von Ihrer Installation an uns gesendet!', '8'); -INSERT INTO `mxchange_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES('main', 'support', 'Support ', 'Y', 'N', '10'); -INSERT INTO `mxchange_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES('logout', 'guest', 'Zum Gastmenü', '', 'N', '1000'); -INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('admin', '', 'Administrative Links', '3', 'N', 'N'); -INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('admin', 'admin', 'Zum Admin-Bereich', '4', 'N', 'N'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('misc', 'extensions', 'Erweiterungen', 'Erweiterungen installieren, updaten, sperren, löschen usw.', '8'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('email','del_email','E-Mail löschen','Löschen Sie hierrüber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem Mailtausch-System. Nur bei Normal-Mails: {!POINTS!} aus den unbestätigten Mails werden dem Werber wieder vergütet.','7'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user','add_points','{!POINTS!} gutschreiben','Buchen Sie einem Mitglied direkt {!POINTS!} auf. Sie können dazu auch einen Kommentar mitsenden.','5'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user','list_cats','Kategorien anzeigen','Listet die ausgewählten Kategorien eines Mitgliedes auf.','9'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('setup','config_other','Sonstige Einstellungen','Sonstige Einstellungen an Ihrem Mailtausch.','13'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('misc','updates','Updates prüfen','Prüft, ob eine neue Version oder ein Patch auf dem Server exisitiert. Sie müssen dann die Patches/Updates selber herunterladen und einspielen. Dabei werden keine Daten von Ihrer Installation an uns gesendet!','8'); +INSERT INTO `mxchange_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES('main','support','Support ','Y','N','10'); +INSERT INTO `mxchange_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES('logout','guest','Zum Gastmenü','','N','1000'); +INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('admin','','Administrative Links','3','N','N'); +INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('admin','admin','Zum Admin-Bereich','4','N','N'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, löschen usw.','8'); diff --git a/install/menu-en.sql b/install/menu-en.sql index c5a798760d..b820b545c3 100644 --- a/install/menu-en.sql +++ b/install/menu-en.sql @@ -96,22 +96,22 @@ INSERT INTO `mxchange_admin_menu` VALUES (NULL,'user','edit_user','Account editi INSERT INTO `mxchange_admin_menu` VALUES (NULL,'stats','logs','Aufruflogbücher',8,'Verwalten Sie Ihre Aufruflogbücher mit diesem Admin-Bereich! (Derzeit nur Download!)'); INSERT INTO `mxchange_admin_menu` VALUES (NULL,'stats','usage','Aufrufstatistik',9,'Erkennt automatisch Ihre Aufrufstatisiken und bindet diese in das Admin-Interface ein. (Derzeit nur Webalizer!)'); -INSERT INTO `mxchange_member_menu` VALUES (NULL, 'main', 'stats', 'Statistiken', 9, 'Y', 'N', '', 0); +INSERT INTO `mxchange_member_menu` VALUES (NULL, 'main','stats','Statistiken', 9, 'Y','N','', 0); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('email', 'email_archiv', 'E-Mail Archiv', 'Sehen Sie sich hier bereits gesendete Mails an.', '6'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user', 'list_links', 'Unbestätigte Mails', 'Mit diesem Menüpunkt können Sie die vom Mitglied nicht bestätigten Mails anzeigen.', '8'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user', 'list_refs', 'Referrals anzeigen', 'Mit diesem Menüpunkt können Sie die generierten Referrals eines Mitgliedes auflisten.', '7'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('email','email_archiv','E-Mail Archiv','Sehen Sie sich hier bereits gesendete Mails an.','6'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user','list_links','Unbestätigte Mails','Mit diesem Menüpunkt können Sie die vom Mitglied nicht bestätigten Mails anzeigen.','8'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user','list_refs','Referrals anzeigen','Mit diesem Menüpunkt können Sie die generierten Referrals eines Mitgliedes auflisten.','7'); -INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('main', 'stats', 'Statistiken', '7', 'Y', 'N'); -INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('online', '', 'Jetzt Online', '2', 'Y', 'N'); +INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('main','stats','Statistiken','7','Y','N'); +INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('online','','Jetzt Online','2','Y','N'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('email', 'del_email', 'E-Mail löschen', 'Löschen Sie hierrüber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem Mailtausch-System. Nur bei Normal-Mails: {!POINTS!} aus den unbestätigten Mails werden dem Werber wieder vergütet.', '7'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user', 'add_points', '{!POINTS!} gutschreiben', 'Buchen Sie einem Mitglied direkt {!POINTS!} auf. Sie können dazu auch einen Kommentar mitsenden.', '5'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user', 'list_cats', 'Kategorien anzeigen', 'Listet die ausgewählten Kategorien eines Mitgliedes auf.', '9'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('setup', 'config_other', 'Sonstige Einstellungen', 'Sonstige Einstellungen an Ihrem Mailtausch.', '13'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('misc', 'updates', 'Updates prüfen', 'Prüft, ob eine neue Version oder ein Patch auf dem Server exisitiert. Sie müssen dann die Patches/Updates selber herunterladen und einspielen. Dabei werden keine Daten von Ihrer Installation an uns gesendet!', '8'); -INSERT INTO `mxchange_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES('main', 'support', 'Support ', 'Y', 'N', '10'); -INSERT INTO `mxchange_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES('logout', 'guest', 'Zum Gastmenü', '', 'N', '1000'); -INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('admin', '', 'Administrative Links', '3', 'N', 'N'); -INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('admin', 'admin', 'Zum Admin-Bereich', '4', 'N', 'N'); -INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('misc', 'extensions', 'Erweiterungen', 'Erweiterungen installieren, updaten, sperren, löschen usw.', '8'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('email','del_email','E-Mail löschen','Löschen Sie hierrüber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem Mailtausch-System. Nur bei Normal-Mails: {!POINTS!} aus den unbestätigten Mails werden dem Werber wieder vergütet.','7'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user','add_points','{!POINTS!} gutschreiben','Buchen Sie einem Mitglied direkt {!POINTS!} auf. Sie können dazu auch einen Kommentar mitsenden.','5'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('user','list_cats','Kategorien anzeigen','Listet die ausgewählten Kategorien eines Mitgliedes auf.','9'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('setup','config_other','Sonstige Einstellungen','Sonstige Einstellungen an Ihrem Mailtausch.','13'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('misc','updates','Updates prüfen','Prüft, ob eine neue Version oder ein Patch auf dem Server exisitiert. Sie müssen dann die Patches/Updates selber herunterladen und einspielen. Dabei werden keine Daten von Ihrer Installation an uns gesendet!','8'); +INSERT INTO `mxchange_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES('main','support','Support ','Y','N','10'); +INSERT INTO `mxchange_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES('logout','guest','Zum Gastmenü','','N','1000'); +INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('admin','','Administrative Links','3','N','N'); +INSERT INTO `mxchange_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES('admin','admin','Zum Admin-Bereich','4','N','N'); +INSERT INTO `mxchange_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, löschen usw.','8'); diff --git a/install/tables.sql b/install/tables.sql index dd1a805a23..d4ba588826 100644 --- a/install/tables.sql +++ b/install/tables.sql @@ -279,7 +279,7 @@ CREATE TABLE `mxchange_task_system` ( `assigned_admin` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `status` ENUM('NEW','OPEN','SOLVED','CLOSED','DELETED') NOT NULL DEFAULT 'NEW', - `task_type` ENUM('FIRST_USER','SUPPORT_MEMBER','SUPPORT_ADMIN','OTHERS', 'EXTENSION', 'EXTENSION_UPDATE') NOT NULL DEFAULT 'FIRST_USER', + `task_type` ENUM('FIRST_USER','SUPPORT_MEMBER','SUPPORT_ADMIN','OTHERS','EXTENSION','EXTENSION_UPDATE') NOT NULL DEFAULT 'FIRST_USER', `subject` VARCHAR(255) NOT NULL DEFAULT '', `text` LONGBLOB NOT NULL, `task_created` VARCHAR(10) NOT NULL DEFAULT 0, @@ -339,7 +339,7 @@ ALTER TABLE `mxchange_user_data` MODIFY `zip` VARCHAR(6) NOT NULL DEFAULT ''; ALTER TABLE `mxchange_admin_menu` MODIFY `action` VARCHAR(255) NOT NULL DEFAULT ''; ALTER TABLE `mxchange_admin_menu` MODIFY `what` VARCHAR(255) NOT NULL DEFAULT ''; ALTER TABLE `mxchange_user_data` MODIFY `last_module` VARCHAR(255) NOT NULL DEFAULT ''; -ALTER TABLE `mxchange_config` ADD `allow_direct_pay` ENUM('N', 'Y') NOT NULL DEFAULT 'N'; +ALTER TABLE `mxchange_config` ADD `allow_direct_pay` ENUM('Y','N') NOT NULL DEFAULT 'N'; ALTER TABLE `mxchange_user_data` MODIFY `last_profile_sent` VARCHAR(10) NOT NULL DEFAULT 0; ALTER TABLE `mxchange_user_data` MODIFY `last_update` VARCHAR(10) NOT NULL DEFAULT 0; ALTER TABLE `mxchange_user_data` MODIFY `joined` VARCHAR(10) NOT NULL DEFAULT 0; diff --git a/modules.php b/modules.php index ed8a25842f..9c13ae6437 100644 --- a/modules.php +++ b/modules.php @@ -44,12 +44,15 @@ $CSS = 0; $GLOBALS['what'] = ""; $GLOBALS['action'] = ""; $GLOBALS['userid'] = 0; +// Fix missing module to "index" +if (empty($_GET['module'])) $_GET['module'] = "index"; + +// Secure action/what if present if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']); if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']); -if (empty($_GET['module'])) $_GET['module'] = "index"; // Secure the module name (very important line!) -$GLOBALS['module'] = htmlentities(strip_tags($_GET['module']), ENT_QUOTES); +$GLOBALS['module'] = secureString($_GET['module']); // Needed include files require ("inc/config.php"); diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index 35cbdd592d..924debdbf8 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -1,6 +1,4 @@ -
+
-- 2.30.2