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

fixed bug with empty description

Dieser Commit ist enthalten in:
o.pinke 2023-02-10 11:55:27 +01:00
Ursprung c0e250a21f
Commit 0589fd287e
3 geänderte Dateien mit 74 neuen und 93 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

39
conlite/includes/grouprights_lay.inc.php
Datei anzeigen

@ -1,4 +1,5 @@
<?php
/**
* Project:
* Contenido Content Management System
@ -29,7 +30,6 @@
* }}
*
*/
if (!defined('CON_FRAMEWORK')) {
die('Illegal call');
}
@ -46,12 +46,10 @@ $rights_list_old = array ();
while ($db->next_record()) { //set a new rights list fore this user
$rights_list_old[$db->f(3) . "|" . $db->f(4) . "|" . $db->f("idcat")] = "x";
}
if (($perm->have_perm_area_action($area, $action)) && ($action == "user_edit"))
{
if (($perm->have_perm_area_action($area, $action)) && ($action == "user_edit")) {
saverights();
} else {
if (!$perm->have_perm_area_action($area, $action))
{
if (!$perm->have_perm_area_action($area, $action)) {
$notification->displayNotification("error", i18n("Permission denied"));
}
}
@ -65,12 +63,10 @@ $sTable = '';
$sJsBefore .= "var itemids=new Array();
var actareaids=new Array(); \n";
if (($perm->have_perm_area_action($area, $action)) && ($action == "group_edit"))
{
if (($perm->have_perm_area_action($area, $action)) && ($action == "group_edit")) {
saverights();
} else {
if (!$perm->have_perm_area_action($area, $action))
{
if (!$perm->have_perm_area_action($area, $action)) {
$notification->displayNotification("error", i18n("Permission denied"));
}
}
@ -90,13 +86,11 @@ $sCheckboxesRow = '';
$aSecondHeaderRow = array();
// look for possible actions in mainarea []
foreach($right_list["lay"] as $value2)
{
foreach ($right_list["lay"] as $value2) {
//if there are some actions
if (is_array($value2["action"]))
//set the areas that are in use
foreach($value2["action"] as $key3 => $value3)
{
foreach ($value2["action"] as $key3 => $value3) {
$possible_areas[$value2["perm"]] = "";
$colspan++;
//set the possible areas and actions for this areas
@ -105,7 +99,6 @@ foreach($right_list["lay"] as $value2)
//checkbox for the whole action
$sTable .= $oTable->header_cell($lngAct[$value2["perm"]][$value3]);
array_push($aSecondHeaderRow, "<input type=\"checkbox\" name=\"checkall_" . $value2["perm"] . "_$value3\" value=\"\" onClick=\"setRightsFor('" . $value2["perm"] . "','$value3','')\">");
}
}
@ -130,29 +123,24 @@ $sTable .= $oTable->end_row();
$sql = "SELECT * FROM " . $cfg["tab"]["lay"] . " WHERE idclient='" . Contenido_Security::toInteger($rights_client) . "' ORDER BY name";
$db->query($sql);
while ($db->next_record()) {
$sTplName = clHtmlEntities($db->f("name"));
$sDescription = clHtmlEntities($db->f("description"));
$sDescription = empty($db->f("description")) ? '' : clHtmlEntities($db->f("description"));
$sTable .= $oTable->row();
$sTable .= $oTable->cell($sTplName, "", "", " class=\"td_rights0\"", false);
$sTable .= $oTable->cell($sDescription, "", "", " class=\"td_rights1\" style=\"white-space:normal; \"", false);
//set javscript array for itemids
$sJsBefore .= "itemids[\"" . $db->f("idlay") . "\"]=\"x\";\n";
// look for possible actions in mainarea[]
foreach($right_list["lay"] as $value2)
{
foreach ($right_list["lay"] as $value2) {
//if there area some
if (is_array($value2["action"]))
foreach($value2["action"] as $key3 => $value3)
{
foreach ($value2["action"] as $key3 => $value3) {
//does the user have the right
if (in_array($value2["perm"] . "|$value3|" . $db->f("idlay"), array_keys($rights_list_old)))
$checked = "checked=\"checked\"";
@ -163,15 +151,11 @@ while ($db->next_record()) {
//set the checkbox the name consits of areait+actionid+itemid
//"<input type=\"checkbox\" name=\"rights_list[".$value2["perm"]."|$value3|".$db->f("idlay")."]\" value=\"x\" $checked>
$sTable .= $oTable->cell("<input type=\"checkbox\" name=\"rights_list[" . $value2["perm"] . "|$value3|" . $db->f("idlay") . "]\" value=\"x\" $checked>", "", "", " class=\"td_rights3\"", false);
}
}
//checkbox for checking all actions fore this itemid
$sTable .= $oTable->cell("<input type=\"checkbox\" name=\"checkall_" . $value2["perm"] . "_" . $value3 . "_" . $db->f("idlay") . "\" value=\"\" onClick=\"setRightsFor('" . $value2["perm"] . "','$value3','" . $db->f("idlay") . "')\">", "", "", " class=\"td_rights3\"", false);
$sTable .= $oTable->end_row();
}
$sTable .= $oTable->end_row();
@ -180,12 +164,9 @@ $sTable .= $oTable->sumcell("<a href=javascript:submitrightsform('','area')><img
$sTable .= $oTable->end_row();
$sTable .= $oTable->end_table();
// generate Template
$oTpl->set('s', 'JS_SCRIPT_BEFORE', $sJsBefore);
$oTpl->set('s', 'JS_SCRIPT_AFTER', $sJsAfter);
$oTpl->set('s', 'RIGHTS_CONTENT', $sTable);
$oTpl->set('s', 'EXTERNAL_SCRIPTS', $sJsExternal);
$oTpl->generate('templates/standard/' . $cfg['templates']['rights_inc']);
?>

2
conlite/includes/grouprights_mod.inc.php
Datei anzeigen

@ -117,7 +117,7 @@ $db->query($sql);
while ($db->next_record()) {
$tplname = clHtmlEntities($db->f("name"));
$description = clHtmlEntities($db->f("description"));
$description = empty($db->f("description"))?'':clHtmlEntities($db->f("description"));
$sTable .= $table->row();
$sTable .= $table->cell($tplname,"", "", " class=\"td_rights0\"", false);

2
conlite/includes/grouprights_tpl.inc.php
Datei anzeigen

@ -122,7 +122,7 @@ $db->query($sql);
while ($db->next_record()) {
$tplname = clHtmlEntities($db->f("name"));
$description = clHtmlEntities($db->f("description"));
$description = empty($db->f("description"))?'':clHtmlEntities($db->f("description"));
$sTable .= $table->row();
$sTable .= $table->cell($tplname,"", "", " class=\"td_rights0\"", false);