intraface / intraface.dk

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']);
         }
     }
 }

src/Intraface/modules/contact/Controller/templates/memos.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     <tr>
         <td><?php e($memo['dk_reminder_date']); ?></td>
         <td><a href="<?php e(url($memo['id'])); ?>"><?php e($memo['subject']); ?></a></td>
-        <td><a href="<?php e(url('../../' . $memo['contact_id'])); ?>"><?php e(t('Contact')); ?> <?php e($memo['contact_id']); ?></a></td>
+        <td><a href="<?php e(url('../../'.$memo['contact_id'])); ?>"><?php e(t('Contact')); ?> <?php e($memo['contact_id']); ?></a></td>
     </tr>
 <?php endforeach; ?>
 </table>
\ No newline at end of file

src/Intraface/modules/contact/Controller/templates/batchnewsletter.tpl.php

Braces +5 added lines, -2 removed lines

@@ -8,9 +8,12 @@
 
 <p><?php echo $context->getMessage(); ?></p>
 
-<?php else : ?>
+<?php else {
+    : ?>
 
-    <?php echo $contact->error->view(); ?>
+    <?php echo $contact->error->view();
+}
+?>
 
 <p class="message">Du er ved at tilmelde <?php e(count($contacts)); ?> kontakter til nyhedsbrevet.</p>
 

src/Intraface/modules/contact/Controller/templates/show.tpl.php

Spacing +7 added lines, -7 removed lines

@@ -6,22 +6,22 @@ 
 <div id="colOne">
 
 <div class="box">
-    <img style="float: right;" src="<?php e('http://www.gravatar.com/avatar/'.md5($address['email']).'?s=60&d='.NET_SCHEME . NET_HOST . url('/images/icons/gravatar.png')); ?>" height="60" width="60" />
+    <img style="float: right;" src="<?php e('http://www.gravatar.com/avatar/'.md5($address['email']).'?s=60&d='.NET_SCHEME.NET_HOST.url('/images/icons/gravatar.png')); ?>" height="60" width="60" />
 
     <h1>#<?php e($value['number']); ?> <?php e($address['name']); ?></h1>
 
     <ul class="options" style="clear: none;">
         <li><a href="<?php e(url(null, array('edit'))); ?>"><?php e(t('Edit')); ?></a></li>
         <li><a href="<?php e(url('../', array('use_stored' => 'true'))); ?>"><?php e(t('Close')); ?></a></li>
-        <li><a class="vcard" href="<?php e(url(null . '.vcf')); ?>"><?php e(t('Vcard')); ?></a></li>
+        <li><a class="vcard" href="<?php e(url(null.'.vcf')); ?>"><?php e(t('Vcard')); ?></a></li>
     </ul>
 
     <ul class="options" style="clear: none;">
     <?php foreach ($context->getDependencies() as $key => $dependency) : ?>
             <?php if ($dependency['gateway']->findCountByContactId($context->getContact()->get("id")) > 0) : ?>
-            <li><a href="<?php e($dependency['url']); ?>"><?php e(t(ucfirst($dependency['label'] . 's'))); ?></a></li>
+            <li><a href="<?php e($dependency['url']); ?>"><?php e(t(ucfirst($dependency['label'].'s'))); ?></a></li>
             <?php elseif (!empty($dependency['url_create'])) : ?>
-            <li class="inactive"><a href="<?php e($dependency['url_create']); ?>"><?php e(t('Create') . ' ' . t($dependency['label'])); ?></a></li>
+            <li class="inactive"><a href="<?php e($dependency['url_create']); ?>"><?php e(t('Create').' '.t($dependency['label'])); ?></a></li>
             <?php endif; ?>
     <?php endforeach; ?>
     </ul>
@@ -156,7 +156,7 @@ 
     <?php
     foreach ($persons as $person) { ?>
         <tr class="vcard">
-        <td class="fn"><a href="<?php e(url('contactperson/' . $person['id'], array('edit'))); ?>"><?php e($person['name']); ?></a></td>
+        <td class="fn"><a href="<?php e(url('contactperson/'.$person['id'], array('edit'))); ?>"><?php e($person['name']); ?></a></td>
         <td class="email"><?php e($person['email']); ?></td>
         <td class="tel"><?php e($person['phone']); ?></td>
         <td class="tel"><?php e($person['mobile']); ?></td>
@@ -201,8 +201,8 @@ 
 }
                     ?>
                 </td>
