Changeset 5270

Timestamp:

11/19/07 08:22:13 (9 months ago)

Author:

p_lindheimer

Message:

change module_admin to report errors from dependencies but still list remaining selected modules that do not have errors and allow them to download while skipping the error ones

Files:

• freepbx/trunk/amp_conf/htdocs/admin/page.modules.php (modified) (12 diffs)

freepbx/trunk/amp_conf/htdocs/admin/page.modules.php

@@ -393 +393 @@
-                foreach ($moduleaction as $module => $action) { 
-                        $text = false;
+                        $skipaction = false;
-
-                        // make sure name is set. This is a problem for broken modules
@@ -403 +404 @@
-                                        if (!EXTERNAL_PACKAGE_MANAGEMENT) {
-                                                if (is_array($errors = module_checkdepends($modules_online[$module]))) {
+                                                        $skipaction = true;
-                                                        $errorstext[] = sprintf(_("%s cannot be upgraded: %s Please correct this error first."),  
-                                                                                $modules[$module]['name'],
@@ -408 +410 @@
-                                                } else {
-                                                        $actionstext[] = sprintf(_("%s %s will be upgraded to online version %s"), $modules[$module]['name'], $modules[$module]['dbversion'], $modules_online[$module]['version']);
-                                                        
-                                                }
-                                        }
@@ -415 +416 @@
-                                        if (!EXTERNAL_PACKAGE_MANAGEMENT) {
-                                                if (is_array($errors = module_checkdepends($modules_online[$module]))) {
+                                                        $skipaction = true;
-                                                        $errorstext[] = sprintf(_("%s cannot be installed: %s Please correct this error first."),  
-                                                                                $modules[$module]['name'],
@@ -426 +428 @@
-                                        if (!EXTERNAL_PACKAGE_MANAGEMENT) {
-                                                if (is_array($errors = module_checkdepends($modules[$module]))) {
+                                                        $skipaction = true;
-                                                        $errorstext[] = sprintf((($modules[$module]['status'] == MODULE_STATUS_NEEDUPGRADE) ?  _("%s cannot be upgraded: %s Please correct this error first.") : _("%s cannot be installed: %s Please correct this error first.") ),  
-                                                                                $modules[$module]['name'],
@@ -440 +443 @@
-                                case 'enable':
-                                        if (is_array($errors = module_checkdepends($modules[$module]))) {
+                                                $skipaction = true;
-                                                $errorstext[] = sprintf(_("%s cannot be enabled: %s Please correct this error first."),  
-                                                                        $modules[$module]['name'],
@@ -449 +453 @@
-                                case 'disable':
-                                        if (is_array($errors = module_reversedepends($modules[$module]))) {
+                                                $skipaction = true;
-                                                $errorstext[] = sprintf(_("%s cannot be disabled because the following modules depend on it: %s Please correct this error first."),  
-                                                                        $modules[$module]['name'],
@@ -459 +464 @@
-                                        if (!EXTERNAL_PACKAGE_MANAGEMENT) {
-                                                if (is_array($errors = module_reversedepends($modules[$module]))) {
+                                                        $skipaction = true;
-                                                        $errorstext[] = sprintf(_("%s cannot be uninstalled because the following modules depend on it: %s Please correct this error first."),  
-                                                                                $modules[$module]['name'],
@@ -468 +474 @@
-                                break;
-                        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                if (count($errorstext) > 0) {
-                        echo "<h4>"._("Errors with selection:")."</h4>\n";
@@ -479 +492 @@
-                        }
-                        echo "</ul>";
-
-
-
+
+
+
+
+
+
+
-                        echo "<ul>\n";
-                        foreach ($actionstext as $text) {
@@ -487 +504 @@
-                        }
-                        echo "</ul>";
-                        
-                        //echo "\t<input type=\"submit\" value=\"Confirm\" name=\"process\" />";
-                        echo "\t<input type=\"button\" value=\"Confirm\" name=\"process\" onclick=\"process_module_actions(moduleActions);\" />";
-                } else {
@@ -495 +510 @@
-                }
-                echo "\t<input type=\"button\" value=\""._("Cancel")."\" onclick=\"location.href = 'config.php?display=modules&amp;type=tool&amp;online=".($_REQUEST['online']?1:0)."';\" />";
-                
-                echo "</form>";
-