Changeset 4557

Timestamp:

07/27/07 15:29:10 (1 year ago)

Author:

p_lindheimer

Message:

#2168 fix intercom, #2165 change module to get rid of first time propagation moving all the old inti stuff into install.php. Fix requires core be up to date for some phones because of the SIPPADDHEADER change

Files:

• modules/branches/2.3/paging/functions.inc.php (modified) (2 diffs)
• modules/branches/2.3/paging/install.php (modified) (4 diffs)
• modules/branches/2.3/paging/install.sql (modified) (1 diff)
• modules/branches/2.3/paging/module.xml (modified) (1 diff)
• modules/branches/2.3/paging/page.paging.php (modified) (1 diff)
• modules/branches/2.3/paging/phones.sql (deleted)
• modules/branches/2.3/paging/uninstall.php (copied) (copied from modules/branches/2.3/paging/install.php) (1 diff)
• modules/branches/2.3/paging/uninstall.sql (modified) (1 diff)

modules/branches/2.3/paging/functions.inc.php

@@ -7 +7 @@
-   check for version upgrades, etc, of the paging database, to
-   allow for easy upgrades. */
-
-function paging_init() {
-        global $db;
-        
-        // Check to make sure that install.sql has been run
-        $sql = "SELECT * from paging_overview";
-        $results = $db->getAssoc($sql);
-        
-        if (DB::IsError($results)) {
-                // It couldn't locate the table. This is bad. Lets try to re-create it, just
-                // in case the user has had the brilliant idea to delete it. 
-                // in 2.2, replace this with just runModuleSQL which is in admin/functions.inc.php
-                pagingrunModuleSQL('paging', 'uninstall');
-                if (pagingrunModuleSQL('paging', 'install')==false) {
-                        echo _("There is a problem with install.sql, cannot re-create databases. Contact support\n");
-                        die;
-                } else {
-                        echo _("Database was deleted! Recreated successfully.<br>\n");
-                        $results = $db->getAll($sql);
-                }
-        }
-        if (!isset($results['version'])) {
-                print "First-time use. Propogating databases.<br>\n";
-                // Here, you load up a current database schema. Below, if the version is 
-                // different, you'd write some upgrade code. This is better than doing it
-                // in install.sql, becuase you don't know what's in there already. 
-                $sql = "INSERT INTO paging_overview VALUES ('version', 1)";
-                $db->query($sql);
-                /* Load up the phone definitions */
-                $fd = fopen("modules/paging/phones.sql","r");
-                while (!feof($fd)) {
-                        $data = fgets($fd, 1024);
-                        if ($data{0}!=';' && $data{0}!='#' && strlen($data) > 3) {
-                                // It's not a comment or a blank(ish) line. Add it.
-                                $phoneresult = $db->query($data);
-                                if(DB::IsError($phoneresult)) 
-                                        die($phoneresult->getMessage()."<br><br>error adding to phones table");
-                        }
-                }
-                fclose($fd);
-                print "Init complete. Please click on this page again to start using this module<br>\n";
-                exit;
-        } /* else ... check the version and upgrade if needed. */
-}
-
-
-//      Generates dialplan for paging  - is called from retrieve_conf
@@ -132 +87 @@
-                        unset($fcc);
-
+                        // Since these are going down channel local, set ALERT_INFO and SIPADDHEADER which will be set in dialparties.agi
+                        // no point in even setting the headers here they will get lost in channel local
+                        //
-                        if (!empty($code)) {
-                                $ext->add('ext-intercom', '_'.$code.'.', '', new ext_setvar('dialnumber', '${EXTEN:'.strlen($code).'}'));
-                                $ext->add('ext-intercom', '_'.$code.'.', '', new ext_dbget('user-intercom','AMPUSER/${dialnumber}/intercom'));
-                                $ext->add('ext-intercom', '_'.$code.'.', '', new ext_gotoif('$["${user-intercom}" = "disabled" ]', 'nointercom'));
-
-
-
+
+
-                                $ext->add('ext-intercom', '_'.$code.'.', '', new ext_setvar('__SIP_URI_OPTIONS', 'intercom=true'));
-
-                                $ext->add('ext-intercom', '_'.$code.'.', '', new ext_dial('Local/${dialnumber}@from-internal/n','',''));
-                                $ext->add('ext-intercom', '_'.$code.'.', '', new ext_busy());

modules/branches/2.3/paging/install.php

@@ -22 +22 @@
-unset($fcc);    
-
+$sql = "CREATE TABLE IF NOT EXISTS paging_overview 
+        ( config VARCHAR(50), 
+          detail VARCHAR(25)
+        )";
+$result = $db->query($sql);
+if(DB::IsError($result)) {
+        die($result->getDebugInfo());
+}
+
+$sql = "CREATE TABLE IF NOT EXISTS paging_groups 
+        ( page_number VARCHAR(50), 
+          ext VARCHAR(25)
+        )";
+$result = $db->query($sql);
+if(DB::IsError($result)) {
+        die($result->getDebugInfo());
+}
+
+$sql = "CREATE TABLE IF NOT EXISTS paging_phones 
+        ( phone_name VARCHAR(50), 
+          priority INT, 
+                command VARCHAR(50)
+        )";
+$result = $db->query($sql);
+if(DB::IsError($result)) {
+        die($result->getDebugInfo());
+}
-
-// version 1.6 upgrade
@@ -28 +55 @@
-if(DB::IsError($check)) {
-        // this table wasn't used up to this point, replace it with the new one
-
+IF EXISTS 
-        $result = $db->query($sql);
-        if(DB::IsError($result)) {
@@ -34 +61 @@
-        }
-        
-
+
+
+
+
-        $result = $db->query($sql);
-        if(DB::IsError($result)) {
@@ -47 +77 @@
-        }
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-?>

modules/branches/2.3/paging/install.sql

@@ -1 @@
-CREATE TABLE IF NOT EXISTS paging_overview ( config VARCHAR(50) , detail VARCHAR(25)); 
-CREATE TABLE IF NOT EXISTS paging_groups ( page_number VARCHAR(50) , ext VARCHAR(25)); 
-CREATE TABLE IF NOT EXISTS paging_config ( page_group VARCHAR(50), force_page INTEGER(1) NOT NULL);
-CREATE TABLE IF NOT EXISTS paging_phones ( phone_name VARCHAR(50), priority INT, command VARCHAR(50));

modules/branches/2.3/paging/module.xml

@@ -2 +2 @@
-        <rawname>paging</rawname>
-        <name>Paging and Intercom</name>
-4
+5
-        <type>setup</type>
-        <category>Internal Options &amp; Configuration</category>
-        <changelog>
+                *1.6.5* #2168 fix intercom, #2165 change module to get rid of first time propagation
-                *1.6.4* fixed deprecated use of ALERT_INFO and SIPHEADER
-                *1.6.3* changed ${CALLERID(number)} to ${AMPUSER} to accomodate CID number masquerading

modules/branches/2.3/paging/page.paging.php

@@ -29 +29 @@
-// Check to make sure that the paging database is propogated and
-// up to date.
-paging_init();
-
-switch ($action) {

modules/branches/2.3/paging/uninstall.php

@@ -2 +2 @@
-
-// Enable intercom as a feature code
+echo "removing featurecode intercom-prefix..";
-$fcc = new featurecode('paging', 'intercom-prefix');
-
-
-
+
-unset($fcc);
+echo "done<br>\n";
-
-// User intercom enable code
+echo "removing featurecode intercom-on..";
-$fcc = new featurecode('paging', 'intercom-on');
-
-
-
+
-unset($fcc);
+echo "done<br>\n";
-
-// User intercom disable 
+echo "removing featurecode intercom-off..";
-$fcc = new featurecode('paging', 'intercom-off');
-
-
-
+
-unset($fcc);    
+echo "done<br>\n";
-
+echo "dropping table paging_overview..";
+$sql = "DROP TABLE IF EXISTS paging_overview";
+$result = $db->query($sql);
+if(DB::IsError($result)) {
+        echo "ERROR DELETING TABLE: ".$result->getDebugInfo();
+}
+echo "done<br>\n";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
+
+
+
+
+
+
+
+
+
-
-?>

modules/branches/2.3/paging/uninstall.sql

@@ -1 @@
-DROP TABLE IF EXISTS paging_overview;
-DROP TABLE IF EXISTS paging_groups;
-DROP TABLE IF EXISTS paging_phones;