tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-25 23:05:30 +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> 2012-06-13 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/module_manage_editor_common.php: Disable button * godmode/agentes/module_manage_editor_common.php: Disable button

91
pandora_console/include/functions_config.php
View File

@ -256,13 +256,13 @@ function config_process_config () {
/* Compatibility fix */ /* Compatibility fix */
foreach ($configs as $c) { foreach ($configs as $c) {
$config[$c['token']] = $c['value']; $config[$c['token']] = $c['value'];
} }
if (!isset ($config['language'])) { if (!isset ($config['language'])) {
config_update_value ('language', 'en'); config_update_value ('language', 'en');
} }
if (isset ($config['homeurl']) && $config['homeurl'][0] != '/') { if (isset ($config['homeurl']) && $config['homeurl'][0] != '/') {
$config['homeurl'] = '/'.$config['homeurl']; $config['homeurl'] = '/'.$config['homeurl'];
} }
@ -404,55 +404,55 @@ function config_process_config () {
if (!isset ($config['fontpath'])) { if (!isset ($config['fontpath'])) {
config_update_value ( 'fontpath', $config['homedir'].'/include/fonts/smallfont.ttf'); config_update_value ( 'fontpath', $config['homedir'].'/include/fonts/smallfont.ttf');
} }
if (!isset ($config['style'])) { if (!isset ($config['style'])) {
config_update_value ( 'style', 'pandora'); config_update_value ( 'style', 'pandora');
} }
if (!isset ($config['flash_charts'])) { if (!isset ($config['flash_charts'])) {
config_update_value ( 'flash_charts', true); config_update_value ( 'flash_charts', true);
} }
if (!isset ($config["custom_logo"])){ if (!isset ($config["custom_logo"])){
config_update_value ('custom_logo', 'none.png'); config_update_value ('custom_logo', 'none.png');
} }
if (!isset ($config['history_db_enabled'])) { if (!isset ($config['history_db_enabled'])) {
config_update_value ( 'history_db_enabled', false); config_update_value ( 'history_db_enabled', false);
} }
if (!isset ($config['history_db_host'])) { if (!isset ($config['history_db_host'])) {
config_update_value ( 'history_db_host', ''); config_update_value ( 'history_db_host', '');
} }
if (!isset ($config['history_db_port'])) { if (!isset ($config['history_db_port'])) {
config_update_value ( 'history_db_port', 3306); config_update_value ( 'history_db_port', 3306);
} }
if (!isset ($config['history_db_name'])) { if (!isset ($config['history_db_name'])) {
config_update_value ( 'history_db_name', 'pandora'); config_update_value ( 'history_db_name', 'pandora');
} }
if (!isset ($config['history_db_user'])) { if (!isset ($config['history_db_user'])) {
config_update_value ( 'history_db_user', 'pandora'); config_update_value ( 'history_db_user', 'pandora');
} }
if (!isset ($config['history_db_pass'])) { if (!isset ($config['history_db_pass'])) {
config_update_value ( 'history_db_pass', ''); config_update_value ( 'history_db_pass', '');
} }
if (!isset ($config['history_db_days'])) { if (!isset ($config['history_db_days'])) {
config_update_value ( 'history_db_days', 0); config_update_value ( 'history_db_days', 0);
} }
if (!isset ($config['history_db_step'])) { if (!isset ($config['history_db_step'])) {
config_update_value ( 'history_db_step', 0); config_update_value ( 'history_db_step', 0);
} }
if (!isset ($config['history_db_delay'])) { if (!isset ($config['history_db_delay'])) {
config_update_value ( 'history_db_delay', 0); config_update_value ( 'history_db_delay', 0);
} }
if (!isset ($config['activate_gis'])) { if (!isset ($config['activate_gis'])) {
config_update_value ( 'activate_gis', 0); config_update_value ( 'activate_gis', 0);
} }
@ -476,119 +476,119 @@ function config_process_config () {
if (!isset ($config['auth'])) { if (!isset ($config['auth'])) {
config_update_value ( 'auth', 'mysql'); config_update_value ( 'auth', 'mysql');
} }
if (!isset ($config['autocreate_remote_users'])) { if (!isset ($config['autocreate_remote_users'])) {
config_update_value ('autocreate_remote_users', 0); config_update_value ('autocreate_remote_users', 0);
} }
if (!isset ($config['autocreate_blacklist'])) { if (!isset ($config['autocreate_blacklist'])) {
config_update_value ('autocreate_blacklist', ''); config_update_value ('autocreate_blacklist', '');
} }
if (!isset ($config['default_remote_profile'])) { if (!isset ($config['default_remote_profile'])) {
config_update_value ('default_remote_profile', 0); config_update_value ('default_remote_profile', 0);
} }
if (!isset ($config['default_remote_group'])) { if (!isset ($config['default_remote_group'])) {
config_update_value ('default_remote_group', 0); config_update_value ('default_remote_group', 0);
} }
if (!isset ($config['ldap_server'])) { if (!isset ($config['ldap_server'])) {
config_update_value ( 'ldap_server', 'localhost'); config_update_value ( 'ldap_server', 'localhost');
} }
if (!isset ($config['ldap_port'])) { if (!isset ($config['ldap_port'])) {
config_update_value ( 'ldap_port', 389); config_update_value ( 'ldap_port', 389);
} }
if (!isset ($config['ldap_version'])) { if (!isset ($config['ldap_version'])) {
config_update_value ( 'ldap_version', '3'); config_update_value ( 'ldap_version', '3');
} }
if (!isset ($config['ldap_start_tls'])) { if (!isset ($config['ldap_start_tls'])) {
config_update_value ( 'ldap_start_tls', 0); config_update_value ( 'ldap_start_tls', 0);
} }
if (!isset ($config['ldap_base_dn'])) { if (!isset ($config['ldap_base_dn'])) {
config_update_value ( 'ldap_base_dn', 'ou=People,dc=edu,dc=example,dc=org'); config_update_value ( 'ldap_base_dn', 'ou=People,dc=edu,dc=example,dc=org');
} }
if (!isset ($config['ldap_login_attr'])) { if (!isset ($config['ldap_login_attr'])) {
config_update_value ( 'ldap_login_attr', 'uid'); config_update_value ( 'ldap_login_attr', 'uid');
} }
if (!isset ($config['ad_server'])) { if (!isset ($config['ad_server'])) {
config_update_value ( 'ad_server', 'localhost'); config_update_value ( 'ad_server', 'localhost');
} }
if (!isset ($config['ad_port'])) { if (!isset ($config['ad_port'])) {
config_update_value ( 'ad_port', 389); config_update_value ( 'ad_port', 389);
} }
if (!isset ($config['ad_start_tls'])) { if (!isset ($config['ad_start_tls'])) {
config_update_value ( 'ad_start_tls', 0); config_update_value ( 'ad_start_tls', 0);
} }
if (!isset ($config['ad_domain'])) { if (!isset ($config['ad_domain'])) {
config_update_value ( 'ad_domain', ''); config_update_value ( 'ad_domain', '');
} }
if (!isset ($config['rpandora_server'])) { if (!isset ($config['rpandora_server'])) {
config_update_value ( 'rpandora_server', 'localhost'); config_update_value ( 'rpandora_server', 'localhost');
} }
if (!isset ($config['rpandora_port'])) { if (!isset ($config['rpandora_port'])) {
config_update_value ( 'rpandora_port', 3306); config_update_value ( 'rpandora_port', 3306);
} }
if (!isset ($config['rpandora_dbname'])) { if (!isset ($config['rpandora_dbname'])) {
config_update_value ( 'rpandora_dbname', 'pandora'); config_update_value ( 'rpandora_dbname', 'pandora');
} }
if (!isset ($config['rpandora_user'])) { if (!isset ($config['rpandora_user'])) {
config_update_value ( 'rpandora_user', 'pandora'); config_update_value ( 'rpandora_user', 'pandora');
} }
if (!isset ($config['rpandora_pass'])) { if (!isset ($config['rpandora_pass'])) {
config_update_value ( 'rpandora_pass', ''); config_update_value ( 'rpandora_pass', '');
} }
if (!isset ($config['rbabel_server'])) { if (!isset ($config['rbabel_server'])) {
config_update_value ( 'rbabel_server', 'localhost'); config_update_value ( 'rbabel_server', 'localhost');
} }
if (!isset ($config['rbabel_port'])) { if (!isset ($config['rbabel_port'])) {
config_update_value ( 'rbabel_port', 3306); config_update_value ( 'rbabel_port', 3306);
} }
if (!isset ($config['rbabel_dbname'])) { if (!isset ($config['rbabel_dbname'])) {
config_update_value ( 'rbabel_dbname', 'babel'); config_update_value ( 'rbabel_dbname', 'babel');
} }
if (!isset ($config['rbabel_user'])) { if (!isset ($config['rbabel_user'])) {
config_update_value ( 'rbabel_user', 'babel'); config_update_value ( 'rbabel_user', 'babel');
} }
if (!isset ($config['rbabel_pass'])) { if (!isset ($config['rbabel_pass'])) {
config_update_value ( 'rbabel_pass', ''); config_update_value ( 'rbabel_pass', '');
} }
if (!isset ($config['rintegria_server'])) { if (!isset ($config['rintegria_server'])) {
config_update_value ( 'rintegria_server', 'localhost'); config_update_value ( 'rintegria_server', 'localhost');
} }
if (!isset ($config['rintegria_port'])) { if (!isset ($config['rintegria_port'])) {
config_update_value ( 'rintegria_port', 3306); config_update_value ( 'rintegria_port', 3306);
} }
if (!isset ($config['rintegria_dbname'])) { if (!isset ($config['rintegria_dbname'])) {
config_update_value ( 'rintegria_dbname', 'integria'); config_update_value ( 'rintegria_dbname', 'integria');
} }
if (!isset ($config['rintegria_user'])) { if (!isset ($config['rintegria_user'])) {
config_update_value ( 'rintegria_user', 'integria'); config_update_value ( 'rintegria_user', 'integria');
} }
if (!isset ($config['rintegria_pass'])) { if (!isset ($config['rintegria_pass'])) {
config_update_value ( 'rintegria_pass', ''); config_update_value ( 'rintegria_pass', '');
} }
@ -618,7 +618,6 @@ function config_process_config () {
} }
if (!isset ($config['relative_path']) && (isset ($_POST['nick']) || isset ($config['id_user'])) && isset($config['enterprise_installed'])) { if (!isset ($config['relative_path']) && (isset ($_POST['nick']) || isset ($config['id_user'])) && isset($config['enterprise_installed'])) {
$isFunctionSkins = enterprise_include_once ('include/functions_skins.php'); $isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
if(isset($config['id_user'])) if(isset($config['id_user']))
@ -645,7 +644,7 @@ function config_process_config () {
config_update_config(); config_update_config();
} }
function config_check (){ function config_check () {
global $config; global $config;
// At this first version I'm passing errors using session variables, because the error management // At this first version I'm passing errors using session variables, because the error management

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

@ -184,7 +184,8 @@ if($extra_sql == ENTERPRISE_NOT_HOOK) {
else if ($extra_sql != '') { else if ($extra_sql != '') {
$extra_sql .= ' OR '; $extra_sql .= ' OR ';
} }
// Build the order sql // Build the order sql
if(!empty($order)) { if(!empty($order)) {
$order_sql = ' ORDER BY '; $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", $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); $params, $basic_where, $extra_sql, $where, $order_sql, $limit_sql);
$modules = db_get_all_rows_sql($sql); $modules = db_get_all_rows_sql($sql);
break; break;
case "oracle": case "oracle":
@ -418,7 +420,7 @@ foreach ($modules as $module) {
AND ($module["id_tipo_modulo"] != 17) AND ($module["id_tipo_modulo"] != 17)
AND ($module["id_tipo_modulo"] != 23)) { AND ($module["id_tipo_modulo"] != 23)) {
echo "</td><td class='".$tdcolor."f9' title='".io_safe_output($module["descripcion"])."'>"; 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>"; echo "</td>";
} }
else{ else{
@ -456,7 +458,7 @@ foreach ($modules as $module) {
else $colspan= 1; else $colspan= 1;
echo "<td class='".$tdcolor."f9' colspan='" . $colspan . "' title='".io_safe_output($module["datos"])."'>"; 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>"; 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); $module = db_get_row ('tagente_modulo', 'id_agente_modulo', $id_module);
echo '<h3>'; echo '<h3>';
echo html_print_image("images/brick.png", true) . '&nbsp;'; 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> '; echo '<strong>'.__('Type').':</strong> ';
$agentmoduletype = modules_get_agentmodule_type ($module['id_agente_modulo']); $agentmoduletype = modules_get_agentmodule_type ($module['id_agente_modulo']);
echo modules_get_moduletype_name ($agentmoduletype).'&nbsp;'; echo modules_get_moduletype_name ($agentmoduletype).'&nbsp;';
@ -403,7 +403,7 @@ if (is_ajax ()) {
echo $modulegroup.'<br />'; echo $modulegroup.'<br />';
} }
echo '<strong>'.__('Agent').':</strong> '; 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) { if($module['id_tipo_modulo'] == 18) {
echo '<strong>'.__('Address').':</strong> '; echo '<strong>'.__('Address').':</strong> ';