ConLite/ConLite
1
0
Fork 0
Code Issues 25 Pull requests Projects 2 Releases 2 Wiki Activity

remove pear stuff, fix php8.x issues

Browse source
This commit is contained in:
o.pinke 2023-02-17 15:13:58 +01:00
parent 9367766e7d
commit 97a3370258
6 changed files with 7 additions and 1220 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conlite/classes/cHTML5/class.chtml.php
View file

@ -20,11 +20,7 @@
// security check
defined('CON_FRAMEWORK') or die('Illegal call');
/*
if (!class_exists("HTML_Common2")) {
cInclude("pear", "HTML/Common2.php");
}
*/
/* Global ID counter */
$cHTMLIDCount = 0;

4
conlite/classes/class.inuse.php
View file

@ -293,6 +293,4 @@ class InUseItem extends Item
$this->loadByPrimaryKey($mId);
}
}
}
?>
}

1065
conlite/classes/class.smtp.php
View file

File diff suppressed because it is too large Load diff

6
conlite/classes/template/class.template.php
View file

@ -209,7 +209,11 @@ class Template {
if (!is_file($template)) {
$content = & $template; //template is a string (it is a reference to save memory!!!)
} else {
$content = implode("", file($template)); //template is a file
if(cFileHandler::readable($template)) {
$content = implode("", file($template)); //template is a file
} else {
return $template;
}
}
$content = (($note) ? "<!-- Generated by ConLite " . $cfg['version'] . "-->\n" : "") . $content;

51
conlite/includes/functions.general.php
View file

@ -2052,57 +2052,6 @@ function notifyOnError($errortitle, $errormessage) {
}
}
function cIDNAEncode($sourceEncoding, $string) {
if (extension_loaded("iconv")) {
cInclude('pear', 'Net/IDNA.php');
$idn = Net_IDNA :: getInstance();
$string = iconv("UTF-8", $sourceEncoding, $string);
$string = $idn->encode($string);
return ($string);
}
if (extension_loaded("recode")) {
cInclude('pear', 'Net/IDNA.php');
$idn = Net_IDNA :: getInstance();
$string = $idn->decode($string);
$string = recode_string("UTF-8.." . $sourceEncoding, $string);
return $string;
}
return $string;
}
function cIDNADecode($targetEncoding, $string) {
if (extension_loaded("iconv")) {
cInclude('pear', 'Net/IDNA.php');
$idn = Net_IDNA :: getInstance();
$string = $idn->decode($string);
$string = iconv($targetEncoding, "UTF-8", $string);
return ($string);
}
if (extension_loaded("recode")) {
cInclude('pear', 'Net/IDNA.php');
$idn = Net_IDNA :: getInstance();
$string = recode_string($targetEncoding . "..UTF-8", $string);
$string = $idn->decode($string);
return $string;
}
return $string;
}
/**
* Checks for a named key of an array, pushes it if not set with a default value
*

95
conlite/includes/include.str_overview.php
View file

@ -233,101 +233,6 @@ if (!isset($idcat))
$idcat = 0;
if (!isset($action))
$action = 0;
/*
function buildTree(&$rootItem, &$items) {
global $nextItem, $perm, $tmp_area;
while ($item_list = each($items)) {
list($key, $item) = $item_list;
unset($newItem);
$bCheck = false;
if (!$bCheck) {
$bCheck = $perm->have_perm_area_action($tmp_area, "str_newtree");
}
if (!$bCheck) {
$bCheck = $perm->have_perm_area_action($tmp_area, "str_newcat");
}
if (!$bCheck) {
$bCheck = $perm->have_perm_area_action($tmp_area, "str_makevisible");
}
if (!$bCheck) {
$bCheck = $perm->have_perm_area_action($tmp_area, "str_makepublic");
}
if (!$bCheck) {
$bCheck = $perm->have_perm_area_action($tmp_area, "str_deletecat");
}
if (!$bCheck) {
$bCheck = $perm->have_perm_area_action($tmp_area, "str_moveupcat");
}
if (!$bCheck) {
$bCheck = $perm->have_perm_area_action($tmp_area, "str_movedowncat");
}
if (!$bCheck) {
$bCheck = $perm->have_perm_area_action($tmp_area, "str_movesubtree");
}
if (!$bCheck) {
$bCheck = $perm->have_perm_area_action($tmp_area, "str_renamecat");
}
if (!$bCheck) {
$bCheck = $perm->have_perm_area_action("str_tplcfg", "str_tplcfg");
}
if (!$bCheck) {
$bCheck = $perm->have_perm_item($tmp_area, $item['idcat']);
}
if ($bCheck) {
$newItem = new TreeItem($item['name'], $item['idcat'], true);
} else {
$newItem = new TreeItem($item['name'], $item['idcat'], false);
}
$newItem->collapsed_icon = 'images/open_all.gif';
$newItem->expanded_icon = 'images/close_all.gif';
$newItem->custom['idtree'] = $item['idtree'];
$newItem->custom['level'] = $item['level'];
$newItem->custom['idcat'] = $item['idcat'];
$newItem->custom['idtree'] = $item['idtree'];
$newItem->custom['parentid'] = $item['parentid'];
$newItem->custom['alias'] = $item['alias'];
$newItem->custom['preid'] = $item['preid'];
$newItem->custom['postid'] = $item['postid'];
$newItem->custom['visible'] = $item['visible'];
$newItem->custom['idtplcfg'] = $item['idtplcfg'];
$newItem->custom['public'] = $item['public'];
if ($perm->have_perm_item("str", $item['idcat'])) {
$newItem->custom['forcedisplay'] = 1;
}
if (array_key_exists($key + 1, $items)) {
$nextItem = $items[$key + 1];
} else {
$nextItem = 0;
}
if (array_key_exists($key - 1, $items)) {
$lastItem = $items[$key - 1];
} else {
$lastItem = 0;
}
$rootItem->addItem($newItem);
if ($nextItem['level'] > $item['level']) {
$oldRoot = $rootItem;
buildTree($newItem, $items);
$rootItem = $oldRoot;
}
if ($nextItem['level'] < $item['level']) {
return;
}
}
}
*
*/
function buildTree(&$rootItem, $itemsIterator) {
global $nextItem, $perm, $tmp_area;