-                <td><a href="<?php e(url('memo/' . $reminder_item['id'])); ?>"><?php e($reminder_item['subject']); ?></a></td>
-                <td class="buttons"><a href="<?php e(url('memo/' .$reminder_item['id'], array('edit'))); ?>" class="edit"><?php e(t('edit')); ?></a></td>
+                <td><a href="<?php e(url('memo/'.$reminder_item['id'])); ?>"><?php e($reminder_item['subject']); ?></a></td>
+                <td class="buttons"><a href="<?php e(url('memo/'.$reminder_item['id'], array('edit'))); ?>" class="edit"><?php e(t('edit')); ?></a></td>
             </tr>
             <?php
         }

src/Intraface/modules/contact/Controller/templates/index.tpl.php

Spacing +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@ 
     <?php if ($context->getKernel()->getSetting()->get('user', 'contact.search') == 'hide' and count($context->getContacts()) > 0) : ?>
     <li><a href="<?php e(url(null, array('search' => 'view'))); ?>"><?php e(t('show search')); ?></a></li>
     <?php endif; ?>
-    <li><a class="pdf" href="<?php e(url(null . '.pdf', array('use_stored' => 'true'))); ?>" target="_blank"><?php e(t('Pdf-labels')); ?></a></li>
-    <li><a class="excel" href="<?php e(url(null . '.xls', array('use_stored' => 'true'))); ?>"><?php e(t('Excel')); ?></a></li>
+    <li><a class="pdf" href="<?php e(url(null.'.pdf', array('use_stored' => 'true'))); ?>" target="_blank"><?php e(t('Pdf-labels')); ?></a></li>
+    <li><a class="excel" href="<?php e(url(null.'.xls', array('use_stored' => 'true'))); ?>"><?php e(t('Excel')); ?></a></li>
     <li><a href="<?php e(url('sendemail', array('use_stored' => true))); ?>"><?php e(t('Email to contacts in search')); ?></a></li>
     <li><a href="<?php e(url('import/file')); ?>"><?php e(t('Import contacts')); ?></a></li>
     <li><a href="<?php e(url('../')); ?>"><?php e(t('Close')); ?></a></li>
@@ -86,7 +86,7 @@ 
                     <input type="checkbox" value="<?php e($c['id']); ?>" name="selected[]" />
                 </td>
                 <td><?php e($c['number']); ?></td>
-                <td><img style="border: none; vertical-align:middle" src="<?php e('http://www.gravatar.com/avatar/'.md5($c['email']).'?s=20&d=&d='.NET_SCHEME . NET_HOST . url('/images/icons/gravatar.png')); ?>" height="20" width="20" /> <a class="fn" href="<?php e(url($c['id'])); ?>"><?php e($c['name']); ?></a></td>
+                <td><img style="border: none; vertical-align:middle" src="<?php e('http://www.gravatar.com/avatar/'.md5($c['email']).'?s=20&d=&d='.NET_SCHEME.NET_HOST.url('/images/icons/gravatar.png')); ?>" height="20" width="20" /> <a class="fn" href="<?php e(url($c['id'])); ?>"><?php e($c['name']); ?></a></td>
                 <td class="tel"><?php e($c['phone']); ?></td>
                 <td class="email"><?php e($c['email']); ?></td>
                 <td class="options">

Braces +5 added lines, -2 removed lines

@@ -21,12 +21,15 @@
 
     <p><?php e(t('No contacts has been created')); ?>. <a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create contact')); ?></a>.</p>
 
-<?php else : ?>
+<?php else {
+    : ?>
 
 
 <?php if ($context->getKernel()->getSetting()->get('user', 'contact.search') == 'view') : ?>
 
-<form action="<?php e(url()); ?>" method="get" class="search-filter">
+<form action="<?php e(url());
+}
+?>" method="get" class="search-filter">
     <fieldset>
         <legend><?php e(t('search')); ?></legend>