From 7a7f12a0c126522cb067de692af0950d46bf15fc Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 31 Oct 2012 18:37:59 +0100 Subject: [PATCH 01/12] Create only one CSRF token per session Before, the CSRF token expired every hour. We had a script in place which should refresh the token but this don't worked in every case. (Laptop sleeping etc.) With this commit, the token will only get once created for every session so that the "Token expired" warning shouldn't appear. --- core/ajax/requesttoken.php | 40 ------------------------ core/js/requesttoken.js | 55 --------------------------------- core/routes.php | 3 -- core/templates/layout.base.php | 1 - core/templates/layout.guest.php | 1 - core/templates/layout.user.php | 8 ++++- lib/base.php | 2 -- lib/template.php | 2 -- lib/util.php | 29 ++++------------- 9 files changed, 13 insertions(+), 128 deletions(-) delete mode 100644 core/ajax/requesttoken.php delete mode 100644 core/js/requesttoken.js diff --git a/core/ajax/requesttoken.php b/core/ajax/requesttoken.php deleted file mode 100644 index 9d43a72285..0000000000 --- a/core/ajax/requesttoken.php +++ /dev/null @@ -1,40 +0,0 @@ - -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the license, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. -* If not, see . -* -*/ - -/** - * @file core/ajax/requesttoken.php - * @brief Ajax method to retrieve a fresh request protection token for ajax calls - * @return json: success/error state indicator including a fresh request token - * @author Christian Reiner - */ - -// don't load apps or filesystem for this task -$RUNTIME_NOAPPS = true; -$RUNTIME_NOSETUPFS = true; - -// Sanity checks -// using OCP\JSON::callCheck() below protects the token refreshing itself. -//OCP\JSON::callCheck ( ); -OCP\JSON::checkLoggedIn ( ); -// hand out a fresh token -OCP\JSON::success ( array ( 'token' => OCP\Util::callRegister() ) ); -?> diff --git a/core/js/requesttoken.js b/core/js/requesttoken.js deleted file mode 100644 index 0d78cd7e93..0000000000 --- a/core/js/requesttoken.js +++ /dev/null @@ -1,55 +0,0 @@ -/** - * ownCloud - * - * @file core/js/requesttoken.js - * @brief Routine to refresh the Request protection request token periodically - * @author Christian Reiner (arkascha) - * @copyright 2011-2012 Christian Reiner - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the license, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. - * If not, see . - * - */ - -OC.Request = { - // the request token - Token: {}, - // the lifespan span (in secs) - Lifespan: {}, - // method to refresh the local request token periodically - Refresh: function(){ - // just a client side console log to preserve efficiency - console.log("refreshing request token (lifebeat)"); - var dfd=new $.Deferred(); - $.ajax({ - type: 'POST', - url: OC.filePath('core','ajax','requesttoken.php'), - cache: false, - data: { }, - dataType: 'json' - }).done(function(response){ - // store refreshed token inside this class - OC.Request.Token=response.token; - dfd.resolve(); - }).fail(dfd.reject); - return dfd; - } -} -// accept requesttoken and lifespan into the OC namespace -OC.Request.Token = oc_requesttoken; -OC.Request.Lifespan = oc_requestlifespan; -// refresh the request token periodically shortly before it becomes invalid on the server side -setInterval(OC.Request.Refresh,Math.floor(1000*OC.Request.Lifespan*0.93)), // 93% of lifespan value, close to when the token expires -// early bind token as additional ajax argument for every single request -$(document).bind('ajaxSend', function(elm, xhr, s){xhr.setRequestHeader('requesttoken', OC.Request.Token);}); diff --git a/core/routes.php b/core/routes.php index cc0aa53a21..6f99935668 100644 --- a/core/routes.php +++ b/core/routes.php @@ -13,9 +13,6 @@ $this->create('search_ajax_search', '/search/ajax/search.php') // AppConfig $this->create('core_ajax_appconfig', '/core/ajax/appconfig.php') ->actionInclude('core/ajax/appconfig.php'); -// RequestToken -$this->create('core_ajax_requesttoken', '/core/ajax/requesttoken.php') - ->actionInclude('core/ajax/requesttoken.php'); // Share $this->create('core_ajax_share', '/core/ajax/share.php') ->actionInclude('core/ajax/share.php'); diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index f78b6ff8bb..d8f8305877 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -11,7 +11,6 @@ var oc_webroot = ''; var oc_appswebroots = ; var oc_requesttoken = ''; - var oc_requestlifespan = ''; diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index e6468cdcfb..2eaa517b32 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -11,7 +11,6 @@ var oc_webroot = ''; var oc_appswebroots = ; var oc_requesttoken = ''; - var oc_requestlifespan = ''; var datepickerFormatDate = l('jsdate', 'jsdate')) ?>; var dayNames = t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>; var monthNames = t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>; diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index d876fbc98e..451a4685e8 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -12,7 +12,6 @@ var oc_appswebroots = ; var oc_current_user = ''; var oc_requesttoken = ''; - var oc_requestlifespan = ''; var datepickerFormatDate = l('jsdate', 'jsdate')) ?>; var dayNames = t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>; var monthNames = t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>; @@ -21,6 +20,13 @@ + application = $app; $this->vars = array(); $this->vars['requesttoken'] = OC_Util::callRegister(); - $this->vars['requestlifespan'] = OC_Util::$callLifespan; $parts = explode('/', $app); // fix translation when app is something like core/lostpassword $this->l10n = OC_L10N::get($parts[0]); @@ -391,7 +390,6 @@ class OC_Template{ $page = new OC_TemplateLayout($this->renderas); if($this->renderas == 'user') { $page->assign('requesttoken', $this->vars['requesttoken']); - $page->assign('requestlifespan', $this->vars['requestlifespan']); } // Add custom headers diff --git a/lib/util.php b/lib/util.php index de89e339d9..cb81f0a948 100755 --- a/lib/util.php +++ b/lib/util.php @@ -472,17 +472,6 @@ class OC_Util { return $id; } - /** - * @brief Static lifespan (in seconds) when a request token expires. - * @see OC_Util::callRegister() - * @see OC_Util::isCallRegistered() - * @description - * Also required for the client side to compute the piont in time when to - * request a fresh token. The client will do so when nearly 97% of the - * timespan coded here has expired. - */ - public static $callLifespan = 3600; // 3600 secs = 1 hour - /** * @brief Register an get/post call. Important to prevent CSRF attacks. * @todo Write howto: CSRF protection guide @@ -491,30 +480,24 @@ class OC_Util { * Creates a 'request token' (random) and stores it inside the session. * Ever subsequent (ajax) request must use such a valid token to succeed, * otherwise the request will be denied as a protection against CSRF. - * The tokens expire after a fixed lifespan. - * @see OC_Util::$callLifespan * @see OC_Util::isCallRegistered() */ public static function callRegister() { // Check if a token exists - if(!isset($_SESSION['requesttoken']) || time() >$_SESSION['requesttoken']['time']) { + if(!isset($_SESSION['requesttoken'])) { // No valid token found, generate a new one. - $requestTokenArray = array( - "requesttoken" => self::generate_random_bytes(20), - "time" => time()+self::$callLifespan, - ); - $_SESSION['requesttoken']=$requestTokenArray; + $requestToken = self::generate_random_bytes(20); + $_SESSION['requesttoken']=$requestToken; } else { // Valid token already exists, send it - $requestTokenArray = $_SESSION['requesttoken']; + $requestToken = $_SESSION['requesttoken']; } - return($requestTokenArray['requesttoken']); + return($requestToken); } /** * @brief Check an ajax get/post call if the request token is valid. * @return boolean False if request token is not set or is invalid. - * @see OC_Util::$callLifespan * @see OC_Util::callRegister() */ public static function isCallRegistered() { @@ -530,7 +513,7 @@ class OC_Util { } // Check if the token is valid - if(!isset($_SESSION['requesttoken']) || time() > $_SESSION['requesttoken']["time"]) { + if($token !== $_SESSION['requesttoken']) { // Not valid return false; } else { From 393d2517ee6734c9540211edb714b3ec1324018f Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 31 Oct 2012 18:43:16 +0100 Subject: [PATCH 02/12] Change the requesttoken back to OC.EventSource.requesttoken --- core/js/eventsource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 45c63715a7..e3ad7e3a67 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -40,7 +40,7 @@ OC.EventSource=function(src,data){ dataStr+=name+'='+encodeURIComponent(data[name])+'&'; } } - dataStr+='requesttoken='+OC.Request.Token; + dataStr+='requesttoken='+OC.EventSource.requesttoken; if(!this.useFallBack && typeof EventSource !='undefined'){ this.source=new EventSource(src+'?'+dataStr); this.source.onmessage=function(e){ From 5252fc52edf604eb4ad1256387a3e9512d799d0e Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 1 Nov 2012 16:48:17 +0100 Subject: [PATCH 03/12] LDAP: clear the cache not only when TTL changes, but with every settings update. Fixes #194 --- apps/user_ldap/settings.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php index f765151456..ca9855df6c 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -26,16 +26,12 @@ OCP\Util::addscript('user_ldap', 'settings'); OCP\Util::addstyle('user_ldap', 'settings'); if ($_POST) { + $clearCache = false; foreach($params as $param) { if(isset($_POST[$param])) { + $clearCache = true; if('ldap_agent_password' == $param) { OCP\Config::setAppValue('user_ldap', $param, base64_encode($_POST[$param])); - } elseif('ldap_cache_ttl' == $param) { - if(OCP\Config::getAppValue('user_ldap', $param,'') != $_POST[$param]) { - $ldap = new \OCA\user_ldap\lib\Connection('user_ldap'); - $ldap->clearCache(); - OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]); - } } elseif('home_folder_naming_rule' == $param) { $value = empty($_POST[$param]) ? 'opt:username' : 'attr:'.$_POST[$param]; OCP\Config::setAppValue('user_ldap', $param, $value); @@ -54,6 +50,10 @@ if ($_POST) { OCP\Config::setAppValue('user_ldap', $param, 0); } } + if($clearCache){ + $ldap = new \OCA\user_ldap\lib\Connection('user_ldap'); + $ldap->clearCache(); + } } // fill template From df8c67721df1358eab7aa5794ef223a5bc8f0b59 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 2 Nov 2012 09:42:10 +0100 Subject: [PATCH 04/12] code style --- apps/user_ldap/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php index ca9855df6c..f9ad2db94a 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -50,7 +50,7 @@ if ($_POST) { OCP\Config::setAppValue('user_ldap', $param, 0); } } - if($clearCache){ + if($clearCache) { $ldap = new \OCA\user_ldap\lib\Connection('user_ldap'); $ldap->clearCache(); } From afadf93d317e27fd848f1e70d5849169f862aed9 Mon Sep 17 00:00:00 2001 From: Felix Moeller Date: Fri, 2 Nov 2012 19:53:02 +0100 Subject: [PATCH 05/12] Checkstyle: many fixes --- apps/files/appinfo/filesync.php | 2 +- apps/files/download.php | 2 +- apps/files/index.php | 2 +- apps/files_encryption/lib/crypt.php | 8 +-- apps/files_encryption/lib/cryptstream.php | 2 +- apps/files_encryption/lib/proxy.php | 16 +++--- apps/files_encryption/settings.php | 4 +- apps/files_encryption/tests/encryption.php | 60 +++++++++++----------- apps/files_encryption/tests/proxy.php | 26 +++++----- apps/files_encryption/tests/stream.php | 24 ++++----- apps/files_external/lib/config.php | 2 +- apps/files_external/lib/ftp.php | 8 +-- apps/files_external/lib/smb.php | 10 ++-- apps/files_external/lib/streamwrapper.php | 18 +++---- apps/files_external/lib/swift.php | 38 +++++++------- apps/files_external/lib/webdav.php | 14 ++--- apps/files_sharing/lib/sharedstorage.php | 2 +- apps/files_versions/lib/hooks.php | 2 +- apps/files_versions/lib/versions.php | 8 +-- apps/user_ldap/lib/connection.php | 4 +- apps/user_webdavauth/user_webdavauth.php | 6 +-- lib/MDB2/Driver/Function/sqlite3.php | 2 +- lib/MDB2/Driver/sqlite3.php | 14 ++--- lib/app.php | 10 ++-- lib/appconfig.php | 4 +- lib/archive.php | 10 ++-- lib/archive/tar.php | 8 +-- lib/archive/zip.php | 8 +-- lib/connector/sabre/file.php | 2 +- lib/connector/sabre/locks.php | 6 +-- lib/connector/sabre/node.php | 4 +- lib/connector/sabre/principal.php | 4 +- lib/db.php | 6 +-- lib/eventsource.php | 2 +- lib/filecache.php | 34 ++++++------ lib/filecache/cached.php | 4 +- lib/filecache/update.php | 16 +++--- lib/fileproxy.php | 8 +-- lib/fileproxy/quota.php | 12 ++--- lib/files.php | 16 +++--- lib/filestorage.php | 12 ++--- lib/filestorage/common.php | 18 +++---- lib/filestorage/commontest.php | 6 +-- lib/filestorage/local.php | 28 +++++----- lib/filesystem.php | 20 ++++---- lib/filesystemview.php | 2 +- lib/group.php | 4 +- lib/group/dummy.php | 10 ++-- lib/group/example.php | 2 +- lib/helper.php | 4 +- lib/installer.php | 8 +-- lib/json.php | 2 +- lib/l10n.php | 4 +- lib/mail.php | 6 +-- lib/migration/content.php | 2 +- lib/minimizer.php | 6 +-- lib/ocsclient.php | 10 ++-- lib/preferences.php | 2 +- lib/public/db.php | 2 +- lib/public/util.php | 4 +- lib/search.php | 2 +- lib/search/result.php | 2 +- lib/setup.php | 8 +-- lib/streamwrappers.php | 22 ++++---- lib/template.php | 10 ++-- lib/updater.php | 2 +- lib/user.php | 4 +- lib/user/database.php | 6 +-- lib/user/http.php | 4 +- lib/util.php | 6 +-- lib/vcategories.php | 2 +- lib/vobject.php | 2 +- settings/admin.php | 10 ++-- settings/ajax/getlog.php | 2 +- settings/templates/apps.php | 2 +- tests/lib/archive.php | 44 ++++++++-------- tests/lib/cache.php | 22 ++++---- tests/lib/cache/file.php | 2 +- tests/lib/geo.php | 2 +- tests/lib/group.php | 44 ++++++++-------- tests/lib/group/backend.php | 52 +++++++++---------- tests/lib/streamwrappers.php | 12 ++--- tests/lib/user/backend.php | 18 +++---- 83 files changed, 430 insertions(+), 430 deletions(-) diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php index 47fc6fb4de..dfafe3f956 100644 --- a/apps/files/appinfo/filesync.php +++ b/apps/files/appinfo/filesync.php @@ -36,7 +36,7 @@ if(!OC_User::isLoggedIn()) { } } -list($type,$file) = explode('/', substr($path_info,1+strlen($service)+1), 2); +list($type,$file) = explode('/', substr($path_info, 1+strlen($service)+1), 2); if ($type != 'oc_chunked') { OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); diff --git a/apps/files/download.php b/apps/files/download.php index ff6aefbbe0..0d632c9b2c 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -32,7 +32,7 @@ $filename = $_GET["file"]; if(!OC_Filesystem::file_exists($filename)) { header("HTTP/1.0 404 Not Found"); $tmpl = new OCP\Template( '', '404', 'guest' ); - $tmpl->assign('file',$filename); + $tmpl->assign('file', $filename); $tmpl->printPage(); exit; } diff --git a/apps/files/index.php b/apps/files/index.php index 8b8b0fd761..51fe6b0379 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -86,7 +86,7 @@ $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $maxUploadFilesize = min($upload_max_filesize, $post_max_size); $freeSpace=OC_Filesystem::free_space($dir); -$freeSpace=max($freeSpace,0); +$freeSpace=max($freeSpace, 0); $maxUploadFilesize = min($maxUploadFilesize, $freeSpace); $permissions = OCP\Share::PERMISSION_READ; diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index 28bf3c5c93..d8e7e4d1dd 100644 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -43,7 +43,7 @@ class OC_Crypt { self::init($params['uid'], $params['password']); } - public static function init($login,$password) { + public static function init($login, $password) { $view=new OC_FilesystemView('/'); if(!$view->file_exists('/'.$login)) { $view->mkdir('/'.$login); @@ -195,7 +195,7 @@ class OC_Crypt { public static function blockEncrypt($data, $key='') { $result=''; while(strlen($data)) { - $result.=self::encrypt(substr($data, 0, 8192),$key); + $result.=self::encrypt(substr($data, 0, 8192), $key); $data=substr($data, 8192); } return $result; @@ -204,10 +204,10 @@ class OC_Crypt { /** * decrypt data in 8192b sized blocks */ - public static function blockDecrypt($data, $key='',$maxLength=0) { + public static function blockDecrypt($data, $key='', $maxLength=0) { $result=''; while(strlen($data)) { - $result.=self::decrypt(substr($data, 0, 8192),$key); + $result.=self::decrypt(substr($data, 0, 8192), $key); $data=substr($data, 8192); } if($maxLength>0) { diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php index 0dd2d4b7b1..3170cff366 100644 --- a/apps/files_encryption/lib/cryptstream.php +++ b/apps/files_encryption/lib/cryptstream.php @@ -106,7 +106,7 @@ class OC_CryptStream{ if($currentPos%8192!=0) { //make sure we always start on a block start fseek($this->source, -($currentPos%8192), SEEK_CUR); - $encryptedBlock=fread($this->source,8192); + $encryptedBlock=fread($this->source, 8192); fseek($this->source, -($currentPos%8192), SEEK_CUR); $block=OC_Crypt::decrypt($encryptedBlock); $data=substr($block, 0, $currentPos%8192).$data; diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 61b87ab546..fed6acaf91 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -76,7 +76,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ public function postFile_get_contents($path,$data) { if(self::isEncrypted($path)) { $cached=OC_FileCache_Cached::get($path,''); - $data=OC_Crypt::blockDecrypt($data,'',$cached['size']); + $data=OC_Crypt::blockDecrypt($data, '', $cached['size']); } return $data; } @@ -88,30 +88,30 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ $meta=stream_get_meta_data($result); if(self::isEncrypted($path)) { fclose($result); - $result=fopen('crypt://'.$path,$meta['mode']); + $result=fopen('crypt://'.$path, $meta['mode']); }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); $tmp=fopen('php://temp'); - OCP\Files::streamCopy($result,$tmp); + OCP\Files::streamCopy($result, $tmp); fclose($result); - OC_Filesystem::file_put_contents($path,$tmp); + OC_Filesystem::file_put_contents($path, $tmp); fclose($tmp); } - $result=fopen('crypt://'.$path,$meta['mode']); + $result=fopen('crypt://'.$path, $meta['mode']); } return $result; } - public function postGetMimeType($path,$mime) { + public function postGetMimeType($path, $mime) { if(self::isEncrypted($path)) { $mime=OCP\Files::getMimeType('crypt://'.$path,'w'); } return $mime; } - public function postStat($path,$data) { + public function postStat($path, $data) { if(self::isEncrypted($path)) { $cached=OC_FileCache_Cached::get($path,''); $data['size']=$cached['size']; @@ -119,7 +119,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ return $data; } - public function postFileSize($path,$size) { + public function postFileSize($path, $size) { if(self::isEncrypted($path)) { $cached=OC_FileCache_Cached::get($path,''); return $cached['size']; diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php index 168124a8d2..ab9324dee4 100644 --- a/apps/files_encryption/settings.php +++ b/apps/files_encryption/settings.php @@ -9,8 +9,8 @@ $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')); $enabled=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true'); -$tmpl->assign('blacklist',$blackList); -$tmpl->assign('encryption_enabled',$enabled); +$tmpl->assign('blacklist', $blackList); +$tmpl->assign('encryption_enabled', $enabled); OCP\Util::addscript('files_encryption','settings'); OCP\Util::addscript('core','multiselect'); diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php index a7bc2df0e1..b714b00b8f 100644 --- a/apps/files_encryption/tests/encryption.php +++ b/apps/files_encryption/tests/encryption.php @@ -11,46 +11,46 @@ class Test_Encryption extends UnitTestCase { $key=uniqid(); $file=OC::$SERVERROOT.'/3rdparty/MDB2.php'; $source=file_get_contents($file); //nice large text file - $encrypted=OC_Crypt::encrypt($source,$key); - $decrypted=OC_Crypt::decrypt($encrypted,$key); + $encrypted=OC_Crypt::encrypt($source, $key); + $decrypted=OC_Crypt::decrypt($encrypted, $key); $decrypted=rtrim($decrypted, "\0"); - $this->assertNotEqual($encrypted,$source); - $this->assertEqual($decrypted,$source); + $this->assertNotEqual($encrypted, $source); + $this->assertEqual($decrypted, $source); - $chunk=substr($source,0,8192); - $encrypted=OC_Crypt::encrypt($chunk,$key); + $chunk=substr($source,0, 8192); + $encrypted=OC_Crypt::encrypt($chunk, $key); $this->assertEqual(strlen($chunk), strlen($encrypted)); - $decrypted=OC_Crypt::decrypt($encrypted,$key); + $decrypted=OC_Crypt::decrypt($encrypted, $key); $decrypted=rtrim($decrypted, "\0"); - $this->assertEqual($decrypted,$chunk); + $this->assertEqual($decrypted, $chunk); - $encrypted=OC_Crypt::blockEncrypt($source,$key); - $decrypted=OC_Crypt::blockDecrypt($encrypted,$key); - $this->assertNotEqual($encrypted,$source); - $this->assertEqual($decrypted,$source); + $encrypted=OC_Crypt::blockEncrypt($source, $key); + $decrypted=OC_Crypt::blockDecrypt($encrypted, $key); + $this->assertNotEqual($encrypted, $source); + $this->assertEqual($decrypted, $source); $tmpFileEncrypted=OCP\Files::tmpFile(); - OC_Crypt::encryptfile($file,$tmpFileEncrypted,$key); + OC_Crypt::encryptfile($file,$tmpFileEncrypted, $key); $encrypted=file_get_contents($tmpFileEncrypted); - $decrypted=OC_Crypt::blockDecrypt($encrypted,$key); - $this->assertNotEqual($encrypted,$source); - $this->assertEqual($decrypted,$source); + $decrypted=OC_Crypt::blockDecrypt($encrypted, $key); + $this->assertNotEqual($encrypted, $source); + $this->assertEqual($decrypted, $source); $tmpFileDecrypted=OCP\Files::tmpFile(); - OC_Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key); + OC_Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted, $key); $decrypted=file_get_contents($tmpFileDecrypted); - $this->assertEqual($decrypted,$source); + $this->assertEqual($decrypted, $source); $file=OC::$SERVERROOT.'/core/img/weather-clear.png'; $source=file_get_contents($file); //binary file - $encrypted=OC_Crypt::encrypt($source,$key); - $decrypted=OC_Crypt::decrypt($encrypted,$key); + $encrypted=OC_Crypt::encrypt($source, $key); + $decrypted=OC_Crypt::decrypt($encrypted, $key); $decrypted=rtrim($decrypted, "\0"); - $this->assertEqual($decrypted,$source); + $this->assertEqual($decrypted, $source); - $encrypted=OC_Crypt::blockEncrypt($source,$key); - $decrypted=OC_Crypt::blockDecrypt($encrypted,$key); - $this->assertEqual($decrypted,$source); + $encrypted=OC_Crypt::blockEncrypt($source, $key); + $decrypted=OC_Crypt::blockDecrypt($encrypted, $key); + $this->assertEqual($decrypted, $source); } @@ -59,14 +59,14 @@ class Test_Encryption extends UnitTestCase { $file=__DIR__.'/binary'; $source=file_get_contents($file); //binary file - $encrypted=OC_Crypt::encrypt($source,$key); - $decrypted=OC_Crypt::decrypt($encrypted,$key); + $encrypted=OC_Crypt::encrypt($source, $key); + $decrypted=OC_Crypt::decrypt($encrypted, $key); $decrypted=rtrim($decrypted, "\0"); - $this->assertEqual($decrypted,$source); + $this->assertEqual($decrypted, $source); - $encrypted=OC_Crypt::blockEncrypt($source,$key); - $decrypted=OC_Crypt::blockDecrypt($encrypted,$key, strlen($source)); - $this->assertEqual($decrypted,$source); + $encrypted=OC_Crypt::blockEncrypt($source, $key); + $decrypted=OC_Crypt::blockDecrypt($encrypted, $key, strlen($source)); + $this->assertEqual($decrypted, $source); } } diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php index c3c8f4a2db..25427ff4b9 100644 --- a/apps/files_encryption/tests/proxy.php +++ b/apps/files_encryption/tests/proxy.php @@ -41,7 +41,7 @@ class Test_CryptProxy extends UnitTestCase { } public function tearDown() { - OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig); + OCP\Config::setAppValue('files_encryption', 'enable_encryption', $this->oldConfig); if(!is_null($this->oldKey)) { $_SESSION['enckey']=$this->oldKey; } @@ -51,16 +51,16 @@ class Test_CryptProxy extends UnitTestCase { $file=OC::$SERVERROOT.'/3rdparty/MDB2.php'; $original=file_get_contents($file); - OC_Filesystem::file_put_contents('/file',$original); + OC_Filesystem::file_put_contents('/file', $original); OC_FileProxy::$enabled=false; $stored=OC_Filesystem::file_get_contents('/file'); OC_FileProxy::$enabled=true; $fromFile=OC_Filesystem::file_get_contents('/file'); - $this->assertNotEqual($original,$stored); + $this->assertNotEqual($original, $stored); $this->assertEqual(strlen($original), strlen($fromFile)); - $this->assertEqual($original,$fromFile); + $this->assertEqual($original, $fromFile); } @@ -72,46 +72,46 @@ class Test_CryptProxy extends UnitTestCase { $view=new OC_FilesystemView('/'.OC_User::getUser()); $userDir='/'.OC_User::getUser().'/files'; - $rootView->file_put_contents($userDir.'/file',$original); + $rootView->file_put_contents($userDir.'/file', $original); OC_FileProxy::$enabled=false; $stored=$rootView->file_get_contents($userDir.'/file'); OC_FileProxy::$enabled=true; - $this->assertNotEqual($original,$stored); + $this->assertNotEqual($original, $stored); $fromFile=$rootView->file_get_contents($userDir.'/file'); - $this->assertEqual($original,$fromFile); + $this->assertEqual($original, $fromFile); $fromFile=$view->file_get_contents('files/file'); - $this->assertEqual($original,$fromFile); + $this->assertEqual($original, $fromFile); } public function testBinary() { $file=__DIR__.'/binary'; $original=file_get_contents($file); - OC_Filesystem::file_put_contents('/file',$original); + OC_Filesystem::file_put_contents('/file', $original); OC_FileProxy::$enabled=false; $stored=OC_Filesystem::file_get_contents('/file'); OC_FileProxy::$enabled=true; $fromFile=OC_Filesystem::file_get_contents('/file'); - $this->assertNotEqual($original,$stored); + $this->assertNotEqual($original, $stored); $this->assertEqual(strlen($original), strlen($fromFile)); - $this->assertEqual($original,$fromFile); + $this->assertEqual($original, $fromFile); $file=__DIR__.'/zeros'; $original=file_get_contents($file); - OC_Filesystem::file_put_contents('/file',$original); + OC_Filesystem::file_put_contents('/file', $original); OC_FileProxy::$enabled=false; $stored=OC_Filesystem::file_get_contents('/file'); OC_FileProxy::$enabled=true; $fromFile=OC_Filesystem::file_get_contents('/file'); - $this->assertNotEqual($original,$stored); + $this->assertNotEqual($original, $stored); $this->assertEqual(strlen($original), strlen($fromFile)); } } diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php index 5ea0da4801..2caebf912e 100644 --- a/apps/files_encryption/tests/stream.php +++ b/apps/files_encryption/tests/stream.php @@ -15,14 +15,14 @@ class Test_CryptStream extends UnitTestCase { fclose($stream); $stream=$this->getStream('test1','r', strlen('foobar')); - $data=fread($stream,6); + $data=fread($stream, 6); fclose($stream); - $this->assertEqual('foobar',$data); + $this->assertEqual('foobar', $data); $file=OC::$SERVERROOT.'/3rdparty/MDB2.php'; $source=fopen($file,'r'); - $target=$this->getStream('test2','w',0); - OCP\Files::streamCopy($source,$target); + $target=$this->getStream('test2', 'w', 0); + OCP\Files::streamCopy($source, $target); fclose($target); fclose($source); @@ -30,7 +30,7 @@ class Test_CryptStream extends UnitTestCase { $data=stream_get_contents($stream); $original=file_get_contents($file); $this->assertEqual(strlen($original), strlen($data)); - $this->assertEqual($original,$data); + $this->assertEqual($original, $data); } /** @@ -40,7 +40,7 @@ class Test_CryptStream extends UnitTestCase { * @param int size * @return resource */ - function getStream($id,$mode,$size) { + function getStream($id, $mode, $size) { if($id==='') { $id=uniqid(); } @@ -50,9 +50,9 @@ class Test_CryptStream extends UnitTestCase { }else{ $file=$this->tmpFiles[$id]; } - $stream=fopen($file,$mode); + $stream=fopen($file, $mode); OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size); - return fopen('crypt://streams/'.$id,$mode); + return fopen('crypt://streams/'.$id, $mode); } function testBinary() { @@ -60,26 +60,26 @@ class Test_CryptStream extends UnitTestCase { $source=file_get_contents($file); $stream=$this->getStream('test','w', strlen($source)); - fwrite($stream,$source); + fwrite($stream, $source); fclose($stream); $stream=$this->getStream('test','r', strlen($source)); $data=stream_get_contents($stream); fclose($stream); $this->assertEqual(strlen($data), strlen($source)); - $this->assertEqual($source,$data); + $this->assertEqual($source, $data); $file=__DIR__.'/zeros'; $source=file_get_contents($file); $stream=$this->getStream('test2','w', strlen($source)); - fwrite($stream,$source); + fwrite($stream, $source); fclose($stream); $stream=$this->getStream('test2','r', strlen($source)); $data=stream_get_contents($stream); fclose($stream); $this->assertEqual(strlen($data), strlen($source)); - $this->assertEqual($source,$data); + $this->assertEqual($source, $data); } } diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 9dc3cdd714..57a6438ff1 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -256,7 +256,7 @@ class OC_Mount_Config { foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) { $content .= "\t\t'".$group."' => array (\n"; foreach ($mounts as $mountPoint => $mount) { - $content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n"; + $content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).", \n"; } $content .= "\t\t),\n"; diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php index 13d1387f28..8a67b31b20 100644 --- a/apps/files_external/lib/ftp.php +++ b/apps/files_external/lib/ftp.php @@ -43,7 +43,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ $url.='://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path; return $url; } - public function fopen($path,$mode) { + public function fopen($path, $mode) { switch($mode) { case 'r': case 'rb': @@ -53,7 +53,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ case 'ab': //these are supported by the wrapper $context = stream_context_create(array('ftp' => array('overwrite' => true))); - return fopen($this->constructUrl($path),$mode, false,$context); + return fopen($this->constructUrl($path),$mode, false, $context); case 'r+': case 'w+': case 'wb+': @@ -71,10 +71,10 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ $tmpFile=OCP\Files::tmpFile($ext); OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); if($this->file_exists($path)) { - $this->getFile($path,$tmpFile); + $this->getFile($path, $tmpFile); } self::$tempFiles[$tmpFile]=$path; - return fopen('close://'.$tmpFile,$mode); + return fopen('close://'.$tmpFile, $mode); } } diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index eed2582dc9..d763689434 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -24,14 +24,14 @@ 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]!='/') { $this->share='/'.$this->share; } - if(substr($this->share,-1,1)=='/') { - $this->share=substr($this->share,0,-1); + if(substr($this->share, -1, 1)=='/') { + $this->share=substr($this->share, 0, -1); } //create the root folder if necesary @@ -42,7 +42,7 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{ public function constructUrl($path) { if(substr($path,-1)=='/') { - $path=substr($path,0,-1); + $path=substr($path, 0, -1); } return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->share.$this->root.$path; } @@ -67,7 +67,7 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{ * @param int $time * @return bool */ - public function hasUpdated($path,$time) { + public function hasUpdated($path, $time) { if(!$path and $this->root=='/') { //mtime doesn't work for shares, but giving the nature of the backend, doing a full update is still just fast enough return true; diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php index 7263ef2325..7961ecbe1b 100644 --- a/apps/files_external/lib/streamwrapper.php +++ b/apps/files_external/lib/streamwrapper.php @@ -50,15 +50,15 @@ abstract class OC_FileStorage_StreamWrapper extends OC_Filestorage_Common{ return $succes; } - public function fopen($path,$mode) { - return fopen($this->constructUrl($path),$mode); + public function fopen($path, $mode) { + return fopen($this->constructUrl($path), $mode); } public function free_space($path) { return 0; } - public function touch($path,$mtime=null) { + public function touch($path, $mtime=null) { if(is_null($mtime)) { $fh=$this->fopen($path,'a'); fwrite($fh,''); @@ -68,16 +68,16 @@ abstract class OC_FileStorage_StreamWrapper extends OC_Filestorage_Common{ } } - public function getFile($path,$target) { - return copy($this->constructUrl($path),$target); + public function getFile($path, $target) { + return copy($this->constructUrl($path), $target); } - public function uploadFile($path,$target) { - return copy($path,$this->constructUrl($target)); + public function uploadFile($path, $target) { + return copy($path, $this->constructUrl($target)); } - public function rename($path1,$path2) { - return rename($this->constructUrl($path1),$this->constructUrl($path2)); + public function rename($path1, $path2) { + return rename($this->constructUrl($path1), $this->constructUrl($path2)); } public function stat($path) { diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index 632c72c280..c04de45d40 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -40,7 +40,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ */ private function getContainerName($path) { $path=trim(trim($this->root,'/')."/".$path,'/.'); - return str_replace('/','\\',$path); + return str_replace('/', '\\', $path); } /** @@ -189,7 +189,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ * @param string name * @return bool */ - private function addSubContainer($container,$name) { + private function addSubContainer($container, $name) { if(!$name) { return false; } @@ -201,16 +201,16 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ foreach($containers as &$sub) { $sub=trim($sub); } - if(array_search($name,$containers)!==false) { + if(array_search($name, $containers)!==false) { unlink($tmpFile); return false; }else{ $fh=fopen($tmpFile,'a'); - fwrite($fh,$name."\n"); + fwrite($fh, $name."\n"); } }catch(Exception $e) { $containers=array(); - file_put_contents($tmpFile,$name."\n"); + file_put_contents($tmpFile, $name."\n"); } $obj->load_from_filename($tmpFile); @@ -224,7 +224,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ * @param string name * @return bool */ - private function removeSubContainer($container,$name) { + private function removeSubContainer($container, $name) { if(!$name) { return false; } @@ -239,13 +239,13 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ foreach($containers as &$sub) { $sub=trim($sub); } - $i=array_search($name,$containers); + $i=array_search($name, $containers); if($i===false) { unlink($tmpFile); return false; }else{ unset($containers[$i]); - file_put_contents($tmpFile, implode("\n",$containers)."\n"); + file_put_contents($tmpFile, implode("\n", $containers)."\n"); } $obj->load_from_filename($tmpFile); @@ -337,12 +337,12 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ public function opendir($path) { $container=$this->getContainer($path); $files=$this->getObjects($container); - $i=array_search(self::SUBCONTAINER_FILE,$files); + $i=array_search(self::SUBCONTAINER_FILE, $files); if($i!==false) { unset($files[$i]); } $subContainers=$this->getSubContainers($container); - $files=array_merge($files,$subContainers); + $files=array_merge($files, $subContainers); $id=$this->getContainerName($path); OC_FakeDirStream::$dirs[$id]=$files; return opendir('fakedir://'.$id); @@ -380,7 +380,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ return $obj->read(); } - public function file_put_contents($path,$content) { + public function file_put_contents($path, $content) { $obj=$this->getObject($path); if(is_null($obj)) { $container=$this->getContainer(dirname($path)); @@ -406,7 +406,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ } } - public function fopen($path,$mode) { + public function fopen($path, $mode) { switch($mode) { case 'r': case 'rb': @@ -434,7 +434,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ $tmpFile=$this->getTmpFile($path); OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); self::$tempFiles[$tmpFile]=$path; - return fopen('close://'.$tmpFile,$mode); + return fopen('close://'.$tmpFile, $mode); } } @@ -449,7 +449,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ return 1024*1024*1024*8; } - public function touch($path,$mtime=null) { + public function touch($path, $mtime=null) { $obj=$this->getObject($path); if(is_null($obj)) { return false; @@ -463,10 +463,10 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ $obj->sync_metadata(); } - public function rename($path1,$path2) { + public function rename($path1, $path2) { $sourceContainer=$this->getContainer(dirname($path1)); $targetContainer=$this->getContainer(dirname($path2)); - $result=$sourceContainer->move_object_to(basename($path1),$targetContainer, basename($path2)); + $result=$sourceContainer->move_object_to(basename($path1), $targetContainer, basename($path2)); unset($this->objects[$path1]); if($result) { $targetObj=$this->getObject($path2); @@ -475,10 +475,10 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ return $result; } - public function copy($path1,$path2) { + public function copy($path1, $path2) { $sourceContainer=$this->getContainer(dirname($path1)); $targetContainer=$this->getContainer(dirname($path2)); - $result=$sourceContainer->copy_object_to(basename($path1),$targetContainer, basename($path2)); + $result=$sourceContainer->copy_object_to(basename($path1), $targetContainer, basename($path2)); if($result) { $targetObj=$this->getObject($path2); $this->resetMTime($targetObj); @@ -525,7 +525,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ } } - private function fromTmpFile($tmpFile,$path) { + private function fromTmpFile($tmpFile, $path) { $obj=$this->getObject($path); if(is_null($obj)) { $obj=$this->createObject($path); diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index e29ec6cb8a..3d2ea7fa2a 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -126,7 +126,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ return $this->simpleResponse('DELETE', $path, null, 204); } - public function fopen($path,$mode) { + public function fopen($path, $mode) { $path=$this->cleanPath($path); switch($mode) { case 'r': @@ -194,7 +194,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ } } - public function touch($path,$mtime=null) { + public function touch($path, $mtime=null) { if(is_null($mtime)) { $mtime=time(); } @@ -202,12 +202,12 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ $this->client->proppatch($path, array('{DAV:}lastmodified' => $mtime)); } - public function getFile($path,$target) { + public function getFile($path, $target) { $source=$this->fopen($path, 'r'); file_put_contents($target, $source); } - public function uploadFile($path,$target) { + public function uploadFile($path, $target) { $source=fopen($path, 'r'); $curl = curl_init(); @@ -221,7 +221,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ curl_close ($curl); } - public function rename($path1,$path2) { + public function rename($path1, $path2) { $path1=$this->cleanPath($path1); $path2=$this->root.$this->cleanPath($path2); try{ @@ -235,7 +235,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ } } - public function copy($path1,$path2) { + public function copy($path1, $path2) { $path1=$this->cleanPath($path1); $path2=$this->root.$this->cleanPath($path2); try{ @@ -289,7 +289,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ } } - private function simpleResponse($method,$path,$body,$expected) { + private function simpleResponse($method, $path, $body, $expected) { $path=$this->cleanPath($path); try{ $response=$this->client->request($method, $path, $body); diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 7271dcc930..ac6fb1f683 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -451,7 +451,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common { * @param int $time * @return bool */ - public function hasUpdated($path,$time) { + public function hasUpdated($path, $time) { //TODO return false; } diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php index 822103ebc3..e897a81f7a 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/hooks.php @@ -64,7 +64,7 @@ class Hooks { $abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$params['newpath'].'.v'; if(Storage::isversioned($rel_oldpath)) { $info=pathinfo($abs_newpath); - if(!file_exists($info['dirname'])) mkdir($info['dirname'],0750, true); + if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true); $versions = Storage::getVersions($rel_oldpath); foreach ($versions as $v) { rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 2f27cd0e66..8ee147d085 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -73,7 +73,7 @@ class Storage { } // check filetype blacklist - $blacklist=explode(' ',\OCP\Config::getSystemValue('files_versionsblacklist', Storage::DEFAULTBLACKLIST)); + $blacklist=explode(' ', \OCP\Config::getSystemValue('files_versionsblacklist', Storage::DEFAULTBLACKLIST)); foreach($blacklist as $bl) { $parts=explode('.', $filename); $ext=end($parts); @@ -99,7 +99,7 @@ class Storage { $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath(''); $matches=glob($versionsName.'.v*'); sort($matches); - $parts=explode('.v',end($matches)); + $parts=explode('.v', end($matches)); if((end($parts)+Storage::DEFAULTMININTERVAL)>time()) { return false; } @@ -109,7 +109,7 @@ class Storage { // create all parent folders $info=pathinfo($filename); if(!file_exists($versionsFolderName.'/'.$info['dirname'])) { - mkdir($versionsFolderName.'/'.$info['dirname'],0750,true); + mkdir($versionsFolderName.'/'.$info['dirname'],0750, true); } // store a new version of a file @@ -124,7 +124,7 @@ class Storage { /** * rollback to an old version of a file. */ - public static function rollback($filename,$revision) { + public static function rollback($filename, $revision) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { list($uid, $filename) = self::getUidAndFilename($filename); diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index a570b29b79..74ff55355b 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -188,9 +188,9 @@ class Connection { $this->config['ldapAgentName'] = \OCP\Config::getAppValue($this->configID, 'ldap_dn',''); $this->config['ldapAgentPassword'] = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password','')); $this->config['ldapBase'] = \OCP\Config::getAppValue($this->configID, 'ldap_base', ''); - $this->config['ldapBaseUsers'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_users',$this->config['ldapBase']); + $this->config['ldapBaseUsers'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_users', $this->config['ldapBase']); $this->config['ldapBaseGroups'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']); - $this->config['ldapTLS'] = \OCP\Config::getAppValue($this->configID, 'ldap_tls',0); + $this->config['ldapTLS'] = \OCP\Config::getAppValue($this->configID, 'ldap_tls', 0); $this->config['ldapNoCase'] = \OCP\Config::getAppValue($this->configID, 'ldap_nocase', 0); $this->config['turnOffCertCheck'] = \OCP\Config::getAppValue($this->configID, 'ldap_turn_off_cert_check', 0); $this->config['ldapUserDisplayName'] = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_display_name', 'uid'), 'UTF-8'); diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php index bd9f45d357..5a16a4c992 100755 --- a/apps/user_webdavauth/user_webdavauth.php +++ b/apps/user_webdavauth/user_webdavauth.php @@ -30,19 +30,19 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend { public function createUser() { // Can't create user - OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend',3); + OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend', 3); return false; } public function deleteUser() { // Can't delete user - OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend',3); + OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend', 3); return false; } public function setPassword ( $uid, $password ) { // We can't change user password - OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend',3); + OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend', 3); return false; } diff --git a/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php index 0bddde5bf3..4147a48199 100644 --- a/lib/MDB2/Driver/Function/sqlite3.php +++ b/lib/MDB2/Driver/Function/sqlite3.php @@ -92,7 +92,7 @@ class MDB2_Driver_Function_sqlite3 extends MDB2_Driver_Function_Common function substring($value, $position = 1, $length = null) { if (!is_null($length)) { - return "substr($value,$position,$length)"; + return "substr($value, $position, $length)"; } return "substr($value, $position, length($value))"; } diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php index 9757e4faf9..c9e7170ac6 100644 --- a/lib/MDB2/Driver/sqlite3.php +++ b/lib/MDB2/Driver/sqlite3.php @@ -153,7 +153,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common if($this->connection) { return $this->connection->escapeString($text); }else{ - return str_replace("'","''",$text);//TODO; more + return str_replace("'", "''", $text);//TODO; more } } @@ -276,7 +276,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common * @access public * @since 2.1.1 */ - function setTransactionIsolation($isolation,$options=array()) + function setTransactionIsolation($isolation, $options=array()) { $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true)); switch ($isolation) { @@ -1142,9 +1142,9 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common function bindValue($parameter, $value, $type = null) { if($type) { $type=$this->getParamType($type); - $this->statement->bindValue($parameter,$value,$type); + $this->statement->bindValue($parameter, $value, $type); }else{ - $this->statement->bindValue($parameter,$value); + $this->statement->bindValue($parameter, $value); } return MDB2_OK; } @@ -1165,9 +1165,9 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common function bindParam($parameter, &$value, $type = null) { if($type) { $type=$this->getParamType($type); - $this->statement->bindParam($parameter,$value,$type); + $this->statement->bindParam($parameter, $value, $type); }else{ - $this->statement->bindParam($parameter,$value); + $this->statement->bindParam($parameter, $value); } return MDB2_OK; } @@ -1318,7 +1318,7 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common }else{ $types=null; } - $err = $this->bindValueArray($values,$types); + $err = $this->bindValueArray($values, $types); if (PEAR::isError($err)) { return $this->db->raiseError(MDB2_ERROR, null, null, 'Binding Values failed with message: ' . $err->getMessage(), __FUNCTION__); diff --git a/lib/app.php b/lib/app.php index 231037cbd3..f82961ca3a 100755 --- a/lib/app.php +++ b/lib/app.php @@ -92,7 +92,7 @@ class OC_App{ * @param string/array $types * @return bool */ - public static function isType($app,$types) { + public static function isType($app, $types) { if(is_string($types)) { $types=array($types); } @@ -404,7 +404,7 @@ class OC_App{ * @return array * @note all data is read from info.xml, not just pre-defined fields */ - public static function getAppInfo($appid,$path=false) { + public static function getAppInfo($appid, $path=false) { if($path) { $file=$appid; }else{ @@ -523,21 +523,21 @@ class OC_App{ /** * register a settings form to be shown */ - public static function registerSettings($app,$page) { + public static function registerSettings($app, $page) { self::$settingsForms[]= $app.'/'.$page.'.php'; } /** * register an admin form to be shown */ - public static function registerAdmin($app,$page) { + public static function registerAdmin($app, $page) { self::$adminForms[]= $app.'/'.$page.'.php'; } /** * register a personal form to be shown */ - public static function registerPersonal($app,$page) { + public static function registerPersonal($app, $page) { self::$personalForms[]= $app.'/'.$page.'.php'; } diff --git a/lib/appconfig.php b/lib/appconfig.php index ed0e8f1d0b..1f2d576af8 100644 --- a/lib/appconfig.php +++ b/lib/appconfig.php @@ -107,7 +107,7 @@ class OC_Appconfig{ * @param string $key * @return bool */ - public static function hasKey($app,$key) { + public static function hasKey($app, $key) { $exists = self::getKeys( $app ); return in_array( $key, $exists ); } @@ -170,7 +170,7 @@ class OC_Appconfig{ * @param key * @return array */ - public static function getValues($app,$key) { + public static function getValues($app, $key) { if($app!==false and $key!==false) { return false; } diff --git a/lib/archive.php b/lib/archive.php index a9c245eaf4..61239c8207 100644 --- a/lib/archive.php +++ b/lib/archive.php @@ -42,14 +42,14 @@ abstract class OC_Archive{ * @param string source either a local file or string data * @return bool */ - abstract function addFile($path,$source=''); + abstract function addFile($path, $source=''); /** * rename a file or folder in the archive * @param string source * @param string dest * @return bool */ - abstract function rename($source,$dest); + abstract function rename($source, $dest); /** * get the uncompressed size of a file in the archive * @param string path @@ -85,7 +85,7 @@ abstract class OC_Archive{ * @param string dest * @return bool */ - abstract function extractFile($path,$dest); + abstract function extractFile($path, $dest); /** * extract the archive * @param string path @@ -111,14 +111,14 @@ abstract class OC_Archive{ * @param string mode * @return resource */ - abstract function getStream($path,$mode); + abstract function getStream($path, $mode); /** * add a folder and all it's content * @param string $path * @param string source * @return bool */ - function addRecursive($path,$source) { + function addRecursive($path, $source) { if($dh=opendir($source)) { $this->addFolder($path); while($file=readdir($dh)) { diff --git a/lib/archive/tar.php b/lib/archive/tar.php index 7a47802bc3..6e0629a0e1 100644 --- a/lib/archive/tar.php +++ b/lib/archive/tar.php @@ -84,7 +84,7 @@ class OC_Archive_TAR extends OC_Archive{ * @param string source either a local file or string data * @return bool */ - function addFile($path,$source='') { + function addFile($path, $source='') { if($this->fileExists($path)) { $this->remove($path); } @@ -107,7 +107,7 @@ class OC_Archive_TAR extends OC_Archive{ * @param string dest * @return bool */ - function rename($source,$dest) { + function rename($source, $dest) { //no proper way to delete, rename entire archive, rename file and remake archive $tmp=OCP\Files::tmpFolder(); $this->tar->extract($tmp); @@ -214,7 +214,7 @@ class OC_Archive_TAR extends OC_Archive{ * @param string dest * @return bool */ - function extractFile($path,$dest) { + function extractFile($path, $dest) { $tmp=OCP\Files::tmpFolder(); if(!$this->fileExists($path)) { return false; @@ -294,7 +294,7 @@ class OC_Archive_TAR extends OC_Archive{ * @param string mode * @return resource */ - function getStream($path,$mode) { + function getStream($path, $mode) { if(strrpos($path, '.')!==false) { $ext=substr($path, strrpos($path, '.')); }else{ diff --git a/lib/archive/zip.php b/lib/archive/zip.php index d016c692e3..5a6fc578be 100644 --- a/lib/archive/zip.php +++ b/lib/archive/zip.php @@ -35,7 +35,7 @@ class OC_Archive_ZIP extends OC_Archive{ * @param string source either a local file or string data * @return bool */ - function addFile($path,$source='') { + function addFile($path, $source='') { if($source and $source[0]=='/' and file_exists($source)) { $result=$this->zip->addFile($source, $path); }else{ @@ -53,7 +53,7 @@ class OC_Archive_ZIP extends OC_Archive{ * @param string dest * @return bool */ - function rename($source,$dest) { + function rename($source, $dest) { $source=$this->stripPath($source); $dest=$this->stripPath($dest); $this->zip->renameName($source, $dest); @@ -119,7 +119,7 @@ class OC_Archive_ZIP extends OC_Archive{ * @param string dest * @return bool */ - function extractFile($path,$dest) { + function extractFile($path, $dest) { $fp = $this->zip->getStream($path); file_put_contents($dest, $fp); } @@ -158,7 +158,7 @@ class OC_Archive_ZIP extends OC_Archive{ * @param string mode * @return resource */ - function getStream($path,$mode) { + function getStream($path, $mode) { if($mode=='r' or $mode=='rb') { return $this->zip->getStream($path); } else { diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php index 5bd38240d4..ed02840195 100644 --- a/lib/connector/sabre/file.php +++ b/lib/connector/sabre/file.php @@ -45,7 +45,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D */ public function put($data) { - OC_Filesystem::file_put_contents($this->path,$data); + OC_Filesystem::file_put_contents($this->path, $data); return OC_Connector_Sabre_Node::getETagPropertyForPath($this->path); } diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php index 8ebe324602..55a8d5eaa6 100644 --- a/lib/connector/sabre/locks.php +++ b/lib/connector/sabre/locks.php @@ -45,10 +45,10 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract { // but otherwise reading locks from SQLite Databases will return // nothing $query = 'SELECT * FROM `*PREFIX*locks` WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( `uri` = ?)'; - $params = array(OC_User::getUser(),$uri); + $params = array(OC_User::getUser(), $uri); // We need to check locks for every part in the uri. - $uriParts = explode('/',$uri); + $uriParts = explode('/', $uri); // We already covered the last part of the uri array_pop($uriParts); @@ -137,7 +137,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract { public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) { $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND `uri` = ? AND `token` = ?' ); - $result = $query->execute( array(OC_User::getUser(),$uri,$lockInfo->token)); + $result = $query->execute( array(OC_User::getUser(), $uri, $lockInfo->token)); return $result->numRows() === 1; diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php index 72de972377..291b87257f 100644 --- a/lib/connector/sabre/node.php +++ b/lib/connector/sabre/node.php @@ -80,7 +80,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr $newPath = $parentPath . '/' . $newName; $oldPath = $this->path; - OC_Filesystem::rename($this->path,$newPath); + OC_Filesystem::rename($this->path, $newPath); $this->path = $newPath; @@ -156,7 +156,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } else { if(!array_key_exists( $propertyName, $existing )) { $query = OC_DB::prepare( 'INSERT INTO `*PREFIX*properties` (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)' ); - $query->execute( array( OC_User::getUser(), $this->path, $propertyName,$propertyValue )); + $query->execute( array( OC_User::getUser(), $this->path, $propertyName, $propertyValue )); } else { $query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ? WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?' ); $query->execute( array( $propertyValue,OC_User::getUser(), $this->path, $propertyName )); diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php index 763503721f..04be410ac8 100644 --- a/lib/connector/sabre/principal.php +++ b/lib/connector/sabre/principal.php @@ -46,7 +46,7 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend { * @return array */ public function getPrincipalByPath($path) { - list($prefix,$name) = explode('/', $path); + list($prefix, $name) = explode('/', $path); if ($prefix == 'principals' && OC_User::userExists($name)) { return array( @@ -83,7 +83,7 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend { * @return array */ public function getGroupMembership($principal) { - list($prefix,$name) = Sabre_DAV_URLUtil::splitPath($principal); + list($prefix, $name) = Sabre_DAV_URLUtil::splitPath($principal); $group_membership = array(); if ($prefix == 'principals') { diff --git a/lib/db.php b/lib/db.php index a43f2ad20b..ba59985b75 100644 --- a/lib/db.php +++ b/lib/db.php @@ -115,7 +115,7 @@ class OC_DB { $pass = OC_Config::getValue( "dbpassword", "" ); $type = OC_Config::getValue( "dbtype", "sqlite" ); if(strpos($host, ':')) { - list($host, $port)=explode(':', $host,2); + list($host, $port)=explode(':', $host, 2); }else{ $port=false; } @@ -767,8 +767,8 @@ class PDOStatementWrapper{ /** * pass all other function directly to the PDOStatement */ - public function __call($name,$arguments) { - return call_user_func_array(array($this->statement,$name), $arguments); + public function __call($name, $arguments) { + return call_user_func_array(array($this->statement, $name), $arguments); } /** diff --git a/lib/eventsource.php b/lib/eventsource.php index 3bada131bd..578441ee70 100644 --- a/lib/eventsource.php +++ b/lib/eventsource.php @@ -56,7 +56,7 @@ class OC_EventSource{ * * if only one paramater is given, a typeless message will be send with that paramater as data */ - public function send($type,$data=null) { + public function send($type, $data=null) { if(is_null($data)) { $data=$type; $type=null; diff --git a/lib/filecache.php b/lib/filecache.php index fee3b39825..d5f90d3023 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -42,7 +42,7 @@ class OC_FileCache{ * - encrypted * - versioned */ - public static function get($path,$root=false) { + public static function get($path, $root=false) { if(OC_FileCache_Update::hasUpdated($path, $root)) { if($root===false) {//filesystem hooks are only valid for the default root OC_Hook::emit('OC_Filesystem', 'post_write', array('path'=>$path)); @@ -61,7 +61,7 @@ class OC_FileCache{ * * $data is an assiciative array in the same format as returned by get */ - public static function put($path,$data,$root=false) { + public static function put($path,$data, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -117,7 +117,7 @@ class OC_FileCache{ * @param int $id * @param array $data */ - private static function update($id,$data) { + private static function update($id, $data) { $arguments=array(); $queryParts=array(); foreach(array('size','mtime','ctime','mimetype','encrypted','versioned','writable') as $attribute) { @@ -151,7 +151,7 @@ class OC_FileCache{ * @param string newPath * @param string root (optional) */ - public static function move($oldPath,$newPath,$root=false) { + public static function move($oldPath, $newPath, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -190,7 +190,7 @@ class OC_FileCache{ * @param string path * @param string root (optional) */ - public static function delete($path,$root=false) { + public static function delete($path, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -211,7 +211,7 @@ class OC_FileCache{ * @param string root (optional) * @return array of filepaths */ - public static function search($search,$returnData=false,$root=false) { + public static function search($search, $returnData=false, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -255,7 +255,7 @@ class OC_FileCache{ * - encrypted * - versioned */ - public static function getFolderContent($path,$root=false,$mimetype_filter='') { + public static function getFolderContent($path, $root=false, $mimetype_filter='') { if(OC_FileCache_Update::hasUpdated($path, $root, true)) { OC_FileCache_Update::updateFolder($path, $root); } @@ -268,7 +268,7 @@ class OC_FileCache{ * @param string root (optional) * @return bool */ - public static function inCache($path,$root=false) { + public static function inCache($path, $root=false) { return self::getId($path, $root)!=-1; } @@ -278,7 +278,7 @@ class OC_FileCache{ * @param string root (optional) * @return int */ - public static function getId($path,$root=false) { + public static function getId($path, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -314,7 +314,7 @@ class OC_FileCache{ * @param string user (optional) * @return string */ - public static function getPath($id,$user='') { + public static function getPath($id, $user='') { if(!$user) { $user=OC_User::getUser(); } @@ -348,12 +348,12 @@ class OC_FileCache{ * @param int $sizeDiff * @param string root (optinal) */ - public static function increaseSize($path,$sizeDiff, $root=false) { + public static function increaseSize($path, $sizeDiff, $root=false) { if($sizeDiff==0) return; $id=self::getId($path, $root); while($id!=-1) {//walk up the filetree increasing the size of all parent folders $query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `size`=`size`+? WHERE `id`=?'); - $query->execute(array($sizeDiff,$id)); + $query->execute(array($sizeDiff, $id)); $id=self::getParentId($path); $path=dirname($path); } @@ -366,7 +366,7 @@ class OC_FileCache{ * @param int count (optional) * @param string root (optional) */ - public static function scan($path,$eventSource=false,&$count=0,$root=false) { + public static function scan($path,$eventSource=false,&$count=0, $root=false) { if($eventSource) { $eventSource->send('scanning', array('file'=>$path, 'count'=>$count)); } @@ -401,8 +401,8 @@ class OC_FileCache{ } } - OC_FileCache_Update::cleanFolder($path,$root); - self::increaseSize($path,$totalSize,$root); + OC_FileCache_Update::cleanFolder($path, $root); + self::increaseSize($path,$totalSize, $root); } /** @@ -411,7 +411,7 @@ class OC_FileCache{ * @param string root (optional) * @return int size of the scanned file */ - public static function scanFile($path,$root=false) { + public static function scanFile($path, $root=false) { // NOTE: Ugly hack to prevent shared files from going into the cache (the source already exists somewhere in the cache) if (substr($path, 0, 7) == '/Shared') { return; @@ -453,7 +453,7 @@ class OC_FileCache{ * seccond mimetype part can be ommited * e.g. searchByMime('audio') */ - public static function searchByMime($part1,$part2=null,$root=false) { + public static function searchByMime($part1, $part2=null, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php index 9b1eb4f780..7458322fb1 100644 --- a/lib/filecache/cached.php +++ b/lib/filecache/cached.php @@ -13,7 +13,7 @@ class OC_FileCache_Cached{ public static $savedData=array(); - public static function get($path,$root=false) { + public static function get($path, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -61,7 +61,7 @@ class OC_FileCache_Cached{ * - encrypted * - versioned */ - public static function getFolderContent($path,$root=false,$mimetype_filter='') { + public static function getFolderContent($path, $root=false, $mimetype_filter='') { if($root===false) { $root=OC_Filesystem::getRoot(); } diff --git a/lib/filecache/update.php b/lib/filecache/update.php index f9d64d0ae9..ecfa892744 100644 --- a/lib/filecache/update.php +++ b/lib/filecache/update.php @@ -18,7 +18,7 @@ class OC_FileCache_Update{ * @param boolean folder * @return bool */ - public static function hasUpdated($path,$root=false,$folder=false) { + public static function hasUpdated($path, $root=false, $folder=false) { if($root===false) { $view=OC_Filesystem::getView(); }else{ @@ -46,14 +46,14 @@ class OC_FileCache_Update{ /** * delete non existing files from the cache */ - public static function cleanFolder($path,$root=false) { + public static function cleanFolder($path, $root=false) { if($root===false) { $view=OC_Filesystem::getView(); }else{ $view=new OC_FilesystemView($root); } - $cachedContent=OC_FileCache_Cached::getFolderContent($path,$root); + $cachedContent=OC_FileCache_Cached::getFolderContent($path, $root); foreach($cachedContent as $fileData) { $path=$fileData['path']; $file=$view->getRelativePath($path); @@ -72,7 +72,7 @@ class OC_FileCache_Update{ * @param string path * @param string root (optional) */ - public static function updateFolder($path,$root=false) { + public static function updateFolder($path, $root=false) { if($root===false) { $view=OC_Filesystem::getView(); }else{ @@ -143,7 +143,7 @@ class OC_FileCache_Update{ * @param string path * @param string root (optional) */ - public static function update($path,$root=false) { + public static function update($path, $root=false) { if($root===false) { $view=OC_Filesystem::getView(); }else{ @@ -153,7 +153,7 @@ class OC_FileCache_Update{ $mimetype=$view->getMimeType($path); $size=0; - $cached=OC_FileCache_Cached::get($path,$root); + $cached=OC_FileCache_Cached::get($path, $root); $cachedSize=isset($cached['size'])?$cached['size']:0; if($view->is_dir($path.'/')) { @@ -184,7 +184,7 @@ class OC_FileCache_Update{ * @param string path * @param string root (optional) */ - public static function delete($path,$root=false) { + public static function delete($path, $root=false) { $cached=OC_FileCache_Cached::get($path, $root); if(!isset($cached['size'])) { return; @@ -200,7 +200,7 @@ class OC_FileCache_Update{ * @param string newPath * @param string root (optional) */ - public static function rename($oldPath,$newPath,$root=false) { + public static function rename($oldPath,$newPath, $root=false) { if(!OC_FileCache::inCache($oldPath, $root)) { return; } diff --git a/lib/fileproxy.php b/lib/fileproxy.php index 3e7f1aa1c4..1ca799fb74 100644 --- a/lib/fileproxy.php +++ b/lib/fileproxy.php @@ -51,7 +51,7 @@ class OC_FileProxy{ * * this implements a dummy proxy for all operations */ - public function __call($function,$arguments) { + public function __call($function, $arguments) { if(substr($function, 0, 3)=='pre') { return true; }else{ @@ -85,7 +85,7 @@ class OC_FileProxy{ $proxies=self::getProxies($operation); foreach($proxies as $proxy) { if(!is_null($filepath2)) { - if($proxy->$operation($filepath,$filepath2)===false) { + if($proxy->$operation($filepath, $filepath2)===false) { return false; } }else{ @@ -97,14 +97,14 @@ class OC_FileProxy{ return true; } - public static function runPostProxies($operation,$path,$result) { + public static function runPostProxies($operation,$path, $result) { if(!self::$enabled) { return $result; } $operation='post'.$operation; $proxies=self::getProxies($operation); foreach($proxies as $proxy) { - $result=$proxy->$operation($path,$result); + $result=$proxy->$operation($path, $result); } return $result; } diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php index 012be582a5..54bda5d864 100644 --- a/lib/fileproxy/quota.php +++ b/lib/fileproxy/quota.php @@ -77,33 +77,33 @@ class OC_FileProxy_Quota extends OC_FileProxy{ return $totalSpace-$usedSpace; } - public function postFree_space($path,$space) { + public function postFree_space($path, $space) { $free=$this->getFreeSpace($path); if($free==0) { return $space; } - return min($free,$space); + return min($free, $space); } - public function preFile_put_contents($path,$data) { + public function preFile_put_contents($path, $data) { if (is_resource($data)) { $data = '';//TODO: find a way to get the length of the stream without emptying it } return (strlen($data)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==0); } - public function preCopy($path1,$path2) { + public function preCopy($path1, $path2) { if(!self::$rootView){ self::$rootView = new OC_FilesystemView(''); } return (self::$rootView->filesize($path1)<$this->getFreeSpace($path2) or $this->getFreeSpace($path2)==0); } - public function preFromTmpFile($tmpfile,$path) { + public function preFromTmpFile($tmpfile, $path) { return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==0); } - public function preFromUploadedFile($tmpfile,$path) { + public function preFromUploadedFile($tmpfile, $path) { return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==0); } } diff --git a/lib/files.php b/lib/files.php index b4d4de1c99..13bb127e86 100644 --- a/lib/files.php +++ b/lib/files.php @@ -135,7 +135,7 @@ class OC_Files { * @param file $file ; seperated list of files to download * @param boolean $only_header ; boolean to only send header of the request */ - public static function get($dir,$files, $only_header = false) { + public static function get($dir, $files, $only_header = false) { if(strpos($files, ';')) { $files=explode(';', $files); } @@ -224,7 +224,7 @@ class OC_Files { } } - public static function zipAddDir($dir,$zip,$internalDir='') { + public static function zipAddDir($dir, $zip, $internalDir='') { $dirname=basename($dir); $zip->addEmptyDir($internalDir.$dirname); $internalDir.=$dirname.='/'; @@ -249,7 +249,7 @@ class OC_Files { * @param dir $targetDir * @param file $target */ - public static function move($sourceDir,$source,$targetDir,$target) { + public static function move($sourceDir, $source, $targetDir, $target) { if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')) { $targetFile=self::normalizePath($targetDir.'/'.$target); $sourceFile=self::normalizePath($sourceDir.'/'.$source); @@ -267,7 +267,7 @@ class OC_Files { * @param dir $targetDir * @param file $target */ - public static function copy($sourceDir,$source,$targetDir,$target) { + public static function copy($sourceDir, $source, $targetDir, $target) { if(OC_User::isLoggedIn()) { $targetFile=$targetDir.'/'.$target; $sourceFile=$sourceDir.'/'.$source; @@ -282,7 +282,7 @@ class OC_Files { * @param file $name * @param type $type */ - public static function newFile($dir,$name,$type) { + public static function newFile($dir, $name, $type) { if(OC_User::isLoggedIn()) { $file=$dir.'/'.$name; if($type=='dir') { @@ -305,7 +305,7 @@ class OC_Files { * @param dir $dir * @param file $name */ - public static function delete($dir,$file) { + public static function delete($dir, $file) { if(OC_User::isLoggedIn() && ($dir!= '' || $file != 'Shared')) { $file=$dir.'/'.$file; return OC_Filesystem::unlink($file); @@ -389,7 +389,7 @@ class OC_Files { * @param string file * @return string guessed mime type */ - static function pull($source,$token,$dir,$file) { + static function pull($source, $token, $dir, $file) { $tmpfile=tempnam(get_temp_dir(), 'remoteCloudFile'); $fp=fopen($tmpfile,'w+'); $url=$source.="/files/pull.php?token=$token"; @@ -480,7 +480,7 @@ class OC_Files { } } -function fileCmp($a,$b) { +function fileCmp($a, $b) { if($a['type']=='dir' and $b['type']!='dir') { return -1; }elseif($a['type']!='dir' and $b['type']=='dir') { diff --git a/lib/filestorage.php b/lib/filestorage.php index 146cecf4ef..7b3a15dd8c 100644 --- a/lib/filestorage.php +++ b/lib/filestorage.php @@ -42,13 +42,13 @@ abstract class OC_Filestorage{ abstract public function filectime($path); abstract public function filemtime($path); abstract public function file_get_contents($path); - abstract public function file_put_contents($path,$data); + abstract public function file_put_contents($path, $data); abstract public function unlink($path); - abstract public function rename($path1,$path2); - abstract public function copy($path1,$path2); - abstract public function fopen($path,$mode); + abstract public function rename($path1, $path2); + abstract public function copy($path1, $path2); + abstract public function fopen($path, $mode); abstract public function getMimeType($path); - abstract public function hash($type,$path,$raw = false); + abstract public function hash($type,$path, $raw = false); abstract public function free_space($path); abstract public function search($query); abstract public function touch($path, $mtime=null); @@ -62,6 +62,6 @@ abstract class OC_Filestorage{ * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed. * returning true for other changes in the folder is optional */ - abstract public function hasUpdated($path,$time); + abstract public function hasUpdated($path, $time); abstract public function getOwner($path); } diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php index cf09ea71e8..3c06570d89 100644 --- a/lib/filestorage/common.php +++ b/lib/filestorage/common.php @@ -89,25 +89,25 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { } return fread($handle, $size); } - public function file_put_contents($path,$data) { + public function file_put_contents($path, $data) { $handle = $this->fopen($path, "w"); return fwrite($handle, $data); } // abstract public function unlink($path); - public function rename($path1,$path2) { + public function rename($path1, $path2) { if($this->copy($path1, $path2)) { return $this->unlink($path1); }else{ return false; } } - public function copy($path1,$path2) { + public function copy($path1, $path2) { $source=$this->fopen($path1, 'r'); $target=$this->fopen($path2, 'w'); $count=OC_Helper::streamCopy($source, $target); return $count>0; } -// abstract public function fopen($path,$mode); +// abstract public function fopen($path, $mode); /** * @brief Deletes all files and folders recursively within a directory @@ -204,7 +204,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { unlink($tmpFile); return $mime; } - public function hash($type,$path,$raw = false) { + public function hash($type,$path, $raw = false) { $tmpFile=$this->getLocalFile(); $hash=hash($type, $tmpFile, $raw); unlink($tmpFile); @@ -237,7 +237,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { $this->addLocalFolder($path, $baseDir); return $baseDir; } - private function addLocalFolder($path,$target) { + private function addLocalFolder($path, $target) { if($dh=$this->opendir($path)) { while($file=readdir($dh)) { if($file!=='.' and $file!=='..') { @@ -254,7 +254,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { } // abstract public function touch($path, $mtime=null); - protected function searchInDir($query,$dir='') { + protected function searchInDir($query, $dir='') { $files=array(); $dh=$this->opendir($dir); if($dh) { @@ -264,7 +264,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { $files[]=$dir.'/'.$item; } if($this->is_dir($dir.'/'.$item)) { - $files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item)); + $files=array_merge($files,$this->searchInDir($query, $dir.'/'.$item)); } } } @@ -276,7 +276,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { * @param int $time * @return bool */ - public function hasUpdated($path,$time) { + public function hasUpdated($path, $time) { return $this->filemtime($path)>$time; } diff --git a/lib/filestorage/commontest.php b/lib/filestorage/commontest.php index b88bb232c3..3b038b3fda 100644 --- a/lib/filestorage/commontest.php +++ b/lib/filestorage/commontest.php @@ -63,13 +63,13 @@ class OC_Filestorage_CommonTest extends OC_Filestorage_Common{ public function unlink($path) { return $this->storage->unlink($path); } - public function fopen($path,$mode) { - return $this->storage->fopen($path,$mode); + public function fopen($path, $mode) { + return $this->storage->fopen($path, $mode); } public function free_space($path) { return $this->storage->free_space($path); } public function touch($path, $mtime=null) { - return $this->storage->touch($path,$mtime); + return $this->storage->touch($path, $mtime); } } \ No newline at end of file diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 731ac4a3c7..89e994120c 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -21,7 +21,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ } public function is_dir($path) { if(substr($path,-1)=='/') { - $path=substr($path,0,-1); + $path=substr($path, 0, -1); } return is_dir($this->datadir.$path); } @@ -78,13 +78,13 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ public function file_get_contents($path) { return file_get_contents($this->datadir.$path); } - public function file_put_contents($path,$data) { - return file_put_contents($this->datadir.$path,$data); + public function file_put_contents($path, $data) { + return file_put_contents($this->datadir.$path, $data); } public function unlink($path) { return $this->delTree($path); } - public function rename($path1,$path2) { + public function rename($path1, $path2) { if (!$this->isUpdatable($path1)) { OC_Log::write('core','unable to rename, file is not writable : '.$path1,OC_Log::ERROR); return false; @@ -94,11 +94,11 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return false; } - if($return=rename($this->datadir.$path1,$this->datadir.$path2)) { + if($return=rename($this->datadir.$path1, $this->datadir.$path2)) { } return $return; } - public function copy($path1,$path2) { + public function copy($path1, $path2) { if($this->is_dir($path2)) { if(!$this->file_exists($path2)) { $this->mkdir($path2); @@ -106,10 +106,10 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ $source=substr($path1, strrpos($path1,'/')+1); $path2.=$source; } - return copy($this->datadir.$path1,$this->datadir.$path2); + return copy($this->datadir.$path1, $this->datadir.$path2); } - public function fopen($path,$mode) { - if($return=fopen($this->datadir.$path,$mode)) { + public function fopen($path, $mode) { + if($return=fopen($this->datadir.$path, $mode)) { switch($mode) { case 'r': break; @@ -156,8 +156,8 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return $return; } - public function hash($path,$type,$raw=false) { - return hash_file($type,$this->datadir.$path,$raw); + public function hash($path,$type, $raw=false) { + return hash_file($type,$this->datadir.$path, $raw); } public function free_space($path) { @@ -174,7 +174,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return $this->datadir.$path; } - protected function searchInDir($query,$dir='') { + protected function searchInDir($query, $dir='') { $files=array(); foreach (scandir($this->datadir.$dir) as $item) { if ($item == '.' || $item == '..') continue; @@ -182,7 +182,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ $files[]=$dir.'/'.$item; } if(is_dir($this->datadir.$dir.'/'.$item)) { - $files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item)); + $files=array_merge($files,$this->searchInDir($query, $dir.'/'.$item)); } } return $files; @@ -193,7 +193,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ * @param int $time * @return bool */ - public function hasUpdated($path,$time) { + public function hasUpdated($path, $time) { return $this->filemtime($path)>$time; } } diff --git a/lib/filesystem.php b/lib/filesystem.php index 3b6772c984..f134f9b4dc 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -303,7 +303,7 @@ class OC_Filesystem{ * @param array arguments * @return OC_Filestorage */ - static private function createStorage($class,$arguments) { + static private function createStorage($class, $arguments) { if(class_exists($class)) { try { return new $class($arguments); @@ -349,7 +349,7 @@ class OC_Filesystem{ * @param OC_Filestorage storage * @param string mountpoint */ - static public function mount($class,$arguments,$mountpoint) { + static public function mount($class, $arguments, $mountpoint) { if($mountpoint[0]!='/') { $mountpoint='/'.$mountpoint; } @@ -500,32 +500,32 @@ class OC_Filesystem{ static public function file_get_contents($path) { return self::$defaultInstance->file_get_contents($path); } - static public function file_put_contents($path,$data) { + static public function file_put_contents($path, $data) { return self::$defaultInstance->file_put_contents($path, $data); } static public function unlink($path) { return self::$defaultInstance->unlink($path); } - static public function rename($path1,$path2) { + static public function rename($path1, $path2) { return self::$defaultInstance->rename($path1, $path2); } - static public function copy($path1,$path2) { + static public function copy($path1, $path2) { return self::$defaultInstance->copy($path1, $path2); } - static public function fopen($path,$mode) { + static public function fopen($path, $mode) { return self::$defaultInstance->fopen($path, $mode); } static public function toTmpFile($path) { return self::$defaultInstance->toTmpFile($path); } - static public function fromTmpFile($tmpFile,$path) { + static public function fromTmpFile($tmpFile, $path) { return self::$defaultInstance->fromTmpFile($tmpFile, $path); } static public function getMimeType($path) { return self::$defaultInstance->getMimeType($path); } - static public function hash($type,$path, $raw = false) { + static public function hash($type, $path, $raw = false) { return self::$defaultInstance->hash($type, $path, $raw); } @@ -542,7 +542,7 @@ class OC_Filesystem{ * @param int $time * @return bool */ - static public function hasUpdated($path,$time) { + static public function hasUpdated($path, $time) { return self::$defaultInstance->hasUpdated($path, $time); } @@ -569,7 +569,7 @@ class OC_Filesystem{ * @param bool $stripTrailingSlash * @return string */ - public static function normalizePath($path,$stripTrailingSlash=true) { + public static function normalizePath($path, $stripTrailingSlash=true) { if($path=='') { return '/'; } diff --git a/lib/filesystemview.php b/lib/filesystemview.php index dbb6681656..9a38601acf 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -597,7 +597,7 @@ class OC_FilesystemView { return null; } - private function runHooks($hooks,$path,$post=false) { + private function runHooks($hooks, $path, $post=false) { $prefix=($post)?'post_':''; $run=true; if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) { diff --git a/lib/group.php b/lib/group.php index a89c6c55e3..ed9482418b 100644 --- a/lib/group.php +++ b/lib/group.php @@ -139,7 +139,7 @@ class OC_Group { */ public static function inGroup( $uid, $gid ) { foreach(self::$_usedBackends as $backend) { - if($backend->inGroup($uid,$gid)) { + if($backend->inGroup($uid, $gid)) { return true; } } @@ -223,7 +223,7 @@ class OC_Group { public static function getUserGroups( $uid ) { $groups=array(); foreach(self::$_usedBackends as $backend) { - $groups=array_merge($backend->getUserGroups($uid),$groups); + $groups=array_merge($backend->getUserGroups($uid), $groups); } asort($groups); return $groups; diff --git a/lib/group/dummy.php b/lib/group/dummy.php index 8116dcbd67..9516fd52ff 100644 --- a/lib/group/dummy.php +++ b/lib/group/dummy.php @@ -69,7 +69,7 @@ class OC_Group_Dummy extends OC_Group_Backend { */ public function inGroup($uid, $gid) { if(isset($this->groups[$gid])) { - return (array_search($uid,$this->groups[$gid])!==false); + return (array_search($uid, $this->groups[$gid])!==false); }else{ return false; } @@ -85,7 +85,7 @@ class OC_Group_Dummy extends OC_Group_Backend { */ public function addToGroup($uid, $gid) { if(isset($this->groups[$gid])) { - if(array_search($uid,$this->groups[$gid])===false) { + if(array_search($uid, $this->groups[$gid])===false) { $this->groups[$gid][]=$uid; return true; }else{ @@ -104,9 +104,9 @@ class OC_Group_Dummy extends OC_Group_Backend { * * removes the user from a group. */ - public function removeFromGroup($uid,$gid) { + public function removeFromGroup($uid, $gid) { if(isset($this->groups[$gid])) { - if(($index=array_search($uid,$this->groups[$gid]))!==false) { + if(($index=array_search($uid, $this->groups[$gid]))!==false) { unset($this->groups[$gid][$index]); }else{ return false; @@ -128,7 +128,7 @@ class OC_Group_Dummy extends OC_Group_Backend { $groups=array(); $allGroups=array_keys($this->groups); foreach($allGroups as $group) { - if($this->inGroup($uid,$group)) { + if($this->inGroup($uid, $group)) { $groups[]=$group; } } diff --git a/lib/group/example.php b/lib/group/example.php index 76d1262976..3519b9ed92 100644 --- a/lib/group/example.php +++ b/lib/group/example.php @@ -73,7 +73,7 @@ abstract class OC_Group_Example { * * removes the user from a group. */ - abstract public static function removeFromGroup($uid,$gid); + abstract public static function removeFromGroup($uid, $gid); /** * @brief Get all groups a user belongs to diff --git a/lib/helper.php b/lib/helper.php index 9843f5b1dc..27e312eeb2 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -377,7 +377,7 @@ class OC_Helper { if($mimeType=='application/octet-stream' and function_exists('finfo_open') and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)) { $info = @strtolower(finfo_file($finfo, $path)); if($info) { - $mimeType=substr($info,0, strpos($info, ';')); + $mimeType=substr($info, 0, strpos($info, ';')); } finfo_close($finfo); } @@ -498,7 +498,7 @@ class OC_Helper { * @param resource $target * @return int the number of bytes copied */ - public static function streamCopy($source,$target) { + public static function streamCopy($source, $target) { if(!$source or !$target) { return false; } diff --git a/lib/installer.php b/lib/installer.php index 8c504fb612..0c776d47d5 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -68,7 +68,7 @@ class OC_Installer{ OC_Log::write('core','No href specified when installing app from http',OC_Log::ERROR); return false; } - copy($data['href'],$path); + 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); @@ -80,10 +80,10 @@ class OC_Installer{ //detect the archive type $mime=OC_Helper::getMimeType($path); if($mime=='application/zip') { - rename($path,$path.'.zip'); + rename($path, $path.'.zip'); $path.='.zip'; }elseif($mime=='application/x-gzip') { - rename($path,$path.'.tgz'); + rename($path, $path.'.tgz'); $path.='.tgz'; }else{ OC_Log::write('core','Archives of type '.$mime.' are not supported',OC_Log::ERROR); @@ -344,7 +344,7 @@ class OC_Installer{ * @param string $folder the folder of the app to check * @returns true for app is o.k. and false for app is not o.k. */ - public static function checkCode($appname,$folder) { + public static function checkCode($appname, $folder) { $blacklist=array( 'exec(', diff --git a/lib/json.php b/lib/json.php index cc6cee6caf..be37f94ca6 100644 --- a/lib/json.php +++ b/lib/json.php @@ -120,7 +120,7 @@ class OC_JSON{ /** * Encode and print $data in json format */ - public static function encodedPrint($data,$setContentType=true) { + public static function encodedPrint($data, $setContentType=true) { // Disable mimesniffing, don't move this to setContentTypeHeader! header( 'X-Content-Type-Options: nosniff' ); if($setContentType) { diff --git a/lib/l10n.php b/lib/l10n.php index f1a2523c30..996ace2f57 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -68,14 +68,14 @@ class OC_L10N{ * get an L10N instance * @return OC_L10N */ - public static function get($app,$lang=null) { + public static function get($app, $lang=null) { if(is_null($lang)) { if(!isset(self::$instances[$app])) { self::$instances[$app]=new OC_L10N($app); } return self::$instances[$app]; }else{ - return new OC_L10N($app,$lang); + return new OC_L10N($app, $lang); } } diff --git a/lib/mail.php b/lib/mail.php index 8d30fff9f2..a77ac58569 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -56,13 +56,13 @@ class OC_Mail { $mailo->From =$fromaddress; $mailo->FromName = $fromname;; $mailo->Sender =$fromaddress; - $a=explode(' ',$toaddress); + $a=explode(' ', $toaddress); try { foreach($a as $ad) { - $mailo->AddAddress($ad,$toname); + $mailo->AddAddress($ad, $toname); } - if($ccaddress<>'') $mailo->AddCC($ccaddress,$ccname); + if($ccaddress<>'') $mailo->AddCC($ccaddress, $ccname); if($bcc<>'') $mailo->AddBCC($bcc); $mailo->AddReplyTo($fromaddress, $fromname); diff --git a/lib/migration/content.php b/lib/migration/content.php index 87f8da68c9..ca102b03d8 100644 --- a/lib/migration/content.php +++ b/lib/migration/content.php @@ -152,7 +152,7 @@ class OC_Migration_Content{ $sql = "INSERT INTO `" . $options['table'] . '` ( `'; $fieldssql = implode( '`, `', $fields ); $sql .= $fieldssql . "` ) VALUES( "; - $valuessql = substr( str_repeat( '?, ', count( $fields ) ),0,-2 ); + $valuessql = substr( str_repeat( '?, ', count( $fields ) ), 0, -2 ); $sql .= $valuessql . " )"; // Make the query $query = $this->prepare( $sql ); diff --git a/lib/minimizer.php b/lib/minimizer.php index deffa8e65d..3310624596 100644 --- a/lib/minimizer.php +++ b/lib/minimizer.php @@ -48,11 +48,11 @@ abstract class OC_Minimizer { } if (!function_exists('gzdecode')) { - function gzdecode($data,$maxlength=null,&$filename='',&$error='') + function gzdecode($data, $maxlength=null, &$filename='', &$error='') { - if (strcmp(substr($data,0,9),"\x1f\x8b\x8\0\0\0\0\0\0")) { + if (strcmp(substr($data, 0, 9),"\x1f\x8b\x8\0\0\0\0\0\0")) { return null; // Not the GZIP format we expect (See RFC 1952) } - return gzinflate(substr($data,10,-8)); + return gzinflate(substr($data, 10, -8)); } } diff --git a/lib/ocsclient.php b/lib/ocsclient.php index 32c2cfe6e4..2a36cbc123 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -105,18 +105,18 @@ class OC_OCSClient{ * * This function returns a list of all the applications on the OCS server */ - public static function getApplications($categories,$page,$filter) { + public static function getApplications($categories, $page, $filter) { if(OC_Config::getValue('appstoreenabled', true)==false) { return(array()); } if(is_array($categories)) { - $categoriesstring=implode('x',$categories); + $categoriesstring=implode('x', $categories); }else{ $categoriesstring=$categories; } - $version='&version='.implode('x',\OC_Util::getVersion()); + $version='&version='.implode('x', \OC_Util::getVersion()); $filterurl='&filter='.urlencode($filter); $url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page='.urlencode($page).'&pagesize=100'.$filterurl.$version; $apps=array(); @@ -192,7 +192,7 @@ class OC_OCSClient{ * * This function returns an download url for an applications from the OCS server */ - public static function getApplicationDownload($id,$item) { + public static function getApplicationDownload($id, $item) { if(OC_Config::getValue('appstoreenabled', true)==false) { return null; } @@ -222,7 +222,7 @@ class OC_OCSClient{ * * This function returns a list of all the knowledgebase entries from the OCS server */ - public static function getKnownledgebaseEntries($page,$pagesize,$search='') { + public static function getKnownledgebaseEntries($page, $pagesize, $search='') { if(OC_Config::getValue('knowledgebaseenabled', true)==false) { $kbe=array(); $kbe['totalitems']=0; diff --git a/lib/preferences.php b/lib/preferences.php index b198a18415..6270457834 100644 --- a/lib/preferences.php +++ b/lib/preferences.php @@ -139,7 +139,7 @@ class OC_Preferences{ public static function setValue( $user, $app, $key, $value ) { // Check if the key does exist $query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' ); - $values=$query->execute(array($user,$app,$key))->fetchAll(); + $values=$query->execute(array($user, $app, $key))->fetchAll(); $exists=(count($values)>0); if( !$exists ) { diff --git a/lib/public/db.php b/lib/public/db.php index 6ce62b27ca..d2484b6eb8 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -42,7 +42,7 @@ class DB { * SQL query via MDB2 prepare(), needs to be execute()'d! */ static public function prepare( $query, $limit=null, $offset=null ) { - return(\OC_DB::prepare($query,$limit,$offset)); + return(\OC_DB::prepare($query, $limit, $offset)); } /** diff --git a/lib/public/util.php b/lib/public/util.php index 38da7e8217..6ce79715b6 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -107,8 +107,8 @@ class Util { * @param int timestamp $timestamp * @param bool dateOnly option to ommit time from the result */ - public static function formatDate( $timestamp,$dateOnly=false) { - return(\OC_Util::formatDate( $timestamp,$dateOnly )); + public static function formatDate( $timestamp, $dateOnly=false) { + return(\OC_Util::formatDate( $timestamp, $dateOnly )); } /** diff --git a/lib/search.php b/lib/search.php index 0b6ad05002..2629c5e2fb 100644 --- a/lib/search.php +++ b/lib/search.php @@ -40,7 +40,7 @@ class OC_Search{ * register a new search provider to be used * @param string $provider class name of a OC_Search_Provider */ - public static function registerProvider($class,$options=array()) { + public static function registerProvider($class, $options=array()) { self::$registeredProviders[]=array('class'=>$class,'options'=>$options); } diff --git a/lib/search/result.php b/lib/search/result.php index 63b5cfabce..08beaea151 100644 --- a/lib/search/result.php +++ b/lib/search/result.php @@ -15,7 +15,7 @@ class OC_Search_Result{ * @param string $link link for the result * @param string $type the type of result as human readable string ('File', 'Music', etc) */ - public function __construct($name,$text,$link,$type) { + public function __construct($name, $text, $link, $type) { $this->name=$name; $this->text=$text; $this->link=$link; diff --git a/lib/setup.php b/lib/setup.php index 4e4a32e736..d0620f814a 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -251,7 +251,7 @@ class OC_Setup { mysql_close($connection); } - private static function createMySQLDatabase($name,$user,$connection) { + private static function createMySQLDatabase($name, $user, $connection) { //we cant use OC_BD functions here because we need to connect as the administrative user. $query = "CREATE DATABASE IF NOT EXISTS `$name`"; $result = mysql_query($query, $connection); @@ -264,7 +264,7 @@ class OC_Setup { $result = mysql_query($query, $connection); //this query will fail if there aren't the right permissons, ignore the error } - private static function createDBUser($name,$password,$connection) { + private static function createDBUser($name, $password, $connection) { // we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one, // the anonymous user would take precedence when there is one. $query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'"; @@ -339,7 +339,7 @@ class OC_Setup { } } - private static function pg_createDatabase($name,$user,$connection) { + private static function pg_createDatabase($name, $user, $connection) { //we cant use OC_BD functions here because we need to connect as the administrative user. $e_name = pg_escape_string($name); $e_user = pg_escape_string($user); @@ -364,7 +364,7 @@ class OC_Setup { $result = pg_query($connection, $query); } - private static function pg_createDBUser($name,$password,$connection) { + private static function pg_createDBUser($name, $password, $connection) { $e_name = pg_escape_string($name); $e_password = pg_escape_string($password); $query = "select * from pg_roles where rolname='$e_name';"; diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php index 63b795f4c4..b5ea0a2b2e 100644 --- a/lib/streamwrappers.php +++ b/lib/streamwrappers.php @@ -5,7 +5,7 @@ class OC_FakeDirStream{ private $name; private $index; - public function dir_opendir($path,$options) { + public function dir_opendir($path, $options) { $this->name=substr($path, strlen('fakedir://')); $this->index=0; if(!isset(self::$dirs[$this->name])) { @@ -225,7 +225,7 @@ class OC_CloseStreamWrapper{ public function stream_open($path, $mode, $options, &$opened_path) { $path=substr($path, strlen('close://')); $this->path=$path; - $this->source=fopen($path,$mode); + $this->source=fopen($path, $mode); if(is_resource($this->source)) { $this->meta=stream_get_meta_data($this->source); } @@ -234,7 +234,7 @@ class OC_CloseStreamWrapper{ } public function stream_seek($offset, $whence=SEEK_SET) { - fseek($this->source,$offset,$whence); + fseek($this->source,$offset, $whence); } public function stream_tell() { @@ -242,23 +242,23 @@ class OC_CloseStreamWrapper{ } public function stream_read($count) { - return fread($this->source,$count); + return fread($this->source, $count); } public function stream_write($data) { - return fwrite($this->source,$data); + return fwrite($this->source, $data); } - public function stream_set_option($option,$arg1,$arg2) { + public function stream_set_option($option,$arg1, $arg2) { switch($option) { case STREAM_OPTION_BLOCKING: - stream_set_blocking($this->source,$arg1); + stream_set_blocking($this->source, $arg1); break; case STREAM_OPTION_READ_TIMEOUT: - stream_set_timeout($this->source,$arg1,$arg2); + stream_set_timeout($this->source,$arg1, $arg2); break; case STREAM_OPTION_WRITE_BUFFER: - stream_set_write_buffer($this->source,$arg1,$arg2); + stream_set_write_buffer($this->source,$arg1, $arg2); } } @@ -267,7 +267,7 @@ class OC_CloseStreamWrapper{ } public function stream_lock($mode) { - flock($this->source,$mode); + flock($this->source, $mode); } public function stream_flush() { @@ -290,7 +290,7 @@ class OC_CloseStreamWrapper{ public function stream_close() { fclose($this->source); if(isset(self::$callBacks[$this->path])) { - call_user_func(self::$callBacks[$this->path],$this->path); + call_user_func(self::$callBacks[$this->path], $this->path); } } diff --git a/lib/template.php b/lib/template.php index 1ad47cbe52..ed2481afba 100644 --- a/lib/template.php +++ b/lib/template.php @@ -85,7 +85,7 @@ function human_file_size( $bytes ) { } function simple_file_size($bytes) { - $mbytes = round($bytes/(1024*1024),1); + $mbytes = round($bytes/(1024*1024), 1); if($bytes == 0) { return '0'; } else if($mbytes < 0.1) { return '< 0.1'; } else if($mbytes > 1000) { return '> 1000'; } @@ -102,12 +102,12 @@ function relative_modified_date($timestamp) { if($timediff < 60) { return $l->t('seconds ago'); } else if($timediff < 120) { return $l->t('1 minute ago'); } - else if($timediff < 3600) { return $l->t('%d minutes ago',$diffminutes); } + else if($timediff < 3600) { return $l->t('%d minutes ago', $diffminutes); } //else if($timediff < 7200) { return '1 hour ago'; } //else if($timediff < 86400) { return $diffhours.' hours ago'; } else if((date('G')-$diffhours) > 0) { return $l->t('today'); } else if((date('G')-$diffhours) > -24) { return $l->t('yesterday'); } - else if($timediff < 2678400) { return $l->t('%d days ago',$diffdays); } + else if($timediff < 2678400) { return $l->t('%d days ago', $diffdays); } else if($timediff < 5184000) { return $l->t('last month'); } else if((date('n')-$diffmonths) > 0) { return $l->t('months ago'); } else if($timediff < 63113852) { return $l->t('last year'); } @@ -395,9 +395,9 @@ class OC_Template{ } // Add custom headers - $page->assign('headers',$this->headers, false); + $page->assign('headers', $this->headers, false); foreach(OC_Util::$headers as $header) { - $page->append('headers',$header); + $page->append('headers', $header); } $page->assign( "content", $data, false ); diff --git a/lib/updater.php b/lib/updater.php index f55e55985d..7d5ec4ffe9 100644 --- a/lib/updater.php +++ b/lib/updater.php @@ -38,7 +38,7 @@ class OC_Updater{ $version['updated']=OC_Appconfig::getValue('core', 'lastupdatedat'); $version['updatechannel']='stable'; $version['edition']=OC_Util::getEditionString(); - $versionstring=implode('x',$version); + $versionstring=implode('x', $version); //fetch xml data from updater $url=$updaterurl.'?version='.$versionstring; diff --git a/lib/user.php b/lib/user.php index 869984a16e..126f2aa3da 100644 --- a/lib/user.php +++ b/lib/user.php @@ -179,7 +179,7 @@ class OC_User { if(!$backend->implementsActions(OC_USER_BACKEND_CREATE_USER)) continue; - $backend->createUser($uid,$password); + $backend->createUser($uid, $password); OC_Hook::emit( "OC_User", "post_createUser", array( "uid" => $uid, "password" => $password )); return true; @@ -329,7 +329,7 @@ class OC_User { foreach(self::$_usedBackends as $backend) { if($backend->implementsActions(OC_USER_BACKEND_SET_PASSWORD)) { if($backend->userExists($uid)) { - $success |= $backend->setPassword($uid,$password); + $success |= $backend->setPassword($uid, $password); } } } diff --git a/lib/user/database.php b/lib/user/database.php index b8c9061506..f39c19829e 100644 --- a/lib/user/database.php +++ b/lib/user/database.php @@ -48,7 +48,7 @@ class OC_User_Database extends OC_User_Backend { if(!self::$hasher) { //we don't want to use DES based crypt(), since it doesn't return a has with a recognisable prefix $forcePortable=(CRYPT_BLOWFISH!=1); - self::$hasher=new PasswordHash(8,$forcePortable); + self::$hasher=new PasswordHash(8, $forcePortable); } return self::$hasher; @@ -137,7 +137,7 @@ class OC_User_Database extends OC_User_Backend { }else{//old sha1 based hashing if(sha1($password)==$storedHash) { //upgrade to new hashing - $this->setPassword($row['uid'],$password); + $this->setPassword($row['uid'], $password); return $row['uid']; }else{ return false; @@ -155,7 +155,7 @@ class OC_User_Database extends OC_User_Backend { * Get a list of all users. */ public function getUsers($search = '', $limit = null, $offset = null) { - $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)',$limit,$offset); + $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)',$limit, $offset); $result = $query->execute(array($search.'%')); $users = array(); while ($row = $result->fetchRow()) { diff --git a/lib/user/http.php b/lib/user/http.php index 2668341408..ea055b6982 100644 --- a/lib/user/http.php +++ b/lib/user/http.php @@ -40,7 +40,7 @@ class OC_User_HTTP extends OC_User_Backend { if(isset($parts['query'])) { $url.='?'.$parts['query']; } - return array($parts['user'],$url); + return array($parts['user'], $url); } @@ -66,7 +66,7 @@ class OC_User_HTTP extends OC_User_Backend { if(!$this->matchUrl($uid)) { return false; } - list($user,$url)=$this->parseUrl($uid); + list($user, $url)=$this->parseUrl($uid); $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); diff --git a/lib/util.php b/lib/util.php index de89e339d9..a9bc5c061c 100755 --- a/lib/util.php +++ b/lib/util.php @@ -95,7 +95,7 @@ class OC_Util { */ public static function getVersion() { // hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4.90.0. This is not visible to the user - return array(4,91,00); + return array(4,91, 00); } /** @@ -166,7 +166,7 @@ class OC_Util { * @param int timestamp $timestamp * @param bool dateOnly option to ommit time from the result */ - public static function formatDate( $timestamp,$dateOnly=false) { + public static function formatDate( $timestamp, $dateOnly=false) { if(isset($_SESSION['timezone'])) {//adjust to clients timezone if we know it $systemTimeZone = intval(date('O')); $systemTimeZone=(round($systemTimeZone/100, 0)*60)+($systemTimeZone%100); @@ -186,7 +186,7 @@ class OC_Util { * @param string $url * @return OC_Template */ - public static function getPageNavi($pagecount,$page,$url) { + public static function getPageNavi($pagecount,$page, $url) { $pagelinkcount=8; if ($pagecount>1) { diff --git a/lib/vcategories.php b/lib/vcategories.php index ba6569a244..ec4536673a 100644 --- a/lib/vcategories.php +++ b/lib/vcategories.php @@ -222,7 +222,7 @@ class OC_VCategories { if(!is_array($haystack)) { return false; } - return array_search(strtolower($needle), array_map('strtolower',$haystack)); + return array_search(strtolower($needle), array_map('strtolower', $haystack)); } } diff --git a/lib/vobject.php b/lib/vobject.php index 44a5fbafdb..267176ebc0 100644 --- a/lib/vobject.php +++ b/lib/vobject.php @@ -201,7 +201,7 @@ class OC_VObject{ return $this->vobject->__isset($name); } - public function __call($function,$arguments) { + public function __call($function, $arguments) { return call_user_func_array(array($this->vobject, $function), $arguments); } } diff --git a/settings/admin.php b/settings/admin.php index 9cb70353f9..7ce0ee0d6f 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -20,22 +20,22 @@ $htaccessworking=OC_Util::ishtaccessworking(); $entries=OC_Log_Owncloud::getEntries(3); $entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false; -function compareEntries($a,$b) { +function compareEntries($a, $b) { return $b->time - $a->time; } usort($entries, 'compareEntries'); $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 )); -$tmpl->assign('entries',$entries); +$tmpl->assign('entries', $entries); $tmpl->assign('entriesremain', $entriesremain); -$tmpl->assign('htaccessworking',$htaccessworking); +$tmpl->assign('htaccessworking', $htaccessworking); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes')); $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes')); $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes')); $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global')); -$tmpl->assign('forms',array()); +$tmpl->assign('forms', array()); foreach($forms as $form) { - $tmpl->append('forms',$form); + $tmpl->append('forms', $form); } $tmpl->printPage(); diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php index 22128ef57b..273b02e382 100644 --- a/settings/ajax/getlog.php +++ b/settings/ajax/getlog.php @@ -10,7 +10,7 @@ OC_JSON::checkAdminUser(); $count=(isset($_GET['count']))?$_GET['count']:50; $offset=(isset($_GET['offset']))?$_GET['offset']:0; -$entries=OC_Log_Owncloud::getEntries($count,$offset); +$entries=OC_Log_Owncloud::getEntries($count, $offset); OC_JSON::success(array( "data" => OC_Util::sanitizeHTML($entries), "remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false)); diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 1e9598de1e..38e2af8a51 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -16,7 +16,7 @@ data-type="" data-installed="1"> 3rd party' ?> diff --git a/tests/lib/archive.php b/tests/lib/archive.php index 04ae722aea..408dc2bbae 100644 --- a/tests/lib/archive.php +++ b/tests/lib/archive.php @@ -27,7 +27,7 @@ abstract class Test_Archive extends UnitTestCase { $this->instance=$this->getExisting(); $allFiles=$this->instance->getFiles(); $expected=array('lorem.txt','logo-wide.png','dir/','dir/lorem.txt'); - $this->assertEqual(4,count($allFiles),'only found '.count($allFiles).' out of 4 expected files'); + $this->assertEqual(4, count($allFiles),'only found '.count($allFiles).' out of 4 expected files'); foreach($expected as $file) { $this->assertContains($file, $allFiles, 'cant find '. $file . ' in archive'); $this->assertTrue($this->instance->fileExists($file),'file '.$file.' does not exist in archive'); @@ -36,14 +36,14 @@ abstract class Test_Archive extends UnitTestCase { $rootContent=$this->instance->getFolder(''); $expected=array('lorem.txt','logo-wide.png','dir/'); - $this->assertEqual(3,count($rootContent)); + $this->assertEqual(3, count($rootContent)); foreach($expected as $file) { $this->assertContains($file, $rootContent, 'cant find '. $file . ' in archive'); } $dirContent=$this->instance->getFolder('dir/'); $expected=array('lorem.txt'); - $this->assertEqual(1,count($dirContent)); + $this->assertEqual(1, count($dirContent)); foreach($expected as $file) { $this->assertContains($file, $dirContent, 'cant find '. $file . ' in archive'); } @@ -53,26 +53,26 @@ abstract class Test_Archive extends UnitTestCase { $this->instance=$this->getExisting(); $dir=OC::$SERVERROOT.'/tests/data'; $textFile=$dir.'/lorem.txt'; - $this->assertEqual(file_get_contents($textFile),$this->instance->getFile('lorem.txt')); + $this->assertEqual(file_get_contents($textFile), $this->instance->getFile('lorem.txt')); $tmpFile=OCP\Files::tmpFile('.txt'); - $this->instance->extractFile('lorem.txt',$tmpFile); - $this->assertEqual(file_get_contents($textFile),file_get_contents($tmpFile)); + $this->instance->extractFile('lorem.txt', $tmpFile); + $this->assertEqual(file_get_contents($textFile), file_get_contents($tmpFile)); } public function testWrite() { $dir=OC::$SERVERROOT.'/tests/data'; $textFile=$dir.'/lorem.txt'; $this->instance=$this->getNew(); - $this->assertEqual(0,count($this->instance->getFiles())); - $this->instance->addFile('lorem.txt',$textFile); - $this->assertEqual(1,count($this->instance->getFiles())); + $this->assertEqual(0, count($this->instance->getFiles())); + $this->instance->addFile('lorem.txt', $textFile); + $this->assertEqual(1, count($this->instance->getFiles())); $this->assertTrue($this->instance->fileExists('lorem.txt')); $this->assertFalse($this->instance->fileExists('lorem.txt/')); - $this->assertEqual(file_get_contents($textFile),$this->instance->getFile('lorem.txt')); + $this->assertEqual(file_get_contents($textFile), $this->instance->getFile('lorem.txt')); $this->instance->addFile('lorem.txt','foobar'); - $this->assertEqual('foobar',$this->instance->getFile('lorem.txt')); + $this->assertEqual('foobar', $this->instance->getFile('lorem.txt')); } public function testReadStream() { @@ -80,20 +80,20 @@ abstract class Test_Archive extends UnitTestCase { $this->instance=$this->getExisting(); $fh=$this->instance->getStream('lorem.txt','r'); $this->assertTrue($fh); - $content=fread($fh,$this->instance->filesize('lorem.txt')); + $content=fread($fh, $this->instance->filesize('lorem.txt')); fclose($fh); - $this->assertEqual(file_get_contents($dir.'/lorem.txt'),$content); + $this->assertEqual(file_get_contents($dir.'/lorem.txt'), $content); } public function testWriteStream() { $dir=OC::$SERVERROOT.'/tests/data'; $this->instance=$this->getNew(); $fh=$this->instance->getStream('lorem.txt','w'); $source=fopen($dir.'/lorem.txt','r'); - OCP\Files::streamCopy($source,$fh); + OCP\Files::streamCopy($source, $fh); fclose($source); fclose($fh); $this->assertTrue($this->instance->fileExists('lorem.txt')); - $this->assertEqual(file_get_contents($dir.'/lorem.txt'),$this->instance->getFile('lorem.txt')); + $this->assertEqual(file_get_contents($dir.'/lorem.txt'), $this->instance->getFile('lorem.txt')); } public function testFolder() { $this->instance=$this->getNew(); @@ -111,29 +111,29 @@ abstract class Test_Archive extends UnitTestCase { $this->instance=$this->getExisting(); $tmpDir=OCP\Files::tmpFolder(); $this->instance->extract($tmpDir); - $this->assertEqual(true,file_exists($tmpDir.'lorem.txt')); - $this->assertEqual(true,file_exists($tmpDir.'dir/lorem.txt')); - $this->assertEqual(true,file_exists($tmpDir.'logo-wide.png')); - $this->assertEqual(file_get_contents($dir.'/lorem.txt'),file_get_contents($tmpDir.'lorem.txt')); + $this->assertEqual(true, file_exists($tmpDir.'lorem.txt')); + $this->assertEqual(true, file_exists($tmpDir.'dir/lorem.txt')); + $this->assertEqual(true, file_exists($tmpDir.'logo-wide.png')); + $this->assertEqual(file_get_contents($dir.'/lorem.txt'), file_get_contents($tmpDir.'lorem.txt')); OCP\Files::rmdirr($tmpDir); } public function testMoveRemove() { $dir=OC::$SERVERROOT.'/tests/data'; $textFile=$dir.'/lorem.txt'; $this->instance=$this->getNew(); - $this->instance->addFile('lorem.txt',$textFile); + $this->instance->addFile('lorem.txt', $textFile); $this->assertFalse($this->instance->fileExists('target.txt')); $this->instance->rename('lorem.txt','target.txt'); $this->assertTrue($this->instance->fileExists('target.txt')); $this->assertFalse($this->instance->fileExists('lorem.txt')); - $this->assertEqual(file_get_contents($textFile),$this->instance->getFile('target.txt')); + $this->assertEqual(file_get_contents($textFile), $this->instance->getFile('target.txt')); $this->instance->remove('target.txt'); $this->assertFalse($this->instance->fileExists('target.txt')); } public function testRecursive() { $dir=OC::$SERVERROOT.'/tests/data'; $this->instance=$this->getNew(); - $this->instance->addRecursive('/dir',$dir); + $this->instance->addRecursive('/dir', $dir); $this->assertTrue($this->instance->fileExists('/dir/lorem.txt')); $this->assertTrue($this->instance->fileExists('/dir/data.zip')); $this->assertTrue($this->instance->fileExists('/dir/data.tar.gz')); diff --git a/tests/lib/cache.php b/tests/lib/cache.php index 08653d4a31..7f3eb3ee6f 100644 --- a/tests/lib/cache.php +++ b/tests/lib/cache.php @@ -23,22 +23,22 @@ abstract class Test_Cache extends UnitTestCase { $this->assertFalse($this->instance->hasKey('value1')); $value='foobar'; - $this->instance->set('value1',$value); + $this->instance->set('value1', $value); $this->assertTrue($this->instance->hasKey('value1')); $received=$this->instance->get('value1'); - $this->assertEqual($value,$received,'Value recieved from cache not equal to the original'); + $this->assertEqual($value, $received,'Value recieved from cache not equal to the original'); $value='ipsum lorum'; - $this->instance->set('value1',$value); + $this->instance->set('value1', $value); $received=$this->instance->get('value1'); - $this->assertEqual($value,$received,'Value not overwritten by second set'); + $this->assertEqual($value, $received,'Value not overwritten by second set'); $value2='foobar'; - $this->instance->set('value2',$value2); + $this->instance->set('value2', $value2); $received2=$this->instance->get('value2'); $this->assertTrue($this->instance->hasKey('value1')); $this->assertTrue($this->instance->hasKey('value2')); - $this->assertEqual($value,$received,'Value changed while setting other variable'); - $this->assertEqual($value2,$received2,'Second value not equal to original'); + $this->assertEqual($value, $received,'Value changed while setting other variable'); + $this->assertEqual($value2, $received2,'Second value not equal to original'); $this->assertFalse($this->instance->hasKey('not_set')); $this->assertNull($this->instance->get('not_set'),'Unset value not equal to null'); @@ -49,10 +49,10 @@ abstract class Test_Cache extends UnitTestCase { function testClear() { $value='ipsum lorum'; - $this->instance->set('1_value1',$value); - $this->instance->set('1_value2',$value); - $this->instance->set('2_value1',$value); - $this->instance->set('3_value1',$value); + $this->instance->set('1_value1', $value); + $this->instance->set('1_value2', $value); + $this->instance->set('2_value1', $value); + $this->instance->set('3_value1', $value); $this->assertTrue($this->instance->clear('1_')); $this->assertFalse($this->instance->hasKey('1_value1')); diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index 00be005d08..47b18e5b9f 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -39,7 +39,7 @@ class Test_Cache_File extends Test_Cache { //set up temporary storage OC_Filesystem::clearMounts(); - OC_Filesystem::mount('OC_Filestorage_Temporary',array(),'/'); + OC_Filesystem::mount('OC_Filestorage_Temporary', array(),'/'); OC_User::clearBackends(); OC_User::useBackend(new OC_User_Dummy()); diff --git a/tests/lib/geo.php b/tests/lib/geo.php index cae3d550b3..d4951ee79e 100644 --- a/tests/lib/geo.php +++ b/tests/lib/geo.php @@ -8,7 +8,7 @@ class Test_Geo extends UnitTestCase { function testTimezone() { - $result = OC_Geo::timezone(3,3); + $result = OC_Geo::timezone(3, 3); $expected = 'Africa/Porto-Novo'; $this->assertEquals($expected, $result); diff --git a/tests/lib/group.php b/tests/lib/group.php index 0bea9a0088..9ad397b94a 100644 --- a/tests/lib/group.php +++ b/tests/lib/group.php @@ -36,19 +36,19 @@ class Test_Group extends UnitTestCase { $user1=uniqid(); $user2=uniqid(); - $this->assertFalse(OC_Group::inGroup($user1,$group1)); - $this->assertFalse(OC_Group::inGroup($user2,$group1)); - $this->assertFalse(OC_Group::inGroup($user1,$group2)); - $this->assertFalse(OC_Group::inGroup($user2,$group2)); + $this->assertFalse(OC_Group::inGroup($user1, $group1)); + $this->assertFalse(OC_Group::inGroup($user2, $group1)); + $this->assertFalse(OC_Group::inGroup($user1, $group2)); + $this->assertFalse(OC_Group::inGroup($user2, $group2)); - $this->assertTrue(OC_Group::addToGroup($user1,$group1)); + $this->assertTrue(OC_Group::addToGroup($user1, $group1)); - $this->assertTrue(OC_Group::inGroup($user1,$group1)); - $this->assertFalse(OC_Group::inGroup($user2,$group1)); - $this->assertFalse(OC_Group::inGroup($user1,$group2)); - $this->assertFalse(OC_Group::inGroup($user2,$group2)); + $this->assertTrue(OC_Group::inGroup($user1, $group1)); + $this->assertFalse(OC_Group::inGroup($user2, $group1)); + $this->assertFalse(OC_Group::inGroup($user1, $group2)); + $this->assertFalse(OC_Group::inGroup($user2, $group2)); - $this->assertFalse(OC_Group::addToGroup($user1,$group1)); + $this->assertFalse(OC_Group::addToGroup($user1, $group1)); $this->assertEqual(array($user1),OC_Group::usersInGroup($group1)); $this->assertEqual(array(),OC_Group::usersInGroup($group2)); @@ -59,7 +59,7 @@ class Test_Group extends UnitTestCase { OC_Group::deleteGroup($group1); $this->assertEqual(array(),OC_Group::getUserGroups($user1)); $this->assertEqual(array(),OC_Group::usersInGroup($group1)); - $this->assertFalse(OC_Group::inGroup($user1,$group1)); + $this->assertFalse(OC_Group::inGroup($user1, $group1)); } function testMultiBackend() { @@ -73,8 +73,8 @@ class Test_Group extends UnitTestCase { OC_Group::createGroup($group1); //groups should be added to the first registered backend - $this->assertEqual(array($group1),$backend1->getGroups()); - $this->assertEqual(array(),$backend2->getGroups()); + $this->assertEqual(array($group1), $backend1->getGroups()); + $this->assertEqual(array(), $backend2->getGroups()); $this->assertEqual(array($group1),OC_Group::getGroups()); $this->assertTrue(OC_Group::groupExists($group1)); @@ -82,24 +82,24 @@ class Test_Group extends UnitTestCase { $backend1->createGroup($group2); - $this->assertEqual(array($group1,$group2),OC_Group::getGroups()); + $this->assertEqual(array($group1, $group2),OC_Group::getGroups()); $this->assertTrue(OC_Group::groupExists($group1)); $this->assertTrue(OC_Group::groupExists($group2)); $user1=uniqid(); $user2=uniqid(); - $this->assertFalse(OC_Group::inGroup($user1,$group1)); - $this->assertFalse(OC_Group::inGroup($user2,$group1)); + $this->assertFalse(OC_Group::inGroup($user1, $group1)); + $this->assertFalse(OC_Group::inGroup($user2, $group1)); - $this->assertTrue(OC_Group::addToGroup($user1,$group1)); + $this->assertTrue(OC_Group::addToGroup($user1, $group1)); - $this->assertTrue(OC_Group::inGroup($user1,$group1)); - $this->assertFalse(OC_Group::inGroup($user2,$group1)); - $this->assertFalse($backend2->inGroup($user1,$group1)); + $this->assertTrue(OC_Group::inGroup($user1, $group1)); + $this->assertFalse(OC_Group::inGroup($user2, $group1)); + $this->assertFalse($backend2->inGroup($user1, $group1)); - $this->assertFalse(OC_Group::addToGroup($user1,$group1)); + $this->assertFalse(OC_Group::addToGroup($user1, $group1)); $this->assertEqual(array($user1),OC_Group::usersInGroup($group1)); @@ -109,6 +109,6 @@ class Test_Group extends UnitTestCase { OC_Group::deleteGroup($group1); $this->assertEqual(array(),OC_Group::getUserGroups($user1)); $this->assertEqual(array(),OC_Group::usersInGroup($group1)); - $this->assertFalse(OC_Group::inGroup($user1,$group1)); + $this->assertFalse(OC_Group::inGroup($user1, $group1)); } } diff --git a/tests/lib/group/backend.php b/tests/lib/group/backend.php index 61e008b6ca..f61abed5f2 100644 --- a/tests/lib/group/backend.php +++ b/tests/lib/group/backend.php @@ -52,20 +52,20 @@ abstract class Test_Group_Backend extends UnitTestCase { $name2=$this->getGroupName(); $this->backend->createGroup($name1); $count=count($this->backend->getGroups())-$startCount; - $this->assertEqual(1,$count); - $this->assertTrue((array_search($name1,$this->backend->getGroups())!==false)); - $this->assertFalse((array_search($name2,$this->backend->getGroups())!==false)); + $this->assertEqual(1, $count); + $this->assertTrue((array_search($name1, $this->backend->getGroups())!==false)); + $this->assertFalse((array_search($name2, $this->backend->getGroups())!==false)); $this->backend->createGroup($name2); $count=count($this->backend->getGroups())-$startCount; - $this->assertEqual(2,$count); - $this->assertTrue((array_search($name1,$this->backend->getGroups())!==false)); - $this->assertTrue((array_search($name2,$this->backend->getGroups())!==false)); + $this->assertEqual(2, $count); + $this->assertTrue((array_search($name1, $this->backend->getGroups())!==false)); + $this->assertTrue((array_search($name2, $this->backend->getGroups())!==false)); $this->backend->deleteGroup($name2); $count=count($this->backend->getGroups())-$startCount; - $this->assertEqual(1,$count); - $this->assertTrue((array_search($name1,$this->backend->getGroups())!==false)); - $this->assertFalse((array_search($name2,$this->backend->getGroups())!==false)); + $this->assertEqual(1, $count); + $this->assertTrue((array_search($name1, $this->backend->getGroups())!==false)); + $this->assertFalse((array_search($name2, $this->backend->getGroups())!==false)); } public function testUser() { @@ -77,29 +77,29 @@ abstract class Test_Group_Backend extends UnitTestCase { $user1=$this->getUserName(); $user2=$this->getUserName(); - $this->assertFalse($this->backend->inGroup($user1,$group1)); - $this->assertFalse($this->backend->inGroup($user2,$group1)); - $this->assertFalse($this->backend->inGroup($user1,$group2)); - $this->assertFalse($this->backend->inGroup($user2,$group2)); + $this->assertFalse($this->backend->inGroup($user1, $group1)); + $this->assertFalse($this->backend->inGroup($user2, $group1)); + $this->assertFalse($this->backend->inGroup($user1, $group2)); + $this->assertFalse($this->backend->inGroup($user2, $group2)); - $this->assertTrue($this->backend->addToGroup($user1,$group1)); + $this->assertTrue($this->backend->addToGroup($user1, $group1)); - $this->assertTrue($this->backend->inGroup($user1,$group1)); - $this->assertFalse($this->backend->inGroup($user2,$group1)); - $this->assertFalse($this->backend->inGroup($user1,$group2)); - $this->assertFalse($this->backend->inGroup($user2,$group2)); + $this->assertTrue($this->backend->inGroup($user1, $group1)); + $this->assertFalse($this->backend->inGroup($user2, $group1)); + $this->assertFalse($this->backend->inGroup($user1, $group2)); + $this->assertFalse($this->backend->inGroup($user2, $group2)); - $this->assertFalse($this->backend->addToGroup($user1,$group1)); + $this->assertFalse($this->backend->addToGroup($user1, $group1)); - $this->assertEqual(array($user1),$this->backend->usersInGroup($group1)); - $this->assertEqual(array(),$this->backend->usersInGroup($group2)); + $this->assertEqual(array($user1), $this->backend->usersInGroup($group1)); + $this->assertEqual(array(), $this->backend->usersInGroup($group2)); - $this->assertEqual(array($group1),$this->backend->getUserGroups($user1)); - $this->assertEqual(array(),$this->backend->getUserGroups($user2)); + $this->assertEqual(array($group1), $this->backend->getUserGroups($user1)); + $this->assertEqual(array(), $this->backend->getUserGroups($user2)); $this->backend->deleteGroup($group1); - $this->assertEqual(array(),$this->backend->getUserGroups($user1)); - $this->assertEqual(array(),$this->backend->usersInGroup($group1)); - $this->assertFalse($this->backend->inGroup($user1,$group1)); + $this->assertEqual(array(), $this->backend->getUserGroups($user1)); + $this->assertEqual(array(), $this->backend->usersInGroup($group1)); + $this->assertFalse($this->backend->inGroup($user1, $group1)); } } diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php index 46838ff975..f864a9e361 100644 --- a/tests/lib/streamwrappers.php +++ b/tests/lib/streamwrappers.php @@ -30,16 +30,16 @@ class Test_StreamWrappers extends UnitTestCase { $result[]=$file; $this->assertContains($file, $items); } - $this->assertEqual(count($items),count($result)); + $this->assertEqual(count($items), count($result)); } public function testStaticStream() { $sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt'; $staticFile='static://test'; $this->assertFalse(file_exists($staticFile)); - file_put_contents($staticFile,file_get_contents($sourceFile)); + file_put_contents($staticFile, file_get_contents($sourceFile)); $this->assertTrue(file_exists($staticFile)); - $this->assertEqual(file_get_contents($sourceFile),file_get_contents($staticFile)); + $this->assertEqual(file_get_contents($sourceFile), file_get_contents($staticFile)); unlink($staticFile); clearstatcache(); $this->assertFalse(file_exists($staticFile)); @@ -51,8 +51,8 @@ class Test_StreamWrappers extends UnitTestCase { $tmpFile=OC_Helper::TmpFile('.txt'); $file='close://'.$tmpFile; $this->assertTrue(file_exists($file)); - file_put_contents($file,file_get_contents($sourceFile)); - $this->assertEqual(file_get_contents($sourceFile),file_get_contents($file)); + file_put_contents($file, file_get_contents($sourceFile)); + $this->assertEqual(file_get_contents($sourceFile), file_get_contents($file)); unlink($file); clearstatcache(); $this->assertFalse(file_exists($file)); @@ -68,7 +68,7 @@ class Test_StreamWrappers extends UnitTestCase { $this->fail('Expected exception'); }catch(Exception $e) { $path=$e->getMessage(); - $this->assertEqual($path,$tmpFile); + $this->assertEqual($path, $tmpFile); } } diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php index c69c1bad51..eb3aa91b68 100644 --- a/tests/lib/user/backend.php +++ b/tests/lib/user/backend.php @@ -53,20 +53,20 @@ abstract class Test_User_Backend extends UnitTestCase { $name2=$this->getUser(); $this->backend->createUser($name1,''); $count=count($this->backend->getUsers())-$startCount; - $this->assertEqual(1,$count); - $this->assertTrue((array_search($name1,$this->backend->getUsers())!==false)); - $this->assertFalse((array_search($name2,$this->backend->getUsers())!==false)); + $this->assertEqual(1, $count); + $this->assertTrue((array_search($name1, $this->backend->getUsers())!==false)); + $this->assertFalse((array_search($name2, $this->backend->getUsers())!==false)); $this->backend->createUser($name2,''); $count=count($this->backend->getUsers())-$startCount; - $this->assertEqual(2,$count); - $this->assertTrue((array_search($name1,$this->backend->getUsers())!==false)); - $this->assertTrue((array_search($name2,$this->backend->getUsers())!==false)); + $this->assertEqual(2, $count); + $this->assertTrue((array_search($name1, $this->backend->getUsers())!==false)); + $this->assertTrue((array_search($name2, $this->backend->getUsers())!==false)); $this->backend->deleteUser($name2); $count=count($this->backend->getUsers())-$startCount; - $this->assertEqual(1,$count); - $this->assertTrue((array_search($name1,$this->backend->getUsers())!==false)); - $this->assertFalse((array_search($name2,$this->backend->getUsers())!==false)); + $this->assertEqual(1, $count); + $this->assertTrue((array_search($name1, $this->backend->getUsers())!==false)); + $this->assertFalse((array_search($name2, $this->backend->getUsers())!==false)); } public function testLogin() { From 2f0fd844777a6a2beeea61a03ad3c8b645327748 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 3 Nov 2012 00:02:24 +0100 Subject: [PATCH 06/12] [tx-robot] updated from transifex --- apps/files/l10n/ar.php | 2 ++ apps/files/l10n/bg_BG.php | 1 + apps/files/l10n/ca.php | 1 + apps/files/l10n/cs_CZ.php | 1 + apps/files/l10n/de_DE.php | 1 + apps/files/l10n/eo.php | 1 + apps/files/l10n/eu.php | 1 + apps/files/l10n/fa.php | 10 ++++++++++ apps/files/l10n/fi_FI.php | 1 + apps/files/l10n/gl.php | 8 ++++++++ apps/files/l10n/he.php | 10 ++++++++++ apps/files/l10n/hu_HU.php | 10 ++++++++++ apps/files/l10n/ia.php | 3 +++ apps/files/l10n/id.php | 10 ++++++++++ apps/files/l10n/it.php | 1 + apps/files/l10n/ko.php | 1 + apps/files/l10n/ku_IQ.php | 7 +++++++ apps/files/l10n/lb.php | 1 + apps/files/l10n/lv.php | 1 + apps/files/l10n/mk.php | 1 + apps/files/l10n/ms_MY.php | 1 + apps/files/l10n/nn_NO.php | 1 + apps/files/l10n/oc.php | 1 + apps/files/l10n/pl_PL.php | 3 +++ apps/files/l10n/pt_BR.php | 1 + apps/files/l10n/ro.php | 1 + apps/files/l10n/ru_RU.php | 1 + apps/files/l10n/si_LK.php | 7 +++++++ apps/files/l10n/sk_SK.php | 1 + apps/files/l10n/sr.php | 1 + apps/files/l10n/sr@latin.php | 1 + apps/files/l10n/tr.php | 3 +++ apps/files/l10n/uk.php | 10 ++++++++++ apps/files/l10n/zh_CN.GB2312.php | 1 + apps/files/l10n/zh_TW.php | 11 +++++++++++ apps/files_external/l10n/cs_CZ.php | 2 +- l10n/ar/files.po | 10 +++++----- l10n/bg_BG/files.po | 8 ++++---- l10n/ca/files.po | 10 +++++----- l10n/cs_CZ/files.po | 10 +++++----- l10n/cs_CZ/files_external.po | 6 +++--- l10n/da/files.po | 6 +++--- l10n/de/files.po | 6 +++--- l10n/de_DE/files.po | 10 +++++----- l10n/el/files.po | 6 +++--- l10n/eo/files.po | 8 ++++---- l10n/es/files.po | 6 +++--- l10n/es_AR/files.po | 6 +++--- l10n/et_EE/files.po | 6 +++--- l10n/eu/files.po | 8 ++++---- l10n/fa/files.po | 26 +++++++++++++------------- l10n/fi_FI/files.po | 8 ++++---- l10n/fr/files.po | 6 +++--- l10n/gl/files.po | 22 +++++++++++----------- l10n/he/files.po | 26 +++++++++++++------------- l10n/hi/files.po | 6 +++--- l10n/hr/files.po | 6 +++--- l10n/hu_HU/files.po | 26 +++++++++++++------------- l10n/ia/files.po | 12 ++++++------ l10n/id/files.po | 26 +++++++++++++------------- l10n/it/files.po | 10 +++++----- l10n/ja_JP/files.po | 6 +++--- l10n/ka_GE/files.po | 6 +++--- l10n/ko/files.po | 8 ++++---- l10n/ku_IQ/files.po | 16 ++++++++-------- l10n/lb/files.po | 8 ++++---- l10n/lt_LT/files.po | 6 +++--- l10n/lv/files.po | 8 ++++---- l10n/mk/files.po | 8 ++++---- l10n/ms_MY/files.po | 8 ++++---- l10n/nb_NO/files.po | 6 +++--- l10n/nl/files.po | 6 +++--- l10n/nn_NO/files.po | 8 ++++---- l10n/oc/files.po | 8 ++++---- l10n/pl/files.po | 6 +++--- l10n/pl_PL/files.po | 8 ++++---- l10n/pt_BR/files.po | 8 ++++---- l10n/pt_PT/files.po | 6 +++--- l10n/ro/files.po | 8 ++++---- l10n/ru/files.po | 6 +++--- l10n/ru_RU/files.po | 10 +++++----- l10n/si_LK/files.po | 20 ++++++++++---------- l10n/sk_SK/files.po | 10 +++++----- l10n/sl/files.po | 6 +++--- l10n/sr/files.po | 8 ++++---- l10n/sr@latin/files.po | 8 ++++---- l10n/sv/files.po | 6 +++--- l10n/ta_LK/files.po | 6 +++--- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 4 ++-- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/th_TH/files.po | 6 +++--- l10n/tr/files.po | 12 ++++++------ l10n/uk/files.po | 26 +++++++++++++------------- l10n/vi/files.po | 6 +++--- l10n/zh_CN.GB2312/files.po | 8 ++++---- l10n/zh_CN/files.po | 6 +++--- l10n/zh_TW/files.po | 28 ++++++++++++++-------------- 104 files changed, 422 insertions(+), 306 deletions(-) create mode 100644 apps/files/l10n/ku_IQ.php create mode 100644 apps/files/l10n/pl_PL.php diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php index a5530851d2..78b4915f4e 100644 --- a/apps/files/l10n/ar.php +++ b/apps/files/l10n/ar.php @@ -11,11 +11,13 @@ "Size" => "حجم", "Modified" => "معدل", "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها", +"Save" => "حفظ", "New" => "جديد", "Text file" => "ملف", "Folder" => "مجلد", "Upload" => "إرفع", "Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!", +"Share" => "شارك", "Download" => "تحميل", "Upload too large" => "حجم الترفيع أعلى من المسموح", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم." diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php index 8387394816..0a3bf02e95 100644 --- a/apps/files/l10n/bg_BG.php +++ b/apps/files/l10n/bg_BG.php @@ -16,6 +16,7 @@ "Modified" => "Променено", "Maximum upload size" => "Макс. размер за качване", "0 is unlimited" => "0 означава без ограничение", +"Save" => "Запис", "New" => "Нов", "Text file" => "Текстов файл", "Folder" => "Папка", diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index a10ad5c16c..068031bafc 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -58,6 +58,7 @@ "New" => "Nou", "Text file" => "Fitxer de text", "Folder" => "Carpeta", +"From link" => "Des d'enllaç", "Upload" => "Puja", "Cancel upload" => "Cancel·la la pujada", "Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!", diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index c216f6bce4..6d96033a8b 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -58,6 +58,7 @@ "New" => "Nový", "Text file" => "Textový soubor", "Folder" => "Složka", +"From link" => "Z odkazu", "Upload" => "Odeslat", "Cancel upload" => "Zrušit odesílání", "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index dd2ebbbdd1..7e4c1887ce 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -58,6 +58,7 @@ "New" => "Neu", "Text file" => "Textdatei", "Folder" => "Ordner", +"From link" => "Von Link", "Upload" => "Hochladen", "Cancel upload" => "Upload abbrechen", "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!", diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php index bba06c3f9c..4373bbf58b 100644 --- a/apps/files/l10n/eo.php +++ b/apps/files/l10n/eo.php @@ -27,6 +27,7 @@ "Size" => "Grando", "Modified" => "Modifita", "seconds ago" => "sekundoj antaŭe", +"1 minute ago" => "antaŭ 1 minuto", "today" => "hodiaŭ", "yesterday" => "hieraŭ", "last month" => "lastamonate", diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index 2a923a2813..f99c211607 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -27,6 +27,7 @@ "Size" => "Tamaina", "Modified" => "Aldatuta", "seconds ago" => "segundu", +"1 minute ago" => "orain dela minutu 1", "today" => "gaur", "yesterday" => "atzo", "last month" => "joan den hilabetean", diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php index 2eb3b47ac0..ea3aa43b8f 100644 --- a/apps/files/l10n/fa.php +++ b/apps/files/l10n/fa.php @@ -8,6 +8,7 @@ "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود", "Files" => "فایل ها", "Delete" => "پاک کردن", +"Rename" => "تغییرنام", "replace" => "جایگزین", "cancel" => "لغو", "undo" => "بازگشت", @@ -20,6 +21,14 @@ "Name" => "نام", "Size" => "اندازه", "Modified" => "تغییر یافته", +"seconds ago" => "ثانیه‌ها پیش", +"1 minute ago" => "1 دقیقه پیش", +"today" => "امروز", +"yesterday" => "دیروز", +"last month" => "ماه قبل", +"months ago" => "ماه‌های قبل", +"last year" => "سال قبل", +"years ago" => "سال‌های قبل", "File handling" => "اداره پرونده ها", "Maximum upload size" => "حداکثر اندازه بارگزاری", "max. possible: " => "حداکثرمقدارممکن:", @@ -27,6 +36,7 @@ "Enable ZIP-download" => "فعال سازی بارگیری پرونده های فشرده", "0 is unlimited" => "0 نامحدود است", "Maximum input size for ZIP files" => "حداکثرمقدار برای بار گزاری پرونده های فشرده", +"Save" => "ذخیره", "New" => "جدید", "Text file" => "فایل متنی", "Folder" => "پوشه", diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index b17b542405..5cbbc83edb 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa", "Failed to write to disk" => "Levylle kirjoitus epäonnistui", "Files" => "Tiedostot", +"Unshare" => "Peru jakaminen", "Delete" => "Poista", "Rename" => "Nimeä uudelleen", "{new_name} already exists" => "{new_name} on jo olemassa", diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 1c5dfceb4f..7b332d47df 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -24,6 +24,14 @@ "Name" => "Nome", "Size" => "Tamaño", "Modified" => "Modificado", +"seconds ago" => "hai segundos", +"1 minute ago" => "hai 1 minuto", +"today" => "hoxe", +"yesterday" => "onte", +"last month" => "último mes", +"months ago" => "meses atrás", +"last year" => "último ano", +"years ago" => "anos atrás", "File handling" => "Manexo de ficheiro", "Maximum upload size" => "Tamaño máximo de envío", "max. possible: " => "máx. posible: ", diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php index 1f63978abb..fc169710df 100644 --- a/apps/files/l10n/he.php +++ b/apps/files/l10n/he.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "תיקייה זמנית חסרה", "Failed to write to disk" => "הכתיבה לכונן נכשלה", "Files" => "קבצים", +"Unshare" => "הסר שיתוף", "Delete" => "מחיקה", "generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, אנא המתן.", "Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים", @@ -17,6 +18,14 @@ "Name" => "שם", "Size" => "גודל", "Modified" => "זמן שינוי", +"seconds ago" => "שניות", +"1 minute ago" => "לפני דקה אחת", +"today" => "היום", +"yesterday" => "אתמול", +"last month" => "חודש שעבר", +"months ago" => "חודשים", +"last year" => "שנה שעברה", +"years ago" => "שנים", "File handling" => "טיפול בקבצים", "Maximum upload size" => "גודל העלאה מקסימלי", "max. possible: " => "המרבי האפשרי: ", @@ -24,6 +33,7 @@ "Enable ZIP-download" => "הפעלת הורדת ZIP", "0 is unlimited" => "0 - ללא הגבלה", "Maximum input size for ZIP files" => "גודל הקלט המרבי לקובצי ZIP", +"Save" => "שמירה", "New" => "חדש", "Text file" => "קובץ טקסט", "Folder" => "תיקייה", diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index c11469e3ed..6ded4de480 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár", "Failed to write to disk" => "Nem írható lemezre", "Files" => "Fájlok", +"Unshare" => "Nem oszt meg", "Delete" => "Törlés", "replace" => "cserél", "cancel" => "mégse", @@ -20,6 +21,14 @@ "Name" => "Név", "Size" => "Méret", "Modified" => "Módosítva", +"seconds ago" => "másodperccel ezelőtt", +"1 minute ago" => "1 perccel ezelőtt", +"today" => "ma", +"yesterday" => "tegnap", +"last month" => "múlt hónapban", +"months ago" => "hónappal ezelőtt", +"last year" => "tavaly", +"years ago" => "évvel ezelőtt", "File handling" => "Fájlkezelés", "Maximum upload size" => "Maximális feltölthető fájlméret", "max. possible: " => "max. lehetséges", @@ -27,6 +36,7 @@ "Enable ZIP-download" => "ZIP-letöltés engedélyezése", "0 is unlimited" => "0 = korlátlan", "Maximum input size for ZIP files" => "ZIP file-ok maximum mérete", +"Save" => "Mentés", "New" => "Új", "Text file" => "Szövegfájl", "Folder" => "Mappa", diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php index 21a0bb5237..bcebebc140 100644 --- a/apps/files/l10n/ia.php +++ b/apps/files/l10n/ia.php @@ -1,17 +1,20 @@ "Le file incargate solmente esseva incargate partialmente", "No file was uploaded" => "Nulle file esseva incargate", +"Missing a temporary folder" => "Manca un dossier temporari", "Files" => "Files", "Delete" => "Deler", "Name" => "Nomine", "Size" => "Dimension", "Modified" => "Modificate", "Maximum upload size" => "Dimension maxime de incargamento", +"Save" => "Salveguardar", "New" => "Nove", "Text file" => "File de texto", "Folder" => "Dossier", "Upload" => "Incargar", "Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!", +"Share" => "Compartir", "Download" => "Discargar", "Upload too large" => "Incargamento troppo longe" ); diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php index cc067bf9a1..061d28c8f7 100644 --- a/apps/files/l10n/id.php +++ b/apps/files/l10n/id.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Kehilangan folder temporer", "Failed to write to disk" => "Gagal menulis ke disk", "Files" => "Berkas", +"Unshare" => "batalkan berbagi", "Delete" => "Hapus", "replace" => "mengganti", "cancel" => "batalkan", @@ -20,6 +21,14 @@ "Name" => "Nama", "Size" => "Ukuran", "Modified" => "Dimodifikasi", +"seconds ago" => "beberapa detik yang lalu", +"1 minute ago" => "1 menit lalu", +"today" => "hari ini", +"yesterday" => "kemarin", +"last month" => "bulan kemarin", +"months ago" => "beberapa bulan lalu", +"last year" => "tahun kemarin", +"years ago" => "beberapa tahun lalu", "File handling" => "Penanganan berkas", "Maximum upload size" => "Ukuran unggah maksimum", "max. possible: " => "Kemungkinan maks:", @@ -27,6 +36,7 @@ "Enable ZIP-download" => "Aktifkan unduhan ZIP", "0 is unlimited" => "0 adalah tidak terbatas", "Maximum input size for ZIP files" => "Ukuran masukan maksimal untuk berkas ZIP", +"Save" => "simpan", "New" => "Baru", "Text file" => "Berkas teks", "Folder" => "Folder", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index 91fda49e27..c767fb43b2 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -58,6 +58,7 @@ "New" => "Nuovo", "Text file" => "File di testo", "Folder" => "Cartella", +"From link" => "Da collegamento", "Upload" => "Carica", "Cancel upload" => "Annulla invio", "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!", diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php index 896e979dc8..d2561e129d 100644 --- a/apps/files/l10n/ko.php +++ b/apps/files/l10n/ko.php @@ -27,6 +27,7 @@ "Enable ZIP-download" => "ZIP- 다운로드 허용", "0 is unlimited" => "0은 무제한 입니다", "Maximum input size for ZIP files" => "ZIP 파일에 대한 최대 입력 크기", +"Save" => "저장", "New" => "새로 만들기", "Text file" => "텍스트 파일", "Folder" => "폴더", diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php new file mode 100644 index 0000000000..3c40831b83 --- /dev/null +++ b/apps/files/l10n/ku_IQ.php @@ -0,0 +1,7 @@ + "ناو", +"Save" => "پاشکه‌وتکردن", +"Folder" => "بوخچه", +"Upload" => "بارکردن", +"Download" => "داگرتن" +); diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php index 02f546ad85..4e2ce1b1db 100644 --- a/apps/files/l10n/lb.php +++ b/apps/files/l10n/lb.php @@ -27,6 +27,7 @@ "Enable ZIP-download" => "ZIP-download erlaben", "0 is unlimited" => "0 ass onlimitéiert", "Maximum input size for ZIP files" => "Maximal Gréisst fir ZIP Fichieren", +"Save" => "Späicheren", "New" => "Nei", "Text file" => "Text Fichier", "Folder" => "Dossier", diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php index e550f6dc5e..6488ee534e 100644 --- a/apps/files/l10n/lv.php +++ b/apps/files/l10n/lv.php @@ -2,6 +2,7 @@ "No file was uploaded" => "Neviens fails netika augšuplādēts", "Failed to write to disk" => "Nav iespējams saglabāt", "Files" => "Faili", +"Unshare" => "Pārtraukt līdzdalīšanu", "Delete" => "Izdzēst", "replace" => "aizvietot", "cancel" => "atcelt", diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php index b908da2bb2..a3c43d266f 100644 --- a/apps/files/l10n/mk.php +++ b/apps/files/l10n/mk.php @@ -24,6 +24,7 @@ "Enable ZIP-download" => "Овозможи ZIP симнување ", "0 is unlimited" => "0 е неограничено", "Maximum input size for ZIP files" => "Максимална големина за внес на ZIP датотеки", +"Save" => "Сними", "New" => "Ново", "Text file" => "Текстуална датотека", "Folder" => "Папка", diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php index 1dabec18ea..35dda3d8a6 100644 --- a/apps/files/l10n/ms_MY.php +++ b/apps/files/l10n/ms_MY.php @@ -26,6 +26,7 @@ "Enable ZIP-download" => "Aktifkan muatturun ZIP", "0 is unlimited" => "0 adalah tanpa had", "Maximum input size for ZIP files" => "Saiz maksimum input untuk fail ZIP", +"Save" => "Simpan", "New" => "Baru", "Text file" => "Fail teks", "Folder" => "Folder", diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index 7af37057ce..df8dcb0e9c 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -11,6 +11,7 @@ "Size" => "Storleik", "Modified" => "Endra", "Maximum upload size" => "Maksimal opplastingsstorleik", +"Save" => "Lagre", "New" => "Ny", "Text file" => "Tekst fil", "Folder" => "Mappe", diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php index 4542396a53..078545b6d5 100644 --- a/apps/files/l10n/oc.php +++ b/apps/files/l10n/oc.php @@ -27,6 +27,7 @@ "Size" => "Talha", "Modified" => "Modificat", "seconds ago" => "secondas", +"1 minute ago" => "1 minuta a", "today" => "uèi", "yesterday" => "ièr", "last month" => "mes passat", diff --git a/apps/files/l10n/pl_PL.php b/apps/files/l10n/pl_PL.php new file mode 100644 index 0000000000..157d9a41e4 --- /dev/null +++ b/apps/files/l10n/pl_PL.php @@ -0,0 +1,3 @@ + "Zapisz" +); diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index 43f961156f..0e75196b1e 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -27,6 +27,7 @@ "Size" => "Tamanho", "Modified" => "Modificado", "seconds ago" => "segundos atrás", +"1 minute ago" => "1 minuto atrás", "today" => "hoje", "yesterday" => "ontem", "last month" => "último mês", diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index df0c4bd685..4358e64e7b 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -27,6 +27,7 @@ "Size" => "Dimensiune", "Modified" => "Modificat", "seconds ago" => "secunde în urmă", +"1 minute ago" => "1 minut în urmă", "today" => "astăzi", "yesterday" => "ieri", "last month" => "ultima lună", diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php index 7630647e9a..33d24ed74d 100644 --- a/apps/files/l10n/ru_RU.php +++ b/apps/files/l10n/ru_RU.php @@ -58,6 +58,7 @@ "New" => "Новый", "Text file" => "Текстовый файл", "Folder" => "Папка", +"From link" => "По ссылке", "Upload" => "Загрузить ", "Cancel upload" => "Отмена загрузки", "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!", diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php index 0f85061f8d..5a51f07f7c 100644 --- a/apps/files/l10n/si_LK.php +++ b/apps/files/l10n/si_LK.php @@ -6,6 +6,7 @@ "Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක", "Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි", "Files" => "ගොනු", +"Unshare" => "නොබෙදු", "Delete" => "මකන්න", "Rename" => "නැවත නම් කරන්න", "replace" => "ප්‍රතිස්ථාපනය කරන්න", @@ -18,8 +19,14 @@ "Size" => "ප්‍රමාණය", "Modified" => "වෙනස් කළ", "1 file" => "1 ගොනුවක්", +"seconds ago" => "තත්පරයන්ට පෙර", +"1 minute ago" => "1 මිනිත්තුවකට පෙර", "today" => "අද", "yesterday" => "පෙර දින", +"last month" => "පෙර මාසයේ", +"months ago" => "මාස කීපයකට පෙර", +"last year" => "පෙර අවුරුද්දේ", +"years ago" => "අවුරුදු කීපයකට පෙර", "File handling" => "ගොනු පරිහරණය", "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය", "max. possible: " => "හැකි උපරිමය:", diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php index 2b7991b3a2..a8ec32c05e 100644 --- a/apps/files/l10n/sk_SK.php +++ b/apps/files/l10n/sk_SK.php @@ -58,6 +58,7 @@ "New" => "Nový", "Text file" => "Textový súbor", "Folder" => "Priečinok", +"From link" => "Z odkazu", "Upload" => "Odoslať", "Cancel upload" => "Zrušiť odosielanie", "Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!", diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php index 99e4b12697..b61b989f33 100644 --- a/apps/files/l10n/sr.php +++ b/apps/files/l10n/sr.php @@ -11,6 +11,7 @@ "Size" => "Величина", "Modified" => "Задња измена", "Maximum upload size" => "Максимална величина пошиљке", +"Save" => "Сними", "New" => "Нови", "Text file" => "текстуални фајл", "Folder" => "фасцикла", diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php index d8c7ef1898..d5a5920b37 100644 --- a/apps/files/l10n/sr@latin.php +++ b/apps/files/l10n/sr@latin.php @@ -11,6 +11,7 @@ "Size" => "Veličina", "Modified" => "Zadnja izmena", "Maximum upload size" => "Maksimalna veličina pošiljke", +"Save" => "Snimi", "Upload" => "Pošalji", "Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!", "Download" => "Preuzmi", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index ea5cbe484f..cc9485010e 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -7,7 +7,9 @@ "Missing a temporary folder" => "Geçici bir klasör eksik", "Failed to write to disk" => "Diske yazılamadı", "Files" => "Dosyalar", +"Unshare" => "Paylaşılmayan", "Delete" => "Sil", +"Rename" => "İsim değiştir.", "replace" => "değiştir", "cancel" => "iptal", "undo" => "geri al", @@ -28,6 +30,7 @@ "Enable ZIP-download" => "ZIP indirmeyi aktif et", "0 is unlimited" => "0 limitsiz demektir", "Maximum input size for ZIP files" => "ZIP dosyaları için en fazla girdi sayısı", +"Save" => "Kaydet", "New" => "Yeni", "Text file" => "Metin dosyası", "Folder" => "Klasör", diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index d487571d70..c2c3bbd21c 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -6,6 +6,7 @@ "No file was uploaded" => "Не відвантажено жодного файлу", "Missing a temporary folder" => "Відсутній тимчасовий каталог", "Files" => "Файли", +"Unshare" => "Заборонити доступ", "Delete" => "Видалити", "undo" => "відмінити", "generating ZIP-file, it may take some time." => "Створення ZIP-файлу, це може зайняти певний час.", @@ -17,9 +18,18 @@ "Name" => "Ім'я", "Size" => "Розмір", "Modified" => "Змінено", +"seconds ago" => "секунди тому", +"1 minute ago" => "1 хвилину тому", +"today" => "сьогодні", +"yesterday" => "вчора", +"last month" => "минулого місяця", +"months ago" => "місяці тому", +"last year" => "минулого року", +"years ago" => "роки тому", "Maximum upload size" => "Максимальний розмір відвантажень", "max. possible: " => "макс.можливе:", "0 is unlimited" => "0 є безліміт", +"Save" => "Зберегти", "New" => "Створити", "Text file" => "Текстовий файл", "Folder" => "Папка", diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php index f7e76c89bd..e68efb7202 100644 --- a/apps/files/l10n/zh_CN.GB2312.php +++ b/apps/files/l10n/zh_CN.GB2312.php @@ -27,6 +27,7 @@ "Size" => "大小", "Modified" => "修改日期", "seconds ago" => "秒前", +"1 minute ago" => "1 分钟前", "today" => "今天", "yesterday" => "昨天", "last month" => "上个月", diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php index 089381bcc5..c2792d9dfb 100644 --- a/apps/files/l10n/zh_TW.php +++ b/apps/files/l10n/zh_TW.php @@ -7,7 +7,9 @@ "Missing a temporary folder" => "遺失暫存資料夾", "Failed to write to disk" => "寫入硬碟失敗", "Files" => "檔案", +"Unshare" => "取消共享", "Delete" => "刪除", +"Rename" => "重新命名", "replace" => "取代", "cancel" => "取消", "generating ZIP-file, it may take some time." => "產生壓縮檔, 它可能需要一段時間.", @@ -19,6 +21,14 @@ "Name" => "名稱", "Size" => "大小", "Modified" => "修改", +"seconds ago" => "幾秒前", +"1 minute ago" => "1 分鐘前", +"today" => "今天", +"yesterday" => "昨天", +"last month" => "上個月", +"months ago" => "幾個月前", +"last year" => "去年", +"years ago" => "幾年前", "File handling" => "檔案處理", "Maximum upload size" => "最大上傳容量", "max. possible: " => "最大允許: ", @@ -26,6 +36,7 @@ "Enable ZIP-download" => "啟用 Zip 下載", "0 is unlimited" => "0代表沒有限制", "Maximum input size for ZIP files" => "針對ZIP檔案最大輸入大小", +"Save" => "儲存", "New" => "新增", "Text file" => "文字檔", "Folder" => "資料夾", diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php index 51951c19bf..8006be1a2f 100644 --- a/apps/files_external/l10n/cs_CZ.php +++ b/apps/files_external/l10n/cs_CZ.php @@ -10,7 +10,7 @@ "Backend" => "Podpůrná vrstva", "Configuration" => "Nastavení", "Options" => "Možnosti", -"Applicable" => "Platný", +"Applicable" => "Přístupný pro", "Add mount point" => "Přidat bod připojení", "None set" => "Nenastaveno", "All Users" => "Všichni uživatelé", diff --git a/l10n/ar/files.po b/l10n/ar/files.po index d8b5c41494..3da28f2ec0 100644 --- a/l10n/ar/files.po +++ b/l10n/ar/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -241,9 +241,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "حفظ" #: templates/index.php:7 msgid "New" @@ -275,7 +275,7 @@ msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!" #: templates/index.php:52 msgid "Share" -msgstr "" +msgstr "شارك" #: templates/index.php:54 msgid "Download" diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po index 61972edfbd..505ab1c820 100644 --- a/l10n/bg_BG/files.po +++ b/l10n/bg_BG/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -242,9 +242,9 @@ msgstr "0 означава без ограничение" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Запис" #: templates/index.php:7 msgid "New" diff --git a/l10n/ca/files.po b/l10n/ca/files.po index dabe87fc29..dd41780d0d 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 14:36+0000\n" +"Last-Translator: rogerc \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -244,7 +244,7 @@ msgstr "0 és sense límit" msgid "Maximum input size for ZIP files" msgstr "Mida màxima d'entrada per fitxers ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Desa" @@ -262,7 +262,7 @@ msgstr "Carpeta" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "Des d'enllaç" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 14ec5a8c74..c644d68b52 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 07:02+0000\n" +"Last-Translator: Tomáš Chvátal \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -243,7 +243,7 @@ msgstr "0 znamená bez omezení" msgid "Maximum input size for ZIP files" msgstr "Maximální velikost vstupu pro ZIP soubory" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Uložit" @@ -261,7 +261,7 @@ msgstr "Složka" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "Z odkazu" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po index 0f20d9e72e..6fc4812bb0 100644 --- a/l10n/cs_CZ/files_external.po +++ b/l10n/cs_CZ/files_external.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-04 02:04+0200\n" -"PO-Revision-Date: 2012-10-03 08:09+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 10:04+0000\n" "Last-Translator: Tomáš Chvátal \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -67,7 +67,7 @@ msgstr "Možnosti" #: templates/settings.php:11 msgid "Applicable" -msgstr "Platný" +msgstr "Přístupný pro" #: templates/settings.php:23 msgid "Add mount point" diff --git a/l10n/da/files.po b/l10n/da/files.po index 47db19332a..06526d37e8 100644 --- a/l10n/da/files.po +++ b/l10n/da/files.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -247,7 +247,7 @@ msgstr "0 er ubegrænset" msgid "Maximum input size for ZIP files" msgstr "Maksimal størrelse på ZIP filer" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Gem" diff --git a/l10n/de/files.po b/l10n/de/files.po index 252dc6706d..99c957b5f1 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -256,7 +256,7 @@ msgstr "0 bedeutet unbegrenzt" msgid "Maximum input size for ZIP files" msgstr "Maximale Größe für ZIP-Dateien" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Speichern" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index 561d664400..17e59b57f6 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 15:31+0000\n" +"Last-Translator: a.tangemann \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -257,7 +257,7 @@ msgstr "0 bedeutet unbegrenzt" msgid "Maximum input size for ZIP files" msgstr "Maximale Größe für ZIP-Dateien" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Speichern" @@ -275,7 +275,7 @@ msgstr "Ordner" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "Von Link" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/el/files.po b/l10n/el/files.po index c048458839..c40ced8d6a 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -246,7 +246,7 @@ msgstr "0 για απεριόριστο" msgid "Maximum input size for ZIP files" msgstr "Μέγιστο μέγεθος για αρχεία ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Αποθήκευση" diff --git a/l10n/eo/files.po b/l10n/eo/files.po index 451621eadb..65dafa2cb0 100644 --- a/l10n/eo/files.po +++ b/l10n/eo/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -180,7 +180,7 @@ msgstr "sekundoj antaŭe" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "antaŭ 1 minuto" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -242,7 +242,7 @@ msgstr "0 signifas senlime" msgid "Maximum input size for ZIP files" msgstr "Maksimuma enirgrando por ZIP-dosieroj" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Konservi" diff --git a/l10n/es/files.po b/l10n/es/files.po index 8ee7d335a1..aa29e36f55 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -245,7 +245,7 @@ msgstr "0 es ilimitado" msgid "Maximum input size for ZIP files" msgstr "Tamaño máximo para archivos ZIP de entrada" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Guardar" diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index d3ce2ebb17..6c61d170a4 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -241,7 +241,7 @@ msgstr "0 significa ilimitado" msgid "Maximum input size for ZIP files" msgstr "Tamaño máximo para archivos ZIP de entrada" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Guardar" diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index 8df005349b..932d78a000 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -241,7 +241,7 @@ msgstr "0 tähendab piiramatut" msgid "Maximum input size for ZIP files" msgstr "Maksimaalne ZIP-faili sisestatava faili suurus" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Salvesta" diff --git a/l10n/eu/files.po b/l10n/eu/files.po index 925ad62c76..2e6c047681 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -180,7 +180,7 @@ msgstr "segundu" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "orain dela minutu 1" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -242,7 +242,7 @@ msgstr "0 mugarik gabe esan nahi du" msgid "Maximum input size for ZIP files" msgstr "ZIP fitxategien gehienezko tamaina" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Gorde" diff --git a/l10n/fa/files.po b/l10n/fa/files.po index 84f616431d..e343302117 100644 --- a/l10n/fa/files.po +++ b/l10n/fa/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "پاک کردن" #: js/fileactions.js:178 msgid "Rename" -msgstr "" +msgstr "تغییرنام" #: js/filelist.js:194 js/filelist.js:196 msgid "{new_name} already exists" @@ -177,11 +177,11 @@ msgstr "" #: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "ثانیه‌ها پیش" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 دقیقه پیش" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -189,11 +189,11 @@ msgstr "" #: js/files.js:843 msgid "today" -msgstr "" +msgstr "امروز" #: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "دیروز" #: js/files.js:845 msgid "{days} days ago" @@ -201,19 +201,19 @@ msgstr "" #: js/files.js:846 msgid "last month" -msgstr "" +msgstr "ماه قبل" #: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "ماه‌های قبل" #: js/files.js:849 msgid "last year" -msgstr "" +msgstr "سال قبل" #: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "سال‌های قبل" #: templates/admin.php:5 msgid "File handling" @@ -243,9 +243,9 @@ msgstr "0 نامحدود است" msgid "Maximum input size for ZIP files" msgstr "حداکثرمقدار برای بار گزاری پرونده های فشرده" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "ذخیره" #: templates/index.php:7 msgid "New" diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index 07d19b5863..7256ec6576 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgstr "Tiedostot" #: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "Peru jakaminen" #: js/fileactions.js:110 templates/index.php:66 msgid "Delete" @@ -245,7 +245,7 @@ msgstr "0 on rajoittamaton" msgid "Maximum input size for ZIP files" msgstr "ZIP-tiedostojen enimmäiskoko" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Tallenna" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index bb0fd3bb9d..83b08dcefc 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -250,7 +250,7 @@ msgstr "0 est illimité" msgid "Maximum input size for ZIP files" msgstr "Taille maximale pour les fichiers ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Sauvegarder" diff --git a/l10n/gl/files.po b/l10n/gl/files.po index cd7779e287..3172e4823f 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -176,11 +176,11 @@ msgstr "" #: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "hai segundos" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "hai 1 minuto" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -188,11 +188,11 @@ msgstr "" #: js/files.js:843 msgid "today" -msgstr "" +msgstr "hoxe" #: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "onte" #: js/files.js:845 msgid "{days} days ago" @@ -200,19 +200,19 @@ msgstr "" #: js/files.js:846 msgid "last month" -msgstr "" +msgstr "último mes" #: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "meses atrás" #: js/files.js:849 msgid "last year" -msgstr "" +msgstr "último ano" #: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "anos atrás" #: templates/admin.php:5 msgid "File handling" @@ -242,7 +242,7 @@ msgstr "0 significa ilimitado" msgid "Maximum input size for ZIP files" msgstr "Tamaño máximo de descarga para os ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Gardar" diff --git a/l10n/he/files.po b/l10n/he/files.po index 74ea193057..e58ddbe0b7 100644 --- a/l10n/he/files.po +++ b/l10n/he/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -57,7 +57,7 @@ msgstr "קבצים" #: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "הסר שיתוף" #: js/fileactions.js:110 templates/index.php:66 msgid "Delete" @@ -178,11 +178,11 @@ msgstr "" #: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "שניות" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "לפני דקה אחת" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -190,11 +190,11 @@ msgstr "" #: js/files.js:843 msgid "today" -msgstr "" +msgstr "היום" #: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "אתמול" #: js/files.js:845 msgid "{days} days ago" @@ -202,19 +202,19 @@ msgstr "" #: js/files.js:846 msgid "last month" -msgstr "" +msgstr "חודש שעבר" #: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "חודשים" #: js/files.js:849 msgid "last year" -msgstr "" +msgstr "שנה שעברה" #: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "שנים" #: templates/admin.php:5 msgid "File handling" @@ -244,9 +244,9 @@ msgstr "0 - ללא הגבלה" msgid "Maximum input size for ZIP files" msgstr "גודל הקלט המרבי לקובצי ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "שמירה" #: templates/index.php:7 msgid "New" diff --git a/l10n/hi/files.po b/l10n/hi/files.po index d488b233e7..6119f82e0f 100644 --- a/l10n/hi/files.po +++ b/l10n/hi/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -240,7 +240,7 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "" diff --git a/l10n/hr/files.po b/l10n/hr/files.po index 3b8200377c..df12af3629 100644 --- a/l10n/hr/files.po +++ b/l10n/hr/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -243,7 +243,7 @@ msgstr "0 je \"bez limita\"" msgid "Maximum input size for ZIP files" msgstr "Maksimalna veličina za ZIP datoteke" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Snimi" diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index a35e1a6410..687536d74b 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "Fájlok" #: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "Nem oszt meg" #: js/fileactions.js:110 templates/index.php:66 msgid "Delete" @@ -177,11 +177,11 @@ msgstr "" #: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "másodperccel ezelőtt" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 perccel ezelőtt" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -189,11 +189,11 @@ msgstr "" #: js/files.js:843 msgid "today" -msgstr "" +msgstr "ma" #: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "tegnap" #: js/files.js:845 msgid "{days} days ago" @@ -201,19 +201,19 @@ msgstr "" #: js/files.js:846 msgid "last month" -msgstr "" +msgstr "múlt hónapban" #: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "hónappal ezelőtt" #: js/files.js:849 msgid "last year" -msgstr "" +msgstr "tavaly" #: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "évvel ezelőtt" #: templates/admin.php:5 msgid "File handling" @@ -243,9 +243,9 @@ msgstr "0 = korlátlan" msgid "Maximum input size for ZIP files" msgstr "ZIP file-ok maximum mérete" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Mentés" #: templates/index.php:7 msgid "New" diff --git a/l10n/ia/files.po b/l10n/ia/files.po index b93beceba3..410ed06336 100644 --- a/l10n/ia/files.po +++ b/l10n/ia/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -43,7 +43,7 @@ msgstr "Nulle file esseva incargate" #: ajax/upload.php:25 msgid "Missing a temporary folder" -msgstr "" +msgstr "Manca un dossier temporari" #: ajax/upload.php:26 msgid "Failed to write to disk" @@ -242,9 +242,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Salveguardar" #: templates/index.php:7 msgid "New" @@ -276,7 +276,7 @@ msgstr "Nihil hic. Incarga alcun cosa!" #: templates/index.php:52 msgid "Share" -msgstr "" +msgstr "Compartir" #: templates/index.php:54 msgid "Download" diff --git a/l10n/id/files.po b/l10n/id/files.po index e7f641023b..2d22dd4a21 100644 --- a/l10n/id/files.po +++ b/l10n/id/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "Berkas" #: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "batalkan berbagi" #: js/fileactions.js:110 templates/index.php:66 msgid "Delete" @@ -177,11 +177,11 @@ msgstr "" #: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "beberapa detik yang lalu" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 menit lalu" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -189,11 +189,11 @@ msgstr "" #: js/files.js:843 msgid "today" -msgstr "" +msgstr "hari ini" #: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "kemarin" #: js/files.js:845 msgid "{days} days ago" @@ -201,19 +201,19 @@ msgstr "" #: js/files.js:846 msgid "last month" -msgstr "" +msgstr "bulan kemarin" #: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "beberapa bulan lalu" #: js/files.js:849 msgid "last year" -msgstr "" +msgstr "tahun kemarin" #: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "beberapa tahun lalu" #: templates/admin.php:5 msgid "File handling" @@ -243,9 +243,9 @@ msgstr "0 adalah tidak terbatas" msgid "Maximum input size for ZIP files" msgstr "Ukuran masukan maksimal untuk berkas ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "simpan" #: templates/index.php:7 msgid "New" diff --git a/l10n/it/files.po b/l10n/it/files.po index 07615b478b..ab99f37548 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 15:47+0000\n" +"Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -244,7 +244,7 @@ msgstr "0 è illimitato" msgid "Maximum input size for ZIP files" msgstr "Dimensione massima per i file ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Salva" @@ -262,7 +262,7 @@ msgstr "Cartella" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "Da collegamento" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index 254d4021dd..6d3d13e435 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -242,7 +242,7 @@ msgstr "0を指定した場合は無制限" msgid "Maximum input size for ZIP files" msgstr "ZIPファイルへの最大入力サイズ" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "保存" diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po index 7b44cf8e7e..5a373fe3eb 100644 --- a/l10n/ka_GE/files.po +++ b/l10n/ka_GE/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -241,7 +241,7 @@ msgstr "0 is unlimited" msgid "Maximum input size for ZIP files" msgstr "ZIP ფაილების მაქსიმუმ დასაშვები ზომა" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "შენახვა" diff --git a/l10n/ko/files.po b/l10n/ko/files.po index c569308061..8777987b8f 100644 --- a/l10n/ko/files.po +++ b/l10n/ko/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -242,9 +242,9 @@ msgstr "0은 무제한 입니다" msgid "Maximum input size for ZIP files" msgstr "ZIP 파일에 대한 최대 입력 크기" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "저장" #: templates/index.php:7 msgid "New" diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po index 039d74c3e9..5d550551e7 100644 --- a/l10n/ku_IQ/files.po +++ b/l10n/ku_IQ/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr "" #: js/files.js:754 templates/index.php:50 msgid "Name" -msgstr "" +msgstr "ناو" #: js/files.js:755 templates/index.php:58 msgid "Size" @@ -240,9 +240,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "پاشکه‌وتکردن" #: templates/index.php:7 msgid "New" @@ -254,7 +254,7 @@ msgstr "" #: templates/index.php:10 msgid "Folder" -msgstr "" +msgstr "بوخچه" #: templates/index.php:11 msgid "From link" @@ -262,7 +262,7 @@ msgstr "" #: templates/index.php:22 msgid "Upload" -msgstr "" +msgstr "بارکردن" #: templates/index.php:29 msgid "Cancel upload" @@ -278,7 +278,7 @@ msgstr "" #: templates/index.php:54 msgid "Download" -msgstr "" +msgstr "داگرتن" #: templates/index.php:77 msgid "Upload too large" diff --git a/l10n/lb/files.po b/l10n/lb/files.po index 170b68fe69..cd6a9459f5 100644 --- a/l10n/lb/files.po +++ b/l10n/lb/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -241,9 +241,9 @@ msgstr "0 ass onlimitéiert" msgid "Maximum input size for ZIP files" msgstr "Maximal Gréisst fir ZIP Fichieren" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Späicheren" #: templates/index.php:7 msgid "New" diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po index 8e0e2a183e..f466d59c9e 100644 --- a/l10n/lt_LT/files.po +++ b/l10n/lt_LT/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -243,7 +243,7 @@ msgstr "0 yra neribotas" msgid "Maximum input size for ZIP files" msgstr "Maksimalus ZIP archyvo failo dydis" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Išsaugoti" diff --git a/l10n/lv/files.po b/l10n/lv/files.po index cdc797bd26..9dc008526b 100644 --- a/l10n/lv/files.po +++ b/l10n/lv/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "Faili" #: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "Pārtraukt līdzdalīšanu" #: js/fileactions.js:110 templates/index.php:66 msgid "Delete" @@ -241,7 +241,7 @@ msgstr "0 ir neierobežots" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "" diff --git a/l10n/mk/files.po b/l10n/mk/files.po index 843115ed05..1351f615bc 100644 --- a/l10n/mk/files.po +++ b/l10n/mk/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -243,9 +243,9 @@ msgstr "0 е неограничено" msgid "Maximum input size for ZIP files" msgstr "Максимална големина за внес на ZIP датотеки" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Сними" #: templates/index.php:7 msgid "New" diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po index e5a498dc70..f6c25f2fdf 100644 --- a/l10n/ms_MY/files.po +++ b/l10n/ms_MY/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -244,9 +244,9 @@ msgstr "0 adalah tanpa had" msgid "Maximum input size for ZIP files" msgstr "Saiz maksimum input untuk fail ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Simpan" #: templates/index.php:7 msgid "New" diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po index 06eeaf0877..07c943e605 100644 --- a/l10n/nb_NO/files.po +++ b/l10n/nb_NO/files.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -248,7 +248,7 @@ msgstr "0 er ubegrenset" msgid "Maximum input size for ZIP files" msgstr "Maksimal størrelse på ZIP-filer" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Lagre" diff --git a/l10n/nl/files.po b/l10n/nl/files.po index 96ddd103f5..a8f011493e 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -249,7 +249,7 @@ msgstr "0 is ongelimiteerd" msgid "Maximum input size for ZIP files" msgstr "Maximale grootte voor ZIP bestanden" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Opslaan" diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po index 371c83f97d..5d0cb29c91 100644 --- a/l10n/nn_NO/files.po +++ b/l10n/nn_NO/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -242,9 +242,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Lagre" #: templates/index.php:7 msgid "New" diff --git a/l10n/oc/files.po b/l10n/oc/files.po index 2a5ad4ee0d..9011a3c8ed 100644 --- a/l10n/oc/files.po +++ b/l10n/oc/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -179,7 +179,7 @@ msgstr "secondas" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 minuta a" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -241,7 +241,7 @@ msgstr "0 es pas limitat" msgid "Maximum input size for ZIP files" msgstr "Talha maximum de dintrada per fichièrs ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Enregistra" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index 5291f8f9c7..bc007cff9c 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -246,7 +246,7 @@ msgstr "0 jest nielimitowane" msgid "Maximum input size for ZIP files" msgstr "Maksymalna wielkość pliku wejściowego ZIP " -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Zapisz" diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po index 7d6b27e446..eb216aaa96 100644 --- a/l10n/pl_PL/files.po +++ b/l10n/pl_PL/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n" "MIME-Version: 1.0\n" @@ -240,9 +240,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Zapisz" #: templates/index.php:7 msgid "New" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 10dd8bd07c..8dac2acdea 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -184,7 +184,7 @@ msgstr "segundos atrás" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 minuto atrás" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -246,7 +246,7 @@ msgstr "0 para ilimitado" msgid "Maximum input size for ZIP files" msgstr "Tamanho máximo para arquivo ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Salvar" diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index a9bd185b25..f14ef7f6f2 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -244,7 +244,7 @@ msgstr "0 é ilimitado" msgid "Maximum input size for ZIP files" msgstr "Tamanho máximo para ficheiros ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Guardar" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index 3e81f72821..27425ca496 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -182,7 +182,7 @@ msgstr "secunde în urmă" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 minut în urmă" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -244,7 +244,7 @@ msgstr "0 e nelimitat" msgid "Maximum input size for ZIP files" msgstr "Dimensiunea maximă de intrare pentru fișiere compresate" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Salvare" diff --git a/l10n/ru/files.po b/l10n/ru/files.po index 9ff48761b6..6787003dd3 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -248,7 +248,7 @@ msgstr "0 - без ограничений" msgid "Maximum input size for ZIP files" msgstr "Максимальный исходный размер для ZIP файлов" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Сохранить" diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po index f2be10f7f5..4936c09747 100644 --- a/l10n/ru_RU/files.po +++ b/l10n/ru_RU/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 06:33+0000\n" +"Last-Translator: AnnaSch \n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -242,7 +242,7 @@ msgstr "0 без ограничений" msgid "Maximum input size for ZIP files" msgstr "Максимальный размер входящих ZIP-файлов " -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Сохранить" @@ -260,7 +260,7 @@ msgstr "Папка" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "По ссылке" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po index 6bcc7c60ad..73fafd1774 100644 --- a/l10n/si_LK/files.po +++ b/l10n/si_LK/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "ගොනු" #: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "නොබෙදු" #: js/fileactions.js:110 templates/index.php:66 msgid "Delete" @@ -176,11 +176,11 @@ msgstr "" #: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "තත්පරයන්ට පෙර" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 මිනිත්තුවකට පෙර" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -200,19 +200,19 @@ msgstr "" #: js/files.js:846 msgid "last month" -msgstr "" +msgstr "පෙර මාසයේ" #: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "මාස කීපයකට පෙර" #: js/files.js:849 msgid "last year" -msgstr "" +msgstr "පෙර අවුරුද්දේ" #: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "අවුරුදු කීපයකට පෙර" #: templates/admin.php:5 msgid "File handling" @@ -242,7 +242,7 @@ msgstr "0 යනු සීමාවක් නැති බවය" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "සුරකින්න" diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po index 805d6669dd..222a90cb0a 100644 --- a/l10n/sk_SK/files.po +++ b/l10n/sk_SK/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 08:24+0000\n" +"Last-Translator: Roman Priesol \n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -243,7 +243,7 @@ msgstr "0 znamená neobmedzené" msgid "Maximum input size for ZIP files" msgstr "Najväčšia veľkosť ZIP súborov" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Uložiť" @@ -261,7 +261,7 @@ msgstr "Priečinok" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "Z odkazu" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index e585010a2e..67faee7d81 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -244,7 +244,7 @@ msgstr "0 je neskončno" msgid "Maximum input size for ZIP files" msgstr "Največja vhodna velikost za datoteke ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Shrani" diff --git a/l10n/sr/files.po b/l10n/sr/files.po index 0e27f11489..03853ba2f9 100644 --- a/l10n/sr/files.po +++ b/l10n/sr/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -241,9 +241,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Сними" #: templates/index.php:7 msgid "New" diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po index 405febf6b6..e51bae6564 100644 --- a/l10n/sr@latin/files.po +++ b/l10n/sr@latin/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -241,9 +241,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Snimi" #: templates/index.php:7 msgid "New" diff --git a/l10n/sv/files.po b/l10n/sv/files.po index c44dae38f3..2f03026cd5 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -246,7 +246,7 @@ msgstr "0 är oändligt" msgid "Maximum input size for ZIP files" msgstr "Största tillåtna storlek för ZIP-filer" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Spara" diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po index b360e8437e..d085f8c045 100644 --- a/l10n/ta_LK/files.po +++ b/l10n/ta_LK/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -241,7 +241,7 @@ msgstr "0 ஆனது எல்லையற்றது" msgid "Maximum input size for ZIP files" msgstr "ZIP கோப்புகளுக்கான ஆகக்கூடிய உள்ளீட்டு அளவு" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "சேமிக்க" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 422291bc93..eefb79192d 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-02 00:04+0100\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 4a422814cf..a12f37ae83 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -240,7 +240,7 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 190d884e10..3b8956f0d4 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index bd8c8a10ad..3a24eccf9c 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 1a1ec78c48..0b89a27ab9 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index a4cf543dd1..85c6ceedd4 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 7a3adb98e7..cd757ced24 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-02 00:04+0100\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 44407fd793..acbbb84dce 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-02 00:04+0100\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 57dd193f1f..4c9526cf15 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-02 00:04+0100\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po index a68d313c40..24619bfb1d 100644 --- a/l10n/th_TH/files.po +++ b/l10n/th_TH/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -242,7 +242,7 @@ msgstr "0 หมายถึงไม่จำกัด" msgid "Maximum input size for ZIP files" msgstr "ขนาดไฟล์ ZIP สูงสุด" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "บันทึก" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index d8b67bc960..5744ead193 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -57,7 +57,7 @@ msgstr "Dosyalar" #: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "Paylaşılmayan" #: js/fileactions.js:110 templates/index.php:66 msgid "Delete" @@ -65,7 +65,7 @@ msgstr "Sil" #: js/fileactions.js:178 msgid "Rename" -msgstr "" +msgstr "İsim değiştir." #: js/filelist.js:194 js/filelist.js:196 msgid "{new_name} already exists" @@ -244,9 +244,9 @@ msgstr "0 limitsiz demektir" msgid "Maximum input size for ZIP files" msgstr "ZIP dosyaları için en fazla girdi sayısı" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Kaydet" #: templates/index.php:7 msgid "New" diff --git a/l10n/uk/files.po b/l10n/uk/files.po index 6db967a86b..6f1a92f33f 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "Файли" #: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "Заборонити доступ" #: js/fileactions.js:110 templates/index.php:66 msgid "Delete" @@ -176,11 +176,11 @@ msgstr "" #: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "секунди тому" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 хвилину тому" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -188,11 +188,11 @@ msgstr "" #: js/files.js:843 msgid "today" -msgstr "" +msgstr "сьогодні" #: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "вчора" #: js/files.js:845 msgid "{days} days ago" @@ -200,19 +200,19 @@ msgstr "" #: js/files.js:846 msgid "last month" -msgstr "" +msgstr "минулого місяця" #: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "місяці тому" #: js/files.js:849 msgid "last year" -msgstr "" +msgstr "минулого року" #: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "роки тому" #: templates/admin.php:5 msgid "File handling" @@ -242,9 +242,9 @@ msgstr "0 є безліміт" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Зберегти" #: templates/index.php:7 msgid "New" diff --git a/l10n/vi/files.po b/l10n/vi/files.po index ee219a7139..24a6c71c50 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -243,7 +243,7 @@ msgstr "0 là không giới hạn" msgid "Maximum input size for ZIP files" msgstr "Kích thước tối đa cho các tập tin ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Lưu" diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po index 1ee005f990..a2aa788e89 100644 --- a/l10n/zh_CN.GB2312/files.po +++ b/l10n/zh_CN.GB2312/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" @@ -180,7 +180,7 @@ msgstr "秒前" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 分钟前" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -242,7 +242,7 @@ msgstr "0是无限的" msgid "Maximum input size for ZIP files" msgstr "最大的ZIP文件输入大小" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "保存" diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index d7e773d146..7d7a5fcbd8 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -244,7 +244,7 @@ msgstr "0 为无限制" msgid "Maximum input size for ZIP files" msgstr "ZIP 文件的最大输入大小" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "保存" diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po index 3e563fa7de..52c48f4062 100644 --- a/l10n/zh_TW/files.po +++ b/l10n/zh_TW/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:03+0100\n" -"PO-Revision-Date: 2012-11-01 23:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "檔案" #: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "取消共享" #: js/fileactions.js:110 templates/index.php:66 msgid "Delete" @@ -64,7 +64,7 @@ msgstr "刪除" #: js/fileactions.js:178 msgid "Rename" -msgstr "" +msgstr "重新命名" #: js/filelist.js:194 js/filelist.js:196 msgid "{new_name} already exists" @@ -177,11 +177,11 @@ msgstr "" #: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "幾秒前" #: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 分鐘前" #: js/files.js:840 msgid "{minutes} minutes ago" @@ -189,11 +189,11 @@ msgstr "" #: js/files.js:843 msgid "today" -msgstr "" +msgstr "今天" #: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "昨天" #: js/files.js:845 msgid "{days} days ago" @@ -201,19 +201,19 @@ msgstr "" #: js/files.js:846 msgid "last month" -msgstr "" +msgstr "上個月" #: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "幾個月前" #: js/files.js:849 msgid "last year" -msgstr "" +msgstr "去年" #: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "幾年前" #: templates/admin.php:5 msgid "File handling" @@ -243,9 +243,9 @@ msgstr "0代表沒有限制" msgid "Maximum input size for ZIP files" msgstr "針對ZIP檔案最大輸入大小" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "儲存" #: templates/index.php:7 msgid "New" From 503922ff6cd6d80c9c5cdd58925d76de00d2f311 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 3 Nov 2012 00:10:21 +0100 Subject: [PATCH 07/12] some tests for the file blacklist --- tests/lib/filesystem.php | 52 +++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php index e22b3f1c0d..07c25e1498 100644 --- a/tests/lib/filesystem.php +++ b/tests/lib/filesystem.php @@ -24,7 +24,7 @@ class Test_Filesystem extends UnitTestCase { /** * @var array tmpDirs */ - private $tmpDirs=array(); + private $tmpDirs = array(); /** * @return array @@ -72,21 +72,55 @@ class Test_Filesystem extends UnitTestCase { } } - public function testHooks() { - if(OC_Filesystem::getView()){ + public function testBlacklist() { + OC_Hook::clear('OC_Filesystem'); + OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted'); + OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); + + $run = true; + OC_Hook::emit( + OC_Filesystem::CLASSNAME, + OC_Filesystem::signal_write, + array( + OC_Filesystem::signal_param_path => '/test/.htaccess', + OC_Filesystem::signal_param_run => &$run + ) + ); + $this->assertFalse($run); + + if (OC_Filesystem::getView()) { $user = OC_User::getUser(); - }else{ - $user=uniqid(); - OC_Filesystem::init('/'.$user.'/files'); + } else { + $user = uniqid(); + OC_Filesystem::init('/' . $user . '/files'); + } + + OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/'); + + $rootView = new OC_FilesystemView(''); + $rootView->mkdir('/' . $user); + $rootView->mkdir('/' . $user . '/files'); + + $this->assertFalse(OC_Filesystem::file_put_contents('/.htaccess', 'foo')); + $fh = fopen(__FILE__, 'r'); + $this->assertFalse(OC_Filesystem::file_put_contents('/.htaccess', $fh)); + } + + public function testHooks() { + if (OC_Filesystem::getView()) { + $user = OC_User::getUser(); + } else { + $user = uniqid(); + OC_Filesystem::init('/' . $user . '/files'); } OC_Hook::clear('OC_Filesystem'); OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook'); OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/'); - $rootView=new OC_FilesystemView(''); - $rootView->mkdir('/'.$user); - $rootView->mkdir('/'.$user.'/files'); + $rootView = new OC_FilesystemView(''); + $rootView->mkdir('/' . $user); + $rootView->mkdir('/' . $user . '/files'); OC_Filesystem::file_put_contents('/foo', 'foo'); OC_Filesystem::mkdir('/bar'); From 4c0c78d15deac7bc53c1bf0e967972ac7e9525f4 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 3 Nov 2012 00:21:10 +0100 Subject: [PATCH 08/12] check for filename blacklist in OC_Filesystem::isValidPath --- lib/filesystem.php | 15 ++++++++++----- tests/lib/filesystem.php | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/filesystem.php b/lib/filesystem.php index 79bce2c6d0..852290e62a 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -403,6 +403,9 @@ class OC_Filesystem{ if(strstr($path, '/../') || strrchr($path, '/') === '/..' ) { return false; } + if(self::isFileBlacklisted($path)){ + return false; + } return true; } @@ -412,20 +415,22 @@ class OC_Filesystem{ * @param array $data from hook */ static public function isBlacklisted($data) { - $blacklist = array('.htaccess'); if (isset($data['path'])) { $path = $data['path']; } else if (isset($data['newpath'])) { $path = $data['newpath']; } if (isset($path)) { - $filename = strtolower(basename($path)); - if (in_array($filename, $blacklist)) { - $data['run'] = false; - } + $data['run'] = !self::isFileBlacklisted($path); } } + static public function isFileBlacklisted($path){ + $blacklist = array('.htaccess'); + $filename = strtolower(basename($path)); + return in_array($filename, $blacklist); + } + /** * following functions are equivilent to their php buildin equivilents for arguments/return values. */ diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php index 07c25e1498..0008336383 100644 --- a/tests/lib/filesystem.php +++ b/tests/lib/filesystem.php @@ -101,6 +101,7 @@ class Test_Filesystem extends UnitTestCase { $rootView->mkdir('/' . $user); $rootView->mkdir('/' . $user . '/files'); + $this->assertFalse($rootView->file_put_contents('/.htaccess', 'foo')); $this->assertFalse(OC_Filesystem::file_put_contents('/.htaccess', 'foo')); $fh = fopen(__FILE__, 'r'); $this->assertFalse(OC_Filesystem::file_put_contents('/.htaccess', $fh)); From 17d466b03b91ccc058fe1a88340df36c22a580c2 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 4 Nov 2012 00:01:42 +0100 Subject: [PATCH 09/12] [tx-robot] updated from transifex --- apps/files/l10n/de.php | 1 + apps/files/l10n/de_DE.php | 2 +- apps/files/l10n/es.php | 1 + apps/files/l10n/fr.php | 1 + apps/files/l10n/pt_BR.php | 14 ++++++++++++ apps/files/l10n/sv.php | 1 + core/l10n/de.php | 2 ++ core/l10n/fr.php | 5 +++++ core/l10n/pt_BR.php | 11 ++++++++- l10n/de/core.po | 8 +++---- l10n/de/files.po | 8 +++---- l10n/de_DE/files.po | 8 +++---- l10n/es/files.po | 9 ++++---- l10n/fr/core.po | 26 ++++++++++----------- l10n/fr/files.po | 8 +++---- l10n/pt_BR/core.po | 35 +++++++++++++++-------------- l10n/pt_BR/files.po | 35 +++++++++++++++-------------- l10n/pt_BR/lib.po | 29 ++++++++++++------------ l10n/sv/files.po | 8 +++---- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- lib/l10n/pt_BR.php | 1 + 29 files changed, 135 insertions(+), 96 deletions(-) diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index f0c2f56a86..f27565398b 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -58,6 +58,7 @@ "New" => "Neu", "Text file" => "Textdatei", "Folder" => "Ordner", +"From link" => "Von einem Link", "Upload" => "Hochladen", "Cancel upload" => "Upload abbrechen", "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 7e4c1887ce..be8f83c0fc 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -58,7 +58,7 @@ "New" => "Neu", "Text file" => "Textdatei", "Folder" => "Ordner", -"From link" => "Von Link", +"From link" => "Von einem Link", "Upload" => "Hochladen", "Cancel upload" => "Upload abbrechen", "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!", diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index 8a33768146..04cf10f96b 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -58,6 +58,7 @@ "New" => "Nuevo", "Text file" => "Archivo de texto", "Folder" => "Carpeta", +"From link" => "Desde el enlace", "Upload" => "Subir", "Cancel upload" => "Cancelar subida", "Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index aa63dbb054..3068eb9274 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -58,6 +58,7 @@ "New" => "Nouveau", "Text file" => "Fichier texte", "Folder" => "Dossier", +"From link" => "Depuis le lien", "Upload" => "Envoyer", "Cancel upload" => "Annuler l'envoi", "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index 0e75196b1e..31de3f6e60 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -10,26 +10,39 @@ "Unshare" => "Descompartilhar", "Delete" => "Excluir", "Rename" => "Renomear", +"{new_name} already exists" => "{new_name} já existe", "replace" => "substituir", "suggest name" => "sugerir nome", "cancel" => "cancelar", +"replaced {new_name}" => "substituído {new_name}", "undo" => "desfazer", +"replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ", +"unshared {files}" => "{files} não compartilhados", +"deleted {files}" => "{files} apagados", "generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.", "Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.", "Upload Error" => "Erro de envio", "Pending" => "Pendente", "1 file uploading" => "enviando 1 arquivo", +"{count} files uploading" => "Enviando {count} arquivos", "Upload cancelled." => "Envio cancelado.", "File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.", "Invalid name, '/' is not allowed." => "Nome inválido, '/' não é permitido.", +"{count} files scanned" => "{count} arquivos scaneados", "error while scanning" => "erro durante verificação", "Name" => "Nome", "Size" => "Tamanho", "Modified" => "Modificado", +"1 folder" => "1 pasta", +"{count} folders" => "{count} pastas", +"1 file" => "1 arquivo", +"{count} files" => "{count} arquivos", "seconds ago" => "segundos atrás", "1 minute ago" => "1 minuto atrás", +"{minutes} minutes ago" => "{minutes} minutos atrás", "today" => "hoje", "yesterday" => "ontem", +"{days} days ago" => "{days} dias atrás", "last month" => "último mês", "months ago" => "meses atrás", "last year" => "último ano", @@ -45,6 +58,7 @@ "New" => "Novo", "Text file" => "Arquivo texto", "Folder" => "Pasta", +"From link" => "Do link", "Upload" => "Carregar", "Cancel upload" => "Cancelar upload", "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!", diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index d58ba61be3..eaf16242ef 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -58,6 +58,7 @@ "New" => "Ny", "Text file" => "Textfil", "Folder" => "Mapp", +"From link" => "Från länk", "Upload" => "Ladda upp", "Cancel upload" => "Avbryt uppladdning", "Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!", diff --git a/core/l10n/de.php b/core/l10n/de.php index 5382d1cc64..2e76128051 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -38,6 +38,8 @@ "ownCloud password reset" => "ownCloud-Passwort zurücksetzen", "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}", "You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.", +"Reset email send." => "Die E-Mail zum Zurücksetzen wurde versendet.", +"Request failed!" => "Die Anfrage schlug fehl!", "Username" => "Benutzername", "Request reset" => "Beantrage Zurücksetzung", "Your password was reset" => "Dein Passwort wurde zurückgesetzt.", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 597f58172d..cdddea02b3 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -13,6 +13,8 @@ "Error while sharing" => "Erreur lors de la mise en partage", "Error while unsharing" => "Erreur lors de l'annulation du partage", "Error while changing permissions" => "Erreur lors du changement des permissions", +"Shared with you and the group {group} by {owner}" => "Partagé par {owner} avec vous et le groupe {group}", +"Shared with you by {owner}" => "Partagé avec vous par {owner}", "Share with" => "Partager avec", "Share with link" => "Partager via lien", "Password protect" => "Protéger par un mot de passe", @@ -22,6 +24,7 @@ "Share via email:" => "Partager via e-mail :", "No people found" => "Aucun utilisateur trouvé", "Resharing is not allowed" => "Le repartage n'est pas autorisé", +"Shared in {item} with {user}" => "Partagé dans {item} avec {user}", "Unshare" => "Ne plus partager", "can edit" => "édition autorisée", "access control" => "contrôle des accès", @@ -35,6 +38,8 @@ "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud", "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}", "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.", +"Reset email send." => "Mail de réinitialisation envoyé.", +"Request failed!" => "La requête a échoué !", "Username" => "Nom d'utilisateur", "Request reset" => "Demander la réinitialisation", "Your password was reset" => "Votre mot de passe a été réinitialisé", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index f40328407f..f51c1a94c2 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -13,6 +13,8 @@ "Error while sharing" => "Erro ao compartilhar", "Error while unsharing" => "Erro ao descompartilhar", "Error while changing permissions" => "Erro ao mudar permissões", +"Shared with you and the group {group} by {owner}" => "Compartilhado com você e com o grupo {group} por {owner}", +"Shared with you by {owner}" => "Compartilhado com você por {owner}", "Share with" => "Compartilhar com", "Share with link" => "Compartilhar com link", "Password protect" => "Proteger com senha", @@ -22,6 +24,7 @@ "Share via email:" => "Compartilhar via e-mail:", "No people found" => "Nenhuma pessoa encontrada", "Resharing is not allowed" => "Não é permitido re-compartilhar", +"Shared in {item} with {user}" => "Compartilhado em {item} com {user}", "Unshare" => "Descompartilhar", "can edit" => "pode editar", "access control" => "controle de acesso", @@ -35,6 +38,8 @@ "ownCloud password reset" => "Redefinir senha ownCloud", "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}", "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.", +"Reset email send." => "Email de redefinição de senha enviado.", +"Request failed!" => "A requisição falhou!", "Username" => "Nome de Usuário", "Request reset" => "Pedido de reposição", "Your password was reset" => "Sua senha foi mudada", @@ -86,6 +91,8 @@ "December" => "Dezembro", "web services under your control" => "web services sob seu controle", "Log out" => "Sair", +"Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!", +"If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!", "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.", "Lost your password?" => "Esqueçeu sua senha?", "remember" => "lembrete", @@ -93,5 +100,7 @@ "You are logged out." => "Você está desconectado.", "prev" => "anterior", "next" => "próximo", -"Security Warning!" => "Aviso de Segurança!" +"Security Warning!" => "Aviso de Segurança!", +"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Por favor, verifique a sua senha.
Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente.", +"Verify" => "Verificar" ); diff --git a/l10n/de/core.po b/l10n/de/core.po index 8346ee269e..4c9b9f4f27 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-02 00:04+0100\n" -"PO-Revision-Date: 2012-10-31 23:02+0000\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 23:38+0000\n" "Last-Translator: Mirodin \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -191,11 +191,11 @@ msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen." #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Die E-Mail zum Zurücksetzen wurde versendet." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Die Anfrage schlug fehl!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/de/files.po b/l10n/de/files.po index 99c957b5f1..9967d57d54 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -23,9 +23,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" -"PO-Revision-Date: 2012-11-01 23:21+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 00:03+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -274,7 +274,7 @@ msgstr "Ordner" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "Von einem Link" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index 17e59b57f6..ab1bb852bf 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" -"PO-Revision-Date: 2012-11-02 15:31+0000\n" -"Last-Translator: a.tangemann \n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 23:50+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -275,7 +275,7 @@ msgstr "Ordner" #: templates/index.php:11 msgid "From link" -msgstr "Von Link" +msgstr "Von einem Link" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/es/files.po b/l10n/es/files.po index aa29e36f55..f94f8b1e31 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # Javier Llorente , 2012. # , 2012. # Rubén Trujillo , 2012. @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" -"PO-Revision-Date: 2012-11-01 23:21+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 20:10+0000\n" +"Last-Translator: Luis Medina \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -263,7 +264,7 @@ msgstr "Carpeta" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "Desde el enlace" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 1aa23fd854..42ff195cc9 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 11:37+0000\n" +"Last-Translator: Romain DEP. \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,23 +41,23 @@ msgstr "Cette catégorie existe déjà : " msgid "Settings" msgstr "Paramètres" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "Choisir" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "Annuler" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "Non" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "Oui" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "Ok" @@ -84,11 +84,11 @@ msgstr "Erreur lors du changement des permissions" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "Partagé par {owner} avec vous et le groupe {group}" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Partagé avec vous par {owner}" #: js/share.js:158 msgid "Share with" @@ -129,7 +129,7 @@ msgstr "Le repartage n'est pas autorisé" #: js/share.js:271 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "Partagé dans {item} avec {user}" #: js/share.js:292 msgid "Unshare" @@ -185,11 +185,11 @@ msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votr #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Mail de réinitialisation envoyé." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "La requête a échoué !" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/fr/files.po b/l10n/fr/files.po index 83b08dcefc..dbfd621a75 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" -"PO-Revision-Date: 2012-11-01 23:21+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 11:39+0000\n" +"Last-Translator: Romain DEP. \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -268,7 +268,7 @@ msgstr "Dossier" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "Depuis le lien" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index b6c4847571..02e4283a1b 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/core.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # , 2011. # Guilherme Maluf Balzana , 2012. # , 2012. @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 14:28+0000\n" +"Last-Translator: dudanogueira \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,23 +41,23 @@ msgstr "Essa categoria já existe" msgid "Settings" msgstr "Configurações" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "Escolha" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "Não" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "Sim" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "Ok" @@ -83,11 +84,11 @@ msgstr "Erro ao mudar permissões" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "Compartilhado com você e com o grupo {group} por {owner}" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Compartilhado com você por {owner}" #: js/share.js:158 msgid "Share with" @@ -128,7 +129,7 @@ msgstr "Não é permitido re-compartilhar" #: js/share.js:271 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "Compartilhado em {item} com {user}" #: js/share.js:292 msgid "Unshare" @@ -184,11 +185,11 @@ msgstr "Você receberá um link para redefinir sua senha via e-mail." #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Email de redefinição de senha enviado." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "A requisição falhou!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 @@ -407,13 +408,13 @@ msgstr "Sair" #: templates/login.php:8 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Entrada Automática no Sistema Rejeitada!" #: templates/login.php:9 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!" #: templates/login.php:10 msgid "Please change your password to secure your account again." @@ -451,8 +452,8 @@ msgstr "Aviso de Segurança!" msgid "" "Please verify your password.
For security reasons you may be " "occasionally asked to enter your password again." -msgstr "" +msgstr "Por favor, verifique a sua senha.
Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente." #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "Verificar" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 8dac2acdea..25a4326782 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # Guilherme Maluf Balzana , 2012. # , 2012. # , 2012. @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" -"PO-Revision-Date: 2012-11-01 23:21+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 14:24+0000\n" +"Last-Translator: dudanogueira \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,7 +72,7 @@ msgstr "Renomear" #: js/filelist.js:194 js/filelist.js:196 msgid "{new_name} already exists" -msgstr "" +msgstr "{new_name} já existe" #: js/filelist.js:194 js/filelist.js:196 msgid "replace" @@ -87,7 +88,7 @@ msgstr "cancelar" #: js/filelist.js:243 msgid "replaced {new_name}" -msgstr "" +msgstr "substituído {new_name}" #: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279 msgid "undo" @@ -95,15 +96,15 @@ msgstr "desfazer" #: js/filelist.js:245 msgid "replaced {new_name} with {old_name}" -msgstr "" +msgstr "Substituído {old_name} por {new_name} " #: js/filelist.js:277 msgid "unshared {files}" -msgstr "" +msgstr "{files} não compartilhados" #: js/filelist.js:279 msgid "deleted {files}" -msgstr "" +msgstr "{files} apagados" #: js/files.js:171 msgid "generating ZIP-file, it may take some time." @@ -127,7 +128,7 @@ msgstr "enviando 1 arquivo" #: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" -msgstr "" +msgstr "Enviando {count} arquivos" #: js/files.js:320 js/files.js:353 msgid "Upload cancelled." @@ -144,7 +145,7 @@ msgstr "Nome inválido, '/' não é permitido." #: js/files.js:673 msgid "{count} files scanned" -msgstr "" +msgstr "{count} arquivos scaneados" #: js/files.js:681 msgid "error while scanning" @@ -164,19 +165,19 @@ msgstr "Modificado" #: js/files.js:783 msgid "1 folder" -msgstr "" +msgstr "1 pasta" #: js/files.js:785 msgid "{count} folders" -msgstr "" +msgstr "{count} pastas" #: js/files.js:793 msgid "1 file" -msgstr "" +msgstr "1 arquivo" #: js/files.js:795 msgid "{count} files" -msgstr "" +msgstr "{count} arquivos" #: js/files.js:838 msgid "seconds ago" @@ -188,7 +189,7 @@ msgstr "1 minuto atrás" #: js/files.js:840 msgid "{minutes} minutes ago" -msgstr "" +msgstr "{minutes} minutos atrás" #: js/files.js:843 msgid "today" @@ -200,7 +201,7 @@ msgstr "ontem" #: js/files.js:845 msgid "{days} days ago" -msgstr "" +msgstr "{days} dias atrás" #: js/files.js:846 msgid "last month" @@ -264,7 +265,7 @@ msgstr "Pasta" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "Do link" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po index 168bc9bcc8..5ed1bddb4a 100644 --- a/l10n/pt_BR/lib.po +++ b/l10n/pt_BR/lib.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-25 02:07+0200\n" -"PO-Revision-Date: 2012-10-24 00:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-04 00:01+0100\n" +"PO-Revision-Date: 2012-11-03 14:34+0000\n" +"Last-Translator: dudanogueira \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,47 +81,47 @@ msgstr "Texto" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Imagens" -#: template.php:87 +#: template.php:103 msgid "seconds ago" msgstr "segundos atrás" -#: template.php:88 +#: template.php:104 msgid "1 minute ago" msgstr "1 minuto atrás" -#: template.php:89 +#: template.php:105 #, php-format msgid "%d minutes ago" msgstr "%d minutos atrás" -#: template.php:92 +#: template.php:108 msgid "today" msgstr "hoje" -#: template.php:93 +#: template.php:109 msgid "yesterday" msgstr "ontem" -#: template.php:94 +#: template.php:110 #, php-format msgid "%d days ago" msgstr "%d dias atrás" -#: template.php:95 +#: template.php:111 msgid "last month" msgstr "último mês" -#: template.php:96 +#: template.php:112 msgid "months ago" msgstr "meses atrás" -#: template.php:97 +#: template.php:113 msgid "last year" msgstr "último ano" -#: template.php:98 +#: template.php:114 msgid "years ago" msgstr "anos atrás" diff --git a/l10n/sv/files.po b/l10n/sv/files.po index 2f03026cd5..ec6893a022 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" -"PO-Revision-Date: 2012-11-01 23:21+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 09:10+0000\n" +"Last-Translator: Magnus Höglund \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -264,7 +264,7 @@ msgstr "Mapp" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "Från länk" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index eefb79192d..3e0f7d390d 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index a12f37ae83..06fc0ce46d 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 3b8956f0d4..729f944b65 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 3a24eccf9c..51f405e0f1 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 0b89a27ab9..d53c61547c 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 85c6ceedd4..5c037f680c 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index cd757ced24..fd91ee28f2 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"POT-Creation-Date: 2012-11-04 00:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index acbbb84dce..a7fbc613ee 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"POT-Creation-Date: 2012-11-04 00:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 4c9526cf15..1e74d70915 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php index 5eb2348100..161a5bc0a6 100644 --- a/lib/l10n/pt_BR.php +++ b/lib/l10n/pt_BR.php @@ -14,6 +14,7 @@ "Token expired. Please reload page." => "Token expirou. Por favor recarregue a página.", "Files" => "Arquivos", "Text" => "Texto", +"Images" => "Imagens", "seconds ago" => "segundos atrás", "1 minute ago" => "1 minuto atrás", "%d minutes ago" => "%d minutos atrás", From f8d1d7787e1112842db81a629dfd84b586fbebda Mon Sep 17 00:00:00 2001 From: Felix Moeller Date: Sun, 4 Nov 2012 10:46:32 +0100 Subject: [PATCH 10/12] Checkstyle fixes for SpaceBeforeOpenBrace --- apps/files/ajax/move.php | 2 +- apps/files/ajax/upload.php | 2 +- apps/files/appinfo/update.php | 2 +- cron.php | 4 ++-- lib/backgroundjob.php | 2 +- lib/filecache.php | 2 +- lib/filecache/update.php | 4 ++-- lib/fileproxy/fileoperations.php | 2 +- lib/fileproxy/quota.php | 2 +- lib/filesystem.php | 4 ++-- lib/filesystemview.php | 14 +++++++------- lib/helper.php | 8 ++++---- lib/log.php | 6 +++--- lib/migrate.php | 2 +- lib/migration/content.php | 2 +- lib/router.php | 2 +- lib/setup.php | 2 +- lib/template.php | 4 ++-- tests/bootstrap.php | 10 +++++----- tests/lib/cache.php | 2 +- tests/lib/cache/apc.php | 4 ++-- tests/lib/cache/xcache.php | 2 +- tests/lib/template.php | 8 ++++---- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php index 0541bb1606..5612716b7e 100644 --- a/apps/files/ajax/move.php +++ b/apps/files/ajax/move.php @@ -12,7 +12,7 @@ $file = stripslashes($_GET["file"]); $target = stripslashes(rawurldecode($_GET["target"])); -if(OC_Filesystem::file_exists($target . '/' . $file)){ +if(OC_Filesystem::file_exists($target . '/' . $file)) { OCP\JSON::error(array("data" => array( "message" => "Could not move $file - File with this name already exists" ))); exit; } diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index dc83057040..7a69154677 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -38,7 +38,7 @@ $totalSize=0; foreach($files['size'] as $size) { $totalSize+=$size; } -if($totalSize>OC_Filesystem::free_space($dir)){ +if($totalSize>OC_Filesystem::free_space($dir)) { OCP\JSON::error(array("data" => array( "message" => "Not enough space available" ))); exit(); } diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php index bcbbc6035f..3c63ad3c7c 100644 --- a/apps/files/appinfo/update.php +++ b/apps/files/appinfo/update.php @@ -5,7 +5,7 @@ $installedVersion=OCP\Config::getAppValue('files', 'installed_version'); if (version_compare($installedVersion, '1.1.6', '<')) { $query = OC_DB::prepare( "SELECT `propertyname`, `propertypath`, `userid` FROM `*PREFIX*properties`" ); $result = $query->execute(); - while( $row = $result->fetchRow()){ + while( $row = $result->fetchRow()) { if ( $row["propertyname"][0] != '{' ) { $query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyname` = ? WHERE `userid` = ? AND `propertypath` = ?' ); $query->execute( array( '{DAV:}' + $row["propertyname"], $row["userid"], $row["propertypath"] )); diff --git a/cron.php b/cron.php index fb76c2de42..cd2e155a49 100644 --- a/cron.php +++ b/cron.php @@ -30,7 +30,7 @@ class my_temporary_cron_class { // We use this function to handle (unexpected) shutdowns function handleUnexpectedShutdown() { // Delete lockfile - if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )){ + if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )) { unlink( my_temporary_cron_class::$lockfile ); } @@ -80,7 +80,7 @@ if( OC::$CLI ) { } // check if backgroundjobs is still running - if( file_exists( my_temporary_cron_class::$lockfile )){ + if( file_exists( my_temporary_cron_class::$lockfile )) { my_temporary_cron_class::$keeplock = true; my_temporary_cron_class::$sent = true; echo "Another instance of cron.php is still running!"; diff --git a/lib/backgroundjob.php b/lib/backgroundjob.php index 6415f5b84a..f486519bf0 100644 --- a/lib/backgroundjob.php +++ b/lib/backgroundjob.php @@ -44,7 +44,7 @@ class OC_BackgroundJob{ * are "none", "ajax", "webcron", "cron" */ public static function setExecutionType( $type ) { - if( !in_array( $type, array('none', 'ajax', 'webcron', 'cron'))){ + if( !in_array( $type, array('none', 'ajax', 'webcron', 'cron'))) { return false; } return OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', $type ); diff --git a/lib/filecache.php b/lib/filecache.php index d5f90d3023..782e742d24 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -500,7 +500,7 @@ class OC_FileCache{ * trigger an update for the cache by setting the mtimes to 0 * @param string $user (optional) */ - public static function triggerUpdate($user=''){ + public static function triggerUpdate($user='') { if($user) { $query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `mtime`=0 WHERE `user`=? AND `mimetype`="httpd/unix-directory"'); $query->execute(array($user)); diff --git a/lib/filecache/update.php b/lib/filecache/update.php index ecfa892744..ce395bf6ed 100644 --- a/lib/filecache/update.php +++ b/lib/filecache/update.php @@ -85,7 +85,7 @@ class OC_FileCache_Update{ $file=$path.'/'.$filename; $isDir=$view->is_dir($file); if(self::hasUpdated($file, $root, $isDir)) { - if($isDir){ + if($isDir) { self::updateFolder($file, $root); }elseif($root===false) {//filesystem hooks are only valid for the default root OC_Hook::emit('OC_Filesystem', 'post_write', array('path'=>$file)); @@ -174,7 +174,7 @@ class OC_FileCache_Update{ }else{ $size=OC_FileCache::scanFile($path, $root); } - if($path !== '' and $path !== '/'){ + if($path !== '' and $path !== '/') { OC_FileCache::increaseSize(dirname($path), $size-$cachedSize, $root); } } diff --git a/lib/fileproxy/fileoperations.php b/lib/fileproxy/fileoperations.php index 23fb63fcfb..516629adae 100644 --- a/lib/fileproxy/fileoperations.php +++ b/lib/fileproxy/fileoperations.php @@ -28,7 +28,7 @@ class OC_FileProxy_FileOperations extends OC_FileProxy{ static $rootView; public function premkdir($path) { - if(!self::$rootView){ + if(!self::$rootView) { self::$rootView = new OC_FilesystemView(''); } return !self::$rootView->file_exists($path); diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php index 54bda5d864..05b617c832 100644 --- a/lib/fileproxy/quota.php +++ b/lib/fileproxy/quota.php @@ -93,7 +93,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{ } public function preCopy($path1, $path2) { - if(!self::$rootView){ + if(!self::$rootView) { self::$rootView = new OC_FilesystemView(''); } return (self::$rootView->filesize($path1)<$this->getFreeSpace($path2) or $this->getFreeSpace($path2)==0); diff --git a/lib/filesystem.php b/lib/filesystem.php index 852290e62a..055ba66aae 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -403,7 +403,7 @@ class OC_Filesystem{ if(strstr($path, '/../') || strrchr($path, '/') === '/..' ) { return false; } - if(self::isFileBlacklisted($path)){ + if(self::isFileBlacklisted($path)) { return false; } return true; @@ -425,7 +425,7 @@ class OC_Filesystem{ } } - static public function isFileBlacklisted($path){ + static public function isFileBlacklisted($path) { $blacklist = array('.htaccess'); $filename = strtolower(basename($path)); return in_array($filename, $blacklist); diff --git a/lib/filesystemview.php b/lib/filesystemview.php index 9a38601acf..ecbdb63ec5 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -251,7 +251,7 @@ class OC_FilesystemView { return $this->basicOperation('filemtime', $path); } public function touch($path, $mtime=null) { - if(!is_null($mtime) and !is_numeric($mtime)){ + if(!is_null($mtime) and !is_numeric($mtime)) { $mtime = strtotime($mtime); } return $this->basicOperation('touch', $path, array('write'), $mtime); @@ -266,7 +266,7 @@ class OC_FilesystemView { $path = $this->getRelativePath($absolutePath); $exists = $this->file_exists($path); $run = true; - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { if(!$exists) { OC_Hook::emit( OC_Filesystem::CLASSNAME, @@ -294,7 +294,7 @@ class OC_FilesystemView { $count=OC_Helper::streamCopy($data, $target); fclose($target); fclose($data); - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { if(!$exists) { OC_Hook::emit( OC_Filesystem::CLASSNAME, @@ -337,7 +337,7 @@ class OC_FilesystemView { return false; } $run=true; - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename, array( @@ -362,7 +362,7 @@ class OC_FilesystemView { $storage1->unlink($this->getInternalPath($path1.$postFix1)); $result = $count>0; } - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_rename, @@ -389,7 +389,7 @@ class OC_FilesystemView { return false; } $run=true; - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_copy, @@ -433,7 +433,7 @@ class OC_FilesystemView { $target = $this->fopen($path2.$postFix2, 'w'); $result = OC_Helper::streamCopy($source, $target); } - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_copy, diff --git a/lib/helper.php b/lib/helper.php index 27e312eeb2..ed459dab62 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -475,16 +475,16 @@ class OC_Helper { $dirs = explode(PATH_SEPARATOR, $path); // WARNING : We have to check if open_basedir is enabled : $obd = ini_get('open_basedir'); - if($obd != "none"){ + if($obd != "none") { $obd_values = explode(PATH_SEPARATOR, $obd); - if(count($obd_values) > 0 and $obd_values[0]){ + if(count($obd_values) > 0 and $obd_values[0]) { // open_basedir is in effect ! // We need to check if the program is in one of these dirs : $dirs = $obd_values; } } - foreach($dirs as $dir){ - foreach($exts as $ext){ + foreach($dirs as $dir) { + foreach($exts as $ext) { if($check_fn("$dir/$name".$ext)) return true; } diff --git a/lib/log.php b/lib/log.php index 3fc1e3976a..b5e8e1b06a 100644 --- a/lib/log.php +++ b/lib/log.php @@ -41,7 +41,7 @@ class OC_Log { } //Fatal errors handler - public static function onShutdown(){ + public static function onShutdown() { $error = error_get_last(); if($error) { //ob_end_clean(); @@ -52,12 +52,12 @@ class OC_Log { } // Uncaught exception handler - public static function onException($exception){ + public static function onException($exception) { self::write('PHP', $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(), self::FATAL); } //Recoverable errors handler - public static function onError($number, $message, $file, $line){ + public static function onError($number, $message, $file, $line) { if (error_reporting() === 0) { return; } diff --git a/lib/migrate.php b/lib/migrate.php index 409d77a1a9..e967ae06ec 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -91,7 +91,7 @@ class OC_Migrate{ if( self::$exporttype == 'user' ) { // Check user exists self::$uid = is_null($uid) ? OC_User::getUser() : $uid; - if(!OC_User::userExists(self::$uid)){ + if(!OC_User::userExists(self::$uid)) { return json_encode( array( 'success' => false) ); } } diff --git a/lib/migration/content.php b/lib/migration/content.php index ca102b03d8..eec475945a 100644 --- a/lib/migration/content.php +++ b/lib/migration/content.php @@ -53,7 +53,7 @@ class OC_Migration_Content{ if( !is_null( $this->db ) ) { // Get db path $db = $this->db->getDatabase(); - if(!in_array($db, $this->tmpfiles)){ + if(!in_array($db, $this->tmpfiles)) { $this->tmpfiles[] = $db; } } diff --git a/lib/router.php b/lib/router.php index 7bbc546d75..8cb8fd4f33 100644 --- a/lib/router.php +++ b/lib/router.php @@ -34,7 +34,7 @@ class OC_Router { public function getRoutingFiles() { if (!isset($this->routing_files)) { $this->routing_files = array(); - foreach(OC_APP::getEnabledApps() as $app){ + foreach(OC_APP::getEnabledApps() as $app) { $file = OC_App::getAppPath($app).'/appinfo/routes.php'; if(file_exists($file)) { $this->routing_files[$app] = $file; diff --git a/lib/setup.php b/lib/setup.php index d0620f814a..c424ad6fb0 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -70,7 +70,7 @@ class OC_Setup { if(empty($options['dbname'])) { $error[] = "$dbprettyname enter the database name."; } - if(substr_count($options['dbname'], '.') >= 1){ + if(substr_count($options['dbname'], '.') >= 1) { $error[] = "$dbprettyname you may not use dots in the database name"; } if($dbtype != 'oci' && empty($options['dbhost'])) { diff --git a/lib/template.php b/lib/template.php index ed2481afba..ad25dbcff5 100644 --- a/lib/template.php +++ b/lib/template.php @@ -25,7 +25,7 @@ * Prints an XSS escaped string * @param string $string the string which will be escaped and printed */ -function p($string){ +function p($string) { print(OC_Util::sanitizeHTML($string)); } @@ -33,7 +33,7 @@ function p($string){ * Prints an unescaped string * @param string $string the string which will be printed as it is */ -function print_unescaped($string){ +function print_unescaped($string) { print($string); } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index f8364b71ef..4080a974be 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -2,25 +2,25 @@ require_once __DIR__.'/../lib/base.php'; -if(!class_exists('PHPUnit_Framework_TestCase')){ +if(!class_exists('PHPUnit_Framework_TestCase')) { require_once('PHPUnit/Autoload.php'); } //SimpleTest compatibility abstract class UnitTestCase extends PHPUnit_Framework_TestCase{ - function assertEqual($expected, $actual, $string=''){ + function assertEqual($expected, $actual, $string='') { $this->assertEquals($expected, $actual, $string); } - function assertNotEqual($expected, $actual, $string=''){ + function assertNotEqual($expected, $actual, $string='') { $this->assertNotEquals($expected, $actual, $string); } - static function assertTrue($actual, $string=''){ + static function assertTrue($actual, $string='') { parent::assertTrue((bool)$actual, $string); } - static function assertFalse($actual, $string=''){ + static function assertFalse($actual, $string='') { parent::assertFalse((bool)$actual, $string); } } diff --git a/tests/lib/cache.php b/tests/lib/cache.php index 7f3eb3ee6f..c104460ea4 100644 --- a/tests/lib/cache.php +++ b/tests/lib/cache.php @@ -13,7 +13,7 @@ abstract class Test_Cache extends UnitTestCase { protected $instance; public function tearDown() { - if($this->instance){ + if($this->instance) { $this->instance->clear(); } } diff --git a/tests/lib/cache/apc.php b/tests/lib/cache/apc.php index f68b97bcbd..bb5eb483db 100644 --- a/tests/lib/cache/apc.php +++ b/tests/lib/cache/apc.php @@ -22,11 +22,11 @@ class Test_Cache_APC extends Test_Cache { public function setUp() { - if(!extension_loaded('apc')){ + if(!extension_loaded('apc')) { $this->markTestSkipped('The apc extension is not available.'); return; } - if(!ini_get('apc.enable_cli') && OC::$CLI){ + if(!ini_get('apc.enable_cli') && OC::$CLI) { $this->markTestSkipped('apc not available in CLI.'); return; } diff --git a/tests/lib/cache/xcache.php b/tests/lib/cache/xcache.php index c081036a31..43bed2db03 100644 --- a/tests/lib/cache/xcache.php +++ b/tests/lib/cache/xcache.php @@ -22,7 +22,7 @@ class Test_Cache_XCache extends Test_Cache { public function setUp() { - if(!function_exists('xcache_get')){ + if(!function_exists('xcache_get')) { $this->markTestSkipped('The xcache extension is not available.'); return; } diff --git a/tests/lib/template.php b/tests/lib/template.php index dadfdba5e0..32ae4aca59 100644 --- a/tests/lib/template.php +++ b/tests/lib/template.php @@ -24,7 +24,7 @@ require_once("lib/template.php"); class Test_TemplateFunctions extends UnitTestCase { - public function testP(){ + public function testP() { // FIXME: do we need more testcases? $htmlString = ""; ob_start(); @@ -35,7 +35,7 @@ class Test_TemplateFunctions extends UnitTestCase { $this->assertEqual("<script>alert('xss');</script>", $result); } - public function testPNormalString(){ + public function testPNormalString() { $normalString = "This is a good string!"; ob_start(); p($normalString); @@ -46,7 +46,7 @@ class Test_TemplateFunctions extends UnitTestCase { } - public function testPrintUnescaped(){ + public function testPrintUnescaped() { $htmlString = ""; ob_start(); @@ -57,7 +57,7 @@ class Test_TemplateFunctions extends UnitTestCase { $this->assertEqual($htmlString, $result); } - public function testPrintUnescapedNormalString(){ + public function testPrintUnescapedNormalString() { $normalString = "This is a good string!"; ob_start(); print_unescaped($normalString); From 30d7993e0105a6c98cbf61d4253d08acf236aca7 Mon Sep 17 00:00:00 2001 From: Felix Moeller Date: Sun, 4 Nov 2012 11:10:46 +0100 Subject: [PATCH 11/12] Checkstyle fixes: NoSpaceAfterComma --- apps/files/ajax/autocomplete.php | 2 +- apps/files/ajax/upload.php | 2 +- apps/files/appinfo/filesync.php | 4 +-- apps/files/appinfo/remote.php | 2 +- apps/files/appinfo/update.php | 2 +- apps/files/index.php | 2 +- apps/files/templates/admin.php | 2 +- apps/files/templates/index.php | 2 +- apps/files/templates/part.breadcrumb.php | 2 +- apps/files/templates/part.list.php | 8 ++--- apps/files_encryption/appinfo/app.php | 4 +-- apps/files_encryption/lib/crypt.php | 2 +- apps/files_encryption/lib/cryptstream.php | 6 ++-- apps/files_encryption/lib/proxy.php | 18 +++++----- apps/files_encryption/settings.php | 6 ++-- apps/files_encryption/tests/encryption.php | 6 ++-- apps/files_encryption/tests/proxy.php | 6 ++-- apps/files_encryption/tests/stream.php | 20 ++++++------ apps/files_external/lib/ftp.php | 8 ++--- apps/files_external/lib/google.php | 4 +-- apps/files_external/lib/streamwrapper.php | 4 +-- apps/files_external/lib/swift.php | 6 ++-- apps/files_external/lib/webdav.php | 4 +-- apps/files_versions/appinfo/app.php | 2 +- apps/files_versions/history.php | 2 +- apps/files_versions/lib/versions.php | 2 +- apps/files_versions/settings-personal.php | 2 +- apps/user_ldap/group_ldap.php | 2 +- apps/user_ldap/lib/connection.php | 14 ++++---- apps/user_ldap/settings.php | 4 +-- apps/user_ldap/tests/group_ldap.php | 4 +-- apps/user_webdavauth/appinfo/app.php | 2 +- core/templates/installation.php | 6 ++-- lib/MDB2/Driver/sqlite3.php | 4 +-- lib/app.php | 2 +- lib/archive/tar.php | 6 ++-- lib/archive/zip.php | 2 +- lib/base.php | 8 ++--- lib/connector/sabre/file.php | 2 +- lib/connector/sabre/locks.php | 4 +-- lib/connector/sabre/node.php | 4 +-- lib/db.php | 4 +-- lib/filecache.php | 12 +++---- lib/filecache/update.php | 4 +-- lib/fileproxy.php | 2 +- lib/fileproxy/quota.php | 4 +-- lib/files.php | 2 +- lib/filestorage.php | 2 +- lib/filestorage/common.php | 4 +-- lib/filestorage/local.php | 12 +++---- lib/filesystem.php | 16 ++++----- lib/filesystemview.php | 2 +- lib/image.php | 2 +- lib/installer.php | 10 +++--- lib/json.php | 2 +- lib/l10n.php | 2 +- lib/log/owncloud.php | 4 +-- lib/mail.php | 2 +- lib/migrate.php | 4 +-- lib/migration/content.php | 2 +- lib/ocsclient.php | 6 ++-- lib/request.php | 4 +-- lib/route.php | 2 +- lib/search.php | 2 +- lib/setup.php | 2 +- lib/streamwrappers.php | 8 ++--- lib/template.php | 8 ++--- lib/templatelayout.php | 6 ++-- lib/updater.php | 2 +- lib/user.php | 2 +- lib/user/database.php | 2 +- lib/user/http.php | 2 +- lib/util.php | 38 +++++++++++----------- lib/vcategories.php | 28 ++++++++-------- settings/admin.php | 2 +- settings/ajax/setquota.php | 2 +- settings/personal.php | 6 ++-- settings/templates/admin.php | 2 +- tests/lib/archive.php | 18 +++++----- tests/lib/cache.php | 10 +++--- tests/lib/cache/file.php | 2 +- tests/lib/group.php | 26 +++++++-------- tests/lib/streamwrappers.php | 8 ++--- tests/lib/user/backend.php | 28 ++++++++-------- 84 files changed, 251 insertions(+), 251 deletions(-) diff --git a/apps/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php index fae38368a8..b32ba7c3d5 100644 --- a/apps/files/ajax/autocomplete.php +++ b/apps/files/ajax/autocomplete.php @@ -44,7 +44,7 @@ if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)) { if(substr(strtolower($file), 0, $queryLen)==$query) { $item=$base.$file; if((!$dirOnly or OC_Filesystem::is_dir($item))) { - $files[]=(object)array('id'=>$item,'label'=>$item,'name'=>$item); + $files[]=(object)array('id'=>$item, 'label'=>$item, 'name'=>$item); } } } diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 7a69154677..4ed0bbc5b0 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -51,7 +51,7 @@ if(strpos($dir, '..') === false) { if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) { $meta = OC_FileCache::get($target); $id = OC_FileCache::getId($target); - $result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target)); + $result[]=array( "status" => "success", 'mime'=>$meta['mimetype'], 'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target)); } } OCP\JSON::encodedPrint($result); diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php index dfafe3f956..0e368cb0f4 100644 --- a/apps/files/appinfo/filesync.php +++ b/apps/files/appinfo/filesync.php @@ -21,7 +21,7 @@ */ // load needed apps -$RUNTIME_APPTYPES=array('filesystem','authentication','logging'); +$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging'); OC_App::loadApps($RUNTIME_APPTYPES); if(!OC_User::isLoggedIn()) { if(!isset($_SERVER['PHP_AUTH_USER'])) { @@ -36,7 +36,7 @@ if(!OC_User::isLoggedIn()) { } } -list($type,$file) = explode('/', substr($path_info, 1+strlen($service)+1), 2); +list($type, $file) = explode('/', substr($path_info, 1+strlen($service)+1), 2); if ($type != 'oc_chunked') { OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index f12430f24d..400a978fb1 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -23,7 +23,7 @@ * */ // load needed apps -$RUNTIME_APPTYPES=array('filesystem','authentication','logging'); +$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging'); OC_App::loadApps($RUNTIME_APPTYPES); diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php index 3c63ad3c7c..738864d7cf 100644 --- a/apps/files/appinfo/update.php +++ b/apps/files/appinfo/update.php @@ -39,7 +39,7 @@ foreach($filesToRemove as $file) { $success = OCP\Files::rmdirr($filepath); if($success === false) { //probably not sufficient privileges, give up and give a message. - OCP\Util::writeLog('files','Could not clean /files/ directory. Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR); + OCP\Util::writeLog('files', 'Could not clean /files/ directory. Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR); break; } } diff --git a/apps/files/index.php b/apps/files/index.php index 51fe6b0379..c46ec59d03 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -67,7 +67,7 @@ $breadcrumb = array(); $pathtohere = ''; foreach( explode( '/', $dir ) as $i ) { if( $i != '' ) { - $pathtohere .= '/'.str_replace('+','%20', urlencode($i)); + $pathtohere .= '/'.str_replace('+', '%20', urlencode($i)); $breadcrumb[] = array( 'dir' => $pathtohere, 'name' => $i ); } } diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index 5869ed2107..a60a1cebaf 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -1,4 +1,4 @@ - +
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 7cdff024dd..e2640c1113 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -8,7 +8,7 @@

  • t('Text file');?>

  • t('Folder');?>

    • -

  • t('From link');?>

    • +

  • t('From link');?>

diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php index 71b695f65f..ead9ab1ed7 100644 --- a/apps/files/templates/part.breadcrumb.php +++ b/apps/files/templates/part.breadcrumb.php @@ -1,6 +1,6 @@ -
svg" data-dir='' style='background-image:url("")'> +
svg" data-dir='' style='background-image:url("")'> ">
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index aaf9c5f57e..4b5ac32567 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -14,10 +14,10 @@ $relative_modified_date = OCP\relative_modified_date($file['mtime']); $relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14 if($relative_date_color>200) $relative_date_color = 200; - $name = str_replace('+','%20', urlencode($file['name'])); - $name = str_replace('%2F','/', $name); - $directory = str_replace('+','%20', urlencode($file['directory'])); - $directory = str_replace('%2F','/', $directory); ?> + $name = str_replace('+', '%20', urlencode($file['name'])); + $name = str_replace('%2F', '/', $name); + $directory = str_replace('+', '%20', urlencode($file['directory'])); + $directory = str_replace('%2F', '/', $directory); ?> ' data-permissions=''> diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index bb130a366b..3f76e910a5 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -6,9 +6,9 @@ OC::$CLASSPATH['OC_FileProxy_Encryption'] = 'apps/files_encryption/lib/proxy.php OC_FileProxy::register(new OC_FileProxy_Encryption()); -OCP\Util::connectHook('OC_User','post_login','OC_Crypt','loginListener'); +OCP\Util::connectHook('OC_User', 'post_login', 'OC_Crypt', 'loginListener'); -stream_wrapper_register('crypt','OC_CryptStream'); +stream_wrapper_register('crypt', 'OC_CryptStream'); if(!isset($_SESSION['enckey']) and OCP\User::isLoggedIn()) {//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled) OCP\User::logout(); diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index d8e7e4d1dd..5ff3f57838 100644 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -80,7 +80,7 @@ class OC_Crypt { } } - public static function createkey($username,$passcode) { + public static function createkey($username, $passcode) { // generate a random key $key=mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999); diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php index 3170cff366..8b05560050 100644 --- a/apps/files_encryption/lib/cryptstream.php +++ b/apps/files_encryption/lib/cryptstream.php @@ -23,7 +23,7 @@ /** * transparently encrypted filestream * - * you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path,'stream'=>$stream) + * you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path, 'stream'=>$stream) * and then fopen('crypt://streams/foo'); */ @@ -123,11 +123,11 @@ class OC_CryptStream{ $data=substr($data, 8192); } } - $this->size=max($this->size,$currentPos+$length); + $this->size=max($this->size, $currentPos+$length); return $length; } - public function stream_set_option($option,$arg1,$arg2) { + public function stream_set_option($option, $arg1, $arg2) { switch($option) { case STREAM_OPTION_BLOCKING: stream_set_blocking($this->source, $arg1); diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index fed6acaf91..cacf7d7920 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -36,7 +36,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ */ private static function shouldEncrypt($path) { if(is_null(self::$enableEncryption)) { - self::$enableEncryption=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true'); + self::$enableEncryption=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true'); } if(!self::$enableEncryption) { return false; @@ -59,7 +59,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ * @return bool */ private static function isEncrypted($path) { - $metadata=OC_FileCache_Cached::get($path,''); + $metadata=OC_FileCache_Cached::get($path, ''); return isset($metadata['encrypted']) and (bool)$metadata['encrypted']; } @@ -68,14 +68,14 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ if (!is_resource($data)) {//stream put contents should have been converter to fopen $size=strlen($data); $data=OC_Crypt::blockEncrypt($data); - OC_FileCache::put($path, array('encrypted'=>true,'size'=>$size),''); + OC_FileCache::put($path, array('encrypted'=>true,'size'=>$size), ''); } } } - public function postFile_get_contents($path,$data) { + public function postFile_get_contents($path, $data) { if(self::isEncrypted($path)) { - $cached=OC_FileCache_Cached::get($path,''); + $cached=OC_FileCache_Cached::get($path, ''); $data=OC_Crypt::blockDecrypt($data, '', $cached['size']); } return $data; @@ -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); @@ -106,14 +106,14 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ public function postGetMimeType($path, $mime) { if(self::isEncrypted($path)) { - $mime=OCP\Files::getMimeType('crypt://'.$path,'w'); + $mime=OCP\Files::getMimeType('crypt://'.$path, 'w'); } return $mime; } public function postStat($path, $data) { if(self::isEncrypted($path)) { - $cached=OC_FileCache_Cached::get($path,''); + $cached=OC_FileCache_Cached::get($path, ''); $data['size']=$cached['size']; } return $data; @@ -121,7 +121,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ public function postFileSize($path, $size) { if(self::isEncrypted($path)) { - $cached=OC_FileCache_Cached::get($path,''); + $cached=OC_FileCache_Cached::get($path, ''); return $cached['size']; }else{ return $size; diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php index ab9324dee4..ae28b088cd 100644 --- a/apps/files_encryption/settings.php +++ b/apps/files_encryption/settings.php @@ -8,11 +8,11 @@ $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')); -$enabled=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true'); +$enabled=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true'); $tmpl->assign('blacklist', $blackList); $tmpl->assign('encryption_enabled', $enabled); -OCP\Util::addscript('files_encryption','settings'); -OCP\Util::addscript('core','multiselect'); +OCP\Util::addscript('files_encryption', 'settings'); +OCP\Util::addscript('core', 'multiselect'); return $tmpl->fetchPage(); diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php index b714b00b8f..0e119f55be 100644 --- a/apps/files_encryption/tests/encryption.php +++ b/apps/files_encryption/tests/encryption.php @@ -17,7 +17,7 @@ class Test_Encryption extends UnitTestCase { $this->assertNotEqual($encrypted, $source); $this->assertEqual($decrypted, $source); - $chunk=substr($source,0, 8192); + $chunk=substr($source, 0, 8192); $encrypted=OC_Crypt::encrypt($chunk, $key); $this->assertEqual(strlen($chunk), strlen($encrypted)); $decrypted=OC_Crypt::decrypt($encrypted, $key); @@ -30,14 +30,14 @@ class Test_Encryption extends UnitTestCase { $this->assertEqual($decrypted, $source); $tmpFileEncrypted=OCP\Files::tmpFile(); - OC_Crypt::encryptfile($file,$tmpFileEncrypted, $key); + OC_Crypt::encryptfile($file, $tmpFileEncrypted, $key); $encrypted=file_get_contents($tmpFileEncrypted); $decrypted=OC_Crypt::blockDecrypt($encrypted, $key); $this->assertNotEqual($encrypted, $source); $this->assertEqual($decrypted, $source); $tmpFileDecrypted=OCP\Files::tmpFile(); - OC_Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted, $key); + OC_Crypt::decryptfile($tmpFileEncrypted, $tmpFileDecrypted, $key); $decrypted=file_get_contents($tmpFileDecrypted); $this->assertEqual($decrypted, $source); diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php index 25427ff4b9..1c800bbc5f 100644 --- a/apps/files_encryption/tests/proxy.php +++ b/apps/files_encryption/tests/proxy.php @@ -13,8 +13,8 @@ class Test_CryptProxy extends UnitTestCase { public function setUp() { $user=OC_User::getUser(); - $this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true'); - OCP\Config::setAppValue('files_encryption','enable_encryption','true'); + $this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption', 'true'); + OCP\Config::setAppValue('files_encryption', 'enable_encryption', 'true'); $this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null; @@ -30,7 +30,7 @@ class Test_CryptProxy extends UnitTestCase { //set up temporary storage OC_Filesystem::clearMounts(); - OC_Filesystem::mount('OC_Filestorage_Temporary', array(),'/'); + OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/'); OC_Filesystem::init('/'.$user.'/files'); diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php index 2caebf912e..67b5e98ae6 100644 --- a/apps/files_encryption/tests/stream.php +++ b/apps/files_encryption/tests/stream.php @@ -10,23 +10,23 @@ class Test_CryptStream extends UnitTestCase { private $tmpFiles=array(); function testStream() { - $stream=$this->getStream('test1','w', strlen('foobar')); - fwrite($stream,'foobar'); + $stream=$this->getStream('test1', 'w', strlen('foobar')); + fwrite($stream, 'foobar'); fclose($stream); - $stream=$this->getStream('test1','r', strlen('foobar')); + $stream=$this->getStream('test1', 'r', strlen('foobar')); $data=fread($stream, 6); fclose($stream); $this->assertEqual('foobar', $data); $file=OC::$SERVERROOT.'/3rdparty/MDB2.php'; - $source=fopen($file,'r'); + $source=fopen($file, 'r'); $target=$this->getStream('test2', 'w', 0); OCP\Files::streamCopy($source, $target); fclose($target); fclose($source); - $stream=$this->getStream('test2','r', filesize($file)); + $stream=$this->getStream('test2', 'r', filesize($file)); $data=stream_get_contents($stream); $original=file_get_contents($file); $this->assertEqual(strlen($original), strlen($data)); @@ -51,7 +51,7 @@ class Test_CryptStream extends UnitTestCase { $file=$this->tmpFiles[$id]; } $stream=fopen($file, $mode); - OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size); + OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id, 'stream'=>$stream, 'size'=>$size); return fopen('crypt://streams/'.$id, $mode); } @@ -59,11 +59,11 @@ class Test_CryptStream extends UnitTestCase { $file=__DIR__.'/binary'; $source=file_get_contents($file); - $stream=$this->getStream('test','w', strlen($source)); + $stream=$this->getStream('test', 'w', strlen($source)); fwrite($stream, $source); fclose($stream); - $stream=$this->getStream('test','r', strlen($source)); + $stream=$this->getStream('test', 'r', strlen($source)); $data=stream_get_contents($stream); fclose($stream); $this->assertEqual(strlen($data), strlen($source)); @@ -72,11 +72,11 @@ class Test_CryptStream extends UnitTestCase { $file=__DIR__.'/zeros'; $source=file_get_contents($file); - $stream=$this->getStream('test2','w', strlen($source)); + $stream=$this->getStream('test2', 'w', strlen($source)); fwrite($stream, $source); fclose($stream); - $stream=$this->getStream('test2','r', strlen($source)); + $stream=$this->getStream('test2', 'r', strlen($source)); $data=stream_get_contents($stream); fclose($stream); $this->assertEqual(strlen($data), strlen($source)); diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php index 8a67b31b20..2fc2a3a1a3 100644 --- a/apps/files_external/lib/ftp.php +++ b/apps/files_external/lib/ftp.php @@ -53,7 +53,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ case 'ab': //these are supported by the wrapper $context = stream_context_create(array('ftp' => array('overwrite' => true))); - return fopen($this->constructUrl($path),$mode, false, $context); + return fopen($this->constructUrl($path), $mode, false, $context); case 'r+': case 'w+': case 'wb+': @@ -63,13 +63,13 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ case 'c': case 'c+': //emulate these - if(strrpos($path,'.')!==false) { - $ext=substr($path, strrpos($path,'.')); + if(strrpos($path, '.')!==false) { + $ext=substr($path, strrpos($path, '.')); }else{ $ext=''; } $tmpFile=OCP\Files::tmpFile($ext); - OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); + OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack'); if($this->file_exists($path)) { $this->getFile($path, $tmpFile); } diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index 32d57ed3ce..e5de81280a 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -394,8 +394,8 @@ class OC_Filestorage_Google extends OC_Filestorage_Common { case 'x+': case 'c': case 'c+': - if (strrpos($path,'.') !== false) { - $ext = substr($path, strrpos($path,'.')); + if (strrpos($path, '.') !== false) { + $ext = substr($path, strrpos($path, '.')); } else { $ext = ''; } diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php index 7961ecbe1b..b66a0f0ee1 100644 --- a/apps/files_external/lib/streamwrapper.php +++ b/apps/files_external/lib/streamwrapper.php @@ -60,8 +60,8 @@ abstract class OC_FileStorage_StreamWrapper extends OC_Filestorage_Common{ public function touch($path, $mtime=null) { if(is_null($mtime)) { - $fh=$this->fopen($path,'a'); - fwrite($fh,''); + $fh=$this->fopen($path, 'a'); + fwrite($fh, ''); fclose($fh); }else{ return false;//not supported diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index c04de45d40..2f0076706e 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -39,7 +39,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ * @return string */ private function getContainerName($path) { - $path=trim(trim($this->root,'/')."/".$path,'/.'); + $path=trim(trim($this->root, '/')."/".$path, '/.'); return str_replace('/', '\\', $path); } @@ -205,7 +205,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ unlink($tmpFile); return false; }else{ - $fh=fopen($tmpFile,'a'); + $fh=fopen($tmpFile, 'a'); fwrite($fh, $name."\n"); } }catch(Exception $e) { @@ -432,7 +432,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ case 'c': case 'c+': $tmpFile=$this->getTmpFile($path); - OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); + OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack'); self::$tempFiles[$tmpFile]=$path; return fopen('close://'.$tmpFile, $mode); } diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index 3d2ea7fa2a..2503fb80b1 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -252,7 +252,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ public function stat($path) { $path=$this->cleanPath($path); try{ - $response=$this->client->propfind($path, array('{DAV:}getlastmodified','{DAV:}getcontentlength')); + $response=$this->client->propfind($path, array('{DAV:}getlastmodified', '{DAV:}getcontentlength')); return array( 'mtime'=>strtotime($response['{DAV:}getlastmodified']), 'size'=>(int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0, @@ -266,7 +266,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ public function getMimeType($path) { $path=$this->cleanPath($path); try{ - $response=$this->client->propfind($path, array('{DAV:}getcontenttype','{DAV:}resourcetype')); + $response=$this->client->propfind($path, array('{DAV:}getcontenttype', '{DAV:}resourcetype')); $responseType=$response["{DAV:}resourcetype"]->resourceType; $type=(count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file'; if($type=='dir') { diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index 746f89a813..599d302e6e 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -5,7 +5,7 @@ OC::$CLASSPATH['OCA_Versions\Storage'] = 'apps/files_versions/lib/versions.php'; OC::$CLASSPATH['OCA_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php'; OCP\App::registerAdmin('files_versions', 'settings'); -OCP\App::registerPersonal('files_versions','settings-personal'); +OCP\App::registerPersonal('files_versions', 'settings-personal'); OCP\Util::addscript('files_versions', 'versions'); diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php index 0ebb34f45e..deff735ced 100644 --- a/apps/files_versions/history.php +++ b/apps/files_versions/history.php @@ -22,7 +22,7 @@ */ OCP\User::checkLoggedIn( ); -OCP\Util::addStyle('files_versions','versions'); +OCP\Util::addStyle('files_versions', 'versions'); $tmpl = new OCP\Template( 'files_versions', 'history', 'user' ); if ( isset( $_GET['path'] ) ) { diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 8ee147d085..8f80718746 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -109,7 +109,7 @@ class Storage { // create all parent folders $info=pathinfo($filename); if(!file_exists($versionsFolderName.'/'.$info['dirname'])) { - mkdir($versionsFolderName.'/'.$info['dirname'],0750, true); + mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true); } // store a new version of a file diff --git a/apps/files_versions/settings-personal.php b/apps/files_versions/settings-personal.php index 4fb866bd99..6555bc99c3 100644 --- a/apps/files_versions/settings-personal.php +++ b/apps/files_versions/settings-personal.php @@ -2,6 +2,6 @@ $tmpl = new OCP\Template( 'files_versions', 'settings-personal'); -OCP\Util::addscript('files_versions','settings-personal'); +OCP\Util::addscript('files_versions', 'settings-personal'); return $tmpl->fetchPage(); diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 6c6cc5679b..6343731008 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -124,7 +124,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface { $this->connection->ldapGroupFilter, $this->connection->ldapGroupMemberAssocAttr.'='.$uid )); - $groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName,'dn')); + $groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName, 'dn')); $groups = array_unique($this->ownCloudGroupNames($groups), SORT_LOCALE_STRING); $this->connection->writeToCache($cacheKey, $groups); diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 74ff55355b..ef92bbad40 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -180,13 +180,13 @@ class Connection { * Caches the general LDAP configuration. */ private function readConfiguration($force = false) { - \OCP\Util::writeLog('user_ldap','Checking conf state: isConfigured? '.print_r($this->configured, true).' isForce? '.print_r($force, true).' configID? '.print_r($this->configID, true), \OCP\Util::DEBUG); + \OCP\Util::writeLog('user_ldap', 'Checking conf state: isConfigured? '.print_r($this->configured, true).' isForce? '.print_r($force, true).' configID? '.print_r($this->configID, true), \OCP\Util::DEBUG); if((!$this->configured || $force) && !is_null($this->configID)) { - \OCP\Util::writeLog('user_ldap','Reading the configuration', \OCP\Util::DEBUG); + \OCP\Util::writeLog('user_ldap', 'Reading the configuration', \OCP\Util::DEBUG); $this->config['ldapHost'] = \OCP\Config::getAppValue($this->configID, 'ldap_host', ''); $this->config['ldapPort'] = \OCP\Config::getAppValue($this->configID, 'ldap_port', 389); - $this->config['ldapAgentName'] = \OCP\Config::getAppValue($this->configID, 'ldap_dn',''); - $this->config['ldapAgentPassword'] = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password','')); + $this->config['ldapAgentName'] = \OCP\Config::getAppValue($this->configID, 'ldap_dn', ''); + $this->config['ldapAgentPassword'] = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password', '')); $this->config['ldapBase'] = \OCP\Config::getAppValue($this->configID, 'ldap_base', ''); $this->config['ldapBaseUsers'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_users', $this->config['ldapBase']); $this->config['ldapBaseGroups'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']); @@ -194,8 +194,8 @@ class Connection { $this->config['ldapNoCase'] = \OCP\Config::getAppValue($this->configID, 'ldap_nocase', 0); $this->config['turnOffCertCheck'] = \OCP\Config::getAppValue($this->configID, 'ldap_turn_off_cert_check', 0); $this->config['ldapUserDisplayName'] = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_display_name', 'uid'), 'UTF-8'); - $this->config['ldapUserFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter','objectClass=person'); - $this->config['ldapGroupFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter','(objectClass=posixGroup)'); + $this->config['ldapUserFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter', 'objectClass=person'); + $this->config['ldapGroupFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter', '(objectClass=posixGroup)'); $this->config['ldapLoginFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_login_filter', '(uid=%uid)'); $this->config['ldapGroupDisplayName'] = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_group_display_name', 'uid'), 'UTF-8'); $this->config['ldapQuotaAttribute'] = \OCP\Config::getAppValue($this->configID, 'ldap_quota_attr', ''); @@ -263,7 +263,7 @@ class Connection { if(empty($this->config['ldapGroupFilter']) && empty($this->config['ldapGroupMemberAssocAttr'])) { \OCP\Util::writeLog('user_ldap', 'No group filter is specified, LDAP group feature will not be used.', \OCP\Util::INFO); } - if(!in_array($this->config['ldapUuidAttribute'], array('auto','entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) { + if(!in_array($this->config['ldapUuidAttribute'], array('auto', 'entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) { \OCP\Config::setAppValue($this->configID, 'ldap_uuid_attribute', 'auto'); \OCP\Util::writeLog('user_ldap', 'Illegal value for the UUID Attribute, reset to autodetect.', \OCP\Util::INFO); } diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php index f765151456..95bf6f1ed7 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -31,7 +31,7 @@ if ($_POST) { if('ldap_agent_password' == $param) { OCP\Config::setAppValue('user_ldap', $param, base64_encode($_POST[$param])); } elseif('ldap_cache_ttl' == $param) { - if(OCP\Config::getAppValue('user_ldap', $param,'') != $_POST[$param]) { + if(OCP\Config::getAppValue('user_ldap', $param, '') != $_POST[$param]) { $ldap = new \OCA\user_ldap\lib\Connection('user_ldap'); $ldap->clearCache(); OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]); @@ -59,7 +59,7 @@ if ($_POST) { // fill template $tmpl = new OCP\Template( 'user_ldap', 'settings'); foreach($params as $param) { - $value = OCP\Config::getAppValue('user_ldap', $param,''); + $value = OCP\Config::getAppValue('user_ldap', $param, ''); $tmpl->assign($param, $value); } diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php index 2acb8c35a1..f99902d32f 100644 --- a/apps/user_ldap/tests/group_ldap.php +++ b/apps/user_ldap/tests/group_ldap.php @@ -32,8 +32,8 @@ class Test_Group_Ldap extends UnitTestCase { $this->assertIsA(OC_Group::getGroups(), gettype(array())); $this->assertIsA($group_ldap->getGroups(), gettype(array())); - $this->assertFalse(OC_Group::inGroup('john','dosers'), gettype(false)); - $this->assertFalse($group_ldap->inGroup('john','dosers'), gettype(false)); + $this->assertFalse(OC_Group::inGroup('john', 'dosers'), gettype(false)); + $this->assertFalse($group_ldap->inGroup('john', 'dosers'), gettype(false)); //TODO: check also for expected true result. This backend won't be able to do any modifications, maybe use a dummy for this. $this->assertIsA(OC_Group::getUserGroups('john doe'), gettype(array())); diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php index 3ab323becc..c4c131b7ef 100755 --- a/apps/user_webdavauth/appinfo/app.php +++ b/apps/user_webdavauth/appinfo/app.php @@ -23,7 +23,7 @@ require_once 'apps/user_webdavauth/user_webdavauth.php'; -OC_APP::registerAdmin('user_webdavauth','settings'); +OC_APP::registerAdmin('user_webdavauth', 'settings'); OC_User::registerBackend("WEBDAVAUTH"); OC_User::useBackend( "WEBDAVAUTH" ); diff --git a/core/templates/installation.php b/core/templates/installation.php index 5a3bd2cc9f..a7c4780d5d 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -73,7 +73,7 @@

MySQL t( 'will be used' ); ?>.

- /> + /> @@ -84,7 +84,7 @@ - /> + /> @@ -94,7 +94,7 @@ - /> + />
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php index c9e7170ac6..bccb8cbbf0 100644 --- a/lib/MDB2/Driver/sqlite3.php +++ b/lib/MDB2/Driver/sqlite3.php @@ -351,7 +351,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common } if ($database_file !== ':memory:') { - if(!strpos($database_file,'.db')) { + if(!strpos($database_file, '.db')) { $database_file="$datadir/$database_file.db"; } if (!file_exists($database_file)) { @@ -387,7 +387,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common $php_errormsg = ''; $this->connection = new SQLite3($database_file); - if(is_callable(array($this->connection,'busyTimeout'))) {//busy timout is only available in php>=5.3 + if(is_callable(array($this->connection, 'busyTimeout'))) {//busy timout is only available in php>=5.3 $this->connection->busyTimeout(100); } $this->_lasterror = $this->connection->lastErrorMsg(); diff --git a/lib/app.php b/lib/app.php index f82961ca3a..79c1d83314 100755 --- a/lib/app.php +++ b/lib/app.php @@ -185,7 +185,7 @@ class OC_App{ }else{ $download=OC_OCSClient::getApplicationDownload($app, 1); if(isset($download['downloadlink']) and $download['downloadlink']!='') { - $app=OC_Installer::installApp(array('source'=>'http','href'=>$download['downloadlink'])); + $app=OC_Installer::installApp(array('source'=>'http', 'href'=>$download['downloadlink'])); } } } diff --git a/lib/archive/tar.php b/lib/archive/tar.php index 6e0629a0e1..6c26468699 100644 --- a/lib/archive/tar.php +++ b/lib/archive/tar.php @@ -23,7 +23,7 @@ class OC_Archive_TAR extends OC_Archive{ private $path; function __construct($source) { - $types=array(null,'gz','bz'); + $types=array(null, 'gz', 'bz'); $this->path=$source; $this->tar=new Archive_Tar($source, $types[self::getTarType($source)]); } @@ -309,7 +309,7 @@ class OC_Archive_TAR extends OC_Archive{ if($mode=='r' or $mode=='rb') { return fopen($tmpFile, $mode); }else{ - OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); + OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack'); self::$tempFiles[$tmpFile]=$path; return fopen('close://'.$tmpFile, $mode); } @@ -334,7 +334,7 @@ class OC_Archive_TAR extends OC_Archive{ $this->tar->_close(); $this->tar=null; } - $types=array(null,'gz','bz'); + $types=array(null, 'gz', 'bz'); $this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]); } } diff --git a/lib/archive/zip.php b/lib/archive/zip.php index 5a6fc578be..1c967baa08 100644 --- a/lib/archive/zip.php +++ b/lib/archive/zip.php @@ -171,7 +171,7 @@ class OC_Archive_ZIP extends OC_Archive{ $ext=''; } $tmpFile=OCP\Files::tmpFile($ext); - OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); + OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack'); if($this->fileExists($path)) { $this->extractFile($path, $tmpFile); } diff --git a/lib/base.php b/lib/base.php index 5c3d3fb80c..26cb75dac8 100644 --- a/lib/base.php +++ b/lib/base.php @@ -239,7 +239,7 @@ class OC{ } if(file_exists(OC::$SERVERROOT."/config/config.php") and !is_writable(OC::$SERVERROOT."/config/config.php")) { $tmpl = new OC_Template( '', 'error', 'guest' ); - $tmpl->assign('errors', array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud"))); + $tmpl->assign('errors', array(1=>array('error'=>"Can't write into config directory 'config'", 'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud"))); $tmpl->printPage(); exit; } @@ -322,7 +322,7 @@ class OC{ public static function init() { // register autoloader - spl_autoload_register(array('OC','autoload')); + spl_autoload_register(array('OC', 'autoload')); setlocale(LC_ALL, 'en_US.UTF-8'); // set some stuff @@ -440,7 +440,7 @@ class OC{ OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); //make sure temporary files are cleaned up - register_shutdown_function(array('OC_Helper','cleanTmp')); + register_shutdown_function(array('OC_Helper', 'cleanTmp')); //parse the given parameters self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files')); @@ -669,7 +669,7 @@ class OC{ } OC_App::loadApps(array('authentication')); if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { - //OC_Log::write('core',"Logged in with HTTP Authentication",OC_Log::DEBUG); + //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); OC_User::unsetMagicInCookie(); $_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:''); OC_Util::redirectToDefaultPage(); diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php index ed02840195..8d963a1cf8 100644 --- a/lib/connector/sabre/file.php +++ b/lib/connector/sabre/file.php @@ -57,7 +57,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D */ public function get() { - return OC_Filesystem::fopen($this->path,'rb'); + return OC_Filesystem::fopen($this->path, 'rb'); } diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php index 55a8d5eaa6..a72d003bc7 100644 --- a/lib/connector/sabre/locks.php +++ b/lib/connector/sabre/locks.php @@ -102,7 +102,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract { * @param Sabre_DAV_Locks_LockInfo $lockInfo * @return bool */ - public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) { + public function lock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) { // We're making the lock timeout 5 minutes $lockInfo->timeout = 300; @@ -134,7 +134,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract { * @param Sabre_DAV_Locks_LockInfo $lockInfo * @return bool */ - public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) { + public function unlock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) { $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND `uri` = ? AND `token` = ?' ); $result = $query->execute( array(OC_User::getUser(), $uri, $lockInfo->token)); diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php index 291b87257f..5fc106b85e 100644 --- a/lib/connector/sabre/node.php +++ b/lib/connector/sabre/node.php @@ -85,7 +85,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr $this->path = $newPath; $query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertypath` = ? WHERE `userid` = ? AND `propertypath` = ?' ); - $query->execute( array( $newPath,OC_User::getUser(), $oldPath )); + $query->execute( array( $newPath, OC_User::getUser(), $oldPath )); } @@ -159,7 +159,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr $query->execute( array( OC_User::getUser(), $this->path, $propertyName, $propertyValue )); } else { $query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ? WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?' ); - $query->execute( array( $propertyValue,OC_User::getUser(), $this->path, $propertyName )); + $query->execute( array( $propertyValue, OC_User::getUser(), $this->path, $propertyName )); } } } diff --git a/lib/db.php b/lib/db.php index ba59985b75..fba2687967 100644 --- a/lib/db.php +++ b/lib/db.php @@ -324,7 +324,7 @@ class OC_DB { if( PEAR::isError($result)) { $entry = 'DB Error: "'.$result->getMessage().'"
'; $entry .= 'Offending command was: '.htmlentities($query).'
'; - OC_Log::write('core', $entry,OC_Log::FATAL); + OC_Log::write('core', $entry, OC_Log::FATAL); error_log('DB error: '.$entry); die( $entry ); } @@ -334,7 +334,7 @@ class OC_DB { }catch(PDOException $e) { $entry = 'DB Error: "'.$e->getMessage().'"
'; $entry .= 'Offending command was: '.htmlentities($query).'
'; - OC_Log::write('core', $entry,OC_Log::FATAL); + OC_Log::write('core', $entry, OC_Log::FATAL); error_log('DB error: '.$entry); die( $entry ); } diff --git a/lib/filecache.php b/lib/filecache.php index 782e742d24..6263e03fc6 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -61,7 +61,7 @@ class OC_FileCache{ * * $data is an assiciative array in the same format as returned by get */ - public static function put($path,$data, $root=false) { + public static function put($path, $data, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -120,7 +120,7 @@ class OC_FileCache{ private static function update($id, $data) { $arguments=array(); $queryParts=array(); - foreach(array('size','mtime','ctime','mimetype','encrypted','versioned','writable') as $attribute) { + foreach(array('size','mtime','ctime','mimetype','encrypted','versioned', 'writable') as $attribute) { if(isset($data[$attribute])) { //Convert to int it args are false if($data[$attribute] === false) { @@ -227,7 +227,7 @@ class OC_FileCache{ $where = '`name` LIKE ? AND `user`=?'; } $query=OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*fscache` WHERE '.$where); - $result=$query->execute(array("%$search%",OC_User::getUser())); + $result=$query->execute(array("%$search%", OC_User::getUser())); $names=array(); while($row=$result->fetchRow()) { if(!$returnData) { @@ -366,7 +366,7 @@ class OC_FileCache{ * @param int count (optional) * @param string root (optional) */ - public static function scan($path,$eventSource=false,&$count=0, $root=false) { + public static function scan($path, $eventSource=false,&$count=0, $root=false) { if($eventSource) { $eventSource->send('scanning', array('file'=>$path, 'count'=>$count)); } @@ -402,7 +402,7 @@ class OC_FileCache{ } OC_FileCache_Update::cleanFolder($path, $root); - self::increaseSize($path,$totalSize, $root); + self::increaseSize($path, $totalSize, $root); } /** @@ -448,7 +448,7 @@ class OC_FileCache{ * @return array of file paths * * $part1 and $part2 together form the complete mimetype. - * e.g. searchByMime('text','plain') + * e.g. searchByMime('text', 'plain') * * seccond mimetype part can be ommited * e.g. searchByMime('audio') diff --git a/lib/filecache/update.php b/lib/filecache/update.php index ce395bf6ed..bc403113e7 100644 --- a/lib/filecache/update.php +++ b/lib/filecache/update.php @@ -165,7 +165,7 @@ class OC_FileCache_Update{ $mtime=$view->filemtime($path.'/'); $ctime=$view->filectime($path.'/'); $writable=$view->is_writable($path.'/'); - OC_FileCache::put($path, array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype,'writable'=>$writable)); + OC_FileCache::put($path, array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype, 'writable'=>$writable)); }else{ $count=0; OC_FileCache::scan($path, null, $count, $root); @@ -200,7 +200,7 @@ class OC_FileCache_Update{ * @param string newPath * @param string root (optional) */ - public static function rename($oldPath,$newPath, $root=false) { + public static function rename($oldPath, $newPath, $root=false) { if(!OC_FileCache::inCache($oldPath, $root)) { return; } diff --git a/lib/fileproxy.php b/lib/fileproxy.php index 1ca799fb74..2f81bde64a 100644 --- a/lib/fileproxy.php +++ b/lib/fileproxy.php @@ -97,7 +97,7 @@ class OC_FileProxy{ return true; } - public static function runPostProxies($operation,$path, $result) { + public static function runPostProxies($operation, $path, $result) { if(!self::$enabled) { return $result; } diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php index 05b617c832..81376fb6fc 100644 --- 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/files.php b/lib/files.php index 13bb127e86..5a14083c28 100644 --- a/lib/files.php +++ b/lib/files.php @@ -391,7 +391,7 @@ class OC_Files { */ static function pull($source, $token, $dir, $file) { $tmpfile=tempnam(get_temp_dir(), 'remoteCloudFile'); - $fp=fopen($tmpfile,'w+'); + $fp=fopen($tmpfile, 'w+'); $url=$source.="/files/pull.php?token=$token"; $ch=curl_init(); curl_setopt($ch, CURLOPT_URL, $url); diff --git a/lib/filestorage.php b/lib/filestorage.php index 7b3a15dd8c..dd65f4421b 100644 --- a/lib/filestorage.php +++ b/lib/filestorage.php @@ -48,7 +48,7 @@ abstract class OC_Filestorage{ abstract public function copy($path1, $path2); abstract public function fopen($path, $mode); abstract public function getMimeType($path); - abstract public function hash($type,$path, $raw = false); + abstract public function hash($type, $path, $raw = false); abstract public function free_space($path); abstract public function search($query); abstract public function touch($path, $mtime=null); diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php index 3c06570d89..b97eb79d8d 100644 --- a/lib/filestorage/common.php +++ b/lib/filestorage/common.php @@ -204,7 +204,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { unlink($tmpFile); return $mime; } - public function hash($type,$path, $raw = false) { + public function hash($type, $path, $raw = false) { $tmpFile=$this->getLocalFile(); $hash=hash($type, $tmpFile, $raw); unlink($tmpFile); @@ -264,7 +264,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { $files[]=$dir.'/'.$item; } if($this->is_dir($dir.'/'.$item)) { - $files=array_merge($files,$this->searchInDir($query, $dir.'/'.$item)); + $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item)); } } } diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 89e994120c..2dde0093d4 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -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; } @@ -103,7 +103,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ if(!$this->file_exists($path2)) { $this->mkdir($path2); } - $source=substr($path1, strrpos($path1,'/')+1); + $source=substr($path1, strrpos($path1, '/')+1); $path2.=$source; } return copy($this->datadir.$path1, $this->datadir.$path2); @@ -156,8 +156,8 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return $return; } - public function hash($path,$type, $raw=false) { - return hash_file($type,$this->datadir.$path, $raw); + public function hash($path, $type, $raw=false) { + return hash_file($type, $this->datadir.$path, $raw); } public function free_space($path) { @@ -182,7 +182,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ $files[]=$dir.'/'.$item; } if(is_dir($this->datadir.$dir.'/'.$item)) { - $files=array_merge($files,$this->searchInDir($query, $dir.'/'.$item)); + $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item)); } } return $files; diff --git a/lib/filesystem.php b/lib/filesystem.php index 055ba66aae..aeafb14939 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -35,10 +35,10 @@ * post_create(path) * delete(path, &run) * post_delete(path) - * rename(oldpath,newpath, &run) - * post_rename(oldpath,newpath) - * copy(oldpath,newpath, &run) (if the newpath doesn't exists yes, copy, create and write will be emited in that order) - * post_rename(oldpath,newpath) + * rename(oldpath, newpath, &run) + * post_rename(oldpath, newpath) + * copy(oldpath, newpath, &run) (if the newpath doesn't exists yes, copy, create and write will be emited in that order) + * post_rename(oldpath, newpath) * * the &run parameter can be set to false to prevent the operation from occuring */ @@ -246,7 +246,7 @@ class OC_Filesystem{ } $mtime=filemtime(OC::$SERVERROOT.'/config/mount.php'); - $previousMTime=OC_Appconfig::getValue('files','mountconfigmtime',0); + $previousMTime=OC_Appconfig::getValue('files','mountconfigmtime', 0); if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated OC_FileCache::triggerUpdate(); OC_Appconfig::setValue('files', 'mountconfigmtime', $mtime); @@ -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; } } @@ -356,7 +356,7 @@ class OC_Filesystem{ if(substr($mountpoint, -1)!=='/') { $mountpoint=$mountpoint.'/'; } - self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments); + self::$mounts[$mountpoint]=array('class'=>$class, 'arguments'=>$arguments); } /** @@ -590,7 +590,7 @@ class OC_Filesystem{ $path=substr($path, 0, -1); } //remove duplicate slashes - while(strpos($path,'//')!==false) { + while(strpos($path, '//')!==false) { $path=str_replace('//', '/', $path); } //normalize unicode if possible diff --git a/lib/filesystemview.php b/lib/filesystemview.php index ecbdb63ec5..936e1feb41 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -489,7 +489,7 @@ class OC_FilesystemView { $hooks[]='write'; break; default: - OC_Log::write('core', 'invalid mode ('.$mode.') for '.$path,OC_Log::ERROR); + OC_Log::write('core', 'invalid mode ('.$mode.') for '.$path, OC_Log::ERROR); } return $this->basicOperation('fopen', $path, $hooks, $mode); diff --git a/lib/image.php b/lib/image.php index 38acf00d9f..41cd908169 100644 --- a/lib/image.php +++ b/lib/image.php @@ -271,7 +271,7 @@ class OC_Image { return -1; } if(is_null($this->filepath) || !is_readable($this->filepath)) { - OC_Log::write('core','OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG); + OC_Log::write('core', 'OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG); return -1; } $exif = @exif_read_data($this->filepath, 'IFD0'); diff --git a/lib/installer.php b/lib/installer.php index 0c776d47d5..266c07d5c2 100644 --- 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; } @@ -248,7 +248,7 @@ class OC_Installer{ * -# including appinfo/upgrade.php * -# setting the installed version * - * upgrade.php can determine the current installed version of the app using "OC_Appconfig::getValue($appid,'installed_version')" + * upgrade.php can determine the current installed version of the app using "OC_Appconfig::getValue($appid, 'installed_version')" */ public static function upgradeApp( $data = array()) { // TODO: write function diff --git a/lib/json.php b/lib/json.php index be37f94ca6..204430411c 100644 --- a/lib/json.php +++ b/lib/json.php @@ -72,7 +72,7 @@ class OC_JSON{ public static function checkSubAdminUser() { self::checkLoggedIn(); self::verifyUser(); - if(!OC_Group::inGroup(OC_User::getUser(),'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) { + if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) { $l = OC_L10N::get('lib'); self::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); exit(); diff --git a/lib/l10n.php b/lib/l10n.php index 996ace2f57..f172710e5d 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -167,7 +167,7 @@ class OC_L10N{ * */ public function tA($textArray) { - OC_Log::write('core', 'DEPRECATED: the method tA is deprecated and will be removed soon.',OC_Log::WARN); + OC_Log::write('core', 'DEPRECATED: the method tA is deprecated and will be removed soon.', OC_Log::WARN); $result = array(); foreach($textArray as $key => $text) { $result[$key] = (string)$this->t($text); diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php index d4644163ad..ec43208d83 100644 --- a/lib/log/owncloud.php +++ b/lib/log/owncloud.php @@ -44,9 +44,9 @@ class OC_Log_Owncloud { * @param int level */ public static function write($app, $message, $level) { - $minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ),OC_Log::ERROR); + $minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR); if($level>=$minLevel) { - $entry=array('app'=>$app, 'message'=>$message, 'level'=>$level,'time'=>time()); + $entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=>time()); $fh=fopen(self::$logFile, 'a'); fwrite($fh, json_encode($entry)."\n"); fclose($fh); diff --git a/lib/mail.php b/lib/mail.php index a77ac58569..c78fcce88d 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -27,7 +27,7 @@ class OC_Mail { * @param string $fromname * @param bool $html */ - public static function send($toaddress,$toname,$subject,$mailtext,$fromaddress,$fromname,$html=0,$altbody='',$ccaddress='',$ccname='',$bcc='') { + public static function send($toaddress,$toname,$subject,$mailtext,$fromaddress,$fromname,$html=0,$altbody='',$ccaddress='',$ccname='', $bcc='') { $SMTPMODE = OC_Config::getValue( 'mail_smtpmode', 'sendmail' ); $SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' ); diff --git a/lib/migrate.php b/lib/migrate.php index e967ae06ec..616417a227 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -611,11 +611,11 @@ 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 { - OC_Log::write('migration','Migration.db not found at: '.$db, OC_Log::FATAL ); + OC_Log::write('migration', 'Migration.db not found at: '.$db, OC_Log::FATAL ); return false; } diff --git a/lib/migration/content.php b/lib/migration/content.php index eec475945a..54982b3c84 100644 --- 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 2a36cbc123..ceeb78570f 100644 --- 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/request.php b/lib/request.php index 87262d9862..287d20d1a5 100644 --- a/lib/request.php +++ b/lib/request.php @@ -63,7 +63,7 @@ class OC_Request { $path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME'])); // following is taken from Sabre_DAV_URLUtil::decodePathSegment $path_info = rawurldecode($path_info); - $encoding = mb_detect_encoding($path_info, array('UTF-8','ISO-8859-1')); + $encoding = mb_detect_encoding($path_info, array('UTF-8', 'ISO-8859-1')); switch($encoding) { @@ -98,7 +98,7 @@ class OC_Request { $HTTP_ACCEPT_ENCODING = $_SERVER["HTTP_ACCEPT_ENCODING"]; if( strpos($HTTP_ACCEPT_ENCODING, 'x-gzip') !== false ) return 'x-gzip'; - else if( strpos($HTTP_ACCEPT_ENCODING,'gzip') !== false ) + else if( strpos($HTTP_ACCEPT_ENCODING, 'gzip') !== false ) return 'gzip'; return false; } diff --git a/lib/route.php b/lib/route.php index d5233d7986..5901717c09 100644 --- a/lib/route.php +++ b/lib/route.php @@ -108,7 +108,7 @@ class OC_Route extends Route { public function actionInclude($file) { $function = create_function('$param', 'unset($param["_route"]);' - .'$_GET=array_merge($_GET,$param);' + .'$_GET=array_merge($_GET, $param);' .'unset($param);' .'require_once "'.$file.'";'); $this->action($function); diff --git a/lib/search.php b/lib/search.php index 2629c5e2fb..3c3378ad13 100644 --- a/lib/search.php +++ b/lib/search.php @@ -41,7 +41,7 @@ class OC_Search{ * @param string $provider class name of a OC_Search_Provider */ public static function registerProvider($class, $options=array()) { - self::$registeredProviders[]=array('class'=>$class,'options'=>$options); + self::$registeredProviders[]=array('class'=>$class, 'options'=>$options); } /** diff --git a/lib/setup.php b/lib/setup.php index c424ad6fb0..726b3352d5 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -95,7 +95,7 @@ class OC_Setup { //write the config file OC_Config::setValue('datadirectory', $datadir); OC_Config::setValue('dbtype', $dbtype); - OC_Config::setValue('version', implode('.',OC_Util::getVersion())); + OC_Config::setValue('version', implode('.', OC_Util::getVersion())); if($dbtype == 'mysql') { $dbuser = $options['dbuser']; $dbpass = $options['dbpass']; diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php index b5ea0a2b2e..981c280f0d 100644 --- a/lib/streamwrappers.php +++ b/lib/streamwrappers.php @@ -234,7 +234,7 @@ class OC_CloseStreamWrapper{ } public function stream_seek($offset, $whence=SEEK_SET) { - fseek($this->source,$offset, $whence); + fseek($this->source, $offset, $whence); } public function stream_tell() { @@ -249,16 +249,16 @@ class OC_CloseStreamWrapper{ return fwrite($this->source, $data); } - public function stream_set_option($option,$arg1, $arg2) { + public function stream_set_option($option, $arg1, $arg2) { switch($option) { case STREAM_OPTION_BLOCKING: stream_set_blocking($this->source, $arg1); break; case STREAM_OPTION_READ_TIMEOUT: - stream_set_timeout($this->source,$arg1, $arg2); + stream_set_timeout($this->source, $arg1, $arg2); break; case STREAM_OPTION_WRITE_BUFFER: - stream_set_write_buffer($this->source,$arg1, $arg2); + stream_set_write_buffer($this->source, $arg1, $arg2); } } diff --git a/lib/template.php b/lib/template.php index ad25dbcff5..d1cce8ad7f 100644 --- a/lib/template.php +++ b/lib/template.php @@ -196,11 +196,11 @@ class OC_Template{ public static function detectFormfactor() { // please add more useragent strings for other devices if(isset($_SERVER['HTTP_USER_AGENT'])) { - if(stripos($_SERVER['HTTP_USER_AGENT'],'ipad')>0) { + if(stripos($_SERVER['HTTP_USER_AGENT'], 'ipad')>0) { $mode='tablet'; - }elseif(stripos($_SERVER['HTTP_USER_AGENT'],'iphone')>0) { + }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'; @@ -357,7 +357,7 @@ class OC_Template{ * @param string $text the text content for the element */ public function addHeader( $tag, $attributes, $text='') { - $this->headers[]=array('tag'=>$tag,'attributes'=>$attributes,'text'=>$text); + $this->headers[]=array('tag'=>$tag,'attributes'=>$attributes, 'text'=>$text); } /** diff --git a/lib/templatelayout.php b/lib/templatelayout.php index c3da172a7c..1a0570a270 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -12,10 +12,10 @@ class OC_TemplateLayout extends OC_Template { if( $renderas == 'user' ) { parent::__construct( 'core', 'layout.user' ); - if(in_array(OC_APP::getCurrentApp(), array('settings','admin','help'))!==false) { - $this->assign('bodyid','body-settings', false); + if(in_array(OC_APP::getCurrentApp(), array('settings','admin', 'help'))!==false) { + $this->assign('bodyid', 'body-settings', false); }else{ - $this->assign('bodyid','body-user', false); + $this->assign('bodyid', 'body-user', false); } // Add navigation entry diff --git a/lib/updater.php b/lib/updater.php index 7d5ec4ffe9..11081eded6 100644 --- a/lib/updater.php +++ b/lib/updater.php @@ -30,7 +30,7 @@ class OC_Updater{ */ public static function check() { OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true)); - if(OC_Appconfig::getValue('core', 'installedat','')=='') OC_Appconfig::setValue('core', 'installedat', microtime(true)); + if(OC_Appconfig::getValue('core', 'installedat', '')=='') OC_Appconfig::setValue('core', 'installedat', microtime(true)); $updaterurl='http://apps.owncloud.com/updater.php'; $version=OC_Util::getVersion(); diff --git a/lib/user.php b/lib/user.php index 126f2aa3da..be0e525d86 100644 --- 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/lib/user/database.php b/lib/user/database.php index f39c19829e..f33e338e2e 100644 --- a/lib/user/database.php +++ b/lib/user/database.php @@ -155,7 +155,7 @@ class OC_User_Database extends OC_User_Backend { * Get a list of all users. */ public function getUsers($search = '', $limit = null, $offset = null) { - $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)',$limit, $offset); + $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset); $result = $query->execute(array($search.'%')); $users = array(); while ($row = $result->fetchRow()) { diff --git a/lib/user/http.php b/lib/user/http.php index ea055b6982..944ede73a0 100644 --- a/lib/user/http.php +++ b/lib/user/http.php @@ -50,7 +50,7 @@ class OC_User_HTTP extends OC_User_Backend { * @return boolean */ private function matchUrl($url) { - return ! is_null(parse_url($url,PHP_URL_USER)); + return ! is_null(parse_url($url, PHP_URL_USER)); } /** diff --git a/lib/util.php b/lib/util.php index a9bc5c061c..d8b926a065 100755 --- a/lib/util.php +++ b/lib/util.php @@ -95,7 +95,7 @@ class OC_Util { */ public static function getVersion() { // hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4.90.0. This is not visible to the user - return array(4,91, 00); + return array(4, 91, 00); } /** @@ -157,7 +157,7 @@ class OC_Util { * @param string $text the text content for the element */ public static function addHeader( $tag, $attributes, $text='') { - self::$headers[]=array('tag'=>$tag,'attributes'=>$attributes,'text'=>$text); + self::$headers[]=array('tag'=>$tag,'attributes'=>$attributes, 'text'=>$text); } /** @@ -186,7 +186,7 @@ class OC_Util { * @param string $url * @return OC_Template */ - public static function getPageNavi($pagecount,$page, $url) { + public static function getPageNavi($pagecount, $page, $url) { $pagelinkcount=8; if ($pagecount>1) { @@ -217,7 +217,7 @@ class OC_Util { $web_server_restart= false; //check for database drivers if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect')) { - $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.
','hint'=>'');//TODO: sane hint + $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.
', 'hint'=>'');//TODO: sane hint $web_server_restart= true; } @@ -226,13 +226,13 @@ class OC_Util { // Check if config folder is writable. if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) { - $errors[]=array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud"); + $errors[]=array('error'=>"Can't write into config directory 'config'", 'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud"); } // Check if there is a writable install folder. if(OC_Config::getValue('appstoreenabled', true)) { if( OC_App::getInstallPath() === null || !is_writable(OC_App::getInstallPath()) || !is_readable(OC_App::getInstallPath()) ) { - $errors[]=array('error'=>"Can't write into apps directory",'hint'=>"You can usually fix this by giving the webserver user write access to the apps directory + $errors[]=array('error'=>"Can't write into apps directory", 'hint'=>"You can usually fix this by giving the webserver user write access to the apps directory in owncloud or disabling the appstore in the config file."); } } @@ -269,57 +269,57 @@ class OC_Util { if(!is_dir($CONFIG_DATADIRECTORY)) { $success=@mkdir($CONFIG_DATADIRECTORY); if(!$success) { - $errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' "); + $errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY.")", 'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' "); } } else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) { - $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud
','hint'=>$permissionsHint); + $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud
', 'hint'=>$permissionsHint); } // check if all required php modules are present if(!class_exists('ZipArchive')) { - $errors[]=array('error'=>'PHP module zip not installed.
','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module zip not installed.
', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('mb_detect_encoding')) { - $errors[]=array('error'=>'PHP module mb multibyte not installed.
','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module mb multibyte not installed.
', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('ctype_digit')) { - $errors[]=array('error'=>'PHP module ctype is not installed.
','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module ctype is not installed.
', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('json_encode')) { - $errors[]=array('error'=>'PHP module JSON is not installed.
','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module JSON is not installed.
', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('imagepng')) { - $errors[]=array('error'=>'PHP module GD is not installed.
','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module GD is not installed.
', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('gzencode')) { - $errors[]=array('error'=>'PHP module zlib is not installed.
','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module zlib is not installed.
', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('iconv')) { - $errors[]=array('error'=>'PHP module iconv is not installed.
','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module iconv is not installed.
', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('simplexml_load_string')) { - $errors[]=array('error'=>'PHP module SimpleXML is not installed.
','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module SimpleXML is not installed.
', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(floatval(phpversion())<5.3) { - $errors[]=array('error'=>'PHP 5.3 is required.
','hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher. PHP 5.2 is no longer supported by ownCloud and the PHP community.'); + $errors[]=array('error'=>'PHP 5.3 is required.
', 'hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher. PHP 5.2 is no longer supported by ownCloud and the PHP community.'); $web_server_restart= false; } if(!defined('PDO::ATTR_DRIVER_NAME')) { - $errors[]=array('error'=>'PHP PDO module is not installed.
','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP PDO module is not installed.
', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if($web_server_restart) { - $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?
','hint'=>'Please ask your server administrator to restart the web server.'); + $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?
', 'hint'=>'Please ask your server administrator to restart the web server.'); } return $errors; diff --git a/lib/vcategories.php b/lib/vcategories.php index ec4536673a..46256def9c 100644 --- a/lib/vcategories.php +++ b/lib/vcategories.php @@ -66,7 +66,7 @@ class OC_VCategories { * @returns array containing the categories as strings. */ public function categories() { - //OC_Log::write('core','OC_VCategories::categories: '.print_r($this->categories, true), OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::categories: '.print_r($this->categories, true), OC_Log::DEBUG); if(!$this->categories) { return array(); } @@ -139,12 +139,12 @@ class OC_VCategories { $this->categories = array(); } foreach($objects as $object) { - //OC_Log::write('core','OC_VCategories::rescan: '.substr($object, 0, 100).'(...)', OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::rescan: '.substr($object, 0, 100).'(...)', OC_Log::DEBUG); $vobject = OC_VObject::parse($object); if(!is_null($vobject)) { $this->loadFromVObject($vobject, $sync); } else { - OC_Log::write('core','OC_VCategories::rescan, unable to parse. ID: '.', '.substr($object, 0, 100).'(...)', OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::rescan, unable to parse. ID: '.', '.substr($object, 0, 100).'(...)', OC_Log::DEBUG); } } $this->save(); @@ -158,9 +158,9 @@ class OC_VCategories { usort($this->categories, 'strnatcasecmp'); // usort to also renumber the keys $escaped_categories = serialize($this->categories); OC_Preferences::setValue($this->user, $this->app, self::PREF_CATEGORIES_LABEL, $escaped_categories); - OC_Log::write('core','OC_VCategories::save: '.print_r($this->categories, true), OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::save: '.print_r($this->categories, true), OC_Log::DEBUG); } else { - OC_Log::write('core','OC_VCategories::save: $this->categories is not an array! '.print_r($this->categories, true), OC_Log::ERROR); + OC_Log::write('core', 'OC_VCategories::save: $this->categories is not an array! '.print_r($this->categories, true), OC_Log::ERROR); } } @@ -173,37 +173,37 @@ class OC_VCategories { if(!is_array($names)) { $names = array($names); } - OC_Log::write('core','OC_VCategories::delete, before: '.print_r($this->categories, true), OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::delete, before: '.print_r($this->categories, true), OC_Log::DEBUG); foreach($names as $name) { - OC_Log::write('core','OC_VCategories::delete: '.$name, OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::delete: '.$name, OC_Log::DEBUG); if($this->hasCategory($name)) { - //OC_Log::write('core','OC_VCategories::delete: '.$name.' got it', OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::delete: '.$name.' got it', OC_Log::DEBUG); unset($this->categories[$this->array_searchi($name, $this->categories)]); } } $this->save(); - OC_Log::write('core','OC_VCategories::delete, after: '.print_r($this->categories, true), OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::delete, after: '.print_r($this->categories, true), OC_Log::DEBUG); if(!is_null($objects)) { foreach($objects as $key=>&$value) { $vobject = OC_VObject::parse($value[1]); if(!is_null($vobject)) { $categories = $vobject->getAsArray('CATEGORIES'); - //OC_Log::write('core','OC_VCategories::delete, before: '.$key.': '.print_r($categories, true), OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::delete, before: '.$key.': '.print_r($categories, true), OC_Log::DEBUG); foreach($names as $name) { $idx = $this->array_searchi($name, $categories); - //OC_Log::write('core','OC_VCategories::delete, loop: '.$name.', '.print_r($idx, true), OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::delete, loop: '.$name.', '.print_r($idx, true), OC_Log::DEBUG); if($idx !== false) { - OC_Log::write('core','OC_VCategories::delete, unsetting: '.$categories[$this->array_searchi($name, $categories)], OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::delete, unsetting: '.$categories[$this->array_searchi($name, $categories)], OC_Log::DEBUG); unset($categories[$this->array_searchi($name, $categories)]); //unset($categories[$idx]); } } - //OC_Log::write('core','OC_VCategories::delete, after: '.$key.': '.print_r($categories, true), OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::delete, after: '.$key.': '.print_r($categories, true), OC_Log::DEBUG); $vobject->setString('CATEGORIES', implode(',', $categories)); $value[1] = $vobject->serialize(); $objects[$key] = $value; } else { - OC_Log::write('core','OC_VCategories::delete, unable to parse. ID: '.$value[0].', '.substr($value[1], 0, 50).'(...)', OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::delete, unable to parse. ID: '.$value[0].', '.substr($value[1], 0, 50).'(...)', OC_Log::DEBUG); } } } diff --git a/settings/admin.php b/settings/admin.php index 7ce0ee0d6f..c704704ed3 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -25,7 +25,7 @@ function compareEntries($a, $b) { } usort($entries, 'compareEntries'); -$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 )); +$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 )); $tmpl->assign('entries', $entries); $tmpl->assign('entriesremain', $entriesremain); $tmpl->assign('htaccessworking', $htaccessworking); diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php index 4b32585b30..845f8ea408 100644 --- a/settings/ajax/setquota.php +++ b/settings/ajax/setquota.php @@ -36,5 +36,5 @@ if($username) { } OC_Appconfig::setValue('files', 'default_quota', $quota); } -OC_JSON::success(array("data" => array( "username" => $username ,'quota' => $quota))); +OC_JSON::success(array("data" => array( "username" => $username , 'quota' => $quota))); diff --git a/settings/personal.php b/settings/personal.php index f28ab2ae75..47dbcc53eb 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -40,11 +40,11 @@ $languages=array(); foreach($languageCodes as $lang) { $l=OC_L10N::get('settings', $lang); if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file - $languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__')); + $languages[]=array('code'=>$lang, 'name'=>$l->t('__language_name__')); }elseif(isset($languageNames[$lang])) { - $languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]); + $languages[]=array('code'=>$lang, 'name'=>$languageNames[$lang]); }else{//fallback to language code - $languages[]=array('code'=>$lang,'name'=>$lang); + $languages[]=array('code'=>$lang, 'name'=>$lang); } } diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 35f34489fe..300d6093d6 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -3,7 +3,7 @@ * This file is licensed under the Affero General Public License version 3 or later. * See the COPYING-README file. */ -$levels=array('Debug','Info','Warning','Error','Fatal'); +$levels=array('Debug','Info','Warning','Error', 'Fatal'); ?> instance=$this->getExisting(); $allFiles=$this->instance->getFiles(); - $expected=array('lorem.txt','logo-wide.png','dir/','dir/lorem.txt'); - $this->assertEqual(4, count($allFiles),'only found '.count($allFiles).' out of 4 expected files'); + $expected=array('lorem.txt','logo-wide.png','dir/', 'dir/lorem.txt'); + $this->assertEqual(4, count($allFiles), 'only found '.count($allFiles).' out of 4 expected files'); foreach($expected as $file) { $this->assertContains($file, $allFiles, 'cant find '. $file . ' in archive'); - $this->assertTrue($this->instance->fileExists($file),'file '.$file.' does not exist in archive'); + $this->assertTrue($this->instance->fileExists($file), 'file '.$file.' does not exist in archive'); } $this->assertFalse($this->instance->fileExists('non/existing/file')); $rootContent=$this->instance->getFolder(''); - $expected=array('lorem.txt','logo-wide.png','dir/'); + $expected=array('lorem.txt','logo-wide.png', 'dir/'); $this->assertEqual(3, count($rootContent)); foreach($expected as $file) { $this->assertContains($file, $rootContent, 'cant find '. $file . ' in archive'); @@ -71,14 +71,14 @@ abstract class Test_Archive extends UnitTestCase { $this->assertFalse($this->instance->fileExists('lorem.txt/')); $this->assertEqual(file_get_contents($textFile), $this->instance->getFile('lorem.txt')); - $this->instance->addFile('lorem.txt','foobar'); + $this->instance->addFile('lorem.txt', 'foobar'); $this->assertEqual('foobar', $this->instance->getFile('lorem.txt')); } public function testReadStream() { $dir=OC::$SERVERROOT.'/tests/data'; $this->instance=$this->getExisting(); - $fh=$this->instance->getStream('lorem.txt','r'); + $fh=$this->instance->getStream('lorem.txt', 'r'); $this->assertTrue($fh); $content=fread($fh, $this->instance->filesize('lorem.txt')); fclose($fh); @@ -87,8 +87,8 @@ abstract class Test_Archive extends UnitTestCase { public function testWriteStream() { $dir=OC::$SERVERROOT.'/tests/data'; $this->instance=$this->getNew(); - $fh=$this->instance->getStream('lorem.txt','w'); - $source=fopen($dir.'/lorem.txt','r'); + $fh=$this->instance->getStream('lorem.txt', 'w'); + $source=fopen($dir.'/lorem.txt', 'r'); OCP\Files::streamCopy($source, $fh); fclose($source); fclose($fh); @@ -123,7 +123,7 @@ abstract class Test_Archive extends UnitTestCase { $this->instance=$this->getNew(); $this->instance->addFile('lorem.txt', $textFile); $this->assertFalse($this->instance->fileExists('target.txt')); - $this->instance->rename('lorem.txt','target.txt'); + $this->instance->rename('lorem.txt', 'target.txt'); $this->assertTrue($this->instance->fileExists('target.txt')); $this->assertFalse($this->instance->fileExists('lorem.txt')); $this->assertEqual(file_get_contents($textFile), $this->instance->getFile('target.txt')); diff --git a/tests/lib/cache.php b/tests/lib/cache.php index c104460ea4..1a1287ff13 100644 --- a/tests/lib/cache.php +++ b/tests/lib/cache.php @@ -26,22 +26,22 @@ abstract class Test_Cache extends UnitTestCase { $this->instance->set('value1', $value); $this->assertTrue($this->instance->hasKey('value1')); $received=$this->instance->get('value1'); - $this->assertEqual($value, $received,'Value recieved from cache not equal to the original'); + $this->assertEqual($value, $received, 'Value recieved from cache not equal to the original'); $value='ipsum lorum'; $this->instance->set('value1', $value); $received=$this->instance->get('value1'); - $this->assertEqual($value, $received,'Value not overwritten by second set'); + $this->assertEqual($value, $received, 'Value not overwritten by second set'); $value2='foobar'; $this->instance->set('value2', $value2); $received2=$this->instance->get('value2'); $this->assertTrue($this->instance->hasKey('value1')); $this->assertTrue($this->instance->hasKey('value2')); - $this->assertEqual($value, $received,'Value changed while setting other variable'); - $this->assertEqual($value2, $received2,'Second value not equal to original'); + $this->assertEqual($value, $received, 'Value changed while setting other variable'); + $this->assertEqual($value2, $received2, 'Second value not equal to original'); $this->assertFalse($this->instance->hasKey('not_set')); - $this->assertNull($this->instance->get('not_set'),'Unset value not equal to null'); + $this->assertNull($this->instance->get('not_set'), 'Unset value not equal to null'); $this->assertTrue($this->instance->remove('value1')); $this->assertFalse($this->instance->hasKey('value1')); diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index 47b18e5b9f..d64627198e 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -39,7 +39,7 @@ class Test_Cache_File extends Test_Cache { //set up temporary storage OC_Filesystem::clearMounts(); - OC_Filesystem::mount('OC_Filestorage_Temporary', array(),'/'); + OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/'); OC_User::clearBackends(); OC_User::useBackend(new OC_User_Dummy()); diff --git a/tests/lib/group.php b/tests/lib/group.php index 9ad397b94a..7b9ca3414b 100644 --- a/tests/lib/group.php +++ b/tests/lib/group.php @@ -50,15 +50,15 @@ class Test_Group extends UnitTestCase { $this->assertFalse(OC_Group::addToGroup($user1, $group1)); - $this->assertEqual(array($user1),OC_Group::usersInGroup($group1)); - $this->assertEqual(array(),OC_Group::usersInGroup($group2)); + $this->assertEqual(array($user1), OC_Group::usersInGroup($group1)); + $this->assertEqual(array(), OC_Group::usersInGroup($group2)); - $this->assertEqual(array($group1),OC_Group::getUserGroups($user1)); - $this->assertEqual(array(),OC_Group::getUserGroups($user2)); + $this->assertEqual(array($group1), OC_Group::getUserGroups($user1)); + $this->assertEqual(array(), OC_Group::getUserGroups($user2)); OC_Group::deleteGroup($group1); - $this->assertEqual(array(),OC_Group::getUserGroups($user1)); - $this->assertEqual(array(),OC_Group::usersInGroup($group1)); + $this->assertEqual(array(), OC_Group::getUserGroups($user1)); + $this->assertEqual(array(), OC_Group::usersInGroup($group1)); $this->assertFalse(OC_Group::inGroup($user1, $group1)); } @@ -76,13 +76,13 @@ class Test_Group extends UnitTestCase { $this->assertEqual(array($group1), $backend1->getGroups()); $this->assertEqual(array(), $backend2->getGroups()); - $this->assertEqual(array($group1),OC_Group::getGroups()); + $this->assertEqual(array($group1), OC_Group::getGroups()); $this->assertTrue(OC_Group::groupExists($group1)); $this->assertFalse(OC_Group::groupExists($group2)); $backend1->createGroup($group2); - $this->assertEqual(array($group1, $group2),OC_Group::getGroups()); + $this->assertEqual(array($group1, $group2), OC_Group::getGroups()); $this->assertTrue(OC_Group::groupExists($group1)); $this->assertTrue(OC_Group::groupExists($group2)); @@ -101,14 +101,14 @@ class Test_Group extends UnitTestCase { $this->assertFalse(OC_Group::addToGroup($user1, $group1)); - $this->assertEqual(array($user1),OC_Group::usersInGroup($group1)); + $this->assertEqual(array($user1), OC_Group::usersInGroup($group1)); - $this->assertEqual(array($group1),OC_Group::getUserGroups($user1)); - $this->assertEqual(array(),OC_Group::getUserGroups($user2)); + $this->assertEqual(array($group1), OC_Group::getUserGroups($user1)); + $this->assertEqual(array(), OC_Group::getUserGroups($user2)); OC_Group::deleteGroup($group1); - $this->assertEqual(array(),OC_Group::getUserGroups($user1)); - $this->assertEqual(array(),OC_Group::usersInGroup($group1)); + $this->assertEqual(array(), OC_Group::getUserGroups($user1)); + $this->assertEqual(array(), OC_Group::usersInGroup($group1)); $this->assertFalse(OC_Group::inGroup($user1, $group1)); } } diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php index f864a9e361..89b2785fca 100644 --- a/tests/lib/streamwrappers.php +++ b/tests/lib/streamwrappers.php @@ -22,7 +22,7 @@ class Test_StreamWrappers extends UnitTestCase { public function testFakeDir() { - $items=array('foo','bar'); + $items=array('foo', 'bar'); OC_FakeDirStream::$dirs['test']=$items; $dh=opendir('fakedir://test'); $result=array(); @@ -60,9 +60,9 @@ class Test_StreamWrappers extends UnitTestCase { //test callback $tmpFile=OC_Helper::TmpFile('.txt'); $file='close://'.$tmpFile; - OC_CloseStreamWrapper::$callBacks[$tmpFile]=array('Test_StreamWrappers','closeCallBack'); - $fh=fopen($file,'w'); - fwrite($fh,'asd'); + OC_CloseStreamWrapper::$callBacks[$tmpFile]=array('Test_StreamWrappers', 'closeCallBack'); + $fh=fopen($file, 'w'); + fwrite($fh, 'asd'); try{ fclose($fh); $this->fail('Expected exception'); diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php index eb3aa91b68..79653481f9 100644 --- a/tests/lib/user/backend.php +++ b/tests/lib/user/backend.php @@ -51,12 +51,12 @@ abstract class Test_User_Backend extends UnitTestCase { $name1=$this->getUser(); $name2=$this->getUser(); - $this->backend->createUser($name1,''); + $this->backend->createUser($name1, ''); $count=count($this->backend->getUsers())-$startCount; $this->assertEqual(1, $count); $this->assertTrue((array_search($name1, $this->backend->getUsers())!==false)); $this->assertFalse((array_search($name2, $this->backend->getUsers())!==false)); - $this->backend->createUser($name2,''); + $this->backend->createUser($name2, ''); $count=count($this->backend->getUsers())-$startCount; $this->assertEqual(2, $count); $this->assertTrue((array_search($name1, $this->backend->getUsers())!==false)); @@ -76,24 +76,24 @@ abstract class Test_User_Backend extends UnitTestCase { $this->assertFalse($this->backend->userExists($name1)); $this->assertFalse($this->backend->userExists($name2)); - $this->backend->createUser($name1,'pass1'); - $this->backend->createUser($name2,'pass2'); + $this->backend->createUser($name1, 'pass1'); + $this->backend->createUser($name2, 'pass2'); $this->assertTrue($this->backend->userExists($name1)); $this->assertTrue($this->backend->userExists($name2)); - $this->assertTrue($this->backend->checkPassword($name1,'pass1')); - $this->assertTrue($this->backend->checkPassword($name2,'pass2')); + $this->assertTrue($this->backend->checkPassword($name1, 'pass1')); + $this->assertTrue($this->backend->checkPassword($name2, 'pass2')); - $this->assertFalse($this->backend->checkPassword($name1,'pass2')); - $this->assertFalse($this->backend->checkPassword($name2,'pass1')); + $this->assertFalse($this->backend->checkPassword($name1, 'pass2')); + $this->assertFalse($this->backend->checkPassword($name2, 'pass1')); - $this->assertFalse($this->backend->checkPassword($name1,'dummy')); - $this->assertFalse($this->backend->checkPassword($name2,'foobar')); + $this->assertFalse($this->backend->checkPassword($name1, 'dummy')); + $this->assertFalse($this->backend->checkPassword($name2, 'foobar')); - $this->backend->setPassword($name1,'newpass1'); - $this->assertFalse($this->backend->checkPassword($name1,'pass1')); - $this->assertTrue($this->backend->checkPassword($name1,'newpass1')); - $this->assertFalse($this->backend->checkPassword($name2,'newpass1')); + $this->backend->setPassword($name1, 'newpass1'); + $this->assertFalse($this->backend->checkPassword($name1, 'pass1')); + $this->assertTrue($this->backend->checkPassword($name1, 'newpass1')); + $this->assertFalse($this->backend->checkPassword($name2, 'newpass1')); } } From 80b98547107ec3b5895a47c2f1ebfbd4f171f238 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 4 Nov 2012 14:26:41 +0100 Subject: [PATCH 12/12] Remove uneeded debug output --- apps/user_webdavauth/settings.php | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php index 4f1ddbbefd..497a3385ca 100755 --- a/apps/user_webdavauth/settings.php +++ b/apps/user_webdavauth/settings.php @@ -21,7 +21,6 @@ * */ -print_r($_POST); if($_POST) { if(isset($_POST['webdav_url'])) {