From 5e55b4d6e77b91e29838d26765e7f1bd55fe6bbd Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 7 Sep 2012 14:05:51 +0200 Subject: [PATCH] Whitespace fixes in lib --- lib/base.php | 8 ++++---- lib/db.php | 2 +- lib/l10n.php | 6 +++--- lib/user.php | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/base.php b/lib/base.php index cbcbdd2ad0..a145fd1cf2 100644 --- a/lib/base.php +++ b/lib/base.php @@ -51,7 +51,7 @@ class OC{ */ public static $THIRDPARTYWEBROOT = ''; /** - * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and + * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and * web path in 'url' */ public static $APPSROOTS = array(); @@ -95,7 +95,7 @@ class OC{ }else{ return false; } - + if($fullPath = stream_resolve_include_path($path)) { require_once $path; } @@ -533,10 +533,10 @@ class OC{ } OC_App::loadApps(); - + //setup extra user backends OC_User::setupBackends(); - + if(OC_User::login($_POST["user"], $_POST["password"])) { if(!empty($_POST["remember_login"])) { if(defined("DEBUG") && DEBUG) { diff --git a/lib/db.php b/lib/db.php index 2f36416d0a..bd3afe2b06 100644 --- a/lib/db.php +++ b/lib/db.php @@ -411,7 +411,7 @@ class OC_DB { if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't $content = str_replace( '0000-00-00 00:00:00', 'CURRENT_TIMESTAMP', $content ); } - + file_put_contents( $file2, $content ); // Try to create tables diff --git a/lib/l10n.php b/lib/l10n.php index 0421e4eba8..f827412613 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -113,9 +113,9 @@ class OC_L10N{ $i18ndir = self::findI18nDir($app); // Localization is in /l10n, Texts are in $i18ndir // (Just no need to define date/time format etc. twice) - if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') || - OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || - OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') || + if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') || + OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || + OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) { // Include the file, save the data from $CONFIG include(strip_tags($i18ndir).strip_tags($lang).'.php'); diff --git a/lib/user.php b/lib/user.php index 305fb8ed3a..236478e9e5 100644 --- a/lib/user.php +++ b/lib/user.php @@ -39,7 +39,7 @@ class OC_User { // The backend used for user management private static $_usedBackends = array(); - + private static $_setupedBackends = array(); // Backends available (except database)