Checkstyle: Fix the last 25 NoSpaceAfterComma

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index cacf7d7920aabf5814e79bbc8868c59bb2b248cc..4a390013d20f2826a092a5cbb4fc9e778b8b35f1 100644 (file)
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -92,7 +92,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
                }elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') {
                        if(OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0) {
                                //first encrypt the target file so we don't end up with a half encrypted file
-                               OCP\Util::writeLog('files_encryption','Decrypting '.$path.' before writing', OCP\Util::DEBUG);
+                               OCP\Util::writeLog('files_encryption', 'Decrypting '.$path.' before writing', OCP\Util::DEBUG);
                                $tmp=fopen('php://temp');
                                OCP\Files::streamCopy($result, $tmp);
                                fclose($result);

diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index d7636894347fcf6017bd1ec2e4a6f9516236e36e..802d80d8d1f49c495b4255d7ff3898d2213590ae 100644 (file)
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -24,7 +24,7 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
                if(!$this->root || $this->root[0]!='/') {
                        $this->root='/'.$this->root;
                }
-               if(substr($this->root,-1, 1)!='/') {
+               if(substr($this->root, -1, 1)!='/') {
                        $this->root.='/';
                }
                if(!$this->share || $this->share[0]!='/') {
@@ -41,7 +41,7 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
        }
 
        public function constructUrl($path) {
-               if(substr($path,-1)=='/') {
+               if(substr($path, -1)=='/') {
                        $path=substr($path, 0, -1);
                }
                return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->share.$this->root.$path;

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 3a653ad7208f2d10c8632e22694bb7cd04faf229..d10062c1d9dd8100511092f59e7575dba2076710 100644 (file)
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -29,7 +29,7 @@
                <p><label for="ldap_cache_ttl">Cache Time-To-Live</label><input type="text" id="ldap_cache_ttl" name="ldap_cache_ttl" value="<?php echo $_['ldap_cache_ttl']; ?>" title="<?php echo $l->t('in seconds. A change empties the cache.');?>" /></p>
                <p><label for="home_folder_naming_rule">User Home Folder Naming Rule</label><input type="text" id="home_folder_naming_rule" name="home_folder_naming_rule" value="<?php echo $_['home_folder_naming_rule']; ?>" title="<?php echo $l->t('Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.');?>" /></p>
        </fieldset>
-       <input type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection">Test Configuration</button> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a>
+       <input type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection">Test Configuration</button> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('', 'actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a>
        </div>
 
 </form>

diff --git a/lib/MDB2/Driver/Reverse/sqlite3.php b/lib/MDB2/Driver/Reverse/sqlite3.php
index 36626478ce81d9be4918c2a699457c871cf0bee8..9703780954904d49165abd82d389f847f986f4d0 100644 (file)
--- a/lib/MDB2/Driver/Reverse/sqlite3.php
+++ b/lib/MDB2/Driver/Reverse/sqlite3.php
@@ -476,7 +476,7 @@ class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common
         $definition['unique'] = true;
         $count = count($column_names);
         for ($i=0; $i<$count; ++$i) {
-            $column_name = strtok($column_names[$i]," ");
+            $column_name = strtok($column_names[$i], " ");
             $collation = strtok(" ");
             $definition['fields'][$column_name] = array(
                 'position' => $i+1

diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 81376fb6fcae32b0018482b14459ce5ec5fc5144..46bc8dc16d8f396341951946fd3225d8afb0bcfc 100644 (file)
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -38,9 +38,9 @@ class OC_FileProxy_Quota extends OC_FileProxy{
                if(in_array($user, $this->userQuota)) {
                        return $this->userQuota[$user];
                }
-               $userQuota=OC_Preferences::getValue($user,'files','quota', 'default');
+               $userQuota=OC_Preferences::getValue($user, 'files', 'quota', 'default');
                if($userQuota=='default') {
-                       $userQuota=OC_AppConfig::getValue('files','default_quota', 'none');
+                       $userQuota=OC_AppConfig::getValue('files', 'default_quota', 'none');
                }
                if($userQuota=='none') {
                        $this->userQuota[$user]=0;

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 2dde0093d4bd511cb19c0537cc4bb058c813b55b..6fe45acf8c5a3b60b4e395971100621bf029571b 100644 (file)
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -6,7 +6,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
        protected $datadir;
        public function __construct($arguments) {
                $this->datadir=$arguments['datadir'];
-               if(substr($this->datadir,-1)!=='/') {
+               if(substr($this->datadir, -1)!=='/') {
                        $this->datadir.='/';
                }
        }
@@ -20,7 +20,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
                return opendir($this->datadir.$path);
        }
        public function is_dir($path) {
-               if(substr($path,-1)=='/') {
+               if(substr($path, -1)=='/') {
                        $path=substr($path, 0, -1);
                }
                return is_dir($this->datadir.$path);
@@ -86,11 +86,11 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
        }
        public function rename($path1, $path2) {
                if (!$this->isUpdatable($path1)) {
-                       OC_Log::write('core','unable to rename, file is not writable : '.$path1, OC_Log::ERROR);
+                       OC_Log::write('core', 'unable to rename, file is not writable : '.$path1, OC_Log::ERROR);
                        return false;
                }
                if(! $this->file_exists($path1)) {
-                       OC_Log::write('core','unable to rename, file does not exists : '.$path1, OC_Log::ERROR);
+                       OC_Log::write('core', 'unable to rename, file does not exists : '.$path1, OC_Log::ERROR);
                        return false;
                }
 

diff --git a/lib/filesystem.php b/lib/filesystem.php
index aeafb14939575a4517ee6695cf5afa300e7d6bba..e4c0e2e1eb5e6a57a8c507631f5ae728180387e3 100644 (file)
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -246,7 +246,7 @@ class OC_Filesystem{
                        }\r
                \r
                        $mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');\r
-                       $previousMTime=OC_Appconfig::getValue('files','mountconfigmtime', 0);\r
+                       $previousMTime=OC_Appconfig::getValue('files', 'mountconfigmtime', 0);\r
                        if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated\r
                                OC_FileCache::triggerUpdate();\r
                                OC_Appconfig::setValue('files', 'mountconfigmtime', $mtime);\r
@@ -312,7 +312,7 @@ class OC_Filesystem{
                                return false;
                        }
                }else{
-                       OC_Log::write('core','storage backend '.$class.' not found', OC_Log::ERROR);
+                       OC_Log::write('core', 'storage backend '.$class.' not found', OC_Log::ERROR);
                        return false;
                }
        }

diff --git a/lib/installer.php b/lib/installer.php
index 266c07d5c2b6a357f9cb324e39594a4ede1a6ac2..7dc8b0cef8ddfbbe2db16814dc92c3f67ef9765e 100644 (file)
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -57,7 +57,7 @@ class OC_Installer{
         */
        public static function installApp( $data = array()) {
                if(!isset($data['source'])) {
-                       OC_Log::write('core','No source specified when installing app', OC_Log::ERROR);
+                       OC_Log::write('core', 'No source specified when installing app', OC_Log::ERROR);
                        return false;
                }
 
@@ -65,13 +65,13 @@ class OC_Installer{
                if($data['source']=='http') {
                        $path=OC_Helper::tmpFile();
                        if(!isset($data['href'])) {
-                               OC_Log::write('core','No href specified when installing app from http', OC_Log::ERROR);
+                               OC_Log::write('core', 'No href specified when installing app from http', OC_Log::ERROR);
                                return false;
                        }
                        copy($data['href'], $path);
                }else{
                        if(!isset($data['path'])) {
-                               OC_Log::write('core','No path specified when installing app from local file', OC_Log::ERROR);
+                               OC_Log::write('core', 'No path specified when installing app from local file', OC_Log::ERROR);
                                return false;
                        }
                        $path=$data['path'];
@@ -86,7 +86,7 @@ class OC_Installer{
                        rename($path, $path.'.tgz');
                        $path.='.tgz';
                }else{
-                       OC_Log::write('core','Archives of type '.$mime.' are not supported', OC_Log::ERROR);
+                       OC_Log::write('core', 'Archives of type '.$mime.' are not supported', OC_Log::ERROR);
                        return false;
                }
 

diff --git a/lib/migrate.php b/lib/migrate.php
index 616417a22716e546860208f8f8a7029227b2344c..96f5a0001f79060ebf9c1166909884160507481f 100644 (file)
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -611,7 +611,7 @@ class OC_Migrate{
                if( file_exists( $db ) ) {
                        // Connect to the db
                        if(!self::connectDB( $db )) {
-                               OC_Log::write('migration','Failed to connect to migration.db', OC_Log::ERROR);
+                               OC_Log::write('migration', 'Failed to connect to migration.db', OC_Log::ERROR);
                                return false;
                        }
                } else {

diff --git a/lib/migration/content.php b/lib/migration/content.php
index 54982b3c8470a15965b0a31875dd584a4400cb06..00df62f0c7fafada2f669c10b64eaa8cdae2b000 100644 (file)
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -205,7 +205,7 @@ class OC_Migration_Content{
                        }
                        closedir($dirhandle);
            } else {
-                       OC_Log::write('admin_export',"Was not able to open directory: " . $dir, OC_Log::ERROR);
+                       OC_Log::write('admin_export', "Was not able to open directory: " . $dir, OC_Log::ERROR);
                        return false;
            }
            return true;

diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index ceeb78570fd49c2a1b9d0e9fa7d270865dbe7c5a..b6b5ad8f0a99b9a3322f423e2866f5d19b9065e2 100644 (file)
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -162,7 +162,7 @@ class OC_OCSClient{
                $xml=OC_OCSClient::getOCSresponse($url);
 
                if($xml==false) {
-                       OC_Log::write('core','Unable to parse OCS content', OC_Log::FATAL);
+                       OC_Log::write('core', 'Unable to parse OCS content', OC_Log::FATAL);
                        return null;
                }
                $data=simplexml_load_string($xml);
@@ -200,7 +200,7 @@ class OC_OCSClient{
                $xml=OC_OCSClient::getOCSresponse($url);
 
                if($xml==false) {
-                       OC_Log::write('core','Unable to parse OCS content', OC_Log::FATAL);
+                       OC_Log::write('core', 'Unable to parse OCS content', OC_Log::FATAL);
                        return null;
                }
                $data=simplexml_load_string($xml);
@@ -238,7 +238,7 @@ class OC_OCSClient{
                $xml=OC_OCSClient::getOCSresponse($url);
 
                if($xml==false) {
-                       OC_Log::write('core','Unable to parse knowledgebase content', OC_Log::FATAL);
+                       OC_Log::write('core', 'Unable to parse knowledgebase content', OC_Log::FATAL);
                        return null;
                }
                $data=simplexml_load_string($xml);

diff --git a/lib/template.php b/lib/template.php
index efcc6e82c4ca077c5f9ebb672765ff9f72f2fea8..3d3589abd1e9c24028346b203d04e573aaafc4b9 100644 (file)
--- a/lib/template.php
+++ b/lib/template.php
@@ -199,7 +199,7 @@ class OC_Template{
                                $mode='tablet';
                        }elseif(stripos($_SERVER['HTTP_USER_AGENT'], 'iphone')>0) {
                                $mode='mobile';
-                       }elseif((stripos($_SERVER['HTTP_USER_AGENT'],'N9')>0) and (stripos($_SERVER['HTTP_USER_AGENT'], 'nokia')>0)) {
+                       }elseif((stripos($_SERVER['HTTP_USER_AGENT'], 'N9')>0) and (stripos($_SERVER['HTTP_USER_AGENT'], 'nokia')>0)) {
                                $mode='mobile';
                        }else{
                                $mode='default';

diff --git a/lib/user.php b/lib/user.php
index be0e525d868ab0c2110a4d4833351ef9f08d0270..801ab7f608da99569c9263a83ed7d17cc00f41c5 100644 (file)
--- a/lib/user.php
+++ b/lib/user.php
@@ -133,7 +133,7 @@ class OC_User {
                                self::useBackend($backend);
                                $_setupedBackends[]=$i;
                        }else{
-                               OC_Log::write('core','User backend '.$class.' not found.', OC_Log::ERROR);
+                               OC_Log::write('core', 'User backend '.$class.' not found.', OC_Log::ERROR);
                        }
                }
        }

diff --git a/settings/users.php b/settings/users.php
index 6eaae474538a26385eff0a6cc74ba94e6936ba28..395712dbd590dc26b6ab9557f9cc54df04de53f6 100644 (file)
--- a/settings/users.php
+++ b/settings/users.php
@@ -42,7 +42,7 @@ foreach( $accessiblegroups as $i ) {
        $groups[] = array( "name" => $i );
 }
 $quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', 'default,none,1 GB, 5 GB, 10 GB');
-$quotaPreset=explode(',',$quotaPreset);
+$quotaPreset=explode(',', $quotaPreset);
 foreach($quotaPreset as &$preset) {
        $preset=trim($preset);
 }