summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/affiliate-site.module106
-rw-r--r--modules/drupal-site.module94
-rw-r--r--modules/rating.module18
-rw-r--r--modules/watchdog.module4
-rw-r--r--modules/watchdog/watchdog.module4
5 files changed, 17 insertions, 209 deletions
diff --git a/modules/affiliate-site.module b/modules/affiliate-site.module
deleted file mode 100644
index 1f004d11c..000000000
--- a/modules/affiliate-site.module
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-$module = array("help" => "affiliate_help",
- "block" => "affiliate_block",
- "admin" => "affiliate_admin");
-
-function affiliate_help() {
- ?>
- <P>This is a small module to manage related and/or affiliate sites. The module exports two different blocks with links to the affiliate sites.</P>
- <?php
-}
-
-function affiliate_block() {
- global $site_url;
-
- $result = db_query("SELECT * FROM affiliates ORDER BY name");
-
- $content .= "<SCRIPT>\n";
- $content .= " <!--//\n";
- $content .= " function gotosite(site) {\n";
- $content .= " if (site != \"\") {\n";
- $content .= " parent.location = site\n";
- $content .= " }\n";
- $content .= " }\n";
- $content .= " //-->\n";
- $content .= "</SCRIPT>\n";
-
- $content .= "<CENTER>\n";
- $content .= "<FORM ACTION=\"\" METHOD=\"post\">\n";
- $content .= " <SELECT NAME=\"affiliate\" ONCHANGE=\"gotosite(this.options[this.selectedIndex].value)\">\n";
- $content .= " <OPTION VALUE=\"$site_url\">select a site</OPTION>\n";
- while ($affiliate = db_fetch_object($result)) {
- $content .= " <OPTION VALUE=\"$affiliate->link\">$affiliate->name</OPTION>\n";
- }
-
- $content .= " </SELECT>\n";
- $content .= "</FORM>\n";
- $content .= "</CENTER>\n";
-
- $blocks[0]["subject"] = "Affiliate sites";
- $blocks[0]["content"] = $content;
- $blocks[0]["info"] = "Affiliate sites (selection)";
-
- unset($content);
-
- $result = db_query("SELECT * FROM affiliates ORDER BY name");
- while ($affiliate = db_fetch_object($result)) {
- $content .= "<LI><A HREF=\"$affiliate->link\">$affiliate->name</A></LI>\n";
- }
-
- $blocks[1]["subject"] = "Affiliate sites";
- $blocks[1]["content"] = $content;
- $blocks[1]["info"] = "Affiliate sites (sequential)";
-
- return $blocks;
-}
-
-function affiliate_admin_add($name, $url, $contact) {
- db_query("INSERT INTO affiliates (name, link, contact) VALUES ('". check_input($name) ."', '". check_input($url) ."', '". check_input($contact) ."')");
-}
-
-function affiliate_admin_del($id) {
- db_query("DELETE FROM affiliates WHERE id = '$id'");
-}
-
-function affiliate_admin_display() {
- $result = db_query("SELECT * FROM affiliates ORDER BY name");
-
- $output .= "<FORM ACTION=\"admin.php?mod=affiliate-site\" METHOD=\"post\">\n";
- $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
- $output .= " <TR><TH>name</TH><TH>link</TH><TH>contact</TH><TH>operations</TH></TR>\n";
-
- while ($affiliate = db_fetch_object($result)) {
- $output .= " <TR><TD>". check_output($affiliate->name) ."</TD><TD>". format_url($affiliate->link) ."</TD><TD>". format_email($affiliate->contact) ."</TD><TD ALIGN=\"center\"><A HREF=\"admin.php?mod=affiliate-site&op=delete&id=$affiliate->id\">delete</A></TD></TR>\n";
- }
-
- $output .= " <TR><TD><INPUT TYPE=\"text\" NAME=\"name\"></TD><TD><INPUT TYPE=\"text\" NAME=\"url\"></TD><TD><INPUT TYPE=\"text\" NAME=\"contact\"></TD><TD><INPUT NAME=\"op\" TYPE=\"submit\" VALUE=\"Add affiliate site\"></TD></TR>\n";
- $output .= "</TABLE>\n";
- $output .= "</FORM>\n";
-
- print $output;
-}
-
-function affiliate_admin() {
- global $op, $id, $name, $url, $contact;
-
- print "<SMALL><A HREF=\"admin.php?mod=affiliate-site\">overview</A> | <A HREF=\"admin.php?mod=affiliate-site&op=help\">help</A></SMALL><HR>\n";
-
- switch($op) {
- case "Add affiliate site":
- affiliate_admin_add($name, $url, $contact);
- affiliate_admin_display();
- break;
- case "delete":
- affiliate_admin_del($id);
- affiliate_admin_display();
- break;
- case "help":
- affiliate_help();
- break;
- default:
- affiliate_admin_display();
- }
-}
-
-?> \ No newline at end of file
diff --git a/modules/drupal-site.module b/modules/drupal-site.module
deleted file mode 100644
index d4742b681..000000000
--- a/modules/drupal-site.module
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-$module = array("block" => "drupal_block",
- "admin" => "drupal_admin");
-
-function drupal_block() {
- global $site_url;
-
- $result = db_query("SELECT * FROM drupals ORDER BY name");
-
- $content .= "<SCRIPT>\n";
- $content .= " <!--//\n";
- $content .= " function gotosite(site) {\n";
- $content .= " if (site != \"\") {\n";
- $content .= " parent.location = site\n";
- $content .= " }\n";
- $content .= " }\n";
- $content .= " //-->\n";
- $content .= "</SCRIPT>\n";
-
- $content .= "<CENTER>\n";
- $content .= "<FORM ACTION=\"\" METHOD=\"post\">\n";
- $content .= " <SELECT NAME=\"drupal\" ONCHANGE=\"gotosite(this.options[this.selectedIndex].value)\">\n";
- $content .= " <OPTION VALUE=\"$site_url\">select a site</OPTION>\n";
- while ($drupal = db_fetch_object($result)) {
- $content .= " <OPTION VALUE=\"$drupal->link\">$drupal->name</OPTION>\n";
- }
-
- $content .= " </SELECT>\n";
- $content .= "</FORM>\n";
- $content .= "</CENTER>\n";
-
- $blocks[0]["subject"] = "Drupal sites";
- $blocks[0]["content"] = $content;
- $blocks[0]["info"] = "Drupal sites (selection)";
-
- unset($content);
-
- $result = db_query("SELECT * FROM drupals ORDER BY name");
- while ($drupal = db_fetch_object($result)) {
- $content .= "<LI><A HREF=\"$drupal->link\">$drupal->name</A></LI>\n";
- }
-
- $blocks[1]["subject"] = "Drupal sites";
- $blocks[1]["content"] = $content;
- $blocks[1]["info"] = "Drupal sites (sequential)";
-
- return $blocks;
-}
-
-function drupal_admin_add($name, $url, $contact) {
- db_query("INSERT INTO drupals (name, link, contact) VALUES ('". check_input($name) ."', '". check_input($url) ."', '". check_input($contact) ."')");
-}
-
-function drupal_admin_del($id) {
- db_query("DELETE FROM drupals WHERE id = '$id'");
-}
-
-function drupal_admin_display() {
- $result = db_query("SELECT * FROM drupals ORDER BY name");
-
- $output .= "<FORM ACTION=\"admin.php?mod=drupal-site\" METHOD=\"post\">\n";
- $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
- $output .= " <TR><TH>name</TH><TH>link</TH><TH>contact</TH><TH>operations</TH></TR>\n";
-
- while ($drupal = db_fetch_object($result)) {
- $output .= " <TR><TD>$drupal->name</TD><TD>". format_url($drupal->link) ."</TD><TD>". format_email($drupal->contact) ."</TD><TD ALIGN=\"center\"><A HREF=\"admin.php?mod=drupal-site&op=delete&id=$drupal->id\">delete</A></TD></TR>\n";
- }
-
- $output .= " <TR><TD><INPUT TYPE=\"text\" NAME=\"name\"></TD><TD><INPUT TYPE=\"text\" NAME=\"url\"></TD><TD><INPUT TYPE=\"text\" NAME=\"contact\"></TD><TD><INPUT NAME=\"op\" TYPE=\"submit\" VALUE=\"Add drupal site\"></TD></TR>\n";
- $output .= "</TABLE>\n";
- $output .= "</FORM>\n";
-
- print $output;
-}
-
-function drupal_admin() {
- global $op, $id, $name, $url, $contact;
-
- switch($op) {
- case "Add drupal site":
- drupal_admin_add($name, $url, $contact);
- drupal_admin_display();
- break;
- case "delete":
- drupal_admin_del($id);
- drupal_admin_display();
- break;
- default:
- drupal_admin_display();
- }
-}
-
-?> \ No newline at end of file
diff --git a/modules/rating.module b/modules/rating.module
index 0330422f4..c5e665592 100644
--- a/modules/rating.module
+++ b/modules/rating.module
@@ -6,10 +6,17 @@ $module = array("cron" => "rating_cron",
"block" => "rating_block");
function rating_cron() {
- $result = db_query("SELECT id FROM users");
-
- while ($account = db_fetch_object($result)) {
+ $r1 = db_query("SELECT id FROM users ORDER BY rating DESC");
+ while ($account = db_fetch_object($r1)) {
db_query("UPDATE users SET rating = '". user_gravity($account->id) ."' WHERE id = '$account->id'");
+ $rating[$account->id] = ++$i;
+ }
+
+ db_query("DELETE FROM rating");
+
+ $r2 = db_query("SELECT id FROM users ORDER BY rating DESC");
+ while ($account = db_fetch_object($r2)) {
+ db_query("INSERT INTO rating (user, new, old) VALUES ('$account->id', '". ++$j ."', '". $rating[$account->id] ."')");
}
}
@@ -20,11 +27,12 @@ function rating_help() {
}
function rating_list($limit) {
- $result = db_query("SELECT userid, rating FROM users ORDER BY rating DESC LIMIT $limit");
+ $result = db_query("SELECT u.userid, u.rating, r.* FROM users u LEFT JOIN rating r ON u.id = r.user ORDER BY u.rating DESC LIMIT $limit");
$output .= "<TABLE CELLPADDING=\"1\" CELLSPACING=\"1\">\n";
while ($account = db_fetch_object($result)) {
- $output .= "<TR><TD ALIGN=\"right\">". ++$i ."</TD><TD>". format_username($account->userid) ."</TD><TD>". check_output($account->rating) ."</TD></TR>";
+ $ranking = $account->old - $account->new;
+ $output .= "<TR><TD ALIGN=\"right\">". ++$i ."</TD><TD>". format_username($account->userid) ."</TD><TD ALIGN=\"right\">". check_output($account->rating) ."</TD><TD>(". ($ranking < 0 ? "" : "+") ."$ranking)</TD></TR>";
}
$output .= "</TABLE>\n";
return $output;
diff --git a/modules/watchdog.module b/modules/watchdog.module
index 18279db1b..23e803e62 100644
--- a/modules/watchdog.module
+++ b/modules/watchdog.module
@@ -15,10 +15,10 @@ function watchdog_cron() {
db_query("DELETE FROM watchdog WHERE ". time() ." - timestamp > ". variable_get(watchdog_clear, "302400"));
}
-function watchdog_overview($order = "date") {
+function watchdog_overview() {
$colors = array(message => "#FFFFFF", special => "#836FFF", warning => "#FFAA22", error => "#EE2C2C");
- $result = db_query("SELECT w.*, u.userid FROM watchdog w LEFT JOIN users u ON w.user = u.id");
+ $result = db_query("SELECT w.*, u.userid FROM watchdog w LEFT JOIN users u ON w.user = u.id ORDER BY timestamp DESC LIMIT 1000");
$output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
$output .= " <TR><TH>date</TH><TH>type</TH><TH>message</TH><TH>user</TH><TH>operations</TH></TR>\n";
diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module
index 18279db1b..23e803e62 100644
--- a/modules/watchdog/watchdog.module
+++ b/modules/watchdog/watchdog.module
@@ -15,10 +15,10 @@ function watchdog_cron() {
db_query("DELETE FROM watchdog WHERE ". time() ." - timestamp > ". variable_get(watchdog_clear, "302400"));
}
-function watchdog_overview($order = "date") {
+function watchdog_overview() {
$colors = array(message => "#FFFFFF", special => "#836FFF", warning => "#FFAA22", error => "#EE2C2C");
- $result = db_query("SELECT w.*, u.userid FROM watchdog w LEFT JOIN users u ON w.user = u.id");
+ $result = db_query("SELECT w.*, u.userid FROM watchdog w LEFT JOIN users u ON w.user = u.id ORDER BY timestamp DESC LIMIT 1000");
$output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
$output .= " <TR><TH>date</TH><TH>type</TH><TH>message</TH><TH>user</TH><TH>operations</TH></TR>\n";