diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-12-14 23:50:21 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-12-15 00:43:46 +0100 |
| commit | df7d6cb26c0e54e9df509b4a739b4d41c87fcb98 (patch) | |
| tree | 793ceb63829665a6b2c05304aa772cc785562dc3 | |
| parent | 68562dafb4a814072aa0cd537b0d035f75e7a70f (diff) | |
| download | nextcloud-server-df7d6cb26c0e54e9df509b4a739b4d41c87fcb98.tar.gz nextcloud-server-df7d6cb26c0e54e9df509b4a739b4d41c87fcb98.zip | |
More style fixes
| -rw-r--r-- | apps/user_ldap/lib/access.php | 2 | ||||
| -rw-r--r-- | core/templates/logout.php | 2 | ||||
| -rw-r--r-- | lib/l10n.php | 10 | ||||
| -rwxr-xr-x | lib/util.php | 3 | ||||
| -rw-r--r-- | 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 a4123cde57a..f888577aedb 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 8cbbdd9cc8d..2247ed8e70f 100644 --- a/core/templates/logout.php +++ b/core/templates/logout.php @@ -1 +1 @@ -<?php echo $l->t( 'You are logged out.' ); ?>
\ No newline at end of file +<?php echo $l->t( 'You are logged out.' ); diff --git a/lib/l10n.php b/lib/l10n.php index cb67cfd4ed6..f70dfa5e34e 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 fc1c889c31d..fc50123b4fe 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 12368a1cdb6..de8092eeaff 100644 --- a/settings/templates/settings.php +++ b/settings/templates/settings.php @@ -6,4 +6,4 @@ <?php foreach($_['forms'] as $form) { echo $form; -};?>
\ No newline at end of file +}; |