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

5
pandora_console/include/functions_config.php
View File

@ -256,7 +256,7 @@ function config_process_config () {
/* Compatibility fix */
foreach ($configs as $c) {
$config[$c['token']] = $c['value'];
$config[$c['token']] = $c['value'];
}
if (!isset ($config['language'])) {
@ -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']))
@ -645,7 +644,7 @@ function config_process_config () {
config_update_config();
}
function config_check (){
function config_check () {
global $config;
// At this first version I'm passing errors using session variables, because the error management

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>";

4
pandora_console/operation/agentes/ver_agente.php
View File

@ -389,7 +389,7 @@ if (is_ajax ()) {
$module = db_get_row ('tagente_modulo', 'id_agente_modulo', $id_module);
echo '<h3>';
echo html_print_image("images/brick.png", true) . '&nbsp;';
echo ui_print_truncate_text($module['nombre'],25,false,true,false).'</h3>';
echo ui_print_truncate_text($module['nombre'], 25, false, true, false).'</h3>';
echo '<strong>'.__('Type').':</strong> ';
$agentmoduletype = modules_get_agentmodule_type ($module['id_agente_modulo']);
echo modules_get_moduletype_name ($agentmoduletype).'&nbsp;';
@ -403,7 +403,7 @@ if (is_ajax ()) {
echo $modulegroup.'<br />';
}
echo '<strong>'.__('Agent').':</strong> ';
echo ui_print_truncate_text(modules_get_agentmodule_agent_name ($module['id_agente_modulo']),25,false,true,false).'<br />';
echo ui_print_truncate_text(modules_get_agentmodule_agent_name($module['id_agente_modulo']), 25, false, true, false).'<br />';
if($module['id_tipo_modulo'] == 18) {
echo '<strong>'.__('Address').':</strong> ';