diff --git a/doc/cmaster/maint/Manager1K.sh b/doc/cmaster/maint/Manager1K.sh
index 2193d71..b78f3e8 100644
--- a/doc/cmaster/maint/Manager1K.sh
+++ b/doc/cmaster/maint/Manager1K.sh
@@ -10,7 +10,7 @@ DBHOST="127.0.0.1"
# default information to put in the db for those .., DO NOT USE a BLANK 'LASTMODIF', use "0".
LASTMODIFBY=`basename $0`
-LASTMODIF="now()::abstime::int4"
+LASTMODIF="EXTRACT(EPOCH FROM now())::int4"
@@ -270,7 +270,7 @@ if [ "$REP1" == "C" ]; then
echo "--> SALT : [$GENSALT]"
echo "--> Adding user '$FORCEUSERNAME'..."
- DAQRY="INSERT INTO users (user_name,password,email,url,question_id,verificationdata,language_id,public_key,last_updated_by,last_updated,signup_cookie,signup_ip,tz_setting) VALUES ('$FORCEUSERNAME','$ENCPASS','$UEMAIL','',$UQID,'$UVA',1,'','$LASTMODIFBY',now()::abstime::int4,'Added from the console','127.0.0.1','')"
+ DAQRY="INSERT INTO users (user_name,password,email,url,question_id,verificationdata,language_id,public_key,last_updated_by,last_updated,signup_cookie,signup_ip,tz_setting) VALUES ('$FORCEUSERNAME','$ENCPASS','$UEMAIL','',$UQID,'$UVA',1,'','$LASTMODIFBY',EXTRACT(EPOCH FROM now())::int4,'Added from the console','127.0.0.1','')"
echo "--> DB: `echo -n \"$DAQRY\" | $PSQLCMD -h $DBHOST $DBNAME`"
FROMC="1"
REP1="M"
@@ -312,9 +312,9 @@ if [ "$REP1" == "M" ]; then
echo "--> NOTICE: We will be running what should be at this moment just like if you ran 'cservice.addme.sql'"
echo "--> NOTICE: You will NOT need to run 'cservice.addme.sql' anymore, so don't run it ;P"
- ADDADMCHAN="INSERT into channels (name,flags,channel_ts,registered_ts,last_updated) VALUES ('*',1,now()::abstime::int4,31337,now()::abstime::int4)"
- ADDCODERCHAN="INSERT into channels (name,flags,channel_ts,registered_ts,last_updated) VALUES ('#coder-com',1,now()::abstime::int4,31337,now()::abstime::int4)"
- ADDCODERACCESS="INSERT into levels (channel_id,user_id,access,added_by,added,last_modif_by,last_modif,last_updated) VALUES (2,1,500,'$LASTMODIFBY',$LASTMODIF,'$LASTMODIFBY',$LASTMODIF,now()::abstime::int4)"
+ ADDADMCHAN="INSERT into channels (name,flags,channel_ts,registered_ts,last_updated) VALUES ('*',1,EXTRACT(EPOCH FROM now())::int4,31337,EXTRACT(EPOCH FROM now())::int4)"
+ ADDCODERCHAN="INSERT into channels (name,flags,channel_ts,registered_ts,last_updated) VALUES ('#coder-com',1,EXTRACT(EPOCH FROM now())::int4,31337,EXTRACT(EPOCH FROM now())::int4)"
+ ADDCODERACCESS="INSERT into levels (channel_id,user_id,access,added_by,added,last_modif_by,last_modif,last_updated) VALUES (2,1,500,'$LASTMODIFBY',$LASTMODIF,'$LASTMODIFBY',$LASTMODIF,EXTRACT(EPOCH FROM now())::int4)"
echo "--> Inserting ADMIN (*) channel..."
echo "--> DB: `echo -n \"$ADDADMCHAN\" | $PSQLCMD -h $DBHOST $DBNAME`"
@@ -337,16 +337,16 @@ if [ "$REP1" == "M" ]; then
if [ "$ADMINLVL" == "1000" ]; then
echo "--> Modifying ADMIN access from $ADMINLVL to 999..."
- DAQRY="UPDATE levels SET access=999,last_modif_by='$LASTMODIFBY',last_modif=$LASTMODIF,last_updated=now()::abstime::int4 WHERE channel_id=1 AND user_id=$USRID AND access=$ADMINLVL"
+ DAQRY="UPDATE levels SET access=999,last_modif_by='$LASTMODIFBY',last_modif=$LASTMODIF,last_updated=EXTRACT(EPOCH FROM now())::int4 WHERE channel_id=1 AND user_id=$USRID AND access=$ADMINLVL"
echo "--> DB: `echo -n \"$DAQRY\" | $PSQLCMD -h $DBHOST $DBNAME`"
else
if [ "$ADMINLVL" == "(0" ]; then
echo "--> Adding ADMIN access at level 1000..."
- DAQRY="INSERT INTO levels (channel_id,user_id,access,added_by,added,last_modif_by,last_modif,last_updated) VALUES (1,$USRID,1000,'$LASTMODIFBY',$LASTMODIF,'$LASTMODIFBY',$LASTMODIF,now()::abstime::int4)"
+ DAQRY="INSERT INTO levels (channel_id,user_id,access,added_by,added,last_modif_by,last_modif,last_updated) VALUES (1,$USRID,1000,'$LASTMODIFBY',$LASTMODIF,'$LASTMODIFBY',$LASTMODIF,EXTRACT(EPOCH FROM now())::int4)"
echo "--> DB: `echo -n \"$DAQRY\" | $PSQLCMD -h $DBHOST $DBNAME`"
else
echo "--> Modifying ADMIN access from $ADMINLVL to 1000..."
- DAQRY="UPDATE levels SET access=1000,last_modif_by='$LASTMODIFBY',last_modif=$LASTMODIF,last_updated=now()::abstime::int4 WHERE channel_id=1 AND user_id=$USRID AND access=$ADMINLVL"
+ DAQRY="UPDATE levels SET access=1000,last_modif_by='$LASTMODIFBY',last_modif=$LASTMODIF,last_updated=EXTRACT(EPOCH FROM now())::int4 WHERE channel_id=1 AND user_id=$USRID AND access=$ADMINLVL"
echo "--> DB: `echo -n \"$DAQRY\" | $PSQLCMD -h $DBHOST $DBNAME`"
fi
fi
diff --git a/doc/cmaster/regproc/appjudge b/doc/cmaster/regproc/appjudge
index 7d828cb..cfe06e0 100644
--- a/doc/cmaster/regproc/appjudge
+++ b/doc/cmaster/regproc/appjudge
@@ -41,7 +41,7 @@ proc log_channel {hDB channel_id state areason acode} {
}
set sup_list [string trim $sup_list ", "]
set log_msg "\[The Judge\]: Application ${state}. ${areason} Applicant: ${mgr_what}. Supporters: ${sup_list}."
- pg_exec $hDB "INSERT INTO channellog (ts,channelid,event,message,last_updated) VALUES(now()::abstime::int4,$channel_id,$acode,'\[The Judge\]: Application ${state}. ${areason} Applicant: ${mgr_what}. Supporters: ${sup_list}.',now()::abstime::int4)"
+ pg_exec $hDB "INSERT INTO channellog (ts,channelid,event,message,last_updated) VALUES(EXTRACT(EPOCH FROM now())::int4,$channel_id,$acode,'\[The Judge\]: Application ${state}. ${areason} Applicant: ${mgr_what}. Supporters: ${sup_list}.',EXTRACT(EPOCH FROM now())::int4)"
}
proc get_channel {hDB channel_id} {
@@ -52,7 +52,7 @@ proc reject_app {hDB channel_id reason} {
global AS_REJECTED REVIEWER_ID
puts [format "%s: Rejecting application for channel %s: %s" [clock_stamp] [get_channel $hDB $channel_id] $reason]
log_channel $hDB $channel_id "REJECTED" $reason 13
- pg_exec $hDB "UPDATE pending SET status=$AS_REJECTED, last_updated=now()::abstime::int4, reviewed_by_id=$REVIEWER_ID, decision_ts=now()::abstime::int4, decision='Rejected: $reason' WHERE channel_id=$channel_id"
+ pg_exec $hDB "UPDATE pending SET status=$AS_REJECTED, last_updated=EXTRACT(EPOCH FROM now())::int4, reviewed_by_id=$REVIEWER_ID, decision_ts=EXTRACT(EPOCH FROM now())::int4, decision='Rejected: $reason' WHERE channel_id=$channel_id"
# Need the associated userid
pg_select $hDB "SELECT channel_id,manager_id FROM pending WHERE channel_id=$channel_id" res_ch {
set notify_user [lindex [array get res_ch "manager_id"] 1]
@@ -67,7 +67,7 @@ proc check_comments {hDB channel_id} {
set objcount [lindex [array get res_obj "objcount"] 1]
if {$objcount} {
puts [format "%s: Moving channel %s to status %d (there are %d objections/comments)" [clock_stamp] [get_channel $hDB $channel_id] $AS_PENDREVIEW $objcount]
- pg_exec $hDB "UPDATE pending SET status=$AS_PENDREVIEW,last_updated=now()::abstime::int4 WHERE channel_id=$channel_id"
+ pg_exec $hDB "UPDATE pending SET status=$AS_PENDREVIEW,last_updated=EXTRACT(EPOCH FROM now())::int4 WHERE channel_id=$channel_id"
set check_res 1
}
}
@@ -76,7 +76,7 @@ proc check_comments {hDB channel_id} {
set comments [string trim [lindex [array get res_cmt "comments"] 1]]
if {[string match "REVIEW:*" $comments]} {
puts [format "%s: Moving channel %s to status %d (it was labeled for review)" [clock_stamp] [get_channel $hDB $channel_id] $AS_PENDREVIEW]
- pg_exec $hDB "UPDATE pending SET status=$AS_PENDREVIEW, last_updated=now()::abstime::int4 WHERE channel_id=$channel_id"
+ pg_exec $hDB "UPDATE pending SET status=$AS_PENDREVIEW, last_updated=EXTRACT(EPOCH FROM now())::int4 WHERE channel_id=$channel_id"
set check_res 1
}
}
@@ -104,8 +104,8 @@ proc check_fraudulous {hDB chan_id mgr_id} {
if {$isfraud > 0} {
# move it to 'Ready for review' if anyone is fraudulous
puts [format "%s: Moving channel %s to status %d (%d fraudulent applicant/supporters found)" [clock_stamp] [get_channel $hDB $chan_id] $AS_PENDREVIEW $isfraud]
- pg_exec $hDB "UPDATE pending SET status=$AS_PENDREVIEW,last_updated=now()::abstime::int4 WHERE channel_id=$chan_id"
- }
+ pg_exec $hDB "UPDATE pending SET status=$AS_PENDREVIEW,last_updated=EXTRACT(EPOCH FROM now())::int4 WHERE channel_id=$chan_id"
+ }
return $isfraud
}
@@ -145,7 +145,7 @@ puts [format "%s: The court is now in session." [clock_stamp]]
# Step 0.5: Reject applications that are still in status 0 after x days.
set sup_timeout [expr $DAY * $SUPPORT_DAYS]
-pg_select $hSQL "SELECT channel_id,status,check_start_ts FROM pending WHERE (status = $AS_PENDING_SUPPORT) AND (now()::abstime::int4 > (created_ts + $sup_timeout))" sup_expired {
+pg_select $hSQL "SELECT channel_id,status,check_start_ts FROM pending WHERE (status = $AS_PENDING_SUPPORT) AND (EXTRACT(EPOCH FROM now())::int4 > (created_ts + $sup_timeout))" sup_expired {
set chan_id [lindex [array get sup_expired "channel_id"] 1]
reject_app $hSQL $chan_id "One or more of the supporters did not confirm their support."
}
@@ -153,7 +153,7 @@ pg_select $hSQL "SELECT channel_id,status,check_start_ts FROM pending WHERE (sta
# Step 1: reject applications that failed to pass the activity test within the required timeframe
set app_timeout [expr $DAY * $MAX_DAYS]
-pg_select $hSQL "SELECT channel_id,status,check_start_ts,unique_join_count FROM pending WHERE (status = $AS_TRAFFIC_CHECK) AND (now()::abstime::int4 > (check_start_ts + $app_timeout))" t_expired {
+pg_select $hSQL "SELECT channel_id,status,check_start_ts,unique_join_count FROM pending WHERE (status = $AS_TRAFFIC_CHECK) AND (EXTRACT(EPOCH FROM now())::int4 > (check_start_ts + $app_timeout))" t_expired {
set chan_id [lindex [array get t_expired "channel_id"] 1]
set joins [lindex [array get t_expired "unique_join_count"] 1]
@@ -170,7 +170,7 @@ pg_select $hSQL "SELECT channel_id,status,check_start_ts,unique_join_count FROM
# get supporter count
pg_select $hSQL "SELECT COUNT(*) AS supcount FROM supporters WHERE channel_id=$chan_id" res_supc { set sup_joins [lindex [array get sup_res "supcount"] 1] }
puts [format "%s: Moving channel %s to status %d (application labeled for human inspection)" [clock_stamp] [get_channel $hSQL $chan_id] $AS_NOTIFICATION]
- pg_exec $hSQL "UPDATE pending SET status=$AS_NOTIFICATION,check_start_ts=now()::abstime::int4,comments='REVIEW: Only $sup_joins supporters have been seen.', last_updated=now()::abstime::int4 WHERE channel_id=$chan_id"
+ pg_exec $hSQL "UPDATE pending SET status=$AS_NOTIFICATION,check_start_ts=EXTRACT(EPOCH FROM now())::int4,comments='REVIEW: Only $sup_joins supporters have been seen.', last_updated=EXTRACT(EPOCH FROM now())::int4 WHERE channel_id=$chan_id"
} else {
# No - Reject
reject_app $hSQL $chan_id "Not enough activity in the channel."
@@ -188,14 +188,14 @@ pg_select $hSQL "SELECT channel_id,status FROM pending WHERE (status=$AS_TRAFFIC
if {$sup_joins >= $MIN_SUPPORTERS} {
puts [format "%s: Moving channel %s to status %d (traffic check passed)" [clock_stamp] [get_channel $hSQL $chan_id] $AS_NOTIFICATION]
- pg_exec $hSQL "UPDATE pending SET status=$AS_NOTIFICATION,check_start_ts=now()::abstime::int4,last_updated=now()::abstime::int4 WHERE channel_id=$chan_id"
+ pg_exec $hSQL "UPDATE pending SET status=$AS_NOTIFICATION,check_start_ts=EXTRACT(EPOCH FROM now())::int4,last_updated=EXTRACT(EPOCH FROM now())::int4 WHERE channel_id=$chan_id"
}
}
# Step 3: check for end of notify period
set notify_delay [expr $DAY * $NOTIFY_DAYS]
-pg_select $hSQL "SELECT channel_id,status,manager_id,reviewed FROM pending WHERE (status = $AS_NOTIFICATION) AND ((check_start_ts + $notify_delay) < now()::abstime::int4)" t_notified {
+pg_select $hSQL "SELECT channel_id,status,manager_id,reviewed FROM pending WHERE (status = $AS_NOTIFICATION) AND ((check_start_ts + $notify_delay) < EXTRACT(EPOCH FROM now())::int4)" t_notified {
set chan_id [lindex [array get t_notified "channel_id"] 1]
set mgr_id [lindex [array get t_notified "manager_id"] 1]
set reviewed [lindex [array get t_notified "reviewed"] 1]
@@ -208,24 +208,24 @@ pg_select $hSQL "SELECT channel_id,status,manager_id,reviewed FROM pending WHERE
# Register the channel
log_channel $hSQL $chan_id "ACCEPTED" "All checks passed." 7
puts [format "%s: Moving channel %s to status %d (notify period ended)" [clock_stamp] [get_channel $hSQL $chan_id] $AS_COMPLETED]
- pg_exec $hSQL "UPDATE pending SET status=$AS_COMPLETED,reviewed_by_id=$REVIEWER_ID,decision_ts=now()::abstime::int4,decision='Accepted by The Judge', last_updated=now()::abstime::int4 WHERE channel_id=$chan_id"
+ pg_exec $hSQL "UPDATE pending SET status=$AS_COMPLETED,reviewed_by_id=$REVIEWER_ID,decision_ts=EXTRACT(EPOCH FROM now())::int4,decision='Accepted by The Judge', last_updated=EXTRACT(EPOCH FROM now())::int4 WHERE channel_id=$chan_id"
puts [format "%s: Registering channel %s (all checks passed)" [clock_stamp] [get_channel $hSQL $chan_id]]
- pg_exec $hSQL "UPDATE channels SET registered_ts=now()::abstime::int4, last_updated = now()::abstime::int4 WHERE id=$chan_id"
- pg_exec $hSQL "INSERT INTO levels (channel_id,user_id,access,added,added_by,last_modif,last_modif_by,last_updated) VALUES($chan_id,$mgr_id,500,now()::abstime::int4,'The Judge',now()::abstime::int4,'The Judge',now()::abstime::int4)"
+ pg_exec $hSQL "UPDATE channels SET registered_ts=EXTRACT(EPOCH FROM now())::int4, last_updated = EXTRACT(EPOCH FROM now())::int4 WHERE id=$chan_id"
+ pg_exec $hSQL "INSERT INTO levels (channel_id,user_id,access,added,added_by,last_modif,last_modif_by,last_updated) VALUES($chan_id,$mgr_id,500,EXTRACT(EPOCH FROM now())::int4,'The Judge',EXTRACT(EPOCH FROM now())::int4,'The Judge',EXTRACT(EPOCH FROM now())::int4)"
}
}
} else {
# No, label it for review if no one is suspended on it
if {![check_suspended $hSQL $chan_id $mgr_id]} {
puts [format "%s: Moving channel %s to status %d (it was never reviewed)" [clock_stamp] [get_channel $hSQL $chan_id] $AS_PENDREVIEW]
- pg_exec $hSQL "UPDATE pending SET status=$AS_PENDREVIEW,last_updated=now()::abstime::int4 WHERE channel_id=$chan_id"
+ pg_exec $hSQL "UPDATE pending SET status=$AS_PENDREVIEW,last_updated=EXTRACT(EPOCH FROM now())::int4 WHERE channel_id=$chan_id"
}
}
} else {
# Objections found, label it for review if no one is suspended on it ;)
if {![check_suspended $hSQL $chan_id $mgr_id]} {
puts [format "%s: Moving channel %s to status %d (it was never reviewed)" [clock_stamp] [get_channel $hSQL $chan_id] $AS_PENDREVIEW]
- pg_exec $hSQL "UPDATE pending SET status=$AS_PENDREVIEW,last_updated=now()::abstime::int4 WHERE channel_id=$chan_id"
+ pg_exec $hSQL "UPDATE pending SET status=$AS_PENDREVIEW,last_updated=EXTRACT(EPOCH FROM now())::int4 WHERE channel_id=$chan_id"
}
}
}
diff --git a/doc/cmaster/website/manual.html b/doc/cmaster/website/manual.html
index f3724c0..99f79bd 100644
--- a/doc/cmaster/website/manual.html
+++ b/doc/cmaster/website/manual.html
@@ -1,4 +1,4 @@
-
+
@@ -295,10 +295,10 @@ You can get info about other values in the conf file itself.
INSERT into users (user_name,password,language_id,last_updated)
- VALUES ('the_user_name','07d976a29bdb3ff42e10c102852151b28097bbad',1,now()::abstime::int4);
+ VALUES ('the_user_name','07d976a29bdb3ff42e10c102852151b28097bbad',1,EXTRACT(EPOCH FROM now())::int4);
INSERT into levels (channel_id,user_id,access,last_updated)
- VALUES (1,the_user_id,1000,now()::abstime::int4);
+ VALUES (1,the_user_id,1000,EXTRACT(EPOCH FROM now())::int4);
* the_user_name should be the username will be added with level 1000
diff --git a/doc/cservice-1.5.0.sql b/doc/cservice-1.5.0.sql
index 2ca1cfb..87f1faa 100644
--- a/doc/cservice-1.5.0.sql
+++ b/doc/cservice-1.5.0.sql
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------
-- "$Id: cservice.sql,v 1.87 2008/11/12 20:45:42 mrbean_ Exp $"
-- Channel service DB SQL file for PostgreSQL.
@@ -541,7 +541,7 @@ CREATE TRIGGER t_update_levels AFTER UPDATE ON levels FOR EACH ROW EXECUTE PROCE
CREATE FUNCTION new_user() RETURNS OPAQUE AS '
-- creates the users associated last_seen record
BEGIN
- INSERT INTO users_lastseen (user_id, last_seen, last_updated) VALUES(NEW.id, now()::abstime::int4, now()::abstime::int4);
+ INSERT INTO users_lastseen (user_id, last_seen, last_updated) VALUES(NEW.id, EXTRACT(EPOCH FROM now())::int4, EXTRACT(EPOCH FROM now())::int4);
RETURN NEW;
END;
' LANGUAGE 'plpgsql';
@@ -556,7 +556,7 @@ CREATE TRIGGER t_new_user AFTER INSERT ON users FOR EACH ROW EXECUTE PROCEDURE n
CREATE FUNCTION delete_user() RETURNS OPAQUE AS '
BEGIN
INSERT INTO deletion_transactions (tableID, key1, key2, key3, last_updated)
- VALUES(1, OLD.id, 0, 0, now()::abstime::int4);
+ VALUES(1, OLD.id, 0, 0, EXTRACT(EPOCH FROM now())::int4);
RETURN OLD;
END;
' LANGUAGE 'plpgsql';
@@ -569,7 +569,7 @@ CREATE TRIGGER t_delete_user AFTER DELETE ON users FOR EACH ROW EXECUTE PROCEDUR
CREATE FUNCTION delete_channel() RETURNS OPAQUE AS '
BEGIN
INSERT INTO deletion_transactions (tableID, key1, key2, key3, last_updated)
- VALUES(2, OLD.id, 0, 0, now()::abstime::int4);
+ VALUES(2, OLD.id, 0, 0, EXTRACT(EPOCH FROM now())::int4);
RETURN OLD;
END;
' LANGUAGE 'plpgsql';
@@ -582,7 +582,7 @@ CREATE TRIGGER t_delete_channel AFTER DELETE ON channels FOR EACH ROW EXECUTE PR
CREATE FUNCTION delete_level() RETURNS OPAQUE AS '
BEGIN
INSERT INTO deletion_transactions (tableID, key1, key2, key3, last_updated)
- VALUES(3, OLD.channel_id, OLD.user_id, 0, now()::abstime::int4);
+ VALUES(3, OLD.channel_id, OLD.user_id, 0, EXTRACT(EPOCH FROM now())::int4);
RETURN OLD;
END;
' LANGUAGE 'plpgsql';
@@ -595,7 +595,7 @@ CREATE TRIGGER t_delete_level AFTER DELETE ON levels FOR EACH ROW EXECUTE PROCED
CREATE FUNCTION delete_ban() RETURNS OPAQUE AS '
BEGIN
INSERT INTO deletion_transactions (tableID, key1, key2, key3, last_updated)
- VALUES(4, OLD.id, 0, 0, now()::abstime::int4);
+ VALUES(4, OLD.id, 0, 0, EXTRACT(EPOCH FROM now())::int4);
RETURN OLD;
END;
' LANGUAGE 'plpgsql';
@@ -656,7 +656,7 @@ CREATE TABLE glines (
AddedBy VARCHAR(128) NOT NULL,
AddedOn INT4 NOT NULL,
ExpiresAt INT4 NOT NULL,
- LastUpdated INT4 NOT NULL DEFAULT now()::abstime::int4,
+ LastUpdated INT4 NOT NULL DEFAULT EXTRACT(EPOCH FROM now())::int4,
Reason VARCHAR(255)
);
diff --git a/doc/idoc/index.php b/doc/idoc/index.php
index 750a5f3..7eeaa3d 100644
--- a/doc/idoc/index.php
+++ b/doc/idoc/index.php
@@ -1,4 +1,4 @@
-cservice.addme.sql script, you will find it in
the doc/ directory of the 'gnuworld' cvs repository.
What you have to do is edit the username who will be added:
e.g.:
- INSERT into users (user_name,password,language_id,last_updated) VALUES ('Admin','07d976a29bdb3ff42e19c102852151b28097bbad',1,now()::abstime::int4);
+ INSERT into users (user_name,password,language_id,last_updated) VALUES ('Admin','07d976a29bdb3ff42e19c102852151b28097bbad',1,EXTRACT(EPOCH FROM now())::int4);
Change the "Admin" to your preferred username.
After that you run it with this command:
psql cservice < cservice.addme.sql
diff --git a/doc/update_config_20080101.sql b/doc/update_config_20080101.sql
index a0adb86..6b57a5a 100644
--- a/doc/update_config_20080101.sql
+++ b/doc/update_config_20080101.sql
@@ -1,9 +1,9 @@
---
+--
-- $Id: update_config_20080101.sql,v 1.1 2008/01/01 13:49:47 kewlio Exp $
--
-- Set the variable for using the login grace period when cservice links.
--
INSERT INTO variables (var_name,contents,last_updated,hint)
-VALUES ('USE_LOGIN_DELAY', '1', now()::abstime::int4, 'Use login delay when cservice links if set to 1');
+VALUES ('USE_LOGIN_DELAY', '1', EXTRACT(EPOCH FROM now())::int4, 'Use login delay when cservice links if set to 1');
diff --git a/doc/update_cservice_20111122.sql b/doc/update_cservice_20111122.sql
index c609e48..adfef05 100644
--- a/doc/update_cservice_20111122.sql
+++ b/doc/update_cservice_20111122.sql
@@ -1,4 +1,4 @@
--- Update cservice database, adding glines and whitelist tables
+-- Update cservice database, adding glines and whitelist tables
CREATE TABLE glines (
Id SERIAL,
@@ -6,7 +6,7 @@ CREATE TABLE glines (
AddedBy VARCHAR(128) NOT NULL,
AddedOn INT4 NOT NULL,
ExpiresAt INT4 NOT NULL,
- LastUpdated INT4 NOT NULL DEFAULT now()::abstime::int4,
+ LastUpdated INT4 NOT NULL DEFAULT EXTRACT(EPOCH FROM now())::int4,
Reason VARCHAR(255)
);
diff --git a/doc/update_languages_20060131_20.sql b/doc/update_languages_20060131_20.sql
index f3785ae..3a7a2df 100644
--- a/doc/update_languages_20060131_20.sql
+++ b/doc/update_languages_20060131_20.sql
@@ -1,4 +1,4 @@
---
+--
-- $Id: update_languages_20060131_20.sql,v 1.1 2006/01/31 00:25:13 kewlio Exp $
--
-- Update item 20 (ban duration) to move from static to dynamic durations
@@ -17,43 +17,43 @@ DELETE FROM translations WHERE response_id=20;
-- Insert new records in all known languages
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(1,20,'Invalid ban duration. Your ban duration can be a maximum of %d hours.',now()::abstime::int4,0);
+VALUES(1,20,'Invalid ban duration. Your ban duration can be a maximum of %d hours.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(2,20,'Durée du ban invalide. La durée maximale est de %d heures.',now()::abstime::int4,0);
+VALUES(2,20,'Durée du ban invalide. La durée maximale est de %d heures.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(3,20,'Ugyldigt ban varighed. Din ban varighed kan max bestå af %d timer.',now()::abstime::int4,0);
+VALUES(3,20,'Ugyldigt ban varighed. Din ban varighed kan max bestå af %d timer.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(4,20,'Ongeldige banlengte. Je banlengte kan maximum %d uur bedragen.',now()::abstime::int4,0);
+VALUES(4,20,'Ongeldige banlengte. Je banlengte kan maximum %d uur bedragen.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(5,20,'Ungültige Banzeit. Deine Bandauer kann maximal %d Stunden sein.',now()::abstime::int4,0);
+VALUES(5,20,'Ungültige Banzeit. Deine Bandauer kann maximal %d Stunden sein.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(6,20,'Duração de ban inválida. Sua duração de ban aplicada pode ser de no máximo %d horas.',now()::abstime::int4,0);
+VALUES(6,20,'Duração de ban inválida. Sua duração de ban aplicada pode ser de no máximo %d horas.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(7,20,'Durata del ban non valida. La durata massima di un ban può essere di %d ore.',now()::abstime::int4,0);
+VALUES(7,20,'Durata del ban non valida. La durata massima di un ban può essere di %d ore.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(8,20,'Durata banului e incorecta. Poti da ban pe o durata maxima de %d de ore.',now()::abstime::int4,0);
+VALUES(8,20,'Durata banului e incorecta. Poti da ban pe o durata maxima de %d de ore.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(9,20,'Durada de bandeig no vàlida . La durada màxima del bandeig és de %d hores.',now()::abstime::int4,0);
+VALUES(9,20,'Durada de bandeig no và lida . La durada mà xima del bandeig és de %d hores.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(10,20,'Duración de ban no válida. La duración de ban máxima es de %d horas.',now()::abstime::int4,0);
+VALUES(10,20,'Duración de ban no válida. La duración de ban máxima es de %d horas.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(11,20,'Ervenytelen ban idotartalom. Maximum %d orat hasznalhatsz.',now()::abstime::int4,0);
+VALUES(11,20,'Ervenytelen ban idotartalom. Maximum %d orat hasznalhatsz.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(12,20,'Geçersiz yasaklama süresi. Sizin yasaklama süreniz en fazla %d saat olabilir.',now()::abstime::int4,0);
+VALUES(12,20,'Geçersiz yasaklama süresi. Sizin yasaklama süreniz en fazla %d saat olabilir.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(13,20,'Ugyldig ban varighet. Den kan maksimum være %d timer.',now()::abstime::int4,0);
+VALUES(13,20,'Ugyldig ban varighet. Den kan maksimum være %d timer.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(14,20,'Moudatou ban ghayrou sahiha. Almoudatou alkouswa Hia %d heures.',now()::abstime::int4,0);
+VALUES(14,20,'Moudatou ban ghayrou sahiha. Almoudatou alkouswa Hia %d heures.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(15,20,'îùê æîï äáàï ìà çå÷é, äæîï äîéøáé äåà %d ùòåú.',now()::abstime::int4,0);
+VALUES(15,20,'îùê æîï äáà ï ìà çå÷é, äæîï äîéøáé äåà %d ùòåú.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(16,20,'Pogreshno vremetraenje na banot. Vashiot ban moze da bide najmnogu %d chasa.',now()::abstime::int4,0);
+VALUES(16,20,'Pogreshno vremetraenje na banot. Vashiot ban moze da bide najmnogu %d chasa.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(18,20,'Invalid pitchfork duration. Your pitchfork duration can be a maximum of %d hours.',now()::abstime::int4,0);
+VALUES(18,20,'Invalid pitchfork duration. Your pitchfork duration can be a maximum of %d hours.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(19,20,'Avasimi diarkeia gia ban. H diarkeia tou ban den mporei na einai pano apo to anwtato orio twn %d hours.',now()::abstime::int4,0);
+VALUES(19,20,'Avasimi diarkeia gia ban. H diarkeia tou ban den mporei na einai pano apo to anwtato orio twn %d hours.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(20,20,'Ogiltig ban varaktighet. Din ban varaktighet kan max vara %d timmar.',now()::abstime::int4,0);
+VALUES(20,20,'Ogiltig ban varaktighet. Din ban varaktighet kan max vara %d timmar.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(21,20,'Invalid curse duration. Your curse duration can be a maximum of %d hours.',now()::abstime::int4,0);
+VALUES(21,20,'Invalid curse duration. Your curse duration can be a maximum of %d hours.',EXTRACT(EPOCH FROM now())::int4,0);
diff --git a/doc/update_languages_20070807_31.sql b/doc/update_languages_20070807_31.sql
index 19512b0..19b34a6 100644
--- a/doc/update_languages_20070807_31.sql
+++ b/doc/update_languages_20070807_31.sql
@@ -1,4 +1,4 @@
---
+--
-- $Id: update_languages_20070807_31.sql,v 1.1 2007/08/07 21:22:28 kewlio Exp $
--
-- Update item 31 (too many matching bans) to move from static to dynamic bans
@@ -19,39 +19,39 @@ DELETE FROM translations WHERE response_id=31;
-- Insert new records in all known languages
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(1,31,'There are more than %d matching entries.',now()::abstime::int4,0);
+VALUES(1,31,'There are more than %d matching entries.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(2,31,'Il y a plus de %d requêtes trouvées.',now()::abstime::int4,0);
+VALUES(2,31,'Il y a plus de %d requêtes trouvées.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(3,31,'Der er mere end %d matchende indtastninger.',now()::abstime::int4,0);
+VALUES(3,31,'Der er mere end %d matchende indtastninger.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(4,31,'Er zijn meer dan %d bijhorende records.',now()::abstime::int4,0);
+VALUES(4,31,'Er zijn meer dan %d bijhorende records.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(5,31,'Es gibt mehr als %d passende Einträge.',now()::abstime::int4,0);
+VALUES(5,31,'Es gibt mehr als %d passende Einträge.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(6,31,'Há mais de %d entradas.',now()::abstime::int4,0);
+VALUES(6,31,'Há mais de %d entradas.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(7,31,'Sono presenti più di %d corrispondenze.',now()::abstime::int4,0);
+VALUES(7,31,'Sono presenti più di %d corrispondenze.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(8,31,'Sunt mai mult de %d rezultate.',now()::abstime::int4,0);
+VALUES(8,31,'Sunt mai mult de %d rezultate.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(9,31,'Hi ha més de %d entrades coincidents.',now()::abstime::int4,0);
+VALUES(9,31,'Hi ha més de %d entrades coincidents.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(10,31,'Hay más de %d entradas coincidentes.',now()::abstime::int4,0);
+VALUES(10,31,'Hay más de %d entradas coincidentes.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(11,31,'%d-nel tobb hasonlo adat van.',now()::abstime::int4,0);
+VALUES(11,31,'%d-nel tobb hasonlo adat van.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(12,31,'%d den fazla eþleþen giriþ var.',now()::abstime::int4,0);
+VALUES(12,31,'%d den fazla eþleþen giriþ var.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(13,31,'Det er mere enn %d treff som passer dine kriterier.',now()::abstime::int4,0);
+VALUES(13,31,'Det er mere enn %d treff som passer dine kriterier.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(14,31,'Youjado aktare min %d talabe',now()::abstime::int4,0);
+VALUES(14,31,'Youjado aktare min %d talabe',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(15,31,'There are more than %d matching entries.',now()::abstime::int4,0);
+VALUES(15,31,'There are more than %d matching entries.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations (language_id,response_id,text,last_updated,deleted)
-VALUES(16,31,'Ima poveke od %d isti.',now()::abstime::int4,0);
+VALUES(16,31,'Ima poveke od %d isti.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations VALUES (16,31,'There are more than %d matching entries.',31337,0);
-VALUES(19,31,'Iparxoun pio polles apo %d teriastes Eisodous i Simetoxes.',now()::abstime::int4,0);
+VALUES(19,31,'Iparxoun pio polles apo %d teriastes Eisodous i Simetoxes.',EXTRACT(EPOCH FROM now())::int4,0);
INSERT INTO translations VALUES (16,31,'There are more than %d matching entries.',31337,0);
-VALUES(20,31,'Det är mer än %d träffar.',now()::abstime::int4,0);
+VALUES(20,31,'Det är mer än %d träffar.',EXTRACT(EPOCH FROM now())::int4,0);
diff --git a/doc/update_variables_20071227.sql b/doc/update_variables_20071227.sql
index a3ab726..f92e472 100644
--- a/doc/update_variables_20071227.sql
+++ b/doc/update_variables_20071227.sql
@@ -1,4 +1,4 @@
---
+--
-- $Id: update_variables_20071227.sql,v 1.2 2008/01/09 22:42:17 kewlio Exp $
--
-- Update max_ban_duration from hours to seconds (multiply by 3600)
@@ -6,7 +6,7 @@
-- WARNING: run this only ONCE!
-UPDATE variables SET last_updated=now()::abstime::int4,hint='Maximum ban duration (in seconds)',contents=(contents::int4*3600) WHERE var_name='MAX_BAN_DURATION';
+UPDATE variables SET last_updated=EXTRACT(EPOCH FROM now())::int4,hint='Maximum ban duration (in seconds)',contents=(contents::int4*3600) WHERE var_name='MAX_BAN_DURATION';
DELETE FROM help WHERE topic='BAN' AND language_id=1;
diff --git a/mod.dronescan/sqlFakeClient.cc b/mod.dronescan/sqlFakeClient.cc
index dcc8714..8546d3c 100644
--- a/mod.dronescan/sqlFakeClient.cc
+++ b/mod.dronescan/sqlFakeClient.cc
@@ -1,4 +1,4 @@
-#include
+#include
#include
#include
@@ -74,8 +74,8 @@ fakeInsert << "INSERT INTO fakeclients VALUES ("
<< "'" << hostname << "', "
<< "'" << realname << "', "
<< createdBy_i << ", "
- << "now()::abstime::int4, "
- << "now()::abstime::int4, 0"
+ << "EXTRACT(EPOCH FROM now())::int4, "
+ << "EXTRACT(EPOCH FROM now())::int4, 0"
<< ")"
;