mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #242 from fmms/checkstyle05 

Checkstyle fixes
This commit is contained in:
Thomas Müller 2012-11-05 01:34:11 -08:00
parent f0be09a23c 02ec677e3c
commit 135680e50b
41 changed files with 632 additions and 638 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/MDB2/Driver/sqlite3.php
View File

@ -397,8 +397,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
} }
if ($this->fix_assoc_fields_names || if ($this->fix_assoc_fields_names ||
$this->options['portability'] & MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES) $this->options['portability'] & MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES) {
{
$this->connection->exec("PRAGMA short_column_names = 1"); $this->connection->exec("PRAGMA short_column_names = 1");
$this->fix_assoc_fields_names = true; $this->fix_assoc_fields_names = true;
} }

3
lib/archive/tar.php
View File

@ -130,8 +130,7 @@ class OC_Archive_TAR extends OC_Archive{
if( $file == $header['filename'] if( $file == $header['filename']
or $file.'/' == $header['filename'] or $file.'/' == $header['filename']
or '/'.$file.'/' == $header['filename'] or '/'.$file.'/' == $header['filename']
or '/'.$file == $header['filename']) or '/'.$file == $header['filename']) {
{
return $header; return $header;
} }
} }

6
lib/base.php
View File

@ -524,8 +524,7 @@ class OC{
} }
$file_ext = substr($param['file'], -3); $file_ext = substr($param['file'], -3);
if ($file_ext != 'php' if ($file_ext != 'php'
|| !self::loadAppScriptFile($param)) || !self::loadAppScriptFile($param)) {
{
header('HTTP/1.0 404 Not Found'); header('HTTP/1.0 404 Not Found');
} }
} }
@ -595,8 +594,7 @@ class OC{
if(!isset($_COOKIE["oc_remember_login"]) if(!isset($_COOKIE["oc_remember_login"])
|| !isset($_COOKIE["oc_token"]) || !isset($_COOKIE["oc_token"])
|| !isset($_COOKIE["oc_username"]) || !isset($_COOKIE["oc_username"])
|| !$_COOKIE["oc_remember_login"]) || !$_COOKIE["oc_remember_login"]) {
{
return false; return false;
} }
OC_App::loadApps(array('authentication')); OC_App::loadApps(array('authentication'));

3
settings/ajax/changepassword.php
View File

@ -16,8 +16,7 @@ if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
$userstatus = 'subadmin'; $userstatus = 'subadmin';
} }
if(OC_User::getUser() === $username) { if(OC_User::getUser() === $username) {
if (OC_User::checkPassword($username, $oldPassword)) if (OC_User::checkPassword($username, $oldPassword)) {
{
$userstatus = 'user'; $userstatus = 'user';
} else { } else {
if (!OC_Util::isUserVerified()) { if (!OC_Util::isUserVerified()) {

3
settings/templates/help.php
View File

@ -12,8 +12,7 @@
<?php <?php
$url=OC_Helper::linkTo( "settings", "help.php" ).'?page='; $url=OC_Helper::linkTo( "settings", "help.php" ).'?page=';
$pageNavi=OC_Util::getPageNavi($_['pagecount'], $_['page'], $url); $pageNavi=OC_Util::getPageNavi($_['pagecount'], $_['page'], $url);
if($pageNavi) if($pageNavi) {
{
$pageNavi->printPage(); $pageNavi->printPage();
} }
?> ?>