webcol / Calima

Sistema/Ayudantes/CFPHPAyuda.php

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
     function filtroEmail($email){
         if (!filter_input(INPUT_POST, $email, FILTER_VALIDATE_EMAIL)){
             echo "E-Mail no es valido";
-        }
-        else
+        } else
         {
             echo "E-Mail es valido";
         }

Sistema/Ayudantes/CFPHPFormularios.php

Braces +162 added lines, -55 removed lines

@@ -130,14 +130,18 @@ 
 		// Itearate all inputs
 		foreach ($toShow as $input) {
 			// Reading data
-			if (isset($input['data'])) $data = $input['data'];
+			if (isset($input['data'])) {
+			    $data = $input['data'];
+			}
 			
 			// New row
 			echo '<div>';
 				// Showing labels
 				if ($this->show_labels) {
 					echo '<div>';
-						if (isset($input['label']) and $input['label'] != '') echo $input['label'];
+						if (isset($input['label']) and $input['label'] != '') {
+						    echo $input['label'];
+						}
 					echo '</div>';
 				}
 				
@@ -182,7 +186,9 @@ 
 	private function showInput($data) {
 		$r = '';
 		// Number start if is range
-		if ($data['type'] == 'range' and isset($data['min'])) $r .= $data['min'] . ' '; 
+		if ($data['type'] == 'range' and isset($data['min'])) {
+		    $r .= $data['min'] . ' ';
+		}
 		
 		$r .= '<input ';
 		
@@ -197,7 +203,9 @@ 
 		$r .= '/>';
 		
 		// Number end if is range
-		if ($data['type'] == 'range' and isset($data['max'])) $r .= $data['max'] . ' ';
+		if ($data['type'] == 'range' and isset($data['max'])) {
+		    $r .= $data['max'] . ' ';
+		}
 		
 		// Return
 		return $r;
@@ -220,7 +228,9 @@ 
 		// Si no tiene m�ltiples valores (es un string), lo retornamos de golpe 
 		if (!is_array($values)) {
 			// Comprobamos el value, es posible que el usuario este intentando crear los Radio (option) de forma separada
-			if (!is_array($values) and $selected == $values) $base .= ' checked="checked" ';
+			if (!is_array($values) and $selected == $values) {
+			    $base .= ' checked="checked" ';
+			}
 			return $base . ' value="'.$values.'" />';
 		} 
 
@@ -229,7 +239,9 @@ 
 		$r = '';
 		foreach ($values as $id=>$text) {
 			$r .= $base;
-			if ($selected !== null and $id == $selected) $r .= ' checked="checked" ';
+			if ($selected !== null and $id == $selected) {
+			    $r .= ' checked="checked" ';
+			}
 			$r .= ' value="'. $id .'" />'.$text.'</label>';
 		}
 		
@@ -263,7 +275,9 @@ 
 		if ($selected != '') {
 			foreach ($values as $val=>$txt) {
 				$r .= '<option value="' . $val . '"';
-					if ($val == $selected) $r .= ' selected ';
+					if ($val == $selected) {
+					    $r .= ' selected ';
+					}
 				$r .= '>' . $txt . '</option>';
 			}
 		} else {
@@ -304,12 +318,24 @@ 
 	 */
 	private function showStartForm() {
 		$r = '<form ';
-		if ($this->action!= '') $r .= 'action="'.$this->action.'" ';
-		if ($this->method != '') $r .= 'method="'.$this->method .'" ';
-		if ($this->name != '') $r .= 'name="'.$this->name .'" ';
-		if ($this->on_submit != '') $r .= 'onSubmit="'.$this->on_submit  .'" ';
-		if ($this->id != '') $r .= 'id="'.$this->id .'" ';
-		if ($this->class != '') $r .= 'class="'.$this->class .'" ';
+		if ($this->action!= '') {
+		    $r .= 'action="'.$this->action.'" ';
+		}
+		if ($this->method != '') {
+		    $r .= 'method="'.$this->method .'" ';
+		}
+		if ($this->name != '') {
+		    $r .= 'name="'.$this->name .'" ';
+		}
+		if ($this->on_submit != '') {
+		    $r .= 'onSubmit="'.$this->on_submit  .'" ';
+		}
+		if ($this->id != '') {
+		    $r .= 'id="'.$this->id .'" ';
+		}
+		if ($this->class != '') {
+		    $r .= 'class="'.$this->class .'" ';
+		}
 	
 		return $r . '>'.PHP_EOL;
 	}
@@ -370,7 +396,9 @@ 
 			}
 		}
 		
-		if ($success >= $total) return true;
+		if ($success >= $total) {
+		    return true;
+		}
 		return false;
 	}
 	
@@ -570,8 +598,11 @@ 
 	 * @return string/null Return the value, if don't exist, return null
 	 */
 	private function getData($key, $default = null) {
-		if ($this->method == "post") return isset($_POST[$key]) ? $_POST[$key] : $default;
-		else return isset($_GET[$key]) ? $_GET[$key] : $default;
+		if ($this->method == "post") {
+		    return isset($_POST[$key]) ? $_POST[$key] : $default;
+		} else {
+		    return isset($_GET[$key]) ? $_GET[$key] : $default;
+		}
 	}
 	
 	/*
@@ -614,9 +645,15 @@ 
 		);
 		
 		
-		if ($required) $data['required'] = 'required';
-		if ($placeholder != '') $data['placeholder'] = $placeholder;
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($placeholder != '') {
+		    $data['placeholder'] = $placeholder;
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		
 		// Saving data to object
@@ -624,7 +661,9 @@ 
 			'type' => 'input',
 			'data' => $data	
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		 
 		$this->content[] = $content;
 	}
@@ -651,19 +690,33 @@ 
 		);
 	
 		
-		if ($required) $data['required'] = 'required';
-		if ($min) $data['min'] = $min;
-		if ($max) $data['max'] = $max;
-		if ($step) $data['step'] = $step;
-		if ($placeholder != '') $data['placeholder'] = $placeholder;
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($min) {
+		    $data['min'] = $min;
+		}
+		if ($max) {
+		    $data['max'] = $max;
+		}
+		if ($step) {
+		    $data['step'] = $step;
+		}
+		if ($placeholder != '') {
+		    $data['placeholder'] = $placeholder;
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 	
 		// Saving data to object
 		$content = array(
 			'type' => 'input',
 			'data' => $data
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -688,19 +741,33 @@ 
 			'value' => $value,
 		);
 	
-		if ($required) $data['required'] = 'required';
-		if ($min) $data['min'] = $min;
-		if ($max) $data['max'] = $max;
-		if ($step) $data['step'] = $step;
-		if ($placeholder != '') $data['placeholder'] = $placeholder;
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($min) {
+		    $data['min'] = $min;
+		}
+		if ($max) {
+		    $data['max'] = $max;
+		}
+		if ($step) {
+		    $data['step'] = $step;
+		}
+		if ($placeholder != '') {
+		    $data['placeholder'] = $placeholder;
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 	
 		// Saving data to object
 		$content = array(
 			'type' => 'input',
 			'data' => $data
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -721,14 +788,20 @@ 
 			'name' => $name,
 			'value' => $value
 		);
-		if ($required) $data['required'] = 'required';
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		$content = array(
 			'type' => 'input',
 			'data' => $data 
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -746,13 +819,19 @@ 
 	 * @param array $attributes Optional atributes not listened (in array). This will be applicated to all radioButton
 	 */
 	public function addRadio($label = '', $name = '', $values = array(), $selected = null, $required = false, $attributes = array()) {
-		if (!is_array($values)) die('FATAL ERROR: Trying to create "RadioButton" with string VALUE, is requried use ARRAY()');
+		if (!is_array($values)) {
+		    die('FATAL ERROR: Trying to create "RadioButton" with string VALUE, is requried use ARRAY()');
+		}
 		$data = array(
 			'name' => $name,
 		);
 		
-		if ($required) $data['required'] = 'required';		
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		
 		
@@ -762,7 +841,9 @@ 
 			'values' => $values,
 			'selected' => $selected
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -783,9 +864,15 @@ 
 			'name' => $name,
 			'required' => $required,
 		);
