diff --git a/login.php b/login.php index af539ddc..dd9c5885 100644 --- a/login.php +++ b/login.php @@ -103,7 +103,7 @@ if ($ui->st('w', 'get') == 'lo') { } else { session_unset(); session_destroy(); - redirect($pageurl . '/' . $ewInstallPath); + redirect((isset($pageurl)) ? $pageurl . '/' . $ewInstallPath : $ewInstallPath); } } else if ($ui->st('w', 'get') == 'ba') { diff --git a/stuff/admin/tickets.php b/stuff/admin/tickets.php index 55acc307..9ec1511b 100644 --- a/stuff/admin/tickets.php +++ b/stuff/admin/tickets.php @@ -63,6 +63,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) { if (!$ui->smallletters('action',2, 'post')) { $foundlanguages = array(); + $options = array(); foreach (getlanguages($template_to_use) as $row) { diff --git a/stuff/admin/web_master.php b/stuff/admin/web_master.php index 43333a45..01bc8b43 100644 --- a/stuff/admin/web_master.php +++ b/stuff/admin/web_master.php @@ -614,4 +614,4 @@ if ($ui->st('d', 'get') == 'ad' or $ui->st('d', 'get') == 'md') { configureDateTables('-1', '1, "asc"', 'ajax.php?w=datatable&d=webmasterserver'); $template_file = 'admin_web_master_list.tpl'; -} +} \ No newline at end of file diff --git a/stuff/methods/class_ftp.php b/stuff/methods/class_ftp.php index c1314f1b..20cb8509 100644 --- a/stuff/methods/class_ftp.php +++ b/stuff/methods/class_ftp.php @@ -44,7 +44,7 @@ class EasyWiFTP { function __construct($ip, $port, $user, $pwd, $ssl = 'N') { - $this->ftpConnection = ($ssl == 'N') ? @ftp_connect($ip, $port, 5) : @ftp_ssl_connect($ip, $port, 5); + $this->ftpConnection = ($ssl == 'N') ? @ftp_connect($ip, $port, 10) : @ftp_ssl_connect($ip, $port, 5); if ($this->ftpConnection) { @@ -69,7 +69,7 @@ class EasyWiFTP { public function createSecondFTPConnect ($ip, $port, $user, $pwd, $ssl = 'N') { - $this->ftpSecondConnection = ($ssl == 'N') ? @ftp_connect($ip, $port, 5) : @ftp_ssl_connect($ip, $port, 5); + $this->ftpSecondConnection = ($ssl == 'N') ? @ftp_connect($ip, $port, 10) : @ftp_ssl_connect($ip, $port, 5); if ($this->ftpSecondConnection) { $ftpLogin = @ftp_login($this->ftpSecondConnection, $user, $pwd); diff --git a/template/default/imprint.tpl b/template/default/imprint.tpl index 6800222d..f209e8da 100644 --- a/template/default/imprint.tpl +++ b/template/default/imprint.tpl @@ -1,7 +1,7 @@

imprint;?>

diff --git a/third_party/monstaftp/class_monstaftp.php b/third_party/monstaftp/class_monstaftp.php index 629b4481..d595fed4 100644 --- a/third_party/monstaftp/class_monstaftp.php +++ b/third_party/monstaftp/class_monstaftp.php @@ -511,9 +511,14 @@ class Monsta { $year=""; // Split up array into values - $ff = preg_split("/[\s]+/",$ff,9); + $ff = preg_split("/[\s]+/", $ff, 9); $perms = $ff[0]; + + if (!isset($ff[2])) { + continue; + } + $user = $ff[2]; $group = $ff[3]; $size = $ff[4]; @@ -522,9 +527,11 @@ class Monsta { $file = $ff[8]; // Check if file starts with a dot - $dot_prefix=0; - if (preg_match("/^\.+/",$file) && $_SESSION["monstaftp"][$this->serverID]["interface"] == "bas") - $dot_prefix=1; + $dot_prefix = 0; + + if (preg_match("/^\.+/",$file) && $_SESSION["monstaftp"][$this->serverID]["interface"] == "bas") { + $dot_prefix = 1; + } if ($file != "." && $file != ".." && $dot_prefix == 0) {