Changeset 5860

Timestamp:

07/01/08 21:24:41 (3 months ago)

Author:

p_lindheimer

Message:

change to create feature code for each index, add func_devstate blf

Files:

• modules/branches/2.5/daynight/functions.inc.php (modified) (5 diffs)
• modules/branches/2.5/daynight/install.php (modified) (1 diff)
• modules/branches/2.5/daynight/module.xml (modified) (2 diffs)
• modules/branches/2.5/daynight/page.daynight.php (modified) (3 diffs)
• modules/branches/2.5/daynight/uninstall.php (modified) (1 diff)

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

@@ -166 +166 @@
-        global $ext;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $ext->addInclude('from-internal-additional', $id); // Add the include from from-internal
-
-                $list = daynight_list();
-                $passwords = daynight_passwords();
-                foreach ($list as $item) {
-                        $index = $item['ext'];
-                        $ext->add($id, $c.$index, '', new ext_answer(''));
-                        $ext->add($id, $c.$index, '', new ext_wait('1'));
-
-                        if (isset($passwords[$index]) && trim($passwords[$index]) != "" && ctype_digit(trim($passwords[$index]))) {
-                                $ext->add($id, $c.$index, '', new ext_authenticate($passwords[$index]));
-                        }
-                        $ext->add($id, $c.$index, '', new ext_setvar('INDEX', $index)); 
-                        $ext->add($id, $c.$index, '', new ext_goto($id.',s,1'));
-                }
-
-                $c='s';
@@ -194 +200 @@
-
-                $ext->add($id, $c, 'day', new ext_setvar('DB(DAYNIGHT/C${INDEX})', 'DAY'));     
+                if ($amp_conf['USEDEVSTATE']) {
+                        $ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:DAYNIGHT${INDEX})', 'NOT_INUSE'));
+                }
-                $ext->add($id, $c, '', new ext_playback('beep&silence/1&day&reception&digits/${INDEX}&enabled'));
-                $ext->add($id, $c, '', new ext_hangup(''));
-
-                $ext->add($id, $c, 'night', new ext_setvar('DB(DAYNIGHT/C${INDEX})', 'NIGHT')); 
+                if ($amp_conf['USEDEVSTATE']) {
+                        $ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:DAYNIGHT${INDEX})', 'INUSE'));
+                }
-                $ext->add($id, $c, '', new ext_playback('beep&silence/1&beep&silence/1&day&reception&digits/${INDEX}&disabled'));
-                $ext->add($id, $c, '', new ext_hangup(''));
@@ -269 +281 @@
-        }
-        $fc_description = isset($post['fc_description']) ? trim($post['fc_description']) : "";
-$fc_description
+".addslashes($fc_description)."
-
-        $dn = new dayNightObject($id);
@@ -275 +287 @@
-        $dn->create($post['state']);
-
+        $fcc = new featurecode('daynight', 'toggle-mode-'.$id);
+        if ($fc_description) {
+                $fcc->setDescription("$id: $fc_description");
+        } else {
+                $fcc->setDescription("$id: Day Night Control");
+        }
+        $fcc->setDefault('*28'.$id);
+        $fcc->update();
+        unset($fcc);    
+
-        needreload();
-}
@@ -283 +305 @@
-        //
-        $results = sql("DELETE FROM daynight WHERE ext = \"$id\"","query");
+
+        $fcc = new featurecode('daynight', 'toggle-mode-'.$id);
+        $fcc->delete();
+        unset($fcc);    
-}
-

modules/branches/2.5/daynight/install.php

@@ -14 +14 @@
-}
-
-
+
+
+
+
-$fcc = new featurecode('daynight', 'toggle-mode');
-
-
-
+
+
+
+
+
+
-unset($fcc);    
-
+// If we found the old one then we must create all the new ones
+//
+if ($delete_old) {
+        $list = daynight_list();
+        foreach ($list as $item) {
+                $id = $item['ext']
+                $fc_description = $item['dest']
+                $fcc = new featurecode('daynight', 'toggle-mode-'.$id);
+                if ($fc_description) {
+                        $fcc->setDescription("$id: $fc_description");
+                } else {
+                        $fcc->setDescription("$id: Day Night Control");
+                }
+                $fcc->setDefault('*28'.$id);
+                if ($code != '*28') {
+                        $fcc->setCode($code.$id);
+                }
+                if (!$enabled) {
+                        $fcc->setEnabled(false);
+                }
+                $fcc->update();
+                unset($fcc);    
+        }
+}
+
-?>

modules/branches/2.5/daynight/module.xml

@@ -2 +2 @@
-        <rawname>daynight</rawname>
-        <name>Day Night Mode</name>
-4.0.3
+5.0
-        <type>setup</type>
-        <category>Inbound Call Control</category>
@@ -10 +10 @@
-        </description>
-        <changelog>
+                *2.5.0* change to create feature code for each index, add func_devstate blf
-                *2.4.0.3* #2734 fixed issue creating index with no description made it disapear
-                *2.4.0.2* #2604, #2843 fix mal-formed html tags, Russian Translation

modules/branches/2.5/daynight/page.daynight.php

@@ -21 +21 @@
-isset($_REQUEST['itemid'])?$itemid=mysql_real_escape_string($_REQUEST['itemid']):$itemid='';
-
-
-$fcc = new featurecode('daynight', 'toggle-mode');
-$fc = $fcc->getCodeActive();
-unset($fcc);
-
-$daynightcodes = daynight_list();
-?>
@@ -37 +32 @@
-if (isset($daynightcodes)) {
-        foreach ($daynightcodes as $code) {
+                $fcc = new featurecode('daynight', 'toggle-mode-'.$code['ext']);
+                $fc = $fcc->getCode();
+                unset($fcc);
+
-                $dnobj = daynight_get_obj($code['ext']);
-                $color = $dnobj['state'] == 'DAY' ? "style='color:green'" : "style='color:red'";
-{$code['ext']}
+
-        }
-}
@@ -70 +69 @@
-        global $itemid;
-
-'
-.$itemid
+-'.$itemid
+
-        unset($fcc);
-

modules/branches/2.5/daynight/uninstall.php

@@ -1 +1 @@
-<?php
-
+// Delete the old code if still there
+//
-$fcc = new featurecode('daynight', 'toggle-mode');
-$fcc->delete();
-unset($fcc);    
-
+$list = daynight_list();
+foreach ($list as $item) {
+        $id = $item['ext']
+        $fcc = new featurecode('daynight', 'toggle-mode-'.$id);
+        $fcc->delete();
+        unset($fcc);    
+}
+
-sql('DROP TABLE daynight');
-