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

2012-03-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_ui.php: Skin is not used on logon error.
	
	Fixes: #3464062
	
	* godmode/menu.php: Delete autorefresh in Pandora db interface.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5741 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-03-12 17:40:53 +00:00
parent 1a7e768984
commit 78377dda0d
3 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2012-03-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_ui.php: Skin is not used on logon error.
Fixes: #3464062
* godmode/menu.php: Delete autorefresh in Pandora db interface.
2012-03-12 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php,

14
pandora_console/godmode/menu.php
View File

@ -289,12 +289,14 @@ if (check_acl ($config['id_user'], 0, "PM")) {
if (array_key_exists('fatherId',$extmenu)) {
if (strlen($extmenu['fatherId']) > 0) {
$menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["text"] = __($extmenu['name']);
if (!empty($config['refr'])){
$menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["refr"] = $config['refr'];
}
else{
$menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["refr"] = 60;
}
if ($extmenu["name"] != 'DB interface'){
if (!empty($config['refr'])){
$menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["refr"] = $config['refr'];
}
else{
$menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["refr"] = 60;
}
}
$menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["icon"] = $extmenu['icon'];
$menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["sec"] = 'gextensions';
$menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["extension"] = true;

31
pandora_console/include/functions_ui.php
View File

@ -940,10 +940,36 @@ function ui_process_page_head ($string, $bitfield) {
$config['css'] = array ();
}
$exists_css = false;
$login_ok = true;
if (! isset ($config['id_user']) && isset ($_GET["login"])) {
if (isset($_POST['nick']) and isset($_POST['pass'])) {
$nick = get_parameter_post ("nick"); //This is the variable with the login
$pass = get_parameter_post ("pass"); //This is the variable with the password
$nick = db_escape_string_sql($nick);
$pass = db_escape_string_sql($pass);
// process_user_login is a virtual function which should be defined in each auth file.
// It accepts username and password. The rest should be internal to the auth file.
// The auth file can set $config["auth_error"] to an informative error output or reference their internal error messages to it
// process_user_login should return false in case of errors or invalid login, the nickname if correct
$nick_in_db = process_user_login ($nick, $pass);
if ($nick_in_db === false) {
$login_ok = false;
}
}
}
//First, if user has assigned a skin then try to use css files of skin subdirectory
$isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
if (!$login_ok) {
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
enterprise_hook('skins_cleanup');
}
}
$exists_css = false;
if ($login_ok and $isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
//Checks if user's skin is available
$exists_skin = enterprise_hook('skins_is_path_set');
if ($exists_skin){
@ -971,6 +997,7 @@ function ui_process_page_head ($string, $bitfield) {
//We can't load empty and we loaded (conditionally) ie
$loaded = array ('', 'ie');
foreach ($config['css'] as $name => $filename) {
if (in_array ($name, $loaded))
continue;