Changeset 10159

Timestamp:

07/15/10 18:31:36 (3 years ago)

Author:

p_lindheimer

Message:

suggested solution to add option to the Dial patterns wiazrd for trunks and routes to upload from a CSV file re #4445 - if feedback is positive and with proper testing we can back port the end result to 2.8

Files:

• modules/branches/2.9/core/core.css (modified) (1 diff)
• modules/branches/2.9/core/page.routing.php (modified) (7 diffs)
• modules/branches/2.9/core/page.trunks.php (modified) (7 diffs)

modules/branches/2.9/core/core.css

@@ -11 +11 @@
-  max-height: 15em; 
-  max-width: 100%; 
+  width: 500px;
-  overflow: auto; 
-  border: 1px solid #CCCCCC;
-}
-
+
+
+

modules/branches/2.9/core/page.routing.php

@@ -30 +30 @@
-$repotrunkkey = isset($_REQUEST['repotrunkkey'])?$_REQUEST['repotrunkkey']:'';
-
+// Check if they uploaded a CSV file for their route patterns
+//
+if (isset($_FILES['pattern_file']) && $_FILES['pattern_file']['tmp_name'] != '') {
+  $fh = fopen($_FILES['pattern_file']['tmp_name'], 'r');
+  if ($fh !== false) {
+    $csv_file = array();
+    $index = array();
+
+    // Check first row, ingoring empty rows and get indices setup
+    //
+    while (($row = fgetcsv($fh, 5000, ",", "\"")) !== false) {
+      if (count($row) == 1 && $row[0] == '') {
+        continue;
+      } else {
+        $count = count($row) > 4 ? 4 : count($row);
+        for ($i=0;$i<$count;$i++) {
+          switch (strtolower($row[$i])) {
+          case 'prepend':
+          case 'prefix':
+          case 'match pattern':
+          case 'callerid':
+            $index[strtolower($row[$i])] = $i;
+          break;
+          default:
+          break;
+          }
+        }
+        // If no headers then assume standard order
+        if (count($index) == 0) {
+          $index['prepend'] = 0;
+          $index['prefix'] = 1;
+          $index['match pattern'] = 2;
+          $index['callerid'] = 3;
+          if ($count == 4) {
+            $csv_file[] = $row;
+          }
+        }
+        break;
+      }
+    }
+    $row_count = count($index);
+    while (($row = fgetcsv($fh, 5000, ",", "\"")) !== false) {
+      if (count($row) == $row_count) {
+        $csv_file[] = $row;
+      }
+    }
+  }
+}
+
-//
-// Use a hash of the value inserted to get rid of duplicates
@@ -36 +85 @@
-$n_idx = 0;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  $prepend_digit = $_POST["prepend_digit"];
-  $pattern_prefix = $_POST["pattern_prefix"];
@@ -336 +403 @@
-} 
-?>
-
+enctype="multipart/form-data" 
-    <input type="hidden" name="display" value="<?php echo $display?>"/>
-    <input type="hidden" name="extdisplay" value="<?php echo $extdisplay ?>"/>
@@ -521 +588 @@
-          <?php echo _("These options provide a quick way to add outbound dialing rules. Follow the prompts for each.")?><br>
-          <strong><?php echo _("Lookup local prefixes")?></strong> <?php echo _("This looks up your local number on www.localcallingguide.com (NA-only), and sets up so you can dial either 7, 10 or 11 digits (5551234, 6135551234, 16135551234) to access this route.")?><br>
+          <strong><?php echo _("Upload from CSV")?></strong> <?php echo sprintf(_("Upload patterns from a CSV file replacing existing entries. If there are no headers then the file must have 4 columns of patterns in the same order as in the GUI. You can also supply headers: %s, %s, %s and %s in the first row. If there are less then 4 recognized headers then the remaining columns will be blank"),'<strong>prepend</strong>','<strong>prefix</strong>','<strong>match pattern</strong>','<strong>callerid</strong>')?><br>
-          </span></a>:
-      <input id="npanxx" name="npanxx" type="hidden" />
@@ -549 +617 @@
-
-      function insertCode() {
+        // hide the file box if nothing was set
+        if ($('#pattern_file').val() == '') {
+          $('#pattern_file').hide();
+        }
-        code = document.getElementById('inscode').value;
-        insert = '';
@@ -577 +649 @@
-            insert = '';
-          break;
+          case 'csv':
+            $('#pattern_file').show().click();
+            return true;
+          break;
-        }
-
@@ -600 +676 @@
-      <option value="emerg"><?php echo _("Emergency")?></option>
-      <option value="lookup"><?php echo _("Lookup local prefixes")?></option>
+      <option value="csv"><?php echo _("Upload from CSV")?></option>
-        </select>
+        <input type="file" name="pattern_file" id="pattern_file" tabindex="<?php echo ++$tabindex;?>"/>
-      </td>
-    </tr>

