Changeset 125

Timestamp:

13/09/06 00:18:37 (7 years ago)

Author:

dez

Message:

Adds a bunch of templates that no-one thought to svn add previously
Adds page creation and deletion to static component

Files:

• components/bananas.php (modified) (1 diff)
• components/contents.php (modified) (1 diff)
• components/news.php (modified) (1 diff)
• components/static.php (modified) (2 diffs)
• htdocs/css/sucs.css (modified) (2 diffs)
• htdocs/index.php (modified) (3 diffs)
• static/About.txt (modified) (1 diff)
• templates/debug.tpl (added)
• templates/front.tpl (added)
• templates/games.tpl (added)
• templates/index.tpl (modified) (1 diff)
• templates/library-search.tpl (added)
• templates/library.tpl (modified) (2 diffs)
• templates/pagemap.tpl (added)
• templates/pagemap_edit.tpl (added)
• templates/shop.tpl (added)
• templates/static_delete.tpl (added)
• templates/static_edit.tpl (added)

components/bananas.php

@@ -1 +1 @@
 <?php
-echo($path);
 $banana_index = array_search("Bananas", $pathlist);
 if ((sizeof($pathlist) > $banana_index + 1) && (trim($pathlist[$banana_index + 1]) != "")) {

components/contents.php

@@ -42 +42 @@
                 $smarty->assign('data', $dirlist);
                 $smarty->assign('level', 0);
-                $output = $smarty->fetch('contents-loop.tpl');
-                $smarty->assign("secondary", "<div class=\"cbb\"><h3>In this section</h3>".$output."</div>");
-                $smarty->assign('title', end($pathlist));
+                if (!isset($_REQUEST['action'])) {
+                        $output = $smarty->fetch('contents-loop.tpl');
+                        $smarty->assign("secondary", "<div class=\"cbb\"><h3>In this section</h3>".$output."</div>");
+                }
         }
 }

components/news.php

@@ -1 +1 @@
 <?php
 
+if (isset($_REQUEST['action'])) {
+        $action = $_REQUEST['action'];
+} else {
+        $action = "view";
+}
+
 $smarty->assign("news",$DB->GetArray("SELECT * FROM news ORDER BY date DESC LIMIT 5"));
-$output = $smarty->fetch($base."templates/news.tpl");
-$smarty->assign("title", "News");
+
+if ($action == "edit") {
+        $output = $smarty->fetch("news_edit.tpl");
+        $smarty->assign("title", "Edit News");
+} else {
+        $output = $smarty->fetch("news.tpl");
+        $smarty->assign("title", "News");
+}
+
 $smarty->assign("body", $output);
+
 ?>

components/static.php

@@ -1 +1 @@
 <?php
 // Static page producer module
+
+// A user must be in the html group in order to edit pages in this component
+$permission = "html";
 
 // Get the right filename...
@@ -6 +9 @@
 if (!file_exists($myfile)) {
         $myfile = $base."static$path.txt";
-        // ...or serve a 404 error
+        // If the file doesn't exist...
         if (!file_exists($myfile)) {
-                header("HTTP/1.1 404 Not Found");
-                $smarty->assign("body", file_get_contents($base."static/404.txt"));
-                $smarty->assign("pathlist", array("", "Error"));
-                $smarty->assign("title", "File not found");
-                return;
+                if (isset($session->groups[$permission]) && @$_REQUEST['action']=="create") {
+                        // ...and we have permission and have been asked to, create it
+                        $body = "foo";
+                } else {
+                        // ...serve a 404 error
+                        header("HTTP/1.1 404 Not Found");
+                        $body = file_get_contents($base."static/404.txt");
+                        $smarty->assign("pathlist", array("", "Error"));
+                        $title = "File not found";
+                        $smarty->assign("title", $title);
+                        $smarty->assign("body", $body);
+                        // Give those with permission the chance to create the page
+                        if (isset($session->groups[$permission])) $smarty->assign("creatable", TRUE);
+                        return;
+                }
         }
 }
 
