diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2011-12-16 20:43:06 +0400 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2011-12-16 20:43:06 +0400 |
commit | f3e8776dc63656d99c39c007c230a80c0c9e384b (patch) | |
tree | b0debedaf5d4d65477083b40d117d2bb4142ed2b | |
parent | feeb0c742a57eb542f6e904dd4c8b5310bcc066a (diff) | |
parent | dc641943d9245b371eca1928a64bcadfe72f9cf6 (diff) |
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
-rw-r--r-- | apps/files_sharing/sharedstorage.php | 4 | ||||
-rw-r--r-- | files/index.php | 1 | ||||
-rw-r--r-- | files/templates/index.php | 63 | ||||
-rw-r--r-- | index.php | 2 |
4 files changed, 34 insertions, 36 deletions
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php index faf4e68d9b1..d78e273bf38 100644 --- a/apps/files_sharing/sharedstorage.php +++ b/apps/files_sharing/sharedstorage.php @@ -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; diff --git a/files/index.php b/files/index.php index 4b3bbd1bfd4..7e156130d8e 100644 --- a/files/index.php +++ b/files/index.php @@ -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)); diff --git a/files/templates/index.php b/files/templates/index.php index 722c38e4776..c4acab25cc4 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -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> diff --git a/index.php b/index.php index 7ead0fb48a7..9bd460be353 100644 --- a/index.php +++ b/index.php @@ -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); } |