-		if ($required) $data['required'] = 'required';
-		if ($multiple) $data['multiple'] = 'multiple';
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($multiple) {
+		    $data['multiple'] = 'multiple';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		
 		// In this case, the values are saved in the main of array to speed up select loader
@@ -795,7 +882,9 @@ 
 			'values' => $values,
 			'selected' => $selected
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -813,7 +902,9 @@ 
 			'name' => $name,
 			'value' => $value
 		);
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		$this->content[] = array(
 			'type' => 'input',
@@ -836,7 +927,9 @@ 
 			'value' => $value,
 			'onClick' => $onClick
 		);
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		$this->content[] = array(
 			'type' => 'input',
@@ -858,8 +951,12 @@ 
 			'name' => $name,
 		);
 		
-		if ($required) $data['required'] = 'required';
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		// Saving data to object
 		$content = array(
@@ -867,7 +964,9 @@ 
 			'text' => $value,
 			'data' => $data	
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		 
 		$this->content[] = $content;
 	}
@@ -885,18 +984,26 @@ 
 		if ($this->logErrors) {
 			// Try to get a name (label or name)
 			if (class_exists('kw')) {
-				if (isset($data['label'])) $this->errors .= 'Found an error in field' . ': "' . $data['label'] . '": ';
-				elseif (isset($data['name'])) $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				if (isset($data['label'])) {
+				    $this->errors .= 'Found an error in field' . ': "' . $data['label'] . '": ';
+				} elseif (isset($data['name'])) {
+				    $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				}
 			} else {
-				if (isset($data['label'])) $this->errors .= 'Found an error in field' . $data['label'] . '": ';
-				elseif (isset($data['name'])) $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				if (isset($data['label'])) {
+				    $this->errors .= 'Found an error in field' . $data['label'] . '": ';
+				} elseif (isset($data['name'])) {
+				    $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				}
 			}
 			
 			// preparing message
 			$this->errors .= ' ' . $message . '.';
 			
 			// Extra message (title attribute)
-			if (isset($data['title']) and $data['title'] != '') $this->errors .= ' | '. 'MESSAGE' .': ' . $data['title'];
+			if (isset($data['title']) and $data['title'] != '') {
+			    $this->errors .= ' | '. 'MESSAGE' .': ' . $data['title'];
+			}
 			
 			$this->errors .= '<br />';
 		}

Sistema/Ayudantes/CFPHPPaginador.php

Braces +53 added lines, -20 removed lines

@@ -189,35 +189,55 @@ 
 		$start = $cur_page - $this->max_links;
 		$end = $cur_page + $this->max_links;
 		
-		if ($start < 1) $start = 1;
-		if ($end > $this->total_pages) $end = $this->total_pages;
+		if ($start < 1) {
+		    $start = 1;
+		}
+		if ($end > $this->total_pages) {
+		    $end = $this->total_pages;
+		}
 		
 		// Showing all clickable pages (create div if class is defined)
-		if ($this->style != '') $r = '<div class="'.$this->style.'">';
-		else $r = '';
+		if ($this->style != '') {
+		    $r = '<div class="'.$this->style.'">';
+		} else {
+		    $r = '';
+		}
 		
 		
 		// First / previous
 		if ($this->cur_page > 1) {
-			if ($this->first != '') $r .= '<a class="first" href="' . $url_start . '1' . $url_end . '">'.$this->first.'</a> ';
-			if ($this->previous != '') $r .= '<a class="previous" href="' . $url_start . ($cur_page - 1) . $url_end . '">'.$this->previous.'</a> ';
+			if ($this->first != '') {
+			    $r .= '<a class="first" href="' . $url_start . '1' . $url_end . '">'.$this->first.'</a> ';
+			}
+			if ($this->previous != '') {
+			    $r .= '<a class="previous" href="' . $url_start . ($cur_page - 1) . $url_end . '">'.$this->previous.'</a> ';
+			}
 		}
 		
 		// You can optimize this separating BEFORE and AFTER current page in two for (to avoid load "if" in each loop)
 		// but it would be difficult on changes
 		for ($n=$start; $n<=$end; $n++) {
-			if ($n != $cur_page) $r .= '<a class="link" href="'. $url_start . $n . $url_end . '">'.$n.'</a> ';
-			else $r .= '<a class="current">'.$n.'</a> ';
+			if ($n != $cur_page) {
+			    $r .= '<a class="link" href="'. $url_start . $n . $url_end . '">'.$n.'</a> ';
+			} else {
+			    $r .= '<a class="current">'.$n.'</a> ';
+			}
 		}
 		
 		// next / last
 		if ($this->cur_page < $this->total_pages) {
-			if ($this->next != '') $r .= '<a class="next" href="' . $url_start . ($cur_page + 1) . $url_end . '">'.$this->next.'</a> ';
-			if ($this->last != '') $r .= '<a class="last" href="' . $url_start . $this->total_pages . $url_end .'">'.$this->last.'</a> ';
+			if ($this->next != '') {
+			    $r .= '<a class="next" href="' . $url_start . ($cur_page + 1) . $url_end . '">'.$this->next.'</a> ';
+			}
+			if ($this->last != '') {
+			    $r .= '<a class="last" href="' . $url_start . $this->total_pages . $url_end .'">'.$this->last.'</a> ';
+			}
 		}
 		
 		// End div (if exist)
-		if ($this->style != '') $r .= '</div>';
+		if ($this->style != '') {
+		    $r .= '</div>';
+		}
 		
 		return $r;
 	}
