diff --git a/admin/config.apnl.php b/admin/config.apnl.php index fd17a9f..1b52fc3 100644 --- a/admin/config.apnl.php +++ b/admin/config.apnl.php @@ -60,7 +60,7 @@ class config_panel extends admin_module{ $panel->content.="

".$key."

"; foreach($val as $v){ - $panel->content.=""; + $panel->content.=""; } $panel->content.="
".$v["title"]."
".$v["description"]."
".$this->get_option($v["option"],$v["name"])."
".$v["title"]."
".$v["description"]."
".$panel->get_option($v["option"],$v["name"])."
"; @@ -74,99 +74,6 @@ class config_panel extends admin_module{ //bottomAccordion.activate($$(\'vertical_container .accordion_toggle\')[0]); '; } - - function get_option($option,$name) { - global $config,$db,$panel,$userinfo,$admin,$root,$firephp,$lang; - - if($option=="yesno"){ - $checked["yes"]=""; - $checked["no"]=""; - if($config[$name]==1||$config[$name]==True||$config[$name]=="yes"){ - $checked["yes"]='checked="checked"'; - }else{ - $checked["no"]='checked="checked"'; - } - $yn=$panel->radio(array("name"=>$name,"value"=>"1"),$checked["yes"],TRUE); - $yn.="Ja"; - $yn.=$panel->radio(array("name"=>$name,"value"=>"0"),$checked["no"],TRUE); - $yn.="Nein"; - return $yn; - } - if($option=="onoff"){ - $checked["on"]=""; - $checked["off"]=""; - if($config[$name]==1||$config[$name]==True||$config[$name]=="on"){ - $checked["on"]='checked="checked"'; - }else{ - $checked["off"]='checked="checked"'; - } - $yn=$panel->radio(array("name"=>$name,"value"=>"1"),$checked["on"],TRUE); - $yn.="An"; - $yn.=$panel->radio(array("name"=>$name,"value"=>"0"),$checked["off"],TRUE); - $yn.="Aus"; - return $yn; - } - - if($option=="language"){ - $langs=$lang->getlanguages(); - foreach($langs as $lang){ - $values[$lang['name']]=$lang['short']; - } - $select=$panel->select($values,$config[$name],$name,"",TRUE); - return $select; - } - - if($option=="text"){ - $text=$panel->field(array("name"=>$name,"typ"=>"text","value"=>$config[$name]),"",TRUE); - return $text; - } - - if(str_contains($option, "wysiwyg")){ - $string=str_replace("wysiwyg(","",substr($option, 0, -1)); - $sarr=explode(";",$string); - foreach($sarr as $str){ - $substr=explode("|",$str); - $a_name[]=$substr[0]; - $value[]=$substr[1]; - } - if(is_array($sarr)){ - $text=$panel->textarea(array("name"=>$name,"value"=>$config[$name], $a_name[0]=>$value[0],$a_name[1]=>$value[1]),"class=\"mceEditor\"",TRUE); - }else{ - $text=$panel->textarea(array("name"=>$name,"value"=>$config[$name]),"class=\"mceEditor\"",TRUE); - } - return $text; - } - - if(str_contains($option, "textarea")){ - $string=str_replace("textarea(","",substr($option, 0, -1)); - $sarr=explode(";",$string); - if(count($sarr)>1) { - foreach ($sarr as $str) { - $substr = explode("|", $str); - $a_name[] = $substr[0]; - $value[] = $substr[1]; - } - $text=$panel->textarea(array("name"=>$name,"value"=>$config[$name], $a_name[0]=>$value[0],$a_name[1]=>$value[1]),"",TRUE); - }else{ - $text=$panel->textarea(array("name"=>$name,"value"=>$config[$name]),"",TRUE); - } - return $text; - } - - if(str_contains($option, "select")){ - //$text=$panel->field("text",$name,"value=\"".$config[$name]."\"",TRUE); - $string=str_replace("select(","",substr($option, 0, -1)); - $sarr=explode(";",$string); - foreach($sarr as $str){ - $substr=explode("|",$str); - $values[$substr[0]]=$substr[1]; - } - $select=$panel->select($values,$config[$name],$name,"",TRUE); - return $select; - } - - } - function meta() { global $module,$config,$db,$panel,$userinfo,$admin,$root; $meta=' diff --git a/admin/editgroup.apnl.php b/admin/editgroup.apnl.php index 0f12700..10c6f8d 100644 --- a/admin/editgroup.apnl.php +++ b/admin/editgroup.apnl.php @@ -97,7 +97,7 @@ class editgroup_panel extends admin_module{ $role[]=$row; } $panel->title="Vorhandene Rollen"; - $panel->content.=" + $panel->content.="
diff --git a/admin/editusers.apnl.php b/admin/editusers.apnl.php index 82e25f0..9dc39c2 100644 --- a/admin/editusers.apnl.php +++ b/admin/editusers.apnl.php @@ -46,7 +46,7 @@ class editusers_panel extends admin_module{ if($_POST["password"]!=""){ $pwd=", `password`='".hash("sha256",$salt.$db->escape($_POST["password"]))."', `loginkey`='".$_POST['key']."',`salt` = '".$salt."'"; } - $plugin->run_hook('admin_user_before_update',array('data'=>$_POST,'key'=>$key,'user_fid'=>$session->userdata['fuid'])); + $plugin->run_hook('admin_user_before_update',array('data'=>$_POST,'user_fid'=>$session->userdata['fuid'])); $db->query("UPDATE `" . $config["prefix"] . "users` SET `username`='".$db->escape($_POST["name"])."',`realname`='".$db->escape($_POST["realname"])."',`email`='".$db->escape($_POST["email"])."',`from`='".$db->escape($_POST["from"])."',`gender`='".$db->escape($_POST["gender"])."',`bio`='".$db->escape($_POST["bio"])."',`homepage`='".$db->escape($_POST["homepage"])."',`role`='".$db->escape($_POST["role"])."',`active`='".$db->escape($_POST["active"])."',".$pwd." WHERE `uid`='".intval($_POST["uid"])."'"); $_POST['user_fid']=$session->userdata['fuid']; $plugin->run_hook('admin_user_after_update',array('data'=>$_POST)); diff --git a/admin/versions.apnl.php b/admin/versions.apnl.php index 71f87f8..1eb1607 100644 --- a/admin/versions.apnl.php +++ b/admin/versions.apnl.php @@ -74,11 +74,11 @@ class versions_panel extends admin_module{ foreach($versions as $v){ if($v["name"]==$mod["name"]){ if($mod["ver"]<$v["ver"]){ - $panel->content.=""; + $panel->content.=""; }elseif($mod["ver"]==$v["ver"]){ - $panel->content.=""; + $panel->content.=""; }else{ - $panel->content.=""; + $panel->content.=""; } } } @@ -92,11 +92,11 @@ class versions_panel extends admin_module{ foreach($versions as $v){ if($v["name"]==$mod["name"]){ if($mod["version"]<$v["ver"]){ - $panel->content.=""; + $panel->content.=""; }elseif($mod["version"]==$v["ver"]){ - $panel->content.=""; + $panel->content.=""; }else{ - $panel->content.=""; + $panel->content.=""; } } } diff --git a/inc/core.class.php b/inc/core.class.php index dc6f9fe..421f3a8 100644 --- a/inc/core.class.php +++ b/inc/core.class.php @@ -184,11 +184,6 @@ class Core{ $nav_content=preg_replace("/\{logged_in\}(.*?)\{\/logged_in\}/si","",$nav_content); $nav_content=preg_replace("/\{logged_out\}(.*?)\{\/logged_out\}/si","\\1",$nav_content); } - if($session->userdata['allow_grimdark']!=0){ - $nav_content=preg_replace("/\{allow_gd\}(.*?)\{\/allow_gd\}/si","\\1",$nav_content); - }else{ - $nav_content=preg_replace("/\{allow_gd\}(.*?)\{\/allow_gd\}/si","",$nav_content); - } if(trim($nav_content)!=''){ $navtpl->assign('navtitle', $nav_title); @@ -301,6 +296,7 @@ class Core{ * */ function get_navbits(){ + $navs = ""; foreach($this->navbits as $key => $nav){ if(isset($this->navbits[$key+1])){ if($nav['url']==''){ @@ -316,7 +312,7 @@ class Core{ } } - if(!$navs){ + if(empty($navs)){ $navs=$bit; }else{ $navs.=' / '.$bit; @@ -442,11 +438,6 @@ class Core{ $row['content']=preg_replace("/\{logged_in\}(.*?)\{\/logged_in\}/si","",$row['content']); $row['content']=preg_replace("/\{logged_out\}(.*?)\{\/logged_out\}/si","\\1",$row['content']); } - if($session->userdata['allow_grimdark']!=0){ - $row['content']=preg_replace("/\{allow_gd\}(.*?)\{\/allow_gd\}/si","\\1",$row['content']); - }else{ - $row['content']=preg_replace("/\{allow_gd\}(.*?)\{\/allow_gd\}/si","",$row['content']); - } $content.=$row['content']; } } diff --git a/inc/panel.class.php b/inc/panel.class.php index ddd632a..531b8e4 100644 --- a/inc/panel.class.php +++ b/inc/panel.class.php @@ -26,7 +26,7 @@ */ $module["panel"]["name"]="Panel Class"; -$module["panel"]["ver"]="0.3.7"; +$module["panel"]["ver"]="0.3.8"; class panel { var string $sidebar=""; var string $page=""; diff --git a/modules/contact/contact.module.php b/modules/contact/contact.module.php index 9e55382..74becaa 100644 --- a/modules/contact/contact.module.php +++ b/modules/contact/contact.module.php @@ -11,7 +11,7 @@ class module_contact extends admin_module{ $info["file"]="contact"; $info["author"]="BeCast"; $info["version"]="1.0.1"; - $info["url"]="http://www.becast.at"; + $info["url"]="https://www.becast.at"; return $info; } @@ -26,7 +26,7 @@ class module_contact extends admin_module{ );"); $cid=$db->last_id(); $db->query("INSERT INTO `" . $config["prefix"] . "config` (`name`, `value`, `title`, `description`, `option`, `category`) VALUES - ('contact_email', 'contact@example.com', 'E-Mailadresse', 'Die E-Mailadresse(n) an die Kontaktanfragen gesendet werden sollen (meherer Adressen mit Komma trennen).', 'text', ".$cid."), + ('contact_email', 'contact@example.com', 'E-Mailadresse', 'Die E-Mailadresse(n) an die Kontaktanfragen gesendet werden sollen (mehrere Adressen mit Komma trennen).', 'text', ".$cid."), ('contact_captcha', '1', 'Captcha verwenden?', 'Soll bei der Kontaktaufnahme ein Captcha angezeigt werden?', 'yesno', ".$cid.");"); return TRUE; } diff --git a/modules/contact/contact.output.php b/modules/contact/contact.output.php index 609ef07..1c1aad3 100644 --- a/modules/contact/contact.output.php +++ b/modules/contact/contact.output.php @@ -1,4 +1,4 @@ -title='Vorhandene Artikel'; - $panel->content.='
ID NameNeue Version verfügbar!Neue Version verfügbar!AktuellAktuellModified file?Modified file?Neue Version verfügbar!Neue Version verfügbar!AktuellAktuellModified file?Modified file?
+ $panel->content.='
- - - - - - + + + + + + '; if(!empty($news)){ foreach($news as $u){ @@ -112,17 +112,17 @@ class edit_news_panel extends admin_module{ $u['a']='Nein'; } $panel->content.=' - - - - - '; - $panel->content.=' + + + + + '; + $panel->content.=''; } }else{ $panel->content.=' - + '; } $panel->content.='
IDNameKategorienAktivUserAktionenIDNameKategorienAktivUserAktionen
'.$u['id'].''.$u['title'].''.$u['name'].''.$u['a'].''.$u['username'].' '.$u['id'].''.$u['title'].''.$u['name'].''.$u['a'].''.$u['username'].'
Keine News vorhanden.Keine News vorhanden.

'; diff --git a/modules/text/admin/edit.apnl.php b/modules/text/admin/edit.apnl.php index f08e37a..52cc1e7 100644 --- a/modules/text/admin/edit.apnl.php +++ b/modules/text/admin/edit.apnl.php @@ -85,7 +85,7 @@ class edit_text_panel extends admin_module{ $panel->select($karray,$_POST["menue"],"menue"); $panel->content.="
"; $panel->content.="

Kategorien:

- +
"; $resultn = $db->query("SELECT `c_id` FROM `" . $config["prefix"] . "article_category` WHERE `a_id`='".intval($_GET['id'])."'"); while($rowa=$db->fetch_array($resultn)){ @@ -125,7 +125,7 @@ class edit_text_panel extends admin_module{ $panel->formClose(); }elseif($_GET["action"]=="delete" && $_GET["id"]){ $db->query("DELETE FROM `" . $config["prefix"] . "article` WHERE `id`='".intval($_GET["id"])."'"); - $db->query("DELETE FROM `" . $config["prefix"] . "article_menue` where `a_id`='".$id."'"); + $db->query("DELETE FROM `" . $config["prefix"] . "article_menue` where `a_id`='".intval($_GET["id"])."'"); $panel->admin_message("Artikel gelöscht!","Der Artikel wurde erfolgreich gelöscht.",True,"edit_text",3); } @@ -144,15 +144,15 @@ class edit_text_panel extends admin_module{ $articles[]=$row; } $panel->title="Vorhandene Artikel"; - $panel->content.="
+ $panel->content.="
- - - - - - - + + + + + + + "; if(!empty($articles)){ foreach($articles as $u){ @@ -162,18 +162,18 @@ class edit_text_panel extends admin_module{ $u["a"]="Nein"; } $panel->content.=" - - - - - - "; - $panel->content.=" + + + + + + "; + $panel->content.=""; } }else{ $panel->content.=" - + "; } $panel->content.="
IDNameURLKategorienAktivUserAktionenIDNameURLKategorienAktivUserAktionen
".$u["id"]."".$u["title"]."".$u["url"]."".$u["categoryname"]."".$u["a"]."".$u["username"]." ".$u["id"]."".$u["title"]."".$u["url"]."".$u["categoryname"]."".$u["a"]."".$u["username"]."
Keine Artikel vorhanden.Keine Artikel vorhanden.

"; diff --git a/modules/text/admin/editcategory.apnl.php b/modules/text/admin/editcategory.apnl.php index 08fb4f4..0a54798 100644 --- a/modules/text/admin/editcategory.apnl.php +++ b/modules/text/admin/editcategory.apnl.php @@ -125,31 +125,31 @@ class editcategory_text_panel extends admin_module{ $articles[]=$row; } $panel->title="Vorhandene Kategorien"; - $panel->content.=" + $panel->content.="
- - - - - + + + + + "; if(!empty($articles)){ foreach($articles as $u){ $panel->content.=" - - - "; + + + "; if($u["active"]=="true"){ - $panel->content.=""; + $panel->content.=""; }else{ - $panel->content.=""; + $panel->content.=""; } - $panel->content.=" + $panel->content.=""; } }else{ $panel->content.=" - + "; } $panel->content.="
IDNameBildAktivAktionenIDNameBildAktivAktionen
".$u["id"]."".$u["categoryname"]."".$u["picture"]."".$u["id"]."".$u["categoryname"]."".$u["picture"]."JaJaNeinNein
Keine Kategorien vorhanden.Keine Kategorien vorhanden.

"; @@ -157,7 +157,8 @@ class editcategory_text_panel extends admin_module{ } function meta(){ - $meta.=' + global $config; + $meta ='