tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-26 23:35:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-06-13 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* include/functions_config.php,
	operation/agentes/estado_ultimopaquete.php,
	operation/agentes/ver_agente.php: cleaned source code from  merge
	some cosmetic changes in the trunk and this branch.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6541 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-06-13 16:59:36 +00:00
parent 498a319cf8
commit 3692c286b8
4 changed files with 59 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-06-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php,
operation/agentes/estado_ultimopaquete.php,
operation/agentes/ver_agente.php: cleaned source code from merge
some cosmetic changes in the trunk and this branch.
2012-06-13 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/module_manage_editor_common.php: Disable button

1
pandora_console/include/functions_config.php
View File

@ -618,7 +618,6 @@ function config_process_config () {
}
if (!isset ($config['relative_path']) && (isset ($_POST['nick']) || isset ($config['id_user'])) && isset($config['enterprise_installed'])) {
$isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
if(isset($config['id_user']))

6
pandora_console/operation/agentes/estado_ultimopaquete.php
View File

@ -185,6 +185,7 @@ else if ($extra_sql != '') {
$extra_sql .= ' OR ';
}
// Build the order sql
if(!empty($order)) {
$order_sql = ' ORDER BY ';
@ -246,6 +247,7 @@ switch ($config["dbtype"]) {
$sql = sprintf("SELECT %s FROM tagente_modulo, tagente_estado WHERE %s (%s %s) %s %s",
$params, $basic_where, $extra_sql, $where, $order_sql, $limit_sql);
$modules = db_get_all_rows_sql($sql);
break;
case "oracle":
@ -418,7 +420,7 @@ foreach ($modules as $module) {
AND ($module["id_tipo_modulo"] != 17)
AND ($module["id_tipo_modulo"] != 23)) {
echo "</td><td class='".$tdcolor."f9' title='".io_safe_output($module["descripcion"])."'>";
echo mb_strimwidth(io_safe_output($module["descripcion"]), 0, 35, "...", "UTF-8");
echo ui_print_truncate_text(io_safe_output($module["descripcion"]), 35, false);
echo "</td>";
}
else{
@ -456,7 +458,7 @@ foreach ($modules as $module) {
else $colspan= 1;
echo "<td class='".$tdcolor."f9' colspan='" . $colspan . "' title='".io_safe_output($module["datos"])."'>";
echo mb_strimwidth(io_safe_output($module["datos"]), 0, 45, "...", "UTF-8");
io_safe_output(io_safe_output($module["datos"]), 45, false);
}
echo "</td>";