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

[phpcompta-dev]

Author: danydb
Date: 2011-11-24 15:31:09 +0100 (Thu, 24 Nov 2011)
New Revision: 4471

Modified:
   phpcompta/trunk/html/user_pref.php
   phpcompta/trunk/include/pref.inc.php
Log:
 Bug in preference

Modified: phpcompta/trunk/html/user_pref.php
===================================================================
--- phpcompta/trunk/html/user_pref.php  2011-11-24 13:36:17 UTC (rev 4470)
+++ phpcompta/trunk/html/user_pref.php  2011-11-24 14:31:09 UTC (rev 4471)
@@ -87,19 +87,8 @@
 // comta style
 
 include_once ("user_menu.php");
-if ( isset ($_REQUEST['gDossier']) )
-{
-    if ( $_REQUEST['gDossier'] != 0 )
-    {
-        echo '<div class="u_tmenu">';
-        echo menu_tool('user_pref.php');
-        echo "</div>";
-    }
-}
-else
-{
-    echo "<h2 class=\"info\"> Pr&eacute;f&eacute;rences</h2>";
-}
+echo "<h2 class=\"info\"> Pr&eacute;f&eacute;rences</h2>";
+
 require_once("pref.inc.php");
 html_page_stop();
 ?>

Modified: phpcompta/trunk/include/pref.inc.php
===================================================================
--- phpcompta/trunk/include/pref.inc.php        2011-11-24 13:36:17 UTC (rev 
4470)
+++ phpcompta/trunk/include/pref.inc.php        2011-11-24 14:31:09 UTC (rev 
4471)
@@ -33,6 +33,8 @@
 //----------------------------------------------------------------------
 //
 global $g_user;
+$cn=Dossier::connect();
+$g_user=new User($cn);
 $inside_dossier = false;
 
 if (isset($_REQUEST['gDossier']))
@@ -218,7 +220,11 @@
        {
            echo HtmlInput::button_anchor(_('Retour'), 'user_login.php?');
        }
+       else
+         {
+           echo HtmlInput::button_anchor(_('Retour'), 
'do.php?'.Dossier::get());
 
+         }
 
 
        echo "</DIV>";