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

Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup

This commit is contained in:
Thomas Tanghus 2011-12-13 10:35:10 +01:00
parent d55e689261 5e711f37ca
commit ec12dec106
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/helper.php
View File

@ -160,24 +160,25 @@ class OC_Helper {
*/
public static function computerFileSize( $str ){
$bytes = 0;
$str=strtolower($str);
$bytes_array = array(
'B' => 1,
'K' => 1024,
'KB' => 1024,
'MB' => 1024 * 1024,
'M' => 1024 * 1024,
'GB' => 1024 * 1024 * 1024,
'G' => 1024 * 1024 * 1024,
'TB' => 1024 * 1024 * 1024 * 1024,
'T' => 1024 * 1024 * 1024 * 1024,
'PB' => 1024 * 1024 * 1024 * 1024 * 1024,
'P' => 1024 * 1024 * 1024 * 1024 * 1024,
'b' => 1,
'k' => 1024,
'kb' => 1024,
'mb' => 1024 * 1024,
'm' => 1024 * 1024,
'gb' => 1024 * 1024 * 1024,
'g' => 1024 * 1024 * 1024,
'tb' => 1024 * 1024 * 1024 * 1024,
't' => 1024 * 1024 * 1024 * 1024,
'pb' => 1024 * 1024 * 1024 * 1024 * 1024,
'p' => 1024 * 1024 * 1024 * 1024 * 1024,
);
$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]];
}

2
settings/ajax/setquota.php
View File

@ -10,6 +10,6 @@ $quota= OC_Helper::computerFileSize($_POST["quota"]);
// Return Success story
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){
$.post(
OC.filePath('settings','ajax','setquota.php'),
{username:uid,quota:$(this).val()},
function(result){}
{username:uid,quota:$(this).val()},
function(result){
img.parent().children('span').text(result.data.quota)
$(this).parent().attr('data-quota',result.data.quota);
}
);
input.blur();
}else{