Changeset 6130

Timestamp:

07/22/08 22:31:57 (4 months ago)

Author:

p_lindheimer

Message:

#2067 changed parking to use recording_id

Files:

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

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

@@ -30 +30 @@
-                $parkalertinfo  = isset($results['parkalertinfo'])?$results['parkalertinfo']:'';
-                $parkcid        = isset($results['parkcid'])?$results['parkcid']:'';
-         = isset($results['parkingannmsg'])?$results['parkingannmsg
+_id      = isset($results['parkingannmsg_id'])?$results['parkingannmsg_id
-                $goto           = isset($results['goto'])?$results['goto']:'from-pstn,s,1';
-
@@ -70 +70 @@
-                        }
-
-
+
+
-                                $ext->add($contextname, "t", '', new ext_playback($parkingannmsg));
-                        }
@@ -92 +93 @@
-}
-
-
+_id
-        global $db;
-
@@ -120 +121 @@
-                        array($parkinglot_id, 'parkalertinfo', trim("$parkalertinfo")),
-                        array($parkinglot_id, 'parkcid', trim("$parkcid")),
-', "$parkingannmsg
+_id', "$parkingannmsg_id
-                        array($parkinglot_id, 'goto', "$goto"));
-
@@ -155 +156 @@
-        $results = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
-
-announcement']['type'])?$active_modules['announcement
+parking']['type'])?$active_modules['parking
-
-        foreach ($results as $result) {
@@ -166 +167 @@
-        }
-        return $destlist;
+}
+
+function parking_recordings_usage($recording_id) {
+        global $active_modules;
+
+        $my_id = sql("SELECT `data` FROM `parkinglot` WHERE `id` = '1' AND `keyword` = 'parkingannmsg_id' AND `data` = '$recording_id'","getOne");
+        if (!isset($my_id) || $my_id == '') {
+                return array();
+        } else {
+                $type = isset($active_modules['parking']['type'])?$active_modules['parking']['type']:'setup';
+                $usage_arr[] = array(
+                        'url_query' => 'config.php?type='.$type.'&display=parking',
+                        'description' => "Parking Lot",
+                );
+                return $usage_arr;
+        }
-}
-

modules/branches/2.5/parking/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 `parkinglot` 
+(
+        `id` VARCHAR( 20 ) NOT NULL default '1',
+        `keyword` varchar(40) NOT NULL default '',
+        `data` varchar(150) NOT NULL default '',
+        PRIMARY KEY  (`id`,`keyword`)
+)
+";
+$check = $db->query($sql);
+if(DB::IsError($check)) {
+        die_freepbx("Can not create parkinglot table");
+}
-
-$results = array();
@@ -24 +49 @@
-}
-
+// Version 2.5 migrate to recording ids
+//
+outn(_("Migrating recordings if needed.."));
+
+$sql = "SELECT `data` FROM `parkinglot` WHERE  `id` = '1' AND `keyword` = 'parkingannmsg'";
+$results = $db->getAll($sql, DB_FETCHMODE_ASSOC);
+if(DB::IsError($results)) {
+        die_freepbx($results->getMessage());
+}
+if (isset($results[0])) {
+        if (trim($results[0]['data']) != '') {
+                $rec_id = recordings_get_or_create_id($results[0]['data'], 'parking');
+        } else {
+                $rec_id = '';
+        }
+        // Delete just in case
+        $sql="DELETE FROM `parkinglot` WHERE `keyword` = 'parkingannmsg_id'";
+        $results = $db->query($sql);
+        if(DB::IsError($results)) {
+                out(_("fatal error"));
+                die_freepbx($results->getMessage());
+        }
+        $sql="INSERT INTO `parkinglot` (`id`, `keyword`, `data`) VALUES ('1', 'parkingannmsg_id', '$rec_id')";
+        $results = $db->query($sql);
+        if(DB::IsError($results)) {
+                out(_("fatal error"));
+                die_freepbx($results->getMessage());
+        }
+        // Either way, delete it if it were there
+        $sql="DELETE FROM `parkinglot` WHERE `keyword` = 'parkingannmsg'";
+        $results = $db->query($sql);
+        if(DB::IsError($results)) {
+                out(_("fatal error"));
+                die_freepbx($results->getMessage());
+        }
+        out(_("ok"));
+} else {
+        out(_("not needed"));
+}
+
-?>

modules/branches/2.5/parking/module.xml

@@ -2 +2 @@
-        <rawname>parking</rawname>
-        <name>Parking Lot</name>
-0
+1
-        <type>setup</type>
-        <category>Internal Options &amp; Configuration</category>
@@ -11 +11 @@
-        </menuitems>
-        <changelog>
+                *2.5.1* #2067 change recording to recording id
-                *2.5.0* #2845 tabindex
-                *2.4.0.6* #2604, #2716, #2843 fix mal-formed html tags, localization fix, Russian Translation
@@ -26 +27 @@
-        </changelog>
-        <depends>
-
+
+
-        </depends>
-        <location>release/2.5/parking-2.5.0.tgz</location>

modules/branches/2.5/parking/page.parking.php

@@ -23 +23 @@
-isset($_REQUEST['parkalertinfo'])?$parkalertinfo = trim($_REQUEST['parkalertinfo']):$parkalertinfo='';
-isset($_REQUEST['parkcid'])?$parkcid = trim($_REQUEST['parkcid']):$parkcid='';
-'])?$parkingannmsg = trim($_REQUEST['parkingannmsg']):$parkingannmsg
+_id'])?$parkingannmsg_id = trim($_REQUEST['parkingannmsg_id']):$parkingannmsg_id
-
-if (isset($_REQUEST['goto0']) && isset($_REQUEST[$_REQUEST['goto0']."0"])) {
@@ -35 +35 @@
-
-        if ($action == 'edtPARKING') {
-
+_id
-                needreload();
-                redirect_standard();
@@ -119 +119 @@
-                <td><a href="#" class="info"><?php echo _("Announcement:")?><span><?php echo _("Optional message to be played to the orphaned caller prior to going on the to supplied destination below.<br><br>To add additional recordings please use the \"System Recordings\" MENU to the left")?></span></a></td>
-                <td align=right>
-
+_id
-                        <?php
-                                $tresults = recordings_list();
-) ? $parkingannmsg
+_id) ? $parkingannmsg_id
-                                echo '<option value="">'._("None")."</option>";
-                                if (isset($tresults[0])) {
-                                        foreach ($tresults as $tresult) {
-2].'"'.($tresult[2] == $default ? ' SELECTED' : '').'>'.$tresult[1
+'id'].'"'.($tresult['id'] == $default ? ' SELECTED' : '').'>'.$tresult['displayname'
-                                        }
-                                }
+
-                        ?>
-                        </select>
@@ -138 +139 @@
-                <td align=right>
-                        <?php
-) ? $parkingannmsg
+_id) ? $parkingannmsg_id
-                        ?>
-
+_id
-                </td>
-        </tr>