intraface / intraface.dk

src/Intraface/modules/modulepackage/Controller/templates/add-package.tpl.php

Spacing +3 added lines, -3 removed lines

@@ -72,8 +72,8 @@ 
 $existing_modulepackages = $modulepackagemanager->getList();
 
 // default start date is today
-if ($add_type == 'extend' && count($existing_modulepackages) > 0 && isset($existing_modulepackages[count($existing_modulepackages)-1]['dk_start_date'])) {
-    $end_date_integer = strtotime($existing_modulepackages[count($existing_modulepackages)-1]['end_date']);
+if ($add_type == 'extend' && count($existing_modulepackages) > 0 && isset($existing_modulepackages[count($existing_modulepackages) - 1]['dk_start_date'])) {
+    $end_date_integer = strtotime($existing_modulepackages[count($existing_modulepackages) - 1]['end_date']);
     // the new start day is the day after the last package ends
     $start_date = date('d-m-Y', strtotime('+1 day', $end_date_integer));
 } else {
@@ -133,7 +133,7 @@ 
             <option value="24"><?php e('2 '.t('years'));
             if (isset($product['price_incl_vat'])) :
                 e(' (DKK '.($product['price_incl_vat']*24).')');
-            endif;  ?></option>
+            endif; ?></option>
         </select>
     </div>
 

Braces +3 added lines, -1 removed lines

@@ -19,8 +19,10 @@
         <span id="price"><?php $product = $modulepackageshop->getProduct((int)$modulepackage->get('product_id'));
         if (isset($product['product']['currency']['DKK']['price_incl_vat'])) :
             e('DKK '.$product['product']['currency']['DKK']['price_incl_vat'].' '.t('per').' '.t($product['product']['unit']['singular']));
-        else :
+        else {
+            :
             echo 'free!';
+        }
         endif; ?></span>
     </div>
 

src/Intraface/modules/modulepackage/Controller/Postform.php

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
             $this->body('amount'),
             $this->body('currency'),
             $language,
-            NET_SCHEME . NET_HOST. $this->url('../', array('status' => 'success')),
-            NET_SCHEME . NET_HOST. $this->url('../payment', array('action_store_identifier' => $this->body('action_store_identifier'), 'payment_error' => 'true')),
-            NET_SCHEME . NET_HOST. $this->url('/process', array('action_store_identifier' => $this->body('action_store_identifier'))),
+            NET_SCHEME.NET_HOST.$this->url('../', array('status' => 'success')),
+            NET_SCHEME.NET_HOST.$this->url('../payment', array('action_store_identifier' => $this->body('action_store_identifier'), 'payment_error' => 'true')),
+            NET_SCHEME.NET_HOST.$this->url('/process', array('action_store_identifier' => $this->body('action_store_identifier'))),
             $this->query(),
             $this->body()
         );
@@ -47,7 +47,7 @@ 
             'form_action' => $form_action,
             'language' => $language);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/postform');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/postform');
         return $tpl->render($this, $data);
     }
 

src/Intraface/modules/modulepackage/Controller/AddPackage.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
             'modulepackageshop' => $modulepackageshop,
             'modulepackage' => $this->modulepackage,
             'kernel' => $this->getKernel());
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/add-package');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/add-package');
         return $tpl->render($this, $data);
     }
 
@@ -86,7 +86,7 @@ 
                         if ($this->getKernel()->intranet->address->get('name') != $this->getKernel()->user->getAddress()->get('name')) {
                             $contact['contactperson'] = $this->getKernel()->user->getAddress()->get('name');
                             $contact['contactemail'] = $this->getKernel()->user->getAddress()->get('email');
-                            $contact['contactphone'] =  $this->getKernel()->user->getAddress()->get('phone');
+                            $contact['contactphone'] = $this->getKernel()->user->getAddress()->get('phone');
                         }
 
                         // We add the contact_id. But notice, despite of the bad naming the contact_id is the contact_id in the intranet_maintenance intranet!

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

Spacing +1 added lines, -1 removed lines

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

src/Intraface/modules/modulepackage/ModulePackage.php

Indentation +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
      * @param int id on a ModulePackage
      *
      * @return void
