[Phpcompta-dev] r4262 - in phpcompta/trunk: html include include/template

[phpcompta-dev]

Author: danydb
Date: 2011-10-29 03:10:52 +0200 (Sat, 29 Oct 2011)
New Revision: 4262

Modified:
   phpcompta/trunk/html/do.php
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/template/menu.php
Log:
#418: Menu directement choisi s'il n'y en a qu'un

Modified: phpcompta/trunk/html/do.php
===================================================================
--- phpcompta/trunk/html/do.php 2011-10-29 01:10:13 UTC (rev 4261)
+++ phpcompta/trunk/html/do.php 2011-10-29 01:10:52 UTC (rev 4262)
@@ -32,6 +32,14 @@
 html_page_start();
 global $g_user, $cn;
 
+// if gDossier is not set redirect to form to choose a folder
+if ( ! isset($_REQUEST['gDossier']))
+{
+    redirect('user_login.php');
+    exit();
+}
+
+
 $cn = new Database(Dossier::id());
 $g_user = new User($cn);
 

Modified: phpcompta/trunk/include/ac_common.php
===================================================================
--- phpcompta/trunk/include/ac_common.php       2011-10-29 01:10:13 UTC (rev 
4261)
+++ phpcompta/trunk/include/ac_common.php       2011-10-29 01:10:52 UTC (rev 
4262)
@@ -760,14 +760,22 @@
        me_menu,me_code
        from v_all_menu
        where
-       me_code_dep=$1 order by p_order",array($module[$idx]));
+       me_code_dep=$1 and user_name=$2 order by 
p_order",array($module[$idx],$g_user->login));
 
-    if (! empty ($amenu))
+    if (! empty ($amenu) && count($amenu)>1)
     {
        require 'template/menu.php';
     }
-    else
+    elseif (count($amenu)==1)
     {
+       echo '<div class="topmenu">';
+       echo h2info($amenu[0]['me_menu']);
+       echo '</div>';
+       $module[$idx]=$amenu[0]['me_code'];
+    }
+
+    if (empty($amenu) || count($amenu)==1)
+    {
 /**
  * @todo add security
  * check if user can access this module
@@ -784,6 +792,7 @@
            echo '<div class="content">';
            require_once "$file";
            echo '</div>';
+           exit();
        }
     }
 }

Modified: phpcompta/trunk/include/template/menu.php
===================================================================
--- phpcompta/trunk/include/template/menu.php   2011-10-29 01:10:13 UTC (rev 
4261)
+++ phpcompta/trunk/include/template/menu.php   2011-10-29 01:10:52 UTC (rev 
4262)
@@ -14,7 +14,7 @@
        global $g_user;
        // Display the menu
        for($i=0;$i < count($amenu);$i++):
-           if ( isset($module[$idx+1]) && 
$module[$idx+1]==$amenu[$i]['me_code']):
+           if ( (count($amenu)==1)|| (isset($module[$idx+1]) && 
$module[$idx+1]==$amenu[$i]['me_code'])):
                $class="selectedcell";
 ?>
        <td class="<?=$class?>">