X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fextensions-functions.php;h=bc17810735ad1127475e3d6e9b247528b8c3c593;hb=3767eef30a9e514e95625e6da22418ab297b204d;hp=bed7a9c3ce66c1e0186c4284a981d8a6154ca9e4;hpb=d58b90e7ffdd9fe6253530538c46500910e9ea0e;p=mailer.git diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index bed7a9c3ce..bc17810735 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -1,7 +1,7 @@ 0) { // Try to register the extension - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName().":ext_update=".$ext_update.",taskId=".$task.""); - $test = registerExtension($ext_update, $task, getExtensionDryRun(), false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ':ext_update=' . $ext_update . ',taskId=' . $task); + $test = registerExtension($ext_update, $task, isExtensionDryRun(), false); // Reset extension name setCurrentExtensionName($ext_name); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName()); print getCurrentExtensionName().':
'.print_r($test); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',test=' . intval($test)); } // END - if } elseif ($ext_ver != getCurrentExtensionVersion()) { // Ok, update this extension now - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName().",ext_update=".$ext_update.",ext_ver=".$ext_ver."/".getCurrentExtensionVersion().""); - $GLOBALS['ext_backup'][$ext_update][$ext_ver] = getCurrentExtensionName(); - updateExtension($ext_update, $ext_ver, getExtensionDryRun()); - setCurrentExtensionName($GLOBALS['ext_backup'][$ext_update][$ext_ver]); - unset($GLOBALS['ext_backup'][$ext_update][$ext_ver]); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName().""); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',currVer=' . getCurrentExtensionVersion()); + $GLOBALS['ext_backup_name'][$ext_update][$ext_ver] = getCurrentExtensionName(); + $GLOBALS['ext_backup_ver'][$ext_update][$ext_ver] = getCurrentExtensionVersion(); + updateExtension($ext_update, $ext_ver, isExtensionDryRun()); + setCurrentExtensionName($GLOBALS['ext_backup_name'][$ext_update][$ext_ver]); + setCurrentExtensionVersion($GLOBALS['ext_backup_ver'][$ext_update][$ext_ver]); + unset($GLOBALS['ext_backup_name'][$ext_update][$ext_ver]); + unset($GLOBALS['ext_backup_ver'][$ext_update][$ext_ver]); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',currVer=' . getCurrentExtensionVersion()); // All okay! $test = true; @@ -284,72 +333,88 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru setExtensionMode('register'); // Remains true if extension registration reports no failures - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName()); print getCurrentExtensionName().':'.print_r($test, true).''; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',test=' . intval($test)); $test = (($test === true) && (getExtensionReportsFailure() === false)); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName()); print getCurrentExtensionName().':'.print_r($test, true).''; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',test=' . intval($test)); // Does everthing before wents ok? if ($test === true) { // "Dry-run-mode" activated? - if ((getExtensionDryRun() === false) && (!isExtensionOnRemovalList())) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name=".getCurrentExtensionName()); + if ((isExtensionDryRun() === false) && (!isExtensionOnRemovalList())) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName()); // Init SQLs and transfer ext->generic initSqls(); setSqlsArray(getExtensionSqls()); // Run installation pre-installation filters - runFilterChain('pre_extension_installed', array('dry_run' => getExtensionDryRun())); + runFilterChain('pre_extension_installed', array('dry_run' => isExtensionDryRun(), 'enable_codes' => false)); // Register extension - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "insert=".getCurrentExtensionName().'/'.getCurrentExtensionVersion()." - INSERT!"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'insert=' . getCurrentExtensionName() . '/' . getCurrentExtensionVersion() . ' - INSERT!'); if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',always_active=' . getExtensionAlwaysActive() . ', ext_ver=' . getCurrentExtensionVersion() . 'ext_css=' . getExtensionHasCss()); // New way, with CSS SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`, `ext_active`, `ext_version`,`ext_has_css`) VALUES ('%s','%s','%s','%s')", - array(getCurrentExtensionName(), getExtensionAlwaysActive(), getCurrentExtensionVersion(), getExtensionHasCss()), __FUNCTION__, __LINE__); + array( + getCurrentExtensionName(), + getExtensionAlwaysActive(), + getCurrentExtensionVersion(), + getExtensionHasCss() + ), __FUNCTION__, __LINE__); } else { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',always_active=' . getExtensionAlwaysActive() . ', ext_ver=' . getCurrentExtensionVersion()); // Old way, no CSS SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`, `ext_active`, `ext_version`) VALUES ('%s','%s','%s')", - array(getCurrentExtensionName(), getExtensionAlwaysActive(), getCurrentExtensionVersion()), __FUNCTION__, __LINE__); + array( + getCurrentExtensionName(), + getExtensionAlwaysActive(), + getCurrentExtensionVersion() + ), __FUNCTION__, __LINE__); } + // Use the insert id as extension id and cache it for early usage + $GLOBALS['cache_array']['extension']['ext_id'][getCurrentExtensionName()] = SQL_INSERTID(); + $GLOBALS['cache_array']['extension']['ext_name'][SQL_INSERTID()] = getCurrentExtensionName(); + + // Mark it as installed + $GLOBALS['ext_is_installed'][getCurrentExtensionName()] = true; + // Remove cache file(s) if extension is active runFilterChain('post_extension_installed', array( 'pool' => 'extension', 'ext_name' => getCurrentExtensionName(), - 'task_id' => $task_id + 'task_id' => $taskId )); - // Remove all SQL commands - unsetSqls(); + // Re-init queries and notes + initExtensionSqls(true); + initExtensionNotes(true); // In normal mode return a true on success $ret = true; - } elseif (getExtensionDryRun() === true) { - // In "dry-run" mode return array with all SQL commands - $ret = getExtensionSqls(); - - // Remove all SQL commands - unsetSqls(); + } elseif (isExtensionDryRun() === true) { + // In "dry-run" mode do always return a true + $ret = true; } else { // Extension has been removed for updates, so all is fine! $ret = true; } } else { // No, an error occurs while registering extension :-( - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "".getCurrentExtensionName()); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName()); $ret = false; } - } elseif (($task_id > 0) && (getCurrentExtensionName() != '')) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName().""); + } elseif (($taskId > 0) && (getCurrentExtensionName() != '')) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName()); // Remove task from system when id and extension's name is valid SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND `status`='NEW' LIMIT 1", - array(bigintval($task_id)), __FUNCTION__, __LINE__); + array(bigintval($taskId)), __FUNCTION__, __LINE__); } // Is this the sql_patches? - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ':'.getCurrentExtensionName()."/".getExtensionMode().""); - if ((getCurrentExtensionName() == 'sql_patches') && ((getExtensionMode() == 'register') || (getExtensionMode() == 'remove')) && (!getExtensionDryRun()) && ($test)) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": LOAD!"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . '/' . getExtensionMode()); + if ((getCurrentExtensionName() == 'sql_patches') && ((getExtensionMode() == 'register') || (getExtensionMode() == 'remove')) && (!isExtensionDryRun()) && ($test)) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ': LOAD!'); if ($logout === true) { // Then redirect to logout redirectToUrl('modules.php?module=admin&logout=1&' . getExtensionMode() . '=sql_patches'); @@ -361,8 +426,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru } // END - if // Return status code - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName()." - LEFT!"); - //* DEBUG: */ print getCurrentExtensionName().':'.print_r($ret, true).''; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ',test=' . intval($test) . ' - EXIT!'); return $ret; } @@ -379,23 +443,29 @@ function doExtensionSqls ($ext_id, $load_mode) { setCurrentExtensionName($ext_name); // Init EXT_UPDATE_DEPENDS - initExtensionUpdateDependencies(); + if (!isExtensionUpdateDependenciesInitialized()) { + // Init here... + initExtensionUpdateDependencies(); + } // END - if // Init array - initExtensionSqls(); + initExtensionSqls(true); // By default no SQL has been executed $sqlRan = false; // Load extension in detected mode - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ":ext_name[{$ext_id}]=".getCurrentExtensionName().""); - loadExtension(getCurrentExtensionName(), $load_mode, '', false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name[' . $ext_id . ']=' . getCurrentExtensionName() . ',load_mode=' . $load_mode); + loadExtension(getCurrentExtensionName(), $load_mode, '0.0', false); // Init these SQLs initSqls(); setSqlsArray(getExtensionSqls()); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ":SQLs::count=".countSqls().""); + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQLs::count=' . countSqls()); + + // Do we have entries? if (isSqlsValid()) { // Run SQL commands... runFilterChain('run_sqls'); @@ -411,10 +481,10 @@ function doExtensionSqls ($ext_id, $load_mode) { } // END - if // Is this the sql_patches? - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": id=".$ext_id.",currName=".getCurrentExtensionName().",loadMode=".$load_mode); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $ext_id . ',currName=' . getCurrentExtensionName() . ',loadMode=' . $load_mode); if ((getCurrentExtensionName() == 'sql_patches') && (($load_mode == 'register') || ($load_mode == 'remove'))) { // Then redirect to logout - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": LOAD!"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ': LOAD!'); redirectToUrl('modules.php?module=admin&logout=1&' . $load_mode . '=sql_patches'); } // END - if } @@ -424,14 +494,17 @@ function isExtensionInstalled ($ext_name) { // We don't like empty extension names here if (empty($ext_name)) { // Please fix them all - debug_report_bug(__FUNCTION__.': ext_name is empty.'); + debug_report_bug(__FUNCTION__, __LINE__, 'ext_name is empty.'); } // END - if // By default non is installed $isInstalled = false; // Check if there is a cache entry - if (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) { + if (isset($GLOBALS['ext_is_installed'][$ext_name])) { + // Use cache built from below queries + $isInstalled = $GLOBALS['ext_is_installed'][$ext_name]; + } elseif (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) { // Found! $isInstalled = true; @@ -441,20 +514,22 @@ function isExtensionInstalled ($ext_name) { // Extensions are all inactive/not installed during installation } else { // Look in database - $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1", - array($ext_name), __FILE__, __LINE__); + $ext_id = getExtensionId($ext_name); + + // Log debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension ' . $ext_name . ' has ext_id=' . $ext_id); // Do we have a record? - $isInstalled = (SQL_NUMROWS($result) == 1); + $isInstalled = ($ext_id > 0); // Is it installed, then cache the entry if ($isInstalled === true) { - // Dummy call + // Dummy call (get is okay here) getExtensionId($ext_name, true); } // END - if - // Free result - SQL_FREERESULT($result); + // Remember the status + $GLOBALS['ext_is_installed'][$ext_name] = $isInstalled; } // Return status @@ -463,25 +538,33 @@ function isExtensionInstalled ($ext_name) { // Check if given extension is active function isExtensionActive ($ext_name) { - // Extensions are all inactive during installation - if ((isInstallationPhase()) || (empty($ext_name))) return false; + if (isInstallationPhase()) { + // Extensions are all inactive during installation + return false; + } elseif (empty($ext_name)) { + // Empty extension names must befixed + debug_report_bug(__FUNCTION__, __LINE__, 'Empty extension name provided.'); + } elseif (!isExtensionInstalled($ext_name)) { + // Not installed extensions are always inactive + return false; + } // Not active is the default - $active = 'N'; + $data['ext_active'] = 'N'; // Check cache if (isset($GLOBALS['cache_array']['extension']['ext_active'][$ext_name])) { // Load from cache - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "CACHE! ext_name={$ext_name}"); - $active = $GLOBALS['cache_array']['extension']['ext_active'][$ext_name]; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHE! ext_name=' . $ext_name); + $data['ext_active'] = $GLOBALS['cache_array']['extension']['ext_active'][$ext_name]; // Count cache hits incrementStatsEntry('cache_hits'); } elseif (isset($GLOBALS['ext_loaded'][$ext_name])) { // @TODO Extension is loaded, what next? - app_die(__FUNCTION__, __LINE__, "LOADED:$ext_name"); + debug_report_bug(__FUNCTION__, __LINE__, 'LOADED:' . $ext_name); } elseif (($ext_name == 'cache') || (!isExtensionInstalled('cache'))) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "DB! ext_name={$ext_name}"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'DB! ext_name=' . $ext_name); // Load from database $result = SQL_QUERY_ESC("SELECT `ext_active` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1", array($ext_name), __FUNCTION__, __LINE__); @@ -489,82 +572,82 @@ function isExtensionActive ($ext_name) { // Entry found? if (SQL_NUMROWS($result) == 1) { // Load entry - list($active) = SQL_FETCHROW($result); + $data = SQL_FETCHARRAY($result); } // END - if // Free result SQL_FREERESULT($result); // Write cache array - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name=".$ext_name."[DB]: {$active}"); - $GLOBALS['cache_array']['extension']['ext_active'][$ext_name] = $active; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . '[DB]: ' . $data['ext_active']); + $GLOBALS['cache_array']['extension']['ext_active'][$ext_name] = $data['ext_active']; } else { // Extension not active! - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name=".$ext_name.": Not active!"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ': Not active!'); $GLOBALS['cache_array']['extension']['ext_active'][$ext_name] = 'N'; } // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name={$ext_name},active={$active}"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',active=' . $data['ext_active']); // Is this extension activated? (For admins we always have active extensions...) - return ($active == 'Y'); + return ($data['ext_active'] == 'Y'); } // Get version from extensions -function getExtensionVersion ($ext_name) { +function getExtensionVersion ($ext_name, $force = false) { // By default no extension is found - $ext_ver = 'invalid'; + $data['ext_version'] = 'false'; // Empty extension name should be fixed! if (empty($ext_name)) { // Please report this bug! - debug_report_bug(__FUNCTION__ . ': ext_name is empty which is not allowed here.'); + debug_report_bug(__FUNCTION__, __LINE__, 'ext_name is empty which is not allowed here.'); } // END - if // Extensions are all inactive during installation if (isInstallationPhase()) return ''; - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": ext_name={$ext_name}"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name); // Is the cache written? if (isset($GLOBALS['cache_array']['extension']['ext_version'][$ext_name])) { // Load data from cache - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": CACHE!"); - $ext_ver = $GLOBALS['cache_array']['extension']['ext_version'][$ext_name]; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $ext_name . ': CACHE!'); + $data['ext_version'] = $GLOBALS['cache_array']['extension']['ext_version'][$ext_name]; // Count cache hits incrementStatsEntry('cache_hits'); - } elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (getOutputMode() != '0')) { + } elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (!isHtmlOutputMode())) { // Load from database $result = SQL_QUERY_ESC("SELECT `ext_version` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1", array($ext_name), __FUNCTION__, __LINE__); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": DB - ".SQL_NUMROWS($result).""); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $ext_name . ': DB - '.SQL_NUMROWS($result).''); // Is the extension there? if (SQL_NUMROWS($result) == 1) { // Load entry - list($ext_ver) = SQL_FETCHROW($result); + $data = SQL_FETCHARRAY($result); } elseif (isDebugModeEnabled()) { - // Not found! - logDebugMessage(__FUNCTION__, __LINE__, sprintf(": Cannot find extension %s in database!", $ext_name)); + // Not found, please report all + debug_report_bug(__FUNCTION__, __LINE__, sprintf(": Cannot find extension %s in database!", $ext_name)); } // Free result SQL_FREERESULT($result); // Set cache - $GLOBALS['cache_array']['extension']['ext_version'][$ext_name] = $ext_ver; + $GLOBALS['cache_array']['extension']['ext_version'][$ext_name] = $data['ext_version']; } // Extension version should not be invalid - if ($ext_ver == 'invalid') { + if (($data['ext_version'] == 'false') && ($force === false)) { // Please report this trouble - debug_report_bug(sprintf("Extension %s has empty version!", $ext_name)); + debug_report_bug(__FUNCTION__, __LINE__, sprintf("Extension %s has empty version!", $ext_name)); } // END - if // Return result - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": ret={$ext_ver}"); - return $ext_ver; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_version=' . $data['ext_version']); + return $data['ext_version']; } // Updates a given extension with current extension version to latest version @@ -581,7 +664,7 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) { initIncludePool('extension'); // Load extension in test mode - loadExtension($ext_name, 'test', $ext_ver, getExtensionDryRun()); + loadExtension($ext_name, 'test', $ext_ver, isExtensionDryRun()); // Save version history $history = getExtensionVersionHistory(); @@ -590,8 +673,8 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) { initExtensionSqls(); // Check if version is updated - //* DEBUG: */ print getCurrentExtensionName().'/'.$ext_name.':'.getThisExtensionVersion().'/'.$ext_ver.'/'.intval(is_array($history)).'
'; - if (((getThisExtensionVersion() != $ext_ver) || (getExtensionDryRun())) && (is_array($history))) { + //* DEBUG: */ debugOutput(getCurrentExtensionName().'/'.$ext_name.':'.getThisExtensionVersion().'/'.$ext_ver.'/'.intval(is_array($history))); + if (((getThisExtensionVersion() != $ext_ver) || (isExtensionDryRun())) && (is_array($history))) { // Search for starting point $start = array_search($ext_ver, $history); @@ -601,7 +684,7 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) { $GLOBALS['update_ver'][getCurrentExtensionName()] = $history[$idx]; // Load again... - loadExtension(getCurrentExtensionName(), 'update', $GLOBALS['update_ver'][getCurrentExtensionName()], getExtensionDryRun()); + loadExtension(getCurrentExtensionName(), 'update', $GLOBALS['update_ver'][getCurrentExtensionName()], isExtensionDryRun()); // Get all depencies $depencies = getExtensionUpdateDependencies(); @@ -621,14 +704,17 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) { // Is the extension there? if (isExtensionInstalled($ext_depend)) { // Update another extension first! - $test = updateExtension($ext_depend, getExtensionVersion($ext_depend), getExtensionDryRun()); + $test = updateExtension($ext_depend, getExtensionVersion($ext_depend), isExtensionDryRun()); } else { // Register new extension - $test = registerExtension($ext_depend, 0, getExtensionDryRun(), false); + $test = registerExtension($ext_depend, 0, isExtensionDryRun(), false); } } // END - if } // END - foreach + // Set extension version here + setCurrentExtensionVersion($ext_ver); + // Set name back setCurrentExtensionName($ext_name); } // END - if @@ -638,7 +724,7 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) { } // END - for // In real-mode execute any existing includes - if (getExtensionDryRun() === false) { + if (isExtensionDryRun() === false) { $GLOBALS['ext_inc_pool'][getCurrentExtensionName()] = getIncludePool('extension'); runFilterChain('load_includes', 'extension'); setIncludePool('extension', $GLOBALS['ext_inc_pool'][getCurrentExtensionName()]); @@ -650,9 +736,9 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) { setSqlsArray(getExtensionSqls()); // Run SQLs - runFilterChain('run_sqls', array('dry_run' => getExtensionDryRun())); + runFilterChain('run_sqls', array('dry_run' => isExtensionDryRun(), 'enable_codes' => false)); - if (getExtensionDryRun() === false) { + if (isExtensionDryRun() === false) { // Run filters on success extension update runFilterChain('extension_update', getCurrentExtensionName()); } // END - if @@ -664,55 +750,56 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false // Empty title? if (empty($title)) { // Then fix it to default - $title = getMessage('ADMIN_SQLS_EXECUTED_ON_REMOVAL'); + $title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVAL--}'; } // END - if // Init variables $OUT = ''; // Do we have queries? - if ((getExtensionVersion('sql_patches') >= '0.0.7') && (getConfig('verbose_sql') == 'Y')) { - // Init switch color - $SW = 2; - - // Get all SQLs - foreach (getExtensionSqls() as $idx => $sqls) { - // New array format is recursive - foreach ($sqls as $sql) { - // Trim out spaces - $sql = trim($sql); - - // Output command if set - if (!empty($sql)) { - // Prepare output for template - $content = array( - 'sw' => $SW, - 'i' => ($idx+1), - 'sql' => $sql - ); - - // Load row template - $OUT .= loadTemplate('admin_ext_sql_row', true, $content); - - // Switch color - $SW = 3 - $SW; - } // END - if + if (isVerboseSqlEnabled()) { + // Do we have entries? + if (countExtensionSqls() > 0) { + // Init counter + $idx = 0; + // Get all SQLs + foreach (getExtensionSqls() as $sqls) { + // New array format is recursive + foreach ($sqls as $sql) { + // Trim out spaces + $sql = trim($sql); + + // Output command if set + if (!empty($sql)) { + // Prepare output for template + $content = array( + 'i' => ($idx + 1), + 'sql' => str_replace('{', '{', str_replace('}', '}', encodeEntities($sql))) + ); + + // Load row template + $OUT .= loadTemplate('admin_extension_sql_row', true, $content); + + // Count up + $idx++; + } // END - if + } // END - foreach } // END - foreach - } // END - foreach - // Prepare content for template - $content = array( - 'width' => $width, - 'dashed' => $dashed, - 'title' => $title, - 'rows' => $OUT - ); + // Prepare content for template + $content = array( + 'width' => $width, + 'dashed' => $dashed, + 'title' => $title, + 'rows' => $OUT + ); - // Load main template - $OUT = loadTemplate('admin_ext_sql_table', true, $content); - } elseif ((getExtensionVersion('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')); + // Load main template + $OUT = loadTemplate('admin_extension_sql_table', true, $content); + } else { + // No addional SQL commands to run + $OUT = loadTemplate('admin_settings_saved', true, '{--ADMIN_NO_ADDITIONAL_SQLS--}'); + } } // END - if // Return output @@ -722,12 +809,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'); @@ -739,7 +826,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 @@ -747,51 +834,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); + debug_report_bug(__FUNCTION__, __LINE__, '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) { - // Init ID number - $ret = 0; +function getExtensionId ($ext_name) { + // Init id number + $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); - - // Cache it - $GLOBALS['cache_array']['extension']['ext_id'][$ext_name] = $ret; + $data = SQL_FETCHARRAY($result); } // END - if // Free result SQL_FREERESULT($result); - } - if ($ret == 0) { - // We should fix these all! - debug_report_bug(__FUNCTION__ . ': Invalid extension name found. ext_name=' . $ext_name); - } // END - if + // Cache it + $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 @@ -832,38 +915,44 @@ function isExtensionIdValid ($ext_id) { // Activate given extension function doActivateExtension ($ext_name) { + // Is the extension installed? + if (!isExtensionInstalled($ext_name)) { + // Non-installed extensions cannot be activated + debug_report_bug(__FUNCTION__, __LINE__, 'Tried to activate non-installed extension ' . $ext_name); + } // END - if + // Activate the extension SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='Y' WHERE `ext_name`='%s' LIMIT 1", array($ext_name), __FUNCTION__, __LINE__); - // Extension has been activated? - if (SQL_AFFECTEDROWS() == 1) { - // Then run all queries - doExtensionSqls(getExtensionId($ext_name), 'activate'); - } // END - if + // Then run all queries + doExtensionSqls(getExtensionId($ext_name), 'activate'); } // Deactivate given extension -function doDeactivateExtension($ext_name) { +function doDeactivateExtension ($ext_name) { + // Is the extension installed? + if (!isExtensionInstalled($ext_name)) { + // Non-installed extensions cannot be activated + debug_report_bug(__FUNCTION__, __LINE__, 'Tried to deactivate non-installed extension ' . $ext_name); + } // END - if + // Activate the extension SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='%s' LIMIT 1", array($ext_name), __FUNCTION__, __LINE__); - // Extension has been activated? - if (SQL_AFFECTEDROWS() == 1) { - // Then run all queries - doExtensionSqls(getExtensionId($ext_name), 'deactivate'); + // Then run all queries + doExtensionSqls(getExtensionId($ext_name), 'deactivate'); - // Create new task - createExtensionDeactivationTask($ext_name); + // Create new task (we ignore the task id here) + createExtensionDeactivationTask($ext_name); - // Notify the admin - sendAdminNotification( - getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'), - 'admin_ext_deactivated', - array('ext_name' => $ext_name) - ); - } // END - if + // Notify the admin + sendAdminNotification( + '{--ADMIN_EXTENSION_DEACTIVATED_SUBJECT--}', + 'admin_extension_deactivated', + array('ext_name' => $ext_name) + ); } // Checks wether the extension is older than given @@ -882,187 +971,160 @@ function isExtensionOlder ($ext_name, $ext_ver) { // Creates a new task for updated extension function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) { // Create subject line - $subject = '[UPDATE-' . $ext_name . '-' . $ext_ver . ':] {--ADMIN_UPDATE_EXT_SUBJ--}'; + $subject = '[UPDATE-' . $ext_name . '-' . $ext_ver . ':] {--ADMIN_UPDATE_EXTENSION_SUBJECT--}'; + + // Get task id + $taskId = determineTaskIdBySubject($subject); // Is the extension there? if (isExtensionInstalled($ext_name)) { // Check if task is not there - if (determineTaskIdBySubject($subject) == 0) { + if ($taskId == '0') { // Create extension update-task - createNewTask($subject, $notes, 'EXTENSION_UPDATE', 0, $adminId); + $taskId = createNewTask($subject, $notes, 'EXTENSION_UPDATE', 0, $adminId); } // END - if } else { // Extension not there! :-( - debug_report_bug(sprintf("Extension %s not found but should be updated?", $ext_name)); + debug_report_bug(__FUNCTION__, __LINE__, sprintf("Extension %s not found but should be updated?", $ext_name)); } + + // Return task id + return $taskId; } // Creates a new task for newly installed extension -function createNewExtensionTask ($adminId, $subject, $ext) { +function createNewExtensionTask ($ext_name) { + // Generate subject line + $subject = sprintf("[%s:]", $ext_name); + + // Get task id + $taskId = determineTaskIdBySubject($subject); + // Not installed and do we have created a task for the admin? - if ((determineTaskIdBySubject($subject) == 0) && (!isExtensionInstalled($ext))) { + if (($taskId == '0') && (!isExtensionInstalled($ext_name))) { // Set default message if ext-foo is missing - $message = sprintf(getMessage('ADMIN_EXT_TEXT_FILE_MISSING'), $ext); + $message = getMaskedMessage('ADMIN_EXTENSION_TEXT_FILE_MISSING', $ext_name); // Template file $tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl", - getConfig('PATH'), + getPath(), getLanguage(), - $ext + $ext_name ); // Load text for task if found if (isFileReadable($tpl)) { // Load extension's own text template (HTML!) - $message = loadTemplate('ext_' . $ext, true); + $message = loadTemplate('ext_' . $ext_name, true); } else { // Write this in debug.log as well logDebugMessage(__FUNCTION__, __LINE__, $message); } // Task not created so it's a brand-new extension which we need to register and create a task for! - createNewTask($subject, $message, 'EXTENSION', 0, $adminId, false); + $taskId = createNewTask($subject, $message, 'EXTENSION', 0, getCurrentAdminId(), false); } // END - if + + // Return task id + return $taskId; } // Creates a task for automatically deactivated (deprecated) extension -function createExtensionDeactivationTask ($ext) { +function createExtensionDeactivationTask ($ext_name) { // Create subject line - $subject = sprintf("[%s:] %s", $ext, getMessage('TASK_SUBJ_EXTENSION_DEACTIVATED')); + $subject = sprintf("[%s:] %s", $ext_name, '{--ADMIN_TASK_EXTENSION_DEACTIVATED_SUBJECT--}'); + + // Get task id + $taskId = determineTaskIdBySubject($subject); // Not installed and do we have created a task for the admin? - if ((determineTaskIdBySubject($subject) == 0) && (getExtensionVersion($ext) != '')) { + if (($taskId == '0') && (isExtensionInstalled($ext_name))) { // Task not created so add it - createNewTask($subject, SQL_ESCAPE(loadTemplate('task_ext_deactivated', true, $ext)), 'EXTENSION_DEACTIVATION'); + $taskId = createNewTask($subject, SQL_ESCAPE(loadTemplate('task_EXTENSION_deactivated', true, $ext_name)), 'EXTENSION_DEACTIVATION'); } // END - if -} - -// Checks if the module has a menu -function ifModuleHasMenu ($mod, $forceDb = false) { - // All is false by default - $ret = false; - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "mod={$mod},cache=".getExtensionVersion('cache')); - 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])) { - // Check module cache and count hit - $ret = ($GLOBALS['cache_array']['modules']['has_menu'][$mod] == 'Y'); - incrementStatsEntry('cache_hits'); - } elseif (isset($GLOBALS['cache_array']['extension']['ext_menu'][$mod])) { - // 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; - } - } elseif ((isExtensionInstalled('sql_patches')) && (getExtensionVersion('sql_patches') >= '0.3.6') && ((!isExtensionActive('cache')) || ($forceDb === true))) { - // Check database for entry - $result = SQL_QUERY_ESC("SELECT `has_menu` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1", - array($mod), __FUNCTION__, __LINE__); - - // Entry found? - if (SQL_NUMROWS($result) == 1) { - // Load "has_menu" column - list($has_menu) = SQL_FETCHROW($result); - - // Fake cache... ;-) - $GLOBALS['cache_array']['extension']['ext_menu'][$mod] = $has_menu; - - // Does it have a menu? - $ret = ($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! - } - - // Return status - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName().intval($ret)); - return $ret; + // Return task id + return $taskId; } // 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); + // Task found so load task's id and register extension... + $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); + // Task found so load task's id and register extension... + $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 -function addExtensionNotes ($ver) { +function addExtensionNotes ($ext_ver) { // Init notes/content - $out = ''; $content = array(); + $out = ''; + $content = array(); // Is do we have verbose output enabled? - if ((getConfig('verbose_sql') == 'Y') || (!isExtensionActive('sql_patches'))) { + if ((!isExtensionActive('sql_patches')) || (isVerboseSqlEnabled())) { // Update notes found? - if (getExtensionUpdateNotes($ver) != '') { + if (isExtensionUpdateNoteSet($ext_ver)) { // Update notes found $content = array( - 'ver' => $ver, - 'notes' => getExtensionUpdateNotes($ver) + 'ver' => $ext_ver, + 'notes' => getExtensionUpdateNotes($ext_ver) ); // Reset them - setExtensionUpdateNotes('', $ver); - } elseif (($ver == '0.0') || ($ver == '0.0.0')) { + setExtensionUpdateNotes('', $ext_ver); + } elseif (in_array($ext_ver, array('0.0', '0.0.0'))) { // Initial release $content = array( - 'ver' => $ver, - 'notes' => getMessage('INITIAL_RELEASE') + 'ver' => $ext_ver, + 'notes' => '{--INITIAL_RELEASE--}' ); } else { // No update notes found! $content = array( - 'ver' => $ver, - 'notes' => getMessage('NO_UPDATE_NOTES') + 'ver' => $ext_ver, + 'notes' => '{--NO_UPDATE_NOTES--}' ); } // Load template - $out = loadTemplate('admin_ext_notes', true, $content); + $out = loadTemplate('admin_extension_notes', true, $content); } // END - if // Add the notes @@ -1112,9 +1174,14 @@ function getExtensionAlwaysActive () { return $GLOBALS['ext_always_active'][getCurrentExtensionName()]; } +// Checks wether the current extension is always active +function isExtensionAlwaysActive () { + return (getExtensionAlwaysActive() == 'Y'); +} + // Setter for EXT_VERSION flag -function setThisExtensionVersion ($version) { - $GLOBALS['ext_version'][getCurrentExtensionName()] = (string) $version; +function setThisExtensionVersion ($ext_version) { + $GLOBALS['ext_version'][getCurrentExtensionName()] = (string) $ext_version; } // Getter for EXT_VERSION flag @@ -1134,57 +1201,113 @@ function isExtensionDeprecated () { // Setter for EXT_UPDATE_DEPENDS flag function addExtensionUpdateDependency ($updateDepends) { + //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ' - ENTERED!'); // 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(__FUNCTION__, __LINE__, 'updateDepends is empty: currentExtension=' . getCurrentExtensionName()); } // END - if // Is it not yet added? - if (!in_array($updateDepends, $GLOBALS['ext_running_updates'])) { - //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName().'/'.$updateDepends); - // Add it to the list of extension update depencies map - $GLOBALS['ext_update_depends'][getCurrentExtensionName()][] = (string) $updateDepends; - - // Remember it in the list of running updates - $GLOBALS['ext_running_updates'][] = $updateDepends; + /* Only for debugging! + if ((isset($updateDepends, $GLOBALS['ext_running_updates'][getCurrentExtensionName()])) && (in_array($updateDepends, getExtensionUpdatesRunning()))) { + // Double-adding isn't fine, too + debug_report_bug(__FUNCTION__, __LINE__, '() called twice: updateDepends=' . $updateDepends . ',currentExtension=' . getCurrentExtensionName()); } // END - if + */ + + // Add it to the list of extension update depencies map + $GLOBALS['ext_update_depends'][getCurrentExtensionName()][] = (string) $updateDepends; + + // Remember it in the list of running updates + $GLOBALS['ext_running_updates'][getCurrentExtensionName()][] = $updateDepends; + //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ' - EXIT!'); +} + +// Getter for running updates +function getExtensionUpdatesRunning () { + return $GLOBALS['ext_running_updates'][getCurrentExtensionName()]; } // Checks wether the given extension registration is in progress -function isExtensionRegisterRunning ($ext_name) { - return ((isset($GLOBALS['ext_register_running'])) && (in_array($ext_name, $GLOBALS['ext_register_running']))); +function isExtensionRegistrationRunning ($ext_name) { + // Simply check it + $isRunning = ((isset($GLOBALS['ext_register_running'])) && (in_array($ext_name, $GLOBALS['ext_register_running']))); + + // Return it + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ', isRunning=' . intval($isRunning)); + return $isRunning; } // Init EXT_UPDATE_DEPENDS flag function initExtensionUpdateDependencies () { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName()); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ' - ENTERED!'); // Init update depency map automatically if not found - if (!isExtensionUpdateDependenciesInitialized()) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName()." - INIT!"); - $GLOBALS['ext_update_depends'][getCurrentExtensionName()] = array(); + if (isExtensionUpdateDependenciesInitialized()) { + // We need these bug reports as well... + debug_report_bug(__FUNCTION__, __LINE__, '() is called twice: currName=' . getCurrentExtensionName()); } // END - if + $GLOBALS['ext_update_depends'][getCurrentExtensionName()] = array(); + // Init running updates array initExtensionRuningUpdates(); + + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ' - EXIT!'); } // Adds an extension as "registration in progress" function addExtensionRunningRegistration ($ext_name) { // Is it running? - if (!isExtensionRegisterRunning($ext_name)) { - // Then add it! - $GLOBALS['ext_register_running'][] = $ext_name; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Registration in progress: ext_name=' . $ext_name . ' - ENTERED!'); + if (isExtensionRegistrationRunning($ext_name)) { + // This is really bad and should not be quietly ignored + debug_report_bug(__FUNCTION__, __LINE__, '() already called! ext_name=' . $ext_name); } // END - if + + // Then add it! + $GLOBALS['ext_register_running'][] = $ext_name; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Registration in progress: ext_name=' . $ext_name . ' - EXIT!'); } // Checks wether EXT_UPDATE_DEPENDS is initialized function isExtensionUpdateDependenciesInitialized () { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName()); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName()); return (isset($GLOBALS['ext_update_depends'][getCurrentExtensionName()])); } +// Checks wether an update is already running for given extension +function isExtensionUpdateRunning ($ext_name) { + // Current and given extensions means whole array + if ($ext_name == getCurrentExtensionName()) { + // Default is not found + $isRunning = false; + + // Walk through whole array + foreach ($GLOBALS['ext_running_updates'] as $ext1=>$depends) { + // Is it found? + if (($ext1 == $ext_name) || ($isRunning === true)) { + // Found! + logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',isRunning=' . intval($isRunning)); + $isRunning = true; + break; + } // END - if + } // END - foreach + + // Return result + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ', isRunning=' . intval($isRunning)); + return $isRunning; + } // END - if + + // Simply check it + $isRunning = ((isExtensionUpdateDependenciesInitialized()) && (in_array($ext_name, getExtensionRunningUpdates()))); + + // Return it + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ', isRunning=' . intval($isRunning)); + return $isRunning; +} + // Initializes the list of running updates function initExtensionRuningUpdates () { // Auto-init ext_running_updates @@ -1230,7 +1353,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 @@ -1260,8 +1383,8 @@ function getExtensionReportsFailure () { } // Setter for EXT_VER_HISTORY flag -function setExtensionVersionHistory ($verHistory) { - $GLOBALS['ext_ver_history'][getCurrentExtensionName()] = (array) $verHistory; +function setExtensionVersionHistory ($versionHistory) { + $GLOBALS['ext_ver_history'][getCurrentExtensionName()] = (array) $versionHistory; } // Getter for EXT_VER_HISTORY array @@ -1270,27 +1393,41 @@ function getExtensionVersionHistory () { } // Setter for EXT_UPDATE_NOTES -function setExtensionUpdateNotes ($updateNotes, $ver='') { - //* DEBUG: */ print __FUNCTION__.':'.getCurrentExtensionName().'/'.getCurrentExtensionVersion().'/'.$ver.'='.$updateNotes.'
'; - if (empty($ver)) { +function setExtensionUpdateNotes ($updateNotes, $ext_ver = '') { + // . '/' . getCurrentExtensionVersion() + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()=' . getCurrentExtensionName() . ',getExtensionMode()=' . getExtensionMode() . ',ext_ver=' . $ext_ver . ',updateNotes()=' . strlen($updateNotes)); + if (empty($ext_ver)) { $GLOBALS['ext_update_notes'][getCurrentExtensionName()][getCurrentExtensionVersion()] = (string) $updateNotes; } else { - $GLOBALS['ext_update_notes'][getCurrentExtensionName()][$ver] = (string) $updateNotes; + $GLOBALS['ext_update_notes'][getCurrentExtensionName()][$ext_ver] = (string) $updateNotes; } } // Getter for EXT_UPDATE_NOTES -function getExtensionUpdateNotes ($ver) { - return $GLOBALS['ext_update_notes'][getCurrentExtensionName()][$ver]; +function getExtensionUpdateNotes ($ext_ver) { + return $GLOBALS['ext_update_notes'][getCurrentExtensionName()][$ext_ver]; +} + +// Checks if ext_update_notes is set +function isExtensionUpdateNoteSet ($ext_ver) { + return isset($GLOBALS['ext_update_notes'][getCurrentExtensionName()][$ext_ver]); } // Init extension notice -function initExtensionNotes () { +function initExtensionNotes ($force = false) { + // Is it already initialized? + if (($force === false) && (isset($GLOBALS['ext_notes'][getCurrentExtensionName()]))) { + // This is mostly not wanted, so please report it + debug_report_bug(__FUNCTION__, __LINE__, 'ext_notes already set for extension ' . getCurrentExtensionName()); + } // END - if + + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()=' . getCurrentExtensionName()); $GLOBALS['ext_notes'][getCurrentExtensionName()] = ''; } // Append extension notice function appendExtensionNotes ($notes) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()=' . getCurrentExtensionName() . ', notes()=' . strlen($notes)); $GLOBALS['ext_notes'][getCurrentExtensionName()] .= (string) trim($notes); } @@ -1301,30 +1438,36 @@ function getExtensionNotes () { // Setter for current extension name function setCurrentExtensionName ($ext_name) { - $GLOBALS['curr_ext_name'] = (string) trim($ext_name); + $GLOBALS['curr_extension_name'] = (string) trim($ext_name); } // Getter for current extension name function getCurrentExtensionName () { - if (isset($GLOBALS['curr_ext_name'])) { - return $GLOBALS['curr_ext_name']; + if (!isset($GLOBALS['curr_extension_name'])) { + // Not set! + debug_report_bug(__FUNCTION__, __LINE__, 'curr_extension_name not initialized. Please execute initExtensionSqls() before calling this function.'); } // END - if - // Not set! - debug_report_bug(__FUNCTION__.": curr_ext_name not initialized. Please execute initExtensionSqls() before calling this function."); + // Return it + return $GLOBALS['curr_extension_name']; } // Init SQLs array for current extension -function initExtensionSqls () { - // Auto-init the array now... - if (!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()])) { +function initExtensionSqls ($force = false) { + // Auto-init the array or if forced + if (($force === true) || (!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()]))) { + // Set the array $GLOBALS['ext_sqls'][getCurrentExtensionName()] = array(); + + // Initialize the generic array + initSqls(); } // END - if } // Adds SQLs to the SQLs array but "assigns" it with current extension name function addExtensionSql ($sql) { // Add it + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',ext_version=' . getCurrentExtensionVersion() . ',sql=' . $sql); $GLOBALS['ext_sqls'][getCurrentExtensionName()][getCurrentExtensionVersion()][] = $sql; } @@ -1333,7 +1476,7 @@ function getExtensionSqls () { // Output debug backtrace if not found (SHOULD NOT HAPPEN!) if (!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()])) { // Not found, should not happen - debug_report_bug(sprintf("ext_sqls is empty, current extension: %s", + debug_report_bug(__FUNCTION__, __LINE__, sprintf("ext_sqls is empty, current extension: %s", getCurrentExtensionName() )); } // END - if @@ -1342,6 +1485,20 @@ function getExtensionSqls () { return $GLOBALS['ext_sqls'][getCurrentExtensionName()]; } +// Count SQLs for current extension +function countExtensionSqls () { + // Output debug backtrace if not found (SHOULD NOT HAPPEN!) + if (!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()])) { + // Not found, should not happen + debug_report_bug(__FUNCTION__, __LINE__, sprintf("ext_sqls is empty, current extension: %s", + getCurrentExtensionName() + )); + } // END - if + + // Count them all + return count($GLOBALS['ext_sqls'][getCurrentExtensionName()]); +} + // Removes SQLs for current extension function unsetExtensionSqls () { unset($GLOBALS['ext_sqls'][getCurrentExtensionName()]); @@ -1389,19 +1546,19 @@ function redirectOnUninstalledExtension ($ext_name) { // Filter for initialization of all extensions by loading them in 'init' mode function FILTER_INIT_EXTENSIONS () { // Do we have some entries? - //* DEBUG */ print __FUNCTION__.': ENTRY!
'; + //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY!'); if (isset($GLOBALS['cache_array']['extension']['ext_name'])) { - //* DEBUG */ print __FUNCTION__.': CACHE - START!
'; // Load all found extensions if found - foreach ($GLOBALS['cache_array']['extension']['ext_name'] as $key=>$ext_name) { + //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHE - START!'); + foreach ($GLOBALS['cache_array']['extension']['ext_name'] as $key => $ext_name) { // Load it - //* DEBUG */ print __FUNCTION__.': '.$ext_name.' - START
'; - loadExtension($ext_name, 'init'); - //* DEBUG */ print __FUNCTION__.': '.$ext_name.' - END
'; + //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name='.$ext_name.' - START'); + loadExtension($ext_name, 'init', getExtensionVersion($ext_name)); + //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name='.$ext_name.' - END'); } // END - foreach - //* DEBUG */ print __FUNCTION__.': CACHE - END!
'; + //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHE - END!'); } // END - if - //* DEBUG */ print __FUNCTION__.': EXIT!
'; + //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'EXIT!'); } // Setter for extension mode @@ -1416,38 +1573,41 @@ function getExtensionMode () { // Setter for dry-run function enableExtensionDryRun ($dry_run = true) { - //* DEBUG: */ print __FUNCTION__.': '.getCurrentExtensionName().'='.intval($dry_run).'
'; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()='.getCurrentExtensionName().',dry='.intval($dry_run)); $GLOBALS['ext_dry_run'] = (bool) $dry_run; } // Getter for dry-run -function getExtensionDryRun () { +function isExtensionDryRun () { return $GLOBALS['ext_dry_run']; } // Setter for current extension version function setCurrentExtensionVersion ($ext_ver) { - if (empty($ext_ver)) { - // 0.0 is okay here - $GLOBALS['ext_current_version'] = '0.0'; - } else { - // Add version - $GLOBALS['ext_current_version'] = (string) $ext_ver; - } + // ext_ver should never be empty in other modes than 'test' + if ((empty($ext_ver)) && (getExtensionMode() != 'test')) { + // Please report all these messages + debug_report_bug(__FUNCTION__, __LINE__, 'ext_ver is empty. Current extension name: ' . getCurrentExtensionName() . ', mode=' . getExtensionMode()); + } // END - if + + // Add version + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ', ext_ver[' . gettype($ext_ver) . ']=' . $ext_ver); + $GLOBALS['ext_current_version'][getCurrentExtensionName()] = (string) $ext_ver; } // Getter for current extension version function getCurrentExtensionVersion () { - return $GLOBALS['ext_current_version']; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ', ext_ver=' . $GLOBALS['ext_current_version'][getCurrentExtensionName()]); + return $GLOBALS['ext_current_version'][getCurrentExtensionName()]; } -// 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 @@ -1474,7 +1634,7 @@ function getExtensionHasCss () { // Construct FQFN for check $FQFN = sprintf("%stheme/%s/css/%s.css", - getConfig('PATH'), + getPath(), getCurrentTheme(), getCurrentExtensionName() ); @@ -1512,7 +1672,7 @@ function ifExtensionHasLanguageFile ($ext_name) { } // END - if // Put it in cache - $GLOBALS['cache_array']['extension']['ext_lang'][$ext_name] = 'Y'; + $GLOBALS['cache_array']['extension']['ext_lang'][$ext_name] = $readable; } // Return result @@ -1524,7 +1684,7 @@ function loadExtensionInclude () { // Is it readable? if (!isExtensionIncludeReadable()) { // Not readable - debug_report_bug('Extension ' . getCurrentExtensionName() . ' should be loaded, but is not readable.'); + debug_report_bug(__FUNCTION__, __LINE__, 'Extension ' . getCurrentExtensionName() . ' should be loaded, but is not readable.'); } // END - if // Generate INC name @@ -1549,30 +1709,36 @@ 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]; } // Checks if an extension's function file is readable function isExtensionFunctionFileReadable ($ext_name) { + // Is cache there? + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name); if (isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) { // Just count cache hits + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_func=' . $GLOBALS['cache_array']['extension']['ext_func'][$ext_name] .' - CACHE!'); incrementStatsEntry('cache_hits'); } else { - // Construct FQFN for functions file + // Construct IFN for functions file $funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name); // Is this include there? if ((isFileReadable($funcsInclude)) && (!isset($GLOBALS['ext_loaded']['funcs'][$ext_name])) && (getExtensionMode() == 'test')) { // Cache it! + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_func=Y - FOUND!'); $GLOBALS['cache_array']['extension']['ext_func'][$ext_name] = 'Y'; } else { // Cache it! + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_func=N - NOT FOUND!'); $GLOBALS['cache_array']['extension']['ext_func'][$ext_name] = 'N'; } } // Return result + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_func=' . $GLOBALS['cache_array']['extension']['ext_func'][$ext_name]); return ($GLOBALS['cache_array']['extension']['ext_func'][$ext_name] == 'Y'); } @@ -1604,7 +1770,7 @@ function addAdminMenuSql ($action, $what, $title, $descr, $sort) { addExtensionSql($sql); } elseif (isDebugModeEnabled()) { // Double menus should be located and fixed! - logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double admin menu action=%s, what=%s detected.", $action, $what)); + logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double admin menu action=%s,what=%s,title=%s detected.", $action, $what, $title)); } } @@ -1638,7 +1804,7 @@ function addGuestMenuSql ($action, $what, $title, $visible, $locked, $sort) { addExtensionSql($sql); } elseif (isDebugModeEnabled()) { // Double menus should be located and fixed! - logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double guest menu action=%s, what=%s detected.", $action, $what)); + logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double guest menu action=%s,what=%s,title=%s,active=%s detected.", $action, $what, $title, $active)); } } @@ -1672,7 +1838,7 @@ function addMemberMenuSql ($action, $what, $title, $visible, $locked, $sort) { addExtensionSql($sql); } elseif (isDebugModeEnabled()) { // Double menus should be located and fixed! - logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double member menu action=%s, what=%s detected.", $action, $what)); + logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double member menu action=%s,what=%s,title=%s,visivle=%s,locked=%s detected.", $action, $what, $title, $visible, $locked)); } } @@ -1704,9 +1870,47 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) { addExtensionSql($sql); } elseif (isDebugModeEnabled()) { // Double menus should be located and fixed! - logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double sponsor menu action=%s, what=%s detected.", $action, $what)); + logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double sponsor menu action=%s,what=%s,title=%s,active=%s detected.", $action, $what, $title, $active)); } } +// Enables/disables productive mode for current extension (used only while +// registration). +function enableExtensionProductive ($isProductive = true) { + // Log debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ext_name=%s,isProductive=%d", getCurrentExtensionName(), intval($isProductive))); + + // Set it + $GLOBALS['ext_productive'][getCurrentExtensionName()] = (bool) $isProductive; +} + +// Checks wether the extension is in productive phase. If not set, development +// phase (=false) is assumed. +function isExtensionProductive ($ext_name = '') { + // Is the extension name empty? Then use current + if (empty($ext_name)) { + // Get current extension name + $ext_name = getCurrentExtensionName(); + } // END - if + + // Do we have cache? + if (!isset($GLOBALS[__FUNCTION__][$ext_name])) { + // Load extension only if not yet loaded + if (!isset($GLOBALS['ext_productive'][$ext_name])) { + // Load extension in test mode + loadExtension($ext_name, 'test'); + } // END - if + + // Determine it + $GLOBALS[__FUNCTION__][$ext_name] = ((isset($GLOBALS['ext_productive'][$ext_name])) && ($GLOBALS['ext_productive'][$ext_name] === true)); + } // END - if + + // Log debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ext_name=%s,isProductive=%s", $ext_name, intval($GLOBALS[__FUNCTION__][$ext_name]))); + + // Return result + return $GLOBALS[__FUNCTION__][$ext_name]; +} + // [EOF] ?>