always display config values

don't change values unintentionally

diff --git a/files/admin.php b/files/admin.php
index 1fe1ff55a4cf2c78e0b0ae17e08424f665956e7b..289d95cb9124941a1475d7923898d5d4158bbddd 100644 (file)
--- a/files/admin.php
+++ b/files/admin.php
@@ -28,6 +28,7 @@ require_once('../lib/base.php');
 OC_Util::checkAdminUser();
 
 $htaccessWorking=(getenv('htaccessWorking')=='true');
+
 if($_POST) {
        if(isset($_POST['maxUploadSize'])){
                $maxUploadFilesize=$_POST['maxUploadSize'];
@@ -37,13 +38,14 @@ if($_POST) {
                $maxZipInputSize=$_POST['maxZipInputSize'];
                OC_Config::setValue('maxZipInputSize', OC_Helper::computerFileSize($maxZipInputSize));
        }
-       OC_Config::setValue('allowZipDownload', isset($_POST['allowZipDownload']));
-}else{
-       $upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
-       $post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
-       $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
-       $maxZipInputSize = OC_Helper::humanfilesize(OC_Config::getValue('maxZipInputSize', OC_Helper::computerFileSize('800 MB')));
+       if(isset($_POST['submitFilesAdminSettings'])) {
+               OC_Config::setValue('allowZipDownload', isset($_POST['allowZipDownload']));
+       }
 }
+$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
+$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+$maxZipInputSize = OC_Helper::humanfilesize(OC_Config::getValue('maxZipInputSize', OC_Helper::computerFileSize('800 MB')));
 $allowZipDownload = intval(OC_Config::getValue('allowZipDownload', true));
 
 OC_App::setActiveNavigationEntry( "files_administration" );

diff --git a/files/templates/admin.php b/files/templates/admin.php
index fd86d02e1ed59adcdbf2193d3a8ce41a6059892d..730f55f2768d5a6c534699a9b00316e08ec701d0 100644 (file)
--- a/files/templates/admin.php
+++ b/files/templates/admin.php
@@ -10,6 +10,6 @@
                <fieldset class="personalblock">
                        <label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files:' ); ?> </label><input name="maxZipInputSize" id="maxZipInputSize" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>"<?php if (!$_['allowZipDownload']) echo ' disabled="disabled"'; ?> /><br/>
                </fieldset>
-               <input type="submit" value="Save"/>
+               <input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="Save"/>
        </fieldset>
 </form>