Changeset 6347

Timestamp:

08/11/08 18:01:51 (5 years ago)

Author:

p_lindheimer

Message:

fixes #2530 so conflicts when creating users result in proper display, when creating extensions returns to main extension page

Files:

• modules/branches/2.5/core/functions.inc.php (modified) (9 diffs)
• modules/branches/2.5/dictate/functions.inc.php (modified) (1 diff)
• modules/branches/2.5/languages/functions.inc.php (modified) (1 diff)
• modules/branches/2.5/paging/functions.inc.php (modified) (1 diff)
• modules/branches/2.5/vmblast/functions.inc.php (modified) (1 diff)
• modules/branches/2.5/voicemail/functions.inc.php (modified) (4 diffs)

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

@@ -4075 +4075 @@
-    if ( is_string($extdisplay) ) { 
-
-_GLOBALS['abort']) || $_
+GLOBALS['abort']) || $
-        $extenInfo=core_users_get($extdisplay);
-        extract($extenInfo);
@@ -4084 +4084 @@
-      if ( $display == 'extensions' ) {
-        $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Extension").": $extdisplay", false), 0);
-_GLOBALS['abort']) || $_
+GLOBALS['abort']) || $
-          $tlabel = sprintf(_("Delete Extension %s"),$extdisplay);
-          $label = '<span><img width="16" height="16" border="0" title="'.$tlabel.'" alt="" src="images/user_delete.png"/>&nbsp;'.$tlabel.'</span>';
@@ -4096 +4096 @@
-      } else {
-        $currentcomponent->addguielem('_top', new gui_pageheading('title', _("User").": $extdisplay", false), 0);
-_GLOBALS['abort']) || $_
+GLOBALS['abort']) || $
-          $tlabel = sprintf(_("Delete User %s"),$extdisplay);
-          $label = '<span><img width="16" height="16" border="0" title="'.$tlabel.'" alt="" src="images/user_delete.png"/>&nbsp;'.$tlabel.'</span>';
@@ -4241 +4241 @@
-  if (isset($extension) && !checkRange($extension)){
-    echo "<script>javascript:alert('". _("Warning! Extension")." ".$extension." "._("is not allowed for your account").".');</script>";
-_
+
-  } else {
-    //if submitting form, update database
@@ -4250 +4250 @@
-        $usage_arr = framework_check_extension_usage($_REQUEST['extension']);
-        if (!empty($usage_arr)) {
-_
+
-          $conflict_url = framework_display_extension_usage_alert($usage_arr,true);
-          global $currentcomponent;
-          $id=0;
+          $currentcomponent->addguielem('_top', new gui_link_label('conflict', _("Conflicting Extensions"), _("The following extension numbers are in conflict, you can click on the item(s) below to edit the conflicting entity."), true));
-          foreach ($conflict_url as $edit_link) {
-            $currentcomponent->addguielem('_top', new gui_link('conflict'.$i++, $edit_link['label'], $edit_link['url']));
-          }
+          $msg = ($_REQUEST['display'] == 'users') ? _("Configure user again:") : _("Configure extension again:");
+          $currentcomponent->addguielem('_top', new gui_subheading('conflict_end', $msg, false));
+          unset($_REQUEST['action']);
+          redirect_standard_continue();
-        } elseif (core_users_add($_REQUEST)) {
-          needreload();
@@ -4265 +4270 @@
-          // this like voicemail!
-          //
-_
+
-        }
-      break;
@@ -4283 +4288 @@
-        } else {
-          // really bad hack - but if core_users_edit fails, want to stop core_devices_edit
-_
+
-        }
-      break;
@@ -4543 +4548 @@
-    case "add":
-    // really bad hack - but if core_users_add fails, want to stop core_devices_add
-_GLOBALS['abort']) || $_
+GLOBALS['abort']) || $
-      if (core_devices_add($deviceid,$tech,$devinfo_dial,$devicetype,$deviceuser,$description,$emergency_cid)) {
-        needreload();
@@ -4559 +4564 @@
-    case "edit":  //just delete and re-add
-      // really bad hack - but if core_users_edit fails, want to stop core_devices_edit
-_GLOBALS['abort']) || $_
+GLOBALS['abort']) || $
-        core_devices_del($extdisplay,true);
-        core_devices_add($deviceid,$tech,$devinfo_dial,$devicetype,$deviceuser,$description,$emergency_cid,true);

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

@@ -152 +152 @@
-  } 
-  if ($action == "add" || $action == "edit") {
-_GLOBALS['abort']) || $_
+GLOBALS['abort']) || $
-      dictate_update($extdisplay, $dictenabled, $dictformat, $dictemail);
-    }

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

@@ -183 +183 @@
-  } 
-  if ($action == "add" || $action == "edit") {
-_GLOBALS['abort']) || $_
+GLOBALS['abort']) || $
-      languages_user_update($extdisplay, $langcode);
-    }

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

@@ -595 +595 @@
-
-  if ($action == "add" || $action == "edit") {
-_GLOBALS['abort']) || $_
+GLOBALS['abort']) || $
-      if ($in_default_page_grp !== false) {
-        paging_set_default($extdisplay, $in_default_page_grp);

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

@@ -298 +298 @@
-  
-  if (($action == "add" || $action == "edit") && $vm_enabled) {
-_GLOBALS['abort']) || $_
+GLOBALS['abort']) || $
-      if ($in_default_vmblast_grp !== false) {
-        vmblast_set_default($extdisplay, $in_default_vmblast_grp);

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

@@ -242 +242 @@
-  }
-
- 
+
-    // JS function needed for checking voicemail = Enabled
-    $js = 'return (theForm.vm.value == "enabled");';
@@ -336 +336 @@
-    // ** WARNING **
-    // Mailbox must be processed before adding / deleting users, therefore $sortorder = 1
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  } elseif ($extdisplay != '' || $pagename == 'users') { 
-  // We're now viewing an extension, so we need to display _and_ process. 
@@ -600 +615 @@
-  switch ($action) {
-    case "add":
-_GLOBALS['abort']) || $_
+GLOBALS['abort']) || $
-        $usage_arr = framework_check_extension_usage($_REQUEST['extension']);
-        if (!empty($usage_arr)) {
-_
+
-        } else {
-          voicemail_mailbox_add($extdisplay, $_REQUEST);
@@ -618 +633 @@
-    break;
-    case "edit":
-_GLOBALS['abort']) || $_
+GLOBALS['abort']) || $
-        voicemail_mailbox_del($extdisplay);
-        if ( $vm != 'disabled' )