Menu
▾
▴
phpbt-dev — Developer's mailing list and cvs commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(34) |
Aug
(215) |
Sep
(180) |
Oct
(135) |
Nov
(105) |
Dec
(81) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(76) |
Feb
(22) |
Mar
(154) |
Apr
(149) |
May
(128) |
Jun
(94) |
Jul
(14) |
Aug
(24) |
Sep
(77) |
Oct
(52) |
Nov
(22) |
Dec
(6) |
| 2003 |
Jan
(4) |
Feb
(10) |
Mar
(6) |
Apr
(29) |
May
(10) |
Jun
(37) |
Jul
(39) |
Aug
(13) |
Sep
(23) |
Oct
(3) |
Nov
(7) |
Dec
(2) |
| 2004 |
Jan
|
Feb
(10) |
Mar
(4) |
Apr
|
May
(35) |
Jun
(4) |
Jul
(17) |
Aug
(6) |
Sep
(14) |
Oct
(18) |
Nov
(2) |
Dec
(14) |
| 2005 |
Jan
(9) |
Feb
(30) |
Mar
(6) |
Apr
|
May
(38) |
Jun
(23) |
Jul
(21) |
Aug
(76) |
Sep
(50) |
Oct
(51) |
Nov
(13) |
Dec
|
|
From: Benjamin C. <bc...@us...> - 2002-02-28 17:49:11
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv11076
Modified Files:
bug.php
Log Message:
Use the string from the strings file for the javascript alert
Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- bug.php 28 Feb 2002 17:45:53 -0000 1.79
+++ bug.php 28 Feb 2002 17:48:57 -0000 1.80
@@ -737,6 +737,7 @@
'pos' => isset($_gv['pos']) ? $_gv['pos'] : 0,
'already_voted' => $q->grab_field("select count(*) from ".TBL_BUG_VOTE.
" where bug_id = $bugid and user_id = $u"),
+ 'already_voted_string' => $STRING['already_voted'],
'num_votes' => $q->grab_field("select count(*) from ".TBL_BUG_VOTE.
" where bug_id = $bugid")
));
|
|
From: Benjamin C. <bc...@us...> - 2002-02-28 17:46:08
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv10341
Modified Files:
bug.php
Log Message:
Bug votes display works
Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- bug.php 28 Feb 2002 17:31:45 -0000 1.78
+++ bug.php 28 Feb 2002 17:45:53 -0000 1.79
@@ -25,6 +25,34 @@
include 'include.php';
///
+/// View the votes for a bug
+function vote_view($bug_id) {
+ global $u, $q, $t, $STRING;
+
+ $t->set_file('content', 'bugvotes.html');
+ $t->set_block('content', 'row', 'rows');
+
+ $q->query('select login, v.created_date from '.TBL_AUTH_USER.' u, '.
+ TBL_BUG_VOTE." v where u.user_id = v.user_id and bug_id = $bug_id".
+ ' order by v.created_date');
+ if (!$q->num_rows()) {
+ $t->set_var('rows', "<tr><td colspan=\"2\" align=\"center\">{$STRING['no_votes']}</td></tr>");
+ } else {
+ $i = 0;
+ while (list($login, $date) = $q->grab()) {
+ $t->set_var(array(
+ 'bgcolor' => (++$i % 2 == 0) ? '#dddddd' : '#ffffff',
+ 'trclass' => $i % 2 ? '' : 'alt',
+ 'login' => $login,
+ 'date' => date(DATE_FORMAT.' '.TIME_FORMAT, $date)
+ ));
+ $t->parse('rows', 'row', true);
+ }
+ }
+ $t->set_var('bugid', $bug_id);
+}
+
+///
/// Add a vote to a bug to (possibly) promote it
function vote_bug($bug_id) {
global $u, $q, $now, $_pv, $STRING;
@@ -858,6 +886,7 @@
case 'do' : do_form($_pv['bugid']); break;
case 'print' : show_bug_printable($_gv['bugid']); break;
case 'vote' : vote_bug($_gv['bugid']); break;
+ case 'viewvotes' : vote_view($_gv['bugid']); break;
}
} else header("Location: query.php");
|
|
From: Benjamin C. <bc...@us...> - 2002-02-28 17:46:07
|
Update of /cvsroot/phpbt/phpbt/languages In directory usw-pr-cvs1:/tmp/cvs-serv10341/languages Modified Files: de.php en.php es.php fr.php gb2312.php no.php pt-br.php ru_koi8-r.php ru_windows-1251.php se.php Log Message: Bug votes display works Index: de.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/de.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- de.php 28 Feb 2002 17:31:45 -0000 1.9 +++ de.php 28 Feb 2002 17:45:54 -0000 1.10 @@ -70,7 +70,8 @@ 'previous_bug' => 'Previous', 'next_bug' => 'Next', 'already_voted' => 'You have already voted for this bug', - 'too_many_votes' => 'You have reached the maximum number of votes per user' + 'too_many_votes' => 'You have reached the maximum number of votes per user', + 'no_votes' => 'There are no votes for this bug' ); // Page titles Index: en.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/en.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- en.php 28 Feb 2002 17:31:45 -0000 1.9 +++ en.php 28 Feb 2002 17:45:54 -0000 1.10 @@ -67,7 +67,8 @@ 'previous_bug' => 'Previous', 'next_bug' => 'Next', 'already_voted' => 'You have already voted for this bug', - 'too_many_votes' => 'You have reached the maximum number of votes per user' + 'too_many_votes' => 'You have reached the maximum number of votes per user', + 'no_votes' => 'There are no votes for this bug' ); // Page titles Index: es.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/es.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- es.php 28 Feb 2002 17:31:45 -0000 1.2 +++ es.php 28 Feb 2002 17:45:54 -0000 1.3 @@ -67,7 +67,8 @@ 'previous_bug' => 'Previo', 'next_bug' => 'Siguiente', 'already_voted' => 'You have already voted for this bug', - 'too_many_votes' => 'You have reached the maximum number of votes per user' + 'too_many_votes' => 'You have reached the maximum number of votes per user', + 'no_votes' => 'There are no votes for this bug' ); // Page titles Index: fr.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/fr.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fr.php 28 Feb 2002 17:31:45 -0000 1.6 +++ fr.php 28 Feb 2002 17:45:54 -0000 1.7 @@ -68,7 +68,8 @@ 'previous_bug' => 'Previous', 'next_bug' => 'Next', 'already_voted' => 'You have already voted for this bug', - 'too_many_votes' => 'You have reached the maximum number of votes per user' + 'too_many_votes' => 'You have reached the maximum number of votes per user', + 'no_votes' => 'There are no votes for this bug' ); // Page titles Index: gb2312.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/gb2312.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gb2312.php 28 Feb 2002 17:31:45 -0000 1.5 +++ gb2312.php 28 Feb 2002 17:45:54 -0000 1.6 @@ -70,7 +70,8 @@ 'previous_bug' => 'Previous', 'next_bug' => 'Next', 'already_voted' => 'You have already voted for this bug', - 'too_many_votes' => 'You have reached the maximum number of votes per user' + 'too_many_votes' => 'You have reached the maximum number of votes per user', + 'no_votes' => 'There are no votes for this bug' ); // Page titles Index: no.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/no.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- no.php 28 Feb 2002 17:31:45 -0000 1.8 +++ no.php 28 Feb 2002 17:45:54 -0000 1.9 @@ -68,7 +68,8 @@ 'previous_bug' => 'Previous', 'next_bug' => 'Next', 'already_voted' => 'You have already voted for this bug', - 'too_many_votes' => 'You have reached the maximum number of votes per user' + 'too_many_votes' => 'You have reached the maximum number of votes per user', + 'no_votes' => 'There are no votes for this bug' ); // Page titles Index: pt-br.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/pt-br.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- pt-br.php 28 Feb 2002 17:31:45 -0000 1.10 +++ pt-br.php 28 Feb 2002 17:45:54 -0000 1.11 @@ -68,7 +68,8 @@ 'previous_bug' => 'Anterior', 'next_bug' => 'Próximo' , 'already_voted' => 'You have already voted for this bug', - 'too_many_votes' => 'You have reached the maximum number of votes per user' + 'too_many_votes' => 'You have reached the maximum number of votes per user', + 'no_votes' => 'There are no votes for this bug' ); // Page titles Index: ru_koi8-r.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/ru_koi8-r.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ru_koi8-r.php 28 Feb 2002 17:31:45 -0000 1.7 +++ ru_koi8-r.php 28 Feb 2002 17:45:54 -0000 1.8 @@ -67,7 +67,8 @@ 'previous_bug' => 'Previous', 'next_bug' => 'Next', 'already_voted' => 'You have already voted for this bug', - 'too_many_votes' => 'You have reached the maximum number of votes per user' + 'too_many_votes' => 'You have reached the maximum number of votes per user', + 'no_votes' => 'There are no votes for this bug' ); // Page titles Index: ru_windows-1251.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/ru_windows-1251.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ru_windows-1251.php 28 Feb 2002 17:31:45 -0000 1.7 +++ ru_windows-1251.php 28 Feb 2002 17:45:54 -0000 1.8 @@ -67,7 +67,8 @@ 'previous_bug' => 'Previous', 'next_bug' => 'Next', 'already_voted' => 'You have already voted for this bug', - 'too_many_votes' => 'You have reached the maximum number of votes per user' + 'too_many_votes' => 'You have reached the maximum number of votes per user', + 'no_votes' => 'There are no votes for this bug' ); // Page titles Index: se.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/se.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- se.php 28 Feb 2002 17:31:45 -0000 1.9 +++ se.php 28 Feb 2002 17:45:54 -0000 1.10 @@ -68,7 +68,8 @@ 'previous_bug' => 'Previous', 'next_bug' => 'Next', 'already_voted' => 'You have already voted for this bug', - 'too_many_votes' => 'You have reached the maximum number of votes per user' + 'too_many_votes' => 'You have reached the maximum number of votes per user', + 'no_votes' => 'There are no votes for this bug' ); // Page titles |
|
From: Benjamin C. <bc...@us...> - 2002-02-28 17:46:06
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv10341/templates/default
Added Files:
bugvotes.html
Log Message:
Bug votes display works
--- NEW FILE: bugvotes.html ---
<table border="0" cellspacing="2" cellpadding="2">
<tr bgcolor="#eeeeee">
<th>Who</th>
<th>When</th>
</tr>
<!-- BEGIN row -->
<tr>
<td bgcolor="{bgcolor}">{login}</td>
<td bgcolor="{bgcolor}">{date}</td>
</tr>
<!-- END row -->
</table>
<br>
<a href="{me}?op=show&bugid={bugid}">Back to bug #{bugid}</a>
<br>
<br>
|
|
From: Benjamin C. <bc...@us...> - 2002-02-28 17:38:14
|
Update of /cvsroot/phpbt/phpbt/languages In directory usw-pr-cvs1:/tmp/cvs-serv6515/languages Modified Files: de.php en.php es.php fr.php gb2312.php no.php pt-br.php ru_koi8-r.php ru_windows-1251.php se.php Log Message: Bug voting works (display doesn't yet) Index: de.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/de.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- de.php 10 Dec 2001 13:42:04 -0000 1.8 +++ de.php 28 Feb 2002 17:31:45 -0000 1.9 @@ -68,7 +68,9 @@ 'bad_permission' => 'Sie haben nicht die erforderlichen Rechte für diese Funktion', 'project_only_all_groups' => 'You cannot choose specific groups when "All Groups" is chosen', 'previous_bug' => 'Previous', - 'next_bug' => 'Next' + 'next_bug' => 'Next', + 'already_voted' => 'You have already voted for this bug', + 'too_many_votes' => 'You have reached the maximum number of votes per user' ); // Page titles Index: en.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/en.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- en.php 10 Dec 2001 13:42:04 -0000 1.8 +++ en.php 28 Feb 2002 17:31:45 -0000 1.9 @@ -65,7 +65,9 @@ 'bad_permission' => 'You do not have the permissions required for that function', 'project_only_all_groups' => 'You cannot choose specific groups when "All Groups" is chosen', 'previous_bug' => 'Previous', - 'next_bug' => 'Next' + 'next_bug' => 'Next', + 'already_voted' => 'You have already voted for this bug', + 'too_many_votes' => 'You have reached the maximum number of votes per user' ); // Page titles Index: es.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/es.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- es.php 23 Jan 2002 14:46:52 -0000 1.1 +++ es.php 28 Feb 2002 17:31:45 -0000 1.2 @@ -65,7 +65,9 @@ 'bad_permission' => 'Esa funcion requiere privilegios administrativos que Ud. no posee', 'project_only_all_groups' => 'No se pueden elegir grupos específicos si "Todos los grupos" está seleccionado', 'previous_bug' => 'Previo', - 'next_bug' => 'Siguiente' + 'next_bug' => 'Siguiente', + 'already_voted' => 'You have already voted for this bug', + 'too_many_votes' => 'You have reached the maximum number of votes per user' ); // Page titles Index: fr.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/fr.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fr.php 10 Dec 2001 13:42:04 -0000 1.5 +++ fr.php 28 Feb 2002 17:31:45 -0000 1.6 @@ -66,7 +66,9 @@ 'noseverities' => 'Pas de criticités trouvées', 'project_only_all_groups' => 'You cannot choose specific groups when "All Groups" is chosen', 'previous_bug' => 'Previous', - 'next_bug' => 'Next' + 'next_bug' => 'Next', + 'already_voted' => 'You have already voted for this bug', + 'too_many_votes' => 'You have reached the maximum number of votes per user' ); // Page titles Index: gb2312.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/gb2312.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gb2312.php 10 Dec 2001 13:42:04 -0000 1.4 +++ gb2312.php 28 Feb 2002 17:31:45 -0000 1.5 @@ -68,7 +68,9 @@ 'bad_permission' => 'ÄúûÓÐʹÓÃÕâ¸ö¹¦ÄܵÄȨÏÞ', 'project_only_all_groups' => 'You cannot choose specific groups when "All Groups" is chosen', 'previous_bug' => 'Previous', - 'next_bug' => 'Next' + 'next_bug' => 'Next', + 'already_voted' => 'You have already voted for this bug', + 'too_many_votes' => 'You have reached the maximum number of votes per user' ); // Page titles Index: no.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/no.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- no.php 10 Dec 2001 13:42:04 -0000 1.7 +++ no.php 28 Feb 2002 17:31:45 -0000 1.8 @@ -66,7 +66,9 @@ 'noseverities' => 'Ingen alvorligheter funnet', 'project_only_all_groups' => 'You cannot choose specific groups when "All Groups" is chosen', 'previous_bug' => 'Previous', - 'next_bug' => 'Next' + 'next_bug' => 'Next', + 'already_voted' => 'You have already voted for this bug', + 'too_many_votes' => 'You have reached the maximum number of votes per user' ); // Page titles Index: pt-br.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/pt-br.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pt-br.php 15 Dec 2001 19:01:16 -0000 1.9 +++ pt-br.php 28 Feb 2002 17:31:45 -0000 1.10 @@ -66,7 +66,9 @@ 'bad_permission' => 'Você não tem as permissões necessárias para essa função', 'project_only_all_groups' => 'Você não pode escolher um grupo específico quando "All groups" esta selecionado', 'previous_bug' => 'Anterior', - 'next_bug' => 'Próximo' + 'next_bug' => 'Próximo' , + 'already_voted' => 'You have already voted for this bug', + 'too_many_votes' => 'You have reached the maximum number of votes per user' ); // Page titles Index: ru_koi8-r.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/ru_koi8-r.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ru_koi8-r.php 10 Dec 2001 13:42:04 -0000 1.6 +++ ru_koi8-r.php 28 Feb 2002 17:31:45 -0000 1.7 @@ -65,7 +65,9 @@ 'bad_permission' => 'õ ×ÁÓ ÎÅÔ ÐÏÌÎÏÍÏÞÉÊ, ÎÅÏÂÈÏÄÉÍÙÈ ÄÌÑÄÁÎÎÏÊ ÆÕÎËÃÉÉ', 'project_only_all_groups' => 'You cannot choose specific groups when "All Groups" is chosen', 'previous_bug' => 'Previous', - 'next_bug' => 'Next' + 'next_bug' => 'Next', + 'already_voted' => 'You have already voted for this bug', + 'too_many_votes' => 'You have reached the maximum number of votes per user' ); // Page titles Index: ru_windows-1251.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/ru_windows-1251.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ru_windows-1251.php 10 Dec 2001 13:42:04 -0000 1.6 +++ ru_windows-1251.php 28 Feb 2002 17:31:45 -0000 1.7 @@ -65,7 +65,9 @@ 'bad_permission' => 'Ó âàñ íåò ïîëíîìî÷èé, íåîáõîäèìûõ äëÿäàííîé ôóíêöèè', 'project_only_all_groups' => 'You cannot choose specific groups when "All Groups" is chosen', 'previous_bug' => 'Previous', - 'next_bug' => 'Next' + 'next_bug' => 'Next', + 'already_voted' => 'You have already voted for this bug', + 'too_many_votes' => 'You have reached the maximum number of votes per user' ); // Page titles Index: se.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/se.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- se.php 10 Dec 2001 13:42:04 -0000 1.8 +++ se.php 28 Feb 2002 17:31:45 -0000 1.9 @@ -66,7 +66,9 @@ 'bad_permission' => 'Du har inte den behövliga behörigheten för att använda den funktionen', 'project_only_all_groups' => 'You cannot choose specific groups when "All Groups" is chosen', 'previous_bug' => 'Previous', - 'next_bug' => 'Next' + 'next_bug' => 'Next', + 'already_voted' => 'You have already voted for this bug', + 'too_many_votes' => 'You have reached the maximum number of votes per user' ); // Page titles |
|
From: Benjamin C. <bc...@us...> - 2002-02-28 17:38:13
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv6515/templates/default
Modified Files:
bugdisplay.html
Log Message:
Bug voting works (display doesn't yet)
Index: bugdisplay.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/bugdisplay.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bugdisplay.html 29 Jan 2002 15:05:01 -0000 1.16
+++ bugdisplay.html 28 Feb 2002 17:31:45 -0000 1.17
@@ -227,9 +227,9 @@
</tr>
</table>
</form>
-
-<b><a href="{me}?op=vote&bugid={bugid}">Vote for this bug</a></b> |
-<b><a href="{me}?op=viewvotes&bugid={bugid}">View votes for this bug</a></b> |
+{vote_error}
+<b><a href="{me}?op=vote&bugid={bugid}" onClick="if ({already_voted}) { alert ('You have already voted for this bug'); return false; }">Vote for this bug</a></b> |
+<b><a href="{me}?op=viewvotes&bugid={bugid}">View votes ({num_votes}) for this bug</a></b> |
<b><a href="{me}?op=history&bugid={bugid}">View bug activity</a></b> |
<b><a href="{me}?op=print&&bugid={bugid}">Printable view</a></b>
|
|
From: Benjamin C. <bc...@us...> - 2002-02-28 17:38:12
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv6515
Modified Files:
bug.php
Log Message:
Bug voting works (display doesn't yet)
Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- bug.php 14 Feb 2002 03:56:22 -0000 1.77
+++ bug.php 28 Feb 2002 17:31:45 -0000 1.78
@@ -62,7 +62,12 @@
do_changedfields($u, $buginfo, $changedfields);
}
}
- header("Location: bug.php?op=show&bugid=$bug_id&pos={$_pv['pos']}");
+ if (isset($_pv['pos'])) {
+ $posinfo = "&pos={$_pv['pos']}";
+ } else {
+ $posinfo = '';
+ }
+ header("Location: bug.php?op=show&bugid=$bug_id$posinfo");
}
@@ -671,6 +676,7 @@
isset($_gv['pos']) ? $_gv['pos'] : 0);
$t->set_var(array(
'statuserr' => isset($error['status']) ? $error['status'].'<br><br>' : '',
+ 'vote_error' => isset($error['vote']) ? "<div class=\"error\">{$error['vote']}</div>" : '',
'bugid' => $bugid,
'TITLE' => "{$TITLE['editbug']} #$bugid",
'title' => stripslashes($row['title']),
@@ -700,8 +706,12 @@
'prevlink' => $prevlink,
'nextlink' => $nextlink,
'prevnextsep' => $prevlink && $nextlink ? ' | ' : '',
- 'pos' => isset($_gv['pos']) ? $_gv['pos'] : 0
- ));
+ 'pos' => isset($_gv['pos']) ? $_gv['pos'] : 0,
+ 'already_voted' => $q->grab_field("select count(*) from ".TBL_BUG_VOTE.
+ " where bug_id = $bugid and user_id = $u"),
+ 'num_votes' => $q->grab_field("select count(*) from ".TBL_BUG_VOTE.
+ " where bug_id = $bugid")
+ ));
switch($row['status_name']) {
case 'Unconfirmed' :
case 'New' :
@@ -847,6 +857,7 @@
case 'update' : update_bug($_pv['bugid']); break;
case 'do' : do_form($_pv['bugid']); break;
case 'print' : show_bug_printable($_gv['bugid']); break;
+ case 'vote' : vote_bug($_gv['bugid']); break;
}
} else header("Location: query.php");
|
|
From: Ben C. <php...@be...> - 2002-02-26 14:56:11
|
Yup, feel free to make changes. I'll try to look at it today myself.
It's benn an experience trying to convert that PHPlib stuff to work
without register_globals. :)
On Tue, Feb 26, 2002 at 10:10:55AM +0100, Patrick Mairif wrote:
> this
> $a =& $HTTP_SESSION_VARS['auth'];
> $this->auth =& $a->auth;
> solves the problem for me, but this solution depends on the name of
> the instance of the class. it must be "auth".
>
> I would prefer a solution in which the object is stored and restored
> where it's declared, outside of the class.
>
> sth. like
> $auth = new uauth; //declaration of the object
> session_start();
> session_register("auth"); //restoring the object from the session
>
> I didn't had the time this morning to check where it has to be
> changed, but I would do it this evening or so with your ok, Ben.
>
> _______________________________________________
> phpbt-dev mailing list
> php...@li...
> https://lists.sourceforge.net/lists/listinfo/phpbt-dev
|
|
From: Patrick M. <mo...@su...> - 2002-02-26 09:11:00
|
this
$a =& $HTTP_SESSION_VARS['auth'];
$this->auth =& $a->auth;
solves the problem for me, but this solution depends on the name of
the instance of the class. it must be "auth".
I would prefer a solution in which the object is stored and restored
where it's declared, outside of the class.
sth. like
$auth = new uauth; //declaration of the object
session_start();
session_register("auth"); //restoring the object from the session
I didn't had the time this morning to check where it has to be
changed, but I would do it this evening or so with your ok, Ben.
|
|
From: Patrick M. <mo...@us...> - 2002-02-26 09:08:02
|
Update of /cvsroot/phpbt/phpbt/inc
In directory usw-pr-cvs1:/tmp/cvs-serv24420/inc
Modified Files:
auth.php
Log Message:
quick and dirty bugfix
$auth itself instead of $auth->auth is stored in the session
Index: auth.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/auth.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- auth.php 5 Jan 2002 19:49:35 -0000 1.5
+++ auth.php 26 Feb 2002 09:02:27 -0000 1.6
@@ -36,7 +36,9 @@
$HTTP_SESSION_VARS['auth'] = array();
}
- $this->auth =& $HTTP_SESSION_VARS['auth'];
+ $a =& $HTTP_SESSION_VARS['auth'];
+ $this->auth =& $a->auth;
+
if (!isset($this->auth['group_ids'])) {
$this->auth['group_ids'] = array(0);
|
|
From: Patrick M. <mo...@su...> - 2002-02-26 08:58:18
|
I think the problem is the following part from inc/auth.php:
class uauth {
//...
function uauth() {
global $HTTP_SESSION_VARS;
if (!session_is_registered('auth')) {
session_register('auth');
$HTTP_SESSION_VARS['auth'] = array();
}
//...
session_register('auth') will not save the property of uauth, the
array, it will save the instance of uauth, the object itself in the
session.
|
|
From: Ben C. <php...@be...> - 2002-02-25 21:47:01
|
I haven't run into that problem yet, but I haven't been actively looking at this for a while. The CVS is in flux with the main goal being a move away from global variables. So, there may be problems with $HTTP_SESSION_VARS, as I previously was relying on globals and only recently started relying on the track vars. I was having problems getting the auth stuff converted, so there very well may be problems that I have yet to uncover. It's at the top of the list of things I need to verify work properly. Your input and testing have been very helpful, so please keep feeding me info. In return I'll try to feed you fixes. :) Of course, anyone is welcome to solve the problem for me and put the changes into CVS. :) On Mon, Feb 25, 2002 at 10:04:38PM +0100, Patrick Mairif wrote: > Hello, > > I still got the "Cannot use a scalar value as an array" problem in > inc/auth.php. Now on another machine, but the same php installed. > > I found the following out: > > The problem occures with the actual version from cvs. > It happens when the object $auth is created from the class uauth. > > In the constructor of uauth is a reference from > $HTTP_SESSION_VARS['auth'] assigned to $this->auth. This reference is > then used as an array, but it is an object of class uauth > (get_class($this->auth) gives "uauth")! > > What's the aim of this procedure? What can be wrong? Do I am the only > one > with this problem? > Why is not the object $auth with the php4 session-management sored and > restored? It's much more simple! > > ...going to test the latest release instead of the cvs-version. > > patrick! > > > _______________________________________________ > phpbt-dev mailing list > php...@li... > https://lists.sourceforge.net/lists/listinfo/phpbt-dev |
|
From: Patrick M. <mo...@su...> - 2002-02-25 21:04:43
|
Hello, I still got the "Cannot use a scalar value as an array" problem in inc/auth.php. Now on another machine, but the same php installed. I found the following out: The problem occures with the actual version from cvs. It happens when the object $auth is created from the class uauth. In the constructor of uauth is a reference from $HTTP_SESSION_VARS['auth'] assigned to $this->auth. This reference is then used as an array, but it is an object of class uauth (get_class($this->auth) gives "uauth")! What's the aim of this procedure? What can be wrong? Do I am the only one with this problem? Why is not the object $auth with the php4 session-management sored and restored? It's much more simple! ...going to test the latest release instead of the cvs-version. patrick! |
|
From: Benjamin C. <bc...@us...> - 2002-02-14 03:56:26
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv6723
Modified Files:
bug.php
Log Message:
Don't strip tags (allow xml)
Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- bug.php 26 Jan 2002 17:19:19 -0000 1.76
+++ bug.php 14 Feb 2002 03:56:22 -0000 1.77
@@ -389,7 +389,7 @@
$changedfields['resolution_id'] = $resolution_id;
}
if ($comments) {
- $comments = strip_tags($comments);
+ //$comments = strip_tags($comments); -- Uncomment this if you want no <> content in the comments
$q->query("insert into ".TBL_COMMENT." (comment_id, bug_id, comment_text, created_by, created_date)"
." values (".$q->nextid(TBL_COMMENT).", $bugid, '$comments', $u, $now)");
}
|
|
From: Javier S. <ja...@us...> - 2002-01-30 17:06:23
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv22456
Modified Files:
bugform.html
Log Message:
Resizing Title Field (100char max)
Resizing Description text area (more confortable)
Index: bugform.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/bugform.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bugform.html 2001/10/30 03:55:57 1.2
+++ bugform.html 2002/01/30 17:06:19 1.3
@@ -21,11 +21,11 @@
<tr>
<td align="right" valign="top">Summary:</td>
- <td><input type="text" size="30" maxlength="30" name="title" value="{title}"></td>
+ <td><input type="text" size="50" maxlength="100" name="title" value="{title}"></td>
</tr>
<tr>
<td align="right" valign="top">Description:</td>
- <td><textarea name="description" cols=30 rows=5 wrap=virtual>{description}</textarea></td>
+ <td><textarea name="description" cols="50" rows="8" wrap=virtual>{description}</textarea></td>
</tr>
<tr>
<td align="right" valign="top">{urllabel}:</td>
|
|
From: Benjamin C. <bc...@us...> - 2002-01-29 15:05:05
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv28384/templates/default
Modified Files:
bugdisplay.html
Log Message:
Add some (currently nonfunctional) links for voting
Index: bugdisplay.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/bugdisplay.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bugdisplay.html 2002/01/23 14:25:25 1.15
+++ bugdisplay.html 2002/01/29 15:05:01 1.16
@@ -228,6 +228,8 @@
</table>
</form>
+<b><a href="{me}?op=vote&bugid={bugid}">Vote for this bug</a></b> |
+<b><a href="{me}?op=viewvotes&bugid={bugid}">View votes for this bug</a></b> |
<b><a href="{me}?op=history&bugid={bugid}">View bug activity</a></b> |
<b><a href="{me}?op=print&&bugid={bugid}">Printable view</a></b>
|
|
From: Benjamin C. <bc...@us...> - 2002-01-26 17:19:22
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv23002
Modified Files:
bug.php
Log Message:
Auto-promote a bug to New if promotions by voting is disabled
Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- bug.php 2002/01/26 14:20:40 1.75
+++ bug.php 2002/01/26 17:19:19 1.76
@@ -436,7 +436,13 @@
$status = $q->grab_field("select status_id from ".TBL_STATUS." where status_name = 'Assigned'");
} else {
$owner = 0;
- $status = $q->grab_field("select status_id from ".TBL_STATUS." where status_name = 'Unconfirmed'");
+ // If we aren't using voting to promote, then auto-promote to New
+ if (PROMOTE_VOTES) {
+ $stat_to_assign = 'Unconfirmed';
+ } else {
+ $stat_to_assign = 'New';
+ }
+ $status = $q->grab_field("select status_id from ".TBL_STATUS." where status_name = '$stat_to_assign'");
}
$q->query("insert into ".TBL_BUG." (bug_id, title, description, url,
severity_id, priority, status_id, assigned_to, created_by, created_date,
|
|
From: Benjamin C. <bc...@us...> - 2002-01-26 17:18:39
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv22878
Modified Files:
query.php
Log Message:
Clobber a warning
Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- query.php 2002/01/26 14:21:32 1.56
+++ query.php 2002/01/26 17:18:36 1.57
@@ -185,7 +185,7 @@
$_sv['queryinfo']['order'] = $order;
$_sv['queryinfo']['sort'] = $sort;
- if (empty($_sv['queryinfo']['query']) or $op) {
+ if (empty($_sv['queryinfo']['query']) or isset($op)) {
$_sv['queryinfo']['query'] = build_query($assignedto, $reportedby, $open);
}
|
|
From: Benjamin C. <bc...@us...> - 2002-01-26 16:59:24
|
Update of /cvsroot/phpbt/phpbt/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv18782/schemas
Modified Files:
mysql.in pgsql.in
Log Message:
Added new configuration options
Index: mysql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/mysql.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mysql.in 2002/01/26 16:10:02 1.14
+++ mysql.in 2002/01/26 16:59:20 1.15
@@ -293,6 +293,8 @@
INSERT INTO TBL_CONFIGURATION VALUES ('EMAIL_IS_LOGIN','1','Whether to use email addresses as logins','bool');
INSERT INTO TBL_CONFIGURATION VALUES ('STRICT_UPDATING', '0', 'Only the bug reporter, bug owner, managers, and admins can change a bug', 'bool');
INSERT INTO TBL_CONFIGURATION VALUES ('NEW_ACCOUNTS_DISABLED', '0', 'Only admins can create new user accounts - newaccount.php is disabled', 'bool');
+INSERT INTO TBL_CONFIGURATION VALUES ('PROMOTE_VOTES', 5, 'The number of votes required to promote a bug from Unconfirmed to New (Set to 0 to disable promotions by voting)', 'string');
+INSERT INTO TBL_CONFIGURATION VALUES ('MAX_USER_VOTES', 5, 'The maximum number of votes a user can cast across all bugs (Set to 0 to have no limit)', 'string');
INSERT INTO TBL_CONFIGURATION VALUES ('ATTACHMENT_PATH','attachments','Sub-dir of the INSTALLPATH - Needs to be writeable by the web process','string');
INSERT INTO TBL_CONFIGURATION VALUES ('THEME','default','Which set of templates to use','multi');
INSERT INTO TBL_CONFIGURATION VALUES ('ATTACHMENT_MAX_SIZE','2097152','Maximum size (in bytes) of an attachment. This will not override the settings in php.ini if php.ini has a lower limit.','string');
Index: pgsql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/pgsql.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pgsql.in 2002/01/26 16:10:04 1.15
+++ pgsql.in 2002/01/26 16:59:20 1.16
@@ -282,39 +282,24 @@
INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 2);
INSERT INTO TBL_CONFIGURATION VALUES ('INSTALL_URL','OPTION_INSTALL_URL','The base URL of the phpBugTracker installation','string');
-
INSERT INTO TBL_CONFIGURATION VALUES ('JPGRAPH_PATH','','If not in the include path','string');
-
INSERT INTO TBL_CONFIGURATION VALUES ('CVS_WEB','http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/phpbt/phpbt/','Location of your cvs web interface (see format_comments() in bug.php)','string');
-
INSERT INTO TBL_CONFIGURATION VALUES ('ADMIN_EMAIL','OPTION_PHPBT_EMAIL','The email address used in correspondence from the bug tracker','string');
-
INSERT INTO TBL_CONFIGURATION VALUES ('ENCRYPT_PASS','OPTION_ENCRYPT_PASS','Whether to store passwords encrypted. <b>Warning:</b> Changing this after users have been created will result in their being unable to login.','bool');
-
INSERT INTO TBL_CONFIGURATION VALUES ('USE_JPGRAPH','','Whether to show some reports as images','bool');
-
INSERT INTO TBL_CONFIGURATION VALUES ('MASK_EMAIL','1','Should email addresses have . changed to \'dot\' and @ change to \'at\'?','bool');
-
INSERT INTO TBL_CONFIGURATION VALUES ('HIDE_EMAIL','1','Should email addresses be hidden for those not logged in?','bool');
-
INSERT INTO TBL_CONFIGURATION VALUES ('USE_SEVERITY_COLOR','1','Should the query list use the severity colors as the row background color (like SourceForge)','bool');
-
INSERT INTO TBL_CONFIGURATION VALUES ('EMAIL_IS_LOGIN','1','Whether to use email addresses as logins','bool');
-
INSERT INTO TBL_CONFIGURATION VALUES ('STRICT_UPDATING', '0', 'Only the bug reporter, bug owner, managers, and admins can change a bug', 'bool');
-
INSERT INTO TBL_CONFIGURATION VALUES ('NEW_ACCOUNTS_DISABLED', '0', 'Only admins can create new user accounts - newaccount.php is disabled', 'bool');
-
+INSERT INTO TBL_CONFIGURATION VALUES ('PROMOTE_VOTES', 5, 'The number of votes required to promote a bug from Unconfirmed to New (Set to 0 to disable promotions by voting)', 'string');
+INSERT INTO TBL_CONFIGURATION VALUES ('MAX_USER_VOTES', 5, 'The maximum number of votes a user can cast across all bugs (Set to 0 to have no limit)', 'string');
INSERT INTO TBL_CONFIGURATION VALUES ('ATTACHMENT_PATH','attachments','Sub-dir of the INSTALLPATH - Needs to be writeable by the web process','string');
-
INSERT INTO TBL_CONFIGURATION VALUES ('THEME','default','Which set of templates to use','multi');
-
INSERT INTO TBL_CONFIGURATION VALUES ('ATTACHMENT_MAX_SIZE','2097152','Maximum size (in bytes) of an attachment. This will not override the settings in php.ini if php.ini has a lower limit.','string');
-
INSERT INTO TBL_CONFIGURATION VALUES ('DATE_FORMAT','m-d-Y','See the <a href="http://www.php.net/date" target="_new">date page</a> in the PHP manual for more info','string');
-
INSERT INTO TBL_CONFIGURATION VALUES ('TIME_FORMAT','g:i A','See the <a href="http://www.php.net/date" target="_new">date page</a> in the PHP manual for more info','string');
-
INSERT INTO TBL_CONFIGURATION VALUES ('LANGUAGE','en','The language file to use for warning and error messages','multi');
|
|
From: Benjamin C. <bc...@us...> - 2002-01-26 16:54:45
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv17834
Modified Files:
dbchanges.sql
Log Message:
Better explanations
Index: dbchanges.sql
===================================================================
RCS file: /cvsroot/phpbt/phpbt/dbchanges.sql,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dbchanges.sql 2002/01/26 16:07:41 1.17
+++ dbchanges.sql 2002/01/26 16:54:42 1.18
@@ -1,3 +1,3 @@
create table bug_vote (user_id int not null, bug_id int not null, created_date bigint unsigned not null, primary key(user_id, bug_id));
-insert into configuration values ('PROMOTE_VOTES', 5, 'The number of votes required to promote a bug from Unconfirmed to New', 'string');
-insert into configuration values ('MAX_USER_VOTES', 5, 'The maximum number of votes a user can cast across all bugs', 'string');
+insert into configuration values ('PROMOTE_VOTES', 5, 'The number of votes required to promote a bug from Unconfirmed to New (Set to 0 to disable promotions by voting)', 'string');
+insert into configuration values ('MAX_USER_VOTES', 5, 'The maximum number of votes a user can cast across all bugs (Set to 0 to have no limit)', 'string');
|
|
From: Benjamin C. <bc...@us...> - 2002-01-26 16:53:21
|
Update of /cvsroot/phpbt/phpbt/inc
In directory usw-pr-cvs1:/tmp/cvs-serv17584/inc
Modified Files:
functions.php
Log Message:
Sort the theme and language select boxes
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- functions.php 2002/01/26 16:46:52 1.2
+++ functions.php 2002/01/26 16:53:17 1.3
@@ -145,28 +145,36 @@
$dir = opendir(INSTALL_PATH.'/languages');
while (false !== ($file = readdir($dir))) {
if ($file != '.' && $file != '..' && $file != 'CVS') {
- $file = str_replace('.php', '', $file);
- if ($file == $value) {
- $sel = ' selected';
- } else {
- $sel = '';
- }
- $text .= "<option value=\"$file\"$sel>$file</option>";
+ $filelist[] = str_replace('.php', '', $file);
+ }
+ }
+ closedir($dir);
+ sort($filelist);
+ foreach ($filelist as $file) {
+ if ($file == $value) {
+ $sel = ' selected';
+ } else {
+ $sel = '';
}
+ $text .= "<option value=\"$file\"$sel>$file</option>";
}
break;
case 'THEME' :
$dir = opendir(INSTALL_PATH.'/templates');
while (false !== ($file = readdir($dir))) {
if ($file != '.' && $file != '..' && $file != 'CVS') {
- $file = str_replace('.php', '', $file);
- if ($file == $value) {
- $sel = ' selected';
- } else {
- $sel = '';
- }
- $text .= "<option value=\"$file\"$sel>$file</option>";
+ $filelist[] = str_replace('.php', '', $file);
+ }
+ }
+ closedir($dir);
+ sort($filelist);
+ foreach ($filelist as $file) {
+ if ($file == $value) {
+ $sel = ' selected';
+ } else {
+ $sel = '';
}
+ $text .= "<option value=\"$file\"$sel>$file</option>";
}
break;
default :
|
|
From: Benjamin C. <bc...@us...> - 2002-01-26 16:46:57
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv16449
Modified Files:
config-dist.php config.php include.php install.php
Log Message:
Changes for INSTALL_PATH
Index: config-dist.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/config-dist.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-dist.php 2002/01/26 16:11:26 1.6
+++ config-dist.php 2002/01/26 16:46:52 1.7
@@ -60,8 +60,8 @@
define ('ONEDAY', 86400);
-require_once (INSTALL_PATH.'/'.INCLUDE_PATH.'inc/db/'.DB_TYPE.'.php');
-require_once (INSTALL_PATH.'/'.INCLUDE_PATH.'inc/auth.php');
-require_once (INSTALL_PATH.'/'.INCLUDE_PATH.'inc/template.php');
+require_once (INSTALL_PATH.'/inc/db/'.DB_TYPE.'.php');
+require_once (INSTALL_PATH.'/inc/auth.php');
+require_once (INSTALL_PATH.'/inc/template.php');
?>
Index: config.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/config.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- config.php 2002/01/26 16:11:26 1.22
+++ config.php 2002/01/26 16:46:52 1.23
@@ -62,8 +62,8 @@
define ('ONEDAY', 86400);
-require_once (INSTALL_PATH.'/'.INCLUDE_PATH.'inc/db/'.DB_TYPE.'.php');
-require_once (INSTALL_PATH.'/'.INCLUDE_PATH.'inc/auth.php');
-require_once (INSTALL_PATH.'/'.INCLUDE_PATH.'inc/template.php');
+require_once (INSTALL_PATH.'/inc/db/'.DB_TYPE.'.php');
+require_once (INSTALL_PATH.'/inc/auth.php');
+require_once (INSTALL_PATH.'/inc/template.php');
?>
Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- include.php 2002/01/26 14:48:29 1.92
+++ include.php 2002/01/26 16:46:52 1.93
@@ -25,12 +25,7 @@
// Where are we?
define ('INSTALL_PATH', dirname(__FILE__));
-// Handle being included from admin files
-if (!defined('INCLUDE_PATH')) {
- define('INCLUDE_PATH', '');
-}
-
-if (!@include (INSTALL_PATH.'/'.INCLUDE_PATH.'config.php')) {
+if (!@include (INSTALL_PATH.'/config.php')) {
header("Location: install.php");
exit();
}
@@ -40,7 +35,7 @@
}
// Grab the global functions
-include (INSTALL_PATH.'/'.INCLUDE_PATH.'inc/functions.php');
+include (INSTALL_PATH.'/inc/functions.php');
class dbclass extends DB_Sql {
var $classname = 'dbclass';
@@ -116,10 +111,6 @@
$q = new dbclass;
-//include INSTALL_PATH.'/'.INCLUDE_PATH.'inc/adodb/adodb.inc.php';
-//$db =& ADONewConnection(DB_TYPE);
-//$db->PConnect(DB_HOST, DB_USER, DB_PASSWORD, DB_DATABASE);
-
// Set up the configuration variables
$q->query('select varname, varvalue from '.TBL_CONFIGURATION);
while (list($k, $v) = $q->grab()) {
@@ -127,7 +118,7 @@
}
// Localization - include the file with the desired language
-include INSTALL_PATH.'/'.INCLUDE_PATH.'languages/'.LANGUAGE.'.php';
+include INSTALL_PATH.'/languages/'.LANGUAGE.'.php';
$me = $HTTP_SERVER_VARS['PHP_SELF'];
$me2 = $HTTP_SERVER_VARS['REQUEST_URI'];
@@ -203,10 +194,12 @@
}
}
-if (INCLUDE_PATH == '../') {
- $t = new templateclass(INCLUDE_PATH.'templates/'.THEME.'/admin', 'keep');
+if (defined('TEMPLATE_PATH')) {
+ $t = new templateclass(INSTALL_PATH.'/templates/'.THEME.'/'.TEMPLATE_PATH, 'keep');
+ $t->set_var('template_path', '../templates/'.THEME.'/'.TEMPLATE_PATH);
} else {
- $t = new templateclass('templates/'.THEME.'/', 'keep');
+ $t = new templateclass(INSTALL_PATH.'/templates/'.THEME, 'keep');
+ $t->set_var('template_path', 'templates/'.THEME);
}
$t->set_var(array(
@@ -214,8 +207,7 @@
'me' => $me,
'me2' => $me2,
'error' => '',
- 'loginerror' => '',
- 'template_path' => INCLUDE_PATH.'templates/'.THEME));
+ 'loginerror' => ''));
// End classes -- Begin page
Index: install.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/install.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- install.php 2002/01/26 14:48:29 1.10
+++ install.php 2002/01/26 16:46:52 1.11
@@ -25,11 +25,7 @@
define ('INSTALL_PATH', dirname(__FILE__));
-if (!defined('INCLUDE_PATH')) {
- define('INCLUDE_PATH', '');
-}
-
-include (INSTALL_PATH.'/'.INCLUDE_PATH.'/inc/template.php');
+include (INSTALL_PATH.'/inc/template.php');
$t = new Template('templates/default', 'keep');
$t->set_var('me', $HTTP_SERVER_VARS['PHP_SELF']);
$_gv =& $HTTP_GET_VARS;
|
|
From: Benjamin C. <bc...@us...> - 2002-01-26 16:46:56
|
Update of /cvsroot/phpbt/phpbt/admin
In directory usw-pr-cvs1:/tmp/cvs-serv16449/admin
Modified Files:
configure.php group.php os.php project.php resolution.php
severity.php status.php user.php
Log Message:
Changes for INSTALL_PATH
Index: configure.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/configure.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.php 2001/11/23 05:02:41 1.3
+++ configure.php 2002/01/26 16:46:52 1.4
@@ -22,8 +22,8 @@
// ------------------------------------------------------------------------
// $Id$
-define('INCLUDE_PATH', '../');
-include INCLUDE_PATH.'include.php';
+define('TEMPLATE_PATH', 'admin');
+include '../include.php';
function save_options() {
global $q, $HTTP_POST_VARS;
Index: group.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/group.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- group.php 2002/01/19 16:29:51 1.3
+++ group.php 2002/01/26 16:46:52 1.4
@@ -22,8 +22,8 @@
// ------------------------------------------------------------------------
// $Id$
-define('INCLUDE_PATH', '../');
-include INCLUDE_PATH.'include.php';
+define('TEMPLATE_PATH', 'admin');
+include '../include.php';
function purge_group($groupid = 0) {
global $q;
Index: os.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/os.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- os.php 2001/12/19 13:36:29 1.19
+++ os.php 2002/01/26 16:46:52 1.20
@@ -22,8 +22,8 @@
// ------------------------------------------------------------------------
// $Id$
-define('INCLUDE_PATH', '../');
-include INCLUDE_PATH.'include.php';
+define('TEMPLATE_PATH', 'admin');
+include '../include.php';
function do_form($osid = 0) {
global $q, $me, $_pv, $STRING;
Index: project.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/project.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.php 2002/01/23 14:26:07 1.29
+++ project.php 2002/01/26 16:46:52 1.30
@@ -22,8 +22,8 @@
// ------------------------------------------------------------------------
// $Id$
-define('INCLUDE_PATH', '../');
-include INCLUDE_PATH.'include.php';
+define('TEMPLATE_PATH', 'admin');
+include '../include.php';
function save_version($versionid = 0) {
global $q, $me, $_pv, $STRING, $now, $u;
Index: resolution.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/resolution.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- resolution.php 2002/01/19 16:33:20 1.20
+++ resolution.php 2002/01/26 16:46:52 1.21
@@ -22,8 +22,8 @@
// ------------------------------------------------------------------------
// $Id$
-define('INCLUDE_PATH', '../');
-include INCLUDE_PATH.'include.php';
+define('TEMPLATE_PATH', 'admin');
+include '../include.php';
function do_form($resolutionid = 0) {
global $q, $me, $_pv, $STRING;
Index: severity.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/severity.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- severity.php 2002/01/19 16:34:56 1.16
+++ severity.php 2002/01/26 16:46:52 1.17
@@ -22,8 +22,8 @@
// ------------------------------------------------------------------------
// $Id$
-define('INCLUDE_PATH', '../');
-include INCLUDE_PATH.'include.php';
+define('TEMPLATE_PATH', 'admin');
+include '../include.php';
function do_form($severityid = 0) {
global $q, $me, $_pv, $STRING;
Index: status.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/status.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- status.php 2002/01/19 16:31:57 1.20
+++ status.php 2002/01/26 16:46:52 1.21
@@ -22,8 +22,8 @@
// ------------------------------------------------------------------------
// $Id$
-define('INCLUDE_PATH', '../');
-include INCLUDE_PATH.'include.php';
+define('TEMPLATE_PATH', 'admin');
+include '../include.php';
function do_form($statusid = 0) {
global $q, $me, $_pv, $STRING;
Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/user.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- user.php 2002/01/19 16:21:47 1.37
+++ user.php 2002/01/26 16:46:52 1.38
@@ -22,8 +22,8 @@
// ------------------------------------------------------------------------
// $Id$
-define('INCLUDE_PATH', '../');
-include INCLUDE_PATH.'include.php';
+define('TEMPLATE_PATH', 'admin');
+include '../include.php';
function do_form($userid = 0) {
global $q, $me, $_pv, $STRING, $now, $u;
|
|
From: Benjamin C. <bc...@us...> - 2002-01-26 16:46:56
|
Update of /cvsroot/phpbt/phpbt/inc
In directory usw-pr-cvs1:/tmp/cvs-serv16449/inc
Modified Files:
functions.php
Log Message:
Changes for INSTALL_PATH
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- functions.php 2002/01/23 14:22:06 1.1
+++ functions.php 2002/01/26 16:46:52 1.2
@@ -142,7 +142,7 @@
$text .= '</option>';
break;
case 'LANGUAGE' :
- $dir = opendir(INSTALL_PATH.'/'.INCLUDE_PATH.'languages');
+ $dir = opendir(INSTALL_PATH.'/languages');
while (false !== ($file = readdir($dir))) {
if ($file != '.' && $file != '..' && $file != 'CVS') {
$file = str_replace('.php', '', $file);
@@ -156,7 +156,7 @@
}
break;
case 'THEME' :
- $dir = opendir(INSTALL_PATH.'/'.INCLUDE_PATH.'templates');
+ $dir = opendir(INSTALL_PATH.'/templates');
while (false !== ($file = readdir($dir))) {
if ($file != '.' && $file != '..' && $file != 'CVS') {
$file = str_replace('.php', '', $file);
|
|
From: Benjamin C. <bc...@us...> - 2002-01-26 16:11:29
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv9657
Modified Files:
config-dist.php config.php
Log Message:
Added bug_vote table
Index: config-dist.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/config-dist.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-dist.php 2002/01/20 16:19:48 1.5
+++ config-dist.php 2002/01/26 16:11:26 1.6
@@ -42,6 +42,7 @@
define ('TBL_BUG_CC', TBL_PREFIX.'bug_cc');
define ('TBL_BUG_GROUP', TBL_PREFIX.'bug_group');
define ('TBL_BUG_HISTORY', TBL_PREFIX.'bug_history');
+define ('TBL_BUG_VOTE', TBL_PREFIX.'bug_vote');
define ('TBL_COMMENT', TBL_PREFIX.'comment');
define ('TBL_COMPONENT', TBL_PREFIX.'component');
define ('TBL_CONFIGURATION', TBL_PREFIX.'configuration');
Index: config.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/config.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- config.php 2002/01/20 16:19:48 1.21
+++ config.php 2002/01/26 16:11:26 1.22
@@ -44,6 +44,7 @@
define ('TBL_BUG_CC', TBL_PREFIX.'bug_cc');
define ('TBL_BUG_GROUP', TBL_PREFIX.'bug_group');
define ('TBL_BUG_HISTORY', TBL_PREFIX.'bug_history');
+define ('TBL_BUG_VOTE', TBL_PREFIX.'bug_vote');
define ('TBL_COMMENT', TBL_PREFIX.'comment');
define ('TBL_COMPONENT', TBL_PREFIX.'component');
define ('TBL_CONFIGURATION', TBL_PREFIX.'configuration');
|
2 messages has been excluded from this view by a project administrator.