@@ -234,7 +254,9 @@ 
 			$this->original_page = $cur_page;
 			
 			// Filter values
-			if (!is_numeric($cur_page) or $cur_page < 1) $cur_page = 1;
+			if (!is_numeric($cur_page) or $cur_page < 1) {
+			    $cur_page = 1;
+			}
 			
 			// Set new filtered values (is faster this method)
 			$this->cur_page = $cur_page;
@@ -253,14 +275,17 @@ 
 		$records = $this->records;
 		
 		// Force maxium records loaded (only if is specified by user)
-		if ($max_records  > 0 and $max_records  > $total_records) 
-			$this->total_records = $max_records;
+		if ($max_records  > 0 and $max_records  > $total_records) {
+					$this->total_records = $max_records;
+		}
 		
 		// Calculate total pages that have
 		$total_pages = ceil($this->total_records / $records);
 		
 		// Is correct current page?
-		if ($this->cur_page > $total_pages) $this->cur_page = $total_pages;
+		if ($this->cur_page > $total_pages) {
+		    $this->cur_page = $total_pages;
+		}
 		$this->total_pages = $total_pages;
 		
 		// Specify LIMIT to do a query
@@ -302,8 +327,11 @@ 
 					if (!in_array(substr($query_string[0], -1), array('?', '&'))) {
 						// Current string haven't any at end and it isn't "&" or "?" ?
 						// If initial string have one character at least it means that not is the first index 
-						if (isset($query_string[0][0])) $this->url_start = '?'.$query_string[0].'&';
-						else $this->url_start = '?'.$query_string[0];
+						if (isset($query_string[0][0])) {
+						    $this->url_start = '?'.$query_string[0].'&';
+						} else {
+						    $this->url_start = '?'.$query_string[0];
+						}
 					} else {
 						// Current string already have ? or &,
 						$this->url_start = '?'.$query_string[0];
@@ -318,10 +346,14 @@ 
 					foreach ($gets as $get) {
 						if ($get != $get_name) {
 							// Trying to get the GET
-							if (isset($_GET[$get])) $tmp .= $get.'='.$_GET[$get].'&';
+							if (isset($_GET[$get])) {
+							    $tmp .= $get.'='.$_GET[$get].'&';
+							}
 						} else {
 							// Pour the $tmp content to $tmp_start
-							if ($tmp_start == '') $tmp_start .= '?';
+							if ($tmp_start == '') {
+							    $tmp_start .= '?';
+							}
 							$tmp_start .= $tmp;
 							$tmp = '';
 						}
@@ -332,8 +364,9 @@ 
 						// If have start and end
 						$this->url_start = $tmp_start;
 						$this->url_end = $tmp;
+					} else {
+					    $this->url_start = '?'.$tmp;
 					}
-					else $this->url_start = '?'.$tmp;
 				}
 			} else{
 				// Non recicle

Sistema/Ayudantes/CFPHPSeguridad.php

Braces +10 added lines, -12 removed lines

@@ -79,12 +79,13 @@ 
     }
     
     function obtenerDireccionIP(){
-    if (!empty($_SERVER ['HTTP_CLIENT_IP'] ))
-      $ip=$_SERVER ['HTTP_CLIENT_IP'];
-    elseif (!empty($_SERVER ['HTTP_X_FORWARDED_FOR'] ))
-      $ip=$_SERVER ['HTTP_X_FORWARDED_FOR'];
-    else
-      $ip=$_SERVER ['REMOTE_ADDR'];
+    if (!empty($_SERVER ['HTTP_CLIENT_IP'] )) {
+          $ip=$_SERVER ['HTTP_CLIENT_IP'];
+    } elseif (!empty($_SERVER ['HTTP_X_FORWARDED_FOR'] )) {
+          $ip=$_SERVER ['HTTP_X_FORWARDED_FOR'];
+    } else {
+          $ip=$_SERVER ['REMOTE_ADDR'];
+    }
 
     return $ip;
 	}
@@ -94,8 +95,7 @@ 
 
         if($ipCliente == $ip){
         return true;
-        }
-        else{
+        } else{
         header('location: http://www.tusitioweb/redireccion');
         exit;
         }
@@ -106,8 +106,7 @@ 
 
     if (in_array($ipCliente,$ips)){
         return true;
-    }
-    else{
+    } else{
         header('location: http://direccion_envio_salida');
         exit;
     }
@@ -118,8 +117,7 @@ 
 
     if(substr($ipCliente, 0, 8 ) == "150.214."){
         return true;
-    }
-    else{
+    } else{
         header('location: http://direccion_envio_salida');
         exit;
     }

Sistema/Nucleo/CFBootstrap.php

Braces +2 added lines, -4 removed lines

@@ -43,15 +43,13 @@
             
             if(is_callable(array($controlador, $metodo))){
                 $metodo = $peticion->getMetodo();
-            }
-            else{
+            } else{
                 $metodo = 'index';
             }
             
             if(isset($args)){
                 call_user_func_array(array($controlador, $metodo), $args);
-            }
-            else{
+            } else{
                 call_user_func(array($controlador, $metodo));
             }
             

Sistema/Nucleo/CFControlador.php

Braces +3 added lines, -6 removed lines

@@ -39,8 +39,7 @@ 
         if(is_readable($rutaLib)){
             require_once $rutaLib;
            //echo 'libreria cargada';
-        }
-        else {
+        } else {
             throw new Exception("houston tenemos un problema! al cargar libreria");
         }
     }
@@ -53,8 +52,7 @@ 
             $modelo = new $modelo;
             return $modelo;
            //echo 'modelo cargado';
-        }
-        else {
+        } else {
             //echo $rutaMod;
             
             
@@ -68,8 +66,7 @@ 
         if(is_readable($rutaAyudante)){
             require_once $rutaAyudante;
            //echo 'libreria cargada';
-        }
-        else {
+        } else {
             throw new Exception("houston tenemos un problema! al cargar ayudante");
         }
     }

Sistema/Nucleo/CFVista.php

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
             include_once SITE_ROOT . 'mvc/vistas' . DS . ADICIONALES_VISTA . DS . 'encabezado.php';
             include_once $ver_ruta;
             include_once SITE_ROOT . 'mvc/vistas' . DS . ADICIONALES_VISTA . DS . 'pie_de_pagina.php';
-        } 
-        else {
+        } else {
             
             header('Location: '.  Cf_BASE_URL.'error/index'.'?error='.'vista' );
             

Sistema/librerias/rb.php

Braces +281 added lines, -95 removed lines

@@ -82,7 +82,9 @@ 
 	 */
 	public function log()
 	{
-		if ( func_num_args() < 1 ) return;
+		if ( func_num_args() < 1 ) {
+		    return;
+		}
 
 		foreach ( func_get_args() as $argument ) {
 			if ( is_array( $argument ) ) {
@@ -100,7 +102,9 @@ 
 				}
 			}
 
-			if ( $this->mode === self::C_LOGGER_ECHO ) echo "<br>\n";
+			if ( $this->mode === self::C_LOGGER_ECHO ) {
+			    echo "<br>\n";
+			}
 		}
 	}
 	
