From 4c76e4589be1ba8f28872d6c7a49ba4d52f58bae Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Mon, 20 Sep 2010 14:14:55 +0000
Subject: [PATCH] 2010-09-20  Sancho Lerena <slerena@artica.es>

        * include/config.inc.php: config_process.php is obtained from
        defined path in homedir variable.

        * godmode/agentes/module_manager_editor_network.php: Limit for
        OID lenght was too short, DB gets 255 chars, now input also gets
        255 chars.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3258 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  8 ++
 .../agentes/module_manager_editor_network.php |  2 +-
 pandora_console/include/config.inc.php        | 75 -------------------
 3 files changed, 9 insertions(+), 76 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index a4cda1bdba..a90276a7d5 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-20  Sancho Lerena <slerena@artica.es>
+
+	* include/config.inc.php: config_process.php is obtained from defined
+	path in homedir variable.
+
+	* godmode/agentes/module_manager_editor_network.php: Limit for OID lenght
+	was too short, DB gets 255 chars, now input also gets 255 chars.
+
 2010-09-17  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* operation/events/events.php: cleaned source code style.
diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php
index 26cb4d3f64..37d92cd4e0 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_network.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_network.php
@@ -70,7 +70,7 @@ push_table_simple ($data, 'snmp_1');
 $data = array ();
 $data[0] = __('SNMP OID');
 $data[1] = '<span class="left"; style="width: 50%">';
-$data[1] .= print_input_text ('snmp_oid', $snmp_oid, '', 30, 120, true, $disabledBecauseInPolicy);
+$data[1] .= print_input_text ('snmp_oid', $snmp_oid, '', 30, 255, true, $disabledBecauseInPolicy);
 $data[1] .= '<span class="invisible" id="oid">';
 $data[1] .= print_select (array (), 'select_snmp_oid', $snmp_oid, '', '', 0, true, false, false, '', $disabledBecauseInPolicy);
 $data[1] .= '<img src="images/edit.png" class="invisible clickable" id="edit_oid" />';
diff --git a/pandora_console/include/config.inc.php b/pandora_console/include/config.inc.php
index e01c2f4c41..d8e3ac8114 100644
--- a/pandora_console/include/config.inc.php
+++ b/pandora_console/include/config.inc.php
@@ -30,89 +30,14 @@
 
 // $config["auth"]["scheme"] = "mysql";
 
-///*************************** Start LDAP Config *****************************/
-// Only use the following if you have LDAP. Unnecessary for built-in
-//
-//Name or address of the LDAP server
-//  For SSL (not TLS) use 'ldaps://localhost'
-//$config["auth"]["ldap_server"] = 'ldap://rcbi.rochester.edu';
-//
-//OPTIONAL: Port LDAP listens on (usually 389). Some configurations require you to specify this no matter what
-//$config["auth"]["ldap_port"] = 389;
-//
-//OPTIONAL: Use TLS for the connection (not the same as ldaps://)
-//$config["auth"]["ldap_start_tls"] = true;
-//
-//OPTIONAL: Protocol version to use to connect to your server (3 for most installations)
-//$config["auth"]["ldap_version"] = 0;
-//
-// base DN to search for user information (full dn)
-// This is based on Mac OS X OpenDirectory, change accordingly
-//$config["auth"]["ldap_base_dn"] = 'cn=users,dc=rcbi,dc=rochester,dc=edu';
-//
-// The ldap attribute used to find a user (login).
-// E.g., if you use cn,  your login might be "Jane Smith" -- untested!
-//       if you use uid, your login might be "jsmith"
-//$config["auth"]["ldap_login_attr"] = 'uid';
-//
-// OPTIONAL: Account used to connect (bind) to the server and SEARCH for information.
-// This user must have the correct rights to perform search on objects
-// By default the search will be made anonymous.
-// *** We do NOT recommend storing the root LDAP account or any type of admin/living person info here ***
-//$config["auth"]["ldap_admin_dn"] = '';  // user DN
-//$config["auth"]["ldap_admin_pwd"] = ''; // user password
-//
-//------ Admin Group Settings ------//
-//
-// A group name (complete DN) to find users with admin rights
-//$config["auth"]["ldap_admin_group_name"] = 'cn=pandora_admins,cn=groups,dc=rcbi,dc=rochester,dc=edu';
-//
-// What type of group do we want (posixgroup, groupofnames, groupofuniquenames)
-//$config["auth"]["ldap_admin_group_type"] = 'posixgroup';
-//
-// The LDAP attribute used to store member of a group
-//$config["auth"]["ldap_admin_group_attr"] = 'memberuid';
-//
-//------ LDAP Filter Settings ------//
-//
-// LDAP filter used to limit search results and login authentication
-//$config["auth"]["ldap_user_filter"] = '(&(objectclass=person)(!(sn=99)))';
-//
-// Attributes to fetch from LDAP and corresponding user variables in the
-// application. Do change according to your LDAP Schema
-//$config["auth"]["ldap_user_attr"] = array (
-//						 //Pandora attribute // LDAP attribute //Explanation
-//						 'id_user' =>		'uid',	//login
-//						 'lastname' =>	'sn',			//last (sur) name
-//						 'firstname' =	 'givenname',	//first (given) name
-//						 'fullname' =>		'cn',	 //full (common) name
-//						 'comments' =>		'description',	//comments - you can set this to anything
-//						 'last_contact' =>	'lastlogin',	//last login utimestamp or don't define
-//						 'email' =>			'mail',	//email - not necessary will default to empty
-//						 'phone' =>		'phone',		//phone
-//						 'middlename' =>	'mn',			//not yet used except for representational purposes
-//						 'registered' =>	'created'		//created utimestamp or don't define
-//);
-///* You can uncomment the following only if you understand what it implies
-//
-// $config["auth"]["create_user_undefined"] = false; //Create a user with minimal rights if the user is in your authentication scheme but not in Pandora
-//*/
-///*************************** End LDAP Config *****************************/
-
 /**
  * Do not display any ERROR
  */
 error_reporting(E_ALL); 
 
-
-
 // Display ALL errors
 // error_reporting(E_ERROR);
 
-// This is directory where placed "/attachment" directory, to upload files stores. 
-// This MUST be writtable by http server user, and should be in pandora root. 
-// By default, Pandora adds /attachment to this, so by default is the pandora console home dir
-
 $ownDir = dirname(__FILE__) . '/';
 include ($ownDir . "config_process.php");
 ?>