NoSpaceAfterComma II

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 5c19955dbd56c0a157a2a5988920931a74182c28..61b87ab5463509159464a2797cb1d5efb73f71e9 100644 (file)
--- 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 0a0d4d1abbad68c0e32eba71ee2e471d4cc3d4d5..168124a8d22e3ed829288885f9e304717f3e4349 100644 (file)
--- 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 890e66d742ec15ac52a00bf0efca0b0f8287df66..74e468a283837a68a17f5bf32fff22f387f23261 100644 (file)
--- 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 235a106e183df49f3089afe9a30135a8a48c3ccf..0bddde5bf3f25c0ca95606bec6f92a12279f5470 100644 (file)
--- 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 322575954430a562ab86c9a3f56eb36127e9479b..b8b35cdf3d25f770eba680a0264ff74a318871d9 100644 (file)
--- 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 645c92fa1f1dcde3628e5a8566f2d2aa745a0a9e..c3da172a7c18f033e95eea88d400ededfe1170c0 100644 (file)
--- 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');