[Noalyss-commit] [noalyss] 07/17: Dossier:connect : database singleton Indentation Add error_log to catch block

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 3f2f06e73e072170e1caf395696f401117d5dcb0
Author: Dany De Bontridder <address@hidden>
Date:   Tue Sep 15 11:30:15 2015 +0200

    Dossier:connect : database singleton
    Indentation
    Add error_log to catch block
---
 include/class/class_dossier.php |  251 +++++++++++++++++++++------------------
 1 files changed, 133 insertions(+), 118 deletions(-)

diff --git a/include/class/class_dossier.php b/include/class/class_dossier.php
index 3531657..2682f49 100644
--- a/include/class/class_dossier.php
+++ b/include/class/class_dossier.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of NOALYSS.
  *
@@ -15,22 +16,22 @@
  *   You should have received a copy of the GNU General Public License
  *   along with NOALYSS; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ */
 
 // Copyright Author Dany De Bontridder address@hidden
 
-/*!\file
+/* !\file
  * \brief the class for the dossier, everywhere we need to know to
  * which folder we are connected, because we can't use $_SESSION, we
  * need to pass the dossier_id via a _GET or a POST variable
  */
 
-/*! \brief manage the current dossier, everywhere we need to know to
+/* ! \brief manage the current dossier, everywhere we need to know to
  * which folder we are connected, because we can't use $_SESSION, we
  * need to pass the dossier_id via a _GET or a POST variable
  *  private static $variable=array("id"=>"dos_id",
-                                "name"=>"dos_name",
-                                "desc"=>"dos_description");
+  "name"=>"dos_name",
+  "desc"=>"dos_description");
  *
  */
 require_once NOALYSS_INCLUDE.'/lib/class_database.php';
@@ -38,15 +39,19 @@ require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 
 class Dossier
 {
+
     private static $variable=array("id"=>"dos_id",
-                                   "name"=>"dos_name",
-                                   "desc"=>"dos_description");
+        "name"=>"dos_name",
+        "desc"=>"dos_description");
+
     function __construct($p_id)
     {
-        $this->cn=new Database();      // Connect to the repository
+        $this->cn=new Database();  // Connect to the repository
         $this->dos_id=$p_id;
     }
-    /*!\brief return the $_REQUEST['gDossier'] after a check */
+
+    /* !\brief return the $_REQUEST['gDossier'] after a check */
+
     static function id()
     {
         self::check();
@@ -56,25 +61,25 @@ class Dossier
     /**
      * @brief Show the folder where user have access. 
      * @param  p_type string   
-       - A for all dossiers 
-       - R for accessible folders
-       - X forbidden folders
+      - A for all dossiers
+      - R for accessible folders
+      - X forbidden folders
      * @param p_login is the user name
      * @param p_text is a part of the name where are looking for
      * @return     nothing
      *
      */
-    static function show_dossier($p_type,$p_login="",$p_text="",$limit=0)
+    static function show_dossier($p_type, $p_login="", $p_text="", $limit=0)
     {
         $cn=new Database();
         $str_limit=($limit==0)?'':' limit '.$limit;
-        if ( $p_type == "A")
+        if ($p_type=="A")
         {
             $l_sql="select *, 'W' as priv_priv from ac_dossier where dos_name 
~* $2 or dos_description ~* $2 ORDER BY dos_name $str_limit  ";
-            $a_row=$cn->get_array($l_sql,$p_text);
+            $a_row=$cn->get_array($l_sql, $p_text);
             return $a_row;
         }
-        else if ($p_type == "R")
+        else if ($p_type=="R")
         {
             $l_sql="select * from jnt_use_dos
                    natural join ac_dossier
@@ -86,41 +91,40 @@ class Dossier
                    order by dos_name 
                    $str_limit
                    ";
-            
-            $a_row=$cn->get_array($l_sql,array($p_login,$p_text));
-            return $a_row;
 
-        } 
-        else  if ($p_type == 'X')
+            $a_row=$cn->get_array($l_sql, array($p_login, $p_text));
+            return $a_row;
+        }
+        else if ($p_type=='X')
         {
             $l_sql=' select * from ac_dossier where dos_id not in 
                   (select dos_id from jnt_use_dos where use_id=$1)
                   and ( dos_name ~* $2 or dos_description ~* $2)
                   order by dos_name '.$str_limit;
-            $a_row=$cn->get_array($l_sql,array($p_login,$p_text));
+            $a_row=$cn->get_array($l_sql, array($p_login, $p_text));
             return $a_row;
-
         }
         else
         {
-            throw new Exception (_("Erreur paramètre"));
-        } 
-        
-       
+            throw new Exception(_("Erreur paramètre"));
+        }
     }
