fix default body in config- admin

5 files changed, 4 insertions, 49 deletions

diff --git a/app/class/Config.php b/app/class/Config.php
index 6ddb3e4..fa9082f 100644
--- a/app/class/Config.php
+++ b/app/class/Config.php
@@ -21,7 +21,6 @@ abstract class Config
 	protected static $notpublishedpass = false;
 	protected static $alertcss = false;
 	protected static $defaultbody = '%HEADER%'. PHP_EOL .PHP_EOL . '%NAV%'. PHP_EOL .PHP_EOL . '%ASIDE%'. PHP_EOL .PHP_EOL . '%MAIN%'. PHP_EOL .PHP_EOL . '%FOOTER%';
-	protected static $defaultpage = '';
 	protected static $defaultfavicon = '';
 	protected static $defaultthumbnail = '';
 	protected static $analytics = '';	
@@ -195,11 +194,6 @@ abstract class Config
 		return self::$defaultbody;
 	}
 
-	public static function defaultpage()
-	{
-		return self::$defaultpage;
-	}
-
 	public static function defaultfavicon()
 	{
 		return self::$defaultfavicon;
@@ -376,13 +370,6 @@ abstract class Config
 		}
 	}
 
-	public static function setdefaultpage($defaultpage)
-	{
-		if(is_string($defaultpage)) {
-			self::$defaultpage = idclean($defaultpage);
-		}
-	}
-
 	public static function setanalytics($analytics)
 	{
 		if(is_string($analytics) && strlen($analytics) < 25) {
diff --git a/app/class/Controlleradmin.php b/app/class/Controlleradmin.php
index 835f158..cd166c2 100644
--- a/app/class/Controlleradmin.php
+++ b/app/class/Controlleradmin.php
@@ -25,11 +25,6 @@ class Controlleradmin extends Controller
             $datas['faviconlist'] = $this->mediamanager->listfavicon();
             $datas['thumbnaillist'] = $this->mediamanager->listthumbnail();
             $datas['interfacecsslist'] = $this->mediamanager->listinterfacecss();
-            if(in_array(Config::defaultpage(), $datas['pagelist'])) {
-                $datas['defaultpageexist'] = true;
-            } else {
-                $datas['defaultpageexist'] = false;
-            }
 
             $globalcssfile = Model::GLOBAL_DIR . 'global.css';
 
diff --git a/app/class/Controllerpage.php b/app/class/Controllerpage.php
index b214eea..585db0a 100644
--- a/app/class/Controllerpage.php
+++ b/app/class/Controllerpage.php
@@ -222,16 +222,7 @@ class Controllerpage extends Controller
         if ($this->user->iseditor() && !$this->importpage()) {
             $this->page->reset();
             $this->page->addauthor($this->user->id());
-            if (!empty(Config::defaultpage())) {
-                $defaultpage = $this->pagemanager->get(Config::defaultpage());
-                if ($defaultpage !== false) {
-                    $defaultbody = $defaultpage->body();
-                }
-            }
-            if (empty(Config::defaultpage()) || $defaultpage === false) {
-                $defaultbody = Config::defaultbody();
-            }
-            $this->page->setbody($defaultbody);
+            $this->page->setbody(Config::defaultbody());
             $this->pagemanager->add($this->page);
             $this->routedirect('pageedit', ['page' => $this->page->id()]);
         } else {
diff --git a/app/class/Modelrender.php b/app/class/Modelrender.php
index b544d21..2e003e0 100644
--- a/app/class/Modelrender.php
+++ b/app/class/Modelrender.php
@@ -235,7 +235,7 @@ class Modelrender extends Modelpage
 
 		$head = '';
 
-		$head .= '<meta charset="utf8" />' . PHP_EOL;
+		$head .= '<meta charset="utf-8" />' . PHP_EOL;
 		$head .= '<title>' . $this->page->title() . '</title>' . PHP_EOL;
 		if (!empty($this->page->favicon())) {
 			$head .= '<link rel="shortcut icon" href="' . Model::faviconpath() . $this->page->favicon() . '" type="image/x-icon">';
diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php
index 0c9f5af..3ae8036 100644
--- a/app/view/templates/admin.php
+++ b/app/view/templates/admin.php
@@ -84,28 +84,10 @@
 
 
 
+                    <label for="defaultbody">Edit default BODY element</label>
+                    <textarea name="defaultbody" id="defaultbody" cols="30" rows="10" form="admin"><?= Wcms\Config::defaultbody() ?></textarea>
 
 
-                    <label for="defaultpage">Or, create new page BODY based on an already existing one</label>
-                    <select name="defaultpage" id="defaultpage" form="admin">
-                        <option value="" <?= Wcms\Config::defaultpage() === '' || !$defaultpageexist ? 'selected' : '' ?>>--use default BODY element--</option>
-                        <?php
-                        foreach ($pagelist as $page) {
-                        ?>
-                            <option value="<?= $page ?>" <?= Wcms\Config::defaultpage() === $page ? 'selected' : '' ?>><?= $page ?></option>
-                        <?php    }
-                        ?>
-                    </select>
-
-                    <?php
-                    if (empty(!$defaultpageexist || Wcms\Config::defaultpage())) {
-                    ?>
-                        <label for="defaultbody">Edit default BODY element</label>
-                        <textarea name="defaultbody" id="defaultbody" cols="30" rows="10" form="admin"><?= Wcms\Config::defaultbody() ?></textarea>
-                    <?php
-                    }
-                    ?>
-
 
                     <h2 id="alert-pages">Alert pages</h2>