Merge branch 'master' into share_api

Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php

1 files changed, 43 insertions, 0 deletions

diff --git a/apps/storage_charts/settings.php b/apps/storage_charts/settings.php
new file mode 100644
index 00000000000..6a436844525
--- /dev/null
+++ b/apps/storage_charts/settings.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+* ownCloud - DjazzLab Storage Charts plugin
+*
+* @author Xavier Beurois
+* @copyright 2012 Xavier Beurois www.djazz-lab.net
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
+OCP\User::checkLoggedIn();
+OCP\App::checkAppEnabled('storage_charts');
+
+$tmpl = new OCP\Template('storage_charts', 'settings.tpl');
+
+if(isset($_POST['storage_charts_disp']) && count($_POST['storage_charts_disp']) <= 3){
+	$c = $_POST['storage_charts_disp'];
+	$c_disp = Array('cpie_rfsus'=>0,'clines_usse'=>0,'chisto_us'=>0);
+	foreach(array_keys($c_disp) as $chart){
+		if(in_array($chart, $c)){
+			$c_disp[$chart] = 1;
+		}
+	}
+	OC_DLStCharts::setUConfValue('c_disp', serialize($c_disp));
+	$tmpl->assign('stc_save_ok', TRUE);
+}
+
+$displays = OC_DLStCharts::getUConfValue('c_disp', Array('uc_val' => 'a:3:{s:10:"cpie_rfsus";i:1;s:11:"clines_usse";i:1;s:9:"chisto_us";i:1;}'));
+$tmpl->assign('displays', unserialize($displays['uc_val']));
+return $tmpl->fetchPage();
\ No newline at end of file