Changeset 127

Timestamp:

01/07/05 15:54:28 (4 years ago)

Author:

rollercow

Message:

$path changes..

admin points at admin.php
base points at index.php
blog points at index.php/username
http points at /

Files:

• admin.lib.php (modified) (8 diffs)
• blog.lib.php (modified) (10 diffs)
• index.php (modified) (1 diff)

admin.lib.php

@@ -25 +25 @@
-        var $httpPath;          //http Path for files
-        var $adminPath;         //path to admin
+        var $blogPath;          //path to blog for a specific user
+        var $basePath;          //path to the display blog bits
-        var $blog;              //[temporary] holder for instance of blog class
-                        
@@ -40 +42 @@
-                $this->httpPath = dirname($_SERVER['SCRIPT_NAME'])."/";
-                $this->adminPath = $this->httpPath."admin.php/";
+                $this->basePath = $this->httpPath."index.php/";
-                if ($this->userName) {
-                        $this->blog = new blogs($this->userName);
+                        $this->blogPath = $this->basePath.$this->userName."/";
-                }
-        }
@@ -144 +148 @@
-                echo "</a></li>\n";
-                if ($this->userName) {
-httpPath."index.php/".$this->userName."\">"._("My blog")."</a></li>\n"; //index.php will need removing when we fix that
+blogPath."\">"._("My blog")."</a></li>\n";
-                }
-                echo "</ul>\n";
@@ -453 +457 @@
-                echo "<div class=\"entry\">\n";
-                echo "<h2>"._("Blog Settings")."</h2>\n";
-blog
+admin
-                echo "<p>\n";
-                echo "<input type=\"text\" name=\"name\" id=\"name\" value=\"" . $settings[name] . "\" size=\"30\" maxlength=\"60\" tabindex=\"1\" />\n";
@@ -509 +513 @@
-                while($r = db_getrow($result)) {
-                        echo "\t<tr>\n";
-httpPath}index.php/{$this->userName}/
+blogPath}
-                        echo "\t\t<td><a href=\"mailto:{$r['email']}\" title=\"IP: {$r['host']}\">{$r['name']}</a></td>\n";
-                        echo "\t\t<td>{$r['body']}</td>\n";
@@ -563 +567 @@
-                        if(count($_POST['comment'])==0){
-                                error(5, _("No comments selected for deletion."));
-->blog
+
-                        } else {
-                                $del = "(";
@@ -575 +579 @@
-                                } else {
-                                        echo "<div class=\"updateinfo\">".count($_POST['comment'])._(" comment(s) deleted.")."</div>\n";
-->blog
+
-                                }
-                        }
@@ -825 +829 @@
-                }
-                echo "<h2>"._("Add User")."</h2>\n";
-blog
+admin
-                echo "<p>\n";
-                echo "<input type=\"text\" name=\"username\" id=\"username\" value=\"" . (($this->inputError != "") ? strip_tags(trim($_POST['username'])) : "") . "\" size=\"22\" maxlength=\"50\" tabindex=\"1\" />\n";

blog.lib.php

@@ -37 +37 @@
-        var $httpPath;          //http Path for files
-        var $blogPath;          //path to blog
+        var $basePath;          //path to the display blog bits
+        var $adminPath;         //path to blog admin page
-        var $commentError;      //new comment errors
-        var $entryError;        //new entry errors
@@ -64 +66 @@
-                        $this->shortDateFormat = "%x %X";
-                        $this->longDateFormat = "%c";
+                        //path for all http stuff.. ie images, css and so on
-                        $this->httpPath = dirname($_SERVER['SCRIPT_NAME'])."/";
-
+
+
+
+
+
+
-                        $this->commentError = '';
-                        $this->entryError = '';
@@ -100 +108 @@
-                echo " | Cat: <a href=\"".$this->blogPath."category/{$row['category']}\">".$this->categoryName($row['category'])."</a> ";
-                if($this->checkSessionOwner()){
-httpPath."admin.php/
-httpPath."admin.php/
+adminPath."
+adminPath."
-                }
-                echo " ]</p>\n";
@@ -196 +204 @@
-                        $blogOwner = $this->checkSessionOwner();
-                        if($blogOwner) {
-httpPath}admin.php/
+adminPath}
-                        }
-                        echo "<div id=\"comments\">\n";
@@ -423 +431 @@
-                echo "<li><a href=\"{$this->blogPath}\">"._("Blog Home")."</a></li>\n";
-                echo "<li><a href=\"{$this->blogPath}archive/\">"._("Archive")."</a></li>\n";
-
+
+
-                if ($this->checkSessionOwner()){
-httpPath}admin.php
+adminPath}
-                } elseif (!isset($_SESSION['userName'])) {
-httpPath}admin.php
+adminPath}
-                }
-                echo "</ul>\n";
@@ -455 +464 @@
-        var $description;
-        var $httpPath;
+        var $listPath;
+        var $adminPath;
-        var $cssFile;
-
@@ -463 +474 @@
-                $this->description = _("Swansea University Computer Society member web logs");
-                $this->httpPath = dirname($_SERVER['SCRIPT_NAME'])."/";
+                $this->basePath = $this->httpPath."index.php/";
+                $this->adminPath = $this->httpPath."admin.php/";
-                $this->cssFile = "blog.css";
-        }
@@ -469 +482 @@
-        function listBlogs()
-        {
-                $baseurl = "http://".$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']."/";
-                $sql = db_query("SELECT max(entries.timestamp) AS ts, users.username, users.description, users.name, users.title FROM entries LEFT JOIN users ON entries.user_id = users.id GROUP BY users.username, users.name, users.title, users.description ORDER BY ts DESC;");
-                $sqlNum = db_num_rows($sql);
@@ -483 +495 @@
-                                echo "<tr>\n";
-                                echo "    <td>".$row['name']."</td>\n";
-baseurl
+this->basePath
-                                echo "    <td>".$this->timeDiff(strtotime($row['ts']))." ago</td>\n";
-                                echo "</tr>\n";
@@ -529 +541 @@
-        function menu() {
-                echo "<ul class=\"side-menu\">\n";
-httpPath}admin.php
+adminPath}
-                echo "</ul>\n";
-        }

index.php

@@ -2 +2 @@
-        include("blog.lib.php");
-        $request=explode('/',substr($_SERVER[PATH_INFO], 1));
-    
-    
-    
-
-
-    
+       
+       
+       
+       
+       
+       
-        ob_start();
-?>