Changeset 9823

Timestamp:

06/13/10 11:47:05 (3 years ago)

Author:

p_lindheimer

Message:

revert back the 2.8 changes that were moved to do final pre 2.8 publish

Files:

• contributed_modules/modules/customcontexts/functions.inc.php (modified) (31 diffs)
• contributed_modules/modules/customcontexts/install.php (modified) (2 diffs)
• contributed_modules/modules/customcontexts/install.sql (deleted)
• contributed_modules/modules/customcontexts/module.xml (modified) (3 diffs)
• contributed_modules/modules/customcontexts/page.customcontexts.php (modified) (1 diff)
• contributed_modules/modules/customcontexts/uninstall.php (modified) (1 diff)
• contributed_modules/modules/customcontexts/uninstall.sql (deleted)

contributed_modules/modules/customcontexts/functions.inc.php

@@ -5 +5 @@
-function customcontexts_getmodulevalue($id) {
-global $db;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -39 +37 @@
-  switch($engine) {
-    case 'asterisk':
-
+
+
-      $db->query($sql);
-"select context from customcontexts_contexts_list"
-result
+'SELECT context FROM customcontexts_contexts_list'
+section
-      if(DB::IsError($results)) {
-        $results = null;
-      }
-
-
+
+
+
-        if (isset($ext->_includes[$section])) {
-                $i = 0;
-          foreach ($ext->_includes[$section] as $include) {
+            $i = $i + 1;
-            if ($section == 'outbound-allroutes') {
-
-
-
-
-
-
-
-
+
+
+
+
+
-              $db->query($sql);
-            } else {
-
+
+
-              $db->query($sql);
-
-
+
+
+
+
+
-            $db->query($sql);
-          }
@@ -81 +82 @@
-    // only provide display for outbound routing
-    case 'routing':
-
-
-
-
-
+
-      return '';
-    break;
@@ -94 +91 @@
-}
-
-//this is to catch any rename reorder or delete route, so i can fix custom contexts
-function customcontexts_hookProcess_core($viewing_itemid, $request) {
-  switch ($request['display']) {
-        case 'routing':
-      if(isset($request['Submit'])) {
-//        $route = substr($viewing_itemid,4);
-//        $priority = (int)(substr($viewing_itemid,0,3));
-      } 
-      switch ($request['action']) {
-        case 'delroute':
-//          $route = substr($viewing_itemid,4);
-          $priority = (int)(substr($viewing_itemid,0,3));
-          customcontexts_routing_prioritize($request['action'],$priority);
-        break;
-        case 'prioritizeroute':
-          $fullroute = $viewing_itemid;
-          if (isset($request['reporoutekey'])) {
-                    $outbound_routes = core_routing_getroutenames();
-            $fullroute = $outbound_routes[(int)$request['reporoutekey']][0];
-                }
-//          $route = substr($fullroute,4);
-          $priority = (int)(substr($fullroute,0,3));
-          $direction = $request['reporoutedirection'];
-          customcontexts_routing_prioritize($request['action'],$priority,$direction);
-        break;
-        case 'renameroute';
-          $newname = $request['newroutename'];
-          $route = $viewing_itemid;
-          $priority = (substr($viewing_itemid,0,3));
-                    $fullnewname = 'outrt-'.$priority.'-'.$newname;
-                    $fullroutename = 'outrt-'.$route;
-          customcontexts_routing_editname($fullroutename,$fullnewname);
-        break;
-        default:
-    
-        break;
-      }
-    break;
-  }
-}
-
-function customcontexts_routing_editname($route,$newname) {
-  global $db;
-//fix renamed contexts       
+ //fix renamed contexts
-  $sql = "update customcontexts_includes_list  set include = '$newname', description = '$newname', missing = 0 where context = 'outbound-allroutes' and include = '$route'";
-  $db->query($sql);
-
+ 
-  $sql = "update customcontexts_includes set include = '$newname' where include = '$route'";
-  $db->query($sql);
@@ -146 +102 @@
-
-function customcontexts_routing_prioritize($action,$priority,$direction=null) {
-  
+
-  $outbound_routes = core_routing_getroutenames();
-  foreach ($outbound_routes as $route) {
@@ -162 +118 @@
-        }
-        if (isset($newroute)) {
-//fix prioritized contexts   
+         //fix prioritized contexts
-          $sql = "update customcontexts_includes_list  set include = '$newroute', description = '$newroute', missing = 0, sort = $newpriority where context = 'outbound-allroutes' and include= 'outrt-$routename'";
-
+         
-          $db->query($sql);
-
+         
-          $sql = "update customcontexts_includes set include = '$newroute' where include = 'outrt-$routename'";
-
+         
-          $db->query($sql);
-        }
@@ -175 +131 @@
-            case 'delroute';
-              if ($routepriority > $priority) {
-
-          
-
-
-
-
-
-
-
-
-
-
-
+     
+     
+               
+     
+               
+     
+               
+     
+               
+     
+     
+     
+ 
-    }            
-  }
@@ -199 +155 @@
-  global $db;
-//  $sql = "select include, description from customcontexts_includes_list where context = '".$context."' order by description";
-
+
+
+
+
+
+
+
+
+
-  $results = $db->getAll($sql);
-
+{
-    $results = null;
-
+
+
-    $tmparray[] = array($val[0], $val[1], $val[2]);
+  }
-  return $tmparray;
-}
@@ -213 +179 @@
-  $sql = "select context, description from customcontexts_contexts_list order by description";
-  $results = $db->getAll($sql);
-
+{
-    $results = null;
-
+
+
-    $tmparray[] = array($val[0], $val[1]);
+  }
-  return $tmparray;
-}
@@ -224 +192 @@
-  global $db;
-//  $sql = "select customcontexts_contexts_list.context, customcontexts_contexts_list.description as contextdescription, customcontexts_includes_list.include, customcontexts_includes_list.description, if(saved.include is null, 'no', if(saved.timegroupid is null, 'yes', saved.timegroupid)) as allow, saved.sort from customcontexts_contexts_list inner join customcontexts_includes_list on customcontexts_contexts_list.context = customcontexts_includes_list.context left outer join (select * from customcontexts_includes where context = '$context') saved on customcontexts_includes_list.include = saved.include order by customcontexts_contexts_list.description, customcontexts_includes_list.description";
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  $results = $db->getAll($sql);
-
+{
-    $results = null;
-
+
+
-    $tmparray[] = array($val[0], $val[1], $val[2], $val[3], $val[4], $val[5], $val[6]);
-
+
+
-  return $tmparray;
-}
@@ -279 +274 @@
-}
-
-
-
-
+
+
+
+
+
-function customcontexts_get_config($engine) {
-  global $ext;
@@ -287 +284 @@
-    case 'asterisk':
-  global $db;
-
+
+
-  $results = $db->getAll($sql);
-
+{ 
-    $results = null;
+  }
-  foreach ($results as $val) {
-    $context = $val[0];
-//   
-
+   //
+   
-    $dialpattern = explode("\n",$val[1]);
-    if (!$dialpattern) {
@@ -304 +303 @@
-      
-      // remove blanks
-
+
+
+
-      
-      // remove leading underscores (we do that on backend)
-
+
+
+
-    }
-    // check for duplicates, and re-sequence
@@ -333 +336 @@
-      }
-    }
-
-
-
+
+
+
+
+
+
+
+
-    $results2 = $db->getAll($sql);
-
+{
-      $results2 = null;
+    }
-    foreach ($results2 as $inc) {
+    dbug('$results2',$inc);
-      $time = isset($inc[1])?'|'.$inc[1]:'';
-      switch ($inc[2]) {
@@ -358 +368 @@
-      }
-    }
-
-
+   
+   
-    $ext->add($context,'s', '', new ext_macro('hangupcall')); 
-    $ext->add($context,'h', '', new ext_macro('hangupcall'));
@@ -439 +449 @@
-function customcontexts_devices_configpageload() {
-global $currentcomponent;
-
+ 
-  $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
-  $query="SELECT `data` FROM `sip` WHERE `keyword`='context' AND `id`='".$extdisplay."'";
@@ -449 +459 @@
-function customcontexts_extensions_configpageload() {
-global $currentcomponent;
-
+ 
-  $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
-  $query="SELECT `data` FROM `sip` WHERE `keyword`='context' AND `id`='".$extdisplay."'";
@@ -456 +466 @@
-}
-
-
-
-
-
+
+
+
+
+
+
-function customcontexts_customcontextsadmin_configpageinit($dispnum) {
-global $currentcomponent;
@@ -479 +491 @@
-  if ($action == 'del') {
-    $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Context").": $extdisplay"." deleted!", false), 0);
-
-
-
-
+
+
-    $query = ($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:'type=tool&display=customcontextsadmin&extdisplay='.$extdisplay;
-    $delURL = $_SERVER['PHP_SELF'].'?'.$query.'&action=del';
-    $info = 'The context which contains includes which you would like to make available to '.customcontexts_getmodulevalue('moduledisplayname').'. Any context you enter here will be parsed for includes and you can then include them in your own '.customcontexts_getmodulevalue('moduledisplayname').'. Removing them here does NOT delete the context, rather makes them unavailable to your '.customcontexts_getmodulevalue('moduledisplayname').'.';
-     
+
-    $currentcomponent->addguielem('_bottom', new gui_link('help', _(customcontexts_getmodulevalue('moduledisplayname')." v".customcontexts_getmodulevalue('moduleversion')), 'http://www.freepbx.org/support/documentation/module-documentation/third-party-unsupported-modules/customcontexts', true, false), 0);
+    $currentcomponent->addguielem('_bottom', new gui_link('bounty', 'Module Going END OF LIFE - Click For Details', 'http://www.freepbx.org/bounties/custom-context', true, false), 0);
-    if (!$extdisplay) {
-      $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Add Context"), false), 0);
-      $currentcomponent->addguielem('Context', new gui_textbox('extdisplay', '', 'Context', $info, 'isWhitespace() || !isFilename()', $contexterr, false), 3);
-      $currentcomponent->addguielem('Context', new gui_textbox('description', '', 'Description', 'This will display as a heading for the available includes on the '.customcontexts_getmodulevalue('moduledisplayname').' page.', '!isAlphanumeric() || isWhitespace()', $descerr, false), 3);
-
-
-
+
-      $savedcontext = customcontexts_customcontextsadmin_get($extdisplay);
-      $context = $savedcontext[0];
@@ -512 +521 @@
-      foreach ($inclist as $val) {
-        if ($val[2] > 0) {
-//$gui1 = new gui_textbox('includes['.$val[0].']', $val[1], '<font color="red"><strong>'.$val[0].'</strong></font>', 'This will display as the name of the include on the '.customcontexts_getmodulevalue('moduledisplayname').' page.<BR><font color="red"><strong>NOTE: This include should have a description denoting the fact that allowing it may allow another ENTIRE context!</strong></font>', '!isAlphanumeric() || isWhitespace()', $descerr, false);
-//$inchtml = $gui1->generatehtml();
-//$inchtml = '<tr><td colspan="2"><table><tr><td colspan="2">'.$inchtml.'</td></tr></table></td></tr>'.$inchtml;
-//$currentcomponent->addguielem('Includes Descriptions', new guielement('$val[0]',$inchtml,''),3);
-          $currentcomponent->addguielem('Includes Descriptions', new gui_textbox('includes['.$val[0].']', $val[1], '<font color="red"><strong>'.$val[0].'</strong></font>', 'This will display as the name of the include on the '.customcontexts_getmodulevalue('moduledisplayname').' page.<BR><font color="red"><strong>NOTE: This include should have a description denoting the fact that allowing it may allow another ENTIRE context!</strong></font>', '!isAlphanumeric() || isWhitespace()', $descerr, false), 3);
-        } else {
@@ -601 +606 @@
-//---------------------------------------------
-
-
-
-
-
+
+
+
+
+
-function customcontexts_customcontexts_configpageinit($dispnum) {
-global $currentcomponent;
@@ -640 +646 @@
-  if ($action == 'del') {
-    $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Context").": $extdisplay"." deleted!", false), 0);
-
-
-
-
-
-
+
+
+
+
-    $query = 'type=setup&display=customcontexts&extdisplay='.$extdisplay;
-    $delURL = $_SERVER['PHP_SELF'].'?'.$query.'&action=del';
@@ -651 +655 @@
-    $info = 'The custom context to make will be available in your dialplan. These contexts can be used as a context for a device/extension to allow them limited access to your dialplan.';
-    $currentcomponent->addguielem('_bottom', new gui_link('ver', _(customcontexts_getmodulevalue('moduledisplayname')." v".customcontexts_getmodulevalue('moduleversion')), 'http://www.freepbx.org/support/documentation/module-documentation/third-party-unsupported-modules/customcontexts', true, false), 0);
+    $currentcomponent->addguielem('_bottom', new gui_link('bounty', 'Module Going END OF LIFE - Click For Details', 'http://www.freepbx.org/bounties/custom-context', true, false), 0);
-    if (!$extdisplay) {
-      $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Add Context"), false), 0);
-      $currentcomponent->addguielem('Context', new gui_textbox('extdisplay', '', 'Context', $info, 'isWhitespace() || !isFilename()', $contexterr, false), 3);
-      $currentcomponent->addguielem('Context', new gui_textbox('description', '', 'Description', 'This will display as the name of this custom context.', '!isAlphanumeric() || isWhitespace()', $descerr, false), 3);
-
-
-
+
-      $savedcontext = customcontexts_customcontexts_get($extdisplay);
-      $context = $savedcontext[0];
@@ -668 +671 @@
-      $currentcomponent->addguielem('_top', new gui_hidden('extdisplay', $extdisplay));
-      $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Edit Context").": $description", false), 0);
-//     
+     //
-      $currentcomponent->addguielem('_top', new guielement('del', '<tr><td colspan ="2"><a href="'.$delURL.'" onclick="return confirm(\'Are you sure you want to delete '.$context.'?\')">Delete Context '.$context.'</a></td></tr>', ''),3);
-      $currentcomponent->addguielem('_top', new gui_link('dup', _("Duplicate Context")." $context", $dupURL, true, false), 3);
-      $showsort = customcontexts_getmodulevalue('displaysortforincludes');
-      if ($showsort == 1) {
-//       
-//       
+     //
+     //
-      } else {
-        $sortURL = $_SERVER['PHP_SELF'].'?'.$query.'&showsort=1';
@@ -684 +687 @@
-      $ruleshtml = '<tr><td valign="top"><a href="#" class="info">Dial Rules<span>'.$ruledesc.'</span></a></td><td><textarea cols="20" rows="5" id="dialpattern" name="dialpattern">'.$rulestext.'</textarea></td></tr>';
-      $currentcomponent->addguielem('Context', new guielement('rulesbox',$ruleshtml,''), 3);
-
+
-      $currentcomponent->addguielem('Failover Destination', new gui_textbox('failpin', $failpin, 'PIN', 'Enter a numeric PIN to require authentication before continuing to destination.', '!isPINList()', 'PIN must be numeric!', true), 4);
-      $selhtml = drawselects($faildest ,0);
-      $currentcomponent->addguielem('Failover Destination', new guielement('dest0', $selhtml, ''),4);
-      $currentcomponent->addguielem('Feature Code Failover Destination', new gui_textbox('featurefailpin', $featurefailpin, 'PIN', 'Enter a numeric PIN to require authentication before continuing to destination.', '!isPINList()', 'PIN must be numeric!', true), 4);
-selhtml = drawselects($featurefaildest ,1
-element('dest1', $selhtml, ''),4
+currentcomponent->addguielem('Failover Destination', new gui_drawselects('dest0', 0, $faildest, 'Failover Destination')
+_drawselects('dest1', 1, $featurefaildest, 'Failover Destination')
-      $currentcomponent->addguielem('Set All', new gui_selectbox('setall', $currentcomponent->getoptlist('includeyn'), '', 'Set All To:', 'Choose allow to allow access to all includes, choose deny to deny access.',true,'javascript:for (i=0;i<document.forms[\'frm_customcontexts\'].length;i++) {if(document.forms[\'frm_customcontexts\'][i].type==\'select-one\' && document.forms[\'frm_customcontexts\'][i].name.indexOf(\'[allow]\') >= 0 ) {document.forms[\'frm_customcontexts\'][i].selectedIndex = document.forms[\'frm_customcontexts\'][\'setall\'].selectedIndex-1;}}'),2);
-      $inclist = customcontexts_getincludes($extdisplay);
-      foreach ($inclist as $val) {
-        if ($showsort == 1) {
-//$gui1 = new gui_textbox('includes['.$val[0].']', $val[1], '<font color="red"><strong>'.$val[0].'</strong></font>', 'This will display as the name of the include on the '.customcontexts_getmodulevalue('moduledisplayname').' page.<BR><font color="red"><strong>NOTE: This include should have a description denoting the fact that allowing it may allow another ENTIRE context!</strong></font>', '!isAlphanumeric() || isWhitespace()', $descerr, false);
-//$inchtml = $gui1->generatehtml();
-//$inchtml = '<tr><td colspan="2"><table><tr><td colspan="2">'.$inchtml.'</td></tr></table></td></tr>'.$inchtml;
-//$currentcomponent->addguielem('Includes Descriptions', new guielement('$val[0]',$inchtml,''),3);
-          if ($val[6] > 0) {
-
-
+
+
+
+
+
-          } else {
-
-
+
+
+
+
-          }
-//         
+         //
-          $guisort = new gui_selectbox('includes['.$val[2].'][sort]', $currentcomponent->getoptlist('includesort'), $val[5], '<div align="right">Priority</div>', 'Choose a priority with which to sort this option. Lower numbers have a higher priority.',false);
-          $inchtml = '<tr><td colspan="2"><table width="100%"><tr><td></td><td width="50"></td></tr>'.$gui1->generatehtml().'</table></td><td><table>'.$guisort->generatehtml().'</table></td></tr>';
@@ -712 +714 @@
-        } else {
-          if ($val[6] > 0) {
-
+
+
+
-          } else {
-
+
+
+
-          }
-        }
@@ -874 +880 @@
-//---------------------------------------------
-
-
-
-
-
+
+
+
+
+
-function customcontexts_customcontextstimes_configpageinit($dispnum) {
-global $currentcomponent;
@@ -896 +903 @@
-  if ($action == 'del') {
-    $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Time Group").": $extdisplay"." deleted!", false), 0);
-
-
-
-
+
+
-    $query = ($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:'type=setup&display=customcontextstimes&extdisplay='.$extdisplay;
-    $delURL = $_SERVER['PHP_SELF'].'?'.$query.'&action=del';
-    $info = '';
-    $currentcomponent->addguielem('_bottom', new gui_link('ver', _(customcontexts_getmodulevalue('moduledisplayname')." v".customcontexts_getmodulevalue('moduleversion')), 'http://www.freepbx.org/support/documentation/module-documentation/third-party-unsupported-modules/customcontexts', true, false), 0);
+    $currentcomponent->addguielem('_bottom', new gui_link('bounty', 'Module Going END OF LIFE - Click For Details', 'http://www.freepbx.org/bounties/custom-context', true, false), 0);
-    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);
-
-
-
+
-      $savedtimegroup= customcontexts_customcontextstimes_get($extdisplay);
-      $timegroup = $savedtimegroup[0];
@@ -916 +920 @@
-      $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 = customcontexts_gettimes($extdisplay);
-      foreach ($timelist as $val) {
-
-
-
-
+       
+ 
+ 
+ 
-      }
-    $timehtml = drawtimeselects('times[new]',null);
@@ -938 +942 @@
-  $timegroup= isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
-  $description= isset($_REQUEST['description'])?$_REQUEST['description']:null;
-
+ 
-  switch ($action) {
-  case 'add':
@@ -1344 +1348 @@
-
-function customcontexts_customcontextstimes_buildtime( $hour_start, $minute_start, $hour_finish, $minute_finish, $wday_start, $wday_finish, $mday_start, $mday_finish, $month_start, $month_finish) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-//---------------------------end stolen from timeconditions-------------------------------------

contributed_modules/modules/customcontexts/install.php

@@ -16 +16 @@
--->
-<?php
+
+global $db;
+global $amp_conf;
+
+if (! function_exists("out")) {
+  function out($text) {
+    echo $text."<br />";
+  }
+}
+
+if (! function_exists("outn")) {
+  function outn($text) {
+    echo $text;
+  }
+}
+
+
+$sql[] ="CREATE TABLE IF NOT EXISTS `customcontexts_contexts` (
+        `context` varchar(100) NOT NULL default '',
+        `description` varchar(100) NOT NULL default '',
+        PRIMARY KEY  (`context`),
+        UNIQUE KEY `description` (`description`)
+      )";
+
+
+$sql[] ="CREATE TABLE IF NOT EXISTS `customcontexts_contexts_list` (
+        `context` varchar(100) NOT NULL default '',
+        `description` varchar(100) NOT NULL default '',
+        `locked` tinyint(1) NOT NULL default '0',
+        PRIMARY KEY  (`context`),
+        UNIQUE KEY `description` (`description`)
+        )";
+
+$sql[] ="INSERT IGNORE INTO `customcontexts_contexts_list` 
+        (`context`, `description`, `locked`) 
+        VALUES ('from-internal', 'Default Internal Context', 1),
+        ('from-internal-additional', 'Internal Dialplan', 0),('outbound-allroutes', 'Outbound Routes', 0)";
+
+$sql[] ="CREATE TABLE IF NOT EXISTS `customcontexts_includes` (
+  `context` varchar(100) NOT NULL default '',
+  `include` varchar(100) NOT NULL default '',
+  `timegroupid` int(11) default NULL,
+  `sort` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`context`,`include`),
+  KEY `sort` (`sort`)
+)";
+
+$sql[] ="ALTER IGNORE TABLE `customcontexts_includes` ADD `timegroupid` INT NULL AFTER `include`";
+
+$sql[] ="CREATE TABLE IF NOT EXISTS `customcontexts_includes_list` (
+  `context` varchar(100) NOT NULL default '',
+  `include` varchar(100) NOT NULL default '',
+  `description` varchar(100) NOT NULL default '',
+  PRIMARY KEY  (`context`,`include`)
+)";
+
+$sql[] ="ALTER IGNORE TABLE `customcontexts_includes_list` ADD `missing` BOOL NOT NULL DEFAULT '0'";
+
+
+$sql[] ="INSERT IGNORE INTO `customcontexts_includes_list` (`context`, `include`, `description`) VALUES ('from-internal', 'parkedcalls', 'Call Parking'),
+('from-internal', 'from-internal-custom', 'Custom Internal Dialplan'),
+('from-internal', 'ext-fax', 'Fax')";
+
+$sql[] ="INSERT IGNORE INTO `customcontexts_includes_list` (`context`, `include`, `description`) VALUES ('from-internal-additional', 'outbound-allroutes', 'ALL OUTBOUND ROUTES'),
+('from-internal', 'from-internal-additional', 'ENTIRE Basic Internal Dialplan')";
+
+$sql[] ="UPDATE `customcontexts_includes_list` SET `description` = 'ALL OUTBOUND ROUTES' WHERE  `context` = 'from-internal-additional' AND `include` = 'outbound-allroutes'";
+
+$sql[] ="CREATE TABLE IF NOT EXISTS `customcontexts_module` (
+  `id` varchar(50) NOT NULL default '',
+  `value` varchar(100) NOT NULL default '',
+  PRIMARY KEY  (`id`)
+)";
+
+$sql[] ="INSERT IGNORE INTO `customcontexts_module` (`id`, `value`) VALUES ('modulerawname', 'customcontexts'),
+        ('moduledisplayname', 'Custom Contexts'),
+        ('moduleversion', '0.3.2'),
+        ('displaysortforincludes', 1)";
+
+$sql[] ="UPDATE `customcontexts_module` set `value` = '0.3.2' where `id` = 'moduleversion';";
+
+$sql[] ="CREATE TABLE IF NOT EXISTS `customcontexts_timegroups` (
+  `id` int(11) NOT NULL auto_increment,
+  `description` varchar(50) NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `display` (`description`)
+) AUTO_INCREMENT=4 ";
+
+$sql[] ="CREATE TABLE IF NOT EXISTS `customcontexts_timegroups_detail` (
+  `id` int(11) NOT NULL auto_increment,
+  `timegroupid` int(11) NOT NULL default '0',
+  `time` varchar(100) NOT NULL default '',
+  PRIMARY KEY  (`id`)
+) AUTO_INCREMENT=20";
+
+foreach ($sql as $q){
+  $db->query($sql);
+}
+
-customcontexts_updatedb();
-
@@ -38 +137 @@
-  $db->query($sql);
-}
+
+outn(_("checking if migration required..."));
+$modinfo = module_getinfo('customcontexts');
+if (is_array($modinfo)) {
+  $ver = $modinfo['customcontexts']['dbversion'];
+  if (version_compare($ver,'0.3.6','le')) {
+      outn(_("migrating.."));
+      /* We need to now migrate from from the old format of dispname_id where the only supported dispname
+         so far has been "routing" and the "id" used was the imperfect nnn-name. As it truns out, it was
+         possible to have the same route name perfiously so we will try to detect that. This was really ugly
+         so if we can't find stuff we will simply report errors and let the user go back and fix things.
+       */
+      $sql = "SELECT * FROM customcontexts_includes_list WHERE context = 'outbound-allroutes'";
+      $includes = $db->getAll($sql, DB_FETCHMODE_ASSOC);
+      if(DB::IsError($result) || !isset($includes)) { 
+        out(_("Unknown error fetching table data or no data to migrate"));
+        out(_("Migration aborted"));
+      } else {
+        /* If there are any rows then lets get our route information. We will force this module to depend on
+         * the new core, so we can count on the APIs being available. If there are indentical names, then
+         * oh well...
+         */
+        $routes = core_routing_list();
+        $newincludes = array();
+        foreach ($includes as $myinclude) {
+          $include = explode('-',$myinclude['include'],3);
+          $include[1] = (int)$include[1];
+          
+          foreach ($routes as $route) {
+            //if we have a trunk with the same name or the same number mathc it and take it out of the list
+            if ($include[2] == $route['name'] || $include[1] == $route['route_id']){
+              $newincludes[] = array('new' => 'outrt-'.$route['route_id'], 
+                                  'sort' => $route['seq'], 'old' => $include);
+              unset($includes[$myinclude]);
+            } 
+          } 
+        }
+
+        //alert user of unmigrated routes
+        foreach ($includes as $include) {
+          out(_('FAILED to migrating route '.$include['description'].'. NO MATCH FOUND'));
+          outn(_("continuing..."));
+        }
+
+        // We new have all the indices, so lets save them
+        //
+        $sql = $db->prepare('UPDATE customcontexts_includes_list SET include = ?, sort = ? WHERE include = ?');
+        //$result = $db->executeMultiple($sql,$newincludes);
+        if(DB::IsError($result)) {
+          out("FATAL: ".$result->getDebugInfo()."\n".'error updating customcontexts_includes_list table. Aborting!'); 
+        } else {
+          //now update the next table
+          foreach ($newincludes as $newinclude){ 
+            unset($newincludes[$newinclude]['sort']);
+          }
+          $sql = $db->prepare('UPDATE customcontexts_includes SET include = ?, WHERE include = ?');
+          //$result = $db->executeMultiple($sql,$newincludes);
+          if(DB::IsError($result)) {
+            out("FATAL: ".$result->getDebugInfo()."\n".'error updating customcontexts_includes table. Aborting!');  
+          } else {
+          out(_("done"));         
+        }
+      }
+    }
+  }
+}
+
+
-?>

contributed_modules/modules/customcontexts/module.xml

@@ -2 +2 @@
-  <rawname>customcontexts</rawname>
-  <name>Custom Contexts</name>
-0.3.7
+2.8.0beta1.0
-  <type>setup</type>
-  <category>Third Party Addon</category>
-  <description>
-
-
-
-
-
-
-
+
-  </description>
-  <menuitems>
@@ -20 +14 @@
-  </menuitems>
-        <depends>
-lt
+
-          <module>core</module>
-        </depends>
-        <changelog>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        </changelog>
-  <attention>
@@ -57 +41 @@
-    REMEMBER! Any device placed in a restricted context will have no access to the dialplan if this module is disabled until it is placed in a normal context!
-  </attention>
-7
-f4fd5fd77afb3a9c41d56efb34577d29
+5
+69192c610cb8985dc3baee543ffe9ef0
-</module>

contributed_modules/modules/customcontexts/page.customcontexts.php

@@ -12 +12 @@
-
-$dispnum = 'customcontexts'; //used for switch on config.php
-
-?>
-

contributed_modules/modules/customcontexts/uninstall.php

@@ -10 +10 @@
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//GNU General Public License for more details.
+
+$sql[] = "DROP TABLE IF EXISTS `customcontexts_contexts`";
+$sql[] = "DROP TABLE IF EXISTS `customcontexts_contexts_list`";
+$sql[] = "DROP TABLE IF EXISTS `customcontexts_includes`";
+$sql[] = "DROP TABLE IF EXISTS `customcontexts_includes_list`";
+$sql[] = "DROP TABLE IF EXISTS `customcontexts_module`";
+$sql[] = "DROP TABLE IF EXISTS `customcontexts_timegroups`";
+$sql[] = "DROP TABLE IF EXISTS `customcontexts_timegroups_detail`";
+foreach ($sql as $q){
+  $db->query($sql);
+}
-?>
-<font color="red"><strong>You have uninstalled the Custom Contexts Module!<BR>