Changeset 2

Timestamp:

10/17/07 22:27:05 (1 year ago)

Author:

aquarion

Message:

--

Files:

• trunk/chapters/article.inc.php (modified) (1 diff)
• trunk/chapters/frontpage.inc.php (modified) (5 diffs)
• trunk/chapters/gallery.inc.php (modified) (5 diffs)
• trunk/chapters/journal.inc.php (modified) (2 diffs)
• trunk/chapters/showcode.inc.php (modified) (1 diff)
• trunk/classes/html.class.php (modified) (16 diffs)
• trunk/epistula.php (modified) (10 diffs)
• trunk/include/library.php (modified) (9 diffs)

trunk/chapters/article.inc.php

@@ -54 +54 @@
-                        $page->content .= $return[1];
-                        $page->localnav .= $page->subheading($_EP['nameforQV']).getQV($page,$return[0],"article");
-
+
+
-                } else {
-                        $page->status = 404;

trunk/chapters/frontpage.inc.php

@@ -14 +14 @@
-$page->title = $_EP['tagline'];
-
-$wanted[1]
+isset($wanted[1])
-        $page->status = 404;
-} else {
@@ -143 +143 @@
-//**********************************
-
-
+//
-#$page->pagenav .= $page->ulink("/meta/blink.esf", $page->image("assets/images/buttons/esf.gif", "[ESF Icon]"), "Aquarionics Blink ESF Feed");
-
@@ -161 +161 @@
-#$page->pagenav .= "<div class=\"columnheader\">".$page->image("/assets/aq10/images/twhs.png", "Those who have spoken")."</div>\n";
-
-/*$page->pagenav .= "<h2 class=\"columnheader\">Comments</h2>\n";
-
-$entries = array();
-$comments = array();
@@ -171 +169 @@
-
-foreach ($items as $item){
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/* Now Listening To */
@@ -301 +309 @@
-$type = array("journal","article","writing","gallery");
-$display = "full";
-
+
+
+
+
+
+
+
+
+
+
-
-#$page->content .= "<div class=\"columnheader\">".$page->image("/assets/aq10/images/twi.png", "That which is")."</div>\n";

trunk/chapters/gallery.inc.php

@@ -19 +19 @@
-
-$page->title = "Gallery";
+
-
-/*******************************************************************
@@ -47 +48 @@
-$results = safequery($query);
-
+
+
-if (mysql_num_rows($results) == 0) {
-                $page->content = "Gallery in existance failure error. The universe will self-destruct shortly.<br>".$query;
@@ -53 +56 @@
-} else {
-        $page->debug[] = "Found Gallery";
+
-        $gallery = mysql_fetch_assoc($results);
-        $page->title = $gallery['title'];
@@ -58 +62 @@
-
-        $fdir = $_EP['webdir']."/".$dir;
+
+        $page->localnav = pageShowAds($page->date,"", "gallery-".$gallery['id']);
+
-
-        $menu = array();
@@ -94 +101 @@
-        #$page->localnav .= byCat("gallery", "nodesc", "", "title");
-
+        
+
-        if ($wanted[2] == "") {
-

trunk/chapters/journal.inc.php

@@ -56 +56 @@
-                        $page->content .= $return[1];
-                        $page->localnav .= $page->subheading($_EP['nameforQV']).getQV($page,$return[0],"journal");
-                        $page->localnav .= pageShowAds($page->date,"3821646156");
-                } else {
-                        $page->status=404;
@@ -82 +81 @@
-                        ."and title = \"".ep_decode($wanted[4])."\" ";
-                        $return = showItem($page,$qex,"journal",$display);
+
-                        if ($return){
-                                $page->content .= $return[1];
-                                $page->localnav .= $page->subheading($_EP['nameforQV']).getQV($page,$return[0],"journal");
-
+
+
-                        } else {
-                                        $page->status=404;

trunk/chapters/showcode.inc.php

@@ -24 +24 @@
-array_shift($wanted);
-
-
+
+
+
-        $srcfile = "chapters/".$wanted[1];
-} elseif ($wanted[0] == "include"){

trunk/classes/html.class.php

@@ -85 +85 @@
-<link rel="stylesheet" type="text/css" href="http://www.aquarionics.com/assets/aq9/basic.css">
-<link rel="stylesheet" type="text/css" media="print" href="http://www.aquarionics.com/assets/aq9/print.css">
+<script src="/assets/yui/build/yahoo/yahoo.js"></script> 
+<script src="/assets/yui/build/connection/connection.js"></script> 
+
+<script src="/assets/yui/build/event/event.js"></script> 
+
+<script type="text/javascript">
+var TwitterHandleSuccess = function(o){
+        if(o.responseText !== undefined){
+
+                textElements = o.responseXML.getElementsByTagName("text");
+
+
+                if (textElements.length == 0){
+                        document.getElementById('twitterQuote').innerHTML = "Unable to talk to Twitter :-(";
+                }
+                
+
+                desc = textElements[0].textContent;
+                time = o.responseXML.getElementsByTagName("created_at")[0].firstChild.data;
+                //div.innerHTML
+                if(desc){
+                        document.getElementById('twitterQuote').innerHTML = desc;
+                        document.getElementById('twitterTime').innerHTML = time;
+                } else {
+                        
+                }
+        }
+}
+
+var handleFailure = function(o){
+        alert("FAIL!");
+}
+var twitterCB =
+{
+  success:TwitterHandleSuccess,
+  failure:handleFailure,
+  argument: { foo:"foo", bar:"bar" }
+};
+function doTwitter(){
+        var sUrl = "/assets/ajax/twitter.php";
+        var request = YAHOO.util.Connect.asyncRequest('GET', sUrl, twitterCB);
+}
+YAHOO.util.Event.onAvailable ('twitter',doTwitter);
+
+</script>
+
-<link rel="SHORTCUT ICON" href="http://www.aquarionics.com/assets/aq9/favicon.png">
-<style type="text/css">
@@ -94 +140 @@
-                $files = array (
-                        //"header",
+                        date("Y",$this->date)."/header",
+                        date("Y\/F",$this->date),
+                        date("Y\/\w\kW",$this->date),
+                        date("Y\/m\-d",$this->date),
-                        date("Y")."/header",
-                        date("Y\/F"),
-                        date("Y\/\w\kW"),
-                        date("Y\/m\-d"),
-                        date("Y",$this->date)."/header",
-                        date("Y\/F",$this->date),
-                        date("Y\/\w\kW",$this->date),
-                        date("Y\/m\-d",$this->date),
-                        "end",
-                );
@@ -114 +160 @@
-
-                        if (file_exists($_EP['webdir']."/assets/aq13/headers/".$test.".jpg")){
-
+reflector/gd.php?http://www.aquarionics.com/assets/
-
-                        } elseif (file_exists($_EP['webdir']."/assets/aq10/headers/".$test.".jpg")){
-
+reflector/gd.php?http://www.aquarionics.com/assets/
-
-                        }
@@ -183 +229 @@
-                }
-
+// Recent Journal Entries
+if (function_exists("getIndex")){ // Static pages like Projects fail this
+        $thoughts = getIndex("journal",'full',5);
+        $thoughtslist = array();
+        foreach($thoughts as $thought){
+                $thoughtslist[] = '<a href="'.getpermalink('journal', $thought['id'], $thought).'">'.$thought['title'].'</a>';
+        }
+        $thoughts = $this->buildlist($thoughtslist, false, "recent journal");
+}
+
+if (function_exists("getIndex")){ // Static pages like Projects fail this
+        $articles = getIndex("article",'full',5);
+        $articleslist = array();
+        foreach($articles as $article){
+                $articleslist[] = '<a href="'.getpermalink('article', $article['id'], $article).'">'.$article['title'].'</a>';
+        }
+        $articles = $this->buildlist($articleslist, false, "recent article");
+}
+// Recent Pictures
+
+$file = "http://www.aquarionics.com/assets/ajax/flickr.php";
+$doc = new DOMDocument();
+
+
+$loaded = $doc->load($file);
+
+$photosTable = "<table><tr>";
+
+
+
+if($loaded){
+        $maxPhotos = 6;
+
+        $photos = $doc->getElementsByTagName("photo");
+
+        $photosList = array();
+
+        $photoCount = 0;
+        foreach($photos as $photo){
+                $pageNodes =  $photo->getElementsByTagName("page");
+                $node = $pageNodes->item(0);
+                $href = $node->textContent;
+
+
+                $pageNodes =  $photo->getElementsByTagName("image");
+                $node = $pageNodes->item(0);
+                $image = $node->textContent;
+
+                $photosList[] = '<a href="'.$href.'"><img src="/assets/reflector/gd.php?'.$image.'" /></a>';
+                //$photosTable .= '<td><a href="'.$href.'"><img src="'.$image.'" /></a></td>';
+
+                $photoCount++;
+                if ($photoCount >= $maxPhotos){
+                        break;
+                } elseif ($photoCount /2 == floor($photoCount/2)) {
+                        $photosTable .= "</tr>\n<tr>";
+                }
+        }
+} else {
+        $photosList = array();
+}
+
+$photosTable .= "</tr></table>";
+$photos = $this->buildlist($photosList, false, 'recent gallery');
+
-$out .= <<<EOW
-
@@ -194 +305 @@
-</div>
-<ul id="menu">
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-</ul>
-
@@ -203 +321 @@
-EOW;
-
-
+
+
+
+
-
-
@@ -260 +381 @@
-
-<div class="toolbox">
-6 inclusive <a href="http://www.gkhs.net/Nicholas/
+7 inclusive <a href="http://www.NicholasAvenell.com
-</div>
-<div class="toolbox">
@@ -342 +463 @@
-        
-<div id="content">
-http://www.flickr.com/photos/aquarion
+/newgallery
-
-
@@ -493 +614 @@
-                $out = "";
-
-
-
+
+
+
+
+
-                $out .= "<ul".$ulclass.$ulid.">\n";
-                if (is_array($items)){
@@ -830 +954 @@
-                                                )
-                                        );
+                        if (!empty($comment['email'])){
+                                $links[] = array(
+                                        'link'  => "/comment/email/".md5($comment['email'].$_SECRET['hashSecret']),
+                                        'name'  => "More by this person",
+                                        'title' => "More comments from this given email address"
+                                );
+                        }
-                        if(allowsComments($item[0], $item[1])){
-                                $links[] =
@@ -845 +976 @@
-                ."&amp;rating=R"
-                ."&amp;size=80"
-
-
-
+
+
+
+
+
-<div class="address">
-<div class="postmark">';
@@ -874 +1007 @@
-        '.$actions.'
-</div>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                return $out;
@@ -961 +1109 @@
-                }
-
-                if ($array['update_epoch'] != $array['epoch'] && $array['update_epoch'] != 0){
-                        $out .= "<div class=\"lastmodified\">Last Modified: ".date("Y-m-d\TH:i",$array['update_epoch']);
-                }
-
-
@@ -989 +1134 @@
-
-                        . "\t<ul class=\"pipe\">\n"
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        if ($array['location']){
-                                $out .= "<li>From ".$array['location']."</li>\n";
@@ -1023 +1176 @@
-//                      }
-//              }
+                $return .= "</div>";
-                if ($array['display'] != "readmore" && $array['display'] != "brief"){
-                        $comments = getComments($page, $type."-".$array['id']);
@@ -1030 +1184 @@
-                        }
-                }
-                $return .= "</div>";
-
-

trunk/epistula.php

@@ -82 +82 @@
-
-
-$_GET['nocache'] || $_GET['regen']
+isset($_GET['nocache']) || isset($_GET['regen'])
-        $caching = false; 
-        $_EP['caching'] = false;
@@ -102 +102 @@
-header("X-Pingback: ".$_EP['url']."/xmlrpc");
-
-HTTP_SERVER_VARS
+_SERVER
-        $compress = true;
-} else {
@@ -121 +121 @@
-
-$keyboom = explode(".",$parsedURL['path']);
-$keyboom[1]
+isset($keyboom[1])
-        header("Content-Type: ".$filetypes[$keyboom[1]]);
-}
@@ -149 +149 @@
-                header("HTTP/1.1 304 Not Modified");
-        } elseif ($compress){
+                        //die(finfo_file($_EP['cachedir']."/".$cachename));
-                        header("X-Compression: gzip");
-                        header("Content-Encoding: gzip");
@@ -242 +243 @@
-
-if ($_SERVER['QUERY_STRING'] != ""){
-HTTP_SERVER_VARS
+_SERVER
-        $querypos = strpos($_SERVER['REQUEST_URI'], "?");
-        $wanted = explode("/",substr($wanted, 0 , $querypos));
@@ -296 +297 @@
-        array($wanted[0], "^rss", "/meta/all.rss"),
-        array($wanted[0], "^favicon\.ico", "/assets/aq9/favicon.png"),
-?
+
-        array($query[0], "^name=(.*)", "/article/name/[[1]]"),
-        array($query[0], "^node=(.*)", "/article/id/[[1]]"),
@@ -312 +313 @@
-
-function doRedirects($redirects){
+        global $_EP;
+
-        global $page;
-        $found = false;
@@ -362 +365 @@
-doRedirects($forceRedirects);
-
-$override
+isset($override) && !empty($override)
-        require("chapters/".$override.".inc.php");
-        $_EP['chapter'] = $override.".inc.php";
@@ -373 +376 @@
-        $page->debug[] = $db;
-        $_EP['chapter'] = "";
-$forward
+isset($forward)
-        // We're golden.
-
@@ -402 +405 @@
-
-} else {
-
+
+
+
+
-                $page->debug[] = array(0, "Wanted-0 (".$wanted[0].") Unrecognised");
-                $page->status = 404;

trunk/include/library.php

@@ -681 +681 @@
-function buildIndex($type,$display,$limit, $queryextras="", $order = "desc"){
-        global $page;
+
+
-        $items = getIndex($type,$display,$limit, $queryextras, $order);
-        $index = array();
@@ -697 +699 @@
-                } elseif ($group != $date){
-                        $group = $date;
-
-
-                        if ($array['display'] != "single"){
-                                $epoch = strtotime($group);
-
-                                $blinks = getBlinkIndex(false, $epoch, $epoch + 86400);
-                                if (is_array($blinks)){
-                                        $groupOut .= "<div class=\"blinks\">"."<h3>That which is also for ".$group."</h3>";
-                                        $links = array();
-                                        foreach ($blinks as $row) {
-                                                $linkText = $page->ulink(htmlentities($row['link']), $row['title'], $row['content']);
-                                                if ($row['content']){
-                                                        $linkText .=  " (".htmlentities($row['content']).")";
-                                                }
-                                                if ($row['referrer']){
-                                                        $linkText .=  " [".$page->ulink(htmlentities($row['referrer']), "via")."]";
-                                                }
-                                                $links[] = $linkText;
-                                }
-
-                                $groupOut .= $page->buildlist($links,false,"plainlist blinks");
-                                
-                                $groupOut .= "</div>";
-
-                                }
-                        }
-
-                        $output .= $groupOut;
@@ -1065 +1041 @@
-
-function ep_decode($in){
+        $in = urldecode($in);
-        $translate = array ("_" => " ", "[and]" => "&", "[No.]" => "#");
-        return strtr($in, $translate);
@@ -1142 +1119 @@
-        global $urls;
-
-$urls[$item."-".$id]
+isset($urls[$item."-".$id])
-                return $urls[$item."-".$id];
-        }
@@ -1343 +1320 @@
-        $count = 0;
-        $return = array();
+
+
+        if(!is_array($type)){
+                $type = array($type);
+        }
-
-        $dateformat = "%W, %M %D %Y"; // Date format for diary entry display
@@ -1852 +1834 @@
-function safequery($q, $panic=true, $database = false){
-        global $_EP;
+        if(!isset($_EP['sql'])){
+                $_EP['sql'] = 0;
+        }
-        $_EP['sql']++;
-
+//
-        if ($database){
-                $r =  mysql_query($q, $database);
@@ -2002 +1987 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
-
-        if ((time() - $time) > 7889231){// 3 months.  6 months - 15778463
@@ -2026 +2020 @@
-
-        $out .= "<a href=\"/journal/2004/02/12/Selling_Out\">Explain Ads</a>";
-
-
-
+
-        return $out;
-}
@@ -2368 +2360 @@
-        
-}
+
+function niceTime($from, $to = false, $shortform = false){
+
+        if (!$to){
+                $to = time();
+        }
+
+        if ($from > $to){
+                $since = $from - $to;
+        } else {
+                $since = $to - $from;
+        }
+
+        // 60 // minute
+        // 3600 = hour
+        // 86400 = day
+        // 604800 = week
+
+        if ($shortform){
+                $units = array ('sec','min','hr','day','wk','yr');
+        } else {
+                $units = array ('second','minute','hour','day','week','year');
+        }
+
+        if ($since < 60){
+                $date = $since;
+                $unit = $units[0];
+
+        } elseif ($since < 4000){
+                $date = round($since/60);
+                $unit = $units[1];
+
+        } elseif ($since < 82000){
+                $date = round($since/3600);
+                $unit = $units[2];
+
+        } elseif ($since < 603800){
+                $date = round($since/86400);
+                $unit = $units[3];
+                $plus = " on ".date("jS M");
+
+        } elseif ($since < 31440000){
+                $date = round($since/604800);
+                $unit = $units[4];
+
+        } else {
+                $date = round($since/(604800 * 52));
+                #$date = " over a year";
+                $unit = $units[5];
+        }
+
+        if ($date == 1 || $unit == ""){
+                $date = $date." ".$unit;
+        } else {
+                $date = $date." ".$unit."s";
+        }
+
+        if (!$shortform){
+                $date .= " ago".$plus;
+        }
+
+        #$date .= " (".$since.")";
+
+        return $date;
+}
+