Changeset 6158

Timestamp:

07/23/08 19:12:17 (4 months ago)

Author:

p_lindheimer

Message:

#2065 Migrate recordings to recording ids

Files:

• modules/branches/2.5/findmefollow/functions.inc.php (modified) (6 diffs)
• modules/branches/2.5/findmefollow/install.php (modified) (4 diffs)
• modules/branches/2.5/findmefollow/install.sql (deleted)
• modules/branches/2.5/findmefollow/module.xml (modified) (2 diffs)
• modules/branches/2.5/findmefollow/page.findmefollow.php (modified) (8 diffs)
• modules/branches/2.5/findmefollow/uninstall.php (modified) (1 diff)
• modules/branches/2.5/findmefollow/uninstall.sql (deleted)

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

@@ -46 +46 @@
-                                        $postdest = $grp['postdest'];
-                                        $grppre = (isset($grp['grppre'])?$grp['grppre']:'');
- = $grp['annmsg
+_id = $grp['annmsg_id
-                                        $dring = $grp['dring'];
-
-                                        $needsconf = $grp['needsconf'];
- = $grp['remotealert
- = $grp['toolate
+_id = $grp['remotealert_id
+_id = $grp['toolate_id
-                                        $ringing = $grp['ringing'];
-                                        $pre_ring = $grp['pre_ring'];
@@ -129 +129 @@
-                                        $ext->add($contextname, $grpnum, '', new ext_setvar('RingGroupMethod',$strategy));
-                                        $ext->add($contextname, $grpnum, '', new ext_setvar('_FMGRP',$grpnum));
-
+
+
-                                                // should always answer before playing anything, shouldn't we ?
-                                                $ext->add($contextname, $grpnum, '', new ext_gotoif('$[$["${DIALSTATUS}" = "ANSWER"] | $["foo${RRNODEST}" != "foo"]]','DIALGRP'));                      
@@ -139 +140 @@
-                                        // Create the confirm target
-                                        $len=strlen($grpnum)+4;
+                                        $remotealert = recordings_get_file($remotealert_id);
+                                        $toolate = recordings_get_file($toolate_id);
-                                        $ext->add("fmgrps", "_RG-${grpnum}-.", '', new ext_macro('dial','${DB(AMPUSER/'."$grpnum/followme/grptime)},".
-                                                "M(confirm^${remotealert}^${toolate}^${grpnum})$dialopts".',${EXTEN:'.$len.'}'));
@@ -184 +187 @@
-}
-
-='',$dring,$needsconf,$remotealert,$toolate
+_id='',$dring,$needsconf,$remotealert_id,$toolate_id
-        global $amp_conf;
-        global $astman;
-
-, postdest, dring, needsconf, remotealert, toolate, ringing, pre_ring) VALUES ('".str_replace("'", "''",$grpnum)."', '".str_replace("'", "''", $strategy)."', ".str_replace("'", "''", $grptime).", '".str_replace("'", "''", $grppre)."', '".str_replace("'", "''", $grplist)."', '".str_replace("'", "''", $annmsg)."', '".str_replace("'", "''", $postdest)."', '".str_replace("'", "''", $dring)."', '$needsconf', '$remotealert', '$toolate
+_id, postdest, dring, needsconf, remotealert_id, toolate_id, ringing, pre_ring) VALUES ('".str_replace("'", "''",$grpnum)."', '".str_replace("'", "''", $strategy)."', ".str_replace("'", "''", $grptime).", '".str_replace("'", "''", $grppre)."', '".str_replace("'", "''", $grplist)."', '".str_replace("'", "''", $annmsg_id)."', '".str_replace("'", "''", $postdest)."', '".str_replace("'", "''", $dring)."', '$needsconf', '$remotealert_id', '$toolate_id
-        $results = sql($sql);
-
@@ -293 +296 @@
-        global $astman;
-
-, postdest, dring, needsconf, remotealert, toolate
+_id, postdest, dring, needsconf, remotealert_id, toolate_id
-
-        if ($check_astdb) {
@@ -417 +420 @@
-}
-
+function findmefollow_recordings_usage($recording_id) {
+        global $active_modules;
+
+        $results = sql("SELECT `grpnum` FROM `findmefollow` WHERE `annmsg_id` = '$recording_id' OR `remotealert_id` = '$recording_id' OR `toolate_id` = '$recording_id'","getAll",DB_FETCHMODE_ASSOC);
+        if (empty($results)) {
+                return array();
+        } else {
+                //$type = isset($active_modules['ivr']['type'])?$active_modules['ivr']['type']:'setup';
+                foreach ($results as $result) {
+                        $usage_arr[] = array(
+                                'url_query' => 'config.php?display=findmefollow&extdisplay=GRP-'.urlencode($result['grpnum']),
+                                'description' => "Follow-Me User: ".$result['grpnum'],
+                        );
+                }
+                return $usage_arr;
+        }
+}
+
-function findmefollow_fmf_toggle($c) {
-        global $ext;

modules/branches/2.5/findmefollow/install.php

@@ -2 +2 @@
-
-global $db;
+global $amp_conf;
+global $astman;
+
+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 `findmefollow` 
+( 
+        `grpnum` VARCHAR( 20 ) NOT NULL , 
+        `strategy` VARCHAR( 50 ) NOT NULL , 
+        `grptime` SMALLINT NOT NULL , 
+        `grppre` VARCHAR( 100 ) NULL , 
+        `grplist` VARCHAR( 255 ) NOT NULL , 
+        `annmsg_id` INTEGER,
+        `postdest` VARCHAR( 255 ) NULL , 
+        `dring` VARCHAR ( 255 ) NULL , 
+        `remotealert_id` INTEGER,
+        `needsconf` VARCHAR ( 10 ), 
+        `toolate_id` INTEGER,
+        `pre_ring` SMALLINT NOT NULL DEFAULT 0, 
+        PRIMARY KEY  (`grpnum`) 
+)
+";
+$check = $db->query($sql);
+if(DB::IsError($check)) {
+        die_freepbx("Can not create annoucment table");
+}
-
-//TODO: Also need to create all the states if enabled
@@ -20 +57 @@
-    if(DB::IsError($result)) { die_freepbx($result->getDebugInfo()); }
-}
-
-
+
+
+
+
+
-$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
-if(DB::IsError($check)) {
@@ -75 +115 @@
-// is this global...? what if we include this files
-// from a function...?
-global $astman;
-global $amp_conf;
-
-$sql = "SELECT * FROM findmefollow";
@@ -107 +145 @@
-}
-
+// Version 2.5 migrate to recording ids
+//
+outn(_("Checking if recordings need migration.."));
+$sql = "SELECT annmsg_id FROM findmefollow";
+$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+if(DB::IsError($check)) {
+        //  Add recording_id field
+        //
+        out("migrating");
+        outn(_("adding annmsg_id field.."));
+  $sql = "ALTER TABLE findmefollow ADD annmsg_id INTEGER";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) {
+                out(_("fatal error"));
+                die_freepbx($result->getDebugInfo()); 
+        } else {
+                out(_("ok"));
+        }
+        outn(_("adding remotealert_id field.."));
+  $sql = "ALTER TABLE findmefollow ADD remotealert_id INTEGER";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) {
+                out(_("fatal error"));
+                die_freepbx($result->getDebugInfo()); 
+        } else {
+                out(_("ok"));
+        }
+        outn(_("adding toolate_id field.."));
+  $sql = "ALTER TABLE findmefollow ADD toolate_id INTEGER";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) {
+                out(_("fatal error"));
+                die_freepbx($result->getDebugInfo()); 
+        } else {
+                out(_("ok"));
+        }
+
+        // Get all the valudes and replace them with recording_id
+        //
+        outn(_("migrate annmsg to ids.."));
+  $sql = "SELECT `grpnum`, `annmsg` FROM `findmefollow`";
+        $results = $db->getAll($sql, DB_FETCHMODE_ASSOC);
+        if(DB::IsError($results)) {
+                out(_("fatal error"));
+                die_freepbx($results->getDebugInfo());  
+        }
+        $migrate_arr = array();
+        $count = 0;
+        foreach ($results as $row) {
+                if (trim($row['annmsg']) != '') {
+                        $rec_id = recordings_get_or_create_id($row['annmsg'], 'findmefollow');
+                        $migrate_arr[] = array($rec_id, $row['grpnum']);
+                        $count++;
+                }
+        }
+        if ($count) {
+                $compiled = $db->prepare('UPDATE `findmefollow` SET `annmsg_id` = ? WHERE `grpnum` = ?');
+                $result = $db->executeMultiple($compiled,$migrate_arr);
+                if(DB::IsError($result)) {
+                        out(_("fatal error"));
+                        die_freepbx($result->getDebugInfo());   
+                }
+        }
+        out(sprintf(_("migrated %s entries"),$count));
+
+        outn(_("migrate remotealert to ids.."));
+  $sql = "SELECT `grpnum`, `remotealert` FROM `findmefollow`";
+        $results = $db->getAll($sql, DB_FETCHMODE_ASSOC);
+        if(DB::IsError($results)) {
+                out(_("fatal error"));
+                die_freepbx($results->getDebugInfo());  
+        }
+        $migrate_arr = array();
+        $count = 0;
+        foreach ($results as $row) {
+                if (trim($row['remotealert']) != '') {
+                        $rec_id = recordings_get_or_create_id($row['remotealert'], 'findmefollow');
+                        $migrate_arr[] = array($rec_id, $row['grpnum']);
+                        $count++;
+                }
+        }
+        if ($count) {
+                $compiled = $db->prepare('UPDATE `findmefollow` SET `remotealert_id` = ? WHERE `grpnum` = ?');
+                $result = $db->executeMultiple($compiled,$migrate_arr);
+                if(DB::IsError($result)) {
+                        out(_("fatal error"));
+                        die_freepbx($result->getDebugInfo());   
+                }
+        }
+        out(sprintf(_("migrated %s entries"),$count));
+
+        outn(_("migrate toolate to  ids.."));
+  $sql = "SELECT `grpnum`, `toolate` FROM `findmefollow`";
+        $results = $db->getAll($sql, DB_FETCHMODE_ASSOC);
+        if(DB::IsError($results)) {
+                out(_("fatal error"));
+                die_freepbx($results->getDebugInfo());  
+        }
+        $migrate_arr = array();
+        $count = 0;
+        foreach ($results as $row) {
+                if (trim($row['toolate']) != '') {
+                        $rec_id = recordings_get_or_create_id($row['toolate'], 'findmefollow');
+                        $migrate_arr[] = array($rec_id, $row['grpnum']);
+                        $count++;
+                }
+        }
+        if ($count) {
+                $compiled = $db->prepare('UPDATE `findmefollow` SET `toolate_id` = ? WHERE `grpnum` = ?');
+                $result = $db->executeMultiple($compiled,$migrate_arr);
+                if(DB::IsError($result)) {
+                        out(_("fatal error"));
+                        die_freepbx($result->getDebugInfo());   
+                }
+        }
+        out(sprintf(_("migrated %s entries"),$count));
+
+        // Now remove the old recording field replaced by new id field
+        //
+        outn(_("dropping annmsg field.."));
+  $sql = "ALTER TABLE `findmefollow` DROP `annmsg`";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) { 
+                out(_("no annmsg field???"));
+        } else {
+                out(_("ok"));
+        }
+        outn(_("dropping remotealert field.."));
+  $sql = "ALTER TABLE `findmefollow` DROP `remotealert`";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) { 
+                out(_("no remotealert field???"));
+        } else {
+                out(_("ok"));
+        }
+        outn(_("dropping toolate field.."));
+  $sql = "ALTER TABLE `findmefollow` DROP `toolate`";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) { 
+                out(_("no toolate field???"));
+        } else {
+                out(_("ok"));
+        }
+
+} else {
+        out("already migrated");
+}
+
-?>