modules/branches/2.9/core/page.trunks.php

@@ -42 +42 @@
-$failtrunk_enable = ($failtrunk == "")?'':'CHECKED';
-
+// Check if they uploaded a CSV file for their route patterns
+//
+if (isset($_FILES['pattern_file']) && $_FILES['pattern_file']['tmp_name'] != '') {
+  $fh = fopen($_FILES['pattern_file']['tmp_name'], 'r');
+  if ($fh !== false) {
+    $csv_file = array();
+    $index = array();
+
+    // Check first row, ingoring empty rows and get indices setup
+    //
+    while (($row = fgetcsv($fh, 5000, ",", "\"")) !== false) {
+      if (count($row) == 1 && $row[0] == '') {
+        continue;
+      } else {
+        $count = count($row) > 3 ? 3 : count($row);
+        for ($i=0;$i<$count;$i++) {
+          switch (strtolower($row[$i])) {
+          case 'prepend':
+          case 'prefix':
+          case 'match pattern':
+            $index[strtolower($row[$i])] = $i;
+          break;
+          default:
+          break;
+          }
+        }
+        // If no headers then assume standard order
+        if (count($index) == 0) {
+          $index['prepend'] = 0;
+          $index['prefix'] = 1;
+          $index['match pattern'] = 2;
+          if ($count == 3) {
+            $csv_file[] = $row;
+          }
+        }
+        break;
+      }
+    }
+    $row_count = count($index);
+    while (($row = fgetcsv($fh, 5000, ",", "\"")) !== false) {
+      if (count($row) == $row_count) {
+        $csv_file[] = $row;
+      }
+    }
+  }
+  freepbx_debug($index);
+  freepbx_debug($csv_file);
+}
+
-//
-// Use a hash of the value inserted to get rid of duplicates
@@ -48 +97 @@
-$n_idx = 0;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  $prepend_digit = $_POST["prepend_digit"];
-  $pattern_prefix = $_POST["pattern_prefix"];
@@ -403 +468 @@
-?>
-  
-
+enctype="multipart/form-data" 
-      <input type="hidden" name="display" value="<?php echo $display?>"/>
-      <input type="hidden" name="extdisplay" value="<?php echo $extdisplay ?>"/>
@@ -557 +622 @@
-          <strong><?php echo _("Setup Google for directory assistance")?></strong> <?php echo _("is useful to translate a call to directory assistance (default: 411) to Google's toll free directory (default: 18004664411) or any other number of your choosing")?><br>
-          <strong><?php echo _("Lookup numbers for local trunk")?></strong> <?php echo _("This looks up your local number on www.localcallingguide.com (NA-only), and sets up so you can dial either 7 or 10 digits (regardless of what your PSTN is) on a local trunk (where you have to dial 1+area code for long distance, but only 5551234 (7-digit dialing) or 6135551234 (10-digit dialing) for local calls")?><br>
+          <strong><?php echo _("Upload from CSV")?></strong> <?php echo sprintf(_("Upload patterns from a CSV file replacing existing entries. If there are no headers then the file must have 3 columns of patterns in the same order as in the GUI. You can also supply headers: %s, %s and %s in the first row. If there are less then 3 recognized headers then the remaining columns will be blank"),'<strong>prepend</strong>','<strong>prefix</strong>','<strong>match pattern</strong>')?><br>
-          </span></a>:
-        </td><td valign="top"><select id="autopop"  tabindex="<?php echo ++$tabindex;?>" name="autopop" onChange="changeAutoPop(); ">
@@ -565 +631 @@
-            <option value="lookup7"><?php echo _("Lookup numbers for local trunk (7-digit dialing)")?></option>
-            <option value="lookup10"><?php echo _("Lookup numbers for local trunk (10-digit dialing)")?></option>
+            <option value="csv"><?php echo _("Upload from CSV")?></option>
-          </select>
+          <input type="file" name="pattern_file" id="pattern_file" tabindex="<?php echo ++$tabindex;?>"/>
-        </td>
-      </tr>
@@ -663 +731 @@
-      function changeAutoPop() {
-        var idx = false;
+        // hide the file box if nothing was set
+        if ($('#pattern_file').val() == '') {
+          $('#pattern_file').hide();
+        }
-        switch(document.getElementById('autopop').value) {
-          case "always":
@@ -688 +760 @@
-            populateLookup(10);
-          break;
+          case 'csv':
+            $('#pattern_file').show().click();
+            return true;
+          break;
-        }
-        document.getElementById('autopop').value = '';