maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

don't make documentroot include domain-name by default (forgot on update); remove possible undefined index; beautification for template-forms, thx to monumentum

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-03-22 18:51:12 +01:00
parent d5997d5772
commit cce3c0fde3
10 changed files with 96 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -479,7 +479,7 @@ LoadModule authz_host_module modules/mod_authz_host.so</pre><br />';
$description .= 'You can enable or disable this feature anytime from settings -> system settings.<br />';
$question = '<strong>Do you want to automatically append the domain-name to the documentroot of newly created domains?:</strong>&nbsp;';
$question.= makeyesno('update_system_documentroot_use_default_value', '1', '0', '1');
$question.= makeyesno('update_system_documentroot_use_default_value', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}

28
lib/init.php
View File

@@ -307,21 +307,23 @@ if (isset($userinfo['language']) && isset($languages[$userinfo['language']])) {
) {
$language = $_GET['language'];
} else {
$accept_langs = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
for($i = 0; $i<count($accept_langs); $i++) {
// this only works for most common languages. some (uncommon) languages have a 3 letter iso-code.
// to be able to use these also, we would have to depend on the intl extension for php (using Locale::lookup or similar)
// as long as froxlor does not support any of these languages, we can leave it like that.
if (isset($iso[substr($accept_langs[$i],0,2)])) {
$language=$iso[substr($accept_langs[$i],0,2)];
break;
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
$accept_langs = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
for($i = 0; $i<count($accept_langs); $i++) {
// this only works for most common languages. some (uncommon) languages have a 3 letter iso-code.
// to be able to use these also, we would have to depend on the intl extension for php (using Locale::lookup or similar)
// as long as froxlor does not support any of these languages, we can leave it like that.
if (isset($iso[substr($accept_langs[$i],0,2)])) {
$language=$iso[substr($accept_langs[$i],0,2)];
break;
}
}
}
unset($iso);
unset($iso);
// if HTTP_ACCEPT_LANGUAGES has no valid langs, use default (very unlikely)
if (!strlen($language)>0) {
$language = $settings['panel']['standardlanguage'];
// if HTTP_ACCEPT_LANGUAGES has no valid langs, use default (very unlikely)
if (!strlen($language)>0) {
$language = $settings['panel']['standardlanguage'];
}
}
}
} else {

11
templates/Froxlor/admin/templates/filetemplates_add.tpl
View File

@@ -53,23 +53,23 @@ $header
</td>
</tr>
<tr>
<td><em>{SERVERNAME}</em>:</td>
<td><em>{SERVERNAME}</em></td>
<td>{$lng['admin']['templates']['SERVERNAME']}</td>
</tr>
<tr>
<td><em>{CUSTOMER}</em>:</td>
<td><em>{CUSTOMER}</em></td>
<td>{$lng['admin']['templates']['CUSTOMER']}</td>
</tr>
<tr>
<td><em>{ADMIN}</em>:</td>
<td><em>{ADMIN}</em></td>
<td>{$lng['admin']['templates']['ADMIN']}</td>
</tr>
<tr>
<td><em>{CUSTOMER_EMAIL}</em>:</td>
<td><em>{CUSTOMER_EMAIL}</em></td>
<td>{$lng['admin']['templates']['CUSTOMER_EMAIL']}</td>
</tr>
<tr>
<td><em>{ADMIN_EMAIL}</em>:</td>
<td><em>{ADMIN_EMAIL}</em></td>
<td>{$lng['admin']['templates']['ADMIN_EMAIL']}</td>
</tr>
</tbody>
@@ -79,4 +79,3 @@ $header
</article>
$footer

11
templates/Froxlor/admin/templates/filetemplates_edit.tpl
View File

@@ -54,23 +54,23 @@ $header
</td>
</tr>
<tr>
<td><em>{SERVERNAME}</em>:</td>
<td><em>{SERVERNAME}</em></td>
<td>{$lng['admin']['templates']['SERVERNAME']}</td>
</tr>
<tr>
<td><em>{CUSTOMER}</em>:</td>
<td><em>{CUSTOMER}</em></td>
<td>{$lng['admin']['templates']['CUSTOMER']}</td>
</tr>
<tr>
<td><em>{ADMIN}</em>:</td>
<td><em>{ADMIN}</em></td>
<td>{$lng['admin']['templates']['ADMIN']}</td>
</tr>
<tr>
<td><em>{CUSTOMER_EMAIL}</em>:</td>
<td><em>{CUSTOMER_EMAIL}</em></td>
<td>{$lng['admin']['templates']['CUSTOMER_EMAIL']}</td>
</tr>
<tr>
<td><em>{ADMIN_EMAIL}</em>:</td>
<td><em>{ADMIN_EMAIL}</em></td>
<td>{$lng['admin']['templates']['ADMIN_EMAIL']}</td>
</tr>
</tbody>
@@ -80,4 +80,3 @@ $header
</article>
$footer

1
templates/Froxlor/admin/templates/templates.tpl
View File

@@ -63,4 +63,3 @@ $header
</article>
$footer

1
templates/Froxlor/admin/templates/templates_add_1.tpl
View File

@@ -27,4 +27,3 @@ $header
</section>
</article>
$footer

71
templates/Froxlor/admin/templates/templates_add_2.tpl
View File

@@ -54,27 +54,27 @@ $header
</td>
</tr>
<tr>
<td><i>{SALUTATION}</em>:</td>
<td><i>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><i>{FIRSTNAME}</em>:</td>
<td><i>{FIRSTNAME}</em></td>
<td>{$lng['admin']['templates']['FIRSTNAME']}</td>
</tr>
<tr>
<td><em>{NAME}</em>:</td>
<td><em>{NAME}</em></td>
<td>{$lng['admin']['templates']['NAME']}</td>
</tr>
<tr>
<td><em>{COMPANY}</em>:</td>
<td><em>{COMPANY}</em></td>
<td>{$lng['admin']['templates']['COMPANY']}</td>
</tr>
<tr>
<td><em>{USERNAME}</em>:</td>
<td><em>{USERNAME}</em></td>
<td>{$lng['admin']['templates']['USERNAME']}</td>
</tr>
<tr>
<td><em>{PASSWORD}</em>:</td>
<td><em>{PASSWORD}</em></td>
<td>{$lng['admin']['templates']['PASSWORD']}</td>
</tr>
<tr>
@@ -83,7 +83,7 @@ $header
</td>
</tr>
<tr>
<td><em>{EMAIL}</em>:</td>
<td><em>{EMAIL}</em></td>
<td>{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<if $settings['panel']['sendalternativemail'] == 1>
@@ -93,11 +93,11 @@ $header
</td>
</tr>
<tr>
<td><em>{EMAIL}</em>:</td>
<td><em>{EMAIL}</em></td>
<td>{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<tr>
<td><em>{PASSWORD}</em>:</td>
<td><em>{PASSWORD}</em></td>
<td>{$lng['admin']['templates']['EMAIL_PASSWORD']}</td>
</tr>
</if>
@@ -107,15 +107,15 @@ $header
</td>
</tr>
<tr>
<td><em>{SALUTATION}</em>:</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{USERNAME}</em>:</td>
<td><em>{USERNAME}</em></td>
<td>{$lng['admin']['templates']['USERNAME']}</td>
</tr>
<tr>
<td><em>{PASSWORD}</em>:</td>
<td><em>{PASSWORD}</em></td>
<td>{$lng['admin']['templates']['PASSWORD']}</td>
</tr>
<tr>
@@ -124,19 +124,19 @@ $header
</td>
</tr>
<tr>
<td><em>{TRAFFIC}</em>:</td>
<td><em>{TRAFFIC}</em></td>
<td>{$lng['admin']['templates']['TRAFFIC']}</td>
</tr>
<tr>
<td><em>{TRAFFICUSED}</em>:</td>
<td><em>{TRAFFICUSED}</em></td>
<td>{$lng['admin']['templates']['TRAFFICUSED']}</td>
</tr>
<tr>
<td><em>{MAX_PERCENT}</em>:</td>
<td><em>{MAX_PERCENT}</em></td>
<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td><em>{USAGE_PERCENT}</em>:</td>
<td><em>{USAGE_PERCENT}</em></td>
<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
@@ -145,19 +145,19 @@ $header
</td>
</tr>
<tr>
<td><em>{DISKAVAILABLE}</em>:</td>
<td><em>{DISKAVAILABLE}</em></td>
<td>{$lng['admin']['templates']['DISKAVAILABLE']}</td>
</tr>
<tr>
<td><em>{DISKUSED}</em>:</td>
<td><em>{DISKUSED}</em></td>
<td>{$lng['admin']['templates']['DISKUSED']}</td>
</tr>
<tr>
<td><em>{MAX_PERCENT}</em>:</td>
<td><em>{MAX_PERCENT}</em></td>
<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td><em>{USAGE_PERCENT}</em>:</td>
<td><em>{USAGE_PERCENT}</em></td>
<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
@@ -166,23 +166,23 @@ $header
</td>
</tr>
<tr>
<td><em>{SUBJECT}</em>:</td>
<td><em>{SUBJECT}</em></td>
<td>{$lng['admin']['templates']['SUBJECT']}</td>
</tr>
<tr>
<td><em>{SALUTATION}</em>:</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{FIRSTNAME}</em>:</td>
<td><em>{FIRSTNAME}</em></td>
<td>{$lng['admin']['templates']['FIRSTNAME']}</td>
</tr>
<tr>
<td><em>{NAME}</em>:</td>
<td><em>{NAME}</em></td>
<td>{$lng['admin']['templates']['NAME']}</td>
</tr>
<tr>
<td><em>{COMPANY}</em>:</td>
<td><em>{COMPANY}</em></td>
<td>{$lng['admin']['templates']['COMPANY']}</td>
</tr>
<tr>
@@ -191,27 +191,27 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em>:</td>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
</tr>
<tr>
<td><em>{DB_NAME}</em>:</td>
<td><em>{DB_NAME}</em></td>
<td>{$lng['admin']['templates']['DB_NAME']}</td>
</tr>
<tr>
<td><em>{DB_PASS}</em>:</td>
<td><em>{DB_PASS}</em></td>
<td>{$lng['admin']['templates']['DB_PASS']}</td>
</tr>
<tr>
<td><em>{DB_DESC}</em>:</td>
<td><em>{DB_DESC}</em></td>
<td>{$lng['admin']['templates']['DB_DESC']}</td>
</tr>
<tr>
<td><em>{DB_SRV}</em>:</td>
<td><em>{DB_SRV}</em></td>
<td>{$lng['admin']['templates']['DB_SRV']}</td>
</tr>
<tr>
<td><em>{PMA_URI}</em>:</td>
<td><em>{PMA_URI}</em></td>
<td>{$lng['admin']['templates']['PMA_URI']}</td>
</tr>
<tr>
@@ -220,19 +220,19 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em>:</td>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
</tr>
<tr>
<td><em>{USR_NAME}</em>:</td>
<td><em>{USR_NAME}</em></td>
<td>{$lng['admin']['templates']['USR_NAME']}</td>
</tr>
<tr>
<td><em>{USR_PASS}</em>:</td>
<td><em>{USR_PASS}</em></td>
<td>{$lng['admin']['templates']['USR_PASS']}</td>
</tr>
<tr>
<td><em>{USR_PATH}</em>:</td>
<td><em>{USR_PATH}</em></td>
<td>{$lng['admin']['templates']['USR_PATH']}</td>
</tr>
</tbody>
@@ -242,4 +242,3 @@ $header
</article>
$footer

70
templates/Froxlor/admin/templates/templates_edit.tpl
View File

@@ -55,27 +55,27 @@ $header
</td>
</tr>
<tr>
<td><i>{SALUTATION}</em>:</td>
<td><i>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><i>{FIRSTNAME}</em>:</td>
<td><i>{FIRSTNAME}</em></td>
<td>{$lng['admin']['templates']['FIRSTNAME']}</td>
</tr>
<tr>
<td><em>{NAME}</em>:</td>
<td><em>{NAME}</em></td>
<td>{$lng['admin']['templates']['NAME']}</td>
</tr>
<tr>
<td><em>{COMPANY}</em>:</td>
<td><em>{COMPANY}</em></td>
<td>{$lng['admin']['templates']['COMPANY']}</td>
</tr>
<tr>
<td><em>{USERNAME}</em>:</td>
<td><em>{USERNAME}</em></td>
<td>{$lng['admin']['templates']['USERNAME']}</td>
</tr>
<tr>
<td><em>{PASSWORD}</em>:</td>
<td><em>{PASSWORD}</em></td>
<td>{$lng['admin']['templates']['PASSWORD']}</td>
</tr>
<tr>
@@ -84,7 +84,7 @@ $header
</td>
</tr>
<tr>
<td><em>{EMAIL}</em>:</td>
<td><em>{EMAIL}</em></td>
<td>{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<if $settings['panel']['sendalternativemail'] == 1>
@@ -94,11 +94,11 @@ $header
</td>
</tr>
<tr>
<td><em>{EMAIL}</em>:</td>
<td><em>{EMAIL}</em></td>
<td>{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<tr>
<td><em>{PASSWORD}</em>:</td>
<td><em>{PASSWORD}</em></td>
<td>{$lng['admin']['templates']['EMAIL_PASSWORD']}</td>
</tr>
</if>
@@ -108,15 +108,15 @@ $header
</td>
</tr>
<tr>
<td><em>{SALUTATION}</em>:</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{USERNAME}</em>:</td>
<td><em>{USERNAME}</em></td>
<td>{$lng['admin']['templates']['USERNAME']}</td>
</tr>
<tr>
<td><em>{PASSWORD}</em>:</td>
<td><em>{PASSWORD}</em></td>
<td>{$lng['admin']['templates']['PASSWORD']}</td>
</tr>
<tr>
@@ -125,19 +125,19 @@ $header
</td>
</tr>
<tr>
<td><em>{TRAFFIC}</em>:</td>
<td><em>{TRAFFIC}</em></td>
<td>{$lng['admin']['templates']['TRAFFIC']}</td>
</tr>
<tr>
<td><em>{TRAFFICUSED}</em>:</td>
<td><em>{TRAFFICUSED}</em></td>
<td>{$lng['admin']['templates']['TRAFFICUSED']}</td>
</tr>
<tr>
<td><em>{MAX_PERCENT}</em>:</td>
<td><em>{MAX_PERCENT}</em></td>
<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td><em>{USAGE_PERCENT}</em>:</td>
<td><em>{USAGE_PERCENT}</em></td>
<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
@@ -146,19 +146,19 @@ $header
</td>
</tr>
<tr>
<td><em>{DISKAVAILABLE}</em>:</td>
<td><em>{DISKAVAILABLE}</em></td>
<td>{$lng['admin']['templates']['DISKAVAILABLE']}</td>
</tr>
<tr>
<td><em>{DISKUSED}</em>:</td>
<td><em>{DISKUSED}</em></td>
<td>{$lng['admin']['templates']['DISKUSED']}</td>
</tr>
<tr>
<td><em>{MAX_PERCENT}</em>:</td>
<td><em>{MAX_PERCENT}</em></td>
<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td><em>{USAGE_PERCENT}</em>:</td>
<td><em>{USAGE_PERCENT}</em></td>
<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
@@ -167,23 +167,23 @@ $header
</td>
</tr>
<tr>
<td><em>{SUBJECT}</em>:</td>
<td><em>{SUBJECT}</em></td>
<td>{$lng['admin']['templates']['SUBJECT']}</td>
</tr>
<tr>
<td><em>{SALUTATION}</em>:</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{FIRSTNAME}</em>:</td>
<td><em>{FIRSTNAME}</em></td>
<td>{$lng['admin']['templates']['FIRSTNAME']}</td>
</tr>
<tr>
<td><em>{NAME}</em>:</td>
<td><em>{NAME}</em></td>
<td>{$lng['admin']['templates']['NAME']}</td>
</tr>
<tr>
<td><em>{COMPANY}</em>:</td>
<td><em>{COMPANY}</em></td>
<td>{$lng['admin']['templates']['COMPANY']}</td>
</tr>
<tr>
@@ -192,27 +192,27 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em>:</td>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
</tr>
<tr>
<td><em>{DB_NAME}</em>:</td>
<td><em>{DB_NAME}</em></td>
<td>{$lng['admin']['templates']['DB_NAME']}</td>
</tr>
<tr>
<td><em>{DB_PASS}</em>:</td>
<td><em>{DB_PASS}</em></td>
<td>{$lng['admin']['templates']['DB_PASS']}</td>
</tr>
<tr>
<td><em>{DB_DESC}</em>:</td>
<td><em>{DB_DESC}</em></td>
<td>{$lng['admin']['templates']['DB_DESC']}</td>
</tr>
<tr>
<td><em>{DB_SRV}</em>:</td>
<td><em>{DB_SRV}</em></td>
<td>{$lng['admin']['templates']['DB_SRV']}</td>
</tr>
<tr>
<td><em>{PMA_URI}</em>:</td>
<td><em>{PMA_URI}</em></td>
<td>{$lng['admin']['templates']['PMA_URI']}</td>
</tr>
<tr>
@@ -221,19 +221,19 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em>:</td>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
</tr>
<tr>
<td><em>{USR_NAME}</em>:</td>
<td><em>{USR_NAME}</em></td>
<td>{$lng['admin']['templates']['USR_NAME']}</td>
</tr>
<tr>
<td><em>{USR_PASS}</em>:</td>
<td><em>{USR_PASS}</em></td>
<td>{$lng['admin']['templates']['USR_PASS']}</td>
</tr>
<tr>
<td><em>{USR_PATH}</em>:</td>
<td><em>{USR_PATH}</em></td>
<td>{$lng['admin']['templates']['USR_PATH']}</td>
</tr>
</tbody>

1
templates/Froxlor/admin/templates/templates_filetemplate.tpl
View File

@@ -9,4 +9,3 @@
</a>
</td>
</tr>

1
templates/Froxlor/admin/templates/templates_template.tpl
View File

@@ -10,4 +10,3 @@
</a>
</td>
</tr>