Changeset 6153

Timestamp:

07/23/08 18:27:55 (4 months ago)

Author:

p_lindheimer

Message:

#2069 Migrate recordings to recording ids

Files:

• modules/branches/2.5/ringgroups/functions.inc.php (modified) (7 diffs)
• modules/branches/2.5/ringgroups/install.php (modified) (3 diffs)
• modules/branches/2.5/ringgroups/install.sql (deleted)
• modules/branches/2.5/ringgroups/module.xml (modified) (3 diffs)
• modules/branches/2.5/ringgroups/page.ringgroups.php (modified) (10 diffs)

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

@@ -39 +39 @@
-        } else {
-                return false;
+        }
+}
+
+function ringgroups_recordings_usage($recording_id) {
+        global $active_modules;
+
+        $results = sql("SELECT `grpnum`, `description` FROM `ringgroups` 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=ringgroups&extdisplay=GRP-'.urlencode($result['grpnum']),
+                                'description' => "Ring Group: ".$result['description'],
+                        );
+                }
+                return $usage_arr;
-        }
-}
@@ -63 +81 @@
-                                        $postdest = $grp['postdest'];
-                                        $grppre = (isset($grp['grppre'])?$grp['grppre']:'');
- = (isset($grp['annmsg'])?$grp['annmsg
+_id = (isset($grp['annmsg_id'])?$grp['annmsg_id
-                                        $alertinfo = $grp['alertinfo'];
-                                        $needsconf = $grp['needsconf'];
-                                        $cwignore = $grp['cwignore'];
-                                        $cfignore = $grp['cfignore'];
- = $grp['remotealert
- = $grp['toolate
+_id = $grp['remotealert_id
+_id = $grp['toolate_id
-                                        $ringing = $grp['ringing'];
-
@@ -132 +150 @@
-                                        // group dial
-                                        $ext->add($contextname, $grpnum, '', new ext_setvar('RingGroupMethod',$strategy));
-
+
+
-                                                $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${RRNODEST}" != "foo"]','DIALGRP'));                 
-                                                $ext->add($contextname, $grpnum, '', new ext_answer(''));
@@ -139 +158 @@
-                                        }
-                                        if ($needsconf == "CHECKED") {
+                                                $remotealert = recordings_get_file($remotealert_id);
+                                                $toolate = recordings_get_file($toolate_id);
-                                                $len=strlen($grpnum)+4;
-                                                $ext->add("grps", "_RG-${grpnum}-.", '', new ext_macro('dial',$grptime.
@@ -169 +190 @@
-}
-
-='',$alertinfo,$needsconf,$remotealert,$toolate
+_id='',$alertinfo,$needsconf,$remotealert_id,$toolate_id
-
-        $extens = ringgroups_list();
@@ -182 +203 @@
-        print_r($extens);
-
-, postdest, description, alertinfo, needsconf, remotealert, toolate, ringing, cwignore, cfignore) VALUES ('".str_replace("'","''",$grpnum)."', '".str_replace("'", "''", $strategy)."', ".str_replace("'", "''", $grptime).", '".str_replace("'", "''", $grppre)."', '".str_replace("'", "''", $grplist)."', '".str_replace("'", "''", $annmsg)."', '".str_replace("'", "''", $postdest)."', '".str_replace("'", "''", $desc)."', '".str_replace("'", "''", $alertinfo)."', '$needsconf', '$remotealert', '$toolate
+_id, postdest, description, alertinfo, needsconf, remotealert_id, toolate_id, ringing, cwignore, cfignore) 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("'", "''", $desc)."', '".str_replace("'", "''", $alertinfo)."', '$needsconf', '$remotealert_id', '$toolate_id
-        $results = sql($sql);
-        return true;
@@ -257 +278 @@
-
-function ringgroups_get($grpnum) {
-, postdest, description, alertinfo, needsconf, remotealert, toolate
+_id, postdest, description, alertinfo, needsconf, remotealert_id, toolate_id
-        return $results;
-}

modules/branches/2.5/ringgroups/install.php

@@ -1 +1 @@
-<?php
-
+if (! function_exists("out")) {
+        function out($text) {
+                echo $text."<br />";
+        }
+}
+
+if (! function_exists("outn")) {
+        function outn($text) {
+                echo $text;
+        }
+}
+
-global $db;
+global $amp_conf;
+
+$sql = "
+CREATE TABLE IF NOT EXISTS `ringgroups` 
+( 
+        `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 , 
+        `description` VARCHAR( 35 ) NOT NULL , 
+        `alertinfo` VARCHAR ( 255 ) NULL , 
+        `remotealert_id` INTEGER,
+        `needsconf` VARCHAR ( 10 ), 
+        `toolate_id` INTEGER,
+        `cwignore` VARCHAR ( 10 ), 
+        `cfignore` VARCHAR ( 10 ), 
+        PRIMARY KEY  (`grpnum`) 
+) 
+";
+$check = $db->query($sql);
+if(DB::IsError($check)) {
+        die_freepbx("Can not create annoucment table");
+}
-
-// Version 1.1 upgrade
@@ -42 +80 @@
-$db->query("ALTER TABLE ringgroups CHANGE alertinfo alertinfo VARCHAR( 255 ) NULL");
-
-
-
+
+
+
+
+
-$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
-if(DB::IsError($check)) {
@@ -115 +156 @@
-}
-
+// Version 2.5 migrate to recording ids
+//
+outn(_("Checking if recordings need migration.."));
+$sql = "SELECT annmsg_id FROM ringgroups";
+$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 ringgroups 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 ringgroups 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 ringgroups 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 `ringgroups`";
+        $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'], 'ringgroups');
+                        $migrate_arr[] = array($rec_id, $row['grpnum']);
+                        $count++;
+                }
+        }
+        if ($count) {
+                $compiled = $db->prepare('UPDATE `ringgroups` 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 `ringgroups`";
+        $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'], 'ringgroups');
+                        $migrate_arr[] = array($rec_id, $row['grpnum']);
+                        $count++;
+                }
+        }
+        if ($count) {
+                $compiled = $db->prepare('UPDATE `ringgroups` 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 `ringgroups`";
+        $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'], 'ringgroups');
+                        $migrate_arr[] = array($rec_id, $row['grpnum']);
+                        $count++;
+                }
+        }
+        if ($count) {
+                $compiled = $db->prepare('UPDATE `ringgroups` 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 `ringgroups` DROP `annmsg`";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) { 
+                out(_("no annmsg field???"));
+        } else {
+                out(_("ok"));
+        }
+        outn(_("dropping remotealert field.."));
+  $sql = "ALTER TABLE `ringgroups` DROP `remotealert`";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) { 
+                out(_("no remotealert field???"));
+        } else {
+                out(_("ok"));
+        }
+        outn(_("dropping toolate field.."));
+  $sql = "ALTER TABLE `ringgroups` 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/ringgroups/module.xml

@@ -2 +2 @@
-        <rawname>ringgroups</rawname>
-        <name>Ring Groups</name>
-0.
+
-        <type>setup</type>
-        <category>Inbound Call Control</category>
@@ -9 +9 @@
-        </description>
-        <changelog>
+                *2.5.1* #2069 Migrate recordings to recording ids
-                *2.5.0.1* changed depends to 2.5
-                *2.5.0* #1795, #2845, #2391, #2853, #2925 add tabindexing, Skip Busy Agent and Ignore Call Forward options
@@ -41 +42 @@
-        <depends>
-                <version>2.5.0alpha1</version>
+                <module>recordings ge 3.3.8</module>
-        </depends>
-        <menuitems>

modules/branches/2.5/ringgroups/page.ringgroups.php

@@ -21 +21 @@
-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['description'])?$description = $_REQUEST['description']:$description='';
-isset($_REQUEST['alertinfo'])?$alertinfo = $_REQUEST['alertinfo']:$alertinfo='';
@@ -27 +27 @@
-isset($_REQUEST['cwignore'])?$cwignore = $_REQUEST['cwignore']:$cwignore='';
-isset($_REQUEST['cfignore'])?$cfignore = $_REQUEST['cfignore']:$cfignore='';
-'])?$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='';
-
@@ -77 +77 @@
-                                $conflict_url = framework_display_extension_usage_alert($usage_arr);
-
-,$alertinfo,$needsconf,$remotealert,$toolate
+_id,$alertinfo,$needsconf,$remotealert_id,$toolate_id
-                                needreload();
-                                redirect_standard();
@@ -93 +93 @@
-                if ($action == 'edtGRP') {
-                        ringgroups_del($account);       
-,$alertinfo,$needsconf,$remotealert,$toolate
+_id,$alertinfo,$needsconf,$remotealert_id,$toolate_id
-                        needreload();
-                        redirect_standard('extdisplay');
@@ -130 +130 @@
-                $grptime = $thisgrp['grptime'];
-                $goto = $thisgrp['postdest'];
- = $thisgrp['annmsg
+_id = $thisgrp['annmsg_id
-                $description = $thisgrp['description'];
-                $alertinfo = $thisgrp['alertinfo'];
- = $thisgrp['remotealert
+_id = $thisgrp['remotealert_id
-                $needsconf = $thisgrp['needsconf'];
-                $cwignore = $thisgrp['cwignore'];
-                $cfignore = $thisgrp['cfignore'];
- = $thisgrp['toolate
+_id = $thisgrp['toolate_id
-                $ringing = $thisgrp['ringing'];
-                unset($grpliststr);
@@ -166 +166 @@
-                $grptime = '';
-                $goto = '';
-
+_id
-                $alertinfo = '';
-
+_id
-                $needsconf = '';
-                $cwignore = '';
-                $cfignore = '';
-
+_id
-                $ringing = '';
-
@@ -276 +276 @@
-                                <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")."</option>";
-                                                if (isset($tresults[0])) {
-                                                        foreach ($tresults as $tresult) {
-2].'"'.($tresult[2] == $default ? ' SELECTED' : '').'>'.$tresult[1
+'id'].'"'.($tresult['id'] == $annmsg_id ? ' SELECTED' : '').'>'.$tresult['displayname'
-                                                        }
-                                                }
@@ -295 +295 @@
-                                <td>
-                                        <?php
-) ? $annmsg
+_id) ? $annmsg_id
-                                        ?>
-
+_id
-                                </td>
-                        </tr>
@@ -355 +355 @@
-                                <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'] == $remotealert_id ? ' SELECTED' : '').'>'.$tresult['displayname'
-                                                        }
-                                                }
@@ -373 +373 @@
-                                <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'] == $toolate_id ? ' SELECTED' : '').'>'.$tresult['displayname'
-                                                        }
-                                                }