diff --git a/admin.php b/admin.php index 2c5930b..006769d 100644 --- a/admin.php +++ b/admin.php @@ -1,22 +1,27 @@ - - - + + + - + +<?php $ap->website->title(); ?> AdminPanel - <?php $ap->page->title(); ?> -<?php $ap->website->title(); ?> AdminPanel - <?php $ap->page->title(); ?> page->head(); ?> - -
-
- -
-
-page->body(); ?> -
 
-
  + + + +
+
+ +
+
+ page->body(); ?> +
 
+
+
- -
- + + diff --git a/inc/adminbrowser.php b/inc/adminbrowser.php index 3f13ef9..ff29a8a 100755 --- a/inc/adminbrowser.php +++ b/inc/adminbrowser.php @@ -17,10 +17,10 @@ function AdminBrowser($db) { $this->dir = $_GET['dir']; $this->path .= $this->dir; if($_GET['do'] == "upload") $this->doUpload(); - $this->body = "\n"; + $this->body = "
\n"; $this->body .= $this->getBodyBrowser(); $this->body .= $this->getBodyUpload(); - $this->body .= "\n"; + $this->body .= "
\n"; $this->head = $this->getHeadBrowser(); $this->head .= $this->getHeadUpload(); } @@ -35,12 +35,12 @@ function getBodyUpload() { else $ret .= "Uploaded the files successful"; } - $ret .= "
dir."&do=upload\" method=\"post\"> \n"; - $ret .= "\n"; - $ret .= "
"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; + $ret .= "dir."&do=upload\" method=\"post\"> \n"; + $ret .= "
\n"; + $ret .= "
"; + $ret .= "
\n"; + $ret .= "\n"; + $ret .= "\n"; $ret .= "
\n"; $ret .= "
"; return $ret; @@ -77,8 +77,8 @@ function getBodyBrowser() { $handle = openDir($this->path); $dirs = null; $files = null; - $ret = "

Browser

\n"; - $ret .= "dir)."\">BACK\n"; + $ret = "

Browser

