Merge branch 'master' into calendar
This commit is contained in:
commit
f6ed7a19be
|
@ -285,7 +285,9 @@ class OC_Filestorage_Shared extends OC_Filestorage {
|
|||
}
|
||||
|
||||
public function is_writeable($path) {
|
||||
if ($path == "" || $path == "/" || OC_Share::getPermissions($this->datadir.$path) & OC_Share::WRITE) {
|
||||
if($path == "" || $path == "/"){
|
||||
return false;
|
||||
}elseif (OC_Share::getPermissions($this->datadir.$path) & OC_Share::WRITE) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
|
|
|
@ -97,6 +97,7 @@ $tmpl = new OC_Template( "files", "index", "user" );
|
|||
$tmpl->assign( "fileList", $list->fetchPage() );
|
||||
$tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() );
|
||||
$tmpl->assign( 'dir', $dir);
|
||||
$tmpl->assign( 'readonly', !OC_Filesystem::is_writeable($dir));
|
||||
$tmpl->assign( "files", $files );
|
||||
$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
|
||||
$tmpl->assign( 'uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
|
||||
|
|
|
@ -1,42 +1,37 @@
|
|||
<div id="controls">
|
||||
<?php echo($_['breadcrumb']); ?>
|
||||
<?php if (!isset($_['readonly']) || !$_['readonly']) {?>
|
||||
<div class="actions">
|
||||
<div id='new' class='button'>
|
||||
<a>
|
||||
<?php echo $l->t('New');?>
|
||||
</a>
|
||||
<ul class="popup popupTop">
|
||||
<li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
|
||||
<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
|
||||
<!-- <li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='web'><p><?php echo $l->t('From the web');?></p></li> -->
|
||||
</ul>
|
||||
<?php if (!isset($_['readonly']) || !$_['readonly']):?>
|
||||
<div class="actions">
|
||||
<div id='new' class='button'>
|
||||
<a>
|
||||
<?php echo $l->t('New');?>
|
||||
</a>
|
||||
<ul class="popup popupTop">
|
||||
<li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
|
||||
<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
|
||||
<!-- <li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='web'><p><?php echo $l->t('From the web');?></p></li> -->
|
||||
</ul>
|
||||
</div>
|
||||
<div class="file_upload_wrapper svg">
|
||||
<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
|
||||
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
|
||||
<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
|
||||
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
|
||||
<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
|
||||
<input class="file_upload_start" type="file" name='files[]'/>
|
||||
<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
|
||||
<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div class="file_upload_wrapper svg">
|
||||
<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
|
||||
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
|
||||
<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
|
||||
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
|
||||
<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
|
||||
<input class="file_upload_start" type="file" name='files[]'/>
|
||||
<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
|
||||
<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div id="file_action_panel">
|
||||
</div>
|
||||
<div id="file_action_panel"></div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
<div id='notification'></div>
|
||||
|
||||
<?php
|
||||
if (isset($_['files'])) {
|
||||
if (!count($_['files'])) { ?>
|
||||
<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
|
||||
<?php }}?>
|
||||
<?php if (isset($_['files']) and ! $_['readonly'] and count($_['files'])==0):?>
|
||||
<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<table>
|
||||
<thead>
|
||||
|
@ -53,7 +48,7 @@ if (isset($_['files'])) {
|
|||
<th id="headerDate"><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class="selectedActions"><a href="" title="Delete" class="delete"><img class="svg" alt="<?php echo $l->t('Delete')?>" src="<?php echo image_path("core", "actions/delete.svg"); ?>" /></a></span></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="fileList">
|
||||
<tbody id="fileList" data-readonly="<?php echo $_['readonly'];?>">
|
||||
<?php echo($_['fileList']); ?>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
@ -88,7 +88,7 @@ else {
|
|||
if(defined("DEBUG") && DEBUG) {
|
||||
OC_Log::write('core','Setting remember login to cookie',OC_Log::DEBUG);
|
||||
}
|
||||
$token = md5($_POST["user"].time());
|
||||
$token = md5($_POST["user"].time().$_POST['password']);
|
||||
OC_Preferences::setValue($_POST['user'], 'login', 'token', $token);
|
||||
OC_User::setMagicInCookie($_POST["user"], $token);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue