intraface / intraface.dk

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

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
                         case "invoice":
                             if ($kernel->user->hasModuleAccess('invoice')) {
                                 $debtor_module = $kernel->useModule('debtor');
-                                print("<a href=\"".$debtor_module->getPath().$payment['belong_to'] . '/list/' . $payment['belong_to_id']."\">Faktura</a>");
+                                print("<a href=\"".$debtor_module->getPath().$payment['belong_to'].'/list/'.$payment['belong_to_id']."\">Faktura</a>");
                             } else {
                                 e("Faktura");
                             }
@@ -90,7 +90,7 @@ 
                         case "order":
                             if ($kernel->user->hasModuleAccess('order')) {
                                 $debtor_module = $kernel->useModule('debtor');
-                                print("<a href=\"".$debtor_module->getPath().$payment['belong_to'] . '/list/' . $payment['belong_to_id']."\">Ordre</a>");
+                                print("<a href=\"".$debtor_module->getPath().$payment['belong_to'].'/list/'.$payment['belong_to_id']."\">Ordre</a>");
                             } else {
                                 e("Ordre");
                             }

Braces +5 added lines, -2 removed lines

@@ -11,11 +11,14 @@
 
 <?php elseif (!$onlinepayment->isFilledIn()) : ?>
     <p>Der er ikke oprettet nogen betalinger.</p>
-<?php else : ?>
+<?php else {
+    : ?>
 
 
 <fieldset class="hide_on_print">
-    <legend><?php e(t('Search')); ?></legend>
+    <legend><?php e(t('Search'));
+}
+?></legend>
     <form method="get" action="<?php e(url(null)); ?>">
         <label><?php e(t('Text')); ?>
             <input type="text" name="text" value="<?php e($onlinepayment->getDBQuery()->getFilter("text")); ?>" />

src/Intraface/modules/onlinepayment/Controller/ChooseProvider.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         $onlinepayment_module = $this->context->getKernel()->module('onlinepayment');
         $onlinepayment = OnlinePayment::factory($this->context->getKernel());
         $value = $onlinepayment->getProvider();
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/chooseprovider');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/chooseprovider');
         return $smarty->render($this, array('value' => $value));
     }
 

src/Intraface/modules/intranetmaintenance/Controller/templates/intranet/show.tpl.php

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
 $address_value = $context->getValues();
 ?>
 <?php if (!empty($contact_error)) : ?>
-<?php echo $contact_error;?>
+<?php echo $contact_error; ?>
 <?php else : ?>
 <div id="colOne">
 
@@ -15,7 +15,7 @@ 
 </ul>
 
 <?php if ($context->query('flare')) : ?>
- <p class="message"><?php e(t($context->query('flare')));?></p>
+ <p class="message"><?php e(t($context->query('flare'))); ?></p>
 <?php endif; ?>
 
 <?php echo $context->getIntranet()->error->view(); ?>
@@ -33,7 +33,7 @@ 
             <?php if (!empty($value['contact_id']) and $context->getIntranet()->get('id') > 0 && isset($contact_module)) : ?>
                 <?php
                     $contact = new Contact($context->getKernel(), $value['contact_id']);
-                    echo '<a href="'.$contact_module->getPath() . $contact->get('id').'">'.$contact->get('name').'</a>';
+                    echo '<a href="'.$contact_module->getPath().$contact->get('id').'">'.$contact->get('name').'</a>';
                     echo ' <a href="'.url(null, array('add_contact'=>1)).'">'.t('change contact').'</a>';
                 ?>
             <?php elseif (isset($contact_module)) : ?>
@@ -241,7 +241,7 @@ 
                 $user_list['name'] = '[not filled in]';
             }
             ?>
-            <td><a href="<?php e(url('../../user/'. $user_list['id'], array('intranet_id' => $context->getIntranet()->get('id')))); ?>"><?php e($user_list['name']); ?></a></td>
+            <td><a href="<?php e(url('../../user/'.$user_list['id'], array('intranet_id' => $context->getIntranet()->get('id')))); ?>"><?php e($user_list['name']); ?></a></td>
             <td><?php e($user_list['email']); ?></td>
         </tr>
     <?php } ?>

Braces +8 added lines, -3 removed lines

@@ -4,10 +4,13 @@ 
 ?>
 <?php if (!empty($contact_error)) : ?>
 <?php echo $contact_error;?>
-<?php else : ?>
+<?php else {
+    : ?>
 <div id="colOne">
 
-<h1><?php e(t('Intranet')); ?>: <?php e($context->getIntranet()->get('name')); ?></h1>
+<h1><?php e(t('Intranet'));
+}
+?>: <?php e($context->getIntranet()->get('name')); ?></h1>
 
 <ul class="options">
     <li><a href="<?php e(url(null, array('edit'))); ?>"><?php e(t('edit')); ?></a></li>
