Piou-piou / Ruined-World

modules/bataille/app/controller/CentreRecherche.php

Braces +4 added lines, -3 removed lines

@@ -16,7 +16,9 @@ 
 			$query = $dbc1->select("coef_centre_recherche")->from("configuration")->where("ID_configuration", "=", 1)->get();
 
 			if ((is_array($query)) && (count($query) == 1)) {
-				foreach ($query as $obj) $this->coef_centre = $obj->coef_centre_recherche;
+				foreach ($query as $obj) {
+					$this->coef_centre = $obj->coef_centre_recherche;
+				}
 			}
 
 			$query = $dbc1->select()->from("recherche")
@@ -41,8 +43,7 @@ 
 						];
 
 						$temps_recherche = $temps_recherche * ($this->coef_centre * $niveau);
-					}
-					else {
+					} else {
 						$niveau_recherche = 1;
 					}
 

modules/bataille/app/controller/Unite.php

Braces +15 added lines, -10 removed lines

@@ -19,7 +19,9 @@ 
 			$query = $dbc1->select("coef_niveau_unite")->from("configuration")->where("ID_configuration", "=", 1)->get();
 
 			if ((is_array($query)) && (count($query) == 1)) {
-				foreach ($query as $obj) $this->coef_unite = $obj->coef_niveau_unite;
+				foreach ($query as $obj) {
+					$this->coef_unite = $obj->coef_niveau_unite;
+				}
 			}
 		}
 		//-------------------------- END BUILDER ----------------------------------------------------------------------------//
@@ -53,7 +55,9 @@ 
 				$coef = $this->coef_unite*$niveau;
 				$coef_ameliorer = $this->coef_unite*($niveau+1);
 
-				if ($niveau == 1) $coef = 1;
+				if ($niveau == 1) {
+					$coef = 1;
+				}
 
 				return [
 					"caracteristique" => [
@@ -76,8 +80,7 @@ 
 					],
 					"temps_recrutement" => $temps_recrutement
 				];
-			}
-			else {
+			} else {
 				return [];
 			}
 		}
@@ -92,7 +95,9 @@ 
 			$query = $dbc1->select("type_unite")->from("configuration")->where("ID_configuration", "=", 1)->get();
 
 			if ((is_array($query)) && (count($query) == 1)) {
-				foreach ($query as $obj) return explode(",", $obj->type_unite);
+				foreach ($query as $obj) {
+					return explode(",", $obj->type_unite);
+				}
 			}
 		}
 
@@ -128,8 +133,7 @@ 
 				foreach ($query as $obj) {
 					if ($obj->date_fin-$today <= 0) {
 						$this->setTerminerRecrutement($obj->ID_recrutement);
-					}
-					else {
+					} else {
 						$recrutement[] = [
 							"nom" => $obj->nom,
 							"type" => $obj->type,
@@ -150,7 +154,9 @@ 
 		 */
 		public function getAllUnites($id_base = null) {
 
-			if ($id_base == null) $id_base = Bataille::getIdBase();
+			if ($id_base == null) {
+				$id_base = Bataille::getIdBase();
+			}
 
 			$types = $this->getAllType();
 			$count_type = count($types);
@@ -240,8 +246,7 @@ 
 			if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge" ) {
 				FlashMessage::setFlash("Pas assez de ressources pour recruter autant d'unités");
 				return false;
-			}
-			else {
+			} else {
 				//on retire les ressources
 				Bataille::getRessource()->setUpdateRessource($retirer_eau, $retirer_electricite, $retirer_fer, $retirer_fuel, 0, "-");