Changeset 1946

Timestamp:

05/20/06 23:30:44 (3 years ago)

Author:

qldrob

Message:

Apply r1945 to 2.1 branch

Files:

• freepbx/branches/2.1/amp_conf/htdocs/admin/modules/core/page.extensions.php (modified) (1 diff)
• freepbx/branches/2.1/amp_conf/htdocs/admin/modules/core/page.users.php (modified) (1 diff)

freepbx/branches/2.1/amp_conf/htdocs/admin/modules/core/page.extensions.php

@@ -105 +105 @@
-                        core_devices_add($deviceid,$tech,$dial,$devicetype,$deviceuser,$description,$emergency_cid);
-                        core_users_edit($extdisplay,$_REQUEST,$vmcontext,$incontext,$uservm);
+                        // Need to re-propogate all the vm info here, because it could have changed
+                        $uservm = getVoicemail();
+                        $vmcontexts = array_keys($uservm);
+                        $vm=false;
+                        foreach ($vmcontexts as $vmcontext) {
+                                if(isset($uservm[$vmcontext][$extdisplay])){
+                                        $incontext = $vmcontext;  //the context for the current extension
+                                        $vmpwd = $uservm[$vmcontext][$extdisplay]['pwd'];
+                                        $name = $uservm[$vmcontext][$extdisplay]['name'];
+                                        $email = $uservm[$vmcontext][$extdisplay]['email'];
+                                        $pager = $uservm[$vmcontext][$extdisplay]['pager'];
+                                        $options="";
+                                        if (is_array($uservm[$vmcontext][$extdisplay]['options'])) {
+                                                $alloptions = array_keys($uservm[$vmcontext][$extdisplay]['options']);
+                                                if (isset($alloptions)) {
+                                                        foreach ($alloptions as $option) {
+                                                                if ( ($option!="attach") && ($option!="envelope") && ($option!="saycid") && ($option!="delete") && ($option!='') )
+                                                                $options .= $option.'='.$uservm[$vmcontext][$extdisplay]['options'][$option].'|';
+                                                        }
+                                                        $options = rtrim($options,'|');
+                                                        // remove the = sign if there are no options set
+                                                        $options = rtrim($options,'=');
+                                                }
+                                                extract($uservm[$vmcontext][$extdisplay]['options'], EXTR_PREFIX_ALL, "vmops");
+                                        }
+                                        $vm=true;
+                                }
+                        }
-                        needreload();
-               
+                
-                case "resetall":  //form a url with this option to nuke the AMPUSER & DEVICE trees and start over.
-                        core_users2astdb();

freepbx/branches/2.1/amp_conf/htdocs/admin/modules/core/page.users.php

@@ -78 +78 @@
-                case "edit":
-                        core_users_edit($extdisplay,$_REQUEST,$vmcontext,$incontext,$uservm);
+                        // Need to re-propogate all the vm info here, because it could have changed
+                        $uservm = getVoicemail();
+                        $vmcontexts = array_keys($uservm);
+                        $vm=false;
+                        foreach ($vmcontexts as $vmcontext) {
+                                if(isset($uservm[$vmcontext][$extdisplay])){
+                                        $incontext = $vmcontext;  //the context for the current extension
+                                        $vmpwd = $uservm[$vmcontext][$extdisplay]['pwd'];
+                                        $name = $uservm[$vmcontext][$extdisplay]['name'];
+                                        $email = $uservm[$vmcontext][$extdisplay]['email'];
+                                        $pager = $uservm[$vmcontext][$extdisplay]['pager'];
+                                        $options="";
+                                        if (is_array($uservm[$vmcontext][$extdisplay]['options'])) {
+                                                $alloptions = array_keys($uservm[$vmcontext][$extdisplay]['options']);
+                                                if (isset($alloptions)) {
+                                                        foreach ($alloptions as $option) {
+                                                                if ( ($option!="attach") && ($option!="envelope") && ($option!="saycid") && ($option!="delete") && ($option!='') )
+                                                                $options .= $option.'='.$uservm[$vmcontext][$extdisplay]['options'][$option].'|';
+                                                        }
+                                                        $options = rtrim($options,'|');
+                                                        // remove the = sign if there are no options set
+                                                        $options = rtrim($options,'=');
+                                                }
+                                                extract($uservm[$vmcontext][$extdisplay]['options'], EXTR_PREFIX_ALL, "vmops");
+                                        }
+                                        $vm=true;
+                                }
+                        }
-                        needreload();
-                break;