@@ -160,10 +163,12 @@ 
     <legend>Tilføj modulpakke</legend>
     <?php if (!$context->getKernel()->intranet->hasModuleAccess('shop')) : ?>
         This intranet needs to have access to shop for modulepackage to work!
-    <?php else : ?>
+    <?php else {
+    : ?>
 
         <?php
         $modulepackage = new Intraface_modules_modulepackage_ModulePackage;
+}
         $modulepackage->getDBQuery($context->getKernel());
         $packages = $modulepackage->getList();
         ?>

src/Intraface/modules/intranetmaintenance/Controller/templates/intranet/index.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 <ul class="options">
     <li><a href="<?php e(url('../')); ?>"><?php e(t('Close')); ?></a></li>
-    <li><a href="<?php e(url(null) . '?new'); ?>"><?php e(t('create')); ?></a></li>
+    <li><a href="<?php e(url(null).'?new'); ?>"><?php e(t('create')); ?></a></li>
     <li><a href="<?php e(url('../user')); ?>"><?php e(t('users')); ?></a></li>
 </ul>
 

src/Intraface/modules/intranetmaintenance/Controller/templates/user/show.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
     <tbody>
     <?php foreach ($context->getIntranets() as $intranet_value) { ?>
         <tr>
-            <td><a href="<?php e(url('../../intranet/' . $intranet_value['id'])); ?>"><?php e($intranet_value['name']); ?></a></td>
+            <td><a href="<?php e(url('../../intranet/'.$intranet_value['id'])); ?>"><?php e($intranet_value['name']); ?></a></td>
             <td><a href="<?php e(url(null, array('intranet_id' => $intranet_value['id']))); ?>"><?php e(t('Show contact information')); ?></a></td>
         </tr>
         <?php } ?>

src/Intraface/modules/intranetmaintenance/Controller/templates/user/index.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
                 $user["name"] = '['.t('not filled in').']';
             }
             ?>
-            <td><img style="border: none;" src="<?php e('http://www.gravatar.com/avatar/'.md5($user['email']).'?s=20&d=&d='.NET_SCHEME . NET_HOST . url('/images/icons/gravatar.png')); ?>" height="20" width="20" /></td>
+            <td><img style="border: none;" src="<?php e('http://www.gravatar.com/avatar/'.md5($user['email']).'?s=20&d=&d='.NET_SCHEME.NET_HOST.url('/images/icons/gravatar.png')); ?>" height="20" width="20" /></td>
             <td><a href="<?php e(url($user["id"])); ?>"><?php e($user["name"]); ?></a></td>
             <td><?php e($user["email"]); ?></td>
             <td class="buttons">

src/Intraface/modules/intranetmaintenance/Controller/User/Index.php

Indentation +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         if (!is_null($this->redirect)) {
             return $this->redirect;
         }
-         return $this->redirect = Intraface_Redirect::factory($this->getKernel(), 'receive');
+            return $this->redirect = Intraface_Redirect::factory($this->getKernel(), 'receive');
     }
 
     function isAddUserTrue()

Spacing +2 added lines, -2 removed lines

@@ -29,13 +29,13 @@
             return new k_SeeOther($this->getRedirect()->getRedirect($this->url(null)));
         }
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/user/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/user/index');
         return $smarty->render($this);
     }
 
     function renderHtmlCreate()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/user/edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/user/edit');
         return $smarty->render($this);
     }
 

src/Intraface/modules/intranetmaintenance/Controller/Intranet/Key.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
         $modul = $this->getKernel()->module("intranetmaintenance");
         $translation = $this->getKernel()->getTranslation('intranetmaintenance');
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/edit');
         return $smarty->render($this);
     }
 

src/Intraface/modules/intranetmaintenance/Controller/Intranet/Show.php

Spacing +56 added lines, -56 removed lines

@@ -48,7 +48,7 @@ 
                 $contact_module = $this->getKernel()->useModule('contact');
 
                 $redirect = Intraface_Redirect::factory($kernel, 'go');
-                $url = $redirect->setDestination($contact_module->getPath()."select_contact", NET_SCHEME . NET_HOST . $this->url());
+                $url = $redirect->setDestination($contact_module->getPath()."select_contact", NET_SCHEME.NET_HOST.$this->url());
                 $redirect->askParameter('contact_id');
                 $redirect->setIdentifier('contact');
 
@@ -61,7 +61,7 @@ 
         // add existing user
         if ($this->query('add_user') == 1) {
             $redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
-            $url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('../../user'), NET_SCHEME . NET_HOST . $this->url(null));
+            $url = $redirect->setDestination(NET_SCHEME.NET_HOST.$this->url('../../user'), NET_SCHEME.NET_HOST.$this->url(null));
             $redirect->askParameter('user_id');
             $redirect->setIdentifier('add_user');
             return new k_SeeOther($url);
@@ -77,7 +77,7 @@ 
                 $user = new UserMaintenance($redirect->getParameter('user_id'));
                 $user->setIntranetAccess($intranet->get('id'));
                 $user_id = $user->get('id');
