From 4f5e24a3272c8f9f248f2bca63336e55645f2d22 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 28 Jun 2010 18:38:06 +0200 Subject: [PATCH 1/3] load plugins --- inc/lib_base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/lib_base.php b/inc/lib_base.php index aa14d3cec0..c7fd80964a 100755 --- a/inc/lib_base.php +++ b/inc/lib_base.php @@ -110,7 +110,7 @@ if(OC_USER::isLoggedIn()){ // load plugins $CONFIG_LOADPLUGINS=''; $plugins=explode(' ',$CONFIG_LOADPLUGINS); -if(isset($plugins[0]['url'])) foreach($plugins as $plugin) require_once('plugins/'.$plugin.'/lib_'.$plugin.'.php'); +if(isset($plugins[0]['url'])) foreach($plugins as $plugin) require_once($SERVERROOT.'/plugins/'.$plugin.'/lib_'.$plugin.'.php'); // check if the server is correctly configured for ownCloud From 6c400ce8c6d5f19410485960d78cf72dcb9e7f23 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 28 Jun 2010 18:39:03 +0200 Subject: [PATCH 2/3] show users/group config --- inc/templates/adminform.php | 4 ++-- inc/templates/configform.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/templates/adminform.php b/inc/templates/adminform.php index c22c78768b..064201e5c8 100755 --- a/inc/templates/adminform.php +++ b/inc/templates/adminform.php @@ -115,7 +115,7 @@ foreach($dbtypes as $dbtype){
+if(!$FIRSTRUN ){//disabled for now?>
@@ -131,4 +131,4 @@ if(!$FIRSTRUN and false){//disabled for now?> \ No newline at end of file + diff --git a/inc/templates/configform.php b/inc/templates/configform.php index 709e8f1429..ce6fe47433 100755 --- a/inc/templates/configform.php +++ b/inc/templates/configform.php @@ -34,7 +34,7 @@ changepassset=function(){
@@ -50,4 +50,4 @@ foreach($groups as $group){
Create new group
-
--> + From 8ede7d075e25907ba75382e7eb35cad6cf06e9bd Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 29 Jun 2010 14:53:54 +0200 Subject: [PATCH 3/3] load all plugins --- inc/lib_base.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/inc/lib_base.php b/inc/lib_base.php index c7fd80964a..d566e917f8 100755 --- a/inc/lib_base.php +++ b/inc/lib_base.php @@ -26,6 +26,7 @@ ob_start(); // error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL); // MDB2 gives loads of strict error, disabling for now + date_default_timezone_set('Europe/Berlin'); ini_set('arg_separator.output','&'); ini_set('session.cookie_httponly','1;'); @@ -108,9 +109,20 @@ if(OC_USER::isLoggedIn()){ } // load plugins -$CONFIG_LOADPLUGINS=''; -$plugins=explode(' ',$CONFIG_LOADPLUGINS); -if(isset($plugins[0]['url'])) foreach($plugins as $plugin) require_once($SERVERROOT.'/plugins/'.$plugin.'/lib_'.$plugin.'.php'); +$CONFIG_LOADPLUGINS='all'; +if ($CONFIG_LOADPLUGINS != 'all') + $plugins=explode(' ',$CONFIG_LOADPLUGINS); +else{ + $plugins=array(); + $fd=opendir($SERVERROOT.'/plugins'); + while (($filename = readdir($fd)) !== false) { + if($filename<>'.' and $filename<>'..' and substr($filename,0,1)!='.'){ + $plugins[]=$filename; + } + } + closedir($fd); +} +if(isset($plugins[0])) foreach($plugins as $plugin) require_once($SERVERROOT.'/plugins/'.$plugin.'/lib_'.$plugin.'.php'); // check if the server is correctly configured for ownCloud