Changeset 3389

Timestamp:

12/20/06 08:38:51 (5 years ago)

Author:

gregmac

Message:

Added manual module upload option for module admin

Files:

• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/page.modules.php (modified) (2 diffs)

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

@@ -1651 +1651 @@
-}
-
+
+function module_handleupload($uploaded_file) {
+  global $amp_conf;
+  $errors = array();
+  
+  if (!isset($uploaded_file['tmp_name']) || !file_exists($uploaded_file['tmp_name'])) {
+    $errors[] = _("Error finding uploaded file - check your PHP and/or web server configuration");
+    return $errors;
+  }
+  
+  if (!preg_match('/\.(tar\.gz|tgz)$/', $uploaded_file['name'])) {
+    $errors[] = _("File must be in tar+gzip (.tgz or .tar.gz) format");
+    return $errors;
+  }
+  
+  if (!preg_match('/^([A-Za-z][A-Za-z0-9_]+)\-([0-9a-z]+(\.[0-9a-z]+)*)\.(tar\.gz|tgz)$/', $uploaded_file['name'], $matches)) {
+    $errors[] = _("Filename not in correct format: must be modulename-version.tar.gz (eg. custommodule-0.1.tar.gz)");
+    return $errors;
+  } else {
+    $modulename = $matches[1];
+    $moduleversion = $matches[2];
+  }
+  
+  $temppath = $amp_conf['AMPWEBROOT'].'/admin/modules/_cache/'.uniqid("upload");
+  if (! @mkdir($temppath) ) {
+    return array(sprintf(_("Error creating temporary directory: %s"), $temppath));
+  }
+  $filename = $temppath.'/'.$uploaded_file['name'];
+  
+  move_uploaded_file($uploaded_file['tmp_name'], $filename);
+  
+  exec("tar ztf ".escapeshellarg($filename), $output, $exitcode);
+  if ($exitcode != 0) {
+    $errors[] = _("Error untaring uploaded file. Must be a tar+gzip file");
+    return $errors;
+  }
+  
+  foreach ($output as $line) {
+    // make sure all lines start with "modulename/"
+    if (!preg_match('/^'.$modulename.'\//', $line)) {
+      $errors[] = 'File extracting to invalid location: '.$line;
+    }
+  }
+  if (count($errors)) {
+    return $errors;
+  }
+  
+  exec("tar zxf ".escapeshellarg($filename)." --directory=".escapeshellarg($amp_conf['AMPWEBROOT'].'/admin/modules/'), $output, $exitcode);
+  if ($exitcode != 0) {
+    $errors[] = _('Error untaring to modules directory.');
+  }
+  
+  exec("rm -rf ".$temppath, $output, $exitcode);
+  if ($exitcode != 0) {
+    $errors[] = sprintf(_('Error removing temporary directory: %s'), $temppath);
+  }
+  
+  if (count($errors)) {
+    return $errors;
+  }
+  
+  // finally, module installation is successful
+  return true;
+}
+
+
-/** Installs or upgrades a module from it's directory
- * Checks dependencies, and enables

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

@@ -427 +427 @@
-    
-  break;
+  case 'upload':
+    // display links
+    echo "<a href='config.php?display=modules&amp;type=tool'>"._("Manage local modules")."</a>\n";
+    if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+      echo " | <a href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."</a>\n";
+    }
+        
+    if (isset($_FILES['uploadmod']) && !empty($_FILES['uploadmod']['name'])) {
+      // display upload link, only if they did upload something
+      echo " | <a href='config.php?display=modules&amp;type=tool&amp;extdisplay=upload'>"._("Upload module")."</a><br />\n";
+      
+      $res = module_handleupload($_FILES['uploadmod']);
+      if (is_array($res)) {
+        
+        echo '<div class="error"><p>';
+        echo sprintf(_('The following error(s) occured processing the uploaded file: %s'), 
+             '<ul><li>'.implode('</li><li>',$res).'</li></ul>');
+        echo sprintf(_('You should fix the problem or select another file and %s.'), 
+             "<a href='config.php?display=modules&amp;type=tool'>"._("try again")."</a>");
+        echo "</p></div>\n";
+      } else {
+        
+        echo "<p>".sprintf(_("Module uploaded successfully. You need to enable the module using %s to make it available."),
+             "<a href='config.php?display=modules&amp;type=tool'>"._("local module administration")."</a>")
+           ."</p>\n";
+      }
+      
+    } else {
+      echo "<p>"._('You can upload a tar gzip file containing a freePBX module from your local system. If a module with the same name already exists, it will be overwritten.')."</p>\n";
+    
+      echo "<form name=\"modulesGUI-upload\" action=\"config.php\" method=\"post\" enctype=\"multipart/form-data\">";
+      echo "<input type=\"hidden\" name=\"display\" value=\"".$display."\" />";
+      echo "<input type=\"hidden\" name=\"type\" value=\"".$type."\" />";
+      echo "<input type=\"hidden\" name=\"extdisplay\" value=\"upload\" />";
+      
+      echo "<input type=\"file\" name=\"uploadmod\" /> ";
+      echo "&nbsp;&nbsp; <input type=\"submit\" value=\"Upload\" />";
+      echo "</form>";
+    }
+    
+  break;
-  case 'online':
-  default:
@@ -453 +494 @@
-        echo "<a href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."</a>\n";
-      }
+      echo " | <a href='config.php?display=modules&amp;type=tool&amp;extdisplay=upload'>"._("Upload module")."</a><br />\n";
-    }
-