intraface / intraface.dk

src/Intraface/modules/cms/Element.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
     /**
      * Creates a parameter
      *
-     * @return object
+     * @return CMS_Parameter
      */
     function createParameter()
     {

Spacing +12 added lines, -12 removed lines

@@ -41,9 +41,9 @@ 
      */
     function __construct($section, $id = 0)
     {
-        $this->value['identify_as'] = 'cms_element';  // bruges af parameter
+        $this->value['identify_as'] = 'cms_element'; // bruges af parameter
 
-        $this->id        = (int) $id;
+        $this->id        = (int)$id;
         $this->kernel    = $section->kernel;
         $this->section   = $section;
         $this->error     = new Intraface_Error;
@@ -63,7 +63,7 @@ 
 
     function getPosition(DB_Sql $db)
     {
-        return new Ilib_Position($db, "cms_element", $this->id, "section_id=".$this->section->get('id')." AND active = 1 AND intranet_id = " . $this->kernel->intranet->get('id'), "position", "id");
+        return new Ilib_Position($db, "cms_element", $this->id, "section_id=".$this->section->get('id')." AND active = 1 AND intranet_id = ".$this->kernel->intranet->get('id'), "position", "id");
     }
 
     /**
@@ -125,7 +125,7 @@ 
         }
 
         $db = new DB_Sql;
-        $db->query("SELECT id, section_id, date_expire, date_publish, type_key, position FROM cms_element WHERE intranet_id = ".$this->section->kernel->intranet->get('id')." AND id = " . $this->id);
+        $db->query("SELECT id, section_id, date_expire, date_publish, type_key, position FROM cms_element WHERE intranet_id = ".$this->section->kernel->intranet->get('id')." AND id = ".$this->id);
         if (!$db->nextRecord()) {
             return 0;
         }
@@ -147,7 +147,7 @@ 
         $this->value['extra_class'] = '';
 
         if ($this->get('elm_width')) {
-            $this->value['extra_style'] .= 'width: ' . $this->get('elm_width') . ';';
+            $this->value['extra_style'] .= 'width: '.$this->get('elm_width').';';
         }
 
         if ($this->get('elm_properties') == 'float') {
@@ -161,7 +161,7 @@ 
             $this->value['extra_style'] .= ' clear: both;';
         }
         if ($this->get('elm_adjust')) {
-            $this->value['extra_class'] .= ' cms-align-' . $this->get('elm_adjust');
+            $this->value['extra_class'] .= ' cms-align-'.$this->get('elm_adjust');
         }
 
         if ($this->get('elm_box') == 'box') {
@@ -237,11 +237,11 @@ 
             $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_element SET
+        $sql = $sql_type." cms_element SET
                 intranet_id = ".$this->section->kernel->intranet->get('id').",
-                section_id=". (int)$this->section->get('id') . ",
+                section_id=". (int)$this->section->get('id').",
                 type_key = ".safeToDb($this->value['type_key']).",
                 date_changed = NOW(),
                 date_publish = ".$date_publish.",
@@ -254,7 +254,7 @@ 
             $this->id = $db->insertedId();
 
             $next_pos = $this->getPosition($db)->getMaxPosition() + 1;
-            $db->query("UPDATE cms_element SET position = " . $next_pos . " WHERE id = " . $this->id);
+            $db->query("UPDATE cms_element SET position = ".$next_pos." WHERE id = ".$this->id);
         }
 
         $this->load();
@@ -290,7 +290,7 @@ 
     public function delete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_element SET active = 0 WHERE id = " . $this->id);
+        $db->query("UPDATE cms_element SET active = 0 WHERE id = ".$this->id);
         return true;
     }
 
@@ -302,7 +302,7 @@ 
     public function undelete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_element SET active = 1 WHERE id = " . $this->id);
+        $db->query("UPDATE cms_element SET active = 1 WHERE id = ".$this->id);
         return true;
     }
 

src/Intraface/modules/cms/element/Gallery.php

Doc Comments +3 added lines

@@ -6,6 +6,9 @@
 {
     public $methods = array('single_image');
 
+    /**
+     * @param FakeCMSSection $section
+     */
     function __construct($section, $id = 0)
     {
         $this->value['type'] = 'gallery';

src/Intraface/modules/cms/element/Pagelist.php

Doc Comments +3 added lines

@@ -5,6 +5,9 @@
 class Intraface_modules_cms_element_Pagelist extends CMS_Element
 {
 
+    /**
+     * @param FakeCMSSection $section
+     */
     function __construct($section, $id = 0)
     {
         $this->value['type'] = 'pagelist';

src/Intraface/modules/cms/Page.php

Doc Comments +8 added lines, -4 removed lines

@@ -127,7 +127,7 @@ 
      * Returns position object
      *
      * @param object $db database object
-     * @return object Position
+     * @return Ilib_Position Position
      */
     public function getPosition($db)
     {
@@ -137,13 +137,16 @@ 
     /**
      * returns Template object
      *
-     * @return object Template
+     * @return CMS_Template Template
      */
     public function getTemplate()
     {
         return $this->template;
     }
 
+    /**
+     * @param string $type
+     */
     function factory($kernel, $type, $value)
     {
         $gateway = new Intraface_modules_cms_PageGateway($kernel, new DB_Sql);
@@ -745,6 +748,7 @@ 
 
     /**
      * @todo is this still used after the introduction of publish and unpublish
+     * @param string $status
      */
     function setStatus($status)
     {
@@ -815,7 +819,7 @@ 
     /**
      * Returns the possible page types
      *
-     * @return array possible page types
+     * @return string[] possible page types
      */
     public function getTypes()
     {
@@ -825,7 +829,7 @@ 
     /**
      * Returns the possible page types but with a binary index
      *
-     * @return array possible page types with binary index
+     * @return string[] possible page types with binary index
      */
     public static function getTypesWithBinaryIndex()
     {

Indentation +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
     public function __construct($cmssite, $id = 0)
     {
         if (!is_object($cmssite)) {
-             throw new Exception('CMS_Page::__construct needs CMS_Site');
+                throw new Exception('CMS_Page::__construct needs CMS_Site');
         }
 
         $this->id         = (int)$id;
@@ -525,7 +525,7 @@ 
 
         return $display;
     }
-    */
+     */
     function getComments()
     {
         if (!$this->kernel->intranet->hasModuleAccess('contact')) {
@@ -784,7 +784,7 @@ 
     {
         $db = new DB_Sql();
         $db2 = new DB_Sql;
-          // egentlig skuille denne m�ske v�re rekursiv?
+            // egentlig skuille denne m�ske v�re rekursiv?
 
         /*
         // I am not quite sure what this one is suppossed to do - see the next one instead.

Spacing +21 added lines, -21 removed lines

@@ -80,7 +80,7 @@ 
         }
 
         $this->id         = (int)$id;
-        $this->cmssite    =  $cmssite;
+        $this->cmssite    = $cmssite;
         $this->navigation = new CMS_Navigation($this);
         $this->template   = new CMS_Template($this->cmssite);
         $this->kernel     = $this->cmssite->kernel;
@@ -120,7 +120,7 @@ 
         if ($this->dbquery) {
             return $this->dbquery;
         }
-        return ($this->dbquery = new Intraface_DBQuery($this->kernel, 'cms_page', 'cms_page.intranet_id = '.$this->kernel->intranet->get('id').' AND cms_page.active = 1 AND site_id = ' . $this->cmssite->get('id')));
+        return ($this->dbquery = new Intraface_DBQuery($this->kernel, 'cms_page', 'cms_page.intranet_id = '.$this->kernel->intranet->get('id').' AND cms_page.active = 1 AND site_id = '.$this->cmssite->get('id')));
     }
 
     /**
@@ -212,7 +212,7 @@ 
         $validator->isNumeric($var['allow_comments'], 'error in comments - allowed values are 0 and 1');
         $validator->isNumeric($var['hidden'], 'error in hidden - allowed values are 0 and 1');
 
-        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 unique page address. allowed values are a-z 1-9 _ -');
         }
         if (!$this->isIdentifierAvailable($var['identifier'])) {
@@ -228,7 +228,7 @@ 
     function isIdentifierAvailable($identifier)
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM cms_page WHERE site_id = " . $this->cmssite->get('id') . " AND identifier = '".$identifier."' AND active = 1 AND id != " . (int)$this->get('id'));
+        $db->query("SELECT * FROM cms_page WHERE site_id = ".$this->cmssite->get('id')." AND identifier = '".$identifier."' AND active = 1 AND id != ".(int)$this->get('id'));
         return ($db->numRows() == 0);
     }
 
@@ -268,7 +268,7 @@ 
         }
 
         if (empty($var['identifier'])) {
-            $var['identifier'] = md5(date('d-m-Y H:i:s') . $type_key . serialize($var));
+            $var['identifier'] = md5(date('d-m-Y H:i:s').$type_key.serialize($var));
         }
 
         settype($var['date_expire'], 'string');
@@ -282,7 +282,7 @@ 
             $sql_end = ", date_created = NOW()";
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = ", date_updated = NOW() WHERE id = " . $this->id;
+            $sql_end = ", date_updated = NOW() WHERE id = ".$this->id;
         }
 
         $sql_extra = '';
@@ -295,11 +295,11 @@ 
         }
 
         // if the page is to updated
-        $sql = $sql_type . " cms_page SET
+        $sql = $sql_type." cms_page SET
             intranet_id = '".$this->kernel->intranet->get('id')."',
             user_id = '".$this->kernel->user->get('id')."',
-            title = '" .$var['title']. "',
-            keywords = '" .$var['keywords']. "',
+            title = '" .$var['title']."',
+            keywords = '" .$var['keywords']."',
             description = '".$var['description']."',
             date_publish = ".$sql_publish.",
             allow_comments = ".$var['allow_comments'].",
@@ -311,7 +311,7 @@ 
             site_id = '".(int)$this->cmssite->get('id')."',
             template_id = ".$var['template_id'].",
             pic_id = ".intval($var['pic_id']).",
-            identifier = '".$var['identifier']."'" . $sql_end;
+            identifier = '".$var['identifier']."'".$sql_end;
         // password = '".$var['password']."',
         $db = new DB_Sql;
         $db->query($sql);
@@ -326,11 +326,11 @@ 
 
 
         //position
-        $db->query("SELECT position FROM cms_page WHERE id = " . $this->id);
+        $db->query("SELECT position FROM cms_page WHERE id = ".$this->id);
         if ($db->nextRecord()) {
             if ($db->f('position') == 0 and count($this->getList($this->value['type']) > 0)) {
                 $next_pos = $this->getPosition(MDB2::singleton(DB_DSN))->getMaxPosition() + 1;
-                $db->query("UPDATE cms_page SET position = " . $next_pos . " WHERE id = " . $this->id);
+                $db->query("UPDATE cms_page SET position = ".$next_pos." WHERE id = ".$this->id);
             }
         }
 
@@ -367,7 +367,7 @@ 
             $sql_publish = " AND date_publish < NOW() AND status_key > 0";
         }
 
-        $sql = "SELECT *, DATE_FORMAT(date_publish, '%d-%m-%Y') AS date_publish_dk FROM cms_page WHERE intranet_id = ".$this->cmssite->kernel->intranet->get('id')." AND id = " .$this->id . $sql_expire . $sql_publish;
+        $sql = "SELECT *, DATE_FORMAT(date_publish, '%d-%m-%Y') AS date_publish_dk FROM cms_page WHERE intranet_id = ".$this->cmssite->kernel->intranet->get('id')." AND id = ".$this->id.$sql_expire.$sql_publish;
 
         $db = new DB_Sql();
         $db->query($sql);
@@ -386,8 +386,8 @@ 
         if (empty($this->value['identifier'])) {
             $this->value['identifier'] = $db->f('id');
         }
-        $this->value['url'] =  $this->cmssite->get('url') . $this->value['identifier'] . '/';
-        $this->value['url_self'] =  $this->value['identifier'] . '/';
+        $this->value['url'] = $this->cmssite->get('url').$this->value['identifier'].'/';
+        $this->value['url_self'] = $this->value['identifier'].'/';
 
         $this->value['child_of_id'] = $db->f('child_of_id');
         $this->value['name'] = $db->f('title'); //  bruges til keywords - m�ske skulle vi have et felt ogs�, s� title var webrelateret?
@@ -464,7 +464,7 @@ 
 
         foreach ($template_sections as $template_section) {
             $db = new DB_Sql;
-            $db->query("SELECT id FROM cms_section WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND page_id = ".$this->get('id')." AND site_id = ".$this->cmssite->get('id')." AND template_section_id = " . $template_section['id']);
+            $db->query("SELECT id FROM cms_section WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND page_id = ".$this->get('id')." AND site_id = ".$this->cmssite->get('id')." AND template_section_id = ".$template_section['id']);
 
             // opretter de sektioner der ikke er oprettet p� siden
             if (!$db->nextRecord()) {
@@ -480,7 +480,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT cms_section.id FROM cms_section INNER JOIN cms_template_section ON cms_section.template_section_id = cms_template_section.id
             WHERE cms_section.intranet_id = ".$this->kernel->intranet->get('id')."
-                AND cms_section.page_id = " . $this->id . " ORDER BY cms_template_section.position ASC");
+                AND cms_section.page_id = " . $this->id." ORDER BY cms_template_section.position ASC");
         $i = 0;
         $section = array();
         while ($db->nextRecord()) {
@@ -755,7 +755,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE cms_page SET status_key = " . array_search($status, $this->status) . " WHERE id = " . $this->id . " AND intranet_id = " . $this->cmssite->kernel->intranet->get('id'));
+        $db->query("UPDATE cms_page SET status_key = ".array_search($status, $this->status)." WHERE id = ".$this->id." AND intranet_id = ".$this->cmssite->kernel->intranet->get('id'));
         $this->value['status_key'] = array_search($status, $this->status);
         return true;
     }
@@ -799,7 +799,7 @@ 
         // @todo: BUT it can be a mess and the position of the pages is not corrected
         $db->query('UPDATE cms_page SET child_of_id = '.intval($this->get('child_of_id')).' WHERE child_of_id = '.intval($this->id));
 
-        $sql = "UPDATE cms_page SET active = 0 WHERE id=" . $this->id . " AND site_id = ".$this->cmssite->get('id');
+        $sql = "UPDATE cms_page SET active = 0 WHERE id=".$this->id." AND site_id = ".$this->cmssite->get('id');
         $db->query($sql);
         $this->value['active'] = 0;
         $this->load();
@@ -858,7 +858,7 @@ 
     function publish()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_page SET status_key = " . array_search('published', $this->status) . " WHERE id = " . $this->id . " AND intranet_id = " . $this->cmssite->kernel->intranet->get('id'));
+        $db->query("UPDATE cms_page SET status_key = ".array_search('published', $this->status)." WHERE id = ".$this->id." AND intranet_id = ".$this->cmssite->kernel->intranet->get('id'));
         $this->value['status_key'] = 1;
         $this->load();
         return true;
@@ -867,7 +867,7 @@ 
     function unpublish()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_page SET status_key = " . array_search('draft', $this->status) . " WHERE id = " . $this->id . " AND intranet_id = " . $this->cmssite->kernel->intranet->get('id'));
+        $db->query("UPDATE cms_page SET status_key = ".array_search('draft', $this->status)." WHERE id = ".$this->id." AND intranet_id = ".$this->cmssite->kernel->intranet->get('id'));
         $this->value['status_key'] = 0;
         $this->load();
         return true;

src/Intraface/modules/cms/Section.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 +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
         $this->db = MDB2::singleton(DB_DSN);
         $this->cmspage = $cmspage;
         $this->kernel = $cmspage->kernel;
-        $this->id = (int) $id;
+        $this->id = (int)$id;
         //$template_class = 'CMS_Template_' . $this->value['type'];
 
         $this->error = new Intraface_Error();
@@ -184,16 +184,16 @@ 
         if ($this->id == 0) {
             $sql_type = "INSERT INTO ";
             $sql_end = ", date_created = NOW(),
-                type_key = ".$var['type_key'] . ",
+                type_key = ".$var['type_key'].",
                 template_section_id = ".$var['template_section_id'];
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         }
-        $sql = $sql_type . " cms_section SET
+        $sql = $sql_type." cms_section SET
                 intranet_id = ".$this->cmspage->kernel->intranet->get('id').",
-                page_id=". (int)$this->cmspage->get('id') . ",
-                site_id=". (int)$this->cmspage->cmssite->get('id') . ",
+                page_id=". (int)$this->cmspage->get('id').",
+                site_id=". (int)$this->cmspage->cmssite->get('id').",
                 date_updated = NOW()
             " . $sql_end;
 

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

Doc Comments +6 added lines

@@ -12,6 +12,9 @@ 
 {
     private $allowed_tags = '';
 
+    /**
+     * @param FakeCMSPage $cmspage
+     */
     function __construct($cmspage, $id = 0)
     {
         $this->value['type'] = 'longtext';
@@ -52,6 +55,9 @@ 
         return true;
     }
 
+    /**
+     * @param string[] $array
+     */
     public static function convertArrayToTags($array)
     {
         $tags = '';

src/Intraface/modules/cms/Template.php

Doc Comments +6 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');
@@ -131,6 +134,9 @@ 
     }
 
 
+    /**
+     * @return string
+     */
     function save($var)
     {
         if (!empty($var['for_page_type']) && is_array($var['for_page_type'])) {

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')).",
@@ -179,7 +179,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()) {
@@ -212,14 +212,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/contact/Contact.php

Doc Comments +6 added lines, -21 removed lines

@@ -257,7 +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
      */
@@ -318,7 +317,7 @@ 
     /**
      * Loads values for the contact into an array
      *
-     * @return true on success
+     * @return boolean on success
      */
     private function load()
     {
@@ -394,7 +393,7 @@ 
      *
      * @param array $var Values to validate
      *
-     * @return true on success
+     * @return boolean on success
      */
     public function validate($var)
     {
@@ -502,20 +501,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
      */
@@ -616,7 +601,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 +644,7 @@ 
      *
      * @param string $number
      *
-     * @return true hvis det er frit
+     * @return boolean hvis det er frit
      */
     public function isNumberFree($number)
     {
@@ -822,7 +807,7 @@ 
      *
      * TODO M�ske burde denne metode hedde loadKeywords()?
      *
-     * @return object
+     * @return Keyword
      */
     function getKeywords()
     {
@@ -858,7 +843,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 +24 added lines, -24 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
@@ -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

@@ -8,6 +8,9 @@
 

 class OnlinePaymentDefault extends OnlinePayment

 {

+    /**
+     * @param integer $id
+     */
     function __construct($kernel, $id) {

 

         parent::__construct($kernel, $id);

Indentation +6 added lines, -6 removed lines

@@ -225,7 +225,7 @@ 
             throw new Exception('Could not save information in ContactReminder->update' . $result->getUserInfo());
             return false;
         }
-         return $this->id;
+            return $this->id;
     }
 
     /**
@@ -245,8 +245,8 @@ 
             throw new Exception('Could not postphone reminder' . $result->getUserInfo());
             return false;
         }
-         $this->load();
-         return true;
+            $this->load();
+            return true;
     }
 
     /**
@@ -278,7 +278,7 @@ 
         if ($result->numRows() == 0) {
             return array();
         }
-         return $result->fetchAll(MDB2_FETCHMODE_ASSOC);
+            return $result->fetchAll(MDB2_FETCHMODE_ASSOC);
 
     }
 
@@ -297,8 +297,8 @@ 
             throw new Exception('Could not postphone reminder' . $result->getUserInfo());
             return false;
         }
-         $this->load();
-         return true;
+            $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()) {
@@ -212,17 +212,17 @@ 
             $result = $this->db->exec("UPDATE contact_reminder_single SET ".$sql." WHERE intranet_id = ".$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer')." AND id = ".$this->db->quote($this->id, 'integer'));
         } 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;
@@ -240,9 +240,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();
@@ -265,11 +265,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)) {
             die($result->getUserInfo());
@@ -292,9 +292,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();