Changeset 6458

Show
Ignore:
Timestamp:
08/24/08 22:23:04 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 6419-6457 via svnmerge from
http://svn.freepbx.org/freepbx/branches/2.5

........

r6424 | p_lindheimer | 2008-08-19 07:47:24 -0700 (Tue, 19 Aug 2008) | 1 line


fixes #3086 add checkbox to gui elements

........

r6435 | p_lindheimer | 2008-08-21 20:06:52 -0700 (Thu, 21 Aug 2008) | 1 line


closes #3082 increase globals fields, this will not fix sqlite3 so if running sqlite3 during beta, for final release this will have to be done manually or the field lengths will continue to be limitted

........

r6456 | p_lindheimer | 2008-08-24 20:07:48 -0700 (Sun, 24 Aug 2008) | 1 line


fixes #3102, move urlencode/decode out of crypt and let the calling functions urlencode when needed

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.4:1-5944 /freepbx/branches/2.5:1-6418 to /freepbx/branches/2.4:1-5944 /freepbx/branches/2.5:1-6457

  • freepbx/trunk/CHANGES

    r6250 r6458  
    1414 You can revert to the previous behavior by setting: AMPMPG123=false in the 
    1515 amportal.conf file. 
     16 
     17 WARNING: If testing with sqlite3 prior to rc2, you will have to change the field 
     18 size for the globals table as there is no conversion script in the upgrades directory 
     19 since sqlite3 is a pain to do such schema changes and there is no existing installed 
     20 base to convert. 
    1621 
    1722 AMPORTAL CONF NEW SETTINGS: 

  • freepbx/trunk/SQL/newinstall.sql

    r6344 r6458  
    184184DROP TABLE IF EXISTS `globals`; 
    185185CREATE TABLE `globals` ( 
    186   `variable` char(20) NOT NULL default '', 
    187   `value` char(50) NOT NULL default '', 
     186  `variable` varchar(255) NOT NULL default '', 
     187  `value` varchar(255) NOT NULL default '', 
    188188  PRIMARY KEY  (`variable`) 
    189189); 

  • freepbx/trunk/SQL/newinstall.sqlite3.sql

    r6344 r6458  
    187187DROP TABLE IF EXISTS `globals`; 
    188188CREATE TABLE `globals` ( 
    189   `variable` char(20) NOT NULL default '', 
    190   `value` char(50) NOT NULL default '', 
     189  `variable` varchar(255) NOT NULL default '', 
     190  `value` varchar(255) NOT NULL default '', 
    191191  PRIMARY KEY  (`variable`) 
    192192) ; 

  • freepbx/trunk/amp_conf/htdocs/admin/components.class.php

    r6055 r6458  
    634634} 
    635635 
     636class gui_checkbox extends guiinput { 
     637  function gui_checkbox($elemname, $checked=false, $prompttext='', $helptext='', $value='on', $post_text = '', $jsonclick = '', $disable=false) { 
     638    $parent_class = get_parent_class($this); 
     639    parent::$parent_class($elemname, '', $prompttext, $helptext); 
     640 
     641    $itemchecked = $checked ? 'checked' : ''; 
     642    $disable_state = $disable ? 'disabled="true"' : ''; 
     643    $js_onclick_include = ($jsonclick != '') ? 'onclick="' . $jsonclick. '"' : ''; 
     644    $tabindex = guielement::gettabindex(); 
     645 
     646    $this->html_input = "<input type=\"checkbox\" name=\"$this->_elemname\" id=\"$this->_elemname\" $disable_state tabindex=$tabindex value=\"$value\" $js_onclick_include $itemchecked/>$post_text\n"; 
     647  } 
     648} 
     649 
    636650class gui_radio extends guiinput { 
    637651  function gui_radio($elemname, $valarray, $currentvalue = '', $prompttext = '', $helptext = '', $disable=false) { 

  • freepbx/trunk/amp_conf/htdocs/recordings/includes/crypt.php

    r6190 r6458  
    4747      $i += 16; 
    4848    } 
    49     return urlencode(base64_encode($enc_text)); 
     49    return base64_encode($enc_text); 
    5050  } 
    5151 
    …… 
    6363  function decrypt($enc, $salt, $iv_len = 16) { 
    6464 
    65      $enc = base64_decode(urldecode($enc)); 
     65     $enc = base64_decode($enc); 
    6666     $n = strlen($enc); 
    6767     $i = $iv_len; 

  • freepbx/trunk/amp_conf/htdocs/recordings/misc/audio.php

    r6190 r6458  
    1717  $crypt = new Crypt(); 
    1818 
    19   $path = $crypt->decrypt(urlencode($_GET['recording']),$ARI_CRYPT_PASSWORD); 
     19  $path = $crypt->decrypt($_GET['recording'],$ARI_CRYPT_PASSWORD); 
    2020 
    2121  // strip ".." from path for security 

  • freepbx/trunk/amp_conf/htdocs/recordings/modules/callmonitor.module

    r6190 r6458  
    208208      // recording file 
    209209      $recording = $recordings[$value['uniqueid'] . $value['calldate']]; 
    210       $recordingCrypt = $crypt->encrypt($recording,$ARI_CRYPT_PASSWORD); 
     210      $recordingCrypt = urlencode($crypt->encrypt($recording,$ARI_CRYPT_PASSWORD)); 
    211211 
    212212      // date and time 

  • freepbx/trunk/amp_conf/htdocs/recordings/modules/voicemail.module

    r6322 r6458  
    398398        $duration = $value[duration]; 
    399399        if (is_file($recording)) { 
    400           $recordingCrypt = $crypt->encrypt($recording,$ARI_CRYPT_PASSWORD); 
     400          $recordingCrypt = urlencode($crypt->encrypt($recording,$ARI_CRYPT_PASSWORD)); 
    401401    $recordingLink = "<a href='#' onClick=\"javascript:popUp('misc/recording_popup.php?recording=" . $recordingCrypt . "&date=" . $date . "&time=" . $time . "'); return false;\"> 
    402402            " . _("play") . " 
    …… 
    408408        } 
    409409 
    410         $fileCrypt = $crypt->encrypt($file,$ARI_CRYPT_PASSWORD); 
     410        $fileCrypt = urlencode($crypt->encrypt($file,$ARI_CRYPT_PASSWORD)); 
    411411 
    412412        $tableText .= "