Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
7b47c0aa
Commit
7b47c0aa
authored
Aug 21, 2013
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged revisions 4069-4117 from stable branch.
parent
2332b227
Changes
532
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
532 changed files
with
3832 additions
and
1134 deletions
+3832
-1134
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+17
-1
install/dist/lib/opensuse.lib.php
install/dist/lib/opensuse.lib.php
+16
-0
install/install.php
install/install.php
+2
-1
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+3
-3
install/lib/mysql.lib.php
install/lib/mysql.lib.php
+31
-48
install/sql/incremental/upd_0055.sql
install/sql/incremental/upd_0055.sql
+1
-0
install/sql/incremental/upd_0056.sql
install/sql/incremental/upd_0056.sql
+12
-0
install/sql/ispconfig3.sql
install/sql/ispconfig3.sql
+19
-1
install/tpl/config.inc.php.master
install/tpl/config.inc.php.master
+1
-1
install/tpl/system.ini.master
install/tpl/system.ini.master
+6
-0
interface/lib/classes/aps_guicontroller.inc.php
interface/lib/classes/aps_guicontroller.inc.php
+846
-846
interface/lib/classes/client_templates.inc.php
interface/lib/classes/client_templates.inc.php
+163
-70
interface/lib/classes/listform.inc.php
interface/lib/classes/listform.inc.php
+7
-3
interface/lib/classes/plugin_backuplist.inc.php
interface/lib/classes/plugin_backuplist.inc.php
+6
-0
interface/lib/classes/remoting.inc.php
interface/lib/classes/remoting.inc.php
+174
-1
interface/lib/classes/remoting_lib.inc.php
interface/lib/classes/remoting_lib.inc.php
+2
-0
interface/lib/classes/tform.inc.php
interface/lib/classes/tform.inc.php
+7
-6
interface/lib/classes/tree.inc.php
interface/lib/classes/tree.inc.php
+3
-3
interface/lib/lang/ar.lng
interface/lib/lang/ar.lng
+2
-0
interface/lib/lang/bg.lng
interface/lib/lang/bg.lng
+2
-0
interface/lib/lang/br.lng
interface/lib/lang/br.lng
+2
-0
interface/lib/lang/cz.lng
interface/lib/lang/cz.lng
+2
-0
interface/lib/lang/de.lng
interface/lib/lang/de.lng
+2
-0
interface/lib/lang/el.lng
interface/lib/lang/el.lng
+2
-0
interface/lib/lang/en.lng
interface/lib/lang/en.lng
+2
-0
interface/lib/lang/es.lng
interface/lib/lang/es.lng
+2
-0
interface/lib/lang/fi.lng
interface/lib/lang/fi.lng
+2
-0
interface/lib/lang/fr.lng
interface/lib/lang/fr.lng
+2
-0
interface/lib/lang/hr.lng
interface/lib/lang/hr.lng
+2
-0
interface/lib/lang/hu.lng
interface/lib/lang/hu.lng
+2
-0
interface/lib/lang/id.lng
interface/lib/lang/id.lng
+2
-0
interface/lib/lang/it.lng
interface/lib/lang/it.lng
+2
-0
interface/lib/lang/ja.lng
interface/lib/lang/ja.lng
+2
-0
interface/lib/lang/nl.lng
interface/lib/lang/nl.lng
+2
-0
interface/lib/lang/pl.lng
interface/lib/lang/pl.lng
+2
-0
interface/lib/lang/pt.lng
interface/lib/lang/pt.lng
+2
-0
interface/lib/lang/ro.lng
interface/lib/lang/ro.lng
+2
-0
interface/lib/lang/ru.lng
interface/lib/lang/ru.lng
+2
-0
interface/lib/lang/se.lng
interface/lib/lang/se.lng
+2
-0
interface/lib/lang/sk.lng
interface/lib/lang/sk.lng
+2
-0
interface/lib/lang/tr.lng
interface/lib/lang/tr.lng
+2
-0
interface/web/admin/form/system_config.tform.php
interface/web/admin/form/system_config.tform.php
+36
-0
interface/web/admin/language_edit.php
interface/web/admin/language_edit.php
+1
-1
interface/web/admin/lib/lang/ar_server_config.lng
interface/web/admin/lib/lang/ar_server_config.lng
+17
-0
interface/web/admin/lib/lang/ar_software_package.lng
interface/web/admin/lib/lang/ar_software_package.lng
+6
-0
interface/web/admin/lib/lang/ar_software_package_list.lng
interface/web/admin/lib/lang/ar_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/ar_software_repo.lng
interface/web/admin/lib/lang/ar_software_repo.lng
+1
-0
interface/web/admin/lib/lang/ar_system_config.lng
interface/web/admin/lib/lang/ar_system_config.lng
+3
-0
interface/web/admin/lib/lang/bg_server_config.lng
interface/web/admin/lib/lang/bg_server_config.lng
+17
-0
interface/web/admin/lib/lang/bg_software_package.lng
interface/web/admin/lib/lang/bg_software_package.lng
+6
-0
interface/web/admin/lib/lang/bg_software_package_list.lng
interface/web/admin/lib/lang/bg_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/bg_software_repo.lng
interface/web/admin/lib/lang/bg_software_repo.lng
+1
-0
interface/web/admin/lib/lang/bg_system_config.lng
interface/web/admin/lib/lang/bg_system_config.lng
+3
-0
interface/web/admin/lib/lang/br_server_config.lng
interface/web/admin/lib/lang/br_server_config.lng
+17
-0
interface/web/admin/lib/lang/br_software_package.lng
interface/web/admin/lib/lang/br_software_package.lng
+6
-0
interface/web/admin/lib/lang/br_software_package_list.lng
interface/web/admin/lib/lang/br_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/br_software_repo.lng
interface/web/admin/lib/lang/br_software_repo.lng
+1
-0
interface/web/admin/lib/lang/br_system_config.lng
interface/web/admin/lib/lang/br_system_config.lng
+3
-0
interface/web/admin/lib/lang/cz_remote_action.lng
interface/web/admin/lib/lang/cz_remote_action.lng
+2
-2
interface/web/admin/lib/lang/cz_server_config.lng
interface/web/admin/lib/lang/cz_server_config.lng
+17
-0
interface/web/admin/lib/lang/cz_software_package.lng
interface/web/admin/lib/lang/cz_software_package.lng
+6
-0
interface/web/admin/lib/lang/cz_software_package_list.lng
interface/web/admin/lib/lang/cz_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/cz_software_repo.lng
interface/web/admin/lib/lang/cz_software_repo.lng
+1
-0
interface/web/admin/lib/lang/cz_system_config.lng
interface/web/admin/lib/lang/cz_system_config.lng
+3
-0
interface/web/admin/lib/lang/de_system_config.lng
interface/web/admin/lib/lang/de_system_config.lng
+7
-0
interface/web/admin/lib/lang/el_server_config.lng
interface/web/admin/lib/lang/el_server_config.lng
+17
-0
interface/web/admin/lib/lang/el_software_package.lng
interface/web/admin/lib/lang/el_software_package.lng
+6
-0
interface/web/admin/lib/lang/el_software_package_list.lng
interface/web/admin/lib/lang/el_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/el_software_repo.lng
interface/web/admin/lib/lang/el_software_repo.lng
+1
-0
interface/web/admin/lib/lang/el_system_config.lng
interface/web/admin/lib/lang/el_system_config.lng
+3
-0
interface/web/admin/lib/lang/en_system_config.lng
interface/web/admin/lib/lang/en_system_config.lng
+7
-0
interface/web/admin/lib/lang/es_server_config.lng
interface/web/admin/lib/lang/es_server_config.lng
+17
-0
interface/web/admin/lib/lang/es_software_package.lng
interface/web/admin/lib/lang/es_software_package.lng
+6
-0
interface/web/admin/lib/lang/es_software_package_list.lng
interface/web/admin/lib/lang/es_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/es_software_repo.lng
interface/web/admin/lib/lang/es_software_repo.lng
+1
-0
interface/web/admin/lib/lang/es_system_config.lng
interface/web/admin/lib/lang/es_system_config.lng
+3
-0
interface/web/admin/lib/lang/fi_server_config.lng
interface/web/admin/lib/lang/fi_server_config.lng
+17
-0
interface/web/admin/lib/lang/fi_software_package.lng
interface/web/admin/lib/lang/fi_software_package.lng
+6
-0
interface/web/admin/lib/lang/fi_software_package_list.lng
interface/web/admin/lib/lang/fi_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/fi_software_repo.lng
interface/web/admin/lib/lang/fi_software_repo.lng
+1
-0
interface/web/admin/lib/lang/fi_system_config.lng
interface/web/admin/lib/lang/fi_system_config.lng
+3
-0
interface/web/admin/lib/lang/fr_server_config.lng
interface/web/admin/lib/lang/fr_server_config.lng
+17
-0
interface/web/admin/lib/lang/fr_software_package.lng
interface/web/admin/lib/lang/fr_software_package.lng
+6
-0
interface/web/admin/lib/lang/fr_software_package_list.lng
interface/web/admin/lib/lang/fr_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/fr_software_repo.lng
interface/web/admin/lib/lang/fr_software_repo.lng
+1
-0
interface/web/admin/lib/lang/fr_system_config.lng
interface/web/admin/lib/lang/fr_system_config.lng
+3
-0
interface/web/admin/lib/lang/hr_server_config.lng
interface/web/admin/lib/lang/hr_server_config.lng
+17
-0
interface/web/admin/lib/lang/hr_software_package.lng
interface/web/admin/lib/lang/hr_software_package.lng
+6
-0
interface/web/admin/lib/lang/hr_software_package_list.lng
interface/web/admin/lib/lang/hr_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/hr_software_repo.lng
interface/web/admin/lib/lang/hr_software_repo.lng
+1
-0
interface/web/admin/lib/lang/hr_system_config.lng
interface/web/admin/lib/lang/hr_system_config.lng
+3
-0
interface/web/admin/lib/lang/hu_server_config.lng
interface/web/admin/lib/lang/hu_server_config.lng
+17
-0
interface/web/admin/lib/lang/hu_software_package.lng
interface/web/admin/lib/lang/hu_software_package.lng
+6
-0
interface/web/admin/lib/lang/hu_software_package_list.lng
interface/web/admin/lib/lang/hu_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/hu_software_repo.lng
interface/web/admin/lib/lang/hu_software_repo.lng
+1
-0
interface/web/admin/lib/lang/hu_system_config.lng
interface/web/admin/lib/lang/hu_system_config.lng
+3
-0
interface/web/admin/lib/lang/id_server_config.lng
interface/web/admin/lib/lang/id_server_config.lng
+17
-0
interface/web/admin/lib/lang/id_software_package.lng
interface/web/admin/lib/lang/id_software_package.lng
+6
-0
interface/web/admin/lib/lang/id_software_package_list.lng
interface/web/admin/lib/lang/id_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/id_software_repo.lng
interface/web/admin/lib/lang/id_software_repo.lng
+1
-0
interface/web/admin/lib/lang/id_system_config.lng
interface/web/admin/lib/lang/id_system_config.lng
+3
-0
interface/web/admin/lib/lang/it_server_config.lng
interface/web/admin/lib/lang/it_server_config.lng
+17
-0
interface/web/admin/lib/lang/it_software_package.lng
interface/web/admin/lib/lang/it_software_package.lng
+6
-0
interface/web/admin/lib/lang/it_software_package_list.lng
interface/web/admin/lib/lang/it_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/it_software_repo.lng
interface/web/admin/lib/lang/it_software_repo.lng
+1
-0
interface/web/admin/lib/lang/it_system_config.lng
interface/web/admin/lib/lang/it_system_config.lng
+3
-0
interface/web/admin/lib/lang/ja_server_config.lng
interface/web/admin/lib/lang/ja_server_config.lng
+17
-0
interface/web/admin/lib/lang/ja_software_package.lng
interface/web/admin/lib/lang/ja_software_package.lng
+6
-0
interface/web/admin/lib/lang/ja_software_package_list.lng
interface/web/admin/lib/lang/ja_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/ja_software_repo.lng
interface/web/admin/lib/lang/ja_software_repo.lng
+1
-0
interface/web/admin/lib/lang/ja_system_config.lng
interface/web/admin/lib/lang/ja_system_config.lng
+3
-0
interface/web/admin/lib/lang/nl_server_config.lng
interface/web/admin/lib/lang/nl_server_config.lng
+17
-0
interface/web/admin/lib/lang/nl_software_package.lng
interface/web/admin/lib/lang/nl_software_package.lng
+6
-0
interface/web/admin/lib/lang/nl_software_package_list.lng
interface/web/admin/lib/lang/nl_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/nl_software_repo.lng
interface/web/admin/lib/lang/nl_software_repo.lng
+1
-0
interface/web/admin/lib/lang/nl_system_config.lng
interface/web/admin/lib/lang/nl_system_config.lng
+3
-0
interface/web/admin/lib/lang/pl_server_config.lng
interface/web/admin/lib/lang/pl_server_config.lng
+17
-0
interface/web/admin/lib/lang/pl_software_package.lng
interface/web/admin/lib/lang/pl_software_package.lng
+6
-0
interface/web/admin/lib/lang/pl_software_package_list.lng
interface/web/admin/lib/lang/pl_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/pl_software_repo.lng
interface/web/admin/lib/lang/pl_software_repo.lng
+1
-0
interface/web/admin/lib/lang/pl_system_config.lng
interface/web/admin/lib/lang/pl_system_config.lng
+3
-0
interface/web/admin/lib/lang/pt_server_config.lng
interface/web/admin/lib/lang/pt_server_config.lng
+17
-0
interface/web/admin/lib/lang/pt_software_package.lng
interface/web/admin/lib/lang/pt_software_package.lng
+6
-0
interface/web/admin/lib/lang/pt_software_package_list.lng
interface/web/admin/lib/lang/pt_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/pt_software_repo.lng
interface/web/admin/lib/lang/pt_software_repo.lng
+1
-0
interface/web/admin/lib/lang/pt_system_config.lng
interface/web/admin/lib/lang/pt_system_config.lng
+3
-0
interface/web/admin/lib/lang/ro_server_config.lng
interface/web/admin/lib/lang/ro_server_config.lng
+17
-0
interface/web/admin/lib/lang/ro_software_package.lng
interface/web/admin/lib/lang/ro_software_package.lng
+6
-0
interface/web/admin/lib/lang/ro_software_package_list.lng
interface/web/admin/lib/lang/ro_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/ro_software_repo.lng
interface/web/admin/lib/lang/ro_software_repo.lng
+1
-0
interface/web/admin/lib/lang/ro_system_config.lng
interface/web/admin/lib/lang/ro_system_config.lng
+3
-0
interface/web/admin/lib/lang/ru_server_config.lng
interface/web/admin/lib/lang/ru_server_config.lng
+17
-0
interface/web/admin/lib/lang/ru_software_package.lng
interface/web/admin/lib/lang/ru_software_package.lng
+6
-0
interface/web/admin/lib/lang/ru_software_package_list.lng
interface/web/admin/lib/lang/ru_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/ru_software_repo.lng
interface/web/admin/lib/lang/ru_software_repo.lng
+1
-0
interface/web/admin/lib/lang/ru_system_config.lng
interface/web/admin/lib/lang/ru_system_config.lng
+3
-0
interface/web/admin/lib/lang/se_server_config.lng
interface/web/admin/lib/lang/se_server_config.lng
+17
-0
interface/web/admin/lib/lang/se_software_package.lng
interface/web/admin/lib/lang/se_software_package.lng
+6
-0
interface/web/admin/lib/lang/se_software_package_list.lng
interface/web/admin/lib/lang/se_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/se_software_repo.lng
interface/web/admin/lib/lang/se_software_repo.lng
+1
-0
interface/web/admin/lib/lang/se_system_config.lng
interface/web/admin/lib/lang/se_system_config.lng
+3
-0
interface/web/admin/lib/lang/sk_server_config.lng
interface/web/admin/lib/lang/sk_server_config.lng
+17
-0
interface/web/admin/lib/lang/sk_software_package.lng
interface/web/admin/lib/lang/sk_software_package.lng
+6
-0
interface/web/admin/lib/lang/sk_software_package_list.lng
interface/web/admin/lib/lang/sk_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/sk_software_repo.lng
interface/web/admin/lib/lang/sk_software_repo.lng
+1
-0
interface/web/admin/lib/lang/sk_system_config.lng
interface/web/admin/lib/lang/sk_system_config.lng
+3
-0
interface/web/admin/lib/lang/tr_server_config.lng
interface/web/admin/lib/lang/tr_server_config.lng
+18
-0
interface/web/admin/lib/lang/tr_software_package.lng
interface/web/admin/lib/lang/tr_software_package.lng
+6
-0
interface/web/admin/lib/lang/tr_software_package_list.lng
interface/web/admin/lib/lang/tr_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/tr_software_repo.lng
interface/web/admin/lib/lang/tr_software_repo.lng
+1
-0
interface/web/admin/lib/lang/tr_system_config.lng
interface/web/admin/lib/lang/tr_system_config.lng
+3
-0
interface/web/admin/system_config_edit.php
interface/web/admin/system_config_edit.php
+21
-2
interface/web/admin/templates/system_config_misc_edit.htm
interface/web/admin/templates/system_config_misc_edit.htm
+24
-0
interface/web/client/client_edit.php
interface/web/client/client_edit.php
+165
-15
interface/web/client/client_template_del.php
interface/web/client/client_template_del.php
+7
-0
interface/web/client/client_template_edit.php
interface/web/client/client_template_edit.php
+1
-1
interface/web/client/form/client.tform.php
interface/web/client/form/client.tform.php
+18
-0
interface/web/client/form/reseller.tform.php
interface/web/client/form/reseller.tform.php
+18
-0
interface/web/client/lib/lang/ar_client.lng
interface/web/client/lib/lang/ar_client.lng
+1
-0
interface/web/client/lib/lang/ar_client_del.lng
interface/web/client/lib/lang/ar_client_del.lng
+1
-0
interface/web/client/lib/lang/ar_client_template_list.lng
interface/web/client/lib/lang/ar_client_template_list.lng
+1
-0
interface/web/client/lib/lang/ar_reseller.lng
interface/web/client/lib/lang/ar_reseller.lng
+1
-0
interface/web/client/lib/lang/bg_client.lng
interface/web/client/lib/lang/bg_client.lng
+1
-0
interface/web/client/lib/lang/bg_client_del.lng
interface/web/client/lib/lang/bg_client_del.lng
+1
-0
interface/web/client/lib/lang/bg_client_template_list.lng
interface/web/client/lib/lang/bg_client_template_list.lng
+1
-0
interface/web/client/lib/lang/bg_reseller.lng
interface/web/client/lib/lang/bg_reseller.lng
+1
-0
interface/web/client/lib/lang/br_client.lng
interface/web/client/lib/lang/br_client.lng
+1
-0
interface/web/client/lib/lang/br_client_del.lng
interface/web/client/lib/lang/br_client_del.lng
+1
-0
interface/web/client/lib/lang/br_client_template_list.lng
interface/web/client/lib/lang/br_client_template_list.lng
+1
-0
interface/web/client/lib/lang/br_reseller.lng
interface/web/client/lib/lang/br_reseller.lng
+1
-0
interface/web/client/lib/lang/cz_client.lng
interface/web/client/lib/lang/cz_client.lng
+1
-0
interface/web/client/lib/lang/cz_client_del.lng
interface/web/client/lib/lang/cz_client_del.lng
+1
-0
interface/web/client/lib/lang/cz_client_template_list.lng
interface/web/client/lib/lang/cz_client_template_list.lng
+1
-0
interface/web/client/lib/lang/cz_reseller.lng
interface/web/client/lib/lang/cz_reseller.lng
+1
-0
interface/web/client/lib/lang/de_client.lng
interface/web/client/lib/lang/de_client.lng
+5
-0
interface/web/client/lib/lang/de_reseller.lng
interface/web/client/lib/lang/de_reseller.lng
+5
-0
interface/web/client/lib/lang/el_client.lng
interface/web/client/lib/lang/el_client.lng
+1
-0
interface/web/client/lib/lang/el_client_del.lng
interface/web/client/lib/lang/el_client_del.lng
+1
-0
interface/web/client/lib/lang/el_client_template_list.lng
interface/web/client/lib/lang/el_client_template_list.lng
+1
-0
interface/web/client/lib/lang/el_reseller.lng
interface/web/client/lib/lang/el_reseller.lng
+1
-0
interface/web/client/lib/lang/en_client.lng
interface/web/client/lib/lang/en_client.lng
+5
-0
interface/web/client/lib/lang/en_reseller.lng
interface/web/client/lib/lang/en_reseller.lng
+5
-0
interface/web/client/lib/lang/es_client.lng
interface/web/client/lib/lang/es_client.lng
+1
-0
interface/web/client/lib/lang/es_client_del.lng
interface/web/client/lib/lang/es_client_del.lng
+1
-0
interface/web/client/lib/lang/es_client_template_list.lng
interface/web/client/lib/lang/es_client_template_list.lng
+1
-0
interface/web/client/lib/lang/es_reseller.lng
interface/web/client/lib/lang/es_reseller.lng
+1
-0
interface/web/client/lib/lang/fi_client.lng
interface/web/client/lib/lang/fi_client.lng
+1
-0
interface/web/client/lib/lang/fi_client_del.lng
interface/web/client/lib/lang/fi_client_del.lng
+1
-0
interface/web/client/lib/lang/fi_client_template_list.lng
interface/web/client/lib/lang/fi_client_template_list.lng
+1
-0
interface/web/client/lib/lang/fi_reseller.lng
interface/web/client/lib/lang/fi_reseller.lng
+1
-0
interface/web/client/lib/lang/fr_client.lng
interface/web/client/lib/lang/fr_client.lng
+1
-0
interface/web/client/lib/lang/fr_client_del.lng
interface/web/client/lib/lang/fr_client_del.lng
+1
-0
interface/web/client/lib/lang/fr_client_template_list.lng
interface/web/client/lib/lang/fr_client_template_list.lng
+1
-0
interface/web/client/lib/lang/fr_reseller.lng
interface/web/client/lib/lang/fr_reseller.lng
+1
-0
interface/web/client/lib/lang/hr_client.lng
interface/web/client/lib/lang/hr_client.lng
+1
-0
interface/web/client/lib/lang/hr_client_del.lng
interface/web/client/lib/lang/hr_client_del.lng
+1
-0
interface/web/client/lib/lang/hr_client_template_list.lng
interface/web/client/lib/lang/hr_client_template_list.lng
+1
-0
interface/web/client/lib/lang/hr_reseller.lng
interface/web/client/lib/lang/hr_reseller.lng
+1
-0
interface/web/client/lib/lang/hu_client.lng
interface/web/client/lib/lang/hu_client.lng
+1
-0
interface/web/client/lib/lang/hu_client_del.lng
interface/web/client/lib/lang/hu_client_del.lng
+1
-0
interface/web/client/lib/lang/hu_client_template_list.lng
interface/web/client/lib/lang/hu_client_template_list.lng
+1
-0
interface/web/client/lib/lang/hu_reseller.lng
interface/web/client/lib/lang/hu_reseller.lng
+1
-0
interface/web/client/lib/lang/id_client.lng
interface/web/client/lib/lang/id_client.lng
+1
-0
interface/web/client/lib/lang/id_client_del.lng
interface/web/client/lib/lang/id_client_del.lng
+1
-0
interface/web/client/lib/lang/id_client_template_list.lng
interface/web/client/lib/lang/id_client_template_list.lng
+1
-0
interface/web/client/lib/lang/id_reseller.lng
interface/web/client/lib/lang/id_reseller.lng
+1
-0
interface/web/client/lib/lang/it_client.lng
interface/web/client/lib/lang/it_client.lng
+1
-0
interface/web/client/lib/lang/it_client_del.lng
interface/web/client/lib/lang/it_client_del.lng
+1
-0
interface/web/client/lib/lang/it_client_template_list.lng
interface/web/client/lib/lang/it_client_template_list.lng
+1
-0
interface/web/client/lib/lang/it_reseller.lng
interface/web/client/lib/lang/it_reseller.lng
+1
-0
interface/web/client/lib/lang/ja_client.lng
interface/web/client/lib/lang/ja_client.lng
+1
-0
interface/web/client/lib/lang/ja_client_del.lng
interface/web/client/lib/lang/ja_client_del.lng
+1
-0
interface/web/client/lib/lang/ja_client_template_list.lng
interface/web/client/lib/lang/ja_client_template_list.lng
+1
-0
interface/web/client/lib/lang/ja_reseller.lng
interface/web/client/lib/lang/ja_reseller.lng
+1
-0
interface/web/client/lib/lang/nl_client.lng
interface/web/client/lib/lang/nl_client.lng
+1
-0
interface/web/client/lib/lang/nl_client_del.lng
interface/web/client/lib/lang/nl_client_del.lng
+1
-0
interface/web/client/lib/lang/nl_client_template_list.lng
interface/web/client/lib/lang/nl_client_template_list.lng
+1
-0
interface/web/client/lib/lang/nl_reseller.lng
interface/web/client/lib/lang/nl_reseller.lng
+1
-0
interface/web/client/lib/lang/pl_client.lng
interface/web/client/lib/lang/pl_client.lng
+1
-0
interface/web/client/lib/lang/pl_client_del.lng
interface/web/client/lib/lang/pl_client_del.lng
+1
-0
interface/web/client/lib/lang/pl_client_template_list.lng
interface/web/client/lib/lang/pl_client_template_list.lng
+1
-0
interface/web/client/lib/lang/pl_reseller.lng
interface/web/client/lib/lang/pl_reseller.lng
+1
-0
interface/web/client/lib/lang/pt_client.lng
interface/web/client/lib/lang/pt_client.lng
+1
-0
interface/web/client/lib/lang/pt_client_del.lng
interface/web/client/lib/lang/pt_client_del.lng
+1
-0
interface/web/client/lib/lang/pt_client_template_list.lng
interface/web/client/lib/lang/pt_client_template_list.lng
+1
-0
interface/web/client/lib/lang/pt_reseller.lng
interface/web/client/lib/lang/pt_reseller.lng
+1
-0
interface/web/client/lib/lang/ro_client.lng
interface/web/client/lib/lang/ro_client.lng
+1
-0
interface/web/client/lib/lang/ro_client_del.lng
interface/web/client/lib/lang/ro_client_del.lng
+1
-0
interface/web/client/lib/lang/ro_client_template_list.lng
interface/web/client/lib/lang/ro_client_template_list.lng
+1
-0
interface/web/client/lib/lang/ro_reseller.lng
interface/web/client/lib/lang/ro_reseller.lng
+1
-0
interface/web/client/lib/lang/ru_client.lng
interface/web/client/lib/lang/ru_client.lng
+1
-0
interface/web/client/lib/lang/ru_client_del.lng
interface/web/client/lib/lang/ru_client_del.lng
+1
-0
interface/web/client/lib/lang/ru_client_template_list.lng
interface/web/client/lib/lang/ru_client_template_list.lng
+1
-0
interface/web/client/lib/lang/ru_reseller.lng
interface/web/client/lib/lang/ru_reseller.lng
+1
-0
interface/web/client/lib/lang/se_client.lng
interface/web/client/lib/lang/se_client.lng
+1
-0
interface/web/client/lib/lang/se_client_del.lng
interface/web/client/lib/lang/se_client_del.lng
+1
-0
interface/web/client/lib/lang/se_client_template_list.lng
interface/web/client/lib/lang/se_client_template_list.lng
+1
-0
interface/web/client/lib/lang/se_reseller.lng
interface/web/client/lib/lang/se_reseller.lng
+1
-0
interface/web/client/lib/lang/sk_client.lng
interface/web/client/lib/lang/sk_client.lng
+1
-0
interface/web/client/lib/lang/sk_client_del.lng
interface/web/client/lib/lang/sk_client_del.lng
+1
-0
interface/web/client/lib/lang/sk_client_template_list.lng
interface/web/client/lib/lang/sk_client_template_list.lng
+1
-0
interface/web/client/lib/lang/sk_reseller.lng
interface/web/client/lib/lang/sk_reseller.lng
+1
-0
interface/web/client/lib/lang/tr_client.lng
interface/web/client/lib/lang/tr_client.lng
+1
-0
interface/web/client/lib/lang/tr_client_del.lng
interface/web/client/lib/lang/tr_client_del.lng
+1
-0
interface/web/client/lib/lang/tr_client_template_list.lng
interface/web/client/lib/lang/tr_client_template_list.lng
+1
-0
interface/web/client/lib/lang/tr_reseller.lng
interface/web/client/lib/lang/tr_reseller.lng
+1
-0
interface/web/client/reseller_edit.php
interface/web/client/reseller_edit.php
+24
-10
interface/web/client/templates/client_edit_address.htm
interface/web/client/templates/client_edit_address.htm
+18
-0
interface/web/client/templates/client_edit_limits.htm
interface/web/client/templates/client_edit_limits.htm
+5
-1
interface/web/client/templates/reseller_edit_address.htm
interface/web/client/templates/reseller_edit_address.htm
+18
-0
interface/web/dashboard/dashboard.php
interface/web/dashboard/dashboard.php
+30
-2
interface/web/dashboard/dashlets/templates/mailquota.htm
interface/web/dashboard/dashlets/templates/mailquota.htm
+1
-1
interface/web/dashboard/dashlets/templates/quota.htm
interface/web/dashboard/dashlets/templates/quota.htm
+1
-1
interface/web/dashboard/lib/lang/ar_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/ar_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/ar_dashlet_quota.lng
interface/web/dashboard/lib/lang/ar_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/bg_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/bg_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/bg_dashlet_quota.lng
interface/web/dashboard/lib/lang/bg_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/br_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/br_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/br_dashlet_quota.lng
interface/web/dashboard/lib/lang/br_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/cz_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/cz_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/cz_dashlet_quota.lng
interface/web/dashboard/lib/lang/cz_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/de_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/de_dashlet_mailquota.lng
+7
-7
interface/web/dashboard/lib/lang/de_dashlet_quota.lng
interface/web/dashboard/lib/lang/de_dashlet_quota.lng
+7
-7
interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/el_dashlet_quota.lng
interface/web/dashboard/lib/lang/el_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/es_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/es_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/es_dashlet_quota.lng
interface/web/dashboard/lib/lang/es_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/fi_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/fi_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/fi_dashlet_quota.lng
interface/web/dashboard/lib/lang/fi_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/fr_dashlet_quota.lng
interface/web/dashboard/lib/lang/fr_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/hr_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/hr_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/hr_dashlet_quota.lng
interface/web/dashboard/lib/lang/hr_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/hu_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/hu_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/hu_dashlet_quota.lng
interface/web/dashboard/lib/lang/hu_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/id_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/id_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/id_dashlet_quota.lng
interface/web/dashboard/lib/lang/id_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/it_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/it_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/it_dashlet_quota.lng
interface/web/dashboard/lib/lang/it_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/ja_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/ja_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/ja_dashlet_quota.lng
interface/web/dashboard/lib/lang/ja_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/nl_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/nl_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/nl_dashlet_quota.lng
interface/web/dashboard/lib/lang/nl_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/pl_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/pl_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/pl_dashlet_quota.lng
interface/web/dashboard/lib/lang/pl_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/pt_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/pt_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/pt_dashlet_quota.lng
interface/web/dashboard/lib/lang/pt_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/ro_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/ro_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/ro_dashlet_quota.lng
interface/web/dashboard/lib/lang/ro_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/ru_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/ru_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/ru_dashlet_quota.lng
interface/web/dashboard/lib/lang/ru_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/se_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/se_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/se_dashlet_quota.lng
interface/web/dashboard/lib/lang/se_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/sk_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/sk_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/sk_dashlet_quota.lng
interface/web/dashboard/lib/lang/sk_dashlet_quota.lng
+8
-0
interface/web/dashboard/lib/lang/tr_dashlet_mailquota.lng
interface/web/dashboard/lib/lang/tr_dashlet_mailquota.lng
+8
-0
interface/web/dashboard/lib/lang/tr_dashlet_quota.lng
interface/web/dashboard/lib/lang/tr_dashlet_quota.lng
+8
-0
interface/web/dashboard/templates/dashboard.htm
interface/web/dashboard/templates/dashboard.htm
+1
-1
interface/web/dns/lib/lang/tr_dns_mx.lng
interface/web/dns/lib/lang/tr_dns_mx.lng
+1
-0
interface/web/help/lib/lang/ar_support_message.lng
interface/web/help/lib/lang/ar_support_message.lng
+7
-0
interface/web/help/lib/lang/ar_support_message_list.lng
interface/web/help/lib/lang/ar_support_message_list.lng
+1
-0
interface/web/help/lib/lang/bg_support_message.lng
interface/web/help/lib/lang/bg_support_message.lng
+7
-0
interface/web/help/lib/lang/bg_support_message_list.lng
interface/web/help/lib/lang/bg_support_message_list.lng
+1
-0
interface/web/help/lib/lang/br_support_message.lng
interface/web/help/lib/lang/br_support_message.lng
+7
-0
interface/web/help/lib/lang/br_support_message_list.lng
interface/web/help/lib/lang/br_support_message_list.lng
+1
-0
interface/web/help/lib/lang/cz_support_message.lng
interface/web/help/lib/lang/cz_support_message.lng
+7
-0
interface/web/help/lib/lang/cz_support_message_list.lng
interface/web/help/lib/lang/cz_support_message_list.lng
+1
-0
interface/web/help/lib/lang/el_support_message.lng
interface/web/help/lib/lang/el_support_message.lng
+7
-0
interface/web/help/lib/lang/el_support_message_list.lng
interface/web/help/lib/lang/el_support_message_list.lng
+1
-0
interface/web/help/lib/lang/es_support_message.lng
interface/web/help/lib/lang/es_support_message.lng
+7
-0
interface/web/help/lib/lang/es_support_message_list.lng
interface/web/help/lib/lang/es_support_message_list.lng
+1
-0
interface/web/help/lib/lang/fi_support_message.lng
interface/web/help/lib/lang/fi_support_message.lng
+7
-0
interface/web/help/lib/lang/fi_support_message_list.lng
interface/web/help/lib/lang/fi_support_message_list.lng
+1
-0
interface/web/help/lib/lang/fr_support_message.lng
interface/web/help/lib/lang/fr_support_message.lng
+7
-0
interface/web/help/lib/lang/fr_support_message_list.lng
interface/web/help/lib/lang/fr_support_message_list.lng
+1
-0
interface/web/help/lib/lang/hr_support_message.lng
interface/web/help/lib/lang/hr_support_message.lng
+7
-0
interface/web/help/lib/lang/hr_support_message_list.lng
interface/web/help/lib/lang/hr_support_message_list.lng
+1
-0
interface/web/help/lib/lang/hu_support_message.lng
interface/web/help/lib/lang/hu_support_message.lng
+7
-0
interface/web/help/lib/lang/hu_support_message_list.lng
interface/web/help/lib/lang/hu_support_message_list.lng
+1
-0
interface/web/help/lib/lang/id_support_message.lng
interface/web/help/lib/lang/id_support_message.lng
+7
-0
interface/web/help/lib/lang/id_support_message_list.lng
interface/web/help/lib/lang/id_support_message_list.lng
+1
-0
interface/web/help/lib/lang/it_support_message.lng
interface/web/help/lib/lang/it_support_message.lng
+7
-0
interface/web/help/lib/lang/it_support_message_list.lng
interface/web/help/lib/lang/it_support_message_list.lng
+1
-0
interface/web/help/lib/lang/ja_support_message.lng
interface/web/help/lib/lang/ja_support_message.lng
+7
-0
interface/web/help/lib/lang/ja_support_message_list.lng
interface/web/help/lib/lang/ja_support_message_list.lng
+1
-0
interface/web/help/lib/lang/nl_support_message.lng
interface/web/help/lib/lang/nl_support_message.lng
+7
-0
interface/web/help/lib/lang/nl_support_message_list.lng
interface/web/help/lib/lang/nl_support_message_list.lng
+1
-0
interface/web/help/lib/lang/pl_support_message.lng
interface/web/help/lib/lang/pl_support_message.lng
+7
-0
interface/web/help/lib/lang/pl_support_message_list.lng
interface/web/help/lib/lang/pl_support_message_list.lng
+1
-0
interface/web/help/lib/lang/pt_support_message.lng
interface/web/help/lib/lang/pt_support_message.lng
+7
-0
interface/web/help/lib/lang/pt_support_message_list.lng
interface/web/help/lib/lang/pt_support_message_list.lng
+1
-0
interface/web/help/lib/lang/ro_support_message.lng
interface/web/help/lib/lang/ro_support_message.lng
+7
-0
interface/web/help/lib/lang/ro_support_message_list.lng
interface/web/help/lib/lang/ro_support_message_list.lng
+1
-0
interface/web/help/lib/lang/ru_support_message.lng
interface/web/help/lib/lang/ru_support_message.lng
+7
-0
interface/web/help/lib/lang/ru_support_message_list.lng
interface/web/help/lib/lang/ru_support_message_list.lng
+1
-0
interface/web/help/lib/lang/se_support_message.lng
interface/web/help/lib/lang/se_support_message.lng
+7
-0
interface/web/help/lib/lang/se_support_message_list.lng
interface/web/help/lib/lang/se_support_message_list.lng
+1
-0
interface/web/help/lib/lang/sk_support_message.lng
interface/web/help/lib/lang/sk_support_message.lng
+7
-0
interface/web/help/lib/lang/sk_support_message_list.lng
interface/web/help/lib/lang/sk_support_message_list.lng
+1
-0
interface/web/help/lib/lang/tr_support_message.lng
interface/web/help/lib/lang/tr_support_message.lng
+7
-0
interface/web/help/lib/lang/tr_support_message_list.lng
interface/web/help/lib/lang/tr_support_message_list.lng
+1
-0
interface/web/js/scrigo.js.php
interface/web/js/scrigo.js.php
+48
-23
interface/web/login/lib/lang/ar.lng
interface/web/login/lib/lang/ar.lng
+1
-0
interface/web/login/lib/lang/bg.lng
interface/web/login/lib/lang/bg.lng
+1
-0
interface/web/login/lib/lang/br.lng
interface/web/login/lib/lang/br.lng
+1
-0
interface/web/login/lib/lang/cz.lng
interface/web/login/lib/lang/cz.lng
+1
-0
interface/web/login/lib/lang/el.lng
interface/web/login/lib/lang/el.lng
+1
-0
interface/web/login/lib/lang/es.lng
interface/web/login/lib/lang/es.lng
+1
-0
interface/web/login/lib/lang/fi.lng
interface/web/login/lib/lang/fi.lng
+1
-0
interface/web/login/lib/lang/fr.lng
interface/web/login/lib/lang/fr.lng
+1
-0
interface/web/login/lib/lang/hr.lng
interface/web/login/lib/lang/hr.lng
+1
-0
interface/web/login/lib/lang/hu.lng
interface/web/login/lib/lang/hu.lng
+1
-0
interface/web/login/lib/lang/id.lng
interface/web/login/lib/lang/id.lng
+1
-0
interface/web/login/lib/lang/it.lng
interface/web/login/lib/lang/it.lng
+1
-0
interface/web/login/lib/lang/ja.lng
interface/web/login/lib/lang/ja.lng
+1
-0
interface/web/login/lib/lang/nl.lng
interface/web/login/lib/lang/nl.lng
+1
-0
interface/web/login/lib/lang/pl.lng
interface/web/login/lib/lang/pl.lng
+1
-0
interface/web/login/lib/lang/pt.lng
interface/web/login/lib/lang/pt.lng
+1
-0
interface/web/login/lib/lang/ro.lng
interface/web/login/lib/lang/ro.lng
+1
-0
interface/web/login/lib/lang/ru.lng
interface/web/login/lib/lang/ru.lng
+1
-0
interface/web/login/lib/lang/se.lng
interface/web/login/lib/lang/se.lng
+1
-0
interface/web/login/lib/lang/sk.lng
interface/web/login/lib/lang/sk.lng
+1
-0
interface/web/login/lib/lang/tr.lng
interface/web/login/lib/lang/tr.lng
+1
-0
interface/web/mail/lib/lang/ar_spamfilter_users.lng
interface/web/mail/lib/lang/ar_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/ar_user_quota_stats_list.lng
interface/web/mail/lib/lang/ar_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/bg_spamfilter_users.lng
interface/web/mail/lib/lang/bg_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/bg_user_quota_stats_list.lng
interface/web/mail/lib/lang/bg_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/br_spamfilter_users.lng
interface/web/mail/lib/lang/br_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/br_user_quota_stats_list.lng
interface/web/mail/lib/lang/br_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/cz_spamfilter_users.lng
interface/web/mail/lib/lang/cz_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/de_mail_get.lng
interface/web/mail/lib/lang/de_mail_get.lng
+1
-1
interface/web/mail/lib/lang/el_spamfilter_users.lng
interface/web/mail/lib/lang/el_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/el_user_quota_stats_list.lng
interface/web/mail/lib/lang/el_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/es_spamfilter_users.lng
interface/web/mail/lib/lang/es_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/es_user_quota_stats_list.lng
interface/web/mail/lib/lang/es_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/fi_spamfilter_users.lng
interface/web/mail/lib/lang/fi_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/fi_user_quota_stats_list.lng
interface/web/mail/lib/lang/fi_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/fr_spamfilter_users.lng
interface/web/mail/lib/lang/fr_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/fr_user_quota_stats_list.lng
interface/web/mail/lib/lang/fr_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/hr_spamfilter_users.lng
interface/web/mail/lib/lang/hr_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/hr_user_quota_stats_list.lng
interface/web/mail/lib/lang/hr_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/hu_spamfilter_users.lng
interface/web/mail/lib/lang/hu_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/hu_user_quota_stats_list.lng
interface/web/mail/lib/lang/hu_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/id_spamfilter_users.lng
interface/web/mail/lib/lang/id_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/id_user_quota_stats_list.lng
interface/web/mail/lib/lang/id_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/it_spamfilter_users.lng
interface/web/mail/lib/lang/it_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/it_user_quota_stats_list.lng
interface/web/mail/lib/lang/it_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/ja_spamfilter_users.lng
interface/web/mail/lib/lang/ja_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/ja_user_quota_stats_list.lng
interface/web/mail/lib/lang/ja_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/nl_spamfilter_users.lng
interface/web/mail/lib/lang/nl_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/nl_user_quota_stats_list.lng
interface/web/mail/lib/lang/nl_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/pl_spamfilter_users.lng
interface/web/mail/lib/lang/pl_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/pt_spamfilter_users.lng
interface/web/mail/lib/lang/pt_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/pt_user_quota_stats_list.lng
interface/web/mail/lib/lang/pt_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/ro_spamfilter_users.lng
interface/web/mail/lib/lang/ro_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/ro_user_quota_stats_list.lng
interface/web/mail/lib/lang/ro_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/ru_spamfilter_users.lng
interface/web/mail/lib/lang/ru_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/ru_user_quota_stats_list.lng
interface/web/mail/lib/lang/ru_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/se_spamfilter_users.lng
interface/web/mail/lib/lang/se_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/se_user_quota_stats_list.lng
interface/web/mail/lib/lang/se_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/sk_spamfilter_users.lng
interface/web/mail/lib/lang/sk_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/sk_user_quota_stats_list.lng
interface/web/mail/lib/lang/sk_user_quota_stats_list.lng
+1
-0
interface/web/mail/lib/lang/tr_spamfilter_users.lng
interface/web/mail/lib/lang/tr_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/tr_user_quota_stats_list.lng
interface/web/mail/lib/lang/tr_user_quota_stats_list.lng
+1
-0
interface/web/mail/mail_alias_edit.php
interface/web/mail/mail_alias_edit.php
+6
-0
interface/web/mail/mail_get_edit.php
interface/web/mail/mail_get_edit.php
+6
-0
interface/web/mail/mail_user_edit.php
interface/web/mail/mail_user_edit.php
+1
-1
interface/web/monitor/lib/lang/ar.lng
interface/web/monitor/lib/lang/ar.lng
+6
-0
interface/web/monitor/lib/lang/bg.lng
interface/web/monitor/lib/lang/bg.lng
+6
-0
interface/web/monitor/lib/lang/br.lng
interface/web/monitor/lib/lang/br.lng
+6
-0
interface/web/monitor/lib/lang/cz.lng
interface/web/monitor/lib/lang/cz.lng
+6
-0
interface/web/monitor/lib/lang/el.lng
interface/web/monitor/lib/lang/el.lng
+6
-0
interface/web/monitor/lib/lang/es.lng
interface/web/monitor/lib/lang/es.lng
+6
-0
interface/web/monitor/lib/lang/fi.lng
interface/web/monitor/lib/lang/fi.lng
+6
-0
interface/web/monitor/lib/lang/fr.lng
interface/web/monitor/lib/lang/fr.lng
+6
-0
interface/web/monitor/lib/lang/hr.lng
interface/web/monitor/lib/lang/hr.lng
+6
-0
interface/web/monitor/lib/lang/hu.lng
interface/web/monitor/lib/lang/hu.lng
+6
-0
interface/web/monitor/lib/lang/id.lng
interface/web/monitor/lib/lang/id.lng
+6
-0
interface/web/monitor/lib/lang/it.lng
interface/web/monitor/lib/lang/it.lng
+6
-0
interface/web/monitor/lib/lang/ja.lng
interface/web/monitor/lib/lang/ja.lng
+6
-0
interface/web/monitor/lib/lang/nl.lng
interface/web/monitor/lib/lang/nl.lng
+6
-0
interface/web/monitor/lib/lang/pl.lng
interface/web/monitor/lib/lang/pl.lng
+6
-0
interface/web/monitor/lib/lang/pt.lng
interface/web/monitor/lib/lang/pt.lng
+6
-0
interface/web/monitor/lib/lang/ro.lng
interface/web/monitor/lib/lang/ro.lng
+6
-0
interface/web/monitor/lib/lang/ru.lng
interface/web/monitor/lib/lang/ru.lng
+6
-0
interface/web/monitor/lib/lang/se.lng
interface/web/monitor/lib/lang/se.lng
+6
-0
interface/web/monitor/lib/lang/sk.lng
interface/web/monitor/lib/lang/sk.lng
+6
-0
interface/web/monitor/lib/lang/tr.lng
interface/web/monitor/lib/lang/tr.lng
+6
-0
interface/web/sites/ajax_get_json.php
interface/web/sites/ajax_get_json.php
+25
-8
interface/web/sites/cron_edit.php
interface/web/sites/cron_edit.php
+2
-1
interface/web/sites/database_edit.php
interface/web/sites/database_edit.php
+4
-1
interface/web/sites/ftp_user_edit.php
interface/web/sites/ftp_user_edit.php
+9
-1
interface/web/sites/lib/lang/ar_shell_user.lng
interface/web/sites/lib/lang/ar_shell_user.lng
+2
-0
interface/web/sites/lib/lang/ar_web_domain.lng
interface/web/sites/lib/lang/ar_web_domain.lng
+7
-0
interface/web/sites/lib/lang/ar_web_folder_user.lng
interface/web/sites/lib/lang/ar_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/bg_shell_user.lng
interface/web/sites/lib/lang/bg_shell_user.lng
+2
-0
interface/web/sites/lib/lang/bg_web_domain.lng
interface/web/sites/lib/lang/bg_web_domain.lng
+7
-0
interface/web/sites/lib/lang/bg_web_folder_user.lng
interface/web/sites/lib/lang/bg_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/br_shell_user.lng
interface/web/sites/lib/lang/br_shell_user.lng
+2
-0
interface/web/sites/lib/lang/br_web_domain.lng
interface/web/sites/lib/lang/br_web_domain.lng
+7
-0
interface/web/sites/lib/lang/br_web_folder_user.lng
interface/web/sites/lib/lang/br_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/cz_shell_user.lng
interface/web/sites/lib/lang/cz_shell_user.lng
+2
-0
interface/web/sites/lib/lang/cz_web_domain.lng
interface/web/sites/lib/lang/cz_web_domain.lng
+7
-0
interface/web/sites/lib/lang/cz_web_folder_user.lng
interface/web/sites/lib/lang/cz_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/de_database_admin_list.lng
interface/web/sites/lib/lang/de_database_admin_list.lng
+1
-0
interface/web/sites/lib/lang/de_database_list.lng
interface/web/sites/lib/lang/de_database_list.lng
+1
-0
interface/web/sites/lib/lang/de_web_domain.lng
interface/web/sites/lib/lang/de_web_domain.lng
+1
-0
interface/web/sites/lib/lang/de_web_folder_user.lng
interface/web/sites/lib/lang/de_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/el_shell_user.lng
interface/web/sites/lib/lang/el_shell_user.lng
+2
-0
interface/web/sites/lib/lang/el_web_domain.lng
interface/web/sites/lib/lang/el_web_domain.lng
+7
-0
interface/web/sites/lib/lang/el_web_folder_user.lng
interface/web/sites/lib/lang/el_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/en_database_admin_list.lng
interface/web/sites/lib/lang/en_database_admin_list.lng
+1
-0
interface/web/sites/lib/lang/en_database_list.lng
interface/web/sites/lib/lang/en_database_list.lng
+2
-1
interface/web/sites/lib/lang/en_web_domain.lng
interface/web/sites/lib/lang/en_web_domain.lng
+1
-0
interface/web/sites/lib/lang/en_web_folder_user.lng
interface/web/sites/lib/lang/en_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/es_shell_user.lng
interface/web/sites/lib/lang/es_shell_user.lng
+2
-0
interface/web/sites/lib/lang/es_web_domain.lng
interface/web/sites/lib/lang/es_web_domain.lng
+7
-0
interface/web/sites/lib/lang/es_web_folder_user.lng
interface/web/sites/lib/lang/es_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/fi_shell_user.lng
interface/web/sites/lib/lang/fi_shell_user.lng
+2
-0
interface/web/sites/lib/lang/fi_web_domain.lng
interface/web/sites/lib/lang/fi_web_domain.lng
+7
-0
interface/web/sites/lib/lang/fi_web_folder_user.lng
interface/web/sites/lib/lang/fi_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/fr_shell_user.lng
interface/web/sites/lib/lang/fr_shell_user.lng
+2
-0
interface/web/sites/lib/lang/fr_web_domain.lng
interface/web/sites/lib/lang/fr_web_domain.lng
+7
-0
interface/web/sites/lib/lang/fr_web_folder_user.lng
interface/web/sites/lib/lang/fr_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/hr_shell_user.lng
interface/web/sites/lib/lang/hr_shell_user.lng
+2
-0
interface/web/sites/lib/lang/hr_web_domain.lng
interface/web/sites/lib/lang/hr_web_domain.lng
+7
-0
interface/web/sites/lib/lang/hr_web_folder_user.lng
interface/web/sites/lib/lang/hr_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/hu_shell_user.lng
interface/web/sites/lib/lang/hu_shell_user.lng
+2
-0
interface/web/sites/lib/lang/hu_web_domain.lng
interface/web/sites/lib/lang/hu_web_domain.lng
+7
-0
interface/web/sites/lib/lang/hu_web_folder_user.lng
interface/web/sites/lib/lang/hu_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/id_shell_user.lng
interface/web/sites/lib/lang/id_shell_user.lng
+2
-0
interface/web/sites/lib/lang/id_web_domain.lng
interface/web/sites/lib/lang/id_web_domain.lng
+7
-0
interface/web/sites/lib/lang/id_web_folder_user.lng
interface/web/sites/lib/lang/id_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/it_shell_user.lng
interface/web/sites/lib/lang/it_shell_user.lng
+2
-0
interface/web/sites/lib/lang/it_web_domain.lng
interface/web/sites/lib/lang/it_web_domain.lng
+7
-0
interface/web/sites/lib/lang/it_web_folder_user.lng
interface/web/sites/lib/lang/it_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/ja_shell_user.lng
interface/web/sites/lib/lang/ja_shell_user.lng
+2
-0
interface/web/sites/lib/lang/ja_web_domain.lng
interface/web/sites/lib/lang/ja_web_domain.lng
+7
-0
interface/web/sites/lib/lang/ja_web_folder_user.lng
interface/web/sites/lib/lang/ja_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/nl_shell_user.lng
interface/web/sites/lib/lang/nl_shell_user.lng
+2
-0
interface/web/sites/lib/lang/nl_web_domain.lng
interface/web/sites/lib/lang/nl_web_domain.lng
+7
-0
interface/web/sites/lib/lang/nl_web_folder_user.lng
interface/web/sites/lib/lang/nl_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/pl_shell_user.lng
interface/web/sites/lib/lang/pl_shell_user.lng
+2
-0
interface/web/sites/lib/lang/pl_web_domain.lng
interface/web/sites/lib/lang/pl_web_domain.lng
+7
-0
interface/web/sites/lib/lang/pl_web_folder_user.lng
interface/web/sites/lib/lang/pl_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/pt_shell_user.lng
interface/web/sites/lib/lang/pt_shell_user.lng
+2
-0
interface/web/sites/lib/lang/pt_web_domain.lng
interface/web/sites/lib/lang/pt_web_domain.lng
+7
-0
interface/web/sites/lib/lang/pt_web_folder_user.lng
interface/web/sites/lib/lang/pt_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/ro_shell_user.lng
interface/web/sites/lib/lang/ro_shell_user.lng
+2
-0
interface/web/sites/lib/lang/ro_web_domain.lng
interface/web/sites/lib/lang/ro_web_domain.lng
+7
-0
interface/web/sites/lib/lang/ro_web_folder_user.lng
interface/web/sites/lib/lang/ro_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/ru_shell_user.lng
interface/web/sites/lib/lang/ru_shell_user.lng
+2
-0
interface/web/sites/lib/lang/ru_web_domain.lng
interface/web/sites/lib/lang/ru_web_domain.lng
+7
-0
interface/web/sites/lib/lang/ru_web_folder_user.lng
interface/web/sites/lib/lang/ru_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/se_shell_user.lng
interface/web/sites/lib/lang/se_shell_user.lng
+2
-0
interface/web/sites/lib/lang/se_web_domain.lng
interface/web/sites/lib/lang/se_web_domain.lng
+7
-0
interface/web/sites/lib/lang/se_web_folder_user.lng
interface/web/sites/lib/lang/se_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/sk_shell_user.lng
interface/web/sites/lib/lang/sk_shell_user.lng
+2
-0
interface/web/sites/lib/lang/sk_web_domain.lng
interface/web/sites/lib/lang/sk_web_domain.lng
+7
-0
interface/web/sites/lib/lang/sk_web_folder_user.lng
interface/web/sites/lib/lang/sk_web_folder_user.lng
+1
-0
interface/web/sites/lib/lang/tr_shell_user.lng
interface/web/sites/lib/lang/tr_shell_user.lng
+2
-0
interface/web/sites/lib/lang/tr_web_domain.lng
interface/web/sites/lib/lang/tr_web_domain.lng
+8
-0
interface/web/sites/lib/lang/tr_web_folder_user.lng
interface/web/sites/lib/lang/tr_web_folder_user.lng
+1
-0
interface/web/sites/list/database.list.php
interface/web/sites/list/database.list.php
+17
-0
interface/web/sites/shell_user_edit.php
interface/web/sites/shell_user_edit.php
+11
-1
interface/web/sites/templates/database_admin_list.htm
interface/web/sites/templates/database_admin_list.htm
+3
-0
interface/web/sites/templates/database_list.htm
interface/web/sites/templates/database_list.htm
+3
-0
interface/web/sites/templates/web_domain_advanced.htm
interface/web/sites/templates/web_domain_advanced.htm
+9
-0
interface/web/sites/templates/web_domain_backup.htm
interface/web/sites/templates/web_domain_backup.htm
+9
-0
interface/web/sites/templates/web_domain_edit.htm
interface/web/sites/templates/web_domain_edit.htm
+11
-1
interface/web/sites/templates/web_domain_redirect.htm
interface/web/sites/templates/web_domain_redirect.htm
+10
-1
interface/web/sites/templates/web_domain_ssl.htm
interface/web/sites/templates/web_domain_ssl.htm
+9
-0
interface/web/sites/templates/web_domain_stats.htm
interface/web/sites/templates/web_domain_stats.htm
+9
-0
interface/web/sites/web_aliasdomain_edit.php
interface/web/sites/web_aliasdomain_edit.php
+2
-1
interface/web/sites/web_domain_edit.php
interface/web/sites/web_domain_edit.php
+55
-20
interface/web/sites/web_folder_edit.php
interface/web/sites/web_folder_edit.php
+2
-1
interface/web/sites/web_folder_user_edit.php
interface/web/sites/web_folder_user_edit.php
+2
-1
interface/web/sites/web_subdomain_edit.php
interface/web/sites/web_subdomain_edit.php
+2
-1
interface/web/sites/web_vhost_subdomain_edit.php
interface/web/sites/web_vhost_subdomain_edit.php
+2
-1
interface/web/sites/webdav_user_edit.php
interface/web/sites/webdav_user_edit.php
+2
-1
remoting_client/examples/client_add.php
remoting_client/examples/client_add.php
+1
-1
remoting_client/examples/client_update.php
remoting_client/examples/client_update.php
+5
-2
server/cron_daily.php
server/cron_daily.php
+10
-8
server/lib/app.inc.php
server/lib/app.inc.php
+1
-1
server/lib/classes/db_mysql.inc.php
server/lib/classes/db_mysql.inc.php
+9
-0
server/mods-available/dns_module.inc.php
server/mods-available/dns_module.inc.php
+3
-3
server/mods-available/web_module.inc.php
server/mods-available/web_module.inc.php
+3
-3
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/apache2_plugin.inc.php
+21
-11
server/plugins-available/nginx_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php
+87
-3
server/server.php
server/server.php
+2
-1
No files found.
install/dist/lib/fedora.lib.php
View file @
7b47c0aa
...
...
@@ -163,7 +163,23 @@ class installer_dist extends installer_base {
if
(
!
is_group
(
$cf
[
'vmail_groupname'
]))
caselog
(
$command
.
' &> /dev/null'
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
$command
=
'useradd -g '
.
$cf
[
'vmail_groupname'
]
.
' -u '
.
$cf
[
'vmail_userid'
]
.
' '
.
$cf
[
'vmail_username'
]
.
' -d '
.
$cf
[
'vmail_mailbox_base'
]
.
' -m'
;
if
(
!
is_user
(
$cf
[
'vmail_username'
]))
caselog
(
"
$command
&> /dev/null"
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
if
(
!
is_user
(
$cf
[
'vmail_username'
]))
caselog
(
"
$command
&> /dev/null"
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
//* These postconf commands will be executed on installation and update
$server_ini_rec
=
$this
->
db
->
queryOneRecord
(
"SELECT config FROM server WHERE server_id = "
.
$conf
[
'server_id'
]);
$server_ini_array
=
ini_to_array
(
stripslashes
(
$server_ini_rec
[
'config'
]));
unset
(
$server_ini_rec
);
//* If there are RBL's defined, format the list and add them to smtp_recipient_restrictions to prevent removeal after an update
$rbl_list
=
''
;
if
(
@
isset
(
$server_ini_array
[
'mail'
][
'realtime_blackhole_list'
])
&&
$server_ini_array
[
'mail'
][
'realtime_blackhole_list'
]
!=
''
)
{
$rbl_hosts
=
explode
(
","
,
str_replace
(
" "
,
""
,
$server_ini_array
[
'mail'
][
'realtime_blackhole_list'
]));
foreach
(
$rbl_hosts
as
$key
=>
$value
)
{
$rbl_list
.
=
", reject_rbl_client "
.
$value
;
}
}
unset
(
$rbl_hosts
);
unset
(
$server_ini_array
);
//* These postconf commands will be executed on installation and update
$postconf_placeholders
=
array
(
'{config_dir}'
=>
$config_dir
,
...
...
install/dist/lib/opensuse.lib.php
View file @
7b47c0aa
...
...
@@ -178,6 +178,22 @@ class installer_dist extends installer_base {
if
(
$cf
[
'vmail_mailbox_base'
]
!=
''
&&
strlen
(
$cf
[
'vmail_mailbox_base'
])
>=
10
&&
$this
->
is_update
===
false
)
exec
(
'chown -R '
.
$cf
[
'vmail_username'
]
.
':'
.
$cf
[
'vmail_groupname'
]
.
' '
.
$cf
[
'vmail_mailbox_base'
]);
//* These postconf commands will be executed on installation and update
$server_ini_rec
=
$this
->
db
->
queryOneRecord
(
"SELECT config FROM server WHERE server_id = "
.
$conf
[
'server_id'
]);
$server_ini_array
=
ini_to_array
(
stripslashes
(
$server_ini_rec
[
'config'
]));
unset
(
$server_ini_rec
);
//* If there are RBL's defined, format the list and add them to smtp_recipient_restrictions to prevent removeal after an update
$rbl_list
=
''
;
if
(
@
isset
(
$server_ini_array
[
'mail'
][
'realtime_blackhole_list'
])
&&
$server_ini_array
[
'mail'
][
'realtime_blackhole_list'
]
!=
''
)
{
$rbl_hosts
=
explode
(
","
,
str_replace
(
" "
,
""
,
$server_ini_array
[
'mail'
][
'realtime_blackhole_list'
]));
foreach
(
$rbl_hosts
as
$key
=>
$value
)
{
$rbl_list
.
=
", reject_rbl_client "
.
$value
;
}
}
unset
(
$rbl_hosts
);
unset
(
$server_ini_array
);
//* These postconf commands will be executed on installation and update
$postconf_placeholders
=
array
(
'{config_dir}'
=>
$config_dir
,
'{vmail_mailbox_base}'
=>
$cf
[
'vmail_mailbox_base'
],
...
...
install/install.php
View file @
7b47c0aa
...
...
@@ -571,7 +571,8 @@ if($install_mode == 'standard') {
}*/
//** Configure ISPConfig :-)
if
(
strtolower
(
$inst
->
simple_query
(
'Install ISPConfig Web Interface'
,
array
(
'y'
,
'n'
),
'y'
))
==
'y'
)
{
$install_ispconfig_interface_default
=
(
$conf
[
'mysql'
][
'master_slave_setup'
]
==
'y'
)
?
'n'
:
'y'
;
if
(
strtolower
(
$inst
->
simple_query
(
'Install ISPConfig Web Interface'
,
array
(
'y'
,
'n'
),
$install_ispconfig_interface_default
))
==
'y'
)
{
swriteln
(
'Installing ISPConfig'
);
//** We want to check if the server is a module or cgi based php enabled server
...
...
install/lib/installer_base.lib.php
View file @
7b47c0aa
...
...
@@ -400,7 +400,7 @@ class installer_base {
$this
->
warning
(
'Unable to set rights of user in master database: '
.
$value
[
'db'
]
.
"
\n
Query: "
.
$query
.
"
\n
Error: "
.
$this
->
dbmaster
->
errorMessage
);
}
$query
=
"GRANT SELECT, UPDATE(`status`) ON "
.
$value
[
'db'
]
.
".`sys_datalog` TO '"
.
$value
[
'user'
]
.
"'@'"
.
$host
.
"' "
;
$query
=
"GRANT SELECT, UPDATE(`status`
, `error`
) ON "
.
$value
[
'db'
]
.
".`sys_datalog` TO '"
.
$value
[
'user'
]
.
"'@'"
.
$host
.
"' "
;
if
(
$verbose
){
echo
$query
.
"
\n
"
;
}
...
...
@@ -2094,8 +2094,8 @@ class installer_base {
}
$root_cron_jobs
=
array
(
"* * * * * "
.
$install_dir
.
"/server/server.sh > /dev/null
2
>> "
.
$conf
[
'ispconfig_log_dir'
]
.
"/cron.log"
,
"30 00 * * * "
.
$install_dir
.
"/server/cron_daily.sh > /dev/null
2
>> "
.
$conf
[
'ispconfig_log_dir'
]
.
"/cron.log"
"* * * * * "
.
$install_dir
.
"/server/server.sh
2>&1
> /dev/null
| while read line; do echo `/bin/date`
\"\$
line
\"
>> "
.
$conf
[
'ispconfig_log_dir'
]
.
"/cron.log
; done
"
,
"30 00 * * * "
.
$install_dir
.
"/server/cron_daily.sh
2>&1
> /dev/null
| while read line; do echo `/bin/date`
\"\$
line
\"
>> "
.
$conf
[
'ispconfig_log_dir'
]
.
"/cron.log
; done
"
);
if
(
$conf
[
'nginx'
][
'installed'
]
==
true
)
{
...
...
install/lib/mysql.lib.php
View file @
7b47c0aa
...
...
@@ -35,7 +35,7 @@ class db
var
$dbUser
=
""
;
// database authorized user
var
$dbPass
=
""
;
// user's password
var
$dbCharset
=
""
;
// what charset comes and goes to mysql: utf8 / latin1
var
$linkId
=
0
;
// last result of mysql_connect()
var
$linkId
=
false
;
// last result of mysql_connect()
var
$queryId
=
0
;
// last result of mysql_query()
var
$record
=
array
();
// last record fetched
var
$autoCommit
=
1
;
// Autocommit Transactions
...
...
@@ -61,8 +61,8 @@ class db
// error handler
function
updateError
(
$location
)
{
$this
->
errorNumber
=
mysql_errno
();
$this
->
errorMessage
=
mysql_error
();
$this
->
errorNumber
=
mysql
i
_errno
(
$this
->
linkId
);
$this
->
errorMessage
=
mysql
i
_error
(
$this
->
linkId
);
$this
->
errorLocation
=
$location
;
if
(
$this
->
errorNumber
&&
$this
->
show_error_messages
)
{
...
...
@@ -73,16 +73,16 @@ class db
function
connect
()
{
if
(
$this
->
linkId
==
0
)
if
(
!
$this
->
linkId
)
{
$this
->
linkId
=
mysql_connect
(
$this
->
dbHost
,
$this
->
dbUser
,
$this
->
dbPass
);
$this
->
linkId
=
mysql
i
_connect
(
$this
->
dbHost
,
$this
->
dbUser
,
$this
->
dbPass
);
if
(
!
$this
->
linkId
)
{
$this
->
updateError
(
'DB::connect()<br />mysql_connect'
);
$this
->
updateError
(
'DB::connect()<br />mysql
i
_connect'
);
return
false
;
}
$this
->
queryId
=
@
mysql_query
(
'SET NAMES '
.
$this
->
dbCharset
,
$this
->
linkId
);
$this
->
queryId
=
@
mysql
i
_query
(
$this
->
linkId
,
'SET NAMES '
.
$this
->
dbCharset
);
}
return
true
;
}
...
...
@@ -94,14 +94,14 @@ class db
return
false
;
}
if
(
$this
->
dbName
!=
''
)
{
if
(
!
mysql_select_db
(
$this
->
dbName
,
$this
->
linkId
))
if
(
!
mysql
i
_select_db
(
$this
->
linkId
,
$this
->
dbName
))
{
$this
->
updateError
(
'DB::connect()<br />mysql_select_db'
);
$this
->
updateError
(
'DB::connect()<br />mysql
i
_select_db'
);
return
false
;
}
}
$this
->
queryId
=
@
mysql_query
(
$
queryString
,
$this
->
linkId
);
$this
->
updateError
(
'DB::query('
.
$queryString
.
')<br />mysql_query'
);
$this
->
queryId
=
@
mysql
i
_query
(
$
this
->
linkId
,
$queryString
);
$this
->
updateError
(
'DB::query('
.
$queryString
.
')<br />mysql
i
_query'
);
if
(
!
$this
->
queryId
)
{
return
false
;
...
...
@@ -138,8 +138,8 @@ class db
// returns the next record in an array
function
nextRecord
()
{
$this
->
record
=
mysql_fetch_assoc
(
$this
->
queryId
);
$this
->
updateError
(
'DB::nextRecord()<br />mysql_fetch_array'
);
$this
->
record
=
mysql
i
_fetch_assoc
(
$this
->
queryId
);
$this
->
updateError
(
'DB::nextRecord()<br />mysql
i
_fetch_array'
);
if
(
!
$this
->
record
||
!
is_array
(
$this
->
record
))
{
return
false
;
...
...
@@ -151,18 +151,18 @@ class db
// returns number of rows returned by the last select query
function
numRows
()
{
return
mysql_num_rows
(
$this
->
queryId
);
return
mysql
i
_num_rows
(
$this
->
queryId
);
}
function
affectedRows
()
{
return
mysql_affected_rows
(
$this
->
linkId
);
return
mysql
i
_affected_rows
(
$this
->
linkId
);
}
// returns mySQL insert id
function
insertID
()
{
return
mysql_insert_id
(
$this
->
linkId
);
return
mysql
i
_insert_id
(
$this
->
linkId
);
}
// Check der variablen
...
...
@@ -175,7 +175,7 @@ class db
// Check der variablen
function
quote
(
$formfield
)
{
return
mysql_real_escape_string
(
$formfield
);
return
mysql
i
_real_escape_string
(
$this
->
linkId
,
$formfield
);
}
// Check der variablen
...
...
@@ -359,11 +359,22 @@ class db
if
(
$database_name
==
''
){
$database_name
=
$this
->
dbName
;
}
$result
=
mysql_query
(
"SHOW TABLES FROM `
$database_name
`"
);
$tables
=
$this
->
queryAllRecords
(
"SHOW TABLES FROM `
$database_name
`"
);
$tb_names
=
array
();
if
(
is_array
(
$tables
)
&&
!
empty
(
$tables
)){
for
(
$i
=
0
;
$i
<
sizeof
(
$tables
);
$i
++
){
$tb_names
[
$i
]
=
$tables
[
$i
][
'Tables_in_'
.
$database_name
];
}
}
/*
$result = mysqli_query("SHOW TABLES FROM `$database_name`");
$tb_names = array();
for
(
$i
=
0
;
$i
<
mysql_num_rows
(
$result
);
$i
++
)
{
for ($i = 0; $i < mysql
i
_num_rows($result); $i++) {
$tb_names[$i] = mysql_tablename($result, $i);
}
*/
return
$tb_names
;
}
...
...
@@ -438,35 +449,7 @@ class db
}
else
{
return
false
;
}
//$this->createTable('tester',$columns);
/*
$result = mysql_list_fields($go_info["server"]["db_name"],$table_name);
$fields = mysql_num_fields ($result);
$i = 0;
$table = mysql_field_table ($result, $i);
while ($i < $fields) {
$name = mysql_field_name ($result, $i);
$type = mysql_field_type ($result, $i);
$len = mysql_field_len ($result, $i);
$flags = mysql_field_flags ($result, $i);
print_r($flags);
$columns = array(name => $name,
type => "",
defaultValue => "",
isnull => 1,
option => "");
$returnvar[] = $columns;
$i++;
}
*/
}
function
mapType
(
$metaType
,
$typeValue
)
{
...
...
install/sql/incremental/upd_0055.sql
View file @
7b47c0aa
ALTER
TABLE
`web_backup`
CHANGE
`backup_type`
`backup_type`
enum
(
'web'
,
'mongodb'
,
'mysql'
)
NOT
NULL
DEFAULT
'web'
;
ALTER
TABLE
`web_database_user`
ADD
`database_password_mongo`
varchar
(
32
)
DEFAULT
NULL
AFTER
`database_password`
;
ALTER
TABLE
`sys_datalog`
ADD
`error`
MEDIUMTEXT
NULL
DEFAULT
NULL
;
install/sql/incremental/upd_0056.sql
0 → 100644
View file @
7b47c0aa
CREATE
TABLE
`client_template_assigned`
(
`assigned_template_id`
bigint
(
20
)
NOT
NULL
auto_increment
,
`client_id`
bigint
(
11
)
NOT
NULL
DEFAULT
'0'
,
`client_template_id`
int
(
11
)
NOT
NULL
DEFAULT
'0'
,
PRIMARY
KEY
(
`assigned_template_id`
),
KEY
`client_id`
(
`client_id`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
utf8
AUTO_INCREMENT
=
1
;
ALTER
TABLE
`client`
ADD
`gender`
enum
(
''
,
'm'
,
'f'
)
NOT
NULL
DEFAULT
''
AFTER
`company_id`
,
ADD
`locked`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
AFTER
`created_at`
,
ADD
`canceled`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
AFTER
`locked`
,
ADD
`tmp_data`
mediumblob
AFTER
`canceled`
;
install/sql/ispconfig3.sql
View file @
7b47c0aa
...
...
@@ -145,6 +145,7 @@ CREATE TABLE `client` (
`sys_perm_other`
varchar
(
5
)
DEFAULT
NULL
,
`company_name`
varchar
(
64
)
DEFAULT
NULL
,
`company_id`
varchar
(
30
)
DEFAULT
NULL
,
`gender`
enum
(
''
,
'm'
,
'f'
)
NOT
NULL
DEFAULT
''
,
`contact_name`
varchar
(
64
)
DEFAULT
NULL
,
`customer_no`
varchar
(
64
)
DEFAULT
NULL
,
`vat_id`
varchar
(
64
)
DEFAULT
NULL
,
...
...
@@ -225,6 +226,9 @@ CREATE TABLE `client` (
`template_master`
int
(
11
)
unsigned
NOT
NULL
DEFAULT
'0'
,
`template_additional`
text
NOT
NULL
DEFAULT
''
,
`created_at`
bigint
(
20
)
DEFAULT
NULL
,
`locked`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
,
`canceled`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
,
`tmp_data`
mediumblob
,
`id_rsa`
varchar
(
2000
)
NOT
NULL
DEFAULT
''
,
`ssh_rsa`
varchar
(
600
)
NOT
NULL
DEFAULT
''
,
PRIMARY
KEY
(
`client_id`
)
...
...
@@ -315,6 +319,19 @@ CREATE TABLE `client_template` (
-- --------------------------------------------------------
--
-- Table structure for table `client_template_assigned`
--
CREATE
TABLE
`client_template_assigned`
(
`assigned_template_id`
bigint
(
20
)
NOT
NULL
auto_increment
,
`client_id`
bigint
(
11
)
NOT
NULL
DEFAULT
'0'
,
`client_template_id`
int
(
11
)
NOT
NULL
DEFAULT
'0'
,
PRIMARY
KEY
(
`assigned_template_id`
),
KEY
`client_id`
(
`client_id`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
utf8
AUTO_INCREMENT
=
1
;
-- --------------------------------------------------------
--
-- Table structure for table `country`
--
...
...
@@ -1428,6 +1445,7 @@ CREATE TABLE `sys_datalog` (
`user`
varchar
(
255
)
NOT
NULL
default
''
,
`data`
longtext
NOT
NULL
,
`status`
set
(
'pending'
,
'ok'
,
'warning'
,
'error'
)
NOT
NULL
default
'ok'
,
`error`
mediumtext
,
PRIMARY
KEY
(
`datalog_id`
),
KEY
`server_id`
(
`server_id`
,
`status`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
utf8
AUTO_INCREMENT
=
1
;
...
...
@@ -2179,6 +2197,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config`
--
INSERT
INTO
sys_config
VALUES
(
'1'
,
'db'
,
'db_version'
,
'3.0.5.
2
'
);
INSERT
INTO
sys_config
VALUES
(
'1'
,
'db'
,
'db_version'
,
'3.0.5.
3
'
);
SET
FOREIGN_KEY_CHECKS
=
1
;
install/tpl/config.inc.php.master
View file @
7b47c0aa
...
...
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
//** Application
define
(
'ISPC_APP_TITLE'
,
'ISPConfig'
);
define
(
'ISPC_APP_VERSION'
,
'3.0.5.
2
'
);
define
(
'ISPC_APP_VERSION'
,
'3.0.5.
3
'
);
define
(
'DEVSYSTEM'
,
0
);
...
...
install/tpl/system.ini.master
View file @
7b47c0aa
...
...
@@ -41,3 +41,9 @@ tab_change_warning=n
use_loadindicator=y
use_combobox=y
maintenance_mode=n
admin_dashlets_left=
admin_dashlets_right=
reseller_dashlets_left=
reseller_dashlets_right=
client_dashlets_left=
client_dashlets_right=
interface/lib/classes/aps_guicontroller.inc.php
View file @
7b47c0aa
This diff is collapsed.
Click to expand it.
interface/lib/classes/client_templates.inc.php
View file @
7b47c0aa
...
...
@@ -9,7 +9,94 @@
class
client_templates
{
function
apply_client_templates
(
$clientId
)
{
/**
* - check for old-style templates and change to new style
* - update assigned templates
*/
function
update_client_templates
(
$clientId
,
$templates
=
array
())
{
global
$app
,
$conf
;
if
(
!
is_array
(
$templates
))
return
false
;
$new_tpl
=
array
();
$used_assigned
=
array
();
$needed_types
=
array
();
$old_style
=
true
;
foreach
(
$templates
as
$item
)
{
$item
=
trim
(
$item
);
if
(
$item
==
''
)
continue
;
$tpl_id
=
0
;
$assigned_id
=
0
;
if
(
strpos
(
$item
,
':'
)
===
false
)
{
$tpl_id
=
$item
;
}
else
{
$old_style
=
false
;
// has new-style assigns
list
(
$assigned_id
,
$tpl_id
)
=
explode
(
':'
,
$item
,
2
);
if
(
substr
(
$assigned_id
,
0
,
1
)
===
'n'
)
$assigned_id
=
0
;
// newly inserted items
}
if
(
array_key_exists
(
$tpl_id
,
$needed_types
)
==
false
)
$needed_types
[
$tpl_id
]
=
0
;
$needed_types
[
$tpl_id
]
++
;
if
(
$assigned_id
>
0
)
{