Changeset 7235

Show
Ignore:
Timestamp:
11/06/08 15:33:34 (3 years ago)
Author:
mickecarlsson
Message:

Fixes VmX module, settings were revered against extension settings for VmX

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.5/amp_conf/htdocs/recordings/modules/VmX.module

    r6029 r7235  
    110110      if ($vmx_disabled) { 
    111111       
    112         setcookie("ari_vmx_disabled", $vmx_disabled, time()+365*24*60*60); 
     112        setcookie("ari_vmx_disabled", $vmx_disabled); 
    113113        $vmx_disabled_delayed = $vmx_disabled; 
    114114        $_SESSION['ari_error'] =  
    …… 
    126126       
    127127      // store cookie 
    128       setcookie("ari_vmx_unavail_enabled", $vmx_unavail_enabled, time()+365*24*60*60); 
    129       setcookie("ari_vmx_busy_enabled", $vmx_busy_enabled, time()+365*24*60*60); 
    130       setcookie("ari_vmx_play_instructions", $vmx_play_instructions, time()+365*24*60*60); 
     128      setcookie("ari_vmx_unavail_enabled", $vmx_unavail_enabled); 
     129      setcookie("ari_vmx_busy_enabled", $vmx_busy_enabled); 
     130      setcookie("ari_vmx_play_instructions", $vmx_play_instructions); 
    131131       
    132132      $stripped_vmx_option_0_number = preg_replace('/-|\(|\)|\s/','',$vmx_option_0_number); 
    …… 
    135135        $this->setVmxOptionNumber($exten,'0','unavail',""); 
    136136        $this->setVmxOptionNumber($exten,'0','busy',""); 
    137         setcookie("ari_vmx_option_0_system_default", $vmx_option_0_system_default, time()+365*24*60*60); 
     137        setcookie("ari_vmx_option_0_system_default", $vmx_option_0_system_default); 
    138138        if (is_numeric($stripped_vmx_option_0_number) || !$stripped_vmx_option_0_number) { 
    139139          $stripped = preg_replace('/-|\(|\)|\s/','',$_COOKIE['ari_vmx_option_0_number']); 
    140140          if ($vmx_option_0_number && $stripped!=$stripped_vmx_option_0_number) { 
    141             setcookie("ari_vmx_option_0_number", $call_vmx_option_0_number, time()+365*24*60*60); 
     141            setcookie("ari_vmx_option_0_number", $call_vmx_option_0_number); 
    142142          } 
    143143        } 
    …… 
    157157          $stripped = preg_replace('/-|\(|\)|\s/','',$_COOKIE['ari_vmx_option_0_number']); 
    158158          if ($vmx_option_0_number && $stripped!=$stripped_vmx_option_0_number) { 
    159             setcookie("ari_vmx_option_0_number", $call_vmx_option_0_number, time()+365*24*60*60); 
     159            setcookie("ari_vmx_option_0_number", $call_vmx_option_0_number); 
    160160          } 
    161161        } 
    …… 
    166166        $this->setVmxOptionFollowMe($exten,'1','unavail'); 
    167167        $this->setVmxOptionFollowMe($exten,'1','busy'); 
    168         setcookie("ari_vmx_option_1_system_default", $vmx_option_1_system_default, time()+365*24*60*60); 
     168        setcookie("ari_vmx_option_1_system_default", $vmx_option_1_system_default); 
    169169        if (is_numeric($stripped_vmx_option_1_number) || !$stripped_vmx_option_1_number) { 
    170170          $stripped = preg_replace('/-|\(|\)|\s/','',$_COOKIE['ari_vmx_option_1_number']); 
    171171          if ($vmx_option_1_number && $stripped!=$stripped_vmx_option_1_number) { 
    172             setcookie("ari_vmx_option_1_number", $call_vmx_option_1_number, time()+365*24*60*60); 
     172            setcookie("ari_vmx_option_1_number", $call_vmx_option_1_number); 
    173173          } 
    174174        } 
    …… 
    190190          $stripped = preg_replace('/-|\(|\)|\s/','',$_COOKIE['ari_vmx_option_1_number']); 
    191191          if ($vmx_option_1_number && $stripped!=$stripped_vmx_option_1_number) { 
    192             setcookie("ari_vmx_option_1_number", $call_vmx_option_1_number, time()+365*24*60*60); 
     192            setcookie("ari_vmx_option_1_number", $call_vmx_option_1_number); 
    193193          } 
    194194        } 
    …… 
    210210        $stripped = preg_replace('/-|\(|\)|\s/','',$_COOKIE['ari_vmx_option_2_number']); 
    211211        if ($vmx_option_2_number && $stripped!=$stripped_vmx_option_2_number) { 
    212           setcookie("ari_vmx_option_2_number", $call_vmx_option_2_number, time()+365*24*60*60); 
     212          setcookie("ari_vmx_option_2_number", $call_vmx_option_2_number); 
    213213        } 
    214214      } 
    …… 
    255255  //TODO: Set this better than this? 
    256256  $follow_me_disabled = ($follow_me_listring_time > 0)?0:1; 
    257   setcookie("ari_follow_me_disabled", $follow_me_disabled, time()+365*24*60*60); 
     257  setcookie("ari_follow_me_disabled", $follow_me_disabled); 
    258258 
    259259 
    …… 
    261261  if ($vmx_unavail_enabled === false) { 
    262262    $vmx_disabled = true; 
    263     setcookie("ari_vmx_disabled", $vmx_disabled, time()+365*24*60*60); 
     263    setcookie("ari_vmx_disabled", $vmx_disabled); 
    264264    $SETTINGS_ALLOW_VMX_SETTINGS=false; 
    265265  } else { 
    266266    $vmx_disabled = false; 
    267     setcookie("ari_vmx_disabled", false, time()+365*24*60*60); 
     267    setcookie("ari_vmx_disabled", false); 
    268268    $vmx_busy_enabled=$this->getVmxState($exten,'busy'); 
    269269    $vmx_play_instructions=$this->getVmxPlayInstructions($exten); 
    …… 
    592592  global $asterisk_manager_interface; 
    593593 
    594   $value_opt = ($vmx_play_instructions)?'""':'s'; 
     594  $value_opt = ($vmx_play_instructions)?'s':'""'; 
    595595 
    596596  $response = $asterisk_manager_interface->Command("Action: Command\r\nCommand: database put AMPUSER $exten/vmx/$mode/vmxopts/timeout $value_opt\r\n\r\n"); 
    …… 
    614614 
    615615  if (preg_match("/s/",$response)) { 
    616       $response=''; 
     616      $response='checked'; 
    617617  }  
    618618    else { 
    619       $response='checked'; 
     619      $response=''; 
    620620    } 
    621621