diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index 3c33728e2..57d152761 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -596,7 +596,7 @@ class Acc_Ledger extends jrn_def_sql $page=(isset($_GET['offset']))?$_GET['page']:1; $offset=(isset($_GET['offset']))?$_GET['offset']:0; // create the nav. bar - $bar=jrn_navigation_bar($offset,$max_line,$step,$page); + $bar=navigation_bar($offset,$max_line,$step,$page); // show a part list($count,$html)= $Ledger->list_operation($sql,$offset,0); echo $html; @@ -769,7 +769,7 @@ class Acc_Ledger extends jrn_def_sql $page=(isset($_GET['offset']))?$_GET['page']:1; $offset=(isset($_GET['offset']))?$_GET['offset']:0; // create the nav. bar - $bar=jrn_navigation_bar($offset,$max_line,$step,$page); + $bar=navigation_bar($offset,$max_line,$step,$page); // show a part list($count,$html)= $Ledger->list_operation($sql,$offset,0); echo $html; diff --git a/include/class_acc_ledger_fin.php b/include/class_acc_ledger_fin.php index ffb5be09c..68521f1b6 100644 --- a/include/class_acc_ledger_fin.php +++ b/include/class_acc_ledger_fin.php @@ -1056,7 +1056,7 @@ class Acc_Ledger_Fin extends Acc_Ledger list($max_line, $list) = ListJrn($this->db, "where jrn_def_type='FIN' $filter_per $l $available_ledger " , null, $offset, 0); - $bar = jrn_navigation_bar($offset, $max_line, $step, $page); + $bar = navigation_bar($offset, $max_line, $step, $page); echo "
$bar"; echo $list; diff --git a/include/class_acc_ledger_purchase.php b/include/class_acc_ledger_purchase.php index 312b69b83..62c74cc4f 100644 --- a/include/class_acc_ledger_purchase.php +++ b/include/class_acc_ledger_purchase.php @@ -1598,7 +1598,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger // Get the max line $m=($max_line2>$max_line)?$max_line2:$max_line; - $bar2=jrn_navigation_bar($offset,$m,$step,$page); + $bar2=navigation_bar($offset,$m,$step,$page); echo $bar2; echo '

'._('Echeance dépassée').'

'; diff --git a/include/class_acc_ledger_sold.php b/include/class_acc_ledger_sold.php index 4c62b6f8e..d3e205493 100644 --- a/include/class_acc_ledger_sold.php +++ b/include/class_acc_ledger_sold.php @@ -992,7 +992,7 @@ class Acc_Ledger_Sold extends Acc_Ledger // Get the max line $m=($max_line2>$max_line)?$max_line2:$max_line; - $bar2=jrn_navigation_bar($offset,$m,$step,$page); + $bar2=navigation_bar($offset,$m,$step,$page); echo $bar2; echo '

'._('Echeance dépassée').'

