intraface / intraface.dk

install/Install.php

Braces +3 added lines, -2 removed lines

@@ -130,8 +130,9 @@
     {

         if ( is_dir( $f ) ){

             foreach ( scandir( $f ) as $item ){

-                if ( !strcmp( $item, '.' ) || !strcmp( $item, '..' ) )

-                    continue;

+                if ( !strcmp( $item, '.' ) || !strcmp( $item, '..' ) ) {
+                                    continue;
+                }
                 $this->deleteUploadDirectory( $f . "/" . $item );

             }

             rmdir( $f );

generate_package_xml.php

Indentation +25 added lines, -25 removed lines

@@ -57,10 +57,10 @@ 
         'packagefile'       => 'package.xml',

         'ignore'            => $ignore,

         'dir_roles'        => array(

-              'intraface.dk' => 'www'

+                'intraface.dk' => 'www'

         ),

         'exceptions' => array(

-              'intraface.dk/*.*' => 'www'

+                'intraface.dk/*.*' => 'www'

         ),

         'simpleoutput'      => true,

         'addhiddenfiles' => true

@@ -221,29 +221,29 @@ 
 $post_install_script = $pfm->initPostinstallScript('intraface.php');

 $post_install_script->addParamGroup('setup',

     array($post_install_script->getParam('db_user', 'User', 'string', 'root'),

-          $post_install_script->getParam('db_pass', 'Password', 'string', ''),

-          $post_install_script->getParam('db_host', 'Host', 'string', 'localhost'),

-          $post_install_script->getParam('db_name', 'Database', 'string', 'intraface'),

-          $post_install_script->getParam('net_scheme', 'Net scheme', 'string', 'http://'),

-          $post_install_script->getParam('net_host', 'Net host', 'string', 'localhost'),

-          $post_install_script->getParam('net_directory', 'Net directory', 'string', '/'),

-          $post_install_script->getParam('path_root', 'Root path', 'string', '/home/intraface/'),

-          $post_install_script->getParam('path_include_path', 'Include path', 'string', ''),

-          $post_install_script->getParam('path_upload', 'Upload path', 'string', '/home/intraface/upload/'),

-          $post_install_script->getParam('path_cache', 'Cache path', 'string', '/home/intraface/cache'),

-          $post_install_script->getParam('connection_internet', 'Connection to intranet', 'boolean', true),

-          $post_install_script->getParam('server_status', 'Server status', 'string', 'PRODUCTION'),

-          $post_install_script->getParam('error_handle_level', 'Error handle error ', 'integer', E_ALL),

-          $post_install_script->getParam('error_level_continue_script', 'Error level continue script', 'integer' ^ E_NOTICE),

-          $post_install_script->getParam('error_report_email', 'Error report email', 'string', 'support@intraface.dk'),

-          $post_install_script->getParam('error_log', 'Error log', 'string', 'log/error.log'),

-          $post_install_script->getParam('timezone', 'Timezone', 'string', 'Europe/Copenhagen'),

-          $post_install_script->getParam('country_local', 'Country local', 'string', 'da_DK'),

-          $post_install_script->getParam('intraface_intranetmaintenance_intranet_private_key', 'Private key', 'string', ''),

-          $post_install_script->getParam('intraface_onlinepayment_provider', 'Online payment provider', 'string', 'Quickpay'),

-          $post_install_script->getParam('intraface_onlinepayment_merchant', 'Online payment merchant number', 'string', ''),

-          $post_install_script->getParam('intraface_onlinepayment_md5secret', 'Online payment md5secret', 'string', '')

-              ),

+            $post_install_script->getParam('db_pass', 'Password', 'string', ''),

+            $post_install_script->getParam('db_host', 'Host', 'string', 'localhost'),

+            $post_install_script->getParam('db_name', 'Database', 'string', 'intraface'),

+            $post_install_script->getParam('net_scheme', 'Net scheme', 'string', 'http://'),

+            $post_install_script->getParam('net_host', 'Net host', 'string', 'localhost'),

+            $post_install_script->getParam('net_directory', 'Net directory', 'string', '/'),

+            $post_install_script->getParam('path_root', 'Root path', 'string', '/home/intraface/'),

+            $post_install_script->getParam('path_include_path', 'Include path', 'string', ''),

+            $post_install_script->getParam('path_upload', 'Upload path', 'string', '/home/intraface/upload/'),

+            $post_install_script->getParam('path_cache', 'Cache path', 'string', '/home/intraface/cache'),

+            $post_install_script->getParam('connection_internet', 'Connection to intranet', 'boolean', true),

+            $post_install_script->getParam('server_status', 'Server status', 'string', 'PRODUCTION'),

+            $post_install_script->getParam('error_handle_level', 'Error handle error ', 'integer', E_ALL),

+            $post_install_script->getParam('error_level_continue_script', 'Error level continue script', 'integer' ^ E_NOTICE),

+            $post_install_script->getParam('error_report_email', 'Error report email', 'string', 'support@intraface.dk'),

+            $post_install_script->getParam('error_log', 'Error log', 'string', 'log/error.log'),

+            $post_install_script->getParam('timezone', 'Timezone', 'string', 'Europe/Copenhagen'),

+            $post_install_script->getParam('country_local', 'Country local', 'string', 'da_DK'),

+            $post_install_script->getParam('intraface_intranetmaintenance_intranet_private_key', 'Private key', 'string', ''),

+            $post_install_script->getParam('intraface_onlinepayment_provider', 'Online payment provider', 'string', 'Quickpay'),

+            $post_install_script->getParam('intraface_onlinepayment_merchant', 'Online payment merchant number', 'string', ''),

+            $post_install_script->getParam('intraface_onlinepayment_md5secret', 'Online payment md5secret', 'string', '')

+                ),

     '');

 

 $pfm->addPostInstallTask($post_install_script, 'intraface.php');

Braces +3 added lines, -1 removed lines

@@ -251,7 +251,9 @@
 foreach ($web_files AS $file) {

     $src_file = substr($file, 4);

     $formatted_file = substr($file, strlen($web_dir . '/'));

-    if (in_array($src_file, $ignore)) continue;

+    if (in_array($src_file, $ignore)) {
+        continue;
+    }
     $pfm->addInstallAs($src_file, $formatted_file);

 }

 

src/Intraface/Weblogin.php

Indentation +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 

     function hasModuleAccess($modulename)

     {

-		return $this->intranet->hasModuleAccess($modulename);

+        return $this->intranet->hasModuleAccess($modulename);

     }

 

     function hasIntranetAccess($intranet_id)

src/Intraface/Intranet.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 

     public function getAddress()

     {

-    	return ($this->address = Intraface_Address::factory('intranet', $this->id));

+        return ($this->address = Intraface_Address::factory('intranet', $this->id));

     }

 

     /**

src/Intraface/modules/procurement/ProcurementItem.php

Indentation +2 added lines, -2 removed lines

@@ -234,7 +234,7 @@ 
             $product = new Product($this->procurement->kernel, $input["product_id"], $input['product_detail_id']);

 

             if (!is_object($product) || $product->get('id') == 0) {

-                 $this->error->set("Ugyldigt produkt");

+                    $this->error->set("Ugyldigt produkt");

             } else {

                 $product_detail_id = $product->get("detail_id");

             }

@@ -346,7 +346,7 @@ 
         $product = new Product($this->procurement->kernel, $product_id);

 

         if (!is_object($product) || $product->get('id') == 0) {

-             throw new Excetion('Invalid product id');

+                throw new Excetion('Invalid product id');

         } else {

             $product_detail_id = $product->get("detail_id");

         }

src/Intraface/modules/procurement/Procurement.php

Indentation +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 
     function loadItem($id = 0)
     {
-         $this->item = new ProcurementItem($this, (int)$id);
+            $this->item = new ProcurementItem($this, (int)$id);
     }
 
     function update($input)

src/Intraface/modules/procurement/Controller/Show.php

Indentation +10 added lines, -10 removed lines

@@ -98,10 +98,10 @@ 
         }

 

         $data = array(

-        	'procurement' => $this->getProcurement(),

-        	'kernel' => $this->getKernel(),

-        	'append_file' => $append_file,

-        	'filehandler' => $filehandler);

+            'procurement' => $this->getProcurement(),

+            'kernel' => $this->getKernel(),

+            'append_file' => $append_file,

+            'filehandler' => $filehandler);

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

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

     }

@@ -113,9 +113,9 @@ 
         $this->document->addScript('procurement/edit.js');

 

         $data = array(

-        	'procurement' => $this->getProcurement(),

-        	'kernel' => $this->getKernel(),

-        	'title' => $this->t("Edit procurement"),

+            'procurement' => $this->getProcurement(),

+            'kernel' => $this->getKernel(),

+            'title' => $this->t("Edit procurement"),

             'gateway' => new Intraface_modules_procurement_ProcurementGateway($this->getKernel()),

             'values' => $this->getValues());

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

@@ -245,8 +245,8 @@ 
     {

         $this->getProcurement()->loadItem();

         $this->getProcurement()->item->save(array(

-        	'product_id' => $product['product_id'],

-        	'product_variation_id' => $product['product_variation_id'],

-        	'quantity' => intval($quantity)));

+            'product_id' => $product['product_id'],

+            'product_variation_id' => $product['product_variation_id'],

+            'quantity' => intval($quantity)));

     }

 }
\ No newline at end of file

src/Intraface/modules/procurement/Controller/PurchasePrice.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
         $procurement = $this->context->getProcurement();

 

         $data = array(

-    		'items' => $procurement->getItems(),

+            'items' => $procurement->getItems(),

             'procurement' => $procurement

         );

 

src/Intraface/modules/debtor/Debtor.php

Indentation +8 added lines, -8 removed lines

@@ -389,7 +389,7 @@ 
         }

 

         if ($this->type == "invoice") {

-          // Hvis det er en faktura skal der indtastes en due_date, ellers er det ligegyldigt!

+            // Hvis det er en faktura skal der indtastes en due_date, ellers er det ligegyldigt!

             if ($validator->isDate($input["due_date"], "Ugyldig leveringsdato", "allow_no_year")) {

                 $due_date = new Intraface_Date($input["due_date"]);

                 $due_date->convert2db();

@@ -445,7 +445,7 @@ 
             $input["round_off"] = 0;

         }

 

-      // user_id = ".$this->kernel->user->get('id').", // skal puttes p�, men kun hvis det ikke er fra webshop.

+        // user_id = ".$this->kernel->user->get('id').", // skal puttes p�, men kun hvis det ikke er fra webshop.

         $db = new DB_Sql;

         if ($this->id == 0) {

 

@@ -717,9 +717,9 @@ 
 

     function getFromShopId()

     {

-    	if ($this->value['where_from'] == 'webshop') {

-    		return $this->value['where_from_id'];

-    	}

+        if ($this->value['where_from'] == 'webshop') {

+            return $this->value['where_from_id'];

+        }

         throw new Exception('Not from a shop');

     }

 

@@ -1130,9 +1130,9 @@ 
     function getPaymentInformation()

     {

         $info = array('bank_name'    => $this->kernel->setting->get("intranet", "bank_name"),

-                      'bank_reg_number' => $this->kernel->setting->get("intranet", "bank_reg_number"),

-                      'bank_account_number' => $this->kernel->setting->get("intranet", "bank_account_number"),

-                      'giro_account_number' => $this->kernel->setting->get("intranet", "giro_account_number")

+                        'bank_reg_number' => $this->kernel->setting->get("intranet", "bank_reg_number"),

+                        'bank_account_number' => $this->kernel->setting->get("intranet", "bank_account_number"),

+                        'giro_account_number' => $this->kernel->setting->get("intranet", "giro_account_number")

         );

 

         return $info;

Braces +3 added lines, -1 removed lines

@@ -307,7 +307,9 @@
 

         for ($i = 0, $max = count($item), $total = 0, $total_currency = 0; $i<$max; $i++) {

             $total += $item[$i]["amount"]->getAsIso();

-            if ($currency) $total_currency += $item[$i]['amount_currency']->getAsIso();

+            if ($currency) {
+                $total_currency += $item[$i]['amount_currency']->getAsIso();
+            }
         }

 

         // no round off of curreny yet!