ConLite
/
ConLite
1
0
Fork 0
Code Issues 22 Pull-Requests Projekte 2 Releases 2 Wiki Aktivität

fixes PHP 7.3

Dieser Commit ist enthalten in:
Oldperl 2019-07-03 19:14:30 +00:00
Ursprung 4ca038a0df
Commit 06b4a295fb
6 geänderte Dateien mit 508 neuen und 549 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

123
conlite/classes/class.htmlparser.php
Datei anzeigen

@ -1,33 +1,6 @@
<?php
/**
* Project:
* Contenido Content Management System
*
* Description:
* HTML parser for contenido
*
* Requirements:
* @con_php_req 5.0
*
*
* @package Contenido Backend classes
* @version 1.0.2
* @author Starnetsys, LLC.
* @copyright Starnetsys, LLC.
* @link http://starnetsys.com
* @since file available since contenido release <= 4.6
*
* {@internal
* created unknown
* modified 2008-07-02, Frederic Schneider, add security fix
* modified 2009-10-23, Murat Purc, removed deprecated function (PHP 5.3 ready)
*
* $Id$:
* }}
*
*/
if(!defined('CON_FRAMEWORK')) {
if (!defined('CON_FRAMEWORK')) {
die('Illegal call');
}
@ -39,12 +12,12 @@ if(!defined('CON_FRAMEWORK')) {
* website design and software consulting.
*/
define ("NODE_TYPE_START",0);
define ("NODE_TYPE_ELEMENT",1);
define ("NODE_TYPE_ENDELEMENT",2);
define ("NODE_TYPE_TEXT",3);
define ("NODE_TYPE_COMMENT",4);
define ("NODE_TYPE_DONE",5);
define("NODE_TYPE_START", 0);
define("NODE_TYPE_ELEMENT", 1);
define("NODE_TYPE_ENDELEMENT", 2);
define("NODE_TYPE_TEXT", 3);
define("NODE_TYPE_COMMENT", 4);
define("NODE_TYPE_DONE", 5);
/**
* Class HtmlParser.
@ -79,7 +52,6 @@ class HtmlParser {
* of the current node. Indexes are always lowercase.
*/
var $iNodeAttributes;
// The following fields should be
// considered private:
@ -87,13 +59,12 @@ class HtmlParser {
var $iHtmlTextLength;
var $iHtmlTextIndex = 0;
/**
* Constructor.
* Constructs an HtmlParser instance with
* the HTML text given.
*/
function __construct ($aHtmlText) {
function __construct($aHtmlText) {
$this->iHtmlText = $aHtmlText;
$this->iHtmlTextLength = strlen($aHtmlText);
}
@ -124,20 +95,19 @@ class HtmlParser {
$this->iNodeType = NODE_TYPE_DONE;
return false;
}
$this->skipInTag ("<");
$this->skipInTag("<");
$this->clearAttributes();
$name = $this->skipToBlanksInTag();
$pos = strpos($name, "/");
if ($pos === 0) {
$this->iNodeType = NODE_TYPE_ENDELEMENT;
$this->iNodeName = substr ($name, 1);
$this->iNodeName = substr($name, 1);
$this->iNodeValue = "";
}
else {
if (!$this->isValidTagIdentifier ($name)) {
} else {
if (!$this->isValidTagIdentifier($name)) {
$comment = false;
if ($name == "!--") {
$rest = $this->skipToStringInTag ("-->");
$rest = $this->skipToStringInTag("-->");
if ($rest != "") {
$this->iNodeType = NODE_TYPE_COMMENT;
$this->iNodeName = "Comment";
@ -151,15 +121,13 @@ class HtmlParser {
$this->iNodeValue = "<" . $name;
}
return true;
}
else {
} else {
$this->iNodeType = NODE_TYPE_ELEMENT;
$this->iNodeValue = "";
$nameLength = strlen($name);
if ($nameLength > 0 && substr($name, $nameLength - 1, 1) == "/") {
$this->iNodeName = substr($name, 0, $nameLength - 1);
}
else {
} else {
$this->iNodeName = $name;
}
}
@ -173,8 +141,7 @@ class HtmlParser {
$this->skipBlanksInTag();
$value = $this->readValueInTag();
$this->iNodeAttributes[strtolower($attrName)] = $value;
}
else {
} else {
$this->iNodeAttributes[strtolower($attrName)] = "";
}
}
@ -183,40 +150,38 @@ class HtmlParser {
return true;
}
function isValidTagIdentifier ($name) {
function isValidTagIdentifier($name) {
return preg_match('/[A-Za-z0-9]+/', $name);
}
function skipBlanksInTag() {
return "" != ($this->skipInTag (array (" ", "\t", "\r", "\n" )));
return "" != ($this->skipInTag(array(" ", "\t", "\r", "\n")));
}
function skipToBlanksOrEqualsInTag() {
return $this->skipToInTag (array (" ", "\t", "\r", "\n", "=" ));
return $this->skipToInTag(array(" ", "\t", "\r", "\n", "="));
}
function skipToBlanksInTag() {
return $this->skipToInTag (array (" ", "\t", "\r", "\n" ));
return $this->skipToInTag(array(" ", "\t", "\r", "\n"));
}
function skipEqualsInTag() {
return $this->skipInTag (array ( "=" ));
return $this->skipInTag(array("="));
}
function readValueInTag() {
$ch = $this->currentChar();
$value = "";
if ($ch == "\"") {
$this->skipInTag (array ( "\"" ));
$value = $this->skipToInTag (array ( "\"" ));
$this->skipInTag (array ( "\"" ));
}
else if ($ch == "\'") {
$this->skipInTag (array ( "\'" ));
$value = $this->skipToInTag (array ( "\'" ));
$this->skipInTag (array ( "\'" ));
}
else {
$this->skipInTag(array("\""));
$value = $this->skipToInTag(array("\""));
$this->skipInTag(array("\""));
} else if ($ch == "\'") {
$this->skipInTag(array("\'"));
$value = $this->skipToInTag(array("\'"));
$this->skipInTag(array("\'"));
} else {
$value = $this->skipToBlanksInTag();
}
return $value;
@ -233,8 +198,7 @@ class HtmlParser {
if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {
$this->iHtmlTextIndex++;
return true;
}
else {
} else {
return false;
}
}
@ -252,14 +216,19 @@ class HtmlParser {
return $sb;
}
function skipInTag ($chars) {
function skipInTag($chars) {
$sb = "";
while (($ch = $this->currentChar()) !== -1) {
if ($ch == ">") {
return $sb;
} else {
$match = false;
for ($idx = 0; $idx < count($chars); $idx++) {
if(is_countable($chars)) {
$int_cnt_chars = count($chars);
} else {
$int_cnt_chars = strlen($chars);
}
for ($idx = 0; $idx < $int_cnt_chars; $idx++) {
if ($ch == $chars[$idx]) {
$match = true;
break;
@ -275,12 +244,17 @@ class HtmlParser {
return $sb;
}
function skipToInTag ($chars) {
function skipToInTag($chars) {
$sb = "";
while (($ch = $this->currentChar()) !== -1) {
$match = $ch == ">";
if (!$match) {
for ($idx = 0; $idx < count($chars); $idx++) {
if(is_countable($chars)) {
$int_cnt_chars = count($chars);
} else {
$int_cnt_chars = strlen($chars);
}
for ($idx = 0; $idx < $int_cnt_chars; $idx++) {
if ($ch == $chars[$idx]) {
$match = true;
break;
@ -314,16 +288,15 @@ class HtmlParser {
* after the location of $needle, or not moved at all
* if nothing is found.
*/
function skipToStringInTag ($needle) {
$pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex);
function skipToStringInTag($needle) {
$pos = strpos($this->iHtmlText, $needle, $this->iHtmlTextIndex);
if ($pos === false) {
return "";
}
$top = $pos + strlen($needle);
$retvalue = substr ($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex);
$retvalue = substr($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex);
$this->iHtmlTextIndex = $top;
return $retvalue;
}
}
?>
}

4
conlite/classes/class.properties.php
Datei anzeigen

@ -328,7 +328,9 @@ class PropertyCollection extends ItemCollection
public function getAllValues($field, $fieldValue, $auth=NULL)
{
$authString = '';
if (!is_null($auth) && sizeof($auth) > 0) {
if (!is_null($auth)
&& is_countable($auth)
&& sizeof($auth) > 0) {
$authString .= " AND author = '" . $auth->auth["uid"] . "'";
}

2
conlite/external/wysiwyg/tinymce3/editorclass.php vendored
Datei anzeigen

@ -56,7 +56,7 @@ class cTinyMCEEditor extends cWYSIWYGEditor {
*/
var $_bUseGZIP = false;
function cTinyMCEEditor($sEditorName, $sEditorContent) {
public function __construct($sEditorName, $sEditorContent) {
global $belang, $cfg, $cfgClient, $client, $lang, $idart;
parent::__construct($sEditorName, $sEditorContent);

32
conlite/includes/functions.php73.php
Datei anzeigen

@ -1,6 +1,38 @@
<?php
/**
* PHP 7.3 functions for older PHP versions
*
* @package Core
* @subpackage functions
* @version $Rev$
* @since 2.0.3
* @author Ortwin Pinke <o.pinke@conlite.org>
* @copyright (c) 2019, conlite.org
* @license http://www.gnu.de/documents/gpl.en.html GPL v3 (english version)
* @license http://www.gnu.de/documents/gpl.de.html GPL v3 (deutsche Version)
* @link http://www.conlite.org ConLite.org
*
* $Id$
*/
// security check
defined('CON_FRAMEWORK') or die('Illegal call');
if (!function_exists('is_countable')) {
/**
* Verify that the contents of a variable is a countable value
* <p>Verify that the contents of a variable is an <code>array</code> or an object implementing Countable</p>
* @param mixed $var <p>The value to check</p>
* @return bool <p>Returns <b><code>TRUE</code></b> if <code>var</code> is countable, <b><code>FALSE</code></b> otherwise.</p>
* @link http://php.net/manual/en/function.is-countable.php
*
* @param Countable $var
* @return boolean
*/
function is_countable($var) {
return (is_array($var) || $var instanceof Countable);
}
}

324
conlite/includes/functions.tpl.php
Datei anzeigen

@ -1,4 +1,5 @@
<?php
/**
* Project:
* Contenido Content Management System
@ -29,12 +30,11 @@
* }}
*
*/
if(!defined('CON_FRAMEWORK')) {
if (!defined('CON_FRAMEWORK')) {
die('Illegal call');
}
cInclude ("includes", "functions.con.php");
cInclude("includes", "functions.con.php");
/**
* Edit or create a new Template
@ -43,8 +43,7 @@ cInclude ("includes", "functions.con.php");
* @author Jan Lengowski <Jan.Lengowski@4fb.de>
* @copyright four for business AG <www.4fb.de>
*/
function tplEditTemplate($changelayout, $idtpl, $name, $description, $idlay, $c, $default)
{
function tplEditTemplate($changelayout, $idtpl, $name, $description, $idlay, $c, $default) {
global $db;
global $sess;
@ -54,10 +53,10 @@ function tplEditTemplate($changelayout, $idtpl, $name, $description, $idlay, $c,
global $area_tree;
global $perm;
$db2= new DB_ConLite;
$db2 = new DB_ConLite;
$date = date("YmdHis");
$author = "".$auth->auth["uname"]."";
$author = "" . $auth->auth["uname"] . "";
//******** entry in 'tpl'-table ***************
set_magic_quotes_gpc($name);
@ -70,67 +69,63 @@ function tplEditTemplate($changelayout, $idtpl, $name, $description, $idlay, $c,
/* Insert new entry in the
Template Conf table */
$sql = "INSERT INTO ".$cfg["tab"]["tpl_conf"]."
$sql = "INSERT INTO " . $cfg["tab"]["tpl_conf"] . "
(idtplcfg, idtpl, author) VALUES
('".Contenido_Security::toInteger($idtplcfg)."', '".Contenido_Security::toInteger($idtpl)."', '".Contenido_Security::escapeDB($auth->auth["uname"], $db)."')";
('" . Contenido_Security::toInteger($idtplcfg) . "', '" . Contenido_Security::toInteger($idtpl) . "', '" . Contenido_Security::escapeDB($auth->auth["uname"], $db) . "')";
$db->query($sql);
/* Insert new entry in the
Template table */
$sql = "INSERT INTO ".$cfg["tab"]["tpl"]."
$sql = "INSERT INTO " . $cfg["tab"]["tpl"] . "
(idtpl, idtplcfg, name, description, deletable, idlay, idclient, author, created, lastmodified) VALUES
('".Contenido_Security::toInteger($idtpl)."', '".Contenido_Security::toInteger($idtplcfg)."', '".Contenido_Security::escapeDB($name, $db)."', '".Contenido_Security::escapeDB($description, $db)."',
'1', '".Contenido_Security::toInteger($idlay)."', '".Contenido_Security::toInteger($client)."', '".Contenido_Security::escapeDB($author, $db)."', '".Contenido_Security::escapeDB($date, $db)."',
'".Contenido_Security::escapeDB($date, $db)."')";
('" . Contenido_Security::toInteger($idtpl) . "', '" . Contenido_Security::toInteger($idtplcfg) . "', '" . Contenido_Security::escapeDB($name, $db) . "', '" . Contenido_Security::escapeDB($description, $db) . "',
'1', '" . Contenido_Security::toInteger($idlay) . "', '" . Contenido_Security::toInteger($client) . "', '" . Contenido_Security::escapeDB($author, $db) . "', '" . Contenido_Security::escapeDB($date, $db) . "',
'" . Contenido_Security::escapeDB($date, $db) . "')";
$db->query($sql);
// set correct rights for element
cInclude ("includes", "functions.rights.php");
cInclude("includes", "functions.rights.php");
createRightsForElement("tpl", $idtpl);
} else {
/* Update */
$sql = "UPDATE ".$cfg["tab"]["tpl"]." SET name='".Contenido_Security::escapeDB($name, $db)."', description='".Contenido_Security::escapeDB($description, $db)."', idlay='".Contenido_Security::toInteger($idlay)."',
author='".Contenido_Security::escapeDB($author, $db)."', lastmodified='".Contenido_Security::escapeDB($date, $db)."' WHERE idtpl='".Contenido_Security::toInteger($idtpl)."'";
$sql = "UPDATE " . $cfg["tab"]["tpl"] . " SET name='" . Contenido_Security::escapeDB($name, $db) . "', description='" . Contenido_Security::escapeDB($description, $db) . "', idlay='" . Contenido_Security::toInteger($idlay) . "',
author='" . Contenido_Security::escapeDB($author, $db) . "', lastmodified='" . Contenido_Security::escapeDB($date, $db) . "' WHERE idtpl='" . Contenido_Security::toInteger($idtpl) . "'";
$db->query($sql);
if (is_array($c)) {
/* Delete all container assigned to this template */
$sql = "DELETE FROM ".$cfg["tab"]["container"]." WHERE idtpl='".Contenido_Security::toInteger($idtpl, $db)."'";
$sql = "DELETE FROM " . $cfg["tab"]["container"] . " WHERE idtpl='" . Contenido_Security::toInteger($idtpl, $db) . "'";
$db->query($sql);
foreach($c as $idcontainer => $dummyval) {
foreach ($c as $idcontainer => $dummyval) {
$sql = "INSERT INTO ".$cfg["tab"]["container"]." (idcontainer, idtpl, number, idmod) VALUES ";
$sql = "INSERT INTO " . $cfg["tab"]["container"] . " (idcontainer, idtpl, number, idmod) VALUES ";
$sql .= "(";
$sql .= "'".Contenido_Security::toInteger($db->nextid($cfg["tab"]["container"]))."', ";
$sql .= "'".Contenido_Security::toInteger($idtpl)."', ";
$sql .= "'".Contenido_Security::toInteger($idcontainer)."', ";
$sql .= "'".Contenido_Security::toInteger($c[$idcontainer])."'";
$sql .= "'" . Contenido_Security::toInteger($db->nextid($cfg["tab"]["container"])) . "', ";
$sql .= "'" . Contenido_Security::toInteger($idtpl) . "', ";
$sql .= "'" . Contenido_Security::toInteger($idcontainer) . "', ";
$sql .= "'" . Contenido_Security::toInteger($c[$idcontainer]) . "'";
$sql .= ") ";
$db->query($sql);
}
}
/* Generate code */
conGenerateCodeForAllartsUsingTemplate($idtpl);
}
if ($default == 1)
{
$sql = "UPDATE ".$cfg["tab"]["tpl"]." SET defaulttemplate = '0' WHERE idclient = '".Contenido_Security::toInteger($client)."'";
if ($default == 1) {
$sql = "UPDATE " . $cfg["tab"]["tpl"] . " SET defaulttemplate = '0' WHERE idclient = '" . Contenido_Security::toInteger($client) . "'";
$db->query($sql);
$sql = "UPDATE ".$cfg["tab"]["tpl"]." SET defaulttemplate = '1' WHERE idtpl = '".Contenido_Security::toInteger($idtpl)."' AND idclient = '".Contenido_Security::toInteger($client)."'";
$sql = "UPDATE " . $cfg["tab"]["tpl"] . " SET defaulttemplate = '1' WHERE idtpl = '" . Contenido_Security::toInteger($idtpl) . "' AND idclient = '" . Contenido_Security::toInteger($client) . "'";
$db->query($sql);
} else {
$sql = "UPDATE ".$cfg["tab"]["tpl"]." SET defaulttemplate = '0' WHERE idtpl = '".Contenido_Security::toInteger($idtpl)."' AND idclient = '".Contenido_Security::toInteger($client)."'";
$sql = "UPDATE " . $cfg["tab"]["tpl"] . " SET defaulttemplate = '0' WHERE idtpl = '" . Contenido_Security::toInteger($idtpl) . "' AND idclient = '" . Contenido_Security::toInteger($client) . "'";
$db->query($sql);
}
@ -142,7 +137,6 @@ function tplEditTemplate($changelayout, $idtpl, $name, $description, $idlay, $c,
}
return $idtpl;
}
/**
@ -159,37 +153,34 @@ function tplDeleteTemplate($idtpl) {
global $db, $client, $lang, $cfg, $area_tree, $perm;
$sql = "DELETE FROM ".$cfg["tab"]["tpl"]." WHERE idtpl='".Contenido_Security::toInteger($idtpl)."'";
$sql = "DELETE FROM " . $cfg["tab"]["tpl"] . " WHERE idtpl='" . Contenido_Security::toInteger($idtpl) . "'";
$db->query($sql);
/* JL 160603 : Delete all unnecessary entries */
$sql = "DELETE FROM ".$cfg["tab"]["container"]." WHERE idtpl = '".Contenido_Security::toInteger($idtpl)."'";
$sql = "DELETE FROM " . $cfg["tab"]["container"] . " WHERE idtpl = '" . Contenido_Security::toInteger($idtpl) . "'";
$db->query($sql);
$idsToDelete = array();
$sql = "SELECT idtplcfg FROM ".$cfg["tab"]["tpl_conf"]." WHERE idtpl = '".Contenido_Security::toInteger($idtpl)."'";
$sql = "SELECT idtplcfg FROM " . $cfg["tab"]["tpl_conf"] . " WHERE idtpl = '" . Contenido_Security::toInteger($idtpl) . "'";
$db->query($sql);
while ( $db->next_record() ) {
while ($db->next_record()) {
$idsToDelete[] = $db->f("idtplcfg");
}
foreach ( $idsToDelete as $id ) {
foreach ($idsToDelete as $id) {
$sql = "DELETE FROM ".$cfg["tab"]["tpl_conf"]." WHERE idtplcfg = '".Contenido_Security::toInteger($id)."'";
$sql = "DELETE FROM " . $cfg["tab"]["tpl_conf"] . " WHERE idtplcfg = '" . Contenido_Security::toInteger($id) . "'";
$db->query($sql);
$sql = "DELETE FROM ".$cfg["tab"]["container_conf"]." WHERE idtplcfg = '".Contenido_Security::toInteger($id)."'";
$sql = "DELETE FROM " . $cfg["tab"]["container_conf"] . " WHERE idtplcfg = '" . Contenido_Security::toInteger($id) . "'";
$db->query($sql);
}
cInclude ("includes", "functions.rights.php");
cInclude("includes", "functions.rights.php");
deleteRightsForElement("tpl", $idtpl);
}
/**
* Browse a specific layout for containers
*
@ -205,8 +196,8 @@ function tplBrowseLayoutForContainers($idlay, $raw_code = NULL) {
global $cfg;
global $containerinf;
if(is_null($raw_code) || empty($raw_code)) {
$sql = "SELECT code FROM ".$cfg["tab"]["lay"]." WHERE idlay='".Contenido_Security::toInteger($idlay)."'";
if (is_null($raw_code) || empty($raw_code)) {
$sql = "SELECT code FROM " . $cfg["tab"]["lay"] . " WHERE idlay='" . Contenido_Security::toInteger($idlay) . "'";
$db->query($sql);
$db->next_record();
$code = $db->f("code");
@ -214,7 +205,7 @@ function tplBrowseLayoutForContainers($idlay, $raw_code = NULL) {
$code = $raw_code;
}
preg_match_all ("/CMS_CONTAINER\[([0-9]*)\]/", $code, $a_container);
preg_match_all("/CMS_CONTAINER\[([0-9]*)\]/", $code, $a_container);
$iPosBody = stripos($code, '<body>');
$sCodeBeforeHeader = substr($code, 0, $iPosBody);
@ -243,7 +234,7 @@ function tplBrowseLayoutForContainers($idlay, $raw_code = NULL) {
asort($container);
if (is_array($container)) {
$tmp_returnstring = implode("&",$container);
$tmp_returnstring = implode("&", $container);
}
return $tmp_returnstring;
}
@ -256,16 +247,13 @@ function tplBrowseLayoutForContainers($idlay, $raw_code = NULL) {
*
* @return string Container name
*/
function tplGetContainerName($idlay, $container)
{
function tplGetContainerName($idlay, $container) {
global $db;
global $cfg;
global $containerinf;
if (is_array($containerinf[$idlay]))
{
if (array_key_exists($container, $containerinf[$idlay]))
{
if (is_array($containerinf[$idlay])) {
if (array_key_exists($container, $containerinf[$idlay])) {
return $containerinf[$idlay][$container]["name"];
}
}
@ -279,16 +267,13 @@ function tplGetContainerName($idlay, $container)
*
* @return string Container name
*/
function tplGetContainerMode($idlay, $container)
{
function tplGetContainerMode($idlay, $container) {
global $db;
global $cfg;
global $containerinf;
if (is_array($containerinf[$idlay]))
{
if (array_key_exists($container, $containerinf[$idlay]))
{
if (is_array($containerinf[$idlay])) {
if (array_key_exists($container, $containerinf[$idlay])) {
return $containerinf[$idlay][$container]["mode"];
}
}
@ -302,22 +287,17 @@ function tplGetContainerMode($idlay, $container)
*
* @return array Allowed container types
*/
function tplGetContainerTypes($idlay, $container)
{
function tplGetContainerTypes($idlay, $container) {
global $db;
global $cfg;
global $containerinf;
if (is_array($containerinf[$idlay]))
{
if (array_key_exists($container, $containerinf[$idlay]))
{
if ($containerinf[$idlay][$container]["types"] != "")
{
$list = explode(",",$containerinf[$idlay][$container]["types"]);
if (is_array($containerinf[$idlay])) {
if (array_key_exists($container, $containerinf[$idlay])) {
if ($containerinf[$idlay][$container]["types"] != "") {
$list = explode(",", $containerinf[$idlay][$container]["types"]);
foreach ($list as $key => $value)
{
foreach ($list as $key => $value) {
$list[$key] = trim($value);
}
return $list;
@ -334,16 +314,13 @@ function tplGetContainerTypes($idlay, $container)
*
* @return array Allowed container types
*/
function tplGetContainerDefault($idlay, $container)
{
function tplGetContainerDefault($idlay, $container) {
global $db;
global $cfg;
global $containerinf;
if (is_array($containerinf[$idlay]))
{
if (array_key_exists($container, $containerinf[$idlay]))
{
if (is_array($containerinf[$idlay])) {
if (array_key_exists($container, $containerinf[$idlay])) {
return $containerinf[$idlay][$container]["default"];
}
}
@ -356,13 +333,13 @@ function tplGetContainerDefault($idlay, $container)
*
* @return none
*/
function tplPreparseLayout ($idlay, $raw_code = NULL) {
function tplPreparseLayout($idlay, $raw_code = NULL) {
global $containerinf;
global $db;
global $cfg;
if(is_null($raw_code) || empty($raw_code)) {
$sql = "SELECT code FROM ".$cfg["tab"]["lay"]." WHERE idlay='".Contenido_Security::toInteger($idlay)."'";
if (is_null($raw_code) || empty($raw_code)) {
$sql = "SELECT code FROM " . $cfg["tab"]["lay"] . " WHERE idlay='" . Contenido_Security::toInteger($idlay) . "'";
$db->query($sql);
$db->next_record();
$code = $db->f("code");
@ -372,20 +349,17 @@ function tplPreparseLayout ($idlay, $raw_code = NULL) {
$parser = new HtmlParser($code);
$bIsBody = false;
while ($parser->parse())
{
while ($parser->parse()) {
if (strtolower($parser->iNodeName) == 'body') {
$bIsBody = true;
}
if ($parser->iNodeName == "container" && $parser->iNodeType == NODE_TYPE_ELEMENT)
{
if ($parser->iNodeName == "container" && $parser->iNodeType == NODE_TYPE_ELEMENT) {
$idcontainer = $parser->iNodeAttributes["id"];
$mode = $parser->iNodeAttributes["mode"];
if ($mode == "")
{
if ($mode == "") {
$mode = "optional";
}
@ -417,9 +391,9 @@ function tplDuplicateTemplate($idtpl) {
$sql = "SELECT
*
FROM
".$cfg["tab"]["tpl"]."
" . $cfg["tab"]["tpl"] . "
WHERE
idtpl = '".Contenido_Security::toInteger($idtpl)."'";
idtpl = '" . Contenido_Security::toInteger($idtpl) . "'";
$db->query($sql);
$db->next_record();
@ -429,7 +403,7 @@ function tplDuplicateTemplate($idtpl) {
$new_idtpl = $db->nextid($cfg["tab"]["tpl"]);
//modified (added) 2008-06-30 timo.trautmann added fix module settings were also copied
$idtpl_conf = $db->f("idtplcfg");
if($idtpl_conf) {
if ($idtpl_conf) {
$new_idtpl_conf = $db->nextid($cfg["tab"]["tpl_conf"]);
}
//modified (added) 2008-06-30 end
@ -441,11 +415,11 @@ function tplDuplicateTemplate($idtpl) {
//modified (added) 2008-06-30 : idtplcfg -> $new_idtpl
$sql = "INSERT INTO
".$cfg["tab"]["tpl"]."
(idclient, idlay, idtpl, ".($idtpl_conf?'idtplcfg,':'')." name, description, deletable,author, created, lastmodified)
" . $cfg["tab"]["tpl"] . "
(idclient, idlay, idtpl, " . ($idtpl_conf ? 'idtplcfg,' : '') . " name, description, deletable,author, created, lastmodified)
VALUES
('".Contenido_Security::toInteger($idclient)."', '".Contenido_Security::toInteger($idlay)."', '".Contenido_Security::toInteger($new_idtpl)."', ".($idtpl_conf?"'".Contenido_Security::toInteger($new_idtpl_conf)."', ":'')." '".Contenido_Security::escapeDB($name, $db)."',
'".Contenido_Security::escapeDB($descr, $db)."', '1', '".Contenido_Security::escapeDB($author, $db)."', '".Contenido_Security::escapeDB($created, $db)."', '".Contenido_Security::escapeDB($lastmod, $db)."')";
('" . Contenido_Security::toInteger($idclient) . "', '" . Contenido_Security::toInteger($idlay) . "', '" . Contenido_Security::toInteger($new_idtpl) . "', " . ($idtpl_conf ? "'" . Contenido_Security::toInteger($new_idtpl_conf) . "', " : '') . " '" . Contenido_Security::escapeDB($name, $db) . "',
'" . Contenido_Security::escapeDB($descr, $db) . "', '1', '" . Contenido_Security::escapeDB($author, $db) . "', '" . Contenido_Security::escapeDB($created, $db) . "', '" . Contenido_Security::escapeDB($lastmod, $db) . "')";
$db->query($sql);
$a_containers = array();
@ -453,9 +427,9 @@ function tplDuplicateTemplate($idtpl) {
$sql = "SELECT
*
FROM
".$cfg["tab"]["container"]."
" . $cfg["tab"]["container"] . "
WHERE
idtpl = '".Contenido_Security::toInteger($idtpl)."'
idtpl = '" . Contenido_Security::toInteger($idtpl) . "'
ORDER BY
number";
@ -469,22 +443,21 @@ function tplDuplicateTemplate($idtpl) {
$nextid = $db->nextid($cfg["tab"]["container"]);
$sql = "INSERT INTO ".$cfg["tab"]["container"]."
(idcontainer, idtpl, number, idmod) VALUES ('".Contenido_Security::toInteger($nextid)."', '".Contenido_Security::toInteger($new_idtpl)."', '".Contenido_Security::toInteger($key)."', '".Contenido_Security::toInteger($value)."')";
$sql = "INSERT INTO " . $cfg["tab"]["container"] . "
(idcontainer, idtpl, number, idmod) VALUES ('" . Contenido_Security::toInteger($nextid) . "', '" . Contenido_Security::toInteger($new_idtpl) . "', '" . Contenido_Security::toInteger($key) . "', '" . Contenido_Security::toInteger($value) . "')";
$db->query($sql);
}
//modified (added) 2008-06-30 timo.trautmann added fix module settings were also copied
if($idtpl_conf) {
if ($idtpl_conf) {
$a_container_cfg = array();
$sql = "SELECT
*
FROM
".$cfg["tab"]["container_conf"]."
" . $cfg["tab"]["container_conf"] . "
WHERE
idtplcfg = '".Contenido_Security::toInteger($idtpl_conf)."'
idtplcfg = '" . Contenido_Security::toInteger($idtpl_conf) . "'
ORDER BY
number";
@ -498,20 +471,18 @@ function tplDuplicateTemplate($idtpl) {
$nextid = $db->nextid($cfg["tab"]["container_conf"]);
$sql = "INSERT INTO ".$cfg["tab"]["container_conf"]."
(idcontainerc, idtplcfg, number, container) VALUES ('".Contenido_Security::toInteger($nextid)."', '".Contenido_Security::toInteger($new_idtpl_conf)."', '".Contenido_Security::escapeDB($key, $db)."', '".Contenido_Security::escapeDB($value, $db)."')";
$sql = "INSERT INTO " . $cfg["tab"]["container_conf"] . "
(idcontainerc, idtplcfg, number, container) VALUES ('" . Contenido_Security::toInteger($nextid) . "', '" . Contenido_Security::toInteger($new_idtpl_conf) . "', '" . Contenido_Security::escapeDB($key, $db) . "', '" . Contenido_Security::escapeDB($value, $db) . "')";
$db->query($sql);
}
}
//modified (added) 2008-06-30 end
cInclude ("includes", "functions.rights.php");
cInclude("includes", "functions.rights.php");
copyRightsForElement("tpl", $idtpl, $new_idtpl);
return $new_idtpl;
}
/**
@ -535,12 +506,12 @@ function tplIsTemplateInUse($idtpl) {
$sql = "SELECT
b.idcatlang, b.name, b.idlang, b.idcat
FROM
".$cfg["tab"]["cat"]." AS a,
".$cfg["tab"]["cat_lang"]." AS b
" . $cfg["tab"]["cat"] . " AS a,
" . $cfg["tab"]["cat_lang"] . " AS b
WHERE
a.idclient = '".Contenido_Security::toInteger($client)."' AND
a.idclient = '" . Contenido_Security::toInteger($client) . "' AND
a.idcat = b.idcat AND
b.idtplcfg IN (SELECT idtplcfg FROM ".$cfg["tab"]["tpl_conf"]." WHERE idtpl = '".$idtpl."')
b.idtplcfg IN (SELECT idtplcfg FROM " . $cfg["tab"]["tpl_conf"] . " WHERE idtpl = '" . $idtpl . "')
ORDER BY b.idlang ASC, b.name ASC ";
$db->query($sql);
if ($db->Errno == '' && $db->num_rows() > 0) {
@ -551,12 +522,12 @@ function tplIsTemplateInUse($idtpl) {
$sql = "SELECT
b.idartlang, b.title, b.idlang, b.idart
FROM
".$cfg["tab"]["art"]." AS a,
".$cfg["tab"]["art_lang"]." AS b
" . $cfg["tab"]["art"] . " AS a,
" . $cfg["tab"]["art_lang"] . " AS b
WHERE
a.idclient = '".Contenido_Security::toInteger($client)."' AND
a.idclient = '" . Contenido_Security::toInteger($client) . "' AND
a.idart = b.idart AND
b.idtplcfg IN (SELECT idtplcfg FROM ".$cfg["tab"]["tpl_conf"]." WHERE idtpl = '".$idtpl."')
b.idtplcfg IN (SELECT idtplcfg FROM " . $cfg["tab"]["tpl_conf"] . " WHERE idtpl = '" . $idtpl . "')
ORDER BY b.idlang ASC, b.title ASC ";
$db->query($sql);
@ -566,7 +537,6 @@ function tplIsTemplateInUse($idtpl) {
}
return false;
}
/**
@ -591,12 +561,12 @@ function tplGetInUsedData($idtpl) {
$sql = "SELECT
b.idcatlang, b.name, b.idlang, b.idcat
FROM
".$cfg["tab"]["cat"]." AS a,
".$cfg["tab"]["cat_lang"]." AS b
" . $cfg["tab"]["cat"] . " AS a,
" . $cfg["tab"]["cat_lang"] . " AS b
WHERE
a.idclient = '".Contenido_Security::toInteger($client)."' AND
a.idclient = '" . Contenido_Security::toInteger($client) . "' AND
a.idcat = b.idcat AND
b.idtplcfg IN (SELECT idtplcfg FROM ".$cfg["tab"]["tpl_conf"]." WHERE idtpl = '".$idtpl."')
b.idtplcfg IN (SELECT idtplcfg FROM " . $cfg["tab"]["tpl_conf"] . " WHERE idtpl = '" . $idtpl . "')
ORDER BY b.idlang ASC, b.name ASC ";
$db->query($sql);
if ($db->Errno == 0 && $db->num_rows() > 0) {
@ -613,12 +583,12 @@ function tplGetInUsedData($idtpl) {
$sql = "SELECT
b.idartlang, b.title, b.idlang, b.idart
FROM
".$cfg["tab"]["art"]." AS a,
".$cfg["tab"]["art_lang"]." AS b
" . $cfg["tab"]["art"] . " AS a,
" . $cfg["tab"]["art_lang"] . " AS b
WHERE
a.idclient = '".Contenido_Security::toInteger($client)."' AND
a.idclient = '" . Contenido_Security::toInteger($client) . "' AND
a.idart = b.idart AND
b.idtplcfg IN (SELECT idtplcfg FROM ".$cfg["tab"]["tpl_conf"]." WHERE idtpl = '".$idtpl."')
b.idtplcfg IN (SELECT idtplcfg FROM " . $cfg["tab"]["tpl_conf"] . " WHERE idtpl = '" . $idtpl . "')
ORDER BY b.idlang ASC, b.title ASC ";
$db->query($sql);
@ -634,7 +604,6 @@ function tplGetInUsedData($idtpl) {
}
return $aUsedData;
}
/**
@ -645,8 +614,7 @@ function tplGetInUsedData($idtpl) {
* @return int new template configuration ID
*
*/
function tplcfgDuplicate ($idtplcfg)
{
function tplcfgDuplicate($idtplcfg) {
global $cfg;
$db = new DB_ConLite;
@ -655,14 +623,13 @@ function tplcfgDuplicate ($idtplcfg)
$sql = "SELECT
idtpl, status, author, created, lastmodified
FROM
".$cfg["tab"]["tpl_conf"]."
" . $cfg["tab"]["tpl_conf"] . "
WHERE
idtplcfg = '".Contenido_Security::toInteger($idtplcfg)."'";
idtplcfg = '" . Contenido_Security::toInteger($idtplcfg) . "'";
$db->query($sql);
if ($db->next_record())
{
if ($db->next_record()) {
$newidtplcfg = $db2->nextid($cfg["tab"]["tpl_conf"]);
$idtpl = $db->f("idtpl");
$status = $db->f("status");
@ -671,11 +638,11 @@ function tplcfgDuplicate ($idtplcfg)
$lastmodified = $db->f("lastmodified");
$sql = "INSERT INTO
".$cfg["tab"]["tpl_conf"]."
" . $cfg["tab"]["tpl_conf"] . "
(idtplcfg, idtpl, status, author, created, lastmodified)
VALUES
('".Contenido_Security::toInteger($newidtplcfg)."', '".Contenido_Security::toInteger($idtpl)."', '".Contenido_Security::toInteger($status)."', '".Contenido_Security::escapeDB($author, $db2)."',
'".Contenido_Security::escapeDB($created, $db2)."', '".Contenido_Security::escapeDB($lastmodified, $db2)."')";
('" . Contenido_Security::toInteger($newidtplcfg) . "', '" . Contenido_Security::toInteger($idtpl) . "', '" . Contenido_Security::toInteger($status) . "', '" . Contenido_Security::escapeDB($author, $db2) . "',
'" . Contenido_Security::escapeDB($created, $db2) . "', '" . Contenido_Security::escapeDB($lastmodified, $db2) . "')";
$db2->query($sql);
@ -683,28 +650,26 @@ function tplcfgDuplicate ($idtplcfg)
$sql = "SELECT
number, container
FROM
".$cfg["tab"]["container_conf"]."
WHERE idtplcfg = '".Contenido_Security::toInteger($idtplcfg)."'";
" . $cfg["tab"]["container_conf"] . "
WHERE idtplcfg = '" . Contenido_Security::toInteger($idtplcfg) . "'";
$db->query($sql);
while ($db->next_record())
{
while ($db->next_record()) {
$newidcontainerc = $db2->nextid($cfg["tab"]["container_conf"]);
$number = $db->f("number");
$container = $db->f("container");
$sql = "INSERT INTO
".$cfg["tab"]["container_conf"]."
" . $cfg["tab"]["container_conf"] . "
(idcontainerc, idtplcfg, number, container)
VALUES
('".Contenido_Security::toInteger($newidcontainerc)."', '".Contenido_Security::toInteger($newidtplcfg)."', '".Contenido_Security::toInteger($number)."', '".Contenido_Security::escapeDB($container, $db2)."')";
('" . Contenido_Security::toInteger($newidcontainerc) . "', '" . Contenido_Security::toInteger($newidtplcfg) . "', '" . Contenido_Security::toInteger($number) . "', '" . Contenido_Security::escapeDB($container, $db2) . "')";
$db2->query($sql);
}
}
return ($newidtplcfg);
}
/*
@ -719,70 +684,61 @@ function tplcfgDuplicate ($idtplcfg)
* is empty. We need a better logic for handling "changes".
*/
function tplAutoFillModules ($idtpl)
{
function tplAutoFillModules($idtpl) {
global $cfg;
global $db_autofill;
global $containerinf;
global $_autoFillcontainerCache;
if (!is_object($db_autofill))
{
if (!is_object($db_autofill)) {
$db_autofill = new DB_ConLite;
}
$sql = "SELECT idlay FROM ".$cfg["tab"]["tpl"]." WHERE idtpl = '".Contenido_Security::toInteger($idtpl)."'";
$sql = "SELECT idlay FROM " . $cfg["tab"]["tpl"] . " WHERE idtpl = '" . Contenido_Security::toInteger($idtpl) . "'";
$db_autofill->query($sql);
if (!$db_autofill->next_record())
{
if (!$db_autofill->next_record()) {
return false;
}
$idlay = $db_autofill->f("idlay");
if (!(is_array($containerinf) && array_key_exists($idlay, $containerinf) && array_key_exists($idlay, $_autoFillcontainerCache)))
{
if (!(is_array($containerinf) && array_key_exists($idlay, $containerinf) && array_key_exists($idlay, $_autoFillcontainerCache))) {
tplPreparseLayout($idlay);
$_autoFillcontainerCache[$idlay] = tplBrowseLayoutForContainers($idlay);
}
$a_container = explode("&",$_autoFillcontainerCache[$idlay]);
$a_container = explode("&", $_autoFillcontainerCache[$idlay]);
foreach ($a_container as $container)
{
switch ($containerinf[$idlay][$container]["mode"])
{
foreach ($a_container as $container) {
switch ($containerinf[$idlay][$container]["mode"]) {
/* Fixed mode */
case "fixed":
if ($containerinf[$idlay][$container]["default"] != "")
{
$sql = "SELECT idmod FROM ".$cfg["tab"]["mod"]
." WHERE name = '".
Contenido_Security::escapeDB($containerinf[$idlay][$container]["default"], $db_autofill)."'";
if ($containerinf[$idlay][$container]["default"] != "") {
$sql = "SELECT idmod FROM " . $cfg["tab"]["mod"]
. " WHERE name = '" .
Contenido_Security::escapeDB($containerinf[$idlay][$container]["default"], $db_autofill) . "'";
$db_autofill->query($sql);
if ($db_autofill->next_record())
{
if ($db_autofill->next_record()) {
$idmod = $db_autofill->f("idmod");
$sql = "SELECT idcontainer FROM ".$cfg["tab"]["container"]." WHERE idtpl = '".Contenido_Security::toInteger($idtpl)."' AND number = '".Contenido_Security::toInteger($container)."'";
$sql = "SELECT idcontainer FROM " . $cfg["tab"]["container"] . " WHERE idtpl = '" . Contenido_Security::toInteger($idtpl) . "' AND number = '" . Contenido_Security::toInteger($container) . "'";
$db_autofill->query($sql);
if ($db_autofill->next_record())
{
$sql = "UPDATE ".$cfg["tab"]["container"].
" SET idmod = '".Contenido_Security::toInteger($idmod)."' WHERE idtpl = '".Contenido_Security::toInteger($idtpl)."'".
" AND number = '".Contenido_Security::toInteger($container)."' AND ".
" idcontainer = '".Contenido_Security::toInteger($db_autofill->f("idcontainer"))."'";
if ($db_autofill->next_record()) {
$sql = "UPDATE " . $cfg["tab"]["container"] .
" SET idmod = '" . Contenido_Security::toInteger($idmod) . "' WHERE idtpl = '" . Contenido_Security::toInteger($idtpl) . "'" .
" AND number = '" . Contenido_Security::toInteger($container) . "' AND " .
" idcontainer = '" . Contenido_Security::toInteger($db_autofill->f("idcontainer")) . "'";
$db_autofill->query($sql);
} else {
$sql = "INSERT INTO ".$cfg["tab"]["container"].
" (idcontainer, idtpl, number, idmod) ".
" VALUES ('".$db_autofill->nextid($cfg["tab"]["container"])."', ".
$sql = "INSERT INTO " . $cfg["tab"]["container"] .
" (idcontainer, idtpl, number, idmod) " .
" VALUES ('" . $db_autofill->nextid($cfg["tab"]["container"]) . "', " .
" '$idtpl', '$container', '$idmod')";
$db_autofill->query($sql);
}
@ -792,39 +748,35 @@ function tplAutoFillModules ($idtpl)
case "mandatory":
if ($containerinf[$idlay][$container]["default"] != "")
{
$sql = "SELECT idmod FROM ".$cfg["tab"]["mod"]
." WHERE name = '".
Contenido_Security::escapeDB($containerinf[$idlay][$container]["default"], $db)."'";
if ($containerinf[$idlay][$container]["default"] != "") {
$sql = "SELECT idmod FROM " . $cfg["tab"]["mod"]
. " WHERE name = '" .
Contenido_Security::escapeDB($containerinf[$idlay][$container]["default"], $db) . "'";
$db_autofill->query($sql);
if ($db_autofill->next_record())
{
if ($db_autofill->next_record()) {
$idmod = $db_autofill->f("idmod");
$sql = "SELECT idcontainer, idmod FROM ".$cfg["tab"]["container"]
." WHERE idtpl = '".Contenido_Security::toInteger($idtpl)."' AND number = '".Contenido_Security::toInteger($container)."'";
$sql = "SELECT idcontainer, idmod FROM " . $cfg["tab"]["container"]
. " WHERE idtpl = '" . Contenido_Security::toInteger($idtpl) . "' AND number = '" . Contenido_Security::toInteger($container) . "'";
$db_autofill->query($sql);
if ($db_autofill->next_record())
{
if ($db_autofill->next_record()) {
} else {
$sql = "INSERT INTO ".$cfg["tab"]["container"].
" (idcontainer, idtpl, number, idmod) ".
" VALUES ('".Contenido_Security::toInteger($db_autofill->nextid($cfg["tab"]["container"]))."', ".
" '".Contenido_Security::toInteger($idtpl)."', '".Contenido_Security::toInteger($container)."', '".Contenido_Security::toInteger($idmod)."')";
$sql = "INSERT INTO " . $cfg["tab"]["container"] .
" (idcontainer, idtpl, number, idmod) " .
" VALUES ('" . Contenido_Security::toInteger($db_autofill->nextid($cfg["tab"]["container"])) . "', " .
" '" . Contenido_Security::toInteger($idtpl) . "', '" . Contenido_Security::toInteger($container) . "', '" . Contenido_Security::toInteger($idmod) . "')";
$db_autofill->query($sql);
}
}
}
}
}
}
?>

2
conlite/plugins/chains/createmetatags/classes/class.metatag.creator.html5.php
Datei anzeigen

@ -347,7 +347,7 @@ class MetaTagCreatorHtml5 {
*/
protected function _checkCacheFile() {
if(file_exists($this->_sCacheFile)) {
$iDiff = mktime() - filemtime($this->_sCacheFile);
$iDiff = time() - filemtime($this->_sCacheFile);
if($iDiff < $this->_aConfig['cachetime']) {
return true;
}