Changeset 3934

Timestamp:

04/24/07 16:56:43 (6 years ago)

Author:

p_lindheimer

Message:

Merged revisions 3726-3727,3729-3732,3734-3735,3737-3738,3740-3741,3743,3745,3747,3752-3753,3756,3758-3769,3771,3773-3774,3778-3793,3797,3799-3804,3807,3809-3825,3827-3829,3831-3836,3838-3845,3847,3850,3852-3856,3859-3869,3871,3873-3882,3884-3885,3887-3890,3892-3895,3897-3902,3904,3906,3908,3910-3916,3918,3920,3922-3927,3929-3933 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/freepbx/branches/2.2

........

r3933 | p_lindheimer | 2007-04-24 13:54:49 -0700 (Tue, 24 Apr 2007) | 1 line

add argument to module_admin to override default repository and xml locations, and override amportal.conf settings

........

Files:

• freepbx/trunk (modified) (1 prop)
• freepbx/trunk/amp_conf/bin/module_admin (modified) (4 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (5 diffs)

freepbx/trunk/amp_conf/bin/module_admin

@@ -307 +307 @@
-
-function doDownload($modulename, $force) {
-
+
+
+
+
+
-    out("The following error(s) occured:");
-    out(' - '.implode("\n - ",$errors));
@@ -423 +427 @@
-
-// **** Parse out command-line options
-
-
+x:r:
+,"modulexml-path=","modulerepository-path="
-
-$args = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), $shortopts, $longopts);
@@ -438 +442 @@
-$force = false;
-
+// override xml and svn repository paths from hardcoded and amportal.conf defaults
+// currently only implemented for downloading (to facilitate automatic installations)
+//
+$modulexml_path = false;
+$modulerepository_path = false;
+
-foreach ($args[0] as $arg) {
-  switch ($arg[0]) {
@@ -450 +460 @@
-      $ampconfpath = $arg[1];
-    break;
+    case "--modulexml-path": case "x":
+      $modulexml_path = rtrim($arg[1],DIRECTORY_SEPARATOR)."/";
+    break;
+    case "--modulerepository-path": case "r":
+      $modulerepository_path = rtrim($arg[1],DIRECTORY_SEPARATOR)."/";
+    break;
-  }
-}

freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

@@ -1133 +1133 @@
- * a php zero-value (false, null, 0, etc) then no error happened.
- */
-
+, $override_xml = false
-  global $amp_conf;
-  
@@ -1155 +1155 @@
-    preg_match('/(\d+\.\d+)/',$version,$matches);
-    //echo "the result is ".$matches[1];
-
+
+
+
-      $fn = $amp_conf["AMPMODULEXML"]."modules-".$matches[1].".xml";
-      // echo "(From amportal.conf)"; //debug
@@ -1559 +1561 @@
- * @return  mixed   True if succesful, array of error messages if not succesful
- */
-
+
+
+
-  global $amp_conf;
-  
@@ -1571 +1575 @@
-  }
-      
-
+, $override_xml
-  if ($res == null) {
-    return array(_("Module not found in repository"));
@@ -1615 +1619 @@
-  }
-  
-
+
+
+
-    $url = $amp_conf['AMPMODULESVN'].$res['location'];
-    // echo "(From amportal.conf)"; // debug
-  } else {
-    $url = "http://mirror.freepbx.org/modules/".$res['location'];
-    // echo "(From default)"; // debug
-  }
-