Changeset 6128

Timestamp:

07/22/08 22:28:50 (4 months ago)

Author:

p_lindheimer

Message:

#2063 changed annoucements to use recording_id, added assoc access to API calls

Files:

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

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

@@ -5 +5 @@
-        $extens = array();
-        foreach (announcement_list() as $row) {
-0
+'announcement_id'
-        }
-        return $extens;
@@ -35 +35 @@
-}
-
+function announcement_recordings_usage($recording_id) {
+        global $active_modules;
+
+        $results = sql("SELECT announcement_id, description FROM announcement WHERE recording_id = '$recording_id'","getAll",DB_FETCHMODE_ASSOC);
+        if (empty($results)) {
+                return array();
+        } else {
+                $type = isset($active_modules['announcement']['type'])?$active_modules['announcement']['type']:'setup';
+                foreach ($results as $result) {
+                        $usage_arr[] = array(
+                                'url_query' => 'config.php?display=announcement&type='.$type.'&extdisplay='.urlencode($result['announcement_id']),
+                                'description' => "Announcement: ".$result['description'],
+                        );
+                }
+                return $usage_arr;
+        }
+}
+
-function announcement_get_config($engine) {
-        global $ext;
@@ -40 +58 @@
-                case 'asterisk':
-                        foreach (announcement_list() as $row) {
-
-
-
-
+
+
+
+
+
-                                }
-0], 's', 'begin', new ext_noop('Playing announcement '.$row[1
-3] || $row[7
+'announcement_id'], 's', 'begin', new ext_noop('Playing announcement '.$row['description'
+'allow_skip'] || $row['repeat_msg'
-                                        // allow skip
-7
-0
+'repeat_msg'
+'announcement_id'
-                                        }
-0], 's', 'play', new ext_background($row[2]
+'announcement_id'], 's', 'play', new ext_background($recording
-                                        
-3
-0
-5
-0], '_X', '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row[4
+'allow_skip'
+'announcement_id'
+'return_ivr'
+'announcement_id'], '_X', '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row['post_dest'
-                                                } else {
-0], '_X', '', new ext_goto($row[4
+'announcement_id'], '_X', '', new ext_goto($row['post_dest'
-                                                }
-                                        }
-7
-0], $row[7
+'repeat_msg'
+'announcement_id'], $row['repeat_msg'
-                                        }
-                                } else {
-0], 's', '', new ext_playback($row[2]
+'announcement_id'], 's', '', new ext_playback($recording
-                                }
-
-                                // if repeat_msg enabled then set exten to t to allow for the key to be pressed, otherwise play message and go
-7
-5
-0], $exten, '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row[4
-3] || $row[7
-0], 'i', '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row[4
+'repeat_msg'
+'return_ivr'
+'announcement_id'], $exten, '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row['post_dest'
+'allow_skip'] || $row['repeat_msg'
+'announcement_id'], 'i', '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row['post_dest'
-                                } else {
-0], $exten, '', new ext_goto($row[4
-3] || $row[7
-0], 'i', '', new ext_goto($row[4
+'announcement_id'], $exten, '', new ext_goto($row['post_dest'
+'allow_skip'] || $row['repeat_msg'
+'announcement_id'], 'i', '', new ext_goto($row['post_dest'
-                                }
-                                
@@ -87 +106 @@
-function announcement_list() {
-        global $db;
-
-
+_id
+, DB_FETCHMODE_ASSOC
-        if(DB::IsError($results)) {
-                die_freepbx($results->getMessage()."<br><br>Error selecting from announcement");        
-        }
+
+        // Make array backward compatible.
+        $count = 0;
+        foreach($results as $item) {
+                $results[$count][0] = $item['announcement_id'];
+                $results[$count][1] = $item['description'];
+                $results[$count][2] = $item['recording_id'];
+                $results[$count][3] = $item['allow_skip'];
+                $results[$count][4] = $item['post_dest'];
+                $results[$count][5] = $item['return_ivr'];
+                $results[$count][6] = $item['noanswer'];
+                $results[$count][7] = $item['repeat_msg'];
+                $count++;
+        }
-        return $results;
-}
@@ -97 +130 @@
-function announcement_get($announcement_id) {
-        global $db;
-
+_id
-        $row = $db->getRow($sql,DB_FETCHMODE_ASSOC);
-        if(DB::IsError($row)) {
@@ -112 +145 @@
-}
-
-
-
-
+_id
+
+_id
-                "'".addslashes($description)."', ".
-addslashes($recording)
+$recording_id
-                "'".($allow_skip ? 1 : 0)."', ".
-                "'".addslashes($post_dest)."', ".
@@ -138 +171 @@
-}
-
-
+_id
-        global $db;
-        $sql = "UPDATE announcement SET ".
-                "description = '".addslashes($description)."', ".
- = '".addslashes($recording)
+_id = '".$recording_id
-                "allow_skip = '".($allow_skip ? 1 : 0)."', ".
-                "post_dest = '".addslashes($post_dest)."', ".

modules/branches/2.5/announcement/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;
@@ -8 +19 @@
-        announcement_id integer NOT NULL PRIMARY KEY $autoincrement,
-        description VARCHAR( 50 ),
- VARCHAR( 255 )
+_id INTEGER
-        allow_skip INT,
-        post_dest VARCHAR( 255 ),
@@ -83 +94 @@
-}
-
+// Version 2.5 migrate to recording ids
+//
+outn(_("Checking if recordings need migration.."));
+$sql = "SELECT recording_id FROM announcement";
+$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+if(DB::IsError($check)) {
+        //  Add recording_id field
+        //
+        out("migrating");
+        outn(_("adding recording_id field.."));
+  $sql = "ALTER TABLE announcement ADD recording_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 to recording ids.."));
+  $sql = "SELECT `announcement_id`, `recording` FROM `announcement`";
+        $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['recording']) != '') {
+                        $rec_id = recordings_get_or_create_id($row['recording'], 'announcement');
+                        $migrate_arr[] = array($rec_id, $row['announcement_id']);
+                        $count++;
+                }
+        }
+        if ($count) {
+                $compiled = $db->prepare('UPDATE `announcement` SET `recording_id` = ? WHERE `announcement_id` = ?');
+                $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 recording field.."));
+  $sql = "ALTER TABLE `announcement` DROP `recording`";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) { 
+                out(_("no recording field???"));
+        } else {
+                out(_("ok"));
+        }
+
+} else {
+        out("already migrated");
+}
+
-?>

