From 561cbb2de69a31934c22fc28332b5a14b6fcfc68 Mon Sep 17 00:00:00 2001 From: Felix Moeller Date: Tue, 23 Oct 2012 23:01:10 +0200 Subject: [PATCH] NoSpaceAfterComma II --- apps/files_encryption/lib/proxy.php | 6 +++--- apps/files_encryption/settings.php | 2 +- apps/files_external/lib/webdav.php | 4 ++-- lib/MDB2/Driver/Function/sqlite3.php | 2 +- lib/filecache.php | 6 +++--- lib/templatelayout.php | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 5c19955dbd..61b87ab546 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -42,13 +42,13 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ return false; } if(is_null(self::$blackList)) { - self::$blackList=explode(',',OCP\Config::getAppValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg')); + self::$blackList=explode(',', OCP\Config::getAppValue('files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg')); } if(self::isEncrypted($path)) { return true; } - $extension=substr($path,strrpos($path,'.')+1); - if(array_search($extension,self::$blackList)===false) { + $extension=substr($path, strrpos($path, '.')+1); + if(array_search($extension, self::$blackList)===false) { return true; } } diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php index 0a0d4d1abb..168124a8d2 100644 --- a/apps/files_encryption/settings.php +++ b/apps/files_encryption/settings.php @@ -7,7 +7,7 @@ */ $tmpl = new OCP\Template( 'files_encryption', 'settings'); -$blackList=explode(',',OCP\Config::getAppValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg')); +$blackList=explode(',', OCP\Config::getAppValue('files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg')); $enabled=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true'); $tmpl->assign('blacklist',$blackList); $tmpl->assign('encryption_enabled',$enabled); diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index 890e66d742..74e468a283 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -225,7 +225,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ $path1=$this->cleanPath($path1); $path2=$this->root.$this->cleanPath($path2); try{ - $response=$this->client->request('MOVE',$path1,null, array('Destination'=>$path2)); + $response=$this->client->request('MOVE', $path1, null, array('Destination'=>$path2)); return true; }catch(Exception $e) { echo $e; @@ -239,7 +239,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ $path1=$this->cleanPath($path1); $path2=$this->root.$this->cleanPath($path2); try{ - $response=$this->client->request('COPY',$path1,null, array('Destination'=>$path2)); + $response=$this->client->request('COPY', $path1, null, array('Destination'=>$path2)); return true; }catch(Exception $e) { echo $e; diff --git a/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php index 235a106e18..0bddde5bf3 100644 --- a/lib/MDB2/Driver/Function/sqlite3.php +++ b/lib/MDB2/Driver/Function/sqlite3.php @@ -94,7 +94,7 @@ class MDB2_Driver_Function_sqlite3 extends MDB2_Driver_Function_Common if (!is_null($length)) { return "substr($value,$position,$length)"; } - return "substr($value,$position,length($value))"; + return "substr($value, $position, length($value))"; } // }}} diff --git a/lib/filecache.php b/lib/filecache.php index 3225759544..b8b35cdf3d 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -102,7 +102,7 @@ class OC_FileCache{ $data['versioned']=(int)$data['versioned']; $user=OC_User::getUser(); $query=OC_DB::prepare('INSERT INTO `*PREFIX*fscache`(`parent`, `name`, `path`, `path_hash`, `size`, `mtime`, `ctime`, `mimetype`, `mimepart`,`user`,`writable`,`encrypted`,`versioned`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)'); - $result=$query->execute(array($parent,basename($fullpath),$fullpath, md5($fullpath),$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user,$data['writable'],$data['encrypted'],$data['versioned'])); + $result=$query->execute(array($parent, basename($fullpath), $fullpath, md5($fullpath), $data['size'], $data['mtime'], $data['ctime'], $data['mimetype'], $mimePart, $user, $data['writable'], $data['encrypted'], $data['versioned'])); if(OC_DB::isError($result)) { OC_Log::write('files', 'error while writing file('.$fullpath.') to cache', OC_Log::ERROR); } @@ -163,7 +163,7 @@ class OC_FileCache{ $newPath=$root.$newPath; $newParent=self::getParentId($newPath); $query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `parent`=? ,`name`=?, `path`=?, `path_hash`=? WHERE `path_hash`=?'); - $query->execute(array($newParent,basename($newPath),$newPath,md5($newPath), md5($oldPath))); + $query->execute(array($newParent, basename($newPath), $newPath, md5($newPath), md5($oldPath))); if(($cache=OC_Cache::getUserCache(true)) && $cache->hasKey('fileid/'.$oldPath)) { $cache->set('fileid/'.$newPath, $cache->get('fileid/'.$oldPath)); @@ -176,7 +176,7 @@ class OC_FileCache{ while($row= $query->execute(array($oldPath.'/%'))->fetchRow()) { $old=$row['path']; $new=$newPath.substr($old, $oldLength); - $updateQuery->execute(array($new,md5($new), md5($old))); + $updateQuery->execute(array($new, md5($new), md5($old))); if(($cache=OC_Cache::getUserCache(true)) && $cache->hasKey('fileid/'.$old)) { $cache->set('fileid/'.$new, $cache->get('fileid/'.$old)); diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 645c92fa1f..c3da172a7c 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -38,7 +38,7 @@ class OC_TemplateLayout extends OC_Template { foreach(OC_App::getEnabledApps() as $app) { $apps_paths[$app] = OC_App::getAppWebPath($app); } - $this->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution + $this->assign( 'apps_paths', str_replace('\\/', '/', json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution if (OC_Config::getValue('installed', false) && !OC_AppConfig::getValue('core', 'remote_core.css', false)) { OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');