Changeset 6456

Show
Ignore:
Timestamp:
08/24/08 23:07:48 (5 years ago)
Author:
p_lindheimer
Message:

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/branches/2.5/amp_conf/htdocs/recordings/includes/crypt.php

    r6190 r6456  
    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/branches/2.5/amp_conf/htdocs/recordings/misc/audio.php

    r6190 r6456  
    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/branches/2.5/amp_conf/htdocs/recordings/modules/callmonitor.module

    r6190 r6456  
    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/branches/2.5/amp_conf/htdocs/recordings/modules/voicemail.module

    r6322 r6456  
    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 .= "