Changeset 5365

Show
Ignore:
Timestamp:
12/06/07 17:01:25 (6 years ago)
Author:
p_lindheimer
Message:

voicemail needs to check for conflict extension also since it gets called before users, and make dictate and language come after so they can see the abort flag

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r5364 r5365  
    33053305   
    33063306    if ( is_string($extdisplay) ) {  
    3307       $extenInfo=core_users_get($extdisplay); 
    3308       extract($extenInfo); 
     3307 
     3308      if (!isset($GLOBALS['abort']) || $GLOBALS['abort'] !== true) { 
     3309        $extenInfo=core_users_get($extdisplay); 
     3310        extract($extenInfo); 
     3311      } 
    33093312      if (isset($deviceInfo) && is_array($deviceInfo)) 
    33103313        extract($deviceInfo); 
    …… 
    34433446        } else { 
    34443447          // really bad hack - but if core_users_add fails, want to stop core_devices_add 
     3448          // Comment, this does not help everywhere. Other hooks functions can hook before 
     3449          // this like voicemail! 
     3450          // 
    34453451          $GLOBALS['abort'] = true; 
    34463452        } 

  • modules/branches/2.4/dictate/functions.inc.php

    r5339 r5365  
    8484  if ($tech_hardware != null || $pagename == 'users') { 
    8585    dictation_applyhooks(); 
    86     $currentcomponent->addprocessfunc('dictate_configprocess', 5); 
     86    $currentcomponent->addprocessfunc('dictate_configprocess', 8); 
    8787  } elseif ($action=="add") { 
    8888    // We don't need to display anything on an 'add', but we do need to handle returned data. 
    89     $currentcomponent->addprocessfunc('dictate_configprocess', 5); 
     89    $currentcomponent->addprocessfunc('dictate_configprocess', 8); 
    9090  } elseif ($extdisplay != '') { 
    9191    // We're now viewing an extension, so we need to display _and_ process. 
    9292    dictation_applyhooks(); 
    93     $currentcomponent->addprocessfunc('dictate_configprocess', 5); 
     93    $currentcomponent->addprocessfunc('dictate_configprocess', 8); 
    9494  } 
    9595} 

  • modules/branches/2.4/languages/functions.inc.php

    r5339 r5365  
    118118  if ($tech_hardware != null || $pagename == 'users') { 
    119119    language_applyhooks(); 
    120     $currentcomponent->addprocessfunc('languages_configprocess', 5); 
     120    $currentcomponent->addprocessfunc('languages_configprocess', 8); 
    121121  } elseif ($action=="add") { 
    122122    // We don't need to display anything on an 'add', but we do need to handle returned data. 
    123     $currentcomponent->addprocessfunc('languages_configprocess', 5); 
     123    $currentcomponent->addprocessfunc('languages_configprocess', 8); 
    124124  } elseif ($extdisplay != '') { 
    125125    // We're now viewing an extension, so we need to display _and_ process. 
    126126    language_applyhooks(); 
    127     $currentcomponent->addprocessfunc('languages_configprocess', 5); 
     127    $currentcomponent->addprocessfunc('languages_configprocess', 8); 
    128128  } 
    129129} 

  • modules/branches/2.4/voicemail/functions.inc.php

    r5339 r5365  
    236236    case "add": 
    237237      if (!isset($GLOBALS['abort']) || $GLOBALS['abort'] !== true) { 
    238         voicemail_mailbox_add($extdisplay, $_REQUEST); 
    239         needreload(); 
     238        $usage_arr = framework_check_extension_usage($_REQUEST['extension']); 
     239        if (!empty($usage_arr)) { 
     240          $GLOBALS['abort'] = true; 
     241        } else { 
     242          voicemail_mailbox_add($extdisplay, $_REQUEST); 
     243          needreload(); 
     244        } 
    240245      } 
    241246    break;