From 57628ef1a142ebd4a8d95910892c72c8b19774ae Mon Sep 17 00:00:00 2001
From: RobbBienert
Date: Sun, 6 Oct 2024 01:13:55 +0200
Subject: [PATCH] setup bug fixes for recent PHP versions
---
index.php | 4 +++-
setup.php | 38 ++++++++++++++++++++++----------------
2 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/index.php b/index.php
index fd21864..11c4ea2 100644
--- a/index.php
+++ b/index.php
@@ -25,7 +25,9 @@
if(!file_exists(dirname( __FILE__ ).DIRECTORY_SEPARATOR.'personal'.DIRECTORY_SEPARATOR.'settings.inc.php')) {
if(dirname($_SERVER['SCRIPT_NAME']) !== "/") $dir = dirname($_SERVER['SCRIPT_NAME']);
- header("Location: http://".$_SERVER['HTTP_HOST'].$dir."/setup.php");
+ require_once('scripts'.DIRECTORY_SEPARATOR.'proto.inc.php');
+ header('Location: '.proto()."://{$_SERVER['HTTP_HOST']}$dir/setup.php");
+ exit;
}
require_once('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
diff --git a/setup.php b/setup.php
index c14a900..590c36f 100644
--- a/setup.php
+++ b/setup.php
@@ -11,15 +11,16 @@
error_reporting(E_ALL ^ E_NOTICE);
header("Content-Type: text/html; charset=UTF-8");
-
+ // defining to avoid notifications
define("JLOG_NEW_VERSION", '1.1.0');
define("JLOG_SETUP", true);
define("JLOG_ADMIN", false);
$basepath = dirname( __FILE__ ).DIRECTORY_SEPARATOR;
- // defining to avoid notifications
+ require_once('scripts'.DIRECTORY_SEPARATOR.'proto.inc.php');
+
define("JLOG_WEBSITE", $_SERVER["HTTP_HOST"]);
- define("JLOG_PATH", dirname("http://".$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]));
+ define("JLOG_PATH", dirname(proto()."://{$_SERVER["HTTP_HOST"]}{$_SERVER["SCRIPT_NAME"]}"));
// read prefered language from browser
$dir = opendir('.'.DIRECTORY_SEPARATOR.'lang');
@@ -45,7 +46,7 @@
require('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'url_syntax.php');
require('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'version.inc.php');
- define("JLOG_NEW_VERSION", JLOG_SOFTWARE_VERSION);
+ define("JLOG_NEW_VERSION", JLOG_SOFTWARE_VERSION); // causes warning because of redefinition
define("JLOG_PHPV", JLOG_SOFTWARE_PHPV);
define("JLOG_MYSQLV", JLOG_SOFTWARE_MYSQLV);
@@ -54,6 +55,8 @@
$l['admin']['submit'] = $l['admin']['s_install'];
$setup = new Settings($l);
+ $c = ''; // content to display
+
if($_POST) {
$setup->importDataByArray(strip($_POST));
@@ -176,10 +179,13 @@
global $l;
-# FIXME: MySQL has a new API!
- if(!@mysql_connect($data['jlog_db_url'], $data['jlog_db_user'], $data['jlog_db_pwd'])) $errors[] = "Falsche Zugangsdaten | ".mysql_error();
- elseif(!@mysql_select_db($data['jlog_db'])) $errors[] = "Datenbank ".$data['jlog_db']." extistiert nicht".mysql_error();
- elseif(!version_compare(mysql_get_server_info(), JLOG_MYSQLV, ">=") == 1) $errors[] = $l['admin']['s_mysqlv_tolow'];
+ $connect = new mysqli($data['jlog_db_url'], $data['jlog_db_user'], $data['jlog_db_pwd'], $data['jlog_db']);
+ if(!$connect) {
+ $errors[] = "Falsche Zugangsdaten"; // mysqli_error is not available (?)
+ }
+ elseif(!version_compare($connect->server_version, JLOG_MYSQLV, ">=") == 1) {
+ $errors[] = $l['admin']['s_mysqlv_tolow'];
+ }
else {
new Query("SET NAMES utf8");
$create['content'] = new Query($sql['content']);
@@ -225,11 +231,11 @@
function do_htmlpage($content) {
- return '
-
+ return '
+
+
+
-
-
SETUP
+
+ SETUP
'.$content.'
-