Changeset 6143

Timestamp:

07/23/08 14:21:54 (4 years ago)

Author:

p_lindheimer

Message:

Merged revisions 6142 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r6142 | p_lindheimer | 2008-07-23 12:13:29 -0700 (Wed, 23 Jul 2008) | 1 line

#2939 if vmcontext is edited, make changes to symlinks for all devices user is currently using

........

Files:

• modules/branches/2.4 (modified) (1 prop)
• modules/branches/2.4/core/functions.inc.php (modified) (3 diffs)

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

@@ -1820 +1820 @@
-  $thisUser = core_users_get($user);
-  if(isset($thisUser['voicemail']) && ($thisUser['voicemail'] != "novm")) {
-
+ {
-      $vmcontext = "default";
-else
+} else {
-      $vmcontext = $thisUser['voicemail'];
+    }
-    
-    //voicemail symlink
@@ -2649 +2650 @@
-  if ($astman) {
-    $ud = $astman->database_get("AMPUSER",$extension."/device");
+    $current_vmcontext = $astman->database_get("AMPUSER",$extension."/voicemail");
+    $new_vmcontext = isset($vars['vmcontext']) ? $vars['vmcontext'] : 'novm';
-    $vars['device'] = $ud;
-  } else {
@@ -2675 +2678 @@
-    core_users_del($extension, true);
-    core_users_add($vars, true);
+
+    // If the vmcontext has changed, we need to change all the links. In extension mode, the link
+    // to the current fixed device will get changed, but none others will
+    //
+    if ($current_vmcontext != $new_vmcontext) {
+      $user_devices = explode('&',$ud);
+      foreach ($user_devices as $user_device) {
+        exec("rm -f /var/spool/asterisk/voicemail/device/".$user_device);
+        if ($new_context != 'novm') {
+          exec("/bin/ln -s /var/spool/asterisk/voicemail/".$new_vmcontext."/".$extension."/ /var/spool/asterisk/voicemail/device/".$user_device);
+        }
+      }
+    }
-  }
-  return true;
-  
-}
-