intraface / intraface.dk

src/Intraface/modules/cms/section/Longtext.php

Doc Comments +3 added lines

@@ -52,6 +52,9 @@
         return true;

     }

 

+    /**
+     * @param string[] $array
+     */
     public static function convertArrayToTags($array)

     {

         $tags = '';

src/Intraface/modules/cms/Stylesheet.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
     private $cmssite;

     public $error;

 

+    /**
+     * @param CMS_Site $cmssite
+     */
     function __construct($cmssite)

     {

         if (!is_object($cmssite) OR strtolower(get_class($cmssite)) != 'cms_site') {

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     function __construct($cmssite)

     {

         if (!is_object($cmssite) OR strtolower(get_class($cmssite)) != 'cms_site') {

-            throw new Exception('CMS_Stylesheet::__construct needs CMS_Site - got ' . get_class($cmssite));

+            throw new Exception('CMS_Stylesheet::__construct needs CMS_Site - got '.get_class($cmssite));

         }

         $this->cmssite = $cmssite;

         $this->error = new Intraface_Error;

src/Intraface/modules/cms/Template.php

Doc Comments +3 added lines

@@ -65,6 +65,9 @@
         return 'cms_template';

     }

 

+    /**
+     * @param DB_Sql $db
+     */
     function getPosition($db)

     {

         return new Ilib_Position($db, 'cms_template', $this->id, 'site_id = ' . $this->cmssite->get('id'), 'id', 'position');

Spacing +8 added lines, -8 removed lines

@@ -67,7 +67,7 @@ 
 

     function getPosition($db)

     {

-        return new Ilib_Position($db, 'cms_template', $this->id, 'site_id = ' . $this->cmssite->get('id'), 'id', 'position');

+        return new Ilib_Position($db, 'cms_template', $this->id, 'site_id = '.$this->cmssite->get('id'), 'id', 'position');

     }

 

     /**

@@ -78,7 +78,7 @@ 
         switch ($type) {

             case 'id':

                 $db = new DB_Sql;

-                $db->query("SELECT site_id, id FROM cms_template WHERE id = " . $id . " AND intranet_id = " . $kernel->intranet->get('id'));

+                $db->query("SELECT site_id, id FROM cms_template WHERE id = ".$id." AND intranet_id = ".$kernel->intranet->get('id'));

                 if (!$db->nextRecord()) {

                     return false;

                 }

@@ -97,7 +97,7 @@ 
     function load()

     {

         $db = new DB_Sql;

-        $db->query("SELECT id, name, site_id, identifier, for_page_type FROM cms_template WHERE intranet_id = " . $this->cmssite->kernel->intranet->get('id') . " AND id = " . $this->id);

+        $db->query("SELECT id, name, site_id, identifier, for_page_type FROM cms_template WHERE intranet_id = ".$this->cmssite->kernel->intranet->get('id')." AND id = ".$this->id);

 

         if (!$db->nextRecord()) {

             return 0;

@@ -146,12 +146,12 @@ 
         $db = new DB_Sql;

         if ($this->id > 0) {

             $sql_type = "UPDATE ";

-            $sql_end = " WHERE id = " . $this->id;

+            $sql_end = " WHERE id = ".$this->id;

         } else {

             $sql_type = "INSERT INTO ";

             $sql_end = ", date_created = NOW()";

         }

-        $db->query($sql_type . " cms_template SET

+        $db->query($sql_type." cms_template SET

             name = '".safeToDb($var['name'])."',

             date_updated = NOW(),

             intranet_id = ".safeToDb($this->cmssite->kernel->intranet->get('id')).",

@@ -180,7 +180,7 @@ 
             $sql_extra = '';

         }

 

-        $db->query("SELECT id, name, identifier, for_page_type FROM cms_template WHERE ".$sql_extra." intranet_id = " . $this->cmssite->kernel->intranet->get('id') . " AND site_id = " . $this->cmssite->get('id') . " AND active = 1 ORDER BY name");

+        $db->query("SELECT id, name, identifier, for_page_type FROM cms_template WHERE ".$sql_extra." intranet_id = ".$this->cmssite->kernel->intranet->get('id')." AND site_id = ".$this->cmssite->get('id')." AND active = 1 ORDER BY name");

         $i = 0;

         $templates = array();

         while ($db->nextRecord()) {

@@ -213,14 +213,14 @@ 
     function delete()

     {

         $db = new DB_Sql;

-        $db->query("UPDATE cms_template SET active = 0 WHERE id = " . $this->id);

+        $db->query("UPDATE cms_template SET active = 0 WHERE id = ".$this->id);

         return true;

     }

 

     function isIdentifierUnique($identifier)

     {

         $db = new DB_Sql;

-        $db->query("SELECT id FROM cms_template WHERE site_id = " . $this->cmssite->get('id') . " AND identifier = '".$identifier."' AND active = 1 AND id != " . $this->id);

+        $db->query("SELECT id FROM cms_template WHERE site_id = ".$this->cmssite->get('id')." AND identifier = '".$identifier."' AND active = 1 AND id != ".$this->id);

         if ($db->numRows() == 0) {

             return true;

         } else {

src/Intraface/modules/cms/TemplateSection.php

Doc Comments +6 added lines

@@ -62,11 +62,17 @@
         return new CMS_Parameter($this);

     }

 

+    /**
+     * @param string $key
+     */
     function addParameter($key, $value)

     {

         return $this->parameter->save($key, $value);

     }

 

+    /**
+     * @param string $type
+     */
     function factory($object, $type, $value)

     {

         $class_prefix = 'Intraface_modules_cms_templatesection_';

Spacing +15 added lines, -15 removed lines

@@ -31,11 +31,11 @@ 
             throw new Exception('TemplateSection::__construct skal bruge CMS_Template');

         }

         $this->error    = new Intraface_Error;

-        $this->id       = (int) $id;

+        $this->id       = (int)$id;

         $this->template = $template;

         $this->kernel   = $template->kernel;

 

-        $this->value['identify_as'] = 'cms_template_section';  // bruges af parameter

+        $this->value['identify_as'] = 'cms_template_section'; // bruges af parameter

 

         $this->parameter = $this->createParameterObject();

 

@@ -75,7 +75,7 @@ 
                 // validering p� value

                 // kun v�re gyldige elementtyper

                 // object skal vre cmspage

-                $class = $class_prefix . ucfirst($value);

+                $class = $class_prefix.ucfirst($value);

                 return new $class($object);

                 break;

             case 'id':

@@ -84,12 +84,12 @@ 
                 $section_types = $cms_module->getSetting('section_types');

 

                 $db = new DB_Sql;

-                $db->query("SELECT id, type_key, template_id FROM cms_template_section WHERE id = " . $value . " AND intranet_id = " . $object->intranet->get('id'));

+                $db->query("SELECT id, type_key, template_id FROM cms_template_section WHERE id = ".$value." AND intranet_id = ".$object->intranet->get('id'));

                 if (!$db->nextRecord()) {

                     return false;

                 }

 

-                $class = $class_prefix . ucfirst($section_types[$db->f('type_key')]);

+                $class = $class_prefix.ucfirst($section_types[$db->f('type_key')]);

                 return new $class(CMS_Template::factory($object, 'id', $db->f('template_id')), $db->f('id'));

 

                 break;

@@ -99,12 +99,12 @@ 
                 $section_types = $cms_module->getSetting('section_types');

 

                 $db = new DB_Sql;

-                $db->query("SELECT id, type_key FROM cms_template_section WHERE id = " . $value . " AND intranet_id = " . $object->kernel->intranet->get('id'));

+                $db->query("SELECT id, type_key FROM cms_template_section WHERE id = ".$value." AND intranet_id = ".$object->kernel->intranet->get('id'));

                 if (!$db->nextRecord()) {

                     return false;

                 }

 

-                $class = $class_prefix . ucfirst($section_types[$db->f('type_key')]);

+                $class = $class_prefix.ucfirst($section_types[$db->f('type_key')]);

                 return new $class($object, $db->f('id'));

 

                 break;

@@ -117,7 +117,7 @@ 
     function load()

     {

         $db = new DB_Sql;

-        $db->query("SELECT id, name, identifier, type_key, locked FROM cms_template_section WHERE cms_template_section.intranet_id = ".$this->template->cmssite->kernel->intranet->get('id')." AND cms_template_section.id = " . $this->id);

+        $db->query("SELECT id, name, identifier, type_key, locked FROM cms_template_section WHERE cms_template_section.intranet_id = ".$this->template->cmssite->kernel->intranet->get('id')." AND cms_template_section.id = ".$this->id);

         if (!$db->nextRecord()) {

             return 0;

         }

@@ -145,7 +145,7 @@ 
             $this->error->set('error in identifier - cannot be empty');

         }

 

-        if (!Validate::string($var['identifier'], array('format' => VALIDATE_ALPHA . VALIDATE_NUM . '-_'))) {

+        if (!Validate::string($var['identifier'], array('format' => VALIDATE_ALPHA.VALIDATE_NUM.'-_'))) {

             $this->error->set('error in identfier - allowed characters are a-z and 1-9');

         }

         if ($this->isIdentifierUnique($var['identifier'])) {

@@ -176,12 +176,12 @@ 
             $sql_end = ", date_created = NOW()";

         } else {

             $sql_type = "UPDATE ";

-            $sql_end = " WHERE id = " . $this->id;

+            $sql_end = " WHERE id = ".$this->id;

         }

-        $sql = $sql_type . " cms_template_section SET

+        $sql = $sql_type." cms_template_section SET

                 name = '".safeToDb($var['name'])."',

                 identifier = '".safeToDb($var['identifier'])."',

-                site_id = " . $this->template->cmssite->get('id') . ",

+                site_id = " . $this->template->cmssite->get('id').",

                 intranet_id = ".$this->template->kernel->intranet->get('id').",

                 template_id = ".$this->template->get('id').",

                 type_key = ".$this->value['type_key'].",

@@ -211,14 +211,14 @@ 
     function delete()

     {

         $db = new DB_Sql;

-        $db->query("UPDATE cms_template_section SET active = 0 WHERE id = " . $this->id);

+        $db->query("UPDATE cms_template_section SET active = 0 WHERE id = ".$this->id);

         return true;

     }

 

     function getList()

     {

         $db = new DB_Sql;

-        $db->query("SELECT id, name, identifier, type_key FROM cms_template_section WHERE template_id = " . $this->template->get('id') . " AND intranet_id = " . $this->kernel->intranet->get('id') . " AND active = 1 ORDER BY position ASC");

+        $db->query("SELECT id, name, identifier, type_key FROM cms_template_section WHERE template_id = ".$this->template->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 ORDER BY position ASC");

 

         $i = 0;

         $sections = array();

@@ -237,7 +237,7 @@ 
     function isIdentifierUnique($identifier)

     {

         $db = new DB_Sql;

-        $db->query("SELECT count(*) AS antal FROM cms_template_section WHERE identifier = '".$identifier."' AND intranet_id = " . $this->kernel->intranet->get('id') . " AND template_id = " . $this->template->get('id') . " AND active = 1 AND id != " . $this->id);

+        $db->query("SELECT count(*) AS antal FROM cms_template_section WHERE identifier = '".$identifier."' AND intranet_id = ".$this->kernel->intranet->get('id')." AND template_id = ".$this->template->get('id')." AND active = 1 AND id != ".$this->id);

         if (!$db->nextRecord()) {

             return 0;

         }

src/Intraface/modules/cms/templatesection/Mixed.php

Doc Comments +3 added lines

@@ -6,6 +6,9 @@
  */

 class Intraface_modules_cms_templatesection_Mixed extends CMS_TemplateSection

 {

+    /**
+     * @param CMS_Template $cmspage
+     */
     function __construct($cmspage, $id = 0)

     {

         $this->value['type'] = 'mixed';

src/Intraface/modules/contact/Contact.php

Doc Comments +6 added lines, -23 removed lines

@@ -257,8 +257,6 @@ 
      *

      * @param object $kernel

      * @param string $type   What should the contact object be created from

-     * @param string $id     The value which corresponds to the type

-     *

      * @return  object

      */

     public function factory($kernel, $type, $value)

@@ -318,7 +316,7 @@ 
     /**

      * Loads values for the contact into an array

      *

-     * @return true on success

+     * @return boolean on success

      */

     private function load()

     {

@@ -394,7 +392,7 @@ 
      *

      * @param array $var Values to validate

      *

-     * @return true on success

+     * @return boolean on success

      */

     public function validate($var)

     {

@@ -502,21 +500,6 @@ 
     /**

      * Saves the contact

      *

-     * @param	int $var['id']	Kundeid

-     * @param	string $var['company']

-     * @param	string $var['address']

-     * @param	string $var['postalcode']

-     * @param	string $var['town']

-     * @param	string $var['country']

-     * @param	string $var['email']

-     * @param	string $var['website']

-     * @param	string $var['phone']

-     * @param	string $var['deliveryaddress']

-     * @param	string $var['deliverypostalcode']

-     * @param	string $var['deliverytown']

-     * @param	string $var['deliverycountry']

-     * @param	string $var['paymentcondition']

-     *

      * @return void

      */

     public function save($var)

@@ -616,7 +599,7 @@ 
      *

      * Never delete a contact entirely. Should only be deactivated.

      *

-     * @return integer	0 = false eller 1 = true

+     * @return boolean	0 = false eller 1 = true

      */

     public function delete()

     {

@@ -659,7 +642,7 @@ 
      *

      * @param string $number

      *

-     * @return true hvis det er frit

+     * @return boolean hvis det er frit

      */

     public function isNumberFree($number)

     {

@@ -822,7 +805,7 @@ 
      *

      * TODO M�ske burde denne metode hedde loadKeywords()?

      *

-     * @return object

+     * @return Keyword

      */

     function getKeywords()

     {

@@ -858,7 +841,7 @@ 
      *

      * @param integer $id Optional id of the contact person

      *

-     * @return object

+     * @return ContactPerson

      */

     function loadContactPerson($id = 0)

     {

Indentation -3 removed lines

@@ -105,9 +105,6 @@
 

  function getContacts()

  }

-

-

-

  *

  * @package Intraface_Contact

  * @author	Lars Olesen <lars@legestue.net>

Spacing +25 added lines, -25 removed lines

@@ -119,7 +119,7 @@ 
  * @license

  *

  */

-require_once dirname(__FILE__) . '/ContactPerson.php';

+require_once dirname(__FILE__).'/ContactPerson.php';

 require_once 'Intraface/functions.php';

 

 class Contact extends Intraface_Standard

@@ -266,7 +266,7 @@ 
         // Husk noget validering af de forskellige values og typer

         $gateway = new Intraface_modules_contact_ContactGateway($kernel, new DB_Sql);

         try {

-            switch($type) {

+            switch ($type) {

                 case 'email':

                     $emails = $gateway->findByEmail($value);

                     return $emails[0];

@@ -386,7 +386,7 @@ 
     {

         // HACK NECCESSARY FOR THE NEWSLETTERSUBSCRIBER

         $this->kernel->useModule('contact');

-        return ($this->value['login_url'] = 'http://' . $this->kernel->getSetting()->get('intranet', 'contact.login_url') . '/' .$this->kernel->intranet->get('identifier') . '/login?code='. $this->get('code'));

+        return ($this->value['login_url'] = 'http://'.$this->kernel->getSetting()->get('intranet', 'contact.login_url').'/'.$this->kernel->intranet->get('identifier').'/login?code='.$this->get('code'));

     }

 

     /**

@@ -556,16 +556,16 @@ 
 

         // prepare sql to update or insert

         if ($this->id > 0) {

-            $sql="UPDATE contact ";

-            $sql_after=" WHERE id='".$this->id."'";

+            $sql = "UPDATE contact ";

+            $sql_after = " WHERE id='".$this->id."'";

             $sql_create = "";

         } else {

-            $sql="INSERT INTO contact ";

-            $sql_after = ", code='".safeToDb(md5(date('Y-m-d H:i:s') . $sql_items))."'";

+            $sql = "INSERT INTO contact ";

+            $sql_after = ", code='".safeToDb(md5(date('Y-m-d H:i:s').$sql_items))."'";

             $sql_create = "date_created = NOW(),";

         }

 

-        $sql .= " SET	".$sql_create. "

+        $sql .= " SET	".$sql_create."

             intranet_id = '". $this->kernel->intranet->get('id')."',"

             .$sql_items.

             "date_changed = NOW()

@@ -595,7 +595,7 @@ 
             // Delivery Address

             foreach ($address_fields AS $key=>$value) {

                 if (array_key_exists('delivery_'.$value, $var)) {

-                    $delivery_address_to_save[$value] = $var['delivery_' . $value];

+                    $delivery_address_to_save[$value] = $var['delivery_'.$value];

                 }

             }

 

@@ -629,7 +629,7 @@ 
             return false;

         }

         $db = new DB_Sql;

-        $db->query("UPDATE contact SET active = 0, date_changed = NOW() WHERE intranet_id = " . $this->kernel->intranet->get("id") . " AND id = " . $this->id);

+        $db->query("UPDATE contact SET active = 0, date_changed = NOW() WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND id = ".$this->id);

         return true;

     }

 

@@ -649,7 +649,7 @@ 
             return false;

         }

         $db = new DB_Sql;

-        $db->query("UPDATE contact SET active = 1, date_changed = NOW() WHERE intranet_id = " . $this->kernel->intranet->get("id") . " AND id = " . $this->id);

+        $db->query("UPDATE contact SET active = 1, date_changed = NOW() WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND id = ".$this->id);

 

         return true;

     }

@@ -667,9 +667,9 @@ 
         $db = new DB_Sql();

         $sql = "SELECT id

             FROM contact

-            WHERE intranet_id = " . $this->kernel->intranet->get("id") . "

-                AND number = " . (int)$number . "

-                AND id <> " . $this->id . "

+            WHERE intranet_id = " . $this->kernel->intranet->get("id")."

+                AND number = " . (int)$number."

+                AND id <> " . $this->id."

                 AND active = 1

             LIMIT 1";

         $db->query($sql);

@@ -689,7 +689,7 @@ 
     public function getMaxNumber()

     {

         $db = new DB_Sql();

-        $db->query("SELECT number FROM contact WHERE intranet_id = " . $this->kernel->intranet->get("id") . " ORDER BY number DESC");

+        $db->query("SELECT number FROM contact WHERE intranet_id = ".$this->kernel->intranet->get("id")." ORDER BY number DESC");

         if (!$db->nextRecord()) {

             return 0;

         }

@@ -781,11 +781,11 @@ 
                 WHERE address.type=3

                     AND contact.active = 1

                     AND address.active = 1

-                    AND contact.intranet_id = " . $db->quote($this->kernel->intranet->get('id'), 'integer') . "

-                    AND contact.id != " . $db->quote($this->id, 'integer') . "

+                    AND contact.intranet_id = " . $db->quote($this->kernel->intranet->get('id'), 'integer')."

+                    AND contact.id != " . $db->quote($this->id, 'integer')."

                     AND (

-                        (address.email = " . $db->quote($this->address->get('email'), 'text') . " AND address.email != '')

-                        OR (address.phone = " . $db->quote($this->address->get('phone'), 'text') . " AND address.phone != ''))

+                        (address.email = " . $db->quote($this->address->get('email'), 'text')." AND address.email != '')

+                        OR (address.phone = " . $db->quote($this->address->get('phone'), 'text')." AND address.phone != ''))

 

                     ";

 

@@ -874,7 +874,7 @@ 
     function isFilledIn()

     {

         $db = new DB_Sql;

-        $db->query("SELECT count(*) AS antal FROM contact WHERE intranet_id = " . $this->kernel->intranet->get('id'));

+        $db->query("SELECT count(*) AS antal FROM contact WHERE intranet_id = ".$this->kernel->intranet->get('id'));

         if ($db->nextRecord()) {

             return $db->f('antal');

         }

@@ -892,7 +892,7 @@ 
             return false;

         }

         $db = new DB_Sql;

-        $db->query("UPDATE contact SET code = '".md5($this->id . date('Y-m-d H:i:s') . $this->kernel->intranet->get('id'))."' WHERE id = " . $this->id);

+        $db->query("UPDATE contact SET code = '".md5($this->id.date('Y-m-d H:i:s').$this->kernel->intranet->get('id'))."' WHERE id = ".$this->id);

         $this->load();

         return true;

     }

@@ -909,7 +909,7 @@ 
             return false;

         }

         $db = new DB_Sql;

-        $db->query("UPDATE contact SET password = '".md5($this->id . date('Y-m-d H:i:s') . $this->kernel->intranet->get('id'))."' WHERE id = " . $this->id);

+        $db->query("UPDATE contact SET password = '".md5($this->id.date('Y-m-d H:i:s').$this->kernel->intranet->get('id'))."' WHERE id = ".$this->id);

         $this->load();

         return true;

     }

@@ -922,7 +922,7 @@ 
     function getNewsletterSubscriptions()

     {

         $db = new DB_Sql;

-        $db->query("SELECT * FROM newsletter_subscriber WHERE optin = 1 AND active = 1 AND contact_id = " . $this->id . " AND intranet_id =" . $this->kernel->intranet->get('id'));

+        $db->query("SELECT * FROM newsletter_subscriber WHERE optin = 1 AND active = 1 AND contact_id = ".$this->id." AND intranet_id =".$this->kernel->intranet->get('id'));

         $lists = array();

         while ($db->nextRecord()) {

             $lists[] = $db->f('list_id');

@@ -938,7 +938,7 @@ 
     function needNewsletterOptin()

     {

         $db = new DB_Sql;

-        $db->query("SELECT list_id, code FROM newsletter_subscriber WHERE optin = 0 AND contact_id = " . $this->id . " AND intranet_id =" . $this->kernel->intranet->get('id'));

+        $db->query("SELECT list_id, code FROM newsletter_subscriber WHERE optin = 0 AND contact_id = ".$this->id." AND intranet_id =".$this->kernel->intranet->get('id'));

         $lists = array();

         $i = 0;

         while ($db->nextRecord()) {

@@ -959,7 +959,7 @@ 
     function canBeDeleted()

     {

         $db = new DB_Sql;

-        $db->query("SELECT * FROM debtor WHERE contact_id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));

+        $db->query("SELECT * FROM debtor WHERE contact_id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));

         if (!$db->nextRecord()) {

             return true;

         }

src/Intraface/modules/contact/ContactReminder.php

Doc Comments +3 added lines

@@ -124,6 +124,9 @@
         }
     }
 
+    /**
+     * @param integer $id
+     */
     public function factory($kernel, $id)
     {
         $gateway = new Intraface_modules_contact_MemosGateway($kernel);

Indentation +25 added lines, -25 removed lines

@@ -223,11 +223,11 @@ 
             $this->id = $this->db->lastInsertID();
         }
 
-         if (PEAR::isError($result)) {
-             throw new Exception('Could not save information in ContactReminder->update' . $result->getUserInfo());
-             return false;
-         }
-         return $this->id;
+            if (PEAR::isError($result)) {
+                throw new Exception('Could not save information in ContactReminder->update' . $result->getUserInfo());
+                return false;
+            }
+            return $this->id;
     }
 
     /**
@@ -243,12 +243,12 @@ 
          * @todo: validation needed - not crucial as we are setting the postpone date
          */
         $result = $this->db->exec('UPDATE contact_reminder_single SET date_changed = NOW(), reminder_date = ' .$this->db->quote($date, 'date').' WHERE intranet_id = '.$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
-         if (PEAR::isError($result)) {
-             throw new Exception('Could not postphone reminder' . $result->getUserInfo());
-             return false;
-         }
-         $this->load();
-         return true;
+            if (PEAR::isError($result)) {
+                throw new Exception('Could not postphone reminder' . $result->getUserInfo());
+                return false;
+            }
+            $this->load();
+            return true;
     }
 
     /**
@@ -274,14 +274,14 @@ 
                 'WHERE contact_reminder_single.reminder_date < DATE_ADD(NOW(), INTERVAL 30 DAY) AND contact_reminder_single.intranet_id = ' .$db->quote($kernel->intranet->get('id'), 'integer').' AND contact_reminder_single.active = 1 AND contact_reminder_single.status_key = 1 ' .
                 'ORDER BY contact_reminder_single.reminder_date ASC'
             );
-         if (PEAR::isError($result)) {
-             die($result->getUserInfo());
-             return false;
-         }
-         if ($result->numRows() == 0) {
-             return array();
-         }
-         return $result->fetchAll(MDB2_FETCHMODE_ASSOC);
+            if (PEAR::isError($result)) {
+                die($result->getUserInfo());
+                return false;
+            }
+            if ($result->numRows() == 0) {
+                return array();
+            }
+            return $result->fetchAll(MDB2_FETCHMODE_ASSOC);
 
     }
 
@@ -296,12 +296,12 @@ 
         $status_key = array_search($status, $this->status_types);
 
         $result = $this->db->exec('UPDATE contact_reminder_single SET date_changed = NOW(), status_key = ' .$this->db->quote($status_key, 'integer').' WHERE intranet_id = '.$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
-         if (PEAR::isError($result)) {
-             throw new Exception('Could not postphone reminder' . $result->getUserInfo());
-             return false;
-         }
-         $this->load();
-         return true;
+            if (PEAR::isError($result)) {
+                throw new Exception('Could not postphone reminder' . $result->getUserInfo());
+                return false;
+            }
+            $this->load();
+            return true;
 
     }
 

Spacing +18 added lines, -18 removed lines

@@ -199,9 +199,9 @@ 
             throw new Exception("Was not able to convert date in ContactReminder->update");
         }
 
-        $sql = "reminder_date = ".$this->db->quote($date->get(), 'date')."," .
-                "date_changed = NOW()," .
-                "subject = ".$this->db->quote($input['subject'], 'text')."," .
+        $sql = "reminder_date = ".$this->db->quote($date->get(), 'date').",".
+                "date_changed = NOW(),".
+                "subject = ".$this->db->quote($input['subject'], 'text').",".
                 "description = ".$this->db->quote($input['description'], 'text')."";
 
         if ($this->error->isError()) {
@@ -214,17 +214,17 @@ 
         } else {
 
             $result = $this->db->exec("INSERT INTO contact_reminder_single SET ".$sql.", ".
-                "intranet_id = ".$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer')."," .
-                "contact_id = ".$this->db->quote($this->contact->get('id'), 'integer')."," .
-                "created_by_user_id = ".$this->db->quote($this->contact->kernel->user->get('id'), 'integer')."," .
-                "status_key = 1," .
-                "date_created = NOW()," .
+                "intranet_id = ".$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').",".
+                "contact_id = ".$this->db->quote($this->contact->get('id'), 'integer').",".
+                "created_by_user_id = ".$this->db->quote($this->contact->kernel->user->get('id'), 'integer').",".
+                "status_key = 1,".
+                "date_created = NOW(),".
                 "active = 1");
             $this->id = $this->db->lastInsertID();
         }
 
          if (PEAR::isError($result)) {
-             throw new Exception('Could not save information in ContactReminder->update' . $result->getUserInfo());
+             throw new Exception('Could not save information in ContactReminder->update'.$result->getUserInfo());
              return false;
          }
          return $this->id;
@@ -242,9 +242,9 @@ 
         /**
          * @todo: validation needed - not crucial as we are setting the postpone date
          */
-        $result = $this->db->exec('UPDATE contact_reminder_single SET date_changed = NOW(), reminder_date = ' .$this->db->quote($date, 'date').' WHERE intranet_id = '.$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
+        $result = $this->db->exec('UPDATE contact_reminder_single SET date_changed = NOW(), reminder_date = '.$this->db->quote($date, 'date').' WHERE intranet_id = '.$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
          if (PEAR::isError($result)) {
-             throw new Exception('Could not postphone reminder' . $result->getUserInfo());
+             throw new Exception('Could not postphone reminder'.$result->getUserInfo());
              return false;
          }
          $this->load();
@@ -267,11 +267,11 @@ 
 
         $db = MDB2::singleton(DB_DSN);
         //
-        $result = $db->query('SELECT contact_reminder_single.*, DATE_FORMAT(contact_reminder_single.reminder_date, "%d-%m-%Y") AS dk_reminder_date, address.name AS contact_name ' .
-                'FROM contact_reminder_single ' .
-                'INNER JOIN contact ON (contact_reminder_single.contact_id = contact.id AND contact.intranet_id = '.$db->quote($kernel->intranet->get('id'), 'integer') . ' AND contact.active = 1) '.
-                'LEFT JOIN address ON (address.belong_to_id = contact.id AND address.type = 3 AND address.active = 1) ' .
-                'WHERE contact_reminder_single.reminder_date < DATE_ADD(NOW(), INTERVAL 30 DAY) AND contact_reminder_single.intranet_id = ' .$db->quote($kernel->intranet->get('id'), 'integer').' AND contact_reminder_single.active = 1 AND contact_reminder_single.status_key = 1 ' .
+        $result = $db->query('SELECT contact_reminder_single.*, DATE_FORMAT(contact_reminder_single.reminder_date, "%d-%m-%Y") AS dk_reminder_date, address.name AS contact_name '.
+                'FROM contact_reminder_single '.
+                'INNER JOIN contact ON (contact_reminder_single.contact_id = contact.id AND contact.intranet_id = '.$db->quote($kernel->intranet->get('id'), 'integer').' AND contact.active = 1) '.
+                'LEFT JOIN address ON (address.belong_to_id = contact.id AND address.type = 3 AND address.active = 1) '.
+                'WHERE contact_reminder_single.reminder_date < DATE_ADD(NOW(), INTERVAL 30 DAY) AND contact_reminder_single.intranet_id = '.$db->quote($kernel->intranet->get('id'), 'integer').' AND contact_reminder_single.active = 1 AND contact_reminder_single.status_key = 1 '.
                 'ORDER BY contact_reminder_single.reminder_date ASC'
             );
          if (PEAR::isError($result)) {
@@ -295,9 +295,9 @@ 
     {
         $status_key = array_search($status, $this->status_types);
 
-        $result = $this->db->exec('UPDATE contact_reminder_single SET date_changed = NOW(), status_key = ' .$this->db->quote($status_key, 'integer').' WHERE intranet_id = '.$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
+        $result = $this->db->exec('UPDATE contact_reminder_single SET date_changed = NOW(), status_key = '.$this->db->quote($status_key, 'integer').' WHERE intranet_id = '.$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
          if (PEAR::isError($result)) {
-             throw new Exception('Could not postphone reminder' . $result->getUserInfo());
+             throw new Exception('Could not postphone reminder'.$result->getUserInfo());
              return false;
          }
          $this->load();

src/Intraface/modules/debtor/Controller/Collection.php

Doc Comments +3 added lines

@@ -548,6 +548,9 @@
         return 'Create';
     }
 
+    /**
+     * @return string
+     */
     function getType()
     {
         return $this->context->getType();

Indentation +17 added lines, -17 removed lines

@@ -79,8 +79,8 @@ 
         $this->getGateway()->getDBQuery()->setUri($this->url(null, array('use_stored' => 'true')));
 
         $data = array(
-        	'posts' => $this->getGateway()->findAll(),
-        	'debtor' => $this->getGateway());
+            'posts' => $this->getGateway()->findAll(),
+            'debtor' => $this->getGateway());
 
 
         // @todo kan følgende ikke lige så godt hente fra $this->query()
@@ -101,17 +101,17 @@ 
 
     function postForm()
     {
-    	$debtor = $this->getDebtor();
-    	$contact = new Contact($this->getKernel(), $_POST["contact_id"]);
-
-    	if (isset($_POST["contact_person_id"]) && $_POST["contact_person_id"] == "-1") {
-    		$contact_person = new ContactPerson($contact);
-    		$person["name"] = $_POST['contact_person_name'];
-    		$person["email"] = $_POST['contact_person_email'];
-    		$contact_person->save($person);
-    		$contact_person->load();
-    		$_POST["contact_person_id"] = $contact_person->get("id");
-    	}
+        $debtor = $this->getDebtor();
+        $contact = new Contact($this->getKernel(), $_POST["contact_id"]);
+
+        if (isset($_POST["contact_person_id"]) && $_POST["contact_person_id"] == "-1") {
+            $contact_person = new ContactPerson($contact);
+            $person["name"] = $_POST['contact_person_name'];
+            $person["email"] = $_POST['contact_person_email'];
+            $contact_person->save($person);
+            $contact_person->load();
+            $_POST["contact_person_id"] = $contact_person->get("id");
+        }
 
         if ($this->getKernel()->intranet->hasModuleAccess('currency') && !empty($_POST['currency_id'])) {
             $currency_module = $this->getKernel()->useModule('currency', false); // false = ignore user access
@@ -124,11 +124,11 @@ 
             $_POST['currency'] = $currency;
         }
 
-    	if ($debtor->update($_POST)) {
-    	    return new k_SeeOther($this->url('../list/' . $debtor->get('id')));
-    	}
+        if ($debtor->update($_POST)) {
+            return new k_SeeOther($this->url('../list/' . $debtor->get('id')));
+        }
 
-    	return $this->render();
+        return $this->render();
     }
 
     function renderXls()

Spacing +8 added lines, -8 removed lines

@@ -95,7 +95,7 @@ 
             $data['contact'] = new Contact($this->getKernel(), $this->getGateway()->getDBQuery()->getFilter('contact_id'));
         }
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/collection');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/collection');
         return $smarty->render($this, $data);
     }
 
@@ -125,7 +125,7 @@ 
         }
 
     	if ($debtor->update($_POST)) {
-    	    return new k_SeeOther($this->url('../list/' . $debtor->get('id')));
+    	    return new k_SeeOther($this->url('../list/'.$debtor->get('id')));
     	}
 
     	return $this->render();
@@ -323,15 +323,15 @@ 
             $i++;
 
             $worksheet->write($i, 0, 'Forfaldne', $format_italic);
-            $worksheet->write($i, 1, number_format($due_total, 2, ",","."), $format_italic);
+            $worksheet->write($i, 1, number_format($due_total, 2, ",", "."), $format_italic);
             $i++;
 
             $worksheet->write($i, 0, 'Udestående (sendt):', $format_italic);
-            $worksheet->write($i, 1, number_format($sent_total, 2, ",","."), $format_italic);
+            $worksheet->write($i, 1, number_format($sent_total, 2, ",", "."), $format_italic);
             $i++;
 
             $worksheet->write($i, 0, 'Total:', $format_italic);
-            $worksheet->write($i, 1, number_format($total, 2, ",","."), $format_italic);
+            $worksheet->write($i, 1, number_format($total, 2, ",", "."), $format_italic);
             $i++;
 
             // $worksheet->write($i, 0, number_format(memory_get_usage()));
@@ -510,15 +510,15 @@ 
         $i++;
 
         $worksheet->write($i, 0, 'Forfaldne', $format_italic);
-        $worksheet->write($i, 1, number_format($due_total, 2, ",","."), $format_italic);
+        $worksheet->write($i, 1, number_format($due_total, 2, ",", "."), $format_italic);
         $i++;
 
         $worksheet->write($i, 0, 'Udestående (sendt):', $format_italic);
-        $worksheet->write($i, 1, number_format($sent_total, 2, ",","."), $format_italic);
+        $worksheet->write($i, 1, number_format($sent_total, 2, ",", "."), $format_italic);
         $i++;
 
         $worksheet->write($i, 0, 'Total:', $format_italic);
-        $worksheet->write($i, 1, number_format($total, 2, ",","."), $format_italic);
+        $worksheet->write($i, 1, number_format($total, 2, ",", "."), $format_italic);
         $i++;
 
         $worksheet->hideGridLines();

src/Intraface/modules/debtor/Controller/Create.php

Doc Comments +3 added lines

@@ -87,6 +87,9 @@
         return 'Create';
     }
 
+    /**
+     * @return string
+     */
     function getType()
     {
         return $this->context->context->getType();

Indentation +15 added lines, -15 removed lines

@@ -31,17 +31,17 @@ 
 
     function postForm()
     {
-    	$debtor = $this->getDebtor();
-    	$contact = new Contact($this->getKernel(), $this->body("contact_id"));
-
-    	if ($this->body("contact_person_id") == "-1") {
-    		$contact_person = new ContactPerson($contact);
-    		$person["name"] = $_POST['contact_person_name'];
-    		$person["email"] = $_POST['contact_person_email'];
-    		$contact_person->save($person);
-    		$contact_person->load();
-    		$_POST["contact_person_id"] = $contact_person->get("id");
-    	}
+        $debtor = $this->getDebtor();
+        $contact = new Contact($this->getKernel(), $this->body("contact_id"));
+
+        if ($this->body("contact_person_id") == "-1") {
+            $contact_person = new ContactPerson($contact);
+            $person["name"] = $_POST['contact_person_name'];
+            $person["email"] = $_POST['contact_person_email'];
+            $contact_person->save($person);
+            $contact_person->load();
+            $_POST["contact_person_id"] = $contact_person->get("id");
+        }
 
         if ($this->getKernel()->intranet->hasModuleAccess('currency') && $this->body('currency_id')) {
             $currency_module = $this->getKernel()->useModule('currency', false); // false = ignore user access
@@ -54,11 +54,11 @@ 
             $_POST['currency'] = $currency;
         }
 
-    	if ($debtor->update($_POST)) {
-    	    return new k_SeeOther($this->url('../' . $debtor->get('id')));
-    	}
+        if ($debtor->update($_POST)) {
+            return new k_SeeOther($this->url('../' . $debtor->get('id')));
+        }
 
-    	return $this->render();
+        return $this->render();
     }
 
     function getValues()

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
         if ($this->query('contact_id') == '') {
             return new k_SeeOther($this->url('contact'));
         }
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/edit');
         return $smarty->render($this);
     }
 
@@ -55,7 +55,7 @@ 
         }
 
     	if ($debtor->update($_POST)) {
-    	    return new k_SeeOther($this->url('../' . $debtor->get('id')));
+    	    return new k_SeeOther($this->url('../'.$debtor->get('id')));
     	}
 
     	return $this->render();
@@ -67,7 +67,7 @@ 
             return $this->body();
         }
 
-        $due_time = time() + $this->getContact()->get('paymentcondition') * 24 * 60 * 60;
+        $due_time = time() + $this->getContact()->get('paymentcondition')*24*60*60;
         $due_date = date('d-m-Y', $due_time);
 
         return array(