intraface / intraface.dk

src/Intraface/modules/webshop/Basket.php

Spacing +44 added lines, -44 removed lines

@@ -56,13 +56,13 @@ 
         }
 
         $this->webshop = $webshop;
-        $this->sql_extra = " session_id = '" . safeToDb($session_id) . "'";
+        $this->sql_extra = " session_id = '".safeToDb($session_id)."'";
 
         // rydder op i databasen efter fx to timer
         $clean_up_after = 2; // timer
 
         $db = new DB_Sql;
-        $db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL " . $clean_up_after . " HOUR) < NOW()");
+        $db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL ".$clean_up_after." HOUR) < NOW()");
     }
 
     /**
@@ -128,27 +128,27 @@ 
         }
 
         $db->query("SELECT id, quantity FROM basket WHERE product_id = $product_id
-                AND product_detail_id = " . $product_detail_id . "
-                AND basketevaluation_product = " . $basketevaluation . "
-                AND " . $this->sql_extra. "
+                AND product_detail_id = ".$product_detail_id."
+                AND basketevaluation_product = " . $basketevaluation."
+                AND " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
 
         if ($db->nextRecord()) {
             if ($quantity == 0) {
                 $db->query("DELETE FROM basket
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
-                        AND " . $this->sql_extra . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
+                        AND " . $this->sql_extra."
                         AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
             } else {
                 $db->query("UPDATE basket SET
                     quantity = $quantity,
                     date_changed = NOW(),
                     text = '".$text."'
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
 
-                        AND " . $this->sql_extra . "
+                        AND " . $this->sql_extra."
                         AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
             }
             return true;
@@ -158,10 +158,10 @@ 
                         quantity = $quantity,
                         date_changed = NOW(),
                         text = '".$text."',
-                        basketevaluation_product = " . $basketevaluation . ",
+                        basketevaluation_product = " . $basketevaluation.",
                         product_id = $product_id,
                         product_detail_id = ".$product_detail_id.",
-                        intranet_id = " . $this->webshop->kernel->intranet->get('id') . ",
+                        intranet_id = " . $this->webshop->kernel->intranet->get('id').",
                         " . $this->sql_extra);
             return true;
         }
@@ -186,10 +186,10 @@ 
         settype($input['email'], 'string');
         settype($input['phone'], 'string');
 
-        $sql = "name = \"".safeToDb($input['name'])."\"," .
-            "contactperson = \"".safeToDb($input['contactperson'])."\", " .
-            "address = \"".safeToDb($input['address'])."\", " .
-            "postcode = \"".safeToDb($input['postcode'])."\", " .
+        $sql = "name = \"".safeToDb($input['name'])."\",".
+            "contactperson = \"".safeToDb($input['contactperson'])."\", ".
+            "address = \"".safeToDb($input['address'])."\", ".
+            "postcode = \"".safeToDb($input['postcode'])."\", ".
             "city = \"".safeToDb($input['city'])."\", ".
             "country = \"".safeToDb($input['country'])."\", ".
             "cvr = \"".safeToDb($input['cvr'])."\", ".
@@ -251,13 +251,13 @@ 
     public function saveToDb($sql) {
 
         $db = new DB_Sql;
-        $db->query("SELECT id FROM basket_details WHERE " . $this->sql_extra. "
+        $db->query("SELECT id FROM basket_details WHERE ".$this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if ($db->nextRecord()) {
             $db->query("UPDATE basket_details SET ".$sql.",
                 date_changed = NOW()
-                WHERE id = ".$db->f('id') . "
-                    AND " . $this->sql_extra . "
+                WHERE id = ".$db->f('id')."
+                    AND " . $this->sql_extra."
                     AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
             return true;
         } else {
@@ -265,7 +265,7 @@ 
                     SET ".$sql.",
                         date_changed = NOW(),
                            date_created = NOW(),
-                        intranet_id = " . $this->webshop->kernel->intranet->get('id') . ",
+                        intranet_id = " . $this->webshop->kernel->intranet->get('id').",
                         " . $this->sql_extra);
 
             return true;
@@ -284,7 +284,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -313,7 +313,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_coupon
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -334,7 +334,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_ean
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -355,7 +355,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_comment
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -378,9 +378,9 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket
-            WHERE " . $this->sql_extra . "
-                AND product_id = " . $product_id . "
-                AND intranet_id = " . $this->webshop->kernel->intranet->get('id') . "
+            WHERE " . $this->sql_extra."
+                AND product_id = " . $product_id."
+                AND intranet_id = " . $this->webshop->kernel->intranet->get('id')."
       AND quantity > 0 LIMIT 1");
 
         if (!$db->nextRecord()) {
@@ -400,14 +400,14 @@ 
         $price = 0;
 
         $db = new DB_Sql;
-        $db->query("SELECT product_id, quantity FROM basket WHERE " . $this->sql_extra);
+        $db->query("SELECT product_id, quantity FROM basket WHERE ".$this->sql_extra);
 
         while ($db->nextRecord()) {
             $product = new Product($this->webshop->kernel, $db->f("product_id"));
             if ($type == 'exclusive_vat') {
-                $price += $product->get('price') * $db->f("quantity");
+                $price += $product->get('price')*$db->f("quantity");
             } else {
-                $price += $product->get('price_incl_vat') * $db->f("quantity");
+                $price += $product->get('price_incl_vat')*$db->f("quantity");
             }
         }
 
@@ -431,9 +431,9 @@ 
                 ON product.id = basket.product_id
             INNER JOIN product_detail
                 ON product.id = product_detail.product_id
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND product_detail.active = 1
-                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id") . "
+                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id")."
                 AND basket.quantity > 0
             ");
 
@@ -441,7 +441,7 @@ 
         $weight = 0;
 
         while ($db->nextRecord()) {
-            $weight += $db->f('weight') * $db->f('quantity');
+            $weight += $db->f('weight')*$db->f('quantity');
         }
 
         return $weight;
@@ -470,9 +470,9 @@ 
                 ON product.id = basket.product_id
             INNER JOIN product_detail
                 ON product.id = product_detail.product_id
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND product_detail.active = 1
-                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id") . "
+                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id")."
             ORDER BY product_detail.vat DESC, basket.basketevaluation_product");
 
         $i = 0;
@@ -493,8 +493,8 @@ 
 
             // basket specific
             $items[$i]['quantity'] = $db->f('quantity');
-            $items[$i]['totalprice'] = $db->f('quantity') * $items[$i]['price'];
-            $items[$i]['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['price_incl_vat'];
+            $items[$i]['totalprice'] = $db->f('quantity')*$items[$i]['price'];
+            $items[$i]['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['price_incl_vat'];
 
             $i++;
         }
@@ -511,10 +511,10 @@ 
     public function removeEvaluationProducts()
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM basket " .
-                "WHERE basketevaluation_product = 1 " .
-                    "AND " . $this->sql_extra . " " .
-                    "AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
+        $db->query("DELETE FROM basket ".
+                "WHERE basketevaluation_product = 1 ".
+                    "AND ".$this->sql_extra." ".
+                    "AND intranet_id = ".$this->webshop->kernel->intranet->get("id"));
         return true;
 
     }
@@ -527,8 +527,8 @@ 
     public function reset()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE basket SET session_id = '' WHERE " . $this->sql_extra . " AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
-        $db->query("UPDATE basket_details SET session_id = '' WHERE " . $this->sql_extra . " AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
+        $db->query("UPDATE basket SET session_id = '' WHERE ".$this->sql_extra." AND intranet_id = ".$this->webshop->kernel->intranet->get("id"));
+        $db->query("UPDATE basket_details SET session_id = '' WHERE ".$this->sql_extra." AND intranet_id = ".$this->webshop->kernel->intranet->get("id"));
 
         return true;
     }

Doc Comments +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
      * @param integer $product_id Product to remove
      * @param integer $quantity   How many should be removed
      *
-     * @return boelean
+     * @return boolean
      */
     public function remove($product_id, $quantity = 1)
     {

src/Intraface/modules/filemanager/TemporaryFile.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
     /**
      * @var string $file_path
      */
-    private $file_path ;
+    private $file_path;
     
     /**
      * @var string $file_dir
@@ -114,7 +114,7 @@ 
         if (strlen($file_name) > 50) {
             $extension = strrchr($file_name, '.');
             if ($extension !== false && (strlen($extension) == 4 || strlen($extension) == 5)) {
-                $file_name = substr($file_name, 0, 50-strlen($extension)).$extension;
+                $file_name = substr($file_name, 0, 50 - strlen($extension)).$extension;
             }
             else {
                 $file_name = substr($file_name, 0, 50);

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     /**
      * Constructor
      *
-     * @param object $file_handler
+     * @param object $filehandler
      * @param string $file_name the name of the temporary file.
      */
     public function __construct($filehandler, $file_name = null)

src/Intraface/modules/filemanager/Append/File.php

Indentation +12 added lines, -12 removed lines

@@ -20,18 +20,18 @@
         // @todo should add the template for intranet
         //$this->actAs('Intraface_Doctrine_Template_Intranet');
         $options = array('created' =>  array('name'          => 'date_created',    // Name of created column
-                                             'type'          => 'timestamp',     // Doctrine column data type
-                                             'options'       => array(),         // Array of options for column
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
-                                             'disabled'      => false,           // Disable the created column(default)
-                                             'expression'    => 'NOW()'),        // Update column with database expression(default=false)
-                         'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default)
-                                             'type'          => 'timestamp',     // Doctrine column data type(default)
-                                             'options'       => array(),         // Array of options for column(default)
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
-                                             'disabled'      => false,           // Disable the updated column(default)
-                                             'expression'    => 'NOW()',         // Use a database expression to set column(default=false)
-                                             'onInsert'      => true));          // Whether or not to set column onInsert(default)
+                                                'type'          => 'timestamp',     // Doctrine column data type
+                                                'options'       => array(),         // Array of options for column
+                                                'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
+                                                'disabled'      => false,           // Disable the created column(default)
+                                                'expression'    => 'NOW()'),        // Update column with database expression(default=false)
+                            'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default)
+                                                'type'          => 'timestamp',     // Doctrine column data type(default)
+                                                'options'       => array(),         // Array of options for column(default)
+                                                'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
+                                                'disabled'      => false,           // Disable the updated column(default)
+                                                'expression'    => 'NOW()',         // Use a database expression to set column(default=false)
+                                                'onInsert'      => true));          // Whether or not to set column onInsert(default)
 
         $this->actAs('Timestampable', $options);
 

