wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'refs/merge-requests/23' of git://gitorious.org/owncloud/owncloud into merge

Browse source
This commit is contained in:
Robin Appelman 2010-07-08 20:31:02 +02:00
commit 32e5851255
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
inc/lib_base.php
View file

@ -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

4
inc/templates/adminform.php
View file

@ -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>
</script>

4
inc/templates/configform.php
View file

@ -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>