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

Minor fix

This commit is contained in:
Alejandro Gallardo Escobar 2015-07-14 10:20:04 +02:00
parent 7909ba2963
commit b0f894437e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/include/functions_html.php
View File

@ -37,6 +37,7 @@ if (!isset($config)) {
} }
} }
require_once ($config['homedir'].'/include/functions.php');
require_once ($config['homedir'].'/include/functions_users.php'); require_once ($config['homedir'].'/include/functions_users.php');
require_once ($config['homedir'].'/include/functions_groups.php'); require_once ($config['homedir'].'/include/functions_groups.php');
require_once ($config['homedir'].'/include/functions_ui.php'); require_once ($config['homedir'].'/include/functions_ui.php');
@ -1018,8 +1019,9 @@ function html_print_input_password ($name, $value, $alt = '', $size = 50, $maxle
if ($size == 0) if ($size == 0)
$size = 10; $size = 10;
$attr = array();
if ($required) if ($required)
$attr = array('required' => 'required'); $attr['required'] = 'required';
return html_print_input_text_extended ($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return, true); return html_print_input_text_extended ($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return, true);
} }
@ -1046,8 +1048,9 @@ function html_print_input_text ($name, $value, $alt = '', $size = 50, $maxlength
if ($size == 0) if ($size == 0)
$size = 10; $size = 10;
$attr = array();
if ($required) if ($required)
$attr = array('required' => 'required'); $attr['required'] = 'required';
return html_print_input_text_extended ($name, $value, 'text-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return); return html_print_input_text_extended ($name, $value, 'text-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return);
} }
@ -1081,7 +1084,7 @@ function html_print_input_image ($name, $src, $value, $style = '', $return = fal
} }
// If metaconsole is activated and image doesn't exists try to search on normal console // If metaconsole is activated and image doesn't exists try to search on normal console
if (defined('METACONSOLE')) { if (is_metaconsole()) {
if (false === @file_get_contents($src, 0, null, 0, 1)) { if (false === @file_get_contents($src, 0, null, 0, 1)) {
$src = '../../' . $src; $src = '../../' . $src;
} }
@ -1764,7 +1767,7 @@ function html_print_image ($src, $return = false, $options = false,
global $config; global $config;
// If metaconsole is in use then don't use skins // If metaconsole is in use then don't use skins
if (!defined('METACONSOLE')) { if (!is_metaconsole()) {
/* Checks if user's skin is available */ /* Checks if user's skin is available */
$isFunctionSkins = enterprise_include_once ('include/functions_skins.php'); $isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
@ -1780,7 +1783,7 @@ function html_print_image ($src, $return = false, $options = false,
// If metaconsole is activated and image doesn't exists try to search on normal console // If metaconsole is activated and image doesn't exists try to search on normal console
if (defined('METACONSOLE')) { if (is_metaconsole()) {
if (!$relative) { if (!$relative) {
$working_dir = str_replace("\\", "/", getcwd()); // Windows compatibility $working_dir = str_replace("\\", "/", getcwd()); // Windows compatibility
if (strstr($working_dir, 'enterprise/meta') === false) { if (strstr($working_dir, 'enterprise/meta') === false) {