From dae5c2208c936c82b07eea35ce95f0aba03f5413 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sat, 7 Apr 2001 20:00:21 +0000 Subject: - improved rating module: it now shows some basic statistics :-) - updated database files - removed affialiate-site and drupal-site module: maintain them by hand through a box for now will you. --- modules/affiliate-site.module | 106 --------------------------------------- modules/drupal-site.module | 94 ---------------------------------- modules/rating.module | 18 +++++-- modules/watchdog.module | 4 +- modules/watchdog/watchdog.module | 4 +- 5 files changed, 17 insertions(+), 209 deletions(-) delete mode 100644 modules/affiliate-site.module delete mode 100644 modules/drupal-site.module (limited to 'modules') 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 @@ - "affiliate_help", - "block" => "affiliate_block", - "admin" => "affiliate_admin"); - -function affiliate_help() { - ?> -

This is a small module to manage related and/or affiliate sites. The module exports two different blocks with links to the affiliate sites.

- \n"; - $content .= " \n"; - $content .= "\n"; - - $content .= "
\n"; - $content .= "
\n"; - $content .= " \n"; - $content .= "
\n"; - $content .= "
\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 .= "
  • link\">$affiliate->name
    • \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 .= "
    \n"; - $output .= "\n"; - $output .= " \n"; - - while ($affiliate = db_fetch_object($result)) { - $output .= " \n"; - } - - $output .= " \n"; - $output .= "
    namelinkcontactoperations
    ". check_output($affiliate->name) ."". format_url($affiliate->link) ."". format_email($affiliate->contact) ."id\">delete
    \n"; - $output .= "
    \n"; - - print $output; -} - -function affiliate_admin() { - global $op, $id, $name, $url, $contact; - - print "overview | help
    \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 @@ - "drupal_block", - "admin" => "drupal_admin"); - -function drupal_block() { - global $site_url; - - $result = db_query("SELECT * FROM drupals ORDER BY name"); - - $content .= "\n"; - - $content .= "
    \n"; - $content .= "
    \n"; - $content .= " \n"; - $content .= "
    \n"; - $content .= "
    \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 .= "
  • link\">$drupal->name
    • \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 .= "
    \n"; - $output .= "\n"; - $output .= " \n"; - - while ($drupal = db_fetch_object($result)) { - $output .= " \n"; - } - - $output .= " \n"; - $output .= "
    namelinkcontactoperations
    $drupal->name". format_url($drupal->link) ."". format_email($drupal->contact) ."id\">delete
    \n"; - $output .= "
    \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 .= "\n"; while ($account = db_fetch_object($result)) { - $output .= ""; + $ranking = $account->old - $account->new; + $output .= ""; } $output .= "
    ". ++$i ."". format_username($account->userid) ."". check_output($account->rating) ."
    ". ++$i ."". format_username($account->userid) ."". check_output($account->rating) ."(". ($ranking < 0 ? "" : "+") ."$ranking)
    \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 .= "\n"; $output .= " \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 .= "
    datetypemessageuseroperations
    \n"; $output .= " \n"; -- cgit v1.2.3
    datetypemessageuseroperations