merge dev_php8 #33
|
@ -21,3 +21,4 @@
|
||||||
/conlite/logs/debug.log
|
/conlite/logs/debug.log
|
||||||
/cms/data/config/production/config.mod_rewrite.php
|
/cms/data/config/production/config.mod_rewrite.php
|
||||||
/cms/data/config/production/config.local.php
|
/cms/data/config/production/config.local.php
|
||||||
|
/cms/cache/*
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
/config.mod_rewrite.php
|
|
@ -242,7 +242,7 @@ $errsite = 'Location: ' . Contenido_Url::getInstance()->buildRedirect($aParams);
|
||||||
* Note: These variables can be set via http globals e.g. front_content.php?idcat=41&idart=34&idcatart=35&idartlang=42
|
* Note: These variables can be set via http globals e.g. front_content.php?idcat=41&idart=34&idcatart=35&idartlang=42
|
||||||
* If not the values will be computed.
|
* If not the values will be computed.
|
||||||
*/
|
*/
|
||||||
if ($idart && !$idcat && !$idcatart) {
|
if (!empty($idart) && empty($idcat) && empty($idcatart)) {
|
||||||
/* Try to fetch the first idcat */
|
/* Try to fetch the first idcat */
|
||||||
$sql = "SELECT idcat FROM " . $cfg["tab"]["cat_art"] . " WHERE idart = '" . Contenido_Security::toInteger($idart) . "'";
|
$sql = "SELECT idcat FROM " . $cfg["tab"]["cat_art"] . " WHERE idart = '" . Contenido_Security::toInteger($idart) . "'";
|
||||||
$db->query($sql);
|
$db->query($sql);
|
||||||
|
@ -411,7 +411,7 @@ if ($cfg["cache"]["disable"] != '1') {
|
||||||
* The reason is to avoid cross-site scripting errors in the backend, if the backend domain differs from
|
* The reason is to avoid cross-site scripting errors in the backend, if the backend domain differs from
|
||||||
* the frontend domain.
|
* the frontend domain.
|
||||||
*/
|
*/
|
||||||
if ($contenido) {
|
if (isset($contenido)) {
|
||||||
$perm->load_permissions();
|
$perm->load_permissions();
|
||||||
|
|
||||||
/* Change mode edit / view */
|
/* Change mode edit / view */
|
||||||
|
@ -527,7 +527,7 @@ if (empty($inUse) && (isset($allow) && $allow == true) && $view == "edit" && ($p
|
||||||
##############################################
|
##############################################
|
||||||
|
|
||||||
/* Mark submenuitem 'Preview' in the Contenido Backend (Area: Contenido --> Articles --> Preview) */
|
/* Mark submenuitem 'Preview' in the Contenido Backend (Area: Contenido --> Articles --> Preview) */
|
||||||
if ($contenido) {
|
if (isset($contenido)) {
|
||||||
$markscript = markSubMenuItem(4, true);
|
$markscript = markSubMenuItem(4, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,294 +1,294 @@
|
||||||
/* Cookies Directive - The rewrite. Now a jQuery plugin
|
/* Cookies Directive - The rewrite. Now a jQuery plugin
|
||||||
* Version: 2.0.1
|
* Version: 2.0.1
|
||||||
* Author: Ollie Phillips
|
* Author: Ollie Phillips test
|
||||||
* 24 October 2013
|
* 24 October 2013
|
||||||
*/
|
*/
|
||||||
|
|
||||||
;(function($) {
|
;(function($) {
|
||||||
$.cookiesDirective = function(options) {
|
$.cookiesDirective = function(options) {
|
||||||
|
|
||||||
// Default Cookies Directive Settings
|
// Default Cookies Directive Settings
|
||||||
var settings = $.extend({
|
var settings = $.extend({
|
||||||
//Options
|
//Options
|
||||||
explicitConsent: true,
|
explicitConsent: true,
|
||||||
position: 'top',
|
position: 'top',
|
||||||
duration: 10,
|
duration: 10,
|
||||||
limit: 0,
|
limit: 0,
|
||||||
message: null,
|
message: null,
|
||||||
cookieScripts: null,
|
cookieScripts: null,
|
||||||
privacyPolicyUri: 'privacy.html',
|
privacyPolicyUri: 'privacy.html',
|
||||||
inlineAction: false,
|
inlineAction: false,
|
||||||
scriptWrapper: function(){},
|
scriptWrapper: function(){},
|
||||||
// Styling
|
// Styling
|
||||||
fontFamily: 'helvetica',
|
fontFamily: 'helvetica',
|
||||||
fontColor: '#FFFFFF',
|
fontColor: '#FFFFFF',
|
||||||
fontSize: '13px',
|
fontSize: '13px',
|
||||||
backgroundColor: '#000000',
|
backgroundColor: '#000000',
|
||||||
backgroundOpacity: '80',
|
backgroundOpacity: '80',
|
||||||
linkColor: '#CA0000',
|
linkColor: '#CA0000',
|
||||||
// Messages
|
// Messages
|
||||||
multipleCookieScriptBeginningLabel: ' We use ',
|
multipleCookieScriptBeginningLabel: ' We use ',
|
||||||
and: ' and ',
|
and: ' and ',
|
||||||
multipleCookieScriptEndLabel: ' scripts, which all set cookies. ',
|
multipleCookieScriptEndLabel: ' scripts, which all set cookies. ',
|
||||||
singleCookieScriptBeginningLabel: ' We use a ',
|
singleCookieScriptBeginningLabel: ' We use a ',
|
||||||
singleCookieScriptEndLabel: ' script which sets cookies.',
|
singleCookieScriptEndLabel: ' script which sets cookies.',
|
||||||
explicitCookieDeletionWarning: 'You may delete and block all cookies from this site, but parts of the site will not work.',
|
explicitCookieDeletionWarning: 'You may delete and block all cookies from this site, but parts of the site will not work.',
|
||||||
explicitFindOutMore: 'To find out more about cookies on this website, see our',
|
explicitFindOutMore: 'To find out more about cookies on this website, see our',
|
||||||
privacyPolicyLinkText: ' privacy policy',
|
privacyPolicyLinkText: ' privacy policy',
|
||||||
explicitCheckboxLabel: 'You must tick the "I accept cookies from this site" box to accept',
|
explicitCheckboxLabel: 'You must tick the "I accept cookies from this site" box to accept',
|
||||||
explicitCookieAcceptanceLabel: 'I accept cookies from this site',
|
explicitCookieAcceptanceLabel: 'I accept cookies from this site',
|
||||||
explicitCookieAcceptButtonText: 'Continue',
|
explicitCookieAcceptButtonText: 'Continue',
|
||||||
impliedDisclosureText: ' More details can be found in our',
|
impliedDisclosureText: ' More details can be found in our',
|
||||||
impliedSubmitText: 'Do not show this message again',
|
impliedSubmitText: 'Do not show this message again',
|
||||||
}, options);
|
}, options);
|
||||||
|
|
||||||
// Perform consent checks
|
// Perform consent checks
|
||||||
if(!getCookie('cookiesDirective')) {
|
if(!getCookie('cookiesDirective')) {
|
||||||
if(settings.limit > 0) {
|
if(settings.limit > 0) {
|
||||||
// Display limit in force, record the view
|
// Display limit in force, record the view
|
||||||
if(!getCookie('cookiesDisclosureCount')) {
|
if(!getCookie('cookiesDisclosureCount')) {
|
||||||
setCookie('cookiesDisclosureCount',1,1);
|
setCookie('cookiesDisclosureCount',1,1);
|
||||||
} else {
|
} else {
|
||||||
var disclosureCount = getCookie('cookiesDisclosureCount');
|
var disclosureCount = getCookie('cookiesDisclosureCount');
|
||||||
disclosureCount ++;
|
disclosureCount ++;
|
||||||
setCookie('cookiesDisclosureCount',disclosureCount,1);
|
setCookie('cookiesDisclosureCount',disclosureCount,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Have we reached the display limit, if not make disclosure
|
// Have we reached the display limit, if not make disclosure
|
||||||
if(settings.limit >= getCookie('cookiesDisclosureCount')) {
|
if(settings.limit >= getCookie('cookiesDisclosureCount')) {
|
||||||
disclosure(settings);
|
disclosure(settings);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// No display limit
|
// No display limit
|
||||||
disclosure(settings);
|
disclosure(settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If we don't require explicit consent, load up our script wrapping function
|
// If we don't require explicit consent, load up our script wrapping function
|
||||||
if(!settings.explicitConsent) {
|
if(!settings.explicitConsent) {
|
||||||
settings.scriptWrapper.call();
|
settings.scriptWrapper.call();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Cookies accepted, load script wrapping function
|
// Cookies accepted, load script wrapping function
|
||||||
settings.scriptWrapper.call();
|
settings.scriptWrapper.call();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Used to load external javascript files into the DOM
|
// Used to load external javascript files into the DOM
|
||||||
$.cookiesDirective.loadScript = function(options) {
|
$.cookiesDirective.loadScript = function(options) {
|
||||||
var settings = $.extend({
|
var settings = $.extend({
|
||||||
uri: '',
|
uri: '',
|
||||||
appendTo: 'body'
|
appendTo: 'body'
|
||||||
}, options);
|
}, options);
|
||||||
|
|
||||||
var elementId = String(settings.appendTo);
|
var elementId = String(settings.appendTo);
|
||||||
var sA = document.createElement("script");
|
var sA = document.createElement("script");
|
||||||
sA.src = settings.uri;
|
sA.src = settings.uri;
|
||||||
sA.type = "text/javascript";
|
sA.type = "text/javascript";
|
||||||
sA.onload = sA.onreadystatechange = function() {
|
sA.onload = sA.onreadystatechange = function() {
|
||||||
if ((!sA.readyState || sA.readyState == "loaded" || sA.readyState == "complete")) {
|
if ((!sA.readyState || sA.readyState == "loaded" || sA.readyState == "complete")) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
switch(settings.appendTo) {
|
switch(settings.appendTo) {
|
||||||
case 'head':
|
case 'head':
|
||||||
$('head').append(sA);
|
$('head').append(sA);
|
||||||
break;
|
break;
|
||||||
case 'body':
|
case 'body':
|
||||||
$('body').append(sA);
|
$('body').append(sA);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$('#' + elementId).append(sA);
|
$('#' + elementId).append(sA);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Helper scripts
|
// Helper scripts
|
||||||
// Get cookie
|
// Get cookie
|
||||||
var getCookie = function(name) {
|
var getCookie = function(name) {
|
||||||
var nameEQ = name + "=";
|
var nameEQ = name + "=";
|
||||||
var ca = document.cookie.split(';');
|
var ca = document.cookie.split(';');
|
||||||
for(var i=0;i < ca.length;i++) {
|
for(var i=0;i < ca.length;i++) {
|
||||||
var c = ca[i];
|
var c = ca[i];
|
||||||
while (c.charAt(0)==' ') c = c.substring(1,c.length);
|
while (c.charAt(0)==' ') c = c.substring(1,c.length);
|
||||||
if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
|
if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set cookie
|
// Set cookie
|
||||||
var setCookie = function(name,value,days) {
|
var setCookie = function(name,value,days) {
|
||||||
if (days) {
|
if (days) {
|
||||||
var date = new Date();
|
var date = new Date();
|
||||||
date.setTime(date.getTime()+(days*24*60*60*1000));
|
date.setTime(date.getTime()+(days*24*60*60*1000));
|
||||||
var expires = "; expires="+date.toGMTString();
|
var expires = "; expires="+date.toGMTString();
|
||||||
}
|
}
|
||||||
else var expires = "";
|
else var expires = "";
|
||||||
document.cookie = name+"="+value+expires+"; path=/";
|
document.cookie = name+"="+value+expires+"; path=/";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detect IE < 9
|
// Detect IE < 9
|
||||||
var checkIE = function(){
|
var checkIE = function(){
|
||||||
var version;
|
var version;
|
||||||
if (navigator.appName == 'Microsoft Internet Explorer') {
|
if (navigator.appName == 'Microsoft Internet Explorer') {
|
||||||
var ua = navigator.userAgent;
|
var ua = navigator.userAgent;
|
||||||
var re = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})");
|
var re = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})");
|
||||||
if (re.exec(ua) != null) {
|
if (re.exec(ua) != null) {
|
||||||
version = parseFloat(RegExp.$1);
|
version = parseFloat(RegExp.$1);
|
||||||
}
|
}
|
||||||
if (version <= 8.0) {
|
if (version <= 8.0) {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
if(version == 9.0) {
|
if(version == 9.0) {
|
||||||
if(document.compatMode == "BackCompat") {
|
if(document.compatMode == "BackCompat") {
|
||||||
// IE9 in quirks mode won't run the script properly, set to emulate IE8
|
// IE9 in quirks mode won't run the script properly, set to emulate IE8
|
||||||
var mA = document.createElement("meta");
|
var mA = document.createElement("meta");
|
||||||
mA.content = "IE=EmulateIE8";
|
mA.content = "IE=EmulateIE8";
|
||||||
document.getElementsByTagName('head')[0].appendChild(mA);
|
document.getElementsByTagName('head')[0].appendChild(mA);
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disclosure routines
|
// Disclosure routines
|
||||||
var disclosure = function(options) {
|
var disclosure = function(options) {
|
||||||
var settings = options;
|
var settings = options;
|
||||||
settings.css = 'fixed';
|
settings.css = 'fixed';
|
||||||
|
|
||||||
// IE 9 and lower has issues with position:fixed, either out the box or in compatibility mode - fix that
|
// IE 9 and lower has issues with position:fixed, either out the box or in compatibility mode - fix that
|
||||||
if(checkIE()) {
|
if(checkIE()) {
|
||||||
settings.position = 'top';
|
settings.position = 'top';
|
||||||
settings.css = 'absolute';
|
settings.css = 'absolute';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Any cookie setting scripts to disclose
|
// Any cookie setting scripts to disclose
|
||||||
var scriptsDisclosure = '';
|
var scriptsDisclosure = '';
|
||||||
if (settings.cookieScripts) {
|
if (settings.cookieScripts) {
|
||||||
var scripts = settings.cookieScripts.split(',');
|
var scripts = settings.cookieScripts.split(',');
|
||||||
var scriptsCount = scripts.length;
|
var scriptsCount = scripts.length;
|
||||||
var scriptDisclosureTxt = '';
|
var scriptDisclosureTxt = '';
|
||||||
if(scriptsCount>1) {
|
if(scriptsCount>1) {
|
||||||
for(var t=0; t < scriptsCount - 1; t++) {
|
for(var t=0; t < scriptsCount - 1; t++) {
|
||||||
scriptDisclosureTxt += scripts[t] + ', ';
|
scriptDisclosureTxt += scripts[t] + ', ';
|
||||||
}
|
}
|
||||||
|
|
||||||
scriptsDisclosure = settings.multipleCookieScriptBeginningLabel + scriptDisclosureTxt.substring(0, scriptDisclosureTxt.length - 2) + settings.and + scripts[scriptsCount - 1] + settings.multipleCookieScriptEndLabel;
|
scriptsDisclosure = settings.multipleCookieScriptBeginningLabel + scriptDisclosureTxt.substring(0, scriptDisclosureTxt.length - 2) + settings.and + scripts[scriptsCount - 1] + settings.multipleCookieScriptEndLabel;
|
||||||
} else {
|
} else {
|
||||||
scriptsDisclosure = setting.singleCookieScriptBeginningLabel + scripts[0] + settings.singleCookieScriptEndLabel;
|
scriptsDisclosure = setting.singleCookieScriptBeginningLabel + scripts[0] + settings.singleCookieScriptEndLabel;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create overlay, vary the disclosure based on explicit/implied consent
|
// Create overlay, vary the disclosure based on explicit/implied consent
|
||||||
// Set our disclosure/message if one not supplied
|
// Set our disclosure/message if one not supplied
|
||||||
var html = '';
|
var html = '';
|
||||||
html += '<div id="epd">';
|
html += '<div id="epd">';
|
||||||
html += '<div id="cookiesdirective" style="position:'+ settings.css +';'+ settings.position + ':-300px;left:0px;width:100%;'
|
html += '<div id="cookiesdirective" style="position:'+ settings.css +';'+ settings.position + ':-300px;left:0px;width:100%;'
|
||||||
html += 'height:auto;background:' + settings.backgroundColor + ';opacity:.' + settings.backgroundOpacity + ';';
|
html += 'height:auto;background:' + settings.backgroundColor + ';opacity:.' + settings.backgroundOpacity + ';';
|
||||||
html += '-ms-filter: “alpha(opacity=' + settings.backgroundOpacity + ')”; filter: alpha(opacity=' + settings.backgroundOpacity + ');';
|
html += '-ms-filter: “alpha(opacity=' + settings.backgroundOpacity + ')”; filter: alpha(opacity=' + settings.backgroundOpacity + ');';
|
||||||
html += '-khtml-opacity: .' + settings.backgroundOpacity + '; -moz-opacity: .' + settings.backgroundOpacity + ';';
|
html += '-khtml-opacity: .' + settings.backgroundOpacity + '; -moz-opacity: .' + settings.backgroundOpacity + ';';
|
||||||
html += 'color:' + settings.fontColor + ';font-family:' + settings.fontFamily + ';font-size:' + settings.fontSize + ';';
|
html += 'color:' + settings.fontColor + ';font-family:' + settings.fontFamily + ';font-size:' + settings.fontSize + ';';
|
||||||
html += 'text-align:center;z-index:1000;">';
|
html += 'text-align:center;z-index:1000;">';
|
||||||
html += '<div style="position:relative;height:auto;width:90%;padding:10px;margin-left:auto;margin-right:auto;">';
|
html += '<div style="position:relative;height:auto;width:90%;padding:10px;margin-left:auto;margin-right:auto;">';
|
||||||
|
|
||||||
if(!settings.message) {
|
if(!settings.message) {
|
||||||
if(settings.explicitConsent) {
|
if(settings.explicitConsent) {
|
||||||
// Explicit consent message
|
// Explicit consent message
|
||||||
settings.message = 'This site uses cookies. Some of the cookies we ';
|
settings.message = 'This site uses cookies. Some of the cookies we ';
|
||||||
settings.message += 'use are essential for parts of the site to operate and have already been set.';
|
settings.message += 'use are essential for parts of the site to operate and have already been set.';
|
||||||
} else {
|
} else {
|
||||||
// Implied consent message
|
// Implied consent message
|
||||||
settings.message = 'We have placed cookies on your computer to help make this website better.';
|
settings.message = 'We have placed cookies on your computer to help make this website better.';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
html += settings.message;
|
html += settings.message;
|
||||||
|
|
||||||
// Build the rest of the disclosure for implied and explicit consent
|
// Build the rest of the disclosure for implied and explicit consent
|
||||||
if(settings.explicitConsent) {
|
if(settings.explicitConsent) {
|
||||||
// Explicit consent disclosure
|
// Explicit consent disclosure
|
||||||
html += scriptsDisclosure + settings.explicitCookieDeletionWarning;
|
html += scriptsDisclosure + settings.explicitCookieDeletionWarning;
|
||||||
html += settings.explicitFindOutMore + '<a style="color:'+ settings.linkColor + ';font-weight:bold;';
|
html += settings.explicitFindOutMore + '<a style="color:'+ settings.linkColor + ';font-weight:bold;';
|
||||||
html += 'font-family:' + settings.fontFamily + ';font-size:' + settings.fontSize + ';" href="'+ settings.privacyPolicyUri + '">'+ settings.privacyPolicyLinkText +'</a>.';
|
html += 'font-family:' + settings.fontFamily + ';font-size:' + settings.fontSize + ';" href="'+ settings.privacyPolicyUri + '">'+ settings.privacyPolicyLinkText +'</a>.';
|
||||||
html += '<div id="epdnotick" style="color:#ca0000;display:none;margin:2px;"><span style="background:#cecece;padding:2px;">' + settings.explicitCheckboxLabel + '</span></div>'
|
html += '<div id="epdnotick" style="color:#ca0000;display:none;margin:2px;"><span style="background:#cecece;padding:2px;">' + settings.explicitCheckboxLabel + '</span></div>'
|
||||||
html += '<div style="margin-top:5px;';
|
html += '<div style="margin-top:5px;';
|
||||||
if(settings.inlineAction) {
|
if(settings.inlineAction) {
|
||||||
html += 'display:inline-block;margin-left:5px';
|
html += 'display:inline-block;margin-left:5px';
|
||||||
}
|
}
|
||||||
html += '">' + settings.explicitCookieAcceptanceLabel + '<input type="checkbox" name="epdagree" id="epdagree" /> ';
|
html += '">' + settings.explicitCookieAcceptanceLabel + '<input type="checkbox" name="epdagree" id="epdagree" /> ';
|
||||||
html += '<input type="submit" name="explicitsubmit" id="explicitsubmit" value="' + settings.explicitCookieAcceptButtonText + '"/><br/></div></div>';
|
html += '<input type="submit" name="explicitsubmit" id="explicitsubmit" value="' + settings.explicitCookieAcceptButtonText + '"/><br/></div></div>';
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Implied consent disclosure
|
// Implied consent disclosure
|
||||||
html += scriptsDisclosure + settings.impliedDisclosureText + ' <a style="color:'+ settings.linkColor + ';';
|
html += scriptsDisclosure + settings.impliedDisclosureText + ' <a style="color:'+ settings.linkColor + ';';
|
||||||
html += 'font-weight:bold;font-family:' + settings.fontFamily + ';font-size:' + settings.fontSize + ';" href="'+ settings.privacyPolicyUri + '">' + settings.privacyPolicyLinkText + '</a>.';
|
html += 'font-weight:bold;font-family:' + settings.fontFamily + ';font-size:' + settings.fontSize + ';" href="'+ settings.privacyPolicyUri + '">' + settings.privacyPolicyLinkText + '</a>.';
|
||||||
html += '<div style="margin-top:5px;';
|
html += '<div style="margin-top:5px;';
|
||||||
if(settings.inlineAction) {
|
if(settings.inlineAction) {
|
||||||
html += 'display:inline-block;margin-left:5px';
|
html += 'display:inline-block;margin-left:5px';
|
||||||
}
|
}
|
||||||
html += '"><input type="submit" name="impliedsubmit" id="impliedsubmit" value="' + settings.impliedSubmitText + '"/></div></div>';
|
html += '"><input type="submit" name="impliedsubmit" id="impliedsubmit" value="' + settings.impliedSubmitText + '"/></div></div>';
|
||||||
}
|
}
|
||||||
html += '</div></div>';
|
html += '</div></div>';
|
||||||
$('body').append(html);
|
$('body').append(html);
|
||||||
|
|
||||||
// Serve the disclosure, and be smarter about branching
|
// Serve the disclosure, and be smarter about branching
|
||||||
var dp = settings.position.toLowerCase();
|
var dp = settings.position.toLowerCase();
|
||||||
if(dp != 'top' && dp!= 'bottom') {
|
if(dp != 'top' && dp!= 'bottom') {
|
||||||
dp = 'top';
|
dp = 'top';
|
||||||
}
|
}
|
||||||
var opts = new Array();
|
var opts = new Array();
|
||||||
if(dp == 'top') {
|
if(dp == 'top') {
|
||||||
opts['in'] = {'top':'0'};
|
opts['in'] = {'top':'0'};
|
||||||
opts['out'] = {'top':'-300'};
|
opts['out'] = {'top':'-300'};
|
||||||
} else {
|
} else {
|
||||||
opts['in'] = {'bottom':'0'};
|
opts['in'] = {'bottom':'0'};
|
||||||
opts['out'] = {'bottom':'-300'};
|
opts['out'] = {'bottom':'-300'};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start animation
|
// Start animation
|
||||||
$('#cookiesdirective').animate(opts['in'], 1000, function() {
|
$('#cookiesdirective').animate(opts['in'], 1000, function() {
|
||||||
// Set event handlers depending on type of disclosure
|
// Set event handlers depending on type of disclosure
|
||||||
if(settings.explicitConsent) {
|
if(settings.explicitConsent) {
|
||||||
// Explicit, need to check a box and click a button
|
// Explicit, need to check a box and click a button
|
||||||
$('#explicitsubmit').click(function() {
|
$('#explicitsubmit').click(function() {
|
||||||
if($('#epdagree').is(':checked')) {
|
if($('#epdagree').is(':checked')) {
|
||||||
// Set a cookie to prevent this being displayed again
|
// Set a cookie to prevent this being displayed again
|
||||||
setCookie('cookiesDirective',1,365);
|
setCookie('cookiesDirective',1,365);
|
||||||
// Close the overlay
|
// Close the overlay
|
||||||
$('#cookiesdirective').animate(opts['out'],1000,function() {
|
$('#cookiesdirective').animate(opts['out'],1000,function() {
|
||||||
// Remove the elements from the DOM and reload page
|
// Remove the elements from the DOM and reload page
|
||||||
$('#cookiesdirective').remove();
|
$('#cookiesdirective').remove();
|
||||||
location.reload(true);
|
location.reload(true);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// We need the box checked we want "explicit consent", display message
|
// We need the box checked we want "explicit consent", display message
|
||||||
$('#epdnotick').css('display', 'block');
|
$('#epdnotick').css('display', 'block');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// Implied consent, just a button to close it
|
// Implied consent, just a button to close it
|
||||||
$('#impliedsubmit').click(function() {
|
$('#impliedsubmit').click(function() {
|
||||||
// Set a cookie to prevent this being displayed again
|
// Set a cookie to prevent this being displayed again
|
||||||
setCookie('cookiesDirective',1,365);
|
setCookie('cookiesDirective',1,365);
|
||||||
// Close the overlay
|
// Close the overlay
|
||||||
$('#cookiesdirective').animate(opts['out'],1000,function() {
|
$('#cookiesdirective').animate(opts['out'],1000,function() {
|
||||||
// Remove the elements from the DOM and reload page
|
// Remove the elements from the DOM and reload page
|
||||||
$('#cookiesdirective').remove();
|
$('#cookiesdirective').remove();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set a timer to remove the warning after 'settings.duration' seconds
|
// Set a timer to remove the warning after 'settings.duration' seconds
|
||||||
setTimeout(function(){
|
setTimeout(function(){
|
||||||
$('#cookiesdirective').animate({
|
$('#cookiesdirective').animate({
|
||||||
opacity:'0'
|
opacity:'0'
|
||||||
},2000, function(){
|
},2000, function(){
|
||||||
$('#cookiesdirective').css(dp,'-300px');
|
$('#cookiesdirective').css(dp,'-300px');
|
||||||
});
|
});
|
||||||
}, settings.duration * 1000);
|
}, settings.duration * 1000);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
})(jQuery);
|
})(jQuery);
|
||||||
|
|
|
@ -330,13 +330,9 @@ if( sizeof($_GET) == 0 && isset($_POST['save_search']) )
|
||||||
// STORED SEARCH HAS BEEN CALLED
|
// STORED SEARCH HAS BEEN CALLED
|
||||||
elseif( sizeof($_GET) > 0)
|
elseif( sizeof($_GET) > 0)
|
||||||
{
|
{
|
||||||
$itemtypeReq = $_GET['itemtype'];
|
$itemtypeReq = (isset($itemtypeReq))?$_GET['itemtype']:'';
|
||||||
$itemidReq = $_GET['itemid'];
|
$itemidReq = (isset($itemidReq))?$_GET['itemid']:'';
|
||||||
// Do we have the request parameters we need to fetch search values of stored search ?
|
if(strlen($itemtypeReq) > 0 && strlen($itemidReq) > 0) {
|
||||||
if( (isset($itemtypeReq) && strlen($itemtypeReq)>0) &&
|
|
||||||
(isset($itemidReq) && strlen($itemidReq)>0)
|
|
||||||
)
|
|
||||||
{
|
|
||||||
$searchResults = getSearchResults($itemidReq, $itemtypeReq);
|
$searchResults = getSearchResults($itemidReq, $itemtypeReq);
|
||||||
$sSearchStr_tmp = $searchResults[$save_title];
|
$sSearchStr_tmp = $searchResults[$save_title];
|
||||||
$iSearchID_tmp = $searchResults[$save_id];
|
$iSearchID_tmp = $searchResults[$save_id];
|
||||||
|
@ -403,13 +399,13 @@ if ($iSearchID_tmp > 0) {
|
||||||
}
|
}
|
||||||
// Date
|
// Date
|
||||||
if ($sSearchStrDateType_tmp != 'n/a') {
|
if ($sSearchStrDateType_tmp != 'n/a') {
|
||||||
if (($sSearchStrDateFromDay_tmp > 0) && ($sSearchStrDateFromMonth_tmp > 0) && ($sSearchStrDateFromYear_tmp > 0)) {
|
if (!empty($sSearchStrDateFromDay_tmp) && !empty($sSearchStrDateFromMonth_tmp) && !empty($sSearchStrDateFromYear_tmp)) {
|
||||||
$sSearchStrDateFrom = $sSearchStrDateFromYear_tmp.'-'.$sSearchStrDateFromMonth_tmp.'-'.$sSearchStrDateFromDay_tmp.' 00:00:00';
|
$sSearchStrDateFrom = $sSearchStrDateFromYear_tmp.'-'.$sSearchStrDateFromMonth_tmp.'-'.$sSearchStrDateFromDay_tmp.' 00:00:00';
|
||||||
} else {
|
} else {
|
||||||
$sSearchStrDateFrom = '';
|
$sSearchStrDateFrom = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($sSearchStrDateToDay_tmp > 0) && ($sSearchStrDateToMonth_tmp > 0) && ($sSearchStrDateToYear_tmp > 0)) {
|
if (!empty($sSearchStrDateToDay_tmp) && !empty($sSearchStrDateToMonth_tmp) && !empty($sSearchStrDateToYear_tmp)) {
|
||||||
$sSearchStrDateTo = $sSearchStrDateToYear_tmp.'-'.$sSearchStrDateToMonth_tmp.'-'.$sSearchStrDateToDay_tmp.' 23:59:59';
|
$sSearchStrDateTo = $sSearchStrDateToYear_tmp.'-'.$sSearchStrDateToMonth_tmp.'-'.$sSearchStrDateToDay_tmp.' 23:59:59';
|
||||||
} else {
|
} else {
|
||||||
$sSearchStrDateTo = '';
|
$sSearchStrDateTo = '';
|
||||||
|
@ -623,7 +619,9 @@ if (empty($where) || $iAffectedRows <= 0) {
|
||||||
// fuer den ersten gefundenen Artikel die Werte fuer CategoryID und TemplateID merken
|
// fuer den ersten gefundenen Artikel die Werte fuer CategoryID und TemplateID merken
|
||||||
if ($i == 0) {
|
if ($i == 0) {
|
||||||
$iIDCat = $idcat;
|
$iIDCat = $idcat;
|
||||||
$iIDTpl = $idtpl;
|
if(!empty($idtpl)) {
|
||||||
|
$iIDTpl = $idtpl;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Funktion zum umwandeln in Startartikel/normale Artikel*/
|
/* Funktion zum umwandeln in Startartikel/normale Artikel*/
|
||||||
|
@ -637,8 +635,10 @@ if (empty($where) || $iAffectedRows <= 0) {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if( $startidartlang == $idartlang ) {
|
if( $startidartlang == $idartlang ) {
|
||||||
|
$sFlagTitle = i18n('Flag as normal article');
|
||||||
$makeStartarticle = "<td nowrap=\"nowrap\" class=\"bordercell\"><img src=\"images/isstart1.gif\" border=\"0\" title=\"{$sFlagTitle}\" alt=\"{$sFlagTitle}\"></td>";
|
$makeStartarticle = "<td nowrap=\"nowrap\" class=\"bordercell\"><img src=\"images/isstart1.gif\" border=\"0\" title=\"{$sFlagTitle}\" alt=\"{$sFlagTitle}\"></td>";
|
||||||
} else {
|
} else {
|
||||||
|
$sFlagTitle = i18n('Flag as start article');
|
||||||
$makeStartarticle = "<td nowrap=\"nowrap\" class=\"bordercell\"><img src=\"images/isstart0.gif\" border=\"0\" title=\"{$sFlagTitle}\" alt=\"{$sFlagTitle}\"></td>";
|
$makeStartarticle = "<td nowrap=\"nowrap\" class=\"bordercell\"><img src=\"images/isstart0.gif\" border=\"0\" title=\"{$sFlagTitle}\" alt=\"{$sFlagTitle}\"></td>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -703,7 +703,7 @@ if (empty($where) || $iAffectedRows <= 0) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($perm->have_perm_area_action_item("con", "con_deleteart",$idcat)) {
|
if ($perm->have_perm_area_action_item("con", "con_deleteart",$idcat)) {
|
||||||
$delete = "<a href=\"javascript://\" onclick=\"box.confirm("$sDeleteArticle", "$sDeleteArticleQuestion:<br><br><b>$db->f('title')</b>", "deleteArticle($idart,$idcat)")\" title=\"$sDeleteArticle\"><img src=\"images/delete.gif\" title=\"$sDeleteArticle\" alt=\"$sDeleteArticle\" border=\"0\"></a>";
|
$delete = "<a href=\"javascript://\" onclick=\"box.confirm("$sDeleteArticle", "$sDeleteArticleQuestion:<br><br><b>".$db->f('title')."</b>", "deleteArticle($idart,$idcat)")\" title=\"$sDeleteArticle\"><img src=\"images/delete.gif\" title=\"$sDeleteArticle\" alt=\"$sDeleteArticle\" border=\"0\"></a>";
|
||||||
}else {
|
}else {
|
||||||
$delete = "";
|
$delete = "";
|
||||||
}
|
}
|
||||||
|
@ -717,8 +717,6 @@ if (empty($where) || $iAffectedRows <= 0) {
|
||||||
<td nowrap=\"nowrap\" class=\"bordercell\">$sTemplateName</td>
|
<td nowrap=\"nowrap\" class=\"bordercell\">$sTemplateName</td>
|
||||||
<td nowrap=\"nowrap\" class=\"bordercell\">
|
<td nowrap=\"nowrap\" class=\"bordercell\">
|
||||||
<a id=\"m1\" onclick=\"javascript:window.open('main.php?subject=$todoListeSubject&area=todo&frame=1&itemtype=idart&itemid=$idart&contenido=$sSession', 'todo', 'scrollbars=yes, height=300, width=550');\" alt=\"$sReminder\" title=\"$sReminder\" href=\"#\"><img id=\"m2\" style=\"padding-left: 2px; padding-right: 2px;\" alt=\"$sReminder\" src=\"images/but_setreminder.gif\" border=\"0\"></a>
|
<a id=\"m1\" onclick=\"javascript:window.open('main.php?subject=$todoListeSubject&area=todo&frame=1&itemtype=idart&itemid=$idart&contenido=$sSession', 'todo', 'scrollbars=yes, height=300, width=550');\" alt=\"$sReminder\" title=\"$sReminder\" href=\"#\"><img id=\"m2\" style=\"padding-left: 2px; padding-right: 2px;\" alt=\"$sReminder\" src=\"images/but_setreminder.gif\" border=\"0\"></a>
|
||||||
$properties
|
|
||||||
$tplconfig
|
|
||||||
$duplicate
|
$duplicate
|
||||||
$delete
|
$delete
|
||||||
</td>
|
</td>
|
||||||
|
@ -746,7 +744,7 @@ if (empty($where) || $iAffectedRows <= 0) {
|
||||||
# Save Search Parameters
|
# Save Search Parameters
|
||||||
###########################
|
###########################
|
||||||
|
|
||||||
if($bHit && sizeof($_GET) == 0 && isset($_POST) ) {
|
if(!empty($bHit) && sizeof($_GET) == 0 && isset($_POST) ) {
|
||||||
// Build form with hidden fields that contain all search parameters to be stored using generic db
|
// Build form with hidden fields that contain all search parameters to be stored using generic db
|
||||||
$searchForm = '<form id="save_search" target="right_bottom" method="post" action="backend_search.php">';
|
$searchForm = '<form id="save_search" target="right_bottom" method="post" action="backend_search.php">';
|
||||||
// Meta for Contenido
|
// Meta for Contenido
|
||||||
|
|
|
@ -247,9 +247,11 @@ class Article extends Item
|
||||||
* @param string Property name
|
* @param string Property name
|
||||||
* @return mixed Property value
|
* @return mixed Property value
|
||||||
*/
|
*/
|
||||||
public function getField($name)
|
public function getField($name) {
|
||||||
{
|
if(!is_null($name) && !empty($this->values[$name])) {
|
||||||
return urldecode($this->values[$name]);
|
return urldecode($this->values[$name]);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -7,9 +7,6 @@
|
||||||
* Description:
|
* Description:
|
||||||
* Contenido XML Parser
|
* Contenido XML Parser
|
||||||
*
|
*
|
||||||
* Requirements:
|
|
||||||
* @con_php_req 5.0
|
|
||||||
*
|
|
||||||
*
|
*
|
||||||
* @package Contenido_XML
|
* @package Contenido_XML
|
||||||
* @version 1.0.9
|
* @version 1.0.9
|
||||||
|
@ -19,79 +16,17 @@
|
||||||
* @link http://www.4fb.de
|
* @link http://www.4fb.de
|
||||||
* @link http://www.contenido.org
|
* @link http://www.contenido.org
|
||||||
* @since file available since contenido release <= 4.6
|
* @since file available since contenido release <= 4.6
|
||||||
*
|
|
||||||
* {@internal
|
|
||||||
* created unknown
|
|
||||||
* modified 2008-06-30, Dominik Ziegler, add security fix
|
|
||||||
*
|
|
||||||
* $Id$:
|
|
||||||
* }}
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (!defined('CON_FRAMEWORK')) {
|
if (!defined('CON_FRAMEWORK')) {
|
||||||
die('Illegal call');
|
die('Illegal call');
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
/**
|
|
||||||
* Class for parsing XML documents using SAX
|
|
||||||
*
|
|
||||||
* This class is a abstraction class for the PHP Expat XML functions.
|
|
||||||
*
|
|
||||||
* You can define handler functions/objects for start, end, PI and data sections (1.) or
|
|
||||||
* your can define path which will trigger the defined event when encountered (2.)
|
|
||||||
*
|
|
||||||
* Example:
|
|
||||||
*
|
|
||||||
* 1.) $parser->setEvents(array("startElement"=> "myFunction",
|
|
||||||
* "endElement"=> "myFunction",
|
|
||||||
* "characterData"=> "myFunction",
|
|
||||||
* "processingInstruction" => "myFunction");
|
|
||||||
*
|
|
||||||
* The value can also be an array with the object reference and the method to call.
|
|
||||||
* i.e. "startElement"=>array(&$myObj, "myMethod") instead of "startelement"=>"myFunction"
|
|
||||||
*
|
|
||||||
* 2.) $parser->setEvents(array("/root/foo/bar"=>"myFunction"));
|
|
||||||
*
|
|
||||||
* Valid array keys are: 'startElement', 'endElement', 'characterData', 'processingInstruction' and paths
|
|
||||||
* folowing the scheme '/root/element'. The path MUST begin from the root element and MUST start with '/'.
|
|
||||||
*
|
|
||||||
* The value can also be an array with the object reference and the method to call.
|
|
||||||
* i.e. "/foo/bar"=>array(&$myObj, "myMethod") instead of "/foo/bar"=>"myFunction"
|
|
||||||
*
|
|
||||||
* It has 3 public methods:
|
|
||||||
*
|
|
||||||
* setEventHandlers - Set specific handlers for the xml parser
|
|
||||||
* parseFile - Used to parse a XML file
|
|
||||||
* parse - Used to parse a XML string
|
|
||||||
*
|
|
||||||
* A small example:
|
|
||||||
*
|
|
||||||
* include ("class.xmlparser.php");
|
|
||||||
*
|
|
||||||
* // The XML String
|
|
||||||
* $xml = '
|
|
||||||
* <?xml version="1.0"?>
|
|
||||||
* <foo>
|
|
||||||
* <bar>some text</bar>
|
|
||||||
* <bar>another text</bar>
|
|
||||||
* </foo>';
|
|
||||||
*
|
|
||||||
* function myHandler($name, $attribs, $content)
|
|
||||||
* {
|
|
||||||
* echo "<b style='color:red'>HIT</b>: [ <b>$name</b> ] [ $content ]<br/>";
|
|
||||||
* }
|
|
||||||
*
|
|
||||||
* $parser = new XmlParser; // Parser instance
|
|
||||||
* $parser->setEventHandlers(array("/foo/bar"=>"myHandler")); // Define our handler
|
|
||||||
* $parser->parse($xml); // Parse the XML string
|
|
||||||
*
|
|
||||||
* Report bugs to: jan.lengowski@4fb.de
|
|
||||||
*
|
|
||||||
* @author Jan Lengowski <Jan.Lengowski@4fb.de>
|
* @author Jan Lengowski <Jan.Lengowski@4fb.de>
|
||||||
* @copyright four for business AG <www.4fb.de>
|
* @copyright four for business AG <www.4fb.de>
|
||||||
* @version 1.0
|
* @version 1.0
|
||||||
*/
|
*/
|
||||||
class XmlParser {
|
class clXmlParser {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* XML Parser autofree
|
* XML Parser autofree
|
|
@ -119,7 +119,8 @@ class cApiModule extends Item {
|
||||||
* @param mixed $mId Specifies the ID of item to load
|
* @param mixed $mId Specifies the ID of item to load
|
||||||
*/
|
*/
|
||||||
public function __construct($mId = false) {
|
public function __construct($mId = false) {
|
||||||
global $cfg, $cfgClient, $client;
|
$cfg = cRegistry::getConfig();
|
||||||
|
$cfgClient = cRegistry::getClientConfig(cRegistry::getClientId());
|
||||||
|
|
||||||
parent::__construct($cfg["tab"]["mod"], "idmod");
|
parent::__construct($cfg["tab"]["mod"], "idmod");
|
||||||
|
|
||||||
|
@ -129,20 +130,22 @@ class cApiModule extends Item {
|
||||||
// (data not from a form field)
|
// (data not from a form field)
|
||||||
$this->setFilters(array(), array());
|
$this->setFilters(array(), array());
|
||||||
|
|
||||||
$this->_packageStructure = array("jsfiles" => $cfgClient[$client]["js"]["path"],
|
$this->_packageStructure = array(
|
||||||
"tplfiles" => $cfgClient[$client]["tpl"]["path"],
|
"jsfiles" => $cfgClient["js"]["path"],
|
||||||
"cssfiles" => $cfgClient[$client]["css"]["path"]);
|
"tplfiles" => $cfgClient["tpl"]["path"],
|
||||||
|
"cssfiles" => $cfgClient["css"]["path"]
|
||||||
|
);
|
||||||
|
|
||||||
if (isset($cfg['dceModEdit']) && is_array($cfg['dceModEdit'])) {
|
if (isset($cfg['dceModEdit']) && is_array($cfg['dceModEdit'])) {
|
||||||
$this->_aModFileEditConf['clientPath'] = $cfgClient[$client]["path"]["frontend"];
|
$this->_aModFileEditConf['clientPath'] = $cfgClient["path"]["frontend"];
|
||||||
$this->_aModFileEditConf = array_merge($this->_aModFileEditConf, $cfg['dceModEdit']);
|
$this->_aModFileEditConf = array_merge($this->_aModFileEditConf, $cfg['dceModEdit']);
|
||||||
if (!isset($cfg['dceModEdit']['modPath']) || empty($cfg['dceModEdit']['modPath'])) {
|
if (!isset($cfg['dceModEdit']['modPath']) || empty($cfg['dceModEdit']['modPath'])) {
|
||||||
$this->_aModFileEditConf['modPath'] = $cfgClient[$client]["path"]["frontend"]
|
$this->_aModFileEditConf['modPath'] = $cfgClient["path"]["frontend"]
|
||||||
. $this->_aModFileEditConf['modFolderName'] . "/";
|
. $this->_aModFileEditConf['modFolderName'] . "/";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$oClient = new cApiClient($client);
|
$oClient = new cApiClient(cRegistry::getClientId());
|
||||||
$aClientProp = $oClient->getPropertiesByType('modfileedit');
|
$aClientProp = $oClient->getPropertiesByType('modfileedit');
|
||||||
if (count($aClientProp) > 0) {
|
if (count($aClientProp) > 0) {
|
||||||
$this->_aModFileEditConf = array_merge($this->_aModFileEditConf, $aClientProp);
|
$this->_aModFileEditConf = array_merge($this->_aModFileEditConf, $aClientProp);
|
||||||
|
@ -376,6 +379,8 @@ class cApiModule extends Item {
|
||||||
/**
|
/**
|
||||||
* Checks if the module is a pre-4.3 module
|
* Checks if the module is a pre-4.3 module
|
||||||
* @return boolean true if this module is an old one
|
* @return boolean true if this module is an old one
|
||||||
|
*
|
||||||
|
* @deprecated since version 2.0
|
||||||
*/
|
*/
|
||||||
public function isOldModule() {
|
public function isOldModule() {
|
||||||
// Keywords to scan
|
// Keywords to scan
|
||||||
|
@ -494,7 +499,7 @@ class cApiModule extends Item {
|
||||||
private function _parseImportFile($sFile, $sType = "module", $sEncoding = "ISO-8859-1") {
|
private function _parseImportFile($sFile, $sType = "module", $sEncoding = "ISO-8859-1") {
|
||||||
global $_mImport;
|
global $_mImport;
|
||||||
|
|
||||||
$oParser = new XmlParser($sEncoding);
|
$oParser = new clXmlParser($sEncoding);
|
||||||
|
|
||||||
if ($sType == "module") {
|
if ($sType == "module") {
|
||||||
$oParser->setEventHandlers(array("/module/name" => "cHandler_ModuleData",
|
$oParser->setEventHandlers(array("/module/name" => "cHandler_ModuleData",
|
||||||
|
@ -1128,7 +1133,7 @@ class cApiModuleTranslationCollection extends ItemCollection {
|
||||||
public function import($idmod, $idlang, $file) {
|
public function import($idmod, $idlang, $file) {
|
||||||
global $_mImport;
|
global $_mImport;
|
||||||
|
|
||||||
$parser = new XmlParser("ISO-8859-1");
|
$parser = new clXmlParser("ISO-8859-1");
|
||||||
|
|
||||||
$parser->setEventHandlers(array("/module/translation/string/original" => "cHandler_ItemName",
|
$parser->setEventHandlers(array("/module/translation/string/original" => "cHandler_ItemName",
|
||||||
"/module/translation/string/translation" => "cHandler_Translation"));
|
"/module/translation/string/translation" => "cHandler_Translation"));
|
||||||
|
|
|
@ -69,17 +69,17 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpmailer/phpmailer",
|
"name": "phpmailer/phpmailer",
|
||||||
"version": "v5.2.28",
|
"version": "v6.5.3",
|
||||||
"version_normalized": "5.2.28.0",
|
"version_normalized": "6.5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/PHPMailer/PHPMailer.git",
|
"url": "https://github.com/PHPMailer/PHPMailer.git",
|
||||||
"reference": "acba50393dd03da69a50226c139722af8b153b11"
|
"reference": "baeb7cde6b60b1286912690ab0693c7789a31e71"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/acba50393dd03da69a50226c139722af8b153b11",
|
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/baeb7cde6b60b1286912690ab0693c7789a31e71",
|
||||||
"reference": "acba50393dd03da69a50226c139722af8b153b11",
|
"reference": "baeb7cde6b60b1286912690ab0693c7789a31e71",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -109,7 +109,7 @@
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"league/oauth2-google": "Needed for Google XOAUTH2 authentication"
|
"league/oauth2-google": "Needed for Google XOAUTH2 authentication"
|
||||||
},
|
},
|
||||||
"time": "2020-03-19T14:29:37+00:00",
|
"time": "2021-11-25T16:34:11+00:00",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"installation-source": "dist",
|
"installation-source": "dist",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -147,7 +147,7 @@
|
||||||
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
|
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/PHPMailer/PHPMailer/issues",
|
"issues": "https://github.com/PHPMailer/PHPMailer/issues",
|
||||||
"source": "https://github.com/PHPMailer/PHPMailer/tree/v5.2.28"
|
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.3"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
<?php return array(
|
|
||||||
'root' => array(
|
|
||||||
'pretty_version' => 'dev-develop',
|
|
||||||
'version' => 'dev-develop',
|
|
||||||
'type' => 'library',
|
|
||||||
'install_path' => __DIR__ . '/../../../',
|
|
||||||
'aliases' => array(),
|
|
||||||
'reference' => '0a7adbf0db76ed6c5fb65d9757552ef26b59a659',
|
|
||||||
'name' => 'vendor/conlite',
|
|
||||||
'dev' => false,
|
|
||||||
),
|
|
||||||
'versions' => array(
|
|
||||||
'endroid/qr-code' => array(
|
|
||||||
'pretty_version' => '1.9.3',
|
|
||||||
'version' => '1.9.3.0',
|
|
||||||
'type' => 'library',
|
|
||||||
'install_path' => __DIR__ . '/../endroid/qr-code',
|
|
||||||
'aliases' => array(),
|
|
||||||
'reference' => 'c9644bec2a9cc9318e98d1437de3c628dcd1ef93',
|
|
||||||
'dev_requirement' => false,
|
|
||||||
),
|
|
||||||
'phpmailer/phpmailer' => array(
|
|
||||||
'pretty_version' => 'v5.2.28',
|
|
||||||
'version' => '5.2.28.0',
|
|
||||||
'type' => 'library',
|
|
||||||
'install_path' => __DIR__ . '/../phpmailer/phpmailer',
|
|
||||||
'aliases' => array(),
|
|
||||||
'reference' => 'acba50393dd03da69a50226c139722af8b153b11',
|
|
||||||
'dev_requirement' => false,
|
|
||||||
),
|
|
||||||
'symfony/options-resolver' => array(
|
|
||||||
'pretty_version' => 'v3.4.47',
|
|
||||||
'version' => '3.4.47.0',
|
|
||||||
'type' => 'library',
|
|
||||||
'install_path' => __DIR__ . '/../symfony/options-resolver',
|
|
||||||
'aliases' => array(),
|
|
||||||
'reference' => 'c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744',
|
|
||||||
'dev_requirement' => false,
|
|
||||||
),
|
|
||||||
'vendor/conlite' => array(
|
|
||||||
'pretty_version' => 'dev-develop',
|
|
||||||
'version' => 'dev-develop',
|
|
||||||
'type' => 'library',
|
|
||||||
'install_path' => __DIR__ . '/../../../',
|
|
||||||
'aliases' => array(),
|
|
||||||
'reference' => '0a7adbf0db76ed6c5fb65d9757552ef26b59a659',
|
|
||||||
'dev_requirement' => false,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
|
@ -33,11 +33,11 @@ if (!defined('CON_FRAMEWORK')) {
|
||||||
|
|
||||||
$bDebug = false;
|
$bDebug = false;
|
||||||
|
|
||||||
if (!$idcat) {
|
if (!$idcat && !empty($_REQUEST['idcat'])) {
|
||||||
$idcat = Contenido_Security::toInteger($_REQUEST['idcat']);
|
$idcat = Contenido_Security::toInteger($_REQUEST['idcat']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$sCatlist = Contenido_Security::toString($_REQUEST['wholelist']);
|
$sCatlist = (!empty($_REQUEST['wholelist']))?Contenido_Security::toString($_REQUEST['wholelist']):'';
|
||||||
if ($sCatlist != '') {
|
if ($sCatlist != '') {
|
||||||
$aCatlist = explode(',', $sCatlist);
|
$aCatlist = explode(',', $sCatlist);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -736,7 +736,7 @@ function conMakeCatOnline($idcat, $lang, $status)
|
||||||
WHERE idcat = '".Contenido_Security::toInteger($idcat)."' AND idlang = '".Contenido_Security::toInteger($lang)."'";
|
WHERE idcat = '".Contenido_Security::toInteger($idcat)."' AND idlang = '".Contenido_Security::toInteger($lang)."'";
|
||||||
$db->query($sql);
|
$db->query($sql);
|
||||||
|
|
||||||
if ($cfg["pathresolve_heapcache"] == true && !$status = 0)
|
if (isset($cfg["pathresolve_heapcache"]) && $cfg["pathresolve_heapcache"] == true && !$status = 0)
|
||||||
{
|
{
|
||||||
$pathresolve_tablename = $cfg["sql"]["sqlprefix"]."_pathresolve_cache";
|
$pathresolve_tablename = $cfg["sql"]["sqlprefix"]."_pathresolve_cache";
|
||||||
$sql = "DELETE FROM %s WHERE idlang = '%s' AND idcat = '%s'";
|
$sql = "DELETE FROM %s WHERE idlang = '%s' AND idcat = '%s'";
|
||||||
|
|
|
@ -237,32 +237,17 @@ function conGenerateCode($idcat, $idart, $lang, $client, $layout = false) {
|
||||||
$a_container = explode("&", $tmp_returnstring);
|
$a_container = explode("&", $tmp_returnstring);
|
||||||
|
|
||||||
foreach ($a_container as $key => $value) {
|
foreach ($a_container as $key => $value) {
|
||||||
|
|
||||||
$sql = "SELECT output, template, name FROM " . $cfg["tab"]["mod"] . " WHERE idmod='" . $a_d[$value] . "'";
|
|
||||||
|
|
||||||
$db->query($sql);
|
|
||||||
$db->next_record();
|
|
||||||
|
|
||||||
if (is_numeric($a_d[$value])) {
|
if (is_numeric($a_d[$value])) {
|
||||||
$thisModule = '<?php $cCurrentModule = ' . ((int) $a_d[$value]) . '; ?>';
|
$thisModule = '<?php $cCurrentModule = ' . ((int) $a_d[$value]) . '; ?>';
|
||||||
$thisContainer = '<?php $cCurrentContainer = ' . ((int) $value) . '; ?>';
|
$thisContainer = '<?php $cCurrentContainer = ' . ((int) $value) . '; ?>';
|
||||||
}
|
}
|
||||||
/* dceModFileEdit (c)2009 www.dceonline.de */
|
|
||||||
if ($cfg['dceModEdit']['use']
|
|
||||||
&& ($cfg['dceModEdit']['allModsFromFile'] == true
|
|
||||||
|| in_array((int) $a_d[$value], $cfg['dceModEdit']['modsFromFile']))) {
|
|
||||||
cInclude('classes', 'contenido/class.module.php');
|
|
||||||
$tmpModule = new cApiModule;
|
|
||||||
$tmpModule->loadByPrimaryKey($a_d[$value]);
|
|
||||||
$output = $thisModule . $thisContainer . $tmpModule->get("output");
|
|
||||||
unset($tmpModule);
|
|
||||||
} else {
|
|
||||||
$output = $thisModule . $thisContainer . $db->f("output");
|
|
||||||
}
|
|
||||||
/* dceModFileEdit (c)2009 www.dceonline.de */
|
|
||||||
$output = AddSlashes($output) . "\n";
|
|
||||||
|
|
||||||
$template = $db->f("template");
|
$oModule = new cApiModule($a_d[$value]);
|
||||||
|
$output = $thisModule . $thisContainer . $oModule->get("output");
|
||||||
|
$template = $oModule->get("template");
|
||||||
|
|
||||||
|
$output = AddSlashes($output) . "\n";
|
||||||
|
|
||||||
$varstring = array();
|
$varstring = array();
|
||||||
if (!empty($a_c[$value])) {
|
if (!empty($a_c[$value])) {
|
||||||
|
@ -297,7 +282,7 @@ function conGenerateCode($idcat, $idart, $lang, $client, $layout = false) {
|
||||||
$fedebug .= "Container: CMS_CONTAINER[$value]" . '\\\\n';
|
$fedebug .= "Container: CMS_CONTAINER[$value]" . '\\\\n';
|
||||||
}
|
}
|
||||||
if ($frontend_debug["module_display"] == true) {
|
if ($frontend_debug["module_display"] == true) {
|
||||||
$fedebug .= "Modul: " . $db->f("name") . '\\\\n';
|
$fedebug .= "Modul: " . $oModule->get("name") . '\\\\n';
|
||||||
}
|
}
|
||||||
if ($frontend_debug["module_timing_summary"] == true || $frontend_debug["module_timing"] == true) {
|
if ($frontend_debug["module_timing_summary"] == true || $frontend_debug["module_timing"] == true) {
|
||||||
$fedebug .= 'Eval-Time: $modtime' . $value . '\\\\n';
|
$fedebug .= 'Eval-Time: $modtime' . $value . '\\\\n';
|
||||||
|
@ -311,7 +296,7 @@ function conGenerateCode($idcat, $idart, $lang, $client, $layout = false) {
|
||||||
|
|
||||||
if ($frontend_debug["module_timing_summary"] == true) {
|
if ($frontend_debug["module_timing_summary"] == true) {
|
||||||
$output .= addslashes(' <?php $cModuleTimes["' . $value . '"] = $modtime' . $value . '; ?>');
|
$output .= addslashes(' <?php $cModuleTimes["' . $value . '"] = $modtime' . $value . '; ?>');
|
||||||
$output .= addslashes(' <?php $cModuleNames["' . $value . '"] = "' . addslashes($db->f("name")) . '"; ?>');
|
$output .= addslashes(' <?php $cModuleNames["' . $value . '"] = "' . addslashes($oModule->get("name")) . '"; ?>');
|
||||||
}
|
}
|
||||||
/* Replace new containers */
|
/* Replace new containers */
|
||||||
$code = preg_replace("/<container( +)id=\\\\\"$value\\\\\"(.*)>(.*)<\/container>/Uis", "CMS_CONTAINER[$value]", $code);
|
$code = preg_replace("/<container( +)id=\\\\\"$value\\\\\"(.*)>(.*)<\/container>/Uis", "CMS_CONTAINER[$value]", $code);
|
||||||
|
|
|
@ -80,7 +80,7 @@ $ipc_conpluginpath = cRegistry::getPluginsPath();
|
||||||
*
|
*
|
||||||
* @deprecated since version 2.0
|
* @deprecated since version 2.0
|
||||||
*/
|
*/
|
||||||
if ($contenido) {
|
if (isset($contenido)) {
|
||||||
$lastscantime = getSystemProperty("system", "plugin-lastscantime");
|
$lastscantime = getSystemProperty("system", "plugin-lastscantime");
|
||||||
|
|
||||||
/* Clean up: Fetch and trim the plugin order */
|
/* Clean up: Fetch and trim the plugin order */
|
||||||
|
|
|
@ -860,13 +860,14 @@ if (is_numeric($idcat) && ($idcat >= 0)) {
|
||||||
if ($perm->have_perm_area_action("str_tplcfg","str_tplcfg") ||
|
if ($perm->have_perm_area_action("str_tplcfg","str_tplcfg") ||
|
||||||
$perm->have_perm_area_action_item("str_tplcfg","str_tplcfg",$lidcat)) */
|
$perm->have_perm_area_action_item("str_tplcfg","str_tplcfg",$lidcat)) */
|
||||||
|
|
||||||
if (($perm->have_perm_area_action_item("con", "con_tplcfg_edit", $idcat) || $perm->have_perm_area_action("con", "con_tplcfg_edit"))) {
|
if (($perm->have_perm_area_action_item("con", "con_tplcfg_edit", $idcat)
|
||||||
|
|| $perm->have_perm_area_action("con", "con_tplcfg_edit"))) {
|
||||||
|
|
||||||
if (0 != $idcat) {
|
if (0 != $idcat) {
|
||||||
|
|
||||||
$tpl->set('s', 'CATEGORY', $cat_name);
|
$tpl->set('s', 'CATEGORY', $cat_name);
|
||||||
$tpl->set('s', 'CATEGORY_CONF', $tmp_img);
|
$tpl->set('s', 'CATEGORY_CONF', (!empty($tmp_img))?$tmp_img:'');
|
||||||
$tpl->set('s', 'CATEGORY_LINK', $tmp_link);
|
$tpl->set('s', 'CATEGORY_LINK', (!empty($tmp_link))?$tmp_link:'');
|
||||||
} else {
|
} else {
|
||||||
$tpl->set('s', 'CATEGORY', $cat_name);
|
$tpl->set('s', 'CATEGORY', $cat_name);
|
||||||
$tpl->set('s', 'CATEGORY_CONF', ' ');
|
$tpl->set('s', 'CATEGORY_CONF', ' ');
|
||||||
|
|
|
@ -1,14 +1,161 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Project:
|
||||||
|
* Contenido Content Management System
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* Display files from specified directory
|
||||||
|
*
|
||||||
|
* Requirements:
|
||||||
|
* @con_php_req 5.0
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @package Contenido Backend includes
|
||||||
|
* @version 1.0.2
|
||||||
|
* @author Olaf Niemann, Willi Mann
|
||||||
|
* @copyright four for business AG <www.4fb.de>
|
||||||
|
* @license http://www.contenido.org/license/LIZENZ.txt
|
||||||
|
* @link http://www.4fb.de
|
||||||
|
* @link http://www.contenido.org
|
||||||
|
* @since file available since contenido release <= 4.6
|
||||||
|
*
|
||||||
|
* {@internal
|
||||||
|
* created 2003-04-20
|
||||||
|
* modified 2008-06-27, Frederic Schneider, add security fix
|
||||||
|
*
|
||||||
|
* $Id$:
|
||||||
|
* }}
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
if (!defined('CON_FRAMEWORK')) {
|
|
||||||
die('Illegal call');
|
if(!defined('CON_FRAMEWORK')) {
|
||||||
|
die('Illegal call');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cInclude("includes", "functions.file.php");
|
||||||
|
|
||||||
$oDirList = new cGuiFileList($cfgClient[$client]["js"]["path"], 'js');
|
$tpl->reset();
|
||||||
$oDirList->scanDir();
|
|
||||||
|
|
||||||
$oDirList->renderList();
|
if (!(int) $client > 0) {
|
||||||
|
#if there is no client selected, display empty page
|
||||||
|
$oPage = new cPage;
|
||||||
|
$oPage->render();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$path = $cfgClient[$client]["js"]["path"];
|
||||||
|
$sFileType = "js";
|
||||||
|
|
||||||
|
$sSession = $sess->id;
|
||||||
|
|
||||||
|
$sArea = 'js';
|
||||||
|
$sActionDelete = 'js_delete';
|
||||||
|
$sActionEdit = 'js_edit';
|
||||||
|
|
||||||
|
$sScriptTemplate = '
|
||||||
|
<script type="text/javascript" src="scripts/rowMark.js"></script>
|
||||||
|
<script type="text/javascript" src="scripts/general.js"></script>
|
||||||
|
<script type="text/javascript" src="scripts/messageBox.js.php?contenido='.$sSession.'"></script>
|
||||||
|
<script type="text/javascript">
|
||||||
|
|
||||||
|
/* Create messageBox instance */
|
||||||
|
box = new messageBox("", "", "", 0, 0);
|
||||||
|
|
||||||
|
function deleteFile(file)
|
||||||
|
{
|
||||||
|
url = "main.php?area='.$sArea.'";
|
||||||
|
url += "&action='.$sActionDelete.'";
|
||||||
|
url += "&frame=2";
|
||||||
|
url += "&delfile=" + file;
|
||||||
|
url += "&contenido='.$sSession.'";
|
||||||
|
window.location.href = url;
|
||||||
|
parent.parent.frames["right"].frames["right_bottom"].location.href = "main.php?area='.$sArea.'&frame=4&contenido='.$sSession.'";
|
||||||
|
}
|
||||||
|
</script>';
|
||||||
|
|
||||||
|
$tpl->set('s', 'JAVASCRIPT', $sScriptTemplate);
|
||||||
|
|
||||||
|
# delete file
|
||||||
|
if ($action == $sActionDelete)
|
||||||
|
{
|
||||||
|
if (!strrchr($_REQUEST['delfile'], "/"))
|
||||||
|
{
|
||||||
|
if (file_exists($path.$_REQUEST['delfile']))
|
||||||
|
{
|
||||||
|
unlink($path.$_REQUEST['delfile']);
|
||||||
|
removeFileInformation($client, $_REQUEST['delfile'], 'js', $db);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($handle = opendir($path))
|
||||||
|
{
|
||||||
|
|
||||||
|
$aFiles = array();
|
||||||
|
|
||||||
|
while ($file = readdir($handle))
|
||||||
|
{
|
||||||
|
if(substr($file, (strlen($file) - (strlen($sFileType) + 1)), (strlen($sFileType) + 1)) == ".$sFileType" AND is_readable($path.$file))
|
||||||
|
{
|
||||||
|
$aFiles[] = $file;
|
||||||
|
}elseif (substr($file, (strlen($file) - (strlen($sFileType) + 1)), (strlen($sFileType) + 1)) == ".$sFileType" AND !is_readable($path.$file))
|
||||||
|
{
|
||||||
|
$notification->displayNotification("error", $file." ".i18n("is not readable!"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
closedir($handle);
|
||||||
|
|
||||||
|
// display files
|
||||||
|
if (is_array($aFiles))
|
||||||
|
{
|
||||||
|
|
||||||
|
sort($aFiles);
|
||||||
|
|
||||||
|
foreach ($aFiles as $filename)
|
||||||
|
{
|
||||||
|
|
||||||
|
$bgcolor = ( is_int($tpl->dyn_cnt / 2) ) ? $cfg["color"]["table_light"] : $cfg["color"]["table_dark"];
|
||||||
|
$tpl->set('d', 'BGCOLOR', $bgcolor);
|
||||||
|
|
||||||
|
$tmp_mstr = '<a class=\"action\" href="javascript:conMultiLink(\'%s\', \'%s\', \'%s\', \'%s\')" title="%s" alt="%s">%s</a>';
|
||||||
|
|
||||||
|
$html_filename = sprintf($tmp_mstr, 'right_top',
|
||||||
|
$sess->url("main.php?area=$area&frame=3&file=$filename"),
|
||||||
|
'right_bottom',
|
||||||
|
$sess->url("main.php?area=$area&frame=4&action=$sActionEdit&file=$filename&tmp_file=$filename"),
|
||||||
|
$filename, $filename, clHtmlSpecialChars($filename));
|
||||||
|
|
||||||
|
$tpl->set('d', 'FILENAME', $html_filename);
|
||||||
|
|
||||||
|
$delTitle = i18n("Delete File");
|
||||||
|
$delDescr = sprintf(i18n("Do you really want to delete the following file:<br><br>%s<br>"),$filename);
|
||||||
|
|
||||||
|
if ($perm->have_perm_area_action('style', $sActionDelete))
|
||||||
|
{
|
||||||
|
$tpl->set('d', 'DELETE', '<a title="'.$delTitle.'" href="javascript://" onclick="box.confirm(\''.$delTitle.'\', \''.$delDescr.'\', \'deleteFile(\\\''.$filename.'\\\')\')"><img src="'.$cfg['path']['images'].'delete.gif" border="0" title="'.$delTitle.'"></a>');
|
||||||
|
}else
|
||||||
|
{
|
||||||
|
$tpl->set('d', 'DELETE', '');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stripslashes($_REQUEST['file']) == $filename) {
|
||||||
|
$tpl->set('d', 'ID', 'id="marked"');
|
||||||
|
} else {
|
||||||
|
$tpl->set('d', 'ID', '');
|
||||||
|
}
|
||||||
|
|
||||||
|
$tpl->next();
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else
|
||||||
|
{
|
||||||
|
if ((int) $client > 0) {
|
||||||
|
$notification->displayNotification("error", i18n("Directory is not existing or readable!")."<br>$path");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$tpl->generate($cfg['path']['templates'] . $cfg['templates']['files_overview']);
|
||||||
|
|
||||||
|
?>
|
|
@ -357,7 +357,7 @@ function insertTab(event, obj) {
|
||||||
$page->setReload();
|
$page->setReload();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* dceModFileEdit (c)2009-2011 www.dceonline.de */
|
|
||||||
if ($cfg['dceModEdit']['use']) {
|
if ($cfg['dceModEdit']['use']) {
|
||||||
// button for mod folder creation
|
// button for mod folder creation
|
||||||
if (!$module->hasModuleFolder() && $action != "mod_new") {
|
if (!$module->hasModuleFolder() && $action != "mod_new") {
|
||||||
|
@ -380,7 +380,7 @@ function insertTab(event, obj) {
|
||||||
} else {
|
} else {
|
||||||
$form->add(i18n("Name"), $name->render());
|
$form->add(i18n("Name"), $name->render());
|
||||||
}
|
}
|
||||||
/* End dceModFileEdit (c)2009-2011 www.dceonline.de */
|
|
||||||
$form->add(i18n("Type"), $typeselect->render() . $custom->render());
|
$form->add(i18n("Type"), $typeselect->render() . $custom->render());
|
||||||
$form->add(i18n("Description"), $descr->render());
|
$form->add(i18n("Description"), $descr->render());
|
||||||
|
|
||||||
|
|
|
@ -164,7 +164,6 @@ if (($action == "tpl_new") && (!$perm->have_perm_area_action_anyitem($area, $act
|
||||||
$raw_code = ($oLayout->virgin) ? "" : $oLayout->getLayout();
|
$raw_code = ($oLayout->virgin) ? "" : $oLayout->getLayout();
|
||||||
tplPreparseLayout($idlay, $raw_code);
|
tplPreparseLayout($idlay, $raw_code);
|
||||||
$tmp_returnstring = tplBrowseLayoutForContainers($idlay, $raw_code);
|
$tmp_returnstring = tplBrowseLayoutForContainers($idlay, $raw_code);
|
||||||
var_dump($tmp_returnstring);
|
|
||||||
if(empty($tmp_returnstring)) {
|
if(empty($tmp_returnstring)) {
|
||||||
$a_container = [];
|
$a_container = [];
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
/debug.log
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 9fab0549299f5a17d8b242f3aaa13cdfe83c90d5
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit c0e41ea0fa3e8c738893dfe8faacbbb71797be57
|
|
|
@ -144,12 +144,9 @@ class pimPluginHandler {
|
||||||
$aGeneral = array();
|
$aGeneral = array();
|
||||||
if (is_object($this->_oPiXml)) {
|
if (is_object($this->_oPiXml)) {
|
||||||
$aGeneral = $this->_xml2Array($this->_oPiXml->general);
|
$aGeneral = $this->_xml2Array($this->_oPiXml->general);
|
||||||
if($aDependencies = $this->_getDepencyArray()) {
|
$aDependencies = $this->_xml2Array($this->_oPiXml->dependencies);
|
||||||
foreach ($aDependencies as $aDependency) {
|
|
||||||
|
$aGeneral['dependencies'] = $aDependencies;
|
||||||
}
|
|
||||||
}
|
|
||||||
$aGeneral['dependencies'] = print_r($aDependencies, TRUE);
|
|
||||||
}
|
}
|
||||||
return $aGeneral;
|
return $aGeneral;
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,7 +64,10 @@ class pimView extends Template{
|
||||||
public function setVariable($sVariable, $sName = '') {
|
public function setVariable($sVariable, $sName = '') {
|
||||||
if(empty($sName)) {
|
if(empty($sName)) {
|
||||||
$sName = strtoupper($$sVariable);
|
$sName = strtoupper($$sVariable);
|
||||||
}
|
}
|
||||||
|
if(is_array($sVariable)) {
|
||||||
|
$sVariable = json_encode($sVariable);
|
||||||
|
}
|
||||||
$this->set('s', $sName, $sVariable);
|
$this->set('s', $sName, $sVariable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -249,7 +249,7 @@ return array(
|
||||||
'ArtSpecCollection' => 'conlite/classes/class.artspec.php',
|
'ArtSpecCollection' => 'conlite/classes/class.artspec.php',
|
||||||
'ArtSpecItem' => 'conlite/classes/class.artspec.php',
|
'ArtSpecItem' => 'conlite/classes/class.artspec.php',
|
||||||
'Layout' => 'conlite/classes/class.layout.php',
|
'Layout' => 'conlite/classes/class.layout.php',
|
||||||
'XmlParser' => 'conlite/classes/class.xmlparser.php',
|
'clXmlParser' => 'conlite/classes/class.clxmlparser.php',
|
||||||
'Contenido_UrlBuilder_CustomPath' => 'conlite/classes/UrlBuilder/Contenido_UrlBuilder_CustomPath.class.php',
|
'Contenido_UrlBuilder_CustomPath' => 'conlite/classes/UrlBuilder/Contenido_UrlBuilder_CustomPath.class.php',
|
||||||
'Contenido_UrlBuilder_Frontcontent' => 'conlite/classes/UrlBuilder/Contenido_UrlBuilder_Frontcontent.class.php',
|
'Contenido_UrlBuilder_Frontcontent' => 'conlite/classes/UrlBuilder/Contenido_UrlBuilder_Frontcontent.class.php',
|
||||||
'Contenido_UrlBuilderFactory' => 'conlite/classes/UrlBuilder/Contenido_UrlBuilderFactory.class.php',
|
'Contenido_UrlBuilderFactory' => 'conlite/classes/UrlBuilder/Contenido_UrlBuilderFactory.class.php',
|
||||||
|
|
|
@ -152,8 +152,7 @@ ini_set("error_log", $cfg['path']['conlite_logs'] . "errorlog.txt");
|
||||||
* @todo change first if to use a local config var for servername
|
* @todo change first if to use a local config var for servername
|
||||||
*
|
*
|
||||||
**/
|
**/
|
||||||
if ($cfg["develop"]["show_errors"]
|
if ($cfg["develop"]["show_errors"]) {
|
||||||
&& filter_input(INPUT_SERVER, 'SERVER_NAME', FILTER_SANITIZE_STRING) == "local.dceserver.de") {
|
|
||||||
error_reporting(E_ALL);
|
error_reporting(E_ALL);
|
||||||
} else {
|
} else {
|
||||||
if ($cfg["develop"]["show_deprecated"]) {
|
if ($cfg["develop"]["show_deprecated"]) {
|
||||||
|
|
Laden…
In neuem Issue referenzieren