modules/branches/2.5/findmefollow/module.xml

@@ -2 +2 @@
-        <rawname>findmefollow</rawname>
-        <name>Follow Me</name>
-0.
+
-        <changelog>
+                *2.5.1* #2065 Migrate recordings to recording ids
-                *2.5.0.1* #2391, #2908, #2845, #1791, added delete and add icons
-                *2.5.0* Add enable/disable featurecode with blf support, new confirmation sound file announces cid availability
@@ -42 +43 @@
-        <depends>
-                <version>2.5.0alpha1</version>
+                <module>recordings ge 3.3.8</module>
-        </depends>
-        <type>setup</type>

modules/branches/2.5/findmefollow/page.findmefollow.php

@@ -23 +23 @@
-isset($_REQUEST['grppre'])?$grppre = $_REQUEST['grppre']:$grppre='';
-isset($_REQUEST['strategy'])?$strategy = $_REQUEST['strategy']:$strategy='';
-'])?$annmsg = $_REQUEST['annmsg']:$annmsg
+_id'])?$annmsg_id = $_REQUEST['annmsg_id']:$annmsg_id
-isset($_REQUEST['dring'])?$dring = $_REQUEST['dring']:$dring='';
-isset($_REQUEST['needsconf'])?$needsconf = $_REQUEST['needsconf']:$needsconf='';
-'])?$remotealert = $_REQUEST['remotealert']:$remotealert
-'])?$toolate = $_REQUEST['toolate']:$toolate
+_id'])?$remotealert_id = $_REQUEST['remotealert_id']:$remotealert_id
+_id'])?$toolate_id = $_REQUEST['toolate_id']:$toolate_id
-isset($_REQUEST['ringing'])?$ringing = $_REQUEST['ringing']:$ringing='';
-isset($_REQUEST['pre_ring'])?$pre_ring = $_REQUEST['pre_ring']:$pre_ring='0';
@@ -73 +73 @@
-                //add group
-                if ($action == 'addGRP') {
-,$dring,$needsconf,$remotealert,$toolate
+_id,$dring,$needsconf,$remotealert_id,$toolate_id
-
-                        needreload();
@@ -89 +89 @@
-                if ($action == 'edtGRP') {
-                        findmefollow_del($account);     
-,$dring,$needsconf,$remotealert,$toolate
+_id,$dring,$needsconf,$remotealert_id,$toolate_id
-
-                        needreload();
@@ -134 +134 @@
-                $grptime     = isset($thisgrp['grptime'])     ? $thisgrp['grptime']     : '';
-                $goto        = isset($thisgrp['postdest'])    ? $thisgrp['postdest']    : '';
-      = isset($thisgrp['annmsg'])      ? $thisgrp['annmsg
+_id      = isset($thisgrp['annmsg_id'])      ? $thisgrp['annmsg_id
-                $dring       = isset($thisgrp['dring'])       ? $thisgrp['dring']       : '';
- = isset($thisgrp['remotealert']) ? $thisgrp['remotealert
+_id = isset($thisgrp['remotealert_id']) ? $thisgrp['remotealert_id
-                $needsconf   = isset($thisgrp['needsconf'])   ? $thisgrp['needsconf']   : '';
-     = isset($thisgrp['toolate'])     ? $thisgrp['toolate
+_id     = isset($thisgrp['toolate_id'])     ? $thisgrp['toolate_id
-                $ringing     = isset($thisgrp['ringing'])     ? $thisgrp['ringing']     : '';
-                $pre_ring    = isset($thisgrp['pre_ring'])    ? $thisgrp['pre_ring']    : '';
@@ -288 +288 @@
-                                <td><a href="#" class="info"><?php echo _("Announcement:")?><span><?php echo _("Message to be played to the caller before dialing this group.<br><br>To add additional recordings please use the \"System Recordings\" MENU to the left")?></span></a></td>
-                                <td>
-
+_id
-                                        <?php
-                                                $tresults = recordings_list();
-) ? $annmsg
+_id) ? $annmsg_id
-                                                echo '<option value="">'._("None");
-                                                if (isset($tresults)) {
-                                                        foreach ($tresults as $tresult) {
-2].'"'.($tresult[2] == $default ? ' SELECTED' : '').'>'.$tresult[1]
+'id'].'"'.($tresult['id'] == $default ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n"
-                                                        }
-                                                }
@@ -307 +307 @@
-                                <td>
-                                        <?php
-) ? $annmsg
+_id) ? $annmsg_id
-                                        ?>
-
+_id
-                                </td>
-                        </tr>
@@ -354 +354 @@
-                                <td><a href="#" class="info"><?php echo _("Remote Announce:")?><span><?php echo _("Message to be played to the person RECEIVING the call, if 'Confirm Calls' is enabled.<br><br>To add additional recordings use the \"System Recordings\" MENU to the left")?></span></a></td>
-                                <td>
-
+_id
-                                        <?php
-                                                $tresults = recordings_list();
-) ? $remotealert
+_id) ? $remotealert_id
-                                                echo '<option value="">'._("Default")."</option>";
-                                                if (isset($tresults[0])) {
-                                                        foreach ($tresults as $tresult) {
-2].'"'.($tresult[2] == $default ? ' SELECTED' : '').'>'.$tresult[1
+'id'].'"'.($tresult['id'] == $default ? ' SELECTED' : '').'>'.$tresult['displayname'
-                                                        }
-                                                }
@@ -371 +371 @@
-                                <td><a href="#" class="info"><?php echo _("Too-Late Announce:")?><span><?php echo _("Message to be played to the person RECEIVING the call, if the call has already been accepted before they push 1.<br><br>To add additional recordings use the \"System Recordings\" MENU to the left")?></span></a></td>
-                                <td>
-
+_id
-                                        <?php
-                                                $tresults = recordings_list();
-) ? $toolate
+_id) ? $toolate_id
-                                                echo '<option value="">'._("Default")."</option>";
-                                                if (isset($tresults[0])) {
-                                                        foreach ($tresults as $tresult) {
-2].'"'.($tresult[2] == $default ? ' SELECTED' : '').'>'.$tresult[1
+'id'].'"'.($tresult['id'] == $default ? ' SELECTED' : '').'>'.$tresult['displayname'
-                                                        }
-                                                }

modules/branches/2.5/findmefollow/uninstall.php

@@ -32 +32 @@
-}
-
+sql('DROP TABLE IF EXISTS findmefollow');
+
-?>