';
if ( $sa == "add")
- require_once ('param_jrn_add.inc.php');
+ require_once 'param_jrn_add.inc.php';
elseif ($sa=='detail')
require_once ('param_jrn_detail.inc.php');
else
diff --git a/html/user_advanced.php b/html/user_advanced.php
deleted file mode 100644
index 911e0b938..000000000
--- a/html/user_advanced.php
+++ /dev/null
@@ -1,123 +0,0 @@
-Check();
-$User->check_dossier(dossier::id());
-$cn=new Database(dossier::id());
-$User->db=$cn;
-
-require_once('class_database.php');
-require_once('class_ipopup.php');
-load_all_script();
-echo ICard::ipopup('ipopcard');
-echo IPoste::ipopup('ipop_account');
-$search_card=new IPopup('ipop_card');
-$search_card->title=_('Recherche de fiche');
-$search_card->value='';
-echo $search_card->input();
-
-
-
-// We don't check permissions here in fact, permission are tested in the
-// functions
-
-// Show the top menus
-include_once ("user_menu.php");
-echo '';
-$p_action="";
-
-
-$p_action=(isset($_REQUEST['p_action']))?$_REQUEST['p_action']:"";
-switch ($p_action)
-{
-case 'preod':
- $high=9;
- break;
-case 'periode';
- $high=2;
- break;
-case 'verif';
- $high=10;
- break;
-case 'defreport':
- $high=6;
- break;
-case 'ouv':
- $high=8;
- break;
-default:
- $high=0;
-
-}
-echo ShowMenuAdvanced($high);
-
-
-//--------------------------------------------------
-// Predefined operation
-//--------------------------------------------------
-
-if ($p_action=="preod")
-{
- require_once('preod.inc.php');
-
- exit();
-}
-//----------------------------------------------------------------------
-// Verification solde
-//----------------------------------------------------------------------
-if ( $p_action=='verif' )
-{
- require_once ('verif_bilan.inc.php');
- exit();
-}
-
-if ($p_action=='defreport')
-{
- require_once('report.inc.php');
-}
-/* --------------------------------------------------
-Import writing (opening exercice)
--------------------------------------------------- */
-if ( $p_action == 'ouv')
-{
- require_once('opening.inc.php');
-}
-html_page_stop();
-?>
diff --git a/include/ac_common.php b/include/ac_common.php
index 08a8b60e7..4ae1d1418 100644
--- a/include/ac_common.php
+++ b/include/ac_common.php
@@ -602,7 +602,7 @@ function set_language()
/**
*@brief try to determine on what os you are running the pĥpcompte
*server
- *@return
+ *@return
* 0 it is a windows
* 1 it is a Unix like
*/
@@ -687,4 +687,79 @@ EOF;
exit();
}
}
+/**
+ *
+ * @param int $selected module selected
+ */
+function show_module($selected)
+{
+ global $g_user;
+ $cn=Dossier::connect();
+ $amodule=$cn->get_array("select
+ me_code,me_menu,me_url
+ from v_all_menu
+ where
+ user_name=$1
+ and p_type_display='M'
+ order by p_order",array($g_user->login));
+ require_once('template/module.php');
+ if ( $selected != -1 )
+ {
+ $file=$cn->get_value("select me_file from v_all_menu where me_code=$1",array($selected));
+ if ($file != '')
+ require_once $file;
+ }
+
+}
+/**
+ * show default module
+ */
+function show_default()
+{
+ $cn=Dossier::connect();
+ $file=$cn->get_array('SELECT m_code FROM module where m_default=1');
+ if (! empty ($file) )
+ {
+ $selected=$file[0]['m_code'];
+ show_module($selected);
+ }
+}
+/**
+ *
+ */
+function show_menu($module,$idx)
+{
+ global $g_user;
+ $cn=Dossier::connect();
+ $amenu=$cn->get_array("select
+ me_menu,me_code
+ from v_all_menu
+ where
+ me_code_dep=$1 order by p_order",array($module[$idx]));
+
+ if (! empty ($amenu))
+ {
+ require 'template/menu.php';
+ }
+ else
+ {
+/**
+ * @todo add security
+ * check if user can access this module
+ */
+ $file=$cn->get_value("select me_file
+ from menu_ref
+ where
+ me_code=$1 and
+ (me_file is not null or trim(me_file) <>'')",
+ array($module[$idx]));
+
+ if ( $file != "" )
+ {
+ echo '
';
+ require_once "$file";
+ echo '
';
+ }
+ }
+}
?>
diff --git a/include/action.inc.php b/include/action.inc.php
index 609f1ecc8..d1f33d91f 100644
--- a/include/action.inc.php
+++ b/include/action.inc.php
@@ -22,10 +22,10 @@
* \brief Page who manage the different actions (meeting, letter)
*/
require_once('class_ipopup.php');
+global $g_user;
+$g_user->can_request(GECOUR);
-$User->can_request(GECOUR);
-
-$retour=HtmlInput::button_anchor(_('Retour'),'?p_action=suivi_courrier&my_action&'.dossier::get());
+$retour=HtmlInput::button_anchor(_('Retour'),'?ac='.$_REQUEST['ac'].'&my_action&'.dossier::get());
//-----------------------------------------------------
// Action
//-----------------------------------------------------
@@ -53,8 +53,8 @@ $sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
* with the generation of document
*/
$ag_id=(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0;
-$p_action=$_REQUEST['p_action'];
-$base='p_action='.$p_action;
+$ac=$_REQUEST['ac'];
+$base='ac='.$ac;
require_once('action.common.inc.php');
echo "