\n"; + $ret .= "dir)."\">BACK\n"; $ret .= "\n"; $ret .= " \n"; while ($file = readdir($handle)) { @@ -86,7 +86,7 @@ function getBodyBrowser() { $dirs .= " "; $dirs .= ""; $dirs .= ""; diff --git a/inc/admingeneral.php b/inc/admingeneral.php index 0c2fc2d..9c9b612 100755 --- a/inc/admingeneral.php +++ b/inc/admingeneral.php @@ -27,7 +27,7 @@ function AdminGeneral($db) { } // build page - $ret = ""; + $ret = "
"; $ret .= "

General Setup

\n"; if ($saved) { // ToDo: print some "page saved successfully"-stuff @@ -35,15 +35,14 @@ function AdminGeneral($db) { } $ret .= "
\n
NameSizeActions
"; - $dirs .= "dir."/".$file."\">"; + $dirs .= "dir."/".$file."\">"; $dirs .= $file; $dirs .= ""; $dirs .= "
\n"; - $ret .= "\n"; - $ret .= "

Website

- \n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; + $ret .= "\n"; + $ret .= "

Website

\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; $ret .= "
TitlegetWebsiteTitle()."\">
DomaingetWebsiteDomain()."\">
WebmastergetWebsiteWebmaster()."\">
TitlegetWebsiteTitle()."\"/>
DomaingetWebsiteDomain()."\"/>
WebmastergetWebsiteWebmaster()."\"/>
\n"; - $ret .= "\n"; + $ret .= "
\n"; $this->body = $ret; $this->head = ""; } diff --git a/inc/adminlogin.php b/inc/adminlogin.php index e3253f6..4a0169c 100755 --- a/inc/adminlogin.php +++ b/inc/adminlogin.php @@ -16,14 +16,14 @@ function AdminLogin($db) { $this->title = "Login"; $this->id = ""; $this->author = ""; - $ret = "\n"; + $ret = "
\n"; $ret .= "
\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; $ret .= "
username
password
username
password
\n"; + $ret .= "
"; - $ret .= "\n"; + $ret .= "
\n"; $this->body = $ret; $this->head = ""; diff --git a/inc/adminpage.php b/inc/adminpage.php index 430b5cc..5e721ae 100755 --- a/inc/adminpage.php +++ b/inc/adminpage.php @@ -57,16 +57,16 @@ function AdminPage($db) { $this->title = $db->getPageTitle($id); // delete question - $ret = ""; + $ret = "
"; $ret .= "

Delete Page

\n"; $ret .= "

Do you realy want to delete the "".htmlentities($this->title)."" page?

\n"; $ret .= "
"; - $ret .= "\n"; - $ret .= ""; - $ret .= "\n"; - $ret .= "\n"; + $ret .= "\n"; + $ret .= ""; + $ret .= "\n"; + $ret .= "\n"; $ret .= "
\n"; - $ret .= "\n"; + $ret .= "
\n"; $this->body = $ret; } elseif (isset($_GET['id']) and ($_GET['id'] !== "new")) { @@ -80,25 +80,25 @@ function AdminPage($db) { $this->author = $db->getPageAuthor($id); // build form - $ret = ""; + $ret = "
"; $ret .= "

Edit Page

\n"; $ret .= "
"; if ($db->isPage($id)) $checked = " checked=\"checked\""; // only true, if page is visible else $checked = ""; - $ret .= " visible\n"; + $ret .= " visible\n"; $ret .= "

Title

"; - $ret .= "title."\">"; + $ret .= "title."\"/>"; $ret .= "

Author

\n"; $ret .= "

".$this->author."

\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; // plugin stuff global $PLUGINS; $ret .= $PLUGINS[$type]->getEditorBody($main); - $ret .= "\n"; + $ret .= "\n"; $ret .= "
\n"; - $ret .= "\n"; + $ret .= "
\n"; $this->body = $ret; $this->head = $PLUGINS[$type]->getEditorHead($main); } @@ -109,21 +109,21 @@ function AdminPage($db) { $this->title = "new page"; // build form - $ret = ""; + $ret = "
"; $ret .= "

New Page

\n"; $ret .= "
"; - $ret .= " visible\n"; + $ret .= " visible\n"; $ret .= "

Title

\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "id."\">\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "id."\"/>\n"; // plugin stuff global $PLUGINS; $ret .= $PLUGINS[$_GET['type']]->getEditorBody(""); - $ret .= "\n"; + $ret .= "\n"; $ret .= "
\n"; - $ret .= "\n"; + $ret .= "
\n"; $this->body = $ret; $this->head = $PLUGINS[$_GET['type']]->getEditorHead(""); } @@ -135,33 +135,33 @@ function AdminPage($db) { $this->head = ""; $sitemap = $db->getSitemap(); - $ret = ""; + $ret = "
"; $ret .= "

List Of Pages

\n"; foreach($sitemap as $page) { $ret .= ""; // Title - $ret .= ""; + $ret .= ""; // edit-button - $ret .= ""; + $ret .= ""; // delete-button - $ret .= ""; + $ret .= ""; $ret .= "\n"; } - $ret .= "
".htmlentities($page[1])."".htmlentities($page[1])."EDITEDITDELETEDELETE
\n"; + $ret .= "\n"; // new page $ret .= "
\n"; - $ret .= "\n"; - $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; $ret .= "

New Page

\nType: \n"; - $ret .= "\n"; + $ret .= "\n"; $ret .= "
\n"; - $ret .= "\n"; + $ret .= "
\n"; $this->body = $ret; $this->head = ""; diff --git a/inc/adminpanel.php b/inc/adminpanel.php index 3896bec..88b1bee 100755 --- a/inc/adminpanel.php +++ b/inc/adminpanel.php @@ -2,7 +2,7 @@ session_start(); // Include plugins (all files in inc/plugins/) -foreach(glob("inc/plugins/*.php") as $filename) include($filename); +foreach(glob("inc/plugins/*.php") as $filename) if($filename !== "inc/plugins/index.php") require_once($filename); // include Db include("inc/dbwrite.php"); diff --git a/inc/adminuser.php b/inc/adminuser.php index 59b47fd..adf5663 100755 --- a/inc/adminuser.php +++ b/inc/adminuser.php @@ -49,16 +49,16 @@ function AdminUser($db) { $id = $this->id; $this->title = $dbuser->getUserName($id); // delete question - $ret = "\n"; + $ret = "
\n"; $ret .= "

Delete User

\n"; $ret .= "

Do you realy want to delete the user "".htmlentities($this->title).""?

\n"; $ret .= "
"; - $ret .= "\n"; - $ret .= ""; - $ret .= "\n"; - $ret .= "\n"; + $ret .= "\n"; + $ret .= ""; + $ret .= "\n"; + $ret .= "\n"; $ret .= "
"; - $ret .= "\n"; + $ret .= "
\n"; $this->body = $ret; } elseif (isset($_GET['id']) and ($_GET['id'] !== "new")) { @@ -72,18 +72,18 @@ function AdminUser($db) { $rights = $dbuser->getUserRights($id); // build form - $ret = "\n"; + $ret = "
\n"; $ret .= "

Edit User

\n"; $ret .= "
"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; $ret .= "
Name
Rights
Name
Repeat password
Name
Rights
Name
Repeat password
"; - $ret .= "\n"; + $ret .= "
\n"; $this->body = $ret; $this->head = ""; } @@ -96,18 +96,19 @@ function AdminUser($db) { $this->author = ""; // ToDo // build form - $ret = "\n"; + $ret = "
\n"; $ret .= "

New User

\n"; $ret .= "
"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; - $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; $ret .= "
Name
Rights
Password
Repeat password
Name
Rights
Password
Repeat password
\n"; + $ret .= "\n"; + $ret .= "\n"; + $ret .= "
"; - $ret .= "\n"; + $ret .= "
\n"; $this->body = $ret; $this->head = ""; } @@ -119,28 +120,28 @@ function AdminUser($db) { $this->head = ""; $users = $dbuser->getUsers(); - $ret = "\n"; + $ret = "
\n"; $ret .= "

List Of Users

\n"; foreach($users as $user) { $ret .= ""; // Title - $ret .= ""; + $ret .= ""; // edit-button - $ret .= ""; + $ret .= ""; // delete-button - $ret .= ""; + $ret .= ""; $ret .= "\n"; } - $ret .= "
".htmlentities($user[1])."".htmlentities($user[1])."EDITEDITDELETEDELETE
\n"; + $ret .= "\n"; // new page $ret .= "
\n"; - $ret .= "\n"; - $ret .= "\n"; + $ret .= "\n"; + $ret .= "\n"; $ret .= "

New User

\n"; - $ret .= "\n"; + $ret .= "\n"; $ret .= "
"; - $ret .= "\n"; + $ret .= "
\n"; $this->body = $ret; $this->head = ""; diff --git a/inc/plugins/album.php b/inc/plugins/album.php index 670f815..edad363 100755 --- a/inc/plugins/album.php +++ b/inc/plugins/album.php @@ -42,7 +42,7 @@ function getBody($main, $id) { $ret .= "margin:5px;"; $ret .= "\">\n"; $ret .= "\n"; - $ret .= "\n"; + $ret .= "\"".$file."\"/\n"; $ret .= "\n"; $ret .= "\n"; } @@ -68,7 +68,7 @@ function getEditorHead($main) { } function getEditorBody($main) { - return "

Album URL


\n"; + return "

Album URL


\n"; } } diff --git a/inc/plugins/html.php b/inc/plugins/html.php index eede6d2..6077090 100755 --- a/inc/plugins/html.php +++ b/inc/plugins/html.php @@ -65,7 +65,7 @@ function getMain($post) { function getEditorBody($main) { // ToDo: return an wysiwyg-editor (as html) - return "

Page Content


\n"; + return "

Page Content


\n"; } function getEditorHead($main) { diff --git a/inc/plugins/iframe.php b/inc/plugins/iframe.php index 1dfff20..dd0f7d2 100755 --- a/inc/plugins/iframe.php +++ b/inc/plugins/iframe.php @@ -21,7 +21,7 @@ function getMain($post) { function getEditorBody($main) { // ToDo: return html to edit the iframe-url - return "

Iframe URL


\n"; + return "

Iframe URL


\n"; } function getEditorHead($main) { diff --git a/index.php b/index.php index cc07124..82046ab 100644 --- a/index.php +++ b/index.php @@ -1,13 +1,16 @@ - - - + + + + - + +<?php $cms->website->title(); ?> - <?php $cms->page->title(); ?> - -<?php $cms->website->title(); ?> - <?php $cms->page->title(); ?> - -
-
- -
-
-page->body(); ?> -
 
-
  + + + +
+
+ +
+
+ page->body(); ?> +
 
+
+
- -
- + +