Update setup to run under PHP7

Mostly mysql_ to mysqli_ changes.
This commit is contained in:
Jeena 2020-04-05 15:29:07 +02:00
parent a6daece140
commit 7af86452ff
2 changed files with 25 additions and 21 deletions

View file

@ -8,15 +8,16 @@
var $_error = "";
//Konstruktor
function Query($sql)
function __construct($sql)
{
// Query in der Klasse speichern
$this->_sql = trim($sql);
$this->_result = mysql_query($this->_sql);
global $mysql;
// Query in der Klasse speichern
$this->_sql = trim($sql);
$this->_result = mysqli_query($mysql, $this->_sql);
if(!$this->_result) {
$this->_errno = mysql_errno();
$this->_error = mysql_error();
}
$this->_errno = mysqli_errno($mysql);
$this->_error = mysqli_error($mysql);
}
}
//Methoden
@ -46,11 +47,12 @@
}
function fetch() {
global $mysql;
if($this->error()) {
echo "An Error has occurred, please check your MySQL-Query.";
$return = null;
}
else $return = mysql_fetch_assoc($this->_result);
else $return = mysqli_fetch_assoc($this->_result);
return $return;
}
@ -58,13 +60,13 @@
if($this->error()) {
$return = -1;
}
else $return = mysql_num_rows($this->_result);
else $return = mysqli_num_rows($this->_result);
return $return;
}
function free() {
// Speicher freimachen
mysql_free_result($this->_result);
mysqli_free_result($this->_result);
}
}

View file

@ -12,7 +12,7 @@
header("Content-Type: text/html; charset=UTF-8");
define("JLOG_NEW_VERSION", '1.1.0');
define("JLOG_NEW_VERSION", '1.4.0');
define("JLOG_SETUP", true);
define("JLOG_ADMIN", false);
$basepath = dirname( __FILE__ ).DIRECTORY_SEPARATOR;
@ -50,6 +50,7 @@
define("JLOG_MYSQLV", JLOG_SOFTWARE_MYSQLV);
$errors = array();
$mysql = null;
$l['admin']['submit'] = $l['admin']['s_install'];
$setup = new Settings($l);
@ -111,6 +112,7 @@
function create_mysql_tables($data) {
# returns false if all tables were created, if not returns the $errors array
$errors = array();
$sql['content'] = '
CREATE TABLE `'.$data['jlog_db_prefix'].'content` (
@ -128,7 +130,7 @@
section varchar(10) default \'weblog\',
UNIQUE KEY id (id),
FULLTEXT KEY content_index (content, topic, teaser, keywords)
) TYPE=MyISAM CHARACTER SET utf8;';
) CHARACTER SET utf8;';
$sql['comments'] = '
CREATE TABLE `'.$data["jlog_db_prefix"].'comments` (
@ -146,7 +148,7 @@
PRIMARY KEY (id),
UNIQUE KEY sid (sid),
FULLTEXT KEY comments_index ( name, city, email, homepage, content )
) TYPE=MyISAM CHARACTER SET utf8;';
) CHARACTER SET utf8;';
$sql['categories'] = '
CREATE TABLE `'.$data["jlog_db_prefix"].'categories` (
@ -156,13 +158,13 @@
description text,
UNIQUE KEY id (id),
UNIQUE KEY url (url)
) TYPE=MyISAM CHARACTER SET utf8;';
) CHARACTER SET utf8;';
$sql['catassign'] = '
CREATE TABLE `'.$data["jlog_db_prefix"].'catassign` (
content_id int(11),
cat_id tinyint(4)
) TYPE=MyISAM CHARACTER SET utf8;';
) CHARACTER SET utf8;';
$sql['attributes'] = '
CREATE TABLE `'.$data["jlog_db_prefix"].'attributes` (
@ -172,13 +174,13 @@
value varchar(250) NOT NULL default \'\',
PRIMARY KEY (id),
KEY entry_id (entry_id)
) TYPE=MyISAM CHARACTER SET utf8;';
) CHARACTER SET utf8;';
global $l;
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'];
global $mysql;
if(!($mysql = @mysqli_connect($data['jlog_db_url'], $data['jlog_db_user'], $data['jlog_db_pwd'], $data['jlog_db']))) $errors[] = "Falsche Zugangsdaten | ".mysqli_error($mysql);
elseif(!@mysqli_select_db($mysql, $data['jlog_db'])) $errors[] = "Datenbank ".$data['jlog_db']." extistiert nicht".mysqli_error($connect);
elseif(!version_compare(mysqli_get_server_info($mysql), JLOG_MYSQLV, ">=") == 1) $errors[] = $l['admin']['s_mysqlv_tolow'];
else {
new Query("SET NAMES utf8");
$create['content'] = new Query($sql['content']);
@ -265,7 +267,7 @@
</head>
<body>
<div id="container">
<h1><a href="http://jeenaparadies.net/projects/jlog/" title="Jlog v'.JLOG_NEW_VERSION.'"><img id="logo" src="http://jeenaparadies.net/img/jlog-logo.png" style="width: 210px; height: 120px;" alt="Jlog" /></a> SETUP</h1>
<h1><a href="http://github.com/jeena/jlog/" title="Jlog v'.JLOG_NEW_VERSION.'"><img id="logo" src="http://paradies.jeena.net/img/jlog-logo.png" style="width: 210px; height: 120px;" alt="Jlog" /></a> SETUP</h1>
'.$content.'
</div>
</body>