tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Working in the massive action for the tags in policies. Ticket: #1576

This commit is contained in:
mdtrooper 2014-12-09 15:57:15 +01:00
parent 95e57c41fe
commit 704b3932a4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/include/functions_html.php
View File

@ -1466,13 +1466,22 @@ function html_print_table (&$table, $return = false) {
if (!isset ($style[$key])) {
$style[$key] = '';
}
$output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'. $cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key] .'" '.$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="' . $class . ' ' . $cellclass[$keyrow][$key] . '">'. $item .'</td>'."\n";
$output .= '<td ' .
'id="' . $tableid . '-' . $keyrow . '-' . $key . '" ' .
'style="' . $cellstyle[$keyrow][$key] .
$style[$key] . $valign[$key] . $align[$key] .
$size[$key] . $wrap[$key] . '" ' .
$colspan[$keyrow][$key] . ' ' .
$rowspan[$keyrow][$key] . ' ' .
'class="' . $class . ' ' .
$cellclass[$keyrow][$key] . '">' .
$item . '</td>' . "\n";
}
$output .= '</tr>'."\n";
$output .= '</tr>' . "\n";
}
}
$output .= '</tbody></table>'."\n";
$output .= '</tbody></table>' . "\n";
if ($return)
return $output;

7
pandora_console/include/functions_tags.php
View File

@ -532,7 +532,8 @@ function tags_get_policy_module_tags ($id_policy_module) {
if (empty($id_policy_module))
return false;
$tags = db_get_all_rows_filter('ttag_policy_module', array('id_policy_module' => $id_policy_module), false);
$tags = db_get_all_rows_filter('ttag_policy_module',
array('id_policy_module' => $id_policy_module), false);
if ($tags === false)
return false;
@ -559,8 +560,8 @@ function tags_get_all_tags ($return_url = false) {
$return = array();
foreach ($tags as $tag) {
$return[$tag['id_tag']] = $tag['name'];
if($return_url) {
$return[$tag['id_tag']] .= ' '.$tag['url'];
if ($return_url) {
$return[$tag['id_tag']] .= ' ' . $tag['url'];
}
}