Piou-piou / ribs-framework

admin.php

Braces +9 added lines, -18 removed lines

@@ -30,8 +30,7 @@ 
 	if (isset($_GET['page'])) {
 		$titre_page = "Administration du site";
 		$description_page = "Administration du site";
-	}
-	else {
+	} else {
 		$titre_page = "Administration du site";
 		$description_page = "Administration du site";
 	}
@@ -61,25 +60,21 @@ 
 			//si c'est un controleur de base on va cerhcer dans core/admin
 			if ($core !== false) {
 				require_once(ROOT.$lien.".php");
-			}
-			else if ($module !== false) {
+			} else if ($module !== false) {
 				$explode = explode("/", $lien, 3);
 
 				require_once(ROOT.$explode[0]."/".$explode[1]."/admin/controller/".$explode[2].".php");
-			}
-			else {
+			} else {
 				require_once("admin/controller/".$lien.".php");
 			}
 		}
 		//pour la page de login
 		else if ($page == "login") {
 			require("admin/views/template/login_admin.php");
-		}
-		else {
+		} else {
 			if (!isset($_SESSION["idlogin".CLEF_SITE])) {
 				Connexion::setConnexion(1, WEBROOT."administrator/login");
-			}
-			else {
+			} else {
 				if (\core\functions\ChaineCaractere::FindInString($page, "modules/") == true) {
 					//utilisé pour initialiser les modules
 					$page_module = $page;
@@ -94,8 +89,7 @@ 
 				if (($droit_acces->getDroitAccesPage("gestion-comptes/index") == false) && ($page == "gestion-comptes")) {
 					FlashMessage::setFlash("L'accès à cette page n'est pas activé, veuillez contacter votre administrateur pour y avoir accès");
 					header("location:".WEBROOT."administrator");
-				}
-				else if (($droit_acces->getDroitAccesPage("gestion-droits-acces/index") == false) && ($page == "gestion-droits-acces")) {
+				} else if (($droit_acces->getDroitAccesPage("gestion-droits-acces/index") == false) && ($page == "gestion-droits-acces")) {
 					FlashMessage::setFlash("L'accès à cette page n'est pas activé, veuillez contacter votre administrateur pour y avoir accès");
 					header("location:".WEBROOT."administrator");
 				}
@@ -103,8 +97,7 @@ 
 				if ($droit_acces->getDroitAccesPage($page) == false) {
 					FlashMessage::setFlash("Vous n'avez pas les droits pour accéder à cette page, contacter votre gérant pour y avoir accès");
 					header("location:".WEBROOT."administrator");
-				}
-				else {
+				} else {
 					$cache = new \core\Cache($page, 1);
 					$admin = new Admin($_SESSION["idlogin".CLEF_SITE]);
 
@@ -116,14 +109,12 @@ 
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		Connexion::setConnexion(1, WEBROOT."administrator/login");
 
 		if (!isset($_SESSION["idlogin".CLEF_SITE])) {
 			Connexion::setConnexion(1, WEBROOT."administrator/login");
-		}
-		else {
+		} else {
 			$page = "index";
 			$admin = new Admin($_SESSION["idlogin".CLEF_SITE]);
 			require(ROOT."admin/controller/initialise_all.php");

index.php

Braces +6 added lines, -12 removed lines

@@ -38,8 +38,7 @@ 
 
 			$contenu->getContenuPage();
 			$contenu_page = $contenu->getContenu();
-		}
-		else {
+		} else {
 			$contenu->getHeadPage(1);
 			$titre_page = $contenu->getBaliseTitle();
 			$description_page = $contenu->getMetaDescription();
@@ -75,17 +74,14 @@ 
 			//si c'est un controleur de base on va cerhcer dans core/admin
 			if ($core !== false) {
 				require_once(ROOT.$lien.".php");
-			}
-			else if ($module !== false) {
+			} else if ($module !== false) {
 				$explode = explode("/", $lien, 3);
 
 				require_once(ROOT.$explode[0]."/".$explode[1]."/app/controller/".$explode[2].".php");
-			}
-			else {
+			} else {
 				require_once("app/controller/".$lien.".php");
 			}
-		}
-		else {
+		} else {
 			$cache = new \core\Cache($page);
 
 			$router_module = new RouterModule();
@@ -95,8 +91,7 @@ 
 				if ($router_module->getController() != "") {
 					require_once(MODULEROOT.$router_module->getController());
 				}
-			}
-			else {
+			} else {
 				$explode = explode("/", $page);
 				$page = "app/views/".end($explode);
 
@@ -111,8 +106,7 @@ 
 			}
 			$cache->setEnd();
 		}
-	}
-	else {
+	} else {
 		$page = "app/views/index";
 		require("app/controller/initialise_all.php");
 		require("app/views/template/principal.php");

admin/controller/initialise_all.php

Braces +5 added lines, -10 removed lines

@@ -47,8 +47,7 @@ 
 			//$id_liste_droit_acces = $_SESSION['id_liste_droit_acces'];
 
 			unset($_SESSION['err_ajout_utilisateur']);
-		}
-		else {
+		} else {
 			$nom = null;
 			$prenom = null;
 			$pseudo = null;
@@ -75,8 +74,7 @@ 
 			$contenu_page = $_SESSION['contenu'];
 
 			unset($_SESSION['err_modification_contenu']);
-		}
-		else if ($page == "gestion-contenus/modifier-contenu") {
+		} else if ($page == "gestion-contenus/modifier-contenu") {
 			$id_page_courante = $_GET['id'];
 
 			$contenu->getHeadPage($id_page_courante);
@@ -89,8 +87,7 @@ 
 			$parent_courant = $contenu->getParent();
 			$texte_parent_courant = $gestion_contenu->getParentTexte($parent_courant);
 			$contenu_page = $contenu->getContenu();
-		}
-		else {
+		} else {
 			$balise_title = null;
 			$url = null;
 			$meta_description = null;
@@ -131,8 +128,7 @@ 
 			$contenu_dynamique = $config->getContenusDynamique();
 			$responsive = $config->getResponsive();
 			$cache_config = $config->getCache();
-		}
-		else {
+		} else {
 			$config = new \core\Configuration();
 			$nom_site = $config->getNomSite();
 			$url_site = $config->getUrlSite();
@@ -156,8 +152,7 @@ 
 
 		if (isset($_SESSION['err_modification_configini'])) {
 
-		}
-		else {
+		} else {
 			$developpement = $ini["developpment"];
 
 			$db_type_dev = $ini["dev"]["DB_TYPE"];

admin/views/configuration/module.php

Braces +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
 						<td>
 							<?php if (\core\modules\GestionModule::getModuleInstaller($gestion_module_page_syst->getNom()[$i]) == true) { ?>
 								<a class="open-popup" popup="popup-delete-module" href="<?=ADMWEBROOT?>controller/core/modules/installation/supprimer?id_module=<?=$gestion_module_page_syst->getIdModule()[$i]?>">Supprimer</a>
-							<?php }else{ ?>
+							<?php } else{ ?>
 								<a class="installer-module" href="<?=ADMWEBROOT?>controller/core/modules/installation/installer?url=<?=$gestion_module_page_syst->getUrlTelechargement()[$i]?>">Installer</a>
 							<?php }?>
 						</td>
@@ -90,7 +90,7 @@ 
 						<td>
 							<?php if (\core\modules\GestionModule::getModuleInstaller($gestion_module_page->getNom()[$i]) == true) { ?>
 								<a class="supprimer open-popup" popup="popup-delete-module" href="<?=ADMWEBROOT?>controller/core/modules/installation/supprimer?id_module=<?=$gestion_module_page->getIdModule()[$i]?>">Supprimer</a>
-							<?php }else{ ?>
+							<?php } else{ ?>
 								<a href="<?=ADMWEBROOT?>controller/core/modules/installation/installer?url=<?=$gestion_module_page->getUrlTelechargement()[$i]?>">Installer</a>
 							<?php }?>
 						</td>

libs/ckfinder/plugins/watermark/plugin.php

Braces +1 added lines, -2 removed lines

@@ -148,8 +148,7 @@
         }
         if ($watermarkImageAttr['mime'] == 'image/png') {
             imagecopy($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height);
-        }
-        else {
+        } else {
             imagecopymerge($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height, $transparency);
         }
 

libs/ckfinder/plugins/imageresize/plugin.php

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 *
 * CKFinder extension: resize image according to a given size
 */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * Include base XML command handler

libs/ckfinder/plugins/zip/plugin.php

Braces +11 added lines, -17 removed lines

@@ -12,7 +12,9 @@ 
 *
 * CKFinder extension: provides commands to add files into a zip archive, or extract contents from a zip.
 */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * Include base XML command handler
@@ -358,8 +360,7 @@ 
               {
                 $sFileName = CKFinder_Connector_Utils_FileSystem::autoRename($extractPath,$sFileName);
                 $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
-              }
-              elseif ( $checkedFiles[$fileName]['options'] == 'overwrite')
+              } elseif ( $checkedFiles[$fileName]['options'] == 'overwrite')
               {
                 if ( !$this->_currentFolder->checkAcl( CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ){
                   $this->errorCode = CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED;
@@ -370,19 +371,16 @@ 
                 {
                   $this->errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
                   $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
-                }
-                else
+                } else
                 {
                   $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
                 }
-              }
-              else
+              } else
               {
                 // add to skipped files
                 $this->appendUnzippedNode($this->unzippedNodes,$fileName,'skip');
               }
-            }
-            else
+            } else
             {
               $this->errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
               $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
@@ -449,8 +447,7 @@ 
       $dirExists->addChild($oErrorNode);
       $this->_connectorNode->addChild($dirExists);
       return;
-    }
-    elseif ( !empty( $_POST['force']) && $_POST['force'] =='overwrite' )
+    } elseif ( !empty( $_POST['force']) && $_POST['force'] =='overwrite' )
     {
       if ( !(($aclMask &  CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ==  CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ){
         $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
@@ -465,8 +462,7 @@ 
             $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
         }
       }
-    }
-    else if ( !empty( $_POST['force']) && $_POST['force'] !== 'merge' )
+    } else if ( !empty( $_POST['force']) && $_POST['force'] !== 'merge' )
     {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
     }
