From 206ee1f32b11eaa38a8df0536d7f7732c6dcebc9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 26 Feb 2011 04:37:11 +0000 Subject: [PATCH] Extension ext-forced continued, 'earnings' are now in one menu block: - Basic menu structure for ext-forced finished - New member menu 'action-earn' added, where all "earning possibilities" should go - SQL dumps resorted to let them look like the menu will appear - Bugs in what-edit.php fixed, mostly small things and memedit has linked to adminedit --- .gitattributes | 1 + inc/extensions/ext-forced.php | 29 ++++++++++--- inc/extensions/ext-sql_patches.php | 15 +++++-- inc/modules/admin/admin-inc.php | 4 +- inc/modules/admin/what-adminedit.php | 4 +- inc/modules/admin/what-guestedit.php | 12 +++--- inc/modules/admin/what-memedit.php | 14 +++---- inc/modules/member/action-earn.php | 61 ++++++++++++++++++++++++++++ install/menu-de.sql | 16 ++++---- install/menu-en.sql | 16 ++++---- 10 files changed, 130 insertions(+), 42 deletions(-) create mode 100644 inc/modules/member/action-earn.php diff --git a/.gitattributes b/.gitattributes index 579d865398..bbf9f9e094 100644 --- a/.gitattributes +++ b/.gitattributes @@ -588,6 +588,7 @@ inc/modules/member/.htaccess -text svneol=unset#text/plain inc/modules/member/action- -text svneol=unset#text/plain inc/modules/member/action-account.php -text svneol=unset#text/plain inc/modules/member/action-bank.php -text svneol=unset#text/plain +inc/modules/member/action-earn.php svneol=native#text/plain inc/modules/member/action-extras.php -text svneol=unset#text/plain inc/modules/member/action-logout.php -text svneol=unset#text/plain inc/modules/member/action-main.php -text svneol=unset#text/plain diff --git a/inc/extensions/ext-forced.php b/inc/extensions/ext-forced.php index 53c89cea1a..a98fe19915 100644 --- a/inc/extensions/ext-forced.php +++ b/inc/extensions/ext-forced.php @@ -54,9 +54,10 @@ switch (getExtensionMode()) { // This depends on 'sponsor' now addExtensionDependency('sponsor'); + // All required tables for this extension: // - Ads addDropTableSql('forced_ads'); - addExtensionSql("CREATE TABLE IF NOT EXIST `{?_MYSQL_PREFIX?}_forced_ads` ( + addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_forced_ads` ( `forced_ads_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT , `forced_ads_ad_url` VARCHAR( 255 ) NULL DEFAULT NULL , `forced_ads_click_url` VARCHAR( 255 ) NOT NULL , @@ -128,15 +129,27 @@ PRIMARY KEY ( `forced_costs_id` ) `forced_stats_user_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL , `forced_stats_viewed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `forced_stats_clicked` TIMESTAMP NULL DEFAULT NULL , -`forced_stats_real_ip` VARCHAR ( 15 ) NOT NULL DEFAULT '0.0.0.0' , -`forced_stats_remote_addr` VARCHAR ( 15 ) NOT NULL DEFAULT '0.0.0.0' , -`forced_stats_ua` VARCHAR ( 255 ) NULL DEFAULT NULL , -`forced_stats_is_proxy` ENUM ( 'Y', 'N' ) NOT NULL DEFAULT 'N' , -`forced_stats_session_id` VARCHAR ( 100 ) NULL DEFAULT NULL , +`forced_stats_real_ip` VARCHAR( 15 ) NOT NULL DEFAULT '0.0.0.0' , +`forced_stats_remote_addr` VARCHAR( 15 ) NOT NULL DEFAULT '0.0.0.0' , +`forced_stats_ua` VARCHAR( 255 ) NULL DEFAULT NULL , +`forced_stats_is_proxy` ENUM( 'Y', 'N' ) NOT NULL DEFAULT 'N' , +`forced_stats_session_id` VARCHAR( 100 ) NULL DEFAULT NULL , INDEX ( `forced_stats_campaign_id` ) , INDEX ( `forced_stats_user_id` ) , PRIMARY KEY ( `forced_stats_id` ) ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Forced Campaign Statistics'"); + + // Menu system + // - Administrator + addAdminMenuSql('forced',NULL,'Forced-Ads','Verwalten Sie hier bequem alle laufenden Forced-Banner und -Textlinks und deren Kampgnen. Sie können hier auch neue Werbmittel (Ads) hinzufügen oder laufende Forced-Kampagnen bei z.B. Regelverstössen sperren oder löschen. Auch das naträgliche Editieren von Ads und Kampagnen ist jederzeit möglich. Kampagnen dienen der einfacheren Verwaltung und der Trennung von dem Werbemittel selbst dienen. Sie brauchen also z.B. einen Forced-Banner nur einmal einfügen und können dann bei Bedarf weitere Kampagnen starten.',5); + addAdminMenuSql('forced','list_forced_ads','Werbemittel verwalten','Listet alle eingetragenen Werbmittel (Ads) auf. Sie können hier diese nachträglich editieren falls Sie mal eine falsche URL eingegeben haben oder den Text ändern wollen. Löschen Sie hier auch Forced-Banner, die nicht mehr gültig sind (z.B. abgelaufen sind). Sollten doch mit dem Werbmittel verknüpfte Kampagnen vorhanden sein, erhalten Sie einen Warnheis. Neue Werbmittel können Sie hier ebenfalls hinzufügen. Denken Sie aber daran, dass ohne Kampagne dieses nicht angezeigt wird. Achten Sie hier auch die Reload-Sperre.',1); + addAdminMenuSql('forced','list_forced_campaigns','Kampagnen verwalten','Listet alle Kampagnen auf und zeigt deren Status an. Jederzeit können Sie Kampagnen stoppen, falls Sie dies wünschen oder ein Regelverstoss vorliegt. Haben Sie ein Werbemittel hinzugefügt, so fügen Sie bitte unbedingt eine Kampagne hinzu, da es sonst nicht angezeigt wird.',2); + addAdminMenuSql('forced','list_forced_costs','Kosten verwalten','Legen Sie die Preise pro Klick zum Buchen Forced-Werbemittel fest und wie viele {OPEN_CONFIG}POINTS{CLOSE_CONFIG} Ihre Mitglieder erhalten sollen. Generell sollten Sie bei Mitgliederbuchungen höhere Kosten pro Klick als was Ihre Mitglieder pro Klick erhalten einstellen, da so die {OPEN_CONFIG}POINTS{CLOSE_CONFIG} abgebaut werden (Sie können an Accountaufladungen z.B. verdienen).',3); + addAdminMenuSql('forced','stats_forced','Statistiken','Zeigt Gesamtstatistiken und zu den einzelnen Kampagnen und Werbmitteln an. Die hier angezeigte Statistik kann jedoch nicht manuell gelöscht werden (bitte auch nicht selber tun) da sie auch gleichzeitigt als Reload-Sperre dient.',4); + + // - Members + addMemberMenuSql('earn','forced_banner','Forced-Banner','Y','N',2); + addMemberMenuSql('earn','forced_textlink','Forced-Textlinks','Y','N',3); break; case 'remove': // Do stuff when removing extension @@ -147,6 +160,10 @@ PRIMARY KEY ( `forced_stats_id` ) addDropTableSql('forced_campaigns_user'); addDropTableSql('forced_costs'); addDropTableSql('forced_stats'); + + // Menu systems + addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='forced' LIMIT 5"); + addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what` IN ('forced_banner','forced_textlink') LIMIT 2"); break; case 'activate': // Do stuff when admin activates this extension diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index c6b3474542..1f5a838c3f 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.7.6'); +setThisExtensionVersion('0.7.7'); // Version history array (add more with , '0.1.0' and so on) -setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6')); +setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -83,7 +83,8 @@ switch (getExtensionMode()) { (`action`='stats' AND (`what`='' OR `what` IS NULL)) OR (`action`='extras' AND (`what`='' OR `what` IS NULL)) OR (`action`='rals' AND (`what`='' OR `what` IS NULL)) OR -(`action`='account' AND (`what`='' OR `what` IS NULL))"); +(`action`='account' AND (`what`='' OR `what` IS NULL)) OR +`action`='earn'"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='main' WHERE `action`='stats' OR `action`='extras' OR @@ -776,6 +777,14 @@ INDEX (`ip`) // Update notes (these will be set as task text!) setExtensionUpdateNotes("Spaltentyp fuer kleine Zahlen sollten auch z.B. TINYINT sein."); break; + + case '0.7.7': // SQL queries for v0.7.7 + addMemberMenuSql('earn',NULL,'Verdienen','Y','N',2); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='earn', `sort`=1 WHERE `what`='unconfirmed' LIMIT 1"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Menüpunkt Verdienen hinzugefügt und Unbestätigte Mails als ersten Punkt dort hin verschoben."); + break; } // END - switch break; diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 7f85ad4a6f..4542f84670 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -296,7 +296,7 @@ ORDER BY $OUT .= '['; } } else { - $OUT .= ''; + $OUT .= ''; } $OUT .= $title; @@ -1494,7 +1494,7 @@ function adminProcessMenuEditForm ($type, $subMenu) { } // Handle weightning -function doAdminProcessMenuWeightning ($type) { +function doAdminProcessMenuWeightning ($type, $AND) { // Are there all required (generalized) GET parameter? if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) { // Init variables diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php index e2db9fd343..05290a1e3b 100644 --- a/inc/modules/admin/what-adminedit.php +++ b/inc/modules/admin/what-adminedit.php @@ -186,7 +186,7 @@ LIMIT 1", } } else { // Handle weightning - doAdminProcessMenuWeightning('guest'); + doAdminProcessMenuWeightning('admin', $AND); // Run SQL $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." ORDER BY `sort` ASC", __FILE__, __LINE__); @@ -214,7 +214,7 @@ LIMIT 1", $data['navi'] = '{--HIGHER--}'; } elseif ($data['sort'] > 0) { // Anything else between highest and lowest - $data['navi'] = '{--HIGHER--}/{--LOWER--}'; + $data['navi'] = '{--HIGHER--}|{--LOWER--}'; } // Add more data to $data diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php index eded88276c..6f44c2aa58 100644 --- a/inc/modules/admin/what-guestedit.php +++ b/inc/modules/admin/what-guestedit.php @@ -38,7 +38,7 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point addYouAreHereLink('admin', __FILE__); @@ -179,7 +179,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() adminProcessMenuEditForm('guest', $subMenu); } else { // Handle weightning - doAdminProcessMenuWeightning('guest'); + doAdminProcessMenuWeightning('guest', $AND); // By default list menus if (empty($subMenu)) { @@ -211,12 +211,12 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() $NAVI = '{--HIGHER--}'; } elseif ($data['sort'] > 0) { // Anything else between highest and lowest - $NAVI = '{--HIGHER--}/{--LOWER--}'; + $NAVI = '{--HIGHER--}|{--LOWER--}'; } - if (empty($data['action'])) $data['action'] = ' '; - if (empty($data['what'])) $data['what'] = ' '; - if (empty($data['title'])) $data['title'] = ' '; + if (empty($data['action'])) $data['action'] = '---'; + if (empty($data['what'])) $data['what'] = '---'; + if (empty($data['title'])) $data['title'] = '---'; // Prepapre content $row = array( diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php index 9c2698fc68..68867ee6a6 100644 --- a/inc/modules/admin/what-memedit.php +++ b/inc/modules/admin/what-memedit.php @@ -177,7 +177,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() adminProcessMenuEditForm('member', $subMenu); } else { // Handle weightning - doAdminProcessMenuWeightning('guest'); + doAdminProcessMenuWeightning('member', $AND); if (!empty($subMenu)) { // Edit sub menus @@ -199,19 +199,19 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() $count++; if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($subMenu)))) { // Is highest position - $data['navi'] = '{--LOWER--}'; + $data['navi'] = '{--LOWER--}'; } elseif ($count == SQL_NUMROWS($result)) { // Is lowest position - $data['navi'] = '{--HIGHER--}'; + $data['navi'] = '{--HIGHER--}'; } elseif ($data['sort'] > 0) { // Anything else between highest and lowest - $data['navi'] = '{--HIGHER--}/{--LOWER--}'; + $data['navi'] = '{--HIGHER--}|{--LOWER--}'; } // Fix empty values for Firefox - if (empty($data['action'])) $data['action'] = ' '; - if (empty($data['what'])) $data['what'] = ' '; - if (empty($data['title'])) $data['title'] = ' '; + if (empty($data['action'])) $data['action'] = '---'; + if (empty($data['what'])) $data['what'] = '---'; + if (empty($data['title'])) $data['title'] = '---'; // Add more entries $data['mode'] = 'mem'; diff --git a/inc/modules/member/action-earn.php b/inc/modules/member/action-earn.php new file mode 100644 index 0000000000..56a4c59ff3 --- /dev/null +++ b/inc/modules/member/action-earn.php @@ -0,0 +1,61 @@ + diff --git a/install/menu-de.sql b/install/menu-de.sql index 2e322e5794..54449cc0df 100644 --- a/install/menu-de.sql +++ b/install/menu-de.sql @@ -37,18 +37,16 @@ INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Multi Lev INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Wernis-Seiten','Y',21); INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Primera-Seiten','Y',22); -INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen',1,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Hauptmenü',0,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','confirm','Bestätigungslink',3,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen',1,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','confirm','Bestätigungslink',3,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (0,'Urlaub'); -INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (50,'Bonus möglich!'); -INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (90,'Bonus möglich!'); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (5,''); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (10,''); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (15,''); @@ -58,16 +56,18 @@ INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (30,''); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (35,''); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (40,''); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (45,''); +INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (50,'Bonus möglich!'); +INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (90,'Bonus möglich!'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Mitgliedsmenü',0,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',1,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Guthaben',4,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','categories','Kategorien auswählen',3,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbestätigte Emails',5,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken',9, 'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',1,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','guest','Zum Gastmenü',1000,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (10,1.000,'Klick-Mail 10 Sek.',2.000); diff --git a/install/menu-en.sql b/install/menu-en.sql index dc3340a225..dbe7ac6424 100644 --- a/install/menu-en.sql +++ b/install/menu-en.sql @@ -37,18 +37,16 @@ INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Multi Lev INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Wernis-Seiten','Y',21); INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Primera-Seiten','Y',22); -INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen',1,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Hauptmenü',0,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','confirm','Bestätigungslink',3,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen',1,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','confirm','Bestätigungslink',3,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (0,'Urlaub'); -INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (50,'Bonus möglich!'); -INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (90,'Bonus möglich!'); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (5,''); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (10,''); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (15,''); @@ -58,16 +56,18 @@ INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (30,''); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (35,''); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (40,''); INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (45,''); +INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (50,'Bonus möglich!'); +INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (90,'Bonus möglich!'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Mitgliedsmenü',0,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',1,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Guthaben',4,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','categories','Kategorien auswählen',3,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbestätigte Emails',5,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken',9,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',1,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','guest','Zum Gastmenü',1000,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (10,1.000,'Klick-Mail 10 Sek.',2.000); -- 2.30.2