Changeset 7542

Timestamp:

03/18/09 16:40:49 (3 years ago)

Author:

mickecarlsson

Message:

Localized bulkextensions, added permit/deny from re #3584. Added localization for table.csv

Files:

• contributed_modules/modules/bulkextensions/functions.inc.php (modified) (4 diffs)
• contributed_modules/modules/bulkextensions/i18n (added)
• contributed_modules/modules/bulkextensions/i18n/bulkextensions.pot (added)
• contributed_modules/modules/bulkextensions/i18n/sv_SE (added)
• contributed_modules/modules/bulkextensions/i18n/sv_SE/LC_MESSAGES (added)
• contributed_modules/modules/bulkextensions/i18n/sv_SE/LC_MESSAGES/bulkextensions.mo (added)
• contributed_modules/modules/bulkextensions/i18n/sv_SE/LC_MESSAGES/bulkextensions.po (added)
• contributed_modules/modules/bulkextensions/i18n/sv_SE/LC_MESSAGES/table.csv (added)
• contributed_modules/modules/bulkextensions/page.bulkextensions.php (modified) (11 diffs)
• contributed_modules/modules/bulkextensions/table.csv (modified) (2 diffs)
• contributed_modules/modules/bulkextensions/template.csv (modified) (1 diff)

contributed_modules/modules/bulkextensions/functions.inc.php

@@ -1 +1 @@
-<?php
+//This file is part of FreePBX.
+//
+//    FreePBX is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    FreePBX is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with FreePBX.  If not, see <http://www.gnu.org/licenses/>.
+//
+//    Copyright 2008 sasargen
+//    Portions Copyright 2009 Mikael Carlsson, mickecamino@gmail.com
+//
+
-/* functions.inc.php - functions for BulkExtensions module. */
-include_once("modules/voicemail/functions.inc.php");    // for using voicemail module functions to retrieve voicemail settings
@@ -36 +55 @@
-  $action   = "edit";
-  $fname    = "bulkext__" .  (string) time() . $_SERVER["SERVER_NAME"] . ".csv";
-
+nfo_deny,devinfo_permit,devi
-  $data     = $csv_header;
-  $exts     = get_all_exts();
@@ -174 +193 @@
-    $csv_line[37] = isset($d_info["accountcode"])?$d_info["accountcode"]:"";
-    $csv_line[38] = isset($d_info["mailbox"])?$d_info["mailbox"]:"";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    for ($i = 0; $i < count($csv_line); $i++) {
-      /* If the string contains a comma, enclose it in double-quotes. */
@@ -284 +305 @@
-
-function generate_table_rows() {
-
-
-
+
+
+
+
+
+
+
+
-  }
-  $k = 0;

contributed_modules/modules/bulkextensions/page.bulkextensions.php

@@ -1 +1 @@
-<?php
+//This file is part of FreePBX.
+//
+//    FreePBX is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    FreePBX is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with FreePBX.  If not, see <http://www.gnu.org/licenses/>.
+//
+//    Copyright 2006 sasargen
+//    Portions Copyright 2009 Mikael Carlsson, mickecamino@gmail.com
+//
-// This is a long running process, so extend time limit for execution.
-// Typical PHP default is 30 seconds, but this only allows 100 to 200
@@ -91 +109 @@
-      "devinfo_accountcode" => array(false, -1),
-      "devinfo_mailbox" => array(false, -1),
+      "devinfo_deny" => array(false, -1),
+      "devinfo_permit" => array(false, -1),
-      "devicetype" => array(false, -1),
-      "deviceid" => array(false, -1),
@@ -324 +344 @@
-        }
-
+          if ($aFields["devinfo_deny"][0]) {
+          $vars["devinfo_deny"] = trim($aInfo[$aFields["devinfo_deny"][1]]);
+        }
+
+          if ($aFields["devinfo_permit"][0]) {
+          $vars["devinfo_permit"] = trim($aInfo[$aFields["devinfo_permit"][1]]);
+        }
+        
-        if ($aFields["devicetype"][0]) {
-          $vars["devicetype"] = trim($aInfo[$aFields["devicetype"][1]]);
@@ -798 +826 @@
-  }
-
+
+echo "<h1>"._("Bulk Extensions")."</h1>";
+echo "<h2>"._("Manage Extensions in bulk using CSV files.")."</h2>";
+echo "<p>";
+
+echo sprintf(_("Start by downloading the %s Template CSV file %s (right-click > save as) or clicking the Export Extensions button."), "<a href=\"modules/bulkextensions/template.csv\">", "</a>"); 
+
+echo "<p>";
+
+echo _("Modify the CSV file to add, edit, or delete Extensions as desired. Then load the CSV file. After the CSV file is processed, the action taken for each row will be displayed.");
+echo "<p>";
+echo "<b>"._("Bulk extension changes can take a long time to complete. It can take 30-60 seconds to add 100 extensions on a small system. However, on a system with 2000 extensions it can take about 5 minutes to add 100 new extensions.")."</b>";
-?>
-<h1>Bulk Extensions</h1>
-
-<h2>Manage Extensions in bulk using CSV files.</h2>
-
-<p>
-Start by downloading the
-<a href="modules/bulkextensions/template.csv">Template CSV file</a>
-(right-click > save as) or clicking the Export Extensions button.
-</p>
-<p>
-Modify the CSV file to add, edit, or delete Extensions as desired. Then load
-the CSV file. After the CSV file is processed, the action taken for each row
-will be displayed.
-</p>
-<p>
-<b>Bulk extension changes can take a long time to complete. It can take 30-60
-seconds to add 100 extensions on a small system. However, on a system with 2000
-extensions it can take about 5 minutes to add 100 new extensions.</b>
-</p>
-
-<form action="<?php $_SERVER["PHP_SELF"] ?>" name="uploadcsv" method="post" enctype="multipart/form-data">
-<input id="csv_type" name="csv_type" type="hidden" value="none" />
-Export Extensions
-CSV File to Load
-Load File
+<?php echo _("Export Extensions")?>
+<?php echo _("CSV File to Load")?>
+<?php echo _("Load File")?>
-<hr />
-
-
-
-
-
+
+
+
+
+
+
+
-<table>
-  <tr>
-    <td>
-      <a href="#" class="info">
-
-
-
-
-
+
+
-      </span>
-      </a>
@@ -849 +868 @@
-    <td>
-      <a href="#" class="info">
-
-
-
-
-
-
+
+
-      </span>
-      </a>
@@ -865 +880 @@
-    <td>
-      <a href="#" class="info">
-Email From:
+<?php echo _("Email From:")?>
-      <span>
-
-
+
-      </span>
-      </a>
@@ -879 +893 @@
-    <td>
-      <a href="#" class="info">
-Email Reply-To:
+<?php echo _("Email Reply-To:")?>
-      <span>
-
-
+
-      </span>
-      </a>
@@ -893 +906 @@
-    <td>
-      <a href="#" class="info">
-Email Subject:
+<?php echo _("Email Subject:")?>
-      <span>
-
-
-
+
-      </span>
-      </a>
@@ -908 +919 @@
-    <td>
-      <a href="#" class="info">
-Email Opening:
+<?php echo _("Email Opening:")?>
-      <span>
-
-
-
-
-
+
+
-      </span>
-      </a>
@@ -925 +933 @@
-    <td>
-      <a href="#" class="info">
-Email Closing:
+<?php echo _("Email Closing:")?>
-      <span>
-
-
+
-      </span>
-      </a>
@@ -939 +946 @@
-</form>
-<hr />
-
-
-
-
-
-
+
+
+
-  print $table_output;
-}

