зеркало из https://github.com/nextcloud/server.git
Whitespace fixes in lib
This commit is contained in:
Родитель
386d1ac49f
Коммит
5e55b4d6e7
|
@ -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) {
|
||||
|
|
|
@ -411,7 +411,7 @@ class OC_DB {
|
|||
if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't
|
||||
$content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
|
||||
}
|
||||
|
||||
|
||||
file_put_contents( $file2, $content );
|
||||
|
||||
// Try to create tables
|
||||
|
|
|
@ -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');
|
||||
|
|
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче