From: Roland Häder Date: Mon, 9 Nov 2009 16:51:46 +0000 (+0000) Subject: Fix for #138 and some 'empty version' fixed X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=83475fa12b58b4be5f91c21c1afff87ae49c11e4;p=mailer.git Fix for #138 and some 'empty version' fixed --- diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php index 9128c54b1f..a2cb13b727 100644 --- a/inc/extensions/ext-refback.php +++ b/inc/extensions/ext-refback.php @@ -39,7 +39,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0.1'); @@ -80,12 +80,12 @@ KEY (`refid`) case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='refback' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what` IN('refback','reflist') LIMIT 2"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='refback' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what` IN('refback','reflist') LIMIT 2"); break; case 'update': // Update an extension @@ -100,7 +100,7 @@ KEY (`refid`) // Update notes (these will be set as task text!) setExtensionUpdateNotes("Refback-System ist nun ein-/ausschaltbar und minimale/maximale Refback-Prozente sind festlegbar."); break; - } + } // END - switch break; case 'modify': // When the extension got modified @@ -115,7 +115,7 @@ KEY (`refid`) default: // Unknown extension mode DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown extension mode %s detected.", getExtensionMode())); break; -} +} // END - switch // [EOF] ?> diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index 426bacca0c..4f97ecf239 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -42,10 +42,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.6.7'); +setThisExtensionVersion('0.6.8'); // 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')); +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')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -711,10 +711,24 @@ PRIMARY KEY (`filter_id`) case '0.6.7': // SQL queries for v0.6.7 addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` CHANGE `index_delay` `index_delay` TINYINT(3) NOT NULL DEFAULT 0"); - // Update notes (these will be set as task text!) setExtensionUpdateNotes("Die Weiterleitungseinstellung muss auch Werte kleiner Null akzeptieren."); break; + + case '0.6.8': // SQL queries for v0.6.8 + addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_admin_menu` +CHANGE `action` `action` VARCHAR(50) NOT NULL, +CHANGE `what` `what` VARCHAR(50) NULL DEFAULT NULL'); + addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_guest_menu` +CHANGE `action` `action` VARCHAR(50) NOT NULL, +CHANGE `what` `what` VARCHAR(50) NULL DEFAULT NULL'); + addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_member_menu` +CHANGE `action` `action` VARCHAR(50) NOT NULL, +CHANGE `what` `what` VARCHAR(50) NULL DEFAULT NULL'); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Spalten verkürzt, damit die Schlüssel passen."); + break; } // END - switch break; @@ -737,6 +751,7 @@ PRIMARY KEY (`filter_id`) // @TODO Rewrite this to a filter if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isCacheInstanceValid())) { // Destroy some cache files + if ($GLOBALS['cache_instance']->loadCacheFile('config')) $GLOBALS['cache_instance']->removeCacheFile(); if ($GLOBALS['cache_instance']->loadCacheFile('extension')) $GLOBALS['cache_instance']->removeCacheFile(); if ($GLOBALS['cache_instance']->loadCacheFile('modules')) $GLOBALS['cache_instance']->removeCacheFile(); } // END - if @@ -759,7 +774,7 @@ PRIMARY KEY (`filter_id`) } // END - if // Transfer words/numbers to constants - setConfigEntry('POINTS' , getConfig('points_word')); + setConfigEntry('POINTS', getConfig('points_word')); break; default: // Unknown extension mode diff --git a/inc/functions.php b/inc/functions.php index fc03e66c9f..dfa1e13218 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -3164,7 +3164,7 @@ function determineReferalId () { } elseif ((isSessionVariableSet('refid')) && (getSession('refid') != 0)) { // Set session refid als global $GLOBALS['refid'] = bigintval(getSession('refid')); - } elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getConfig('select_user_zero_refid')) == 'Y') { + } elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getConfig('select_user_zero_refid') == 'Y')) { // Select a random user which has confirmed enougth mails $GLOBALS['refid'] = determineRandomReferalId(); } elseif ((isExtensionInstalled('sql_patches')) && (getConfig('def_refid') > 0)) { diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php index 152bd3cef7..996b9dc1c7 100644 --- a/inc/modules/member/what-points.php +++ b/inc/modules/member/what-points.php @@ -53,8 +53,8 @@ $depths = SQL_NUMROWS($result_depths); // Add many more rows for the login/turbo/ref/order bonus // @TODO Should we rewrite this to a filter? if (!isExtensionActive('bonus')) $depths += 1; -if (getExtensionVersion('bonus') >= '0.2.2') $depths += 6; -if (getExtensionVersion('bonus') >= '0.4.4') $depths += 4; +if (isExtensionInstalledAndNewer('bonus', '0.2.2')) $depths += 6; +if (isExtensionInstalledAndNewer('bonus', '0.4.4')) $depths += 4; // Remember row count in constant $content['rowspan'] = ($depths*2+15); @@ -124,7 +124,7 @@ if (!fetchUserData(getMemberId())) { $CONFIRMED = '---'; $SENT = '---'; $RECEIVED = '---'; // Only user >= v0.1.2: Fetch confirmed mails counter -if (getExtensionVersion('user') >= '0.1.2') { +if (isExtensionInstalledAndNewer('user', '0.1.2')) { $add = ''; $CONFIRMED = getUserData('mails_confirmed'); @@ -151,13 +151,13 @@ $content['tref'] = $TREF; $content['tlock'] = translateComma($TLOCK); // Fixes a bug when there is no bonus extension installed -if (isExtensionOlder('bonus', '0.4.4')) setConfigEntry('bonus_active', "X"); +if (isExtensionInstalledAndOlder('bonus', '0.4.4')) setConfigEntry('bonus_active', "X"); // Members shall see no special rows here $content['special_rows'] = ''; // Display login bonus and turbo-click bonus -if ((getExtensionVersion('bonus') >= '0.2.2') && (isExtensionActive('bonus')) && (getConfig('bonus_active') == 'Y')) { +if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonus')) && (getConfig('bonus_active') == 'Y')) { // Fetch some data and init others (to avoid a notice here) $content['login'] = getUserData('login_bonus'); $content['turbo'] = getUserData('turbo_bonus'); @@ -188,7 +188,7 @@ if ((getExtensionVersion('bonus') >= '0.2.2') && (isExtensionActive('bonus')) && // Output rows $content['special_rows'] = loadTemplate('member_points_bonus_rows', true, $content); -} elseif (getConfig('bonus_active') != 'Y') { +} elseif ((isExtensionActive('bonus')) && (getConfig('bonus_active') != 'Y')) { // Bonus active rallye deactivated $content['special_rows'] = loadTemplate('member_points_bonus_disabled', true); } elseif ((isAdmin()) && (isExtensionOlder('bonus', '0.2.2')) && (isExtensionActive('bonus'))) { diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php index c999d578b8..7a02cdecc2 100644 --- a/inc/modules/member/what-reflinks.php +++ b/inc/modules/member/what-reflinks.php @@ -53,8 +53,9 @@ if (!fetchUserData(getMemberId())) { } // END - if // Prepare some data -$content['ref_clicks'] = getUserData('ref_clicks'); -$content['userid'] = getMemberId(); +$content['ref_clicks'] = getUserData('ref_clicks'); +$content['userid'] = getMemberId(); +$content['nickname_content'] = ''; // @TODO Move this into a filter if (isExtensionActive('nickname')) {