phpslash-commit Mailing List for phpSlash (Page 92)
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
phpslash-commit — A list for automatically mailed SCM Commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(59) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(52) |
Feb
(77) |
Mar
(118) |
Apr
(76) |
May
(106) |
Jun
(145) |
Jul
(9) |
Aug
(15) |
Sep
(78) |
Oct
(83) |
Nov
(105) |
Dec
(51) |
| 2003 |
Jan
(105) |
Feb
(100) |
Mar
(111) |
Apr
(149) |
May
(95) |
Jun
(56) |
Jul
(8) |
Aug
(2) |
Sep
|
Oct
(22) |
Nov
(117) |
Dec
(6) |
| 2004 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
(25) |
May
|
Jun
(11) |
Jul
(26) |
Aug
(85) |
Sep
(119) |
Oct
(312) |
Nov
(271) |
Dec
(5) |
| 2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
(12) |
May
(7) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: nathan h. <nh...@us...> - 2002-04-28 19:45:31
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv3364/public_html
Modified Files:
config.php3
Log Message:
fix parse error, unquoted strings and finish last commit
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** config.php3 27 Apr 2002 20:49:35 -0000 1.135
--- config.php3 28 Apr 2002 02:08:27 -0000 1.136
***************
*** 19,23 ****
/**** START DEBUGING - Comment or delete this for production! ****/
//ini_set('error_reporting', 'E_ALL');
! ini_set('error_reporting', 'E_ALL~E_NOTICE');
/**** END DEBUGING ****/
--- 19,23 ----
/**** START DEBUGING - Comment or delete this for production! ****/
//ini_set('error_reporting', 'E_ALL');
! //ini_set('error_reporting', 'E_ALL~E_NOTICE');
/**** END DEBUGING ****/
|
|
From: nathan h. <nh...@us...> - 2002-04-28 19:45:14
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv3364/class
Modified Files:
Comment.class Poll.class
Log Message:
fix parse error, unquoted strings and finish last commit
Index: Comment.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Comment.class 10 Apr 2002 03:03:43 -0000 1.24
--- Comment.class 28 Apr 2002 02:08:26 -0000 1.25
***************
*** 42,46 ****
$this->order = $ary['order'];
! if ($ary[mode] == "") {
$this->mode = $this->psl['comment_defaultmode'];
} else {
--- 42,46 ----
$this->order = $ary['order'];
! if ($ary['mode'] == "") {
$this->mode = $this->psl['comment_defaultmode'];
} else {
***************
*** 52,56 ****
/* Templates */
! $this->ctempl = new Template($this->psl['templatedir'], remove);
$this->ctempl->debug = 0;
$this->ctempl->set_file(array(
--- 52,56 ----
/* Templates */
! $this->ctempl = new Template($this->psl['templatedir'], 'remove');
$this->ctempl->debug = 0;
$this->ctempl->set_file(array(
***************
*** 321,325 ****
}
! $this->ctempl->set_block(maincomment, each_mode, modes);
while (list($key,$val) = each($this->comment_mode_array)) {
$this->ctempl->set_var(array(
--- 321,325 ----
}
! $this->ctempl->set_block('maincomment', 'each_mode', 'modes');
while (list($key,$val) = each($this->comment_mode_array)) {
$this->ctempl->set_var(array(
***************
*** 358,365 ****
function nested($parent_id, $lvl) {
! $templ = new Template($this->psl[templatedir], remove);
$templ->debug = 0;
$templ->set_file(array(
! 'nestcomment' => "commentNest.tpl"
));
--- 358,365 ----
function nested($parent_id, $lvl) {
! $templ = new Template($this->psl['templatedir'], 'remove');
$templ->debug = 0;
$templ->set_file(array(
! 'nestcomment' => 'commentNest.tpl'
));
***************
*** 375,381 ****
'THREAD' => $thread
));
! $templ->parse(OUT, array("nestcomment"));
$all_comments .= $templ->get('OUT');
! $templ->set_var('THREAD',"");
}
}
--- 375,381 ----
'THREAD' => $thread
));
! $templ->parse('OUT', array("nestcomment"));
$all_comments .= $templ->get('OUT');
! $templ->set_var('THREAD','');
}
}
Index: Poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Poll.class 28 Apr 2002 01:55:08 -0000 1.15
--- Poll.class 28 Apr 2002 02:08:26 -0000 1.16
***************
*** 217,221 ****
return false;
} elseif (empty($ary['choice_ary'][0]) || empty($ary['choice_ary'][1])) {
! $this->message = 'You need to have at least 2 possible answers, otherwise it wouldn't be a very effective poll, would it?';
return false;
}
--- 217,221 ----
return false;
} elseif (empty($ary['choice_ary'][0]) || empty($ary['choice_ary'][1])) {
! $this->message = 'You need to have at least 2 possible answers, otherwise it wouldn\'t be a very effective poll, would it?';
return false;
}
***************
*** 466,470 ****
function getResults($question_id) {
! if (!question_id) {
$question_id = getCurrent();
}
--- 466,470 ----
function getResults($question_id) {
! if (!$question_id) {
$question_id = getCurrent();
}
***************
*** 552,556 ****
$this->db->query($q);
! titlebar('100%', $this->psl[site_name] . ' Polls');
$this->templ->set_block('listpoll', 'newpollbutton');
--- 552,556 ----
$this->db->query($q);
! titlebar('100%', $this->psl['site_name'] . ' Polls');
$this->templ->set_block('listpoll', 'newpollbutton');
|
|
From: nathan h. <nh...@us...> - 2002-04-28 19:45:12
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv1144/public_html Modified Files: config.php3 Log Message: Fixing unqouted strings Index: config.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** config.php3 15 Apr 2002 15:47:40 -0000 1.133 --- config.php3 27 Apr 2002 20:31:10 -0000 1.134 *************** *** 82,87 **** $_PSL['DB_Host'] = "localhost"; ! $_PSL['DB_Database'] = "psl"; ! $_PSL['DB_User'] = "psl"; $_PSL['DB_Password'] = "foo"; --- 82,87 ---- $_PSL['DB_Host'] = "localhost"; ! $_PSL['DB_Database'] = "pslft"; ! $_PSL['DB_User'] = "pslft"; $_PSL['DB_Password'] = "foo"; |
|
From: nathan h. <nh...@us...> - 2002-04-28 19:45:06
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv3364
Modified Files:
CHANGES
Log Message:
fix parse error, unquoted strings and finish last commit
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.470
retrieving revision 1.471
diff -C2 -d -r1.470 -r1.471
*** CHANGES 28 Apr 2002 01:55:08 -0000 1.470
--- CHANGES 28 Apr 2002 02:08:26 -0000 1.471
***************
*** 13,18 ****
9 - Removal of something (kill -9 :)
2002-Apr-27 9:39PM EDT nathan hruby <na...@ds...>
! [BT] - pollList.tpl, pollMoreLink.tpl -> use ROOTURL
Poll.class -> Errors and much overuasgae of double quotes now gone
--- 13,24 ----
9 - Removal of something (kill -9 :)
+ 2002-Apr-27 9:54PM EDT nathan hruby <na...@ds...>
+ [B] - Poll.class - works now, single quoted something that shouldn't have been :)
+ [B] - Poll.class - found a bug where the the question_id was not being seen from the input
+ [W] - Comment.class - Poll class revealed a bunch of unquoted strings
+ [T] - default/pollDisplay.tpl - apply fix from last entry to this file too
+
2002-Apr-27 9:39PM EDT nathan hruby <na...@ds...>
! [BT] - for default and basic pollList.tpl, pollMoreLink.tpl -> use ROOTURL
Poll.class -> Errors and much overuasgae of double quotes now gone
|
|
From: nathan h. <nh...@us...> - 2002-04-28 19:44:59
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv1144 Modified Files: CHANGES Log Message: Fixing unqouted strings Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.462 retrieving revision 1.463 diff -C2 -d -r1.462 -r1.463 *** CHANGES 22 Apr 2002 14:56:09 -0000 1.462 --- CHANGES 27 Apr 2002 20:31:10 -0000 1.463 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-27 4:19PM EDT nathan hruby <na...@ds...> + [B] - Quoted unquoted strings in Block_render_[section|topic|query].class + and functions.inc. + 2002-Apr-22 7:00AM CDT Joe Stewart <joe...@us...> [B] - Story.class, Story_base.class - story preview should work for users |
|
From: nathan h. <nh...@us...> - 2002-04-28 19:44:20
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv4816 Modified Files: CHANGES Log Message: Doc update for register_globals and a futz with config. Will fiox config before release Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.463 retrieving revision 1.464 diff -C2 -d -r1.463 -r1.464 *** CHANGES 27 Apr 2002 20:31:10 -0000 1.463 --- CHANGES 27 Apr 2002 20:49:35 -0000 1.464 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-27 4:45PM EDT nathan hruby <na...@ds...> + [W] - Added info about register_globals setting in the docs. + (register_globals must be on) + 2002-Apr-27 4:19PM EDT nathan hruby <na...@ds...> [B] - Quoted unquoted strings in Block_render_[section|topic|query].class |
|
From: nathan h. <nh...@us...> - 2002-04-28 19:39:54
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv3364/public_html/templates/en/default
Modified Files:
pollDisplay.tpl
Log Message:
fix parse error, unquoted strings and finish last commit
Index: pollDisplay.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/pollDisplay.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pollDisplay.tpl 8 Jun 2001 21:30:00 -0000 1.4
--- pollDisplay.tpl 28 Apr 2002 02:08:27 -0000 1.5
***************
*** 9,14 ****
<!-- END each_choice -->
<input type=submit value=Vote>
! [ <a href="{ROOTDIR}/poll.php3?submit=viewresults&question_id={QUESTION_ID}">Results</a>
! | <a href="{ROOTDIR}/poll.php3">Polls</a> ]
<br>Comments: <b>{COMMENT_COUNT}</b> | Votes: <b>{VOTE_COUNT}</b>
</FONT>
--- 9,14 ----
<!-- END each_choice -->
<input type=submit value=Vote>
! [ <a href="{ROOTURL}/poll.php3?submit=viewresults&question_id={QUESTION_ID}">Results</a>
! | <a href="{ROOTURL}/poll.php3">Polls</a> ]
<br>Comments: <b>{COMMENT_COUNT}</b> | Votes: <b>{VOTE_COUNT}</b>
</FONT>
|
|
From: nathan h. <nh...@us...> - 2002-04-28 19:39:40
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv29002
Modified Files:
CHANGES
Log Message:
fix errors in quote class
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.468
retrieving revision 1.469
diff -C2 -d -r1.468 -r1.469
*** CHANGES 27 Apr 2002 22:02:48 -0000 1.468
--- CHANGES 28 Apr 2002 01:32:39 -0000 1.469
***************
*** 14,17 ****
--- 14,20 ----
2002-Apr-27 5:52PM EDT nathan hruby <na...@ds...>
+ [B] - block_render_quote.class - several errors, including one parse error
+
+ 2002-Apr-27 5:52PM EDT nathan hruby <na...@ds...>
[BT] - *foot*.tpl - Update copyright to reflect the fact it's
not 1999 or 2000 and that this has been a consecutive
|
|
From: nathan h. <nh...@us...> - 2002-04-28 19:38:25
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv630 Modified Files: CHANGES Log Message: Poll Cleanups Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.469 retrieving revision 1.470 diff -C2 -d -r1.469 -r1.470 *** CHANGES 28 Apr 2002 01:32:39 -0000 1.469 --- CHANGES 28 Apr 2002 01:55:08 -0000 1.470 *************** *** 13,17 **** 9 - Removal of something (kill -9 :) ! 2002-Apr-27 5:52PM EDT nathan hruby <na...@ds...> [B] - block_render_quote.class - several errors, including one parse error --- 13,21 ---- 9 - Removal of something (kill -9 :) ! 2002-Apr-27 9:39PM EDT nathan hruby <na...@ds...> ! [BT] - pollList.tpl, pollMoreLink.tpl -> use ROOTURL ! Poll.class -> Errors and much overuasgae of double quotes now gone ! ! 2002-Apr-27 9:25PM EDT nathan hruby <na...@ds...> [B] - block_render_quote.class - several errors, including one parse error |
|
From: nathan h. <nh...@us...> - 2002-04-28 19:38:25
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv630/class
Modified Files:
Poll.class
Log Message:
Poll Cleanups
Index: Poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Poll.class 27 Apr 2002 21:50:12 -0000 1.14
--- Poll.class 28 Apr 2002 01:55:08 -0000 1.15
***************
*** 37,49 ****
$this->templ->debug = 0;
$this->templ->set_file(array(
! 'editpoll' => "pollEdit.tpl",
! 'listpoll' => "pollList.tpl",
! 'showpoll' => "pollShow.tpl",
! 'resultpage' => "pollResultPage.tpl",
! 'displaypoll' => "pollDisplay.tpl"
));
$this->templ->set_var(array(
! 'TITLE' => "Poll Module",
! 'ACTION_URL' => $_PSL['adminurl'] . "/pollAdmin.php3",
'ROOTURL' => $_PSL['rooturl'],
'IMAGEURL' => $_PSL['imageurl']
--- 37,49 ----
$this->templ->debug = 0;
$this->templ->set_file(array(
! 'editpoll' => 'pollEdit.tpl',
! 'listpoll' => 'pollList.tpl',
! 'showpoll' => 'pollShow.tpl',
! 'resultpage' => 'pollResultPage.tpl',
! 'displaypoll' => 'pollDisplay.tpl'
));
$this->templ->set_var(array(
! 'TITLE' => 'Poll Module',
! 'ACTION_URL' => $_PSL['adminurl'] . '/pollAdmin.php3',
'ROOTURL' => $_PSL['rooturl'],
'IMAGEURL' => $_PSL['imageurl']
***************
*** 60,76 ****
function newPoll() {
! titlebar("100%", "Create A New Poll");
$this->templ->set_var(array(
! 'QUESTION_ID' => "",
! 'QUESTION' => "",
! 'NUM_VOTERS' => "0",
! 'CURRENT' => "checked"
));
$this->templ->set_block(editpoll, each_choice, choices);
for ($i = 1; $i <= $this->psl['poll_max_answers']; $i++) {
$this->templ->set_var(array(
! 'CHOICE_VALUE' => "",
! 'NUM_VOTES_VALUE' => "0"
));
$this->templ->parse('choices', 'each_choice', true);
--- 60,76 ----
function newPoll() {
! titlebar('100%', 'Create A New Poll');
$this->templ->set_var(array(
! 'QUESTION_ID' => '',
! 'QUESTION' => '',
! 'NUM_VOTERS' => '0',
! 'CURRENT' => 'checked'
));
$this->templ->set_block(editpoll, each_choice, choices);
for ($i = 1; $i <= $this->psl['poll_max_answers']; $i++) {
$this->templ->set_var(array(
! 'CHOICE_VALUE' => '',
! 'NUM_VOTES_VALUE' => '0'
));
$this->templ->parse('choices', 'each_choice', true);
***************
*** 86,91 ****
function makeCurrent ($question_id) {
! if ($question_id == "") {
! $this->message = "No Question ID";
return false;
} else {
--- 86,91 ----
function makeCurrent ($question_id) {
! if ($question_id == '') {
! $this->message = 'No Question ID';
return false;
} else {
***************
*** 123,127 ****
if ($aff == 1) {
$this->db->next_record();
! return $this->db->f("question_id");
} else {
$this->message = "Either there were no current polls, or more then one? Affected Rows is: '$aff'";
--- 123,127 ----
if ($aff == 1) {
$this->db->next_record();
! return $this->db->f('question_id');
} else {
$this->message = "Either there were no current polls, or more then one? Affected Rows is: '$aff'";
***************
*** 137,141 ****
if (!$question_id) {
! $this->message = "No ID to edit";
return false;
}
--- 137,141 ----
if (!$question_id) {
! $this->message = 'No ID to edit';
return false;
}
***************
*** 155,169 ****
} else {
! titlebar("100%", "Edit An Existing Poll");
! if ($this->db->f("current")) {
! $current = "checked";
} else {
! $current = "";
};
$this->templ->set_var(array(
'QUESTION_ID' => $question_id,
! 'QUESTION' => $this->db->f("question_text"),
'CURRENT' => $current
));
--- 155,169 ----
} else {
! titlebar('100%', 'Edit An Existing Poll');
! if ($this->db->f('current')) {
! $current = 'checked';
} else {
! $current = '';
};
$this->templ->set_var(array(
'QUESTION_ID' => $question_id,
! 'QUESTION' => $this->db->f('question_text'),
'CURRENT' => $current
));
***************
*** 181,186 ****
$x++;
$this->templ->set_var(array(
! 'CHOICE_VALUE' => $this->db->f("answer_text"),
! 'NUM_VOTES_VALUE' => $this->db->f("votes")
));
$this->templ->parse('choices', 'each_choice', true);
--- 181,186 ----
$x++;
$this->templ->set_var(array(
! 'CHOICE_VALUE' => $this->db->f('answer_text'),
! 'NUM_VOTES_VALUE' => $this->db->f('votes')
));
$this->templ->parse('choices', 'each_choice', true);
***************
*** 190,195 ****
$x++;
$this->templ->set_var(array(
! 'CHOICE_VALUE' => "",
! 'NUM_VOTES_VALUE' => ""
));
$this->templ->parse('choices', 'each_choice', true);
--- 190,195 ----
$x++;
$this->templ->set_var(array(
! 'CHOICE_VALUE' => '',
! 'NUM_VOTES_VALUE' => ''
));
$this->templ->parse('choices', 'each_choice', true);
***************
*** 214,221 ****
if (empty($question)) {
! $this->message = "Silly admin! You need to have a question before you can have a poll.";
return false;
} elseif (empty($ary['choice_ary'][0]) || empty($ary['choice_ary'][1])) {
! $this->message = "You need to have at least 2 possible answers, otherwise it wouldn't be a very effective poll, would it?";
return false;
}
--- 214,221 ----
if (empty($question)) {
! $this->message = 'Silly admin! You need to have a question before you can have a poll.';
return false;
} elseif (empty($ary['choice_ary'][0]) || empty($ary['choice_ary'][1])) {
! $this->message = 'You need to have at least 2 possible answers, otherwise it wouldn't be a very effective poll, would it?';
return false;
}
***************
*** 230,234 ****
* value in question_id */
! if ($ary['question_id'] != "") {
/* existing poll */
--- 230,234 ----
* value in question_id */
! if ($ary['question_id'] != '') {
/* existing poll */
***************
*** 277,282 ****
/* if the "current" box is checked, then run the makeCurrent method */
! if ($ary[currentqid] != "") {
! if (!$this->makeCurrent($ary[question_id])) {
$this->message = "There was an error in setting "$question" as the current poll: $this->message\n";
return false;
--- 277,282 ----
/* if the "current" box is checked, then run the makeCurrent method */
! if ($ary['currentqid'] != '') {
! if (!$this->makeCurrent($ary['question_id'])) {
$this->message = "There was an error in setting "$question" as the current poll: $this->message\n";
return false;
***************
*** 289,296 ****
$vote = clean($votes_ary[$x]);
! if ($answer == "") {
$msg .= "Choice $x was ignored<BR>\n";
} else {
! if ($vote == "") {
$vote = 0;
}
--- 289,296 ----
$vote = clean($votes_ary[$x]);
! if ($answer == '') {
$msg .= "Choice $x was ignored<BR>\n";
} else {
! if ($vote == '') {
$vote = 0;
}
***************
*** 348,353 ****
}
! if ($question_id == "") {
! $this->message = "No question_id in Poll::deletePoll";
return false;
}
--- 348,353 ----
}
! if ($question_id == '') {
! $this->message = 'No question_id in Poll::deletePoll';
return false;
}
***************
*** 360,364 ****
$this->db->query($q);
if ($this->db->next_record()) {
! $question_text = $this->db->f("question_text");
} else {
$this->message = "I couldn't find your Poll, $question_id??";
--- 360,364 ----
$this->db->query($q);
if ($this->db->next_record()) {
! $question_text = $this->db->f('question_text');
} else {
$this->message = "I couldn't find your Poll, $question_id??";
***************
*** 372,376 ****
WHERE question_id = '$question_id'";
if (!$this->db->query($q)) {
! $this->message = "There was an error deleting your poll answers";
return false;
}
--- 372,376 ----
WHERE question_id = '$question_id'";
if (!$this->db->query($q)) {
! $this->message = 'There was an error deleting your poll answers';
return false;
}
***************
*** 380,384 ****
WHERE question_id = '$question_id'";
if (!$this->db->query($q)) {
! $this->message = "There was an error deleting your poll question";
return false;
}
--- 380,384 ----
WHERE question_id = '$question_id'";
if (!$this->db->query($q)) {
! $this->message = 'There was an error deleting your poll question';
return false;
}
***************
*** 388,397 ****
WHERE question_id = '$question_id'";
if (!$this->db->query($q)) {
! $this->message = "THere was an error removing the votes";
return false;
}
$cmt = new Comment;
! $del = $cmt->delete("0",$question_id);
$this->message = "Poll "$question_text" was <em>deleted</em><br>\n";
--- 388,397 ----
WHERE question_id = '$question_id'";
if (!$this->db->query($q)) {
! $this->message = 'THere was an error removing the votes';
return false;
}
$cmt = new Comment;
! $del = $cmt->delete('0',$question_id);
$this->message = "Poll "$question_text" was <em>deleted</em><br>\n";
***************
*** 406,410 ****
// Ass-u-me that the vote was successful.
! $this->message = pslgetText("Your vote has been registered");
if (!$remote_addr) {
--- 406,410 ----
// Ass-u-me that the vote was successful.
! $this->message = pslgetText('Your vote has been registered');
if (!$remote_addr) {
***************
*** 482,490 ****
return false;
} else {
! $totalvotes = $this->db->f("question_total_votes");
! $question = $this->db->f("question_text");
! $maxvotes = $this->db->f("maxvotes");
! titlebar("100%","$question");
$query = "SELECT answer_text,
--- 482,490 ----
return false;
} else {
! $totalvotes = $this->db->f('question_total_votes');
! $question = $this->db->f('question_text');
! $maxvotes = $this->db->f('maxvotes');
! titlebar('100%',$question);
$query = "SELECT answer_text,
***************
*** 514,518 ****
$this->templ->set_var(array(
! 'ANSWER' => $this->db->f("answer_text"),
'ROOTDIR' => $this->psl['rooturl'],
'IMAGEWIDTH' => $imagewidth,
--- 514,518 ----
$this->templ->set_var(array(
! 'ANSWER' => $this->db->f('answer_text'),
'ROOTDIR' => $this->psl['rooturl'],
'IMAGEWIDTH' => $imagewidth,
***************
*** 525,533 ****
if ($percent == 0) {
! $this->templ->parse("choices", "zerobar", true);
} else {
! $this->templ->parse("choices", "regbar", true);
};
! $this->templ->parse("choices", "each_choice", true);
}
$this->templ->parse('FORM', 'showpoll');
--- 525,533 ----
if ($percent == 0) {
! $this->templ->parse('choices', 'zerobar', true);
} else {
! $this->templ->parse('choices', 'regbar', true);
};
! $this->templ->parse('choices', 'each_choice', true);
}
$this->templ->parse('FORM', 'showpoll');
***************
*** 552,561 ****
$this->db->query($q);
! titlebar("100%", $this->psl[site_name] . " Polls");
! $this->templ->set_block("listpoll","newpollbutton");
! $this->templ->set_block("listpoll","morelink");
! $this->templ->set_block("listpoll","row", "rows");
! $this->templ->set_block("row","admin");
/* advance the db pointer to $min */
--- 552,561 ----
$this->db->query($q);
! titlebar('100%', $this->psl[site_name] . ' Polls');
! $this->templ->set_block('listpoll', 'newpollbutton');
! $this->templ->set_block('listpoll', 'morelink');
! $this->templ->set_block('listpoll', 'row', 'rows');
! $this->templ->set_block('row', 'admin');
/* advance the db pointer to $min */
***************
*** 565,588 ****
}
while ($this->db->next_record() && ($min + 20) > $thisid++) {
! $action = $this->templ->get("ACTION_URL");
$this->templ->set_var(array(
! 'ADMIN_URL' => $this->psl['adminurl'] . "/pollAdmin.php3",
! 'QUESTION_ID' => $this->db->f("question_id"),
! 'QUESTION' => $this->db->f("question_text"),
! 'POLLDATE' => $this->db->f("polldate"),
'ID' => $thisid
));
/* if no perms, then clear the admin var */
! if (!$this->perm->have_perm("poll")) {
! $this->templ->set_var("admin","");
}
$this->templ->parse('rows','row',true);
}
if (!$this->db->next_record()) {
! $this->templ->set_var("morelink","");
}
! if (!$this->perm->have_perm("poll")) {
! $this->templ->set_var("newpollbutton","");
}
$this->templ->parse('OUT','listpoll');
--- 565,588 ----
}
while ($this->db->next_record() && ($min + 20) > $thisid++) {
! $action = $this->templ->get('ACTION_URL');
$this->templ->set_var(array(
! 'ADMIN_URL' => $this->psl['adminurl'] . '/pollAdmin.php3',
! 'QUESTION_ID' => $this->db->f('question_id'),
! 'QUESTION' => $this->db->f('question_text'),
! 'POLLDATE' => $this->db->f('polldate'),
'ID' => $thisid
));
/* if no perms, then clear the admin var */
! if (!$this->perm->have_perm('poll')) {
! $this->templ->set_var('admin','');
}
$this->templ->parse('rows','row',true);
}
if (!$this->db->next_record()) {
! $this->templ->set_var('morelink','');
}
! if (!$this->perm->have_perm('poll')) {
! $this->templ->set_var('newpollbutton','');
}
$this->templ->parse('OUT','listpoll');
***************
*** 602,608 ****
* booth that you see on the main page.
*/
! function getPollBooth($question_id = "") {
! if ($question_id == "") {
$question_id = $this->getCurrent();
}
--- 602,608 ----
* booth that you see on the main page.
*/
! function getPollBooth($question_id = '') {
! if ($question_id == '') {
$question_id = $this->getCurrent();
}
***************
*** 622,636 ****
$this->db->query($q);
! $this->templ->set_block("displaypoll", "each_choice", "choices");
while ($this->db->next_record()) {
$this->templ->set_var(array(
'QUESTION_ID' => $question_id,
! 'QUESTION' => $this->db->f("question_text"),
! 'ANSWER_ID' => $this->db->f("answer_id"),
! 'ANSWER' => $this->db->f("answer_text"),
! 'COMMENT_COUNT' => $this->db->f("count"),
! 'VOTE_COUNT' => $this->db->f("question_total_votes"),
! 'ACTION_URL' => $this->psl['rooturl'] . "/poll.php3"
));
$this->templ->parse('choices', 'each_choice', true);
--- 622,636 ----
$this->db->query($q);
! $this->templ->set_block('displaypoll', 'each_choice', 'choices');
while ($this->db->next_record()) {
$this->templ->set_var(array(
'QUESTION_ID' => $question_id,
! 'QUESTION' => $this->db->f('question_text'),
! 'ANSWER_ID' => $this->db->f('answer_id'),
! 'ANSWER' => $this->db->f('answer_text'),
! 'COMMENT_COUNT' => $this->db->f('count'),
! 'VOTE_COUNT' => $this->db->f('question_total_votes'),
! 'ACTION_URL' => $this->psl['rooturl'] . '/poll.php3'
));
$this->templ->parse('choices', 'each_choice', true);
|
|
From: nathan h. <nh...@us...> - 2002-04-28 19:38:10
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv9026/public_html/admin
Modified Files:
mailinglistAdmin.php3
Log Message:
fix no output in mailinglist admin
Index: mailinglistAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/mailinglistAdmin.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mailinglistAdmin.php3 1 Feb 2002 04:23:52 -0000 1.3
--- mailinglistAdmin.php3 27 Apr 2002 21:07:50 -0000 1.4
***************
*** 39,45 ****
--- 39,47 ----
case "subscribe":
$list->subscribe($HTTP_POST_VARS);
+ echo $list->message;
break;
case "unsubscribe":
$list->unsubscribe($unsubscribe_address);
+ echo $list->message;
break;
case "mass_delete":
|
|
From: nathan h. <nh...@us...> - 2002-04-28 19:38:05
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv18441/class
Modified Files:
Poll.class
Log Message:
Fix link bug
Index: Poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Poll.class 3 Feb 2002 02:49:40 -0000 1.13
--- Poll.class 27 Apr 2002 21:50:12 -0000 1.14
***************
*** 46,50 ****
'TITLE' => "Poll Module",
'ACTION_URL' => $_PSL['adminurl'] . "/pollAdmin.php3",
! 'ROOTDIR' => $_PSL['rooturl'],
'IMAGEURL' => $_PSL['imageurl']
));
--- 46,50 ----
'TITLE' => "Poll Module",
'ACTION_URL' => $_PSL['adminurl'] . "/pollAdmin.php3",
! 'ROOTURL' => $_PSL['rooturl'],
'IMAGEURL' => $_PSL['imageurl']
));
|
|
From: Joe S. <joe...@us...> - 2002-04-22 15:08:04
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv17590/phpslash-ft/class
Modified Files:
Story.class Story_base.class
Log Message:
story date on preview fixes
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Story.class 15 Apr 2002 15:47:37 -0000 1.33
--- Story.class 22 Apr 2002 14:56:09 -0000 1.34
***************
*** 633,637 ****
* we get the time from the array if it's valid. else we generate it.
*/
! $q = "SELECT date_format('$ary[time]',$this->article_dateformat) AS datef";
$this->db->query($q);
$this->db->next_record();
--- 633,645 ----
* we get the time from the array if it's valid. else we generate it.
*/
! if ($ary['datetime'] == "") {
! if( $ary['story_date'] ) {
! $ary['datetime'] = implode( '-', $ary['story_date']) ." ". implode( ':',$ary['story_time']);
! } else {
! $ary['datetime'] = date("Y-m-d H:i:s");
! }
! }
!
! $q = "SELECT date_format('$ary[datetime]',$this->article_dateformat) AS datef";
$this->db->query($q);
$this->db->next_record();
***************
*** 1046,1053 ****
$ary['body_text'] = clean($ary['body_text']);
$ary['title'] = clean($ary['title']);
! if( $ary['time'] == "") {
! $ary['time'] = date("Y-m-d H:i:s");
! }
!
$this->template->set_var(array(
'DEPT' => $ary['dept'],
--- 1054,1062 ----
$ary['body_text'] = clean($ary['body_text']);
$ary['title'] = clean($ary['title']);
! if( $ary['story_date'] ) {
! $ary['datetime'] = implode( '-', $ary['story_date']) ." ". implode( ':',$ary['story_time']);
! } else {
! $ary['datetime'] = date("Y-m-d H:i:s");
! }
$this->template->set_var(array(
'DEPT' => $ary['dept'],
***************
*** 1055,1059 ****
'BODYTEXT' => $ary['body_text'],
'TITLE' => $ary['title'],
! 'TIME' => $ary['time'],
'AUTHOR_ID' => $author_id,
'AUTHOR_NAME' => $author_name
--- 1064,1068 ----
'BODYTEXT' => $ary['body_text'],
'TITLE' => $ary['title'],
! 'TIME' => $ary['datetime'],
'AUTHOR_ID' => $author_id,
'AUTHOR_NAME' => $author_name
***************
*** 1063,1071 ****
$this->template->set_var(array(
'TYPE' => "hidden",
! 'TIME_VALUE' => $ary['time']
));
$this->template->parse("datetime_rows","datetime_row",true);
} else {
! $datetime = split( ' ', $ary['time']);
$story_date = split( '-', $datetime[0]);
$story_time = split( ':', $datetime[1]);
--- 1072,1080 ----
$this->template->set_var(array(
'TYPE' => "hidden",
! 'TIME_VALUE' => $ary['datetime']
));
$this->template->parse("datetime_rows","datetime_row",true);
} else {
! $datetime = split( ' ', $ary['datetime']);
$story_date = split( '-', $datetime[0]);
$story_time = split( ':', $datetime[1]);
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Story_base.class 15 Apr 2002 15:59:05 -0000 1.10
--- Story_base.class 22 Apr 2002 14:56:09 -0000 1.11
***************
*** 460,468 ****
}
! if ($ary['time'] == "") {
if( $ary['story_date'] ) {
! $ary['time'] = implode( '-', $ary['story_date']) ." ". implode( ':',$ary['story_time']);
} else {
! $ary['time'] = date("Y-m-d H:i:s");
}
}
--- 460,468 ----
}
! if ($ary['datetime'] == "") {
if( $ary['story_date'] ) {
! $ary['datetime'] = implode( '-', $ary['story_date']) ." ". implode( ':',$ary['story_time']);
} else {
! $ary['datetime'] = date("Y-m-d H:i:s");
}
}
***************
*** 482,486 ****
SET user_id = '$ary[author_id]',
title = '$ary[title]',
! time = '$ary[time]',
dept = '$ary[dept]',
intro_text = '$ary[intro_text]',
--- 482,486 ----
SET user_id = '$ary[author_id]',
title = '$ary[title]',
! time = '$ary[datetime]',
dept = '$ary[dept]',
intro_text = '$ary[intro_text]',
***************
*** 539,543 ****
'$ary[intro_text]',
'$ary[body_text]',
! '$ary[time]',
'0')";
// echo "<PRE>INSERT INTO: $q</PRE>\n";
--- 539,543 ----
'$ary[intro_text]',
'$ary[body_text]',
! '$ary[datetime]',
'0')";
// echo "<PRE>INSERT INTO: $q</PRE>\n";
|
|
From: Joe S. <joe...@us...> - 2002-04-22 15:08:04
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv17590/phpslash-ft Modified Files: CHANGES Log Message: story date on preview fixes Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.461 retrieving revision 1.462 diff -C2 -d -r1.461 -r1.462 *** CHANGES 22 Apr 2002 11:49:06 -0000 1.461 --- CHANGES 22 Apr 2002 14:56:09 -0000 1.462 *************** *** 14,17 **** --- 14,21 ---- 2002-Apr-22 7:00AM CDT Joe Stewart <joe...@us...> + [B] - Story.class, Story_base.class - story preview should work for users + with and without storyeditor privileges. + + 2002-Apr-22 7:00AM CDT Joe Stewart <joe...@us...> [W] - fr.php3 - tobozo upated the French translation. |
|
From: Joe S. <joe...@us...> - 2002-04-22 11:49:10
|
Update of /cvsroot/phpslash/phpslash-ft/class/locale
In directory usw-pr-cvs1:/tmp/cvs-serv14092/phpslash-ft/class/locale
Modified Files:
fr.php3
Log Message:
updated French translation
Index: fr.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/locale/fr.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fr.php3 19 Dec 2001 20:00:41 -0000 1.2
--- fr.php3 22 Apr 2002 11:49:07 -0000 1.3
***************
*** 4,8 ****
* translations named using POSIX locale conventions ( en, es, de, etc)
*
! * Please don't use HTML code here!
*/
$pslstrings = array(
--- 4,8 ----
* translations named using POSIX locale conventions ( en, es, de, etc)
*
! * Please don't use HTML code here!
*/
$pslstrings = array(
***************
*** 43,47 ****
"About" =>
! "A propos de..",
"Topic" =>
--- 43,47 ----
"About" =>
! "A propos de...",
"Topic" =>
***************
*** 78,81 ****
--- 78,84 ----
"Carnet de bord",
+ "User" =>
+ "Utilisateur",
+
// functions.inc
"NO TITLE" =>
***************
*** 106,109 ****
--- 109,115 ----
"Recherche sur le terme ' %s '",
+ "Search Comment text" =>
+ "Rechercher dans les Commentaires",
+
"All Topics" =>
"Toutes les categories",
***************
*** 212,216 ****
"Show Pending" =>
! "Afficher les commentaires en attente",
// Glossary.class
--- 218,222 ----
"Show Pending" =>
! "Afficher les commentaires en attente de validation",
// Glossary.class
***************
*** 227,234 ****
"There was an error inserting your subscription information into the database." =>
! "Il s'est produit une erreur lors de l'insertion de vos infos dans la base de données.",
"There was an error inserting your frequency data." =>
! "Il s'est produit une erreur lors de l'insertion de la frequence des données.",
--- 233,240 ----
"There was an error inserting your subscription information into the database." =>
! "Il s'est produit une erreur dans la base de données lors de l'insertion de vos infos de souscription .",
"There was an error inserting your frequency data." =>
! "Il s'est produit une erreur lors de l'insertion des données de fréquence .",
***************
*** 240,244 ****
"The email address '%s' is not found" =>
! "L'adresse ''%s' n'a pas été trouvée",
"Email: '%s' is not found" =>
--- 246,250 ----
"The email address '%s' is not found" =>
! "L'adresse '%s' n'a pas été trouvée",
"Email: '%s' is not found" =>
***************
*** 285,290 ****
"Your vote hasn't been registered because there was no remote address: %s" =>
"Le vote n'a pas été enregistré par manque d'adresse distante: %s",
"Your vote hasn't been registered because you (or someone from your computer) has already voted." =>
! "Le vote n'a pas été enregistré car ca ressemble a de la triche.",
--- 291,297 ----
"Your vote hasn't been registered because there was no remote address: %s" =>
"Le vote n'a pas été enregistré par manque d'adresse distante: %s",
+
"Your vote hasn't been registered because you (or someone from your computer) has already voted." =>
! "Le vote n'a pas été enregistré car ca ressemble trop a de la triche.",
|
|
From: Joe S. <joe...@us...> - 2002-04-22 11:49:10
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv14092/phpslash-ft Modified Files: CHANGES Log Message: updated French translation Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.460 retrieving revision 1.461 diff -C2 -d -r1.460 -r1.461 *** CHANGES 19 Apr 2002 17:26:37 -0000 1.460 --- CHANGES 22 Apr 2002 11:49:06 -0000 1.461 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-22 7:00AM CDT Joe Stewart <joe...@us...> + [W] - fr.php3 - tobozo upated the French translation. + 2002-Apr-19 12:00PM CDT Joe Stewart <joe...@us...> [T] - basic/storyNew.tpl, basic.css - moved alignment to stylesheet per |
|
From: Joe S. <joe...@us...> - 2002-04-19 17:38:28
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv18080/phpslash-ft/public_html/templates/en/basic
Modified Files:
storyNew.tpl
Log Message:
storyNew.tpl - align in basic.css
Index: storyNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/storyNew.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** storyNew.tpl 19 Apr 2002 16:34:39 -0000 1.4
--- storyNew.tpl 19 Apr 2002 17:26:37 -0000 1.5
***************
*** 6,18 ****
<table cellpadding="5" cellspacing="0" border="0">
<tr>
! <td class="descr" align="right">Title</td>
<td colspan="3"><input type="text" name="title" value="{TITLE}" size="50" /></td>
</tr>
<tr>
! <td class="descr" align="right">Dept.</td>
<td colspan="3"><input type="text" name="dept" value="{DEPT}" size="50" /></td>
</tr>
<tr>
! <td class="descr" align="right">Topic</td>
<td>
<select size="4" multiple="multiple" name="topic_id_ary[]">
--- 6,18 ----
<table cellpadding="5" cellspacing="0" border="0">
<tr>
! <td class="descr">Title</td>
<td colspan="3"><input type="text" name="title" value="{TITLE}" size="50" /></td>
</tr>
<tr>
! <td class="descr">Dept.</td>
<td colspan="3"><input type="text" name="dept" value="{DEPT}" size="50" /></td>
</tr>
<tr>
! <td class="descr">Topic</td>
<td>
<select size="4" multiple="multiple" name="topic_id_ary[]">
***************
*** 22,26 ****
</select>
</td>
! <td class="descr" align="right">Section</td>
<td>
<select size="4" multiple="multiple" name="section_id_ary[]">
--- 22,26 ----
</select>
</td>
! <td class="descr">Section</td>
<td>
<select size="4" multiple="multiple" name="section_id_ary[]">
***************
*** 32,36 ****
</tr>
<tr>
! <td class="descr" align="right">Author</td>
<td colspan="3">
<select name="author_id">
--- 32,36 ----
</tr>
<tr>
! <td class="descr">Author</td>
<td colspan="3">
<select name="author_id">
***************
*** 42,46 ****
</tr>
<tr>
! <td class="descr" align="right">Date</td>
<td>
<!-- BEGIN datetime_row -->
--- 42,46 ----
</tr>
<tr>
! <td class="descr">Date</td>
<td>
<!-- BEGIN datetime_row -->
***************
*** 67,71 ****
<!-- END day_row -->
</select></td>
! <td class="descr" align="right">Time</td>
<td>
<select name=story_time[]>
--- 67,71 ----
<!-- END day_row -->
</select></td>
! <td class="descr">Time</td>
<td>
<select name=story_time[]>
***************
*** 90,98 ****
</tr>
<tr>
! <td class="descr" align="right">Intro Text</td>
<td colspan="3"><textarea name="intro_text" wrap="physical" cols="75" rows="10">{INTROTEXT}</textarea></td>
</tr>
<tr>
! <td class="descr" align="right">Body Text</td>
<td colspan="3"><textarea name="body_text" wrap="physical" cols="75" rows="10">{BODYTEXT}</textarea></td>
</tr>
--- 90,98 ----
</tr>
<tr>
! <td class="descr">Intro Text</td>
<td colspan="3"><textarea name="intro_text" wrap="physical" cols="75" rows="10">{INTROTEXT}</textarea></td>
</tr>
<tr>
! <td class="descr">Body Text</td>
<td colspan="3"><textarea name="body_text" wrap="physical" cols="75" rows="10">{BODYTEXT}</textarea></td>
</tr>
|
|
From: Joe S. <joe...@us...> - 2002-04-19 17:38:21
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/styles
In directory usw-pr-cvs1:/tmp/cvs-serv18080/phpslash-ft/public_html/styles
Modified Files:
basic.css
Log Message:
storyNew.tpl - align in basic.css
Index: basic.css
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/styles/basic.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** basic.css 9 Apr 2002 16:58:39 -0000 1.1
--- basic.css 19 Apr 2002 17:26:39 -0000 1.2
***************
*** 382,385 ****
--- 382,387 ----
#storyNew .descr {
+ text-align: right;
+ vertical-align: middle;
}
|
|
From: Joe S. <joe...@us...> - 2002-04-19 17:38:21
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv18080/phpslash-ft Modified Files: CHANGES Log Message: storyNew.tpl - align in basic.css Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.459 retrieving revision 1.460 diff -C2 -d -r1.459 -r1.460 *** CHANGES 19 Apr 2002 16:34:39 -0000 1.459 --- CHANGES 19 Apr 2002 17:26:37 -0000 1.460 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-19 12:00PM CDT Joe Stewart <joe...@us...> + [T] - basic/storyNew.tpl, basic.css - moved alignment to stylesheet per + Lars instruction. + 2002-Apr-19 11:30AM CDT Joe Stewart <joe...@us...> [T] - basic/storyNew.tpl and default/storyNew.tpl - html changes only. |
|
From: Joe S. <joe...@us...> - 2002-04-19 16:34:44
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv27489/phpslash-ft Modified Files: CHANGES Log Message: storyNew.tpl - html changes only Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.458 retrieving revision 1.459 diff -C2 -d -r1.458 -r1.459 *** CHANGES 17 Apr 2002 15:37:42 -0000 1.458 --- CHANGES 19 Apr 2002 16:34:39 -0000 1.459 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-19 11:30AM CDT Joe Stewart <joe...@us...> + [T] - basic/storyNew.tpl and default/storyNew.tpl - html changes only. + 2002-Apr-17 10:30AM CDT Joe Stewart <joe...@us...> [B] - article.php3 - change permission for modify link to storyeditor. |
|
From: Joe S. <joe...@us...> - 2002-04-19 16:34:43
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv27489/phpslash-ft/public_html/templates/en/basic
Modified Files:
storyNew.tpl
Log Message:
storyNew.tpl - html changes only
Index: storyNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/storyNew.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** storyNew.tpl 15 Apr 2002 13:13:08 -0000 1.3
--- storyNew.tpl 19 Apr 2002 16:34:39 -0000 1.4
***************
*** 6,105 ****
<table cellpadding="5" cellspacing="0" border="0">
<tr>
! <td class="descr">Title</td>
! <td><input type="text" name="title" value="{TITLE}" size="50" /></td>
</tr>
<tr>
! <td class="descr">Dept.</td>
! <td><input type="text" name="dept" value="{DEPT}" size="50" /></td>
</tr>
<tr>
! <td colspan="2">
! <table border="0">
! <tr>
! <td class="descr">Topic</td>
! <td>
! <select size="4" multiple="multiple" name="topic_id_ary[]">
! <!-- BEGIN topic_row -->
! <option value="{TOPIC_ID}" {SELECTED}>{TOPIC_NAME}</option>
! <!-- END topic_row -->
! </select>
! </td>
! <td class="descr">Section</td>
! <td>
! <select size="4" multiple="multiple" name="section_id_ary[]">
! <!-- BEGIN section_row -->
! <option value="{SECTION_ID}" {SELECTED}>{SECTION_NAME}</option>
! <!-- END section_row -->
! </select>
! </td>
! </tr>
! <tr>
! <td class="descr">Author</td>
! <td>
! <select name="author_id">
! <!-- BEGIN author_row -->
! <option value="{AUTHOR_ID}" {AUTHOR_SELECTED}>{AUTHOR_NAME}</option>
! <!-- END author_row -->
! </select>
! </td>
! <td class="descr">Time</td>
! <td>
! <!-- BEGIN datetime_row -->
! <INPUT type=hidden name=datetime value="{TIME}" size=20>{TIME_VALUE}
! <!-- END datetime_row -->
! <!-- BEGIN datetimeset_row -->
! <select name=story_date[]>
! <!-- BEGIN year_row -->
! <option {SELECTED} value="{STORYYEAR}">{STORYYEAR}</option>
! <!-- END year_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN month_row -->
! <option {SELECTED}>{STORYMONTH}</option>
! <!-- END month_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN day_row -->
! <option {SELECTED}>{STORYDAY}</option>
! <!-- END day_row -->
! </select>
! Time
! <select name=story_time[]>
! <!-- BEGIN hour_row -->
! <option {SELECTED}>{STORYHOUR}</option>
! <!-- END hour_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN minute_row -->
! <option {SELECTED}>{STORYMINUTE}</option>
! <!-- END minute_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN second_row -->
! <option {SELECTED}>{STORYSECOND}</option>
! <!-- END second_row -->
! </select>
! <!-- END datetimeset_row -->
! </td>
! </tr>
! </table>
</td>
</tr>
</table>
- <p class="descr">Intro Text</p>
- <textarea name="intro_text" wrap="physical" cols="75" rows="10">{INTROTEXT}</textarea>
- <p class="descr">Body Text</p>
- <textarea name="body_text" wrap="physical" cols="75" rows="10">{BODYTEXT}</textarea>
- <p><span class="descr">New Story Options: </span>
- <input type="radio" {PLAIN_CHKBOX} name="content" value="plain" /> Plain Text
- <input type="radio" {HTML_CHKBOX} name="content" value="html" /> HTML
- <input type="radio" {EXTTRANS_CHKBOX} name="content" value="exttrans" /> Extended Translation</p>
-
- <input type="submit" name="submit" value="save" />
- <input type="submit" name="submit" value="preview" />
</form>
</div> <!-- id="storyNew" -->
--- 6,117 ----
<table cellpadding="5" cellspacing="0" border="0">
<tr>
! <td class="descr" align="right">Title</td>
! <td colspan="3"><input type="text" name="title" value="{TITLE}" size="50" /></td>
</tr>
<tr>
! <td class="descr" align="right">Dept.</td>
! <td colspan="3"><input type="text" name="dept" value="{DEPT}" size="50" /></td>
</tr>
<tr>
! <td class="descr" align="right">Topic</td>
! <td>
! <select size="4" multiple="multiple" name="topic_id_ary[]">
! <!-- BEGIN topic_row -->
! <option value="{TOPIC_ID}" {SELECTED}>{TOPIC_NAME}</option>
! <!-- END topic_row -->
! </select>
! </td>
! <td class="descr" align="right">Section</td>
! <td>
! <select size="4" multiple="multiple" name="section_id_ary[]">
! <!-- BEGIN section_row -->
! <option value="{SECTION_ID}" {SELECTED}>{SECTION_NAME}</option>
! <!-- END section_row -->
! </select>
! </td>
! </tr>
! <tr>
! <td class="descr" align="right">Author</td>
! <td colspan="3">
! <select name="author_id">
! <!-- BEGIN author_row -->
! <option value="{AUTHOR_ID}" {AUTHOR_SELECTED}>{AUTHOR_NAME}</option>
! <!-- END author_row -->
! </select>
! </td>
! </tr>
! <tr>
! <td class="descr" align="right">Date</td>
! <td>
! <!-- BEGIN datetime_row -->
! <INPUT type=hidden name=datetime value="{TIME}" size=20>{TIME_VALUE}
! </td>
! <td colspan="2"> </td>
! <!-- END datetime_row -->
! <!-- BEGIN datetimeset_row -->
! <select name=story_date[]>
! <!-- BEGIN year_row -->
! <option {SELECTED} value="{STORYYEAR}">{STORYYEAR}</option>
! <!-- END year_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN month_row -->
! <option {SELECTED}>{STORYMONTH}</option>
! <!-- END month_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN day_row -->
! <option {SELECTED}>{STORYDAY}</option>
! <!-- END day_row -->
! </select></td>
! <td class="descr" align="right">Time</td>
! <td>
! <select name=story_time[]>
! <!-- BEGIN hour_row -->
! <option {SELECTED}>{STORYHOUR}</option>
! <!-- END hour_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN minute_row -->
! <option {SELECTED}>{STORYMINUTE}</option>
! <!-- END minute_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN second_row -->
! <option {SELECTED}>{STORYSECOND}</option>
! <!-- END second_row -->
! </select>
! <!-- END datetimeset_row -->
! </td>
! </tr>
! <tr>
! <td class="descr" align="right">Intro Text</td>
! <td colspan="3"><textarea name="intro_text" wrap="physical" cols="75" rows="10">{INTROTEXT}</textarea></td>
! </tr>
! <tr>
! <td class="descr" align="right">Body Text</td>
! <td colspan="3"><textarea name="body_text" wrap="physical" cols="75" rows="10">{BODYTEXT}</textarea></td>
! </tr>
! <tr>
! <td> </td>
! <td colspan="3">
! <span class="descr">New Story Options: </span>
! <input type="radio" {PLAIN_CHKBOX} name="content" value="plain" /> Plain Text
! <input type="radio" {HTML_CHKBOX} name="content" value="html" /> HTML
! <input type="radio" {EXTTRANS_CHKBOX} name="content" value="exttrans" /> Extended Translation</p>
! </td>
! </tr>
! <tr>
! <td> </td>
! <td colspan="3">
! <input type="submit" name="submit" value="save" />
! <input type="submit" name="submit" value="preview" />
</td>
</tr>
</table>
</form>
</div> <!-- id="storyNew" -->
|
|
From: Joe S. <joe...@us...> - 2002-04-19 16:34:43
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv27489/phpslash-ft/public_html/templates/en/default
Modified Files:
storyNew.tpl
Log Message:
storyNew.tpl - html changes only
Index: storyNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/storyNew.tpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** storyNew.tpl 15 Apr 2002 14:50:22 -0000 1.13
--- storyNew.tpl 19 Apr 2002 16:34:38 -0000 1.14
***************
*** 5,20 ****
<TABLE CELLPADDING=5 CELLSPACING=0 BORDER=0>
<TR>
! <TD>Title</TD>
! <TD><INPUT type=text name=title value="{TITLE}" size=50></TD>
</TR>
<TR>
! <TD>Dept.</TD>
! <TD><INPUT type=text name=dept value="{DEPT}" size=50></TD>
</TR>
<TR>
! <TD COLSPAN=2>
! <TABLE CELLPADDING=0 CELLSPACING=0 BORDER=0 WIDTH=100%>
! <TR>
! <TD>Topic</TD>
<TD>
<SELECT SIZE=4 MULTIPLE NAME=topic_id_ary[]>
--- 5,17 ----
<TABLE CELLPADDING=5 CELLSPACING=0 BORDER=0>
<TR>
! <TD align="right">Title</TD>
! <TD COLSPAN=3><INPUT type=text name=title value="{TITLE}" size=50></TD>
</TR>
<TR>
! <TD align="right">Dept.</TD>
! <TD COLSPAN=3><INPUT type=text name=dept value="{DEPT}" size=50></TD>
</TR>
<TR>
! <TD align="right">Topic</TD>
<TD>
<SELECT SIZE=4 MULTIPLE NAME=topic_id_ary[]>
***************
*** 24,28 ****
</SELECT>
</TD>
! <TD>Section</TD>
<TD>
<SELECT SIZE=4 MULTIPLE NAME=section_id_ary[]>
--- 21,25 ----
</SELECT>
</TD>
! <TD align="right">Section</TD>
<TD>
<SELECT SIZE=4 MULTIPLE NAME=section_id_ary[]>
***************
*** 35,39 ****
<TR>
! <TD valign="top">Author</TD>
<TD valign="top">
<select name=author_id>
--- 32,36 ----
<TR>
! <TD align="right" valign="top">Author</TD>
<TD valign="top">
<select name=author_id>
***************
*** 43,47 ****
</select>
</TD>
! <TD>Date</TD>
<TD>
<!-- BEGIN datetime_row -->
--- 40,49 ----
</select>
</TD>
! <TD> </TD>
! <TD> </TD>
! </TR>
!
! <TR>
! <TD align="right">Date</TD>
<TD>
<!-- BEGIN datetime_row -->
***************
*** 66,70 ****
<!-- END day_row -->
</select>
! Time
<select name=story_time[]>
<!-- BEGIN hour_row -->
--- 68,74 ----
<!-- END day_row -->
</select>
! </TD>
! <TD align="right">Time</TD>
! <TD>
<select name=story_time[]>
<!-- BEGIN hour_row -->
***************
*** 85,106 ****
</select>
<!-- END datetimeset_row -->
- </TD>
- </TR>
- </TABLE>
</TD>
</TR>
! </TABLE>
! Intro Text<BR>
! <TEXTAREA NAME="intro_text" WRAP="PHYSICAL" COLS="75" ROWS="10">{INTROTEXT}</TEXTAREA><BR>
! <P><P>
! Body Text<BR>
! <TEXTAREA NAME="body_text" WRAP="PHYSICAL" COLS="75" ROWS="10">{BODYTEXT}</TEXTAREA><BR>
! <B>New Story Options: </B>
<input type=radio {PLAIN_CHKBOX} name=content value="plain"> Plain Text
<input type=radio {HTML_CHKBOX} name=content value="html"> HTML
! <input type=radio {EXTTRANS_CHKBOX} name=content value="exttrans"> Extended Translation
! <BR><BR>
! <input type="submit" name="submit" value="save">
! <input type="submit" name="submit" value="preview">
! </FORM>
<!-- storyNew.tpl -->
--- 89,117 ----
</select>
<!-- END datetimeset_row -->
</TD>
</TR>
! <TR>
! <TD align="top">Intro Text</TD>
! <TD colspan=3>
! <TEXTAREA NAME="intro_text" WRAP="PHYSICAL" COLS="75" ROWS="10">{INTROTEXT}</TEXTAREA></TD>
! </TR>
! <TR>
! <TD align="top">Body Text</TD>
! <TD colspan=3>
! <TEXTAREA NAME="body_text" WRAP="PHYSICAL" COLS="75" ROWS="10">{BODYTEXT}</TEXTAREA></TD>
! <TR>
! <TD> </TD>
! <TD COLSPAN=3>
! New Story Options: </B>
<input type=radio {PLAIN_CHKBOX} name=content value="plain"> Plain Text
<input type=radio {HTML_CHKBOX} name=content value="html"> HTML
! <input type=radio {EXTTRANS_CHKBOX} name=content value="exttrans"> Extended Translation</TD>
! </TR>
! <TR>
! <TD> </TD>
! <TD colspan=3>
! <input type="submit" name="submit" value="save">
! <input type="submit" name="submit" value="preview"></TD>
! </TR>
! </TABLE>
<!-- storyNew.tpl -->
|
|
From: Joe S. <joe...@us...> - 2002-04-17 15:37:46
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv14290/phpslash-ft Modified Files: CHANGES Log Message: perm change from root to storyeditor Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.457 retrieving revision 1.458 diff -C2 -d -r1.457 -r1.458 *** CHANGES 16 Apr 2002 15:16:27 -0000 1.457 --- CHANGES 17 Apr 2002 15:37:42 -0000 1.458 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-17 10:30AM CDT Joe Stewart <joe...@us...> + [B] - article.php3 - change permission for modify link to storyeditor. + 2002-Apr-15 10:30AM CDT Joe Stewart <joe...@us...> [B] - pollAdmin.php3 - [ 544698 ] pollAdmin permissions - If perm check |
|
From: Joe S. <joe...@us...> - 2002-04-17 15:37:46
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv14290/phpslash-ft/public_html
Modified Files:
article.php3
Log Message:
perm change from root to storyeditor
Index: article.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** article.php3 23 Mar 2002 14:12:28 -0000 1.62
--- article.php3 17 Apr 2002 15:37:42 -0000 1.63
***************
*** 101,105 ****
if($perm->have_perm('story')) {
if( ($auth->auth['uid'] == $story->story_ary['user_id']) OR
! ($perm->have_perm('root'))) {
$related .= "<a href=\"".$_PSL['adminurl']."/storyAdmin.php3?submit=edit&story_id=".$story_id."\">".pslgetText('Modify Story')."</a>";
}
--- 101,105 ----
if($perm->have_perm('story')) {
if( ($auth->auth['uid'] == $story->story_ary['user_id']) OR
! ($perm->have_perm('storyeditor'))) {
$related .= "<a href=\"".$_PSL['adminurl']."/storyAdmin.php3?submit=edit&story_id=".$story_id."\">".pslgetText('Modify Story')."</a>";
}
|
|
From: Joe S. <joe...@us...> - 2002-04-16 15:16:31
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv27082/phpslash-ft
Modified Files:
CHANGES
Log Message:
bugfix - [ 544698 ] pollAdmin permissions
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.456
retrieving revision 1.457
diff -C2 -d -r1.456 -r1.457
*** CHANGES 15 Apr 2002 15:47:33 -0000 1.456
--- CHANGES 16 Apr 2002 15:16:27 -0000 1.457
***************
*** 14,17 ****
--- 14,21 ----
2002-Apr-15 10:30AM CDT Joe Stewart <joe...@us...>
+ [B] - pollAdmin.php3 - [ 544698 ] pollAdmin permissions - If perm check
+ fails, then the login page is displayed.
+
+ 2002-Apr-15 10:30AM CDT Joe Stewart <joe...@us...>
[W] - Story.class, Story_base.class, config.php3, slash-all.sql,
and 6_to_65.sql - changed required permissions for some story actions
|
2 messages has been excluded from this view by a project administrator.
