Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Made domain-moving deactivateable, added realtime patch, added possib…

…ility to login multiple times

git-svn-id: file:///var/svn/trunk/syscp@2323 45fdb5c4-e40b-0410-b369-9aab4fe9a275
  • Loading branch information...
commit f0d1ca7f43dc4be2b19ef9ac6ce5e1b625566e48 1 parent cf1d4db
@flol authored
View
101 admin_domains.php
@@ -774,8 +774,7 @@
&& $_POST['send'] == 'send')
{
$customer = $customer_old = $db->query_first("SELECT * FROM " . TABLE_PANEL_CUSTOMERS . " WHERE `customerid`='" . (int)$result['customerid'] . "'");
- $customerid = intval($_POST['customerid']);
- if($customerid != $result['customerid'])
+ if(isset($_POST['customerid']) && ($customerid = intval($_POST['customerid'])) != $result['customerid'] && $settings['panel']['allow_domain_change_customer'] == '1')
{
$customer = $db->query_first("SELECT * FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `customerid`='" . (int)$customerid . "' AND (`subdomains_used` + " . (int)$subdomains . " <= `subdomains` OR `subdomains` = '-1' ) AND (`emails_used` + " . (int)$emails . " <= `emails` OR `emails` = '-1' ) AND (`email_forwarders_used` + " . (int)$email_forwarders . " <= `email_forwarders` OR `email_forwarders` = '-1' ) AND (`email_accounts_used` + " . (int)$email_accounts . " <= `email_accounts` OR `email_accounts` = '-1' ) " . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' ") . " ");
if(empty($customer) || $customer['customerid'] != $customerid)
@@ -783,12 +782,15 @@
standard_error('customerdoesntexist');
}
}
+ else
+ {
+ $customerid = $result['customerid'];
+ }
$admin = $admin_old = $db->query_first("SELECT * FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid`='" . (int)$result['adminid'] . "' ");
if($userinfo['customers_see_all'] == '1')
{
- $adminid = intval($_POST['adminid']);
- if($adminid != $result['adminid'])
+ if(isset($_POST['adminid']) && ($adminid = intval($_POST['adminid'])) != $result['adminid'] && $settings['panel']['allow_domain_change_admin'] == '1')
{
$admin = $db->query_first("SELECT * FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid`='" . (int)$adminid . "' AND ( `domains_used` < `domains` OR `domains` = '-1' )");
if(empty($admin) || $admin['adminid'] != $adminid)
@@ -796,6 +798,10 @@
standard_error('admindoesntexist');
}
}
+ else
+ {
+ $adminid = $result['adminid'];
+ }
}
else
{
@@ -1137,7 +1143,7 @@
$isemaildomain = "1";
}
- if($customerid != $result['customerid'])
+ if($customerid != $result['customerid'] && $settings['panel']['allow_domain_change_customer'] == '1')
{
$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `customerid` = '" . (int)$customerid . "' WHERE `domainid` = '" . (int)$result['id']. "' ");
$db->query("UPDATE `" . TABLE_MAIL_VIRTUAL . "` SET `customerid` = '" . (int)$customerid . "' WHERE `domainid` = '" . (int)$result['id']. "' ");
@@ -1145,7 +1151,7 @@
$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `subdomains_used` = `subdomains_used` - '" . (int)$subdomains . "', `emails_used` = `emails_used` - '" . (int)$emails . "', `email_forwarders_used` = `email_forwarders_used` - '" . (int)$email_forwarders . "', `email_accounts_used` = `email_accounts_used` - '" . (int)$email_accounts . "' WHERE `customerid` = '" . (int)$result['customerid'] . "' ");
}
- if($adminid != $result['adminid'])
+ if($adminid != $result['adminid'] && $settings['panel']['allow_domain_change_admin'] == '1')
{
$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `domains_used` = `domains_used` + 1 WHERE `adminid` = '" . (int)$adminid . "' ");
$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `domains_used` = `domains_used` - 1 WHERE `adminid` = '" . (int)$result['adminid'] . "' ");
@@ -1200,51 +1206,96 @@
}
else
{
- $customers = '';
- $result_customers = $db->query("SELECT `customerid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE ( (`subdomains_used` + " . (int)$subdomains . " <= `subdomains` OR `subdomains` = '-1' ) AND (`emails_used` + " . (int)$emails . " <= `emails` OR `emails` = '-1' ) AND (`email_forwarders_used` + " . (int)$email_forwarders . " <= `email_forwarders` OR `email_forwarders` = '-1' ) AND (`email_accounts_used` + " . (int)$email_accounts . " <= `email_accounts` OR `email_accounts` = '-1' ) " . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' ") . ") OR `customerid` = '" . (int)$result['customerid'] . "' ORDER BY `name` ASC");
+ if($settings['panel']['allow_domain_change_customer'] == '1')
+ {
+ $customers = '';
+ $result_customers = $db->query("SELECT `customerid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE ( (`subdomains_used` + " . (int)$subdomains . " <= `subdomains` OR `subdomains` = '-1' ) AND (`emails_used` + " . (int)$emails . " <= `emails` OR `emails` = '-1' ) AND (`email_forwarders_used` + " . (int)$email_forwarders . " <= `email_forwarders` OR `email_forwarders` = '-1' ) AND (`email_accounts_used` + " . (int)$email_accounts . " <= `email_accounts` OR `email_accounts` = '-1' ) " . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' ") . ") OR `customerid` = '" . (int)$result['customerid'] . "' ORDER BY `name` ASC");
- while($row_customer = $db->fetch_array($result_customers))
+ while($row_customer = $db->fetch_array($result_customers))
+ {
+ if($row_customer['company'] == '')
+ {
+ $customers.= makeoption($row_customer['name'] . ', ' . $row_customer['firstname'] . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid'], $result['customerid']);
+ }
+ else
+ {
+ if($row_customer['name'] != ''
+ && $row_customer['firstname'] != '')
+ {
+ $customers.= makeoption($row_customer['name'] . ', ' . $row_customer['firstname'] . ' | ' . $row_customer['company'] . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid'], $result['customerid']);
+ }
+ else
+ {
+ $customers.= makeoption($row_customer['company'] . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid'], $result['customerid']);
+ }
+ }
+ }
+ }
+ else
{
- if($row_customer['company'] == '')
+ $customer = $db->query_first("SELECT `customerid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `customerid` = '" . (int)$result['customerid'] . "'");
+ if($customer['company'] == '')
{
- $customers.= makeoption($row_customer['name'] . ', ' . $row_customer['firstname'] . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid'], $result['customerid']);
+ $result['customername'] = $customer['name'] . ', ' . $customer['firstname'] . ' (' . $customer['loginname'] . ')';
}
else
{
- if($row_customer['name'] != ''
- && $row_customer['firstname'] != '')
+ if($customer['name'] != ''
+ && $customer['firstname'] != '')
{
- $customers.= makeoption($row_customer['name'] . ', ' . $row_customer['firstname'] . ' | ' . $row_customer['company'] . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid'], $result['customerid']);
+ $result['customername'] = $customer['name'] . ', ' . $customer['firstname'] . ' | ' . $customer['company'] . ' (' . $customer['loginname'] . ')';
}
else
{
- $customers.= makeoption($row_customer['company'] . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid'], $result['customerid']);
+ $result['customername'] = $customer['company'] . ' (' . $customer['loginname'] . ')';
}
}
}
- $admins = '';
-
if($userinfo['customers_see_all'] == '1')
{
- $result_admins = $db->query("SELECT `adminid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_ADMINS . "` WHERE (`domains_used` < `domains` OR `domains` = '-1') OR `adminid` = '" . (int)$result['adminid'] . "' ORDER BY `name` ASC");
+ if($settings['panel']['allow_domain_change_admin'] == '1')
+ {
+ $admins = '';
+ $result_admins = $db->query("SELECT `adminid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_ADMINS . "` WHERE (`domains_used` < `domains` OR `domains` = '-1') OR `adminid` = '" . (int)$result['adminid'] . "' ORDER BY `name` ASC");
- while($row_admin = $db->fetch_array($result_admins))
+ while($row_admin = $db->fetch_array($result_admins))
+ {
+ if($row_admin['company'] == '')
+ {
+ $admins.= makeoption($row_admin['name'] . ', ' . $row_admin['firstname'] . ' (' . $row_admin['loginname'] . ')', $row_admin['adminid'], $result['adminid']);
+ }
+ else
+ {
+ if($row_admin['name'] != ''
+ && $row_admin['firstname'] != '')
+ {
+ $admins.= makeoption($row_admin['name'] . ', ' . $row_admin['firstname'] . ' | ' . $row_admin['company'] . ' (' . $row_admin['loginname'] . ')', $row_admin['adminid'], $result['adminid']);
+ }
+ else
+ {
+ $admins.= makeoption($row_admin['company'] . ' (' . $row_admin['loginname'] . ')', $row_admin['adminid'], $result['adminid']);
+ }
+ }
+ }
+ }
+ else
{
- if($row_admin['company'] == '')
+ $admin = $db->query_first("SELECT `adminid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = '" . (int)$result['adminid'] . "'");
+ if($admin['company'] == '')
{
- $admins.= makeoption($row_admin['name'] . ', ' . $row_admin['firstname'] . ' (' . $row_admin['loginname'] . ')', $row_admin['adminid'], $result['adminid']);
+ $result['adminname'] = $admin['name'] . ', ' . $admin['firstname'] . ' (' . $admin['loginname'] . ')';
}
else
{
- if($row_admin['name'] != ''
- && $row_admin['firstname'] != '')
+ if($admin['name'] != ''
+ && $admin['firstname'] != '')
{
- $admins.= makeoption($row_admin['name'] . ', ' . $row_admin['firstname'] . ' | ' . $row_admin['company'] . ' (' . $row_admin['loginname'] . ')', $row_admin['adminid'], $result['adminid']);
+ $result['adminname'] = $admin['name'] . ', ' . $admin['firstname'] . ' | ' . $admin['company'] . ' (' . $admin['loginname'] . ')';
}
else
{
- $admins.= makeoption($row_admin['company'] . ' (' . $row_admin['loginname'] . ')', $row_admin['adminid'], $result['adminid']);
+ $result['adminname'] = $admin['company'] . ' (' . $admin['loginname'] . ')';
}
}
}
View
11 admin_index.php
@@ -26,7 +26,16 @@
if($action == 'logout')
{
$log->logAction(ADM_ACTION, LOG_NOTICE, "logged out");
- $db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1'");
+
+ if($settings['session']['allow_multiple_login'] == '1')
+ {
+ $db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1' AND `hash` = '" . $s . "'");
+ }
+ else
+ {
+ $db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1'");
+ }
+
redirectTo('index.php');
exit;
}
View
35 admin_settings.php
@@ -305,6 +305,22 @@
$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='" . $db->escape($value) . "' WHERE `settinggroup`='admin' AND `varname`='syscp_graphic'");
$log->logAction(ADM_ACTION, LOG_INFO, "changed syscp_graphic from '" . $settings['system']['syscp_graphic'] . "' to '" . $value . "'");
}
+
+ if($_POST['panel_allow_domain_change_admin'] != $settings['panel']['allow_domain_change_admin']
+ && isset($_POST['panel_allow_domain_change_admin']))
+ {
+ $value = ($_POST['panel_allow_domain_change_admin'] == '1' ? '1' : '0');
+ $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='" . $db->escape($value) . "' WHERE `settinggroup`='panel' AND `varname`='allow_domain_change_admin'");
+ $log->logAction(ADM_ACTION, LOG_INFO, "changed panel_allow_domain_change_admin from '" . $settings['panel']['allow_domain_change_admin'] . "' to '" . $value . "'");
+ }
+
+ if($_POST['panel_allow_domain_change_customer'] != $settings['panel']['allow_domain_change_customer']
+ && isset($_POST['panel_allow_domain_change_customer']))
+ {
+ $value = ($_POST['panel_allow_domain_change_customer'] == '1' ? '1' : '0');
+ $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='" . $db->escape($value) . "' WHERE `settinggroup`='panel' AND `varname`='allow_domain_change_customer'");
+ $log->logAction(ADM_ACTION, LOG_INFO, "changed panel_allow_domain_change_customer from '" . $settings['panel']['allow_domain_change_customer'] . "' to '" . $value . "'");
+ }
}
if(($settings_part && $_part == 'accounts')
@@ -318,6 +334,14 @@
$log->logAction(ADM_ACTION, LOG_INFO, "changed session_sessiontimeout from '" . $settings['session']['sessiontimeout'] . "' to '" . $value . "'");
}
+ if($_POST['session_allow_multiple_login'] != $settings['session']['allow_multiple_login']
+ && isset($_POST['session_allow_multiple_login']))
+ {
+ $value = ($_POST['session_allow_multiple_login'] == '1' ? '1' : '0');
+ $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='" . $db->escape($value) . "' WHERE `settinggroup`='session' AND `varname`='allow_multiple_login'");
+ $log->logAction(ADM_ACTION, LOG_INFO, "changed session_allow_multiple_login from '" . $settings['session']['allow_multiple_login'] . "' to '" . $value . "'");
+ }
+
if($_POST['login_maxloginattempts'] != $settings['login']['maxloginattempts']
&& isset($_POST['login_maxloginattempts']))
{
@@ -546,6 +570,14 @@
unset($db_root);
}
+ if($_POST['system_realtime_port'] != $settings['system']['realtime_port']
+ && isset($_POST['system_realtime_port']))
+ {
+ $value = validate($_POST['system_realtime_port'], 'realtime port', '/^[0-9]+$/');
+ $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='" . $db->escape($value) . "' WHERE `settinggroup`='system' AND `varname`='realtime_port'");
+ $log->logAction(ADM_ACTION, LOG_INFO, "changed system_realtime_port from '" . $settings['system']['realtime_port'] . "' to '" . $value . "'");
+ }
+
if($_POST['index_file_extension'] != $settings['system']['index_file_extension']
&& isset($_POST['index_file_extension']))
{
@@ -1524,6 +1556,9 @@
$quota_type_option.= makeoption($lng['emails']['quota_type']['megabyte'], 'mb', $quota_type[$i]);
$quota_type_option.= makeoption($lng['emails']['quota_type']['gigabyte'], 'gb', $quota_type[$i]);
unset($i, $quota_type);
+ $session_allow_multiple_login = makeyesno('session_allow_multiple_login', '1', '0', $settings['session']['allow_multiple_login']);
+ $panel_allow_domain_change_admin = makeyesno('panel_allow_domain_change_admin', '1', '0', $settings['panel']['allow_domain_change_admin']);
+ $panel_allow_domain_change_customer = makeyesno('panel_allow_domain_change_customer', '1', '0', $settings['panel']['allow_domain_change_customer']);
$natsorting = makeyesno('panel_natsorting', '1', '0', $settings['panel']['natsorting']);
$mailpwcleartext = makeyesno('system_mailpwcleartext', '1', '0', $settings['system']['mailpwcleartext']);
$panel_sendalternativemail = makeyesno('panel_sendalternativemail', '1', '0', $settings['panel']['sendalternativemail']);
View
11 customer_index.php
@@ -26,7 +26,16 @@
if($action == 'logout')
{
$log->logAction(USR_ACTION, LOG_NOTICE, "logged out");
- $db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0'");
+
+ if($settings['session']['allow_multiple_login'] == '1')
+ {
+ $db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0' AND `hash` = '" . $s . "'");
+ }
+ else
+ {
+ $db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0'");
+ }
+
redirectTo('index.php');
exit;
}
View
6 index.php
@@ -116,7 +116,11 @@
$language = $settings['panel']['standardlanguage'];
}
- $db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['userid'] . "' AND `adminsession` = '" . $db->escape($userinfo['adminsession']) . "'");
+ if($settings['session']['allow_multiple_login'] != '1')
+ {
+ $db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['userid'] . "' AND `adminsession` = '" . $db->escape($userinfo['adminsession']) . "'");
+ }
+
$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`) VALUES ('" . $db->escape($s) . "', '" . (int)$userinfo['userid'] . "', '" . $db->escape($remote_addr) . "', '" . $db->escape($http_user_agent) . "', '" . time() . "', '" . $db->escape($language) . "', '" . $db->escape($userinfo['adminsession']) . "')");
if($userinfo['adminsession'] == '1')
View
4 install/syscp.sql
@@ -631,6 +631,10 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (114, 'aps', 'webserver-htaccess', '');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (115, 'aps', 'php-function', '');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (116, 'aps', 'webserver-module', '');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (117, 'system', 'realtime_port', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (118, 'session', 'allow_multiple_login', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (119, 'panel', 'allow_domain_change_admin', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (120, 'panel', 'allow_domain_change_customer', '0');
# --------------------------------------------------------
View
16 install/updatesql_1.2.19-20.inc.php
@@ -972,6 +972,22 @@
$db->query($query);
$settings['panel']['version'] = '1.2.19-svn36';
}
+
+ if($settings['panel']['version'] == '1.2.19-svn36')
+ {
+ $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn36 to 1.2.19-svn37");
+ $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'realtime_port', '0')");
+ $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('session', 'allow_multiple_login', '0')");
+ $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'allow_domain_change_admin', '0')");
+ $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'allow_domain_change_customer', '0')");
+
+ // set new version
+
+ $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn37\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\'';
+ $query = sprintf($query, TABLE_PANEL_SETTINGS);
+ $db->query($query);
+ $settings['panel']['version'] = '1.2.19-svn37';
+ }
}
// php filter-extension check
View
29 lib/functions.php
@@ -781,7 +781,7 @@ function validate($str, $fieldname, $pattern = '', $lng = '', $emptydefault = ar
function inserttask($type, $param1 = '', $param2 = '', $param3 = '')
{
- global $db;
+ global $db, $settings;
if($type == '1'
|| $type == '3'
@@ -790,6 +790,7 @@ function inserttask($type, $param1 = '', $param2 = '', $param3 = '')
{
$db->query('DELETE FROM `' . TABLE_PANEL_TASKS . '` WHERE `type`="' . $type . '"');
$db->query('INSERT INTO `' . TABLE_PANEL_TASKS . '` (`type`) VALUES ("' . $type . '")');
+ $doupdate = true;
}
elseif($type == '2'
&& $param1 != ''
@@ -802,6 +803,32 @@ function inserttask($type, $param1 = '', $param2 = '', $param3 = '')
$data['gid'] = $param3;
$data = serialize($data);
$db->query('INSERT INTO `' . TABLE_PANEL_TASKS . '` (`type`, `data`) VALUES ("2", "' . $db->escape($data) . '")');
+ $doupdate = true;
+ }
+
+ // Taken from https://wiki.syscp.org/contrib/realtime
+
+ if($doupdate === true && (int)$settings['system']['realtime_port'] !== 0)
+ {
+ $timeout = 15;
+ $socket = @socket_create (AF_INET, SOCK_STREAM, SOL_UDP);
+ if($socket !== false) {
+ $time = time();
+ while (!@socket_connect($socket, '127.0.0.1', (int)$settings['system']['realtime_port']))
+ {
+ $err = socket_last_error($socket);
+ if ($err == 115 || $err == 114)
+ {
+ if ((time() - $time) >= $timeout)
+ {
+ break;
+ }
+ sleep(1);
+ continue;
+ }
+ }
+ @socket_close ($socket);
+ }
}
}
View
2  lib/tables.inc.php
@@ -88,6 +88,6 @@
define('INSTANCE_UNINSTALL', 5);
define('PACKAGE_LOCKED', 1);
define('PACKAGE_ENABLED', 2);
-$version = '1.2.19-svn36';
+$version = '1.2.19-svn37';
?>
View
13 lng/english.lng.php
@@ -1345,4 +1345,17 @@
$lng['error']['customerdoesntexist'] = 'The customer you have chosen doesn\'t exist.';
$lng['error']['admindoesntexist'] = 'The admin you have chosen doesn\'t exist.';
+// ADDED IN 1.2.19-svn37
+
+$lng['serversettings']['system_realtime_port']['title'] = 'Port for realtime SysCP';
+$lng['serversettings']['system_realtime_port']['description'] = 'SysCP connects to this port at localhost everytime a new cron task is scheduled. If value is 0 (zero), this feature ist deactivated.<br />See also: <a href="https://wiki.syscp.org/contrib/realtime">Make SysCP work in realtime (SysCP Wiki)</a>';
+$lng['serversettings']['session_allow_multiple_login']['title'] = 'Allow multiple login';
+$lng['serversettings']['session_allow_multiple_login']['description'] = 'If activated a user could login multiple times.';
+$lng['serversettings']['panel_allow_domain_change_admin']['title'] = 'Allow moving domains between admins';
+$lng['serversettings']['panel_allow_domain_change_admin']['description'] = 'If activated you can change the admin of a domain at domainsettings.<br /><b>Attention:</b> If a customer isn\'t assigned to the same admin as the domain, the admin can see every other domain of that customer!';
+$lng['serversettings']['panel_allow_domain_change_customer']['title'] = 'Allow moving domains between customers';
+$lng['serversettings']['panel_allow_domain_change_customer']['description'] = 'If activated you can change the customer of a domain at domainsettings.<br /><b>Attention:</b> SysCP won\'t change any paths. This could render a domain unusable!';
+$lng['domains']['associated_with_domain'] = 'Associated';
+$lng['domains']['aliasdomains'] = 'Aliasdomains';
+
?>
View
13 lng/german.lng.php
@@ -1348,4 +1348,17 @@
$lng['error']['customerdoesntexist'] = 'Der ausgew&auml;hlte Kunde existiert nicht.';
$lng['error']['admindoesntexist'] = 'Der ausgew&auml;hlte Admin existiert nicht.';
+// ADDED IN 1.2.19-svn37
+
+$lng['serversettings']['system_realtime_port']['title'] = 'Port f&uuml;r Realtime SysCP';
+$lng['serversettings']['system_realtime_port']['description'] = 'Dieser Port auf localhost wird bei jedem neuen Cron-Task kontaktiert. Wenn der Wert 0 (Null) ist, dann ist dieses Feature deaktiviert.<br />Siehe dazu auch: <a href="https://wiki.syscp.org/contrib/realtime">Make SysCP work in realtime (SysCP Wiki)</a>';
+$lng['serversettings']['session_allow_multiple_login']['title'] = 'Erlaube gleichzeitigen Login';
+$lng['serversettings']['session_allow_multiple_login']['description'] = 'Wenn diese Option aktiviert ist, k&ouml;nnen sich Nutzer mehrmals gleichzeitig anmelden.';
+$lng['serversettings']['panel_allow_domain_change_admin']['title'] = 'Erlaube Verschieben von Domains unter Admins';
+$lng['serversettings']['panel_allow_domain_change_admin']['description'] = 'Wenn diese Option aktiviert ist, kann unter Domaineinstellungen die Domain einem anderen Admin zugewiesen werden.<br /><b>Achtung:</b> Wenn eine wenn der Kunde einer Domain nicht dem gleichen Admin zugeordnet ist wie die Domain selbst, kann dieser Admin alle anderen Domains des Kunden sehen!';
+$lng['serversettings']['panel_allow_domain_change_customer']['title'] = 'Erlaube Verschieben von Domains unter Kunden';
+$lng['serversettings']['panel_allow_domain_change_customer']['description'] = 'Wenn diese Option aktiviert ist, kann unter Domaineinstellungen die Domain einem anderen Kunden zugewiesen werden.<br /><b>Achtung:</b> Es werden keine Pfade bei dieser Aktion angepasst. Das kann dazu f&uuml;hren, dass die Domain nach dem Verschieben nicht mehr richtig funktioniert!';
+$lng['domains']['associated_with_domain'] = 'Verbunden mit';
+$lng['domains']['aliasdomains'] = 'Aliasdomains';
+
?>
View
8 templates/admin/domains/domains_edit.tpl
@@ -21,12 +21,12 @@ $header
</tr>
<tr>
<td class="main_field_name">{$lng['admin']['customer']}:</td>
- <td class="main_field_display" nowrap="nowrap"><select class="dropdown_noborder" name="customerid">$customers</select></td>
+ <td class="main_field_display" nowrap="nowrap"><if $settings['panel']['allow_domain_change_customer'] == '1'><select class="dropdown_noborder" name="customerid">$customers</select><else>{$result['customername']}</if></td>
</tr>
<if $userinfo['customers_see_all'] == '1'>
<tr>
<td class="main_field_name">{$lng['admin']['admin']}:</td>
- <td class="main_field_display" nowrap="nowrap"><select class="dropdown_noborder" name="adminid">$admins</select></td>
+ <td class="main_field_display" nowrap="nowrap"><if $settings['panel']['allow_domain_change_admin'] == '1'><select class="dropdown_noborder" name="adminid">$admins</select><else>{$result['adminname']}</if></td>
</tr>
</if>
<if $alias_check == '0'>
@@ -35,6 +35,10 @@ $header
<td class="main_field_display" nowrap="nowrap"><select class="dropdown_noborder" name="alias">$domains</select></td>
</tr>
</if>
+ <tr>
+ <td class="main_field_name">{$lng['domains']['associated_with_domain']}:</td>
+ <td class="main_field_display" nowrap="nowrap">{$subdomains} {$lng['customer']['subdomains']}, {$alias_check} {$lng['domains']['aliasdomains']}, {$emails} {$lng['customer']['emails']}, {$email_accounts} {$lng['customer']['accounts']}, {$email_forwarders} {$lng['customer']['forwarders']}</td>
+ </tr>
<if $userinfo['change_serversettings'] == '1'>
<tr>
<td class="main_field_name">DocumentRoot:<br />({$lng['panel']['emptyfordefault']})</td>
View
4 templates/admin/settings/settings_accounts.tpl
@@ -11,6 +11,10 @@
<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="session_sessiontimeout" value="{$settings['session']['sessiontimeout']}" /></td>
</tr>
<tr>
+ <td class="main_field_name"><b>{$lng['serversettings']['session_allow_multiple_login']['title']}:</b><br />{$lng['serversettings']['session_allow_multiple_login']['description']}</td>
+ <td class="main_field_display" nowrap="nowrap">{$session_allow_multiple_login}</td>
+ </tr>
+ <tr>
<td class="main_field_name"><b>{$lng['serversettings']['maxloginattempts']['title']}:</b><br />{$lng['serversettings']['maxloginattempts']['description']}</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="login_maxloginattempts" value="{$settings['login']['maxloginattempts']}" /></td>
</tr>
View
20 templates/admin/settings/settings_panel.tpl
@@ -47,24 +47,26 @@
<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="panel_webftp_url" value="{$settings['panel']['webftp_url']}" /></td>
</tr>
<tr>
- <td class="main_field_name">
- <b>{$lng['admin']['show_version_login']['title']}:</b><br />{$lng['admin']['show_version_login']['description']}<br />
- </td>
+ <td class="main_field_name"><b>{$lng['admin']['show_version_login']['title']}:</b><br />{$lng['admin']['show_version_login']['description']}</td>
<td class="main_field_display" nowrap="nowrap">{$frontend_syscp_version_login}</td>
</tr>
<tr>
- <td class="main_field_name">
- <b>{$lng['admin']['show_version_footer']['title']}:</b><br />{$lng['admin']['show_version_footer']['description']}<br />
- </td>
+ <td class="main_field_name"><b>{$lng['admin']['show_version_footer']['title']}:</b><br />{$lng['admin']['show_version_footer']['description']}</td>
<td class="main_field_display" nowrap="nowrap">{$frontend_syscp_version_footer}</td>
</tr>
<tr>
- <td class="main_field_name">
- <b>{$lng['admin']['syscp_graphic']['title']}:</b><br />{$lng['admin']['syscp_graphic']['description']}<br />
- </td>
+ <td class="main_field_name"><b>{$lng['admin']['syscp_graphic']['title']}:</b><br />{$lng['admin']['syscp_graphic']['description']}</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="frontend_syscp_graphic" value="{$settings['admin']['syscp_graphic']}" /></td>
</tr>
<tr>
+ <td class="main_field_name"><b>{$lng['serversettings']['panel_allow_domain_change_admin']['title']}:</b><br />{$lng['serversettings']['panel_allow_domain_change_admin']['description']}<br /><div style="color:red">{$lng['admin']['know_what_youre_doing']}</div></td>
+ <td class="main_field_display" nowrap="nowrap">{$panel_allow_domain_change_admin}</td>
+ </tr>
+ <tr>
+ <td class="main_field_name"><b>{$lng['serversettings']['panel_allow_domain_change_customer']['title']}:</b><br />{$lng['serversettings']['panel_allow_domain_change_customer']['description']}<br /><div style="color:red">{$lng['admin']['know_what_youre_doing']}</div></td>
+ <td class="main_field_display" nowrap="nowrap">{$panel_allow_domain_change_customer}</td>
+ </tr>
+ <tr>
<td class="maintitle_apply_right" nowrap="nowrap" colspan="2">
<if $_part == 'panel'>
<input type="hidden" name="part" value="panel" />
View
4 templates/admin/settings/settings_system.tpl
@@ -27,6 +27,10 @@
<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="system_mysql_access_host" value="{$settings['system']['mysql_access_host']}" /></td>
</tr>
<tr>
+ <td class="main_field_name"><b>{$lng['serversettings']['system_realtime_port']['title']}:</b><br />{$lng['serversettings']['system_realtime_port']['description']}</td>
+ <td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="system_realtime_port" value="{$settings['system']['realtime_port']}" /></td>
+ </tr>
+ <tr>
<td class="main_field_name"><b>{$lng['serversettings']['index_file_extension']['title']}:</b><br />{$lng['serversettings']['index_file_extension']['description']}</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="index_file_extension" value="{$settings['system']['index_file_extension']}" /></td>
</tr>
Please sign in to comment.
Something went wrong with that request. Please try again.