diff --git a/apps/files_archive/lib/tar.php b/apps/files_archive/lib/tar.php index a5d5400478..1eed11a762 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 c1c26d7754..c68df06f9f 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 fa3535fd14..3e42bf6a6c 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 514965666f..393f8ba914 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 f93f0fded6..db12922762 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 341f411bdb..78c6ad491d 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 */ diff --git a/core/js/js.js b/core/js/js.js index 2e65dfac50..51dcbe5413 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -69,10 +69,10 @@ OC={ * @param file the name of the image file * @return string * - * if no extention is given for the image, it will automatically decide between .png and .svg based on what the browser supports + * if no extension is given for the image, it will automatically decide between .png and .svg based on what the browser supports */ imagePath:function(app,file){ - if(file.indexOf('.')==-1){//if no extention is given, use png or svg depending on browser support + if(file.indexOf('.')==-1){//if no extension is given, use png or svg depending on browser support file+=(SVGSupport())?'.svg':'.png'; } return OC.filePath(app,'img',file); diff --git a/files/css/files.css b/files/css/files.css index 03945f030b..e103f0a7a6 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -40,9 +40,9 @@ tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; h tbody tr { background-color:#fff; } tbody tr.selected { background-color:#eee; } tbody a { color:#000; } -span.extention, td.date { color:#999; } -span.extention { opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } -tr:hover span.extention { opacity:1; } +span.extension, td.date { color:#999; } +span.extension { text-transform:lowercase; opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } +tr:hover span.extension { opacity:1; } div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; } div.crumb:first-child { padding-left:1em; } div.crumb.last { font-weight:bold; } diff --git a/files/index.php b/files/index.php index 82d0960892..aea91542db 100644 --- a/files/index.php +++ b/files/index.php @@ -51,10 +51,10 @@ foreach( OC_Files::getdirectorycontent( $dir ) as $i ){ $fileinfo=pathinfo($i['name']); $i['basename']=$fileinfo['filename']; if (!empty($fileinfo['extension'])) { - $i['extention']='.' . $fileinfo['extension']; + $i['extension']='.' . $fileinfo['extension']; } else { - $i['extention']=''; + $i['extension']=''; } } if($i['directory']=='/'){ diff --git a/files/js/filelist.js b/files/js/filelist.js index 35847e06df..533e03b43c 100644 --- a/files/js/filelist.js +++ b/files/js/filelist.js @@ -7,15 +7,15 @@ FileList={ var html=''; if(name.indexOf('.')!=-1){ var basename=name.substr(0,name.lastIndexOf('.')); - var extention=name.substr(name.lastIndexOf('.')); + var extension=name.substr(name.lastIndexOf('.')); }else{ var basename=name; - var extention=false; + var extension=false; } html+=''; html+=''+basename - if(extention){ - html+=''+extention+''; + if(extension){ + html+=''+extension+''; } html+=''; if(size!='Pending'){ @@ -147,7 +147,7 @@ FileList={ span.text(basename); td.children('a.name').append(span); if(newname.indexOf('.')>0){ - span.append($(''+newname.substr(newname.lastIndexOf('.'))+'')); + span.append($(''+newname.substr(newname.lastIndexOf('.'))+'')); } $.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(){ tr.data('renaming',false); diff --git a/files/templates/part.list.php b/files/templates/part.list.php index b117d81a1a..5a5941fc7a 100644 --- a/files/templates/part.list.php +++ b/files/templates/part.list.php @@ -18,7 +18,7 @@ - + diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php index f632474df0..f0bfc064cb 100644 --- a/lib/filestorage/common.php +++ b/lib/filestorage/common.php @@ -100,11 +100,11 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { } $head=fread($source,8192);//8kb should suffice to determine a mimetype if($pos=strrpos($path,'.')){ - $extention=substr($path,$pos); + $extension=substr($path,$pos); }else{ - $extention=''; + $extension=''; } - $tmpFile=OC_Helper::tmpFile($extention); + $tmpFile=OC_Helper::tmpFile($extension); file_put_contents($tmpFile,$head); $mime=OC_Helper::getMimeType($tmpFile); unlink($tmpFile); @@ -129,11 +129,11 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { return false; } if($pos=strrpos($path,'.')){ - $extention=substr($path,$pos); + $extension=substr($path,$pos); }else{ - $extention=''; + $extension=''; } - $tmpFile=OC_Helper::tmpFile($extention); + $tmpFile=OC_Helper::tmpFile($extension); $target=fopen($tmpFile,'w'); $count=OC_Helper::streamCopy($source,$target); return $tmpFile; diff --git a/lib/helper.php b/lib/helper.php index 2026286352..c33db5f10f 100755 --- a/lib/helper.php +++ b/lib/helper.php @@ -310,9 +310,9 @@ class OC_Helper { $mimeType='application/octet-stream'; if ($mimeType=='application/octet-stream') { self::$mimetypes = include('mimetypes.fixlist.php'); - $extention=strtolower(strrchr(basename($path), ".")); - $extention=substr($extention,1);//remove leading . - $mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream'; + $extension=strtolower(strrchr(basename($path), ".")); + $extension=substr($extension,1);//remove leading . + $mimeType=(isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream'; } if (@is_dir($path)) { @@ -346,9 +346,9 @@ class OC_Helper { if(!self::$mimetypes || self::$mimetypes != include('mimetypes.list.php')){ self::$mimetypes=include('mimetypes.list.php'); } - $extention=strtolower(strrchr(basename($path), ".")); - $extention=substr($extention,1);//remove leading . - $mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream'; + $extension=strtolower(strrchr(basename($path), ".")); + $extension=substr($extension,1);//remove leading . + $mimeType=(isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream'; } return $mimeType; } diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php index e0570e84ea..ccf47999b1 100644 --- a/lib/mimetypes.list.php +++ b/lib/mimetypes.list.php @@ -21,7 +21,7 @@ */ /** - * list of mimetypes by extention + * list of mimetypes by extension */ return array( diff --git a/lib/template.php b/lib/template.php index cb39a10df3..eeba2410b6 100644 --- a/lib/template.php +++ b/lib/template.php @@ -161,7 +161,7 @@ class OC_Template{ } /** - * @brief Returns the formfactor extention for current formfactor + * @brief Returns the formfactor extension for current formfactor */ protected function getFormFactorExtension() {