Use new more intelligent default for pg_enable_utf8

[ND.git] / Include.pm

diff --git a/Include.pm b/Include.pm
index ba1768ee3447c27c4c1747389f0748bd0d6dad9f..6af489ae86660977d2f528a295c1b9fa64ec02cb 100644 (file)
--- a/Include.pm
+++ b/Include.pm
@@ -25,7 +25,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/min max parseValue prettyValue log_message intel_log def_log unread_query pa_xp/;
+our @EXPORT = qw/min max parseValue prettyValue pa_xp/;
 
 sub min {
     my ($x,$y) = @_;
@@ -37,7 +37,6 @@ sub max {
     return ($x < $y ? $y : $x);
 }
 
-
 sub parseValue {
        if (defined $_[0] && $_[0] =~ /^(-?\d+(?:\.\d+)?)([khMG])?$/){
                return $1 unless defined $2;
@@ -67,44 +66,11 @@ sub prettyValue {
        return sprintf('%'.$decimals.'f%s', $value,$unit);
 }
 
-
-sub log_message {
-       my ($uid, $message) = @_;
-       my $log = $ND::DBH->prepare_cached(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
-               (SELECT ftid FROM users WHERE uid = $1),$1,$2)});
-       $log->execute($uid,$message) or $ND::ERROR .= p($ND::DBH->errstr);
-}
-
-sub intel_log {
-       my ($uid,$planet, $message) = @_;
-       my $log = $ND::DBH->prepare_cached(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
-               (SELECT ftid FROM planets WHERE id = $3),$1,$2)});
-       $log->execute($uid,$message,$planet) or $ND::ERROR .= p($ND::DBH->errstr);
-}
-
-sub def_log {
-       my ($uid,$call, $message) = @_;
-       my $log = $ND::DBH->prepare_cached(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
-               (SELECT ftid FROM calls WHERE id = $3),$1,$2)});
-       $log->execute($uid,$message,$call) or $ND::ERROR .= p($ND::DBH->errstr);
-}
-
 sub pa_xp {
        my ($roids,$ascore,$avalue,$tscore,$tvalue) = @_;
-       my $bravery = (max(0,min(2,$tscore/$ascore)-0.6)) * (min(2,$tvalue/$avalue)-0.4);
+       my $bravery = (max(0,min(2,$tscore/$ascore)-0.2)) * (min(2,$tvalue/$avalue)-0.1);
        return int(max($roids * 10 * $bravery,0))
 
 }
 
-sub unread_query {
-       return $ND::DBH->prepare_cached(q{
-                       SELECT count(*) AS unread, count(NULLIF(fp.time > $2,FALSE)) AS new
-FROM forum_boards fb NATURAL JOIN forum_threads ft 
-       JOIN forum_posts fp USING (ftid) LEFT OUTER JOIN 
-               (SELECT * FROM forum_thread_visits WHERE uid = $1) ftv ON ftv.ftid = ft.ftid
-WHERE (ftv.time IS NULL OR fp.time > ftv.time) AND fbid > 0 AND
-       fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($1)))
-               });
-}
-
 1;