intraface / intraface.dk

src/Intraface/XMLRPC/Shop/Server2.php

Braces +3 added lines, -1 removed lines

@@ -185,7 +185,9 @@
                 $attribute_string = '';

                 $attributes_array = $variation->getAttributesAsArray();

                 foreach ($attributes_array as $attribute) {

-                    if ($attribute_string != '') $attribute_string .= '-';

+                    if ($attribute_string != '') {
+                        $attribute_string .= '-';
+                    }
                     $attribute_string .= $attribute['id'];

                 }

 

src/Intraface/XMLRPC/Shop/Server.php

Braces +1 added lines, -2 removed lines

@@ -303,8 +303,7 @@
         // we put the possibility for BasketEvaluation not to be run.

         if (is_string($customer) && $customer == 'no_evaluation') {

             // nothing happens

-        }

-        elseif (is_array($customer)) {

+        } elseif (is_array($customer)) {

             require_once 'Intraface/modules/webshop/BasketEvaluation.php';

             $basketevaluation = new BasketEvaluation($this->webshop->kernel);

             if (!$basketevaluation->run($this->webshop->basket, $customer)) {

src/Intraface/XMLRPC/Shop/Server0100.php

Braces +7 added lines, -3 removed lines

@@ -144,7 +144,7 @@ 
         $search['area'] = 'category_'.$category_id;

         if ($results_per_page > 0) {

             $search['use_paging'] = 'true';

-        }else {

+        } else {

             $search['use_paging'] = 'false';

         }

 

@@ -493,11 +493,15 @@ 
                 $attributes_array = $variation->getAttributesAsArray();

 

                 foreach ($attributes_array as $attribute) {

-                    if ($attribute_string != '') $attribute_string .= '-';

+                    if ($attribute_string != '') {
+                        $attribute_string .= '-';
+                    }
                     $attribute_string .= $attribute['id'];

 

                     // We calculate all products which is on stock with this attribute to be able to mark unused attributes in list.

-                    if (!isset($attribute_for_sale[$attribute['id']])) $attribute_for_sale[$attribute['id']] = 0;

+                    if (!isset($attribute_for_sale[$attribute['id']])) {
+                        $attribute_for_sale[$attribute['id']] = 0;
+                    }
                     if ($stock !== false) {

                         // If for_sale is less than zero we add zero.

                         $attribute_for_sale[$attribute['id']] += (($stock['for_sale'] < 0) ? 0 : $stock['for_sale']);

src/Intraface/XMLRPC/Shop/Server0004.php

Braces +7 added lines, -3 removed lines

@@ -142,7 +142,7 @@ 
         $search['area'] = 'category_'.$category_id;

         if ($results_per_page > 0) {

             $search['use_paging'] = 'true';

-        }else {

+        } else {

             $search['use_paging'] = 'false';

         }

 

@@ -327,11 +327,15 @@ 
                 $attributes_array = $variation->getAttributesAsArray();

 

                 foreach ($attributes_array as $attribute) {

-                    if ($attribute_string != '') $attribute_string .= '-';

+                    if ($attribute_string != '') {
+                        $attribute_string .= '-';
+                    }
                     $attribute_string .= $attribute['id'];

 

                     // We calculate all products which is on stock with this attribute to be able to mark unused attributes in list.

-                    if (!isset($attribute_for_sale[$attribute['id']])) $attribute_for_sale[$attribute['id']] = 0;

+                    if (!isset($attribute_for_sale[$attribute['id']])) {
+                        $attribute_for_sale[$attribute['id']] = 0;
+                    }
                     if ($stock !== false) {

                         // If for_sale is less than zero we add zero.

                         $attribute_for_sale[$attribute['id']] += (($stock['for_sale'] < 0) ? 0 : $stock['for_sale']);

src/Intraface/common.php

Braces +37 added lines, -11 removed lines

@@ -20,15 +20,37 @@ 
 require_once 'bucket.inc.php';

 

 // paths

-if (!defined('PATH_INCLUDE_IHTML')) define('PATH_INCLUDE_IHTML', PATH_ROOT.'Intraface/ihtml' . DIRECTORY_SEPARATOR);

-if (!defined('PATH_INCLUDE_MODULE')) define('PATH_INCLUDE_MODULE', PATH_ROOT.'Intraface/modules' . DIRECTORY_SEPARATOR);

-if (!defined('PATH_INCLUDE_SHARED')) define('PATH_INCLUDE_SHARED', PATH_ROOT.'Intraface/shared' . DIRECTORY_SEPARATOR);

-if (!defined('PATH_INCLUDE_CONFIG')) define('PATH_INCLUDE_CONFIG', PATH_ROOT.'/Intraface/config'.DIRECTORY_SEPARATOR);

-if (!defined('PATH_UPLOAD')) define('PATH_UPLOAD', PATH_ROOT . 'upload/'); // Directory for upload of files.

-if (!defined('PATH_UPLOAD_TEMPORARY')) define('PATH_UPLOAD_TEMPORARY', 'tempdir/'); // Mappen i Upload_path, under intranetid, hvor temp-filer placeres.

-if (!defined('PATH_CAPTCHA')) define('PATH_CAPTCHA', PATH_ROOT . 'captcha/'); // remember trailing slash - used for the demo formular

-if (!defined('PATH_CACHE')) define('PATH_CACHE', PATH_ROOT . 'cache/'); // remember trailing slash - path to cache

-if (!defined('PATH_INCLUDE_BACKUP')) define('PATH_INCLUDE_BACKUP', PATH_ROOT . 'backup/');

+if (!defined('PATH_INCLUDE_IHTML')) {
+    define('PATH_INCLUDE_IHTML', PATH_ROOT.'Intraface/ihtml' . DIRECTORY_SEPARATOR);
+}
+if (!defined('PATH_INCLUDE_MODULE')) {
+    define('PATH_INCLUDE_MODULE', PATH_ROOT.'Intraface/modules' . DIRECTORY_SEPARATOR);
+}
+if (!defined('PATH_INCLUDE_SHARED')) {
+    define('PATH_INCLUDE_SHARED', PATH_ROOT.'Intraface/shared' . DIRECTORY_SEPARATOR);
+}
+if (!defined('PATH_INCLUDE_CONFIG')) {
+    define('PATH_INCLUDE_CONFIG', PATH_ROOT.'/Intraface/config'.DIRECTORY_SEPARATOR);
+}
+if (!defined('PATH_UPLOAD')) {
+    define('PATH_UPLOAD', PATH_ROOT . 'upload/');
+}
+// Directory for upload of files.

+if (!defined('PATH_UPLOAD_TEMPORARY')) {
+    define('PATH_UPLOAD_TEMPORARY', 'tempdir/');
+}
+// Mappen i Upload_path, under intranetid, hvor temp-filer placeres.

+if (!defined('PATH_CAPTCHA')) {
+    define('PATH_CAPTCHA', PATH_ROOT . 'captcha/');
+}
+// remember trailing slash - used for the demo formular

+if (!defined('PATH_CACHE')) {
+    define('PATH_CACHE', PATH_ROOT . 'cache/');
+}
+// remember trailing slash - path to cache

+if (!defined('PATH_INCLUDE_BACKUP')) {
+    define('PATH_INCLUDE_BACKUP', PATH_ROOT . 'backup/');
+}
 

 // paths on www

 if (defined('NET_SCHEME') && defined('NET_HOST') && defined('NET_DIRECTORY')) {

@@ -43,10 +65,14 @@ 
 $bucket = new bucket_Container(new Intraface_Factory());

 

 // filehandler

-if (!defined('IMAGE_LIBRARY')) define('IMAGE_LIBRARY', 'GD');

+if (!defined('IMAGE_LIBRARY')) {
+    define('IMAGE_LIBRARY', 'GD');
+}
 

 // database

-if (!defined('DB_DSN')) define('DB_DSN', 'mysql://'.DB_USER.':'.DB_PASS.'@'.DB_HOST.'/'.DB_NAME.'');

+if (!defined('DB_DSN')) {
+    define('DB_DSN', 'mysql://'.DB_USER.':'.DB_PASS.'@'.DB_HOST.'/'.DB_NAME.'');
+}
 if (!defined('MDB2_DEBUG')) {

     define('MDB2_DEBUG', false);

 }

src/Intraface/NewAddress.php

Braces +15 added lines, -30 removed lines

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

         if ($i = array_search($type, $address_type)) {

             $this->type = $i;

-        }

-        else {

+        } else {

             throw new Exception('Ugyldig address type');

         }

 

@@ -108,23 +107,20 @@ 
     function load() {

         if ($this->old_address_id != 0) {

             $sql = "id = ".$this->old_address_id;

-        }

-        else {

+        } else {

             $sql = "type = ".$this->type." AND belong_to_id = ".$this->id." AND active = 1";

         }

 

         $this->db->query("SELECT * FROM address WHERE ".$sql);

         if ($this->db->numRows() > 1) {

             throw new Exception('Der er mere end 1 aktiv adresse', FATAL);

-        }

-        elseif ($this->db->nextRecord()) {

+        } elseif ($this->db->nextRecord()) {

             $this->value['address_id'] = $this->db->f('id');

             for ($i = 0, $max = count($this->fields); $i<$max; $i++) {

                 $this->value[$this->fields[$i]] = $this->db->f($this->fields[$i]);

             }

             return $this->db->f('id');

-        }

-        else {

+        } else {

             return 0;

         }

     }

@@ -140,11 +136,9 @@ 
         $db = new DB_sql;

         if ($this->old_address_id != 0) {

             return 0;

-        }

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

+        } elseif ($this->id == 0) {

             throw new Exception('Address:save(): Id kan ikke v�re 0 n�r du fors�ger at gemme adresse', FATAL);

-        }

-        elseif (count($array_var) > 0) {

+        } elseif (count($array_var) > 0) {

 

             $db->query("SELECT * FROM address WHERE id = ".$this->address_id);

             if ($db->nextRecord()) {

@@ -155,22 +149,19 @@ 
                         if ($db->f($this->fields[$i]) != $array_var[$this->fields[$i]]) {

                             $do_update = 1;

                         }

-                    }

-                    else {

+                    } else {

                         // $sql .= $this->fields[$i]." = '', ";

                     }

 

                 }

-            }

-            else {

+            } else {

                 // Kun hvis der rent faktisk gemmes nogle v�rdier opdaterer vi

                 $do_update = 0;

                 for ($i = 0, $max = count($this->fields), $sql = ''; $i<$max; $i++) {

                     if (array_key_exists($this->fields[$i], $array_var) AND isset($array_var[$this->fields[$i]])) {

                         $sql .= $this->fields[$i]." = '".$array_var[$this->fields[$i]]."', ";

                         $do_update = 1;

-                    }

-                    else {

+                    } else {

                         // $sql .= $this->fields[$i]." = \"\", ";

                     }

                 }

@@ -179,16 +170,14 @@ 
             if ($do_update == 0) {

                 // Hmmmmm, der er slet ikke nogen felter der er �ndret! S� gemmer vi ikke, men siger at det gik godt :-)

                 return 1;

-            }

-            else {

+            } else {

                 $this->db->query("UPDATE address SET active = 0 WHERE type = ".$this->type." AND belong_to_id = ".$this->id);

                 $this->db->query("INSERT INTO address SET ".$sql." type = ".$this->type.", belong_to_id = ".$this->id.", active = 1, changed_date = NOW()");

                 $this->adress_id = $this->db->insertedId();

                 $this->load();

                 return 1;

             }

-        }

-        else {

+        } else {

             // Der var slet ikke noget indhold i arrayet, s� vi lader v�re at opdatere, men siger, at vi gjorde.

             return 1;

         }

@@ -205,19 +194,15 @@ 
     function update($array_var) {

         if ($this->old_address_id != 0) {

             return 0;

-        }

-        elseif ($this->address_id == 0) {

+        } elseif ($this->address_id == 0) {

             $this->save($array_var);

-        }

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

+        } elseif ($this->id == 0) {

             throw new Exception("Id kan ikke v�re 0 n�r du fors�ger at gemme adresse", FATAL);

-        }

-        else {

+        } else {

             for ($i = 0, $max = count($this->fields), $sql = ''; $i<$max; $i++) {

                 if (isset($array_var[$this->fields[$i]])) {

                     $sql .= $this->fields[$i]." = \"".$array_var[$this->fields[$i]]."\", ";

-                }

-                else {

+                } else {

                     $sql .= $this->fields[$i]." = \"\", ";

                 }

             }

src/Intraface/shared/keyword/Keyword.php

Braces +3 added lines, -1 removed lines

@@ -516,7 +516,9 @@
                 $temparray = explode($splitter, substr($val, $delimlen, strlen($val)-$delimlen-$delimlen ) );

 

                 while (list($iarg, $ival) = each($temparray)) {

-                    if (!empty($ival)) $result[] = trim($ival);

+                    if (!empty($ival)) {
+                        $result[] = trim($ival);
+                    }
                 }

                 $instring = 1;

             }

src/intraface.dk/core/index.php

Braces +3 added lines, -1 removed lines

@@ -285,7 +285,9 @@
     public $options;
     function options()
     {
-        if (empty($this->options)) return array();
+        if (empty($this->options)) {
+            return array();
+        }
         return $this->options;
     }
 }

src/intraface.dk/core/javascript/ckeditor/ckeditor_php4.php

Braces +21 added lines, -26 removed lines

@@ -146,10 +146,11 @@ 
 		$_config = $this->configSettings($config, $events);

 

 		$js = $this->returnGlobalEvents();

-		if (!empty($_config))

-			$js .= "CKEDITOR.replace('".$name."', ".$this->jsEncode($_config).");";

-		else

-			$js .= "CKEDITOR.replace('".$name."');";

+		if (!empty($_config)) {
+					$js .= "CKEDITOR.replace('".$name."', ".$this->jsEncode($_config).");";
+		} else {
+					$js .= "CKEDITOR.replace('".$name."');";
+		}
 

 		$out .= $this->script($js);

 

@@ -186,8 +187,7 @@ 
 		$js = $this->returnGlobalEvents();

 		if (!empty($_config)) {

 			$js .= "CKEDITOR.replace('".$id."', ".$this->jsEncode($_config).");";

-		}

-		else {

+		} else {

 			$js .= "CKEDITOR.replace('".$id."');";

 		}

 		$out .= $this->script($js);

@@ -230,12 +230,10 @@ 
 		if (empty($_config)) {

 			if (empty($className)) {

 				$js .= "CKEDITOR.replaceAll();";

-			}

-			else {

+			} else {

 				$js .= "CKEDITOR.replaceAll('".$className."');";

 			}

-		}

-		else {

+		} else {

 			$classDetection = "";

 			$js .= "CKEDITOR.replaceAll( function(textarea, config) {\n";

 			if (!empty($className)) {

@@ -293,8 +291,7 @@ 
 	{

 		if (!empty($event)) {

 			$this->_events[$event] = array();

-		}

-		else {

+		} else {

 			$this->_events = array();

 		}

 	}

@@ -333,8 +330,7 @@ 
 	{

 		if (!empty($event)) {

 			$this->_globalEvents[$event] = array();

-		}

-		else {

+		} else {

 			$this->_globalEvents = array();

 		}

 	}

@@ -387,11 +383,9 @@ 
 			foreach ($_events as $eventName => $handlers) {

 				if (empty($handlers)) {

 					continue;

-				}

-				else if (count($handlers) == 1) {

+				} else if (count($handlers) == 1) {

 					$_config['on'][$eventName] = '@@'.$handlers[0];

-				}

-				else {

+				} else {

 					$_config['on'][$eventName] = '@@function (ev){';

 					foreach ($handlers as $handler => $code) {

 						$_config['on'][$eventName] .= '('.$code.')(ev);';

@@ -497,8 +491,7 @@ 
 		 */

 		if (isset($_SERVER['SCRIPT_FILENAME'])) {

 			$realPath = dirname($_SERVER['SCRIPT_FILENAME']);

-		}

-		else {

+		} else {

 			/**

 			 * realpath — Returns canonicalized absolute pathname

 			 */

@@ -554,8 +547,7 @@ 
 			// Use @@ to not use quotes when outputting string value

 			if (strpos($val, '@@') === 0) {

 				return substr($val, 2);

-			}

-			else {

+			} else {

 				// All scalars are converted to strings to avoid indeterminism.

 				// PHP's "1" and 1 are equal for all PHP operators, but

 				// JS's "1" and 1 are not. So if we pass "1" or 1 from the PHP backend,

@@ -581,12 +573,15 @@ 
 		$result = array();

 		if ($isList)

 		{

-			foreach ($val as $v) $result[] = $this->jsEncode($v);

+			foreach ($val as $v) {
+			    $result[] = $this->jsEncode($v);
+			}
 			return '[ ' . join(', ', $result) . ' ]';

-		}

-		else

+		} else

 		{

-			foreach ($val as $k => $v) $result[] = $this->jsEncode($k).': '.$this->jsEncode($v);

+			foreach ($val as $k => $v) {
+			    $result[] = $this->jsEncode($k).': '.$this->jsEncode($v);
+			}
 			return '{ ' . join(', ', $result) . ' }';

 		}

 	}