Changeset 12798

Timestamp:

10/13/11 12:57:54 (2 years ago)

Author:

p_lindheimer

Message:

add back check with xml2Array.class.php, add optional file_scan_exclude_list to scandirr, replace sed with preg_replace to fix OSX issues

Files:

• modules/branches/2.10/package.php (modified) (8 diffs)

modules/branches/2.10/package.php

@@ -99 +99 @@
-  $ver    = 
-  $x      = '';
+  $file_scan_exclude_list = array();
-  
-  echo 'Packaging ' . $mod . '...' . PHP_EOL;
@@ -114 +115 @@
-    continue;
-  }
+  // Run xml script through the exact method that FreePBX currently uses. There have
+  // been cases where XML is valid but this method still fails so it won't be caught
+  // with the proper XML checer, better here then breaking the online repository
+  //
+  include_once('xml2Array.class.php');
+  $parser = new xml2ModuleArray($xml);
+  $xmlarray = $parser->parseAdvanced($xml);
-  
-  //include module specifc hook, if present
@@ -150 +158 @@
-  //check php files for syntax errors
-  $bail = false;
-
+, $file_scan_exclude_list
-  foreach ($files as $f) {
-    if (pathinfo($f, PATHINFO_EXTENSION) == 'php') {
@@ -188 +196 @@
-  
-  //update md5 sum
-
-
-
+
+
+
+
+
+
+
-  
-  //update location
-
-
+
+
+
+
+
+
-  
-  //move tarbal to relase dir
@@ -229 +245 @@
- *
- * @pram string - directory to scan
-
+
+
- * @returns array
- *
- * @author Moshe Brevda mbrevda => gmail ~ com
- */
-
+, $exclude_list=array()
-  $list = array();
-  if ($absolute) {
@@ -242 +259 @@
-  
-  //get directory contents
+  if (!empty($exclude_list) && in_array(basename($dir), $exclude_list)) {
+    return $list;
+  }
-  foreach (scandir($dir) as $d) {
-    
-    //ignore any of the files in the array
-
+, '.svn')) || (!empty($exclude_list) && in_array($d, $exclude_list
-      continue;
-    }
@@ -252 +272 @@
-    if (is_dir($dir . '/' . $d)) {
-      if ($absolute) {
-
+, $exclude_list
-      } else {
-
+, $exclude_list
-      }
-      
@@ -265 +285 @@
-        $list[] = $d;
-      }
-      
-    }
-  }