X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=ed0c0e8baee9c538350c195d1b82fd7cbfb8f093;hp=f531cb40e88894a34561b725c8e9c6c695c09cdf;hb=5fa8c7bab284e1549611b733d09364c39a437e2d;hpb=16de7d9e8b98108627db01688bc095240b5ba8d2 diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index f531cb40e8..ed0c0e8bae 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -1,7 +1,7 @@ %s has empty version!", $ext_name)); } // END - if // Return result - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": ret={$ext_ver}"); - return $ext_ver; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": ret={$data['ext_version']}"); + return $data['ext_version']; } // Updates a given extension with current extension version to latest version @@ -679,7 +682,7 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false $OUT = ''; // Do we have queries? - if ((getExtensionVersion('sql_patches') >= '0.0.7') && (getConfig('verbose_sql') == 'Y')) { + if ((isExtensionInstalledAndNewer('sql_patches', '0.0.7')) && (getConfig('verbose_sql') == 'Y')) { // Init switch color $SW = 2; @@ -718,7 +721,7 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false // Load main template $OUT = loadTemplate('admin_ext_sql_table', true, $content); - } elseif ((getExtensionVersion('sql_patches') >= '0.0.7') && (getConfig('verbose_sql') == 'Y')) { + } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.0.7')) && (getConfig('verbose_sql') == 'Y')) { // No addional SQL commands to run $OUT = loadTemplate('admin_settings_saved', true, getMessage('ADMIN_NO_ADDITIONAL_SQLS')); } // END - if @@ -730,12 +733,12 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false // Get extension name from id function getExtensionName ($ext_id) { // Init extension name - $ret = ''; + $data['ext_name'] = ''; // Is cache there? if (isset($GLOBALS['cache_array']['extension']['ext_name'][$ext_id])) { // Load from cache - $ret = $GLOBALS['cache_array']['extension']['ext_name'][$ext_id]; + $data['ext_name'] = $GLOBALS['cache_array']['extension']['ext_name'][$ext_id]; // Count cache hits incrementStatsEntry('cache_hits'); @@ -747,7 +750,7 @@ function getExtensionName ($ext_id) { // Is the entry there? if (SQL_NUMROWS($result) == 1) { // Get the extension's name from database - list($ret) = SQL_FETCHROW($result); + $data = SQL_FETCHARRAY($result); } // END - if // Free result @@ -755,49 +758,47 @@ function getExtensionName ($ext_id) { } // Did we find some extension? - if (empty($ret)) { + if (empty($data['ext_name'])) { // We should fix these all! debug_report_bug(__FUNCTION__ . ': ext_name is empty. ext_id=' . $ext_id); } // END - if // Return the extension name - return $ret; + return $data['ext_name']; } // Get extension id from name -function getExtensionId ($ext_name, $forceDb = false) { +function getExtensionId ($ext_name) { // Init id number - $ret = 0; + $data['ext_id'] = '0'; + // Do we have cache? if (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) { // Load from cache - $ret = $GLOBALS['cache_array']['extension']['ext_id'][$ext_name]; + $data['ext_id'] = $GLOBALS['cache_array']['extension']['ext_id'][$ext_name]; // Count cache hits incrementStatsEntry('cache_hits'); - } elseif (($forceDb === true) || (!isExtensionActive('cache'))) { + } else { // Load from database - $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `id` AS ext_id FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1", array($ext_name), __FUNCTION__, __LINE__); // Is the entry there? if (SQL_NUMROWS($result) == 1) { // Get the extension's id from database - list($ret) = SQL_FETCHROW($result); + $data = SQL_FETCHARRAY($result); } // END - if // Free result SQL_FREERESULT($result); // Cache it - $GLOBALS['cache_array']['extension']['ext_id'][$ext_name] = $ret; - } else { - // Caching enabled but no cache found is bad - debug_report_bug(__FUNCTION__ . ': Cache not found but ext-cache is active. ext_name=' . $ext_name); - } // END - if + $GLOBALS['cache_array']['extension']['ext_id'][$ext_name] = $data['ext_id']; + } // Return value - return $ret; + return $data['ext_id']; } // Determines wether the given extension name is valid @@ -865,7 +866,7 @@ function doDeactivateExtension($ext_name) { // Notify the admin sendAdminNotification( - getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'), + getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'), 'admin_ext_deactivated', array('ext_name' => $ext_name) ); @@ -893,7 +894,7 @@ function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) { // Is the extension there? if (isExtensionInstalled($ext_name)) { // Check if task is not there - if (determineTaskIdBySubject($subject) == 0) { + if (determineTaskIdBySubject($subject) == '0') { // Create extension update-task createNewTask($subject, $notes, 'EXTENSION_UPDATE', 0, $adminId); } // END - if @@ -906,9 +907,9 @@ function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) { // Creates a new task for newly installed extension function createNewExtensionTask ($adminId, $subject, $ext) { // Not installed and do we have created a task for the admin? - if ((determineTaskIdBySubject($subject) == 0) && (!isExtensionInstalled($ext))) { + if ((determineTaskIdBySubject($subject) == '0') && (!isExtensionInstalled($ext))) { // Set default message if ext-foo is missing - $message = sprintf(getMessage('ADMIN_EXT_TEXT_FILE_MISSING'), $ext); + $message = getMaskedMessage('ADMIN_EXT_TEXT_FILE_MISSING', $ext); // Template file $tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl", @@ -937,7 +938,7 @@ function createExtensionDeactivationTask ($ext) { $subject = sprintf("[%s:] %s", $ext, getMessage('TASK_SUBJ_EXTENSION_DEACTIVATED')); // Not installed and do we have created a task for the admin? - if ((determineTaskIdBySubject($subject) == 0) && (getExtensionVersion($ext) != '')) { + if ((determineTaskIdBySubject($subject) == '0') && (getExtensionVersion($ext) != '')) { // Task not created so add it createNewTask($subject, SQL_ESCAPE(loadTemplate('task_ext_deactivated', true, $ext)), 'EXTENSION_DEACTIVATION'); } // END - if @@ -948,7 +949,7 @@ function ifModuleHasMenu ($mod, $forceDb = false) { // All is false by default $ret = false; - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "mod={$mod},cache=".getExtensionVersion('cache')); + // Extension installed and newer than or has version 0.1.2? if (isExtensionInstalledAndNewer('cache', '0.1.2')) { // Cache version is okay, so let's check the cache! if (isset($GLOBALS['cache_array']['modules']['has_menu'][$mod])) { @@ -959,9 +960,9 @@ function ifModuleHasMenu ($mod, $forceDb = false) { // Check cache and count hit $ret = ($GLOBALS['cache_array']['extension']['ext_menu'][$mod] == 'Y'); incrementStatsEntry('cache_hits'); - } elseif ($mod == 'admin') { - // Admin module has always a menu! - $ret = true; + } else { + // Admin/guest/member/sponsor modules have always a menu! + $ret = in_array($mod, array('admin', 'index', 'login', 'sponsor')); } } elseif ((isExtensionInstalled('sql_patches')) && (getExtensionVersion('sql_patches') >= '0.3.6') && ((!isExtensionActive('cache')) || ($forceDb === true))) { // Check database for entry @@ -971,69 +972,71 @@ function ifModuleHasMenu ($mod, $forceDb = false) { // Entry found? if (SQL_NUMROWS($result) == 1) { // Load "has_menu" column - list($has_menu) = SQL_FETCHROW($result); + $data = SQL_FETCHARRAY($result); // Fake cache... ;-) - $GLOBALS['cache_array']['extension']['ext_menu'][$mod] = $has_menu; + $GLOBALS['cache_array']['extension']['ext_menu'][$mod] = $data['has_menu']; // Does it have a menu? - $ret = ($has_menu == 'Y'); + $ret = ($data['has_menu'] == 'Y'); } // END - if // Free memory SQL_FREERESULT($result); } elseif (!isExtensionInstalled('sql_patches')) { - // No sql_patches installed, so maybe in admin area or no admin registered? - $ret = (((isAdmin()) || (!isAdminRegistered())) && ($mod == 'admin')); // Then there is a menu! + // No sql_patches installed, so maybe in admin/guest/member/sponsor area or no admin registered? + $ret = in_array($mod, array('admin', 'index', 'login', 'sponsor')); // Then there is a menu! + } else { + // Unsupported state! + logDebugMessage(__FUNCTION__, __LINE__, 'This should never be reached.'); } // Return status - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName().intval($ret)); return $ret; } // Determines the task id for given extension function determineExtensionTaskId ($ext_name) { // Default is not found - $task_id = 0; + $data['task_id'] = '0'; // Search for extension task's id - $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `task_type`='EXTENSION' AND `subject`='[%s:]' LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `id` AS task_id FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `task_type`='EXTENSION' AND `subject`='[%s:]' LIMIT 1", array($ext_name), __FUNCTION__, __LINE__); // Entry found? if (SQL_NUMROWS($result) == 1) { // Task found so load task's id and register extension... - list($task_id) = SQL_FETCHROW($result); + $data = SQL_FETCHARRAY($result); } // END - if // Free result SQL_FREERESULT($result); // Return it - return $task_id; + return $data['task_id']; } // Determines the task id for given subject function determineTaskIdBySubject ($subject) { // Default is not found - $task_id = 0; + $data['task_id'] = '0'; // Search for task id - $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `subject` LIKE '%s%%' LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `id` AS task_id FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `subject` LIKE '%s%%' LIMIT 1", array($subject), __FUNCTION__, __LINE__); // Entry found? if (SQL_NUMROWS($result) == 1) { // Task found so load task's id and register extension... - list($task_id) = SQL_FETCHROW($result); + $data = SQL_FETCHARRAY($result); } // END - if // Free result SQL_FREERESULT($result); // Return it - return $task_id; + return $data['task_id']; } // Add updates notes for given version @@ -1143,7 +1146,7 @@ function addExtensionUpdateDependency ($updateDepends) { // Is the update depency empty? (NEED TO BE FIXED!) if (empty($updateDepends)) { // Please report this bug! - debug_report_bug("updateDepends is left empty!"); + debug_report_bug('updateDepends is left empty!'); } // END - if // Is it not yet added? @@ -1236,7 +1239,7 @@ function removeExtensionUpdateDependency ($ext_name) { // Init iterator for update depencies function initExtensionUpdateIterator () { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName()); - $GLOBALS['ext_depend_iterator'][getCurrentExtensionName()] = 0; + $GLOBALS['ext_depend_iterator'][getCurrentExtensionName()] = '0'; } // Getter for depency iterator @@ -1447,13 +1450,13 @@ function getCurrentExtensionVersion () { return $GLOBALS['ext_current_version']; } -// Remove the extension from global cache array +// Remove the extension from cache array function removeExtensionFromArray () { // "Cache" this name $ext_name = getCurrentExtensionName(); // Now loop through the whole cache - foreach ($GLOBALS['cache_array']['extension'] as $cacheName=>$cacheArray) { + foreach ($GLOBALS['cache_array']['extension'] as $cacheName => $cacheArray) { // Is it an element? if (isset($cacheArray[$ext_name])) { // Array element @@ -1555,7 +1558,7 @@ function isExtensionIncludeReadable ($ext_name = '') { } // END - if // Return result - //* DEBUG: */ print __FUNCTION__.': '.$ext_name.'='.intval($GLOBALS['ext_inc_readable'][$ext_name]).'
'; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',realable='.intval($GLOBALS['ext_inc_readable'][$ext_name])); return $GLOBALS['ext_inc_readable'][$ext_name]; }