admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev-8-bootstrap

Browse source
This commit is contained in:
sparkyx 2021-03-12 18:56:29 +01:00
commit 60bb8f50c1
86 changed files with 1374 additions and 741 deletions
Download patch file Download diff file Expand all files Collapse all files

84
include/lib/ac_common.php
View file

@ -32,12 +32,12 @@ require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';
/**
* \brief to protect again bad characters which can lead to a cross scripting attack
the string to be diplayed must be protected
the string to be diplayed must be protected. Side effects with htmlentities, especially for
* the date (transform dot in &periode;) and number
*/
function h($p_string)
{
return htmlspecialchars($p_string);
return htmlspecialchars($p_string,ENT_QUOTES|ENT_HTML5,'UTF-8',true);
}
function span($p_string, $p_extra='')
@ -47,31 +47,31 @@ function span($p_string, $p_extra='')
function hi($p_string)
{
return '<i>' . htmlspecialchars($p_string) . '</i>';
return '<i>' . h($p_string) . '</i>';
}
function hb($p_string)
{
return '<b>' . htmlspecialchars($p_string) . '</b>';
return '<b>' . h($p_string) . '</b>';
}
function th($p_string, $p_extra='',$raw='')
{
return '<th ' . $p_extra . '>' . htmlspecialchars($p_string).$raw . '</th>';
return '<th ' . $p_extra . '>' . h($p_string).$raw . '</th>';
}
function h2info($p_string)
{
return '<h2 class="info">' . htmlspecialchars($p_string) . '</h2>';
return '<h2 class="info">' . h($p_string) . '</h2>';
}
function h2($p_string, $p_class="",$raw="")
{
return '<h2 ' . $p_class . '>' . $raw.htmlspecialchars($p_string) . '</h2>';
return '<h2 ' . $p_class . '>' . $raw.h($p_string) . '</h2>';
}
function h1($p_string, $p_class="")
{
return '<h1 ' . $p_class . '>' . htmlspecialchars($p_string) . '</h1>';
return '<h1 ' . $p_class . '>' . h($p_string) . '</h1>';
}
/**
* \brief surround the string with td
@ -424,9 +424,11 @@ function html_min_page_start($p_theme="", $p_script="", $p_script2="")
<LINK REL=\"stylesheet\" type=\"text/css\" href=\"$style\" media=\"screen\">
<link rel=\"stylesheet\" type=\"text/css\" href=\"style-print.css\" media=\"print\">" .
$p_script2 . "
<script src=\"js/prototype.js\" type=\"text/javascript\"></script>
<script src=\"js/scripts.js\" type=\"text/javascript\"></script>
<script src=\"js/acc_ledger.js\" type=\"text/javascript\"></script>
<script src=\"js/smoke.js\" type=\"text/javascript\"></script>";
include_once NOALYSS_INCLUDE.'/lib/message_javascript.php';
echo '</HEAD>
';
@ -523,15 +525,23 @@ function ShowItem($p_array, $p_dir='V', $class="mtitle", $class_ref="mtitle", $d
$title = "";
$set = "XX";
if (isset($href[2]))
$title = $href[2];
if (isset($href[3]))
$set = $href[3];
{
$title=$href[2];
}
if (isset($href[3]))
{
$set=$href[3];
}
if ($set == $default)
$ret.='<TR><TD CLASS="selectedcell"><A class="' . $class_ref . '" HREF="' . $href[0] . '" title="' . $title . '" ' . $javascript . '>' . $href[1] . '</A></TD></TR>';
else
$ret.='<TR><TD CLASS="' . $class . '"><A class="' . $class_ref . '" HREF="' . $href[0] . '" title="' . $title . '" ' . $javascript . '>' . $href[1] . '</A></TD></TR>';
}
if ($set==$default)
{
$ret.='<TR><TD CLASS="selectedcell"><A class="'.$class_ref.'" HREF="'.$href[0].'" title="'.$title.'" '.$javascript.'>'.$href[1].'</A></TD></TR>';
}
else
{
$ret.='<TR><TD CLASS="'.$class.'"><A class="'.$class_ref.'" HREF="'.$href[0].'" title="'.$title.'" '.$javascript.'>'.$href[1].'</A></TD></TR>';
}
}
}
//direction Horizontal
else if ($p_dir == 'H')
@ -686,13 +696,17 @@ function sql_filter_per($p_cn, $p_from, $p_to, $p_form='p_id', $p_field='jr_tech
throw new Exception("SFP2"._("Date invalide"));
}
}
if ($p_from == $p_to)
$periode = " $p_field = (select p_id from parm_periode " .
" where " .
" p_start = to_date('$p_from','DD.MM.YYYY')) ";
if ($p_from==$p_to)
{
$periode=" $p_field = (select p_id from parm_periode ".
" where ".
" p_start = to_date('$p_from','DD.MM.YYYY')) ";
}
else
$periode = "$p_field in (select p_id from parm_periode " .
" where p_start >= to_date('$p_from','DD.MM.YYYY') and p_end <= to_date('$p_to','DD.MM.YYYY')) ";
{
$periode="$p_field in (select p_id from parm_periode ".
" where p_start >= to_date('$p_from','DD.MM.YYYY') and p_end <= to_date('$p_to','DD.MM.YYYY')) ";
}
return $periode;
}
@ -710,7 +724,9 @@ function alert($p_msg, $buffer=false)
$r.= '</script>';
if ($buffer)
return $r;
{
return $r;
}
echo $r;
}
@ -720,14 +736,23 @@ function alert($p_msg, $buffer=false)
function set_language()
{
// desactivate local check
if ( defined("LOCALE") && LOCALE==0 ) return;
if ( ! isset ($_SESSION[SESSION_KEY.'g_lang'])) return;
if (defined("LOCALE")&&LOCALE==0)
{
return;
}
if (!isset($_SESSION[SESSION_KEY.'g_lang']))
{
return;
}
/*
* If translation is not supported by current
*/
if (! function_exists("bindtextdomain")) return;
if (!function_exists("bindtextdomain"))
{
return;
}
$dir = "";
// set differently the language depending of the operating system
if (what_os() == 1)
@ -1155,6 +1180,7 @@ function display_menu($p_menuid)
}
tracedebug("'menu", $file[0]['me_file'],__FUNCTION__.__LINE__."line");
tracedebug("'menu", $file[0]['me_parameter'],__FUNCTION__.__LINE__."parm ");
if ( DEBUG ) { echo $file[0]['me_file']," param : ",$file[0]['me_parameter'] ;}
/*
* Log the file we input to put in the folder test-noalyss for replaying it
*/