fixes PHP 7.3

conlite/classes/contenido/class.module.php

@@ -160,7 +160,7 @@ class cApiModule extends Item {
             } catch (Exception $ex) {
                 $oWriter = cLogWriter::factory("File", array('destination' => 'contenido.log'));
                 $oLog = new cLog($oWriter);
-                $log->log($ex->getFile() . " (" . $ex->getLine() . "): " . $ex->getMessage(), cLog::WARN);
+                $oLog->log($ex->getFile() . " (" . $ex->getLine() . "): " . $ex->getMessage(), cLog::WARN);
             }
         }
         if ($this->_aModFileEditConf['use'] == TRUE && is_writable($this->_aModFileEditConf['modPath'])) {

conlite/includes/functions.database.php

@@ -246,20 +246,23 @@ function dbUpgradeTable($db, $table, $field, $type, $null, $key, $default, $extr
     $structure = dbGetColumns($db, $table);
 
     // Third check: Compare field properties
-    if (($structure[$field]['Type'] != $type) ||
+    if (($structure[$field]['Type'] != $type) || ($structure[$field]['Null'] != $null) || ($structure[$field]['Key'] != $key) || ($structure[$field]['Default'] != $default) || ($structure[$field]['Extra'] != $extra)) {
-            ($structure[$field]['Null'] != $null) ||
-            ($structure[$field]['Key'] != $key) ||
-            ($structure[$field]['Default'] != $default) ||
-            ($structure[$field]['Extra'] != $extra)) {
 
         if ($structure[$field]['Key'] == "PRI") {
             $alterField = "  ALTER TABLE " . Contenido_Security::escapeDB($table, $db) . " ADD PRIMARY KEY ('" . Contenido_Security::escapeDB($field, $db) . "') ";
         } else {
+            if($type == "datetime" || $type == "date") {
+                $db->query("SET SESSION sql_mode='ALLOW_INVALID_DATES'");
+            }
             $alterField = "  ALTER TABLE " . Contenido_Security::escapeDB($table, $db) . " CHANGE COLUMN $field $field $type " . $parameter['NULL'] . " " . $parameter['DEFAULT'] . " " . $parameter['KEY'];
         }
 
         $db->query($alterField);
-
+        if ($bDebug) {
+            $sDebugData = sprintf("%s:ErrorNo. %s:%s\n", $alterField, $db->getErrorNumber(), $db->getErrorMessage());
+            file_put_contents('../data/logs/setup_queries.txt', $sDebugData, FILE_APPEND);
+            echo 'updateField:' . $alterField . '<br />';
+        }
         $columnCache[$table] = "";
     }
 

conlite/includes/functions.lang.php

@@ -459,18 +459,12 @@ function langDuplicateFromFirstLanguage($client, $idlang) {
  * @copyright four for business AG <www.4fb.de>
  */
 function langDeleteLanguage($idlang, $idclient = "") {
-    global $db, $sess, $client, $cfg, $notification;
+    global $db, $cfg, $notification;
 
     $deleteok = 1;
     
-    // Bugfix: New idclient parameter introduced, as Administration -> Languages
-    // is used for different clients to delete the language
-
-    // Use global client id, if idclient not specified (former behaviour)
-    // Note, that this check also have been added for the action in the database
-    // - just to be equal to langNewLanguage
     if (!is_numeric($idclient)) {
-        $idclient = $client;
+        $idclient = cRegistry::getClientId();
     }
 
     //************ check if there are still arts online

conlite/includes/functions.stat.php

@@ -87,7 +87,7 @@ function statsArchive($yearmonth) {
                            ".Contenido_Security::toInteger($db->f(1)).",
                            ".Contenido_Security::toInteger($db->f(2)).",
                            ".Contenido_Security::toInteger($db->f(3)).",
-                           '".Contenido_Security::escapeDB($db->f(4), $db2)."')";
+                           ".Contenido_Security::escapeDB($db->f(4), $db2).")";
 
         $db2->query($insertSQL);
     }

conlite/includes/include.lang_edit.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Project: 
  * Contenido Content Management System
@@ -28,8 +29,7 @@
  * }}
  * 
  */
-
+if (!defined('CON_FRAMEWORK')) {
-if(!defined('CON_FRAMEWORK')) {
     die('Illegal call');
 }
 
@@ -49,22 +49,20 @@ $sReload = '<script language="javascript">
                 if (left_bottom) {
                     var href = left_bottom.location.href;
                     href = href.replace(/&idlang[^&]*/, \'\');
-                    left_bottom.location.href = href+"&idlang="+"'.$idlang.'";
+                    left_bottom.location.href = href+"&idlang="+"' . $idlang . '";
                 }
             </script>';
 
-if ($action == "lang_newlanguage" || $action == "lang_deletelanguage")
+if ($action == "lang_newlanguage" || $action == "lang_deletelanguage") {
-{
     $page = new UI_Page;
 
-        if ($action == "lang_deletelanguage")
+    if ($action == "lang_deletelanguage") {
-		{
         // finally delete from dropdown in header
         $newOption = '<script>
 							var langList = top.header.document.getElementById("cLanguageSelect");
 							var thepos="";
 							for(var i=0;i<langList.length;i++) {
-								if(langList.options[i].value == '.$idlang.') {
+								if(langList.options[i].value == ' . $idlang . ') {
 									thepos = langList.options[i].index;
 								}
 							}
@@ -75,13 +73,13 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage")
     if ($action == "lang_newlanguage") {
         // update language dropdown in header
         $new_idlang = 0;
-            $db->query( 'SELECT max(idlang) as newlang FROM '.$cfg["tab"]["lang"].';' );
+        $db->query('SELECT max(idlang) as newlang FROM ' . $cfg["tab"]["lang"] . ';');
         if ($db->next_record()) {
             $new_idlang = $db->f('newlang');
         }
 
         $newOption = '<script language="javascript">
-							var newLang = new Option("'.i18n("New language").' ('.$new_idlang.')", "'.$new_idlang.'", false, false);
+							var newLang = new Option("' . i18n("New language") . ' (' . $new_idlang . ')", "' . $new_idlang . '", false, false);
 							var langList = top.header.document.getElementById("cLanguageSelect");
 							langList.options[langList.options.length] = newLang;
 							</script>';
@@ -93,10 +91,8 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage")
     }
     $page->addScript('reload', $sReload);
     $page->render();
-} else
+} else {
-{
+    if ($action == "lang_edit") {
-	if ($action == "lang_edit")
-	{
         callPluginStore("languages");
 
         $language = new cApiLanguage($idlang);
@@ -105,8 +101,8 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage")
         $language->setProperty("dateformat", "date", stripslashes($dateformat));
         $language->setProperty("dateformat", "time", stripslashes($timeformat));
 
-    	$language->setProperty("language", "code", stripslashes($languagecode) );
+        $language->setProperty("language", "code", stripslashes($languagecode));
-    	$language->setProperty("country", "code", stripslashes($countrycode) );
+        $language->setProperty("country", "code", stripslashes($countrycode));
 
         // update dropdown in header
         $newOption = '<script language="javascript">
@@ -114,30 +110,25 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage")
 						var thepos="";
 						for(var i=0;i<langList.length;i++)
 						{
-							if(langList.options[i].value == '.$idlang.')
+							if(langList.options[i].value == ' . $idlang . ')
 							{
-								langList.options[i].innerHTML = \''.$langname.' ('.$idlang.')\';
+								langList.options[i].innerHTML = \'' . $langname . ' (' . $idlang . ')\';
 							}
 						}
 						</script>';
     }
 
-    if(!$perm->have_perm_area_action($area, $action))
+    if (!$perm->have_perm_area_action($area, $action)) {
-    {
         $notification->displayNotification("error", i18n("Permission denied"));
-	  
     } else {
 
-		if ( !isset($idlang) && $action != "lang_new")
+        if (!isset($idlang) && $action != "lang_new") {
-		{
             $notification->displayNotification("error", "no language id given. Usually, this shouldn't happen, except if you played around with your system. if you didn't play around, please report a bug.");
-		
         } else {
 
-			if (($action == "lang_edit") && ($perm->have_perm_area_action($area, $action)))
+            if (($action == "lang_edit") && ($perm->have_perm_area_action($area, $action))) {
-			{
                 langEditLanguage($idlang, $langname, $sencoding, $active, $direction);
-				$noti = $notification->returnNotification("info", i18n("Changes saved"))."<br>";
+                $noti = $notification->returnNotification("info", i18n("Changes saved")) . "<br>";
             }
 
 
@@ -147,11 +138,11 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage")
 						A.idlang AS idlang, A.name AS name, A.active as active, A.encoding as encoding, A.direction as direction,
 						B.idclient AS idclient 
 					FROM
-						".$cfg["tab"]["lang"]." AS A,
+						" . $cfg["tab"]["lang"] . " AS A,
-						".$cfg["tab"]["clients_lang"]." AS B
+						" . $cfg["tab"]["clients_lang"] . " AS B
 					WHERE
-						A.idlang = '".Contenido_Security::toInteger($idlang)."' AND
+						A.idlang = '" . Contenido_Security::toInteger($idlang) . "' AND
-						B.idlang = '".Contenido_Security::toInteger($idlang)."'";
+						B.idlang = '" . Contenido_Security::toInteger($idlang) . "'";
 
             $db->query($sql);
             $db->next_record();
@@ -165,8 +156,7 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage")
 
 
             $charsets = array();
-			foreach ($cfg['AvailableCharsets'] as $charset)
+            foreach ($cfg['AvailableCharsets'] as $charset) {
-			{
                 $charsets[$charset] = $charset;
             }
 
@@ -183,7 +173,7 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage")
                 'mo' => 'Moldavian', 'mr' => 'Marathi', 'ms' => 'Malay', 'mt' => 'Maltese', 'my' => 'Burmese', 'na' => 'Nauru', 'ne' => 'Nepali', 'nl' => 'Dutch', 'no' => 'Norwegian', 'oc' => 'Occitan', 'om' => 'Oromo', 'or' => 'Oriya', 'pa' => 'Punjabi', 'pl' => 'Polish', 'ps' => 'Pashto', 'pt' => 'Portuguese',
                 'qu' => 'Quechua', 'rm' => 'Rhaeto-Romance', 'rn' => 'Kirundi', 'ro' => 'Romanian', 'ru' => 'Russian', 'rw' => 'Kinyarwanda', 'sa' => 'Sanskrit', 'sd' => 'Sindhi', 'sg' => 'Sangro', 'sh' => 'Serbo-Croatian', 'si' => 'Singhalese', 'sk' => 'Slovak', 'sl' => 'Slovenian', 'sm' => 'Samoan',
                 'sn' => 'Shona', 'so' => 'Somali', 'sq' => 'Albanian', 'sr' => 'Serbian', 'ss' => 'Siswati', 'st' => 'Sesotho', 'su' => 'Sudanese', 'sv' => 'Swedish', 'sw' => 'Swahili', 'ta' => 'Tamil', 'te' => 'Tegulu', 'tg' => 'Tajik', 'th' => 'Thai', 'ti' => 'Tigtinya', 'tk' => 'Turkmen', 'tl' => 'Tagalog',
-									'tn' => 'Setswana', 'to' => 'Tonga', 'tr' => 'Turkish', 'ts' => 'Tsonga', 'tt' => 'Tatar', 'tw' => 'Twi', 'uk' => 'Ukrainian', 'ur' => 'Urdu', 'uz' => 'Uzbek', 'vi' => 'Vietnamese', 'vo' => 'Volapuk', 'wo' => 'Wolof', 'xh' => 'Xhosa', 'yo' => 'Yoruba', 'zh' => 'Chinese', 'zu' => 'Zulu' );
+                'tn' => 'Setswana', 'to' => 'Tonga', 'tr' => 'Turkish', 'ts' => 'Tsonga', 'tt' => 'Tatar', 'tw' => 'Twi', 'uk' => 'Ukrainian', 'ur' => 'Urdu', 'uz' => 'Uzbek', 'vi' => 'Vietnamese', 'vo' => 'Volapuk', 'wo' => 'Wolof', 'xh' => 'Xhosa', 'yo' => 'Yoruba', 'zh' => 'Chinese', 'zu' => 'Zulu');
 
             $iso_3166_codes = array('af' => 'Afghanistan', 'al' => 'Albania', 'dz' => 'Algeria', 'as' => 'American Samoa', 'ad' => 'Andorra', 'ao' => 'Angola', 'ai' => 'Anguilla', 'aq' => 'Antarctica', 'ag' => 'Antigua/Barbuda', 'ar' => 'Argentina', 'am' => 'Armenia', 'aw' => 'Aruba', 'au' => 'Australia', 'at' => 'Austria',
                 'az' => 'Azerbaijan', 'bs' => 'Bahamas', 'bh' => 'Bahrain', 'bd' => 'Bangladesh', 'bb' => 'Barbados', 'by' => 'Belarus', 'be' => 'Belgium', 'bz' => 'Belize', 'bj' => 'Benin', 'bm' => 'Bermuda', 'bt' => 'Bhutan', 'bo' => 'Bolivia', 'ba' => 'Bosnia/Herzegowina', 'bw' => 'Botswana',
@@ -204,7 +194,7 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage")
                 'sh' => 'Santa Helena', 'pm' => 'Santa Pierre/Miquelon', 'sd' => 'Sudan', 'sr' => 'Suriname', 'sj' => 'Svalbard/Jan Mayen Islands', 'sz' => 'Swaziland', 'se' => 'Sweden', 'ch' => 'Switzerland', 'sy' => 'Syrian Arab Republic', 'tw' => 'Taiwan', 'tj' => 'Tajikistan',
                 'tz' => 'Tanzania, United Republic Of', 'th' => 'Thailand', 'tg' => 'Togo', 'tk' => 'Tokelau', 'to' => 'Tonga', 'tt' => 'Trinidad/Tobago', 'tn' => 'Tunisia', 'tr' => 'Turkey', 'tm' => 'Turkmenistan', 'tc' => 'Turks/Caicos Islands', 'tv' => 'Tuvalu', 'ug' => 'Uganda', 'ua' => 'Ukraine',
                 'ae' => 'United Arab Emirates', 'gb' => 'United Kingdom', 'us' => 'United States', 'um' => 'United States Minor Outlying Islands', 'uy' => 'Uruguay', 'uz' => 'Uzbekistan', 'vu' => 'Vanuatu', 'va' => 'Vatican City State -Holy See-', 've' => 'Venezuela', 'vn' => 'Viet Nam',
-									'vg' => 'Virgin Islands, British', 'vi' => 'Virgin Islands, U.S.', 'wf' => 'Wallis/Futuna Islands', 'eh' => 'Western Sahara', 'ye' => 'Yemen', 'yu' => 'Yougoslavia', 'zm' => 'Zambia', 'zw' => 'Zimbabwe' );
+                'vg' => 'Virgin Islands, British', 'vi' => 'Virgin Islands, U.S.', 'wf' => 'Wallis/Futuna Islands', 'eh' => 'Western Sahara', 'ye' => 'Yemen', 'yu' => 'Yougoslavia', 'zm' => 'Zambia', 'zw' => 'Zimbabwe');
 
 
 
@@ -241,8 +231,8 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage")
 
             $form->addHeader(i18n("Edit language"));
 
-			$form->add(i18n("Language name"), formGenerateField ("text", "langname", clHtmlSpecialChars($db->f("name")), 40, 255));
+            $form->add(i18n("Language name"), formGenerateField("text", "langname", clHtmlSpecialChars($db->f("name")), 40, 255));
-			$form->add(i18n("Active"), formGenerateCheckbox ("active", "1",$db->f("active")));
+            $form->add(i18n("Active"), formGenerateCheckbox("active", "1", $db->f("active")));
 
             $form->addSubHeader(i18n("Language"));
             $form->add(i18n("Encoding"), $eselect);
@@ -257,7 +247,7 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage")
 
 
             $page = new UI_Page;
-			$page->setContent($noti.$form->render());
+            $page->setContent($noti . $form->render());
 
             if ($targetclient == $client) {
                 $page->addScript('refreshHeader', $newOption);

conlite/plugins/chains/createmetatags/include.chain.content.createmetatags.php

@@ -70,7 +70,7 @@ function cecCreateMetatags($metatags) {
     if (file_exists($cachefilename)) {
         $fileexists = true;
 
-        $diff =  mktime() - filemtime($cachefilename);
+        $diff =  time() - filemtime($cachefilename);
 
         if ($diff > $cachetime) {
             $reload = true;