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

Merge branch 'ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows' into 'develop' 

Fixed error with slashes - #3426

See merge request artica/pandorafms!2143

Former-commit-id: 6e78bc1fdb4de94c31c06ff98b9f2f27f2788646
This commit is contained in:
Alejandro Fraguas 2019-02-18 10:43:16 +01:00
parent 0ef118f401 582b8a70da
commit c897d65f10
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pandora_console/include/functions_api.php
View File

@ -366,23 +366,30 @@ function api_get_groups($thrash1, $thrash2, $other, $returnType, $user_in_db)
$returnAllGroup = true; $returnAllGroup = true;
$returnAllColumns = false; $returnAllColumns = false;
if (isset($other['data'][1])) if (isset($other['data'][1])) {
$returnAllGroup = ( $other['data'][1] == '1' ? true : false); $returnAllGroup = ( $other['data'][1] == '1' ? true : false);
}
if (isset($other['data'][2]))
$returnAllColumns = ( $other['data'][2] == '1' ? true : false);
$groups = users_get_groups ($user_in_db, "IR", $returnAllGroup, $returnAllColumns); if (isset($other['data'][2])) {
$returnAllColumns = ( $other['data'][2] == '1' ? true : false);
}
$data_groups = array(); $groups = users_get_groups($user_in_db, 'IR', $returnAllGroup, $returnAllColumns);
foreach ($groups as $id => $group) {
$data_groups[] = array($id, $group);
}
if (!isset($other['data'][0])) $data_groups = [];
$separator = ';'; // by default foreach ($groups as $id => $group) {
else $data_groups[] = [
$separator = $other['data'][0]; $id,
$group,
];
}
if (!isset($other['data'][0])) {
$separator = ';';
// by default
} else {
$separator = $other['data'][0];
}
$data['type'] = 'array'; $data['type'] = 'array';
$data['data'] = $data_groups; $data['data'] = $data_groups;

2
pandora_console/include/functions_config.php
View File

@ -2843,7 +2843,7 @@ function config_check()
); );
} }
$result_ejecution = exec($config['phantomjs_bin'].'/phantomjs --version'); $result_ejecution = exec('"'.io_safe_output($config['phantomjs_bin']).'/phantomjs" --version');
if (!isset($result_ejecution) || $result_ejecution == '') { if (!isset($result_ejecution) || $result_ejecution == '') {
if ($config['language'] == 'es') { if ($config['language'] == 'es') {
set_pandora_error_for_header( set_pandora_error_for_header(

4
pandora_console/install.php
View File

@ -128,8 +128,8 @@
</div> </div>
<div style='height: 10px'> <div style='height: 10px'>
<?php <?php
$version = '7.0NG.731'; $version = '7.0NG.731';
$build = '190218'; $build = '190218';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);