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

fixed missing images in setup 

fixed php8 errors
Dieser Commit ist enthalten in:
Ortwin Pinke 2023-05-30 06:28:22 +02:00
Ursprung 629983db56
Commit 41c69d53fe
5 geänderte Dateien mit 196 neuen und 180 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

15
.idea/phpunit.xml
Datei anzeigen

@ -3,23 +3,8 @@
<component name="PHPUnit"> <component name="PHPUnit">
<option name="directories"> <option name="directories">
<list> <list>
<option value="$PROJECT_DIR$/conlite/external/phpmailer/phpmailer/tests" />
<option value="$PROJECT_DIR$/conlite/external/endroid/qr-code/tests" /> <option value="$PROJECT_DIR$/conlite/external/endroid/qr-code/tests" />
<option value="$PROJECT_DIR$/conlite/external/phpmailer/phpmailer/tests" /> <option value="$PROJECT_DIR$/conlite/external/phpmailer/phpmailer/tests" />
<option value="$PROJECT_DIR$/conlite/external/endroid/qr-code/tests" />
<option value="$PROJECT_DIR$/conlite/external/endroid/qr-code/tests" />
<option value="$PROJECT_DIR$/conlite/external/phpmailer/phpmailer/tests" />
<option value="$PROJECT_DIR$/tests" />
<option value="$PROJECT_DIR$/tests" />
<option value="$PROJECT_DIR$/tests" />
<option value="$PROJECT_DIR$/conlite/external/nikic/php-parser/tests" />
<option value="$PROJECT_DIR$/conlite/external/phpunit/php-file-iterator/tests" />
<option value="$PROJECT_DIR$/conlite/external/sebastian/complexity/tests" />
<option value="$PROJECT_DIR$/conlite/external/sebastian/object-enumerator/tests" />
<option value="$PROJECT_DIR$/conlite/external/myclabs/deep-copy/tests" />
<option value="$PROJECT_DIR$/conlite/external/sebastian/comparator/tests" />
<option value="$PROJECT_DIR$/conlite/external/sebastian/code-unit-reverse-lookup/tests" />
<option value="$PROJECT_DIR$/conlite/external/sebastian/cli-parser/tests" />
<option value="$PROJECT_DIR$/tests" /> <option value="$PROJECT_DIR$/tests" />
</list> </list>
</option> </option>

1
.idea/vcs.xml
Datei anzeigen

@ -2,5 +2,6 @@
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" /> <mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/conlite/plugins/cl-mod-rewrite" vcs="Git" />
</component> </component>
</project> </project>

334
conlite/classes/cHTML5/class.chtml.php
Datei anzeigen

