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

[phpcompta-dev]

Author: danydb
Date: 2011-10-29 01:58:49 +0200 (Sat, 29 Oct 2011)
New Revision: 4259

Modified:
   phpcompta/trunk/html/do.php
   phpcompta/trunk/include/ac_common.php
Log:
#422 Module by default

Modified: phpcompta/trunk/html/do.php
===================================================================
--- phpcompta/trunk/html/do.php 2011-10-28 22:12:51 UTC (rev 4258)
+++ phpcompta/trunk/html/do.php 2011-10-28 23:58:49 UTC (rev 4259)
@@ -30,10 +30,10 @@
 require_once('ac_common.php');
 require_once 'function_javascript.php';
 html_page_start();
-global $g_user,$cn;
+global $g_user, $cn;
 
-$cn=new Database(Dossier::id());
-$g_user=new User($cn);
+$cn = new Database(Dossier::id());
+$g_user = new User($cn);
 
 if ($g_user->check_dossier(dossier::id()) == 'P')
 {
@@ -112,14 +112,17 @@
 
 // Show module and highligt selected one
     show_module($module_selected);
-   for ( $i=0;$i != count($all);$i++)
-       {   // show the menu
-           show_menu($all,$i);
-       }
+    for ($i = 0; $i != count($all); $i++)
+    {   // show the menu
+       show_menu($all, $i);
+    }
 }
 else
 {
-    show_module(-1);
+    $default = find_default_module();
+    show_module($default);
+    $all[0] = $default;
+    show_menu($all, 0);
 }
 
 

Modified: phpcompta/trunk/include/ac_common.php
===================================================================
--- phpcompta/trunk/include/ac_common.php       2011-10-28 22:12:51 UTC (rev 
4258)
+++ phpcompta/trunk/include/ac_common.php       2011-10-28 23:58:49 UTC (rev 
4259)
@@ -702,15 +702,51 @@
        user_name=$1
        and p_type_display='M'
        order by p_order",array($g_user->login));
-    require_once('template/module.php');
+
     if ( $selected != -1 )
     {
+       require_once('template/module.php');
        $file=$cn->get_value("select me_file from v_all_menu where 
me_code=$1",array($selected));
        if ($file != '')
+       {
            require_once $file;
+           exit();
+       }
     }
+    else
+    {
 
+    }
 }
+function find_default_module()
+{
+    global $g_user;
+     $cn=Dossier::connect();
+
+   $default_module = $cn->get_array("select me_code
+           from profile_menu join profile_user using (p_id)
+           where
+           user_name=$1 and pm_default=1", array($g_user->login));
+
+       if (empty($default_module))
+       {
+        $default_module = $cn->get_array("select me_code
+           from profile_menu join profile_user using (p_id)
+           where
+           user_name=$1 and p_order=(select min(p_order) from profile_menu
+               where user_name=$1) limit 1", 
array($g_user->login,$g_user->login));
+           return $default_module;
+       }
+
+       if (count($default_module) > 1)
+       {
+           echo_error("Plusieurs modules sont le module par défaut", __LINE__, 
__FILE__);
+       }
+       elseif (count($default_module) == 1)
+       {
+           return $default_module[0]['me_code'];
+       }
+}
 /**
  * show default module
  */