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

recode for PHP 8.x

Dieser Commit ist enthalten in:
Ortwin Pinke 2022-11-21 20:37:19 +01:00
Ursprung b409ba0915
Commit 82f6517398
9 geänderte Dateien mit 472 neuen und 326 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

588
cms/js/jquery.cookiesdirective.js
Datei anzeigen

@ -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" />&nbsp;'; html += '">' + settings.explicitCookieAcceptanceLabel + '<input type="checkbox" name="epdagree" id="epdagree" />&nbsp;';
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);

26
conlite/backend_search.php
Datei anzeigen

@ -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(&quot;$sDeleteArticle&quot;, &quot;$sDeleteArticleQuestion:<br><br><b>$db->f('title')</b>&quot;, &quot;deleteArticle($idart,$idcat)&quot;)\" title=\"$sDeleteArticle\"><img src=\"images/delete.gif\" title=\"$sDeleteArticle\" alt=\"$sDeleteArticle\" border=\"0\"></a>"; $delete = "<a href=\"javascript://\" onclick=\"box.confirm(&quot;$sDeleteArticle&quot;, &quot;$sDeleteArticleQuestion:<br><br><b>".$db->f('title')."</b>&quot;, &quot;deleteArticle($idart,$idcat)&quot;)\" 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&amp;area=todo&amp;frame=1&amp;itemtype=idart&amp;itemid=$idart&amp;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&amp;area=todo&amp;frame=1&amp;itemtype=idart&amp;itemid=$idart&amp;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

8
conlite/classes/class.article.php
Datei anzeigen

@ -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]);
}
} }
/** /**

4
conlite/includes/ajax/include.ajax.con.php
Datei anzeigen

@ -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 {

2
conlite/includes/functions.con.php
Datei anzeigen

@ -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'";

7
conlite/includes/include.con_art_overview.php
Datei anzeigen

@ -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', '&nbsp;'); $tpl->set('s', 'CATEGORY_CONF', '&nbsp;');

159
conlite/includes/include.js_files_overview.php
Datei anzeigen

@ -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']);
?>

1
conlite/includes/include.tpl_edit_form.php
Datei anzeigen

@ -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 {

3
data/config/production/config.misc.php
Datei anzeigen

@ -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"]) {