mambax7 / smartobject

include/captcha/scripts/img.php

Braces +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
 
         if(!extension_loaded('gd')) {
             $this->mode = "bmp";
-        }else{
+        } else{
             $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
             foreach($required_functions as $func) {
                 if(!function_exists($func)) {
@@ -71,7 +71,7 @@ 
         if($this->mode == "bmp") {
             $this->config["num_chars"] = 4;
             $this->code = rand( pow(10, $this->config["num_chars"] - 1), intval( str_pad("9", $this->config["num_chars"], "9") ) );
-        }else{
+        } else{
             $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config["num_chars"] );
             if (!$this->config["casesensitive"]) {
                 $this->code = strtoupper( $this->code );
@@ -107,7 +107,7 @@ 
 
         if($this->mode == "bmp") {
             return $this->createImageBmp();
-        }else{
+        } else{
             return $this->createImageGd();
         }
     }
@@ -168,7 +168,7 @@ 
         if(empty($file)) {
             header("Content-type: image/jpeg");
             imagejpeg ($this->oImage);
-        }else{
+        } else{
             imagejpeg ($this->oImage, XOOPS_ROOT_PATH. "/". $this->config["imagepath"]. "/". $file . ".jpg");
         }
         imagedestroy($this->oImage);
@@ -402,7 +402,7 @@ 
         if(empty($file)) {
             header("Content-type: image/bmp");
             echo $image;
-        }else{
+        } else{
             return $image;
         }
     }

include/captcha/formcaptcha.php

Braces +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 		$this->_captchaHandler->init($name, $skipmember, $numchar, $minfontsize, $maxfontsize, $backgroundtype, $backgroundnum);
 		if(!$this->_captchaHandler->active) {
 			$this->setHidden();
-		}else{
+		} else{
 			$caption = !empty($caption) ? $caption : $this->_captchaHandler->getCaption();
 			$this->setCaption($caption);
 		}

include/captcha/text.php

Braces +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         if($val_a > $val_b) {
             $expression = "{$val_a} - {$val_b} = ?";
             $this->code = $val_a - $val_b;
-        }else{
+        } else{
             $expression = "{$val_a} + {$val_b} = ?";
             $this->code = $val_a + $val_b;
         }

class/smartobjecttable.php

Braces +4 added lines, -4 removed lines

@@ -298,11 +298,11 @@ 
                     }
                     if($column->_keyname == 'checked'){
                         $value = '<input type ="checkbox" name="selected_smartobjects[]" value="'.$object->id().'" />';
-                    }elseif ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
+                    } elseif ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
                         $method = $column->_customMethodForValue;
                         if($column->_param){
                             $value = $object->$method($column->_param);
-                        }else{
+                        } else{
                             $value = $object->$method();
                         }
                     } else {
@@ -654,9 +654,9 @@ 
             if($column->_keyname == 'checked'){
                 $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' .
                         ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_'.$this->_id.', \'selected_smartobjects\');" />';
-            }elseif($column->getCustomCaption()){
+            } elseif($column->getCustomCaption()){
                 $aColumn['caption'] = $column->getCustomCaption();
-            }else{
+            } else{
                 $aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
             }
             // Are we doing a GET sort on this column ?

class/rating.php

Braces +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 
 		if(!$ret){
 			return false;
-		}else{
+		} else{
 			return $ret[0];
 		}
 

class/smartexport.php

Braces +10 added lines, -9 removed lines

@@ -105,13 +105,13 @@ 
 	 	if(!$this->notDisplayFields){
 	 		if(is_array($fields)){
 	 			$this->notDisplayFields = $fields;
-	 		}else{
+	 		} else{
 	 			$this->notDisplayFields = array($fields);
 	 		}
-	 	}else{
+	 	} else{
 	 		if(is_array($fields)){
 	 			$this->notDisplayFields = array_merge($this->notDisplayFields, $fields);
-	 		}else{
+	 		} else{
 	 			$this->notDisplayFields[] = $fields;
 	 		}
 	 	}
@@ -153,8 +153,9 @@ 
 	}
 
 	function arrayToCsvString($dataArray, $separator, $trim = 'both', $removeEmptyLines = TRUE) {
-		if (!is_array($dataArray) || empty ($dataArray))
-			return '';
+		if (!is_array($dataArray) || empty ($dataArray)) {
+					return '';
+		}
 		switch ($trim) {
 			case 'none' :
 				$trimFunction = FALSE;
@@ -178,8 +179,9 @@ 
 
 	}
 	function valToCsvHelper($val, $separator, $trimFunction) {
-		if ($trimFunction)
-			$val = $trimFunction ($val);
+		if ($trimFunction) {
+					$val = $trimFunction ($val);
+		}
 		//If there is a separator (;) or a quote (") or a linebreak in the string, we need to quote it.
 		$needQuote = FALSE;
 		do {
@@ -271,8 +273,7 @@ 
 
 		    if(isset($mimeType) && strstr($mimeType, "text/")) {
 		        $fp = fopen($fullFileName, "r");
-		    }
-		    else {
+		    } else {
 		        $fp = fopen($fullFileName, "rb");
 		    }
 		    fpassthru($fp);

class/smartobject.php

Braces +32 added lines, -14 removed lines

@@ -21,15 +21,33 @@ 
 
 include_once SMARTOBJECT_ROOT_PATH . "class/smartobjectcontroller.php";
 
-if (!defined('XOBJ_DTYPE_SIMPLE_ARRAY')) define('XOBJ_DTYPE_SIMPLE_ARRAY', 101);
-if (!defined('XOBJ_DTYPE_CURRENCY')) define('XOBJ_DTYPE_CURRENCY', 200);
-if (!defined('XOBJ_DTYPE_FLOAT')) define('XOBJ_DTYPE_FLOAT', 201);
-if (!defined('XOBJ_DTYPE_TIME_ONLY')) define('XOBJ_DTYPE_TIME_ONLY', 202);
-if (!defined('XOBJ_DTYPE_URLLINK')) define('XOBJ_DTYPE_URLLINK', 203);
-if (!defined('XOBJ_DTYPE_FILE')) define('XOBJ_DTYPE_FILE', 204);
-if (!defined('XOBJ_DTYPE_IMAGE')) define('XOBJ_DTYPE_IMAGE', 205);
-if (!defined('XOBJ_DTYPE_FORM_SECTION')) define('XOBJ_DTYPE_FORM_SECTION', 210);
-if (!defined('XOBJ_DTYPE_FORM_SECTION_CLOSE')) define('XOBJ_DTYPE_FORM_SECTION_CLOSE', 211);
+if (!defined('XOBJ_DTYPE_SIMPLE_ARRAY')) {
+	define('XOBJ_DTYPE_SIMPLE_ARRAY', 101);
+}
+if (!defined('XOBJ_DTYPE_CURRENCY')) {
+	define('XOBJ_DTYPE_CURRENCY', 200);
+}
+if (!defined('XOBJ_DTYPE_FLOAT')) {
+	define('XOBJ_DTYPE_FLOAT', 201);
+}
+if (!defined('XOBJ_DTYPE_TIME_ONLY')) {
+	define('XOBJ_DTYPE_TIME_ONLY', 202);
+}
+if (!defined('XOBJ_DTYPE_URLLINK')) {
+	define('XOBJ_DTYPE_URLLINK', 203);
+}
+if (!defined('XOBJ_DTYPE_FILE')) {
+	define('XOBJ_DTYPE_FILE', 204);
+}
+if (!defined('XOBJ_DTYPE_IMAGE')) {
+	define('XOBJ_DTYPE_IMAGE', 205);
+}
+if (!defined('XOBJ_DTYPE_FORM_SECTION')) {
+	define('XOBJ_DTYPE_FORM_SECTION', 210);
+}
+if (!defined('XOBJ_DTYPE_FORM_SECTION_CLOSE')) {
+	define('XOBJ_DTYPE_FORM_SECTION_CLOSE', 211);
+}
 
 /**
  * SmartObject base class
@@ -482,9 +500,9 @@ 
     function getVarInfo($key = '', $info = '') {
 		if (isset($this->vars[$key][$info])) {
 			return $this->vars[$key][$info];
-		}elseif ($info == '' && isset($this->vars[$key])) {
+		} elseif ($info == '' && isset($this->vars[$key])) {
 			return $this->vars[$key];
-		}  else {
+		} else {
 			return $this->vars;
 		}
 	}
@@ -1082,7 +1100,7 @@ 
 		if ($fetchOnly) {
 			$ret = $singleview->render($fetchOnly);;
 			return $ret;
-		}else {
+		} else {
 			$singleview->render($fetchOnly);
 		}
     }
@@ -1142,7 +1160,7 @@ 
 		$urllinkid = $this->getVar($key) != null ? $this->getVar($key) : 0;
 		if($urllinkid != 0){
 			return  $smartobject_linkurl_handler->get($urllinkid);
-		}else{
+		} else{
 			return $smartobject_linkurl_handler->create();
 		}
 	}
@@ -1157,7 +1175,7 @@ 
 		$fileid = $this->getVar($key) != null ? $this->getVar($key) : 0;
 		if($fileid != 0){
 			return  $smartobject_file_handler->get($fileid);
-		}else{
+		} else{
 			return $smartobject_file_handler->create();
 		}
 	}

class/smartobjecthandler.php

Braces +7 added lines, -13 removed lines

@@ -255,8 +255,7 @@ 
                 //$criteria->add(new Criteria($this->keyName[$i], ($id[$i]), '=', $this->_itemname));
                 $criteria->add(new Criteria($this->keyName[$i], $id[$i], '=', $this->_itemname));
             }
-        }
-        else {
+        } else {
             //$criteria = new Criteria($this->keyName, intval($id), '=', $this->_itemname);
             /**
             * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
@@ -414,15 +413,13 @@ 
             if (!$id_as_key) {
                 if ($as_object) {
                     $ret[] =& $obj;
-                }
-                else {
+                } else {
                     $ret[] = $obj->toArray();
                 }
             } else {
                 if ($as_object) {
                     $value =& $obj;
-                }
-                else {
+                } else {
                     $value = $obj->toArray();
                 }
                 if ($id_as_key === 'parentid') {
@@ -531,8 +528,7 @@ 
         if ($groupby == false) {
             list($count) = $this->db->fetchRow($result);
             return $count;
-        }
-        else {
+        } else {
             $ret = array();
             while (list($id, $count) = $this->db->fetchRow($result)) {
                 $ret[$id] = $count;
@@ -562,8 +558,7 @@ 
                 $clause[] = $this->keyName[$i]." = ".$obj->getVar($this->keyName[$i]);
             }
             $whereclause = implode(" AND ", $clause);
-        }
-        else {
+        } else {
             $whereclause = $this->keyName." = ".$obj->getVar($this->keyName);
         }
         $sql = "DELETE FROM ".$this->table . " WHERE ".$whereclause;
@@ -659,7 +654,7 @@ 
                 return false;
             }
 
-        }	else {
+        } else {
             $eventResult = $this->executeEvent('beforeUpdate', $obj);
             if (!$eventResult) {
                 $obj->setErrors("An error occured during the BeforeUpdate event");
@@ -714,8 +709,7 @@ 
                     }
                     $whereclause .= $this->keyName[$i]." = ".$obj->getVar($this->keyName[$i]);
                 }
-            }
-            else {
+            } else {
                 $whereclause = $this->keyName." = ".$obj->getVar($this->keyName);
             }
             $sql .= " WHERE ".$whereclause;

class/form/elements/smartformimageelement.php

Braces +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
         if($object->getVar($key) != '' && (substr($object->getVar($key), 0, 4) == 'http' || substr($object->getVar($key), 0, 11) == '{XOOPS_URL}')){
         	$this->addElement( new XoopsFormLabel( '', "<img src='" . str_replace('{XOOPS_URL}', XOOPS_URL, $object->getVar($key)) . "' alt='' /><br/><br/>" ) );
-        }elseif($object->getVar($key) != ''){
+        } elseif($object->getVar($key) != ''){
         	$this->addElement( new XoopsFormLabel( '', "<img src='" . $object_imageurl . $object->getVar($key) . "' alt='' /><br/><br/>" ) );
        	}