More style fixes

This commit is contained in:
Bart Visscher 2012-12-14 23:50:21 +01:00
parent 68562dafb4
commit df7d6cb26c
5 changed files with 10 additions and 9 deletions

View File

@ -1 +1 @@
<?php echo $l->t( 'You are logged out.' ); ?> <?php echo $l->t( 'You are logged out.' );

View File

@ -115,10 +115,12 @@ class OC_L10N{
$i18ndir = self::findI18nDir($app); $i18ndir = self::findI18nDir($app);
// Localization is in /l10n, Texts are in $i18ndir // Localization is in /l10n, Texts are in $i18ndir
// (Just no need to define date/time format etc. twice) // (Just no need to define date/time format etc. twice)
if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/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.'/core/l10n/')
OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/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')) { || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')
)
&& file_exists($i18ndir.$lang.'.php')) {
// Include the file, save the data from $CONFIG // Include the file, save the data from $CONFIG
include strip_tags($i18ndir).strip_tags($lang).'.php'; include strip_tags($i18ndir).strip_tags($lang).'.php';
if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) { if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {

View File

@ -331,8 +331,7 @@ class OC_Util {
$parameters[$value] = true; $parameters[$value] = true;
} }
if (!empty($_POST['user'])) { if (!empty($_POST['user'])) {
$parameters["username"] = $parameters["username"] = OC_Util::sanitizeHTML($_POST['user']).'"';
OC_Util::sanitizeHTML($_POST['user']).'"';
$parameters['user_autofocus'] = false; $parameters['user_autofocus'] = false;
} else { } else {
$parameters["username"] = ''; $parameters["username"] = '';

View File

@ -6,4 +6,4 @@
<?php foreach($_['forms'] as $form) { <?php foreach($_['forms'] as $form) {
echo $form; echo $form;
};?> };