Filtre acces client

htdocs/comm/action/fiche.php3

@@ -1,5 +1,5 @@
 <?PHP
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,16 @@ require("../../lib/webcal.class.php3");
 require("../../cactioncomm.class.php3");
 require("../../actioncomm.class.php3");
 
+/*
+ * Sécurité accés client
+ */
+if ($user->societe_id > 0) 
+{
+  $action = '';
+  $socidp = $user->societe_id;
+}
+
+
 $db = new Db();
 
 /*

htdocs/comm/action/index.php3

@@ -1,8 +1,5 @@
 <?PHP
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * $Id$
- * $Source$
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,19 +15,29 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
+ * $Id$
+ * $Source$
+ *
  */
 require("./pre.inc.php3");
 
-
 require("../../contact.class.php3");
 require("../../lib/webcal.class.php3");
 require("../../cactioncomm.class.php3");
 require("../../actioncomm.class.php3");
 
+/*
+ * Sécurité accés client
+ */
+if ($user->societe_id > 0) 
+{
+  $action = '';
+  $socid = $user->societe_id;
+}
 
 llxHeader();
-$db = new Db();
 
+$db = new Db();
 
 if ($page == -1) { $page = 0 ; }
 $limit = $conf->liste_limit;
@@ -40,27 +47,29 @@ $offset = $limit * $page ;
  *
  *
  */
