From df7d6cb26c0e54e9df509b4a739b4d41c87fcb98 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 14 Dec 2012 23:50:21 +0100 Subject: [PATCH] More style fixes --- apps/user_ldap/lib/access.php | 2 +- core/templates/logout.php | 2 +- lib/l10n.php | 10 ++++++---- lib/util.php | 3 +-- settings/templates/settings.php | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index a4123cde57..f888577aed 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -619,7 +619,7 @@ abstract class Access { //a) paged search insuccessful, though attempted //b) no paged search, but limit set if((!$this->pagedSearchedSuccessful - && $pagedSearchOK) + && $pagedSearchOK) || ( !$pagedSearchOK && !is_null($limit) diff --git a/core/templates/logout.php b/core/templates/logout.php index 8cbbdd9cc8..2247ed8e70 100644 --- a/core/templates/logout.php +++ b/core/templates/logout.php @@ -1 +1 @@ -t( 'You are logged out.' ); ?> \ No newline at end of file +t( 'You are logged out.' ); diff --git a/lib/l10n.php b/lib/l10n.php index cb67cfd4ed..f70dfa5e34 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -115,10 +115,12 @@ 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/') || - OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) { + 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'; if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) { diff --git a/lib/util.php b/lib/util.php index fc1c889c31..fc50123b4f 100755 --- a/lib/util.php +++ b/lib/util.php @@ -331,8 +331,7 @@ class OC_Util { $parameters[$value] = true; } if (!empty($_POST['user'])) { - $parameters["username"] = - OC_Util::sanitizeHTML($_POST['user']).'"'; + $parameters["username"] = OC_Util::sanitizeHTML($_POST['user']).'"'; $parameters['user_autofocus'] = false; } else { $parameters["username"] = ''; diff --git a/settings/templates/settings.php b/settings/templates/settings.php index 12368a1cdb..de8092eeaf 100644 --- a/settings/templates/settings.php +++ b/settings/templates/settings.php @@ -6,4 +6,4 @@ \ No newline at end of file +};