'; diff --git a/include/class_anc_operation.php b/include/class_anc_operation.php index b33300dda..580fa60c9 100644 --- a/include/class_anc_operation.php +++ b/include/class_anc_operation.php @@ -181,11 +181,11 @@ class Anc_Operation if ( empty($array) ) return "Pas d'enregistrement trouvé"; - // jrn_navigation_bar + // navigation_bar $step=$_SESSION['g_pagesize']; $page=(isset($_GET['offset']))?$_GET['page']:1; $offset=(isset($_GET['offset']))?$_GET['offset']:0; - $bar=jrn_navigation_bar($offset+1,count($array),$step,$page); + $bar=navigation_bar($offset+1,count($array),$step,$page); if ( $step !=-1) $view=array_splice($array,$offset,$step); diff --git a/include/class_contact.php b/include/class_contact.php index c49860721..ff4486403 100644 --- a/include/class_contact.php +++ b/include/class_contact.php @@ -64,7 +64,7 @@ class contact extends Fiche // Get offset and page variable $offset=( isset ($_REQUEST['offset'] )) ?$_REQUEST['offset']:0; $page=(isset($_REQUEST['page']))?$_REQUEST['page']:1; - $bar=jrn_navigation_bar($offset,$all_contact,$_SESSION['g_pagesize'],$page); + $bar=navigation_bar($offset,$all_contact,$_SESSION['g_pagesize'],$page); // set a filter ? $search=""; if ( trim($p_search) != "" ) diff --git a/include/class_fiche.php b/include/class_fiche.php index 4cb7a5565..89e161509 100644 --- a/include/class_fiche.php +++ b/include/class_fiche.php @@ -1556,7 +1556,7 @@ class Fiche // Get offset and page variable $offset=( isset ($_REQUEST['offset'] )) ?$_REQUEST['offset']:0; $page=(isset($_REQUEST['page']))?$_REQUEST['page']:1; - $bar=jrn_navigation_bar($offset,$all_tiers,$_SESSION['g_pagesize'],$page); + $bar=navigation_bar($offset,$all_tiers,$_SESSION['g_pagesize'],$page); // set a filter ? $search=$p_sql; diff --git a/include/class_fiche_def.php b/include/class_fiche_def.php index 7a4963ed5..c86409f13 100644 --- a/include/class_fiche_def.php +++ b/include/class_fiche_def.php @@ -299,7 +299,7 @@ class Fiche_Def fiche join fiche_detail using(f_id) where ad_id=1 and fd_id=$1 order by 2"; - // we use jrn_navigation_bar + // we use navigation_bar if ($step == 1 && $_SESSION['g_pagesize'] != -1 ) { $offset=(isset($_GET['offset']))?$_GET['offset']:0; @@ -360,7 +360,7 @@ class Fiche_Def where fd_id='".$this->id."' and ad_id=".ATTR_DEF_NAME." order by f_id"); $sql_limit=" limit ".$step; $sql_offset=" offset ".$offset; - $bar=jrn_navigation_bar($offset,$max_line,$step,$page); + $bar=navigation_bar($offset,$max_line,$step,$page); } // Get all name the cards of the select category diff --git a/include/class_follow_up.php b/include/class_follow_up.php index 3852b37bc..e8ca48d9a 100644 --- a/include/class_follow_up.php +++ b/include/class_follow_up.php @@ -708,7 +708,7 @@ class Follow_Up $limit = " LIMIT $step OFFSET $offset "; else $limit = ''; - $bar = jrn_navigation_bar($offset, $max_line, $step, $page); + $bar = navigation_bar($offset, $max_line, $step, $page); $Res = $this->db->exec_sql($sql . $limit); $a_row = Database::fetch_all($Res); diff --git a/include/class_stock.php b/include/class_stock.php index 817577f6d..d24ab3880 100644 --- a/include/class_stock.php +++ b/include/class_stock.php @@ -64,7 +64,7 @@ class Stock extends Stock_Sql $max_row = Database::num_row($res); - $nav_bar = jrn_navigation_bar($offset, $max_row, 0, $page); + $nav_bar = navigation_bar($offset, $max_row, 0, $page); if ($step != -1) $res = $this->cn->exec_sql($sql . " , sg_id asc limit " . $step . " offset " . $offset); diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index 121031bdc..428caa17a 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -307,7 +307,7 @@ if ( $def == 2 ) $step=$_SESSION['g_pagesize']; $page=(isset($_GET['offset']))?$_GET['page']:1; $offset=(isset($_GET['offset']))?$_GET['offset']:0; - $bar=jrn_navigation_bar($offset,$max_line,$step,$page); + $bar=navigation_bar($offset,$max_line,$step,$page); echo '
'; @@ -393,7 +393,7 @@ if ( $def==3 ) $step=$_SESSION['g_pagesize']; $page=(isset($_GET['offset']))?$_GET['page']:1; $offset=(isset($_GET['offset']))?$_GET['offset']:0; - $bar=jrn_navigation_bar($offset,$max_line,$step,$page); + $bar=navigation_bar($offset,$max_line,$step,$page); echo ''; diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php index 523da7519..1cd948e3d 100644 --- a/include/history_operation.inc.php +++ b/include/history_operation.inc.php @@ -116,7 +116,7 @@ $max_line = $cn->count_sql($sql); $step = $_SESSION['g_pagesize']; $page = (isset($_GET['offset'])) ? $_GET['page'] : 1; $offset = (isset($_GET['offset'])) ? $_GET['offset'] : 0; -$bar = jrn_navigation_bar($offset, $max_line, $step, $page); +$bar = navigation_bar($offset, $max_line, $step, $page); echo $msg; echo ''; diff --git a/include/search.inc.php b/include/search.inc.php index db0b5e949..b7177666f 100644 --- a/include/search.inc.php +++ b/include/search.inc.php @@ -108,7 +108,7 @@ if ( isset ($_GET['viewsearch']) ) // Count nb of line $max_line=$cn->count_sql($sql); list($count,$content)=$ledger->list_operation_to_reconcile($sql); - $bar=jrn_navigation_bar($offset,$max_line,$step,$page); + $bar=navigation_bar($offset,$max_line,$step,$page); if (! $inside ) { echo $bar; diff --git a/include/user_common.php b/include/user_common.php index 3355c1ab3..a46e5f47e 100644 --- a/include/user_common.php +++ b/include/user_common.php @@ -75,11 +75,11 @@ function isValid_deprecrated ($p_cn,$p_grpt_id) $offset=(isset($_GET['offset']))?$_GET['offset']:0; list ($max_ligne,$list)=ListJrn($cn,$_GET['p_jrn'],$sql,null,$offset,1); - $bar=jrn_navigation_bar($offset,$max_ligne,$step,$page); + $bar=navigation_bar($offset,$max_ligne,$step,$page); \endverbatim * \return string with the nav. bar */ -function jrn_navigation_bar($p_offset,$p_line,$p_size=0,$p_page=1,$p_javascript="") +function navigation_bar($p_offset,$p_line,$p_size=0,$p_page=1,$p_javascript="") { // if the pagesize is unlimited return "" // in that case there is no nav. bar