modules/branches/2.5/announcement/module.xml

@@ -2 +2 @@
-        <rawname>announcement</rawname>
-        <name>Announcements</name>
-0
+1
-        <changelog>
+                *2.5.1* #2063 Migrate recordings to recording ids
-                *2.5.0* #2845 tabindex
-                *2.4.0.3* #2872 mispelled Announcement
@@ -31 +32 @@
-        </description>
-        <depends>
-
+
+
-        </depends>
-        <menuitems>

modules/branches/2.5/announcement/page.announcement.php

@@ -19 +19 @@
-$announcement_id = isset($_POST['announcement_id']) ? $_POST['announcement_id'] :  false;
-$description = isset($_POST['description']) ? $_POST['description'] :  '';
- = isset($_POST['recording']) ? $_POST['recording
+_id = isset($_POST['recording_id']) ? $_POST['recording_id
-$allow_skip = isset($_POST['allow_skip']) ? $_POST['allow_skip'] :  0;
-$return_ivr = isset($_POST['return_ivr']) ? $_POST['return_ivr'] :  0;
@@ -34 +34 @@
-switch ($action) {
-        case 'add':
-
+_id
-                needreload();
-                redirect_standard();
-        break;
-        case 'edit':
-
+_id
-                needreload();
-                redirect_standard('extdisplay');
@@ -75 +75 @@
-        $row = announcement_get($extdisplay);
-        
-1
- = $row[2
-3
-4
-5
-6
-7
+'description'
+_id = $row['recording_id'
+'allow_skip'
+'post_dest'
+'return_ivr'
+'noanswer'
+'repeat_msg'
-
-}
@@ -101 +101 @@
-                <td><a href="#" class="info"><?php echo _("Recording")?><span><?php echo _("Message to be played.<br>To add additional recordings use the \"System Recordings\" MENU to the left")?></span></a></td>
-                <td>
-
+_id
-                        <?php
-                                $tresults = recordings_list();
-) ? $recording
+_id) ? $recording_id
-                                if (isset($tresults[0])) {
-                                        foreach ($tresults as $tresult) {
-2].'"'.($tresult[2] == $default ? ' SELECTED' : '').'>'.$tresult[1
+'id'].'"'.($tresult['id'] == $default ? ' SELECTED' : '').'>'.$tresult['displayname'
-                                        }
-                                }