-      */
+     */
     public function __construct($id = 0)
     {
         $this->db = MDB2::singleton(DB_DSN);
@@ -204,18 +204,18 @@ 
         $i = 0;
         $db = $this->dbquery->getRecordset('module_package.id, module_package_plan.plan, module_package_plan.id AS plan_id, module_package.product_id, module_package_group.group_name, module_package_group.id AS group_id');
         while ($db->nextRecord()) {
-             $list[$i]['id'] = $db->f('id');
-             $list[$i]['plan'] = $db->f('plan');
-             $list[$i]['plan_id'] = $db->f('plan_id');
-             $list[$i]['group'] = $db->f('group_name');
-             $list[$i]['group_id'] = $db->f('group_id');
-             $list[$i]['product_id'] = $db->f('product_id');
+                $list[$i]['id'] = $db->f('id');
+                $list[$i]['plan'] = $db->f('plan');
+                $list[$i]['plan_id'] = $db->f('plan_id');
+                $list[$i]['group'] = $db->f('group_name');
+                $list[$i]['group_id'] = $db->f('group_id');
+                $list[$i]['product_id'] = $db->f('product_id');
             if ($db->f('product_id') != 0) {
                 $product_ids[] = $db->f('product_id');
             }
-             $list[$i]['modules'] = $this->getModules($db->f('id'));
-             $list[$i]['product'] = array();
-             $i++;
+                $list[$i]['modules'] = $this->getModules($db->f('id'));
+                $list[$i]['product'] = array();
+                $i++;
         }
 
         // get all products in one request and add them to the array

Spacing +6 added lines, -6 removed lines

@@ -56,10 +56,10 @@ 
      */
     public function load()
     {
-        $result = $this->db->query("SELECT module_package.id, module_package.product_id, module_package_group.group_name AS ".$this->db->quoteIdentifier('group').", module_package_plan.plan, module_package_plan.plan_index, module_package_group.id AS group_id " .
-                "FROM module_package " .
-                "INNER JOIN module_package_group ON module_package.module_package_group_id = module_package_group.id " .
-                "INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id " .
+        $result = $this->db->query("SELECT module_package.id, module_package.product_id, module_package_group.group_name AS ".$this->db->quoteIdentifier('group').", module_package_plan.plan, module_package_plan.plan_index, module_package_group.id AS group_id ".
+                "FROM module_package ".
+                "INNER JOIN module_package_group ON module_package.module_package_group_id = module_package_group.id ".
+                "INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id ".
                 "WHERE module_package.id = ".$this->db->quote($this->id, 'integer'));
 
         if (PEAR::isError($result)) {
@@ -93,8 +93,8 @@ 
             $id = intval($id);
         }
 
-        $result = $this->db->query("SELECT id, module, limiter " .
-                "FROM module_package_module " .
+        $result = $this->db->query("SELECT id, module, limiter ".
+                "FROM module_package_module ".
                 "WHERE module_package_module.module_package_id = ".$this->db->quote($id, 'integer'));
 
         if (PEAR::isError($result)) {

src/Intraface/modules/contact/ContactPerson.php

Spacing +12 added lines, -12 removed lines

@@ -61,7 +61,7 @@ 
     public function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id, name, email, phone, mobile, contact_id FROM contact_person WHERE id = " . $this->id . " LIMIT 1");
+        $db->query("SELECT id, name, email, phone, mobile, contact_id FROM contact_person WHERE id = ".$this->id." LIMIT 1");
         while ($db->nextRecord()) {
             $this->value['id'] = $db->f('id');
             $this->value['name'] = $db->f('name');
@@ -99,7 +99,7 @@ 
 
         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()";
@@ -108,15 +108,15 @@ 
 
         $db = MDB2::singleton(DB_DSN);
 
-        $result = $db->exec($sql_type . "contact_person " .
-                "SET " .
-                "intranet_id = ".$db->quote($this->contact->kernel->intranet->get("id"), 'integer').", " .
-                "name = ".$db->quote($input['name'], 'text').", " .
-                "email = ".$db->quote($input['email'], 'text').", " .
-                "phone = ".$db->quote($input['phone'], 'text').", " .
-                "mobile = ".$db->quote($input['mobile']).", " .
-                "contact_id = " . $db->quote($this->contact->get('id'), 'integer') . ", " .
-                "date_changed = NOW() " . $sql_end);
+        $result = $db->exec($sql_type."contact_person ".
+                "SET ".
+                "intranet_id = ".$db->quote($this->contact->kernel->intranet->get("id"), 'integer').", ".
+                "name = ".$db->quote($input['name'], 'text').", ".
+                "email = ".$db->quote($input['email'], 'text').", ".
+                "phone = ".$db->quote($input['phone'], 'text').", ".
+                "mobile = ".$db->quote($input['mobile']).", ".
+                "contact_id = ".$db->quote($this->contact->get('id'), 'integer').", ".
+                "date_changed = NOW() ".$sql_end);
 
         if (PEAR::isError($result)) {
             throw new Exception('Error in query: '.$result->getUserInfo());
@@ -143,7 +143,7 @@ 
     public function getList()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM contact_person WHERE contact_id = " . $this->contact->get('id'));
+        $db->query("SELECT * FROM contact_person WHERE contact_id = ".$this->contact->get('id'));
         $persons = array();
         $i = 0;
         while ($db->nextRecord()) {

src/Intraface/modules/contact/include_frontpage.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
  * @package Intraface_Contact
  */
 
-require_once dirname(__FILE__) . '/ContactReminder.php';
+require_once dirname(__FILE__).'/ContactReminder.php';
 $contact_module = $kernel->useModule('contact');
 
 $contact = new Contact($kernel);
@@ -25,7 +25,7 @@ 
     }
     $_attention_needed[] = array(
         'module' => $contact_module->getName(),
-        'link' => $contact_module->getPath() .$reminder['contact_id'] . '/memo/' . $reminder['id'],
+        'link' => $contact_module->getPath().$reminder['contact_id'].'/memo/'.$reminder['id'],
         'msg' => $text.' ('.$reminder['dk_reminder_date'].'): '.$reminder['contact_name'].':  '.$reminder['subject'].'.',
         'no_translation' => true
     );

src/Intraface/modules/contact/MainContact.php

Indentation +14 added lines, -14 removed lines

@@ -21,7 +21,7 @@ 
         $this->addPreloadFile('Contact.php');
         $this->addPreloadFile('ContactMessage.php'); // kan m�ske slettes
         $this->addPreloadFile('ContactPerson.php');
-         $this->addPreloadFile('ContactReminder.php');
+            $this->addPreloadFile('ContactReminder.php');
 
         $this->addRequiredShared('email');
         $this->addRequiredShared('keyword');
@@ -40,7 +40,7 @@ 
 
         // settings
         // paymentconditions in days
-         $this->includeSettingFile('settings.php');
+            $this->includeSettingFile('settings.php');
 
         $this->addSetting('paymentcondition', array(0, 8, 14, 30));
         $this->addSetting(
@@ -51,29 +51,29 @@ 
             )
         );
 
-         $this->addSetting('contact_login_url', array(
+            $this->addSetting('contact_login_url', array(
             0 => 'kundelogin.dk',
             1 => 'medlemslogin.dk'
-         ));
+            ));
 
-         $this->addSetting(
-             'preferred_invoice',
-             array(
+            $this->addSetting(
+                'preferred_invoice',
+                array(
                 1 => 'pdf',
                 2 => 'email',
                 3 => 'electronic'
-             )
-         );
+                )
+            );
 
-         $this->addSetting(
-             'reminder_status',
-             array(
+            $this->addSetting(
+                'reminder_status',
+                array(
                 0 => '_Invalid type_',
                 1 => 'created',
                 2 => 'seen',
                 3 => 'cancelled'
-             )
-         );
+                )
+            );
 
     }
 }

src/Intraface/modules/contact/PdfLabel.php

Spacing +6 added lines, -6 removed lines

@@ -57,18 +57,18 @@ 
         }
         
         if (is_array($keywords) && count($keywords) > 0) {
-            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing') * $line, $this->get('font_size'), "Nøgleord: ".implode(", ", $keywords));
+            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing')*$line, $this->get('font_size'), "Nøgleord: ".implode(", ", $keywords));
             $line++;
         }
         
-        $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing') * $line, $this->get('font_size'), "Antal labels i søgning: ".count($contacts));
+        $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing')*$line, $this->get('font_size'), "Antal labels i søgning: ".count($contacts));
         
         // The contacts on labels
         
         for ($i = 0, $max = count($contacts); $i < $max; $i++) {
             // TODO -- hvorfor bruger vi ikke antallet af labels til at vide, hvorn�r
             // vi skifter linje? Vi kender faktisk ikke antallet af labels i en r�kke. Det kunne vi selvf�lgelig komme til
-            if ($this->get('x') + $this->label_width  > $this->get('right_margin_position')) {
+            if ($this->get('x') + $this->label_width > $this->get('right_margin_position')) {
                 // For enden af linjen, ny linje
                 $this->setY("-".$this->label_height);
                 $this->setX(0);
@@ -91,13 +91,13 @@ 
             $address_lines = explode("\n", $contacts[$i]['address']['address']);
             foreach ($address_lines as $l) {
                 if (trim($l) != "") {
-                    $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing') * $line, $this->get('font_size'), $l);
+                    $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing')*$line, $this->get('font_size'), $l);
                     $line++;
                 }
             }
-            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing') * $line, $this->get('font_size'), $contacts[$i]['address']['postcode']." ".$contacts[$i]['address']['city']);
+            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing')*$line, $this->get('font_size'), $contacts[$i]['address']['postcode']." ".$contacts[$i]['address']['city']);
             $line++;
-            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing') * $line, $this->get('font_size'), $contacts[$i]['address']['country']);
+            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing')*$line, $this->get('font_size'), $contacts[$i]['address']['country']);
         }
     }
 }