From eec8fdf3fd36f6f8511bdb4bea0899f82bf3f6ab Mon Sep 17 00:00:00 2001 From: deva Date: Mon, 23 Mar 2009 18:41:22 +0000 Subject: First attempt on a modularized plugin system, complete with admin, and parameters. --- htdocs/admin.css | 124 ++++++++++++++++++++ htdocs/index.php | 30 +++-- pages/admin.php | 89 ++++++-------- utils/forms.php | 119 +++++++++++++++++++ utils/login.php | 5 +- utils/modules.php | 20 ++-- utils/modules/events.php | 296 +++++++++++++++++++++++++---------------------- utils/modules/news.php | 255 +++++++++++++++++++++++++--------------- 8 files changed, 633 insertions(+), 305 deletions(-) create mode 100644 htdocs/admin.css create mode 100644 utils/forms.php diff --git a/htdocs/admin.css b/htdocs/admin.css new file mode 100644 index 0000000..86d0d49 --- /dev/null +++ b/htdocs/admin.css @@ -0,0 +1,124 @@ +/*** Admin ***/ + +.admin { + text-align: center; + position: absolute; + top: 10%; + left: 10%; + right: 10%; + width: 80%; + height: 500px; + border: solid #0000ff 3px; + background: url(gfx/transparent.png) repeat; + color: #000; +} + +.admin .menu { + background-image: none; + border-bottom: solid blue 1px; + width: 100%; + height: 30px; + padding-top: 0px; + padding-left: 0px; +} + +.admin .submenu { + border-bottom: solid blue 1px; +} + +.admin .header { + background-image: none; + text-align: center; + font-size: 16px; + font-weight: bold; + border: 0px; + border-bottom: solid #0000ff 3px; +} + +.admin .logout { + text-align: right; +} + +.admin .preview { + text-align: left; + border: solid green 1px; + padding: 20px 20px 20px 20px; + margin: 20px 60px 20px 60px; +} + +.IGNOREadmin h2 { + text-align: center; +} + +.IGNOREadmin_menu { + margin-top: 4px; + border-top: solid #930104 1px; + border-left: solid #930104 1px; + border-right: solid #930104 1px; + padding-right: 2px; + float: left; +} + +.IGNOREadmin_menu_entry { + text-align: center; + background: url(gfx/chicken.jpg) repeat; + border: solid #930104 1px; + color: #cc7f00; + padding: 1px; + margin: 3px 0px 3px 3px; + width: 67px; + float: left; + text-decoration: none; +} + +.IGNOREadmin_menu_entry_active { + text-align: center; + background: url(gfx/chicken.jpg) repeat; + border-top: solid #930104 1px; + border-left: solid #930104 1px; + border-right: solid #930104 1px; + color: #ffaf00; + font-weight: bold; + padding: 2px 2px 6px 2px; + margin: 1px -1px 0px 2px; + width: 67px; + float: left; + text-decoration: none; +} + +.IGNOREadmin_form { + padding: 4px; + border: solid #930104 1px; + min-height: 300px; + clear:both; +} + +.IGNOREadmin_form input { + margin: 1px; + padding: 0px; + background: #000; + border: solid #930104 1px; + color: #6f6f6f; + width: 150px; +} + +.IGNOREadmin_form select { + background: #000; + border: solid #930104 1px; + color: #6f6f6f; + width: 150px; +} + +.IGNOREadmin_form textarea { + background: #000; + border: solid #930104 1px; + color: #6f6f6f; + width: 500px; + margin-bottom: 4px; +} + +.IGNOREadmin_form button { + background: url(gfx/chicken.jpg) repeat; + border: solid #930104 1px; + color: #ff9f00; +} diff --git a/htdocs/index.php b/htdocs/index.php index f374113..6ce08d8 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -6,6 +6,10 @@ header("Content-Type: text/html; charset=UTF-8"); include_once($UTIL_DIR . "/login.php"); if($page == "admin") checklogin(); + +include_once($UTIL_DIR . "/pages.php"); + +$pages = new Pages($DATA_DIR . "/pages.xml"); ?> @@ -20,7 +24,8 @@ if($page == "admin") checklogin(); - + +
@@ -79,6 +84,15 @@ if($page == "admin") checklogin(); getPage($page); + else $p = $pages->getPage($DEFAULT_PAGE); + if($p) $p->show(); +} + +/* switch($page) { case "news": include($PAGE_DIR."/news.php"); break; case "shop": include($PAGE_DIR."/shop.php"); break; @@ -104,23 +118,23 @@ case "cancel": include($PAGE_DIR."/cancel.php"); break; // Default default: include($PAGE_DIR."/news.php"); break; } +*/ ?>
> getPage("column"); +if($p) $p->show(); ?>
"; ?> diff --git a/pages/admin.php b/pages/admin.php index 5305ae2..3f924c7 100644 --- a/pages/admin.php +++ b/pages/admin.php @@ -1,3 +1,5 @@ +
+
Admin
@@ -7,66 +9,44 @@ if($loggedin == true) { else $UID = $HTTP_COOKIE_VARS["UserID"]; $user = $users->findUser($UID); ?> -
-
-
Admin
-
-
-
-events == "on") {?> - " - href="?page=admin&module=events">Events - -news == "on") {?> - " - href="?page=admin&module=news">News - -gallery == "on") {?> - " - href="?page=admin&module=gallery">Gallery - -guestbook == "on") {?> - " - href="?page=admin&module=guestbook">Guestbook - -newsletter == "on") {?> - " - href="?page=admin&module=newsletter">Newsletter - -pressrelease == "on") {?> - " - href="?page=admin&module=pressrelease">Press - -user == "on") {?> - " - href="?page=admin&module=user">Password - -users == "on") {?> - " - href="?page=admin&module=users">Users - + -
+\n"; -} else { +if($admin_module) { + foreach($admin_module->admin_submodules as $submodulename => $submodule) { + if($s == $submodule) { + $admin_submodule = $s; + $admin_submodule_name = $submodulename; + } + echo "\n"; + } +} ?> -
-
Login
+
+
+$admin_submodule_name
\n"; + $admin_module->admin($admin_submodule, $a, $vars); +} +?> +
+ +

UserID:

Password:

@@ -76,3 +56,4 @@ if($loggedin == true) { +
diff --git a/utils/forms.php b/utils/forms.php new file mode 100644 index 0000000..4383d0a --- /dev/null +++ b/utils/forms.php @@ -0,0 +1,119 @@ + + + + + +
+
+
+
+ +
+
+
" value=""/>
+
+ $value) { +?> + " value=""/> + +
+
+
+
+ +
+
+
+ " value=""/> + / + " value=""/> + / + " value=""/> + - + " value=""/> + : + " value=""/> + : + " value=""/> +
+
+ +
+
+
+ +
+
+ diff --git a/utils/login.php b/utils/login.php index 950476e..88ba53a 100644 --- a/utils/login.php +++ b/utils/login.php @@ -13,6 +13,7 @@ function checklogin() global $loggedin; global $action; global $DATA_DIR; + global $ADMIN_TIMEOUT; $users = new Users($DATA_DIR . "/users.xml"); @@ -25,8 +26,8 @@ function checklogin() } else { _log("Wrong password", $userid); } - setcookie("UserID", $userid, time()+600); // expire in 10 minutes - setcookie("Password", $password, time()+600); // expire in 10 minutes + setcookie("UserID", $userid, time()+$ADMIN_TIMEOUT); + setcookie("Password", $password, time()+$ADMIN_TIMEOUT); return; } else { _log("Failed", $userid); diff --git a/utils/modules.php b/utils/modules.php index 62e64d3..4c34228 100644 --- a/utils/modules.php +++ b/utils/modules.php @@ -1,17 +1,15 @@ diff --git a/utils/modules/events.php b/utils/modules/events.php index 339102e..efba697 100644 --- a/utils/modules/events.php +++ b/utils/modules/events.php @@ -1,153 +1,177 @@ \n"; - $str .= "
" . - htmlspecialchars_decode($this->title, ENT_QUOTES) . "
\n"; - $str .= "
" . date("D M jS Y", $this->time) . "
\n"; - $str .= "
" . - htmlspecialchars_decode($this->description, ENT_QUOTES) . "
\n"; - if($this->flyer) { - $str .= " \"flyer\"flyer . "\"/>\n"; - } - $str .= "
\n"; - return $str; - } - - public function Event($title, $time, $description, $flyer = "") - { - $this->title = $title; - $this->time = $time; - $this->description = $description; - $this->flyer = $flyer; - } + public $title; + public $time; + public $description; + public $flyer; + + public function show() + { + $str = "
\n"; + $str .= "
" . + htmlspecialchars_decode($this->title, ENT_QUOTES) . "
\n"; + $str .= "
" . date("D M jS Y", $this->time) . "
\n"; + $str .= "
" . + htmlspecialchars_decode($this->description, ENT_QUOTES) . "
\n"; + if($this->flyer) { + $str .= " \"flyer\"flyer . "\"/>\n"; + } + $str .= "
\n"; + return $str; + } + + public function Event($title, $time, $description, $flyer = "") + { + $this->title = $title; + $this->time = $time; + $this->description = $description; + $this->flyer = $flyer; + } } class Events { - private $file; - private $events = array(); - - public function run($params) - { - foreach($params as $param) { - switch($param) { - case "coming": - return $this->showcoming(-1); - break; - - case "old": - default: - return $this->showold(-1); - break; - } - } - } - - public function showcoming($number) - { - $str = ""; - - $foundany = false; - - // Key sort - ksort($this->events); - - // If number is -1 show all shows. - if($number == -1) $number = 100000; + private $file; + private $events = array(); + + // Admin config + public $admin_title = "Events"; + public $admin_submodules = array("New Event" => "new", + "Edit Event" => "edit", + "Delete Event" => "delete"); + + public function admin($sub, $action, $vars) + { + switch($sub) { + case "new": + echo "New"; + break; + case "edit": + echo "Edit"; + break; + case "delete": + echo "Delete"; + break; + } + } + + public function run($params) + { + foreach($params as $param) { + switch($param) { + case "coming": + return $this->showcoming(-1); + break; + + case "old": + default: + return $this->showold(-1); + break; + } + } + } + + public function showcoming($number) + { + $str = ""; + + $foundany = false; + + // Key sort + ksort($this->events); + + // If number is -1 show all shows. + if($number == -1) $number = 100000; - foreach($this->events as $event) { - if($event->time >= time()) { - $foundany = true; - $str .= $event->show(); - $number--; - } - if(!$number) return $str; - } - - if($foundany == false) return "No shows available at the moment."; - return $str; - } - - public function showold($number) - { - $str = ""; - - // Key sort - krsort($this->events); - - // If number is -1 show all shows. - if($number == -1) $number = 100000; - - foreach($this->events as $event) { - if($event->time <= time()) { - $str .= $event->show(); - $number--; - } - if(!$number) return $str; - } - return $str; - } + foreach($this->events as $event) { + if($event->time >= time()) { + $foundany = true; + $str .= $event->show(); + $number--; + } + if(!$number) return $str; + } + + if($foundany == false) return "No shows available at the moment."; + return $str; + } + + public function showold($number) + { + $str = ""; + + // Key sort + krsort($this->events); + + // If number is -1 show all shows. + if($number == -1) $number = 100000; + + foreach($this->events as $event) { + if($event->time <= time()) { + $str .= $event->show(); + $number--; + } + if(!$number) return $str; + } + return $str; + } - public function add($event) { - $key = $event->time; - // array_push($this->events, $event); - $this->events[$key] = $event; - } + public function add($event) { + $key = $event->time; + // array_push($this->events, $event); + $this->events[$key] = $event; + } - public function write() - { - $fp = fopen($this->file, "w"); - fwrite($fp, "\n"); - - fwrite($fp, "\n"); - foreach($this->events as $event) { - fwrite($fp, " title, ENT_QUOTES, "UTF-8") . "\"\n"); - fwrite($fp, " time=\"" . $event->time . "\"\n"); - fwrite($fp, " description=\"" . - htmlspecialchars($event->description, ENT_QUOTES, "UTF-8") . "\"\n"); - fwrite($fp, " flyer=\"" . $event->flyer . "\">\n"); - fwrite($fp, " \n"); - } - fwrite($fp, "\n"); - - fclose($fp); - } + public function write() + { + $fp = fopen($this->file, "w"); + fwrite($fp, "\n"); + + fwrite($fp, "\n"); + foreach($this->events as $event) { + fwrite($fp, " title, ENT_QUOTES, "UTF-8") . "\"\n"); + fwrite($fp, " time=\"" . $event->time . "\"\n"); + fwrite($fp, " description=\"" . + htmlspecialchars($event->description, ENT_QUOTES, "UTF-8") . "\"\n"); + fwrite($fp, " flyer=\"" . $event->flyer . "\">\n"); + fwrite($fp, " \n"); + } + fwrite($fp, "\n"); + + fclose($fp); + } - private function read() - { - - $dom = new DomDocument; - $dom->preserveWhiteSpace = FALSE; - $dom->load($this->file); - $params = $dom->getElementsByTagName('event'); - - foreach ($params as $param) { - $event = new Event($param->getAttribute('title'), - $param->getAttribute('time'), - $param->getAttribute('description'), - $param->getAttribute('flyer')); - $this->add($event); - } - - } + private function read() + { + $dom = new DomDocument; + $dom->preserveWhiteSpace = FALSE; + $dom->load($this->file); + $params = $dom->getElementsByTagName('event'); + + foreach ($params as $param) { + $event = new Event($param->getAttribute('title'), + $param->getAttribute('time'), + $param->getAttribute('description'), + $param->getAttribute('flyer')); + $this->add($event); + } + } + + public function Events($file) + { + $this->file = $file; + if(file_exists($file)) $this->read(); + } - public function Events($file) - { - $this->file = $file; - if(file_exists($file)) $this->read(); - } +} +function events_init() +{ + global $DATA_DIR; + return new Events($DATA_DIR . "/events.xml"); } ?> diff --git a/utils/modules/news.php b/utils/modules/news.php index 22de6a0..2505ffb 100644 --- a/utils/modules/news.php +++ b/utils/modules/news.php @@ -1,119 +1,186 @@ \n"; - $str .= "
" . - htmlspecialchars_decode($this->title, ENT_QUOTES) . "
\n"; - $str .= "
" . date("D M jS Y G:i", $this->time) . "
\n"; - $str .= "
" . - htmlspecialchars_decode($this->description, ENT_QUOTES) . "
\n"; - $str .= "
\n"; - return $str; - } - - public function NewsEntry($title, $time, $category, $description) - { - $this->title = $title; - $this->time = $time; - $this->category = $category; - $this->description = $description; - } + public $title; + public $time; + public $description; + public $category; + + public function show() + { + $str = "
\n"; + $str .= "
" . + htmlspecialchars_decode($this->title, ENT_QUOTES) . "
\n"; + $str .= "
" . date("D M jS Y G:i", $this->time) . "
\n"; + $str .= "
" . + htmlspecialchars_decode($this->description, ENT_QUOTES) . "
\n"; + $str .= "
\n"; + return $str; + } + + public function NewsEntry($title, $time, $category, $description) + { + $this->title = $title; + $this->time = $time; + $this->category = $category; + $this->description = $description; + } } class News { - private $file; - private $news = array(); - - public function run($module) - { - global $show; - - switch($module) { - case "news": - default: - if($show == "all") return $this->show(-1, "all"); - else return $this->show(-1, "main"); - break; - } - } - - public function show($number, $category) - { - $str = ""; - - // If number is -1 show all shows. - if($number == -1) $number = 100000; - - foreach($this->news as $newsentry) { - if($newsentry->category == $category || $category == "all") { + private $file; + private $news = array(); + + // Admin config + public $admin_title = "News"; + public $admin_submodules = array("New Newsentry" => "new", + "Edit Newsentry" => "edit", + "Delete Newsentry" => "delete"); + + public function admin($sub, $action, $vars) + { + switch($sub) { + case "new": + switch($action) { + case "add": + $n = new NewsEntry($vars["title"], totimestamp($vars, "time"), $vars["category"], $vars["description"]); + $this->add($n); + $this->write(); + break; + + case "preview": + $n = new NewsEntry($vars["title"], totimestamp($vars, "time"), $vars["category"], $vars["description"]); + echo "
\n"; + echo "
\n"; + echo $n->show(); + echo "
\n"; + echo "
\n"; + echo "

