Changeset 3629

Timestamp:

01/24/07 13:09:53 (2 years ago)

Author:

p_lindheimer

Message:

added followme, VmX Locator, CFB, CFU, help on feature codes pulled from database so it is accurate, and I think there is a tweak to help find monitor files for an extension more often

Files:

• freepbx/trunk/amp_conf/htdocs/recordings/includes/main.conf.php (modified) (4 diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/modules/callmonitor.module (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/recordings/modules/help.module (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/recordings/modules/settings.module (modified) (15 diffs)

freepbx/trunk/amp_conf/htdocs/recordings/includes/main.conf.php

@@ -224 +224 @@
-#
-$ARI_HELP_FEATURE_CODES = array();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-###############################
@@ -260 +265 @@
-$ASTERISK_PROTOCOLS['zap']['config_files'] = "/etc/asterisk/zapata.conf;/etc/asterisk/zapata_additional.conf";
-
+# Settings for Follow-Me Select Boxes in seconds
+#
+
+$SETTINGS_PRERING_LOW = 4;
+$SETTINGS_PRERING_HIGH = 30;
+$SETTINGS_LISTRING_LOW = 6;
+$SETTINGS_LISTRING_HIGH = 60;
+
+$SETTINGS_FOLLOW_ME_LIST_MAX = 5;
+$SETTINGS_ALLOW_VMX_SETTINGS = true;
-#
-# For setting 
@@ -265 +280 @@
-#           1 - show controls
-#
+$SETTINGS_ALLOW_CALLFORWARD_SETTINGS = 1;
+$SETTINGS_ALLOW_VOICEMAIL_SETTINGS = 1;
-$SETTINGS_ALLOW_VOICEMAIL_PASSWORD_SET = 1;
-
@@ -304 +321 @@
-#           1 - show controls
-#
-1
+0
-
-

freepbx/trunk/amp_conf/htdocs/recordings/modules/callmonitor.module

@@ -587 +587 @@
-      // allow entries to be viewed with users extension
-      $searchText .= "(src = '" . $_SESSION['ari_user']['extension'] . "'
-
+
+
+
-
-      // allow entries to be viewed with users outbound CID

freepbx/trunk/amp_conf/htdocs/recordings/modules/help.module

@@ -83 +83 @@
-
-    // handset feature code body
-foreach($ARI_HELP_FEATURE_CODES as $key => $feature_code
+if (isset($_SESSION['dbh_asterisk'])
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

freepbx/trunk/amp_conf/htdocs/recordings/modules/settings.module

@@ -78 +78 @@
-    global $ARI_ADMIN_USERNAME;
-    global $ASTERISK_VOICEMAIL_CONF;
+    global $SETTINGS_ALLOW_CALLFORWARD_SETTINGS;
+    global $SETTINGS_ALLOW_VOICEMAIL_SETTINGS;
-    global $SETTINGS_ALLOW_VOICEMAIL_PASSWORD_SET;
-    global $SETTINGS_VOICEMAIL_PASSWORD_LENGTH;
-    global $SETTINGS_VOICEMAIL_PASSWORD_EXACT;
-    global $SETTINGS_ALLOW_CALL_RECORDING_SET;
+    global $SETTINGS_ALLOW_VMX_SETTINGS;
-
-    // args
@@ -91 +94 @@
-    $call_forward_enable  = getArgument($args,'call_forward_enable');
-    $call_forward_number  = getArgument($args,'call_forward_number');
+
+    $call_forward_busy_enable  = getArgument($args,'call_forward_busy_enable');
+    $call_forward_busy_number  = getArgument($args,'call_forward_busy_number');
+
+    $call_forward_unavailable_enable  = getArgument($args,'call_forward_unavailable_enable');
+    $call_forward_unavailable_number  = getArgument($args,'call_forward_unavailable_number');
+
+    $follow_me_prering_time  = getArgument($args,'follow_me_prering_time');
+    $follow_me_listring_time  = getArgument($args,'follow_me_listring_time');
+    $follow_me_list  = getArgument($args,'follow_me_list');
+    $follow_me_confirm  = getArgument($args,'follow_me_confirm');
+    $follow_me_disabled = getArgument($args,'follow_me_disabled');
+
+                $vmx_option_0_number                                    = getArgument($args, 'vmx_option_0_number');
+                $vmx_option_0_system_default    = getArgument($args, 'vmx_option_0_system_default');
+                $vmx_option_1_number                                    = getArgument($args, 'vmx_option_1_number');
+                $vmx_option_2_number                                    = getArgument($args, 'vmx_option_2_number');
+                $vmx_unavail_enabled                                    = getArgument($args, 'vmx_unavail_enabled');
+                $vmx_busy_enabled                                                       = getArgument($args, 'vmx_busy_enabled');
+                $vmx_play_instructions                          = getArgument($args, 'vmx_play_instructions');
+    $vmx_disabled                                                               = getArgument($args,'vmx_disabled');
-
-    $voicemail_password = getArgument($args,'voicemail_password');
@@ -118 +142 @@
-
-        // update call forward number
-
-
+
+
+
-          $stripped_call_forward_number = preg_replace('/-|\(|\)|\s/','',$call_forward_number);
-          if ($call_forward_enable && !is_numeric($stripped_call_forward_number)) {
@@ -137 +162 @@
-            }
-          }
+
+          // call forward busy
+          $stripped_call_forward_busy_number = preg_replace('/-|\(|\)|\s/','',$call_forward_busy_number);
+          if ($call_forward_busy_enable && !is_numeric($stripped_call_forward_busy_number)) {
+            $_SESSION['ari_error'] = 
+              _("Call forward number not changed") . "<br>" .
+              sprintf(_("Number %s must contain dial numbers (characters like '(', '-', and ')' are ok)"),$call_forward_busy_number);
+          }
+          else {
+
+            // set database
+            $this->setCallForward($exten,$call_forward_busy_enable,$stripped_call_forward_busy_number, "CFB");
+
+            // store cookie
+            $stripped = preg_replace('/-|\(|\)|\s/','',$_COOKIE['ari_call_forward_busy_number']);
+            if ($call_forward_busy_number && $stripped!=$stripped_call_forward_busy_number) {
+              setcookie("ari_call_forward_busy_number", $call_forward_busy_number, time()+365*24*60*60);
+            }
+          }
+
+          // call forward unavailable
+          $stripped_call_forward_unavailable_number = preg_replace('/-|\(|\)|\s/','',$call_forward_unavailable_number);
+          if ($call_forward_unavailable_enable && !is_numeric($stripped_call_forward_unavailable_number)) {
+            $_SESSION['ari_error'] = 
+              _("Call forward number not changed") . "<br>" .
+              sprintf(_("Number %s must contain dial numbers (characters like '(', '-', and ')' are ok)"),$call_forward_unavailable_number);
+          }
+          else {
+
+            // set database
+            $this->setCallForward($exten,$call_forward_unavailable_enable,$stripped_call_forward_unavailable_number, "CFU");
+
+            // store cookie
+            $stripped = preg_replace('/-|\(|\)|\s/','',$_COOKIE['ari_call_forward_unavailable_number']);
+            if ($call_forward_unavailable_number && $stripped!=$stripped_call_forward_unavailable_number) {
+              setcookie("ari_call_forward_unavailable_number", $call_forward_unavailable_number, time()+365*24*60*60);
+            }
+          }
+
-        }
-
+        // Make sure Follow-Me setup has not been deleted for this user since the last refresh
+        $follow_me_disabled_delayed = $_COOKIE['ari_follow_me_disabled'];
+
+        if (! $_COOKIE['ari_follow_me_disabled']) {
+
+          $follow_me_disabled = ($this->getFollowMeListRingTime($exten) > 0)?0:1;
+
+          if ($follow_me_disabled) {
+
+            setcookie("ari_follow_me_disabled", $follow_me_disabled, time()+365*24*60*60);
+            $follow_me_disabled_delayed = $follow_me_disabled;
+            $_SESSION['ari_error'] = 
+              _("Your Follow-Me has been disabled, REFRESH your browser to remove this message") . "<br>" .
+              sprintf(_("Check with your Telephone System Administrator if you think there is a problem"));
+          }
+                                }
+
+        $vmx_disabled_delayed = $_COOKIE['ari_vmx_disabled'];
+        if (! $_COOKIE['ari_vmx_disabled']) {
+
+                                        $vmx_disabled = $this->getVmxState($exten,'unavail');
+                                        if ($vmx_disabled === false) {
+                                                $vmx_disabled = true;
+                        $SETTINGS_ALLOW_VMX_SETTINGS=false;
+                                        } else {
+                                                $vmx_disabled = false;
+                                        }
+          if ($vmx_disabled) {
+
+            setcookie("ari_vmx_disabled", $vmx_disabled, time()+365*24*60*60);
+            $vmx_disabled_delayed = $vmx_disabled;
+            $_SESSION['ari_error'] = 
+              _("Your Premium VmX Locator service has been disabled, REFRESH your browser to remove this message") . "<br>" .
+              sprintf(_("Check with your Telephone System Administrator if you think there is a problem"));
+          }
+                                }
+
+                                if (! $vmx_disabled_delayed) {
+          if (!$STANDALONE['use']) {
+  
+            // set database
+            $this->setVmxState($exten,'unavail',$vmx_unavail_enabled);
+            $this->setVmxState($exten,'busy',$vmx_busy_enabled);
+            $this->setVmxPlayInstructions($exten,'unavail',$vmx_play_instructions);
+            $this->setVmxPlayInstructions($exten,'busy',$vmx_play_instructions);
+  
+            // store cookie
+            setcookie("ari_vmx_unavail_enabled", $vmx_unavail_enabled, time()+365*24*60*60);
+            setcookie("ari_vmx_busy_enabled", $vmx_busy_enabled, time()+365*24*60*60);
+            setcookie("ari_vmx_play_instructions", $vmx_play_instructions, time()+365*24*60*60);
+
+                $stripped_vmx_option_0_number = preg_replace('/-|\(|\)|\s/','',$vmx_option_0_number);
+                                                if ($vmx_option_0_system_default) {
+                $this->setVmxOptionNumber($exten,'0','unavail',"");
+                $this->setVmxOptionNumber($exten,'0','busy',"");
+                setcookie("ari_vmx_option_0_system_default", $vmx_option_0_system_default, time()+365*24*60*60);
+                        if (is_numeric($stripped_vmx_option_0_number) || !$stripped_vmx_option_0_number) {
+                        $stripped = preg_replace('/-|\(|\)|\s/','',$_COOKIE['ari_vmx_option_0_number']);
+                        if ($vmx_option_0_number && $stripped!=$stripped_vmx_option_0_number) {
+                        setcookie("ari_vmx_option_0_number", $call_vmx_option_0_number, time()+365*24*60*60);
+                        }
+                                                        }
+                                                } else {
+                        if (!is_numeric($stripped_vmx_option_0_number) && $stripped_vmx_option_0_number) {
+                                $_SESSION['ari_error'] = 
+                                _("Option 0 not changed") . "<br>" .
+                                sprintf(_("Number %s must contain dial numbers (characters like '(', '-', and ')' are ok)"),$vmx_option_0_number);
+                        }
+                        else {
+
+                                // set database
+                                $this->setVmxOptionNumber($exten,'0','unavail',$stripped_vmx_option_0_number);
+                                $this->setVmxOptionNumber($exten,'0','busy',$stripped_vmx_option_0_number);
+
+                                // store cookie
+                                $stripped = preg_replace('/-|\(|\)|\s/','',$_COOKIE['ari_vmx_option_0_number']);
+                                if ($vmx_option_0_number && $stripped!=$stripped_vmx_option_0_number) {
+                                setcookie("ari_vmx_option_0_number", $call_vmx_option_0_number, time()+365*24*60*60);
+                                }
+                                                        }
+                                                }
+
+                $stripped_vmx_option_1_number = preg_replace('/-|\(|\)|\s/','',$vmx_option_1_number);
+                if (!is_numeric($stripped_vmx_option_1_number) && $stripped_vmx_option_1_number) {
+                $_SESSION['ari_error'] = 
+                _("Option 1 not changed") . "<br>" .
+                sprintf(_("Number %s must contain dial numbers (characters like '(', '-', and ')' are ok)"),$vmx_option_1_number);
+                }
+                else {
+
+                // set database
+                $this->setVmxOptionNumber($exten,'1','unavail',$stripped_vmx_option_1_number);
+                $this->setVmxOptionNumber($exten,'1','busy',$stripped_vmx_option_1_number);
+        
+                // store cookie
+                $stripped = preg_replace('/-|\(|\)|\s/','',$_COOKIE['ari_vmx_option_1_number']);
+                if ($vmx_option_1_number && $stripped!=$stripped_vmx_option_1_number) {
+                setcookie("ari_vmx_option_1_number", $call_vmx_option_1_number, time()+365*24*60*60);
+                }
+                }
+
+                $stripped_vmx_option_2_number = preg_replace('/-|\(|\)|\s/','',$vmx_option_2_number);
+                if (!is_numeric($stripped_vmx_option_2_number) && $stripped_vmx_option_2_number) {
+                $_SESSION['ari_error'] = 
+                _("Option 2 not changed") . "<br>" .
+                sprintf(_("Number %s must contain dial numbers (characters like '(', '-', and ')' are ok)"),$vmx_option_2_number);
+                }
+                else {
+
+                // set database
+                $this->setVmxOptionNumber($exten,'2','unavail',$stripped_vmx_option_2_number);
+                $this->setVmxOptionNumber($exten,'2','busy',$stripped_vmx_option_2_number);
+
+                // store cookie
+                $stripped = preg_replace('/-|\(|\)|\s/','',$_COOKIE['ari_vmx_option_2_number']);
+                if ($vmx_option_2_number && $stripped!=$stripped_vmx_option_2_number) {
+                setcookie("ari_vmx_option_2_number", $call_vmx_option_2_number, time()+365*24*60*60);
+                }
+                }
+          }
+                                } // vmx_disabled_delayed false
+
+        if (! $follow_me_disabled_delayed) {
+
+          // assume no errors, don't update SQL if errors occured
+          $follow_me_update_succeeded=1;
+  
+          // update follow me pre-ring time
+          if (!$STANDALONE['use']) {
+  
+            $stripped_follow_me_prering_time = preg_replace('/-|\s/','',$follow_me_prering_time);
+            if (!is_numeric($stripped_follow_me_prering_time)) {
+              $_SESSION['ari_error'] = 
+                _("Follow-Me pre-ring time not changed") . "<br>" .
+                sprintf(_("Number %s must be an interger number of seconds"),$follow_me_prering_time);
+              $follow_me_update_succeeded=0;
+            }
+            else {
+  
+              // set database
+              $this->setFollowMePreRingTime($exten,$stripped_follow_me_prering_time);
+  
+              // store cookie
+              $stripped = preg_replace('/-|\s/','',$_COOKIE['ari_follow_me_prering_time']);
+              if ($follow_me_prering_time && $stripped!=$stripped_follow_me_prering_time) {
+                setcookie("ari_follow_me_prering_time", $follow_me_prering_time, time()+365*24*60*60);
+              }
+            }
+          }
+  
+          // update follow me list ring time
+          if (!$STANDALONE['use']) {
+  
+            $stripped_follow_me_listring_time = preg_replace('/-|\s/','',$follow_me_listring_time);
+            if (!is_numeric($stripped_follow_me_listring_time)) {
+              $_SESSION['ari_error'] = 
+                _("Follow-Me list ring time not changed") . "<br>" .
+                sprintf(_("Number %s must be an interger number of seconds"),$follow_me_listring_time);
+              $follow_me_update_succeeded=0;
+            }
+            else {
+  
+              // set database
+              $this->setFollowMeListRingTime($exten,$stripped_follow_me_listring_time);
+  
+              // store cookie
+              $stripped = preg_replace('/-|\s/','',$_COOKIE['ari_follow_me_listring_time']);
+              if ($follow_me_listring_time && $stripped!=$stripped_follow_me_listring_time) {
+                setcookie("ari_follow_me_listring_time", $follow_me_listring_time, time()+365*24*60*60);
+              }
+            }
+          }
+  
+          // update follow me list 
+          if (!$STANDALONE['use']) {
+  
+            $grplist = explode("\n", $follow_me_list);
+  
+            if (!$grplist) {
+                    $grplist = null;
+            }
+  
+            foreach (array_keys($grplist) as $key) {
+              //trim it
+              $grplist[$key] = trim($grplist[$key]);
+  
+                                                        // Lookup the extension and append hash if not a user, and remove invalid chars
+                                                        $grplist[$key] = $this->lookupSetExtensionFormat($grplist[$key]);
+  
+              // remove blanks
+              if ($grplist[$key] == "") unset($grplist[$key]);
+            }
+  
+            // check for duplicates, and re-sequence
+            $grplist = array_values(array_unique($grplist));
+
+            $stripped_follow_me_list = implode("-",$grplist);
+  
+            if ($stripped_follow_me_list == "") {
+              $_SESSION['ari_error'] = 
+                _("Follow-Me list must contain at least one valid number") . "<br>" .
+                sprintf(_("The following: %s is not valid"),$follow_me_list);
+              $follow_me_update_succeeded=0;
+            }
+            else {
+  
+              // set database
+              $this->setFollowMeList($exten,$stripped_follow_me_list);
+  
+              // store cookie
+              $stripped = preg_replace('/|\(|\)|\s/','',$_COOKIE['ari_follow_me_list']);
+              if ($follow_me_list && $stripped!=$stripped_follow_me_list) {
+                setcookie("ari_follow_me_list", $follow_me_list, time()+365*24*60*60);
+              }
+            }
+          }
+  
+          // update follow me confirm
+          if (!$STANDALONE['use']) {
+  
+            // set database
+            $this->setFollowMeConfirm($exten,$follow_me_confirm);
+  
+            // store cookie
+            setcookie("ari_follow_me_confirm", $follow_me_confirm, time()+365*24*60*60);
+          }
+  
+          //If no errors than update the SQL table to keep in sync
+          if ($follow_me_update_succeeded) {
+            $this->setFollowMeMySQL($exten, $follow_me_prering_time, $follow_me_listring_time, $follow_me_list, $follow_me_confirm);
+          }
+
+        } //if !follow_me_disabled
+
-        // voicemail settings
-
+SETTINGS_ALLOW_VOICEMAIL_SETTINGS && $
-
-
@@ -356 +654 @@
-    global $STANDALONE;
-    global $ARI_ADMIN_USERNAME;
+    global $SETTINGS_ALLOW_CALLFORWARD_SETTINGS;
+    global $SETTINGS_ALLOW_VOICEMAIL_SETTINGS;
-    global $SETTINGS_ALLOW_VOICEMAIL_PASSWORD_SET;
-    global $SETTINGS_VOICEMAIL_PASSWORD_LENGTH;
@@ -361 +661 @@
-    global $ARI_VOICEMAIL_AUDIO_FORMAT_DEFAULT;
-    global $SETTINGS_ALLOW_CALL_RECORDING_SET;
+    global $SETTINGS_PRERING_LOW;
+    global $SETTINGS_PRERING_HIGH;
+    global $SETTINGS_LISTRING_LOW;
+    global $SETTINGS_LISTRING_HIGH;
+
+    global $SETTINGS_FOLLOW_ME_LIST_MAX;
+    global $SETTINGS_ALLOW_VMX_SETTINGS;
-
-    global $loaded_modules;
@@ -394 +701 @@
-      if (!$STANDALONE['use']) {
-
+
-        $call_forward_number = $this->getCallForwardNumber($exten);
-        if ($call_forward_number) { 
@@ -403 +711 @@
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            <tr>
-              <td><h3>" . _("Call Rout
+                               <td><h3>" . _("Call Forward
-            </tr>
-            <tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            </tr>
-            <tr>
-
-
-
-
+
+
+
+
+
+
+
+
-            </tr>
-            <tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            <tr>
-
-
-
-
+
-            </tr>
-            <tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            <tr>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+