This commit is contained in:
Abdulrahman
2019-05-20 21:56:29 +03:00
parent eb788babd1
commit a9dd576094
12 changed files with 69 additions and 105 deletions

View File

@@ -168,7 +168,7 @@ function inst_get_config($name)
return false;
}
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname);
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname, $dbprefix);
}
if (empty($SQL))

View File

@@ -101,18 +101,18 @@ $install_sqls['files'] = "
CREATE TABLE `{$dbprefix}files` (
`id` int(11) unsigned NOT NULL auto_increment,
`last_down` int(11) unsigned NOT NULL DEFAULT '0',
`name` varchar(300) collate utf8_bin NOT NULL,
`real_filename` VARCHAR( 350 ) collate utf8_bin NOT NULL,
`name` varchar(300) collate utf8_bin NOT NULL DEFAULT '',
`real_filename` VARCHAR( 350 ) collate utf8_bin NOT NULL DEFAULT '',
`size` bigint(20) unsigned NOT NULL DEFAULT '0',
`uploads` int(11) unsigned NOT NULL DEFAULT '0',
`time` int(11) unsigned NOT NULL,
`time` int(11) unsigned NOT NULL DEFAULT '0',
`type` varchar(20) collate utf8_bin NOT NULL,
`folder` varchar(100) collate utf8_bin NOT NULL,
`report` int(11) unsigned NOT NULL DEFAULT '0',
`user` int(11) NOT NULL default '-1',
`code_del` varchar(150) collate utf8_bin NOT NULL,
`user_ip` VARCHAR( 250 ) NOT NULL,
`id_form` VARCHAR( 100 ) NOT NULL,
`code_del` varchar(150) collate utf8_bin NOT NULL DEFAULT '',
`user_ip` VARCHAR( 250 ) NOT NULL DEFAULT '',
`id_form` VARCHAR( 100 ) NOT NULL DEFAULT 'id',
PRIMARY KEY (`id`),
KEY `name` (`name`(300)),
KEY `user` (`user`),
@@ -128,8 +128,8 @@ CREATE TABLE `{$dbprefix}files` (
$install_sqls['config'] = "
CREATE TABLE `{$dbprefix}config` (
`name` varchar(255) collate utf8_bin NOT NULL,
`value` varchar(255) collate utf8_bin NOT NULL,
`option` mediumtext collate utf8_bin NOT NULL,
`value` varchar(255) collate utf8_bin NOT NULL DEFAULT '',
`option` mediumtext collate utf8_bin NOT NULL DEFAULT '',
`display_order` int(10) NOT NULL DEFAULT '1',
`type` varchar(20) NULL DEFAULT 'other',
`plg_id` int(11) NOT NULL DEFAULT '0',
@@ -157,16 +157,16 @@ CREATE TABLE `{$dbprefix}config` (
$install_sqls['plugins'] = "
CREATE TABLE `{$dbprefix}plugins` (
`plg_id` int(11) unsigned NOT NULL auto_increment,
`plg_name` varchar(255) collate utf8_bin NOT NULL,
`plg_name` varchar(255) collate utf8_bin NOT NULL DEFAULT '',
`plg_ver` varchar(255) collate utf8_bin NOT NULL,
`plg_author` varchar(255) collate utf8_bin NOT NULL,
`plg_dsc` mediumtext COLLATE utf8_bin NOT NULL,
`plg_icon` blob NOT NULL,
`plg_uninstall` mediumtext COLLATE utf8_bin NOT NULL,
`plg_author` varchar(255) collate utf8_bin NOT NULL DEFAULT '',
`plg_dsc` mediumtext COLLATE utf8_bin NOT NULL DEFAULT '',
`plg_icon` blob NOT NULL DEFAULT '',
`plg_uninstall` mediumtext COLLATE utf8_bin NOT NULL DEFAULT '',
`plg_disabled` tinyint(1) unsigned NOT NULL default '0',
`plg_instructions` mediumtext COLLATE utf8_bin NOT NULL,
`plg_store` longtext COLLATE utf8_bin NOT NULL,
`plg_files` text COLLATE utf8_bin NOT NULL,
`plg_instructions` mediumtext COLLATE utf8_bin NOT NULL DEFAULT '',
`plg_store` longtext COLLATE utf8_bin NOT NULL DEFAULT '',
`plg_files` text COLLATE utf8_bin NOT NULL DEFAULT '',
PRIMARY KEY (`plg_id`),
KEY `plg_name` (`plg_name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin ;
@@ -174,9 +174,9 @@ CREATE TABLE `{$dbprefix}plugins` (
$install_sqls['lang'] = "
CREATE TABLE `{$dbprefix}lang` (
`word` varchar(255) collate utf8_bin NOT NULL,
`trans` varchar(255) collate utf8_bin NOT NULL,
`lang_id` varchar(100) COLLATE utf8_bin NOT NULL,
`word` varchar(255) collate utf8_bin NOT NULL ,
`trans` varchar(255) collate utf8_bin NOT NULL DEFAULT '',
`lang_id` varchar(100) COLLATE utf8_bin NOT NULL DEFAULT 'en',
`plg_id` int(11) unsigned NOT NULL DEFAULT '0',
KEY `lang_id` (`lang_id`),
KEY `plg_id` (`plg_id`),
@@ -198,7 +198,7 @@ $install_sqls['groups_data'] = "
CREATE TABLE `{$dbprefix}groups_data` (
`group_id` int(11) unsigned NOT NULL,
`name` varchar(255) COLLATE utf8_bin NOT NULL,
`value` varchar(255) COLLATE utf8_bin NOT NULL,
`value` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
KEY `group_id` (`group_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
";

View File

@@ -140,7 +140,7 @@ case 'check':
if (! empty($dbname) && ! empty($dbuser))
{
//connect .. for check
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname);
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname, $dbprefix);
if (! $SQL->is_connected())
@@ -202,7 +202,7 @@ case 'data' :
}
//connect .. for check
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname);
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname, $dbprefix);
include_once PATH . 'includes/usr.php';
include_once PATH . 'includes/functions_alternative.php';

View File

@@ -49,7 +49,7 @@ else
exit('`config.php` was missing! so we created one for you, kindly edit the file with database information.');
}
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname);
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname, $dbprefix);
if (! $SQL->is_connected())
{
@@ -76,7 +76,7 @@ foreach (['cache', 'uploads', 'uploads/thumbs'] as $folder)
//install
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname);
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname, $dbprefix);
include_once PATH . 'includes/usr.php';
include_once PATH . 'includes/functions_alternative.php';

View File

@@ -34,7 +34,7 @@ include_once 'includes/functions_install.php';
include_once 'includes/update_schema.php';
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname);
$SQL = new KleejaDatabase($dbserver, $dbuser, $dbpass, $dbname, $dbprefix);
//
// fix missing db_version