Changeset 11342

Timestamp:

02/11/11 18:40:47 (2 years ago)

Author:

p_lindheimer

Message:

adds a toggle feature code and hints to go in conjunction with Asterisk patch submission 18788 on review board as 1105 re #778

Files:

• freepbx/branches/2.9/amp_conf/bin/generate_hints.php (modified) (3 diffs)
• modules/branches/2.9/campon/functions.inc.php (modified) (1 diff)
• modules/branches/2.9/campon/install.php (modified) (1 diff)
• modules/branches/2.9/core/agi-bin/user_login_out.agi (modified) (4 diffs)
• modules/branches/2.9/core/functions.inc.php (modified) (4 diffs)

freepbx/branches/2.9/amp_conf/bin/generate_hints.php

@@ -12 +12 @@
-//
-$intercom_code = isset($argv[1]) ? $argv[1] : '';
-
+
+
-
-$ast_with_dahdi = ast_with_dahdi();
@@ -39 +40 @@
-  global $dnd_mode;
-  global $intercom_code;
+  global $campon_toggle;
-
-  $dnd_string = ($dnd_mode == 'dnd')?"&Custom:DND$user":'';
@@ -47 +49 @@
-    if ($intercom_code != 'nointercom' && $intercom_code != '') {
-      echo "exten => $intercom_code"."$user,hint,$dial_string"."$dnd_string\n";
+    }
+    if ($campon_toggle != 'nocampon' && $campon_toggle != '') {
+
+      $dev_arr = explode('&',$dial_string);
+      $hint_val = 'ccss:'.implode('&ccss:',$dev_arr);
+      echo "exten => $campon_toggle"."$user,hint,$hint_val"."\n";
-    }
-  } else if ($dnd_mode == 'dnd') {

modules/branches/2.9/campon/functions.inc.php

@@ -234 +234 @@
-  $ext->add($id, $c, '', new ext_playback('beep'));
-  $ext->add($id, $c, '', new ext_macro('hangupcall'));
+}
+
+function campon_toggle($c) {
+  global $ext;
+  global $amp_conf;
+
+  $id = "app-campon-toggle"; // The context to be included
+  $hint_context = 'ext-local';
+
+  $ext->addInclude('from-internal-additional', $id); // Add the include from from-internal
+  $ext->add($id, $c, '', new ext_answer(''));
+  $ext->add($id, $c, '', new ext_set('CCSS_SETUP', 'TRUE')); // keep from calling normal sub-ccss
+  $ext->add($id, $c, '', new ext_macro('user-callerid'));
+  $ext->add($id, $c, '', new ext_execif('$["${EXTENSION_STATE(' . $c . '${AMPUSER}@' . $hint_context . ')}" = "INUSE"]','CallCompletionCancel','','CallCompletionRequest',''));
+  $ext->add($id, $c, '', new ext_noop_trace('CC_REQUEST_RESULT: ${CC_REQUEST_RESULT} CC_REQUEST_REASON: ${CC_REQUEST_REASON}'));
+  $ext->add($id, $c, '', new ext_noop_trace('CC_CANCEL_RESULT: ${CC_CANCEL_RESULT} CC_CANCEL_REASON: ${CC_CANCEL_REASON}'));
+  $ext->add($id, $c, '', new ext_playback('beep'));
+  $ext->add($id, $c, '', new ext_macro('hangupcall'));
+
+  $ext->addGlobal('CAMPONTOGGLE',$c);
+
+  $userlist = core_users_list();
+  if (is_array($userlist)) {
+    foreach($userlist as $item) {
+      $hint_code = $c.$item[0];
+      $ext->add($hint_context, $hint_code, '', new ext_goto('1',$c,$id));
+      if (!$amp_conf['DYNAMICHINTS']) {
+        $devices = core_hint_get($item[0]);
+        $dev_arr = explode('&',$devices);
+        $hint_val = 'ccss:'.implode('&ccss:',$dev_arr);
+        $ext->addHint($hint_context, $hint_code, $hint_val);
+      }
+    }
+  }
-}
-

modules/branches/2.9/campon/install.php

@@ -21 +21 @@
-unset($fcc);
-
+// TODO: do I make this dependant on a patch
+//
+// Camp-On Toggle Feature Code
+$fcc = new featurecode('campon', 'toggle');
+$fcc->setDescription('Camp-On Toggle');
+$fcc->setDefault('*84');
+$fcc->update();
+unset($fcc);
+
-$freepbx_conf =& freepbx_conf::create();
-

modules/branches/2.9/core/agi-bin/user_login_out.agi

@@ -52 +52 @@
-  $que_devstate = get_var( "QUEDEVSTATE" ) == "TRUE" ? true : false;
-  $intercom_code = get_var( "INTERCOMCODE" );
+  $campon_toggle = get_var( "CAMPONTOGGLE" );
-
-  $ast_version14 = version_compare($ast_version, "1.4", "ge");
@@ -278 +279 @@
-    global $dnd_devstate;
-    global $intercom_code;
+    global $campon_toggle;
-    global $ast_version14;
-
@@ -285 +287 @@
-    if ($devices) {
-      $dial_string = get_dial_string($devices);
+
+      if ($campon_toggle != 'nocampon' && $campon_toggle != '') {
+        $dev_arr = explode('&',$dial_string);
+        $hint_val = 'ccss:'.implode('&ccss:',$dev_arr);
+        $response = $astman->send_request('Command',array('Command'=>$dp_pre."add extension {$campon_toggle}{$user},hint,{$hint_val} into ext-local replace"));
+      }
-      if ($dnd_devstate) {
-        $dial_string .= "&Custom:DND$user";
@@ -298 +306 @@
-      if ($intercom_code != 'nointercom' && $intercom_code != '') {
-        $response = $astman->send_request('Command',array('Command'=>$dp_pre."remove extension {$intercom_code}{$user}@ext-local hint"));
+      }
+      if ($campon_toggle != 'nocampon' && $campon_toggle != '') {
+        $response = $astman->send_request('Command',array('Command'=>$dp_pre."remove extension {$campon_toggle}{$user}@ext-local hint"));
-      }
-    }

modules/branches/2.9/core/functions.inc.php

@@ -219 +219 @@
-      $ver16 = false;
-    }
+    // TODO: Temporary Kludge until CCSS is fixed
+    //
+    if (version_compare($ast_version, "1.8", "ge")) {
+      $cc_monitor_policy = "cc_monitor_policy=generic\n";
+    } else {
+      $cc_monitor_policy = "";
+    }
-
-    $sql = "SELECT keyword,data from $table_name where id=-1 and keyword <> 'account' and flags <> 1";
@@ -350 +357 @@
-            $output .= $faxdetect;
-          }
+          if ($cc_monitor_policy) {
+            $output .= $cc_monitor_policy;
+          }
-      }
-      $output .= $additional."\n";
@@ -1282 +1292 @@
-      $intercom_code = ($intercom_code == '') ? 'nointercom' : $intercom_code;
-
+      $fcc = new featurecode('campon', 'toggle');
+      $campon_toggle = $fcc->getCodeActive();
+      unset($fcc);
+
+      $campon_toggle = ($campon_toggle == '') ? 'nocampon' : $campon_toggle;
+
-      // Pass the code so agi scripts like user_login_logout know to generate hints
-      //
@@ -1288 +1304 @@
-      if ($amp_conf['DYNAMICHINTS']) {
-        if ($amp_conf['USEDEVSTATE'] && function_exists('donotdisturb_get_config')) {
- 
+
-        } else {
-          $add_dnd = '';
-        }
-
+' '.$campon_toggle .' '.
-      }
-      $userlist = core_users_list();