Spacing +13 added lines, -13 removed lines

@@ -19,19 +19,19 @@
     {
         // @todo should add the template for intranet
         //$this->actAs('Intraface_Doctrine_Template_Intranet');
-        $options = array('created' =>  array('name'          => 'date_created',    // Name of created column
-                                             'type'          => 'timestamp',     // Doctrine column data type
-                                             'options'       => array(),         // Array of options for column
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
-                                             'disabled'      => false,           // Disable the created column(default)
-                                             'expression'    => 'NOW()'),        // Update column with database expression(default=false)
-                         'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default)
-                                             'type'          => 'timestamp',     // Doctrine column data type(default)
-                                             'options'       => array(),         // Array of options for column(default)
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
-                                             'disabled'      => false,           // Disable the updated column(default)
-                                             'expression'    => 'NOW()',         // Use a database expression to set column(default=false)
-                                             'onInsert'      => true));          // Whether or not to set column onInsert(default)
+        $options = array('created' =>  array('name'          => 'date_created', // Name of created column
+                                             'type'          => 'timestamp', // Doctrine column data type
+                                             'options'       => array(), // Array of options for column
+                                             'format'        => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default)
+                                             'disabled'      => false, // Disable the created column(default)
+                                             'expression'    => 'NOW()'), // Update column with database expression(default=false)
+                         'updated' =>  array('name'          => 'date_updated', // Name of updated column(default)
+                                             'type'          => 'timestamp', // Doctrine column data type(default)
+                                             'options'       => array(), // Array of options for column(default)
+                                             'format'        => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default)
+                                             'disabled'      => false, // Disable the updated column(default)
+                                             'expression'    => 'NOW()', // Use a database expression to set column(default=false)
+                                             'onInsert'      => true)); // Whether or not to set column onInsert(default)
 
         $this->actAs('Timestampable', $options);
 

