Skip to content
Snippets Groups Projects

OP#7365 PHP-8.1 - Upgrade - cronlog Viewer (monitors.ascii)https://projects.iml.unibe.ch/work_packages/7365

Merged Hahn Axel (hahn) requested to merge freshup-php into master
2 files
+ 1172
729
Compare changes
  • Side-by-side
  • Inline

Files

+ 50
128
@@ -15,27 +15,33 @@
@@ -15,27 +15,33 @@
* - icon - will be added as <i class="[icon value]"></i> to the label
* - icon - will be added as <i class="[icon value]"></i> to the label
*
*
* @author Axel
* @author Axel
 
*
 
* 2024-07-04 <axel.hahn@unibe.ch> added type declarations; update php docs
 
* 2024-08-26 <axel.hahn@unibe.ch> remove unneeded methods; simplify icon methods; update phpdocs
*/
*/
class htmlelements {
class htmlelements
 
{
/**
/**
* set of auto generated icon prefixes
* Extracted label from array with attributes
* @var type
* @var string
*/
*/
var $_aIcons=array(
// 'fa-'=>'fa ',
);
var $_sLabel = '';
var $_sLabel = '';
var $_aAttributes = array();
/**
 
* Array of attributes for a html tag
 
* @var array
 
*/
 
var $_aAttributes = [];
 
// ----------------------------------------------------------------------
// ----------------------------------------------------------------------
// CONSTRUCTOR
// CONSTRUCTOR
// ----------------------------------------------------------------------
// ----------------------------------------------------------------------
public function __construct() {
public function __construct()
return true;
{
 
// nothiung here
}
}
// ----------------------------------------------------------------------
// ----------------------------------------------------------------------
@@ -43,27 +49,28 @@ class htmlelements {
@@ -43,27 +49,28 @@ class htmlelements {
// PRIVATE FUNCTIONS
// PRIVATE FUNCTIONS
//
//
// ----------------------------------------------------------------------
// ----------------------------------------------------------------------
/**
/**
* generate html attibutes with all internal attributes key -> values
* generate html attibutes with all internal attributes key -> values
 
* to be added in opening tag
* @return string
* @return string
*/
*/
protected function _addAttributes() {
protected function _addAttributes(): string
 
{
$sReturn = '';
$sReturn = '';
foreach ($this->_aAttributes as $sAttr => $sValue) {
foreach ($this->_aAttributes as $sAttr => $sValue) {
if(is_array($sValue)){
if (is_array($sValue)) {
echo "ERROR: an html tag was defined with array in attribute [$sAttr]:<br><pre>".print_r($this->_aAttributes, 1)."</pre>";
echo "ERROR: an html tag was defined with array in attribute [$sAttr]:<br><pre>" . print_r($this->_aAttributes, 1) . "</pre>";
}
}
$sReturn .= ' '.$sAttr . '="' . $sValue . '"';
$sReturn .= " $sAttr=\"$sValue\"";
}
}
return $sReturn;
return $sReturn;
}
}
/**
/**
* internal helper: fetch all attributes from key-value hash;
* Internal helper: fetch all attributes from key-value hash;
* Specialties here:
* Specialties here:
* - label will be extracted from key 'label'
* - label will be extracted from key 'label'
* - and optional existing key 'icon' will be added at beginning of a label
* - and optional existing key 'icon' will be added at beginning of a label
@@ -71,17 +78,18 @@ class htmlelements {
@@ -71,17 +78,18 @@ class htmlelements {
* @param array $aAttributes
* @param array $aAttributes
* @return boolean
* @return boolean
*/
*/
protected function _setAttributes($aAttributes){
protected function _setAttributes(array $aAttributes): bool
$this->_sLabel='';
{
if(isset($aAttributes['icon']) && $aAttributes['icon']){
$this->_sLabel = '';
$this->_sLabel.=$this->getIcon($aAttributes['icon']);
if (isset($aAttributes['icon']) && $aAttributes['icon']) {
 
$this->_sLabel .= $this->getIcon($aAttributes['icon']);
unset($aAttributes['icon']);
unset($aAttributes['icon']);
}
}
if(isset($aAttributes['label']) && $aAttributes['label']){
if (isset($aAttributes['label']) && $aAttributes['label']) {
$this->_sLabel .= $aAttributes['label'];
$this->_sLabel .= $aAttributes['label'];
unset($aAttributes['label']);
unset($aAttributes['label']);
}
}
$this->_aAttributes=$aAttributes;
$this->_aAttributes = $aAttributes;
return true;
return true;
}
}
@@ -91,21 +99,22 @@ class htmlelements {
@@ -91,21 +99,22 @@ class htmlelements {
// HTML GENERIC
// HTML GENERIC
//
//
// ----------------------------------------------------------------------
// ----------------------------------------------------------------------
/**
/**
* generic function to get html code for a single tag
* Generic function to get html code for a single tag
*
*
* @param string $sTag tag name
* @param string $sTag tag name
* @param array $aAttributes array with attributes (optional including 'icon' and 'label')
* @param array $aAttributes array with attributes (optional including 'icon' and 'label')
* @param boolean $bCloseTag optional: set false if tag has no closing tag (= ending with "/>")
* @param boolean $bCloseTag optional: set false if tag has no closing tag (= ending with "/>")
* @return type
* @return string html code
*/
*/
public function getTag($sTag, $aAttributes, $bCloseTag=true){
public function getTag(string $sTag, array $aAttributes, bool $bCloseTag = true): string
 
{
$sTpl = $bCloseTag ? "<$sTag%s>%s</$sTag>" : "<$sTag %s/>%s";
$sTpl = $bCloseTag ? "<$sTag%s>%s</$sTag>" : "<$sTag %s/>%s";
$this->_setAttributes($aAttributes);
$this->_setAttributes($aAttributes);
return sprintf($sTpl, $this->_addAttributes(), $this->_sLabel);
return sprintf($sTpl, $this->_addAttributes(), $this->_sLabel);
}
}
// ----------------------------------------------------------------------
// ----------------------------------------------------------------------
//
//
// PUBLIC FUNCTIONS
// PUBLIC FUNCTIONS
@@ -114,109 +123,22 @@ class htmlelements {
@@ -114,109 +123,22 @@ class htmlelements {
// ----------------------------------------------------------------------
// ----------------------------------------------------------------------
/**
/**
* helper detect prefix of a string add prefix of a framework
* Helper detect prefix of a string add prefix of a framework
* i.e. value "fa-close" detects font awesome and adds "fa " as prefix
* i.e. value "fa-close" detects font awesome and adds "fa " as prefix
*
*
* @param string $sIconclass
* @param string $sIconclass
* @return boolean
* @return string HTML code
*/
*/
public function getIcon($sIconclass=false){
public function getIcon(string $sIconclass = ''): string
if(!$sIconclass){
{
 
if (!$sIconclass) {
return '';
return '';
}
}
$sPrefix='';
foreach ($this->_aIcons as $sPrefix =>$add) {
if (strpos($sIconclass, $sPrefix)===0){
$sPrefix=$add;
continue;
}
}
// do not use this .. it overrides internal attribute vars
// return $this->getTag('i', array('class'=>$sPrefix.$sIconclass));
return '<i class="'.$sPrefix.$sIconclass.'"></i> ';
}
// ----------------------------------------------------------------------
//
// PUBLIC FUNCTIONS
// HTML COMPONENTS
//
// ----------------------------------------------------------------------
/**
// do not use this .. it overrides internal attribute vars
* get html code for an input field
// return $this->getTag('i', ['class'=>$sIconclass]);
*
* @param array $aAttributes attributes of the select tag
* @return string
*/
public function getFormInput($aAttributes){
$sTpl = '<input %s/>';
$this->_setAttributes($aAttributes);
return sprintf($sTpl, $this->_addAttributes());
}
/**
* get html code for an option field in a select drop down
*
* @param array $aAttributes attributes of the option tag
* @return string
*/
public function getFormOption($aAttributes){
$sTpl = '<option %s>%s</option>';
$this->_setAttributes($aAttributes);
return sprintf($sTpl, $this->_addAttributes(), $this->_sLabel);
}
/**
* get html code for a select drop down
*
* @param array $aAttributes attributes of the select tag
* @param array $aOptions array for all option fields
* @return string
*/
public function getFormSelect($aAttributes, $aOptions=array()){
// $sTpl = '<select %s>%s</select>';
if(!count($aOptions)){
return "<i class=\"$sIconclass\"></i>&nbsp;&nbsp;";
return false;
}
$sOptions='';
foreach($aOptions as $aOptionAttributes){
// $sOptions.=$this->getFormOption($aOptionAttributes);
$sOptions.=$this->getTag('option', $aOptionAttributes);
}
$aAttributes['label']=$sOptions;
return $this->getTag('select', $aAttributes);
/*
$this->_setAttributes($aAttributes);
return sprintf($sTpl, $this->_addAttributes(), $sOptions);
*
*/
}
}
public function getTable($aHead, $aBody, $aTableAttributes=array()){
$sReturn='';
$sTdata='';
$sThead='';
$sTpl = '<table %s>'
. '<thead><tr>%s</tr></thead>'
. '<tbody>%s</tbody>'
. '</table>';
foreach($aHead as $sTh){
$sThead.='<th>'.$sTh.'</th>';
}
foreach($aBody as $aTr){
$sTdata.='<tr>';
foreach($aTr as $sTd){
$sTdata.='<td>'.$sTd.'</td>';
}
$sTdata.='</tr>';
}
$this->_setAttributes($aTableAttributes);
return sprintf($sTpl,
$this->_addAttributes(),
$sThead,
$sTdata
);
}
}
}
Loading