Changeset 10850

Timestamp:

01/08/11 22:45:06 (2 years ago)

Author:

p_lindheimer

Message:

remove IVR migrations code and keep admin table for one-off tracking, WARNING: needs testing once merged back from bootstrap branch

Files:

• modules/branches/bootstrap-2.9/directory/functions.inc.php (modified) (2 diffs)
• modules/branches/bootstrap-2.9/directory/install.php (modified) (6 diffs)
• modules/branches/bootstrap-2.9/directory/uninstall.php (modified) (1 diff)

modules/branches/bootstrap-2.9/directory/functions.inc.php

@@ -352 +352 @@
-  
-  if ($default_directory) {
-directory
+admin
-  } else {
-directory
+admin
-  }
-}
@@ -361 +361 @@
-  global $db;
-
-directory
+admin
-  return $ret ? $ret : '';
-

modules/branches/bootstrap-2.9/directory/install.php

@@ -41 +41 @@
-    audio varchar(50),
-    dial varchar(50) default ''
-  )";
-
-$sql[] = "CREATE TABLE IF NOT EXISTS directory (
-    `key` varchar(50) UNIQUE key,
-    `value` varchar(150)
-  )";
-
@@ -121 +116 @@
-}
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
-if (!$migrated) {
-  //migrate legacy directories to new directory
@@ -141 +127 @@
-  $section = null;
-  $vmusers = array();
-_directory_migration
+
-  if (isset($vmconf) && $vmconf) {
-    foreach ($vmconf['default'] as $ext => $vm) {
@@ -181 +167 @@
-    }
-  
-ua
+au
-    if (!isset($def_dir) || !$def_dir) {
-ua
+au
-      $sql = 'REPLACE INTO `directory` (`key`, value) VALUES ("default_directory", ?)';
-      $db->query($sql, $newdir);
@@ -189 +175 @@
-  }
-
-
-  //check to see if were using the directory in ivr's, ensureing that we have ivr's
-  $ivr_stat = $db->getOne('SELECT count(*) FROM modules WHERE modulename = "ivr" AND enabled = 1');
-  if(DB::IsError($q)) { 
-    die_freepbx(_('Error migrating to new directory! ERROR: Could not get Ivr status ' . $q->getDebugInfo()));
-  }
-  if ($ivr_stat == 1) {
-    $count = $db->getOne('SELECT count(*) FROM ivr WHERE displayname != "__install_done"');
-    if(DB::IsError($count)) { 
-      die_freepbx(_('Error migrating to new directory! ERROR: Could not get count of Ivr\'s using the legacy Directory ' . $q->getDebugInfo()));
-    }
-  } else {
-    $count = 0;
-  }
-
-  //Migrate ivr's if we have ivr's using directory
-  if ($count > 0) { 
-    out(_("Migrating Ivr's to new Directory"));
-    //if we were able to set a new directory
-    if (isset($newdir) && $newdir){
-      //get al ivr's
-      $ivrs = $db->getAll('SELECT * FROM ivr WHERE displayname != "__install_done"', DB_FETCHMODE_ASSOC);
-      if(DB::IsError($ivrs)) { 
-        die_freepbx(_('Error migrating to new directory! ERROR: Could not get all Ivr\'s'));
-      }
-    
-      //get misc destinations that might be referencing legacy directory
-      $miscdests = $db->getAll('SELECT id FROM miscdests WHERE destdial = "{infoservices:directory}"');
-      foreach ($miscdests as $m) {
-        $miscdest[] = 'ext-miscdests,' . $m[0] . ',1';
-      }
-      //iterate over ivr's and their entries, looking  for a misc apps that might be legacy directory or a # dest
-      foreach ($ivrs as $ivr) {
-        out(_("Migrating Ivr " . $ivr['displayname'] . "'s entires to new Directory"));
-        
-        //is this ivr set to use directory?
-        $true_opts = array('1', 'on', 'ON', 'CHECKED', 'checked', 'TRUE', 'true');
-        if (in_array($ivr['enable_directory'], $true_opts)) {
-          out(_("Removing legacy Directory from Ivr " . $ivr['displayname'] . "'s destinations"));
-          
-          //update ivr dests
-          $sql = 'UPDATE ivr_dests SET dest = ? WHERE ivr_id = ? AND ';
-          //add misc diests if we have any
-          if (isset($miscdest) && $miscdest) {
-            $sql .= ' (selection = "#" ';
-            $m = array();
-            foreach ($miscdest as $md) {
-              $m[] = '"' . $md . '"';
-            }
-            $sql .= ' OR dest IN(' . implode(',', $m) . ') )';
-          } else {
-            $sql .= ' selection = "#" ';
-          }
-          $q = $db->query($sql, array($dirdest, $ivr['ivr_id']));
-          if(DB::IsError($q)) { 
-            die_freepbx(_('Error migrating to new directory! ERROR: Failed to update ivr destinations ' . $q->getDebugInfo()));
-          }
-          
-          
-          //check to ensure that we have a # destination
-          $sql = 'SELECT COUNT(*) FROM ivr_dests WHERE ivr_id = ? AND selection = "#"';
-          $pound_count = $db->getOne($sql, array($ivr['ivr_id']));
-          
-          if ($pound_count < 1) {
-            $sql = 'INSERT INTO ivr_dests (ivr_id, selection, dest) VALUES (?, ?, ?)';
-            $q = $db->query($sql, array($ivr['ivr_id'], '#', $dirdest));
-            if(DB::IsError($q)) { 
-              die_freepbx(_('Error migrating to new directory! ERROR: Failed to add ivr destination # ' . $q->getDebugInfo()));
-            }
-          }
-          
-          //remove the legacy directroy option from this ivr
-          $sql = 'UPDATE ivr SET enable_directory = "" WHERE ivr_id = ?';
-          $q = $db->query($sql, array($ivr['ivr_id']));
-          if(DB::IsError($q)) { 
-            die_freepbx(_('Error migrating to new directory! ERROR: Failed to unset enable_directory from ivr ' . $q->getDebugInfo()));
-          }
-        } else {//even if it wasnt set to use the legace directory, ensure that we dont have mics dests pointing at it
-          if (isset($miscdest) && $miscdest) {
-            $sql = 'UPDATE ivr_dests SET dest = ? WHERE ivr_id = ? AND dest';
-            $m = array();
-            foreach ($miscdest as $md) {
-              $m[] = '"' . $md . '"';
-            }
-            $sql .= ' IN(' . implode(',', $m) . ')';
-            $q = $db->query($sql, array($dirdest, $ivr['ivr_id']));
-            if(DB::IsError($q)) { 
-              die_freepbx(_('Error migrating to new directory! ERROR: Failed to update ivr destinations (2) ' . $q->getDebugInfo()));
-            }
-          } 
-        }
-      }//<--- end ivr foreach loop
-    } else { //if we dont have/couldnt create a new directory, assume there are no vm users and disable the option from ivr's
-      out(_("Removing legacy Directory from Ivr " . $ivr['displayname']));
-      $q = $db->query('UPDATE ivr SET enable_directory = ""');
-      if(DB::IsError($q)) { 
-        die_freepbx(_('Error migrating to new directory! ERROR: Failed to unset enable_directory from ivr (2) ' . $q->getDebugInfo()));
-      }
-    }
-  }//<--- end ivr if case
-
-  //TODO: migrate misc dests if any are using legacy directory
-  
-  //Seem where done with migration - mark that in the database
-
-directory
+ != ""
+admin
-  if(DB::IsError($q)) { 
-    die_freepbx(_('Error migrating to new directory! ERROR: Unable to mark Directory as migrated. Migration will probobly be run again at next install/upgrade of this module. ' . $q->getDebugInfo()));
@@ -300 +183 @@
-  out(_('Migration Complete!'));
-}
-
-/** Recursively read voicemail.conf (and any included files)
- * This function coppied from functions.inc.php
- */
-function parse_voicemailconf_directory_migration($filename, &$vmconf, &$section) {
-  if (is_null($vmconf)) {
-    $vmconf = array();
-  }
-  if (is_null($section)) {
-    $section = "general";
-  }
-  
-  if (file_exists($filename)) {
-    $fd = fopen($filename, "r");
-    while ($line = fgets($fd, 1024)) {
-      if (preg_match("/^\s*(\d+)\s*=>\s*(\d*),(.*),(.*),(.*),(.*)\s*([;#].*)?/",$line,$matches)) {
-        // "mailbox=>password,name,email,pager,options"
-        // this is a voicemail line 
-        $vmconf[$section][ $matches[1] ] = array("mailbox"=>$matches[1],
-                  "pwd"=>$matches[2],
-                  "name"=>$matches[3],
-                  "email"=>$matches[4],
-                  "pager"=>$matches[5],
-                  "options"=>array(),
-                  );
-                
-        // parse options
-        //output($matches);
-        foreach (explode("|",$matches[6]) as $opt) {
-          $temp = explode("=",$opt);
-          //output($temp);
-          if (isset($temp[1])) {
-            list($key,$value) = $temp;
-            $vmconf[$section][ $matches[1] ]["options"][$key] = $value;
-          }
-        }
-      } else if (preg_match('/^(?:\s*)#include(?:\s+)["\']{0,1}([^"\']*)["\']{0,1}(\s*[;#].*)?$/',$line,$matches)) {
-        // include another file
-        
-        if ($matches[1][0] == "/") {
-          // absolute path
-          $filename = trim($matches[1]);
-        } else {
-          // relative path
-          $filename =  dirname($filename)."/".trim($matches[1]);
-        }
-        
-        parse_voicemailconf_directory_migration($filename, $vmconf, $section);
-        
-      } else if (preg_match("/^\s*\[(.+)\]/",$line,$matches)) {
-        // section name
-        $section = strtolower($matches[1]);
-      } else if (preg_match("/^\s*([a-zA-Z0-9-_]+)\s*=\s*(.*?)\s*([;#].*)?$/",$line,$matches)) {
-        // name = value
-        // option line
-        $vmconf[$section][ $matches[1] ] = $matches[2];
-      }
-    }
-    fclose($fd);
-  }
-}
-?>

modules/branches/bootstrap-2.9/directory/uninstall.php

@@ -11 +11 @@
-  }
-}
-
-
+
+
+
+
+
+
+
-out(_('ok'));
-?>