More style fixes

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index a4123cde57a2d6759edd6ef3575b0f00472e0865..f888577aedb59adced4e8dbd56f08f56431797db 100644 (file)
--- 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 8cbbdd9cc8d9b3c759adea07bce7a2986b216b2f..2247ed8e70f2ae4c10deac7941286064f738bb84 100644 (file)
--- 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 cb67cfd4ed6fef73d0a517cde4841141b100c5a0..f70dfa5e34ee604022a19db580cd4d5e546236e3 100644 (file)
--- 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 fc1c889c31d22e083ae29798bb393c7e34fe3f3f..fc50123b4fe9df1b1055c2e6b0ddff29530b8024 100755 (executable)
--- 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 12368a1cdb692ab027bfd52d71e68036154b2dce..de8092eeaff5a86ae048ec36206632c9d7251b24 100644 (file)
--- 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
+};