Commit d5c41ee2 authored by alexalouit's avatar alexalouit

Revert "fix Let's Encrypt add web domain alias support"

This reverts commit 0b73ad56
parent b8801811
......@@ -63,7 +63,7 @@ if(count($_POST) > 0) {
if(!preg_match("/^.{1,256}$/i", $_POST['password'])) $error = $app->lng('pw_error_length');
//** importing variables
$ip = ip2long($_SERVER['REMOTE_ADDR']);
$ip = md5($_SERVER['REMOTE_ADDR']);
$username = $_POST['username'];
$password = $_POST['password'];
$loginAs = false;
......@@ -262,7 +262,7 @@ if(count($_POST) > 0) {
$app->plugin->raiseEvent('login', $this);
//* Save successfull login message to var
$authlog = 'Successful login for user \''. $username .'\' from '. long2ip($ip) .' at '. date('Y-m-d H:i:s');
$authlog = 'Successful login for user \''. $username .'\' from '. $_SERVER['REMOTE_ADDR'] .' at '. date('Y-m-d H:i:s');
$authlog_handle = fopen($conf['ispconfig_log_dir'].'/auth.log', 'a');
fwrite($authlog_handle, $authlog ."\n");
fclose($authlog_handle);
......@@ -300,7 +300,7 @@ if(count($_POST) > 0) {
$app->plugin->raiseEvent('login_failed', $this);
//* Save failed login message to var
$authlog = 'Failed login for user \''. $username .'\' from '. long2ip($ip) .' at '. date('Y-m-d H:i:s');
$authlog = 'Failed login for user \''. $username .'\' from '. $_SERVER['REMOTE_ADDR'] .' at '. date('Y-m-d H:i:s');
$authlog_handle = fopen($conf['ispconfig_log_dir'].'/auth.log', 'a');
fwrite($authlog_handle, $authlog ."\n");
fclose($authlog_handle);
......
......@@ -47,7 +47,7 @@ $liste["auth"] = "yes";
* Suchfelder
*****************************************************/
$liste["item"][] = array( 'field' => "JID",
$liste["item"][] = array( 'field' => "jid",
'datatype' => "VARCHAR",
'filters' => array( 0 => array( 'event' => 'SHOW',
'type' => 'IDNTOUTF8')
......
......@@ -402,7 +402,7 @@ class page_action extends tform_actions {
// $this->desyncMailusers($this->dataRecord['domain']);
// Update DNS Records
// TODO: Update gets only triggered from main form. WHY?
$soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other FROM dns_soa WHERE active = 'Y' AND `origin` = ?", $this->dataRecord['domain'].'.');
$soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id FROM dns_soa WHERE active = 'Y' AND `origin` = ?", $this->dataRecord['domain'].'.');
if ( isset($soa) && !empty($soa) ) $this->update_dns($this->dataRecord, $soa);
}
......
......@@ -768,6 +768,8 @@ $(document).on('ready', function () {
$('.progress .progress-bar').css('width', function () {
return $(this).attr('aria-valuenow') + '%';
});
ISPConfig.loadInitContent();
$('#searchform').submit(function(e) {
e.preventDefault();
......
......@@ -141,7 +141,7 @@
searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">',
resultBoxPosition: ''
});
ISPConfig.loadInitContent();
});
//-->
</script>
......
......@@ -159,18 +159,6 @@ class cronjob_monitor_system_update extends cronjob {
* Fetch the output
*/
$data['output'] = shell_exec('zypper lu');
} else if (file_exists('/etc/redhat-release')) {
if(shell_exec("yum list updates | awk 'p; /Updated Packages/ {p=1}'") == '') {
// There is nothing to update
$state = 'ok';
}
else {
$state = 'info';
}
// Fetch the output
$yumData = shell_exec('yum check-update');
$data['output'] = $yumData;
} else {
/*
* It is not Debian/Ubuntu, so there is no data and no state
......
......@@ -265,23 +265,23 @@ class monitor_tools {
$distbaseid = 'fedora';
} elseif(stristr($content, 'CentOS release 5')) {
$distname = 'CentOS';
$distver = '5';
$distver = 'Unknown';
$distid = 'centos53';
$distbaseid = 'fedora';
} elseif(stristr($content, 'CentOS Linux release 6')) {
$distname = 'CentOS';
$distver = '6';
$distver = 'Unknown';
$distid = 'centos53';
$distbaseid = 'fedora';
} elseif(stristr($content, 'CentOS Linux release 7.2')) {
$distname = 'CentOS';
$distver = '7.2';
$distver = 'Unknown';
$distid = 'centos70';
$distconfid = 'centos72';
$distbaseid = 'fedora';
} elseif(stristr($content, 'CentOS Linux release 7')) {
$distname = 'CentOS';
$distver = '7';
$distver = 'Unknown';
$distid = 'centos70';
$distbaseid = 'fedora';
} else {
......
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