-                return new k_SeeOther($this->url('../../user/' . $user->get('id'), array('intranet_id' => $this->name())));
+                return new k_SeeOther($this->url('../../user/'.$user->get('id'), array('intranet_id' => $this->name())));
             }
         }
 
@@ -92,7 +92,7 @@ 
         $gateway = new Intraface_ModuleGateway($this->mdb2);
         $modules = $gateway->getList();
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/show');
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/show');
         return $smarty->render($this, array('modules' => $modules));
     }
 
@@ -103,13 +103,13 @@ 
         $modul = $this->getKernel()->module("intranetmaintenance");
         $translation = $this->getKernel()->getTranslation('intranetmaintenance');
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/edit');
         return $smarty->render($this);
     }
 
     function renderHtmlDelete()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/delete');
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/delete');
         return $smarty->render($this);
     }
 
@@ -141,70 +141,70 @@ 
             throw new Exception('Du kan kun slette bambus beta og bambus - sune og lars');
         }
 
-        $db->query("DELETE FROM accounting_account WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM accounting_post WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM accounting_vat_period WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM accounting_voucher WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM accounting_voucher_file WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM accounting_year WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM accounting_year_end WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM accounting_year_end_action WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM accounting_account WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM accounting_post WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM accounting_vat_period WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM accounting_voucher WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM accounting_voucher_file WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM accounting_year WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM accounting_year_end WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM accounting_year_end_action WHERE intranet_id = ".$intranet_id);
 
         // her skulle vi slette noget address
 
-        $db->query("DELETE FROM contact WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM contact_person WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM contact_message WHERE intranet_id  = " . $intranet_id);
+        $db->query("DELETE FROM contact WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM contact_person WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM contact_message WHERE intranet_id  = ".$intranet_id);
 
-        $db->query("DELETE FROM cms_element WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM cms_page WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM cms_parameter WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM cms_section WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM cms_site WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM cms_template WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM cms_template_section WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM cms_element WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM cms_page WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM cms_parameter WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM cms_section WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM cms_site WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM cms_template WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM cms_template_section WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM comment WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM comment WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM debtor WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM debtor_item WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM debtor WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM debtor_item WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM email WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM email_attachment WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM email WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM email_attachment WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM file_handler WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM file_handler_instance WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM filehandler_append_file WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM file_handler WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM file_handler_instance WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM filehandler_append_file WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM invoice_payment WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM invoice_reminder WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM invoice_reminder_item WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM invoice_reminder_unpaid_reminder WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM invoice_payment WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM invoice_reminder WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM invoice_reminder_item WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM invoice_reminder_unpaid_reminder WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM keyword WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM keyword_x_object WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM keyword WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM keyword_x_object WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM newsletter_archieve WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM newsletter_list WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM newsletter_subscriber WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM newsletter_archieve WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM newsletter_list WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM newsletter_subscriber WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM onlinepayment WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM onlinepayment WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM procurement WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM procurement_item WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM procurement WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM procurement_item WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM product WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM product_detail WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM product_related WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM product WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM product_detail WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM product_related WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM stock_adaptation WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM stock_regulation WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM stock_adaptation WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM stock_regulation WHERE intranet_id = ".$intranet_id);
 
-        $db->query("DELETE FROM todo_list WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM todo_item WHERE intranet_id = " . $intranet_id);
-        $db->query("DELETE FROM todo_contact WHERE intranet_id = " . $intranet_id);
+        $db->query("DELETE FROM todo_list WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM todo_item WHERE intranet_id = ".$intranet_id);
+        $db->query("DELETE FROM todo_contact WHERE intranet_id = ".$intranet_id);
 
-        $this->removeDir('/home/intraface/upload/' . $intranet_id . '/');
+        $this->removeDir('/home/intraface/upload/'.$intranet_id.'/');
     }
 
     protected function removeDir($path)
@@ -214,8 +214,8 @@ 
             $path .= "/";
         }
 
-        $normal_files = glob($path . "*");
-        $hidden_files = glob($path . "\.?*");
+        $normal_files = glob($path."*");
+        $hidden_files = glob($path."\.?*");
         $all_files = array_merge($normal_files, $hidden_files);
 
         foreach ($all_files as $file) {
@@ -227,7 +227,7 @@ 
             if (is_file($file) === true) {
                 // Remove each file in this Directory
                 unlink($file);
-                echo "Removed File: " . $file . "<br>";
+                echo "Removed File: ".$file."<br>";
             } elseif (is_dir($file) === true) {
                 // If this Directory contains a Subdirectory, run this Function on it
                 removeDir($file);

Doc Comments +3 added lines

@@ -207,6 +207,9 @@
         $this->removeDir('/home/intraface/upload/' . $intranet_id . '/');
     }
 
+    /**
+     * @param string $path
+     */
     protected function removeDir($path)
     {
         // Add trailing slash to $path if one is not there