Changeset 4665

Timestamp:

08/03/07 15:10:27 (1 year ago)

Author:

p_lindheimer

Message:

fixed some uninitialized variables, #2210 trunk dialpatterns not being retrieved in gui

Files:

• modules/branches/2.3/core/functions.inc.php (modified) (4 diffs)
• modules/branches/2.3/core/module.xml (modified) (1 diff)
• modules/branches/2.3/core/page.trunks.php (modified) (3 diffs)

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

@@ -1368 +1368 @@
-                $astman->database_put("AMPUSER",$extension."/cidnum",$cid_masquerade);
-                $astman->database_put("AMPUSER",$extension."/voicemail","\"".isset($voicemail)?$voicemail:''."\"");
-isset($device)?$device:''
+((isset($device))?$device:'')
-
-                if (trim($callwaiting) == 'enabled') {
@@ -1816 +1816 @@
-
-function core_trunks_readDialRulesFile() {
-
+
+
-        
-        core_trunks_parse_conf($localPrefixFile, $conf, $section);
@@ -1824 +1825 @@
-
-function core_trunks_writeDialRulesFile($conf) {
-
+
+
-        
-        $fd = fopen($localPrefixFile,"w");
@@ -2828 +2830 @@
-                                core_users_del($extdisplay);
-                                core_users_cleanastdb($extdisplay);
-findmefollow_del
+'findmefollow_del'
-                                    findmefollow_del($extdisplay);
-                                }

modules/branches/2.3/core/module.xml

@@ -4 +4 @@
-        <category>Basic</category>
-        <name>Core</name>
-2
+3
-        <candisable>no</candisable>
-        <canuninstall>no</canuninstall>
-        <changelog>
+                *2.3.0beta2.3.3* fixed some uninitialized variables, #2210 trunk dialpatterns not being retrieved in gui
-                *2.3.0beta2.3.2* #2151 fix trunk ordering when more than 9 trunks used, and some unitialized vars
-                *2.3.0beta2.3.1* #2199 fix ENABLECW behavior on new extensions

modules/branches/2.3/core/page.trunks.php

@@ -13 +13 @@
-//GNU General Public License for more details.
-
-$localPrefixFile = rtrim($amp_conf['ASTETCDIR'],DIRECTORY_SEPARATOR)."/localprefixes.conf";
-
-
@@ -65 +64 @@
-        $dialrules = array_values(array_unique($dialrules));
-} else {
-''
+array()
-}
-
@@ -260 +259 @@
-                }
-                
-                /* //DIALRULES
-                if (!isset($_REQUEST["dialrules"])) { // we check REQUEST because dialrules() is always an array
-                        $dialrules = getTrunkDialRules($trunknum);
-                }
-                */
-                if (!isset($dialrules)) { $dialrules = null; }
-                if (!isset($dialrules)) { $dialrules = null; }
-
-                
-                if (count($dialrules) == 0) {
-                        if ($temp = core_trunks_getDialRules($trunknum)) {