diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master index bf85ec5145c2a8f4812c6a75463102bfdd7436b8..3124d92b33c1bd885b97954422575d9462a4c1d8 100644 --- a/install/tpl/system.ini.master +++ b/install/tpl/system.ini.master @@ -20,6 +20,7 @@ shelluser_prefix=[CLIENTNAME] webdavuser_prefix=[CLIENTNAME] dblist_phpmyadmin_link=y phpmyadmin_url= +webftp_url= [tools] diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php index b7764006441f1a88e4c707d8b50fc09848a80498..828b390fdc43f73db9bff38091ada0a7292702f6 100644 --- a/interface/web/admin/form/system_config.tform.php +++ b/interface/web/admin/form/system_config.tform.php @@ -136,6 +136,18 @@ $form["tabs"]['sites'] = array ( 'width' => '30', 'maxlength' => '255' ), + 'webftp_url' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'REGEX', + 'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/', + 'errmsg'=> 'webftp_url_error_regex'), + ), + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), ################################## # ENDE Datatable fields ################################## diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng index 69957ce7b75918bff68914024ea0fe7acb1d44fd..b3f4fb4d8778728ad1fd7838772ad1eff3a3029e 100644 --- a/interface/web/admin/lib/lang/en_system_config.lng +++ b/interface/web/admin/lib/lang/en_system_config.lng @@ -18,4 +18,5 @@ $wb['phpmyadmin_url_txt'] = 'PHPMyAdmin URL'; $wb['use_domain_module_txt'] = 'Use the domain-module to add new domains'; $wb['use_domain_module_hint'] = 'If you use this module, your customers can only select one of the domains the admin creates for them. They can not free edit the domain-field.You have to re-login after changing this value, to make the changes visible.'; $wb['new_domain_txt'] = 'HTML to create a new domain'; +$wb['webftp_url_txt'] = 'WebFTP URL'; ?> \ No newline at end of file diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm index 9dc8d1bebb08600d5ec5b22052e7c6aee94c6e10..63a4a4f2344f42ba539453e389ef282114888495 100644 --- a/interface/web/admin/templates/system_config_sites_edit.htm +++ b/interface/web/admin/templates/system_config_sites_edit.htm @@ -25,16 +25,20 @@ -
-

{tmpl_var name='dblist_phpmyadmin_link_txt'}

-
- {tmpl_var name='dblist_phpmyadmin_link'} -
+
+

{tmpl_var name='dblist_phpmyadmin_link_txt'}

+
+ {tmpl_var name='dblist_phpmyadmin_link'}
+
+
+ + +
diff --git a/interface/web/sites/ftp_user_list.php b/interface/web/sites/ftp_user_list.php index f16f5f2664374670ce3a8f4b194a3a3036199306..ef94dc246d1c5ceb40b9fdbf9b6b6bc80a161905 100644 --- a/interface/web/sites/ftp_user_list.php +++ b/interface/web/sites/ftp_user_list.php @@ -44,12 +44,31 @@ $list_def_file = "list/ftp_user.list.php"; //* Check permissions for module $app->auth->check_module_permissions('sites'); -$app->uses('listform_actions'); +$app->load('listform_actions'); -// Limit the results to alias domains -//$app->listform_actions->SQLExtWhere = "type = 'subdomain'"; -$app->listform_actions->onLoad(); +class list_action extends listform_actions { + + function onShow() { + global $app,$conf; + + $app->uses('getconf'); + $global_config = $app->getconf->get_global_config('sites'); + + if($global_config['webftp_url'] != '') { + $app->tpl->setVar('webftp_link',1); + $app->tpl->setVar('webftp_url',$global_config['webftp_url']); + } else { + $app->tpl->setVar('webftp_link',0); + } + + parent::onShow(); + } + +} + +$list = new list_action; +$list->onLoad(); ?> \ No newline at end of file diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm index 1fbda08edcbde4e8dcd62cc13317ab362e8dfd33..e0e51a245afde9c921084ca5c254285e0f9594d7 100644 --- a/interface/web/sites/templates/ftp_user_list.htm +++ b/interface/web/sites/templates/ftp_user_list.htm @@ -41,7 +41,8 @@ {tmpl_var name="username"}
- {tmpl_var name='delete_txt'} + {tmpl_var name='admin_txt'} + {tmpl_var name='delete_txt'}