@@ -161,7 +165,9 @@ 
 	{
 		$found = array();
 		foreach( $this->logs as $logEntry ) {
-			if ( strpos( $logEntry, $needle ) !== FALSE ) $found[] = $logEntry;
+			if ( strpos( $logEntry, $needle ) !== FALSE ) {
+			    $found[] = $logEntry;
+			}
 		}
 		return $found;
 	}
@@ -231,7 +237,9 @@ 
 	 */
 	protected function fillInValue( $value )
 	{
-		if ( is_null( $value ) ) $value = 'NULL';
+		if ( is_null( $value ) ) {
+		    $value = 'NULL';
+		}
 
 		$value = strval( $value );
 		if ( strlen( $value ) > ( $this->strLen ) ) {
@@ -257,7 +265,9 @@ 
 	protected function output( $str )
 	{
 		$this->logs[] = $str;
-		if ( !$this->mode ) echo $str .'<br />';
+		if ( !$this->mode ) {
+		    echo $str .'<br />';
+		}
 	}
 
 	/**
@@ -317,7 +327,9 @@ 
 	 */
 	public function log()
 	{
-		if ( func_num_args() < 1 ) return;
+		if ( func_num_args() < 1 ) {
+		    return;
+		}
 
 		$sql = func_get_arg( 0 );
 
@@ -684,7 +696,9 @@ 
 			//Unfortunately the code field is supposed to be int by default (php)
 			//So we need a property to convey the SQL State code.
 			$err = $e->getMessage();
-			if ( $this->loggingEnabled && $this->logger ) $this->logger->log( 'An error occurred: ' . $err );
+			if ( $this->loggingEnabled && $this->logger ) {
+			    $this->logger->log( 'An error occurred: ' . $err );
+			}
 			$exception = new SQL( $err, 0 );
 			$exception->setSQLState( $e->getCode() );
 			throw $exception;
@@ -784,7 +798,9 @@ 
 	 */
 	public function connect()
 	{
-		if ( $this->isConnected ) return;
+		if ( $this->isConnected ) {
+		    return;
+		}
 		try {
 			$user = $this->connectInfo['user'];
 			$pass = $this->connectInfo['pass'];
@@ -865,11 +881,19 @@ 
 	{
 		$arr = $this->GetAll( $sql, $bindings );
 		$res = NULL;
-		if ( !is_array( $arr ) ) return NULL;
-		if ( count( $arr ) === 0 ) return NULL;
+		if ( !is_array( $arr ) ) {
+		    return NULL;
+		}
+		if ( count( $arr ) === 0 ) {
+		    return NULL;
+		}
 		$row1 = array_shift( $arr );
-		if ( !is_array( $row1 ) ) return NULL;
-		if ( count( $row1 ) === 0 ) return NULL;
+		if ( !is_array( $row1 ) ) {
+		    return NULL;
+		}
+		if ( count( $row1 ) === 0 ) {
+		    return NULL;
+		}
 		$col1 = array_shift( $row1 );
 		return $col1;
 	}
@@ -1205,7 +1229,9 @@ 
 			&& $mode !== self::C_ERR_EXCEPTION
 			&& $mode !== self::C_ERR_FUNC
 			&& $mode !== self::C_ERR_FATAL
-		) throw new \Exception( 'Invalid error mode selected' );
+		) {
+		    throw new \Exception( 'Invalid error mode selected' );
+		}
 
 		if ( $mode === self::C_ERR_FUNC && !is_callable( $func ) ) {
 			throw new \Exception( 'Invalid error handler' );
@@ -1322,7 +1348,9 @@ 
 	public static function setMetaAll( $beans, $property, $value )
 	{
 		foreach( $beans as $bean ) {
-			if ( $bean instanceof OODBBean ) $bean->__info[ $property ] = $value;
+			if ( $bean instanceof OODBBean ) {
+			    $bean->__info[ $property ] = $value;
+			}
 		}
 
 		return $beans;
@@ -1645,7 +1673,9 @@ 
 
 		if ( $parents ) {
 			foreach ( $this as $key => $value ) {
-				if ( substr( $key, -3 ) != '_id' ) continue;
+				if ( substr( $key, -3 ) != '_id' ) {
+				    continue;
+				}
 
 				$prop = substr( $key, 0, strlen( $key ) - 3 );
 				$this->$prop;
@@ -1659,13 +1689,17 @@ 
 				$vn = array();
 
 				foreach ( $value as $i => $b ) {
-					if ( !( $b instanceof OODBBean ) ) continue;
+					if ( !( $b instanceof OODBBean ) ) {
+					    continue;
+					}
 					$vn[] = $b->export( $meta, FALSE, FALSE, $filters );
 					$value = $vn;
 				}
 			} elseif ( $value instanceof OODBBean ) {
 				if ( $hasFilters ) {
-					if ( !in_array( strtolower( $value->getMeta( 'type' ) ), $filters ) ) continue;
+					if ( !in_array( strtolower( $value->getMeta( 'type' ) ), $filters ) ) {
+					    continue;
+					}
 				}
 
 				$value = $value->export( $meta, $parents, FALSE, $filters );
@@ -1728,7 +1762,9 @@ 
 		unset( $this->properties[$property] );
 
 		$shadowKey = 'sys.shadow.'.$property;
-		if ( isset( $this->__info[ $shadowKey ] ) ) unset( $this->__info[$shadowKey] );
+		if ( isset( $this->__info[ $shadowKey ] ) ) {
+		    unset( $this->__info[$shadowKey] );
+		}
 
 		//also clear modifiers
 		$this->withSql    = '';
@@ -1895,7 +1931,9 @@ 
 	{
 		static $beautifulColumns = array();
 
-		if ( ctype_lower( $property ) ) return $property;
+		if ( ctype_lower( $property ) ) {
+		    return $property;
+		}
 
 		if (
 			( strpos( $property, 'own' ) === 0 && ctype_upper( substr( $property, 3, 1 ) ) )
@@ -2479,7 +2517,9 @@ 
 		}
 
 		if ( !is_null( $maxDepth ) ) {
-			if ( !$maxDepth-- ) return $this;
+			if ( !$maxDepth-- ) {
+			    return $this;
+			}
 		}
 
 		$oldFetchType = $this->fetchType;
@@ -2489,9 +2529,13 @@ 
 
 		$beans = $this->$property;
 
-		if ( $beans === NULL ) return $this;
+		if ( $beans === NULL ) {
+		    return $this;
+		}
 
-		if ( !is_array( $beans ) ) $beans = array( $beans );
+		if ( !is_array( $beans ) ) {
+		    $beans = array( $beans );
+		}
 
 		foreach( $beans as $bean ) {
 
@@ -2641,11 +2685,17 @@ 
 	 */
 	public function hasListChanged( $property )
 	{
-		if ( !array_key_exists( $property, $this->properties ) ) return FALSE;
+		if ( !array_key_exists( $property, $this->properties ) ) {
+		    return FALSE;
+		}
 		$diffAdded = array_diff_assoc( $this->properties[$property], $this->__info['sys.shadow.'.$property] );
-		if ( count( $diffAdded ) ) return TRUE;
+		if ( count( $diffAdded ) ) {
+		    return TRUE;
+		}
 		$diffMissing = array_diff_assoc( $this->__info['sys.shadow.'.$property], $this->properties[$property] );
-		if ( count( $diffMissing ) ) return TRUE;
+		if ( count( $diffMissing ) ) {
+		    return TRUE;
+		}
 		return FALSE;
 	}
 
@@ -2856,11 +2906,19 @@ 
 		$this->via = NULL;
 		$ids = $beanIndex = $references = array();
 
-		if ( strlen( $list ) < 4 ) throw new RedException('Invalid own-list.');
-		if ( strpos( $list, 'own') !== 0 ) throw new RedException('Only own-lists can be aggregated.');
-		if ( !ctype_upper( substr( $list, 3, 1 ) ) ) throw new RedException('Invalid own-list.');
+		if ( strlen( $list ) < 4 ) {
+		    throw new RedException('Invalid own-list.');
+		}
+		if ( strpos( $list, 'own') !== 0 ) {
+		    throw new RedException('Only own-lists can be aggregated.');
+		}
+		if ( !ctype_upper( substr( $list, 3, 1 ) ) ) {
+		    throw new RedException('Invalid own-list.');
+		}
 
-		if ( is_null( $type ) ) $type = $property;
+		if ( is_null( $type ) ) {
+		    $type = $property;
+		}
 
 		foreach( $this->$list as $bean ) {
 			$field = $property . '_id';
@@ -3320,7 +3378,9 @@ 
 		}
 
 		foreach ( $rows as $row ) {
-			if ( empty( $row ) ) continue;
+			if ( empty( $row ) ) {
+			    continue;
+			}
 
 			if ( count( $row ) > 2 ) {
             $key   = array_shift( $row );
@@ -3357,7 +3417,9 @@ 
 	{
 		$this->sql = $sql;
 
-		if ( !$noSignal ) $this->signal( 'sql_exec', $this );
+		if ( !$noSignal ) {
+		    $this->signal( 'sql_exec', $this );
+		}
 
 		return $this->db->GetOne( $sql, $bindings );
 	}
@@ -4257,7 +4319,9 @@ 
 	public static function renameAssociation( $from, $to = NULL )
 	{
 		if ( is_array( $from ) ) {
-			foreach ( $from as $key => $value ) self::$renames[$key] = $value;
+			foreach ( $from as $key => $value ) {
+			    self::$renames[$key] = $value;
+			}
 
 			return;
 		}
@@ -4438,7 +4502,9 @@ 
 	private function putResultInCache( $cacheTag, $key, $values )
 	{
 		if ( isset( $this->cache[$cacheTag] ) ) {
-			if ( count( $this->cache[$cacheTag] ) > $this->maxCacheSizePerType ) array_shift( $this->cache[$cacheTag] );
+			if ( count( $this->cache[$cacheTag] ) > $this->maxCacheSizePerType ) {
+			    array_shift( $this->cache[$cacheTag] );
+			}
 		} else {
 			$this->cache[$cacheTag] = array();
 		}
@@ -4470,12 +4536,16 @@ 
 
 		$sqlConditions = array();
 		foreach ( $conditions as $column => $values ) {
-			if ( !count( $values ) ) continue;
+			if ( !count( $values ) ) {
+			    continue;
+			}
 
 			$sql = $this->esc( $column );
 			$sql .= ' IN ( ';
 
-			if ( !is_array( $values ) ) $values = array( $values );
+			if ( !is_array( $values ) ) {
+			    $values = array( $values );
+			}
 
 			// If it's safe to skip bindings, do so...
 			if ( ctype_digit( implode( '', $values ) ) ) {
@@ -4516,7 +4586,9 @@ 
 			$sql = implode( ' AND ', $sqlConditions );
 			$sql = " WHERE ( $sql ) ";
 
-			if ( $addSql ) $sql .= $addSql;
+			if ( $addSql ) {
+			    $sql .= $addSql;
+			}
 		} elseif ( $addSql ) {
 			$sql = $addSql;
 		}
@@ -4570,7 +4642,9 @@ 
 		}
 
 		foreach( $map as $key ) {
-			if ( $key['from'] === $property ) return $key;
+			if ( $key['from'] === $property ) {
+			    return $key;
+			}
 		}
 		return NULL;
 	}
@@ -4781,7 +4855,9 @@ 
 			$result = $this->adapter->getCell( "INSERT INTO $table (id) VALUES($default) $suffix" );
 		}
 
-		if ( $suffix ) return $result;
+		if ( $suffix ) {
+		    return $result;
+		}
 
 		$last_id = $this->adapter->getInsertID();
 
@@ -4939,8 +5015,9 @@ 
 	 */
 	public function writeJoin( $type, $targetType, $leftRight = 'LEFT' )
 	{
-		if ( $leftRight !== 'LEFT' && $leftRight !== 'RIGHT' && $leftRight !== 'INNER' )
-			throw new RedException( 'Invalid JOIN.' );
+		if ( $leftRight !== 'LEFT' && $leftRight !== 'RIGHT' && $leftRight !== 'INNER' ) {
+					throw new RedException( 'Invalid JOIN.' );
+		}
 
 		$table = $this->esc( $type );
 		$targetTable = $this->esc( $targetType );
@@ -5209,7 +5286,9 @@ 
 	 */
 	public function widenColumn( $type, $property, $dataType )
 	{
-		if ( !isset($this->typeno_sqltype[$dataType]) ) return FALSE;
+		if ( !isset($this->typeno_sqltype[$dataType]) ) {
+		    return FALSE;
+		}
 
 		$table   = $this->esc( $type );
 		$column  = $this->esc( $property );
@@ -5316,7 +5395,9 @@ 
 		foreach( $keys as $key ) {
 			if (
 				$key['from'] === $field
-			) return $key['table'];
+			) {
+			    return $key['table'];
+			}
 		}
 		return NULL;
 	}
@@ -5512,8 +5593,12 @@ 
 	{
 		$this->svalue = $value;
 
-		if ( is_null( $value ) ) return MySQL::C_DATATYPE_BOOL;
-		if ( $value === INF ) return MySQL::C_DATATYPE_TEXT7;
+		if ( is_null( $value ) ) {
+		    return MySQL::C_DATATYPE_BOOL;
+		}
+		if ( $value === INF ) {
+		    return MySQL::C_DATATYPE_TEXT7;
+		}
 
 		if ( $flagSpecial ) {
 			if ( preg_match( '/^\d{4}\-\d\d-\d\d$/', $value ) ) {
@@ -5538,7 +5623,9 @@ 
 			return MySQL::C_DATATYPE_BOOL;
 		}
 
-		if ( is_float( $value ) ) return self::C_DATATYPE_DOUBLE;
+		if ( is_float( $value ) ) {
+		    return self::C_DATATYPE_DOUBLE;
+		}
 
 		if ( !$this->startsWithZeros( $value ) ) {
 
@@ -5595,7 +5682,9 @@ 
 	{
 		$tableNoQ = $this->esc( $type, TRUE );
 		$columns = array();
-		foreach( $properties as $key => $column ) $columns[$key] = $this->esc( $column );
+		foreach( $properties as $key => $column ) {
+		    $columns[$key] = $this->esc( $column );
+		}
 		$table = $this->esc( $type );
 		sort( $columns ); // Else we get multiple indexes due to order-effects
 		$name = 'UQ_' . sha1( implode( ',', $columns ) );
@@ -5640,7 +5729,9 @@ 
 		$targetFieldNoQ = $this->esc( $targetProperty, TRUE );
 		$tableNoQ = $this->esc( $type, TRUE );
 		$fieldNoQ = $this->esc( $property, TRUE );
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) return FALSE;
+		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) {
+		    return FALSE;
+		}
 
 		//Widen the column if it's incapable of representing a foreign key (at least INT).
 		$columns = $this->getColumns( $tableNoQ );
@@ -5792,7 +5883,9 @@ 
 
 		$oldColumnNames = array_keys( $this->getColumns( $table ) );
 
-		foreach ( $oldColumnNames as $k => $v ) $oldColumnNames[$k] = "`$v`";
+		foreach ( $oldColumnNames as $k => $v ) {
+		    $oldColumnNames[$k] = "`$v`";
+		}
 
 		$q[] = "CREATE TEMPORARY TABLE tmp_backup(" . implode( ",", $oldColumnNames ) . ");";
 		$q[] = "INSERT INTO tmp_backup SELECT * FROM `$table`;";
@@ -5818,16 +5911,22 @@ 
 		foreach ( $tableMap['indexes'] as $name => $index ) {
 			if ( strpos( $name, 'UQ_' ) === 0 ) {
 				$cols = explode( '__', substr( $name, strlen( 'UQ_' . $table ) ) );
-				foreach ( $cols as $k => $v ) $cols[$k] = "`$v`";
+				foreach ( $cols as $k => $v ) {
+				    $cols[$k] = "`$v`";
+				}
 				$q[] = "CREATE UNIQUE INDEX $name ON `$table` (" . implode( ',', $cols ) . ")";
-			} else $q[] = "CREATE INDEX $name ON `$table` ({$index['name']}) ";
+			} else {
+			    $q[] = "CREATE INDEX $name ON `$table` ({$index['name']}) ";
+			}
 		}
 
 		$q[] = "INSERT INTO `$table` SELECT * FROM tmp_backup;";
 		$q[] = "DROP TABLE tmp_backup;";
 		$q[] = "PRAGMA foreign_keys = 1 ";
 
-		foreach ( $q as $sq ) $this->adapter->exec( $sq );
+		foreach ( $q as $sq ) {
+		    $this->adapter->exec( $sq );
+		}
 	}
 
 	/**
@@ -5874,9 +5973,13 @@ 
 		$targetColumn    = $this->esc( $targetProperty, TRUE );
 
 		$tables = $this->getTables();
-		if ( !in_array( $targetTable, $tables ) ) return FALSE;
+		if ( !in_array( $targetTable, $tables ) ) {
+		    return FALSE;
+		}
 
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $table, $column ) ) ) return FALSE;
+		if ( !is_null( $this->getForeignKeyForTypeProperty( $table, $column ) ) ) {
+		    return FALSE;
+		}
 		$t = $this->getTable( $table );
 		$consSQL = ( $constraint ? 'CASCADE' : 'SET NULL' );
 		$label   = 'from_' . $column . '_to_table_' . $targetTable . '_col_' . $targetColumn;
@@ -5953,14 +6056,24 @@ 
 	{
 		$this->svalue = $value;
 
-		if ( $value === NULL ) return self::C_DATATYPE_INTEGER;
-		if ( $value === INF ) return self::C_DATATYPE_TEXT;
+		if ( $value === NULL ) {
+		    return self::C_DATATYPE_INTEGER;
+		}
+		if ( $value === INF ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 
-		if ( $this->startsWithZeros( $value ) ) return self::C_DATATYPE_TEXT;
+		if ( $this->startsWithZeros( $value ) ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 
-		if ( $value === TRUE || $value === FALSE )  return self::C_DATATYPE_INTEGER;
+		if ( $value === TRUE || $value === FALSE ) {
+		    return self::C_DATATYPE_INTEGER;
+		}
 		
-		if ( is_numeric( $value ) && ( intval( $value ) == $value ) && $value < 2147483648 && $value > -2147483648 ) return self::C_DATATYPE_INTEGER;
+		if ( is_numeric( $value ) && ( intval( $value ) == $value ) && $value < 2147483648 && $value > -2147483648 ) {
+		    return self::C_DATATYPE_INTEGER;
+		}
 
 		if ( ( is_numeric( $value ) && $value < 2147483648 && $value > -2147483648)
 			|| preg_match( '/\d{4}\-\d\d\-\d\d/', $value )
@@ -6037,7 +6150,9 @@ 
 		$columnsRaw = $this->adapter->get( "PRAGMA table_info('$table')" );
 
 		$columns    = array();
-		foreach ( $columnsRaw as $r ) $columns[$r['name']] = $r['type'];
+		foreach ( $columnsRaw as $r ) {
+		    $columns[$r['name']] = $r['type'];
+		}
 
 		return $columns;
 	}
@@ -6078,7 +6193,9 @@ 
 	public function addIndex( $type, $name, $column )
 	{
 		$columns = $this->getColumns( $type );
-		if ( !isset( $columns[$column] ) ) return FALSE;
+		if ( !isset( $columns[$column] ) ) {
+		    return FALSE;
+		}
 
 		$table  = $this->esc( $type );
 		$name   = preg_replace( '/\W/', '', $name );
@@ -6337,7 +6454,9 @@ 
 	{
 		$this->svalue = $value;
 
-		if ( $value === INF ) return self::C_DATATYPE_TEXT;
+		if ( $value === INF ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 
 		if ( $flagSpecial && $value ) {
 			if ( preg_match( '/^\d{4}\-\d\d-\d\d$/', $value ) ) {
@@ -6369,9 +6488,13 @@ 
 			}
 		}
 
-		if ( is_float( $value ) ) return self::C_DATATYPE_DOUBLE;
+		if ( is_float( $value ) ) {
+		    return self::C_DATATYPE_DOUBLE;
+		}
 
-		if ( $this->startsWithZeros( $value ) ) return self::C_DATATYPE_TEXT;
+		if ( $this->startsWithZeros( $value ) ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 		
 		if ( $value === FALSE || $value === TRUE || $value === NULL || ( is_numeric( $value )
 				&& AQueryWriter::canBeTreatedAsInt( $value )
@@ -6393,7 +6516,9 @@ 
 	{
 		$r = ( isset( $this->sqltype_typeno[$typedescription] ) ) ? $this->sqltype_typeno[$typedescription] : 99;
 
-		if ( $includeSpecials ) return $r;
+		if ( $includeSpecials ) {
+		    return $r;
+		}
 
 		if ( $r >= QueryWriter::C_DATATYPE_RANGE_SPECIAL ) {
 			return self::C_DATATYPE_SPECIFIED;
@@ -6425,7 +6550,9 @@ 
 	{
 		$tableNoQ = $this->esc( $type, TRUE );
 		$columns = array();
-		foreach( $properties as $key => $column ) $columns[$key] = $this->esc( $column );
+		foreach( $properties as $key => $column ) {
+		    $columns[$key] = $this->esc( $column );
+		}
 		$table = $this->esc( $type );
 		sort( $columns ); //else we get multiple indexes due to order-effects
 		$name = "UQ_" . sha1( $table . implode( ',', $columns ) );
@@ -6481,7 +6608,9 @@ 
 		$targetField = $this->esc( $targetProperty );
 		$tableNoQ = $this->esc( $type, TRUE );
 		$fieldNoQ = $this->esc( $property, TRUE );
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) return FALSE;
+		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) {
+		    return FALSE;
+		}
 		try{
 			$delRule = ( $isDep ? 'CASCADE' : 'SET NULL' );
 			$this->adapter->exec( "ALTER TABLE {$table}
@@ -6787,7 +6916,9 @@ 
 
 			$myFieldLink = $bean->getMeta( 'type' ) . '_id';
 			$alias = $bean->getMeta( 'sys.alias.' . $trash->getMeta( 'type' ) );
-			if ( $alias ) $myFieldLink = $alias . '_id';
+			if ( $alias ) {
+			    $myFieldLink = $alias . '_id';
+			}
 
 			if ( $trash->getMeta( 'sys.garbage' ) === true ) {
 				$this->trash( $trash );
@@ -6864,7 +6995,9 @@ 
 	{
 		$linkField        = $property . '_id';
 		$id = $this->prepareEmbeddedBean( $value );
-		if ($bean->$linkField != $id) $bean->$linkField = $id;
+		if ($bean->$linkField != $id) {
+		    $bean->$linkField = $id;
+		}
 		$bean->setMeta( 'cast.' . $linkField, 'id' );
 		$embeddedBeans[$linkField] = $value;
 		unset( $bean->$property );
@@ -7367,7 +7500,9 @@ 
 
 				$myFieldLink = $beanType . '_id';
 				$alias = $bean->getMeta( 'sys.alias.' . $addition->getMeta( 'type' ) );
-				if ( $alias ) $myFieldLink = $alias . '_id';
+				if ( $alias ) {
+				    $myFieldLink = $alias . '_id';
+				}
 
 				$addition->$myFieldLink = $bean->id;
 				$addition->setMeta( 'cast.' . $myFieldLink, 'id' );
@@ -7629,7 +7764,9 @@ 
 
 				$myFieldLink = $beanType . '_id';
 				$alias = $bean->getMeta( 'sys.alias.' . $addition->getMeta( 'type' ) );
-				if ( $alias ) $myFieldLink = $alias . '_id';
+				if ( $alias ) {
+				    $myFieldLink = $alias . '_id';
+				}
 
 				$addition->$myFieldLink = $bean->id;
 				$addition->setMeta( 'cast.' . $myFieldLink, 'id' );
@@ -7948,7 +8085,9 @@ 
 	public function dispense( $type, $number = 1, $alwaysReturnArray = FALSE )
 	{
 		if ( $number < 1 ) {
-			if ( $alwaysReturnArray ) return array();
+			if ( $alwaysReturnArray ) {
+			    return array();
+			}
 			return NULL;
 		}
 
@@ -8258,8 +8397,12 @@ 
 		list( $type, $property ) = explode( '.', $field );
 		$mode = ($mode === 'write') ? QueryWriter::C_SQLFILTER_WRITE : QueryWriter::C_SQLFILTER_READ;
 
-		if ( !isset( self::$sqlFilters[$mode] ) ) self::$sqlFilters[$mode] = array();
-		if ( !isset( self::$sqlFilters[$mode][$type] ) ) self::$sqlFilters[$mode][$type] = array();
+		if ( !isset( self::$sqlFilters[$mode] ) ) {
+		    self::$sqlFilters[$mode] = array();
+		}
+		if ( !isset( self::$sqlFilters[$mode][$type] ) ) {
+		    self::$sqlFilters[$mode][$type] = array();
+		}
 
 		if ( is_null( $function ) ) {
 			unset( self::$sqlFilters[$mode][$type][$property] );
@@ -8619,7 +8762,9 @@ 
 	{
 		if ( count( $conditions ) > 0 ) {
 			foreach( $conditions as $key => $condition ) {
-				if ( !count( $condition ) ) unset( $conditions[$key] );
+				if ( !count( $condition ) ) {
+				    unset( $conditions[$key] );
+				}
 			}
 		}
 
@@ -8694,7 +8839,9 @@ 
 	 */
 	public function findMulti( $types, $sql, $bindings = array(), $remappings = array(), $queryTemplate = ' %s.%s AS %s__%s' )
 	{
-		if ( !is_array( $types ) ) $types = explode( ',', $types );
+		if ( !is_array( $types ) ) {
+		    $types = explode( ',', $types );
+		}
 		if ( !is_array( $sql ) ) {
 			$writer = $this->toolbox->getWriter();
 			$adapter = $this->toolbox->getDatabaseAdapter();
@@ -8732,8 +8879,12 @@ 
 						$wannaBean[$property] = $value;
 					}
 				}
-				if ( !isset( $wannaBean['id'] ) ) continue;
-				if ( is_null( $wannaBean['id'] ) ) continue;
+				if ( !isset( $wannaBean['id'] ) ) {
+				    continue;
+				}
+				if ( is_null( $wannaBean['id'] ) ) {
+				    continue;
+				}
 				$wannaBeans[$type][$wannaBean['id']] = $wannaBean;
 			}
 		}
@@ -8752,7 +8903,9 @@ 
 			$do      = $remapping['do'];
 			foreach( $beans[$a] as $bean ) {
 				foreach( $beans[$b] as $putBean ) {
-					if ( $matcher( $bean, $putBean, $beans ) ) $do( $bean, $putBean, $beans, $remapping );
+					if ( $matcher( $bean, $putBean, $beans ) ) {
+					    $do( $bean, $putBean, $beans, $remapping );
+					}
 				}
 			}
 		}
@@ -9865,7 +10018,9 @@ 
 		}
 		
 		foreach( $values as $enumItem ) {
-				if ( $enumItem->name === $value ) return $enumItem;	
+				if ( $enumItem->name === $value ) {
+				    return $enumItem;
+				}
 		}
 		
 		$newEnumItems = $this->dispenseLabels( $type, array( $value ) );
@@ -10062,7 +10217,9 @@ 
 	 */
 	public static function testConnection()
 	{
-		if ( !isset( self::$adapter ) ) return FALSE;
+		if ( !isset( self::$adapter ) ) {
+		    return FALSE;
+		}
 
 		$database = self::$adapter->getDatabase();
 		try {
@@ -10212,7 +10369,9 @@ 
                   );
 
 		$wkey = trim( strtolower( $dbType ) );
-		if ( !isset( $writers[$wkey] ) ) trigger_error( 'Unsupported DSN: '.$wkey );
+		if ( !isset( $writers[$wkey] ) ) {
+		    trigger_error( 'Unsupported DSN: '.$wkey );
+		}
 		$writerClass = '\\RedBeanPHP\\QueryWriter\\'.$writers[$wkey];
 		$writer      = new $writerClass( $adapter );
 		$redbean     = new OODB( $writer, $frozen );
@@ -10419,7 +10578,9 @@ 
 	 */
 	public static function trash( $beanOrType, $id = NULL )
 	{
-		if ( is_string( $beanOrType ) ) return self::trash( self::load( $beanOrType, $id ) );
+		if ( is_string( $beanOrType ) ) {
+		    return self::trash( self::load( $beanOrType, $id ) );
+		}
 		return self::$redbean->trash( $beanOrType );
 	}
 
@@ -10441,8 +10602,12 @@ 
 
 			if ( !isset( $typeOrBeanArray['_type'] ) ) {
 				$list = array();
-				foreach( $typeOrBeanArray as $beanArray ) if ( !( is_array( $beanArray ) && isset( $beanArray['_type'] ) ) ) throw new RedException( 'Invalid Array Bean' );
-				foreach( $typeOrBeanArray as $beanArray ) $list[] = self::dispense( $beanArray );
+				foreach( $typeOrBeanArray as $beanArray ) {
+				    if ( !( is_array( $beanArray ) && isset( $beanArray['_type'] ) ) ) throw new RedException( 'Invalid Array Bean' );
+				}
+				foreach( $typeOrBeanArray as $beanArray ) {
+				    $list[] = self::dispense( $beanArray );
+				}
 				return $list;
 			}
 
@@ -10894,7 +11059,9 @@ 
 	 */
 	public static function useExportCase( $caseStyle = 'default' )
 	{
-		if ( !in_array( $caseStyle, array( 'default', 'camel', 'dolphin' ) ) ) throw new RedException( 'Invalid case selected.' );
+		if ( !in_array( $caseStyle, array( 'default', 'camel', 'dolphin' ) ) ) {
+		    throw new RedException( 'Invalid case selected.' );
+		}
 		self::$exportCaseStyle = $caseStyle;
 	}
 
@@ -11095,7 +11262,9 @@ 
 	 */
 	public static function begin()
 	{
-		if ( !self::$redbean->isFrozen() ) return FALSE;
+		if ( !self::$redbean->isFrozen() ) {
+		    return FALSE;
+		}
 
 		self::$adapter->startTransaction();
 
@@ -11110,7 +11279,9 @@ 
 	 */
 	public static function commit()
 	{
-		if ( !self::$redbean->isFrozen() ) return FALSE;
+		if ( !self::$redbean->isFrozen() ) {
+		    return FALSE;
+		}
 
 		self::$adapter->commit();
 
@@ -11125,7 +11296,9 @@ 
 	 */
 	public static function rollback()
 	{
-		if ( !self::$redbean->isFrozen() ) return FALSE;
+		if ( !self::$redbean->isFrozen() ) {
+		    return FALSE;
+		}
 
 		self::$adapter->rollback();
 
@@ -11170,8 +11343,11 @@ 
 	public static function flat( $array, $result = array() )
 	{
 		foreach( $array as $value ) {
-			if ( is_array( $value ) ) $result = self::flat( $value, $result );
-			else $result[] = $value;
+			if ( is_array( $value ) ) {
+			    $result = self::flat( $value, $result );
+			} else {
+			    $result[] = $value;
+			}
 		}
 		return $result;
 	}
@@ -11350,7 +11526,9 @@ 
 	 */
 	public static function isoDateTime( $time = NULL )
 	{
-		if ( !$time ) $time = time();
+		if ( !$time ) {
+		    $time = time();
+		}
 
 		return @date( 'Y-m-d H:i:s', $time );
 	}
@@ -11975,7 +12153,9 @@ 
 	 */
 	protected function duplicate( OODBBean $bean, $trail = array(), $preserveIDs = FALSE )
 	{
-		if ( $this->inTrailOrAdd( $trail, $bean ) ) return $bean;
+		if ( $this->inTrailOrAdd( $trail, $bean ) ) {
+		    return $bean;
+		}
 
 		$type = $bean->getMeta( 'type' );
 
@@ -11983,7 +12163,9 @@ 
 		foreach ( $this->tables as $table ) {
 
 			if ( !empty( $this->filters ) ) {
-				if ( !in_array( $table, $this->filters ) ) continue;
+				if ( !in_array( $table, $this->filters ) ) {
+				    continue;
+				}
 			}
 
 			list( $owned, $shared ) = $this->getListNames( $table );
@@ -12216,8 +12398,12 @@ 
 			$array[]   = $duplicate->export( FALSE, $parents, FALSE, $filters );
 		}
 
-		if ( $caseStyle === 'camel' ) $array = $this->camelfy( $array );
-		if ( $caseStyle === 'dolphin' ) $array = $this->camelfy( $array, true );
+		if ( $caseStyle === 'camel' ) {
+		    $array = $this->camelfy( $array );
+		}
+		if ( $caseStyle === 'dolphin' ) {
+		    $array = $this->camelfy( $array, true );
+		}
 
 		return $array;
 	}

mvc/controladores/indexControlador.php

Braces +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             $this->_vista->imprimirVista('index', 'instalador');
             $this->_sesion->iniciarSesion('_s', false);
             
-        }elseif (Cf_CONFIG_INICIO=='false') {
+        } elseif (Cf_CONFIG_INICIO=='false') {
             
             $this->_vista->titulo = 'CalimaFramework';
             $this->_vista->imprimirVista('index', 'instalador');