Changeset 205

Timestamp:

07/02/07 22:19:45 (2 years ago)

Author:

dez

Message:

Resolves conflict in blog.lib.php
Applies updates made to the live copy that weren't in SVN

Files:

• admin.lib.php (modified) (2 diffs)
• blog.lib.php (modified) (3 diffs)
• feed.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• miscfunctions.lib.php (modified) (1 diff)

admin.lib.php

@@ -46 +46 @@
-                $this->shortDateFormat = "Y-m-d";
-                $this->longDateFormat = "r";
-
-
+
+
+
-                if($this->httpPath[strlen($this->httpPath)-1]!="/") {
-                        $this->httpPath .= "/";
-                }
-                $this->adminPath = $this->httpPath."admin.php/";
-                $this->basePath = $this->httpPath."index.php/";
-                //if we are logged in start a blog instance, and setup the blog path
-                if ($this->userName) {
@@ -64 +63 @@
-        {
-                //set the session time out in seconds
-36
+108
-                //setup the session stuff
-                session_name("BlogSession");

blog.lib.php

@@ -4 +4 @@
- * blogs class - provides functions for blogs
- */
+
+// PHP Notices are fun, but we don't really want to see them right now
+error_reporting(E_ALL ^ E_NOTICE);
-
-// Initialise the database
@@ -98 +101 @@
-                                $this->longDateFormat = "%c";
-                                //set path for all http stuff.. ie images, css and so on
-dirname($_SERVER['SCRIPT_NAME'])
+"/blog/"
-                                //make the httpPath work nicely if we're not in a subdir
-
-
-
+//
+//
+//
-                                //path for the blog viewer with no user
-$this->httpPath."index.php
+"/blogs
-                                //path to this blog
-                                $this->blogPath = $this->basePath.$this->userName."/";
-                                //path to the admin bits
-.php
+
-                                $this->comment_moderation = ($sql[0]['moderate']=='t') ? TRUE : FALSE;
-                                $this->editor = ($sql[0]['editor']=='t') ? TRUE : FALSE;
@@ -742 +745 @@
-                $this->title = _("SUCS Blogs");
-                $this->description = _("Swansea University Computer Society member web logs");
-dirname($_SERVER['SCRIPT_NAME'])
-
-
-
-$this->httpPath."index.php
-.php
+"/blog/"
+//
+//
+//
+"/blogs
+
-                $this->cssFile = "blog.css";
-                $this->svnRevision = getSVNRevision();

feed.php

@@ -29 +29 @@
-        $user = $row;
-        if(substr(dirname($_SERVER['SCRIPT_NAME']), -1)=="/"){
-dirname($_SERVER['SCRIPT_NAME'])."index.php
-dirname($_SERVER['SCRIPT_NAME'])."feed.php
+"/blogs
+"/blog/feed
-        }
-        else {
-dirname($_SERVER['SCRIPT_NAME'])."/index.php
-dirname($_SERVER['SCRIPT_NAME'])."/feed.php
+"/blogs
+"/blog/feed
-        }
-}

index.php

@@ -3 +3 @@
-        include("blog.lib.php");
-        //make our command list
-PATH_INFO
+'PATH_INFO'
-        //if we have something which might be a username start a blogs instance
-        if($request[0] != "" and $request[0] != "list"){
@@ -24 +24 @@
-        //check we have a valid username before offering a RSS feed
-        if($blog->userName) {
-.php
-.php
+
+
-                echo "    <link rel=\"alternate\" type=\"application/rss+xml\" title=\"{$blog->title}\" href=\"$rss_url\"/>\n";
-                echo "    <link rel=\"alternate\" type=\"application/atom+xml\" title=\"{$blog->title}\" href=\"$atom_url\"/>\n";

miscfunctions.lib.php

@@ -81 +81 @@
-        }
-        //pull in list of two level tlds, make an array from them. from http://spamcheck.freeapp.net/two-level-tlds
-.
+/var/www/blog
-        foreach($twoLevelTLD as $TLD) {
-                $two_level_tlds[trim($TLD)] = true;