fixes setup php 8.2 'new installation'
Dieser Commit ist enthalten in:
Ursprung
4b69f07b8f
Commit
70b845ca58
|
@ -6,6 +6,7 @@
|
||||||
<option value="$PROJECT_DIR$/conlite/external/endroid/qr-code/tests" />
|
<option value="$PROJECT_DIR$/conlite/external/endroid/qr-code/tests" />
|
||||||
<option value="$PROJECT_DIR$/conlite/external/phpmailer/phpmailer/tests" />
|
<option value="$PROJECT_DIR$/conlite/external/phpmailer/phpmailer/tests" />
|
||||||
<option value="$PROJECT_DIR$/tests" />
|
<option value="$PROJECT_DIR$/tests" />
|
||||||
|
<option value="$PROJECT_DIR$/tests" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
@ -18,16 +18,20 @@ if (!defined('CON_FRAMEWORK')) {
|
||||||
global $cfg;
|
global $cfg;
|
||||||
|
|
||||||
// Try to load GenericDB database driver
|
// Try to load GenericDB database driver
|
||||||
$driver_filename = $cfg['path']['contenido'] . $cfg['path']['classes'] . 'drivers/' . $cfg['sql']['gdb_driver'] . '/class.gdb.' . $cfg['sql']['gdb_driver'] . '.php';
|
$driver_filename = cRegistry::getBackendPath()
|
||||||
|
. cRegistry::getConfigValue('path', 'classes')
|
||||||
|
. 'drivers'
|
||||||
|
. DIRECTORY_SEPARATOR
|
||||||
|
. cRegistry::getConfigValue('sql', 'gdb_driver')
|
||||||
|
. DIRECTORY_SEPARATOR
|
||||||
|
. 'class.gdb.'
|
||||||
|
. cRegistry::getConfigValue('sql', 'gdb_driver')
|
||||||
|
. '.php';
|
||||||
|
|
||||||
if (file_exists($driver_filename)) {
|
if (file_exists($driver_filename)) {
|
||||||
include_once($driver_filename);
|
include_once($driver_filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
// load all genericdb classes
|
|
||||||
cInclude("classes", "genericdb/class.item.base.abstract.php");
|
|
||||||
cInclude("classes", "genericdb/class.item.cache.php");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class Contenido_ItemException.
|
* Class Contenido_ItemException.
|
||||||
* @author Murat Purc <murat@purc.de>
|
* @author Murat Purc <murat@purc.de>
|
||||||
|
|
|
@ -32,7 +32,7 @@ class cRegistry {
|
||||||
*/
|
*/
|
||||||
public static function getBackendPath() {
|
public static function getBackendPath() {
|
||||||
$cfg = self::getConfig();
|
$cfg = self::getConfig();
|
||||||
return $cfg['path']['contenido'];
|
return $cfg['path']['conlite'];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -23,6 +23,14 @@ define('CON_BE_PATH', '../conlite/');
|
||||||
session_start();
|
session_start();
|
||||||
|
|
||||||
require_once 'lib/defines.php';
|
require_once 'lib/defines.php';
|
||||||
|
/*
|
||||||
|
* SetEnv CL_VERSION
|
||||||
|
*/
|
||||||
|
if (!defined('CL_VERSION')) {
|
||||||
|
|
||||||
|
define('CL_VERSION', C_SETUP_VERSION);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// uncomment this lines during development if needed
|
// uncomment this lines during development if needed
|
||||||
error_reporting(E_ALL ^ E_NOTICE);
|
error_reporting(E_ALL ^ E_NOTICE);
|
||||||
|
@ -94,19 +102,22 @@ if(!is_dir($cfg['path']['conlite_config'])) {
|
||||||
die("Setup cannot find the config folder \"".$cfg['path']['conlite_config']."\"! Make shure folder exists and is readable.");
|
die("Setup cannot find the config folder \"".$cfg['path']['conlite_config']."\"! Make shure folder exists and is readable.");
|
||||||
}
|
}
|
||||||
|
|
||||||
// (bool) Flag to use native i18n.
|
checkAndInclude($cfg['path']['conlite_config'] . 'config.misc.php');
|
||||||
// Note: Enabling this could create unwanted side effects, because of
|
checkAndInclude($cfg['path']['conlite_config'] . 'cfg_sql.inc.php');
|
||||||
// native gettext() behavior.
|
|
||||||
$cfg['native_i18n'] = false;
|
|
||||||
|
|
||||||
// includes
|
// includes
|
||||||
checkAndInclude($cfg['path']['conlite'] . 'classes/con2con/class.registry.php');
|
/** @todo use conlite autoload to load needed classes */
|
||||||
checkAndInclude($cfg['path']['frontend'] . '/pear/HTML/Common2.php');
|
checkAndInclude($cfg['path']['frontend'] . '/pear/HTML/Common2.php');
|
||||||
|
checkAndInclude($cfg['path']['conlite'] . 'classes/con2con/class.registry.php');
|
||||||
|
// load all genericdb classes
|
||||||
|
checkAndInclude($cfg['path']['conlite'] . 'classes/genericdb/class.item.base.abstract.php');
|
||||||
|
checkAndInclude($cfg['path']['conlite'] . 'classes/genericdb/class.item.cache.php');
|
||||||
|
checkAndInclude($cfg['path']['conlite'] . 'classes/class.genericdb.php');
|
||||||
checkAndInclude($cfg['path']['conlite'] . 'classes/cHTML5/class.chtml5.common.php');
|
checkAndInclude($cfg['path']['conlite'] . 'classes/cHTML5/class.chtml5.common.php');
|
||||||
checkAndInclude($cfg['path']['conlite'] . 'classes/cHTML5/class.chtml.php');
|
checkAndInclude($cfg['path']['conlite'] . 'classes/cHTML5/class.chtml.php');
|
||||||
checkAndInclude($cfg['path']['conlite'] . 'classes/class.htmlelements.php');
|
checkAndInclude($cfg['path']['conlite'] . 'classes/class.htmlelements.php');
|
||||||
checkAndInclude($cfg['path']['conlite'] . 'classes/con2con/class.filehandler.php');
|
checkAndInclude($cfg['path']['conlite'] . 'classes/con2con/class.filehandler.php');
|
||||||
checkAndInclude($cfg['path']['conlite'] . 'includes/functions.php54.php');
|
checkAndInclude($cfg['path']['conlite'] . 'classes/contenido/class.language.php');
|
||||||
checkAndInclude($cfg['path']['conlite'] . 'classes/class.i18n.php');
|
checkAndInclude($cfg['path']['conlite'] . 'classes/class.i18n.php');
|
||||||
checkAndInclude($cfg['path']['conlite'] . 'includes/functions.i18n.php');
|
checkAndInclude($cfg['path']['conlite'] . 'includes/functions.i18n.php');
|
||||||
checkAndInclude('lib/class.setupcontrols.php');
|
checkAndInclude('lib/class.setupcontrols.php');
|
||||||
|
|
Laden…
In neuem Issue referenzieren