Changeset 10950 for freepbx/trunk

Timestamp:

01/11/11 17:55:56 (2 years ago)

Author:

p_lindheimer

Message:

closes #4734 Module Admin now uses a repo tag to determine the repo and the repos searched can be specified

Files:

• freepbx/trunk/amp_conf/htdocs/admin/libraries/module.functions.php (modified) (5 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/modulelist.class.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/page.modules.php (modified) (9 diffs)

freepbx/trunk/amp_conf/htdocs/admin/libraries/module.functions.php

@@ -135 +135 @@
-  if (count($xmlarray)) {
-    foreach ($xmlarray['xml']['module'] as $mod) {
-     
+      
-    }
-  }
@@ -148 +148 @@
-  // This will always be the case the first time it is run since the xml is empty.
-  //
-  // TODO: if old_modules is empty, should I populate it from getinfo to at find out what
-  //       is installed or otherwise, just skip it since it is the first time?
-  //
-  $diff_modules = array_diff_assoc($new_modules, $old_modules);
-  $cnt = count($diff_modules);
-  if ($cnt) {
+    $active_repos = module_get_active_repos();
-    $extext = _("The following new modules are available for download. Click delete icon on the right to remove this notice.")."<br />";
-    foreach ($diff_modules as $mod) {
-
-
-
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -204 +209 @@
-    $notifications->delete('freepbx', 'NEWUPDATES');
-  }
+}
+
+function module_get_active_repos() {
+  global $active_repos;
+  if (!isset($active_repos) || !$active_repos) {
+    $repos_serialized = sql("SELECT `data` FROM `module_xml` WHERE `id` = 'repos_serialized'","getOne");
+    if (isset($repos_serialized) && $repos_serialized) {
+      $active_repos = unserialize($repos_serialized);
+    } else {
+      $active_repos = array('standard' => 1);
+      module_set_active_repos($active_repos);
+    }
+    return $active_repos;
+  } else {
+    return $active_repos;
+  }
+}
+
+function module_set_active_repos($repos) {
+  global $active_repos;
+  global $db;
+  $active_repos = $repos;
+  $repos_serialized = $db->escapeSimple(serialize($repos));
+  sql("REPLACE INTO `module_xml` (`id`, `time`, `data`) VALUES ('repos_serialized', '".time()."','".$repos_serialized."')");
-}
-
@@ -257 +286 @@
-          // if status is anything else, it will be updated below when we read the db
-          $modules[$file]['status'] = MODULE_STATUS_NOTINSTALLED;
+          // I think this is the source of reading every module from a file. The assumption is all modules
+          // from the online repo will always have a repo defined but local ones may not so we need to define
+          // them here.
+
+          //TODO: should we have a master list of supported repos and validate against that, or do it dynamically
+          //      we do with other stuff
+          if (!isset($modules[$file]['repo']) || !$modules[$file]['repo']) {
+            $modules[$file]['repo'] = 'local';
+          }
-        }
-      }
@@ -293 +331 @@
-          // no directory for this db entry
-          $modules[ $row['modulename'] ]['status'] = MODULE_STATUS_BROKEN;
+          $modules[ $row['modulename'] ]['repo'] = 'broken';
-        }
-        $modules[ $row['modulename'] ]['dbversion'] = $row['version'];

freepbx/trunk/amp_conf/htdocs/admin/libraries/modulelist.class.php