+
     /**
      * Count the number of folder in the repository
      * @return integer
      */
-    function count() 
+    function count()
     {
         $nb_folder=$this->cn->get_value('select count(*) from ac_dossier');
         return $nb_folder;
     }
-    /*!
+
+    /* !
      * \brief Return all the users
      * as an array
      */
+
     function get_user_folder($sql="")
     {
 
@@ -146,51 +150,56 @@ class Dossier
 
         $res=$this->cn->get_array($sql);
         return $res;
-        }
+    }
+
+    /* !\brief check if gDossier is set */
 
-    /*!\brief check if gDossier is set */
     static function check()
     {
-        if ( ! isset ($_REQUEST['gDossier']) )
+        if (!isset($_REQUEST['gDossier']))
         {
-            echo_error ('Dossier inconnu ');
+            echo_error('Dossier inconnu ');
             exit('Dossier invalide ');
         }
         $id=$_REQUEST['gDossier'];
-        if ( is_numeric ($id) == 0 ||
-                strlen($id)> 6 ||
-                $id > 999999)
+        if (is_numeric($id)==0||
+                strlen($id)>6||
+                $id>999999)
             exit('gDossier Invalide : '.$id);
-
     }
-    /*!\brief return a string to put to gDossier into a GET */
+
+    /* !\brief return a string to put to gDossier into a GET */
+
     static function get()
     {
         self::check();
         return "gDossier=".$_REQUEST['gDossier'];
-
     }
 
-    /*!\brief return a string to set gDossier into a FORM */
+    /* !\brief return a string to set gDossier into a FORM */
+
     static function hidden()
     {
         self::check();
         return '<input type="hidden" id="gDossier" name="gDossier" 
value="'.$_REQUEST['gDossier'].'">';
     }
-    /*!\brief retrieve the name of the current dossier */
+
+    /* !\brief retrieve the name of the current dossier */
+
     static function name($id=0)
     {
         self::check();
 
         $cn=new Database();
         $id=($id==0)?$_REQUEST['gDossier']:$id;
-        $name=$cn->get_value("select dos_name from ac_dossier where 
dos_id=$1",array($_REQUEST['gDossier']));
+        $name=$cn->get_value("select dos_name from ac_dossier where dos_id=$1",
+                array($_REQUEST['gDossier']));
         return $name;
     }
 
     public function get_parameter($p_string)
     {
-        if ( array_key_exists($p_string,self::$variable) )
+        if (array_key_exists($p_string, self::$variable))
         {
             $idx=self::$variable[$p_string];
             return $this->$idx;
@@ -198,21 +207,21 @@ class Dossier
         else
             throw new Exception("Attribut inexistant $p_string");
     }
-    public function set_parameter($p_string,$p_value)
+
+    public function set_parameter($p_string, $p_value)
     {
-        if ( array_key_exists($p_string,self::$variable) )
+        if (array_key_exists($p_string, self::$variable))
         {
             $idx=self::$variable[$p_string];
             $this->$idx=$p_value;
         }
         else
-           throw new Exception("Attribut inexistant $p_string");
-
-
+            throw new Exception("Attribut inexistant $p_string");
     }
+
     public function get_info()
     {
-        return var_export(self::$variable,true);
+        return var_export(self::$variable, true);
     }
 
     public function save()
@@ -222,20 +231,21 @@ class Dossier
 
     public function update()
     {
-        if ( strlen(trim($this->dos_name))== 0 ) return;
+        if (strlen(trim($this->dos_name))==0)
+            return;
 
-        if ( $this->cn->get_value("select count(*) from ac_dossier where 
dos_name=$1 and dos_id<>$2",
-                                  array($this->dos_name,$this->dos_id)) !=0 )
-            return ;
+        if ($this->cn->get_value("select count(*) from ac_dossier where 
dos_name=$1 and dos_id<>$2",
+                        array($this->dos_name, $this->dos_id))!=0)
+            return;
 
         $sql="update ac_dossier set dos_name=$1,dos_description=$2 ".
-             " where dos_id = $3";
+                " where dos_id = $3";
         $res=$this->cn->exec_sql(
-                 $sql,
-                 array(trim($this->dos_name),
-                       trim($this->dos_description),
-                       $this->dos_id)
-             );
+                $sql,
+                array(trim($this->dos_name),
+            trim($this->dos_description),
+            $this->dos_id)
+        );
     }
 
     public function load()
@@ -244,71 +254,76 @@ class Dossier
         $sql="select dos_name,dos_description from ac_dossier where dos_id=$1";
 
         $res=$this->cn->exec_sql(
-                 $sql,
-                 array($this->dos_id)
-             );
+                $sql, array($this->dos_id)
+        );
 
