| install/dist/lib/fedora.lib.php | ●●●●● patch | view | raw | blame | history | |
| install/dist/lib/opensuse.lib.php | ●●●●● patch | view | raw | blame | history | |
| install/lib/installer_base.lib.php | ●●●●● patch | view | raw | blame | history | |
| install/update.php | ●●●●● patch | view | raw | blame | history | |
| interface/web/login/index.php | ●●●●● patch | view | raw | blame | history | |
| interface/web/sites/ajax_get_ip.php | ●●●●● patch | view | raw | blame | history | |
| server/lib/classes/modules.inc.php | ●●●●● patch | view | raw | blame | history |
install/dist/lib/fedora.lib.php
@@ -670,7 +670,7 @@ //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost"); //* and create the symlink if($this->install_ispconfig_interface == true) { if($this->install_ispconfig_interface == true && $this->is_update == false) { if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost"); if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) { exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost"); install/dist/lib/opensuse.lib.php
@@ -688,7 +688,7 @@ //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost"); //* and create the symlink if($this->install_ispconfig_interface == true) { if($this->install_ispconfig_interface == true && $this->is_update == false) { if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost"); if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) { exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost"); install/lib/installer_base.lib.php
@@ -35,7 +35,7 @@ var $db; public $conf; public $install_ispconfig_interface = true; public $is_update = false; // true if it is an update, falsi if it is a new install public function __construct() @@ -938,13 +938,11 @@ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); //* Copy the ISPConfig vhost for the controlpanel // TODO: These are missing! should they be "vhost_dist_*_dir" ? $vhost_conf_dir = $conf['apache']['vhost_conf_dir']; $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir']; // Dont just copy over the virtualhost template but add some custom settings $content = rf("tpl/apache_ispconfig.vhost.master"); $content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content); @@ -959,7 +957,7 @@ //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost"); //* and create the symlink if($this->install_ispconfig_interface == true) { if($this->install_ispconfig_interface == true && $this->is_update == false) { if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost"); if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) { exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost"); install/update.php
@@ -101,6 +101,7 @@ $conf['ispconfig_log_priority'] = $conf_old["log_priority"]; $inst = new installer(); $inst->is_update = true; //** Detect the installed applications $inst->find_installed_apps(); interface/web/login/index.php
@@ -92,7 +92,8 @@ } //* Check if there already wrong logins $sql = "SELECT * FROM `attempts_login` WHERE `ip`= '{$ip}' AND `login_time` < NOW() + INTERVAL 15 MINUTE LIMIT 1"; $sql = "SELECT * FROM `attempts_login` WHERE `ip`= '{$ip}' AND `login_time` > (NOW() - INTERVAL 1 MINUTE) LIMIT 1"; echo $sql; $alreadyfailed = $app->db->queryOneRecord($sql); //* login to much wrong if($alreadyfailed['times'] > 5) { interface/web/sites/ajax_get_ip.php
@@ -41,7 +41,7 @@ $sql = "SELECT ip_address FROM server_ip WHERE server_id = $server_id"; $ips = $app->db->queryAllRecords($sql); // $ip_select = "<option value=''></option>"; $ip_select = ""; $ip_select = "<option value='*'>*</option>\r\n"; if(is_array($ips)) { foreach( $ips as $ip) { //$selected = ($ip["ip_address"] == $this->dataRecord["ip_address"])?'SELECTED':''; server/lib/classes/modules.inc.php
@@ -88,12 +88,15 @@ $records = $app->dbmaster->queryAllRecords($sql); foreach($records as $d) { $data = unserialize(stripslashes($d["data"])); if(!$data = unserialize(stripslashes($d["data"]))) { $data = unserialize($d["data"]); } $replication_error = false; $this->current_datalog_id = $d["datalog_id"]; if($d["action"] == 'i') { if(count($data['new']) > 0) { if($d["action"] == 'i' || $d["action"] == 'u') { $idx = explode(":",$d["dbidx"]); $tmp_sql1 = ''; $tmp_sql2 = ''; @@ -113,7 +116,7 @@ } $app->log("Replicated from master: ".$sql,LOGLEVEL_DEBUG); } /* if($d["action"] == 'u') { $sql = "UPDATE $d[dbtable] SET "; foreach($data['new'] as $fieldname => $val) { @@ -129,7 +132,7 @@ } $app->log("Replicated from master: ".$sql,LOGLEVEL_DEBUG); } */ if($d["action"] == 'd') { $idx = explode(":",$d["dbidx"]); $sql = "DELETE FROM $d[dbtable] "; @@ -157,6 +160,9 @@ */ return; } } else { $app->log("Datalog does not conatin any changes for this record ".$d["datalog_id"],LOGLEVEL_DEBUG); } } //* if we have a single server setup @@ -164,7 +170,9 @@ $sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = 0) ORDER BY datalog_id"; $records = $app->db->queryAllRecords($sql); foreach($records as $d) { $data = unserialize(stripslashes($d["data"])); if(!$data = unserialize(stripslashes($d["data"]))) { $data = unserialize($d["data"]); } $this->current_datalog_id = $d["datalog_id"]; $this->raiseTableHook($d["dbtable"],$d["action"],$data); //$app->db->query("DELETE FROM sys_datalog WHERE datalog_id = ".$rec["datalog_id"]);
