diff --git a/.gitignore b/.gitignore index c7dbf93..50ed16c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /cms/dflip/ /cms/js/firstlevel/ /conlite/external/**/.git +/dievino/ diff --git a/conlib/db_mysqli.inc b/conlib/db_mysqli.inc index 91c5ef6..efff09b 100644 --- a/conlib/db_mysqli.inc +++ b/conlib/db_mysqli.inc @@ -134,10 +134,10 @@ class DB_Sql extends DB_Sql_Abstract { ); - if (isset($aCon['charset'])) { - @mysqli_set_charset($dbh, $aCon['charset']); + if (!empty($aCon['charset'])) { + mysqli_set_charset($dbh, $aCon['charset']); } else { - @mysqli_set_charset($dbh, 'utf8'); + mysqli_set_charset($dbh, 'utf8'); } //echo mysqli_character_set_name($dbh); diff --git a/conlite/includes/startup.php b/conlite/includes/startup.php old mode 100755 new mode 100644 diff --git a/nbproject/project.properties b/nbproject/project.properties index 18fa718..43d66d2 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,6 +1,6 @@ auxiliary.org-netbeans-modules-php-smarty.smarty-framework=true include.path=${php.global.include.path} -php.version=PHP_73 +php.version=PHP_80 source.encoding=UTF-8 src.dir=. tags.asp=false diff --git a/pear/HTML/Common2.php b/pear/HTML/Common2.php index 05f0d92..aeeb5fb 100644 --- a/pear/HTML/Common2.php +++ b/pear/HTML/Common2.php @@ -513,7 +513,8 @@ abstract class HTML_Common2 implements ArrayAccess * @return boolean Returns true on success or false on failure. * @link http://php.net/manual/en/arrayaccess.offsetexists.php */ - public function offsetExists($offset) + #[ReturnTypeWillChange] + public function offsetExists($offset) { return isset($this->attributes[strtolower($offset)]); } @@ -527,6 +528,7 @@ abstract class HTML_Common2 implements ArrayAccess * @link http://php.net/manual/en/arrayaccess.offsetget.php * @see getAttribute() */ + #[ReturnTypeWillChange] public function offsetGet($offset) { return $this->getAttribute($offset); @@ -542,6 +544,7 @@ abstract class HTML_Common2 implements ArrayAccess * @link http://php.net/manual/en/arrayaccess.offsetset.php * @see setAttribute() */ + #[ReturnTypeWillChange] public function offsetSet($offset, $value) { if (null !== $offset) { @@ -561,6 +564,7 @@ abstract class HTML_Common2 implements ArrayAccess * @link http://php.net/manual/en/arrayaccess.offsetunset.php * @see removeAttribute */ + #[ReturnTypeWillChange] public function offsetUnset($offset) { $this->removeAttribute($offset); diff --git a/setup/lib/defines.php b/setup/lib/defines.php index eec6cc1..aec9db6 100644 --- a/setup/lib/defines.php +++ b/setup/lib/defines.php @@ -37,6 +37,6 @@ define('C_SETUP_STEPFILE', 'images/steps/s%d.png'); define('C_SETUP_STEPFILE_ACTIVE', 'images/steps/s%da.png'); define('C_SETUP_STEPWIDTH', 28); define('C_SETUP_STEPHEIGHT', 28); -define('C_SETUP_MIN_PHP_VERSION', '7.2.0'); -define('C_SETUP_MAX_PHP_VERSION', '8.1.0'); +define('C_SETUP_MIN_PHP_VERSION', '7.4.0'); +define('C_SETUP_MAX_PHP_VERSION', '8.2.0'); define('C_SETUP_VERSION', '2.2.0 beta'); \ No newline at end of file diff --git a/setup/steps/forms/setupsummary.php b/setup/steps/forms/setupsummary.php index 41f25f1..3b911a4 100644 --- a/setup/steps/forms/setupsummary.php +++ b/setup/steps/forms/setupsummary.php @@ -31,6 +31,8 @@ if (!defined('CON_FRAMEWORK')) { die('Illegal call'); } +//print_r($_SESSION); + class cSetupSetupSummary extends cSetupMask { public function __construct($step, $previous, $next) {