[Phpslash-commit] CVS: phpslash-ft/class Block.class,1.19,1.20 Block_render_cal.class,1.9,1.10 Block
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
[Phpslash-commit] CVS: phpslash-ft/class Block.class,1.19,1.20 Block_render_cal.class,1.9,1.10 Block_render_comments.class,1.3,1.4 Block_render_submission.class,1.2,1.3 Comment.class,1.35,1.36 Infolog.class,1.4,1.5 MailingList.class,1.10,1.11 Poll.class,1.21,1.22 Story_admin.class,1.6,1.7 Story_base.class,1.18,1.19 Submission.class,1.11,1.12 functions.inc,1.113,1.114 slashAuth.class,1.6,1.7 slashDB.class,1.4,1.5
|
From: Matthew L. <sym...@us...> - 2002-11-21 18:50:07
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv30097/class
Modified Files:
Block.class Block_render_cal.class Block_render_comments.class
Block_render_submission.class Comment.class Infolog.class
MailingList.class Poll.class Story_admin.class
Story_base.class Submission.class functions.inc
slashAuth.class slashDB.class
Log Message:
:!
:q
::q
^:q
Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Block.class 31 Oct 2002 21:38:50 -0000 1.19
--- Block.class 21 Nov 2002 18:50:01 -0000 1.20
***************
*** 160,164 ****
type AS type_id,
expire_length,
! UNIX_TIMESTAMP(last_update) AS last_update,
location,
source_url,
--- 160,164 ----
type AS type_id,
expire_length,
! date_issued AS last_update,
location,
source_url,
***************
*** 239,243 ****
// echo "<H3>SECTION_DEL: $section_del</H3>\n";
$this->db->query($section_del);
!
$query = "UPDATE psl_block
--- 239,243 ----
// echo "<H3>SECTION_DEL: $section_del</H3>\n";
$this->db->query($section_del);
! $timestamp = time();
$query = "UPDATE psl_block
***************
*** 245,249 ****
type = '$block_array[block_type]',
expire_length = '$block_array[expire_length]',
! last_update = '',
title = '$block_array[block_title]',
location = '$block_array[location]',
--- 245,249 ----
type = '$block_array[block_type]',
expire_length = '$block_array[expire_length]',
! date_issued = NULL,
title = '$block_array[block_title]',
location = '$block_array[location]',
***************
*** 261,265 ****
$this->message = "Creating new block from submitted info.<br>\n";
!
$block_array["block_id"] = generateID("psl_block_seq");
$query = "INSERT INTO psl_block
--- 261,265 ----
$this->message = "Creating new block from submitted info.<br>\n";
! $timestamp = time();
$block_array["block_id"] = generateID("psl_block_seq");
$query = "INSERT INTO psl_block
***************
*** 272,276 ****
cache_data,
ordernum,
! block_options)
VALUES ('$block_array[block_id]',
'$block_array[block_type]',
--- 272,276 ----
cache_data,
ordernum,
! block_options)
VALUES ('$block_array[block_id]',
'$block_array[block_type]',
***************
*** 281,285 ****
'$block_array[cache_data]',
'$block_array[ordernum]',
! '$serial_opts')";
$this->message .= "Adding the block to the db...<br>\n";
$this->db->query($query);
--- 281,286 ----
'$block_array[cache_data]',
'$block_array[ordernum]',
! '$serial_opts')
! ";
$this->message .= "Adding the block to the db...<br>\n";
$this->db->query($query);
***************
*** 335,344 ****
$next = $last + $update;
# $next = 0;
! $now = time();
! if ($now > $next) {
! # echo "$now is bigger then<BR> $next<BR><BR>\n";
return 0;
! } elseif ($now == $last) {
! # echo "now($now) is equal to last($last)<BR><BR>\n";
} else {
# echo "1 -- CHECKTIME: last-> $last || Update -> $update || Next -> $next<BR>\n";
--- 336,345 ----
$next = $last + $update;
# $next = 0;
! $timestamp = time();
! if ($timestamp > $next) {
! # echo "$timestamp is bigger then<BR> $next<BR><BR>\n";
return 0;
! } elseif ($timestamp == $last) {
! # echo "now($timestamp) is equal to last($last)<BR><BR>\n";
} else {
# echo "1 -- CHECKTIME: last-> $last || Update -> $update || Next -> $next<BR>\n";
***************
*** 476,481 ****
$query = "UPDATE psl_block
SET cache_data = '$this->parsedData',
! last_update = FROM_UNIXTIME($newdate)
WHERE id = '$id'";
$this->db->query($query);
if ($this->db->affected_rows() != 1) {
--- 477,483 ----
$query = "UPDATE psl_block
SET cache_data = '$this->parsedData',
! date_issued = $newdate
WHERE id = '$id'";
+ debug("Block::storeParsed::Update query:", $query);
$this->db->query($query);
if ($this->db->affected_rows() != 1) {
***************
*** 541,545 ****
psl_block.title,
psl_block.expire_length,
! UNIX_TIMESTAMP(psl_block.last_update) as last_update,
psl_block.location,
psl_block.source_url,
--- 543,547 ----
psl_block.title,
psl_block.expire_length,
! psl_block.date_issued as last_update,
psl_block.location,
psl_block.source_url,
***************
*** 574,582 ****
$update = intval($this->block_ary[$i]["expire_length"]);
$next = $last + $update;
! $now = time();
// update cache? if yes doParse
! if ($now > $next) {
! // if (($now > $next) && ($update != 0)) {
$this->block_info = $this->block_ary[$i];
--- 576,584 ----
$update = intval($this->block_ary[$i]["expire_length"]);
$next = $last + $update;
! $timestamp = time();
// update cache? if yes doParse
! if ($timestamp > $next) {
! // if (($timestamp > $next) && ($update != 0)) {
$this->block_info = $this->block_ary[$i];
Index: Block_render_cal.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_cal.class,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Block_render_cal.class 24 Oct 2002 19:36:03 -0000 1.9
--- Block_render_cal.class 21 Nov 2002 18:50:01 -0000 1.10
***************
*** 28,31 ****
--- 28,32 ----
$current_date=getdate();
+
$month = $current_date["mon"];
$year = $current_date["year"];
***************
*** 33,37 ****
$enddate = date("Y-m-d H:i:s");
-
$now = time();
$url_month = date ("m",$now);
--- 34,37 ----
***************
*** 45,52 ****
/* get all dates where there was a story in the current month */
$cal_q = new slashDB;
! $q = "SELECT time,date_format(time,\"%e\") AS thing
FROM psl_story
! WHERE time >= '$year-$month-01'
! AND time <= '$enddate'";
$cal_q->query($q);
--- 45,52 ----
/* get all dates where there was a story in the current month */
$cal_q = new slashDB;
! $q = "SELECT date_available
FROM psl_story
! WHERE date_available >= $firstday
! AND date_available <= $now";
$cal_q->query($q);
***************
*** 54,58 ****
it means there was a story on the 5th */
while ($cal_q->next_record()) {
! $ary[$cal_q->Record["thing"]]++;
};
--- 54,59 ----
it means there was a story on the 5th */
while ($cal_q->next_record()) {
! $mday = strftime("%e",$cal_q->Record['date_available']);
! $ary[$mday]++;
};
Index: Block_render_comments.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_comments.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Block_render_comments.class 13 Nov 2002 20:22:01 -0000 1.3
--- Block_render_comments.class 21 Nov 2002 18:50:02 -0000 1.4
***************
*** 101,105 ****
AND psl_section_lut.section_id = psl_section.section_id
AND psl_comment.story_id = psl_section_lut.story_id
! ORDER BY date DESC
LIMIT $number";
} elseif (isset($section)){
--- 101,105 ----
AND psl_section_lut.section_id = psl_section.section_id
AND psl_comment.story_id = psl_section_lut.story_id
! ORDER BY psl_comment.date_created DESC
LIMIT $number";
} elseif (isset($section)){
***************
*** 114,118 ****
AND psl_section_lut.section_id = psl_section.section_id
AND psl_comment.story_id = psl_section_lut.story_id
! ORDER BY date DESC
LIMIT $number";
} else {
--- 114,118 ----
AND psl_section_lut.section_id = psl_section.section_id
AND psl_comment.story_id = psl_section_lut.story_id
! ORDER BY psl_comment.date_created DESC
LIMIT $number";
} else {
***************
*** 122,126 ****
story_id
FROM psl_comment
! ORDER BY date DESC
LIMIT $number";
}
--- 122,126 ----
story_id
FROM psl_comment
! ORDER BY date_created DESC
LIMIT $number";
}
Index: Block_render_submission.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_submission.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Block_render_submission.class 3 Sep 2002 19:54:40 -0000 1.2
--- Block_render_submission.class 21 Nov 2002 18:50:02 -0000 1.3
***************
*** 49,54 ****
$q = "SELECT story_id,
title,
! date_format(time,\"%d-%b-%Y\") AS pdate,
! date_format(time,\"%h:%i\") AS ptime,
name,
email
--- 49,53 ----
$q = "SELECT story_id,
title,
! date_created,
name,
email
***************
*** 80,85 ****
'EMAIL' => $this->db->Record["email"],
'NAME' => $this->db->Record["name"],
! 'TIME' => $this->db->Record["ptime"],
! 'DATE' => $this->db->Record["pdate"]
));
$this->templ->parse("rows","row",true);
--- 79,84 ----
'EMAIL' => $this->db->Record["email"],
'NAME' => $this->db->Record["name"],
! 'TIME' => psl_time12($this->db->Record["date_created"]),
! 'DATE' => psl_dateShort($this->db->Record["date_created"])
));
$this->templ->parse("rows","row",true);
Index: Comment.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Comment.class 24 Oct 2002 18:12:10 -0000 1.35
--- Comment.class 21 Nov 2002 18:50:02 -0000 1.36
***************
*** 116,121 ****
subject,
comment_text,
! date_format(date,\"%W, %M %d \@%h:%i%p\") AS time,
! UNIX_TIMESTAMP(date) AS timestamp,
psl_author.author_realname,
psl_author.url
--- 116,120 ----
subject,
comment_text,
! date_created,
psl_author.author_realname,
psl_author.url
***************
*** 128,134 ****
}
if ($this->order == "DESC") {
! $query .= " ORDER BY date DESC";
} else {
! $query .= " ORDER BY date ASC";
}
--- 127,133 ----
}
if ($this->order == "DESC") {
! $query .= " ORDER BY date_created DESC";
} else {
! $query .= " ORDER BY date_created ASC";
}
***************
*** 168,173 ****
subject,
comment_text,
! date_format(date,\"%W, %M %d \@%h:%i%p\") AS time,
! UNIX_TIMESTAMP(date) AS timestamp,
psl_author.author_realname,
psl_author.url
--- 167,171 ----
subject,
comment_text,
! date_created,
psl_author.author_realname,
psl_author.url
***************
*** 284,289 ****
'MODE' => $this->mode,
'ORDER' => $this->order,
! // 'TIME' => $ary['time']
! 'TIME' => psl_dateTimeLong($ary['timestamp'])
));
if ($this->perm->have_perm("comment")) {
--- 282,286 ----
'MODE' => $this->mode,
'ORDER' => $this->order,
! 'TIME' => psl_dateTimeLong($ary['date_created'])
));
if ($this->perm->have_perm("comment")) {
***************
*** 683,687 ****
story_id,
user_id,
! date,
name,
email,
--- 680,684 ----
story_id,
user_id,
! date_created,
name,
email,
***************
*** 693,697 ****
'$ary[story_id]',
'$ary[user_id]',
! FROM_UNIXTIME($timestamp),
'$ary[name]',
'$ary[email]',
--- 690,694 ----
'$ary[story_id]',
'$ary[user_id]',
! $timestamp,
'$ary[name]',
'$ary[email]',
***************
*** 722,725 ****
--- 719,723 ----
isset($ary['subject']) && isset($ary['comment_text'])) {
+ $timestamp = time();
$q = "UPDATE psl_comment
SET name = '$ary[name]',
***************
*** 903,910 ****
};
$new_parent_id = $this->db->f("parent_id");
!
// Update the comment with the new parent_id.
$q = "UPDATE psl_comment
! SET parent_id = '$new_parent_id'
WHERE story_id = '$story_id'
AND comment_id = '$comment_id'";
--- 901,908 ----
};
$new_parent_id = $this->db->f("parent_id");
! $timestamp = time();
// Update the comment with the new parent_id.
$q = "UPDATE psl_comment
! SET parent_id = '$new_parent_id'
WHERE story_id = '$story_id'
AND comment_id = '$comment_id'";
***************
*** 940,945 ****
}
$q = "UPDATE psl_comment
! SET parent_id = 0
WHERE story_id = '$story_id'
AND comment_id = '$comment_id'";
--- 938,944 ----
}
+ $timestamp = time();
$q = "UPDATE psl_comment
! SET parent_id = 0
WHERE story_id = '$story_id'
AND comment_id = '$comment_id'";
***************
*** 1021,1025 ****
// Now grab all the pending comments
$this->db->query("SELECT comment_id,
! date_format(date,\"%W %M %d, @%h:%i\") AS time,
name,
email,
--- 1020,1024 ----
// Now grab all the pending comments
$this->db->query("SELECT comment_id,
! date_created,
name,
email,
***************
*** 1037,1041 ****
$ary['story_id'] = $story_id;
$ary['comment_id'] = $this->db->f("comment_id");
! $ary['time'] = $this->db->f("time");
$ary['name'] = $this->db->f("name");
$ary['email'] = $this->db->f("email");
--- 1036,1040 ----
$ary['story_id'] = $story_id;
$ary['comment_id'] = $this->db->f("comment_id");
! $ary['time'] = psl_dateTimeLong($this->db->f('date_created'));
$ary['name'] = $this->db->f("name");
$ary['email'] = $this->db->f("email");
Index: Infolog.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Infolog.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Infolog.class 17 Jun 2002 20:58:42 -0000 1.4
--- Infolog.class 21 Nov 2002 18:50:02 -0000 1.5
***************
*** 45,49 ****
'ACTION_URL' => $this->psl['phpself'],
'INFOLOG_ID' => $this->db->Record['id'],
! 'INFOLOG_TIME' => $this->db->Record['time'],
'INFOLOG_DESC' => $this->db->Record['description'],
'INFOLOG_DATA' => $this->db->Record['data']
--- 45,49 ----
'ACTION_URL' => $this->psl['phpself'],
'INFOLOG_ID' => $this->db->Record['id'],
! 'INFOLOG_TIME' => psl_dateTimeShort($this->db->Record['date_created']),
'INFOLOG_DESC' => $this->db->Record['description'],
'INFOLOG_DATA' => $this->db->Record['data']
Index: MailingList.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/MailingList.class,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MailingList.class 17 Jun 2002 18:02:05 -0000 1.10
--- MailingList.class 21 Nov 2002 18:50:02 -0000 1.11
***************
*** 163,166 ****
--- 163,167 ----
WHERE email = '$ary[subscribe_address]'";
$this->db->query($q);
+ $timestamp = time();
if ($this->db->next_record()) {
$id = $this->db->Record["id"];
***************
*** 170,177 ****
} else {
$id = generateID("psl_mailinglist_seq");
! $q = "INSERT INTO psl_mailinglist (id,email,name)
VALUES ('$id',
'$ary[subscribe_address]',
! '$ary[name]')";
}
if (!$this->db->query($q)) {
--- 171,179 ----
} else {
$id = generateID("psl_mailinglist_seq");
! $q = "INSERT INTO psl_mailinglist (id,email,name,date_created)
VALUES ('$id',
'$ary[subscribe_address]',
! '$ary[name]',
! $timestamp)";
}
if (!$this->db->query($q)) {
***************
*** 249,253 ****
name,
email,
! date_format(timestamp,\"%W %M %d, \@ %h:%i%p\") AS time
FROM psl_mailinglist";
$this->db->query($q);
--- 251,255 ----
name,
email,
! date_created
FROM psl_mailinglist";
$this->db->query($q);
***************
*** 263,267 ****
'ID' => $this->db->f("id"),
'EMAIL' => $this->db->f("email"),
! 'TIME' => $this->db->f("time")
));
$this->templ->parse("rows","row",true);
--- 265,269 ----
'ID' => $this->db->f("id"),
'EMAIL' => $this->db->f("email"),
! 'TIME' => psl_dateTimeShort($this->db->f("date_created"))
));
$this->templ->parse("rows","row",true);
***************
*** 316,326 ****
$ary['eyear'] = date("Y");
}
! $begdate = date("Y-m-d H:i:s", mktime(0,0,0,$ary['bmonth'],$ary['bday'],$ary['byear']));
! $enddate = date("Y-m-d H:i:s", mktime(0,0,0,$ary['emonth'],$ary['eday'] + 1,$ary['eyear']));
$q = "SELECT story.story_id,
story.title,
story.dept,
! date_format(story.time,\"%W %M %d, \@ %h:%i%p\") AS datef,
story.intro_text,
story.body_text,
--- 318,332 ----
$ary['eyear'] = date("Y");
}
!
! $begtimestamp = mktime(0,0,0,$ary['bmonth'],$ary['bday'],$ary['byear']);
! $endtimestamp = mktime(0,0,0,$ary['emonth'],$ary['eday'] + 1,$ary['eyear']);
!
! $begdate = date("Y-m-d H:i:s", $begtimestamp);
! $enddate = date("Y-m-d H:i:s", $endtimestamp);
$q = "SELECT story.story_id,
story.title,
story.dept,
! story.date_available,
story.intro_text,
story.body_text,
***************
*** 329,334 ****
psl_author
WHERE psl_author.author_id = story.user_id
! AND story.time >= '$begdate'
! AND story.time <= '$enddate'
ORDER BY time";
--- 335,340 ----
psl_author
WHERE psl_author.author_id = story.user_id
! AND story.date_available >= $begtimestamp
! AND story.date_available <= $endtimestamp
ORDER BY time";
***************
*** 344,348 ****
'TITLE' => $this->db->Record["title"],
'DEPT' => $this->db->Record["dept"],
! 'DATE' => $this->db->Record["datef"],
'STORY' => format_mail($this->db->Record["intro_text"],76,true),
'URL' => $url
--- 350,354 ----
'TITLE' => $this->db->Record["title"],
'DEPT' => $this->db->Record["dept"],
! 'DATE' => psl_DateTimeLong($this->db->Record["date_available"]),
'STORY' => format_mail($this->db->Record["intro_text"],76,true),
'URL' => $url
Index: Poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Poll.class 13 Nov 2002 21:23:25 -0000 1.21
--- Poll.class 21 Nov 2002 18:50:02 -0000 1.22
***************
*** 31,34 ****
--- 31,35 ----
$this->psl = $_PSL;
+
/*
* Templates
***************
*** 258,270 ****
$ary['question_id'] = generateID("psl_comment_dep_seq");
$query = "INSERT INTO psl_poll_question
(question_id,
question_text,
question_total_votes,
! date)
VALUES ('$ary[question_id]',
'$question',
$totalvotes,
! now())";
# echo "QUERY: $query<BR><BR>\n\n";
$this->db->query($query);
--- 259,272 ----
$ary['question_id'] = generateID("psl_comment_dep_seq");
+ $timestamp = time();
$query = "INSERT INTO psl_poll_question
(question_id,
question_text,
question_total_votes,
! date_created)
VALUES ('$ary[question_id]',
'$question',
$totalvotes,
! $timestamp)";
# echo "QUERY: $query<BR><BR>\n\n";
$this->db->query($query);
***************
*** 426,436 ****
return false;
} else {
$query = "INSERT INTO psl_poll_voter
(question_id,
voter_id,
! time)
VALUES ('$question_id',
'$remote_addr',
! now())";
$this->db->query($query);
--- 428,439 ----
return false;
} else {
+ $timestamp = time();
$query = "INSERT INTO psl_poll_voter
(question_id,
voter_id,
! date_created)
VALUES ('$question_id',
'$remote_addr',
! $timestamp)";
$this->db->query($query);
***************
*** 541,553 ****
*/
function listPolls($min) {
-
/* Get preferences */
$q = "SELECT question_id,
question_text,
! date_format(date,\"%W %M %D\") AS polldate,
! UNIX_TIMESTAMP(date) AS polltimestamp
FROM psl_poll_question
! ORDER BY date DESC";
$this->db->query($q);
--- 544,554 ----
*/
function listPolls($min) {
/* Get preferences */
$q = "SELECT question_id,
question_text,
! date_created AS polltimestamp
FROM psl_poll_question
! ORDER BY polltimestamp DESC";
$this->db->query($q);
Index: Story_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_admin.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Story_admin.class 29 Oct 2002 11:12:03 -0000 1.6
--- Story_admin.class 21 Nov 2002 18:50:03 -0000 1.7
***************
*** 29,32 ****
--- 29,33 ----
var $psl;
+
/*
* CONSTRUCTORS
***************
*** 67,70 ****
--- 68,73 ----
'IMAGEDIR' => $this->psl['imageurl']
));
+
+
}
***************
*** 274,279 ****
author.author_name,
commentcount.count AS commentcount,
! date_format(time,$this->admin_dateformat) AS df,
! UNIX_TIMESTAMP(time) AS timestamp
FROM psl_story story,
psl_author author,";
--- 277,281 ----
author.author_name,
commentcount.count AS commentcount,
! story.date_available AS timestamp
FROM psl_story story,
psl_author author,";
***************
*** 305,308 ****
--- 307,311 ----
$q .= "AND '$section_id' = psl_section_lut.section_id ";
}
+
$q .= "ORDER BY order_no DESC, timestamp DESC";
***************
*** 414,419 ****
'HITS' => $this->db->Record["hits"],
'COMMENTCOUNT' => $this->db->Record["commentcount"],
! 'DATE' => psl_dateTimeShort($this->db->Record["timestamp"])
! ));
if ($i%2 == 0) {
$this->template->parse("rows","row","true");
--- 417,422 ----
'HITS' => $this->db->Record["hits"],
'COMMENTCOUNT' => $this->db->Record["commentcount"],
! 'DATE' => psl_dateTimeShort($this->db->Record["timestamp"])));
!
if ($i%2 == 0) {
$this->template->parse("rows","row","true");
***************
*** 650,653 ****
--- 653,662 ----
$this->db->next_record();
+ /* dates are now implemented as UNIX timestamps. This line
+ pretends that the old field (a MySQL datetime) still exists.
+ (MPL - 11/18/2002) */
+ $this->db->Record['time'] = date("Y-m-d H:i:s",$this->db->Record['date_available']);
+ echo "time: " . $this->db->Record['time'] . "\n<br>";
+
$this->template->set_var(array(
'ORDER_NO' => stripslashes($this->db->Record['order_no']),
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Story_base.class 24 Oct 2002 19:36:04 -0000 1.18
--- Story_base.class 21 Nov 2002 18:50:03 -0000 1.19
***************
*** 33,40 ****
* configuration, and time zone correction (yay!).
*/
var $article_dateformat = "\"%W %M %d, %Y \@ %h:%i%p\""; // date for the article page
var $index_dateformat = "\"%W %M %d %Y \@ %h:%i%p\""; // date for the index page
var $admin_dateformat = "\"%d-%b-%Y %H:%i\""; // date for the admin page
!
/*
* CONSTRUCTORS
--- 33,41 ----
* configuration, and time zone correction (yay!).
*/
+
var $article_dateformat = "\"%W %M %d, %Y \@ %h:%i%p\""; // date for the article page
var $index_dateformat = "\"%W %M %d %Y \@ %h:%i%p\""; // date for the index page
var $admin_dateformat = "\"%d-%b-%Y %H:%i\""; // date for the admin page
!
/*
* CONSTRUCTORS
***************
*** 59,64 ****
story.dept,
story.user_id,
! date_format(story.time,$this->article_dateformat) AS datef,
! UNIX_TIMESTAMP(story.time) AS timestamp,
story.intro_text,
story.body_text,
--- 60,64 ----
story.dept,
story.user_id,
! story.date_available AS timestamp,
story.intro_text,
story.body_text,
***************
*** 87,94 ****
AND commentcount.count_id = story.story_id";
$this->db->query($q);
$aff = $this->db->nf();
! // echo "<B>AFFECTED ROWS: $aff<PRE>QUERY: $q</PRE></B><BR>\n";
if ($this->db->next_record()) {
--- 87,96 ----
AND commentcount.count_id = story.story_id";
+ // echo "<B><PRE>QUERY: $q</PRE></B><BR>\n";
+
$this->db->query($q);
$aff = $this->db->nf();
! // echo "<B>AFFECTED ROWS: $aff</B><BR>\n";
if ($this->db->next_record()) {
***************
*** 119,123 ****
$this->story_ary['name'] = $this->db->Record["name"];
$this->story_ary['realname'] = $this->db->Record["realname"];
- // $this->story_ary['datef'] = $this->db->Record["datef"];
$this->story_ary['datef'] = psl_dateTimeLong($this->db->Record['timestamp']);
$this->story_ary['topic_id'] = $this->db->Record["topic_id"];
--- 121,124 ----
***************
*** 185,190 ****
$q .= " psl_story.story_id,
psl_story.title,
! date_format(psl_story.time,$this->index_dateformat) AS dateformat,
! UNIX_TIMESTAMP(psl_story.time) AS timestamp,
psl_story.intro_text,
psl_story.body_text,
--- 186,190 ----
$q .= " psl_story.story_id,
psl_story.title,
! psl_story.date_available AS timestamp,
psl_story.intro_text,
psl_story.body_text,
***************
*** 221,232 ****
AND psl_topic_lut.topic_id = psl_topic.topic_id ";
! // if no date specified, display from now back(no future articles)
if( empty($argv_ary['date'])) {
$argv_ary['date'] = date("Y-m-d H:i:s");
} else {
// kludge to keep the cal block working - jvs - 04/05/2001
$argv_ary['date'] = intval($argv_ary['date'])+1;
! }
!
while( $each_argv = each($argv_ary) ) {
--- 221,240 ----
AND psl_topic_lut.topic_id = psl_topic.topic_id ";
! /* if no date specified, display from now back(no future articles).
! * Note that articles are dated by a unix timestamp now, so
! * date_available is what gets fed to the database (MPL 11/15/2002) */
if( empty($argv_ary['date'])) {
$argv_ary['date'] = date("Y-m-d H:i:s");
+ $argv_ary['date_available'] = time();
} else {
// kludge to keep the cal block working - jvs - 04/05/2001
+ /* to get articles published at any time ON the day in
+ * questions, we effectively we search for articles published
+ * before midnight on the day AFTER the searched for date (MPL
+ * 11/15/2002) */
$argv_ary['date'] = intval($argv_ary['date'])+1;
! $argv_ary['date_available'] = strtotime($argv_ary['date']);
! }
!
while( $each_argv = each($argv_ary) ) {
***************
*** 269,282 ****
break;
! case "date":
/* I'm not sure if this broke anything, but I changed it to
get the calendar links working
04/05/2001 - jvs - change again - for scheduling articles */
// $q .= "AND to_days('$argv_ary[date]') >= to_days(time) ";
! $q .= "AND ('$argv_ary[date]') >= time ";
break;
case "query":
! $querystring = urldecode($argv_ary[query]);
// debug ( "Story:extractStories.querystring", $querystring);
$q .= "AND ((psl_story.title LIKE '%$querystring%')
--- 277,293 ----
break;
! /* we now search on date_available, which is unix timestamp, not a
! date string like date - MPL 11/14/2002 */
! case "date_available":
/* I'm not sure if this broke anything, but I changed it to
get the calendar links working
04/05/2001 - jvs - change again - for scheduling articles */
// $q .= "AND to_days('$argv_ary[date]') >= to_days(time) ";
! //$q .= "AND ('$argv_ary[date]') >= time ";
! $q .= "AND $argv_ary[date_available] >= psl_story.date_available ";
break;
case "query":
! $querystring = urldecode($argv_ary['query']);
// debug ( "Story:extractStories.querystring", $querystring);
$q .= "AND ((psl_story.title LIKE '%$querystring%')
***************
*** 328,332 ****
if (empty($argv_ary['order']) ) {
! $argv_ary['order'] = "time";
}
if (empty($argv_ary['asc']) ) {
--- 339,343 ----
if (empty($argv_ary['order']) ) {
! $argv_ary['order'] = "date_available";
}
if (empty($argv_ary['asc']) ) {
***************
*** 525,530 ****
SET user_id = '$ary[author_id]',
title = '$ary[title]',
! time = '$ary[datetime]',
! order_no = '$ary[order_no]',
dept = '$ary[dept]',
intro_text = '$ary[intro_text]',
--- 536,541 ----
SET user_id = '$ary[author_id]',
title = '$ary[title]',
! date_available = $ary[timestamp],
! order_no = '$ary[order_no]',
dept = '$ary[dept]',
intro_text = '$ary[intro_text]',
***************
*** 577,581 ****
intro_text,
body_text,
! time,
hits,
topic_cache,
--- 588,592 ----
intro_text,
body_text,
! date_available,
hits,
topic_cache,
***************
*** 588,596 ****
'$ary[intro_text]',
'$ary[body_text]',
! '$ary[datetime]',
'0',
'',
'$serial_opts')";
! // echo "<PRE>INSERT INTO: $q</PRE>\n";
$this->db->query($q);
--- 599,607 ----
'$ary[intro_text]',
'$ary[body_text]',
! $ary[timestamp],
'0',
'',
'$serial_opts')";
! debug("Story_base::saveStory: insert query",$q);
$this->db->query($q);
***************
*** 651,668 ****
function cacheStory( $ary, $field="", $story_id="") {
! // debug( "Story.class::cacheStory::ary", $ary);
! // debug( "Story.class::cacheStory::field", $field);
$now = time();
if( !$story_id){
! // $elapsed = $now - $ary[$field]['update'];
! // debug( "Story.class::cacheStory::elapsed", $elapsed);
if ( ($now - $ary[$field]['update']) < $ary[$field]['expire'] ) {
! // debug("Story.class::getStory::using $field cache", "");
$cache = $ary[$field]['cache'];
} else {
! // debug("Story.class::cacheStory::not using $field cache", "");
$cache = "";
}
--- 662,679 ----
function cacheStory( $ary, $field="", $story_id="") {
! debug( "Story.class::cacheStory::ary", $ary);
! debug( "Story.class::cacheStory::field", $field);
$now = time();
if( !$story_id){
! $elapsed = $now - $ary[$field]['update'];
! debug( "Story.class::cacheStory::elapsed", $elapsed);
if ( ($now - $ary[$field]['update']) < $ary[$field]['expire'] ) {
! debug("Story.class::cacheStory::using $field cache", "");
$cache = $ary[$field]['cache'];
} else {
! debug("Story.class::cacheStory::not using $field cache", "");
$cache = "";
}
***************
*** 682,690 ****
}
if( $expired == true) {
! // debug("Story.class::cacheStory::updating cache", "");
! $serial_cache = addslashes(serialize($ary));
$qc = "UPDATE psl_story
SET topic_cache = '$serial_cache'
WHERE story_id = '$story_id'";
$query_result = $this->db->query($qc);
}
--- 693,701 ----
}
if( $expired == true) {
! $serial_cache = addslashes(serialize($ary));
$qc = "UPDATE psl_story
SET topic_cache = '$serial_cache'
WHERE story_id = '$story_id'";
+ debug("Story.class::cacheStory::updating cache", $qc);
$query_result = $this->db->query($qc);
}
Index: Submission.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Submission.class,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Submission.class 24 Oct 2002 18:20:24 -0000 1.11
--- Submission.class 21 Nov 2002 18:50:03 -0000 1.12
***************
*** 32,40 ****
function displaySubmission($submission_id) {
$q = "SELECT email,
name,
title,
intro_text,
! date_format(time,\"%W %M %d, \@ %h:%i%p\") AS datef
FROM psl_submission
WHERE psl_submission.story_id='$submission_id'";
--- 32,42 ----
function displaySubmission($submission_id) {
+ echo "displaySubmission:begin\n";
+
$q = "SELECT email,
name,
title,
intro_text,
! date_created
FROM psl_submission
WHERE psl_submission.story_id='$submission_id'";
***************
*** 48,52 ****
$ary['name'] = $this->db->f("name");
$ary['email'] = $this->db->f("email");
! $ary['datef'] = $this->db->f("datef");
$this->message = $this->showSubmission($ary);
--- 50,54 ----
$ary['name'] = $this->db->f("name");
$ary['email'] = $this->db->f("email");
! $ary['datef'] = psl_dateTimeLong($this->db->f('date_created'));
$this->message = $this->showSubmission($ary);
***************
*** 89,98 ****
$q = "SELECT story_id,
title,
! date_format(time,\"%d-%b-%Y\") AS pdate,
! date_format(time,\"%h:%i\") AS ptime,
name,
email
FROM psl_submission
! ORDER BY time";
$this->db->query($q);
--- 91,99 ----
$q = "SELECT story_id,
title,
! date_created,
name,
email
FROM psl_submission
! ORDER BY date_created";
$this->db->query($q);
***************
*** 119,124 ****
'EMAIL' => $this->db->Record["email"],
'NAME' => $this->db->Record["name"],
! 'TIME' => $this->db->Record["ptime"],
! 'DATE' => $this->db->Record["pdate"]
));
$this->templ->parse("rows","row",true);
--- 120,125 ----
'EMAIL' => $this->db->Record["email"],
'NAME' => $this->db->Record["name"],
! 'TIME' => psl_time12($this->db->Record["date_created"]),
! 'DATE' => psl_dateShort($this->db->Record["date_created"])
));
$this->templ->parse("rows","row",true);
***************
*** 363,367 ****
$ary['submission_id'] = generateID("psl_submission_seq");
!
$q = "INSERT INTO psl_submission
(story_id,
--- 364,369 ----
$ary['submission_id'] = generateID("psl_submission_seq");
!
! $timestamp = time();
$q = "INSERT INTO psl_submission
(story_id,
***************
*** 370,374 ****
title,
intro_text,
! time)
VALUES ('$ary[submission_id]',
'$ary[name]',
--- 372,376 ----
title,
intro_text,
! date_created)
VALUES ('$ary[submission_id]',
'$ary[name]',
***************
*** 376,380 ****
'$ary[subject]',
'$ary[story]',
! now())";
# echo "<H3>INSERT INTO: $q</H3>\n";
$this->db->query($q);
--- 378,382 ----
'$ary[subject]',
'$ary[story]',
! $timestamp)";
# echo "<H3>INSERT INTO: $q</H3>\n";
$this->db->query($q);
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** functions.inc 12 Nov 2002 17:08:16 -0000 1.113
--- functions.inc 21 Nov 2002 18:50:03 -0000 1.114
***************
*** 280,284 ****
if (!empty($_PSL['use_infolog'])) {
// Init vars (we don't like warnings :)
! $fdate = date("Y-m-d H:i:s",time());
$id = generateID('psl_infolog');
$sl_q = new slashDB;
--- 280,284 ----
if (!empty($_PSL['use_infolog'])) {
// Init vars (we don't like warnings :)
! $timestamp = time();
$id = generateID('psl_infolog');
$sl_q = new slashDB;
***************
*** 298,302 ****
// log it
! $sl_q->query("INSERT INTO psl_infolog VALUES('$id','$fdate','$description','$data')");
} elseif ($_PSL['debug']) {
echo "Infolog: Log requested but logging has disabled by config.";
--- 298,303 ----
// log it
! $sl_q->query("INSERT INTO psl_infolog (id,date_created,description,data)
! VALUES('$id','$timestamp','$description','$data')");
} elseif ($_PSL['debug']) {
echo "Infolog: Log requested but logging has disabled by config.";
Index: slashAuth.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuth.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** slashAuth.class 7 Mar 2002 21:45:36 -0000 1.6
--- slashAuth.class 21 Nov 2002 18:50:03 -0000 1.7
***************
*** 96,99 ****
--- 96,101 ----
AND password = '$md5_pw_net'";
+ echo "Query: $q\n";
+
$this->db->query($q);
while ($this->db->next_record()) {
Index: slashDB.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashDB.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** slashDB.class 18 May 2002 15:29:10 -0000 1.4
--- slashDB.class 21 Nov 2002 18:50:03 -0000 1.5
***************
*** 57,60 ****
--- 57,61 ----
}
}
+
}
|