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

[phpcompta-dev]

Author: danydb
Date: 2011-10-29 00:12:51 +0200 (Sat, 29 Oct 2011)
New Revision: 4258

Removed:
   phpcompta/trunk/html/access.php
Modified:
   phpcompta/trunk/html/
   phpcompta/trunk/html/do.php
   phpcompta/trunk/html/user_login.php
   phpcompta/trunk/include/
   phpcompta/trunk/include/template/dashboard.php
   phpcompta/trunk/include/user_menu.php
Log:
remove access.php


Property changes on: phpcompta/trunk/html
___________________________________________________________________
Name: svn:ignore
   - *.log
ajax

   + *.log
ajax
.user_login.php.swp


Deleted: phpcompta/trunk/html/access.php
===================================================================
--- phpcompta/trunk/html/access.php     2011-10-28 21:57:45 UTC (rev 4257)
+++ phpcompta/trunk/html/access.php     2011-10-28 22:12:51 UTC (rev 4258)
@@ -1,137 +0,0 @@
-<?php
-
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder address@hidden
-
-/* !\file
- * \brief first page
- */
-require_once("class_idate.php");
-require_once("class_itext.php");
-require_once ('constant.php');
-require_once ('ac_common.php');
-require_once ('class_user.php');
-require_once('class_acc_report.php');
-require_once('class_periode.php');
-require_once ('user_menu.php');
-require_once ('class_dossier.php');
-require_once('class_todo_list.php');
-require_once("class_itextarea.php");
-require_once('class_calendar.php');
-require_once('class_acc_ledger.php');
-require_once('function_javascript.php');
-$cn = new Database(dossier::id());
-$user = new User($cn);
-$user->Check();
-if ($user->check_dossier(dossier::id()) == 'P')
-{
-    redirect("extension.php?" . dossier::get(), 0);
-    exit();
-}
-
-html_page_start($_SESSION['g_theme']);
-load_all_script();
-/*  Check Browser version if < IE6 then unsupported */
-$browser = $_SERVER['HTTP_USER_AGENT'];
-if (strpos($browser, 'MSIE 6') != false ||
-       strpos($browser, 'MSIE 5') != false)
-{
-
-
-    echo <<<EOF
-    <!--[if lt IE 7]>
-    <div style='border: 1px solid #F7941D; background: #FEEFDA; text-align: 
center; clear: both; height: 75px; position: relative;'>
-    <div style='position: absolute; right: 3px; top: 3px; font-family: courier 
new; font-weight: bold;'><a href='#' 
onclick='javascript:this.parentNode.parentNode.style.display="none"; return 
false;'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-cornerx.jpg' 
style='border: none;' alt='Close this notice'/></a></div>
-    <div style='width: 640px; margin: 0 auto; text-align: left; padding: 0; 
overflow: hidden; color: black;'>
-    <div style='width: 75px; float: left;'><img 
src='http://www.ie6nomore.com/files/theme/ie6nomore-warning.jpg' 
alt='Warning!'/></div>
-    <div style='width: 275px; float: left; font-family: Arial, sans-serif;'>
-   <div style='font-size: 14px; font-weight: bold; margin-top: 12px;'>Vous 
utilisez un navigateur dépassé depuis près de 8 ans!</div>
-    <div style='font-size: 12px; margin-top: 6px; line-height: 12px;'>Pour une 
meilleure expérience web, prenez le temps de mettre votre navigateur à 
jour.</div>
-    </div>
-   <div style='width: 75px; float: left;'><a 
href='http://fr.www.mozilla.com/fr/' target='_blank'><img 
src='http://www.ie6nomore.com/files/theme/ie6nomore-firefox.jpg' style='border: 
none;' alt='Get Firefox 3.5'/></a></div>
-   <div style='width: 73px; float: left;'><a 
href='http://www.apple.com/fr/safari/download/' target='_blank'><img 
src='http://www.ie6nomore.com/files/theme/ie6nomore-safari.jpg' style='border: 
none;' alt='Get Safari 4'/></a></div>
- <div style='float: left;'><a href='http://www.google.com/chrome?hl=fr' 
target='_blank'><img 
src='http://www.ie6nomore.com/files/theme/ie6nomore-chrome.jpg' style='border: 
none;' alt='Get Google Chrome'/></a></div>
-     </div>
-     </div>
-     <![endif]-->
-EOF;
-    exit();
-}
-if ($cn->exist_table('version') == false)
-{
-    echo '<h2 class="error" style="font-size:12px">' . _("Base de donnée 
invalide") . '</h2>';
-    $base = dirname($_SERVER['REQUEST_URI']);
-    echo HtmlInput::button_anchor('Retour', $base . '/user_login.php');
-    exit();
-}
-if (DBVERSION < dossier::get_version($cn))
-{
-    echo '<h2 class="error" style="font-size:12px">' . _("Attention: la 
version de base de donnée est supérieure à la version du programme, vous 
devriez mettre à jour") . '</h2>';
-}
-if (DBVERSION > dossier::get_version($cn))
-{
-    echo '<h2 class="error" style="font-size:12px">' . _("Votre base de 
données n'est pas à jour") . '   ';
-    $a = _("cliquez ici pour appliquer le patch");
-    $base = dirname($_SERVER['REQUEST_URI']) . '/admin/setup.php';
-    echo '<a hreF="' . $base . '">' . $a . '</a></h2>';
-}
-
-/*
- * Set a correct periode for the user
- */
-$periode = $user->get_periode();
-$oPeriode = new Periode($cn, $periode);
-
-if ($oPeriode->load() == -1)
-{
-    $periode = $cn->get_value('select p_id from parm_periode order by p_start 
asc limit 1');
-    $user->set_periode($periode);
-}
-
-echo '<div class="u_tmenu">';
-echo menu_tool('access.php');
-echo '</div>';
-echo '<div class="content">';
-
-/* others report */
-$cal = new Calendar();
-$cal->get_preference();
-$Ledger = new Acc_Ledger($cn, 0);
-$last_ledger = array();
-if ($user->check_action(GESTION) == 1)
-{
-    $Operation = new Action($cn);
-    $last_ledger = $Ledger->get_last(10);
-    $last_operation = $Operation->get_last(10);
-}
-else
-{
-    $last_operation = array();
-}
-ob_start();
-require_once('template/dashboard.php');
-$ret = ob_get_contents();
-ob_end_clean();
-echo $ret;
-
-echo '</div>';
-
-

Modified: phpcompta/trunk/html/do.php
===================================================================
--- phpcompta/trunk/html/do.php 2011-10-28 21:57:45 UTC (rev 4257)
+++ phpcompta/trunk/html/do.php 2011-10-28 22:12:51 UTC (rev 4258)
@@ -34,6 +34,72 @@
 
 $cn=new Database(Dossier::id());
 $g_user=new User($cn);
+
+if ($g_user->check_dossier(dossier::id()) == 'P')
+{
+    redirect("extension.php?" . dossier::get(), 0);
+    exit();
+}
+
+html_page_start($_SESSION['g_theme']);
+load_all_script();
+/*  Check Browser version if < IE6 then unsupported */
+$browser = $_SERVER['HTTP_USER_AGENT'];
+if (strpos($browser, 'MSIE 6') != false ||
+       strpos($browser, 'MSIE 5') != false)
+{
+
+
+    echo <<<EOF
+    <!--[if lt IE 7]>
+    <div style='border: 1px solid #F7941D; background: #FEEFDA; text-align: 
center; clear: both; height: 75px; position: relative;'>
+    <div style='position: absolute; right: 3px; top: 3px; font-family: courier 
new; font-weight: bold;'><a href='#' 
onclick='javascript:this.parentNode.parentNode.style.display="none"; return 
false;'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-cornerx.jpg' 
style='border: none;' alt='Close this notice'/></a></div>
+    <div style='width: 640px; margin: 0 auto; text-align: left; padding: 0; 
overflow: hidden; color: black;'>
+    <div style='width: 75px; float: left;'><img 
src='http://www.ie6nomore.com/files/theme/ie6nomore-warning.jpg' 
alt='Warning!'/></div>
+    <div style='width: 275px; float: left; font-family: Arial, sans-serif;'>
+   <div style='font-size: 14px; font-weight: bold; margin-top: 12px;'>Vous 
utilisez un navigateur dépassé depuis près de 8 ans!</div>
+    <div style='font-size: 12px; margin-top: 6px; line-height: 12px;'>Pour une 
meilleure expérience web, prenez le temps de mettre votre navigateur à 
jour.</div>
+    </div>
+   <div style='width: 75px; float: left;'><a 
href='http://fr.www.mozilla.com/fr/' target='_blank'><img 
src='http://www.ie6nomore.com/files/theme/ie6nomore-firefox.jpg' style='border: 
none;' alt='Get Firefox 3.5'/></a></div>
+   <div style='width: 73px; float: left;'><a 
href='http://www.apple.com/fr/safari/download/' target='_blank'><img 
src='http://www.ie6nomore.com/files/theme/ie6nomore-safari.jpg' style='border: 
none;' alt='Get Safari 4'/></a></div>
+ <div style='float: left;'><a href='http://www.google.com/chrome?hl=fr' 
target='_blank'><img 
src='http://www.ie6nomore.com/files/theme/ie6nomore-chrome.jpg' style='border: 
none;' alt='Get Google Chrome'/></a></div>
+     </div>
+     </div>
+     <![endif]-->
+EOF;
+    exit();
+}
+if ($cn->exist_table('version') == false)
+{
+    echo '<h2 class="error" style="font-size:12px">' . _("Base de donnée 
invalide") . '</h2>';
+    $base = dirname($_SERVER['REQUEST_URI']);
+    echo HtmlInput::button_anchor('Retour', $base . '/user_login.php');
+    exit();
+}
+if (DBVERSION < dossier::get_version($cn))
+{
+    echo '<h2 class="error" style="font-size:12px">' . _("Attention: la 
version de base de donnée est supérieure à la version du programme, vous 
devriez mettre à jour") . '</h2>';
+}
+if (DBVERSION > dossier::get_version($cn))
+{
+    echo '<h2 class="error" style="font-size:12px">' . _("Votre base de 
données n'est pas à jour") . '   ';
+    $a = _("cliquez ici pour appliquer le patch");
+    $base = dirname($_SERVER['REQUEST_URI']) . '/admin/setup.php';
+    echo '<a hreF="' . $base . '">' . $a . '</a></h2>';
+}
+
+/*
+ * Set a correct periode for the user
+ */
+$periode = $g_user->get_periode();
+$oPeriode = new Periode($cn, $periode);
+
+if ($oPeriode->load() == -1)
+{
+    $periode = $cn->get_value('select p_id from parm_periode order by p_start 
asc limit 1');
+    $g_user->set_periode($periode);
+}
+
 // Display available menu in the right order
 load_all_script();
 

Modified: phpcompta/trunk/html/user_login.php
===================================================================
--- phpcompta/trunk/html/user_login.php 2011-10-28 21:57:45 UTC (rev 4257)
+++ phpcompta/trunk/html/user_login.php 2011-10-28 22:12:51 UTC (rev 4258)
@@ -102,7 +102,7 @@
         }
         else
         {
-            redirect('access.php?gDossier='.$folder[0]['dos_id']);
+            redirect('do.php?gDossier='.$folder[0]['dos_id']);
             exit();
         }
     }


Property changes on: phpcompta/trunk/include
___________________________________________________________________
Name: svn:ignore
   + .user_menu.php.swp


Modified: phpcompta/trunk/include/template/dashboard.php
===================================================================
--- phpcompta/trunk/include/template/dashboard.php      2011-10-28 21:57:45 UTC 
(rev 4257)
+++ phpcompta/trunk/include/template/dashboard.php      2011-10-28 22:12:51 UTC 
(rev 4258)
@@ -74,19 +74,19 @@
 /*
  * Mini Report
  */
-$report=$user->get_mini_report();
+$report=$g_user->get_mini_report();
 
 $rapport=new Acc_Report($cn);
 $rapport->id=$report;
 if ( $rapport->exist() == false ) {
-  $user->set_mini_report(0);
+  $g_user->set_mini_report(0);
   $report=0;
 }
 
 if ( $report != 0 ) {
   echo '<div style="float:left;width:30%">';
   echo '<fieldset 
style="background-color:white"><legend>'.$rapport->get_name().'</legend>';
-  $exercice=$user->get_exercice();
+  $exercice=$g_user->get_exercice();
   if ( $exercice == 0 ) {
     alert(_('Aucune periode par defaut'));
   } else {

Modified: phpcompta/trunk/include/user_menu.php
===================================================================
--- phpcompta/trunk/include/user_menu.php       2011-10-28 21:57:45 UTC (rev 
4257)
+++ phpcompta/trunk/include/user_menu.php       2011-10-28 22:12:51 UTC (rev 
4258)
@@ -61,7 +61,7 @@
         else $tr="even";
         if ( $user->check_dossier($id)!='P')
         {
-            $target="access.php?gDossier=$id";
+            $target="do.php?gDossier=$id";
         }
         else
         {
@@ -235,7 +235,7 @@
                             //('rapprt.php','Rapprochement'),
 
                             
array('user_advanced.php?'.$str_dossier.'&p_action=preod',_('Ecritures 
definies'),"",9),
-                   
+
                             
array('compta.php?p_action=stock&'.$str_dossier,'Stock',_("Gestion des 
stocks"),5),
                             
array('user_advanced.php?p_action=defreport&'.$str_dossier,_('Rapport'),_("Rapport"),6),
                             
array('user_advanced.php?p_action=ouv&'.$str_dossier,_('Ecriture 
ouverture'),"",8),
@@ -444,7 +444,7 @@
  * \note must include javascript : acc_ledger.js
  * \return string
 */
-function menu_tool($p_from)
+function menu_tool_deprecated($p_from)
 {
 
     if ( ! isset ($_REQUEST['gDossier']))