-if ($action=='delete_action') {
+if ($action=='delete_action')
+{
   $actioncomm = new ActionComm($db);
   $actioncomm->delete($actionid);
 }
 /*
- *
- *
  *
  */
-if ($action=='add_action') {
+if ($action=='add_action')
+{
   $contact = new Contact($db);
   $contact->fetch($contactid);
 
-
   $actioncomm = new ActionComm($db);
 
-  if ($actionid == 5) {
+  if ($actionid == 5)
-    $actioncomm->date = $db->idate(mktime($heurehour,$heuremin,0,$remonth,$reday,$reyear));
+    {
-  } else {
+      $actioncomm->date = $db->idate(mktime($heurehour,$heuremin,0,$remonth,$reday,$reyear));
+    }
+  else
+    {
     $actioncomm->date = $date;
-  }
+    }
   $actioncomm->type = $actionid;
   $actioncomm->contact = $contactid;
   
@@ -69,7 +78,6 @@ if ($action=='add_action') {
 
   $actioncomm->add($user);
 
-
   $societe = new Societe($db);
   $societe->fetch($socid);
 
@@ -104,7 +112,6 @@ if ($action=='add_action') {
 }
 
 
-
 /*
  *
  *  Liste
@@ -154,7 +161,9 @@ $sql .= " WHERE a.fk_soc = $socid AND c.id=a.fk_action AND a.fk_user_author = u.
    print $db->error() . '<br>' . $sql;
  }
 
-} else {
+}
+else
+{
 
   print_barre_liste("Liste des actions commerciales effectuées",$page, $PHP_SELF);
 

htdocs/comm/contact.php3

@@ -1,5 +1,5 @@
 <?PHP
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,12 +21,24 @@
  */
 require("./pre.inc.php3");
 
+/*
+ * Sécurité accés client
+ */
+if ($user->societe_id > 0) 
+{
+  $action = '';
+  $socid = $user->societe_id;
+}
+
 llxHeader();
 $db = new Db();
-if ($sortorder == "") {
+
+if ($sortorder == "")
+{
   $sortorder="ASC";
 }
-if ($sortfield == "") {
+if ($sortfield == "")
+{
   $sortfield="p.name";
 }
 
@@ -48,29 +60,32 @@ print_barre_liste("Liste des contacts",$page, $PHP_SELF);
 $sql = "SELECT s.idp, s.nom,  st.libelle as stcomm, p.idp as cidp, p.name, p.firstname, p.email, p.phone ";
 $sql .= "FROM societe as s, socpeople as p, c_stcomm as st WHERE s.fk_stcomm = st.id AND s.idp = p.fk_soc";
 
-if (strlen($stcomm)) 
+if (strlen($stcomm))  // statut commercial
 {
   $sql .= " AND s.fk_stcomm=$stcomm";
 }
 
-if (strlen($begin)) 
+if (strlen($begin)) // filtre sur la premiere lettre du nom
 {
   $sql .= " AND upper(p.name) like '$begin%'";
 }
 
-if ($contactname) {
+if ($contactname) // acces a partir du module de recherche
-  $sql .= " AND lower(p.name) like '%".strtolower($contactname)."%'";
+{
+  $sql .= " AND ( lower(p.name) like '%".strtolower($contactname)."%' OR lower(p.firstname) like '%".strtolower($contactname)."%') ";
   $sortfield = "lower(p.name)";
   $sortorder = "ASC";
 }
 
-if ($socid) {
+if ($socid) 
+{
   $sql .= " AND s.idp = $socid";
 }
 
 $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit, $offset);
 
 $result = $db->query($sql);
+
 if ($result) 
 {
   $num = $db->num_rows();
@@ -111,7 +126,14 @@ if ($result)
       
       print '<td><a href="action/fiche.php3?action=create&actionid=1&contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.$obj->phone.'</a>&nbsp;</td>';
       
-      print "<TD><a href=\"addpropal.php3?socidp=$obj->idp&setcontact=$obj->cidp&action=create\">[Propal]</A></td>\n";
+      if ($user->societe_id == 0) 
+	{
+	  print "<TD><a href=\"addpropal.php3?socidp=$obj->idp&setcontact=$obj->cidp&action=create\">[Propal]</A></td>\n";
+	}
+      else
+	{
+	  print "<td>&nbsp;</td>";
+	}
       print "</TR>\n";
       $i++;
     }

htdocs/comm/fiche.php3

@@ -1,8 +1,5 @@
 <?PHP
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * $Id$
- * $Source$
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +15,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
+ * $Id$
+ * $Source$
+ *
  */
 require("./pre.inc.php3");
 require("../contact.class.php3");

htdocs/comm/propal.php3

@@ -1,8 +1,5 @@
 <?PHP
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * $Id$
- * $Source$
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +15,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
+ * $Id$
+ * $Source$
+ *
  */
 require("./pre.inc.php3");
 
@@ -32,6 +32,16 @@ require("../actioncomm.class.php3");
  *
  */
 
+/*
+ * Sécurité accés client
+ */
+if ($user->societe_id > 0) 
+{
+  $action = '';
+  $socidp = $user->societe_id;
+}
+
+
 llxHeader();
 
 $db = new Db();
@@ -160,6 +170,10 @@ if ($propalid) {
   $sql .= " FROM societe as s, llx_propal as p, c_propalst as c, socpeople as x";
   $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND x.idp = p.fk_soc_contact AND p.rowid = $propalid";
 
+  if ($socidp) { 
+    $sql .= " AND s.idp = $socidp"; 
+  }
+
   $result = $db->query($sql);
 
   if ( $result )

htdocs/fichinter/fiche.php3

@@ -1,5 +1,5 @@
 <?PHP
-/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -434,11 +434,11 @@ $sql .= " FROM societe as s, llx_fichinter as f ";
 $sql .= " WHERE f.fk_soc = s.idp ";
 if ($socidp)
 {
-  $sql .= "AND s.idp = $socidp";
+  $sql .= " AND s.idp = $socidp";
 }
 if ($fichinter > 0)
 {
-  $sql .= "AND s.idp = $fichinter->societe_id";
+  $sql .= " AND s.idp = $fichinter->societe_id";
 }
 
 $sql .= " ORDER BY f.datei DESC ;";

htdocs/fichinter/index.php3

@@ -1,5 +1,5 @@
 <?PHP
-/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,10 +25,18 @@ require("../contact.class.php3");
 
 llxHeader();
 $db = new Db();
-if ($sortorder == "") {
+
+/*
+ * Liste
+ *
+ */
+
+if ($sortorder == "")
+{
   $sortorder="ASC";
 }
-if ($sortfield == "") {
+if ($sortfield == "")
+{
   $sortfield="nom";
 }
 
@@ -38,9 +46,15 @@ print_titre("Liste des fiches d'intervention");
 $sql = "SELECT s.nom,s.idp, f.ref,".$db->pdate("f.datei")." as dp, f.rowid as fichid, f.fk_statut, f.duree";
 $sql .= " FROM societe as s, llx_fichinter as f ";
 $sql .= " WHERE f.fk_soc = s.idp ";
+
+if ($user->societe_id > 0) {
+  $sql .= " AND s.idp = " . $user->societe_id;
+}
+
 $sql .= " ORDER BY f.datei DESC ;";
 
-if ( $db->query($sql) ) {
+if ( $db->query($sql) )
+{
   $num = $db->num_rows();
   $i = 0;
   print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
@@ -49,27 +63,38 @@ if ( $db->query($sql) ) {
   print "<TD><a href=\"$PHP_SELF?sortfield=lower(p.label)&sortorder=ASC\">Societe</a></td>";
   print "<TD>Date</TD>";
   print '<TD align="center">Durée</TD>';
-  print "<TD>Statut</TD><td>&nbsp;</td>";
+  print '<TD align="center">Statut</TD><td>&nbsp;</td>';
   print "</TR>\n";
   $var=True;
-  while ($i < $num) {
+  while ($i < $num)
-    $objp = $db->fetch_object( $i);
+    {
-    $var=!$var;
+      $objp = $db->fetch_object( $i);
-    print "<TR $bc[$var]>";
+      $var=!$var;
-    print "<TD><a href=\"fiche.php3?id=$objp->fichid\">$objp->ref</a></TD>\n";
+      print "<TR $bc[$var]>";
-    print "<TD><a href=\"../comm/fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
+      print "<TD><a href=\"fiche.php3?id=$objp->fichid\">$objp->ref</a></TD>\n";
-    print "<TD>".strftime("%d %B %Y",$objp->dp)."</TD>\n";
+      print "<TD><a href=\"../comm/fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
-    print '<TD align="center">'.sprintf("%.1f",$objp->duree).'</TD>';
+      print "<TD>".strftime("%d %B %Y",$objp->dp)."</TD>\n";
-    print "<TD>$objp->fk_statut</TD>\n";
+      print '<TD align="center">'.sprintf("%.1f",$objp->duree).'</TD>';
-    print '<TD align="center"><a href="fiche.php3?socidp='.$objp->idp.'&action=create">[Fiche Inter]</A></td>';    
+      print '<TD align="center">'.$objp->fk_statut.'</TD>';
-    print "</TR>\n";
 
-    $i++;
+      if ($user->societe_id == 0)
-  }
+	{
+	  print '<TD align="center"><a href="fiche.php3?socidp='.$objp->idp.'&action=create">[Fiche Inter]</A></td>';
+	}
+      else
+	{
+	  print "<td>&nbsp;</td>";
+	}
+      print "</TR>\n";
+      
+      $i++;
+    }
   
   print "</TABLE>";
   $db->free();
-} else {
+}
+else
+{
   print $db->error();
   print "<p>$sql";
 }