src/Intraface/modules/filemanager/ImageRandomizer.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
     public function getRandomImage()
     {
         require_once 'Intraface/modules/filemanager/FileHandler.php';
-        $key = rand(0, count($this->file_list)-1);
+        $key = rand(0, count($this->file_list) - 1);
         $filehandler = new FileHandler($this->file_manager->getKernel(), $this->file_list[$key]);
         return $filehandler;
     }

Doc Comments +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
     /**
      * Constructor
      *
-     * @param object $file_manager file handler
+     * @param Intraface_modules_filemanager_FileManager $file_manager file handler
      * @param array  $keywords     array with keywords
      *
      * @return void
@@ -70,7 +70,7 @@ 
     /**
      * returns dbquery
      *
-     * @return object dbquery
+     * @return Ilib_DBQuery dbquery
      */
     protected function getDBQuery()
     {
@@ -86,7 +86,7 @@ 
     /**
      * return an file object with random image
      *
-     * @return object file_manager with random image loaded
+     * @return FileHandler file_manager with random image loaded
      */
     public function getRandomImage()
     {

src/Intraface/modules/email/Controller/Index.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         	'email_shared' => $email_shared
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/index');
         return $tpl->render($this, $data);
     }
 

src/Intraface/modules/intranetmaintenance/IntranetMaintenance.php

Indentation +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
             $this->id = $this->db->lastInsertID('intranet', 'id');
 
             if (PEAR::isError($this->id)) {
-                   throw new Exception("Error in IntranetMaintenance: ".$id->getMessage());
+                    throw new Exception("Error in IntranetMaintenance: ".$id->getMessage());
             }
             $this->load();
         } else {

Spacing +3 added lines, -3 removed lines

@@ -288,7 +288,7 @@ 
         $intranet = array();
         $db = $this->dbquery->getRecordset('DISTINCT(intranet.id), intranet.name');
         while ($db->nextRecord()) {
-            $intranet[$i]['id'] =   $db->f('id');
+            $intranet[$i]['id'] = $db->f('id');
             $intranet[$i]['name'] = $db->f('name');
             $i++;
         }
@@ -316,7 +316,7 @@ 
      */
     function setContact($contact_id)
     {
-        $this->db->query("UPDATE intranet SET contact_id = ".intval($contact_id)." WHERE id = " . intval($this->id));
+        $this->db->query("UPDATE intranet SET contact_id = ".intval($contact_id)." WHERE id = ".intval($this->id));
         return true;
     }
 
@@ -333,7 +333,7 @@ 
 
     private function identifierIsUnique($identifier)
     {
-        $result = $this->db->query("SELECT identifier FROM intranet WHERE identifier = ".$this->db->quote($identifier, 'text')." AND id <> " . intval($this->id));
+        $result = $this->db->query("SELECT identifier FROM intranet WHERE identifier = ".$this->db->quote($identifier, 'text')." AND id <> ".intval($this->id));
         if ($result->numRows() > 1) {
             return false;
         }

Doc Comments +3 added lines, -3 removed lines

@@ -116,7 +116,7 @@ 
      * Removes the intranets access to a module
      *
      * @param mixed module_id either name or id on module
-     * @return boolean true on success
+     * @return null|boolean true on success
      */
     public function removeModuleAccess($module_id)
     {
@@ -230,6 +230,7 @@ 
 
     /**
      * Saves who the intranet is maintained by
+     * @return boolean
      */
     public function setMaintainedByUser($id, $current_intranet_id)
     {
@@ -322,8 +323,7 @@ 
     /**
      * returns the RandomKeyGenerator
      *
-     * @param integer $length the length of the generated key
-     * @return object RandomKeyGenerator
+     * @return Ilib_RandomKeyGenerator RandomKeyGenerator
      */
     private function getRandomKeyGenerator()
     {

src/Intraface/modules/intranetmaintenance/Controller/Intranet/Index.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
             'intranet_maintenance' => $this->getIntranetmaintenance()
         );
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/index');
         return $smarty->render($this, $data);
     }
 
@@ -40,7 +40,7 @@ 
         $modul = $this->getKernel()->module("intranetmaintenance");
         $translation = $this->getKernel()->getTranslation('intranetmaintenance');
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/edit');
         return $smarty->render($this);
     }
 

src/Intraface/modules/intranetmaintenance/Controller/Index.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
     function renderHtml()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
         return $smarty->render($this);
     }
 

src/Intraface/modules/intranetmaintenance/Controller/Modules.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     {
         $module = $this->getModule();
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/modules');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/modules');
         return $smarty->render($this);
     }