Skip to content

Commit ebef63a

Browse files
author
Marius Burkard
committed
- changed windows line-breaks to unix line-breaks
1 parent 13c1efb commit ebef63a

File tree

43 files changed

+352
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+352
-352
lines changed

‎docs/autoinstall_samples/autoinstall.conf_sample.php‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
<?php
2-
$autoinstall['language'] = 'en'; // de, en (default)
3-
$autoinstall['install_mode'] = 'standard'; // standard (default), expert
4-
5-
$autoinstall['hostname'] = 'server1.example.com'; // default
6-
$autoinstall['mysql_hostname'] = 'localhost'; // default: localhost
7-
$autoinstall['mysql_root_user'] = 'root'; // default: root
8-
$autoinstall['mysql_root_password'] = 'howtoforge';
9-
$autoinstall['mysql_database'] = 'dbispconfig'; // default: dbispcongig
10-
$autoinstall['mysql_charset'] = 'utf8'; // default: utf8
11-
$autoinstall['http_server'] = 'nginx'; // apache (default), nginx
12-
$autoinstall['ispconfig_port'] = '8080'; // default: 8080
13-
$autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n
14-
15-
/* SSL Settings */
16-
$autoinstall['ssl_cert_country'] = 'AU';
17-
$autoinstall['ssl_cert_state'] = 'Some-State';
18-
$autoinstall['ssl_cert_locality'] = 'Chicago';
19-
$autoinstall['ssl_cert_organisation'] = 'Internet Widgits Pty Ltd';
20-
$autoinstall['ssl_cert_organisation_unit'] = 'IT department';
21-
$autoinstall['ssl_cert_common_name'] = $autoinstall['hostname'];
22-
23-
/* optional expert mode settings, needed only for expert mode */
24-
$autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig
25-
$autoinstall['mysql_ispconfig_password'] = md5(uniqid(rand()));
26-
$autoinstall['join_multiserver_setup'] = 'n'; // y, n (default)
27-
$autoinstall['mysql_master_hostname'] = 'master.example.com';
28-
$autoinstall['mysql_master_root_user'] = 'root';
29-
$autoinstall['mysql_master_root_password'] = 'howtoforge';
30-
$autoinstall['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
31-
$autoinstall['configure_mail'] = 'y'; // y (default), n
32-
$autoinstall['configure_jailkit'] = 'y'; // y (default), n
33-
$autoinstall['configure_ftp'] = 'y'; // y (default), n
34-
$autoinstall['configure_dns'] = 'y'; // y (default), n
35-
$autoinstall['configure_apache'] = 'y'; // y (default), n
36-
$autoinstall['configure_nginx'] = 'y'; // y (default), n
37-
$autoinstall['configure_firewall'] = 'y'; // y (default), n
38-
$autoinstall['install_ispconfig_web_interface'] = 'y'; // y (default), n
39-
40-
/* optional update settings, needed only for updates */
41-
$autoupdate['do_backup'] = 'yes'; // yes (default), no
42-
$autoupdate['mysql_root_password'] = 'howtoforge';
43-
$autoupdate['mysql_master_hostname'] = 'master.example.com';
44-
$autoupdate['mysql_master_root_user'] = 'root';
45-
$autoupdate['mysql_master_root_password'] = 'howtoforge';
46-
$autoupdate['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
47-
$autoupdate['reconfigure_permissions_in_master_database'] = 'no'; // no (default), yes
48-
$autoupdate['reconfigure_services'] = 'yes'; // yes (default), no
49-
$autoupdate['ispconfig_port'] = '8080'; // default: 8080
50-
$autoupdate['create_new_ispconfig_ssl_cert'] = 'no'; // no (default), yes
51-
$autoupdate['reconfigure_crontab'] = 'yes'; // yes (default), no
1+
<?php
2+
$autoinstall['language'] = 'en'; // de, en (default)
3+
$autoinstall['install_mode'] = 'standard'; // standard (default), expert
4+
5+
$autoinstall['hostname'] = 'server1.example.com'; // default
6+
$autoinstall['mysql_hostname'] = 'localhost'; // default: localhost
7+
$autoinstall['mysql_root_user'] = 'root'; // default: root
8+
$autoinstall['mysql_root_password'] = 'howtoforge';
9+
$autoinstall['mysql_database'] = 'dbispconfig'; // default: dbispcongig
10+
$autoinstall['mysql_charset'] = 'utf8'; // default: utf8
11+
$autoinstall['http_server'] = 'nginx'; // apache (default), nginx
12+
$autoinstall['ispconfig_port'] = '8080'; // default: 8080
13+
$autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n
14+
15+
/* SSL Settings */
16+
$autoinstall['ssl_cert_country'] = 'AU';
17+
$autoinstall['ssl_cert_state'] = 'Some-State';
18+
$autoinstall['ssl_cert_locality'] = 'Chicago';
19+
$autoinstall['ssl_cert_organisation'] = 'Internet Widgits Pty Ltd';
20+
$autoinstall['ssl_cert_organisation_unit'] = 'IT department';
21+
$autoinstall['ssl_cert_common_name'] = $autoinstall['hostname'];
22+
23+
/* optional expert mode settings, needed only for expert mode */
24+
$autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig
25+
$autoinstall['mysql_ispconfig_password'] = md5(uniqid(rand()));
26+
$autoinstall['join_multiserver_setup'] = 'n'; // y, n (default)
27+
$autoinstall['mysql_master_hostname'] = 'master.example.com';
28+
$autoinstall['mysql_master_root_user'] = 'root';
29+
$autoinstall['mysql_master_root_password'] = 'howtoforge';
30+
$autoinstall['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
31+
$autoinstall['configure_mail'] = 'y'; // y (default), n
32+
$autoinstall['configure_jailkit'] = 'y'; // y (default), n
33+
$autoinstall['configure_ftp'] = 'y'; // y (default), n
34+
$autoinstall['configure_dns'] = 'y'; // y (default), n
35+
$autoinstall['configure_apache'] = 'y'; // y (default), n
36+
$autoinstall['configure_nginx'] = 'y'; // y (default), n
37+
$autoinstall['configure_firewall'] = 'y'; // y (default), n
38+
$autoinstall['install_ispconfig_web_interface'] = 'y'; // y (default), n
39+
40+
/* optional update settings, needed only for updates */
41+
$autoupdate['do_backup'] = 'yes'; // yes (default), no
42+
$autoupdate['mysql_root_password'] = 'howtoforge';
43+
$autoupdate['mysql_master_hostname'] = 'master.example.com';
44+
$autoupdate['mysql_master_root_user'] = 'root';
45+
$autoupdate['mysql_master_root_password'] = 'howtoforge';
46+
$autoupdate['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
47+
$autoupdate['reconfigure_permissions_in_master_database'] = 'no'; // no (default), yes
48+
$autoupdate['reconfigure_services'] = 'yes'; // yes (default), no
49+
$autoupdate['ispconfig_port'] = '8080'; // default: 8080
50+
$autoupdate['create_new_ispconfig_ssl_cert'] = 'no'; // no (default), yes
51+
$autoupdate['reconfigure_crontab'] = 'yes'; // yes (default), no
5252
?>

‎interface/lib/classes/plugin_directive_snippets.inc.php‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
1-
<?php
2-
3-
4-
class plugin_directive_snippets extends plugin_base
5-
{
6-
var $module;
7-
var $form;
8-
var $tab;
9-
var $record_id;
10-
var $formdef;
11-
var $options;
12-
13-
public function onShow()
14-
{
15-
global $app;
16-
17-
$listTpl = new tpl;
18-
$listTpl->newTemplate('templates/web_directive_snippets.htm');
19-
20-
//* Loading language file
21-
$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_web_directive_snippets.lng";
22-
23-
include $lng_file;
24-
$listTpl->setVar($wb);
25-
26-
$message = '';
27-
$error = '';
28-
29-
$server_type = $app->getconf->get_server_config($this->form->dataRecord['server_id'], 'web');
30-
$server_type = $server_type['server_type'];
31-
$records = $app->db->queryAllRecords("SELECT directive_snippets_id, name FROM directive_snippets WHERE customer_viewable = 'y' AND type = ? ORDER BY name ASC", $server_type);
32-
33-
for ($i = 0, $c = count($records); $i < $c; $i++)
34-
{
35-
$records[$i]['is_selected'] = false;
36-
37-
if ($this->form->dataRecord['directive_snippets_id'] === $records[$i]['directive_snippets_id'])
38-
$records[$i]['is_selected'] = true;
39-
}
40-
41-
$listTpl->setLoop('records', $records);
42-
43-
$list_name = 'directive_snippets_list';
44-
$_SESSION["s"]["list"][$list_name]["parent_id"] = $this->form->id;
45-
$_SESSION["s"]["list"][$list_name]["parent_name"] = $app->tform->formDef["name"];
46-
$_SESSION["s"]["list"][$list_name]["parent_tab"] = $_SESSION["s"]["form"]["tab"];
47-
$_SESSION["s"]["list"][$list_name]["parent_script"] = $app->tform->formDef["action"];
48-
$_SESSION["s"]["form"]["return_to"] = $list_name;
49-
50-
return $listTpl->grab();
51-
}
52-
53-
public function onUpdate()
54-
{
55-
global $app, $conf;
56-
57-
if (isset($this->form->dataRecord['directive_snippets_id']) && $this->form->oldDataRecord['directive_snippets_id'] !== $this->form->dataRecord['directive_snippets_id']) {
58-
$app->db->query('UPDATE web_domain SET directive_snippets_id = ? WHERE domain_id = ?', $this->form->dataRecord['directive_snippets_id'], $this->form->id);
59-
}
60-
}
61-
62-
public function onInsert()
63-
{
64-
global $app, $conf;
65-
66-
if (isset($this->form->dataRecord['directive_snippets_id'])) {
67-
$app->db->query('UPDATE web_domain SET directive_snippets_id = ? WHERE domain_id = ?', $this->form->dataRecord['directive_snippets_id'], $this->form->id);
68-
}
69-
}
70-
71-
}
1+
<?php
2+
3+
4+
class plugin_directive_snippets extends plugin_base
5+
{
6+
var $module;
7+
var $form;
8+
var $tab;
9+
var $record_id;
10+
var $formdef;
11+
var $options;
12+
13+
public function onShow()
14+
{
15+
global $app;
16+
17+
$listTpl = new tpl;
18+
$listTpl->newTemplate('templates/web_directive_snippets.htm');
19+
20+
//* Loading language file
21+
$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_web_directive_snippets.lng";
22+
23+
include $lng_file;
24+
$listTpl->setVar($wb);
25+
26+
$message = '';
27+
$error = '';
28+
29+
$server_type = $app->getconf->get_server_config($this->form->dataRecord['server_id'], 'web');
30+
$server_type = $server_type['server_type'];
31+
$records = $app->db->queryAllRecords("SELECT directive_snippets_id, name FROM directive_snippets WHERE customer_viewable = 'y' AND type = ? ORDER BY name ASC", $server_type);
32+
33+
for ($i = 0, $c = count($records); $i < $c; $i++)
34+
{
35+
$records[$i]['is_selected'] = false;
36+
37+
if ($this->form->dataRecord['directive_snippets_id'] === $records[$i]['directive_snippets_id'])
38+
$records[$i]['is_selected'] = true;
39+
}
40+
41+
$listTpl->setLoop('records', $records);
42+
43+
$list_name = 'directive_snippets_list';
44+
$_SESSION["s"]["list"][$list_name]["parent_id"] = $this->form->id;
45+
$_SESSION["s"]["list"][$list_name]["parent_name"] = $app->tform->formDef["name"];
46+
$_SESSION["s"]["list"][$list_name]["parent_tab"] = $_SESSION["s"]["form"]["tab"];
47+
$_SESSION["s"]["list"][$list_name]["parent_script"] = $app->tform->formDef["action"];
48+
$_SESSION["s"]["form"]["return_to"] = $list_name;
49+
50+
return $listTpl->grab();
51+
}
52+
53+
public function onUpdate()
54+
{
55+
global $app, $conf;
56+
57+
if (isset($this->form->dataRecord['directive_snippets_id']) && $this->form->oldDataRecord['directive_snippets_id'] !== $this->form->dataRecord['directive_snippets_id']) {
58+
$app->db->query('UPDATE web_domain SET directive_snippets_id = ? WHERE domain_id = ?', $this->form->dataRecord['directive_snippets_id'], $this->form->id);
59+
}
60+
}
61+
62+
public function onInsert()
63+
{
64+
global $app, $conf;
65+
66+
if (isset($this->form->dataRecord['directive_snippets_id'])) {
67+
$app->db->query('UPDATE web_domain SET directive_snippets_id = ? WHERE domain_id = ?', $this->form->dataRecord['directive_snippets_id'], $this->form->id);
68+
}
69+
}
70+
71+
}
7272
?>

‎interface/web/client/lib/lang/en_client_message_template.lng‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?php
2-
$wb["template_type_txt"] = 'Email type';
3-
$wb["template_name_txt"] = 'Template name';
4-
$wb["subject_txt"] = 'Subject';
5-
$wb["message_txt"] = 'Message';
6-
$wb['Email template'] = 'Email template';
7-
$wb['Settings'] = 'Setting';
8-
$wb['variables_txt'] = 'Variables';
9-
$wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)';
10-
$wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.';
1+
<?php
2+
$wb["template_type_txt"] = 'Email type';
3+
$wb["template_name_txt"] = 'Template name';
4+
$wb["subject_txt"] = 'Subject';
5+
$wb["message_txt"] = 'Message';
6+
$wb['Email template'] = 'Email template';
7+
$wb['Settings'] = 'Setting';
8+
$wb['variables_txt'] = 'Variables';
9+
$wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)';
10+
$wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.';
1111
?>

‎interface/web/client/lib/lang/en_client_message_template_list.lng‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?php
2-
$wb["list_head_txt"] = 'Email templates';
3-
$wb["template_type_txt"] = 'Message for';
4-
$wb["template_name_txt"] = 'Template name';
1+
<?php
2+
$wb["list_head_txt"] = 'Email templates';
3+
$wb["template_type_txt"] = 'Message for';
4+
$wb["template_name_txt"] = 'Template name';
55
?>

‎interface/web/client/templates/message_template_list.htm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ <h1><tmpl_var name="list_head_txt"></h1>
1111
<table class="table">
1212
<thead class="dark form-group-sm">
1313
<tr>
14-
<th data-column="template_type"><tmpl_var name="template_type_txt"></th>
15-
<th data-column="template_name"><tmpl_var name="template_name_txt"></th>
14+
<th data-column="template_type"><tmpl_var name="template_type_txt"></th>
15+
<th data-column="template_name"><tmpl_var name="template_name_txt"></th>
1616
<th class="text-right">&nbsp;</th>
1717
</tr>
1818
<tr>
19-
<td><select class="form-control" name="search_template_type" onChange="ISPConfig.submitForm('pageForm','billing/invoice_message_template_list.php');">{tmpl_var name='search_template_type'}</select></td>
20-
<td><input class="form-control" type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
19+
<td><select class="form-control" name="search_template_type" onChange="ISPConfig.submitForm('pageForm','billing/invoice_message_template_list.php');">{tmpl_var name='search_template_type'}</select></td>
20+
<td><input class="form-control" type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
2121
<td class="text-right"><div class="buttons"><button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="billing/invoice_message_template_list.php"><span class="icon icon-filter"></span></button></div></td>
2222
</tr>
2323
</thead>
2424
<tbody>
2525
<tmpl_loop name="records">
2626
<tr>
27-
<td><a href="#" data-load-content="billing/invoice_message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_type"}</a></td>
28-
<td><a href="#" data-load-content="billing/invoice_message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_name"}</a></td>
27+
<td><a href="#" data-load-content="billing/invoice_message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_type"}</a></td>
28+
<td><a href="#" data-load-content="billing/invoice_message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_name"}</a></td>
2929
<td class="text-right">
3030
<div class="buttons icons16">
3131
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('billing/invoice_message_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>

‎interface/web/dashboard/lib/lang/bg_dashlet_invoice_client_settings.lng‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
2-
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
3-
$wb['edit_txt'] = 'Edit';
4-
?>
1+
<?php
2+
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
3+
$wb['edit_txt'] = 'Edit';
4+
?>

‎interface/web/dashboard/lib/lang/br_dashlet_invoice_client_settings.lng‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
2-
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
3-
$wb['edit_txt'] = 'Edit';
4-
?>
1+
<?php
2+
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
3+
$wb['edit_txt'] = 'Edit';
4+
?>

‎interface/web/dashboard/lib/lang/cz_dashlet_invoice_client_settings.lng‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
2-
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
3-
$wb['edit_txt'] = 'Edit';
4-
?>
1+
<?php
2+
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
3+
$wb['edit_txt'] = 'Edit';
4+
?>

‎interface/web/dashboard/lib/lang/el_dashlet_invoice_client_settings.lng‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
2-
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
3-
$wb['edit_txt'] = 'Edit';
4-
?>
1+
<?php
2+
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
3+
$wb['edit_txt'] = 'Edit';
4+
?>

‎interface/web/dashboard/lib/lang/en_dashlet_invoice_client_settings.lng‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
2-
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
3-
$wb['edit_txt'] = 'Edit';
4-
?>
1+
<?php
2+
$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
3+
$wb['edit_txt'] = 'Edit';
4+
?>

0 commit comments

Comments
 (0)