From 48922db7c4852cce761b56d734ddc02e6bf8ee54 Mon Sep 17 00:00:00 2001 From: Naglfar Date: Tue, 12 Jan 2021 16:00:14 +0100 Subject: [PATCH] Avoid undefined variable warnings in wiki, users and server pages --- includes/server.php | 24 ++++++++++-------------- includes/users.php | 24 ++++++++++-------------- wiki.php | 27 ++++++++++----------------- 3 files changed, 30 insertions(+), 45 deletions(-) diff --git a/includes/server.php b/includes/server.php index b40e9d3..3f73260 100644 --- a/includes/server.php +++ b/includes/server.php @@ -8,24 +8,20 @@ include('../config.php'); include('../parsedown-1.7.3/Parsedown.php'); include('../parsedown-extra-0.7.1/ParsedownExtra.php'); -$page = $_GET['page']; -$style = $_GET['style']; +if(isset($_GET['page'])) + $page = $_GET['page']; +else + $page = "server"; + +if(isset($_GET['style'])) + $site_style = $_GET['style']; + $Parsedown = new Parsedown(); $Parsedown->setMarkupEscaped(true); $ParsedownExtra = new ParsedownExtra(); -if ( $page == "") { - $page = "main"; - } - -if ( $style == "") { - if ( $site_style == "") { - $site_style="site"; - } -} -else { - $site_style=$style; -} +if (empty($site_style)) + $site_style="site"; $header = file_get_contents("$doc_root/includes/header.md"); $sidebar = file_get_contents("$doc_root/includes/sidebar.md"); diff --git a/includes/users.php b/includes/users.php index c94bd89..71da3a8 100644 --- a/includes/users.php +++ b/includes/users.php @@ -8,24 +8,20 @@ include('../config.php'); include('../parsedown-1.7.3/Parsedown.php'); include('../parsedown-extra-0.7.1/ParsedownExtra.php'); -$page = $_GET['page']; -$style = $_GET['style']; +if(isset($_GET['page'])) + $page = $_GET['page']; +else + $page = "users"; + +if(isset($_GET['style'])) + $site_style = $_GET['style']; + $Parsedown = new Parsedown(); $Parsedown->setMarkupEscaped(true); $ParsedownExtra = new ParsedownExtra(); -if ( $page == "") { - $page = "main"; - } - -if ( $style == "") { - if ( $site_style == "") { - $site_style="site"; - } -} -else { - $site_style=$style; -} +if (empty($site_style)) + $site_style="site"; $header = file_get_contents("$doc_root/includes/header.md"); $sidebar = file_get_contents("$doc_root/includes/sidebar.md"); diff --git a/wiki.php b/wiki.php index b57d1d6..8f14721 100644 --- a/wiki.php +++ b/wiki.php @@ -8,27 +8,20 @@ include('config.php'); include('parsedown-1.7.3/Parsedown.php'); include('parsedown-extra-0.7.1/ParsedownExtra.php'); -$page = $_GET['page']; -if (isset($_GET['style'])) -{ - $style = $_GET['style']; -} +if(isset($_GET['page'])) + $page = $_GET['page']; +else + $page = "main"; + +if(isset($_GET['style'])) + $site_style = $_GET['style']; + $Parsedown = new Parsedown(); $Parsedown->setMarkupEscaped(true); $ParsedownExtra = new ParsedownExtra(); -if ( $page == "") { - $page = "main"; - } - -if ( empty($style)) { - if ( $site_style == "") { - $site_style="site"; - } -} -else { - $site_style=$style; -} +if (empty($site_style)) + $site_style="site"; $header = file_get_contents("$doc_root/includes/header.md"); $sidebar = file_get_contents("$doc_root/includes/sidebar.md");