Changeset 10337

Timestamp:

10/04/10 13:59:13 (3 years ago)

Author:

mickecarlsson

Message:

Close #4567 added fax settings to bulkextensions

Files:

• contributed_modules/modules/bulkextensions/CHANGES (modified) (1 diff)
• contributed_modules/modules/bulkextensions/functions.inc.php (modified) (5 diffs)
• contributed_modules/modules/bulkextensions/i18n/sv_SE/LC_MESSAGES/table.csv (modified) (1 diff)
• contributed_modules/modules/bulkextensions/module.xml (modified) (2 diffs)
• contributed_modules/modules/bulkextensions/page.bulkextensions.php (modified) (6 diffs)
• contributed_modules/modules/bulkextensions/table.csv (modified) (1 diff)
• contributed_modules/modules/bulkextensions/template.csv (modified) (1 diff)

contributed_modules/modules/bulkextensions/CHANGES

@@ -7 +7 @@
-   Note: Translate only the text, not labels. All labels in position 1 must remain as they are.
-Fixed bug when setting one entry in a field in the csv file all fields that where empty got an empty line in the config files
-
-
-
+

contributed_modules/modules/bulkextensions/functions.inc.php

@@ -32 +32 @@
-    include_once("modules/findmefollow/functions.inc.php"); // for using findmefollow functions to retreive follow me settings
-    };
+if (file_exists("modules/fax/functions.inc.php")) {
+    include_once("modules/fax/functions.inc.php");             // for using fax functions to retreive fax settings
+    };
-
-/* Verify existence of voicemail, dictate, languages and findmefollow functions. */
@@ -53 +56 @@
-} else {
-  $findme_exists  = FALSE;
+}
+if (function_exists("fax_get_user") && function_exists("fax_save_user") && function_exists("fax_delete_user")) {
+       $fax_exists     = TRUE;
+} else {
+       $fax_exists     = FALSE;
-}
-
@@ -61 +69 @@
-  global $lang_exists;
-  global $findme_exists;
+  global $fax_exists;
-  $action   = "edit";
-  $fname    = "bulkext__" .  (string) time() . $_SERVER["SERVER_NAME"] . ".csv";
-
+,faxenabled,faxemail
-  $data     = $csv_header;
-  $exts     = get_all_exts();
@@ -161 +170 @@
-      $ddial    = isset($followme_settings["ddial"])?$followme_settings["ddial"]:"";
-    }
+
+    /* Obtain fax settings */
+    if ($fax_exists) {
+        $fax_settings = fax_get_user($e);
+        }
+    if (isset($fax_settings)) {
+    $faxenabled     = isset($fax_settings["faxenabled"])?$fax_settings["faxenabled"]:"";
+    $faxemail       = isset($fax_settings["faxemail"])?$fax_settings["faxemail"]:"";
+    }
+
-    $csv_line[0]  = $action;
-    $csv_line[1]  = isset($u_info["extension"])?$u_info["extension"]:"";
@@ -250 +269 @@
-    $csv_line[83] = isset($toolate_id)?$toolate_id:"";
-    $csv_line[84] = isset($postdest)?$postdest:"";
+    $csv_line[85]   = isset($faxenabled)?$faxenabled:"";
+    $csv_line[86]   = isset($faxemail)?$faxemail:"";
+
-    for ($i = 0; $i < count($csv_line); $i++) {
-      /* If the string contains a comma, enclose it in double-quotes. */

contributed_modules/modules/bulkextensions/i18n/sv_SE/LC_MESSAGES/table.csv

@@ -86 +86 @@
-"toolate_id","blankt eller 0 (Standard)","någon inspelnings-id aktivt på systemet","För-sent meddelande: (Sidan Följ-mig)","Meddelande att spela upp för den UPPRINGDE, om samtalet redan har besvarats av annan part, innan denna uppringda har tryckt 1.<br><br>För att lÀgga till inspelningar vÀljer du "Systeminspelningar"i menyn till vÀnster"
-"postdest",,"Text i formatet <b>context,exten,priority</b> som Àr en aktiv destination i nummerplanen på systemet","Destination vid inget svar: (Sidan Följ-mig)",
+"faxenabled",,"true eller tomt","Aktiverad","Aktiveras fax om instÀllningen sÀtts till <b>true</b>. Om detta fÀlt Àr tomt readeras faxinstÀllningen"
+"faxemail",,"Giltig e-postadress","E-post för fax","E-postadress dit mottagna fax skickas"

contributed_modules/modules/bulkextensions/module.xml

@@ -3 +3 @@
-  <name>Bulk Extensions</name>
-  <description>Bulk Extensions uses CSV files to import and export extensions.</description>
-5.0.7
+7.0.0
-  <type>tool</type>
-  <category>Third Party Addon</category>
@@ -10 +10 @@
-  </menuitems>
-  <depends>
-5
+7
-  </depends>
-5.0.7
+7.0.0
-  <info></info>
-  <changelog>
+    *2.7.0.0* #4567 Add fax setting
-    *2.6.0.7* #4495
-    *2.5.0.6* #4150

contributed_modules/modules/bulkextensions/page.bulkextensions.php

@@ -155 +155 @@
-      "remotealert_id" => array(false, -1),
-      "toolate_id" => array(false, -1),
-
+
+
+
-      );
-
@@ -621 +623 @@
-          $vars["postdest"] = trim($aInfo[$aFields["postdest"][1]]);
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-         
-        /* Needed fields for creating a Follow Me are account (aka grpnum), strategy, grptime, */
@@ -643 +658 @@
-        }
-
+
+
-        if (!(isset($amp_conf["AMPEXTENSIONS"]) && ($amp_conf["AMPEXTENSIONS"] == "deviceanduser"))) {
-          $vars["devicetype"]   = "fixed";
@@ -695 +712 @@
-            findmefollow_add($vars["account"], $vars["strategy"], $vars["grptime"], $vars["grplist"], $vars["postdest"], $vars["grppre"], $vars["annmsg_id"], $vars["dring"], $vars["needsconf"], $vars["remotealert_id"], $vars["toolate_id"], $vars["ringing"], $vars["pre_ring"], $vars["ddial"]);
-          }
+          if ($fax_exists) {
+            fax_save_user($vars["extension"], $vars["faxenabled"], $vars["faxemail"]);
+          }
+
-          // begin status output for this row
-          $output .= "Row $k: Added: " . $vars["extension"];
@@ -836 +857 @@
-          $change = true;
-        }
+                                if ($fax_exists) {
+                                // If there is no entry in faxenabled, then delete the user in the fax table
+                                    if (!isset($aInfo[$aFields["faxenabled"][1]]) || ($aInfo[$aFields["faxenabled"][1]] == "")){
+                                        fax_delete_user($vars["extension"]);
+                                        } else {
+                                            fax_save_user($vars["extension"], $vars["faxenabled"], $vars["faxemail"]);
+                                            }
+                                    }
+
-        $output .= "Row $k: Edited: " . $vars["extension"] . "<BR>";
-        break;
@@ -874 +904 @@
-          voicemail_mailbox_del($vars["extension"]);
-        }
+                                // Fax settings
+                                if ($fax_exists) {
+                                        fax_delete_user($vars["extension"]);
+                                }
-        $output .= "Row $k: Deleted: " . $vars["extension"] . "<BR>";
-        break;

