[Phpcompta-dev] r4901 - phpcompta/trunk/include

[phpcompta-dev]

Author: danydb
Date: 2012-06-14 23:24:56 +0200 (Thu, 14 Jun 2012)
New Revision: 4901

Modified:
   phpcompta/trunk/include/action.common.inc.php
   phpcompta/trunk/include/ajax_get_profile.php
   phpcompta/trunk/include/class_follow_up.php
   phpcompta/trunk/include/dashboard.inc.php
Log:
Security : action public are public (readonly) or write if right has been given,
increase last operation to 20
Cosmetic for profile

Modified: phpcompta/trunk/include/action.common.inc.php
===================================================================
--- phpcompta/trunk/include/action.common.inc.php       2012-06-14 20:16:54 UTC 
(rev 4900)
+++ phpcompta/trunk/include/action.common.inc.php       2012-06-14 21:24:56 UTC 
(rev 4901)
@@ -156,7 +156,7 @@
                echo $retour;
                echo '</form>';
        }
-       else if ($g_user->can_read_action($ag_id) == true)
+       else if ($g_user->can_read_action($ag_id) == true || $act->ag_dest == 
-1)
        {
                echo $act->Display('READ', false, $base, $retour);
        }

Modified: phpcompta/trunk/include/ajax_get_profile.php
===================================================================
--- phpcompta/trunk/include/ajax_get_profile.php        2012-06-14 20:16:54 UTC 
(rev 4900)
+++ phpcompta/trunk/include/ajax_get_profile.php        2012-06-14 21:24:56 UTC 
(rev 4901)
@@ -80,9 +80,9 @@
        echo "<h2>Impression</h2>";
        $profile_menu->printing($p_id);
        echo $add_one;
-       echo "<h2>Action gestion accessible</h2>";
+       echo "<h1>Action gestion accessible</h1>";
        $profile_menu->available_profile($p_id);
-       echo "<h2>Dépôt de stock accessible</h2>";
+       echo "<h1>Dépôt de stock accessible</h1>";
        $profile_menu->available_repository($p_id);
 
 }

Modified: phpcompta/trunk/include/class_follow_up.php
===================================================================
--- phpcompta/trunk/include/class_follow_up.php 2012-06-14 20:16:54 UTC (rev 
4900)
+++ phpcompta/trunk/include/class_follow_up.php 2012-06-14 21:24:56 UTC (rev 
4901)
@@ -1259,11 +1259,9 @@
                        $query .= ' and ag_state in (2,3) ';
                if (isset($_GET['only_internal']))
                        $query .= ' and f_id_dest=0 ';
-               if (!isset($all_action))
+               if ( isset($all_action))
                {
                        $query .=" and (ag_owner='" . $_SESSION['g_user'] . "' 
or ".self::sql_security_filter($cn, "R")." )";
-               } else {
-                       $query .= "and ".self::sql_security_filter($cn,'R');
                }
                if (isset($date_start) && isDate($date_start) != null)
                {
@@ -1273,7 +1271,7 @@
                {
                        $query.=" and ag_timestamp <= 
to_date('$date_end','DD.MM.YYYY')";
                }
-               if (isset($ag_dest_query)&& ! isset($all_action) && 
$ag_dest_query != -1)
+               if (isset($ag_dest_query)&& ! isset($all_action) )
                {
                                $query.= " and ag_dest = " . 
sql_string($ag_dest_query);
                }
@@ -1281,6 +1279,7 @@
                {
                        $query = " and ag_id= " . $ag_id;
                }
+               var_dump( $query.$str);
                return $query . $str;
        }
 

Modified: phpcompta/trunk/include/dashboard.inc.php
===================================================================
--- phpcompta/trunk/include/dashboard.inc.php   2012-06-14 20:16:54 UTC (rev 
4900)
+++ phpcompta/trunk/include/dashboard.inc.php   2012-06-14 21:24:56 UTC (rev 
4901)
@@ -23,7 +23,7 @@
 $last_operation=$Operation->get_today();
 $Ledger=new Acc_Ledger($cn,0);
 $last_ledger=array();
-$last_ledger=$Ledger->get_last(10);
+$last_ledger=$Ledger->get_last(20);
 
 ob_start();
 require_once('template/dashboard.php');



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu