wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into calendar_sharing

Browse source
This commit is contained in:
Georg Ehrke 2012-04-15 14:28:31 +02:00
commit 8ddea7e95c
18 changed files with 58 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_archive/lib/tar.php
View file

@ -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;

4
apps/files_encryption/lib/proxy.php
View file

@ -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;
}
}

2
apps/files_sharing/get.php
View file

@ -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'] == "/") {

6
apps/media/js/loader.js
View file

@ -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){

6
apps/media/js/music.js
View file

@ -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;
}

2
apps/media/lib_scanner.php
View file

@ -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
*/

5
core/css/styles.css
View file

@ -95,8 +95,9 @@ label.infield { cursor: text !important; }
#navigation a.active, #navigation a:hover, #navigation a:focus { background-color:#dbdbdb; border-top:1px solid #d4d4d4; border-bottom:1px solid #ccc; color:#333; }
#navigation a.active { background-color:#ddd; }
#navigation #settings { position:absolute; bottom:3.5em; width:100%; }
#expand { margin:0 0 .2em 1.2em; cursor:pointer; }
#expand+span { position:relative; bottom:.4em; left:.2em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; }
#expand { position:relative; margin-bottom:-.5em; padding:.5em 10.1em .7em 1.2em; cursor:pointer; }
#expand+span { position:absolute; margin:-1.7em 0 0 2.5em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
#expand:hover+span, #expand+span:hover { opacity:1; cursor:pointer; }
#logout { position:absolute; right:0; top:0; padding:1.2em 2em .55em 1.2em; }

7
core/js/js.js
View file

@ -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);
@ -406,9 +406,6 @@ $(document).ready(function(){
$('#settings #expanddiv').click(function(event){
event.stopPropagation();
});
$('#settings #expand').hover(function(){
$('#settings #expand+span').fadeToggle();
});
$(window).click(function(){//hide the settings menu when clicking oustide it
if($('body').attr("id")=="body-user"){
$('#settings #expanddiv').slideUp();

2
core/templates/layout.user.php
View file

@ -44,7 +44,7 @@
<ul id="settings" class="svg">
<img id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
<span style="display:none;"><?php echo $l->t('Settings');?></span>
<span><?php echo $l->t('Settings');?></span>
<div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
<?php foreach($_['settingsnavigation'] as $entry):?>
<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>

20
files/css/files.css
View file

@ -36,13 +36,13 @@
/* FILE TABLE */
#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
table { position:relative; top:37px; width:100%; }
tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; height:1em; }
tbody tr { background-color:#fff; }
tbody tr { background-color:#fff; height:2.5em; }
tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; }
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; }
@ -60,7 +60,7 @@ table tr[data-type="dir"] td.filename a.name {font-weight:bold; }
table td.filename a.name input, table td.filename a.name form { width:100%; cursor:text; }
table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; }
table td.filename .nametext, .modified { float:left; padding:.3em 0; }
table td.filename .nametext { width:60%; }
table td.filename .nametext { width:70%; overflow:hidden; }
table td.filename form { float:left; font-size:.85em; }
table thead.fixed tr{ position:fixed; top:6.5em; z-index:49; -moz-box-shadow:0 -3px 7px #ddd; -webkit-box-shadow:0 -3px 7px #ddd; box-shadow:0 -3px 7px #ddd; }
table thead.fixed { height:2em; }
@ -70,8 +70,12 @@ table thead.fixed { height:2em; }
#fileList tr td.filename { -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; }
#select_all { float:left; margin:.3em 0.6em 0 .5em; }
#uploadsize-message,#delete-confirm { display:none; }
.selectedActions a,#fileList a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
a.action>img{ max-height:16px; max-width:16px; }
.fileactions { position:absolute; right:0; top:.8em; font-size:.8em; }
#fileList .fileactions a.action { position:relative; top:-.3em; }
#fileList .fileactions a.action img { position:relative; top:.2em; }
.selectedActions a,#fileList a.action { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; }
a.action.delete { float:right; }
a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
.selectedActions { display:none; }
/* add breadcrumb divider to the File item in navigation panel */

4
files/index.php
View file

@ -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']=='/'){

12
files/js/fileactions.js
View file

@ -59,6 +59,7 @@ FileActions={
if($('tr').filterAttr('data-file',file).data('renaming')){
return;
}
parent.children('a.name').append('<span class="fileactions" />');
var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
for(name in actions){
if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){
@ -66,11 +67,10 @@ FileActions={
if(img.call){
img=img(file);
}
var html='<a href="#" original-title="'+name+'" class="action" style="display:none" />';
var html='<a href="#" class="action" style="display:none">';
if(img) { html+='<img src="'+img+'"/> '; }
html += name+'</a>';
var element=$(html);
if(img){
element.append($('<img src="'+img+'"/>'));
}
element.data('action',name);
element.click(function(event){
event.stopPropagation();
@ -81,7 +81,7 @@ FileActions={
action(currentFile);
});
element.hide();
parent.children('a.name').append(element);
parent.find('a.name>span.fileactions').append(element);
}
}
if(actions['Delete']){
@ -113,7 +113,7 @@ FileActions={
return false;
},
hide:function(){
$('#fileList .action').fadeOut(200,function(){
$('#fileList span.fileactions').fadeOut(200,function(){
$(this).remove();
});
},

10
files/js/filelist.js
View file

@ -7,15 +7,15 @@ FileList={
var html='<tr data-type="file" data-size="'+size+'">';
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+='<td class="filename" style="background-image:url('+img+')"><input type="checkbox" />';
html+='<a class="name" href="download.php?file='+$('#dir').val()+'/'+name+'"><span class="nametext">'+basename
if(extention){
html+='<span class="extention">'+extention+'</span>';
if(extension){
html+='<span class="extension">'+extension+'</span>';
}
html+='</span></a></td>';
if(size!='Pending'){
@ -147,7 +147,7 @@ FileList={
span.text(basename);
td.children('a.name').append(span);
if(newname.indexOf('.')>0){
span.append($('<span class="extention">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
}
$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(){
tr.data('renaming',false);

2
files/templates/part.list.php
View file

@ -18,7 +18,7 @@
<?php if($file['type'] == 'dir'):?>
<?php echo htmlspecialchars($file['name']);?>
<?php else:?>
<?php echo htmlspecialchars($file['basename']);?><span class='extention'><?php echo $file['extention'];?></span>
<?php echo htmlspecialchars($file['basename']);?><span class='extension'><?php echo $file['extension'];?></span>
<?php endif;?>
</span>
</a>

12
lib/filestorage/common.php
View file

@ -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;

12
lib/helper.php
View file

@ -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;
}

2
lib/mimetypes.list.php
View file

@ -21,7 +21,7 @@
*/
/**
* list of mimetypes by extention
* list of mimetypes by extension
*/
return array(

2
lib/template.php
View file

@ -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()
{