Changeset 2750

Show
Ignore:
Timestamp:
10/17/06 23:32:47 (7 years ago)
Author:
qldrob
Message:

More #999 fixes (slowly getting there)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2566 r2750  
    108108    if ( $vmbox == null ) { 
    109109      $vm = false; 
     110      $incontext = 'device'; 
     111      $vmpwd = null; 
     112      $name = null; 
     113      $email = null; 
     114      $pager = null; 
     115      $vmoptions = null; 
    110116    } else { 
    111117      $incontext = isset($vmbox['vmcontext'])?$vmbox['vmcontext']:'device'; 
    …… 
    120126    //loop through all options 
    121127    $options=""; 
    122     if ( is_array($vmoptions) ) { 
     128    if ( isset($vmoptions) && is_array($vmoptions) ) { 
    123129      $alloptions = array_keys($vmoptions); 
    124130      if (isset($alloptions)) { 
    …… 
    133139      } 
    134140      extract($vmoptions, EXTR_PREFIX_ALL, "vmops"); 
    135     } 
     141    } else { 
     142      $vmops_attach = false; 
     143      $vmops_saycid = false; 
     144      $vmops_envelope = false; 
     145      $vmops_delete = false; 
     146    } 
     147 
    136148    //AMP Users can only add to their department's context 
    137149    $vmcontext = isset($_SESSION["AMP_user"]->_deptname)?$_SESSION["AMP_user"]->_deptname:null; 
    138150 
    139151    if (empty($vmcontext))  
    140       $vmcontext = ($_REQUEST['vmcontext'] ? $_REQUEST['vmcontext'] : $incontext); 
     152      $vmcontext = (isset($_REQUEST['vmcontext']) ? $_REQUEST['vmcontext'] : $incontext); 
    141153    if (empty($vmcontext)) 
    142154      $vmcontext = 'default';