]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into pr-exceed_upload_limit_msg
authorPellaeon Lin <nfsmwlin@gmail.com>
Thu, 30 Jan 2014 14:50:20 +0000 (22:50 +0800)
committerPellaeon Lin <nfsmwlin@gmail.com>
Thu, 30 Jan 2014 14:50:20 +0000 (22:50 +0800)
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php

1  2 
apps/files/index.php
apps/files/js/file-upload.js
apps/files/js/files.js
apps/files/templates/index.php
apps/files_sharing/public.php
lib/private/helper.php
lib/public/util.php

Simple merge
Simple merge
Simple merge
index f20a3f1d07381e8f9dfe123247b8dd90dec3ba0f,ff78f0ca551871437fc12dffffca8dd6ac30a243..939043b2c9f78ccce5f13df392c364311a8b7d08
                        <div id="upload" class="button"
                                 title="<?php p($l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize']) ?>">
                                        <?php if($_['uploadMaxFilesize'] >= 0):?>
 -                                      <input type="hidden" name="MAX_FILE_SIZE" id="max_upload"
 -                                                 value="<?php p($_['uploadMaxFilesize']) ?>">
 +                                      <input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php p($_['uploadMaxFilesize']) ?>">
                                        <?php endif;?>
 +                                      <input type="hidden" id="upload_limit" value="<?php p($_['uploadLimit']) ?>">
 +                                      <input type="hidden" id="free_space" value="<?php p($_['freeSpace']) ?>">
+                                       <?php if(isset($_['dirToken'])):?>
+                                       <input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
+                                       <input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
+                                       <?php endif;?>
                                        <input type="hidden" class="max_human_file_size"
                                                   value="(max <?php p($_['uploadMaxHumanFilesize']); ?>)">
                                        <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
index 540f2b004c6ec3afecab8be7b4c0f3faf62c413b,0ca923fff080cad75c190db197071d8d827a50b0..b187da41324eb31a4f715ce292dcc160fec097be
@@@ -160,11 -160,8 +162,10 @@@ if (isset($path)) 
                if ($linkItem['item_type'] !== 'folder') {
                        $allowPublicUploadEnabled = false;
                }
-               $tmpl->assign('allowPublicUploadEnabled', $allowPublicUploadEnabled);
                $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
                $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 +              $tmpl->assign('freeSpace', $freeSpace);
 +              $tmpl->assign('uploadLimit', $uploadLimit); // PHP upload limit
  
                $urlLinkIdentifiers= (isset($token)?'&t='.$token:'')
                                                        .(isset($_GET['dir'])?'&dir='.$_GET['dir']:'')
Simple merge
Simple merge