-// A user must be in the html group in order to edit pages in this component
-$permission = "html";
-
-
-// If we've been asked to save changes and have permission to do so...
-if (@$_REQUEST['action']=="Save" && $session->groups[$permission]) {
-        file_put_contents($myfile, $_REQUEST['body'], LOCK_EX);
+// If we've got edit permission...
+if (isset($session->groups[$permission])) {
+        switch (@$_REQUEST['action']) {
+        case "Save":
+                // ...save the file
+                file_put_contents($myfile, $_REQUEST['body'], LOCK_EX);
+                // probably need some error-handling here...
+                break;
+        case "Delete":
+                $deleted = unlink($myfile);
+                break;
+        }
 }
 
-if (isset($pathlist[2]))
-        $title = $pathlist[2];
-elseif (isset($pathlist[1]))
-        $title = $pathlist[1];
-else
-        $title = "Static Page Producer";
+$title = end($pathlist);
 
-$body = file_get_contents($myfile);
-$modified = filectime($myfile);
+if (file_exists($myfile)) {
+        $body = file_get_contents($myfile);
+        $modified = date("r", filectime($myfile));
+}
 
 $smarty->assign("title", $title);
-$smarty->assign("modified", date("r", $modified));
-
 
 // Editing static pages - does the user have permission?
 if (isset($session->groups[$permission])) {
 // display Edit link on page
-        $smarty->assign("editable", true);
+        $smarty->assign("editable", TRUE);
 // load the editing template
-        if (@$_REQUEST['action']=="edit") {
+        switch (@$_REQUEST['action']) {
+        case "create":
+                if (!file_exists($myfile)) file_put_contents($myfile, "Page under construction\n", LOCK_EX);
+        case "edit":
                 $smarty->assign("editcontent", htmlentities($body));
                 $body = $smarty->fetch('static_edit.tpl');
-                $smarty->assign("action", $_REQUEST['action']);
+                $smarty->assign("action", "edit");
+                $modified = NULL;
+                break;
+        case "delete-query":
+                $body = $smarty->fetch('static_delete.tpl').$body;
+                break;
+        case "Delete":
+                if ($deleted) $body = "File deleted";
+                break;
         }
 }
 
 $smarty->assign("body", $body);
-
+$smarty->assign("modified", @$modified);
 ?>

htdocs/css/sucs.css

@@ -367 +367 @@
 
 /* --------------------------------------------------
+    Dialog box
+   -------------------------------------------------- */
+
+.dialog {
+        text-align: center;
+        margin: auto;
+        width: 20em;
+}
+
+/* --------------------------------------------------
     Tables
    -------------------------------------------------- */
@@ -389 +399 @@
         text-align: right;
 }
+
+#edit ul {
+        margin: 0;
+}
+
+#edit li {
+        display: inline;
+        float: right;
+        padding-left: 1em;
+}

htdocs/index.php

@@ -1 +1 @@
 <?php
+// Display execution time?
+//$displaytime = TRUE;
 
 // start the clock (this is just temporary cause I'm interested in how long all this takes)
-$time = microtime();
-$time = explode(' ', $time);
-$time = $time[1] + $time[0];
-$begintime = $time;
+if (@$displaytime) {
+        $time = microtime();
+        $time = explode(' ', $time);
+        $time = $time[1] + $time[0];
+        $begintime = $time;
+}
 
 /* --------------------------------------------------------
@@ -45 +49 @@
 $compdebug = TRUE;
 
-// Display execution time?
-$displaytime = false;
 
 /* --------------------------------------------------------
@@ -136 +138 @@
 
 // Last chance to stop the clock and still end up with valid HTML
-$time = microtime();
-$time = explode(" ", $time);
-$time = $time[1] + $time[0];
-$endtime = $time;
-$totaltime = ($endtime - $begintime);
-if ($displaytime) $smarty->assign("totaltime", $totaltime);
+if (@$displaytime) {
+        $time = microtime();
+        $time = explode(" ", $time);
+        $time = $time[1] + $time[0];
+        $endtime = $time;
+        $totaltime = ($endtime - $begintime);
+        $smarty->assign("totaltime", $totaltime);
+}
 
 $smarty->display("foot".$language['file'].".tpl");

static/About.txt

@@ -18 +18 @@
 <li>Mail list hosting</li>
 <li><a href="/Help/Advisory">Programming Advisory service</a></li>
-<li><a href="/Services/Library">Reference Library</a> of popular books (including Computer Science recommended course texts)</li>
-<li>24hr access to our own <a href="/Services/Room">Computer Room</a><br />
+<li><a href="/Knowledge/Library">Reference Library</a> of popular books (including Computer Science recommended course texts)</li>
+<li>24hr access to our own <a href="/About/Room">Computer Room</a><br />
 Features include:
 <ul>

templates/index.tpl

@@ -13 +13 @@
 {$body}
 
+{if $creatable}
+<p>You can <a href="?action=create">create</a> this page though.</p>
+{/if}
+
 {if $modified}
 <div id="edit">
 {if $editable}
-<a href="?action=edit">Edit</a><br />
+<ul>
+<li><a href="?action=delete-query">Delete</a></li>
+<li><a href="?action=edit">Edit</a></li>
+</ul>
+<div class="clear"></div>
 {/if}
 Page last modified {$modified}

templates/library.tpl

@@ -6 +6 @@
 <h3>Random Books</h3>
         {foreach name=randoms from=$randoms item=randomitem}
-        <a href="/Services/Library/{$randomitem.id}"><img src="{$randomitem.image_url}" alt="{$randomitem.title}" height="120" /></a>
+        <a href="/Knowledge/Library/{$randomitem.id}"><img src="{$randomitem.image_url}" alt="{$randomitem.title}" height="120" /></a>
         {/foreach}
 
@@ -27 +27 @@
         <ul>
         {foreach name=results from=$results item=result}
-<li><a href="/Services/Library/{$result.id}">{$result.title}</a>{if $result.onloan} <em>(on loan)</em>{/if} </li>
+<li><a href="/Knowledge/Library/{$result.id}">{$result.title}</a>{if $result.onloan} <em>(on loan)</em>{/if} </li>
         {/foreach}
         </ul>