mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup

This commit is contained in:
Thomas Tanghus 2011-12-16 17:43:06 +01:00
parent feeb0c742a dc641943d9
commit f3e8776dc6
4 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/sharedstorage.php
View File

@ -285,7 +285,9 @@ class OC_Filestorage_Shared extends OC_Filestorage {
} }
public function is_writeable($path) { 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; return true;
} else { } else {
return false; return false;

1
files/index.php
View File

@ -97,6 +97,7 @@ $tmpl = new OC_Template( "files", "index", "user" );
$tmpl->assign( "fileList", $list->fetchPage() ); $tmpl->assign( "fileList", $list->fetchPage() );
$tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() ); $tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() );
$tmpl->assign( 'dir', $dir); $tmpl->assign( 'dir', $dir);
$tmpl->assign( 'readonly', !OC_Filesystem::is_writeable($dir));
$tmpl->assign( "files", $files ); $tmpl->assign( "files", $files );
$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize); $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
$tmpl->assign( 'uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize)); $tmpl->assign( 'uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));

21
files/templates/index.php
View File

@ -1,6 +1,6 @@
<div id="controls"> <div id="controls">
<?php echo($_['breadcrumb']); ?> <?php echo($_['breadcrumb']); ?>
<?php if (!isset($_['readonly']) || !$_['readonly']) {?> <?php if (!isset($_['readonly']) || !$_['readonly']):?>
<div class="actions"> <div class="actions">
<div id='new' class='button'> <div id='new' class='button'>
<a> <a>
@ -9,7 +9,7 @@
<ul class="popup popupTop"> <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('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='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> --> <!-- <li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='web'><p><?php echo $l->t('From the web');?></p></li> -->
</ul> </ul>
</div> </div>
<div class="file_upload_wrapper svg"> <div class="file_upload_wrapper svg">
@ -24,19 +24,14 @@
</form> </form>
</div> </div>
</div> </div>
<div id="file_action_panel"> <div id="file_action_panel"></div>
</div> <?php endif;?>
</div> </div>
<?php
}
?>
<div id='notification'></div> <div id='notification'></div>
<?php <?php if (isset($_['files']) and ! $_['readonly'] and count($_['files'])==0):?>
if (isset($_['files'])) { <div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
if (!count($_['files'])) { ?> <?php endif; ?>
<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
<?php }}?>
<table> <table>
<thead> <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> <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> </tr>
</thead> </thead>
<tbody id="fileList"> <tbody id="fileList" data-readonly="<?php echo $_['readonly'];?>">
<?php echo($_['fileList']); ?> <?php echo($_['fileList']); ?>
</tbody> </tbody>
</table> </table>

2
index.php
View File

@ -88,7 +88,7 @@ else {
if(defined("DEBUG") && DEBUG) { if(defined("DEBUG") && DEBUG) {
OC_Log::write('core','Setting remember login to cookie',OC_Log::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_Preferences::setValue($_POST['user'], 'login', 'token', $token);
OC_User::setMagicInCookie($_POST["user"], $token); OC_User::setMagicInCookie($_POST["user"], $token);
} }