X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=c4e88abaf0e2c30d28e159c23a72515348249f42;hb=5c8a9ba30d1aaa13a6f18c51548a4d3f2c25326e;hp=80513f4db8478e3085293586cfc3638ca45c0a5d;hpb=6b9595ec5034045297bb3461e715a28a4edbde60;p=mailer.git
diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 80513f4db8..c4e88abaf0 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
} // END - if
// Load the extension and maybe found language and function files.
-function loadExtension ($ext_name, $ext_mode = 'init', $ext_ver = '', $dry_run = false) {
+function loadExtension ($ext_name, $ext_mode, $ext_ver = '', $dry_run = false) {
// If this happens twice, we need the bug report from you, except for updates/tests
if ((isset($GLOBALS['loaded_extension'][$ext_name][$ext_mode])) && (!in_array($ext_mode, array('update', 'test')))) {
debug_report_bug(__FUNCTION__, __LINE__, '() is called twice: ext_name=' . $ext_name . ', ext_mode='. $ext_mode . ',ext_sqls=' . print_r(getExtensionSqls(), true) . ', ext_register_running=' . print_r($GLOBALS['ext_register_running'], true) . ', ext_running_updates=' . print_r($GLOBALS['ext_running_updates'], true));
@@ -116,7 +116,7 @@ function loadExtension ($ext_name, $ext_mode = 'init', $ext_ver = '', $dry_run =
if (isExtensionFunctionFileReadable($ext_name)) {
// Not yet loaded?
if ((($GLOBALS['cache_array']['extension']['ext_func'][$ext_name] == 'Y') || (!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name]))) && (!isset($GLOBALS['ext_loaded']['funcs'][$ext_name]))) {
- // Construct FQFN for functions file
+ // Construct IFN for functions file
$funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name);
// Mark it as loaded
@@ -125,7 +125,7 @@ function loadExtension ($ext_name, $ext_mode = 'init', $ext_ver = '', $dry_run =
// Download functions file
loadIncludeOnce($funcsInclude);
} // END - if
- } elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (getOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme') && (getExtensionMode() == 'test')) {
+ } elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (getScriptOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme') && (getExtensionMode() == 'test')) {
// No functions file is not so good...
logDebugMessage(__FUNCTION__, __LINE__, sprintf("NOTICE: Extension %s has no own functions file or we cannot read from it. mode=%s",
$ext_name,
@@ -166,9 +166,9 @@ function loadExtension ($ext_name, $ext_mode = 'init', $ext_ver = '', $dry_run =
}
// Registeres an extension and possible update depencies
-function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = true) {
+function registerExtension ($ext_name, $taskId, $dry_run = false, $logout = true) {
// Set current extension name
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',task_id=' . $task_id . ',dry_run=' . intval($dry_run) . ',logout=' . intval($logout) . ' - ENTERED!');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',task_id=' . $taskId . ',dry_run=' . intval($dry_run) . ',logout=' . intval($logout) . ' - ENTERED!');
setCurrentExtensionName($ext_name);
// Enable dry-run
@@ -200,14 +200,14 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
} // END - if
// Is the task id zero? Then we need to auto-fix it here
- if ($task_id == '0') {
+ if ($taskId == '0') {
// Try to find the task
- $task_id = determineExtensionTaskId(getCurrentExtensionName());
+ $taskId = determineExtensionTaskId(getCurrentExtensionName());
// Still zero and not in dry-run?
- if (($task_id == '0') && (!isExtensionDryRun())) {
+ if (($taskId == '0') && (!isExtensionDryRun())) {
// Now try to create a new task
- $task_id = createNewExtensionTask(getCurrentExtensionName());
+ $taskId = createNewExtensionTask(getCurrentExtensionName());
// Is it still zero?
if ($taskId == '0') {
@@ -241,13 +241,13 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
// And run possible updates
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName());
$history = getExtensionVersionHistory();
- foreach ($history as $ver) {
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ', ext_ver=' . $ver);
+ foreach ($history as $ext_ver) {
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ', ext_ver=' . $ext_ver);
// Load extension in update mode
- loadExtension(getCurrentExtensionName(), 'update', $ver, isExtensionDryRun());
+ loadExtension(getCurrentExtensionName(), 'update', $ext_ver, isExtensionDryRun());
// Add update notes to our output
- addExtensionNotes($ver);
+ addExtensionNotes($ext_ver);
} // END - foreach
// Does this extension depends on an outstanding update of another update?
@@ -284,8 +284,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
// Reset extension name
setCurrentExtensionName($ext_name);
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
- //* DEBUG: */ debugOutput(getCurrentExtensionName().':' . print_r($test, true) . '
');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',test=' . intval($test));
} // END - if
} elseif ($ext_ver != getCurrentExtensionVersion()) {
// Ok, update this extension now
@@ -325,11 +324,9 @@ 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());
- //* DEBUG: */ debugOutput(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());
- //* DEBUG: */ debugOutput(getCurrentExtensionName().':' . print_r($test, true) . '
');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',test=' . intval($test));
// Does everthing before wents ok?
if ($test === true) {
@@ -366,16 +363,19 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
), __FUNCTION__, __LINE__);
}
+ // Use the insert id as extension id and cache it for early usage
+ $GLOBALS['cache_array']['extension']['ext_id'][getCurrentExtensionName()] = SQL_INSERTID();
+
// 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
));
// Re-init queries and notes
initExtensionSqls(true);
- initExtensionNotes();
+ initExtensionNotes(true);
// Mark it as installed
$GLOBALS['ext_is_installed'][getCurrentExtensionName()] = true;
@@ -385,9 +385,6 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
} elseif (isExtensionDryRun() === true) {
// In "dry-run" mode do always return a true
$ret = true;
-
- // Re-init queries and notes
- initExtensionNotes();
} else {
// Extension has been removed for updates, so all is fine!
$ret = true;
@@ -397,11 +394,11 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName());
$ret = false;
}
- } elseif (($task_id > 0) && (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?
@@ -419,8 +416,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
} // END - if
// Return status code
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ' - EXIT!');
- //* DEBUG: */ debugOutput(getCurrentExtensionName().':'.print_r($ret, true).'
');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ',test=' . intval($test) . ' - EXIT!');
return $ret;
}
@@ -449,14 +445,14 @@ function doExtensionSqls ($ext_id, $load_mode) {
$sqlRan = false;
// Load extension in detected mode
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ":ext_name[{$ext_id}]=".getCurrentExtensionName()."");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name[' . $ext_id . ']=' . getCurrentExtensionName());
loadExtension(getCurrentExtensionName(), $load_mode, '', false);
// Init these SQLs
initSqls();
setSqlsArray(getExtensionSqls());
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ":SQLs::count=".countSqls()."");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQLs::count=' . countSqls());
if (isSqlsValid()) {
// Run SQL commands...
runFilterChain('run_sqls');
@@ -472,10 +468,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
}
@@ -485,7 +481,7 @@ 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
@@ -526,8 +522,16 @@ 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
$data['ext_active'] = 'N';
@@ -535,7 +539,7 @@ function isExtensionActive ($ext_name) {
// Check cache
if (isset($GLOBALS['cache_array']['extension']['ext_active'][$ext_name])) {
// Load from cache
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "CACHE! ext_name={$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
@@ -544,7 +548,7 @@ function isExtensionActive ($ext_name) {
// @TODO Extension is loaded, what next?
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__);
@@ -559,16 +563,16 @@ function isExtensionActive ($ext_name) {
SQL_FREERESULT($result);
// Write cache array
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name=".$ext_name."[DB]: ".$data['ext_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=".$data['ext_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 ($data['ext_active'] == 'Y');
@@ -587,7 +591,7 @@ function getExtensionVersion ($ext_name, $force = false) {
// 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])) {
@@ -597,7 +601,7 @@ function getExtensionVersion ($ext_name, $force = false) {
// Count cache hits
incrementStatsEntry('cache_hits');
- } elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (getOutputMode() != 0)) {
+ } elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (getScriptOutputMode() != 0)) {
// 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__);
@@ -626,7 +630,7 @@ function getExtensionVersion ($ext_name, $force = false) {
} // END - if
// Return result
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": ret={$data['ext_version']}");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_version=' . $data['ext_version']);
return $data['ext_version'];
}
@@ -737,48 +741,49 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false
$OUT = '';
// Do we have queries?
- if ((isExtensionInstalledAndNewer('sql_patches', '0.0.7')) && (getConfig('verbose_sql') == 'Y')) {
- // Init switch color
- $SW = 2;
-
- // Get all SQLs
- foreach (getExtensionSqls() as $sqls) {
- // New array format is recursive
- foreach ($sqls as $idx => $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' => $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 ((isExtensionInstalledAndNewer('sql_patches', '0.0.7')) && (getConfig('verbose_sql') == 'Y')) {
- // No addional SQL commands to run
- $OUT = loadTemplate('admin_settings_saved', true, '{--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
@@ -921,8 +926,8 @@ function doDeactivateExtension($ext_name) {
// Notify the admin
sendAdminNotification(
- getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'),
- 'admin_ext_deactivated',
+ '{--ADMIN_EXTENSION_DEACTIVATED_SUBJECT--}',
+ 'admin_extension_deactivated',
array('ext_name' => $ext_name)
);
} // END - if
@@ -944,7 +949,7 @@ 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_EXTENSION_SUBJ--}';
+ $subject = '[UPDATE-' . $ext_name . '-' . $ext_ver . ':] {--ADMIN_UPDATE_EXTENSION_SUBJECT--}';
// Get task id
$taskId = determineTaskIdBySubject($subject);
@@ -980,7 +985,7 @@ function createNewExtensionTask ($ext_name) {
// Template file
$tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl",
- getConfig('PATH'),
+ getPath(),
getLanguage(),
$ext_name
);
@@ -1005,7 +1010,7 @@ function createNewExtensionTask ($ext_name) {
// Creates a task for automatically deactivated (deprecated) extension
function createExtensionDeactivationTask ($ext_name) {
// Create subject line
- $subject = sprintf("[%s:] %s", $ext_name, '{--TASK_SUBJ_EXTENSION_DEACTIVATED--}');
+ $subject = sprintf("[%s:] %s", $ext_name, '{--ADMIN_TASK_EXTENSION_DEACTIVATED_SUBJECT--}');
// Get task id
$taskId = determineTaskIdBySubject($subject);
@@ -1020,57 +1025,6 @@ function createExtensionDeactivationTask ($ext_name) {
return $taskId;
}
-// Checks if the module has a menu
-function ifModuleHasMenu ($mod, $forceDb = false) {
- // All is false by default
- $ret = false;
-
- // 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])) {
- // 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');
- } else {
- // Admin/guest/member/sponsor modules have always a menu!
- $ret = in_array($mod, array('admin', 'index', 'login', 'sponsor'));
- }
- } elseif ((isExtensionInstalledAndNewer('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
- $data = SQL_FETCHARRAY($result);
-
- // Fake cache... ;-)
- $GLOBALS['cache_array']['extension']['ext_menu'][$mod] = $data['has_menu'];
-
- // Does it have a menu?
- $ret = ($data['has_menu'] == 'Y');
- } // END - if
-
- // Free memory
- SQL_FREERESULT($result);
- } elseif (!isExtensionInstalled('sql_patches')) {
- // 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
- return $ret;
-}
-
// Determines the task id for given extension
function determineExtensionTaskId ($ext_name) {
// Default is not found
@@ -1116,38 +1070,39 @@ function determineTaskIdBySubject ($subject) {
}
// 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 ((!isExtensionActive('sql_patches')) || (getConfig('verbose_sql') == 'Y')) {
+ if ((!isExtensionActive('sql_patches')) || (isVerboseSqlEnabled())) {
// Update notes found?
- if (isExtensionUpdateNoteSet($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,
+ 'ver' => $ext_ver,
'notes' => '{--INITIAL_RELEASE--}'
);
} else {
// No update notes found!
$content = array(
- 'ver' => $ver,
+ 'ver' => $ext_ver,
'notes' => '{--NO_UPDATE_NOTES--}'
);
}
// Load template
- $out = loadTemplate('admin_EXTENSION_notes', true, $content);
+ $out = loadTemplate('admin_extension_notes', true, $content);
} // END - if
// Add the notes
@@ -1203,8 +1158,8 @@ function isExtensionAlwaysActive () {
}
// 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
@@ -1232,7 +1187,7 @@ function addExtensionUpdateDependency ($updateDepends) {
} // END - if
// Is it not yet added?
- /* DEBUG:
+ /* 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());
@@ -1406,8 +1361,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
@@ -1416,33 +1371,41 @@ function getExtensionVersionHistory () {
}
// Setter for EXT_UPDATE_NOTES
-function setExtensionUpdateNotes ($updateNotes, $ver='') {
+function setExtensionUpdateNotes ($updateNotes, $ext_ver = '') {
// . '/' . getCurrentExtensionVersion()
- //* DEBUG: */ debug_report_bug(__FUNCTION__.':' . getCurrentExtensionName() . '/' . getExtensionMode() . '/' . $ver . '=' . $updateNotes);
- if (empty($ver)) {
+ //* 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 ($ver) {
- return isset($GLOBALS['ext_update_notes'][getCurrentExtensionName()][$ver]);
+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);
}
@@ -1453,23 +1416,24 @@ function getExtensionNotes () {
// Setter for current extension name
function setCurrentExtensionName ($ext_name) {
- $GLOBALS['curr_EXTENSION_name'] = (string) trim($ext_name);
+ $GLOBALS['curr_extension_name'] = (string) trim($ext_name);
}
// Getter for current extension name
function getCurrentExtensionName () {
- if (isset($GLOBALS['curr_EXTENSION_name'])) {
- return $GLOBALS['curr_EXTENSION_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_EXTENSION_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 ($force = false) {
// Auto-init the array or if forced
- if ((!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()])) || ($force === true)) {
+ if (($force === true) || (!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()]))) {
// Set the array
$GLOBALS['ext_sqls'][getCurrentExtensionName()] = array();
@@ -1498,6 +1462,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()]);
@@ -1545,19 +1523,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'])) {
// Load all found extensions if found
- //* DEBUG */ print __FUNCTION__.': CACHE - START!
';
+ //* 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
';
+ //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name='.$ext_name.' - START');
loadExtension($ext_name, 'init', getExtensionVersion($ext_name));
- //* DEBUG */ print __FUNCTION__.': '.$ext_name.' - END
';
+ //* 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
@@ -1572,7 +1550,7 @@ function getExtensionMode () {
// Setter for dry-run
function enableExtensionDryRun ($dry_run = true) {
- //* DEBUG: */ debugOutput(__FUNCTION__.': '.getCurrentExtensionName().'='.intval($dry_run));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()='.getCurrentExtensionName().',dry='.intval($dry_run));
$GLOBALS['ext_dry_run'] = (bool) $dry_run;
}
@@ -1633,7 +1611,7 @@ function getExtensionHasCss () {
// Construct FQFN for check
$FQFN = sprintf("%stheme/%s/css/%s.css",
- getConfig('PATH'),
+ getPath(),
getCurrentTheme(),
getCurrentExtensionName()
);
@@ -1714,24 +1692,30 @@ function isExtensionIncludeReadable ($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');
}