-        if ( Database::num_row($res) == 0 ) return;
-        $row=Database::fetch_array($res,0);
-        foreach ($row as $idx=>$value)
+        if (Database::num_row($res)==0)
+            return;
+        $row=Database::fetch_array($res, 0);
+        foreach ($row as $idx=> $value)
         {
             $this->$idx=$value;
         }
-
     }
 
     static function get_version($p_cn)
-       {
-               return $p_cn->get_value('select val from version');
-       }
-
-       static function connect()
-       {
-               $id = Dossier::id();
-               $cn = new Database($id);
-               return $cn;
-       }
-       /**
-        *connect to folder and give to admin. the profile Admin(builtin)
-        * @param int $p_id dossier::id()
-        */
-       static function synchro_admin($p_id)
-       {
-               // connect to target
-               $cn=new Database($p_id);
-
-               if (! $cn->exist_table("profile_menu"))
-               {
-                       echo_warning("Dossier invalide");
-                       return;
-               }
-               // connect to repo
-               $repo=new Database();
-
-               $a_admin=$repo->get_array("select use_login from ac_users where
+    {
+        return $p_cn->get_value('select val from version');
+    }
+
+    static function connect()
+    {
+        static $cn=null;
+        if ($cn!=null)
+            return $cn;
+        $id=Dossier::id();
+        $cn=new Database($id);
+        return $cn;
+    }
+
+    /**
+     * connect to folder and give to admin. the profile Admin(builtin)
+     * @param int $p_id dossier::id()
+     */
+    static function synchro_admin($p_id)
+    {
+        // connect to target
+        $cn=new Database($p_id);
+
+        if (!$cn->exist_table("profile_menu"))
+        {
+            echo_warning("Dossier invalide");
+            return;
+        }
+        // connect to repo
+        $repo=new Database();
+
+        $a_admin=$repo->get_array("select use_login from ac_users where
                        use_admin=1 and use_active=1");
-               try
-               {
-                       /**
-                        * synchro global
-                        */
-                       $cn->start();
-                       for ($i=0;$i<count($a_admin);$i++)
-                       {
-                               $exist=$cn->get_value("select p_id from 
profile_user
-                                       where 
user_name=$1",array($a_admin[$i]['use_login']));
-                               if ( $exist == "")
-                               {
-                                       $cn->exec_sql("insert into 
profile_user(user_name,p_id) values($1,1)",
-                                                       
array($a_admin[$i]['use_login']));
-                               }
-
-                       }
-                       $cn->commit();
-               } catch(Exception $e)
-               {
-                       echo_warning($e->getMessage());
-                       $cn->rollback();
-               }
-       }
+        try
+        {
+            /**
+             * synchro global
+             */
+            $cn->start();
+            for ($i=0; $i<count($a_admin); $i++)
+            {
+                $exist=$cn->get_value("select p_id from profile_user
+                                       where user_name=$1", 
array($a_admin[$i]['use_login']));
+                if ($exist=="")
+                {
+                    $cn->exec_sql("insert into profile_user(user_name,p_id) 
values($1,1)",
+                            array($a_admin[$i]['use_login']));
+                }
+            }
+            $cn->commit();
+        }
+        catch (Exception $e)
+        {
+            echo_warning($e->getMessage());
+            error_log($e->getTraceAsString());
+            $cn->rollback();
+        }
+    }
+
 }