Skip to content

Commit 05457e3

Browse files
author
vogelor
committed
Site->aliasdomain now works together with the domain - module
1 parent 1293d86 commit 05457e3

File tree

2 files changed

+79
-39
lines changed

2 files changed

+79
-39
lines changed

‎interface/web/sites/templates/web_aliasdomain_edit.htm‎

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,54 @@ <h2><tmpl_var name="list_head_txt"></h2>
33

44
<div class="panel panel_web_domain">
55

6-
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels">
8-
<div class="ctrlHolder">
9-
<label for="domain">{tmpl_var name='domain_txt'}</label>
10-
<input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
6+
<div class="pnl_formsarea">
7+
<fieldset class="inlineLabels">
8+
<div class="ctrlHolder">
9+
<label for="domain">{tmpl_var name='domain_txt'}</label>
10+
<tmpl_if name="domain_option">
11+
<select name="domain" id="domain" class="selectInput">
12+
{tmpl_var name='domain_option'}
13+
</select>
14+
<tmpl_else>
15+
<input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
16+
</tmpl_if>
1117
</div>
12-
<div class="ctrlHolder">
13-
<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
14-
<select name="parent_domain_id" id="parent_domain_id" class="selectInput">
18+
<div class="ctrlHolder">
19+
<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
20+
<select name="parent_domain_id" id="parent_domain_id" class="selectInput">
1521
{tmpl_var name='parent_domain_id'}
1622
</select>
17-
</div>
18-
<div class="ctrlHolder">
19-
<label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
20-
<select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
23+
</div>
24+
<div class="ctrlHolder">
25+
<label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
26+
<select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
2127
{tmpl_var name='redirect_type'}
2228
</select>
23-
</div>
24-
<div class="ctrlHolder">
25-
<label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
26-
<input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
2729
</div>
28-
<div class="ctrlHolder">
29-
<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
30-
<select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
30+
<div class="ctrlHolder">
31+
<label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
32+
<input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
33+
</div>
34+
<div class="ctrlHolder">
35+
<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
36+
<select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
3137
{tmpl_var name='subdomain'}
3238
</select>
33-
</div>
34-
<div class="ctrlHolder">
39+
</div>
40+
<div class="ctrlHolder">
3541
<p class="label">{tmpl_var name='active_txt'}</p>
36-
<div class="multiField">
42+
<div class="multiField">
3743
{tmpl_var name='active'}
38-
</div>
44+
</div>
3945
</div>
40-
</fieldset>
46+
</fieldset>
47+
48+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
4149

42-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
50+
<div class="buttonHolder buttons">
51+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
52+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
53+
</div>
54+
</div>
4355

44-
<div class="buttonHolder buttons">
45-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
46-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
47-
</div>
48-
</div>
49-
5056
</div>

‎interface/web/sites/web_aliasdomain_edit.php‎

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,54 @@ function onShowNew() {
6868
parent::onShowNew();
6969
}
7070

71-
/*
7271
function onShowEnd() {
7372
global $app, $conf;
7473

75-
// Get the record of the parent domain
76-
$parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".intval($this->dataRecord["parent_domain_id"]));
77-
78-
$this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"],'',$this->dataRecord["domain"]);
79-
$app->tpl->setVar("domain",$this->dataRecord["domain"]);
80-
74+
/*
75+
* Now we have to check, if we should use the domain-module to select the domain
76+
* or not
77+
*/
78+
$app->uses('ini_parser,getconf');
79+
$settings = $app->getconf->get_global_config('domains');
80+
if ($settings['use_domain_module'] == 'y') {
81+
/*
82+
* The domain-module is in use.
83+
*/
84+
$client_group_id = $_SESSION["s"]["user"]["default_group"];
85+
/*
86+
* The admin can select ALL domains, the user only the domains assigned to him
87+
*/
88+
$sql = "SELECT domain FROM domain ";
89+
if ($_SESSION["s"]["user"]["typ"] != 'admin') {
90+
$sql .= "WHERE sys_groupid =" . $client_group_id;
91+
}
92+
$sql .= " ORDER BY domain";
93+
$domains = $app->db->queryAllRecords($sql);
94+
$domain_select = '';
95+
if(is_array($domains) && sizeof($domains) > 0) {
96+
/* We have domains in the list, so create the drop-down-list */
97+
foreach( $domains as $domain) {
98+
$domain_select .= "<option value=" . $domain['domain'] ;
99+
if ($domain['domain'] == $this->dataRecord["domain"]) {
100+
$domain_select .= " selected";
101+
}
102+
$domain_select .= ">" . $domain['domain'] . "</option>\r\n";
103+
}
104+
}
105+
else {
106+
/*
107+
* We have no domains in the domain-list. This means, we can not add ANY new domain.
108+
* To avoid, that the variable "domain_option" is empty and so the user can
109+
* free enter a domain, we have to create a empty option!
110+
*/
111+
$domain_select .= "<option value=''></option>\r\n";
112+
}
113+
$app->tpl->setVar("domain_option",$domain_select);
114+
}
115+
81116
parent::onShowEnd();
82117

83118
}
84-
*/
85119

86120
function onSubmit() {
87121
global $app, $conf;

0 commit comments

Comments
 (0)