mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor

This commit is contained in:
Tom Needham 2011-12-15 10:23:32 +00:00
parent 3f44a28e28 a862fec9a3
commit 6cef214b66
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -88,7 +88,7 @@ else {
if(defined("DEBUG") && DEBUG) { if(defined("DEBUG") && DEBUG) {
OC_Log::write('core','Setting remember login to cookie',OC_Log::DEBUG); OC_Log::write('core','Setting remember login to cookie',OC_Log::DEBUG);
} }
$token = md5($_POST["user"].time()); $token = md5($_POST["user"].time().$_POST['password']);
OC_Preferences::setValue($_POST['user'], 'login', 'token', $token); OC_Preferences::setValue($_POST['user'], 'login', 'token', $token);
OC_User::setMagicInCookie($_POST["user"], $token); OC_User::setMagicInCookie($_POST["user"], $token);
} }

25
lib/helper.php
View File

@ -160,24 +160,25 @@ class OC_Helper {
*/ */
public static function computerFileSize( $str ){ public static function computerFileSize( $str ){
$bytes = 0; $bytes = 0;
$str=strtolower($str);
$bytes_array = array( $bytes_array = array(
'B' => 1, 'b' => 1,
'K' => 1024, 'k' => 1024,
'KB' => 1024, 'kb' => 1024,
'MB' => 1024 * 1024, 'mb' => 1024 * 1024,
'M' => 1024 * 1024, 'm' => 1024 * 1024,
'GB' => 1024 * 1024 * 1024, 'gb' => 1024 * 1024 * 1024,
'G' => 1024 * 1024 * 1024, 'g' => 1024 * 1024 * 1024,
'TB' => 1024 * 1024 * 1024 * 1024, 'tb' => 1024 * 1024 * 1024 * 1024,
'T' => 1024 * 1024 * 1024 * 1024, 't' => 1024 * 1024 * 1024 * 1024,
'PB' => 1024 * 1024 * 1024 * 1024 * 1024, 'pb' => 1024 * 1024 * 1024 * 1024 * 1024,
'P' => 1024 * 1024 * 1024 * 1024 * 1024, 'p' => 1024 * 1024 * 1024 * 1024 * 1024,
); );
$bytes = floatval($str); $bytes = floatval($str);
if (preg_match('#([KMGTP]?B?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) { if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
$bytes *= $bytes_array[$matches[1]]; $bytes *= $bytes_array[$matches[1]];
} }

2
settings/ajax/setquota.php
View File

@ -10,6 +10,6 @@ $quota= OC_Helper::computerFileSize($_POST["quota"]);
// Return Success story // Return Success story
OC_Preferences::setValue($username,'files','quota',$quota); OC_Preferences::setValue($username,'files','quota',$quota);
OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>$quota))); OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>OC_Helper::humanFileSize($quota))));
?> ?>

7
settings/js/users.js
View File

@ -101,8 +101,11 @@ $(document).ready(function(){
if($(this).val().length>0){ if($(this).val().length>0){
$.post( $.post(
OC.filePath('settings','ajax','setquota.php'), OC.filePath('settings','ajax','setquota.php'),
{username:uid,quota:$(this).val()}, {username:uid,quota:$(this).val()},
function(result){} function(result){
img.parent().children('span').text(result.data.quota)
$(this).parent().attr('data-quota',result.data.quota);
}
); );
input.blur(); input.blur();
}else{ }else{