intraface / intraface.dk

src/Intraface/modules/accounting/YearEnd.php

Doc Comments +11 added lines

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

     }

 

+    /**
+     * @param string $action
+     */
     function setStated($action, $voucher_id)

     {

         $db = new DB_Sql;

@@ -106,6 +109,7 @@ 
      * credit-konto

      * amount

      *

+     * @param string $action
      */

     function saveStatedAction($action, $voucher_id, $debet_account_id, $credit_account_id, $amount)

     {

@@ -121,6 +125,9 @@ 
         return true;

     }

 

+    /**
+     * @param string $action
+     */
     function getStatedActions($action)

     {

         $db = new DB_Sql;

@@ -154,6 +161,7 @@ 
      * bør vel egentlig ikke være muligt! Måske kan man forestille sig, at den så bare

      * gemmer videre og at den ved get lægger tallene i amount sammen?

      *

+     * @param string $type
      */

     function saveStatement($type)

     {

@@ -199,6 +207,9 @@ 
         return new Account($this->year, $id);

     }

 

+    /**
+     * @param string $type
+     */
     function getStatement($type)

     {

 

Spacing +19 added lines, -19 removed lines

@@ -44,7 +44,7 @@ 
     private function load()

     {

         $db = new DB_Sql;

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

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

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

             return 0;

         }

@@ -62,14 +62,14 @@ 
             return false;

         }

         $db = new DB_Sql;

-        $db->query("INSERT INTO accounting_year_end SET date_created=NOW(), year_id = " . $this->year->get('id') . ", intranet_id =" .$this->year->kernel->intranet->get('id'));

+        $db->query("INSERT INTO accounting_year_end SET date_created=NOW(), year_id = ".$this->year->get('id').", intranet_id =".$this->year->kernel->intranet->get('id'));

         return true;

     }

 

     function setStep($step)

     {

         $db = new DB_Sql;

-        $db->query("UPDATE accounting_year_end SET date_updated=NOW(), step_key = " . (int)$step . " WHERE year_id = " . $this->year->get('id'));

+        $db->query("UPDATE accounting_year_end SET date_updated=NOW(), step_key = ".(int)$step." WHERE year_id = ".$this->year->get('id'));

         return true;

     }

 

@@ -80,12 +80,12 @@ 
         switch ($action) {

             // bruges i forbindelse med nulstilling af resultatkontoen

             case 'operating_reset':

-                $db->query("UPDATE accounting_year_end SET date_updated=NOW(), operating_reset_voucher_id = " . (int)$voucher_id . " WHERE year_id = " . $this->year->get('id'));

+                $db->query("UPDATE accounting_year_end SET date_updated=NOW(), operating_reset_voucher_id = ".(int)$voucher_id." WHERE year_id = ".$this->year->get('id'));

                 return true;

                 break;

             // bruges i forbindelse med overførelse af kapitalkontoen

             case 'result_account_reset':

-                $db->query("UPDATE accounting_year_end SET date_updated=NOW(), result_account_reset_voucher_id = " . (int)$voucher_id . " WHERE year_id = " . $this->year->get('id'));

+                $db->query("UPDATE accounting_year_end SET date_updated=NOW(), result_account_reset_voucher_id = ".(int)$voucher_id." WHERE year_id = ".$this->year->get('id'));

                 return true;

                 break;

 

@@ -117,14 +117,14 @@ 
     function deleteStatedAction($id)

     {

         $db = new DB_Sql;

-        $db->query("DELETE FROM accounting_year_end_action WHERE id = " . (int)$id);

+        $db->query("DELETE FROM accounting_year_end_action WHERE id = ".(int)$id);

         return true;

     }

 

     function getStatedActions($action)

     {

         $db = new DB_Sql;

-        $db->query("SELECT * FROM accounting_year_end_action WHERE year_id = " . $this->year->get('id') . " AND type_key = ".array_search($action, $this->actions)." AND intranet_id = " . $this->year->kernel->intranet->get('id'));

+        $db->query("SELECT * FROM accounting_year_end_action WHERE year_id = ".$this->year->get('id')." AND type_key = ".array_search($action, $this->actions)." AND intranet_id = ".$this->year->kernel->intranet->get('id'));

         $actions = array();

         $i = 0;

         while ($db->nextRecord()) {

@@ -143,7 +143,7 @@ 
     function flushStatement($type)

     {

         $db = new DB_Sql;

-        $db->query("DELETE FROM accounting_year_end_statement WHERE intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id = " . $this->year->get('id') . " AND type_key = " . array_search($type, $this->types));

+        $db->query("DELETE FROM accounting_year_end_statement WHERE intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id = ".$this->year->get('id')." AND type_key = ".array_search($type, $this->types));

         return true;

     }

 

@@ -180,7 +180,7 @@ 
         $db = new DB_Sql;

         $db2 = new DB_Sql;

 

-        $db->query("SELECT id FROM accounting_account WHERE year_id = " .$this->year->get('id'). " AND intranet_id = " . $this->year->kernel->intranet->get('id') . " AND number >= " . $account_start->get('number') . " AND number <= " . $account_end->get('number') . " ORDER BY number ASC");

+        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->year->get('id')." AND intranet_id = ".$this->year->kernel->intranet->get('id')." AND number >= ".$account_start->get('number')." AND number <= ".$account_end->get('number')." ORDER BY number ASC");

 

         while ($db->nextRecord()) {

             $account = new Account($this->year, $db->f('id'));

@@ -188,7 +188,7 @@ 
 

             // vi vender sgu lige fortegnet, så udgifter får negativt fortegn

             // og indtægter positivt fortegn

-            $db2->query("INSERT INTO accounting_year_end_statement SET type_key = ".array_search($type, $this->types).", intranet_id = ".$this->year->kernel->intranet->get('id').", year_id = ".$this->year->get('id').", account_id = " . $account->get('id') . ", amount = '".-1 * $account->get('saldo')."'");

+            $db2->query("INSERT INTO accounting_year_end_statement SET type_key = ".array_search($type, $this->types).", intranet_id = ".$this->year->kernel->intranet->get('id').", year_id = ".$this->year->get('id').", account_id = ".$account->get('id').", amount = '".-1*$account->get('saldo')."'");

         }

 

         return true;

@@ -236,7 +236,7 @@ 
      */

     function resetOperatingAccounts($type = 'do')

     {

-        switch($type) {

+        switch ($type) {

             case 'do':

                 break;

             case 'reverse':

@@ -292,7 +292,7 @@ 
                         'debet_account_number' => $debet_account->get('number'),

                         'credit_account_number' => $credit_account->get('number'),

                         'amount' => amountToForm($a['amount']),

-                        'text' => 'Modpostering: ' . $debet_account->get('name') . ' og ' . $credit_account->get('name'),

+                        'text' => 'Modpostering: '.$debet_account->get('name').' og '.$credit_account->get('name'),

                         'vat_off' => 1

 

                     );

@@ -315,7 +315,7 @@ 
                 ));

 

                 $accounts = $account->getList('operating', true);

-                if (!is_array($accounts) OR count($accounts) == 0){

+                if (!is_array($accounts) OR count($accounts) == 0) {

                     $this->error->set('Du kan ikke nulstille nogle konti der ikke findes');

                     return false;

                 }

@@ -332,7 +332,7 @@ 
                             'debet_account_number' => $result_account->get('number'),

                             'credit_account_number' => $account->get('number'),

                             'amount' => amountToForm(abs($account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook

-                            'text' => $account->get('name') . ' til resultatkontoen',

+                            'text' => $account->get('name').' til resultatkontoen',

                             'vat_off' => 1

 

                         );

@@ -344,7 +344,7 @@ 
                             'debet_account_number' => $account->get('number'),

                             'credit_account_number' => $result_account->get('number'),

                             'amount' => amountToForm(abs($account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook

-                            'text' => $account->get('name') . ' til resultatkontoen',

+                            'text' => $account->get('name').' til resultatkontoen',

                             'vat_off' => 1

                         );

                         $debet_account = $account;

@@ -367,7 +367,7 @@ 
 

     function resetYearResult($type = 'do')

     {

-        switch($type) {

+        switch ($type) {

             case 'do':

                 // her sker ikke noget

                 break;

@@ -428,7 +428,7 @@ 
                         'debet_account_number' => $debet_account->get('number'),

                         'credit_account_number' => $credit_account->get('number'),

                         'amount' => amountToForm($a['amount']),

-                        'text' => 'Modpostering: ' . $debet_account->get('name') . ' og ' . $credit_account->get('name'),

+                        'text' => 'Modpostering: '.$debet_account->get('name').' og '.$credit_account->get('name'),

                         'vat_off' => 1

 

                     );

@@ -464,7 +464,7 @@ 
                         'debet_account_number' => $result_account->get('number'),

                         'credit_account_number' => $capital_account->get('number'),

                         'amount' => abs(amountToForm($result_account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook

-                        'text' => $result_account->get('name') . ' nulstilles',

+                        'text' => $result_account->get('name').' nulstilles',

                         'vat_off' => 1

 

                     );

@@ -476,7 +476,7 @@ 
                         'debet_account_number' => $capital_account->get('number'),

                         'credit_account_number' => $result_account->get('number'),

                         'amount' => abs(amountToForm($result_account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook

-                        'text' => $result_account->get('name') . ' nulstilles',

+                        'text' => $result_account->get('name').' nulstilles',

                         'vat_off' => 1

                     );

                     $debet_account = $capital_account;

src/Intraface/modules/administration/UserAdministration.php

Doc Comments +3 added lines

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

 class UserAdministration extends Intraface_User

 {

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

     {

         parent::__construct($id);

src/Intraface/modules/cms/Controller/Templates.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
         }

     }

 

+    /**
+     * @return integer
+     */
     function getSiteId()

     {

          return $this->context->name();

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 

     function getSiteId()

     {

-         return $this->context->name();

+            return $this->context->name();

     }

 

     function renderHtml()

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
             'templates' => $templates

         );

 

-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/templates');

+        $tpl = $this->template->create(dirname(__FILE__).'/templates/templates');

         return $tpl->render($this, $data);

     }

 

@@ -54,7 +54,7 @@ 
             'translation' => $this->getKernel()->getTranslation()

         );

 

-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/template-edit');

+        $tpl = $this->template->create(dirname(__FILE__).'/templates/template-edit');

         return $tpl->render($this, $data);

     }

 

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()

     {

Indentation +1 added lines, -1 removed lines

@@ -281,7 +281,7 @@
         $this->save_element($var);

 

         return $this->id;

-  }

+    }

 

     /**

      * Deactivates an element

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') {

@@ -162,7 +162,7 @@ 
 

         }

         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') {

@@ -238,11 +238,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.",

@@ -255,7 +255,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();

@@ -291,7 +291,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;

     }

 

@@ -303,7 +303,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/ElementGateway.php

Doc Comments +9 added lines

@@ -11,6 +11,9 @@ 
         $this->kernel = $kernel;
     }
 
+    /**
+     * @param string $type
+     */
     function findBySectionAndType($section, $type)
     {
         $class = $this->class_prefix . ucfirst($type);
@@ -37,6 +40,9 @@ 
         return new $class(CMS_Section::factory($this->kernel, 'id', $this->db->f('section_id')), $this->db->f('id'));
     }
 
+    /**
+     * @param string $id
+     */
     function findByKernelAndId($kernel, $id)
     {
         $cms_module = $kernel->getModule('cms');
@@ -53,6 +59,9 @@ 
         return new $class(CMS_Section::factory($kernel, 'id', $this->db->f('section_id')), $this->db->f('id'));
     }
 
+    /**
+     * @param string $id
+     */
     function findBySectionAndId($section, $id)
     {
         // FIXME - jeg tror den her kan skabe en del

Spacing +7 added lines, -7 removed lines

@@ -13,7 +13,7 @@ 
 
     function findBySectionAndType($section, $type)
     {
-        $class = $this->class_prefix . ucfirst($type);
+        $class = $this->class_prefix.ucfirst($type);
 
         if (!class_exists($class)) {
             throw new Exception('Class does not exist');
@@ -26,11 +26,11 @@ 
         $cms_module = $this->kernel->getModule('cms');
         $element_types = $cms_module->getSetting('element_types');
 
-        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = " . $id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = ".$id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         if (!$this->db->nextRecord()) {
             return false;
         }
-        $class = $this->class_prefix . ucfirst($element_types[$this->db->f('type_key')]);
+        $class = $this->class_prefix.ucfirst($element_types[$this->db->f('type_key')]);
         if (!class_exists($class)) {
             return false;
         }
@@ -42,11 +42,11 @@ 
         $cms_module = $kernel->getModule('cms');
         $element_types = $cms_module->getSetting('element_types');
 
-        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = " . $id . " AND intranet_id = " . $kernel->intranet->get('id'));
+        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = ".$id." AND intranet_id = ".$kernel->intranet->get('id'));
         if (!$this->db->nextRecord()) {
             return false;
         }
-        $class = $this->class_prefix . ucfirst($element_types[$this->db->f('type_key')]);
+        $class = $this->class_prefix.ucfirst($element_types[$this->db->f('type_key')]);
         if (!class_exists($class)) {
             return false;
         }
@@ -61,12 +61,12 @@ 
         $cms_module = $section->kernel->getModule('cms');
         $element_types = $cms_module->getSetting('element_types');
 
-        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = " . $id . " AND intranet_id = " . $section->kernel->intranet->get('id'));
+        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = ".$id." AND intranet_id = ".$section->kernel->intranet->get('id'));
         if (!$this->db->nextRecord()) {
             return false;
         }
 
-        $class = $this->class_prefix . ucfirst($element_types[$this->db->f('type_key')]);
+        $class = $this->class_prefix.ucfirst($element_types[$this->db->f('type_key')]);
         if (!class_exists($class)) {
             return false;
         }

src/Intraface/modules/cms/HTML_Parser.php

Doc Comments +3 added lines

@@ -21,6 +21,9 @@
         $this->translation = $translation;

     }

 

+    /**
+     * @param string $phrase
+     */
     function t($phrase)

     {

         return utf8_encode($this->translation->get($phrase));

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
                 $element['extra_style'] = ' style="'.$element['extra_style'].'"';

             }

 

-            $function =  'parse'.$element['type'] . 'Element';

+            $function = 'parse'.$element['type'].'Element';

             $output = $this->$function($element);

 

             $display .= '<div id="element-'.$element['id'].'"'.$element['extra_class'].$element['extra_style'].'>';

@@ -76,9 +76,9 @@ 
             } else {

                 $display .= '		<li><a href="'.url(null).'?action=move&amp;element_id='.$element['id'].'&amp;id='.$element['section_id'].'">'.$this->t('move').'</a></li>';

             }

-            $display .= '		<li><a class="confirm" href="' . url(null) . '?delete='.$element['id'].'">'.$this->t('delete').'</a></li>';

-            $display .=	'	</ul>';

-            $display .= '<div>' . 			$output . '</div>';

+            $display .= '		<li><a class="confirm" href="'.url(null).'?delete='.$element['id'].'">'.$this->t('delete').'</a></li>';

+            $display .= '	</ul>';

+            $display .= '<div>'.$output.'</div>';

             $display .= '</div>';

         }

         return $display;

src/Intraface/modules/cms/Navigation.php

Doc Comments +3 added lines

@@ -10,6 +10,9 @@
     private $cmspage;

     public $value;

 

+    /**
+     * @param CMS_Page $cmspage
+     */
     function __construct($cmspage)

     {

         $this->cmspage = $cmspage;

src/Intraface/modules/cms/Page.php

Doc Comments +6 added lines, -3 removed lines

@@ -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);

@@ -818,7 +821,7 @@ 
     /**

      * Returns the possible page types

      *

-     * @return array possible page types

+     * @return string[] possible page types

      */

     public function getTypes()

     {

@@ -828,7 +831,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

      */

     static public 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;

@@ -527,7 +527,7 @@ 
 

         return $display;

     }

-    */

+     */

     function getComments()

     {

         if (!$this->kernel->intranet->hasModuleAccess('contact')) {

@@ -787,7 +787,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 +22 added lines, -22 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?

@@ -425,7 +425,7 @@ 
             $page_tree[$i]['id'] = $this->get('id');

 

             $child_of_id = $this->get('child_of_id');

-            while($child_of_id != 0) {

+            while ($child_of_id != 0) {

                 $i++;

 

                 $db->query("SELECT child_of_id, navigation_name, title, id, identifier FROM cms_page WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 AND type_key = ".$this->get('type_key')." AND id = ".$child_of_id);

@@ -465,7 +465,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()) {

@@ -482,7 +482,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()) {

@@ -758,7 +758,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;

     }

@@ -802,7 +802,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();

@@ -861,7 +861,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;

@@ -870,7 +870,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/PageGateway.php

Doc Comments +5 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     /**
      * Returns the possible page types
      *
-     * @return array possible page types
+     * @return string[] possible page types
      */
     public function getTypes()
     {
@@ -59,6 +59,9 @@ 
         return $object;
     }
 
+    /**
+     * @param string $identifier
+     */
     function findBySiteIdAndIdentifier($site_id, $identifier)
     {
         $identifier = strip_tags($identifier);
@@ -282,7 +285,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
      */
     static public function getTypesWithBinaryIndex()
     {

Spacing +10 added lines, -10 removed lines

@@ -40,7 +40,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')));
     }
 
     function setDBQuery($dbquery)
@@ -50,7 +50,7 @@ 
 
     function findById($id)
     {
-        $this->db->query("SELECT id, site_id FROM cms_page WHERE id = " . (int)$id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $this->db->query("SELECT id, site_id FROM cms_page WHERE id = ".(int)$id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         if (!$this->db->nextRecord()) {
             return false;
         }
@@ -64,13 +64,13 @@ 
         $identifier = strip_tags($identifier);
 
         if (!empty($identifier)) {
-            $this->db->query("SELECT site_id, id FROM cms_page WHERE identifier = '" . $identifier . "' AND intranet_id = " . $this->kernel->intranet->get('id') . " AND active = 1 AND site_id = " . $site_id);
+            $this->db->query("SELECT site_id, id FROM cms_page WHERE identifier = '".$identifier."' AND intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 AND site_id = ".$site_id);
         } else {
             // @todo choose the default page - vi skal lige have noget med publish og expire date her ogs�
-            $this->db->query("SELECT site_id, id FROM cms_page WHERE intranet_id = " . $this->kernel->intranet->get('id') . " AND active = 1 AND status_key = 1 AND site_id = " . $site_id . " ORDER BY position ASC LIMIT 1");
+            $this->db->query("SELECT site_id, id FROM cms_page WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 AND status_key = 1 AND site_id = ".$site_id." ORDER BY position ASC LIMIT 1");
         }
         if (!$this->db->nextRecord()) {
-            $this->db->query("SELECT site_id, id FROM cms_page WHERE id = " . (int)$identifier . " AND intranet_id = " . $this->kernel->intranet->get('id') . " AND active = 1 AND site_id = " . $site_id);
+            $this->db->query("SELECT site_id, id FROM cms_page WHERE id = ".(int)$identifier." AND intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 AND site_id = ".$site_id);
             if (!$this->db->nextRecord()) {
                 return false;
             }
@@ -146,7 +146,7 @@ 
 
         // Benyttes til undersider.
         $dbquery_original = clone $this->getDBQuery();
-        $dbquery_original->storeResult('','', 'toplevel'); // sikre at der ikke bliver gemt ved undermenuer.
+        $dbquery_original->storeResult('', '', 'toplevel'); // sikre at der ikke bliver gemt ved undermenuer.
 
 
         $keywords = $this->getDBQuery()->getKeyword();
@@ -175,8 +175,8 @@ 
 
         $cmspage[0] = $this->getDBQuery()->getRecordset("cms_page.id, title, identifier, status_key, navigation_name, date_publish, child_of_id, pic_id, description, DATE_FORMAT(date_publish, '%d-%m-%Y') AS date_publish_dk", '', false); //
 
-        while(TRUE) {
-            while($cmspage[$n]->nextRecord()) {
+        while (TRUE) {
+            while ($cmspage[$n]->nextRecord()) {
 
                 $pages[$i]['id'] = $cmspage[$n]->f('id');
 
@@ -214,8 +214,8 @@ 
                 // til google sitemaps
                 // sp�rgsm�let er om vi ikke skal starte et objekt op for hver pages
 
-                $pages[$i]['url'] = $this->cmssite->get('url') . $pages[$i]['identifier'] . '/';
-                $pages[$i]['url_self'] = $pages[$i]['identifier'] . '/';
+                $pages[$i]['url'] = $this->cmssite->get('url').$pages[$i]['identifier'].'/';
+                $pages[$i]['url_self'] = $pages[$i]['identifier'].'/';
                 $pages[$i]['changefreq'] = 'weekly';
                 $pages[$i]['priority'] = 0.5;