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

merging trunk

Dieser Commit ist enthalten in:
oldperl 2019-02-11 15:38:11 +00:00
Ursprung 4d005004cb
Commit e8f3efb90e
4 geänderte Dateien mit 111 neuen und 100 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
branches/lz-prognose/conlite/includes/functions.php73.php Normale Datei
Datei anzeigen

@ -0,0 +1,6 @@
<?php
if (!function_exists('is_countable')) {
function is_countable($var) {
return (is_array($var) || $var instanceof Countable);
}
}

11
branches/lz-prognose/conlite/includes/include.frontend.user_edit.php
Datei anzeigen

@ -1,4 +1,5 @@
<?php
/**
* Project:
* Contenido Content Management System
@ -17,7 +18,6 @@
*
* $Id: include.frontend.user_edit.php 292 2014-01-20 09:49:37Z oldperl $:
*/
if (!defined('CON_FRAMEWORK')) {
die('Illegal call');
}
@ -137,8 +137,7 @@ if ($oFeUser->virgin == false && $oFeUser->get("idclient") == $client) {
/* Check out if there are any plugins */
if (is_array($cfg['plugins']['frontendusers'])) {
foreach ($cfg['plugins']['frontendusers'] as $plugin) {
if (function_exists("frontendusers_".$plugin."_wantedVariables") &&
function_exists("frontendusers_".$plugin."_store")) {
if (function_exists("frontendusers_" . $plugin . "_wantedVariables") && function_exists("frontendusers_" . $plugin . "_store")) {
# check if user belongs to a specific group
# if true store values defined in frontenduser plugin
if (function_exists("frontendusers_" . $plugin . "_checkUserGroup")) {
@ -159,7 +158,8 @@ if ($oFeUser->virgin == false && $oFeUser->get("idclient") == $client) {
}
}
}
if($bStore) $oFeUser->store();
if ($bStore)
$oFeUser->store();
}
if (count($messages) > 0) {
@ -192,8 +192,7 @@ if ($oFeUser->virgin == false && $oFeUser->get("idclient") == $client) {
/* Check out if there are any plugins */
if (is_array($pluginOrder)) {
foreach ($pluginOrder as $plugin) {
if (function_exists("frontendusers_".$plugin."_getTitle") &&
function_exists("frontendusers_".$plugin."_display")) {
if (function_exists("frontendusers_" . $plugin . "_getTitle") && function_exists("frontendusers_" . $plugin . "_display")) {
# check if user belongs to a specific group
# if true display frontenduser plugin
if (function_exists("frontendusers_" . $plugin . "_checkUserGroup")) {

3
branches/lz-prognose/conlite/includes/pseudo-cron.inc.php
Datei anzeigen

@ -405,6 +405,9 @@ function parseCronFile($PC_cronTabFile, $PC_debug) {
$file = @file($PC_cronTabFile);
$job = Array();
$jobs = Array();
if(!is_countable($file)) {
return $jobs;
}
for ($i = 0; $i < count($file); $i++) {
if ($file[$i][0] != '#') {
// old regex, without dow abbreviations:

3
branches/lz-prognose/conlite/includes/startup.php
Datei anzeigen

@ -78,6 +78,9 @@ if (!defined('CL_VERSION')) {
// fixed functions for PHP 5.4 and later
include_once(str_replace('\\', '/', realpath(dirname(__FILE__) . '/..')) . '/includes/functions.php54.php');
// simulate PHP 7.3 functions
include_once(str_replace('\\', '/', realpath(dirname(__FILE__) . '/..')) . '/includes/functions.php73.php');
// 1. security check: Include security class and invoke basic request checks
include_once(str_replace('\\', '/', realpath(dirname(__FILE__) . '/..')) . '/classes/class.security.php');
try {