Merge branch 'merge'

3 files changed, 19 insertions, 7 deletions

diff --git a/inc/lib_base.php b/inc/lib_base.php
index f991e40dfd8..4fcba692b4f 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('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
diff --git a/inc/templates/adminform.php b/inc/templates/adminform.php
index 81b02ac45fc..9846cfee6d3 100755
--- a/inc/templates/adminform.php
+++ b/inc/templates/adminform.php
@@ -115,7 +115,7 @@ foreach($dbtypes as $dbtype){
 <tr><td></td><td><input type="submit" name="set_config" alt="save" value="save" class="formstyle" /></td></tr>
 </table></form><br/>
 <?php
-if(!$FIRSTRUN and false){//disabled for now?>
+if(!$FIRSTRUN ){//disabled for now?>
 <br/>
 <form method="post" enctype="multipart/form-data" action="#">
 <table cellpadding="5" cellspacing="5" border="0" class="loginform">
@@ -131,4 +131,4 @@ if(!$FIRSTRUN and false){//disabled for now?>
 <script type="text/javascript">
     dbtypechange()
     showBackupPath()
-</script>
\ No newline at end of file
+</script>
diff --git a/inc/templates/configform.php b/inc/templates/configform.php
index 64499b9ed95..63e0e0a7d17 100755
--- a/inc/templates/configform.php
+++ b/inc/templates/configform.php
@@ -34,7 +34,7 @@ changepassset=function(){
 </table>
 </form>
 <!--dissabled for now
-Groups:
+Groups:-->
 <form method="post" enctype="multipart/form-data">
 <input type='hidden' name='creategroup' value='1'>
 <table cellpadding="5" cellspacing="5" border="0" class="loginform">
@@ -50,4 +50,4 @@ foreach($groups as $group){
 <tr><td colspan='2' class='center'>Create new group</td></tr>
 <tr><td><input type='text' name='groupname' class="formstyle"></input></td><td><input type='submit' value='create' class="formstyle"></input></td></tr>
 </table>
-</form>-->
+</form>