fixed missing images in setup
fixed php8 errors
Dieser Commit ist enthalten in:
Ortwin Pinke
Ursprung
629983db56
Commit
41c69d53fe
|
|
@ -3,23 +3,8 @@
|
|||
<component name="PHPUnit">
|
||||
<option name="directories">
|
||||
<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/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" />
|
||||
</list>
|
||||
</option>
|
||||
|
|
|
|||
|
|
@ -2,5 +2,6 @@
|
|||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$/conlite/plugins/cl-mod-rewrite" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -29,7 +29,8 @@ $cHTMLIDCount = 0;
|
|||
*
|
||||
* @author Ortwin Pinke <o.pinke@conlite.org>
|
||||
*/
|
||||
class cHTML extends cHTML5Common {
|
||||
class cHTML extends cHTML5Common
|
||||
{
|
||||
|
||||
/**
|
||||
* Storage of the open SGML tag template
|
||||
|
|
@ -57,15 +58,15 @@ class cHTML extends cHTML5Common {
|
|||
|
||||
/**
|
||||
* Defines the style definitions
|
||||
* @var string
|
||||
* @var array
|
||||
*/
|
||||
protected $_styledefs;
|
||||
protected $_styledefs = [];
|
||||
|
||||
/**
|
||||
* Defines all scripts which are required by the current element
|
||||
* @var array
|
||||
*/
|
||||
protected $_requiredScripts;
|
||||
protected $_requiredScripts = [];
|
||||
|
||||
/**
|
||||
* @var boolean Defines if the current tag is a contentless tag
|
||||
|
|
@ -75,12 +76,12 @@ class cHTML extends cHTML5Common {
|
|||
/**
|
||||
* @var array Defines which JS events contain which scripts
|
||||
*/
|
||||
protected $_aEventDefinitions;
|
||||
protected $_aEventDefinitions = [];
|
||||
|
||||
/**
|
||||
* @var array Style definitions
|
||||
*/
|
||||
protected $_aStyleDefinitions;
|
||||
protected $_aStyleDefinitions = [];
|
||||
|
||||
/**
|
||||
* @var string The content itself
|
||||
|
|
@ -96,9 +97,10 @@ class cHTML extends cHTML5Common {
|
|||
* @param none
|
||||
* @return void
|
||||
*/
|
||||
public function __construct() {
|
||||
global $cfg;
|
||||
$this->_aCfg = $cfg;
|
||||
public function __construct()
|
||||
{
|
||||
|
||||
$this->_aCfg = cRegistry::getConfig();
|
||||
|
||||
parent::__construct();
|
||||
$this->_skeleton_open = '<%s%s>';
|
||||
|
|
@ -122,20 +124,21 @@ class cHTML extends cHTML5Common {
|
|||
$this->_skeleton_single = '<%s%s>';
|
||||
}
|
||||
|
||||
$this->_styledefs = array ();
|
||||
$this->_aStyleDefinitions = array();
|
||||
$this->_styledefs = [];
|
||||
$this->_aStyleDefinitions = [];
|
||||
$this->setContentlessTag();
|
||||
|
||||
$this->advanceID();
|
||||
$this->_requiredScripts = array ();
|
||||
$this->_aEventDefinitions = array ();
|
||||
$this->_requiredScripts = [];
|
||||
$this->_aEventDefinitions = [];
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param type $contentlessTag
|
||||
*/
|
||||
public function setContentlessTag($contentlessTag = true) {
|
||||
public function setContentlessTag($contentlessTag = true)
|
||||
{
|
||||
$this->_contentlessTag = $contentlessTag;
|
||||
}
|
||||
|
||||
|
|
@ -147,7 +150,8 @@ class cHTML extends cHTML5Common {
|
|||
*
|
||||
* @return void
|
||||
*/
|
||||
public function advanceID() {
|
||||
public function advanceID()
|
||||
{
|
||||
global $cHTMLIDCount;
|
||||
|
||||
$cHTMLIDCount++;
|
||||
|
|
@ -159,7 +163,8 @@ class cHTML extends cHTML5Common {
|
|||
*
|
||||
* @return string current ID
|
||||
*/
|
||||
public function getID() {
|
||||
public function getID()
|
||||
{
|
||||
return $this->getAttribute("id");
|
||||
}
|
||||
|
||||
|
|
@ -175,7 +180,8 @@ class cHTML extends cHTML5Common {
|
|||
*
|
||||
* @param string $alt Text to set as the "alt" attribute
|
||||
*/
|
||||
public function setAlt($alt) {
|
||||
public function setAlt($alt)
|
||||
{
|
||||
$attributes = array("alt" => $alt, "title" => $alt);
|
||||
$this->updateAttributes($attributes);
|
||||
}
|
||||
|
|
@ -185,7 +191,8 @@ class cHTML extends cHTML5Common {
|
|||
*
|
||||
* @param string $class Text to set as the "id"
|
||||
*/
|
||||
public function setID($id) {
|
||||
public function setID($id)
|
||||
{
|
||||
$this->updateAttributes(array("id" => $id));
|
||||
}
|
||||
|
||||
|
|
@ -194,7 +201,8 @@ class cHTML extends cHTML5Common {
|
|||
*
|
||||
* @param string $class Text to set as the "class" attribute
|
||||
*/
|
||||
public function setClass($class) {
|
||||
public function setClass($class)
|
||||
{
|
||||
$this->updateAttributes(array("class" => $class));
|
||||
}
|
||||
|
||||
|
|
@ -203,7 +211,8 @@ class cHTML extends cHTML5Common {
|
|||
*
|
||||
* @param $class string Text to set as the "style" attribute
|
||||
*/
|
||||
public function setStyle($style) {
|
||||
public function setStyle($style)
|
||||
{
|
||||
$this->updateAttributes(array("style" => $style));
|
||||
}
|
||||
|
||||
|
|
@ -216,7 +225,8 @@ class cHTML extends cHTML5Common {
|
|||
* @param $event string Type of the event
|
||||
* @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") {
|
||||
$this->updateAttributes(array("on" . $event => $action));
|
||||
} else {
|
||||
|
|
@ -232,7 +242,8 @@ class cHTML extends cHTML5Common {
|
|||
*
|
||||
* @param $event string Type of the event
|
||||
*/
|
||||
public function unsetEvent($event) {
|
||||
public function unsetEvent($event)
|
||||
{
|
||||
if (substr($event, 0, 2) != "on") {
|
||||
$this->removeAttribute("on" . $event);
|
||||
} else {
|
||||
|
|
@ -250,11 +261,12 @@ class cHTML extends cHTML5Common {
|
|||
* @param $attributes string Attributes to set
|
||||
* @return string filled SGML opener skeleton
|
||||
*/
|
||||
public function fillSkeleton($attributes) {
|
||||
public function fillSkeleton($attributes)
|
||||
{
|
||||
if ($this->_contentlessTag == true) {
|
||||
return sprintf($this->_skeleton_single, $this->_tag, $attributes);
|
||||
} else {
|
||||
return sprintf($this->_skeleton_open, $this->_tag, $attributes);
|
||||
return is_null($this->_skeleton_open) ? '' : sprintf($this->_skeleton_open, $this->_tag, $attributes);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -264,19 +276,21 @@ class cHTML extends cHTML5Common {
|
|||
* @param none
|
||||
* @return string filled SGML closer skeleton
|
||||
*/
|
||||
public function fillCloseSkeleton() {
|
||||
return sprintf($this->_skeleton_close, $this->_tag);
|
||||
public function fillCloseSkeleton()
|
||||
{
|
||||
return is_null($this->_skeleton_close) ? '' : sprintf($this->_skeleton_close, $this->_tag);
|
||||
}
|
||||
|
||||
/**
|
||||
* addStyleDefinition
|
||||
*
|
||||
* @deprecated name change, use attachStyleDefinition
|
||||
* @param $entity string Entity to define
|
||||
* @param $definition string Definition for the given entity
|
||||
* @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;
|
||||
}
|
||||
|
||||
|
|
@ -299,7 +313,8 @@ class cHTML extends cHTML5Common {
|
|||
* @param $sDefinition string Definition for the given entity
|
||||
* @return string filled SGML closing skeleton
|
||||
*/
|
||||
public function attachStyleDefinition($sName, $sDefinition) {
|
||||
public function attachStyleDefinition($sName, $sDefinition)
|
||||
{
|
||||
$this->_aStyleDefinitions[$sName] = $sDefinition;
|
||||
}
|
||||
|
||||
|
|
@ -307,9 +322,10 @@ class cHTML extends cHTML5Common {
|
|||
*
|
||||
* @param string $script
|
||||
*/
|
||||
public function addRequiredScript($script) {
|
||||
public function addRequiredScript($script)
|
||||
{
|
||||
if (!is_array($this->_requiredScripts)) {
|
||||
$this->_requiredScripts = array ();
|
||||
$this->_requiredScripts = [];
|
||||
}
|
||||
$this->_requiredScripts[] = $script;
|
||||
$this->_requiredScripts = array_unique($this->_requiredScripts);
|
||||
|
|
@ -320,7 +336,8 @@ class cHTML extends cHTML5Common {
|
|||
* @param array $aAttributes
|
||||
* @return array
|
||||
*/
|
||||
public function updateAttributes($aAttributes) {
|
||||
public function updateAttributes($aAttributes)
|
||||
{
|
||||
return $this->mergeAttributes($aAttributes);
|
||||
}
|
||||
|
||||
|
|
@ -330,7 +347,8 @@ class cHTML extends cHTML5Common {
|
|||
* @param $content string/object String with the content or an object to render.
|
||||
*
|
||||
*/
|
||||
public function _setContent($content) {
|
||||
public function _setContent($content)
|
||||
{
|
||||
$this->setContentlessTag(false);
|
||||
/* Is it an array? */
|
||||
if (is_array($content)) {
|
||||
|
|
@ -356,7 +374,7 @@ class cHTML extends cHTML5Common {
|
|||
$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);
|
||||
}
|
||||
return;
|
||||
|
|
@ -376,7 +394,8 @@ class cHTML extends cHTML5Common {
|
|||
* @param $sEvent string defines the event (e.g. onClick)
|
||||
* @param $sCode string defines the code
|
||||
*/
|
||||
public function attachEventDefinition($sName, $sEvent, $sCode) {
|
||||
public function attachEventDefinition($sName, $sEvent, $sCode)
|
||||
{
|
||||
$this->_aEventDefinitions[strtolower($sEvent)][$sName] = $sCode;
|
||||
}
|
||||
|
||||
|
|
@ -386,7 +405,8 @@ class cHTML extends cHTML5Common {
|
|||
* @param $sAttributeName string Name 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);
|
||||
if (is_null($sValue)) {
|
||||
$sValue = $sAttributeName;
|
||||
|
|
@ -398,7 +418,8 @@ class cHTML extends cHTML5Common {
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function __toString() {
|
||||
public function __toString()
|
||||
{
|
||||
return $this->toHtml();
|
||||
}
|
||||
|
||||
|
|
@ -406,7 +427,8 @@ class cHTML extends cHTML5Common {
|
|||
* Renders the output
|
||||
* If the tag
|
||||
*/
|
||||
public function toHTML() {
|
||||
public function toHTML()
|
||||
{
|
||||
/* Fill style definition */
|
||||
$style = $this->getAttribute("style");
|
||||
|
||||
|
|
@ -436,7 +458,7 @@ class cHTML extends cHTML5Common {
|
|||
}
|
||||
|
||||
foreach ($this->_aEventDefinitions as $sEventName => $sEntry) {
|
||||
$aFullCode = array();
|
||||
$aFullCode = [];
|
||||
|
||||
foreach ($sEntry as $sName => $sCode) {
|
||||
$aFullCode[] = $sCode;
|
||||
|
|
@ -460,8 +482,8 @@ class cHTML extends cHTML5Common {
|
|||
* @param none
|
||||
* @return string Rendered HTML
|
||||
*/
|
||||
public function render() {
|
||||
public function render()
|
||||
{
|
||||
return $this->toHtml();
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -39,6 +39,7 @@ class cHTMLAlphaImage extends cHTMLImage {
|
|||
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
function setMouseover ($sMouseoverSrc)
|
||||
|
|
@ -78,7 +79,7 @@ class cHTMLAlphaImage extends cHTMLImage {
|
|||
}
|
||||
|
||||
|
||||
return null;
|
||||
return parent::toHTML();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -90,6 +91,7 @@ class cHTMLErrorMessageList extends cHTMLDiv {
|
|||
public function __construct() {
|
||||
$this->_oTable = new cHTMLTable();
|
||||
$this->_oTable->setWidth("100%");
|
||||
parent::__construct();
|
||||
$this->setClass("errorlist");
|
||||
$this->setStyle("width: 450px; height: 218px; overflow: auto; border: 1px solid black;");
|
||||
}
|
||||
|
|
@ -100,7 +102,7 @@ class cHTMLErrorMessageList extends cHTMLDiv {
|
|||
|
||||
function toHTML() {
|
||||
$this->_setContent($this->_oTable->render());
|
||||
return null;
|
||||
return parent::toHTML();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -161,11 +163,12 @@ class cHTMLFoldableErrorMessage extends cHTMLTableRow {
|
|||
} else {
|
||||
$this->_oIcon->setContent(" ");
|
||||
}
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
function toHTML() {
|
||||
$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->_oMessage->setContent($sMessage);
|
||||
$this->_oMessage->setClass("entry_nowrap");
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
function toHTML() {
|
||||
$this->setContent([$this->_oTitle, $this->_oMessage]);
|
||||
return null;
|
||||
return parent::toHTML();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -204,6 +209,8 @@ class cHTMLLanguageLink extends cHTMLDiv {
|
|||
* @param int $stepnumber
|
||||
*/
|
||||
function __construct($langcode, $langname, $stepnumber) {
|
||||
parent::__construct();
|
||||
|
||||
$linkImage = new cHTMLAlphaImage();
|
||||
$linkImage->setAlt("");
|
||||
$linkImage->setSrc("../conlite/images/submit.gif");
|
||||
|
|
@ -242,6 +249,8 @@ class cHTMLButtonLink extends cHTMLDiv {
|
|||
* @param string $title
|
||||
*/
|
||||
function __construct($href, $title) {
|
||||
parent::__construct();
|
||||
|
||||
$linkImage = new cHTMLAlphaImage();
|
||||
$linkImage->setSrc("../conlite/images/submit.gif");
|
||||
$linkImage->setMouseover("../conlite/images/submit_hover.gif");
|
||||
|
|
@ -269,4 +278,3 @@ class cHTMLButtonLink extends cHTMLDiv {
|
|||
$this->setContent(sprintf($alignment, $link->render(), $link2->render()));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -100,6 +100,7 @@ if(!is_dir($cfg['path']['conlite_config'])) {
|
|||
$cfg['native_i18n'] = false;
|
||||
|
||||
// includes
|
||||
checkAndInclude($cfg['path']['conlite'] . 'classes/con2con/class.registry.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.chtml.php');
|
||||
|
|
@ -120,4 +121,3 @@ checkAndInclude('lib/functions.sql.php');
|
|||
checkAndInclude('lib/functions.setup.php');
|
||||
checkAndInclude('lib/class.template.php');
|
||||
checkAndInclude('lib/class.setupmask.php');
|
||||
?>
|
||||
|
|
|
|||
Laden…
In neuem Issue referenzieren