Commit cab9249b authored by tbrehm's avatar tbrehm

Fixed several bugs (revisions 1783-1788 from stable branch).

parent 2c3939aa
...@@ -38,6 +38,11 @@ NameVirtualHost *:{vhost_port} ...@@ -38,6 +38,11 @@ NameVirtualHost *:{vhost_port}
# ErrorLog /var/log/apache2/error.log # ErrorLog /var/log/apache2/error.log
# CustomLog /var/log/apache2/access.log combined # CustomLog /var/log/apache2/access.log combined
ServerSignature Off ServerSignature Off
<IfModule mod_security2.c>
SecRuleEngine Off
</IfModule>
</VirtualHost> </VirtualHost>
......
...@@ -72,13 +72,13 @@ class mail_user_filter_plugin { ...@@ -72,13 +72,13 @@ class mail_user_filter_plugin {
} }
if($skip == false && $line != '') $out .= $line ."\n"; if($skip == false && $line != '') $out .= $line ."\n";
if($line == '### END FILTER_ID:'.$page_form->id) { if($line == '### END FILTER_ID:'.$page_form->id) {
$out .= $this->mail_user_filter_get_rule($page_form); if($page_form->dataRecord["active"] == 'y') $out .= $this->mail_user_filter_get_rule($page_form);
$skip = false; $skip = false;
} }
} }
// We did not found our rule, so we add it now as first rule. // We did not found our rule, so we add it now as first rule.
if($found == false) { if($found == false && $page_form->dataRecord["active"] == 'y') {
$new_rule = $this->mail_user_filter_get_rule($page_form); $new_rule = $this->mail_user_filter_get_rule($page_form);
$out = $new_rule . $out; $out = $new_rule . $out;
} }
......
...@@ -197,6 +197,14 @@ class page_action extends tform_actions { ...@@ -197,6 +197,14 @@ class page_action extends tform_actions {
$app->db->query($sql); $app->db->query($sql);
} }
// language changed
if(isset($this->dataRecord['language']) && $this->dataRecord['language'] != '' && $this->oldDataRecord['language'] != $this->dataRecord['language']) {
$language = $app->db->quote($this->dataRecord["language"]);
$client_id = $this->id;
$sql = "UPDATE sys_user SET language = '$language' WHERE client_id = $client_id";
$app->db->query($sql);
}
// reseller status changed // reseller status changed
if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != $this->oldDataRecord["limit_client"]) { if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != $this->oldDataRecord["limit_client"]) {
$modules = ISPC_INTERFACE_MODULES_ENABLED; $modules = ISPC_INTERFACE_MODULES_ENABLED;
......
...@@ -192,6 +192,14 @@ class page_action extends tform_actions { ...@@ -192,6 +192,14 @@ class page_action extends tform_actions {
$app->db->query($sql); $app->db->query($sql);
} }
// language changed
if(isset($this->dataRecord['language']) && $this->dataRecord['language'] != '' && $this->oldDataRecord['language'] != $this->dataRecord['language']) {
$language = $app->db->quote($this->dataRecord["language"]);
$client_id = $this->id;
$sql = "UPDATE sys_user SET language = '$language' WHERE client_id = $client_id";
$app->db->query($sql);
}
// reseller status changed // reseller status changed
if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != $this->oldDataRecord["limit_client"]) { if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != $this->oldDataRecord["limit_client"]) {
$modules = ISPC_INTERFACE_MODULES_ENABLED.',client'; $modules = ISPC_INTERFACE_MODULES_ENABLED.',client';
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<td class="tbl_col_country"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td> <td class="tbl_col_country"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
<td class="tbl_col_buttons"> <td class="tbl_col_buttons">
<div class="buttons icons16" style="width:60px;"> <div class="buttons icons16" style="width:60px;">
<a class="icons16 icoLoginAs" href="#" onclick="loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a> <tmpl_if name="is_admin"><a class="icons16 icoLoginAs" href="#" onclick="loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a> </tmpl_if>
<a class="icons16 icoDelete" href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> <a class="icons16 icoDelete" href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
</div> </div>
</td> </td>
......
`test -f /var/vmail/mailfilters/$HOST/$USER/.vacation.msg && exit 1 || exit 0` `test -f {vmail_mailbox_base}/mailfilters/$HOST/$USER/.vacation.msg && exit 1 || exit 0`
if ($RETURNCODE==1) if ($RETURNCODE==1)
{ {
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment