Changeset 5920

Timestamp:

07/06/08 04:16:38 (5 years ago)

Author:

p_lindheimer

Message:

merged timegroups and timecondition mods into timeconditions module. Originally submitted as #1695 by naftali5 as 2 modules, now merged and moved over from contributed_modules repository

Files:

• modules/branches/2.5/timeconditions/functions.inc.php (modified) (8 diffs)
• modules/branches/2.5/timeconditions/install.php (modified) (4 diffs)
• modules/branches/2.5/timeconditions/install.sql (deleted)
• modules/branches/2.5/timeconditions/module.xml (modified) (3 diffs)
• modules/branches/2.5/timeconditions/page.timeconditions.php (modified) (5 diffs)
• modules/branches/2.5/timeconditions/page.timegroups.php (added)
• modules/branches/2.5/timeconditions/uninstall.sql (modified) (1 diff)

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

@@ -1 +1 @@
-<?php /* $Id */
-
-// returns a associative arrays with keys 'destination' and 'description'
-function timeconditions_destinations() {
-  //get the list of meetmes
-  $results = timeconditions_list(true);
-
-  // return an associative array with destination and description
-  if (isset($results)) {
-    foreach($results as $result){
-        $extens[] = array('destination' => 'timeconditions,'.$result['timeconditions_id'].',1', 'description' => $result['displayname']);
-    }
-    return $extens;
-  } else {
-    return null;
-  }
-}
-
-function timeconditions_getdest($exten) {
@@ -34 +18 @@
-      return array('description' => 'Time Conditon : '.$thisexten['displayname'],
-                   'edit_url' => 'config.php?display=timeconditions&itemid='.urlencode($exten),
-         
+          
-    }
-  } else {
@@ -41 +25 @@
-}
-
+// returns a associative arrays with keys 'destination' and 'description'
+function timeconditions_destinations() {
+  //get the list of timeconditions
+  $results = timeconditions_list(true);
+
+  // return an associative array with destination and description
+  if (isset($results)) {
+    foreach($results as $result){
+        $extens[] = array('destination' => 'timeconditions,'.$result['timeconditions_id'].',1', 'description' => $result['displayname']);
+    }
+    return $extens;
+  } else {
+    return null;
+  }
+}
-
-/*  Generates dialplan for conferences
@@ -48 +47 @@
-  global $ext;  // is this the best way to pass this?
-  global $conferences_conf;
+
-  switch($engine) {
-    case "asterisk":
@@ -55 +55 @@
-          $thisitem = timeconditions_get(ltrim($item['timeconditions_id']));
-          // add dialplan
-
+
+
+
+
+
+
-          $ext->add('timeconditions', $item['timeconditions_id'], '', new ext_goto($item['falsegoto']));
-        }
@@ -122 +127 @@
-
-function timeconditions_get($id){
-meetme
+timecondition
-  $results = sql("SELECT * FROM timeconditions WHERE timeconditions_id = '$id'","getRow",DB_FETCHMODE_ASSOC);
-  return $results;
@@ -131 +136 @@
-}
-
+//obsolete handled in timegroups module
-function timeconditions_get_time( $hour_start, $minute_start, $hour_finish, $minute_finish, $wday_start, $wday_finish, $mday_start, $mday_finish, $month_start, $month_finish) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-function timeconditions_add($post){
-
+ {
-    return false;
+  }
-  extract($post);
-
-
-
-
+
+
+
+
+
-  $results = sql("INSERT INTO timeconditions (displayname,time,truegoto,falsegoto,deptname) values (\"$displayname\",\"$time\",\"${$goto0.'0'}\",\"${$goto1.'1'}\",\"$deptname\")");
-}
-
-function timeconditions_edit($id,$post){
-
+ {
-    return false;
+  }
-  extract($post);
-
-       
+ //
-  
-
+
+
+
-  $results = sql("UPDATE timeconditions SET displayname = \"$displayname\", time = \"$time\", truegoto = \"${$goto0.'0'}\", falsegoto = \"${$goto1.'1'}\", deptname = \"$deptname\" WHERE timeconditions_id = \"$id\"");
-}
@@ -237 +256 @@
-  return true;
-}
+
+
+
+/*
+The following functions are available to other modules.
+
+function timeconditions_timegroups_add_group($description,$times=null) return the inserted id
+  expects an array of times, each an associative array
+  Array ( [0] => Array ( [hour_start] => - [minute_start] => - [hour_finish] => - 
+  [minute_finish] => - [wday_start] => - [wday_finish] => - [mday_start] => - 
+  [mday_finish] => - [month_start] => - [month_finish] => - ) )
+
+function timeconditions_timegroups_add_group_timestrings($description,$times=null) return the inserted id
+  alternative to above. expects an array of time strings instead of associative array of hours minutes etc.
+
+function timeconditions_timegroups_list_groups()
+  returns an array of id and descriptions for any time groups defined by the user
+  the array contains inidces 0 and 1 for the rnav and associative value and text for select boxes
+
+function timeconditions_timegroups_get_times($timegroup)
+  returns an array of id and time string of the users time selections for the selected timegroup
+
+function timeconditions_timegroups_buildtime( $hour_start, $minute_start, $hour_finish, $minute_finish, $wday_start, $wday_finish, $mday_start, $mday_finish, $month_start, $month_finish) 
+  should never be needed by another module, as this module should be the only place creating the time string, as it returns the string to other modules.
+
+function timeconditions_timegroups_drawtimeselects($name, $time)
+  should never be needed by another module, as this module should be the only place drawing the time selects
+*/
+
+//lists any time groups defined by the user
+function timeconditions_timegroups_list_groups() {
+  global $db;
+
+  $sql = "select id, description from timegroups_groups order by description";
+  $results = $db->getAll($sql);
+  if(DB::IsError($results)) {
+    $results = null;
+  }
+  foreach ($results as $val) {
+    $tmparray[] = array($val[0], $val[1], "value" => $val[0], "text" => $val[1]);
+  }
+  return $tmparray;
+}
+
+//---------------------------------------------
+
+//timegroups page helper
+//we are using gui styles so there is very little on the page
+//the timegroups page is used to create time string 
+//to be used by other modules for gotoif or includes or IFTIME func
+function timeconditions_timegroups_configpageinit($dispnum) {
+global $currentcomponent;
+
+  switch ($dispnum) {
+    case 'timegroups':
+      $currentcomponent->addguifunc('timeconditions_timegroups_configpageload');
+      $currentcomponent->addprocessfunc('timeconditions_timegroups_configprocess', 5);  
+    break;
+  }
+}
+
+//actually render the timegroups page
+function timeconditions_timegroups_configpageload() {
+  global $currentcomponent;
+
+  $descerr = 'Description must be alpha-numeric, and may not be left blank';
+  $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
+  $action= isset($_REQUEST['action'])?$_REQUEST['action']:null;
+  if ($action == 'del') {
+    $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Time Group").": $extdisplay"." deleted!", false), 0);
+    unset($extdisplay);
+  }
+//need to get page name/type dynamically
+  $query = ($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:'type=setup&display=timegroups&extdisplay='.$extdisplay;
+  $delURL = $_SERVER['PHP_SELF'].'?'.$query.'&action=del';
+  $info = '';
+  if (!$extdisplay) {
+    $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Add Time Group"), false), 0);
+    $currentcomponent->addguielem('Time Group', new gui_textbox('description', '', 'Description', 'This will display as the name of this Time Group.', '!isAlphanumeric() || isWhitespace()', $descerr, false), 3);
+  } else {
+    $savedtimegroup= timeconditions_timegroups_get_group($extdisplay);
+    $timegroup = $savedtimegroup[0];
+    $description = $savedtimegroup[1];
+    $currentcomponent->addguielem('_top', new gui_hidden('extdisplay', $extdisplay));
+    $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Edit Time Group").": $description", false), 0);
+    $currentcomponent->addguielem('_top', new gui_link('del', _("Delete Time Group")." $timegroup", $delURL, true, false), 0);
+    $currentcomponent->addguielem('Time Group', new gui_textbox('description', $description, 'Description', 'This will display as the name of this Time Group.', '', '', false), 3);
+    $timelist = timeconditions_timegroups_get_times($extdisplay);
+    foreach ($timelist as $val) {
+      $timehtml = timeconditions_timegroups_drawtimeselects('times['.$val[0].']',$val[1]);
+      $timehtml = '<tr><td colspan="2"><table>'.$timehtml.'</table></td></tr>';
+      $currentcomponent->addguielem($val[1], new guielement('dest0', $timehtml, ''),5);
+    }
+  }
+  $timehtml = timeconditions_timegroups_drawtimeselects('times[new]',null);
+  $timehtml = '<tr><td colspan="2"><table>'.$timehtml.'</table></td></tr>';
+  $currentcomponent->addguielem('New Time', new guielement('dest0', $timehtml, ''),6);
+  $currentcomponent->addguielem('_top', new gui_hidden('action', ($extdisplay ? 'edit' : 'add')));
+}
+
+//handle timegroups page submit button
+function timeconditions_timegroups_configprocess() {
+  $action= isset($_REQUEST['action'])?$_REQUEST['action']:null;
+  $timegroup= isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
+  $description= isset($_REQUEST['description'])?$_REQUEST['description']:null;
+  $times = isset($_REQUEST['times'])?$_REQUEST['times']:null;
+
+  //addslashes  
+  switch ($action) {
+    case 'add':
+      timeconditions_timegroups_add_group($description,$times);
+      break;
+    case 'edit':
+      timeconditions_timegroups_edit_group($timegroup,$description);
+      timeconditions_timegroups_edit_times($timegroup,$times);
+      break;
+    case 'del':
+      timeconditions_timegroups_del_group($timegroup);
+      break;
+  }
+}
+
+//these are the users time selections for the current timegroup
+function timeconditions_timegroups_get_times($timegroup) {
+  global $db;
+
+  $sql = "select id, time from timegroups_details where timegroupid = $timegroup";
+  $results = $db->getAll($sql);
+  if(DB::IsError($results)) {
+    $results = null;
+  }
+  foreach ($results as $val) {
+    $tmparray[] = array($val[0], $val[1]);
+  }
+  return $tmparray;
+}
+
+//retrieve a single timegroup for the timegroups page
+function timeconditions_timegroups_get_group($timegroup) {
+  global $db;
+
+  $sql = "select id, description from timegroups_groups where id = $timegroup";
+  $results = $db->getAll($sql);
+  if(DB::IsError($results)) {
+    $results = null;
+  }
+  $tmparray = array($results[0][0], $results[0][1]);
+  return $tmparray;
+}
+
+//add a new timegroup for timegroups page
+//expects an array of times, each an associative array
+//Array ( [0] => Array ( [hour_start] => - [minute_start] => - [hour_finish] => - 
+//[minute_finish] => - [wday_start] => - [wday_finish] => - [mday_start] => - 
+//[mday_finish] => - [month_start] => - [month_finish] => - ) )
+function timeconditions_timegroups_add_group($description,$times=null) {
+  global $db;
+
+  $sql = "insert timegroups_groups(description) VALUES ('$description')";
+  $db->query($sql);
+  $timegroup=mysql_insert_id();
+  if (isset($times)) {
+    timeconditions_timegroups_edit_times($timegroup,$times);
+  }
+  needreload();
+  return $timegroup;
+}
+
+function timeconditions_timegroups_add_group_timestrings($description,$timestrings) {
+  global $db;
+
+  $sql = "insert timegroups_groups(description) VALUES ('$description')";
+  $db->query($sql);
+  $timegroup=mysql_insert_id();
+  timeconditions_timegroups_edit_timestrings($timegroup,$timestrings);
+  needreload();
+  return $timegroup;
+}
+
+//delete a single timegroup from the timegroups page
+function timeconditions_timegroups_del_group($timegroup) {
+  global $db;
+
+  $sql = "delete from timegroups_details where timegroupid = $timegroup";
+  $db->query($sql);
+  $sql = "delete from timegroups_groups where id = $timegroup";
+  $db->query($sql);
+  needreload();
+}
+
+//update a single timegroup from the timegroups page
+function timeconditions_timegroups_edit_group($timegroup,$description) {
+  global $db;
+
+  $sql = "update timegroups_groups set description = '$description' where id = $timegroup";
+  $db->query($sql);
+  needreload();
+}
+
+//update the timegroup_detail under a single timegroup from the timegroups page
+function timeconditions_timegroups_edit_times($timegroup,$times) {
+  global $db;
+
+  $sql = "delete from timegroups_details where timegroupid = $timegroup";
+  $db->query($sql);
+  foreach ($times as $key=>$val) {
+    extract($val);
+    $time = timeconditions_timegroups_buildtime( $hour_start, $minute_start, $hour_finish, $minute_finish, $wday_start, $wday_finish, $mday_start, $mday_finish, $month_start, $month_finish);
+    if (isset($time) && $time != '' && $time <> '*|*|*|*') {
+      $sql = "insert timegroups_details (timegroupid, time) values ($timegroup, '$time')";
+      $db->query($sql);
+    }
+  }
+  needreload();
+}
+
+//update the timegroup_detail under a single timegroup 
+function timeconditions_timegroups_edit_timestrings($timegroup,$timestrings) {
+  global $db;
+
+  $sql = "delete from timegroups_details where timegroupid = $timegroup";
+  $db->query($sql);
+  foreach ($timestrings as $key=>$val) {
+    $time = $val;
+    if (isset($time) && $time != '' && $time <> '*|*|*|*') {
+      $sql = "insert timegroups_details (timegroupid, time) values ($timegroup, '$time')";
+      $db->query($sql);
+    }
+  }
+  needreload();
+}
+
+function timeconditions_timegroups_drawgroupselect($elemname, $currentvalue = '', $canbeempty = true, $onchange = '') {
+  global $tabindex;
+  $output = '';
+  $onchange = ($onchange != '') ? " onchange=\"$onchange\"" : '';
+  
+  $output .= "\n\t\t\t<select name=\"$elemname\" tabindex=\"".++$tabindex."\" id=\"$elemname\"$onchange>\n";
+  // include blank option if required
+  if ($canbeempty) {
+    $output .= '<option value="">'._("--Select a Group--").'</option>';     
+  }
+  // build the options
+  $valarray = timeconditions_timegroups_list_groups();
+  foreach ($valarray as $item) {
+    $itemvalue = (isset($item['value']) ? $item['value'] : '');
+    $itemtext = (isset($item['text']) ? _($item['text']) : '');
+    $itemselected = ($currentvalue == $itemvalue) ? ' selected' : '';
+    
+    $output .= "\t\t\t\t<option value=\"$itemvalue\"$itemselected>$itemtext</option>\n";
+  }
+  $output .= "\t\t\t</select>\n\t\t";
+  return $output;
+}
+
+//---------------------------------stolen from time conditions and heavily modified------------------------------------------
+
+function timeconditions_timegroups_drawtimeselects($name, $time) {
+  $html = '';
+  // ----- Load Time Pattern Variables -----
+  if (isset($time)) {
+    list($time_hour, $time_wday, $time_mday, $time_month) = explode('|', $time);
+  } else {
+    list($time_hour, $time_wday, $time_mday, $time_month) = Array('*','-','-','-');
+  }
+  $html = $html.'<tr>';
+  $html = $html.'<td>'._("Time to start:").'</td>';
+  $html = $html.'<td>';
+  // Hour could be *, hh:mm, hh:mm-hhmm
+  if ( $time_hour === '*' ) {
+    $hour_start = $hour_finish = '-';
+    $minute_start = $minute_finish = '-';
+  } else {
+    list($hour_start_string, $hour_finish_string) = explode('-', $time_hour);
+    if ($hour_start_string === '*') {
+      $hour_start_string = $hour_finish_string;
+    }
+    if ($hour_finish_string === '*') {
+      $hour_finish_string = $hour_start_string;
+    }
+    list($hour_start, $minute_start) = explode( ':', $hour_start_string);
+    list($hour_finish, $minute_finish) = explode( ':', $hour_finish_string);
+    if ( !$hour_finish) {
+      $hour_finish = $hour_start;
+    }
+    if ( !$minute_finish) {
+      $minute_finish = $minute_start;
+    }
+  }
+  $html = $html.'<select name="'.$name.'[hour_start]"/>';
+  $default = '';
+  if ( $hour_start === '-' ) {
+    $default = ' selected';
+  }
+  $html = $html."<option value=\"-\" $default>-";
+  for ($i = 0 ; $i < 24 ; $i++) {
+    $default = "";
+    if ( sprintf("%02d", $i) === $hour_start ) {
+      $default = ' selected';
+    }
+    $html = $html."<option value=\"$i\" $default> ".sprintf("%02d", $i);
+  }
+  $html = $html.'</select>';
+  $html = $html.'<nbsp>:<nbsp>';
+  $html = $html.'<select name="'.$name.'[minute_start]"/>';
+  $default = '';
+  if ( $minute_start === '-' ) {
+    $default = ' selected';
+  }
+  $html = $html."<option value=\"-\" $default>-";
+  for ($i = 0 ; $i < 60 ; $i++) {
+    $default = "";
+    if ( sprintf("%02d", $i) === $minute_start ) {
+      $default = ' selected';
+    }
+    $html = $html."<option value=\"$i\" $default> ".sprintf("%02d", $i);
+  }
+  $html = $html.'</select>';
+  $html = $html.'</td>';
+  $html = $html.'</tr>';
+  $html = $html.'<tr>';
+  $html = $html.'<td>'._("Time to finish:").'</td>';
+  $html = $html.'<td>';
+  $html = $html.'<select name="'.$name.'[hour_finish]"/>';
+  $default = '';
+  if ( $hour_finish === '-' ) {
+    $default = ' selected';
+  }
+  $html = $html."<option value=\"-\" $default>-";
+  for ($i = 0 ; $i < 24 ; $i++) {
+    $default = "";
+    if ( sprintf("%02d", $i) === $hour_finish) {
+      $default = ' selected';
+    }
+    $html = $html."<option value=\"$i\" $default> ".sprintf("%02d", $i);
+  }
+  $html = $html.'</select>';
+  $html = $html.'<nbsp>:<nbsp>';
+  $html = $html.'<select name="'.$name.'[minute_finish]"/>';
+  $default = '';
+  if ( $minute_finish === '-' ) {
+    $default = ' selected';
+  }
+  $html = $html."<option value=\"-\" $default>-";
+  for ($i = 0 ; $i < 60 ; $i++) {
+    $default = '';
+    if ( sprintf("%02d", $i) === $minute_finish ) {
+      $default = ' selected';
+    }
+    $html = $html."<option value=\"$i\" $default> ".sprintf("%02d", $i);
+  }
+  $html = $html.'</select>';
+  $html = $html.'</td>';
+  $html = $html.'</tr>';
+  $html = $html.'<tr>';
+
+  // WDay could be *, day, day1-day2
+  if ( $time_wday != '*' ) {
+    list($wday_start, $wday_finish) = explode('-', $time_wday);
+    if ($wday_start === '*') {
+      $wday_start = $wday_finish;
+    }
+    if ($wday_finish === '*') {
+      $wday_finish = $wday_start;
+    }
+    if ( !$wday_finish) {
+      $wday_finish = $wday_start;
+    }
+  } else {
+    $wday_start = $wday_finish = '-';
+  }
+  $html = $html.'<td>'._("Week Day Start:").'</td>';
+  $html = $html.'<td>';
+  $html = $html.'<select name="'.$name.'[wday_start]"/>';
+  if ( $wday_start == '-' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"-\" $default>-";
+ 
+  if ( $wday_start == 'mon' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"mon\" $default>" . _("Monday");
+
+  if ( $wday_start == 'tue' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"tue\" $default>" . _("Tuesday");
+
+  if ( $wday_start == 'wed' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"wed\" $default>" . _("Wednesday");
+
+  if ( $wday_start == 'thu' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"thu\" $default>" . _("Thursday");
+
+  if ( $wday_start == 'fri' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"fri\" $default>" . _("Friday");
+
+  if ( $wday_start == 'sat' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"sat\" $default>" . _("Saturday");
+
+  if ( $wday_start == 'sun' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"sun\" $default>" . _("Sunday");
+
+  $html = $html.'</td>';
+  $html = $html.'</tr>';
+  $html = $html.'<tr>';
+  $html = $html.'<td>'._("Week Day finish:").'</td>';
+  $html = $html.'<td>';
+  $html = $html.'<select name="'.$name.'[wday_finish]"/>';
+
+  if ( $wday_finish == '-' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"-\" $default>-";
+ 
+  if ( $wday_finish == 'mon' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"mon\" $default>" . _("Monday");
+
+  if ( $wday_finish == 'tue' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"tue\" $default>" . _("Tuesday");
+
+  if ( $wday_finish == 'wed' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"wed\" $default>" . _("Wednesday");
+
+  if ( $wday_finish == 'thu' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"thu\" $default>" . _("Thursday");
+
+  if ( $wday_finish == 'fri' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"fri\" $default>" . _("Friday");
+
+  if ( $wday_finish == 'sat' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"sat\" $default>" . _("Saturday");
+
+  if ( $wday_finish == 'sun' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"sun\" $default>" . _("Sunday");
+
+  $html = $html.'</td>';
+  $html = $html.'</tr>';
+  $html = $html.'<tr>';
+  $html = $html.'<td>'._("Month Day start:").'</td>';
+
+  // MDay could be *, day, day1-day2
+  if ( $time_mday != '*' ) {
+    list($mday_start, $mday_finish) = explode('-', $time_mday);
+    if ($mday_start === '*') {
+      $mday_start = $mday_finish;
+    }
+    if ($mday_finish === '*') {
+      $mday_finish = $mday_start;
+    }
+    if ( !$mday_finish) { 
+      $mday_finish = $mday_start;
+    }
+  } else {
+    $mday_start = $mday_finish = '-';
+  }
+
+  $html = $html.'<td>';
+  $html = $html.'<select name="'.$name.'[mday_start]"/>';
+  $default = '';
+  if ( $mday_start == '-' ) {
+    $default = ' selected';
+  }
+  $html = $html."<option value=\"-\" $default>-";
+  for ($i = 1 ; $i < 32 ; $i++) {
+    $default = '';
+    if ( $i == $mday_start ) {
+      $default = ' selected';
+    }
+    $html = $html."<option value=\"$i\" $default> $i";
+  }
+  $html = $html.'</select>';
+  $html = $html.'</td>';
+  $html = $html.'<tr>';
+  $html = $html.'<td>'._("Month Day finish:").'</td>';
+  $html = $html.'<td>';
+  $html = $html.'<select name="'.$name.'[mday_finish]"/>';
+  $default = '';
+  if ( $mday_finish == '-' ) {
+    $default = ' selected';
+  }
+  $html = $html."<option value=\"-\" $default>-";
+  for ($i = 1 ; $i < 32 ; $i++) {
+    $default = '';
+    if ( $i == $mday_finish ) {
+      $default = ' selected';
+    }
+    $html = $html."<option value=\"$i\" $default> $i";
+  }
+  $html = $html.'</select>';
+  $html = $html.'</td>';
+  $html = $html.'</tr>';
+  $html = $html.'<tr>';
+  $html = $html.'<td>'._("Month start:").'</td>';
+
+  // Month could be *, month, month1-month2
+  if ( $time_month != '*' ) {
+    list($month_start, $month_finish) = explode('-', $time_month);
+    if ($month_start === '*') {
+      $month_start = $month_finish;
+    }
+    if ($month_finish === '*') {
+      $month_finish = $month_start;
+    }
+    if ( !$month_finish) {
+      $month_finish = $month_start;
+    }
+  } else {
+    $month_start = $month_finish = '-';
+  }
+  $html = $html.'<td>';
+  $html = $html.'<select name="'.$name.'[month_start]"/>';
+
+  if ( $month_start == '-' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"-\" $default>-";
+
+  if ( $month_start == 'jan' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"jan\" $default>" . _("January");
+                                 
+  if ( $month_start == 'feb' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"feb\" $default>" . _("February");
+  
+  if ( $month_start == 'mar' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"mar\" $default>" . _("March");
+                                 
+  if ( $month_start == 'apr' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"apr\" $default>" . _("April");
+   
+  if ( $month_start == 'may' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"may\" $default>" . _("May");
+                               
+  if ( $month_start == 'jun' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"jun\" $default>" . _("June");
+
+  if ( $month_start == 'jul' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"jul\" $default>" . _("July");
+                                 
+  if ( $month_start == 'aug' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"aug\" $default>" . _("August");
+   
+  if ( $month_start == 'sep' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"sep\" $default>" . _("September");
+                               
+  if ( $month_start == 'oct' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"oct\" $default>" . _("October");
+
+  if ( $month_start == 'nov' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"nov\" $default>" . _("November");
+                                 
+  if ( $month_start == 'dec' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"dec\" $default>" . _("December");
+
+  $html = $html.'</select>';
+  $html = $html.'</td>';
+  $html = $html.'</tr>';
+  $html = $html.'<tr>';
+  $html = $html.'<td>'._("Month finish:").'</td>';
+  $html = $html.'<td>';
+  $html = $html.'<select name="'.$name.'[month_finish]"/>';
+
+  if ( $month_finish == '-' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"-\" $default>-";
+
+  if ( $month_finish == 'jan' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"jan\" $default>" . _("January");
+                                 
+  if ( $month_finish == 'feb' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"feb\" $default>" . _("February");
+  
+  if ( $month_finish == 'mar' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"mar\" $default>" . _("March");
+                                 
+  if ( $month_finish == 'apr' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"apr\" $default>" . _("April");
+   
+  if ( $month_finish == 'may' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"may\" $default>" . _("May");
+                                 
+  if ( $month_finish == 'jun' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"jun\" $default>" . _("June");
+  
+  if ( $month_finish == 'jul' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"jul\" $default>" . _("July");
+                                 
+  if ( $month_finish == 'aug' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"aug\" $default>" . _("August");
+   
+  if ( $month_finish == 'sep' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"sep\" $default>" . _("September");
+                                 
+  if ( $month_finish == 'oct' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"oct\" $default>" . _("October");
+  
+  if ( $month_finish == 'nov' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"nov\" $default>" . _("November");
+                                 
+  if ( $month_finish == 'dec' ) { 
+    $default = ' selected'; 
+  } else {
+    $default = '';
+  }
+  $html = $html."<option value=\"dec\" $default>" . _("December");
+
+  $html = $html.'</select>';
+  $html = $html.'</td>';
+  $html = $html.'</tr>';
+  $html = $html.'</tr>';
+  return $html;
+}
+
+function timeconditions_timegroups_buildtime( $hour_start, $minute_start, $hour_finish, $minute_finish, $wday_start, $wday_finish, $mday_start, $mday_finish, $month_start, $month_finish) {
+
+  //----- Time Hour Interval proccess ----
+  //
+  if ($minute_start == '-') {
+    $time_minute_start = "00";
+  } else {
+    $time_minute_start = sprintf("%02d",$minute_start);
+  }
+  if ($minute_finish == '-') {
+    $time_minute_finish = "00";
+  } else {
+    $time_minute_finish = sprintf("%02d",$minute_finish);
+  }
+  if ($hour_start == '-') {
+    $time_hour_start = '*';
+  } else {
+    $time_hour_start = sprintf("%02d",$hour_start) . ':' . $time_minute_start;
+  }
+  if ($hour_finish == '-') {
+    $time_hour_finish = '*';
+  } else {
+    $time_hour_finish = sprintf("%02d",$hour_finish) . ':' . $time_minute_finish;
+  }
+  if ($time_hour_start === '*') {
+    $time_hour_start = $time_hour_finish;
+  }
+  if ($time_hour_finish === '*') {$time_hour_finish = $time_hour_start;}
+  if ($time_hour_start == $time_hour_finish) {
+    $time_hour = $time_hour_start;
+  } else {
+    $time_hour = $time_hour_start . '-' . $time_hour_finish;
+  }
+
+  //----- Time Week Day Interval proccess -----
+  //
+  if ($wday_start == '-') {
+    $time_wday_start = '*';
+  } else {
+    $time_wday_start = $wday_start;
+  }
+  if ($wday_finish == '-') {
+    $time_wday_finish = '*';
+  } else {
+    $time_wday_finish = $wday_finish;
+  }
+  if ($time_wday_start === '*') {
+    $time_wday_start = $time_wday_finish;
+  }
+  if ($time_wday_finish === '*') {
+    $time_wday_finish = $time_wday_start;
+  }
+  if ($time_wday_start == $time_wday_finish) {
+    $time_wday = $time_wday_start;
+  } else {
+    $time_wday = $time_wday_start . '-' . $time_wday_finish;
+  }
+
+  //----- Time Month Day Interval proccess -----
+  //
+  if ($mday_start == '-') {
+    $time_mday_start = '*';
+  } else {
+    $time_mday_start = $mday_start;
+  }
+  if ($mday_finish == '-') {
+    $time_mday_finish = '*';
+  } else {
+    $time_mday_finish = $mday_finish;
+  }
+  if ($time_mday_start === '*') {
+    $time_mday_start = $time_mday_finish;
+  }
+  if ($time_mday_finish === '*') {
+    $time_mday_finish = $time_mday_start;
+  }
+  if ($time_mday_start == $time_mday_finish) {
+    $time_mday = $time_mday_start;
+  } else {
+    $time_mday = $time_mday_start . '-' . $time_mday_finish;
+  }
+
+  //----- Time Month Interval proccess -----
+  //
+  if ($month_start == '-') {
+    $time_month_start = '*';
+  } else {
+    $time_month_start = $month_start;
+  }
+  if ($month_finish == '-') {
+    $time_month_finish = '*';
+  } else {
+    $time_month_finish = $month_finish;
+  }
+  if ($time_month_start === '*') {
+    $time_month_start = $time_month_finish;
+  }
+  if ($time_month_finish === '*') {
+    $time_month_finish = $time_month_start;
+  }
+  if ($time_month_start == $time_month_finish) {
+    $time_month = $time_month_start;
+  } else {
+    $time_month = $time_month_start . '-' . $time_month_finish;
+  }
+  $time = $time_hour . '|' . $time_wday . '|' . $time_mday . '|' . $time_month;
+  return $time;
+}
+
+//---------------------------end stolen from timeconditions-------------------------------------
+
-?>

modules/branches/2.5/timeconditions/install.php

@@ -1 @@
-
+
+
+
-
-global $db;
-global $amp_conf;
-
+if (! function_exists("out")) {
+  function out($text) {
+    echo $text."<br />";
+  }
+}
+
+if (! function_exists("outn")) {
+  function outn($text) {
+    echo $text;
+  }
+}
+
-$autoincrement = (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) ? "AUTOINCREMENT":"AUTO_INCREMENT";
-
-
+
+
-  timeconditions_id INTEGER NOT NULL PRIMARY KEY $autoincrement,
-  displayname VARCHAR( 50 ) ,
@@ -14 +29 @@
-  deptname VARCHAR( 50 )
-)";
-
-$check = $db->query($sql);
-if(DB::IsError($check)) {
@@ -20 +34 @@
-}
-
+$sql = "
+CREATE TABLE IF NOT EXISTS `timegroups_groups` (
+  `id` int(11) NOT NULL PRIMARY KEY $autoincrement,
+  `description` varchar(50) NOT NULL default '',
+  UNIQUE KEY `display` (`description`)
+) $autoincrement = 1 
+";
+$check = $db->query($sql);
+if(DB::IsError($check)) {
+  die_freepbx("Can not create `timeconditions` table: " .  $check->getMessage() .  "\n");
+}
+
+$sql = "
+CREATE TABLE IF NOT EXISTS `timegroups_details` (
+  `id` int(11) NOT NULL PRIMARY KEY $autoincrement,
+  `timegroupid` int(11) NOT NULL default '0',
+  `time` varchar(100) NOT NULL default ''
+) $autoincrement = 1 
+";
+$check = $db->query($sql);
+if(DB::IsError($check)) {
+  die_freepbx("Can not create `timeconditions` table: " .  $check->getMessage() .  "\n");
+}
+
+// Merge old findmefollow destinations to extension
+//
-$results = array();
-$sql = "SELECT timeconditions_id, truegoto, falsegoto FROM timeconditions";
@@ -41 +81 @@
-}
-
+/* Upgrade to 2.5
+ * Migrate time condtions to new time condtions groups
+ */
+timeconditions_updatedb();
+
+/* Alter the time field to int now that it refernces the id field in groups
+ */
+outn(_("converting timeconditions time field to int.."));
+$sql = "ALTER TABLE `timeconditions` CHANGE `time` `time` INT (11)";
+$results = $db->query($sql);
+if(DB::IsError($results)) {
+  out(_("ERROR: failed to convert field ").$results->getMessage());
+} else {
+  out(_("OK"));
+}
+
+// bring db up to date on install/upgrade
+//
+function timeconditions_updatedb() {
+  $modinfo = module_getinfo('timeconditions');
+  if (is_array($modinfo)) {
+    $ver = $modinfo['timeconditions']['dbversion'];
+
+    // If previous version was older than 2.5 then migrate the timeconditions to groups
+    //
+    if (version_compare_freepbx($ver,'2.5','lt')) { 
+      outn(_("Checking for old timeconditions to upgrade.."));
+      $upgradelist = timeconditions_list_forupgrade();
+      if (isset($upgradelist)) { 
+        // we have old conditions to upgrade
+        //
+        out(_("starting migration"));
+        foreach($upgradelist as $upgrade) {
+          $times[] = $upgrade['time'];
+          $newid = timeconditions_timegroups_add_group_timestrings('migrated-'.$upgrade['displayname'],$times);
+          timeconditions_set_timegroupid($upgrade['timeconditions_id'],$newid);
+          $newtimes = timeconditions_timegroups_get_times($newid);
+          out(sprintf(_("Upgraded %s and created group %s"), $upgrade['displayname'], 'migrated-'.$upgrade['displayname']));
+          if (!is_array($newtimes)) {
+            out(sprintf(_("%sWARNING:%s Not time defined for this condtion, please review"),"<font color='red'>","</font>"));
+          }
+          unset($times);
+        }
+      } else {
+        out(_("no upgrade needed"));
+      }
+    }
+  }
+}
+
+function timeconditions_list_forupgrade() {
+  $results = sql("SELECT * FROM timeconditions","getAll",DB_FETCHMODE_ASSOC);
+  if(is_array($results)){
+    foreach($results as $result){
+      $list[] = $result;
+    }
+  }
+  if (isset($list)) {
+    return $list;
+  } else { 
+    return null;
+  }
+}
+
+function timeconditions_set_timegroupid($id, $timegroup) {
+  sql("UPDATE timeconditions SET time = $timegroup WHERE timeconditions_id = $id;");
+}
-?>

modules/branches/2.5/timeconditions/module.xml

@@ -2 +2 @@
-  <rawname>timeconditions</rawname>
-  <name>Time Conditions</name>
-4.4.3
+5.0
-  <type>setup</type>
-  <category>Inbound Call Control</category>
@@ -9 +9 @@
-  </description>
-  <changelog>
+    *2.5.0* #1695: Merged timegroups and timecondition changes from contributed_modules originally submitted by naftali5
-    *2.4.4.3* #2604, #2765, #2843 fix mal-formed html tags, Russian Translation
-    *2.4.4.2* generate all timeconditions when using database mode authorization and deptarments
@@ -25 +26 @@
-  <menuitems>
-    <timeconditions>Time Conditions</timeconditions>
+    <timegroups>Time Groups</timegroups>
-  </menuitems>
-  <location>release/2.4/timeconditions-2.4.4.3.tgz</location>

modules/branches/2.5/timeconditions/page.timeconditions.php

@@ -18 +18 @@
-
-$dispnum = "timeconditions"; //used for switch on config.php
+$tabindex = 0;
-
-//if submitting form, update database
@@ -57 +58 @@
-</ul></div>
-
-<div class="rnav" style="margin:15px 10px; padding: 5px; background: #e0e0ff; border: #2E78A7 solid 1px;">
-  <?php echo _("Server time:")?> <span id="idTime">00:00:00</span>
-</div>
-
-<script>
-var hour = <?php $l = localtime(); echo $l[2]?>;
-var min  = <?php $l = localtime(); echo $l[1]?>;
-var sec  = <?php $l = localtime(); echo $l[0]?>;
-
-// happily stollen from http://www.aspfaq.com/show.asp?id=2300
-function PadDigits(n, totalDigits) 
-{ 
-  n = n.toString(); 
-  var pd = ''; 
-  if (totalDigits > n.length) 
-  { 
-    for (i=0; i < (totalDigits-n.length); i++) 
-    { 
-      pd += '0'; 
-    } 
-  } 
-  return pd + n.toString(); 
-} 
-
-function updateTime()
-{
-  sec++;
-  if (sec==60)
-  {
-    min++;
-    sec = 0;
-  } 
-    
-  if (min==60)
-  {
-    hour++;
-    min = 0;
-  }
-
-  if (hour==24)
-  {
-    hour = 0;
-  }
-  
-  document.getElementById("idTime").innerHTML = PadDigits(hour,2)+":"+PadDigits(min,2)+":"+PadDigits(sec,2);
-  setTimeout('updateTime()',1000);
-}
-
-updateTime();
-</script>
-
-
-<div class="content">
-<?php
@@ -124 +73 @@
-  <h2><?php echo ($itemid ? _("Time Condition:")." ". $itemid : _("Add Time Condition")); ?></h2>
-<?php   if ($itemid){ ?>
-
-
-
-
-
-
-
-
-
-
+
+
-  <form autocomplete="off" name="edit" action="<?php $_SERVER['PHP_SELF'] ?>" method="post" onsubmit="return edit_onsubmit();">
-  <input type="hidden" name="display" value="<?php echo $dispnum?>">
@@ -150 +91 @@
-  </tr>
-  <tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-  </tr>
-  <tr><td colspan="2"><br><h5><?php echo _("Destination if time matches")?>:<hr></h5></td></tr>
@@ -522 +127 @@
-function edit_onsubmit() {
-  var msgInvalidTimeCondName = "<?php echo _('Please enter a valid Time Conditions Name'); ?>";
-
-
-
-
-
+
-  
-  defaultEmptyOK = false;
-  if (!isAlphanumeric(theForm.displayname.value))
-    return warnInvalid(theForm.displayname, msgInvalidTimeCondName);
+  if (isEmpty(theForm.time.value))
+    return confirm(msgInvalidTimeGroup)
-  
-  // Check to see that they're either all '-' or all numbers.
-  if ((theForm.hour_start.value == "-" || theForm.hour_finish.value == "-"  || theForm.minute_start.value == "-" || theForm.minute_finish.value == "-") && (theForm.hour_start.value != "-" || theForm.hour_finish.value != "-"  || theForm.minute_start.value != "-" || theForm.minute_finish.value != "-")) 
-    return warnInvalid(theForm.displayname, msgInvalidTimeMatch);
-
-  if ((theForm.wday_start.value == "-" || theForm.wday_finish.value == "-") && (theForm.wday_start.value != "-" ||theForm.wday_finish.value != "-" ))
-    return warnInvalid(theForm.displayname, msgInvalidDay);
-
-  if ((theForm.mday_start.value == "-" || theForm.mday_finish.value == "-") && (theForm.mday_start.value != "-" || theForm.mday_finish.value != "-" ))
-    return warnInvalid(theForm.displayname, msgInvalidMday);
-
-  if ((theForm.month_start.value == "-" || theForm.month_finish.value == "-") && (theForm.month_start.value != "-" || theForm.month_finish.value != "-" ))
-    return warnInvalid(theForm.displayname, msgInvalidMth);
-    
-  if (!validateDestinations(edit,2,true))
-    return false;

modules/branches/2.5/timeconditions/uninstall.sql

@@ +1 @@
+DROP TABLE IF EXISTS `timegroups_groups`;
+DROP TABLE IF EXISTS `timegroups_detail`;
-DROP TABLE IF EXISTS `timeconditions`;