@@ -735,8 +731,7 @@ 
 
         $files[$sourceFilePath] = $zipPathPart.pathinfo($sourceFilePath,PATHINFO_BASENAME);
       }
-    }
-    else
+    } else
     {
       if (!is_dir($_sServerDir)) {
         $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
@@ -803,8 +798,7 @@ 
         }
         $zip_filename = CKFinder_Connector_Utils_FileSystem::autoRename($dest_dir, $zip_filename);
         $zipFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($dest_dir, $zip_filename);
-      }
-      elseif ( isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'overwrite' )
+      } elseif ( isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'overwrite' )
       {
         if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
           $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);

libs/ckfinder/plugins/fileeditor/plugin.php

Braces +4 added lines, -3 removed lines

@@ -12,7 +12,9 @@ 
 *
 * CKFinder extension: prodives command that saves edited file.
 */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * Include base XML command handler
@@ -70,8 +72,7 @@ 
         $fp = @fopen($filePath, 'wb');
         if ($fp === false || !flock($fp, LOCK_EX)) {
             $result = false;
-        }
-        else {
+        } else {
             $result = fwrite($fp, $_POST["content"]);
             flock($fp, LOCK_UN);
             fclose($fp);

libs/ckfinder/ckfinder.php

Braces +3 added lines, -2 removed lines

@@ -11,7 +11,8 @@
  * this file is part of the Source Code of CKFinder.
  */
 
-if ( version_compare( phpversion(), '5', '<' ) )
+if ( version_compare( phpversion(), '5', '<' ) ) {
 	require_once 'core/ckfinder_php4.php' ;
-else
+} else {
 	require_once 'core/ckfinder_php5.php' ;
+}