@@ -32 +32 @@
-  function initialize(&$module_list) {
-    $this->module_array = $module_list;
+    // strip out extraneous fields (help especially when printing out debugs
+    //
+    foreach ($this->module_array as $mod_key => $mod) {
+      if (isset($mod['changelog'])) {
+        unset($this->module_array[$mod_key]['changelog']);
+      }
+      if (isset($mod['description'])) {
+        unset($this->module_array[$mod_key]['description']);
+      }
+      if (isset($mod['attention'])) {
+        unset($this->module_array[$mod_key]['attention']);
+      }
+      if (isset($mod['publisher'])) {
+        unset($this->module_array[$mod_key]['publisher']);
+      }
+      if (isset($mod['license'])) {
+        unset($this->module_array[$mod_key]['license']);
+      }
+      if (isset($mod['candisable'])) {
+        unset($this->module_array[$mod_key]['candisable']);
+      }
+      if (isset($mod['canuninstall'])) {
+        unset($this->module_array[$mod_key]['canuninstall']);
+      }
+      if (isset($mod['location'])) {
+        unset($this->module_array[$mod_key]['location']);
+      }
+      if (isset($mod['md5sum'])) {
+        unset($this->module_array[$mod_key]['md5sum']);
+      }
+    }
-    $module_serialized = $this->_db->escapeSimple(serialize($this->module_array));
-    sql("DELETE FROM `module_xml` WHERE `id` = 'mod_serialized'");

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

@@ -16 +16 @@
-$module_repo = isset($_REQUEST['module_repo'])?htmlentities($_REQUEST['module_repo']):'supported';
-$repo = "http://mirror.freepbx.org/";
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-// fix php errors from undefined variable. Not sure if we can just change the reference below to use
@@ -132 +136 @@
-
-  echo "<h2>" . _("Module Administration") . "</h2>";
+  //TODO: decide if warnings of any sort need to be given, or just list of repos active?
-  if ($module_repo == "extended") {
-    echo "<h4 align='center'>"._("NOTICE")."<br />"._("You have accessed the extended repository which includes un-supported and third party modules")."</h4>";
@@ -453 +458 @@
-    // display links
-    if (!EXTERNAL_PACKAGE_MANAGEMENT) {
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-        
-    if (isset($_FILES['uploadmod']) && !empty($_FILES['uploadmod']['name'])) {
-      // display upload link, only if they did upload something
-      echo " | <a href='config.php?display=modules&type=$type&extdisplay=upload'>"._("Upload module")."</a><br />\n";
-      
-      $res = module_handleupload($_FILES['uploadmod']);
-      if (is_array($res)) {
@@ -512 +517 @@
-    } else {
-      if (!EXTERNAL_PACKAGE_MANAGEMENT) {
-
- echo " | <a class='info check_updates' href='config.php?display=modules&amp;type=$type&amp;online=1&amp;module_repo=$module_repo'>"._("Check for updates online")."<span>"._("Checking for updates will transmit your FreePBX and Asterisk version numbers along with a unique but random identifier. This is used to provide proper update information and track version usage to focus development and maintenance efforts. No private information is transmitted.")."</span></a>\n";
-}
-echo " | <a href='config.php?display=modules&type=$type&extdisplay=upload'>"._("Upload module")."</a><br />\n";
+array('upload')
+} else {
+ echo " | <a href='config.php?display=modules&type=$type&extdisplay=upload'>"._("Upload module")."</a><br />\n";
+}
-    }
-
@@ -544 +549 @@
-
-    $category = false;
-    $has_extended_modules = false;
-    $numdisplayed = 0;
-    $fd = $amp_conf['ASTETCDIR'].'/freepbx_module_admin.conf';
@@ -553 +557 @@
-    }
-    foreach (array_keys($modules) as $name) {
- 
+
-        $modules[$name]['category'] = _("Broken");
-        $modules[$name]['name'] = $name;
-  
+
-      if (isset($module_filter[$name]) && strtolower(trim($module_filter[$name])) == 'hidden') {
-        continue;
-      }
+
+      // Theory: module is not in the defined repos, and since it is not local (meaning we loaded it at some point) then we
+      //         don't show it. Exception, if the status is BROKEN then we should show it because it was here once.
+      //
+      if ((!isset($active_repos[$modules[$name]['repo']]) || !$active_repos[$modules[$name]['repo']]) 
+        && $modules[$name]['status'] != MODULE_STATUS_BROKEN && !isset($modules_local[$name])) {
+        continue;
+      }
+
-      $numdisplayed++;
-      
@@ -603 +616 @@
-      
-      echo "\t\t\t<span class=\"modulestatus\">";
-
-
-
+
-      switch ($modules[$name]['status']) {
-        case MODULE_STATUS_NOTINSTALLED:
@@ -831 +842 @@
-
-    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;
-}
@@ -957 +954 @@
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<?php
-}
-
-?>