contributed_modules/modules/bulkextensions/table.csv

@@ -76 +76 @@
-"grptime","20","0-60","Ring Time (max 60 sec) (Follow Me page)","Time in seconds that the phones will ring. For all hunt style ring strategies, this is the time for each iteration of phone(s) that are rung"
-"grplist","User's own extension",List of extensions (hyphen separated),"Follow-Me List: (Follow Me page)","extension-extension-extension-... (extension is numeric; multiple extensions separated by '-')<br><br>You can include an extension on a remote system, or an external number by suffixing a number with a pound (#).  ex:  2448089# would dial 2448089 on the appropriate trunk (see Outbound Routing)."
-"System Recordings"
+'System Recordings'
-"ringing","Ring","Ring, default, none, or any active Music On Hold class on the system","Play Music On Hold? (Follow Me page)","If you select a Music on Hold class to play, instead of 'Ring', they will hear that instead of Ringing while they are waiting for someone to pick up."
-"grppre",,,"CID Name Prefix: (Follow Me page)","You can optionally prefix the Caller ID name when ringing extensions in this group. ie: If you prefix with 'Sales:', a call from John Doe would display as 'Sales:John Doe' on the extensions that ring."
-"dring",,"Valid alert info text recognized by SIP phone","Alert Info: (Follow Me page)","You can optionally include an Alert Info which can create distinctive rings on SIP phones."
-"needsconf",,"CHECKED or (blank)","Confirm Calls: (Follow Me page)","Enable this if you're calling external numbers that need confirmation - eg, a mobile phone may go to voicemail which will pick up the call. Enabling this requires the remote side push 1 on their phone before the call is put through. This feature only works with the ringall/ringall-prim  ring strategy"
-"System Recordings"
-"System Recordings"
+'System Recordings'
+'System Recordings'
-"postdest",,"Text in the format <b>context,exten,priority</b> that is an active dialplan destination on the system","Destination if no answer: (Follow Me page)",
+"faxenabled",,"true or blank","Enabled","Enables fax if setting is set to <b>true</b>. If left blank fax settings are removed"
+"faxemail",,"Valid email address","Fax Email","Email address where fax should be emailed to"

contributed_modules/modules/bulkextensions/template.csv

@@ -1 +1 @@
-action,extension,name,cid_masquerade,sipname,outboundcid,ringtimer,callwaiting,call_screen,pinless,emergency_cid,tech,hardware,devinfo_channel,devinfo_secret,devinfo_notransfer,devinfo_dtmfmode,devinfo_canreinvite,devinfo_context,devinfo_immediate,devinfo_signalling,devinfo_echocancel,devinfo_echocancelwhenbrdiged,devinfo_echotraining,devinfo_busydetect,devinfo_busycount,devinfo_callprogress,devinfo_host,devinfo_type,devinfo_nat,devinfo_port,devinfo_qualify,devinfo_callgroup,devinfo_pickupgroup,devinfo_disallow,devinfo_allow,devinfo_dial,devinfo_accountcode,devinfo_mailbox,devinfo_deny,devinfo_permit,devicetype,deviceid,deviceuser,description,dictenabled,dictformat,dictemail,langcode,record_in,record_out,vm,vmpwd,email,pager,attach,saycid,envelope,delete,options,vmcontext,vmx_state,vmx_unavail_enabled,vmx_busy_enabled,vmx_play_instructions,vmx_option_0_sytem_default,vmx_option_0_number,vmx_option_1_system_default,vmx_option_1_number,vmx_option_2_number,account,ddial,pre_ring,strategy,grptime,grplist,annmsg_id,ringing,grppre,dring,needsconf,remotealert_id,toolate_id,postdest
-
-
-
-
+,,
+,,
+,,
-
-
-
-
-
+,,
+,,
+,,
-
-