Changeset 10571

Timestamp:

11/18/10 17:37:56 (3 years ago)

Author:

p_lindheimer

Message:

additional logic to implement sticky true/false overrides and settable/checkable in GUI re #4636

Files:

• modules/branches/2.9/timeconditions/functions.inc.php (modified) (9 diffs)
• modules/branches/2.9/timeconditions/page.timeconditions.php (modified) (3 diffs)

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

@@ -59 +59 @@
-        $context = 'timeconditions';
-        $fc_context = 'timeconditions-toggles';
-
+_autoreset
-        $need_maint = false;
-        $interval = isset($amp_conf['TCINTERVAL']) && ctype_digit($amp_conf['TCINTERVAL']) ? $amp_conf['TCINTERVAL'] : '60';
@@ -80 +80 @@
-            }
-          }
-
-set("DB(TC/$time_id)",''
+:4
+execif('$["${DB(TC/'.$time_id.')}" = "false"]','Set',"DB(TC/$time_id)="
-          $skip_dest = 'falsegoto';
-          if ($amp_conf['USEDEVSTATE'] && $generate_hint) {
-            $ext->add($context, $time_id, $skip_dest, new ext_set("$DEVSTATE(Custom:TC$time_id)",'INUSE'));
+            $ext->add($context, $time_id, '', new ext_execif('$["${DB(TC/'.$time_id.')}" = "false_sticky" & "${'.$DEVSTATE.'(Custom:TCSTICKY${ARG1})}" != "INUSE"]','Set',$DEVSTATE.'(Custom:TCSTICKY${ARG1})=INUSE'));
-            $skip_dest = '';
-          }
@@ -91 +92 @@
-          $ext->add($context, $time_id, '', new ext_return(''));
-
-
-set("DB(TC/$time_id)",''
+:5
+execif('$["${DB(TC/'.$time_id.')}" = "true"]','Set',"DB(TC/$time_id)="
-          $skip_dest = 'truegoto';
-          if ($amp_conf['USEDEVSTATE'] && $generate_hint) {
-            $ext->add($context, $time_id, $skip_dest, new ext_set("$DEVSTATE(Custom:TC$time_id)",'NOT_INUSE'));
+            $ext->add($context, $time_id, '', new ext_execif('$["${DB(TC/'.$time_id.')}" = "true_sticky" & "${'.$DEVSTATE.'(Custom:TCSTICKY${ARG1})}" != "INUSE"]','Set',$DEVSTATE.'(Custom:TCSTICKY${ARG1})=INUSE'));
-            $skip_dest = '';
-          }
@@ -106 +108 @@
-          unset($fcc);
-          if ($c != '') {
-
+_autoreset
-            if ($amp_conf['USEDEVSTATE'] && $generate_hint) {
-              $ext->addHint($fc_context, $c, 'Custom:TC'.$time_id);
@@ -140 +142 @@
-        }
-
-
+_autoreset
-          $ext->add($fc_context, 'h', '', new ext_hangup());
-
@@ -152 +154 @@
-            $ext->add($m_context, 's', '', new ext_system($amp_conf['ASTVARLIBDIR']."/bin/schedtc.php $interval ".$amp_conf['ASTSPOOLDIR'].'/outgoing 0'));
-          }
-
+:4
-          if ($amp_conf['USEDEVSTATE']) {
-            $ext->add($m_context, 's', '', new ext_set($DEVSTATE.'(Custom:TC${ARG1})', '${IF($["${TCSTATE}" = "true"]?INUSE:NOT_INUSE)}'));
+            $ext->add($m_context, 's', '', new ext_execif('$["${'.$DEVSTATE.'(Custom:TCSTICKY${ARG1})}" = "INUSE"]', 'Set',$DEVSTATE.'(Custom:TCSTICKY${ARG1})=NOT_INUSE'));
-          }
-          if ($amp_conf['FCBEEPONLY']) {
@@ -249 +252 @@
-
-function timeconditions_get($id){
+  global $astman;
-  //get all the variables for the timecondition
-  $results = sql("SELECT * FROM timeconditions WHERE timeconditions_id = '$id'","getRow",DB_FETCHMODE_ASSOC);
+
+  $fcc = new featurecode('timeconditions', 'toggle-mode-'.$id);
+  $c = $fcc->getCodeActive();
+  unset($fcc);
+  if ($c == '') {
+    $results['tcstate'] = false;
+    $results['tccode'] = false;
+  } else {
+    $results['tccode'] = $c;
+    if ($astman != null) {
+      $results['tcstate'] = $astman->database_get("TC",$id);
+    } else {
+      die_freepbx("No manager connection, can't get Time Condition State");
+    }
+  }
-  return $results;
-}
@@ -389 +408 @@
-function timeconditions_edit($id,$post){
-  global $db;
+  global $astman;
+  global $amp_conf;
-
-  $id = $db->escapeSimple($id);
@@ -402 +423 @@
-  }
-  $results = sql("UPDATE timeconditions SET displayname = \"$displayname\", time = \"$time\", truegoto = \"$truegoto\", falsegoto = \"$falsegoto\", deptname = \"$deptname\", generate_hint = \"$generate_hint\"  WHERE timeconditions_id = \"$id\"");
+
+  if (isset($post['tcstate_new']) && $post['tcstate_new'] != 'unchanged') {
+    $tcstate_new = $post['tcstate_new'];
+
+    if ($amp_conf['USEDEVSTATE']) {
+      $engine_info = engine_getinfo();
+      $version = $engine_info['version'];
+      $DEVSTATE = version_compare($version, "1.6", "ge") ? "DEVICE_STATE" : "DEVSTATE";
+    } else {
+      $DEVSTATE = false;
+    }
+    if ($astman != null) {
+      switch ($tcstate_new) {
+        case 'auto':
+          $tcstate_new = "";
+          $blf = 'NOT_INUSE';
+          $sticky = 'NOT_INUSE';
+        break;
+        case 'true':
+          $blf = 'NOT_INUSE';
+          $sticky = 'NOT_INUSE';
+        break;
+        case 'true_sticky':
+          $blf = 'NOT_INUSE';
+          $sticky = 'INUSE';
+        break;
+        case 'false':
+          $blf = 'INUSE';
+          $sticky = 'NOT_INUSE';
+        break;
+        case 'false_sticky':
+          $blf = 'INUSE';
+          $sticky = 'INUSE';
+        break;
+        default:
+          $tcstate_new = false;
+        break;
+      }
+      if ($tcstate_new !== false) {
+        $astman->database_put("TC",$id,$tcstate_new);
+        if ($DEVSTATE) {
+          $astman->send_request('Command',array('Command'=>"core set global ".$DEVSTATE."(Custom:TC".$id.") $blf"));
+          $astman->send_request('Command',array('Command'=>"core set global ".$DEVSTATE."(Custom:TCSTICKY".$id.") $sticky"));
+        }
+      }
+    } else {
+      die_freepbx("No manager connection, can't update Time Condition State");
+    }
+  }
-}
-

modules/branches/2.9/timeconditions/page.timeconditions.php

@@ -11 +11 @@
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//GNU General Public License for more details.
-
-
-isset($_REQUEST['action'])?$action = $_REQUEST['action']:$action='';
@@ -83 +82 @@
-    }
-    $generate_hint = $thisItem['generate_hint'] == '1' ? '1' : '0';
-
+
+
+
+
-?>
-  <form autocomplete="off" name="edit" action="<?php $_SERVER['PHP_SELF'] ?>" method="post" onsubmit="return edit_onsubmit();">
@@ -102 +104 @@
-<?php if ($amp_conf['USEDEVSTATE']) { ?>
-  <tr>
-_("If set an Asterisk hint will be created for the override feature code associated with this Time Condition that can be used to light BLF buttons on a phone programmed to enable/disable this Time Condition. If not using a BLF it is better to leave this un-checked as additional system resources are required to keep the hint updated. The Feature Code can be found and enabled/disabled on the Feature Codes tab under Time Conditions."
+sprintf(_("If set an Asterisk hint will be created for the override feature code %s associated with this Time Condition that can be used to light BLF buttons on a phone programmed to enable/disable this Time Condition. If not using a BLF it is better to leave this un-checked as additional system resources are required to keep the hint updated. This Feature Code can be found and enabled/disabled on the Feature Codes tab under Time Conditions."),$tccode
-    <td>
-      <input name="generate_hint" type="checkbox" value="1" <?php echo ($generate_hint == '1' ? 'checked' : ''); ?>  tabindex="<?php echo ++$tabindex;?>"/>
+    </td>
+  </tr>
+<?php } ?>
+
+<?php 
+  if ($itemid && $thisItem['tcstate'] !== false) {
+    $tcstate = $thisItem['tcstate'] == '' ? 'auto' : $thisItem['tcstate'];
+    switch ($tcstate) {
+      case 'auto':
+        $state_msg = _('No Override');
+      break;
+      case 'true':
+        $state_msg = _('Temporary Override matching state');
+      break;
+      case 'true_sticky':
+        $state_msg = _('Permanent Override matching state');
+      break;
+      case 'false':
+        $state_msg = _('Temporary Override unmatching state');
+      break;
+      case 'false_sticky':
+        $state_msg = _('Permanent Override unmatching state');
+      break;
+      default:
+        $state_msg = _('Unknown State');
+      break;
+    }
+?>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Current Override:")?><span><?php echo _("Indicates the current state of this Time Condition. If it is in a Temporary Override state, it will automatically resume at the next time transition based on the associated Time Group. If in a Permanent Override state, it will stay in that state until changed here or through other means such as external XML applications on your phone. If No Override then it functions normally based on the time schedule.")?></span></a></td>
+    <td><?php echo $state_msg; ?></td>
+  </tr>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Change Override:")?><span><?php echo sprintf(_("This Time Condition can be set to Temporarily go to the 'matched' or 'unmatched' destination in which case the override will automatcally reset once the current time span has elapsed. If set to Permanent it will stay overriden until manually reset. All overrides can be removed wih the Reset Override option. Temporary Overrides can also be toggled with the %s feature code, which will also remove a Permanent Override if set but can not set a Permanent Override which must be done here or with other applicaions such as an XML based phone options."),$tccode)?></span></a></td>
+    <td>
+      <select name="tcstate_new" tabindex="<?php echo ++$tabindex;?>">
+        <option value="unchanged" SELECTED><?php echo _("Unchanged");?></option>
+        <option value="auto" ><?php echo _("Reset Override");?></option>
+        <option value="true" ><?php echo _("Temporary matched");?></option>
+        <option value="true_sticky" ><?php echo _("Permanently matched");?></option>
+        <option value="false" ><?php echo _("Temporary unmatched");?></option>
+        <option value="false_sticky" ><?php echo _("Permanently unmatched");?></option>
+      </select>
-    </td>
-  </tr>