contributed_modules/modules/bulkextensions/table.csv

@@ -8 +8 @@
-"callwaiting","enabled","enabled, disabled","Call Waiting","Set the initial/current Call Waiting state for this user's extension."
-"call_screen","0","0, nomemory, memory","Call Screening","Call Screening requires external callers to say their name, which will be played back to the user and allow the user to accept or reject the call.  Screening with memory only verifies a caller for their caller-id once. Screening without memory always requires a caller to say their name. Either mode will always announce the caller based on the last introduction saved with that callerid. If any user on the system uses the memory option, when that user is called, the caller will be required to re-introduce themselves and all users on the system will have that new introduction associated with the caller's CallerId.Set the initial/current Call Waiting state for this user's extension."
-,
+
-"emergency_cid",,,"Emergency CID","This caller id will always be set when dialing out an Outbound Route flagged as Emergency. The Emergency CID overrides all other caller id settings."
-"tech",,"sip, iax2, zap, custom",,"Device channel type."
@@ -38 +38 @@
-"devinfo_accountcode",,,"accountcode","See conf file for device tech."
-"devinfo_mailbox",,,"mailbox","See conf file for device tech. Default is exten@device, i.e 101@device."
+"devinfo_deny",,,"deny","Network/Mask of IP address range to deny.  Default is 0.0.0.0/0.0.0.0 (or everything)."
+"devinfo_permit",,,"permit","Network/Mask of IP address range to permit.  Default is 0.0.0.0/0.0.0.0 (or everything).  Valid examples would be: 192.168.1.0/255.255.255.0 (all IP addresses from 192.168.1.0-255) or 10.1.0.42/255.255.255.255 (a single address)."
-"devicetype","fixed","fixed, adhoc",,"Extensions require that devicetype be fixed. If devicetype is adhoc, FreePBX must manage it in Device and Users mode, not Extensions mode."
-"deviceid",,,,"Defaults to be the value of extension (see item 1 of this table)."

contributed_modules/modules/bulkextensions/template.csv

@@ -1 @@
-
+nfo_deny,devinfo_permit,devi
-
-
-
-
+,,
+0.0.0.0/0.0.0.0,192.168.0.123,
+,,
-
-
-
-
-
+0.0.0.0/0.0.0.0,0.0.0.0/0.0.0.0,
+,,
+,,
-
-