summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/admin.inc2
-rw-r--r--includes/calendar.inc2
-rw-r--r--includes/config.inc16
-rw-r--r--includes/story.inc14
-rw-r--r--includes/template.inc4
5 files changed, 26 insertions, 12 deletions
diff --git a/includes/admin.inc b/includes/admin.inc
index 5f7d889ae..08c8642c4 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -34,7 +34,7 @@ function admin_header() {
admin_icon("accounts");
admin_icon("misc");
admin_icon("bans");
- admin_icon("logs");
+ admin_icon("watchdog");
admin_icon("stats");
admin_icon("info");
admin_icon("home");
diff --git a/includes/calendar.inc b/includes/calendar.inc
index 561363c33..3748c3699 100644
--- a/includes/calendar.inc
+++ b/includes/calendar.inc
@@ -1,6 +1,6 @@
<?
-class calendar {
+class Calendar {
var $date;
function calendar($date) {
diff --git a/includes/config.inc b/includes/config.inc
index c5fdffd8f..8a4b9b2d6 100644
--- a/includes/config.inc
+++ b/includes/config.inc
@@ -11,17 +11,17 @@
#$dbname = "droporg";
### http://beta.drop.org/:
-$dbhost = "zind.net";
-$dbuname = "dries";
-$dbpass = "Abc123";
-$dbname = "dries";
-
-### http://dione/:
-#$dbhost = "";
+#$dbhost = "zind.net";
#$dbuname = "dries";
-#$dbpass = "oakley";
+#$dbpass = "Abc123";
#$dbname = "dries";
+### http://dione/:
+$dbhost = "";
+$dbuname = "dries";
+$dbpass = "oakley";
+$dbname = "dries";
+
#
# Name of the site
#
diff --git a/includes/story.inc b/includes/story.inc
new file mode 100644
index 000000000..31deede65
--- /dev/null
+++ b/includes/story.inc
@@ -0,0 +1,14 @@
+<?
+
+class Story {
+ function story($userid, $subject, $abstract, $article, $category, $timestamp) {
+ $this->userid = $userid;
+ $this->subject = $subject;
+ $this->abstract = $abstract;
+ $this->article = $article;
+ $this->category = $category;
+ $this->timestamp = $timestamp;
+ }
+}
+
+?> \ No newline at end of file
diff --git a/includes/template.inc b/includes/template.inc
index 0190d4293..61d1d97db 100644
--- a/includes/template.inc
+++ b/includes/template.inc
@@ -12,7 +12,7 @@ function display_moderation_results($theme, $story) {
$output .= "<P>\n";
$output .= "<B>Other people voted:</B><BR>\n";
- $result = db_query("SELECT * FROM users WHERE history LIKE '%s$story->id%'");
+ $result = db_query("SELECT * FROM users WHERE id != $user->id AND history LIKE '%s$story->id%'");
while ($account = db_fetch_object($result)) {
$output .= "". format_username($account->userid) ." voted `". user_getHistory($account->history, "s$story->id") ."'.<BR>";
}
@@ -98,7 +98,7 @@ function display_new_headlines($theme, $num = 10) {
function display_calendar($theme, $date) {
include "includes/calendar.inc";
- $calendar = new calendar($date);
+ $calendar = new Calendar($date);
$theme->box("Browse archives", $calendar->display());
}