maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/0.9.31.2'

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-27 16:46:33 +01:00
parent f3b61ce87c 01d825fc2a
commit 0fb0d3b2db
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin_customers.php
View File

@@ -197,7 +197,11 @@ if ($page == 'customers'
WHERE `customerid` = :id" . WHERE `customerid` = :id" .
($userinfo['customers_see_all'] ? '' : " AND `adminid` = :adminid") ($userinfo['customers_see_all'] ? '' : " AND `adminid` = :adminid")
); );
$result = Database::pexecute_first($result_stmt, array('id' => $id, 'adminid' => $userinfo['adminid'])); $result_data = array('id' => $id);
if ($userinfo['customers_see_all'] == '0') {
$result_data['adminid'] = $userinfo['adminid'];
}
$result = Database::pexecute_first($result_stmt, $result_data);
if ($result['loginname'] != '') { if ($result['loginname'] != '') {

8
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -2574,8 +2574,14 @@ if (isFroxlorVersion('0.9.31')) {
} }
if (isFroxlorVersion('0.9.31.1')) { if (isFroxlorVersion('0.9.31.1')) {
showUpdateStep("Updating from 0.9.31.1 to 0.9.31.2 final", true);
lastStepStatus(0);
updateToVersion('0.9.31.2');
}
showUpdateStep("Updating from 0.9.31.1 to 0.9.32-dev1"); if (isFroxlorVersion('0.9.31.2')) {
showUpdateStep("Updating from 0.9.31.2 to 0.9.32-dev1");
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Removing APS-module (deprecated)"); showUpdateStep("Removing APS-module (deprecated)");

2
templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf
View File

@@ -1,4 +1,4 @@
#protocols = imap pop3 <SSLPROTOCOLS> protocols = imap pop3 <SSLPROTOCOLS>
listen = * listen = *
mail_access_groups = vmail mail_access_groups = vmail
mail_debug = no mail_debug = no

2
templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf
View File

@@ -4,7 +4,7 @@
# Address to use when sending rejection mails. # Address to use when sending rejection mails.
# Default is postmaster@<your domain>. # Default is postmaster@<your domain>.
#postmaster_address = postmaster@<SERVERNAME> postmaster_address = postmaster@<SERVERNAME>
# Hostname to use in various parts of sent mails, eg. in Message-Id. # Hostname to use in various parts of sent mails, eg. in Message-Id.
# Default is the system's real hostname. # Default is the system's real hostname.