Getter for boolean values should be named like ifFoo() or isBar()

[mailer.git] / inc / extensions-functions.php

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 4bc33da72f09b7a5f1f0310880290accba053f4f..48397e939e8c00c5a25ffdef1e6690ef9b6e9630 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -205,7 +205,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
                $task_id = determineExtensionTaskId(getCurrentExtensionName());
 
                // Still zero and not in dry-run?
-               if (($task_id == '0') && (!getExtensionDryRun())) {
+               if (($task_id == '0') && (!isExtensionDryRun())) {
                        // Then request a bug report
                        debug_report_bug(__FUNCTION__, __LINE__, sprintf("%s: task_id is still zero after determineExtensionTaskId(%s)",
                                __FUNCTION__,
@@ -228,7 +228,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 
        // Does this extension exists?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
-       if (loadExtension(getCurrentExtensionName(), 'register', '', getExtensionDryRun())) {
+       if (loadExtension(getCurrentExtensionName(), 'register', '', isExtensionDryRun())) {
                // Set current extension name again
                setCurrentExtensionName($ext_name);
 
@@ -238,7 +238,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
                foreach ($history as $ver) {
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ', ext_ver=' . $ver);
                        // Load extension in update mode
-                       loadExtension(getCurrentExtensionName(), 'update', $ver, getExtensionDryRun());
+                       loadExtension(getCurrentExtensionName(), 'update', $ver, isExtensionDryRun());
 
                        // Add update notes to our output
                        addExtensionNotes($ver);
@@ -254,7 +254,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 
                        // Check if extension is not installed and not already in registration procedure and if loading it wents finally fine...
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',isExtensionRegistrationRunning(' . $ext_update . ')=' . intval(isExtensionRegistrationRunning($ext_update)));
-                       if ((!isExtensionInstalled($ext_update)) && (!isExtensionRegistrationRunning($ext_update)) && (loadExtension($ext_update, 'test', '', getExtensionDryRun()))) {
+                       if ((!isExtensionInstalled($ext_update)) && (!isExtensionRegistrationRunning($ext_update)) && (loadExtension($ext_update, 'test', '', isExtensionDryRun()))) {
                                // Set current extension name again
                                setCurrentExtensionName($ext_name);
 
@@ -274,7 +274,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
                                        if ($task > 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);
+                                               $test = registerExtension($ext_update, $task, isExtensionDryRun(), false);
 
                                                // Reset extension name
                                                setCurrentExtensionName($ext_name);
@@ -286,7 +286,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
                                        //* 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, getExtensionDryRun());
+                                       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]);
@@ -328,14 +328,14 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
                // Does everthing before wents ok?
                if ($test === true) {
                        // "Dry-run-mode" activated?
-                       if ((getExtensionDryRun() === false) && (!isExtensionOnRemovalList())) {
+                       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()));
 
                                // Register extension
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'insert=' . getCurrentExtensionName() . '/' . getCurrentExtensionVersion() . ' - INSERT!');
@@ -376,7 +376,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 
                                // In normal mode return a true on success
                                $ret = true;
-                       } elseif (getExtensionDryRun() === true) {
+                       } elseif (isExtensionDryRun() === true) {
                                // In  "dry-run" mode do always return a true
                                $ret = true;
 
@@ -400,7 +400,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 
        // Is this the sql_patches?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . '/' . getExtensionMode());
-       if ((getCurrentExtensionName() == 'sql_patches') && ((getExtensionMode() == 'register') || (getExtensionMode() == 'remove')) && (!getExtensionDryRun()) && ($test)) {
+       if ((getCurrentExtensionName() == 'sql_patches') && ((getExtensionMode() == 'register') || (getExtensionMode() == 'remove')) && (!isExtensionDryRun()) && ($test)) {
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ': LOAD!');
                if ($logout === true) {
                        // Then redirect to logout
@@ -638,7 +638,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();
@@ -648,7 +648,7 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) {
 
        // Check if version is updated
        //* DEBUG: */ debugOutput(getCurrentExtensionName().'/'.$ext_name.':'.getThisExtensionVersion().'/'.$ext_ver.'/'.intval(is_array($history)));
-       if (((getThisExtensionVersion() != $ext_ver) || (getExtensionDryRun())) && (is_array($history))) {
+       if (((getThisExtensionVersion() != $ext_ver) || (isExtensionDryRun())) && (is_array($history))) {
                // Search for starting point
                $start = array_search($ext_ver, $history);
 
@@ -658,7 +658,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();
@@ -678,10 +678,10 @@ 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
@@ -698,7 +698,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()]);
@@ -710,9 +710,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()));
 
-               if (getExtensionDryRun() === false) {
+               if (isExtensionDryRun() === false) {
                        // Run filters on success extension update
                        runFilterChain('extension_update', getCurrentExtensionName());
                } // END - if
@@ -1550,7 +1550,7 @@ function enableExtensionDryRun ($dry_run = true) {
 }
 
 // Getter for dry-run
-function getExtensionDryRun () {
+function isExtensionDryRun () {
        return $GLOBALS['ext_dry_run'];
 }