Looking ok?

"; + beginform("add"); + hidden($vars); + button("yes"); + endform(); + beginform("retry"); + hidden($vars); + button("no"); + endform(); + break; + + case "retry": + $title = $vars["title"]; + $time = totimestamp($vars, "time"); + $category = $vars["category"]; + $description = $vars["description"]; + default: + beginform("preview"); + lineedit("Title", "title", $title); + datetimeedit("Time", "time", $time); + combobox("Category", "category", $category, array("Main" => "main", "Site" => "site")); + textedit("Description", "description", $description); + button("Post news"); + endform(); + break; + } + break; + + case "edit": + echo "Edit"; + break; + case "delete": + echo "Delete"; + break; + } + } + + public function run($module) + { + global $show; + + switch($module) { + case "news": + default: + if($show == "all") return $this->show(-1, "all"); + else return $this->show(-1, "main"); + break; + } + } + + public function show($number, $category) + { + $str = ""; + + // If number is -1 show all shows. + if($number == -1) $number = 100000; + + foreach($this->news as $newsentry) { + if($newsentry->category == $category || $category == "all") { $str .= $newsentry->show(); $number--; - } - if(!$number) return $str; - } - return $str; - } - - public function add($newsentry) { - $key = $newsentry->time; - $this->news[$key] = $newsentry; - } + } + if(!$number) return $str; + } + return $str; + } + + public function add($newsentry) { + $key = $newsentry->time; + $this->news[$key] = $newsentry; + } - public function write() - { - $fp = fopen($this->file, "w"); - fwrite($fp, "\n"); - - fwrite($fp, "\n"); - foreach($this->news as $newsentry) { - fwrite($fp, " file, "w"); + fwrite($fp, "\n"); + + fwrite($fp, "\n"); + foreach($this->news as $newsentry) { + fwrite($fp, " title, ENT_QUOTES, "UTF-8") . "\"\n"); - fwrite($fp, " time=\"" . $newsentry->time . "\"\n"); - fwrite($fp, " category=\"" . $newsentry->category . "\"\n"); - fwrite($fp, " description=\"" . + fwrite($fp, " time=\"" . $newsentry->time . "\"\n"); + fwrite($fp, " category=\"" . $newsentry->category . "\"\n"); + fwrite($fp, " description=\"" . htmlspecialchars($newsentry->description, ENT_QUOTES, "UTF-8") . "\">\n"); - fwrite($fp, " \n"); - } - fwrite($fp, "\n"); + fwrite($fp, " \n"); + } + fwrite($fp, "\n"); - fclose($fp); - } + fclose($fp); + } - private function read() - { - $dom = new DomDocument; - $dom->preserveWhiteSpace = FALSE; - $dom->load($this->file); - $params = $dom->getElementsByTagName('newsentry'); - - foreach ($params as $param) { - $newsentry = new NewsEntry($param->getAttribute('title'), + private function read() + { + $dom = new DomDocument; + $dom->preserveWhiteSpace = FALSE; + $dom->load($this->file); + $params = $dom->getElementsByTagName('newsentry'); + + foreach ($params as $param) { + $newsentry = new NewsEntry($param->getAttribute('title'), $param->getAttribute('time'), $param->getAttribute('category'), $param->getAttribute('description')); - $this->add($newsentry); - } + $this->add($newsentry); + } - // Key sort - krsort($this->news); - } + // Key sort + krsort($this->news); + } - public function News($file) - { - $this->file = $file; - if(file_exists($file)) $this->read(); - } + public function News($file) + { + $this->file = $file; + if(file_exists($file)) $this->read(); + } } +function news_init() +{ + global $DATA_DIR; + return new News($DATA_DIR . "/news.xml"); +} ?> -- cgit v1.2.3