Fix used space calculation if shared folder does not exist, fixes bug oc-1331

Conflicts:
	settings/personal.php

diff --git a/settings/personal.php b/settings/personal.php
index 26a9f601d9aa1dd45b9b3379d68999cdf0d0bbcb..04abd074eb72b51db9217be384ffd1f15e12ac2d 100644 (file)
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -1,65 +1,70 @@
-<?php
-/**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-require_once('../lib/base.php');
-OC_Util::checkLoggedIn();
-
-// Highlight navigation entry
-OC_Util::addScript( 'settings', 'personal' );
-OC_Util::addStyle( 'settings', 'settings' );
-OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
-OC_Util::addStyle( '3rdparty', 'chosen' );
-OC_App::setActiveNavigationEntry( 'personal' );
-
-// calculate the disc space
-$rootInfo=OC_FileCache::get('');
+<?php\r
+/**\r
+ * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>\r
+ * This file is licensed under the Affero General Public License version 3 or later.\r
+ * See the COPYING-README file.\r
+ */\r
+\r
+require_once('../lib/base.php');\r
+OC_Util::checkLoggedIn();\r
+\r
+// Highlight navigation entry\r
+OC_Util::addScript( 'settings', 'personal' );\r
+OC_Util::addStyle( 'settings', 'settings' );\r
+OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );\r
+OC_Util::addStyle( '3rdparty', 'chosen' );\r
+OC_App::setActiveNavigationEntry( 'personal' );\r
+\r
+// calculate the disc space\r
+$rootInfo=OC_FileCache::get('');\r
 $sharedInfo=OC_FileCache::get('/Shared');\r
-$used=$rootInfo['size']-$sharedInfo['size'];
-$free=OC_Filesystem::free_space();
-$total=$free+$used;
-if($total==0) $total=1;  // prevent division by zero
-$relative=round(($used/$total)*10000)/100;
-
-$email=OC_Preferences::getValue(OC_User::getUser(), 'settings','email','');
-
-$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
-$languageCodes=OC_L10N::findAvailableLanguages();
-sort ($languageCodes);
-
-//put the current language in the front
-unset($languageCodes[array_search($lang,$languageCodes)]);
-array_unshift($languageCodes,$lang);
-
-$languageNames=include 'languageCodes.php';
-$languages=array();
-foreach($languageCodes as $lang){
-       $l=OC_L10N::get('settings',$lang);
-       if(substr($l->t('__language_name__'),0,1)!='_'){//first check if the language name is in the translation file
-               $languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
-       }elseif(isset($languageNames[$lang])){
-               $languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
-       }else{//fallback to language code
-               $languages[]=array('code'=>$lang,'name'=>$lang);
-       }
-}
-
-// Return template
-$tmpl = new OC_Template( 'settings', 'personal', 'user');
-$tmpl->assign('usage',OC_Helper::humanFileSize($used));
-$tmpl->assign('total_space',OC_Helper::humanFileSize($total));
-$tmpl->assign('usage_relative',$relative);
-$tmpl->assign('email',$email);
-$tmpl->assign('languages',$languages);
-
-$forms=OC_App::getForms('personal');
-$tmpl->assign('forms',array());
-foreach($forms as $form){
-       $tmpl->append('forms',$form);
-}
-$tmpl->printPage();
-
-?>
+if (!isset($sharedInfo)) {\r
+       $sharedSize = 0;\r
+} else {\r
+       $sharedSize = $sharedInfo['size'];\r
+}\r
+$used=$rootInfo['size']-$sharedSize;\r
+$free=OC_Filesystem::free_space();\r
+$total=$free+$used;\r
+if($total==0) $total=1;  // prevent division by zero\r
+$relative=round(($used/$total)*10000)/100;\r
+\r
+$email=OC_Preferences::getValue(OC_User::getUser(), 'settings','email','');\r
+\r
+$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );\r
+$languageCodes=OC_L10N::findAvailableLanguages();\r
+sort ($languageCodes);\r
+\r
+//put the current language in the front\r
+unset($languageCodes[array_search($lang,$languageCodes)]);\r
+array_unshift($languageCodes,$lang);\r
+\r
+$languageNames=include 'languageCodes.php';\r
+$languages=array();\r
+foreach($languageCodes as $lang){\r
+       $l=OC_L10N::get('settings',$lang);\r
+       if(substr($l->t('__language_name__'),0,1)!='_'){//first check if the language name is in the translation file\r
+               $languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));\r
+       }elseif(isset($languageNames[$lang])){\r
+               $languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);\r
+       }else{//fallback to language code\r
+               $languages[]=array('code'=>$lang,'name'=>$lang);\r
+       }\r
+}\r
+\r
+// Return template\r
+$tmpl = new OC_Template( 'settings', 'personal', 'user');\r
+$tmpl->assign('usage',OC_Helper::humanFileSize($used));\r
+$tmpl->assign('total_space',OC_Helper::humanFileSize($total));\r
+$tmpl->assign('usage_relative',$relative);\r
+$tmpl->assign('email',$email);\r
+$tmpl->assign('languages',$languages);\r
+\r
+$forms=OC_App::getForms('personal');\r
+$tmpl->assign('forms',array());\r
+foreach($forms as $form){\r
+       $tmpl->append('forms',$form);\r
+}\r
+$tmpl->printPage();\r
+\r
+?>\r