mambax7 / bookshop

class/bookshop_commands.php

Doc Comments +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
     /**
 	 * Mise à jour des stocks pour chaque livre composant la commande
      * @param  integer $cmd_id Identifiant de la commande
-     * @return void
+     * @return boolean
      */
     public function updateStocks($cmd_id)
     {

Indentation +108 added lines, -108 removed lines

@@ -35,7 +35,7 @@ 
 
 include_once XOOPS_ROOT_PATH . '/kernel/object.php';
 if (!class_exists('Bookshop_XoopsPersistableObjectHandler')) {
-    include_once XOOPS_ROOT_PATH . '/modules/bookshop/class/PersistableObjectHandler.php';
+	include_once XOOPS_ROOT_PATH . '/modules/bookshop/class/PersistableObjectHandler.php';
 }
 
 /**
@@ -43,29 +43,29 @@ 
  */
 class bookshop_commands extends Bookshop_Object
 {
-    public function __construct()
-    {
-        $this->initVar('cmd_id', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('cmd_uid', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('cmd_date', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_state', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('cmd_ip', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_lastname', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_firstname', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_adress', XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar('cmd_zip', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_town', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_country', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_telephone', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_email', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_articles_count', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('cmd_total', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_shipping', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_bill', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('cmd_password', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('cmd_text', XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar('cmd_cancel', XOBJ_DTYPE_TXTBOX, null, false);
-    }
+	public function __construct()
+	{
+		$this->initVar('cmd_id', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('cmd_uid', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('cmd_date', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_state', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('cmd_ip', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_lastname', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_firstname', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_adress', XOBJ_DTYPE_TXTAREA, null, false);
+		$this->initVar('cmd_zip', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_town', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_country', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_telephone', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_email', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_articles_count', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('cmd_total', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_shipping', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_bill', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('cmd_password', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('cmd_text', XOBJ_DTYPE_TXTAREA, null, false);
+		$this->initVar('cmd_cancel', XOBJ_DTYPE_TXTBOX, null, false);
+	}
 }
 
 /**
@@ -73,99 +73,99 @@ 
  */
 class BookshopBookshop_commandsHandler extends Bookshop_XoopsPersistableObjectHandler
 {
-    /**
-     * @param $db
-     */
-    public function __construct($db)
-    {    //                                             Table                   Classe           Id
-        parent::__construct($db, 'bookshop_commands', 'bookshop_commands', 'cmd_id');
-    }
+	/**
+	 * @param $db
+	 */
+	public function __construct($db)
+	{    //                                             Table                   Classe           Id
+		parent::__construct($db, 'bookshop_commands', 'bookshop_commands', 'cmd_id');
+	}
 
-    /**
-     * Indique si c'est la premi�re commande d'un client
-     *
-     * @param  integer $uid Identifiant de l'utilisateur
-     * @return boolean Indique si c'est le cas ou pas
-     */
-    public function isFirstCommand($uid)
-    {
-        $critere = new Criteria('cmd_uid', (int)$uid, '=');
-        if ($this->getCount($critere) > 0) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Indique si c'est la premi�re commande d'un client
+	 *
+	 * @param  integer $uid Identifiant de l'utilisateur
+	 * @return boolean Indique si c'est le cas ou pas
+	 */
+	public function isFirstCommand($uid)
+	{
+		$critere = new Criteria('cmd_uid', (int)$uid, '=');
+		if ($this->getCount($critere) > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 
-    /**
+	/**
 	 * Indique si un livre a déajà été acheté par un utilisateur
-     *
-     * @param  integer $uid    Identifiant de l'utilisateur
-     * @param  integer $bookId Identifiant du livre
-     * @return boolean Indique si c'est le cas ou pas
-     */
-    public function BookAlreadyBought($uid, $bookId)
-    {
-        $sql    = 'SELECT Count(*) as cpt FROM ' . $this->db->prefix('bookshop_caddy') . ' c, ' . $this->db->prefix('bookshop_commands') . ' f WHERE c.caddy_book_id = ' . (int)$bookId . ' AND c.caddy_cmd_id = f.cmd_id AND f.cmd_uid = ' . (int)$uid;
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        }
-        list($count) = $this->db->fetchRow($result);
-        if ($count > 0) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	 *
+	 * @param  integer $uid    Identifiant de l'utilisateur
+	 * @param  integer $bookId Identifiant du livre
+	 * @return boolean Indique si c'est le cas ou pas
+	 */
+	public function BookAlreadyBought($uid, $bookId)
+	{
+		$sql    = 'SELECT Count(*) as cpt FROM ' . $this->db->prefix('bookshop_caddy') . ' c, ' . $this->db->prefix('bookshop_commands') . ' f WHERE c.caddy_book_id = ' . (int)$bookId . ' AND c.caddy_cmd_id = f.cmd_id AND f.cmd_uid = ' . (int)$uid;
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		}
+		list($count) = $this->db->fetchRow($result);
+		if ($count > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 
-    /**
+	/**
 	 * Mise à jour des stocks pour chaque livre composant la commande
-     * @param  integer $cmd_id Identifiant de la commande
-     * @return void
-     */
-    public function updateStocks($cmd_id)
-    {
-        global $h_bookshop_caddy, $h_bookshop_books;
-        // Recherche de tous les livres du caddy
-        $caddy  = $h_bookshop_caddy->getCaddyFromCommand($cmd_id);
-        $tblTmp = $tblBooks = array();
-        foreach ($caddy as $item) {
-            $tblTmp[] = $item->getVar('caddy_book_id');
-        }
-        // Chargement de tous les livres
-        $critere  = new Criteria('book_id', '(' . implode(',', $tblTmp) . ')', 'IN');
-        $tblBooks = $h_bookshop_books->getObjects($critere, true);
+	 * @param  integer $cmd_id Identifiant de la commande
+	 * @return void
+	 */
+	public function updateStocks($cmd_id)
+	{
+		global $h_bookshop_caddy, $h_bookshop_books;
+		// Recherche de tous les livres du caddy
+		$caddy  = $h_bookshop_caddy->getCaddyFromCommand($cmd_id);
+		$tblTmp = $tblBooks = array();
+		foreach ($caddy as $item) {
+			$tblTmp[] = $item->getVar('caddy_book_id');
+		}
+		// Chargement de tous les livres
+		$critere  = new Criteria('book_id', '(' . implode(',', $tblTmp) . ')', 'IN');
+		$tblBooks = $h_bookshop_books->getObjects($critere, true);
 		// Boucle sur le caddy pour mettre à jour les quantités
-        foreach ($caddy as $item) {
-            if (isset($tblBooks[$item->getVar('caddy_book_id')])) {
-                $book = $tblBooks[$item->getVar('caddy_book_id')];
-                $h_bookshop_books->decreaseStock($book, $item->getVar('caddy_qte'));
+		foreach ($caddy as $item) {
+			if (isset($tblBooks[$item->getVar('caddy_book_id')])) {
+				$book = $tblBooks[$item->getVar('caddy_book_id')];
+				$h_bookshop_books->decreaseStock($book, $item->getVar('caddy_qte'));
 				$h_bookshop_books->verifyLowStock($book);	// Vérification du stock d'alerte
-            }
-        }
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
+	/**
 	 * Validation d'une commande et mise à jour des stocks
-     *
-     * @param  integer $cmd_id Identifiant de la commande
-     * @return boolean Indique si la validation de la commande s'est bien faite ou pas
-     */
-    public function validateCommand($cmd_id)
-    {
-        $retval   = false;
-        $commande =& $this->get($cmd_id);
-        if (is_object($commande)) {
-            $commande->setVar('cmd_state', COMMAND_STATE_VALIDATED);
-            $retval = $this->insert($commande, true);
-            if ($retval) {
-                $this->updateStocks($cmd_id);
-            }
-        }
+	 *
+	 * @param  integer $cmd_id Identifiant de la commande
+	 * @return boolean Indique si la validation de la commande s'est bien faite ou pas
+	 */
+	public function validateCommand($cmd_id)
+	{
+		$retval   = false;
+		$commande =& $this->get($cmd_id);
+		if (is_object($commande)) {
+			$commande->setVar('cmd_state', COMMAND_STATE_VALIDATED);
+			$retval = $this->insert($commande, true);
+			if ($retval) {
+				$this->updateStocks($cmd_id);
+			}
+		}
 
-        return $retval;
-    }
+		return $retval;
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -26,16 +26,16 @@ 
 
 defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-define('COMMAND_STATE_NOINFORMATION', 0);    // Pas encore d'informations sur la commande
-define("COMMAND_STATE_VALIDATED", 1);		// Commande validée par Paypal
-define('COMMAND_STATE_PENDING', 2);            // En attente
-define('COMMAND_STATE_FAILED', 3);            // Echec
-define("COMMAND_STATE_CANCELED", 4);		// Annulée
-define('COMMAND_STATE_FRAUD', 5);            // Fraude
+define('COMMAND_STATE_NOINFORMATION', 0); // Pas encore d'informations sur la commande
+define("COMMAND_STATE_VALIDATED", 1); // Commande validée par Paypal
+define('COMMAND_STATE_PENDING', 2); // En attente
+define('COMMAND_STATE_FAILED', 3); // Echec
+define("COMMAND_STATE_CANCELED", 4); // Annulée
+define('COMMAND_STATE_FRAUD', 5); // Fraude
 
-include_once XOOPS_ROOT_PATH . '/kernel/object.php';
+include_once XOOPS_ROOT_PATH.'/kernel/object.php';
 if (!class_exists('Bookshop_XoopsPersistableObjectHandler')) {
-    include_once XOOPS_ROOT_PATH . '/modules/bookshop/class/PersistableObjectHandler.php';
+    include_once XOOPS_ROOT_PATH.'/modules/bookshop/class/PersistableObjectHandler.php';
 }
 
 /**
@@ -106,7 +106,7 @@ 
      */
     public function BookAlreadyBought($uid, $bookId)
     {
-        $sql    = 'SELECT Count(*) as cpt FROM ' . $this->db->prefix('bookshop_caddy') . ' c, ' . $this->db->prefix('bookshop_commands') . ' f WHERE c.caddy_book_id = ' . (int)$bookId . ' AND c.caddy_cmd_id = f.cmd_id AND f.cmd_uid = ' . (int)$uid;
+        $sql    = 'SELECT Count(*) as cpt FROM '.$this->db->prefix('bookshop_caddy').' c, '.$this->db->prefix('bookshop_commands').' f WHERE c.caddy_book_id = '.(int)$bookId.' AND c.caddy_cmd_id = f.cmd_id AND f.cmd_uid = '.(int)$uid;
         $result = $this->db->query($sql);
         if (!$result) {
             return 0;
@@ -134,14 +134,14 @@ 
             $tblTmp[] = $item->getVar('caddy_book_id');
         }
         // Chargement de tous les livres
-        $critere  = new Criteria('book_id', '(' . implode(',', $tblTmp) . ')', 'IN');
+        $critere  = new Criteria('book_id', '('.implode(',', $tblTmp).')', 'IN');
         $tblBooks = $h_bookshop_books->getObjects($critere, true);
 		// Boucle sur le caddy pour mettre à jour les quantités
         foreach ($caddy as $item) {
             if (isset($tblBooks[$item->getVar('caddy_book_id')])) {
                 $book = $tblBooks[$item->getVar('caddy_book_id')];
                 $h_bookshop_books->decreaseStock($book, $item->getVar('caddy_qte'));
-				$h_bookshop_books->verifyLowStock($book);	// Vérification du stock d'alerte
+				$h_bookshop_books->verifyLowStock($book); // Vérification du stock d'alerte
             }
         }
 
@@ -157,7 +157,7 @@ 
     public function validateCommand($cmd_id)
     {
         $retval   = false;
-        $commande =& $this->get($cmd_id);
+        $commande = & $this->get($cmd_id);
         if (is_object($commande)) {
             $commande->setVar('cmd_state', COMMAND_STATE_VALIDATED);
             $retval = $this->insert($commande, true);

class/bookshop_votedata.php

Doc Comments +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      * @param  integer $book_id    Identifiant du livre
 	 * @param integer $totalVotes Variable passée par référence et devant contenir le nombre total de votes du livre
 	 * @param integer $sumRating Variable passée par référence et devant contenir le cumul des votes
-     * @return none    Rien
+     * @return integer|null    Rien
      */
     public function getCountRecordSumRating($book_id, &$totalVotes, &$sumRating)
     {

Indentation +53 added lines, -53 removed lines

@@ -28,7 +28,7 @@ 
 
 include_once XOOPS_ROOT_PATH . '/kernel/object.php';
 if (!class_exists('Bookshop_XoopsPersistableObjectHandler')) {
-    include_once XOOPS_ROOT_PATH . '/modules/bookshop/class/PersistableObjectHandler.php';
+	include_once XOOPS_ROOT_PATH . '/modules/bookshop/class/PersistableObjectHandler.php';
 }
 
 /**
@@ -36,15 +36,15 @@ 
  */
 class bookshop_votedata extends Bookshop_Object
 {
-    public function __construct()
-    {
-        $this->initVar('vote_ratingid', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('vote_book_id', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('vote_uid', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('vote_rating', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('vote_ratinghostname', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('vote_ratingtimestamp', XOBJ_DTYPE_INT, null, false);
-    }
+	public function __construct()
+	{
+		$this->initVar('vote_ratingid', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('vote_book_id', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('vote_uid', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('vote_rating', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('vote_ratinghostname', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('vote_ratingtimestamp', XOBJ_DTYPE_INT, null, false);
+	}
 }
 
 /**
@@ -52,52 +52,52 @@ 
  */
 class BookshopBookshop_votedataHandler extends Bookshop_XoopsPersistableObjectHandler
 {
-    /**
-     * @param $db
-     */
-    public function __construct($db)
-    {    //                          Table                   Classe           Id
-        parent::__construct($db, 'bookshop_votedata', 'bookshop_votedata', 'vote_ratingid');
-    }
+	/**
+	 * @param $db
+	 */
+	public function __construct($db)
+	{    //                          Table                   Classe           Id
+		parent::__construct($db, 'bookshop_votedata', 'bookshop_votedata', 'vote_ratingid');
+	}
 
-    /**
-     * Renvoie le nombre total de votes pour un livre ainsi que la sommes des votes
-     *
-     * @param  integer $book_id    Identifiant du livre
+	/**
+	 * Renvoie le nombre total de votes pour un livre ainsi que la sommes des votes
+	 *
+	 * @param  integer $book_id    Identifiant du livre
 	 * @param integer $totalVotes Variable passée par référence et devant contenir le nombre total de votes du livre
 	 * @param integer $sumRating Variable passée par référence et devant contenir le cumul des votes
-     * @return none    Rien
-     */
-    public function getCountRecordSumRating($book_id, &$totalVotes, &$sumRating)
-    {
-        $sql    = 'SELECT count( * ) AS cpt, sum( vote_rating ) AS sum_rating FROM ' . $this->table . ' WHERE vote_book_id = ' . (int)$book_id;
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        } else {
-            $myrow      = $this->db->fetchArray($result);
-            $totalVotes = $myrow['cpt'];
-            $sumRating  = $myrow['sum_rating'];
-        }
-    }
+	 * @return none    Rien
+	 */
+	public function getCountRecordSumRating($book_id, &$totalVotes, &$sumRating)
+	{
+		$sql    = 'SELECT count( * ) AS cpt, sum( vote_rating ) AS sum_rating FROM ' . $this->table . ' WHERE vote_book_id = ' . (int)$book_id;
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		} else {
+			$myrow      = $this->db->fetchArray($result);
+			$totalVotes = $myrow['cpt'];
+			$sumRating  = $myrow['sum_rating'];
+		}
+	}
 
-    /**
-     * Returns the (x) last votes
-     *
-     * @param  integer $start Starting position
-     * @param  integer $limit count of items to return
-     * @return array   Array of votedata objects
-     */
-    public function getLastVotes($start = 0, $limit = 0)
-    {
-        $tbl_datas = array();
-        $criteria  = new Criteria('vote_ratingid', 0, '<>');
-        $criteria->setLimit($limit);
-        $criteria->setStart($start);
-        $criteria->setSort('vote_ratingtimestamp');
-        $criteria->setOrder('DESC');
-        $tbl_datas =& $this->getObjects($criteria, true);
+	/**
+	 * Returns the (x) last votes
+	 *
+	 * @param  integer $start Starting position
+	 * @param  integer $limit count of items to return
+	 * @return array   Array of votedata objects
+	 */
+	public function getLastVotes($start = 0, $limit = 0)
+	{
+		$tbl_datas = array();
+		$criteria  = new Criteria('vote_ratingid', 0, '<>');
+		$criteria->setLimit($limit);
+		$criteria->setStart($start);
+		$criteria->setSort('vote_ratingtimestamp');
+		$criteria->setOrder('DESC');
+		$tbl_datas =& $this->getObjects($criteria, true);
 
-        return $tbl_datas;
-    }
+		return $tbl_datas;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -26,9 +26,9 @@ 
 
 defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once XOOPS_ROOT_PATH . '/kernel/object.php';
+include_once XOOPS_ROOT_PATH.'/kernel/object.php';
 if (!class_exists('Bookshop_XoopsPersistableObjectHandler')) {
-    include_once XOOPS_ROOT_PATH . '/modules/bookshop/class/PersistableObjectHandler.php';
+    include_once XOOPS_ROOT_PATH.'/modules/bookshop/class/PersistableObjectHandler.php';
 }
 
 /**
@@ -70,7 +70,7 @@ 
      */
     public function getCountRecordSumRating($book_id, &$totalVotes, &$sumRating)
     {
-        $sql    = 'SELECT count( * ) AS cpt, sum( vote_rating ) AS sum_rating FROM ' . $this->table . ' WHERE vote_book_id = ' . (int)$book_id;
+        $sql    = 'SELECT count( * ) AS cpt, sum( vote_rating ) AS sum_rating FROM '.$this->table.' WHERE vote_book_id = '.(int)$book_id;
         $result = $this->db->query($sql);
         if (!$result) {
             return 0;
@@ -96,7 +96,7 @@ 
         $criteria->setStart($start);
         $criteria->setSort('vote_ratingtimestamp');
         $criteria->setOrder('DESC');
-        $tbl_datas =& $this->getObjects($criteria, true);
+        $tbl_datas = & $this->getObjects($criteria, true);
 
         return $tbl_datas;
     }

class/PersistableObjectHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
     /**
      * retrieve an object
      *
-     * @param  mixed $id        ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
+     * @param  integer $id        ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
      * @param  bool  $as_object whether to return an object or an array
      * @return mixed reference to the object, FALSE if failed
      */

Indentation +526 added lines, -526 removed lines

@@ -31,20 +31,20 @@ 
  */
 class Bookshop_Object extends XoopsObject
 {
-    /**
-     * @param string $format
-     *
-     * @return array
-     */
-    public function toArray($format = 's')
-    {
-        $ret = array();
-        foreach ($this->vars as $k => $v) {
-            $ret[$k] = $this->getVar($k, $format);
-        }
-
-        return $ret;
-    }
+	/**
+	 * @param string $format
+	 *
+	 * @return array
+	 */
+	public function toArray($format = 's')
+	{
+		$ret = array();
+		foreach ($this->vars as $k => $v) {
+			$ret[$k] = $this->getVar($k, $format);
+		}
+
+		return $ret;
+	}
 }
 
 /**
@@ -55,523 +55,523 @@ 
  */
 class Bookshop_XoopsPersistableObjectHandler extends XoopsObjectHandler
 {
-    /**#@+
+	/**#@+
      * Information about the class, the handler is managing
      *
      * @var string
      */
-    public    $table;
-    protected $keyName;
-    protected $className;
-    protected $identifierName;
-    protected $cacheOptions = array();
-    /**#@-*/
-
-    /**
-     * Constructor - called from child classes
-     *
-     * @param object $db        {@link XoopsDatabase} object
-     * @param string $tablename Name of database table
-     * @param string $classname Name of Class, this handler is managing
-     * @param string $keyname   Name of the property, holding the key
-     *
-     * @param bool   $idenfierName
-     *
-     */
-    public function __construct($db, $tablename, $classname, $keyname, $idenfierName = false)
-    {
-        parent::__construct($db);
-        $this->table     = $db->prefix($tablename);
-        $this->keyName   = $keyname;
-        $this->className = $classname;
-        if ($idenfierName != false) {
-            $this->identifierName = $idenfierName;
-        }
-    }
-
-    /**
-     * create a new object
-     *
-     * @param bool $isNew Flag the new objects as "new"?
-     *
-     * @return object
-     */
-    public function create($isNew = true)
-    {
-        $obj = new $this->className();
-        if ($isNew === true) {
-            $obj->setNew();
-        }
-
-        return $obj;
-    }
-
-    /**
-     * retrieve an object
-     *
-     * @param  mixed $id        ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
-     * @param  bool  $as_object whether to return an object or an array
-     * @return mixed reference to the object, FALSE if failed
-     */
-    public function &get($id, $as_object = true)
-    {
-        if (is_array($this->keyName)) {
-            $criteria = new CriteriaCompo();
-            $vnb      = count($this->keyName);
-            for ($i = 0; $i < $vnb; ++$i) {
-                $criteria->add(new Criteria($this->keyName[$i], (int)$id[$i]));
-            }
-        } else {
-            $criteria = new Criteria($this->keyName, (int)$id);
-        }
-        $criteria->setLimit(1);
-        $obj_array =& $this->getObjects($criteria, false, $as_object);
-        if (count($obj_array) != 1) {
-            $ret = null;
-        } else {
-            $ret =& $obj_array[0];
-        }
-
-        return $ret;
-    }
-
-    /**
-     * retrieve objects from the database
-     *
-     * @param null|CriteriaElement $criteria  {@link CriteriaElement} conditions to be met
-     * @param bool                 $id_as_key use the ID as key for the array?
-     * @param bool                 $as_object return an array of objects?
-     *
-     * @return array
-     */
-    public function &getObjects(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true)
-    {
-        $ret   = array();
-        $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->table;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-
-        $ret = $this->convertResultSet($result, $id_as_key, $as_object);
-
-        return $ret;
-    }
-
-    /**
-     * Convert a database resultset to a returnable array
-     *
-     * @param object $result    database resultset
-     * @param bool   $id_as_key - should NOT be used with joint keys
-     * @param bool   $as_object
-     *
-     * @return array
-     */
-    public function convertResultSet($result, $id_as_key = false, $as_object = true)
-    {
-        $ret = array();
-        while ($myrow = $this->db->fetchArray($result)) {
-            $obj = $this->create(false);
-            $obj->assignVars($myrow);
-            if (!$id_as_key) {
-                if ($as_object) {
-                    $ret[] =& $obj;
-                } else {
-                    $row     = array();
-                    $vars    = $obj->getVars();
-                    $tbl_tmp = array_keys($vars);
-                    foreach ($tbl_tmp as $i) {
-                        $row[$i] = $obj->getVar($i);
-                    }
-                    $ret[] = $row;
-                }
-            } else {
-                if ($as_object) {
-                    $ret[$myrow[$this->keyName]] =& $obj;
-                } else {
-                    $row     = array();
-                    $vars    = $obj->getVars();
-                    $tbl_tmp = array_keys($vars);
-                    foreach ($tbl_tmp as $i) {
-                        $row[$i] = $obj->getVar($i);
-                    }
-                    $ret[$myrow[$this->keyName]] = $row;
-                }
-            }
-            unset($obj);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * get IDs of objects matching a condition
-     *
-     * @param  object $criteria {@link CriteriaElement} to match
-     * @return array  of object IDs
-     */
-    public function getIds($criteria = null)
-    {
-        $sql = 'SELECT ' . $this->keyName . ' FROM ' . $this->table;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        $result = $this->db->query($sql);
-        $ret    = array();
-        while ($myrow = $this->db->fetchArray($result)) {
-            $ret[] = $myrow[$this->keyName];
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Retrieve a list of objects as arrays - DON'T USE WITH JOINT KEYS
-     *
-     * @param object $criteria {@link CriteriaElement} conditions to be met
-     * @param int    $limit    Max number of objects to fetch
-     * @param int    $start    Which record to start at
-     *
-     * @return array
-     */
-    public function getList($criteria = null, $limit = 0, $start = 0)
-    {
-        $ret = array();
-        if ($criteria == null) {
-            $criteria = new CriteriaCompo();
-        }
-
-        if ($criteria->getSort() == '') {
-            $criteria->setSort($this->identifierName);
-        }
-
-        $sql = 'SELECT ' . $this->keyName;
-        if (!empty($this->identifierName)) {
-            $sql .= ', ' . $this->identifierName;
-        }
-        $sql .= ' FROM ' . $this->table;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-
-        $myts = MyTextSanitizer::getInstance();
-        while ($myrow = $this->db->fetchArray($result)) {
-            //identifiers should be textboxes, so sanitize them like that
-            $ret[$myrow[$this->keyName]] = empty($this->identifierName) ? 1 : $myts->htmlSpecialChars($myrow[$this->identifierName]);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * count objects matching a condition
-     *
-     * @param  object $criteria {@link CriteriaElement} to match
-     * @return int    count of objects
-     */
-    public function getCount($criteria = null)
-    {
-        $field   = '';
-        $groupby = false;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            if ($criteria->groupby != '') {
-                $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
-            }
-        }
-        $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ($criteria->groupby != '') {
-                $sql .= $criteria->getGroupby();
-            }
-        }
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        }
-        if ($groupby == false) {
-            list($count) = $this->db->fetchRow($result);
-
-            return $count;
-        } else {
-            $ret = array();
-            while (list($id, $count) = $this->db->fetchRow($result)) {
-                $ret[$id] = $count;
-            }
-
-            return $ret;
-        }
-    }
-
-    /**
-     * delete an object from the database
-     *
-     * @param  XoopsObject $obj reference to the object to delete
-     * @param  bool        $force
-     * @return bool   FALSE if failed.
-     */
-    public function delete(XoopsObject $obj, $force = false)
-    {
-        if (is_array($this->keyName)) {
-            $clause = array();
-            $vnb    = count($this->keyName);
-            for ($i = 0; $i < $vnb; ++$i) {
-                $clause[] = $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
-            }
-            $whereclause = implode(' AND ', $clause);
-        } else {
-            $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
-        }
-        $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause;
-        if (false != $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-        if (!$result) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Quickly insert a record like this $myobject_handler->quickInsert('field1' => field1value, 'field2' => $field2value)
-     *
-     * @param  array $vars  Array containing the fields name and value
-     * @param  bool  $force whether to force the query execution despite security settings
-     * @return bool  @link insert's value
-     */
-    public function quickInsert($vars = null, $force = false)
-    {
-        $object = $this->create(true);
-        $object->setVars($vars);
-        $retval = $this->insert($object, $force);
-        unset($object);
-
-        return $retval;
-    }
-
-    /**
-     * insert a new object in the database
-     *
-     * @param  XoopsObject $obj         reference to the object
-     * @param  bool        $force       whether to force the query execution despite security settings
-     * @param  bool        $checkObject check if the object is dirty and clean the attributes
-     * @return bool   FALSE if failed, TRUE if already present and unchanged or successful
-     */
-
-    public function insert(XoopsObject $obj, $force = false, $checkObject = true)
-    {
-        if ($checkObject != false) {
-            if (!is_object($obj)) {
-                echo '<br><h1>Error, not object</h1>';
-
-                return false;
-            }
-            /**
-             * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
-             */
+	public    $table;
+	protected $keyName;
+	protected $className;
+	protected $identifierName;
+	protected $cacheOptions = array();
+	/**#@-*/
+
+	/**
+	 * Constructor - called from child classes
+	 *
+	 * @param object $db        {@link XoopsDatabase} object
+	 * @param string $tablename Name of database table
+	 * @param string $classname Name of Class, this handler is managing
+	 * @param string $keyname   Name of the property, holding the key
+	 *
+	 * @param bool   $idenfierName
+	 *
+	 */
+	public function __construct($db, $tablename, $classname, $keyname, $idenfierName = false)
+	{
+		parent::__construct($db);
+		$this->table     = $db->prefix($tablename);
+		$this->keyName   = $keyname;
+		$this->className = $classname;
+		if ($idenfierName != false) {
+			$this->identifierName = $idenfierName;
+		}
+	}
+
+	/**
+	 * create a new object
+	 *
+	 * @param bool $isNew Flag the new objects as "new"?
+	 *
+	 * @return object
+	 */
+	public function create($isNew = true)
+	{
+		$obj = new $this->className();
+		if ($isNew === true) {
+			$obj->setNew();
+		}
+
+		return $obj;
+	}
+
+	/**
+	 * retrieve an object
+	 *
+	 * @param  mixed $id        ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
+	 * @param  bool  $as_object whether to return an object or an array
+	 * @return mixed reference to the object, FALSE if failed
+	 */
+	public function &get($id, $as_object = true)
+	{
+		if (is_array($this->keyName)) {
+			$criteria = new CriteriaCompo();
+			$vnb      = count($this->keyName);
+			for ($i = 0; $i < $vnb; ++$i) {
+				$criteria->add(new Criteria($this->keyName[$i], (int)$id[$i]));
+			}
+		} else {
+			$criteria = new Criteria($this->keyName, (int)$id);
+		}
+		$criteria->setLimit(1);
+		$obj_array =& $this->getObjects($criteria, false, $as_object);
+		if (count($obj_array) != 1) {
+			$ret = null;
+		} else {
+			$ret =& $obj_array[0];
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * retrieve objects from the database
+	 *
+	 * @param null|CriteriaElement $criteria  {@link CriteriaElement} conditions to be met
+	 * @param bool                 $id_as_key use the ID as key for the array?
+	 * @param bool                 $as_object return an array of objects?
+	 *
+	 * @return array
+	 */
+	public function &getObjects(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true)
+	{
+		$ret   = array();
+		$limit = $start = 0;
+		$sql   = 'SELECT * FROM ' . $this->table;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ($criteria->getSort() != '') {
+				$sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		$result = $this->db->query($sql, $limit, $start);
+		if (!$result) {
+			return $ret;
+		}
+
+		$ret = $this->convertResultSet($result, $id_as_key, $as_object);
+
+		return $ret;
+	}
+
+	/**
+	 * Convert a database resultset to a returnable array
+	 *
+	 * @param object $result    database resultset
+	 * @param bool   $id_as_key - should NOT be used with joint keys
+	 * @param bool   $as_object
+	 *
+	 * @return array
+	 */
+	public function convertResultSet($result, $id_as_key = false, $as_object = true)
+	{
+		$ret = array();
+		while ($myrow = $this->db->fetchArray($result)) {
+			$obj = $this->create(false);
+			$obj->assignVars($myrow);
+			if (!$id_as_key) {
+				if ($as_object) {
+					$ret[] =& $obj;
+				} else {
+					$row     = array();
+					$vars    = $obj->getVars();
+					$tbl_tmp = array_keys($vars);
+					foreach ($tbl_tmp as $i) {
+						$row[$i] = $obj->getVar($i);
+					}
+					$ret[] = $row;
+				}
+			} else {
+				if ($as_object) {
+					$ret[$myrow[$this->keyName]] =& $obj;
+				} else {
+					$row     = array();
+					$vars    = $obj->getVars();
+					$tbl_tmp = array_keys($vars);
+					foreach ($tbl_tmp as $i) {
+						$row[$i] = $obj->getVar($i);
+					}
+					$ret[$myrow[$this->keyName]] = $row;
+				}
+			}
+			unset($obj);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * get IDs of objects matching a condition
+	 *
+	 * @param  object $criteria {@link CriteriaElement} to match
+	 * @return array  of object IDs
+	 */
+	public function getIds($criteria = null)
+	{
+		$sql = 'SELECT ' . $this->keyName . ' FROM ' . $this->table;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		$result = $this->db->query($sql);
+		$ret    = array();
+		while ($myrow = $this->db->fetchArray($result)) {
+			$ret[] = $myrow[$this->keyName];
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Retrieve a list of objects as arrays - DON'T USE WITH JOINT KEYS
+	 *
+	 * @param object $criteria {@link CriteriaElement} conditions to be met
+	 * @param int    $limit    Max number of objects to fetch
+	 * @param int    $start    Which record to start at
+	 *
+	 * @return array
+	 */
+	public function getList($criteria = null, $limit = 0, $start = 0)
+	{
+		$ret = array();
+		if ($criteria == null) {
+			$criteria = new CriteriaCompo();
+		}
+
+		if ($criteria->getSort() == '') {
+			$criteria->setSort($this->identifierName);
+		}
+
+		$sql = 'SELECT ' . $this->keyName;
+		if (!empty($this->identifierName)) {
+			$sql .= ', ' . $this->identifierName;
+		}
+		$sql .= ' FROM ' . $this->table;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ($criteria->getSort() != '') {
+				$sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		$result = $this->db->query($sql, $limit, $start);
+		if (!$result) {
+			return $ret;
+		}
+
+		$myts = MyTextSanitizer::getInstance();
+		while ($myrow = $this->db->fetchArray($result)) {
+			//identifiers should be textboxes, so sanitize them like that
+			$ret[$myrow[$this->keyName]] = empty($this->identifierName) ? 1 : $myts->htmlSpecialChars($myrow[$this->identifierName]);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * count objects matching a condition
+	 *
+	 * @param  object $criteria {@link CriteriaElement} to match
+	 * @return int    count of objects
+	 */
+	public function getCount($criteria = null)
+	{
+		$field   = '';
+		$groupby = false;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			if ($criteria->groupby != '') {
+				$groupby = true;
+				$field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+			}
+		}
+		$sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ($criteria->groupby != '') {
+				$sql .= $criteria->getGroupby();
+			}
+		}
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		}
+		if ($groupby == false) {
+			list($count) = $this->db->fetchRow($result);
+
+			return $count;
+		} else {
+			$ret = array();
+			while (list($id, $count) = $this->db->fetchRow($result)) {
+				$ret[$id] = $count;
+			}
+
+			return $ret;
+		}
+	}
+
+	/**
+	 * delete an object from the database
+	 *
+	 * @param  XoopsObject $obj reference to the object to delete
+	 * @param  bool        $force
+	 * @return bool   FALSE if failed.
+	 */
+	public function delete(XoopsObject $obj, $force = false)
+	{
+		if (is_array($this->keyName)) {
+			$clause = array();
+			$vnb    = count($this->keyName);
+			for ($i = 0; $i < $vnb; ++$i) {
+				$clause[] = $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+			}
+			$whereclause = implode(' AND ', $clause);
+		} else {
+			$whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+		}
+		$sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause;
+		if (false != $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+		if (!$result) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Quickly insert a record like this $myobject_handler->quickInsert('field1' => field1value, 'field2' => $field2value)
+	 *
+	 * @param  array $vars  Array containing the fields name and value
+	 * @param  bool  $force whether to force the query execution despite security settings
+	 * @return bool  @link insert's value
+	 */
+	public function quickInsert($vars = null, $force = false)
+	{
+		$object = $this->create(true);
+		$object->setVars($vars);
+		$retval = $this->insert($object, $force);
+		unset($object);
+
+		return $retval;
+	}
+
+	/**
+	 * insert a new object in the database
+	 *
+	 * @param  XoopsObject $obj         reference to the object
+	 * @param  bool        $force       whether to force the query execution despite security settings
+	 * @param  bool        $checkObject check if the object is dirty and clean the attributes
+	 * @return bool   FALSE if failed, TRUE if already present and unchanged or successful
+	 */
+
+	public function insert(XoopsObject $obj, $force = false, $checkObject = true)
+	{
+		if ($checkObject != false) {
+			if (!is_object($obj)) {
+				echo '<br><h1>Error, not object</h1>';
+
+				return false;
+			}
+			/**
+			 * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+			 */
 //            if (!is_a($obj, $this->className)) {
 //                $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className);
 
-                if (!(class_exists($this->className) && $obj instanceof $this->className)) {
-                    $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className);
-
-                return false;
-            }
-            if (!$obj->isDirty()) {
-                $obj->setErrors('Not dirty'); //will usually not be outputted as errors are not displayed when the method returns true, but it can be helpful when troubleshooting code - Mith
-
-                return true;
-            }
-        }
-        if (!$obj->cleanVars()) {
-            foreach ($obj->getErrors() as $oneerror) {
-                echo '<br><h2>' . $oneerror . '</h2>';
-            }
-
-            return false;
-        }
-        foreach ($obj->cleanVars as $k => $v) {
-            if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) {
-                $cleanvars[$k] = (int)$v;
-            } elseif (is_array($v)) {
-                $cleanvars[$k] = $this->db->quoteString(implode(',', $v));
-            } else {
-                $cleanvars[$k] = $this->db->quoteString($v);
-            }
-        }
-        if (isset($cleanvars['dohtml'])) {        // Modification Herv� to be able to use dohtml
-            unset($cleanvars['dohtml']);
-        }
-        if ($obj->isNew()) {
-            if (!is_array($this->keyName)) {
-                if ($cleanvars[$this->keyName] < 1) {
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
-                }
-            }
-            $sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')';
-        } else {
-            $sql = 'UPDATE ' . $this->table . ' SET';
-            foreach ($cleanvars as $key => $value) {
-                if ((!is_array($this->keyName) && $key == $this->keyName) || (is_array($this->keyName) && in_array($key, $this->keyName))) {
-                    continue;
-                }
-                if (isset($notfirst)) {
-                    $sql .= ',';
-                }
-                $sql .= ' ' . $key . ' = ' . $value;
-                $notfirst = true;
-            }
-            if (is_array($this->keyName)) {
-                $whereclause = '';
-                $vnb         = count($this->keyName);
-                for ($i = 0; $i < $vnb; ++$i) {
-                    if ($i > 0) {
-                        $whereclause .= ' AND ';
-                    }
-                    $whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
-                }
-            } else {
-                $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
-            }
-            $sql .= ' WHERE ' . $whereclause;
-        }
-
-        if (false != $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-        if (!$result) {
-            return false;
-        }
-        if ($obj->isNew() && !is_array($this->keyName)) {
-            $obj->assignVar($this->keyName, $this->db->getInsertId());
-        }
-
-        return true;
-    }
-
-    /**
-     * Change a value for objects with a certain criteria
-     *
-     * @param string $fieldname  Name of the field
-     * @param string $fieldvalue Value to write
-     * @param object $criteria   {@link CriteriaElement}
-     *
-     * @param bool   $force
-     *
-     * @return bool
-     */
-    public function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
-    {
-        $set_clause = $fieldname . ' = ';
-        if (is_numeric($fieldvalue)) {
-            $set_clause .= $fieldvalue;
-        } elseif (is_array($fieldvalue)) {
-            $set_clause .= $this->db->quoteString(implode(',', $fieldvalue));
-        } else {
-            $set_clause .= $this->db->quoteString($fieldvalue);
-        }
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $set_clause;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        if (false != $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-        if (!$result) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * delete all objects meeting the conditions
-     *
-     * @param  object $criteria {@link CriteriaElement} with conditions to meet
-     * @return bool
-     */
-
-    public function deleteAll($criteria = null)
-    {
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql = 'DELETE FROM ' . $this->table;
-            $sql .= ' ' . $criteria->renderWhere();
-            if (!$this->db->queryF($sql)) {
-                return false;
-            }
-            $rows = $this->db->getAffectedRows();
-
-            return $rows > 0 ? $rows : true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Compare two objects and returns, in an array, the differences
-     *
-     * @param  XoopsObject $old_object The first object to compare
-     * @param  XoopsObject $new_object The new object
-     * @return array       differences  key = fieldname, value = array('old_value', 'new_value')
-     */
-    public function compareObjects($old_object, $new_object)
-    {
-        $ret       = array();
-        $vars_name = array_keys($old_object->getVars());
-        foreach ($vars_name as $one_var) {
-            if ($old_object->getVar($one_var, 'f') == $new_object->getVar($one_var, 'f')) {
-            } else {
-                $ret[$one_var] = array($old_object->getVar($one_var), $new_object->getVar($one_var));
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Get distincted values of a field in the table
-     *
-     * @param  string $field  Field's name
-     * @param  string $format Format in wich we want the datas
-     * @return array  containing the distinct values
-     */
-    public function getDistincts($field, $format = 's')
-    {
-        $sql    = 'SELECT ' . $this->keyName . ', ' . $field . ' FROM ' . $this->table . ' GROUP BY ' . $field . ' ORDER BY ' . $field;
-        $result = $this->db->query($sql);
-        $ret    = array();
-        $obj    = new $this->className();
-        while ($myrow = $this->db->fetchArray($result)) {
-            $obj->setVar($field, $myrow[$field]);
-            $ret[$myrow[$this->keyName]] = $obj->getVar($field, $format);
-        }
-
-        return $ret;
-    }
+				if (!(class_exists($this->className) && $obj instanceof $this->className)) {
+					$obj->setErrors(get_class($obj) . ' Differs from ' . $this->className);
+
+				return false;
+			}
+			if (!$obj->isDirty()) {
+				$obj->setErrors('Not dirty'); //will usually not be outputted as errors are not displayed when the method returns true, but it can be helpful when troubleshooting code - Mith
+
+				return true;
+			}
+		}
+		if (!$obj->cleanVars()) {
+			foreach ($obj->getErrors() as $oneerror) {
+				echo '<br><h2>' . $oneerror . '</h2>';
+			}
+
+			return false;
+		}
+		foreach ($obj->cleanVars as $k => $v) {
+			if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) {
+				$cleanvars[$k] = (int)$v;
+			} elseif (is_array($v)) {
+				$cleanvars[$k] = $this->db->quoteString(implode(',', $v));
+			} else {
+				$cleanvars[$k] = $this->db->quoteString($v);
+			}
+		}
+		if (isset($cleanvars['dohtml'])) {        // Modification Herv� to be able to use dohtml
+			unset($cleanvars['dohtml']);
+		}
+		if ($obj->isNew()) {
+			if (!is_array($this->keyName)) {
+				if ($cleanvars[$this->keyName] < 1) {
+					$cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
+				}
+			}
+			$sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')';
+		} else {
+			$sql = 'UPDATE ' . $this->table . ' SET';
+			foreach ($cleanvars as $key => $value) {
+				if ((!is_array($this->keyName) && $key == $this->keyName) || (is_array($this->keyName) && in_array($key, $this->keyName))) {
+					continue;
+				}
+				if (isset($notfirst)) {
+					$sql .= ',';
+				}
+				$sql .= ' ' . $key . ' = ' . $value;
+				$notfirst = true;
+			}
+			if (is_array($this->keyName)) {
+				$whereclause = '';
+				$vnb         = count($this->keyName);
+				for ($i = 0; $i < $vnb; ++$i) {
+					if ($i > 0) {
+						$whereclause .= ' AND ';
+					}
+					$whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+				}
+			} else {
+				$whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+			}
+			$sql .= ' WHERE ' . $whereclause;
+		}
+
+		if (false != $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+		if (!$result) {
+			return false;
+		}
+		if ($obj->isNew() && !is_array($this->keyName)) {
+			$obj->assignVar($this->keyName, $this->db->getInsertId());
+		}
+
+		return true;
+	}
+
+	/**
+	 * Change a value for objects with a certain criteria
+	 *
+	 * @param string $fieldname  Name of the field
+	 * @param string $fieldvalue Value to write
+	 * @param object $criteria   {@link CriteriaElement}
+	 *
+	 * @param bool   $force
+	 *
+	 * @return bool
+	 */
+	public function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
+	{
+		$set_clause = $fieldname . ' = ';
+		if (is_numeric($fieldvalue)) {
+			$set_clause .= $fieldvalue;
+		} elseif (is_array($fieldvalue)) {
+			$set_clause .= $this->db->quoteString(implode(',', $fieldvalue));
+		} else {
+			$set_clause .= $this->db->quoteString($fieldvalue);
+		}
+		$sql = 'UPDATE ' . $this->table . ' SET ' . $set_clause;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		if (false != $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+		if (!$result) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * delete all objects meeting the conditions
+	 *
+	 * @param  object $criteria {@link CriteriaElement} with conditions to meet
+	 * @return bool
+	 */
+
+	public function deleteAll($criteria = null)
+	{
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql = 'DELETE FROM ' . $this->table;
+			$sql .= ' ' . $criteria->renderWhere();
+			if (!$this->db->queryF($sql)) {
+				return false;
+			}
+			$rows = $this->db->getAffectedRows();
+
+			return $rows > 0 ? $rows : true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Compare two objects and returns, in an array, the differences
+	 *
+	 * @param  XoopsObject $old_object The first object to compare
+	 * @param  XoopsObject $new_object The new object
+	 * @return array       differences  key = fieldname, value = array('old_value', 'new_value')
+	 */
+	public function compareObjects($old_object, $new_object)
+	{
+		$ret       = array();
+		$vars_name = array_keys($old_object->getVars());
+		foreach ($vars_name as $one_var) {
+			if ($old_object->getVar($one_var, 'f') == $new_object->getVar($one_var, 'f')) {
+			} else {
+				$ret[$one_var] = array($old_object->getVar($one_var), $new_object->getVar($one_var));
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Get distincted values of a field in the table
+	 *
+	 * @param  string $field  Field's name
+	 * @param  string $format Format in wich we want the datas
+	 * @return array  containing the distinct values
+	 */
+	public function getDistincts($field, $format = 's')
+	{
+		$sql    = 'SELECT ' . $this->keyName . ', ' . $field . ' FROM ' . $this->table . ' GROUP BY ' . $field . ' ORDER BY ' . $field;
+		$result = $this->db->query($sql);
+		$ret    = array();
+		$obj    = new $this->className();
+		while ($myrow = $this->db->fetchArray($result)) {
+			$obj->setVar($field, $myrow[$field]);
+			$ret[$myrow[$this->keyName]] = $obj->getVar($field, $format);
+		}
+
+		return $ret;
+	}
 }

Spacing +35 added lines, -35 removed lines

@@ -125,11 +125,11 @@ 
             $criteria = new Criteria($this->keyName, (int)$id);
         }
         $criteria->setLimit(1);
-        $obj_array =& $this->getObjects($criteria, false, $as_object);
+        $obj_array = & $this->getObjects($criteria, false, $as_object);
         if (count($obj_array) != 1) {
             $ret = null;
         } else {
-            $ret =& $obj_array[0];
+            $ret = & $obj_array[0];
         }
 
         return $ret;
@@ -148,11 +148,11 @@ 
     {
         $ret   = array();
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->table;
+        $sql   = 'SELECT * FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -184,7 +184,7 @@ 
             $obj->assignVars($myrow);
             if (!$id_as_key) {
                 if ($as_object) {
-                    $ret[] =& $obj;
+                    $ret[] = & $obj;
                 } else {
                     $row     = array();
                     $vars    = $obj->getVars();
@@ -196,7 +196,7 @@ 
                 }
             } else {
                 if ($as_object) {
-                    $ret[$myrow[$this->keyName]] =& $obj;
+                    $ret[$myrow[$this->keyName]] = & $obj;
                 } else {
                     $row     = array();
                     $vars    = $obj->getVars();
@@ -221,9 +221,9 @@ 
      */
     public function getIds($criteria = null)
     {
-        $sql = 'SELECT ' . $this->keyName . ' FROM ' . $this->table;
+        $sql = 'SELECT '.$this->keyName.' FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         $ret    = array();
@@ -254,15 +254,15 @@ 
             $criteria->setSort($this->identifierName);
         }
 
-        $sql = 'SELECT ' . $this->keyName;
+        $sql = 'SELECT '.$this->keyName;
         if (!empty($this->identifierName)) {
-            $sql .= ', ' . $this->identifierName;
+            $sql .= ', '.$this->identifierName;
         }
-        $sql .= ' FROM ' . $this->table;
+        $sql .= ' FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -294,12 +294,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             if ($criteria->groupby != '') {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
-        $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table;
+        $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby != '') {
                 $sql .= $criteria->getGroupby();
             }
@@ -335,13 +335,13 @@ 
             $clause = array();
             $vnb    = count($this->keyName);
             for ($i = 0; $i < $vnb; ++$i) {
-                $clause[] = $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+                $clause[] = $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]);
             }
             $whereclause = implode(' AND ', $clause);
         } else {
-            $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+            $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName);
         }
-        $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause;
+        $sql = 'DELETE FROM '.$this->table.' WHERE '.$whereclause;
         if (false != $force) {
             $result = $this->db->queryF($sql);
         } else {
@@ -395,7 +395,7 @@ 
 //                $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className);
 
                 if (!(class_exists($this->className) && $obj instanceof $this->className)) {
-                    $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className);
+                    $obj->setErrors(get_class($obj).' Differs from '.$this->className);
 
                 return false;
             }
@@ -407,7 +407,7 @@ 
         }
         if (!$obj->cleanVars()) {
             foreach ($obj->getErrors() as $oneerror) {
-                echo '<br><h2>' . $oneerror . '</h2>';
+                echo '<br><h2>'.$oneerror.'</h2>';
             }
 
             return false;
@@ -427,12 +427,12 @@ 
         if ($obj->isNew()) {
             if (!is_array($this->keyName)) {
                 if ($cleanvars[$this->keyName] < 1) {
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
+                    $cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq');
                 }
             }
-            $sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')';
+            $sql = 'INSERT INTO '.$this->table.' ('.implode(',', array_keys($cleanvars)).') VALUES ('.implode(',', array_values($cleanvars)).')';
         } else {
-            $sql = 'UPDATE ' . $this->table . ' SET';
+            $sql = 'UPDATE '.$this->table.' SET';
             foreach ($cleanvars as $key => $value) {
                 if ((!is_array($this->keyName) && $key == $this->keyName) || (is_array($this->keyName) && in_array($key, $this->keyName))) {
                     continue;
@@ -440,7 +440,7 @@ 
                 if (isset($notfirst)) {
                     $sql .= ',';
                 }
-                $sql .= ' ' . $key . ' = ' . $value;
+                $sql .= ' '.$key.' = '.$value;
                 $notfirst = true;
             }
             if (is_array($this->keyName)) {
@@ -450,12 +450,12 @@ 
                     if ($i > 0) {
                         $whereclause .= ' AND ';
                     }
-                    $whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+                    $whereclause .= $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]);
                 }
             } else {
-                $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+                $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName);
             }
-            $sql .= ' WHERE ' . $whereclause;
+            $sql .= ' WHERE '.$whereclause;
         }
 
         if (false != $force) {
@@ -486,7 +486,7 @@ 
      */
     public function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
     {
-        $set_clause = $fieldname . ' = ';
+        $set_clause = $fieldname.' = ';
         if (is_numeric($fieldvalue)) {
             $set_clause .= $fieldvalue;
         } elseif (is_array($fieldvalue)) {
@@ -494,9 +494,9 @@ 
         } else {
             $set_clause .= $this->db->quoteString($fieldvalue);
         }
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $set_clause;
+        $sql = 'UPDATE '.$this->table.' SET '.$set_clause;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (false != $force) {
             $result = $this->db->queryF($sql);
@@ -520,8 +520,8 @@ 
     public function deleteAll($criteria = null)
     {
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql = 'DELETE FROM ' . $this->table;
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql = 'DELETE FROM '.$this->table;
+            $sql .= ' '.$criteria->renderWhere();
             if (!$this->db->queryF($sql)) {
                 return false;
             }
@@ -563,7 +563,7 @@ 
      */
     public function getDistincts($field, $format = 's')
     {
-        $sql    = 'SELECT ' . $this->keyName . ', ' . $field . ' FROM ' . $this->table . ' GROUP BY ' . $field . ' ORDER BY ' . $field;
+        $sql    = 'SELECT '.$this->keyName.', '.$field.' FROM '.$this->table.' GROUP BY '.$field.' ORDER BY '.$field;
         $result = $this->db->query($sql);
         $ret    = array();
         $obj    = new $this->className();

class/registryfile.php

Doc Comments +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     /**
      * @param null $fichier
      *
-     * @return bool|string
+     * @return string
      */
     public function getfile($fichier = null)
     {

Indentation +58 added lines, -58 removed lines

@@ -29,67 +29,67 @@
  */
 class bookshop_registryfile
 {
-    public $filename;    // Nom du fichier à traiter
+	public $filename;    // Nom du fichier à traiter
 
-    /**
-     * @param null $fichier
-     */
-    public function __construct($fichier = null)
-    {
-        $this->setfile($fichier);
-    }
+	/**
+	 * @param null $fichier
+	 */
+	public function __construct($fichier = null)
+	{
+		$this->setfile($fichier);
+	}
 
-    /**
-     * @param null $fichier
-     */
-    public function setfile($fichier = null)
-    {
-        if ($fichier) {
-            $this->filename = XOOPS_UPLOAD_PATH . '/' . $fichier;
-        }
-    }
+	/**
+	 * @param null $fichier
+	 */
+	public function setfile($fichier = null)
+	{
+		if ($fichier) {
+			$this->filename = XOOPS_UPLOAD_PATH . '/' . $fichier;
+		}
+	}
 
-    /**
-     * @param null $fichier
-     *
-     * @return bool|string
-     */
-    public function getfile($fichier = null)
-    {
-        $fw = '';
-        if (!$fichier) {
-            $fw = $this->filename;
-        } else {
-            $fw = XOOPS_UPLOAD_PATH . '/' . $fichier;
-        }
-        if (file_exists($fw)) {
-            return file_get_contents($fw);
-        } else {
-            return '';
-        }
-    }
+	/**
+	 * @param null $fichier
+	 *
+	 * @return bool|string
+	 */
+	public function getfile($fichier = null)
+	{
+		$fw = '';
+		if (!$fichier) {
+			$fw = $this->filename;
+		} else {
+			$fw = XOOPS_UPLOAD_PATH . '/' . $fichier;
+		}
+		if (file_exists($fw)) {
+			return file_get_contents($fw);
+		} else {
+			return '';
+		}
+	}
 
-    /**
-     * @param      $content
-     * @param null $fichier
-     *
-     * @return bool
-     */
-    public function savefile($content, $fichier = null)
-    {
-        $fw = '';
-        if (!$fichier) {
-            $fw = $this->filename;
-        } else {
-            $fw = XOOPS_UPLOAD_PATH . '/' . $fichier;
-        }
-        if (file_exists($fw)) {
-            @unlink($fw);
-        }
-        $fp = fopen($fw, 'w') || exit('Error, impossible to create the file ' . $this->filename);
-        fwrite($fp, $content);
-        fclose($fp);
+	/**
+	 * @param      $content
+	 * @param null $fichier
+	 *
+	 * @return bool
+	 */
+	public function savefile($content, $fichier = null)
+	{
+		$fw = '';
+		if (!$fichier) {
+			$fw = $this->filename;
+		} else {
+			$fw = XOOPS_UPLOAD_PATH . '/' . $fichier;
+		}
+		if (file_exists($fw)) {
+			@unlink($fw);
+		}
+		$fp = fopen($fw, 'w') || exit('Error, impossible to create the file ' . $this->filename);
+		fwrite($fp, $content);
+		fclose($fp);
 
-        return true;
-    }
+		return true;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
  */
 class bookshop_registryfile
 {
-    public $filename;    // Nom du fichier à traiter
+    public $filename; // Nom du fichier à traiter
 
     /**
      * @param null $fichier
@@ -45,7 +45,7 @@ 
     public function setfile($fichier = null)
     {
         if ($fichier) {
-            $this->filename = XOOPS_UPLOAD_PATH . '/' . $fichier;
+            $this->filename = XOOPS_UPLOAD_PATH.'/'.$fichier;
         }
     }
 
@@ -60,7 +60,7 @@ 
         if (!$fichier) {
             $fw = $this->filename;
         } else {
-            $fw = XOOPS_UPLOAD_PATH . '/' . $fichier;
+            $fw = XOOPS_UPLOAD_PATH.'/'.$fichier;
         }
         if (file_exists($fw)) {
             return file_get_contents($fw);
@@ -81,12 +81,12 @@ 
         if (!$fichier) {
             $fw = $this->filename;
         } else {
-            $fw = XOOPS_UPLOAD_PATH . '/' . $fichier;
+            $fw = XOOPS_UPLOAD_PATH.'/'.$fichier;
         }
         if (file_exists($fw)) {
             @unlink($fw);
         }
-        $fp = fopen($fw, 'w') || exit('Error, impossible to create the file ' . $this->filename);
+        $fp = fopen($fw, 'w') || exit('Error, impossible to create the file '.$this->filename);
         fwrite($fp, $content);
         fclose($fp);
 

include/functions.php

Doc Comments +2 added lines, -3 removed lines

@@ -528,7 +528,7 @@ 
  * Calcul de la réduction
  *
  * @param float $price Le montant dont on veut calculer la réduction
- * @param integer $dicount Le montant de la rédution, par exemple 10 pour 10%
+ * @param integer $discount Le montant de la rédution, par exemple 10 pour 10%
  * @return float Le montant de la réduction
  */
 function bookshop_getDiscountedPrice($price, $discount)
@@ -695,7 +695,7 @@ 
 /**
  * Verify that the current user is a member of the Admin group
  *
- * @return booleean Admin or not
+ * @return boolean Admin or not
  */
 function bookshop_isAdmin()
 {
@@ -723,7 +723,6 @@ 
  * Indique si l'utilisateur courant fait partie d'une groupe donné (avec gestion de cache)
  *
  * @param int $group
- * @param integer $groupe Groupe recherché
  * @return boolean vrai si l'utilisateur fait partie du groupe, faux sinon
  */
 function bookshop_isMemberOfGroup($group = 0)

Indentation +450 added lines, -450 removed lines

@@ -41,31 +41,31 @@ 
  */
 function bookshop_getmoduleoption($option, $repmodule = 'bookshop')
 {
-    global $xoopsModuleConfig, $xoopsModule;
-    static $tbloptions = array();
-    if (is_array($tbloptions) && array_key_exists($option, $tbloptions)) {
-        return $tbloptions[$option];
-    }
-
-    $retval = false;
-    if (isset($xoopsModuleConfig) && (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $repmodule && $xoopsModule->getVar('isactive'))) {
-        if (isset($xoopsModuleConfig[$option])) {
-            $retval = $xoopsModuleConfig[$option];
-        }
-    } else {
-        $module_handler = xoops_getHandler('module');
-        $module         =& $module_handler->getByDirname($repmodule);
-        $config_handler = xoops_getHandler('config');
-        if ($module) {
-            $moduleConfig =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
-            if (isset($moduleConfig[$option])) {
-                $retval = $moduleConfig[$option];
-            }
-        }
-    }
-    $tbloptions[$option] = $retval;
-
-    return $retval;
+	global $xoopsModuleConfig, $xoopsModule;
+	static $tbloptions = array();
+	if (is_array($tbloptions) && array_key_exists($option, $tbloptions)) {
+		return $tbloptions[$option];
+	}
+
+	$retval = false;
+	if (isset($xoopsModuleConfig) && (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $repmodule && $xoopsModule->getVar('isactive'))) {
+		if (isset($xoopsModuleConfig[$option])) {
+			$retval = $xoopsModuleConfig[$option];
+		}
+	} else {
+		$module_handler = xoops_getHandler('module');
+		$module         =& $module_handler->getByDirname($repmodule);
+		$config_handler = xoops_getHandler('config');
+		if ($module) {
+			$moduleConfig =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+			if (isset($moduleConfig[$option])) {
+				$retval = $moduleConfig[$option];
+			}
+		}
+	}
+	$tbloptions[$option] = $retval;
+
+	return $retval;
 }
 
 /**
@@ -75,13 +75,13 @@ 
  */
 function bookshop_is_x22()
 {
-    $x22 = false;
-    $xv  = str_replace('XOOPS ', '', XOOPS_VERSION);
-    if (substr($xv, 2, 1) == '2') {
-        $x22 = true;
-    }
+	$x22 = false;
+	$xv  = str_replace('XOOPS ', '', XOOPS_VERSION);
+	if (substr($xv, 2, 1) == '2') {
+		$x22 = true;
+	}
 
-    return $x22;
+	return $x22;
 }
 
 /**
@@ -97,84 +97,84 @@ 
  */
 function bookshop_getWysiwygForm($caption, $name, $value = '', $width = '100%', $height = '400px', $supplemental = '')
 {
-    $editor                   = false;
-    $x22                      = bookshop_is_x22();
-    $editor_configs           = array();
-    $editor_configs['name']   = $name;
-    $editor_configs['value']  = $value;
-    $editor_configs['rows']   = 35;
-    $editor_configs['cols']   = 60;
-    $editor_configs['width']  = $width;
-    $editor_configs['height'] = $height;
-
-    $editor_option = bookshop_getmoduleoption('bl_form_options');
-
-    switch (strtolower($editor_option)) {
-        case 'spaw':
-            if (!$x22) {
-                if (is_readable(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php')) {
-                    include_once(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php');
-                    $editor = new XoopsFormSpaw($caption, $name, $value);
-                }
-            } else {
-                $editor = new XoopsFormEditor($caption, 'spaw', $editor_configs);
-            }
-            break;
-
-        case 'fck':
-            if (!$x22) {
-                if (is_readable(XOOPS_ROOT_PATH . '/class/fckeditor/formfckeditor.php')) {
-                    include_once(XOOPS_ROOT_PATH . '/class/fckeditor/formfckeditor.php');
-                    $editor = new XoopsFormFckeditor($caption, $name, $value);
-                }
-            } else {
-                $editor = new XoopsFormEditor($caption, 'fckeditor', $editor_configs);
-            }
-            break;
-
-        case 'htmlarea':
-            if (!$x22) {
-                if (is_readable(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php')) {
-                    include_once(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php');
-                    $editor = new XoopsFormHtmlarea($caption, $name, $value);
-                }
-            } else {
-                $editor = new XoopsFormEditor($caption, 'htmlarea', $editor_configs);
-            }
-            break;
-
-        case 'dhtml':
-            if (!$x22) {
-                $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 10, 50, $supplemental);
-            } else {
-                $editor = new XoopsFormEditor($caption, 'dhtmltextarea', $editor_configs);
-            }
-            break;
-
-        case 'textarea':
-            $editor = new XoopsFormTextArea($caption, $name, $value);
-            break;
-
-        case 'tinyeditor':
-            if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinyeditortextarea.php')) {
-                include_once XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinyeditortextarea.php';
-                $editor = new XoopsFormTinyeditorTextArea(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => $width, 'height' => $height));
-            }
-            break;
-
-        case 'koivi':
-            if (!$x22) {
-                if (is_readable(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php')) {
-                    include_once(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php');
-                    $editor = new XoopsFormWysiwygTextArea($caption, $name, $value, '100%', '250px', '');
-                }
-            } else {
-                $editor = new XoopsFormEditor($caption, 'koivi', $editor_configs);
-            }
-            break;
-    }
-
-    return $editor;
+	$editor                   = false;
+	$x22                      = bookshop_is_x22();
+	$editor_configs           = array();
+	$editor_configs['name']   = $name;
+	$editor_configs['value']  = $value;
+	$editor_configs['rows']   = 35;
+	$editor_configs['cols']   = 60;
+	$editor_configs['width']  = $width;
+	$editor_configs['height'] = $height;
+
+	$editor_option = bookshop_getmoduleoption('bl_form_options');
+
+	switch (strtolower($editor_option)) {
+		case 'spaw':
+			if (!$x22) {
+				if (is_readable(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php')) {
+					include_once(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php');
+					$editor = new XoopsFormSpaw($caption, $name, $value);
+				}
+			} else {
+				$editor = new XoopsFormEditor($caption, 'spaw', $editor_configs);
+			}
+			break;
+
+		case 'fck':
+			if (!$x22) {
+				if (is_readable(XOOPS_ROOT_PATH . '/class/fckeditor/formfckeditor.php')) {
+					include_once(XOOPS_ROOT_PATH . '/class/fckeditor/formfckeditor.php');
+					$editor = new XoopsFormFckeditor($caption, $name, $value);
+				}
+			} else {
+				$editor = new XoopsFormEditor($caption, 'fckeditor', $editor_configs);
+			}
+			break;
+
+		case 'htmlarea':
+			if (!$x22) {
+				if (is_readable(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php')) {
+					include_once(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php');
+					$editor = new XoopsFormHtmlarea($caption, $name, $value);
+				}
+			} else {
+				$editor = new XoopsFormEditor($caption, 'htmlarea', $editor_configs);
+			}
+			break;
+
+		case 'dhtml':
+			if (!$x22) {
+				$editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 10, 50, $supplemental);
+			} else {
+				$editor = new XoopsFormEditor($caption, 'dhtmltextarea', $editor_configs);
+			}
+			break;
+
+		case 'textarea':
+			$editor = new XoopsFormTextArea($caption, $name, $value);
+			break;
+
+		case 'tinyeditor':
+			if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinyeditortextarea.php')) {
+				include_once XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinyeditortextarea.php';
+				$editor = new XoopsFormTinyeditorTextArea(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => $width, 'height' => $height));
+			}
+			break;
+
+		case 'koivi':
+			if (!$x22) {
+				if (is_readable(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php')) {
+					include_once(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php');
+					$editor = new XoopsFormWysiwygTextArea($caption, $name, $value, '100%', '250px', '');
+				}
+			} else {
+				$editor = new XoopsFormEditor($caption, 'koivi', $editor_configs);
+			}
+			break;
+	}
+
+	return $editor;
 }
 
 /**
@@ -190,11 +190,11 @@ 
  */
 function bookshop_JavascriptLinkConfirm($msg, $form = false)
 {
-    if (!$form) {
-        return "onclick=\"javascript:return confirm('" . str_replace("'", ' ', $msg) . "')\"";
-    } else {
-        return "onSubmit=\"javascript:return confirm('" . str_replace("'", ' ', $msg) . "')\"";
-    }
+	if (!$form) {
+		return "onclick=\"javascript:return confirm('" . str_replace("'", ' ', $msg) . "')\"";
+	} else {
+		return "onSubmit=\"javascript:return confirm('" . str_replace("'", ' ', $msg) . "')\"";
+	}
 }
 
 /**
@@ -205,30 +205,30 @@ 
  */
 function bookshop_IP()
 {
-    $proxy_ip = '';
-    if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-        $proxy_ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-    } elseif (!empty($_SERVER['HTTP_X_FORWARDED'])) {
-        $proxy_ip = $_SERVER['HTTP_X_FORWARDED'];
-    } elseif (!empty($_SERVER['HTTP_FORWARDED_FOR'])) {
-        $proxy_ip = $_SERVER['HTTP_FORWARDED_FOR'];
-    } elseif (!empty($_SERVER['HTTP_FORWARDED'])) {
-        $proxy_ip = $_SERVER['HTTP_FORWARDED'];
-    } elseif (!empty($_SERVER['HTTP_VIA'])) {
-        $proxy_ip = $_SERVER['HTTP_VIA'];
-    } elseif (!empty($_SERVER['HTTP_X_COMING_FROM'])) {
-        $proxy_ip = $_SERVER['HTTP_X_COMING_FROM'];
-    } elseif (!empty($_SERVER['HTTP_COMING_FROM'])) {
-        $proxy_ip = $_SERVER['HTTP_COMING_FROM'];
-    }
-    $regs = array();
-    if (!empty($proxy_ip) && $is_ip = preg_match('/^([0-9]{1,3}\.){3,3}[0-9]{1,3}/', $proxy_ip, $regs) && count($regs) > 0) {
-        $the_IP = $regs[0];
-    } else {
-        $the_IP = $_SERVER['REMOTE_ADDR'];
-    }
-
-    return $the_IP;
+	$proxy_ip = '';
+	if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+		$proxy_ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+	} elseif (!empty($_SERVER['HTTP_X_FORWARDED'])) {
+		$proxy_ip = $_SERVER['HTTP_X_FORWARDED'];
+	} elseif (!empty($_SERVER['HTTP_FORWARDED_FOR'])) {
+		$proxy_ip = $_SERVER['HTTP_FORWARDED_FOR'];
+	} elseif (!empty($_SERVER['HTTP_FORWARDED'])) {
+		$proxy_ip = $_SERVER['HTTP_FORWARDED'];
+	} elseif (!empty($_SERVER['HTTP_VIA'])) {
+		$proxy_ip = $_SERVER['HTTP_VIA'];
+	} elseif (!empty($_SERVER['HTTP_X_COMING_FROM'])) {
+		$proxy_ip = $_SERVER['HTTP_X_COMING_FROM'];
+	} elseif (!empty($_SERVER['HTTP_COMING_FROM'])) {
+		$proxy_ip = $_SERVER['HTTP_COMING_FROM'];
+	}
+	$regs = array();
+	if (!empty($proxy_ip) && $is_ip = preg_match('/^([0-9]{1,3}\.){3,3}[0-9]{1,3}/', $proxy_ip, $regs) && count($regs) > 0) {
+		$the_IP = $regs[0];
+	} else {
+		$the_IP = $_SERVER['REMOTE_ADDR'];
+	}
+
+	return $the_IP;
 }
 
 /**
@@ -242,23 +242,23 @@ 
  */
 function bookshop_set_metas($page_title = '', $meta_description = '', $meta_keywords = '')
 {
-    global $xoTheme, $xoTheme, $xoopsTpl;
-    $xoopsTpl->assign('xoops_pagetitle', $page_title);
-    if (isset($xoTheme) && is_object($xoTheme)) {
-        if (!empty($meta_keywords)) {
-            $xoTheme->addMeta('meta', 'keywords', $meta_keywords);
-        }
-        if (!empty($meta_description)) {
-            $xoTheme->addMeta('meta', 'description', $meta_description);
-        }
-    } elseif (isset($xoopsTpl) && is_object($xoopsTpl)) {    // Compatibility for old Xoops versions
-        if (!empty($meta_keywords)) {
-            $xoopsTpl->assign('xoops_meta_keywords', $meta_keywords);
-        }
-        if (!empty($meta_description)) {
-            $xoopsTpl->assign('xoops_meta_description', $meta_description);
-        }
-    }
+	global $xoTheme, $xoTheme, $xoopsTpl;
+	$xoopsTpl->assign('xoops_pagetitle', $page_title);
+	if (isset($xoTheme) && is_object($xoTheme)) {
+		if (!empty($meta_keywords)) {
+			$xoTheme->addMeta('meta', 'keywords', $meta_keywords);
+		}
+		if (!empty($meta_description)) {
+			$xoTheme->addMeta('meta', 'description', $meta_description);
+		}
+	} elseif (isset($xoopsTpl) && is_object($xoopsTpl)) {    // Compatibility for old Xoops versions
+		if (!empty($meta_keywords)) {
+			$xoopsTpl->assign('xoops_meta_keywords', $meta_keywords);
+		}
+		if (!empty($meta_description)) {
+			$xoopsTpl->assign('xoops_meta_description', $meta_description);
+		}
+	}
 }
 
 /**
@@ -272,53 +272,53 @@ 
  */
 function bookshop_send_email_from_tpl($tpl_name, $recipients, $subject, $variables)
 {
-    global $xoopsConfig;
-    include_once XOOPS_ROOT_PATH . '/class/xoopsmailer.php';
-    if (!is_array($recipients)) {
-        if (trim($recipients) == '') {
-            return false;
-        }
-    } else {
-        if (count($recipients) == 0) {
-            return false;
-        }
-    }
-    if (function_exists('xoops_getMailer')) {
-        $xoopsMailer =& xoops_getMailer();
-    } else {
-        $xoopsMailer =& getMailer();
-    }
-
-    $xoopsMailer->useMail();
-    $xoopsMailer->setTemplateDir(XOOPS_ROOT_PATH . '/modules/bookshop/language/' . $xoopsConfig['language'] . '/mail_template');
-    $xoopsMailer->setTemplate($tpl_name);
-    $xoopsMailer->setToEmails($recipients);
-    // Change !
-    //$xoopsMailer->setFromEmail('contact@gbphotosports.com');
-    //$xoopsMailer->setFromName('PhotoSports');
-    $xoopsMailer->setSubject($subject);
-    foreach ($variables as $key => $value) {
-        $xoopsMailer->assign($key, $value);
-    }
-    $res = $xoopsMailer->send();
-    unset($xoopsMailer);
-
-    $fp = @fopen(XOOPS_UPLOAD_PATH . '/logmail_bookshop.txt', 'a');
-    if ($fp) {
-        fwrite($fp, str_repeat('-', 120) . "\n");
-        fwrite($fp, date('d/m/Y H:i:s') . "\n");
-        fwrite($fp, 'Nom du template : ' . $tpl_name . "\n");
-        fwrite($fp, 'Sujet du mail : ' . $subject . "\n");
-        if (is_array($recipients)) {
-            fwrite($fp, 'Destinaire(s) du mail : ' . implode(',', $recipients) . "\n");
-        } else {
-            fwrite($fp, 'Destinaire(s) du mail : ' . $recipients . "\n");
-        }
-        fwrite($fp, 'Variables transmises : ' . implode(',', $variables) . "\n");
-        fclose($fp);
-    }
-
-    return $res;
+	global $xoopsConfig;
+	include_once XOOPS_ROOT_PATH . '/class/xoopsmailer.php';
+	if (!is_array($recipients)) {
+		if (trim($recipients) == '') {
+			return false;
+		}
+	} else {
+		if (count($recipients) == 0) {
+			return false;
+		}
+	}
+	if (function_exists('xoops_getMailer')) {
+		$xoopsMailer =& xoops_getMailer();
+	} else {
+		$xoopsMailer =& getMailer();
+	}
+
+	$xoopsMailer->useMail();
+	$xoopsMailer->setTemplateDir(XOOPS_ROOT_PATH . '/modules/bookshop/language/' . $xoopsConfig['language'] . '/mail_template');
+	$xoopsMailer->setTemplate($tpl_name);
+	$xoopsMailer->setToEmails($recipients);
+	// Change !
+	//$xoopsMailer->setFromEmail('contact@gbphotosports.com');
+	//$xoopsMailer->setFromName('PhotoSports');
+	$xoopsMailer->setSubject($subject);
+	foreach ($variables as $key => $value) {
+		$xoopsMailer->assign($key, $value);
+	}
+	$res = $xoopsMailer->send();
+	unset($xoopsMailer);
+
+	$fp = @fopen(XOOPS_UPLOAD_PATH . '/logmail_bookshop.txt', 'a');
+	if ($fp) {
+		fwrite($fp, str_repeat('-', 120) . "\n");
+		fwrite($fp, date('d/m/Y H:i:s') . "\n");
+		fwrite($fp, 'Nom du template : ' . $tpl_name . "\n");
+		fwrite($fp, 'Sujet du mail : ' . $subject . "\n");
+		if (is_array($recipients)) {
+			fwrite($fp, 'Destinaire(s) du mail : ' . implode(',', $recipients) . "\n");
+		} else {
+			fwrite($fp, 'Destinaire(s) du mail : ' . $recipients . "\n");
+		}
+		fwrite($fp, 'Variables transmises : ' . implode(',', $variables) . "\n");
+		fclose($fp);
+	}
+
+	return $res;
 }
 
 /**
@@ -328,30 +328,30 @@ 
  */
 function bookshop_updateCache()
 {
-    global $xoopsModule;
-    $folder  = $xoopsModule->getVar('dirname');
-    $tpllist = array();
-    include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
-    $tplfile_handler = xoops_getHandler('tplfile');
-    $tpllist         = $tplfile_handler->find(null, null, null, $folder);
-    xoops_template_clear_module_cache($xoopsModule->getVar('mid'));            // Clear module's blocks cache
-
-    // Remove cache for each page.
-    foreach ($tpllist as $onetemplate) {
-        if ($onetemplate->getVar('tpl_type') === 'module') {
-            // Note, I've been testing all the other methods (like the one of Smarty) and none of them run, that's why I have used this code
-            $files_del = array();
-            $files_del = glob(XOOPS_CACHE_PATH . '/*' . $onetemplate->getVar('tpl_file') . '*');
-            if (count($files_del) > 0 && is_array($files_del)) {
-                foreach ($files_del as $one_file) {
-                    if (is_file($one_file)) {
-                        unlink($one_file);
-                    }
-                }
-            }
-        }
-    }
+	global $xoopsModule;
+	$folder  = $xoopsModule->getVar('dirname');
+	$tpllist = array();
+	include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
+	include_once XOOPS_ROOT_PATH . '/class/template.php';
+	$tplfile_handler = xoops_getHandler('tplfile');
+	$tpllist         = $tplfile_handler->find(null, null, null, $folder);
+	xoops_template_clear_module_cache($xoopsModule->getVar('mid'));            // Clear module's blocks cache
+
+	// Remove cache for each page.
+	foreach ($tpllist as $onetemplate) {
+		if ($onetemplate->getVar('tpl_type') === 'module') {
+			// Note, I've been testing all the other methods (like the one of Smarty) and none of them run, that's why I have used this code
+			$files_del = array();
+			$files_del = glob(XOOPS_CACHE_PATH . '/*' . $onetemplate->getVar('tpl_file') . '*');
+			if (count($files_del) > 0 && is_array($files_del)) {
+				foreach ($files_del as $one_file) {
+					if (is_file($one_file)) {
+						unlink($one_file);
+					}
+				}
+			}
+		}
+	}
 }
 
 /**
@@ -362,12 +362,12 @@ 
  */
 function bookshop_make_infotips($text)
 {
-    $infotips = bookshop_getmoduleoption('infotips');
-    if ($infotips > 0) {
-        $myts = MyTextSanitizer::getInstance();
+	$infotips = bookshop_getmoduleoption('infotips');
+	if ($infotips > 0) {
+		$myts = MyTextSanitizer::getInstance();
 
-        return $myts->htmlSpecialChars(xoops_substr(strip_tags($text), 0, $infotips));
-    }
+		return $myts->htmlSpecialChars(xoops_substr(strip_tags($text), 0, $infotips));
+	}
 }
 
 /**
@@ -379,8 +379,8 @@ 
  */
 function bookshop_redirect($message = '', $url = 'index.php', $time = 2)
 {
-    redirect_header($url, $time, $message);
-    exit();
+	redirect_header($url, $time, $message);
+	exit();
 }
 
 /**
@@ -390,18 +390,18 @@ 
  */
 function bookshop_get_module()
 {
-    static $mymodule;
-    if (!isset($mymodule)) {
-        global $xoopsModule;
-        if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == BOOKSHOP_DIRNAME) {
-            $mymodule =& $xoopsModule;
-        } else {
-            $hModule  = xoops_getHandler('module');
-            $mymodule = $hModule->getByDirname(BOOKSHOP_DIRNAME);
-        }
-    }
-
-    return $mymodule;
+	static $mymodule;
+	if (!isset($mymodule)) {
+		global $xoopsModule;
+		if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == BOOKSHOP_DIRNAME) {
+			$mymodule =& $xoopsModule;
+		} else {
+			$hModule  = xoops_getHandler('module');
+			$mymodule = $hModule->getByDirname(BOOKSHOP_DIRNAME);
+		}
+	}
+
+	return $mymodule;
 }
 
 /**
@@ -411,13 +411,13 @@ 
  */
 function bookshop_get_module_name()
 {
-    static $module_name;
-    if (!isset($module_name)) {
-        $mymodule    = bookshop_get_module();
-        $module_name = $mymodule->getVar('name');
-    }
+	static $module_name;
+	if (!isset($module_name)) {
+		$mymodule    = bookshop_get_module();
+		$module_name = $mymodule->getVar('name');
+	}
 
-    return $module_name;
+	return $module_name;
 }
 
 /**
@@ -430,40 +430,40 @@ 
 function bookshop_makeSEOurl($content, $urw = 1)
 {
 	$s       = "ÀÁÂÃÄÅÒÓÔÕÖØÈÉÊËÇÌÍÎÏÙÚÛÜŸÑàáâãäåòóôõöøèéêëçìíîïùúûüÿñ '()";
-    $r       = 'AAAAAAOOOOOOEEEECIIIIUUUUYNaaaaaaooooooeeeeciiiiuuuuyn----';
-    $content = strtr($content, $s, $r);
-    $content = strip_tags($content);
-    $content = strtolower($content);
-    $content = htmlentities($content);
-    $content = preg_replace('/&([a-zA-Z])(uml|acute|grave|circ|tilde);/', '$1', $content);
-    $content = html_entity_decode($content);
-    $content = preg_replace('/quot/i', ' ', $content);
-    $content = preg_replace("/'/i", ' ', $content);
-    $content = preg_replace('/-/i', ' ', $content);
-    $content = preg_replace('/[[:punct:]]/i', '', $content);
-
-    // Selon option mais attention au fichier .htaccess !
-    //$content = eregi_replace('[[:digit:]]','', $content);
-    $content = preg_replace('/[^a-z|A-Z|0-9]/', '-', $content);    // moi
-
-    $words    = explode(' ', $content);
-    $keywords = '';
-    foreach ($words as $word) {
-        if (strlen($word) >= $urw) {
-            $keywords .= '-' . trim($word);
-        }
-    }
-    if (!$keywords) {
-        $keywords = '-';
-    }
-    // Supprime les tirets en double
-    $keywords = str_replace('--', '-', $keywords);
+	$r       = 'AAAAAAOOOOOOEEEECIIIIUUUUYNaaaaaaooooooeeeeciiiiuuuuyn----';
+	$content = strtr($content, $s, $r);
+	$content = strip_tags($content);
+	$content = strtolower($content);
+	$content = htmlentities($content);
+	$content = preg_replace('/&([a-zA-Z])(uml|acute|grave|circ|tilde);/', '$1', $content);
+	$content = html_entity_decode($content);
+	$content = preg_replace('/quot/i', ' ', $content);
+	$content = preg_replace("/'/i", ' ', $content);
+	$content = preg_replace('/-/i', ' ', $content);
+	$content = preg_replace('/[[:punct:]]/i', '', $content);
+
+	// Selon option mais attention au fichier .htaccess !
+	//$content = eregi_replace('[[:digit:]]','', $content);
+	$content = preg_replace('/[^a-z|A-Z|0-9]/', '-', $content);    // moi
+
+	$words    = explode(' ', $content);
+	$keywords = '';
+	foreach ($words as $word) {
+		if (strlen($word) >= $urw) {
+			$keywords .= '-' . trim($word);
+		}
+	}
+	if (!$keywords) {
+		$keywords = '-';
+	}
+	// Supprime les tirets en double
+	$keywords = str_replace('--', '-', $keywords);
 	// Supprime un éventuel tiret à la fin de la chaine
-    if (substr($keywords, strlen($keywords) - 1, 1) == '-') {
-        $keywords = substr($keywords, 0, strlen($keywords) - 1);
-    }
+	if (substr($keywords, strlen($keywords) - 1, 1) == '-') {
+		$keywords = substr($keywords, 0, strlen($keywords) - 1);
+	}
 
-    return $keywords;
+	return $keywords;
 }
 
 /**
@@ -473,9 +473,9 @@ 
  */
 function bookshop_setCSS()
 {
-    global $xoopsTpl;
-    $url = BOOKSHOP_URL . 'assets/css/bookshop.css';
-    $xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
+	global $xoopsTpl;
+	$url = BOOKSHOP_URL . 'assets/css/bookshop.css';
+	$xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
 }
 
 /**
@@ -486,10 +486,10 @@ 
  */
 function bookshop_makeHrefTitle($title)
 {
-    $s = "\"'";
-    $r = '  ';
+	$s = "\"'";
+	$r = '  ';
 
-    return strtr($title, $s, $r);
+	return strtr($title, $s, $r);
 }
 
 /**
@@ -500,9 +500,9 @@ 
  */
 function bookshop_formatMoney($ttc)
 {
-    $retval = sprintf('%0.' . bookshop_getmoduleoption('decimals_count') . 'f', $ttc);
+	$retval = sprintf('%0.' . bookshop_getmoduleoption('decimals_count') . 'f', $ttc);
 
-    return $retval;
+	return $retval;
 }
 
 /**
@@ -516,12 +516,12 @@ 
  */
 function bookshop_getTTC($ht, $vat, $edit = false)
 {
-    $ttc = $ht * (1 + ($vat / 100));
-    if (!$edit) {
-        return bookshop_formatMoney($ttc);
-    } else {
-        return $ttc;
-    }
+	$ttc = $ht * (1 + ($vat / 100));
+	if (!$edit) {
+		return bookshop_formatMoney($ttc);
+	} else {
+		return $ttc;
+	}
 }
 
 /**
@@ -533,7 +533,7 @@ 
  */
 function bookshop_getDiscountedPrice($price, $discount)
 {
-    return $price - ($price * ($discount / 100));
+	return $price - ($price * ($discount / 100));
 }
 
 /**
@@ -545,7 +545,7 @@ 
  */
 function bookshop_getVAT($ht, $vat)
 {
-    return ($ht * $vat) / 100;
+	return ($ht * $vat) / 100;
 }
 
 /**
@@ -557,9 +557,9 @@ 
  */
 function bookshop_getHT($ttc, $vat)
 {
-    $ht = $ttc / (1 + ($vat / 100));
+	$ht = $ttc / (1 + ($vat / 100));
 
-    return bookshop_formatMoney($ht);
+	return bookshop_formatMoney($ht);
 }
 
 /**
@@ -570,70 +570,70 @@ 
  */
 function bookshop_createmeta_keywords($content)
 {
-    $keywordscount = bookshop_getmoduleoption('metagen_maxwords');
-    $keywordsorder = bookshop_getmoduleoption('metagen_order');
-
-    $tmp = array();
-    // Search for the "Minimum keyword length"
-    if (isset($_SESSION['bookshop_keywords_limit'])) {
-        $limit = $_SESSION['bookshop_keywords_limit'];
-    } else {
-        $config_handler                      = xoops_getHandler('config');
-        $xoopsConfigSearch                   =& $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
-        $limit                               = $xoopsConfigSearch['keyword_min'];
-        $_SESSION['bookshop_keywords_limit'] = $limit;
-    }
-    $myts            = MyTextSanitizer::getInstance();
-    $content         = str_replace('<br>', ' ', $content);
-    $content         = $myts->undoHtmlSpecialChars($content);
-    $content         = strip_tags($content);
-    $content         = strtolower($content);
-    $search_pattern  = array('&nbsp;', "\t", "\r\n", "\r", "\n", ',', '.', "'", ';', ':', ')', '(', '"', '?', '!', '{', '}', '[', ']', '<', '>', '/', '+', '-', '_', '\\', '*');
-    $replace_pattern = array(' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
-    $content         = str_replace($search_pattern, $replace_pattern, $content);
-    $keywords        = explode(' ', $content);
-    switch ($keywordsorder) {
-        case 0:    // Ordre d'apparition dans le texte
-            $keywords = array_unique($keywords);
-            break;
+	$keywordscount = bookshop_getmoduleoption('metagen_maxwords');
+	$keywordsorder = bookshop_getmoduleoption('metagen_order');
+
+	$tmp = array();
+	// Search for the "Minimum keyword length"
+	if (isset($_SESSION['bookshop_keywords_limit'])) {
+		$limit = $_SESSION['bookshop_keywords_limit'];
+	} else {
+		$config_handler                      = xoops_getHandler('config');
+		$xoopsConfigSearch                   =& $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
+		$limit                               = $xoopsConfigSearch['keyword_min'];
+		$_SESSION['bookshop_keywords_limit'] = $limit;
+	}
+	$myts            = MyTextSanitizer::getInstance();
+	$content         = str_replace('<br>', ' ', $content);
+	$content         = $myts->undoHtmlSpecialChars($content);
+	$content         = strip_tags($content);
+	$content         = strtolower($content);
+	$search_pattern  = array('&nbsp;', "\t", "\r\n", "\r", "\n", ',', '.', "'", ';', ':', ')', '(', '"', '?', '!', '{', '}', '[', ']', '<', '>', '/', '+', '-', '_', '\\', '*');
+	$replace_pattern = array(' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
+	$content         = str_replace($search_pattern, $replace_pattern, $content);
+	$keywords        = explode(' ', $content);
+	switch ($keywordsorder) {
+		case 0:    // Ordre d'apparition dans le texte
+			$keywords = array_unique($keywords);
+			break;
 		case 1:	// Ordre de fréquence des mots
-            $keywords = array_count_values($keywords);
-            asort($keywords);
-            $keywords = array_keys($keywords);
-            break;
+			$keywords = array_count_values($keywords);
+			asort($keywords);
+			$keywords = array_keys($keywords);
+			break;
 		case 2:	// Ordre inverse de la fréquence des mots
-            $keywords = array_count_values($keywords);
-            arsort($keywords);
-            $keywords = array_keys($keywords);
-            break;
-    }
-    // Remove black listed words
-    if (xoops_trim(bookshop_getmoduleoption('metagen_blacklist')) != '') {
-        $metagen_blacklist = str_replace("\r", '', bookshop_getmoduleoption('metagen_blacklist'));
-        $metablack         = explode("\n", $metagen_blacklist);
-        array_walk($metablack, 'trim');
-        $keywords = array_diff($keywords, $metablack);
-    }
-
-    foreach ($keywords as $keyword) {
-        if (strlen($keyword) >= $limit && !is_numeric($keyword)) {
-            $tmp[] = $keyword;
-        }
-    }
-    $tmp = array_slice($tmp, 0, $keywordscount);
-    if (count($tmp) > 0) {
-        return implode(',', $tmp);
-    } else {
-        if (!isset($config_handler) || !is_object($config_handler)) {
-            $config_handler = xoops_getHandler('config');
-        }
-        $xoopsConfigMetaFooter =& $config_handler->getConfigsByCat(XOOPS_CONF_METAFOOTER);
-        if (isset($xoopsConfigMetaFooter['meta_keywords'])) {
-            return $xoopsConfigMetaFooter['meta_keywords'];
-        } else {
-            return '';
-        }
-    }
+			$keywords = array_count_values($keywords);
+			arsort($keywords);
+			$keywords = array_keys($keywords);
+			break;
+	}
+	// Remove black listed words
+	if (xoops_trim(bookshop_getmoduleoption('metagen_blacklist')) != '') {
+		$metagen_blacklist = str_replace("\r", '', bookshop_getmoduleoption('metagen_blacklist'));
+		$metablack         = explode("\n", $metagen_blacklist);
+		array_walk($metablack, 'trim');
+		$keywords = array_diff($keywords, $metablack);
+	}
+
+	foreach ($keywords as $keyword) {
+		if (strlen($keyword) >= $limit && !is_numeric($keyword)) {
+			$tmp[] = $keyword;
+		}
+	}
+	$tmp = array_slice($tmp, 0, $keywordscount);
+	if (count($tmp) > 0) {
+		return implode(',', $tmp);
+	} else {
+		if (!isset($config_handler) || !is_object($config_handler)) {
+			$config_handler = xoops_getHandler('config');
+		}
+		$xoopsConfigMetaFooter =& $config_handler->getConfigsByCat(XOOPS_CONF_METAFOOTER);
+		if (isset($xoopsConfigMetaFooter['meta_keywords'])) {
+			return $xoopsConfigMetaFooter['meta_keywords'];
+		} else {
+			return '';
+		}
+	}
 }
 
 /**
@@ -644,11 +644,11 @@ 
  */
 function bookshop_getUsersFromGroup($group_id)
 {
-    $tbl_users      = array();
-    $member_handler = xoops_getHandler('member');
-    $tbl_users      = $member_handler->getUsersByGroup($group_id, true);
+	$tbl_users      = array();
+	$member_handler = xoops_getHandler('member');
+	$tbl_users      = $member_handler->getUsersByGroup($group_id, true);
 
-    return $tbl_users;
+	return $tbl_users;
 }
 
 /**
@@ -659,13 +659,13 @@ 
  */
 function bookshop_getEmailsFromGroup($group_id)
 {
-    $ret       = array();
-    $tbl_users = bookshop_getUsersFromGroup($group_id);
-    foreach ($tbl_users as $user) {
-        $ret[] = $user->getVar('email');
-    }
+	$ret       = array();
+	$tbl_users = bookshop_getUsersFromGroup($group_id);
+	foreach ($tbl_users as $user) {
+		$ret[] = $user->getVar('email');
+	}
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -676,20 +676,20 @@ 
  */
 function bookshop_post_it($datastream, $url)
 {
-    $url     = preg_replace('@^http://@i', '', $url);
-    $host    = substr($url, 0, strpos($url, '/'));
-    $uri     = strstr($url, '/');
-    $reqbody = '';
-    foreach ($datastream as $key => $val) {
-        if (!empty($reqbody)) {
-            $reqbody .= '&';
-        }
-        $reqbody .= $key . '=' . urlencode($val);
-    }
-    $contentlength = strlen($reqbody);
-    $reqheader     = "POST $uri HTTP/1.1\r\n" . "Host: $host\n" . "Content-Type: application/x-www-form-urlencoded\r\n" . "Content-Length: $contentlength\r\n\r\n" . "$reqbody\r\n";
-
-    return $reqheader;
+	$url     = preg_replace('@^http://@i', '', $url);
+	$host    = substr($url, 0, strpos($url, '/'));
+	$uri     = strstr($url, '/');
+	$reqbody = '';
+	foreach ($datastream as $key => $val) {
+		if (!empty($reqbody)) {
+			$reqbody .= '&';
+		}
+		$reqbody .= $key . '=' . urlencode($val);
+	}
+	$contentlength = strlen($reqbody);
+	$reqheader     = "POST $uri HTTP/1.1\r\n" . "Host: $host\n" . "Content-Type: application/x-www-form-urlencoded\r\n" . "Content-Length: $contentlength\r\n\r\n" . "$reqbody\r\n";
+
+	return $reqheader;
 }
 
 /**
@@ -699,24 +699,24 @@ 
  */
 function bookshop_isAdmin()
 {
-    global $xoopsUser, $xoopsModule;
-    if (is_object($xoopsUser)) {
-        if (in_array(XOOPS_GROUP_ADMIN, $xoopsUser->getGroups())) {
-            return true;
-        } else {
-            if (isset($xoopsModule)) {
-                if ($xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
-                    return true;
-                } else {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        }
-    } else {
-        return false;
-    }
+	global $xoopsUser, $xoopsModule;
+	if (is_object($xoopsUser)) {
+		if (in_array(XOOPS_GROUP_ADMIN, $xoopsUser->getGroups())) {
+			return true;
+		} else {
+			if (isset($xoopsModule)) {
+				if ($xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
+					return true;
+				} else {
+					return false;
+				}
+			} else {
+				return false;
+			}
+		}
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -728,24 +728,24 @@ 
  */
 function bookshop_isMemberOfGroup($group = 0)
 {
-    global $xoopsUser;
-    static $tblBuffer = array();
-    $retval = false;
-    if (is_object($xoopsUser)) {
-        $uid = $xoopsUser->getVar('uid');
-    } else {
-        $uid = 0;
-    }
-    if (is_array($tblBuffer) && array_key_exists($group, $tblBuffer)) {
-        $retval = $tblBuffer[$group];
-    } else {
-        $member_handler    = xoops_getHandler('member');
-        $tblGroups         = $member_handler->getGroupsByUser($uid, false);    // Renvoie un tableau d'ID (de groupes)
-        $retval            = in_array($group, $tblGroups);
-        $tblBuffer[$group] = $retval;
-    }
-
-    return $retval;
+	global $xoopsUser;
+	static $tblBuffer = array();
+	$retval = false;
+	if (is_object($xoopsUser)) {
+		$uid = $xoopsUser->getVar('uid');
+	} else {
+		$uid = 0;
+	}
+	if (is_array($tblBuffer) && array_key_exists($group, $tblBuffer)) {
+		$retval = $tblBuffer[$group];
+	} else {
+		$member_handler    = xoops_getHandler('member');
+		$tblGroups         = $member_handler->getGroupsByUser($uid, false);    // Renvoie un tableau d'ID (de groupes)
+		$retval            = in_array($group, $tblGroups);
+		$tblBuffer[$group] = $retval;
+	}
+
+	return $retval;
 }
 
 /**
@@ -755,17 +755,17 @@ 
  */
 function bookshop_needsAsterisk()
 {
-    if (bookshop_is_x22()) {
-        return false;
-    }
-    if (strpos(strtolower(XOOPS_VERSION), 'legacy') === false) {
-        $xv = xoops_trim(str_replace('XOOPS ', '', XOOPS_VERSION));
-        if ((int)substr($xv, 4, 2) >= 17) {
-            return false;
-        }
-    }
-
-    return true;
+	if (bookshop_is_x22()) {
+		return false;
+	}
+	if (strpos(strtolower(XOOPS_VERSION), 'legacy') === false) {
+		$xv = xoops_trim(str_replace('XOOPS ', '', XOOPS_VERSION));
+		if ((int)substr($xv, 4, 2) >= 17) {
+			return false;
+		}
+	}
+
+	return true;
 }
 
 /**
@@ -777,20 +777,20 @@ 
  */
 function bookshop_formMarkRequiredFields(&$sform)
 {
-    if (bookshop_needsAsterisk()) {
-        $tblRequired = array();
-        foreach ($sform->getRequired() as $item) {
-            $tblRequired[] = $item->_name;
-        }
-        $tblElements = array();
-        $tblElements = &$sform->getElements();
-        $cnt         = count($tblElements);
-        for ($i = 0; $i < $cnt; ++$i) {
-            if (is_object($tblElements[$i]) && in_array($tblElements[$i]->_name, $tblRequired)) {
-                $tblElements[$i]->_caption .= ' *';
-            }
-        }
-    }
-
-    return $sform;
+	if (bookshop_needsAsterisk()) {
+		$tblRequired = array();
+		foreach ($sform->getRequired() as $item) {
+			$tblRequired[] = $item->_name;
+		}
+		$tblElements = array();
+		$tblElements = &$sform->getElements();
+		$cnt         = count($tblElements);
+		for ($i = 0; $i < $cnt; ++$i) {
+			if (is_object($tblElements[$i]) && in_array($tblElements[$i]->_name, $tblRequired)) {
+				$tblElements[$i]->_caption .= ' *';
+			}
+		}
+	}
+
+	return $sform;
 }

Spacing +41 added lines, -41 removed lines

@@ -54,10 +54,10 @@ 
         }
     } else {
         $module_handler = xoops_getHandler('module');
-        $module         =& $module_handler->getByDirname($repmodule);
+        $module         = & $module_handler->getByDirname($repmodule);
         $config_handler = xoops_getHandler('config');
         if ($module) {
-            $moduleConfig =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+            $moduleConfig = & $config_handler->getConfigsByCat(0, $module->getVar('mid'));
             if (isset($moduleConfig[$option])) {
                 $retval = $moduleConfig[$option];
             }
@@ -112,8 +112,8 @@ 
     switch (strtolower($editor_option)) {
         case 'spaw':
             if (!$x22) {
-                if (is_readable(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php')) {
-                    include_once(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php');
+                if (is_readable(XOOPS_ROOT_PATH.'/class/spaw/formspaw.php')) {
+                    include_once(XOOPS_ROOT_PATH.'/class/spaw/formspaw.php');
                     $editor = new XoopsFormSpaw($caption, $name, $value);
                 }
             } else {
@@ -123,8 +123,8 @@ 
 
         case 'fck':
             if (!$x22) {
-                if (is_readable(XOOPS_ROOT_PATH . '/class/fckeditor/formfckeditor.php')) {
-                    include_once(XOOPS_ROOT_PATH . '/class/fckeditor/formfckeditor.php');
+                if (is_readable(XOOPS_ROOT_PATH.'/class/fckeditor/formfckeditor.php')) {
+                    include_once(XOOPS_ROOT_PATH.'/class/fckeditor/formfckeditor.php');
                     $editor = new XoopsFormFckeditor($caption, $name, $value);
                 }
             } else {
@@ -134,8 +134,8 @@ 
 
         case 'htmlarea':
             if (!$x22) {
-                if (is_readable(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php')) {
-                    include_once(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php');
+                if (is_readable(XOOPS_ROOT_PATH.'/class/htmlarea/formhtmlarea.php')) {
+                    include_once(XOOPS_ROOT_PATH.'/class/htmlarea/formhtmlarea.php');
                     $editor = new XoopsFormHtmlarea($caption, $name, $value);
                 }
             } else {
@@ -156,16 +156,16 @@ 
             break;
 
         case 'tinyeditor':
-            if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinyeditortextarea.php')) {
-                include_once XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinyeditortextarea.php';
+            if (is_readable(XOOPS_ROOT_PATH.'/class/xoopseditor/tinyeditor/formtinyeditortextarea.php')) {
+                include_once XOOPS_ROOT_PATH.'/class/xoopseditor/tinyeditor/formtinyeditortextarea.php';
                 $editor = new XoopsFormTinyeditorTextArea(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => $width, 'height' => $height));
             }
             break;
 
         case 'koivi':
             if (!$x22) {
-                if (is_readable(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php')) {
-                    include_once(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php');
+                if (is_readable(XOOPS_ROOT_PATH.'/class/wysiwyg/formwysiwygtextarea.php')) {
+                    include_once(XOOPS_ROOT_PATH.'/class/wysiwyg/formwysiwygtextarea.php');
                     $editor = new XoopsFormWysiwygTextArea($caption, $name, $value, '100%', '250px', '');
                 }
             } else {
@@ -191,9 +191,9 @@ 
 function bookshop_JavascriptLinkConfirm($msg, $form = false)
 {
     if (!$form) {
-        return "onclick=\"javascript:return confirm('" . str_replace("'", ' ', $msg) . "')\"";
+        return "onclick=\"javascript:return confirm('".str_replace("'", ' ', $msg)."')\"";
     } else {
-        return "onSubmit=\"javascript:return confirm('" . str_replace("'", ' ', $msg) . "')\"";
+        return "onSubmit=\"javascript:return confirm('".str_replace("'", ' ', $msg)."')\"";
     }
 }
 
@@ -273,7 +273,7 @@ 
 function bookshop_send_email_from_tpl($tpl_name, $recipients, $subject, $variables)
 {
     global $xoopsConfig;
-    include_once XOOPS_ROOT_PATH . '/class/xoopsmailer.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsmailer.php';
     if (!is_array($recipients)) {
         if (trim($recipients) == '') {
             return false;
@@ -284,13 +284,13 @@ 
         }
     }
     if (function_exists('xoops_getMailer')) {
-        $xoopsMailer =& xoops_getMailer();
+        $xoopsMailer = & xoops_getMailer();
     } else {
-        $xoopsMailer =& getMailer();
+        $xoopsMailer = & getMailer();
     }
 
     $xoopsMailer->useMail();
-    $xoopsMailer->setTemplateDir(XOOPS_ROOT_PATH . '/modules/bookshop/language/' . $xoopsConfig['language'] . '/mail_template');
+    $xoopsMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/bookshop/language/'.$xoopsConfig['language'].'/mail_template');
     $xoopsMailer->setTemplate($tpl_name);
     $xoopsMailer->setToEmails($recipients);
     // Change !
@@ -303,18 +303,18 @@ 
     $res = $xoopsMailer->send();
     unset($xoopsMailer);
 
-    $fp = @fopen(XOOPS_UPLOAD_PATH . '/logmail_bookshop.txt', 'a');
+    $fp = @fopen(XOOPS_UPLOAD_PATH.'/logmail_bookshop.txt', 'a');
     if ($fp) {
-        fwrite($fp, str_repeat('-', 120) . "\n");
-        fwrite($fp, date('d/m/Y H:i:s') . "\n");
-        fwrite($fp, 'Nom du template : ' . $tpl_name . "\n");
-        fwrite($fp, 'Sujet du mail : ' . $subject . "\n");
+        fwrite($fp, str_repeat('-', 120)."\n");
+        fwrite($fp, date('d/m/Y H:i:s')."\n");
+        fwrite($fp, 'Nom du template : '.$tpl_name."\n");
+        fwrite($fp, 'Sujet du mail : '.$subject."\n");
         if (is_array($recipients)) {
-            fwrite($fp, 'Destinaire(s) du mail : ' . implode(',', $recipients) . "\n");
+            fwrite($fp, 'Destinaire(s) du mail : '.implode(',', $recipients)."\n");
         } else {
-            fwrite($fp, 'Destinaire(s) du mail : ' . $recipients . "\n");
+            fwrite($fp, 'Destinaire(s) du mail : '.$recipients."\n");
         }
-        fwrite($fp, 'Variables transmises : ' . implode(',', $variables) . "\n");
+        fwrite($fp, 'Variables transmises : '.implode(',', $variables)."\n");
         fclose($fp);
     }
 
@@ -331,18 +331,18 @@ 
     global $xoopsModule;
     $folder  = $xoopsModule->getVar('dirname');
     $tpllist = array();
-    include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
     $tplfile_handler = xoops_getHandler('tplfile');
     $tpllist         = $tplfile_handler->find(null, null, null, $folder);
-    xoops_template_clear_module_cache($xoopsModule->getVar('mid'));            // Clear module's blocks cache
+    xoops_template_clear_module_cache($xoopsModule->getVar('mid')); // Clear module's blocks cache
 
     // Remove cache for each page.
     foreach ($tpllist as $onetemplate) {
         if ($onetemplate->getVar('tpl_type') === 'module') {
             // Note, I've been testing all the other methods (like the one of Smarty) and none of them run, that's why I have used this code
             $files_del = array();
-            $files_del = glob(XOOPS_CACHE_PATH . '/*' . $onetemplate->getVar('tpl_file') . '*');
+            $files_del = glob(XOOPS_CACHE_PATH.'/*'.$onetemplate->getVar('tpl_file').'*');
             if (count($files_del) > 0 && is_array($files_del)) {
                 foreach ($files_del as $one_file) {
                     if (is_file($one_file)) {
@@ -394,7 +394,7 @@ 
     if (!isset($mymodule)) {
         global $xoopsModule;
         if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == BOOKSHOP_DIRNAME) {
-            $mymodule =& $xoopsModule;
+            $mymodule = & $xoopsModule;
         } else {
             $hModule  = xoops_getHandler('module');
             $mymodule = $hModule->getByDirname(BOOKSHOP_DIRNAME);
@@ -429,7 +429,7 @@ 
  */
 function bookshop_makeSEOurl($content, $urw = 1)
 {
-	$s       = "ÀÁÂÃÄÅÒÓÔÕÖØÈÉÊËÇÌÍÎÏÙÚÛÜŸÑàáâãäåòóôõöøèéêëçìíîïùúûüÿñ '()";
+	$s = "ÀÁÂÃÄÅÒÓÔÕÖØÈÉÊËÇÌÍÎÏÙÚÛÜŸÑàáâãäåòóôõöøèéêëçìíîïùúûüÿñ '()";
     $r       = 'AAAAAAOOOOOOEEEECIIIIUUUUYNaaaaaaooooooeeeeciiiiuuuuyn----';
     $content = strtr($content, $s, $r);
     $content = strip_tags($content);
@@ -444,13 +444,13 @@ 
 
     // Selon option mais attention au fichier .htaccess !
     //$content = eregi_replace('[[:digit:]]','', $content);
-    $content = preg_replace('/[^a-z|A-Z|0-9]/', '-', $content);    // moi
+    $content = preg_replace('/[^a-z|A-Z|0-9]/', '-', $content); // moi
 
     $words    = explode(' ', $content);
     $keywords = '';
     foreach ($words as $word) {
         if (strlen($word) >= $urw) {
-            $keywords .= '-' . trim($word);
+            $keywords .= '-'.trim($word);
         }
     }
     if (!$keywords) {
@@ -474,7 +474,7 @@ 
 function bookshop_setCSS()
 {
     global $xoopsTpl;
-    $url = BOOKSHOP_URL . 'assets/css/bookshop.css';
+    $url = BOOKSHOP_URL.'assets/css/bookshop.css';
     $xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
 }
 
@@ -500,7 +500,7 @@ 
  */
 function bookshop_formatMoney($ttc)
 {
-    $retval = sprintf('%0.' . bookshop_getmoduleoption('decimals_count') . 'f', $ttc);
+    $retval = sprintf('%0.'.bookshop_getmoduleoption('decimals_count').'f', $ttc);
 
     return $retval;
 }
@@ -579,7 +579,7 @@ 
         $limit = $_SESSION['bookshop_keywords_limit'];
     } else {
         $config_handler                      = xoops_getHandler('config');
-        $xoopsConfigSearch                   =& $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
+        $xoopsConfigSearch                   = & $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
         $limit                               = $xoopsConfigSearch['keyword_min'];
         $_SESSION['bookshop_keywords_limit'] = $limit;
     }
@@ -627,7 +627,7 @@ 
         if (!isset($config_handler) || !is_object($config_handler)) {
             $config_handler = xoops_getHandler('config');
         }
-        $xoopsConfigMetaFooter =& $config_handler->getConfigsByCat(XOOPS_CONF_METAFOOTER);
+        $xoopsConfigMetaFooter = & $config_handler->getConfigsByCat(XOOPS_CONF_METAFOOTER);
         if (isset($xoopsConfigMetaFooter['meta_keywords'])) {
             return $xoopsConfigMetaFooter['meta_keywords'];
         } else {
@@ -684,10 +684,10 @@ 
         if (!empty($reqbody)) {
             $reqbody .= '&';
         }
-        $reqbody .= $key . '=' . urlencode($val);
+        $reqbody .= $key.'='.urlencode($val);
     }
     $contentlength = strlen($reqbody);
-    $reqheader     = "POST $uri HTTP/1.1\r\n" . "Host: $host\n" . "Content-Type: application/x-www-form-urlencoded\r\n" . "Content-Length: $contentlength\r\n\r\n" . "$reqbody\r\n";
+    $reqheader     = "POST $uri HTTP/1.1\r\n"."Host: $host\n"."Content-Type: application/x-www-form-urlencoded\r\n"."Content-Length: $contentlength\r\n\r\n"."$reqbody\r\n";
 
     return $reqheader;
 }
@@ -740,7 +740,7 @@ 
         $retval = $tblBuffer[$group];
     } else {
         $member_handler    = xoops_getHandler('member');
-        $tblGroups         = $member_handler->getGroupsByUser($uid, false);    // Renvoie un tableau d'ID (de groupes)
+        $tblGroups         = $member_handler->getGroupsByUser($uid, false); // Renvoie un tableau d'ID (de groupes)
         $retval            = in_array($group, $tblGroups);
         $tblBuffer[$group] = $retval;
     }

checkout.php

Indentation +168 added lines, -168 removed lines

@@ -36,7 +36,7 @@ 
 
 $op = 'default';
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 $xoopsTpl->assign('op', $op);
@@ -48,181 +48,181 @@ 
 
 function listCart()
 {
-    global $h_bookshop_caddy, $cartForTemplate, $emptyCart, $shippingAmount, $commandAmount, $vatAmount, $goOn, $commandAmountTTC, $discountsDescription;
-    $h_bookshop_caddy->computeCart($cartForTemplate, $emptyCart, $shippingAmount, $commandAmount, $vatAmount, $goOn, $commandAmountTTC, $discountsDescription);
-    $dec              = bookshop_getmoduleoption('decimals_count');
-    $shippingAmount   = sprintf('%0.' . $dec . 'f', $shippingAmount);        // Amount of postage
-    $commandAmount    = sprintf('%0.' . $dec . 'f', $commandAmount);        // Amount HT command
-    $vatAmount        = sprintf('%0.' . $dec . 'f', $vatAmount);                // Amount of VAT
-    $commandAmountTTC = sprintf('%0.' . $dec . 'f', $commandAmountTTC);    // Amount TTC of the order (shipping included)
+	global $h_bookshop_caddy, $cartForTemplate, $emptyCart, $shippingAmount, $commandAmount, $vatAmount, $goOn, $commandAmountTTC, $discountsDescription;
+	$h_bookshop_caddy->computeCart($cartForTemplate, $emptyCart, $shippingAmount, $commandAmount, $vatAmount, $goOn, $commandAmountTTC, $discountsDescription);
+	$dec              = bookshop_getmoduleoption('decimals_count');
+	$shippingAmount   = sprintf('%0.' . $dec . 'f', $shippingAmount);        // Amount of postage
+	$commandAmount    = sprintf('%0.' . $dec . 'f', $commandAmount);        // Amount HT command
+	$vatAmount        = sprintf('%0.' . $dec . 'f', $vatAmount);                // Amount of VAT
+	$commandAmountTTC = sprintf('%0.' . $dec . 'f', $commandAmountTTC);    // Amount TTC of the order (shipping included)
 }
 
 $tbl_country = XoopsLists::getCountryList();
 if (is_object($xoopsUser)) {
-    $uid = $xoopsUser->getVar('uid');
+	$uid = $xoopsUser->getVar('uid');
 } else {
-    $uid = 0;
+	$uid = 0;
 }
 
 switch ($op) {
-    // ****************************************************************************************************************
-    case 'default': // Submitting Forms
-        // ****************************************************************************************************************
-        if ($h_bookshop_caddy->isCartEmpty()) {
-            bookshop_redirect(_BOOKSHOP_CART_IS_EMPTY, BOOKSHOP_URL, 4);
-        }
-        listCart();
-        $notFound = true;
-
-        if ($uid > 0) {    // Si c'est un utlisateur enregistr�, on recherche dans les anciennes commandes pour pr� remplir les champs
-            $tblCommand  = array();
-            $critereUser = new Criteria('cmd_uid', $uid, '=');
-            $critereUser->setSort('cmd_date');
-            $critereUser->setOrder('DESC');
-            $critereUser->setLimit(1);
-            $tblCommand = $h_bookshop_commands->getObjects($critereUser, false);
-            if (count($tblCommand) > 0) {
-                $notFound = false;
-                $commande = $tblCommand[0];
-            }
-        }
-
-        if ($notFound) {
-            $commande = $h_bookshop_commands->create(true);
-        }
-
-        $sform = new XoopsThemeForm(_BOOKSHOP_PLEASE_ENTER, 'informationfrm', BOOKSHOP_URL . 'checkout.php', 'post');
-        $sform->addElement(new XoopsFormHidden('op', 'paypal'));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount . ' ' . bookshop_getmoduleoption('money_full')));
-        $sform->addElement(new XoopsFormText(_BOOKSHOP_LASTNAME, 'cmd_lastname', 50, 255, $commande->getVar('cmd_lastname')), true);
-        $sform->addElement(new XoopsFormText(_BOOKSHOP_FIRSTNAME, 'cmd_firstname', 50, 255, $commande->getVar('cmd_firstname')), false);
-        $sform->addElement(new XoopsFormTextArea(_BOOKSHOP_STREET, 'cmd_adress', $commande->getVar('cmd_adress'), 3, 50), true);
-        $sform->addElement(new XoopsFormText(_BOOKSHOP_CP, 'cmd_zip', 5, 30, $commande->getVar('cmd_zip')), true);
-        $sform->addElement(new XoopsFormText(_BOOKSHOP_CITY, 'cmd_town', 40, 255, $commande->getVar('cmd_town')), true);
-        $sform->addElement(new XoopsFormSelectCountry(_BOOKSHOP_COUNTRY, 'cmd_country', $commande->getVar('cmd_country')), true);
-        $sform->addElement(new XoopsFormText(_BOOKSHOP_PHONE, 'cmd_telephone', 15, 50, $commande->getVar('cmd_telephone')), false);
-        if ($uid > 0) {
-            $sform->addElement(new XoopsFormText(_BOOKSHOP_EMAIL, 'cmd_email', 50, 255, $xoopsUser->getVar('email')), true);
-        } else {
-            $sform->addElement(new XoopsFormText(_BOOKSHOP_EMAIL, 'cmd_email', 50, 255, ''), true);
-        }
-        $sform->addElement(new XoopsFormRadioYN(_BOOKSHOP_INVOICE, 'cmd_bill', 0), true);
-
-        $button_tray = new XoopsFormElementTray('', '');
-        $submit_btn  = new XoopsFormButton('', 'post', _BOOKSHOP_SAVE, 'submit');
-        $button_tray->addElement($submit_btn);
-        $sform->addElement($button_tray);
-
-        $sform = bookshop_formMarkRequiredFields($sform);
-        $xoopsTpl->assign('form', $sform->render());
-        break;
-
-    // ****************************************************************************************************************
-    case 'paypal':    // Validation finale avant envoi sur Paypal
-        // ****************************************************************************************************************
-        if ($h_bookshop_caddy->isCartEmpty()) {
-            bookshop_redirect(_BOOKSHOP_CART_IS_EMPTY, BOOKSHOP_URL, 4);
-        }
-        listCart();
-
-        $password       = md5(xoops_makepass());
-        $passwordCancel = md5(xoops_makepass());
-        $paypal         = new bookshop_paypal(bookshop_getmoduleoption('paypal_test'), bookshop_getmoduleoption('paypal_email'), bookshop_getmoduleoption('paypal_money'), true, $passwordCancel);
-
-        $commande = $h_bookshop_commands->create(true);
-        $commande->setVars($_POST);
-        $commande->setVar('cmd_uid', $uid);
-        $commande->setVar('cmd_date', date('Y-m-d'));
-        $commande->setVar('cmd_state', COMMAND_STATE_NOINFORMATION);
-        $commande->setVar('cmd_ip', bookshop_IP());
-        $commande->setVar('cmd_articles_count', count($cartForTemplate));
-        $commande->setVar('cmd_total', $commandAmountTTC);
-        $commande->setVar('cmd_shipping', $shippingAmount);
-        $commande->setVar('cmd_password', $password);
-        $commande->setVar('cmd_cancel', $passwordCancel);
-        $commande->setVar('cmd_text', implode("\n", $discountsDescription));
-        $res = $h_bookshop_commands->insert($commande, true);
-        if (!$res) {    // Si la sauvegarde n'a pas fonctionn�
-            bookshop_redirect(_BOOKSHOP_ERROR10, BOOKSHOP_URL, 6);
-        }
-
-        // Enregistrement du panier
-        $msgCommande = '';
-        foreach ($cartForTemplate as $line) {
-            $panier = $h_bookshop_caddy->create(true);
-            $panier->setVar('caddy_book_id', $line['book_id']);
-            $panier->setVar('caddy_qte', $line['book_qty']);
-            $panier->setVar('caddy_price', $line['book_price_ttc']);    // Attention, prix TTC
-            $panier->setVar('caddy_cmd_id', $commande->getVar('cmd_id'));
-            $panier->setVar('caddy_shipping', $line['book_shipping_amount']);
-            $msgCommande .= str_pad(wordwrap($line['book_title'], 60), 60, ' ') . ' ' . str_pad($line['book_qty'] . ' ' . _BOOKSHOP_COPY_COUNT, 8, ' ', STR_PAD_LEFT) . ' ' . str_pad($line['book_price_ttc'] . ' ' . bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT) . ' '
-                            . str_pad($line['book_shipping_amount'] . ' ' . bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT) . "\n";
-            $res = $h_bookshop_caddy->insert($panier, true);
-        }
-        $msgCommande .= "\n\n" . _BOOKSHOP_SHIPPING_PRICE . ' ' . $shippingAmount . ' ' . bookshop_getmoduleoption('money_full') . "\n";
-        $msgCommande .= _BOOKSHOP_TOTAL . ' ' . $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full') . "\n";
-        if (count($discountsDescription) > 0) {
-            $msgCommande .= "\n\n" . _BOOKSHOP_CART4 . "\n";
-            $msgCommande .= implode("\n", $discountsDescription);
-            $msgCommande .= "\n";
-        }
-        $msg                 = array();
-        $msg['COMMANDE']     = $msgCommande;
-        $msg['NUM_COMMANDE'] = $commande->getVar('cmd_id');
-        $msg['NOM']          = $commande->getVar('cmd_lastname');
-        $msg['PRENOM']       = $commande->getVar('cmd_firstname');
-        $msg['ADRESSE']      = $commande->getVar('cmd_adress');
-        $msg['CP']           = $commande->getVar('cmd_zip');
-        $msg['VILLE']        = $commande->getVar('cmd_town');
-        $msg['PAYS']         = $tbl_country[$commande->getVar('cmd_country')];
-        $msg['TELEPHONE']    = $commande->getVar('cmd_telephone');
-        $msg['EMAIL']        = $commande->getVar('cmd_email');
-        $msg['URL_BILL']     = BOOKSHOP_URL . 'invoice.php?command=' . $commande->getVar('cmd_id') . '&pass=' . $password;
-        $msg['IP']           = bookshop_IP();
-        if ($commande->getVar('cmd_bill') == 1) {
-            $msg['FACTURE'] = _YES;
-        } else {
-            $msg['FACTURE'] = _NO;
-        }
-        // Envoi du mail au client
-        bookshop_send_email_from_tpl('command_client.tpl', $commande->getVar('cmd_email'), sprintf(_BOOKSHOP_THANKYOU_CMD, $xoopsConfig['sitename']), $msg);
-        // Envoi du mail au groupe de personne devant recevoir le mail
-        bookshop_send_email_from_tpl('command_shop.tpl', bookshop_getEmailsFromGroup(bookshop_getmoduleoption('grp_sold')), _BOOKSHOP_NEW_COMMAND, $msg);
-
-        // Presentation of the form to send to Paypal
-        $payURL = $paypal->getURL();
-
-        // Final presentation with hidden variables basket  ******************************
-        $sform    = new XoopsThemeForm(_BOOKSHOP_PAY_PAYPAL, 'payform', $payURL, 'post');
-        $elements = array();
-        $elements = $paypal->getFormContent($commande->getVar('cmd_id'), $commandAmountTTC, $commande->getVar('cmd_email'));
-        foreach ($elements as $key => $value) {
-            $sform->addElement(new XoopsFormHidden($key, $value));
-        }
-
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount . ' ' . bookshop_getmoduleoption('money_full')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_LASTNAME, $commande->getVar('cmd_lastname')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_FIRSTNAME, $commande->getVar('cmd_firstname')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_STREET, $commande->getVar('cmd_adress')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_CP, $commande->getVar('cmd_zip')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_CITY, $commande->getVar('cmd_town')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_COUNTRY, $tbl_country[$commande->getVar('cmd_country')]));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_PHONE, $commande->getVar('cmd_telephone')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_EMAIL, $commande->getVar('cmd_email')));
-
-        if ($commande->getVar('cmd_bill') == 0) {
-            $sform->addElement(new XoopsFormLabel(_BOOKSHOP_INVOICE, _NO));
-        } else {
-            $sform->addElement(new XoopsFormLabel(_BOOKSHOP_INVOICE, _YES));
-        }
-        $button_tray = new XoopsFormElementTray('', '');
-        $submit_btn  = new XoopsFormButton('', 'post', _BOOKSHOP_PAY_PAYPAL, 'submit');
-        $button_tray->addElement($submit_btn);
-        $sform->addElement($button_tray);
-        $xoopsTpl->assign('form', $sform->render());
-        break;
+	// ****************************************************************************************************************
+	case 'default': // Submitting Forms
+		// ****************************************************************************************************************
+		if ($h_bookshop_caddy->isCartEmpty()) {
+			bookshop_redirect(_BOOKSHOP_CART_IS_EMPTY, BOOKSHOP_URL, 4);
+		}
+		listCart();
+		$notFound = true;
+
+		if ($uid > 0) {    // Si c'est un utlisateur enregistr�, on recherche dans les anciennes commandes pour pr� remplir les champs
+			$tblCommand  = array();
+			$critereUser = new Criteria('cmd_uid', $uid, '=');
+			$critereUser->setSort('cmd_date');
+			$critereUser->setOrder('DESC');
+			$critereUser->setLimit(1);
+			$tblCommand = $h_bookshop_commands->getObjects($critereUser, false);
+			if (count($tblCommand) > 0) {
+				$notFound = false;
+				$commande = $tblCommand[0];
+			}
+		}
+
+		if ($notFound) {
+			$commande = $h_bookshop_commands->create(true);
+		}
+
+		$sform = new XoopsThemeForm(_BOOKSHOP_PLEASE_ENTER, 'informationfrm', BOOKSHOP_URL . 'checkout.php', 'post');
+		$sform->addElement(new XoopsFormHidden('op', 'paypal'));
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full')));
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount . ' ' . bookshop_getmoduleoption('money_full')));
+		$sform->addElement(new XoopsFormText(_BOOKSHOP_LASTNAME, 'cmd_lastname', 50, 255, $commande->getVar('cmd_lastname')), true);
+		$sform->addElement(new XoopsFormText(_BOOKSHOP_FIRSTNAME, 'cmd_firstname', 50, 255, $commande->getVar('cmd_firstname')), false);
+		$sform->addElement(new XoopsFormTextArea(_BOOKSHOP_STREET, 'cmd_adress', $commande->getVar('cmd_adress'), 3, 50), true);
+		$sform->addElement(new XoopsFormText(_BOOKSHOP_CP, 'cmd_zip', 5, 30, $commande->getVar('cmd_zip')), true);
+		$sform->addElement(new XoopsFormText(_BOOKSHOP_CITY, 'cmd_town', 40, 255, $commande->getVar('cmd_town')), true);
+		$sform->addElement(new XoopsFormSelectCountry(_BOOKSHOP_COUNTRY, 'cmd_country', $commande->getVar('cmd_country')), true);
+		$sform->addElement(new XoopsFormText(_BOOKSHOP_PHONE, 'cmd_telephone', 15, 50, $commande->getVar('cmd_telephone')), false);
+		if ($uid > 0) {
+			$sform->addElement(new XoopsFormText(_BOOKSHOP_EMAIL, 'cmd_email', 50, 255, $xoopsUser->getVar('email')), true);
+		} else {
+			$sform->addElement(new XoopsFormText(_BOOKSHOP_EMAIL, 'cmd_email', 50, 255, ''), true);
+		}
+		$sform->addElement(new XoopsFormRadioYN(_BOOKSHOP_INVOICE, 'cmd_bill', 0), true);
+
+		$button_tray = new XoopsFormElementTray('', '');
+		$submit_btn  = new XoopsFormButton('', 'post', _BOOKSHOP_SAVE, 'submit');
+		$button_tray->addElement($submit_btn);
+		$sform->addElement($button_tray);
+
+		$sform = bookshop_formMarkRequiredFields($sform);
+		$xoopsTpl->assign('form', $sform->render());
+		break;
+
+	// ****************************************************************************************************************
+	case 'paypal':    // Validation finale avant envoi sur Paypal
+		// ****************************************************************************************************************
+		if ($h_bookshop_caddy->isCartEmpty()) {
+			bookshop_redirect(_BOOKSHOP_CART_IS_EMPTY, BOOKSHOP_URL, 4);
+		}
+		listCart();
+
+		$password       = md5(xoops_makepass());
+		$passwordCancel = md5(xoops_makepass());
+		$paypal         = new bookshop_paypal(bookshop_getmoduleoption('paypal_test'), bookshop_getmoduleoption('paypal_email'), bookshop_getmoduleoption('paypal_money'), true, $passwordCancel);
+
+		$commande = $h_bookshop_commands->create(true);
+		$commande->setVars($_POST);
+		$commande->setVar('cmd_uid', $uid);
+		$commande->setVar('cmd_date', date('Y-m-d'));
+		$commande->setVar('cmd_state', COMMAND_STATE_NOINFORMATION);
+		$commande->setVar('cmd_ip', bookshop_IP());
+		$commande->setVar('cmd_articles_count', count($cartForTemplate));
+		$commande->setVar('cmd_total', $commandAmountTTC);
+		$commande->setVar('cmd_shipping', $shippingAmount);
+		$commande->setVar('cmd_password', $password);
+		$commande->setVar('cmd_cancel', $passwordCancel);
+		$commande->setVar('cmd_text', implode("\n", $discountsDescription));
+		$res = $h_bookshop_commands->insert($commande, true);
+		if (!$res) {    // Si la sauvegarde n'a pas fonctionn�
+			bookshop_redirect(_BOOKSHOP_ERROR10, BOOKSHOP_URL, 6);
+		}
+
+		// Enregistrement du panier
+		$msgCommande = '';
+		foreach ($cartForTemplate as $line) {
+			$panier = $h_bookshop_caddy->create(true);
+			$panier->setVar('caddy_book_id', $line['book_id']);
+			$panier->setVar('caddy_qte', $line['book_qty']);
+			$panier->setVar('caddy_price', $line['book_price_ttc']);    // Attention, prix TTC
+			$panier->setVar('caddy_cmd_id', $commande->getVar('cmd_id'));
+			$panier->setVar('caddy_shipping', $line['book_shipping_amount']);
+			$msgCommande .= str_pad(wordwrap($line['book_title'], 60), 60, ' ') . ' ' . str_pad($line['book_qty'] . ' ' . _BOOKSHOP_COPY_COUNT, 8, ' ', STR_PAD_LEFT) . ' ' . str_pad($line['book_price_ttc'] . ' ' . bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT) . ' '
+							. str_pad($line['book_shipping_amount'] . ' ' . bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT) . "\n";
+			$res = $h_bookshop_caddy->insert($panier, true);
+		}
+		$msgCommande .= "\n\n" . _BOOKSHOP_SHIPPING_PRICE . ' ' . $shippingAmount . ' ' . bookshop_getmoduleoption('money_full') . "\n";
+		$msgCommande .= _BOOKSHOP_TOTAL . ' ' . $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full') . "\n";
+		if (count($discountsDescription) > 0) {
+			$msgCommande .= "\n\n" . _BOOKSHOP_CART4 . "\n";
+			$msgCommande .= implode("\n", $discountsDescription);
+			$msgCommande .= "\n";
+		}
+		$msg                 = array();
+		$msg['COMMANDE']     = $msgCommande;
+		$msg['NUM_COMMANDE'] = $commande->getVar('cmd_id');
+		$msg['NOM']          = $commande->getVar('cmd_lastname');
+		$msg['PRENOM']       = $commande->getVar('cmd_firstname');
+		$msg['ADRESSE']      = $commande->getVar('cmd_adress');
+		$msg['CP']           = $commande->getVar('cmd_zip');
+		$msg['VILLE']        = $commande->getVar('cmd_town');
+		$msg['PAYS']         = $tbl_country[$commande->getVar('cmd_country')];
+		$msg['TELEPHONE']    = $commande->getVar('cmd_telephone');
+		$msg['EMAIL']        = $commande->getVar('cmd_email');
+		$msg['URL_BILL']     = BOOKSHOP_URL . 'invoice.php?command=' . $commande->getVar('cmd_id') . '&pass=' . $password;
+		$msg['IP']           = bookshop_IP();
+		if ($commande->getVar('cmd_bill') == 1) {
+			$msg['FACTURE'] = _YES;
+		} else {
+			$msg['FACTURE'] = _NO;
+		}
+		// Envoi du mail au client
+		bookshop_send_email_from_tpl('command_client.tpl', $commande->getVar('cmd_email'), sprintf(_BOOKSHOP_THANKYOU_CMD, $xoopsConfig['sitename']), $msg);
+		// Envoi du mail au groupe de personne devant recevoir le mail
+		bookshop_send_email_from_tpl('command_shop.tpl', bookshop_getEmailsFromGroup(bookshop_getmoduleoption('grp_sold')), _BOOKSHOP_NEW_COMMAND, $msg);
+
+		// Presentation of the form to send to Paypal
+		$payURL = $paypal->getURL();
+
+		// Final presentation with hidden variables basket  ******************************
+		$sform    = new XoopsThemeForm(_BOOKSHOP_PAY_PAYPAL, 'payform', $payURL, 'post');
+		$elements = array();
+		$elements = $paypal->getFormContent($commande->getVar('cmd_id'), $commandAmountTTC, $commande->getVar('cmd_email'));
+		foreach ($elements as $key => $value) {
+			$sform->addElement(new XoopsFormHidden($key, $value));
+		}
+
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full')));
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount . ' ' . bookshop_getmoduleoption('money_full')));
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_LASTNAME, $commande->getVar('cmd_lastname')));
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_FIRSTNAME, $commande->getVar('cmd_firstname')));
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_STREET, $commande->getVar('cmd_adress')));
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_CP, $commande->getVar('cmd_zip')));
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_CITY, $commande->getVar('cmd_town')));
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_COUNTRY, $tbl_country[$commande->getVar('cmd_country')]));
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_PHONE, $commande->getVar('cmd_telephone')));
+		$sform->addElement(new XoopsFormLabel(_BOOKSHOP_EMAIL, $commande->getVar('cmd_email')));
+
+		if ($commande->getVar('cmd_bill') == 0) {
+			$sform->addElement(new XoopsFormLabel(_BOOKSHOP_INVOICE, _NO));
+		} else {
+			$sform->addElement(new XoopsFormLabel(_BOOKSHOP_INVOICE, _YES));
+		}
+		$button_tray = new XoopsFormElementTray('', '');
+		$submit_btn  = new XoopsFormButton('', 'post', _BOOKSHOP_PAY_PAYPAL, 'submit');
+		$button_tray->addElement($submit_btn);
+		$sform->addElement($button_tray);
+		$xoopsTpl->assign('form', $sform->render());
+		break;
 }
 $title = _BOOKSHOP_VALIDATE_CMD . ' - ' . bookshop_get_module_name();
 bookshop_set_metas($title, $title);

Switch Indentation +157 added lines, -157 removed lines

@@ -66,163 +66,163 @@
 
 switch ($op) {
     // ****************************************************************************************************************
-    case 'default': // Submitting Forms
-        // ****************************************************************************************************************
-        if ($h_bookshop_caddy->isCartEmpty()) {
-            bookshop_redirect(_BOOKSHOP_CART_IS_EMPTY, BOOKSHOP_URL, 4);
-        }
-        listCart();
-        $notFound = true;
-
-        if ($uid > 0) {    // Si c'est un utlisateur enregistr�, on recherche dans les anciennes commandes pour pr� remplir les champs
-            $tblCommand  = array();
-            $critereUser = new Criteria('cmd_uid', $uid, '=');
-            $critereUser->setSort('cmd_date');
-            $critereUser->setOrder('DESC');
-            $critereUser->setLimit(1);
-            $tblCommand = $h_bookshop_commands->getObjects($critereUser, false);
-            if (count($tblCommand) > 0) {
-                $notFound = false;
-                $commande = $tblCommand[0];
-            }
-        }
-
-        if ($notFound) {
-            $commande = $h_bookshop_commands->create(true);
-        }
-
-        $sform = new XoopsThemeForm(_BOOKSHOP_PLEASE_ENTER, 'informationfrm', BOOKSHOP_URL . 'checkout.php', 'post');
-        $sform->addElement(new XoopsFormHidden('op', 'paypal'));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount . ' ' . bookshop_getmoduleoption('money_full')));
-        $sform->addElement(new XoopsFormText(_BOOKSHOP_LASTNAME, 'cmd_lastname', 50, 255, $commande->getVar('cmd_lastname')), true);
-        $sform->addElement(new XoopsFormText(_BOOKSHOP_FIRSTNAME, 'cmd_firstname', 50, 255, $commande->getVar('cmd_firstname')), false);
-        $sform->addElement(new XoopsFormTextArea(_BOOKSHOP_STREET, 'cmd_adress', $commande->getVar('cmd_adress'), 3, 50), true);
-        $sform->addElement(new XoopsFormText(_BOOKSHOP_CP, 'cmd_zip', 5, 30, $commande->getVar('cmd_zip')), true);
-        $sform->addElement(new XoopsFormText(_BOOKSHOP_CITY, 'cmd_town', 40, 255, $commande->getVar('cmd_town')), true);
-        $sform->addElement(new XoopsFormSelectCountry(_BOOKSHOP_COUNTRY, 'cmd_country', $commande->getVar('cmd_country')), true);
-        $sform->addElement(new XoopsFormText(_BOOKSHOP_PHONE, 'cmd_telephone', 15, 50, $commande->getVar('cmd_telephone')), false);
-        if ($uid > 0) {
-            $sform->addElement(new XoopsFormText(_BOOKSHOP_EMAIL, 'cmd_email', 50, 255, $xoopsUser->getVar('email')), true);
-        } else {
-            $sform->addElement(new XoopsFormText(_BOOKSHOP_EMAIL, 'cmd_email', 50, 255, ''), true);
-        }
-        $sform->addElement(new XoopsFormRadioYN(_BOOKSHOP_INVOICE, 'cmd_bill', 0), true);
-
-        $button_tray = new XoopsFormElementTray('', '');
-        $submit_btn  = new XoopsFormButton('', 'post', _BOOKSHOP_SAVE, 'submit');
-        $button_tray->addElement($submit_btn);
-        $sform->addElement($button_tray);
-
-        $sform = bookshop_formMarkRequiredFields($sform);
-        $xoopsTpl->assign('form', $sform->render());
-        break;
-
-    // ****************************************************************************************************************
-    case 'paypal':    // Validation finale avant envoi sur Paypal
-        // ****************************************************************************************************************
-        if ($h_bookshop_caddy->isCartEmpty()) {
-            bookshop_redirect(_BOOKSHOP_CART_IS_EMPTY, BOOKSHOP_URL, 4);
-        }
-        listCart();
-
-        $password       = md5(xoops_makepass());
-        $passwordCancel = md5(xoops_makepass());
-        $paypal         = new bookshop_paypal(bookshop_getmoduleoption('paypal_test'), bookshop_getmoduleoption('paypal_email'), bookshop_getmoduleoption('paypal_money'), true, $passwordCancel);
-
-        $commande = $h_bookshop_commands->create(true);
-        $commande->setVars($_POST);
-        $commande->setVar('cmd_uid', $uid);
-        $commande->setVar('cmd_date', date('Y-m-d'));
-        $commande->setVar('cmd_state', COMMAND_STATE_NOINFORMATION);
-        $commande->setVar('cmd_ip', bookshop_IP());
-        $commande->setVar('cmd_articles_count', count($cartForTemplate));
-        $commande->setVar('cmd_total', $commandAmountTTC);
-        $commande->setVar('cmd_shipping', $shippingAmount);
-        $commande->setVar('cmd_password', $password);
-        $commande->setVar('cmd_cancel', $passwordCancel);
-        $commande->setVar('cmd_text', implode("\n", $discountsDescription));
-        $res = $h_bookshop_commands->insert($commande, true);
-        if (!$res) {    // Si la sauvegarde n'a pas fonctionn�
-            bookshop_redirect(_BOOKSHOP_ERROR10, BOOKSHOP_URL, 6);
-        }
-
-        // Enregistrement du panier
-        $msgCommande = '';
-        foreach ($cartForTemplate as $line) {
-            $panier = $h_bookshop_caddy->create(true);
-            $panier->setVar('caddy_book_id', $line['book_id']);
-            $panier->setVar('caddy_qte', $line['book_qty']);
-            $panier->setVar('caddy_price', $line['book_price_ttc']);    // Attention, prix TTC
-            $panier->setVar('caddy_cmd_id', $commande->getVar('cmd_id'));
-            $panier->setVar('caddy_shipping', $line['book_shipping_amount']);
-            $msgCommande .= str_pad(wordwrap($line['book_title'], 60), 60, ' ') . ' ' . str_pad($line['book_qty'] . ' ' . _BOOKSHOP_COPY_COUNT, 8, ' ', STR_PAD_LEFT) . ' ' . str_pad($line['book_price_ttc'] . ' ' . bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT) . ' '
-                            . str_pad($line['book_shipping_amount'] . ' ' . bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT) . "\n";
-            $res = $h_bookshop_caddy->insert($panier, true);
-        }
-        $msgCommande .= "\n\n" . _BOOKSHOP_SHIPPING_PRICE . ' ' . $shippingAmount . ' ' . bookshop_getmoduleoption('money_full') . "\n";
-        $msgCommande .= _BOOKSHOP_TOTAL . ' ' . $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full') . "\n";
-        if (count($discountsDescription) > 0) {
-            $msgCommande .= "\n\n" . _BOOKSHOP_CART4 . "\n";
-            $msgCommande .= implode("\n", $discountsDescription);
-            $msgCommande .= "\n";
-        }
-        $msg                 = array();
-        $msg['COMMANDE']     = $msgCommande;
-        $msg['NUM_COMMANDE'] = $commande->getVar('cmd_id');
-        $msg['NOM']          = $commande->getVar('cmd_lastname');
-        $msg['PRENOM']       = $commande->getVar('cmd_firstname');
-        $msg['ADRESSE']      = $commande->getVar('cmd_adress');
-        $msg['CP']           = $commande->getVar('cmd_zip');
-        $msg['VILLE']        = $commande->getVar('cmd_town');
-        $msg['PAYS']         = $tbl_country[$commande->getVar('cmd_country')];
-        $msg['TELEPHONE']    = $commande->getVar('cmd_telephone');
-        $msg['EMAIL']        = $commande->getVar('cmd_email');
-        $msg['URL_BILL']     = BOOKSHOP_URL . 'invoice.php?command=' . $commande->getVar('cmd_id') . '&pass=' . $password;
-        $msg['IP']           = bookshop_IP();
-        if ($commande->getVar('cmd_bill') == 1) {
-            $msg['FACTURE'] = _YES;
-        } else {
-            $msg['FACTURE'] = _NO;
-        }
-        // Envoi du mail au client
-        bookshop_send_email_from_tpl('command_client.tpl', $commande->getVar('cmd_email'), sprintf(_BOOKSHOP_THANKYOU_CMD, $xoopsConfig['sitename']), $msg);
-        // Envoi du mail au groupe de personne devant recevoir le mail
-        bookshop_send_email_from_tpl('command_shop.tpl', bookshop_getEmailsFromGroup(bookshop_getmoduleoption('grp_sold')), _BOOKSHOP_NEW_COMMAND, $msg);
-
-        // Presentation of the form to send to Paypal
-        $payURL = $paypal->getURL();
-
-        // Final presentation with hidden variables basket  ******************************
-        $sform    = new XoopsThemeForm(_BOOKSHOP_PAY_PAYPAL, 'payform', $payURL, 'post');
-        $elements = array();
-        $elements = $paypal->getFormContent($commande->getVar('cmd_id'), $commandAmountTTC, $commande->getVar('cmd_email'));
-        foreach ($elements as $key => $value) {
-            $sform->addElement(new XoopsFormHidden($key, $value));
-        }
-
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount . ' ' . bookshop_getmoduleoption('money_full')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_LASTNAME, $commande->getVar('cmd_lastname')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_FIRSTNAME, $commande->getVar('cmd_firstname')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_STREET, $commande->getVar('cmd_adress')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_CP, $commande->getVar('cmd_zip')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_CITY, $commande->getVar('cmd_town')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_COUNTRY, $tbl_country[$commande->getVar('cmd_country')]));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_PHONE, $commande->getVar('cmd_telephone')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_EMAIL, $commande->getVar('cmd_email')));
-
-        if ($commande->getVar('cmd_bill') == 0) {
-            $sform->addElement(new XoopsFormLabel(_BOOKSHOP_INVOICE, _NO));
-        } else {
-            $sform->addElement(new XoopsFormLabel(_BOOKSHOP_INVOICE, _YES));
-        }
-        $button_tray = new XoopsFormElementTray('', '');
-        $submit_btn  = new XoopsFormButton('', 'post', _BOOKSHOP_PAY_PAYPAL, 'submit');
-        $button_tray->addElement($submit_btn);
-        $sform->addElement($button_tray);
-        $xoopsTpl->assign('form', $sform->render());
-        break;
+    	case 'default': // Submitting Forms
+        	// ****************************************************************************************************************
+        	if ($h_bookshop_caddy->isCartEmpty()) {
+            	bookshop_redirect(_BOOKSHOP_CART_IS_EMPTY, BOOKSHOP_URL, 4);
+        	}
+        	listCart();
+        	$notFound = true;
+
+        	if ($uid > 0) {    // Si c'est un utlisateur enregistr�, on recherche dans les anciennes commandes pour pr� remplir les champs
+            	$tblCommand  = array();
+            	$critereUser = new Criteria('cmd_uid', $uid, '=');
+            	$critereUser->setSort('cmd_date');
+            	$critereUser->setOrder('DESC');
+            	$critereUser->setLimit(1);
+            	$tblCommand = $h_bookshop_commands->getObjects($critereUser, false);
+            	if (count($tblCommand) > 0) {
+                	$notFound = false;
+                	$commande = $tblCommand[0];
+            	}
+        	}
+
+        	if ($notFound) {
+            	$commande = $h_bookshop_commands->create(true);
+        	}
+
+        	$sform = new XoopsThemeForm(_BOOKSHOP_PLEASE_ENTER, 'informationfrm', BOOKSHOP_URL . 'checkout.php', 'post');
+        	$sform->addElement(new XoopsFormHidden('op', 'paypal'));
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full')));
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount . ' ' . bookshop_getmoduleoption('money_full')));
+        	$sform->addElement(new XoopsFormText(_BOOKSHOP_LASTNAME, 'cmd_lastname', 50, 255, $commande->getVar('cmd_lastname')), true);
+        	$sform->addElement(new XoopsFormText(_BOOKSHOP_FIRSTNAME, 'cmd_firstname', 50, 255, $commande->getVar('cmd_firstname')), false);
+        	$sform->addElement(new XoopsFormTextArea(_BOOKSHOP_STREET, 'cmd_adress', $commande->getVar('cmd_adress'), 3, 50), true);
+        	$sform->addElement(new XoopsFormText(_BOOKSHOP_CP, 'cmd_zip', 5, 30, $commande->getVar('cmd_zip')), true);
+        	$sform->addElement(new XoopsFormText(_BOOKSHOP_CITY, 'cmd_town', 40, 255, $commande->getVar('cmd_town')), true);
+        	$sform->addElement(new XoopsFormSelectCountry(_BOOKSHOP_COUNTRY, 'cmd_country', $commande->getVar('cmd_country')), true);
+        	$sform->addElement(new XoopsFormText(_BOOKSHOP_PHONE, 'cmd_telephone', 15, 50, $commande->getVar('cmd_telephone')), false);
+        	if ($uid > 0) {
+            	$sform->addElement(new XoopsFormText(_BOOKSHOP_EMAIL, 'cmd_email', 50, 255, $xoopsUser->getVar('email')), true);
+        	} else {
+            	$sform->addElement(new XoopsFormText(_BOOKSHOP_EMAIL, 'cmd_email', 50, 255, ''), true);
+        	}
+        	$sform->addElement(new XoopsFormRadioYN(_BOOKSHOP_INVOICE, 'cmd_bill', 0), true);
+
+        	$button_tray = new XoopsFormElementTray('', '');
+        	$submit_btn  = new XoopsFormButton('', 'post', _BOOKSHOP_SAVE, 'submit');
+        	$button_tray->addElement($submit_btn);
+        	$sform->addElement($button_tray);
+
+        	$sform = bookshop_formMarkRequiredFields($sform);
+        	$xoopsTpl->assign('form', $sform->render());
+        	break;
+
+    	// ****************************************************************************************************************
+    	case 'paypal':    // Validation finale avant envoi sur Paypal
+        	// ****************************************************************************************************************
+        	if ($h_bookshop_caddy->isCartEmpty()) {
+            	bookshop_redirect(_BOOKSHOP_CART_IS_EMPTY, BOOKSHOP_URL, 4);
+        	}
+        	listCart();
+
+        	$password       = md5(xoops_makepass());
+        	$passwordCancel = md5(xoops_makepass());
+        	$paypal         = new bookshop_paypal(bookshop_getmoduleoption('paypal_test'), bookshop_getmoduleoption('paypal_email'), bookshop_getmoduleoption('paypal_money'), true, $passwordCancel);
+
+        	$commande = $h_bookshop_commands->create(true);
+        	$commande->setVars($_POST);
+        	$commande->setVar('cmd_uid', $uid);
+        	$commande->setVar('cmd_date', date('Y-m-d'));
+        	$commande->setVar('cmd_state', COMMAND_STATE_NOINFORMATION);
+        	$commande->setVar('cmd_ip', bookshop_IP());
+        	$commande->setVar('cmd_articles_count', count($cartForTemplate));
+        	$commande->setVar('cmd_total', $commandAmountTTC);
+        	$commande->setVar('cmd_shipping', $shippingAmount);
+        	$commande->setVar('cmd_password', $password);
+        	$commande->setVar('cmd_cancel', $passwordCancel);
+        	$commande->setVar('cmd_text', implode("\n", $discountsDescription));
+        	$res = $h_bookshop_commands->insert($commande, true);
+        	if (!$res) {    // Si la sauvegarde n'a pas fonctionn�
+            	bookshop_redirect(_BOOKSHOP_ERROR10, BOOKSHOP_URL, 6);
+        	}
+
+        	// Enregistrement du panier
+        	$msgCommande = '';
+        	foreach ($cartForTemplate as $line) {
+            	$panier = $h_bookshop_caddy->create(true);
+            	$panier->setVar('caddy_book_id', $line['book_id']);
+            	$panier->setVar('caddy_qte', $line['book_qty']);
+            	$panier->setVar('caddy_price', $line['book_price_ttc']);    // Attention, prix TTC
+            	$panier->setVar('caddy_cmd_id', $commande->getVar('cmd_id'));
+            	$panier->setVar('caddy_shipping', $line['book_shipping_amount']);
+            	$msgCommande .= str_pad(wordwrap($line['book_title'], 60), 60, ' ') . ' ' . str_pad($line['book_qty'] . ' ' . _BOOKSHOP_COPY_COUNT, 8, ' ', STR_PAD_LEFT) . ' ' . str_pad($line['book_price_ttc'] . ' ' . bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT) . ' '
+                            	. str_pad($line['book_shipping_amount'] . ' ' . bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT) . "\n";
+            	$res = $h_bookshop_caddy->insert($panier, true);
+        	}
+        	$msgCommande .= "\n\n" . _BOOKSHOP_SHIPPING_PRICE . ' ' . $shippingAmount . ' ' . bookshop_getmoduleoption('money_full') . "\n";
+        	$msgCommande .= _BOOKSHOP_TOTAL . ' ' . $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full') . "\n";
+        	if (count($discountsDescription) > 0) {
+            	$msgCommande .= "\n\n" . _BOOKSHOP_CART4 . "\n";
+            	$msgCommande .= implode("\n", $discountsDescription);
+            	$msgCommande .= "\n";
+        	}
+        	$msg                 = array();
+        	$msg['COMMANDE']     = $msgCommande;
+        	$msg['NUM_COMMANDE'] = $commande->getVar('cmd_id');
+        	$msg['NOM']          = $commande->getVar('cmd_lastname');
+        	$msg['PRENOM']       = $commande->getVar('cmd_firstname');
+        	$msg['ADRESSE']      = $commande->getVar('cmd_adress');
+        	$msg['CP']           = $commande->getVar('cmd_zip');
+        	$msg['VILLE']        = $commande->getVar('cmd_town');
+        	$msg['PAYS']         = $tbl_country[$commande->getVar('cmd_country')];
+        	$msg['TELEPHONE']    = $commande->getVar('cmd_telephone');
+        	$msg['EMAIL']        = $commande->getVar('cmd_email');
+        	$msg['URL_BILL']     = BOOKSHOP_URL . 'invoice.php?command=' . $commande->getVar('cmd_id') . '&pass=' . $password;
+        	$msg['IP']           = bookshop_IP();
+        	if ($commande->getVar('cmd_bill') == 1) {
+            	$msg['FACTURE'] = _YES;
+        	} else {
+            	$msg['FACTURE'] = _NO;
+        	}
+        	// Envoi du mail au client
+        	bookshop_send_email_from_tpl('command_client.tpl', $commande->getVar('cmd_email'), sprintf(_BOOKSHOP_THANKYOU_CMD, $xoopsConfig['sitename']), $msg);
+        	// Envoi du mail au groupe de personne devant recevoir le mail
+        	bookshop_send_email_from_tpl('command_shop.tpl', bookshop_getEmailsFromGroup(bookshop_getmoduleoption('grp_sold')), _BOOKSHOP_NEW_COMMAND, $msg);
+
+        	// Presentation of the form to send to Paypal
+        	$payURL = $paypal->getURL();
+
+        	// Final presentation with hidden variables basket  ******************************
+        	$sform    = new XoopsThemeForm(_BOOKSHOP_PAY_PAYPAL, 'payform', $payURL, 'post');
+        	$elements = array();
+        	$elements = $paypal->getFormContent($commande->getVar('cmd_id'), $commandAmountTTC, $commande->getVar('cmd_email'));
+        	foreach ($elements as $key => $value) {
+            	$sform->addElement(new XoopsFormHidden($key, $value));
+        	}
+
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full')));
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount . ' ' . bookshop_getmoduleoption('money_full')));
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_LASTNAME, $commande->getVar('cmd_lastname')));
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_FIRSTNAME, $commande->getVar('cmd_firstname')));
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_STREET, $commande->getVar('cmd_adress')));
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_CP, $commande->getVar('cmd_zip')));
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_CITY, $commande->getVar('cmd_town')));
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_COUNTRY, $tbl_country[$commande->getVar('cmd_country')]));
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_PHONE, $commande->getVar('cmd_telephone')));
+        	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_EMAIL, $commande->getVar('cmd_email')));
+
+        	if ($commande->getVar('cmd_bill') == 0) {
+            	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_INVOICE, _NO));
+        	} else {
+            	$sform->addElement(new XoopsFormLabel(_BOOKSHOP_INVOICE, _YES));
+        	}
+        	$button_tray = new XoopsFormElementTray('', '');
+        	$submit_btn  = new XoopsFormButton('', 'post', _BOOKSHOP_PAY_PAYPAL, 'submit');
+        	$button_tray->addElement($submit_btn);
+        	$sform->addElement($button_tray);
+        	$xoopsTpl->assign('form', $sform->render());
+        	break;
 }
 $title = _BOOKSHOP_VALIDATE_CMD . ' - ' . bookshop_get_module_name();
 bookshop_set_metas($title, $title);

Spacing +23 added lines, -23 removed lines

@@ -26,13 +26,13 @@ 
 /**
  * Entering Customer Data + display information entered for validation with redirection to Paypal
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $GLOBALS['current_category']  = -1;
 $xoopsOption['template_main'] = 'bookshop_command.tpl';
-include_once XOOPS_ROOT_PATH . '/header.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-include_once BOOKSHOP_PATH . 'class/bookshop_paypal.php';
+include_once XOOPS_ROOT_PATH.'/header.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+include_once BOOKSHOP_PATH.'class/bookshop_paypal.php';
 
 $op = 'default';
 if (isset($_POST['op'])) {
@@ -51,10 +51,10 @@ 
     global $h_bookshop_caddy, $cartForTemplate, $emptyCart, $shippingAmount, $commandAmount, $vatAmount, $goOn, $commandAmountTTC, $discountsDescription;
     $h_bookshop_caddy->computeCart($cartForTemplate, $emptyCart, $shippingAmount, $commandAmount, $vatAmount, $goOn, $commandAmountTTC, $discountsDescription);
     $dec              = bookshop_getmoduleoption('decimals_count');
-    $shippingAmount   = sprintf('%0.' . $dec . 'f', $shippingAmount);        // Amount of postage
-    $commandAmount    = sprintf('%0.' . $dec . 'f', $commandAmount);        // Amount HT command
-    $vatAmount        = sprintf('%0.' . $dec . 'f', $vatAmount);                // Amount of VAT
-    $commandAmountTTC = sprintf('%0.' . $dec . 'f', $commandAmountTTC);    // Amount TTC of the order (shipping included)
+    $shippingAmount   = sprintf('%0.'.$dec.'f', $shippingAmount); // Amount of postage
+    $commandAmount    = sprintf('%0.'.$dec.'f', $commandAmount); // Amount HT command
+    $vatAmount        = sprintf('%0.'.$dec.'f', $vatAmount); // Amount of VAT
+    $commandAmountTTC = sprintf('%0.'.$dec.'f', $commandAmountTTC); // Amount TTC of the order (shipping included)
 }
 
 $tbl_country = XoopsLists::getCountryList();
@@ -91,10 +91,10 @@ 
             $commande = $h_bookshop_commands->create(true);
         }
 
-        $sform = new XoopsThemeForm(_BOOKSHOP_PLEASE_ENTER, 'informationfrm', BOOKSHOP_URL . 'checkout.php', 'post');
+        $sform = new XoopsThemeForm(_BOOKSHOP_PLEASE_ENTER, 'informationfrm', BOOKSHOP_URL.'checkout.php', 'post');
         $sform->addElement(new XoopsFormHidden('op', 'paypal'));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount . ' ' . bookshop_getmoduleoption('money_full')));
+        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC.' '.bookshop_getmoduleoption('money_full')));
+        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount.' '.bookshop_getmoduleoption('money_full')));
         $sform->addElement(new XoopsFormText(_BOOKSHOP_LASTNAME, 'cmd_lastname', 50, 255, $commande->getVar('cmd_lastname')), true);
         $sform->addElement(new XoopsFormText(_BOOKSHOP_FIRSTNAME, 'cmd_firstname', 50, 255, $commande->getVar('cmd_firstname')), false);
         $sform->addElement(new XoopsFormTextArea(_BOOKSHOP_STREET, 'cmd_adress', $commande->getVar('cmd_adress'), 3, 50), true);
@@ -153,17 +153,17 @@ 
             $panier = $h_bookshop_caddy->create(true);
             $panier->setVar('caddy_book_id', $line['book_id']);
             $panier->setVar('caddy_qte', $line['book_qty']);
-            $panier->setVar('caddy_price', $line['book_price_ttc']);    // Attention, prix TTC
+            $panier->setVar('caddy_price', $line['book_price_ttc']); // Attention, prix TTC
             $panier->setVar('caddy_cmd_id', $commande->getVar('cmd_id'));
             $panier->setVar('caddy_shipping', $line['book_shipping_amount']);
-            $msgCommande .= str_pad(wordwrap($line['book_title'], 60), 60, ' ') . ' ' . str_pad($line['book_qty'] . ' ' . _BOOKSHOP_COPY_COUNT, 8, ' ', STR_PAD_LEFT) . ' ' . str_pad($line['book_price_ttc'] . ' ' . bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT) . ' '
-                            . str_pad($line['book_shipping_amount'] . ' ' . bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT) . "\n";
+            $msgCommande .= str_pad(wordwrap($line['book_title'], 60), 60, ' ').' '.str_pad($line['book_qty'].' '._BOOKSHOP_COPY_COUNT, 8, ' ', STR_PAD_LEFT).' '.str_pad($line['book_price_ttc'].' '.bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT).' '
+                            . str_pad($line['book_shipping_amount'].' '.bookshop_getmoduleoption('money_short'), 10, ' ', STR_PAD_LEFT)."\n";
             $res = $h_bookshop_caddy->insert($panier, true);
         }
-        $msgCommande .= "\n\n" . _BOOKSHOP_SHIPPING_PRICE . ' ' . $shippingAmount . ' ' . bookshop_getmoduleoption('money_full') . "\n";
-        $msgCommande .= _BOOKSHOP_TOTAL . ' ' . $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full') . "\n";
+        $msgCommande .= "\n\n"._BOOKSHOP_SHIPPING_PRICE.' '.$shippingAmount.' '.bookshop_getmoduleoption('money_full')."\n";
+        $msgCommande .= _BOOKSHOP_TOTAL.' '.$commandAmountTTC.' '.bookshop_getmoduleoption('money_full')."\n";
         if (count($discountsDescription) > 0) {
-            $msgCommande .= "\n\n" . _BOOKSHOP_CART4 . "\n";
+            $msgCommande .= "\n\n"._BOOKSHOP_CART4."\n";
             $msgCommande .= implode("\n", $discountsDescription);
             $msgCommande .= "\n";
         }
@@ -178,7 +178,7 @@ 
         $msg['PAYS']         = $tbl_country[$commande->getVar('cmd_country')];
         $msg['TELEPHONE']    = $commande->getVar('cmd_telephone');
         $msg['EMAIL']        = $commande->getVar('cmd_email');
-        $msg['URL_BILL']     = BOOKSHOP_URL . 'invoice.php?command=' . $commande->getVar('cmd_id') . '&pass=' . $password;
+        $msg['URL_BILL']     = BOOKSHOP_URL.'invoice.php?command='.$commande->getVar('cmd_id').'&pass='.$password;
         $msg['IP']           = bookshop_IP();
         if ($commande->getVar('cmd_bill') == 1) {
             $msg['FACTURE'] = _YES;
@@ -201,8 +201,8 @@ 
             $sform->addElement(new XoopsFormHidden($key, $value));
         }
 
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC . ' ' . bookshop_getmoduleoption('money_full')));
-        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount . ' ' . bookshop_getmoduleoption('money_full')));
+        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_TOTAL, $commandAmountTTC.' '.bookshop_getmoduleoption('money_full')));
+        $sform->addElement(new XoopsFormLabel(_BOOKSHOP_SHIPPING_PRICE, $shippingAmount.' '.bookshop_getmoduleoption('money_full')));
         $sform->addElement(new XoopsFormLabel(_BOOKSHOP_LASTNAME, $commande->getVar('cmd_lastname')));
         $sform->addElement(new XoopsFormLabel(_BOOKSHOP_FIRSTNAME, $commande->getVar('cmd_firstname')));
         $sform->addElement(new XoopsFormLabel(_BOOKSHOP_STREET, $commande->getVar('cmd_adress')));
@@ -224,7 +224,7 @@ 
         $xoopsTpl->assign('form', $sform->render());
         break;
 }
-$title = _BOOKSHOP_VALIDATE_CMD . ' - ' . bookshop_get_module_name();
+$title = _BOOKSHOP_VALIDATE_CMD.' - '.bookshop_get_module_name();
 bookshop_set_metas($title, $title);
 bookshop_setCSS();
-include_once(XOOPS_ROOT_PATH . '/footer.php');
+include_once(XOOPS_ROOT_PATH.'/footer.php');

blocks/bookshop_recommended.php

Indentation +112 added lines, -112 removed lines

@@ -15,102 +15,102 @@ 
  */
 function b_bookshop_recomm_show($options)
 {
-    // '10|0';  // See 10 books, for all categories or a particular category
-    global $xoopsConfig, $xoopsTpl;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
-    $tblLivres = $tblCategories = $tblTmp = $tbl_tmp_vat = $tbl_vat = $tbl_tmp_lang = $block = $tbl_books_id = array();
-    $tblLivres = $h_bookshop_books->getRecentRecommendedBooks(0, $options[0], $options[1]);
-    if ($h_bookshop_books->getRecommendedCount() > $options[0]) {    // Il y a plus de livres recommand�s dans la BDD que dans le bloc, on affiche donc un lien vers la page des livres recommand�s
-        $block['showMore'] = true;
-    }
+	// '10|0';  // See 10 books, for all categories or a particular category
+	global $xoopsConfig, $xoopsTpl;
+	include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+	$tblLivres = $tblCategories = $tblTmp = $tbl_tmp_vat = $tbl_vat = $tbl_tmp_lang = $block = $tbl_books_id = array();
+	$tblLivres = $h_bookshop_books->getRecentRecommendedBooks(0, $options[0], $options[1]);
+	if ($h_bookshop_books->getRecommendedCount() > $options[0]) {    // Il y a plus de livres recommand�s dans la BDD que dans le bloc, on affiche donc un lien vers la page des livres recommand�s
+		$block['showMore'] = true;
+	}
 
-    if (count($tblLivres) > 0) {
-        $url                  = BOOKSHOP_URL . 'assets/css/bookshop.css';
-        $block['nostock_msg'] = bookshop_getmoduleoption('nostock_msg');
-        $xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
-        $tblTmp = array();
-        foreach ($tblLivres as $item) {
-            $tblTmp[]       = $item->getVar('book_cid');
-            $tbl_tmp_vat[]  = $item->getVar('book_vat_id');
-            $tbl_tmp_lang[] = $item->getVar('book_lang_id');
-            $tbl_books_id[] = $item->getVar('book_id');
-        }
-        $tblTmp       = array_unique($tblTmp);
-        $tbl_tmp_vat  = array_unique($tbl_tmp_vat);
-        $tbl_tmp_lang = array_unique($tbl_tmp_lang);
+	if (count($tblLivres) > 0) {
+		$url                  = BOOKSHOP_URL . 'assets/css/bookshop.css';
+		$block['nostock_msg'] = bookshop_getmoduleoption('nostock_msg');
+		$xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
+		$tblTmp = array();
+		foreach ($tblLivres as $item) {
+			$tblTmp[]       = $item->getVar('book_cid');
+			$tbl_tmp_vat[]  = $item->getVar('book_vat_id');
+			$tbl_tmp_lang[] = $item->getVar('book_lang_id');
+			$tbl_books_id[] = $item->getVar('book_id');
+		}
+		$tblTmp       = array_unique($tblTmp);
+		$tbl_tmp_vat  = array_unique($tbl_tmp_vat);
+		$tbl_tmp_lang = array_unique($tbl_tmp_lang);
 
-        sort($tbl_tmp_lang);
-        sort($tblTmp);
-        sort($tbl_tmp_vat);
-        sort($tbl_books_id);
+		sort($tbl_tmp_lang);
+		sort($tblTmp);
+		sort($tbl_tmp_vat);
+		sort($tbl_books_id);
 
-        // Get languages *******************************************
-        if (count($tbl_tmp_lang) > 0) {
-            $tbl_lang = $h_bookshop_lang->getObjects(new Criteria('lang_id', '(' . implode(',', $tbl_tmp_lang) . ')', 'IN'), true);
-        }
+		// Get languages *******************************************
+		if (count($tbl_tmp_lang) > 0) {
+			$tbl_lang = $h_bookshop_lang->getObjects(new Criteria('lang_id', '(' . implode(',', $tbl_tmp_lang) . ')', 'IN'), true);
+		}
 
-        // Get the list of categories ****************************
-        $tblCategories = $h_bookshop_cat->getObjects(new Criteria('cat_cid', '(' . implode(',', $tblTmp) . ')', 'IN'), true);
+		// Get the list of categories ****************************
+		$tblCategories = $h_bookshop_cat->getObjects(new Criteria('cat_cid', '(' . implode(',', $tblTmp) . ')', 'IN'), true);
 
-        // Get VAT ***********************************************
-        if (count($tbl_tmp_vat) > 0) {
-            $tbl_vat = $h_bookshop_vat->getObjects(new Criteria('vat_id', '(' . implode(',', $tbl_tmp_vat) . ')', 'IN'), true);
-        }
+		// Get VAT ***********************************************
+		if (count($tbl_tmp_vat) > 0) {
+			$tbl_vat = $h_bookshop_vat->getObjects(new Criteria('vat_id', '(' . implode(',', $tbl_tmp_vat) . ')', 'IN'), true);
+		}
 
-        // Get the authors, deuxi�me partie **************************
-        $tbl_books_auteurs = array();
-        $tbl_auteurs       = $h_bookshop_booksauthors->getObjects(new Criteria('ba_book_id', '(' . implode(',', $tbl_books_id) . ')', 'IN'), true);
-        if (count($tbl_auteurs) > 0) {
-            foreach ($tbl_auteurs as $item) {
-                $tbl_tmp_auteurs[] = $item->getVar('ba_auth_id');
-                // Grouping data by book
-                $tbl_books_auteurs[$item->getVar('ba_book_id')][] = $item;
-            }
-            $tbl_tmp_auteurs = array_unique($tbl_tmp_auteurs);
-            sort($tbl_tmp_auteurs);
-            // Then recovered the information from these authors / translators
-            $tbl_infos_auteurs = $h_bookshop_authors->getObjects(new Criteria('auth_id', '(' . implode(',', $tbl_tmp_auteurs) . ')', 'IN'), true);
-        }
-        foreach ($tblLivres as $item) {
-            $tbl_tmp                            = array();
-            $tbl_tmp                            = $item->toArray();
-            $tbl_tmp['book_category']           = $tblCategories[$item->getVar('book_cid')];
-            $tbl_tmp['book_language']           = $tbl_lang[$item->getVar('book_lang_id')];
-            $tbl_tmp['book_vat_rate']           = $tbl_vat[$item->getVar('book_vat_id')];
-            $tbl_tmp['book_price_ttc']          = bookshop_getTTC($item->getVar('book_price'), $tbl_vat[$item->getVar('book_vat_id')]->getVar('vat_rate'));
-            $tbl_tmp['book_discount_price_ttc'] = bookshop_getTTC($item->getVar('book_discount_price'), $tbl_vat[$item->getVar('book_vat_id')]->getVar('vat_rate'));
+		// Get the authors, deuxi�me partie **************************
+		$tbl_books_auteurs = array();
+		$tbl_auteurs       = $h_bookshop_booksauthors->getObjects(new Criteria('ba_book_id', '(' . implode(',', $tbl_books_id) . ')', 'IN'), true);
+		if (count($tbl_auteurs) > 0) {
+			foreach ($tbl_auteurs as $item) {
+				$tbl_tmp_auteurs[] = $item->getVar('ba_auth_id');
+				// Grouping data by book
+				$tbl_books_auteurs[$item->getVar('ba_book_id')][] = $item;
+			}
+			$tbl_tmp_auteurs = array_unique($tbl_tmp_auteurs);
+			sort($tbl_tmp_auteurs);
+			// Then recovered the information from these authors / translators
+			$tbl_infos_auteurs = $h_bookshop_authors->getObjects(new Criteria('auth_id', '(' . implode(',', $tbl_tmp_auteurs) . ')', 'IN'), true);
+		}
+		foreach ($tblLivres as $item) {
+			$tbl_tmp                            = array();
+			$tbl_tmp                            = $item->toArray();
+			$tbl_tmp['book_category']           = $tblCategories[$item->getVar('book_cid')];
+			$tbl_tmp['book_language']           = $tbl_lang[$item->getVar('book_lang_id')];
+			$tbl_tmp['book_vat_rate']           = $tbl_vat[$item->getVar('book_vat_id')];
+			$tbl_tmp['book_price_ttc']          = bookshop_getTTC($item->getVar('book_price'), $tbl_vat[$item->getVar('book_vat_id')]->getVar('vat_rate'));
+			$tbl_tmp['book_discount_price_ttc'] = bookshop_getTTC($item->getVar('book_discount_price'), $tbl_vat[$item->getVar('book_vat_id')]->getVar('vat_rate'));
 
-            // Search for  authors / translators
-            $tbl_join1         = $tbl_join2 = array();
-            $tbl_tmp2          = $tbl_books_auteurs[$item->getVar('book_id')];    // Returns a list of all authors / translators of a book
-            $tbl_livre_auteurs = $tbl_livre_traducteurs = array();
-            foreach ($tbl_tmp2 as $oneauthor) {
-                $auteur = $tbl_infos_auteurs[$oneauthor->getVar('ba_auth_id')];
-                if ($oneauthor->getVar('ba_type') == 1) {
-                    $tbl_livre_auteurs[] = $auteur->toArray();
-                    $tbl_join1[]         = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
-                } else {
-                    $tbl_livre_traducteurs[] = $auteur->toArray();
-                    $tbl_join2[]             = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
-                }
-            }
-            if (count($tbl_join1) > 0) {
-                $tbl_tmp['book_joined_authors'] = implode(', ', $tbl_join1);
-            }
-            if (count($tbl_join2) > 0) {
-                $tbl_tmp['book_joined_translators'] = implode(',', $tbl_join2);
-            }
-            $tbl_tmp['book_authors']     = $tbl_livre_auteurs;
-            $tbl_tmp['book_translators'] = $tbl_livre_traducteurs;
-            // Et on place le tout dans le template
-            $block['block_books'][] = $tbl_tmp;
-        }
+			// Search for  authors / translators
+			$tbl_join1         = $tbl_join2 = array();
+			$tbl_tmp2          = $tbl_books_auteurs[$item->getVar('book_id')];    // Returns a list of all authors / translators of a book
+			$tbl_livre_auteurs = $tbl_livre_traducteurs = array();
+			foreach ($tbl_tmp2 as $oneauthor) {
+				$auteur = $tbl_infos_auteurs[$oneauthor->getVar('ba_auth_id')];
+				if ($oneauthor->getVar('ba_type') == 1) {
+					$tbl_livre_auteurs[] = $auteur->toArray();
+					$tbl_join1[]         = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
+				} else {
+					$tbl_livre_traducteurs[] = $auteur->toArray();
+					$tbl_join2[]             = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
+				}
+			}
+			if (count($tbl_join1) > 0) {
+				$tbl_tmp['book_joined_authors'] = implode(', ', $tbl_join1);
+			}
+			if (count($tbl_join2) > 0) {
+				$tbl_tmp['book_joined_translators'] = implode(',', $tbl_join2);
+			}
+			$tbl_tmp['book_authors']     = $tbl_livre_auteurs;
+			$tbl_tmp['book_translators'] = $tbl_livre_traducteurs;
+			// Et on place le tout dans le template
+			$block['block_books'][] = $tbl_tmp;
+		}
 
-        return $block;
-    } else {    // The list of books is not found (it is not books sold in the stock books)
+		return $block;
+	} else {    // The list of books is not found (it is not books sold in the stock books)
 
-        return false;
-    }
+		return false;
+	}
 }
 
 /**
@@ -120,27 +120,27 @@ 
  */
 function b_bookshop_recomm_edit($options)
 {
-    // '10|0';  // See 10 books, for all categories
-    global $xoopsConfig;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
-    include_once BOOKSHOP_PATH . 'class/tree.php';
-    $tblCategories = array();
-    $tblCategories = $h_bookshop_cat->GetAllCategories();
-    $mytree        = new Bookshop_XoopsObjectTree($tblCategories, 'cat_cid', 'cat_pid');
-    $form          = '';
-    $checkeds      = array('', '');
-    if (!isset($options[1])) {
-        $options[1] = 0;
-    }
-    $checkeds[$options[1]] = 'checked';
-    $form .= "<table border='0'>";
-    $form .= '<tr><td>' . _MB_BOOKSHOP_BOOKS_CNT . "</td><td><input type='text' name='options[]' id='options' value='" . $options[0] . "' /></td></tr>";
-    //$form .= '<tr><td>'._MB_BOOKSHOP_SORT_ORDER."</td><td><input type='radio' name='options[]' id='options[]' value='0' ".$checkeds[0]." />"._MB_BOOKSHOP_SORT_1." <input type='radio' name='options[]' id='options[]' value='1' ".$checkeds[1]." />"._MB_BOOKSHOP_SORT_2.'</td></tr>';
-    $select = $mytree->makeSelBox('options[]', 'cat_title', '-', $options[1], _MB_BOOKSHOP_ALL_CATEGORIES);
-    $form .= '<tr><td>' . _MB_BOOKSHOP_CATEGORY . '</td><td>' . $select . '</td></tr>';
-    $form .= '</table>';
+	// '10|0';  // See 10 books, for all categories
+	global $xoopsConfig;
+	include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+	include_once BOOKSHOP_PATH . 'class/tree.php';
+	$tblCategories = array();
+	$tblCategories = $h_bookshop_cat->GetAllCategories();
+	$mytree        = new Bookshop_XoopsObjectTree($tblCategories, 'cat_cid', 'cat_pid');
+	$form          = '';
+	$checkeds      = array('', '');
+	if (!isset($options[1])) {
+		$options[1] = 0;
+	}
+	$checkeds[$options[1]] = 'checked';
+	$form .= "<table border='0'>";
+	$form .= '<tr><td>' . _MB_BOOKSHOP_BOOKS_CNT . "</td><td><input type='text' name='options[]' id='options' value='" . $options[0] . "' /></td></tr>";
+	//$form .= '<tr><td>'._MB_BOOKSHOP_SORT_ORDER."</td><td><input type='radio' name='options[]' id='options[]' value='0' ".$checkeds[0]." />"._MB_BOOKSHOP_SORT_1." <input type='radio' name='options[]' id='options[]' value='1' ".$checkeds[1]." />"._MB_BOOKSHOP_SORT_2.'</td></tr>';
+	$select = $mytree->makeSelBox('options[]', 'cat_title', '-', $options[1], _MB_BOOKSHOP_ALL_CATEGORIES);
+	$form .= '<tr><td>' . _MB_BOOKSHOP_CATEGORY . '</td><td>' . $select . '</td></tr>';
+	$form .= '</table>';
 
-    return $form;
+	return $form;
 }
 
 /**
@@ -149,10 +149,10 @@ 
  */
 function b_bookshop_recomm_duplicatable($options)
 {
-    $options = explode('|', $options);
-    $block   = &b_bookshop_recomm_show($options);
+	$options = explode('|', $options);
+	$block   = &b_bookshop_recomm_show($options);
 
-    $tpl = new XoopsTpl();
-    $tpl->assign('block', $block);
-    $tpl->display('db:bookshop_block_recommended.tpl');
+	$tpl = new XoopsTpl();
+	$tpl->assign('block', $block);
+	$tpl->display('db:bookshop_block_recommended.tpl');
 }

Spacing +14 added lines, -14 removed lines

@@ -17,7 +17,7 @@ 
 {
     // '10|0';  // See 10 books, for all categories or a particular category
     global $xoopsConfig, $xoopsTpl;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+    include XOOPS_ROOT_PATH.'/modules/bookshop/include/common.php';
     $tblLivres = $tblCategories = $tblTmp = $tbl_tmp_vat = $tbl_vat = $tbl_tmp_lang = $block = $tbl_books_id = array();
     $tblLivres = $h_bookshop_books->getRecentRecommendedBooks(0, $options[0], $options[1]);
     if ($h_bookshop_books->getRecommendedCount() > $options[0]) {    // Il y a plus de livres recommand�s dans la BDD que dans le bloc, on affiche donc un lien vers la page des livres recommand�s
@@ -25,7 +25,7 @@ 
     }
 
     if (count($tblLivres) > 0) {
-        $url                  = BOOKSHOP_URL . 'assets/css/bookshop.css';
+        $url                  = BOOKSHOP_URL.'assets/css/bookshop.css';
         $block['nostock_msg'] = bookshop_getmoduleoption('nostock_msg');
         $xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
         $tblTmp = array();
@@ -46,20 +46,20 @@ 
 
         // Get languages *******************************************
         if (count($tbl_tmp_lang) > 0) {
-            $tbl_lang = $h_bookshop_lang->getObjects(new Criteria('lang_id', '(' . implode(',', $tbl_tmp_lang) . ')', 'IN'), true);
+            $tbl_lang = $h_bookshop_lang->getObjects(new Criteria('lang_id', '('.implode(',', $tbl_tmp_lang).')', 'IN'), true);
         }
 
         // Get the list of categories ****************************
-        $tblCategories = $h_bookshop_cat->getObjects(new Criteria('cat_cid', '(' . implode(',', $tblTmp) . ')', 'IN'), true);
+        $tblCategories = $h_bookshop_cat->getObjects(new Criteria('cat_cid', '('.implode(',', $tblTmp).')', 'IN'), true);
 
         // Get VAT ***********************************************
         if (count($tbl_tmp_vat) > 0) {
-            $tbl_vat = $h_bookshop_vat->getObjects(new Criteria('vat_id', '(' . implode(',', $tbl_tmp_vat) . ')', 'IN'), true);
+            $tbl_vat = $h_bookshop_vat->getObjects(new Criteria('vat_id', '('.implode(',', $tbl_tmp_vat).')', 'IN'), true);
         }
 
         // Get the authors, deuxi�me partie **************************
         $tbl_books_auteurs = array();
-        $tbl_auteurs       = $h_bookshop_booksauthors->getObjects(new Criteria('ba_book_id', '(' . implode(',', $tbl_books_id) . ')', 'IN'), true);
+        $tbl_auteurs       = $h_bookshop_booksauthors->getObjects(new Criteria('ba_book_id', '('.implode(',', $tbl_books_id).')', 'IN'), true);
         if (count($tbl_auteurs) > 0) {
             foreach ($tbl_auteurs as $item) {
                 $tbl_tmp_auteurs[] = $item->getVar('ba_auth_id');
@@ -69,7 +69,7 @@ 
             $tbl_tmp_auteurs = array_unique($tbl_tmp_auteurs);
             sort($tbl_tmp_auteurs);
             // Then recovered the information from these authors / translators
-            $tbl_infos_auteurs = $h_bookshop_authors->getObjects(new Criteria('auth_id', '(' . implode(',', $tbl_tmp_auteurs) . ')', 'IN'), true);
+            $tbl_infos_auteurs = $h_bookshop_authors->getObjects(new Criteria('auth_id', '('.implode(',', $tbl_tmp_auteurs).')', 'IN'), true);
         }
         foreach ($tblLivres as $item) {
             $tbl_tmp                            = array();
@@ -82,16 +82,16 @@ 
 
             // Search for  authors / translators
             $tbl_join1         = $tbl_join2 = array();
-            $tbl_tmp2          = $tbl_books_auteurs[$item->getVar('book_id')];    // Returns a list of all authors / translators of a book
+            $tbl_tmp2          = $tbl_books_auteurs[$item->getVar('book_id')]; // Returns a list of all authors / translators of a book
             $tbl_livre_auteurs = $tbl_livre_traducteurs = array();
             foreach ($tbl_tmp2 as $oneauthor) {
                 $auteur = $tbl_infos_auteurs[$oneauthor->getVar('ba_auth_id')];
                 if ($oneauthor->getVar('ba_type') == 1) {
                     $tbl_livre_auteurs[] = $auteur->toArray();
-                    $tbl_join1[]         = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
+                    $tbl_join1[]         = $auteur->getVar('auth_firstname').' '.$auteur->getVar('auth_name');
                 } else {
                     $tbl_livre_traducteurs[] = $auteur->toArray();
-                    $tbl_join2[]             = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
+                    $tbl_join2[]             = $auteur->getVar('auth_firstname').' '.$auteur->getVar('auth_name');
                 }
             }
             if (count($tbl_join1) > 0) {
@@ -122,8 +122,8 @@ 
 {
     // '10|0';  // See 10 books, for all categories
     global $xoopsConfig;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
-    include_once BOOKSHOP_PATH . 'class/tree.php';
+    include XOOPS_ROOT_PATH.'/modules/bookshop/include/common.php';
+    include_once BOOKSHOP_PATH.'class/tree.php';
     $tblCategories = array();
     $tblCategories = $h_bookshop_cat->GetAllCategories();
     $mytree        = new Bookshop_XoopsObjectTree($tblCategories, 'cat_cid', 'cat_pid');
@@ -134,10 +134,10 @@ 
     }
     $checkeds[$options[1]] = 'checked';
     $form .= "<table border='0'>";
-    $form .= '<tr><td>' . _MB_BOOKSHOP_BOOKS_CNT . "</td><td><input type='text' name='options[]' id='options' value='" . $options[0] . "' /></td></tr>";
+    $form .= '<tr><td>'._MB_BOOKSHOP_BOOKS_CNT."</td><td><input type='text' name='options[]' id='options' value='".$options[0]."' /></td></tr>";
     //$form .= '<tr><td>'._MB_BOOKSHOP_SORT_ORDER."</td><td><input type='radio' name='options[]' id='options[]' value='0' ".$checkeds[0]." />"._MB_BOOKSHOP_SORT_1." <input type='radio' name='options[]' id='options[]' value='1' ".$checkeds[1]." />"._MB_BOOKSHOP_SORT_2.'</td></tr>';
     $select = $mytree->makeSelBox('options[]', 'cat_title', '-', $options[1], _MB_BOOKSHOP_ALL_CATEGORIES);
-    $form .= '<tr><td>' . _MB_BOOKSHOP_CATEGORY . '</td><td>' . $select . '</td></tr>';
+    $form .= '<tr><td>'._MB_BOOKSHOP_CATEGORY.'</td><td>'.$select.'</td></tr>';
     $form .= '</table>';
 
     return $form;

blocks/bookshop_categories.php

Indentation +70 added lines, -70 removed lines

@@ -32,68 +32,68 @@ 
  */
 function b_bookshop_category_show($options)
 {
-    global $xoopsTpl;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
-    $block = array();
-    $url   = BOOKSHOP_URL . 'assets/css/bookshop.css';
-    $xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
-    $block['nostock_msg'] = bookshop_getmoduleoption('nostock_msg');
+	global $xoopsTpl;
+	include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+	$block = array();
+	$url   = BOOKSHOP_URL . 'assets/css/bookshop.css';
+	$xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
+	$block['nostock_msg'] = bookshop_getmoduleoption('nostock_msg');
 
-    if ((int)$options[0] == 0) {
-        $block['block_option'] = 0;
-        if (!isset($GLOBALS['current_category']) || $GLOBALS['current_category'] == -1) {
-            return false;
-        }
-        $cat_cid = (int)$GLOBALS['current_category'];
-        include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+	if ((int)$options[0] == 0) {
+		$block['block_option'] = 0;
+		if (!isset($GLOBALS['current_category']) || $GLOBALS['current_category'] == -1) {
+			return false;
+		}
+		$cat_cid = (int)$GLOBALS['current_category'];
+		include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
 
-        if ($cat_cid > 0) {
-            include_once XOOPS_ROOT_PATH . '/class/tree.php';
-            $tbl_categories = $tblChilds = $tbl_tmp = array();
-            $tbl_categories = $h_bookshop_cat->GetAllCategories();
-            $mytree         = new XoopsObjectTree($tbl_categories, 'cat_cid', 'cat_pid');
-            $tblChilds      = $mytree->getAllChild($cat_cid);
-            //$tblChilds = array_reverse($tblChilds);
-            foreach ($tblChilds as $item) {
-                $tbl_tmp[] = "<a href='" . $h_bookshop_cat->GetCategoryLink($item->getVar('cat_cid'), $item->getVar('cat_title')) . "' title='" . bookshop_makeHrefTitle($item->getVar('cat_title')) . "'>" . $item->getVar('cat_title') . '</a>';
-            }
-            $block['block_categories'] = $tbl_tmp;
+		if ($cat_cid > 0) {
+			include_once XOOPS_ROOT_PATH . '/class/tree.php';
+			$tbl_categories = $tblChilds = $tbl_tmp = array();
+			$tbl_categories = $h_bookshop_cat->GetAllCategories();
+			$mytree         = new XoopsObjectTree($tbl_categories, 'cat_cid', 'cat_pid');
+			$tblChilds      = $mytree->getAllChild($cat_cid);
+			//$tblChilds = array_reverse($tblChilds);
+			foreach ($tblChilds as $item) {
+				$tbl_tmp[] = "<a href='" . $h_bookshop_cat->GetCategoryLink($item->getVar('cat_cid'), $item->getVar('cat_title')) . "' title='" . bookshop_makeHrefTitle($item->getVar('cat_title')) . "'>" . $item->getVar('cat_title') . '</a>';
+			}
+			$block['block_categories'] = $tbl_tmp;
 
-            $category = null;
-            if ($cat_cid > 0) {
-                $category = $h_bookshop_cat->get($cat_cid);
-                if (is_object($category)) {
-                    $block['block_current_category'] = $category->toArray();
-                }
-            }
+			$category = null;
+			if ($cat_cid > 0) {
+				$category = $h_bookshop_cat->get($cat_cid);
+				if (is_object($category)) {
+					$block['block_current_category'] = $category->toArray();
+				}
+			}
 		} else {	// On est à la racine, on n'affiche donc que les catégories mères
-            $tbl_categories = array();
-            $criteria       = new Criteria('cat_pid', 0, '=');
-            $criteria->setSort('cat_title');
-            $tbl_categories = $h_bookshop_cat->getObjects($criteria, true);
-            foreach ($tbl_categories as $item) {
-                $tbl_tmp[] = "<a href='" . $h_bookshop_cat->GetCategoryLink($item->getVar('cat_cid'), $item->getVar('cat_title')) . "' title='" . bookshop_makeHrefTitle($item->getVar('cat_title')) . "'>" . $item->getVar('cat_title') . '</a>';
-            }
-            $block['block_categories'] = $tbl_tmp;
-        }
-    } else {    // Affichage classique
-        $block['block_option'] = 1;
-        include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
-        include_once BOOKSHOP_PATH . 'class/tree.php';
-        $tbl_categories = $h_bookshop_cat->GetAllCategories();
-        $mytree         = new Bookshop_XoopsObjectTree($tbl_categories, 'cat_cid', 'cat_pid');
-        $jump           = BOOKSHOP_URL . 'category.php?cat_cid=';
-        $additional     = "onchange='location=\"" . $jump . "\"+this.options[this.selectedIndex].value'";
-        if (isset($GLOBALS['current_category']) && $GLOBALS['current_category'] != -1) {
-            $cat_cid = (int)$GLOBALS['current_category'];
-        } else {
-            $cat_cid = 0;
-        }
-        $htmlSelect          = $mytree->makeSelBox('cat_cid', 'cat_title', '-', $cat_cid, false, 0, $additional);
-        $block['htmlSelect'] = $htmlSelect;
-    }
+			$tbl_categories = array();
+			$criteria       = new Criteria('cat_pid', 0, '=');
+			$criteria->setSort('cat_title');
+			$tbl_categories = $h_bookshop_cat->getObjects($criteria, true);
+			foreach ($tbl_categories as $item) {
+				$tbl_tmp[] = "<a href='" . $h_bookshop_cat->GetCategoryLink($item->getVar('cat_cid'), $item->getVar('cat_title')) . "' title='" . bookshop_makeHrefTitle($item->getVar('cat_title')) . "'>" . $item->getVar('cat_title') . '</a>';
+			}
+			$block['block_categories'] = $tbl_tmp;
+		}
+	} else {    // Affichage classique
+		$block['block_option'] = 1;
+		include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+		include_once BOOKSHOP_PATH . 'class/tree.php';
+		$tbl_categories = $h_bookshop_cat->GetAllCategories();
+		$mytree         = new Bookshop_XoopsObjectTree($tbl_categories, 'cat_cid', 'cat_pid');
+		$jump           = BOOKSHOP_URL . 'category.php?cat_cid=';
+		$additional     = "onchange='location=\"" . $jump . "\"+this.options[this.selectedIndex].value'";
+		if (isset($GLOBALS['current_category']) && $GLOBALS['current_category'] != -1) {
+			$cat_cid = (int)$GLOBALS['current_category'];
+		} else {
+			$cat_cid = 0;
+		}
+		$htmlSelect          = $mytree->makeSelBox('cat_cid', 'cat_title', '-', $cat_cid, false, 0, $additional);
+		$block['htmlSelect'] = $htmlSelect;
+	}
 
-    return $block;
+	return $block;
 }
 
 /**
@@ -103,16 +103,16 @@ 
  */
 function b_bookshop_category_edit($options)
 {
-    global $xoopsConfig;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+	global $xoopsConfig;
+	include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
 
-    $checkeds              = array('', '');
-    $checkeds[$options[0]] = 'checked';
-    $form                  = '';
-    $form .= '<b>' . _MB_BOOKSHOP_TYPE_BLOCK . "</b><br><input type='radio' name='options[]' id='options[]' value='0' " . $checkeds[0] . ' />' . _MB_BOOKSHOP_TYPE_BLOCK2 . "<br><input type='radio' name='options[]' id='options[]' value='1' " . $checkeds[1] . ' />' . _MB_BOOKSHOP_TYPE_BLOCK1
-             . '</td></tr>';
+	$checkeds              = array('', '');
+	$checkeds[$options[0]] = 'checked';
+	$form                  = '';
+	$form .= '<b>' . _MB_BOOKSHOP_TYPE_BLOCK . "</b><br><input type='radio' name='options[]' id='options[]' value='0' " . $checkeds[0] . ' />' . _MB_BOOKSHOP_TYPE_BLOCK2 . "<br><input type='radio' name='options[]' id='options[]' value='1' " . $checkeds[1] . ' />' . _MB_BOOKSHOP_TYPE_BLOCK1
+			 . '</td></tr>';
 
-    return $form;
+	return $form;
 }
 
 /**
@@ -122,10 +122,10 @@ 
  */
 function b_bookshop_category_duplicatable($options)
 {
-    $options = explode('|', $options);
-    $block   = &b_bookshop_category($options);
+	$options = explode('|', $options);
+	$block   = &b_bookshop_category($options);
 
-    $tpl = new XoopsTpl();
-    $tpl->assign('block', $block);
-    $tpl->display('db:bookshop_block_categories.tpl');
+	$tpl = new XoopsTpl();
+	$tpl->assign('block', $block);
+	$tpl->display('db:bookshop_block_categories.tpl');
 }

Spacing +12 added lines, -12 removed lines

@@ -33,9 +33,9 @@ 
 function b_bookshop_category_show($options)
 {
     global $xoopsTpl;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+    include XOOPS_ROOT_PATH.'/modules/bookshop/include/common.php';
     $block = array();
-    $url   = BOOKSHOP_URL . 'assets/css/bookshop.css';
+    $url   = BOOKSHOP_URL.'assets/css/bookshop.css';
     $xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
     $block['nostock_msg'] = bookshop_getmoduleoption('nostock_msg');
 
@@ -45,17 +45,17 @@ 
             return false;
         }
         $cat_cid = (int)$GLOBALS['current_category'];
-        include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+        include XOOPS_ROOT_PATH.'/modules/bookshop/include/common.php';
 
         if ($cat_cid > 0) {
-            include_once XOOPS_ROOT_PATH . '/class/tree.php';
+            include_once XOOPS_ROOT_PATH.'/class/tree.php';
             $tbl_categories = $tblChilds = $tbl_tmp = array();
             $tbl_categories = $h_bookshop_cat->GetAllCategories();
             $mytree         = new XoopsObjectTree($tbl_categories, 'cat_cid', 'cat_pid');
             $tblChilds      = $mytree->getAllChild($cat_cid);
             //$tblChilds = array_reverse($tblChilds);
             foreach ($tblChilds as $item) {
-                $tbl_tmp[] = "<a href='" . $h_bookshop_cat->GetCategoryLink($item->getVar('cat_cid'), $item->getVar('cat_title')) . "' title='" . bookshop_makeHrefTitle($item->getVar('cat_title')) . "'>" . $item->getVar('cat_title') . '</a>';
+                $tbl_tmp[] = "<a href='".$h_bookshop_cat->GetCategoryLink($item->getVar('cat_cid'), $item->getVar('cat_title'))."' title='".bookshop_makeHrefTitle($item->getVar('cat_title'))."'>".$item->getVar('cat_title').'</a>';
             }
             $block['block_categories'] = $tbl_tmp;
 
@@ -72,18 +72,18 @@ 
             $criteria->setSort('cat_title');
             $tbl_categories = $h_bookshop_cat->getObjects($criteria, true);
             foreach ($tbl_categories as $item) {
-                $tbl_tmp[] = "<a href='" . $h_bookshop_cat->GetCategoryLink($item->getVar('cat_cid'), $item->getVar('cat_title')) . "' title='" . bookshop_makeHrefTitle($item->getVar('cat_title')) . "'>" . $item->getVar('cat_title') . '</a>';
+                $tbl_tmp[] = "<a href='".$h_bookshop_cat->GetCategoryLink($item->getVar('cat_cid'), $item->getVar('cat_title'))."' title='".bookshop_makeHrefTitle($item->getVar('cat_title'))."'>".$item->getVar('cat_title').'</a>';
             }
             $block['block_categories'] = $tbl_tmp;
         }
     } else {    // Affichage classique
         $block['block_option'] = 1;
-        include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
-        include_once BOOKSHOP_PATH . 'class/tree.php';
+        include XOOPS_ROOT_PATH.'/modules/bookshop/include/common.php';
+        include_once BOOKSHOP_PATH.'class/tree.php';
         $tbl_categories = $h_bookshop_cat->GetAllCategories();
         $mytree         = new Bookshop_XoopsObjectTree($tbl_categories, 'cat_cid', 'cat_pid');
-        $jump           = BOOKSHOP_URL . 'category.php?cat_cid=';
-        $additional     = "onchange='location=\"" . $jump . "\"+this.options[this.selectedIndex].value'";
+        $jump           = BOOKSHOP_URL.'category.php?cat_cid=';
+        $additional     = "onchange='location=\"".$jump."\"+this.options[this.selectedIndex].value'";
         if (isset($GLOBALS['current_category']) && $GLOBALS['current_category'] != -1) {
             $cat_cid = (int)$GLOBALS['current_category'];
         } else {
@@ -104,12 +104,12 @@ 
 function b_bookshop_category_edit($options)
 {
     global $xoopsConfig;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+    include XOOPS_ROOT_PATH.'/modules/bookshop/include/common.php';
 
     $checkeds              = array('', '');
     $checkeds[$options[0]] = 'checked';
     $form                  = '';
-    $form .= '<b>' . _MB_BOOKSHOP_TYPE_BLOCK . "</b><br><input type='radio' name='options[]' id='options[]' value='0' " . $checkeds[0] . ' />' . _MB_BOOKSHOP_TYPE_BLOCK2 . "<br><input type='radio' name='options[]' id='options[]' value='1' " . $checkeds[1] . ' />' . _MB_BOOKSHOP_TYPE_BLOCK1
+    $form .= '<b>'._MB_BOOKSHOP_TYPE_BLOCK."</b><br><input type='radio' name='options[]' id='options[]' value='0' ".$checkeds[0].' />'._MB_BOOKSHOP_TYPE_BLOCK2."<br><input type='radio' name='options[]' id='options[]' value='1' ".$checkeds[1].' />'._MB_BOOKSHOP_TYPE_BLOCK1
              . '</td></tr>';
 
     return $form;

blocks/bookshop_top.php

Indentation +106 added lines, -106 removed lines

@@ -32,98 +32,98 @@ 
  */
 function b_bookshop_top_show($options)
 {
-    // '10|0';  // See 10 books, for all categories or a particular category
-    global $xoopsConfig, $xoopsTpl;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
-    $tblLivres = $tblCategories = $tblTmp = $tbl_tmp_vat = $tbl_vat = $tbl_tmp_lang = $block = $tbl_books_id = array();
-    $tblLivres = $h_bookshop_books->getMostViewedBooks(0, $options[0], $options[1]);
-    if (count($tblLivres) > 0) {
-        $url                  = BOOKSHOP_URL . 'assets/css/bookshop.css';
-        $block['nostock_msg'] = bookshop_getmoduleoption('nostock_msg');
-        $xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
-        $tblTmp = array();
-        foreach ($tblLivres as $item) {
-            $tblTmp[]       = $item->getVar('book_cid');
-            $tbl_tmp_vat[]  = $item->getVar('book_vat_id');
-            $tbl_tmp_lang[] = $item->getVar('book_lang_id');
-            $tbl_books_id[] = $item->getVar('book_id');
-        }
-        $tblTmp       = array_unique($tblTmp);
-        $tbl_tmp_vat  = array_unique($tbl_tmp_vat);
-        $tbl_tmp_lang = array_unique($tbl_tmp_lang);
+	// '10|0';  // See 10 books, for all categories or a particular category
+	global $xoopsConfig, $xoopsTpl;
+	include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+	$tblLivres = $tblCategories = $tblTmp = $tbl_tmp_vat = $tbl_vat = $tbl_tmp_lang = $block = $tbl_books_id = array();
+	$tblLivres = $h_bookshop_books->getMostViewedBooks(0, $options[0], $options[1]);
+	if (count($tblLivres) > 0) {
+		$url                  = BOOKSHOP_URL . 'assets/css/bookshop.css';
+		$block['nostock_msg'] = bookshop_getmoduleoption('nostock_msg');
+		$xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
+		$tblTmp = array();
+		foreach ($tblLivres as $item) {
+			$tblTmp[]       = $item->getVar('book_cid');
+			$tbl_tmp_vat[]  = $item->getVar('book_vat_id');
+			$tbl_tmp_lang[] = $item->getVar('book_lang_id');
+			$tbl_books_id[] = $item->getVar('book_id');
+		}
+		$tblTmp       = array_unique($tblTmp);
+		$tbl_tmp_vat  = array_unique($tbl_tmp_vat);
+		$tbl_tmp_lang = array_unique($tbl_tmp_lang);
 
-        sort($tbl_tmp_lang);
-        sort($tblTmp);
-        sort($tbl_tmp_vat);
-        sort($tbl_books_id);
+		sort($tbl_tmp_lang);
+		sort($tblTmp);
+		sort($tbl_tmp_vat);
+		sort($tbl_books_id);
 
-        // Get languages *******************************************
-        if (count($tbl_tmp_lang) > 0) {
-            $tbl_lang = $h_bookshop_lang->getObjects(new Criteria('lang_id', '(' . implode(',', $tbl_tmp_lang) . ')', 'IN'), true);
-        }
+		// Get languages *******************************************
+		if (count($tbl_tmp_lang) > 0) {
+			$tbl_lang = $h_bookshop_lang->getObjects(new Criteria('lang_id', '(' . implode(',', $tbl_tmp_lang) . ')', 'IN'), true);
+		}
 
-        // Get the list of categories ****************************
-        $tblCategories = $h_bookshop_cat->getObjects(new Criteria('cat_cid', '(' . implode(',', $tblTmp) . ')', 'IN'), true);
+		// Get the list of categories ****************************
+		$tblCategories = $h_bookshop_cat->getObjects(new Criteria('cat_cid', '(' . implode(',', $tblTmp) . ')', 'IN'), true);
 
-        // Get VAT ***********************************************
-        if (count($tbl_tmp_vat) > 0) {
-            $tbl_vat = $h_bookshop_vat->getObjects(new Criteria('vat_id', '(' . implode(',', $tbl_tmp_vat) . ')', 'IN'), true);
-        }
+		// Get VAT ***********************************************
+		if (count($tbl_tmp_vat) > 0) {
+			$tbl_vat = $h_bookshop_vat->getObjects(new Criteria('vat_id', '(' . implode(',', $tbl_tmp_vat) . ')', 'IN'), true);
+		}
 
-        // Get the authors, deuxi�me partie **************************
-        $tbl_books_auteurs = array();
-        $tbl_auteurs       = $h_bookshop_booksauthors->getObjects(new Criteria('ba_book_id', '(' . implode(',', $tbl_books_id) . ')', 'IN'), true);
-        if (count($tbl_auteurs) > 0) {
-            foreach ($tbl_auteurs as $item) {
-                $tbl_tmp_auteurs[] = $item->getVar('ba_auth_id');
-                // Grouping data by book
-                $tbl_books_auteurs[$item->getVar('ba_book_id')][] = $item;
-            }
-            $tbl_tmp_auteurs = array_unique($tbl_tmp_auteurs);
-            sort($tbl_tmp_auteurs);
-            // Then recovered the information from these authors / translators
-            $tbl_infos_auteurs = $h_bookshop_authors->getObjects(new Criteria('auth_id', '(' . implode(',', $tbl_tmp_auteurs) . ')', 'IN'), true);
-        }
-        foreach ($tblLivres as $item) {
-            $tbl_tmp                            = array();
-            $tbl_tmp                            = $item->toArray();
-            $tbl_tmp['book_category']           = $tblCategories[$item->getVar('book_cid')];
-            $tbl_tmp['book_language']           = $tbl_lang[$item->getVar('book_lang_id')];
-            $tbl_tmp['book_vat_rate']           = $tbl_vat[$item->getVar('book_vat_id')];
-            $tbl_tmp['book_price_ttc']          = bookshop_getTTC($item->getVar('book_price'), $tbl_vat[$item->getVar('book_vat_id')]->getVar('vat_rate'));
-            $tbl_tmp['book_discount_price_ttc'] = bookshop_getTTC($item->getVar('book_discount_price'), $tbl_vat[$item->getVar('book_vat_id')]->getVar('vat_rate'));
+		// Get the authors, deuxi�me partie **************************
+		$tbl_books_auteurs = array();
+		$tbl_auteurs       = $h_bookshop_booksauthors->getObjects(new Criteria('ba_book_id', '(' . implode(',', $tbl_books_id) . ')', 'IN'), true);
+		if (count($tbl_auteurs) > 0) {
+			foreach ($tbl_auteurs as $item) {
+				$tbl_tmp_auteurs[] = $item->getVar('ba_auth_id');
+				// Grouping data by book
+				$tbl_books_auteurs[$item->getVar('ba_book_id')][] = $item;
+			}
+			$tbl_tmp_auteurs = array_unique($tbl_tmp_auteurs);
+			sort($tbl_tmp_auteurs);
+			// Then recovered the information from these authors / translators
+			$tbl_infos_auteurs = $h_bookshop_authors->getObjects(new Criteria('auth_id', '(' . implode(',', $tbl_tmp_auteurs) . ')', 'IN'), true);
+		}
+		foreach ($tblLivres as $item) {
+			$tbl_tmp                            = array();
+			$tbl_tmp                            = $item->toArray();
+			$tbl_tmp['book_category']           = $tblCategories[$item->getVar('book_cid')];
+			$tbl_tmp['book_language']           = $tbl_lang[$item->getVar('book_lang_id')];
+			$tbl_tmp['book_vat_rate']           = $tbl_vat[$item->getVar('book_vat_id')];
+			$tbl_tmp['book_price_ttc']          = bookshop_getTTC($item->getVar('book_price'), $tbl_vat[$item->getVar('book_vat_id')]->getVar('vat_rate'));
+			$tbl_tmp['book_discount_price_ttc'] = bookshop_getTTC($item->getVar('book_discount_price'), $tbl_vat[$item->getVar('book_vat_id')]->getVar('vat_rate'));
 
-            // Search for  authors / translators
-            $tbl_join1         = $tbl_join2 = array();
-            $tbl_tmp2          = $tbl_books_auteurs[$item->getVar('book_id')];    // Returns a list of all authors / translators of a book
-            $tbl_livre_auteurs = $tbl_livre_traducteurs = array();
-            foreach ($tbl_tmp2 as $oneauthor) {
-                $auteur = $tbl_infos_auteurs[$oneauthor->getVar('ba_auth_id')];
-                if ($oneauthor->getVar('ba_type') == 1) {
-                    $tbl_livre_auteurs[] = $auteur->toArray();
-                    $tbl_join1[]         = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
-                } else {
-                    $tbl_livre_traducteurs[] = $auteur->toArray();
-                    $tbl_join2[]             = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
-                }
-            }
-            if (count($tbl_join1) > 0) {
-                $tbl_tmp['book_joined_authors'] = implode(', ', $tbl_join1);
-            }
-            if (count($tbl_join2) > 0) {
-                $tbl_tmp['book_joined_translators'] = implode(',', $tbl_join2);
-            }
-            $tbl_tmp['book_authors']     = $tbl_livre_auteurs;
-            $tbl_tmp['book_translators'] = $tbl_livre_traducteurs;
-            // Et on place le tout dans le template
-            $block['block_books'][] = $tbl_tmp;
-        }
+			// Search for  authors / translators
+			$tbl_join1         = $tbl_join2 = array();
+			$tbl_tmp2          = $tbl_books_auteurs[$item->getVar('book_id')];    // Returns a list of all authors / translators of a book
+			$tbl_livre_auteurs = $tbl_livre_traducteurs = array();
+			foreach ($tbl_tmp2 as $oneauthor) {
+				$auteur = $tbl_infos_auteurs[$oneauthor->getVar('ba_auth_id')];
+				if ($oneauthor->getVar('ba_type') == 1) {
+					$tbl_livre_auteurs[] = $auteur->toArray();
+					$tbl_join1[]         = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
+				} else {
+					$tbl_livre_traducteurs[] = $auteur->toArray();
+					$tbl_join2[]             = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
+				}
+			}
+			if (count($tbl_join1) > 0) {
+				$tbl_tmp['book_joined_authors'] = implode(', ', $tbl_join1);
+			}
+			if (count($tbl_join2) > 0) {
+				$tbl_tmp['book_joined_translators'] = implode(',', $tbl_join2);
+			}
+			$tbl_tmp['book_authors']     = $tbl_livre_auteurs;
+			$tbl_tmp['book_translators'] = $tbl_livre_traducteurs;
+			// Et on place le tout dans le template
+			$block['block_books'][] = $tbl_tmp;
+		}
 
-        return $block;
-    } else {    // La liste des livres est introuvable (on ne trouve pas les livres vendus dans le stock des livres)
+		return $block;
+	} else {    // La liste des livres est introuvable (on ne trouve pas les livres vendus dans le stock des livres)
 
-        return false;
-    }
+		return false;
+	}
 }
 
 /**
@@ -133,24 +133,24 @@ 
  */
 function b_bookshop_top_edit($options)
 {
-    // '10|0';  // See 10 books, for all categories
-    global $xoopsConfig;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
-    include_once BOOKSHOP_PATH . 'class/tree.php';
-    $tblCategories         = array();
-    $tblCategories         = $h_bookshop_cat->GetAllCategories();
-    $mytree                = new Bookshop_XoopsObjectTree($tblCategories, 'cat_cid', 'cat_pid');
-    $form                  = '';
-    $checkeds              = array('', '');
-    $checkeds[$options[1]] = 'checked';
-    $form .= "<table border='0'>";
-    $form .= '<tr><td>' . _MB_BOOKSHOP_BOOKS_CNT . "</td><td><input type='text' name='options[]' id='options' value='" . $options[0] . "' /></td></tr>";
-    //$form .= '<tr><td>'._MB_BOOKSHOP_SORT_ORDER."</td><td><input type='radio' name='options[]' id='options[]' value='0' ".$checkeds[0]." />"._MB_BOOKSHOP_SORT_1." <input type='radio' name='options[]' id='options[]' value='1' ".$checkeds[1]." />"._MB_BOOKSHOP_SORT_2.'</td></tr>';
-    $select = $mytree->makeSelBox('options[]', 'cat_title', '-', $options[1], _MB_BOOKSHOP_ALL_CATEGORIES);
-    $form .= '<tr><td>' . _MB_BOOKSHOP_CATEGORY . '</td><td>' . $select . '</td></tr>';
-    $form .= '</table>';
+	// '10|0';  // See 10 books, for all categories
+	global $xoopsConfig;
+	include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+	include_once BOOKSHOP_PATH . 'class/tree.php';
+	$tblCategories         = array();
+	$tblCategories         = $h_bookshop_cat->GetAllCategories();
+	$mytree                = new Bookshop_XoopsObjectTree($tblCategories, 'cat_cid', 'cat_pid');
+	$form                  = '';
+	$checkeds              = array('', '');
+	$checkeds[$options[1]] = 'checked';
+	$form .= "<table border='0'>";
+	$form .= '<tr><td>' . _MB_BOOKSHOP_BOOKS_CNT . "</td><td><input type='text' name='options[]' id='options' value='" . $options[0] . "' /></td></tr>";
+	//$form .= '<tr><td>'._MB_BOOKSHOP_SORT_ORDER."</td><td><input type='radio' name='options[]' id='options[]' value='0' ".$checkeds[0]." />"._MB_BOOKSHOP_SORT_1." <input type='radio' name='options[]' id='options[]' value='1' ".$checkeds[1]." />"._MB_BOOKSHOP_SORT_2.'</td></tr>';
+	$select = $mytree->makeSelBox('options[]', 'cat_title', '-', $options[1], _MB_BOOKSHOP_ALL_CATEGORIES);
+	$form .= '<tr><td>' . _MB_BOOKSHOP_CATEGORY . '</td><td>' . $select . '</td></tr>';
+	$form .= '</table>';
 
-    return $form;
+	return $form;
 }
 
 /**
@@ -159,10 +159,10 @@ 
  */
 function b_bookshop_top_show_duplicatable($options)
 {
-    $options = explode('|', $options);
-    $block   = &b_bookshop_top_show($options);
+	$options = explode('|', $options);
+	$block   = &b_bookshop_top_show($options);
 
-    $tpl = new XoopsTpl();
-    $tpl->assign('block', $block);
-    $tpl->display('db:bookshop_block_top.tpl');
+	$tpl = new XoopsTpl();
+	$tpl->assign('block', $block);
+	$tpl->display('db:bookshop_block_top.tpl');
 }

Spacing +14 added lines, -14 removed lines

@@ -34,11 +34,11 @@ 
 {
     // '10|0';  // See 10 books, for all categories or a particular category
     global $xoopsConfig, $xoopsTpl;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
+    include XOOPS_ROOT_PATH.'/modules/bookshop/include/common.php';
     $tblLivres = $tblCategories = $tblTmp = $tbl_tmp_vat = $tbl_vat = $tbl_tmp_lang = $block = $tbl_books_id = array();
     $tblLivres = $h_bookshop_books->getMostViewedBooks(0, $options[0], $options[1]);
     if (count($tblLivres) > 0) {
-        $url                  = BOOKSHOP_URL . 'assets/css/bookshop.css';
+        $url                  = BOOKSHOP_URL.'assets/css/bookshop.css';
         $block['nostock_msg'] = bookshop_getmoduleoption('nostock_msg');
         $xoopsTpl->assign('xoops_module_header', "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />");
         $tblTmp = array();
@@ -59,20 +59,20 @@ 
 
         // Get languages *******************************************
         if (count($tbl_tmp_lang) > 0) {
-            $tbl_lang = $h_bookshop_lang->getObjects(new Criteria('lang_id', '(' . implode(',', $tbl_tmp_lang) . ')', 'IN'), true);
+            $tbl_lang = $h_bookshop_lang->getObjects(new Criteria('lang_id', '('.implode(',', $tbl_tmp_lang).')', 'IN'), true);
         }
 
         // Get the list of categories ****************************
-        $tblCategories = $h_bookshop_cat->getObjects(new Criteria('cat_cid', '(' . implode(',', $tblTmp) . ')', 'IN'), true);
+        $tblCategories = $h_bookshop_cat->getObjects(new Criteria('cat_cid', '('.implode(',', $tblTmp).')', 'IN'), true);
 
         // Get VAT ***********************************************
         if (count($tbl_tmp_vat) > 0) {
-            $tbl_vat = $h_bookshop_vat->getObjects(new Criteria('vat_id', '(' . implode(',', $tbl_tmp_vat) . ')', 'IN'), true);
+            $tbl_vat = $h_bookshop_vat->getObjects(new Criteria('vat_id', '('.implode(',', $tbl_tmp_vat).')', 'IN'), true);
         }
 
         // Get the authors, deuxi�me partie **************************
         $tbl_books_auteurs = array();
-        $tbl_auteurs       = $h_bookshop_booksauthors->getObjects(new Criteria('ba_book_id', '(' . implode(',', $tbl_books_id) . ')', 'IN'), true);
+        $tbl_auteurs       = $h_bookshop_booksauthors->getObjects(new Criteria('ba_book_id', '('.implode(',', $tbl_books_id).')', 'IN'), true);
         if (count($tbl_auteurs) > 0) {
             foreach ($tbl_auteurs as $item) {
                 $tbl_tmp_auteurs[] = $item->getVar('ba_auth_id');
@@ -82,7 +82,7 @@ 
             $tbl_tmp_auteurs = array_unique($tbl_tmp_auteurs);
             sort($tbl_tmp_auteurs);
             // Then recovered the information from these authors / translators
-            $tbl_infos_auteurs = $h_bookshop_authors->getObjects(new Criteria('auth_id', '(' . implode(',', $tbl_tmp_auteurs) . ')', 'IN'), true);
+            $tbl_infos_auteurs = $h_bookshop_authors->getObjects(new Criteria('auth_id', '('.implode(',', $tbl_tmp_auteurs).')', 'IN'), true);
         }
         foreach ($tblLivres as $item) {
             $tbl_tmp                            = array();
@@ -95,16 +95,16 @@ 
 
             // Search for  authors / translators
             $tbl_join1         = $tbl_join2 = array();
-            $tbl_tmp2          = $tbl_books_auteurs[$item->getVar('book_id')];    // Returns a list of all authors / translators of a book
+            $tbl_tmp2          = $tbl_books_auteurs[$item->getVar('book_id')]; // Returns a list of all authors / translators of a book
             $tbl_livre_auteurs = $tbl_livre_traducteurs = array();
             foreach ($tbl_tmp2 as $oneauthor) {
                 $auteur = $tbl_infos_auteurs[$oneauthor->getVar('ba_auth_id')];
                 if ($oneauthor->getVar('ba_type') == 1) {
                     $tbl_livre_auteurs[] = $auteur->toArray();
-                    $tbl_join1[]         = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
+                    $tbl_join1[]         = $auteur->getVar('auth_firstname').' '.$auteur->getVar('auth_name');
                 } else {
                     $tbl_livre_traducteurs[] = $auteur->toArray();
-                    $tbl_join2[]             = $auteur->getVar('auth_firstname') . ' ' . $auteur->getVar('auth_name');
+                    $tbl_join2[]             = $auteur->getVar('auth_firstname').' '.$auteur->getVar('auth_name');
                 }
             }
             if (count($tbl_join1) > 0) {
@@ -135,8 +135,8 @@ 
 {
     // '10|0';  // See 10 books, for all categories
     global $xoopsConfig;
-    include XOOPS_ROOT_PATH . '/modules/bookshop/include/common.php';
-    include_once BOOKSHOP_PATH . 'class/tree.php';
+    include XOOPS_ROOT_PATH.'/modules/bookshop/include/common.php';
+    include_once BOOKSHOP_PATH.'class/tree.php';
     $tblCategories         = array();
     $tblCategories         = $h_bookshop_cat->GetAllCategories();
     $mytree                = new Bookshop_XoopsObjectTree($tblCategories, 'cat_cid', 'cat_pid');
@@ -144,10 +144,10 @@ 
     $checkeds              = array('', '');
     $checkeds[$options[1]] = 'checked';
     $form .= "<table border='0'>";
-    $form .= '<tr><td>' . _MB_BOOKSHOP_BOOKS_CNT . "</td><td><input type='text' name='options[]' id='options' value='" . $options[0] . "' /></td></tr>";
+    $form .= '<tr><td>'._MB_BOOKSHOP_BOOKS_CNT."</td><td><input type='text' name='options[]' id='options' value='".$options[0]."' /></td></tr>";
     //$form .= '<tr><td>'._MB_BOOKSHOP_SORT_ORDER."</td><td><input type='radio' name='options[]' id='options[]' value='0' ".$checkeds[0]." />"._MB_BOOKSHOP_SORT_1." <input type='radio' name='options[]' id='options[]' value='1' ".$checkeds[1]." />"._MB_BOOKSHOP_SORT_2.'</td></tr>';
     $select = $mytree->makeSelBox('options[]', 'cat_title', '-', $options[1], _MB_BOOKSHOP_ALL_CATEGORIES);
-    $form .= '<tr><td>' . _MB_BOOKSHOP_CATEGORY . '</td><td>' . $select . '</td></tr>';
+    $form .= '<tr><td>'._MB_BOOKSHOP_CATEGORY.'</td><td>'.$select.'</td></tr>';
     $form .= '</table>';
 
     return $form;