@ -5,7 +5,7 @@
* *
* Description: * Description:
* Base Class for all cHTML Elements * Base Class for all cHTML Elements
* *
* @category ConLite * @category ConLite
* @package Core * @package Core
* @subpackage cHTML * @subpackage cHTML
@ -29,11 +29,12 @@ $cHTMLIDCount = 0;
* *
* @author Ortwin Pinke <o.pinke@conlite.org> * @author Ortwin Pinke <o.pinke@conlite.org>
*/ */
class cHTML extends cHTML5Common { class cHTML extends cHTML5Common
{
/** /**
* Storage of the open SGML tag template * Storage of the open SGML tag template
* @var string * @var string
*/ */
protected $_skeleton_open; protected $_skeleton_open;
@ -57,15 +58,15 @@ class cHTML extends cHTML5Common {
/** /**
* Defines the style definitions * Defines the style definitions
* @var string * @var array
*/ */
protected $_styledefs; protected $_styledefs = [];
/** /**
* Defines all scripts which are required by the current element * Defines all scripts which are required by the current element
* @var array * @var array
*/ */
protected $_requiredScripts; protected $_requiredScripts = [];
/** /**
* @var boolean Defines if the current tag is a contentless tag * @var boolean Defines if the current tag is a contentless tag
@ -75,31 +76,32 @@ class cHTML extends cHTML5Common {
/** /**
* @var array Defines which JS events contain which scripts * @var array Defines which JS events contain which scripts
*/ */
protected $_aEventDefinitions; protected $_aEventDefinitions = [];
/** /**
* @var array Style definitions * @var array Style definitions
*/ */
protected $_aStyleDefinitions; protected $_aStyleDefinitions = [];
/** /**
* @var string The content itself * @var string The content itself
*/ */
protected $_content; protected $_content;
protected $_aCfg; protected $_aCfg;
/** /**
* Constructor Function * Constructor Function
* Initializes the SGML open/close tags * Initializes the SGML open/close tags
* *
* @param none * @param none
* @return void * @return void
*/ */
public function __construct() { public function __construct()
global $cfg; {
$this->_aCfg = $cfg;
$this->_aCfg = cRegistry::getConfig();
parent::__construct(); parent::__construct();
$this->_skeleton_open = '<%s%s>'; $this->_skeleton_open = '<%s%s>';
$this->_skeleton_close = '</%s>'; $this->_skeleton_close = '</%s>';
@ -108,50 +110,52 @@ class cHTML extends cHTML5Common {
/* Cache the XHTML setting for performance reasons */ /* Cache the XHTML setting for performance reasons */
if (!is_array($this->_aCfg) || !array_key_exists("generate_xhtml", $this->_aCfg)) { if (!is_array($this->_aCfg) || !array_key_exists("generate_xhtml", $this->_aCfg)) {
if (function_exists("getEffectiveSetting")) { if (function_exists("getEffectiveSetting")) {
$bXhtml = (getEffectiveSetting("generator", "xhtml") == 'true' $bXhtml = (getEffectiveSetting("generator", "xhtml") == 'true'
|| getEffectiveSetting("generator", "xhtml") === TRUE)?true:false; || getEffectiveSetting("generator", "xhtml") === TRUE) ? true : false;
$this->_aCfg["generate_xhtml"] = $bXhtml; $this->_aCfg["generate_xhtml"] = $bXhtml;
} else { } else {
$this->_aCfg["generate_xhtml"] = false; $this->_aCfg["generate_xhtml"] = false;
} }
} }
if($this->_aCfg["generate_xhtml"] === true) { if ($this->_aCfg["generate_xhtml"] === true) {
$this->_skeleton_single = '<%s%s />'; $this->_skeleton_single = '<%s%s />';
} else { } else {
$this->_skeleton_single = '<%s%s>'; $this->_skeleton_single = '<%s%s>';
} }
$this->_styledefs = array (); $this->_styledefs = [];
$this->_aStyleDefinitions = array(); $this->_aStyleDefinitions = [];
$this->setContentlessTag(); $this->setContentlessTag();
$this->advanceID(); $this->advanceID();
$this->_requiredScripts = array (); $this->_requiredScripts = [];
$this->_aEventDefinitions = array (); $this->_aEventDefinitions = [];
} }
/** /**
* *
* @param type $contentlessTag * @param type $contentlessTag
*/ */
public function setContentlessTag($contentlessTag = true) { public function setContentlessTag($contentlessTag = true)
{
$this->_contentlessTag = $contentlessTag; $this->_contentlessTag = $contentlessTag;
} }
/** /**
* advances to the next ID available in the system. * advances to the next ID available in the system.
* *
* This function is useful if you need to use HTML elements * This function is useful if you need to use HTML elements
* in a loop, but don't want to re-create new objects each time. * in a loop, but don't want to re-create new objects each time.
* *
* @return void * @return void
*/ */
public function advanceID() { public function advanceID()
{
global $cHTMLIDCount; global $cHTMLIDCount;
$cHTMLIDCount ++; $cHTMLIDCount++;
$this->updateAttributes(array ("id" => "m".$cHTMLIDCount)); $this->updateAttributes(array("id" => "m" . $cHTMLIDCount));
} }
/** /**
@ -159,24 +163,26 @@ class cHTML extends cHTML5Common {
* *
* @return string current ID * @return string current ID
*/ */
public function getID() { public function getID()
{
return $this->getAttribute("id"); return $this->getAttribute("id");
} }
/** /**
* setAlt: sets the alt and title attributes * setAlt: sets the alt and title attributes
* *
* Sets the "alt" and "title" tags. Usually, "alt" is used * Sets the "alt" and "title" tags. Usually, "alt" is used
* for accessibility and "title" for mouse overs. * for accessibility and "title" for mouse overs.
* *
* To set the text for all browsers for mouse over, set "alt" * To set the text for all browsers for mouse over, set "alt"
* and "title". IE behaves incorrectly and shows "alt" on * and "title". IE behaves incorrectly and shows "alt" on
* mouse over. Mozilla browsers only show "title" as mouse over. * mouse over. Mozilla browsers only show "title" as mouse over.
* *
* @param string $alt Text to set as the "alt" attribute * @param string $alt Text to set as the "alt" attribute
*/ */
public function setAlt($alt) { public function setAlt($alt)
$attributes = array ("alt" => $alt, "title" => $alt); {
$attributes = array("alt" => $alt, "title" => $alt);
$this->updateAttributes($attributes); $this->updateAttributes($attributes);
} }
@ -185,8 +191,9 @@ class cHTML extends cHTML5Common {
* *
* @param string $class Text to set as the "id" * @param string $class Text to set as the "id"
*/ */
public function setID($id) { public function setID($id)
$this->updateAttributes(array ("id" => $id)); {
$this->updateAttributes(array("id" => $id));
} }
/** /**
@ -194,8 +201,9 @@ class cHTML extends cHTML5Common {
* *
* @param string $class Text to set as the "class" attribute * @param string $class Text to set as the "class" attribute
*/ */
public function setClass($class) { public function setClass($class)
$this->updateAttributes(array ("class" => $class)); {
$this->updateAttributes(array("class" => $class));
} }
/** /**
@ -203,8 +211,9 @@ class cHTML extends cHTML5Common {
* *
* @param $class string Text to set as the "style" attribute * @param $class string Text to set as the "style" attribute
*/ */
public function setStyle($style) { public function setStyle($style)
$this->updateAttributes(array ("style" => $style)); {
$this->updateAttributes(array("style" => $style));
} }
/** /**
@ -216,11 +225,12 @@ class cHTML extends cHTML5Common {
* @param $event string Type of the event * @param $event string Type of the event
* @param $action string Function or action to call (JavaScript Code) * @param $action string Function or action to call (JavaScript Code)
*/ */
public function setEvent($event, $action) { public function setEvent($event, $action)
{
if (substr($event, 0, 2) != "on") { if (substr($event, 0, 2) != "on") {
$this->updateAttributes(array ("on".$event => $action)); $this->updateAttributes(array("on" . $event => $action));
} else { } else {
$this->updateAttributes(array ($event => $action)); $this->updateAttributes(array($event => $action));
} }
} }
@ -232,9 +242,10 @@ class cHTML extends cHTML5Common {
* *
* @param $event string Type of the event * @param $event string Type of the event
*/ */
public function unsetEvent($event) { public function unsetEvent($event)
{
if (substr($event, 0, 2) != "on") { if (substr($event, 0, 2) != "on") {
$this->removeAttribute("on".$event); $this->removeAttribute("on" . $event);
} else { } else {
$this->removeAttribute($event); $this->removeAttribute($event);
} }
@ -242,7 +253,7 @@ class cHTML extends cHTML5Common {
/** /**
* fillSkeleton: Fills the open SGML tag skeleton * fillSkeleton: Fills the open SGML tag skeleton
* *
* fillSkeleton fills the SGML opener tag with the * fillSkeleton fills the SGML opener tag with the
* specified attributes. Attributes need to be passed * specified attributes. Attributes need to be passed
* in the stringyfied variant. * in the stringyfied variant.
@ -250,11 +261,12 @@ class cHTML extends cHTML5Common {
* @param $attributes string Attributes to set * @param $attributes string Attributes to set
* @return string filled SGML opener skeleton * @return string filled SGML opener skeleton
*/ */
public function fillSkeleton($attributes) { public function fillSkeleton($attributes)
{
if ($this->_contentlessTag == true) { if ($this->_contentlessTag == true) {
return sprintf($this->_skeleton_single, $this->_tag, $attributes); return sprintf($this->_skeleton_single, $this->_tag, $attributes);
} else { } else {
return sprintf($this->_skeleton_open, $this->_tag, $attributes); return is_null($this->_skeleton_open) ? '' : sprintf($this->_skeleton_open, $this->_tag, $attributes);
} }
} }
@ -264,63 +276,68 @@ class cHTML extends cHTML5Common {
* @param none * @param none
* @return string filled SGML closer skeleton * @return string filled SGML closer skeleton
*/ */
public function fillCloseSkeleton() { public function fillCloseSkeleton()
return sprintf($this->_skeleton_close, $this->_tag); {
return is_null($this->_skeleton_close) ? '' : sprintf($this->_skeleton_close, $this->_tag);
} }
/** /**
* addStyleDefinition * addStyleDefinition
* *
* @deprecated name change, use attachStyleDefinition
* @param $entity string Entity to define * @param $entity string Entity to define
* @param $definition string Definition for the given entity * @param $definition string Definition for the given entity
* @return string filled SGML closing skeleton * @return string filled SGML closing skeleton
* @deprecated name change, use attachStyleDefinition
*/ */
public function setStyleDefinition($entity, $definition) { public function setStyleDefinition($entity, $definition)
{
$this->_styledefs[$entity] = $definition; $this->_styledefs[$entity] = $definition;
} }
/** /**
* attachStyleDefinition: Attaches a style definition. * attachStyleDefinition: Attaches a style definition.
* *
* This function is not restricted to a single style, e.g. * This function is not restricted to a single style, e.g.
* you can set multiple style definitions as-is to the handler. * you can set multiple style definitions as-is to the handler.
* *
* $example->attachStyle("myIdentifier", * $example->attachStyle("myIdentifier",
* "border: 1px solid black; white-space: nowrap"); * "border: 1px solid black; white-space: nowrap");
* $example->attachStyle("myIdentifier2", * $example->attachStyle("myIdentifier2",
* "padding: 0px"); * "padding: 0px");
* *
* Results in: * Results in:
* *
* style="border: 1px solid black; white-space: nowrap; padding: 0px;" * style="border: 1px solid black; white-space: nowrap; padding: 0px;"
* *
* @param $sName string Name for a style definition * @param $sName string Name for a style definition
* @param $sDefinition string Definition for the given entity * @param $sDefinition string Definition for the given entity
* @return string filled SGML closing skeleton * @return string filled SGML closing skeleton
*/ */
public function attachStyleDefinition($sName, $sDefinition) { public function attachStyleDefinition($sName, $sDefinition)
{
$this->_aStyleDefinitions[$sName] = $sDefinition; $this->_aStyleDefinitions[$sName] = $sDefinition;
} }
/** /**
* *
* @param string $script * @param string $script
*/ */
public function addRequiredScript($script) { public function addRequiredScript($script)
{
if (!is_array($this->_requiredScripts)) { if (!is_array($this->_requiredScripts)) {
$this->_requiredScripts = array (); $this->_requiredScripts = [];
} }
$this->_requiredScripts[] = $script; $this->_requiredScripts[] = $script;
$this->_requiredScripts = array_unique($this->_requiredScripts); $this->_requiredScripts = array_unique($this->_requiredScripts);
} }
/** /**
* *
* @param array $aAttributes * @param array $aAttributes
* @return array * @return array
*/ */
public function updateAttributes($aAttributes) { public function updateAttributes($aAttributes)
{
return $this->mergeAttributes($aAttributes); return $this->mergeAttributes($aAttributes);
} }
@ -330,20 +347,21 @@ class cHTML extends cHTML5Common {
* @param $content string/object String with the content or an object to render. * @param $content string/object String with the content or an object to render.
* *
*/ */
public function _setContent($content) { public function _setContent($content)
{
$this->setContentlessTag(false); $this->setContentlessTag(false);
/* Is it an array? */ /* Is it an array? */
if(is_array($content)) { if (is_array($content)) {
unset ($this->_content); unset ($this->_content);
$this->_content = ""; $this->_content = "";
foreach($content as $item) { foreach ($content as $item) {
if(is_object($item)) { if (is_object($item)) {
if(method_exists($item, "render")) { if (method_exists($item, "render")) {
$this->_content .= $item->render(); $this->_content .= $item->render();
} }
if(count($item->_requiredScripts) > 0) { if (count($item->_requiredScripts) > 0) {
$this->_requiredScripts = array_merge($this->_requiredScripts, $item->_requiredScripts); $this->_requiredScripts = array_merge($this->_requiredScripts, $item->_requiredScripts);
} }
} else { } else {
@ -351,12 +369,12 @@ class cHTML extends cHTML5Common {
} }
} }
} else { } else {
if(is_object($content)) { if (is_object($content)) {
if(method_exists($content, "render")) { if (method_exists($content, "render")) {
$this->_content = $content->render(); $this->_content = $content->render();
} }
if(count($content->_requiredScripts) > 0) { if (is_countable($content->_requiredScripts) && count($content->_requiredScripts) > 0) {
$this->_requiredScripts = array_merge($this->_requiredScripts, $content->_requiredScripts); $this->_requiredScripts = array_merge($this->_requiredScripts, $content->_requiredScripts);
} }
return; return;
@ -368,91 +386,95 @@ class cHTML extends cHTML5Common {
/** /**
* attachEventDefinition: Attaches the code for an event * attachEventDefinition: Attaches the code for an event
* *
* Example to attach an onClick handler: * Example to attach an onClick handler:
* setEventDefinition("foo", "onClick", "alert('foo');"); * setEventDefinition("foo", "onClick", "alert('foo');");
* *
* @param $sName string defines the name of the event * @param $sName string defines the name of the event
* @param $sEvent string defines the event (e.g. onClick) * @param $sEvent string defines the event (e.g. onClick)
* @param $sCode string defines the code * @param $sCode string defines the code
*/ */
public function attachEventDefinition($sName, $sEvent, $sCode) { public function attachEventDefinition($sName, $sEvent, $sCode)
{
$this->_aEventDefinitions[strtolower($sEvent)][$sName] = $sCode; $this->_aEventDefinitions[strtolower($sEvent)][$sName] = $sCode;
} }
/** /**
* setAttribte: Sets a specific attribute * setAttribte: Sets a specific attribute
* *
* @param $sAttributeName string Name of the attribute * @param $sAttributeName string Name of the attribute
* @param $sValue string Value of the attribute * @param $sValue string Value of the attribute
*/ */
public function setAttribute($sAttributeName, $sValue = NULL) { public function setAttribute($sAttributeName, $sValue = NULL)
{
$sAttributeName = strtolower($sAttributeName); $sAttributeName = strtolower($sAttributeName);
if (is_null($sValue)) { if (is_null($sValue)) {
$sValue = $sAttributeName; $sValue = $sAttributeName;
} }
$this->updateAttributes(array ($sAttributeName => $sValue)); $this->updateAttributes(array($sAttributeName => $sValue));
} }
/** /**
* *
* @return string * @return string
*/ */
public function __toString() { public function __toString()
{
return $this->toHtml(); return $this->toHtml();
} }
/** /**
* Renders the output * Renders the output
* If the tag * If the tag
*/ */
public function toHTML() { public function toHTML()
/* Fill style definition */ {
$style = $this->getAttribute("style"); /* Fill style definition */
$style = $this->getAttribute("style");
/* If the style doesn't end with a semicolon, append one */
if(!empty($style) && is_string($style)) { /* If the style doesn't end with a semicolon, append one */
$style = trim($style); if (!empty($style) && is_string($style)) {
$style = trim($style);
if (substr($style, strlen($style) - 1) != ";") {
$style .= ";"; if (substr($style, strlen($style) - 1) != ";") {
} $style .= ";";
} }
}
foreach($this->_aStyleDefinitions as $sKey => $sEntry) {
$style .= $sKey.': '.$sEntry; foreach ($this->_aStyleDefinitions as $sKey => $sEntry) {
$style .= $sKey . ': ' . $sEntry;
if (substr($style, strlen($style) - 1) != ";") {
$style .= ";"; if (substr($style, strlen($style) - 1) != ";") {
} $style .= ";";
} }
/* Apply all stored styles */ }
foreach ($this->_styledefs as $key => $value) { /* Apply all stored styles */
$style .= "$key: $value;"; foreach ($this->_styledefs as $key => $value) {
} $style .= "$key: $value;";
}
if ($style != "") {
$this->setStyle($style); if ($style != "") {
} $this->setStyle($style);
}
foreach($this->_aEventDefinitions as $sEventName => $sEntry) {
$aFullCode = array(); foreach ($this->_aEventDefinitions as $sEventName => $sEntry) {
$aFullCode = [];
foreach ($sEntry as $sName => $sCode) {
$aFullCode[] = $sCode; foreach ($sEntry as $sName => $sCode) {
} $aFullCode[] = $sCode;
$this->setAttribute($sEventName, $this->getAttribute($sEventName).implode(" ", $aFullCode)); }
} $this->setAttribute($sEventName, $this->getAttribute($sEventName) . implode(" ", $aFullCode));
}
if ($this->_content != "" || $this->_contentlessTag == false) {
$attributes = $this->getAttributes(true); if ($this->_content != "" || $this->_contentlessTag == false) {
return $this->fillSkeleton($attributes).$this->_content.$this->fillCloseSkeleton(); $attributes = $this->getAttributes(true);
} else { return $this->fillSkeleton($attributes) . $this->_content . $this->fillCloseSkeleton();
/* This is a single style tag */ } else {
$attributes = $this->getAttributes(true); /* This is a single style tag */
return $this->fillSkeleton($attributes); $attributes = $this->getAttributes(true);
} return $this->fillSkeleton($attributes);
} }
}
/** /**
* render(): Alias for toHtml * render(): Alias for toHtml
@ -460,8 +482,8 @@ class cHTML extends cHTML5Common {
* @param none * @param none
* @return string Rendered HTML * @return string Rendered HTML
*/ */
public function render() { public function render()
{
return $this->toHtml(); return $this->toHtml();
} }
} }
?>

22
setup/lib/class.setupcontrols.php
Datei anzeigen

@ -39,6 +39,7 @@ class cHTMLAlphaImage extends cHTMLImage {
public function __construct() public function __construct()
{ {
parent::__construct();
} }
function setMouseover ($sMouseoverSrc) function setMouseover ($sMouseoverSrc)
@ -76,9 +77,9 @@ class cHTMLAlphaImage extends cHTMLImage {
$this->attachEventDefinition("mouseover", "onMouseOut", sprintf($sMouseScript, $this->_src) ); $this->attachEventDefinition("mouseover", "onMouseOut", sprintf($sMouseScript, $this->_src) );
} }
} }
return null;
return parent::toHTML();
} }
} }
@ -90,6 +91,7 @@ class cHTMLErrorMessageList extends cHTMLDiv {
public function __construct() { public function __construct() {
$this->_oTable = new cHTMLTable(); $this->_oTable = new cHTMLTable();
$this->_oTable->setWidth("100%"); $this->_oTable->setWidth("100%");
parent::__construct();
$this->setClass("errorlist"); $this->setClass("errorlist");
$this->setStyle("width: 450px; height: 218px; overflow: auto; border: 1px solid black;"); $this->setStyle("width: 450px; height: 218px; overflow: auto; border: 1px solid black;");
} }
@ -100,7 +102,7 @@ class cHTMLErrorMessageList extends cHTMLDiv {
function toHTML() { function toHTML() {
$this->_setContent($this->_oTable->render()); $this->_setContent($this->_oTable->render());
return null; return parent::toHTML();
} }
} }
@ -161,11 +163,12 @@ class cHTMLFoldableErrorMessage extends cHTMLTableRow {
} else { } else {
$this->_oIcon->setContent("&nbsp;"); $this->_oIcon->setContent("&nbsp;");
} }
parent::__construct();
} }
function toHTML() { function toHTML() {
$this->setContent([$this->_oFolding, $this->_oContent, $this->_oIcon]); $this->setContent([$this->_oFolding, $this->_oContent, $this->_oIcon]);
return null; return parent::toHTML();
} }
} }
@ -187,11 +190,13 @@ class cHTMLInfoMessage extends cHTMLTableRow {
$this->_oTitle->setVerticalAlignment("top"); $this->_oTitle->setVerticalAlignment("top");
$this->_oMessage->setContent($sMessage); $this->_oMessage->setContent($sMessage);
$this->_oMessage->setClass("entry_nowrap"); $this->_oMessage->setClass("entry_nowrap");
parent::__construct();
} }
function toHTML() { function toHTML() {
$this->setContent([$this->_oTitle, $this->_oMessage]); $this->setContent([$this->_oTitle, $this->_oMessage]);
return null; return parent::toHTML();
} }
} }
@ -204,6 +209,8 @@ class cHTMLLanguageLink extends cHTMLDiv {
* @param int $stepnumber * @param int $stepnumber
*/ */
function __construct($langcode, $langname, $stepnumber) { function __construct($langcode, $langname, $stepnumber) {
parent::__construct();
$linkImage = new cHTMLAlphaImage(); $linkImage = new cHTMLAlphaImage();
$linkImage->setAlt(""); $linkImage->setAlt("");
$linkImage->setSrc("../conlite/images/submit.gif"); $linkImage->setSrc("../conlite/images/submit.gif");
@ -242,6 +249,8 @@ class cHTMLButtonLink extends cHTMLDiv {
* @param string $title * @param string $title
*/ */
function __construct($href, $title) { function __construct($href, $title) {
parent::__construct();
$linkImage = new cHTMLAlphaImage(); $linkImage = new cHTMLAlphaImage();
$linkImage->setSrc("../conlite/images/submit.gif"); $linkImage->setSrc("../conlite/images/submit.gif");
$linkImage->setMouseover("../conlite/images/submit_hover.gif"); $linkImage->setMouseover("../conlite/images/submit_hover.gif");
@ -268,5 +277,4 @@ class cHTMLButtonLink extends cHTMLDiv {
$alignment = '<table border="0" width="100%%" cellspacing="0" cellpadding="0"><tr><td valign="middle">%s</td><td valign="middle" align="right">%s</td></tr></table>'; $alignment = '<table border="0" width="100%%" cellspacing="0" cellpadding="0"><tr><td valign="middle">%s</td><td valign="middle" align="right">%s</td></tr></table>';
$this->setContent(sprintf($alignment, $link->render(), $link2->render())); $this->setContent(sprintf($alignment, $link->render(), $link2->render()));
} }
} }
?>

4
setup/lib/startup.php
Datei anzeigen

@ -100,6 +100,7 @@ if(!is_dir($cfg['path']['conlite_config'])) {
$cfg['native_i18n'] = false; $cfg['native_i18n'] = false;
// includes // includes
checkAndInclude($cfg['path']['conlite'] . 'classes/con2con/class.registry.php');
checkAndInclude($cfg['path']['frontend'] . '/pear/HTML/Common2.php'); checkAndInclude($cfg['path']['frontend'] . '/pear/HTML/Common2.php');
checkAndInclude($cfg['path']['conlite'] . 'classes/cHTML5/class.chtml5.common.php'); checkAndInclude($cfg['path']['conlite'] . 'classes/cHTML5/class.chtml5.common.php');
checkAndInclude($cfg['path']['conlite'] . 'classes/cHTML5/class.chtml.php'); checkAndInclude($cfg['path']['conlite'] . 'classes/cHTML5/class.chtml.php');
@ -119,5 +120,4 @@ checkAndInclude('lib/functions.libraries.php');
checkAndInclude('lib/functions.sql.php'); checkAndInclude('lib/functions.sql.php');
checkAndInclude('lib/functions.setup.php'); checkAndInclude('lib/functions.setup.php');
checkAndInclude('lib/class.template.php'); checkAndInclude('lib/class.template.php');
checkAndInclude('lib/class.setupmask.php'); checkAndInclude('lib/class.setupmask.php');
?>