Changeset 9961

Timestamp:

06/26/10 11:17:47 (2 years ago)

Author:

p_lindheimer

Message:

closes #4376 setting repository select box to extended if such modules are present, also changes 'type' form tool to what ever is currently selected

Files:

• freepbx/branches/2.8/amp_conf/htdocs/admin/page.modules.php (modified) (13 diffs)

freepbx/branches/2.8/amp_conf/htdocs/admin/page.modules.php

@@ -116 +116 @@
-  function process_module_actions(actions) {
-    freepbx_modal_show('moduleBox');
-   urlStr = "config.php?type=tool
+    urlStr = "config.php?type=<?php echo $type ?>
-    for (var i in actions) {
-      urlStr += "&amp;moduleaction["+i+"]="+actions[i];
@@ -126 +126 @@
-    freepbx_modal_hide('moduleBox');
-    if (goback) {
-     location.href = 'config.php?display=modules&amp;type=tool
+      location.href = 'config.php?display=modules&amp;type=<?php echo $type ?>
-    }
-  }
@@ -280 +280 @@
-      echo "\t<a href=\"#\" onclick=\"parent.close_module_actions(true);\" />"._("Return")."</a>";
-    } else {
-tool
+$type
-    echo "</div>";
-    }
@@ -447 +447 @@
-      echo "<p>"._("Please select at least one action to perform by clicking on the module, and selecting an action on the \"Action\" tab.")."</p>";
-    }
-tool
+$type
-    echo "</form>";
-    
@@ -456 +456 @@
-      displayRepoSelect();
-    }
-tool
+$type
-    if (!EXTERNAL_PACKAGE_MANAGEMENT) {
-tool
+$type
-    }
-        
-    if (isset($_FILES['uploadmod']) && !empty($_FILES['uploadmod']['name'])) {
-      // display upload link, only if they did upload something
-tool
+$type
-      
-      $res = module_handleupload($_FILES['uploadmod']);
@@ -472 +472 @@
-             '<ul><li>'.implode('</li><li>',$res).'</li></ul>');
-        echo sprintf(_('You should fix the problem or select another file and %s.'), 
-tool
+$type
-        echo "</p></div>\n";
-      } else {
-        
-        echo "<p>".sprintf(_("Module uploaded successfully. You need to enable the module using %s to make it available."),
-tool
+$type
-           ."</p>\n";
-      }
@@ -508 +508 @@
-      
-      if (!EXTERNAL_PACKAGE_MANAGEMENT) {
-tool
+$type
-        echo "<input type=\"checkbox\" id=\"show_upgradable_only\" onclick=\"showhide_upgrades();\" /><label for=\"show_upgradable_only\">"._("Show only upgradeable")."</label>";
-      }
@@ -514 +514 @@
-      if (!EXTERNAL_PACKAGE_MANAGEMENT) {
-        displayRepoSelect();
-tool
-
-tool
+$type
+
+$type
-    }
-
@@ -545 +545 @@
-
-    $category = false;
+    $has_extended_modules = false;
-    $numdisplayed = 0;
-    $fd = $amp_conf['ASTETCDIR'].'/freepbx_module_admin.conf';
@@ -603 +604 @@
-      
-      echo "\t\t\t<span class=\"modulestatus\">";
+      if (!$has_extended_modules && $category == 'Third Party Addon') {
+        $has_extended_modules = true;
+      }
-      switch ($modules[$name]['status']) {
-        case MODULE_STATUS_NOTINSTALLED:
@@ -828 +832 @@
-
-    echo "</form>";
+    if ($has_extended_modules) {
+?>
+  <script language="javascript">
+  <!-- Begin
+
+  $(document).ready(function(){
+    $("#module_repo").val('extended');
+    $('.check_updates').attr('href','config.php?display=modules&type=<?php echo $type ?>&online=1&module_repo=extended');
+  });
+
+  // End -->
+  </script>
+<?php
+    }
-  break;
-}
@@ -938 +956 @@
-
-function displayRepoSelect() {
+  global $type;
-?>
-  <select name="module_repo" id="module_repo">
@@ -948 +967 @@
-  $(document).ready(function(){
-    $("#module_repo").change(function(){
-   $('.check_updates').attr('href','config.php?display=modules&type=tool
+    $('.check_updates').attr('href','config.php?display=modules&type=<?php echo $type ?>
-    if (this.value == "extended") {
-      alert("<?php echo _("You have selected to access the Extended Repository. This repository contains some Third Party and un-supported modules. Although these modules are believed to work with FreePBX, they are either developed by third parties in conjunction with optional PBX components, or they are not directly sponsored by the core FreePBX team and may not receive the same level of responsiveness to issues as the main code base does.") ?>");