use config var in settings form

diff --git a/mod/settings.php b/mod/settings.php
index ff38a97a9968e602db4315949cc622bf6fa73c81..5709df720fd94e694a17b268fbb867424f76b731 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1253,6 +1253,7 @@ function settings_content(App $a)
                '$importcontact' => L10n::t('Import Contacts'),
                '$importcontact_text' => L10n::t('Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'),
                '$importcontact_button' => L10n::t('Upload File'),
+               '$importcontact_maxsize' => Config::get('system', max_csv_file_size, 30720), 
                '$relocate' => L10n::t('Relocate'),
                '$relocate_text' => L10n::t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."),
                '$relocate_button' => L10n::t("Resend relocate message to contacts"),

diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl
index 8ecc332d7d5e2a28f3a30cd8534977a144e0f349..af1352c4cbeb1b5913bdbd56485f8f8d59b788f8 100644 (file)
--- a/view/templates/settings/settings.tpl
+++ b/view/templates/settings/settings.tpl
@@ -198,7 +198,7 @@
 
 <h3 class="settings-heading"><a href="javascript:;">{{$importcontact}}</a></h3>
 <div class="settings-content-block">
-<input type="hidden" name="MAX_FILE_SIZE" value="30720" />
+<input type="hidden" name="MAX_FILE_SIZE" value="{{$importcontact_maxsize}}" />
 <div id="settings-pagetype-desc">{{$importcontact_text}}</div>
 <input type="file" name="importcontact-filename" />
 

diff --git a/view/theme/frio/templates/settings/settings.tpl b/view/theme/frio/templates/settings/settings.tpl
index d35094194398982067a39719109fa3938ca405fc..4ed94b182736603c035b750546abf440867f2952 100644 (file)
--- a/view/theme/frio/templates/settings/settings.tpl
+++ b/view/theme/frio/templates/settings/settings.tpl
@@ -283,7 +283,7 @@
                                        <div class="section-content-tools-wrapper">
 
                                                <div id="importcontact-relocate-desc">{{$importcontact_text}}</div>
-                                               <input type="hidden" name="MAX_FILE_SIZE" value="30720" />
+                                               <input type="hidden" name="MAX_FILE_SIZE" value="{{$importcontact_maxsize}}" />
                                                <input type="file" name="importcontact-filename" />
 
                                                <br/>