diff options
author | Jan-Christoph Borchardt <jan@unhosted.org> | 2012-04-15 13:32:45 +0200 |
---|---|---|
committer | Jan-Christoph Borchardt <jan@unhosted.org> | 2012-04-15 13:34:30 +0200 |
commit | 7ddd0434270fa1cc51769e812f257cf63b0ec92f (patch) | |
tree | 10a2cac32c4cdb05e4c88b9008d6b1e05e670faa /apps | |
parent | d32799e4bf48412d71222401dba84aaab47a75a7 (diff) | |
download | nextcloud-server-7ddd0434270fa1cc51769e812f257cf63b0ec92f.tar.gz nextcloud-server-7ddd0434270fa1cc51769e812f257cf63b0ec92f.zip |
renamed extention to extension, also now only showing lowercase
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files_archive/lib/tar.php | 4 | ||||
-rw-r--r-- | apps/files_encryption/lib/proxy.php | 4 | ||||
-rw-r--r-- | apps/files_sharing/get.php | 2 | ||||
-rw-r--r-- | apps/media/js/loader.js | 6 | ||||
-rw-r--r-- | apps/media/js/music.js | 6 | ||||
-rw-r--r-- | apps/media/lib_scanner.php | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/apps/files_archive/lib/tar.php b/apps/files_archive/lib/tar.php index a5d54004788..1eed11a762d 100644 --- a/apps/files_archive/lib/tar.php +++ b/apps/files_archive/lib/tar.php @@ -30,8 +30,8 @@ class OC_Archive_TAR extends OC_Archive{ */ static public function getTarType($file){ if(strpos($file,'.')){ - $extention=substr($file,strrpos($file,'.')); - switch($extention){ + $extension=substr($file,strrpos($file,'.')); + switch($extension){ case 'gz': case 'tgz': return self::GZIP; diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index c1c26d7754f..c68df06f9fa 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -41,8 +41,8 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ if(self::isEncrypted($path)){ return true; } - $extention=substr($path,strrpos($path,'.')+1); - if(array_search($extention,self::$blackList)===false){ + $extension=substr($path,strrpos($path,'.')+1); + if(array_search($extension,self::$blackList)===false){ return true; } } diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php index fa3535fd144..3e42bf6a6c7 100644 --- a/apps/files_sharing/get.php +++ b/apps/files_sharing/get.php @@ -31,7 +31,7 @@ if ($source !== false) { if ($i['type'] == 'file') { $fileinfo = pathinfo($i['name']); $i['basename'] = $fileinfo['filename']; - $i['extention'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : ''; + $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : ''; } $i['directory'] = substr($i['directory'], $rootLength); if ($i['directory'] == "/") { diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js index 514965666fa..393f8ba914e 100644 --- a/apps/media/js/loader.js +++ b/apps/media/js/loader.js @@ -1,10 +1,10 @@ function musicTypeFromFile(file){ - var extention=file.substr(file.indexOf('.')+1).toLowerCase(); - if(extention=='ogg'){ + var extension=file.substr(file.indexOf('.')+1).toLowerCase(); + if(extension=='ogg'){ return 'oga'; } //TODO check for more specific cases - return extention; + return extension; } function playAudio(filename){ diff --git a/apps/media/js/music.js b/apps/media/js/music.js index f93f0fded62..db129227626 100644 --- a/apps/media/js/music.js +++ b/apps/media/js/music.js @@ -48,10 +48,10 @@ function getUrlVars(){ } function musicTypeFromFile(file){ - var extention=file.split('.').pop().toLowerCase(); - if(extention=='ogg'){ + var extension=file.split('.').pop().toLowerCase(); + if(extension=='ogg'){ return 'oga'; } //TODO check for more specific cases - return extention; + return extension; } diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php index 341f411bdb8..78c6ad491da 100644 --- a/apps/media/lib_scanner.php +++ b/apps/media/lib_scanner.php @@ -127,7 +127,7 @@ class OC_MEDIA_SCANNER{ } /** - * quick check if a song is a music file by checking the extention, not as good as a proper mimetype check but way faster + * quick check if a song is a music file by checking the extension, not as good as a proper mimetype check but way faster * @param string $filename * @return bool */ |