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...> - 2004-07-13 13:05:41
|
Update of /cvsroot/phpbt/phpbt/templates/default/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1364/templates/default/admin Modified Files: Tag: htmltemplates oslist.html Log Message: Removing smarty references Index: oslist.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/oslist.html,v retrieving revision 1.9.6.1 retrieving revision 1.9.6.2 diff -u -r1.9.6.1 -r1.9.6.2 --- oslist.html 30 Aug 2003 21:59:37 -0000 1.9.6.1 +++ oslist.html 13 Jul 2004 13:05:28 -0000 1.9.6.2 @@ -10,7 +10,7 @@ <table border="0" width="100%"> <tr> <td valign="top"> - <b> <?php echo $page_title; ?></b> - <a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?op=edit&os_id=0" onClick="popupOS(0); return false;"><?php echo translate("Add new operating system"); ?></a> + <b> <?php echo $page_title; ?></b> - <a href="os.php?op=edit&os_id=0" onClick="popupOS(0); return false;"><?php echo translate("Add new operating system"); ?></a> <hr size="1"> <table class="bordertable" align="center"> <tr> @@ -21,12 +21,12 @@ </tr> <?php for ($i = 0, $count = count($oses); $i < $count; $i++) { ?> <tr> - <td><a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?op=edit&os_id=<?php echo $oses[$i]['os_id']; ?>" onClick="popupOS(<?php echo $oses[$i]['os_id']; ?>); return false;"><?php echo stripslashes($oses[$i]['os_name']); ?></a></td> + <td><a href="os.php?op=edit&os_id=<?php echo $oses[$i]['os_id']; ?>" onClick="popupOS(<?php echo $oses[$i]['os_id']; ?>); return false;"><?php echo stripslashes($oses[$i]['os_name']); ?></a></td> <td> <?php echo $oses[$i]['regex']; ?></td> <td align="center"><?php echo $oses[$i]['sort_order']; ?></td> <td align="center"> <?php if (!$oses[$i]['bug_count']) { ?> - <a href="{$smarty.server.PHP_SELF}?op=del&os_id=<?php echo $oses[$i]['os_id']; ?>" onClick="return confirm('<?php echo translate("Are you sure you want to delete this OS"); ?>?')"><?php echo translate("Delete"); ?></a> + <a href="os.php?op=del&os_id=<?php echo $oses[$i]['os_id']; ?>" onClick="return confirm('<?php echo translate("Are you sure you want to delete this OS"); ?>?')"><?php echo translate("Delete"); ?></a> <?php } ?> </td> </tr> |
|
From: Benjamin C. <bc...@us...> - 2004-07-03 13:19:15
|
Update of /cvsroot/phpbt/phpbt/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9695/inc Modified Files: Tag: htmltemplates functions.php Log Message: Fixed a bug with choosing a reporter when creating a bug Index: functions.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v retrieving revision 1.44.2.8 retrieving revision 1.44.2.9 diff -u -r1.44.2.8 -r1.44.2.9 --- functions.php 3 Jul 2004 13:08:42 -0000 1.44.2.8 +++ functions.php 3 Jul 2004 13:19:07 -0000 1.44.2.9 @@ -174,10 +174,11 @@ break; case 'reporter': global $u; + $selected = $selected ? $selected : $u; $rs = $db->query("select u.user_id, login from ".TBL_AUTH_USER." u where u.active > 0 order by login"); while ($rs->fetchInto($row)) { // either singular matches, or array matches are acceptable - if ($u == $row['user_id']) { + if ($selected == $row['user_id']) { $sel = ' selected'; } else { $sel = ''; |
|
From: Benjamin C. <bc...@us...> - 2004-07-03 13:19:15
|
Update of /cvsroot/phpbt/phpbt/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9695/templates/default Modified Files: Tag: htmltemplates bugform.html Log Message: Fixed a bug with choosing a reporter when creating a bug Index: bugform.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bugform.html,v retrieving revision 1.9.4.3 retrieving revision 1.9.4.4 diff -u -r1.9.4.3 -r1.9.4.4 --- bugform.html 12 Oct 2003 05:13:54 -0000 1.9.4.3 +++ bugform.html 3 Jul 2004 13:19:07 -0000 1.9.4.4 @@ -21,7 +21,7 @@ </td> <td> <select name="reporter"> - <?php build_select('reporter') ?> + <?php build_select('reporter', $reporter) ?> </select> </td> </tr> |
|
From: Benjamin C. <bc...@us...> - 2004-07-03 13:19:15
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9695 Modified Files: Tag: htmltemplates bug.php Log Message: Fixed a bug with choosing a reporter when creating a bug Index: bug.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/bug.php,v retrieving revision 1.134.2.6 retrieving revision 1.134.2.7 diff -u -r1.134.2.6 -r1.134.2.7 --- bug.php 3 Jul 2004 12:58:13 -0000 1.134.2.6 +++ bug.php 3 Jul 2004 13:19:07 -0000 1.134.2.7 @@ -494,6 +494,9 @@ if ($url == 'http://') { $url = ''; } + + // Use the selected reporter, if specified + $reporter = ($reporter and is_numeric($reporter)) ? $reporter : $u; // Check to see if this bug's component has an owner and should be assigned if ($owner = $db->getOne("select owner from ".TBL_COMPONENT." c where component_id = $component")) { @@ -506,7 +509,7 @@ $bugid = $db->nextId(TBL_BUG); - $db->query('insert into '.TBL_BUG.' (bug_id, title, description, url, severity_id, priority, status_id, assigned_to, created_by, created_date, last_modified_by, last_modified_date, project_id, site_id, database_id, version_id, component_id, os_id, browser_string) values ('.$bugid.', '.join(', ', array($db->quote(stripslashes($title)), $db->quote(stripslashes($description)), $db->quote(stripslashes($url)))).', '.(int)$severity.', '.(int)$priority.', '.(int)$status.', '.$owner.', '.$u.', '.$now.', '.$u.', '.$now.', '.$project.', '.(int)$site.', '.(int)$database.', '.(int)$version.', '.(int)$component.', '.(int)$os.', '.$db->quote(stripslashes($_SERVER['HTTP_USER_AGENT'])).')'); + $db->query('insert into '.TBL_BUG.' (bug_id, title, description, url, severity_id, priority, status_id, assigned_to, created_by, created_date, last_modified_by, last_modified_date, project_id, site_id, database_id, version_id, component_id, os_id, browser_string) values ('.$bugid.', '.join(', ', array($db->quote(stripslashes($title)), $db->quote(stripslashes($description)), $db->quote(stripslashes($url)))).', '.(int)$severity.', '.(int)$priority.', '.(int)$status.', '.$owner.', '.$reporter.', '.$now.', '.$u.', '.$now.', '.$project.', '.(int)$site.', '.(int)$database.', '.(int)$version.', '.(int)$component.', '.(int)$os.', '.$db->quote(stripslashes($_SERVER['HTTP_USER_AGENT'])).')'); $buginfo = $db->getRow('select * from '.TBL_BUG." where bug_id = $bugid"); do_changedfields($u, $buginfo); |
|
From: Benjamin C. <bc...@us...> - 2004-07-03 13:08:50
|
Update of /cvsroot/phpbt/phpbt/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7559/inc Modified Files: Tag: htmltemplates functions.php Log Message: Moving gettext() setup to inc/functions.php from include.php Index: functions.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v retrieving revision 1.44.2.7 retrieving revision 1.44.2.8 diff -u -r1.44.2.7 -r1.44.2.8 --- functions.php 30 Jun 2004 13:49:24 -0000 1.44.2.7 +++ functions.php 3 Jul 2004 13:08:42 -0000 1.44.2.8 @@ -22,6 +22,16 @@ // ------------------------------------------------------------------------ // $Id$ +// Set the domain if gettext is available +if (is_callable('gettext')) { + define('USE_GETTEXT', true); + setlocale(LC_ALL, LOCALE); + bindtextdomain('phpbt', './locale'); + textdomain('phpbt'); +} else { + define('USE_GETTEXT', false); +} + /// /// Show text to the browser - escape hatch function show_text($text, $iserror = false) { |
|
From: Benjamin C. <bc...@us...> - 2004-07-03 13:08:50
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7559 Modified Files: Tag: htmltemplates include.php Log Message: Moving gettext() setup to inc/functions.php from include.php Index: include.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/include.php,v retrieving revision 1.126.4.8 retrieving revision 1.126.4.9 diff -u -r1.126.4.8 -r1.126.4.9 --- include.php 3 Jul 2004 12:59:16 -0000 1.126.4.8 +++ include.php 3 Jul 2004 13:08:42 -0000 1.126.4.9 @@ -148,16 +148,6 @@ // End classes -- Begin page -// Set the domain if gettext is available -if (is_callable('gettext')) { - define('USE_GETTEXT', true); - setlocale(LC_ALL, LOCALE); - bindtextdomain('phpbt', './locale'); - textdomain('phpbt'); -} else { - define('USE_GETTEXT', false); -} - if (!defined('NO_AUTH')) { session_start(); $auth = new uauth; |
|
From: Benjamin C. <bc...@us...> - 2004-07-03 13:03:48
|
Update of /cvsroot/phpbt/phpbt/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6677/default Modified Files: Tag: htmltemplates queryform.html Log Message: Smarty cleanup Index: queryform.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/queryform.html,v retrieving revision 1.20.4.3 retrieving revision 1.20.4.4 diff -u -r1.20.4.3 -r1.20.4.4 --- queryform.html 3 May 2004 13:31:23 -0000 1.20.4.3 +++ queryform.html 3 Jul 2004 13:03:39 -0000 1.20.4.4 @@ -238,4 +238,4 @@ <?php } ?> </form> <br> -<a href="{$smarty.server.PHP_SELF}?op=query"><?php echo translate("Go to the simple query page"); ?></a> +<a href="query.php?op=query"><?php echo translate("Go to the simple query page"); ?></a> |
|
From: Benjamin C. <bc...@us...> - 2004-07-03 12:59:54
|
Update of /cvsroot/phpbt/phpbt/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5910/default Modified Files: Tag: htmltemplates bugemail-newbug.txt bugemail.txt Log Message: Tweaked for php rendering rather than smarty Index: bugemail-newbug.txt =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bugemail-newbug.txt,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -r1.3 -r1.3.6.1 --- bugemail-newbug.txt 17 Jun 2002 15:49:18 -0000 1.3 +++ bugemail-newbug.txt 3 Jul 2004 12:59:46 -0000 1.3.6.1 @@ -3,27 +3,27 @@ INSTEAD FOLLOW BUG'S URL BELOW IN ORDER TO DETAIL BUG: ============================================================================ - Bug #: {$bugid} ({$bugurl}) - Reported By: {$reporter} + Bug #: <?php echo $bugid; ?> (<?php echo $bugurl; ?>) + Reported By: <?php echo $reporter."\n"; ?> ---------------------------------------------------------------------------- - Summary: {$title} - URL: {$url} - Product: {$project_id} - Version: {$version_id} - Component: {$component_id} - Site: {$site_id} - Status: {$status_id} - Resolution: {$resolution_id} - Severity: {$severity_id} - OS/Version: {$os_id} - Database: {$database_id} - Priority: {$priority} - Assigned To: {$assignedto} + Summary: <?php echo $title."\n"; ?> + URL: <?php echo $url."\n"; ?> + Product: <?php echo $project_id."\n"; ?> + Version: <?php echo $version_id."\n"; ?> + Component: <?php echo $component_id."\n"; ?> + Site: <?php echo $site_id."\n"; ?> + Status: <?php echo $status_id."\n"; ?> + Resolution: <?php echo $resolution_id."\n"; ?> + Severity: <?php echo $severity_id."\n"; ?> + OS/Version: <?php echo $os_id."\n"; ?> + Database: <?php echo $database_id."\n"; ?> + Priority: <?php echo $priority."\n"; ?> + Assigned To: <?php echo $assignedto."\n"; ?> ============================================================================ -{if $showcomments} +<?php if ($showcomments) { ?> COMMENTS ------ Posted by {$oldpostedby} at {$oldpostedon} ----- -{$oldcomments} +----- Posted by <?php echo $oldpostedby; ?> at <?php echo $oldpostedon; ?> ----- +<?php echo $oldcomments."\n"; ?> -{/if} +<?php } ?> Index: bugemail.txt =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bugemail.txt,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -r1.5 -r1.5.6.1 --- bugemail.txt 14 Jun 2002 15:26:06 -0000 1.5 +++ bugemail.txt 3 Jul 2004 12:59:46 -0000 1.5.6.1 @@ -3,32 +3,32 @@ INSTEAD FOLLOW BUG'S URL BELOW IN ORDER TO DETAIL BUG: ============================================================================ - Bug #: {$bugid} ({$bugurl}) -{$reporter_stat} Reported By: {$reporter} + Bug #: <?php echo $bugid; ?> (<?php echo $bugurl; ?>) +<?php echo $reporter_stat; ?> Reported By: <?php echo $reporter."\n"; ?> ---------------------------------------------------------------------------- -{$title_stat} Summary: {$title} -{$url_stat} URL: {$url} -{$project_id_stat} Product: {$project_id} -{$version_id_stat} Version: {$version_id} -{$to_be_closed_in_version_id_stat} To be Closed in Version: {$to_be_closed_in_version_id} -{$closed_in_version_id_stat} Closed in Version: {$closed_in_version_id} -{$component_id_stat} Component: {$component_id} -{$site_id_stat} Site(s): {$site_id} -{$status_id_stat} Status: {$status_id} -{$resolution_id_stat} Resolution: {$resolution_id} -{$severity_id_stat} Severity: {$severity_id} -{$os_id_stat} OS/Version: {$os_id} -{$database_id_stat} Database: {$database_id} -{$priority_stat} Priority: {$priority} -{$assignedto_stat} Assigned To: {$assignedto} +<?php echo $title_stat; ?> Summary: <?php echo $title."\n"; ?> +<?php echo $url_stat; ?> URL: <?php echo $url."\n"; ?> +<?php echo $project_id_stat; ?> Product: <?php echo $project_id."\n"; ?> +<?php echo $version_id_stat; ?> Version: <?php echo $version_id."\n"; ?> +<?php echo $to_be_closed_in_version_id_stat; ?> To be Closed in Version: <?php echo $to_be_closed_in_version_id."\n"; ?> +<?php echo $closed_in_version_id_stat; ?> Closed in Version: <?php echo $closed_in_version_id."\n"; ?> +<?php echo $component_id_stat; ?> Component: <?php echo $component_id."\n"; ?> +<?php echo $site_id_stat; ?> Site(s): <?php echo $site_id."\n"; ?> +<?php echo $status_id_stat; ?> Status: <?php echo $status_id."\n"; ?> +<?php echo $resolution_id_stat; ?> Resolution: <?php echo $resolution_id."\n"; ?> +<?php echo $severity_id_stat; ?> Severity: <?php echo $severity_id."\n"; ?> +<?php echo $os_id_stat; ?> OS/Version: <?php echo $os_id."\n"; ?> +<?php echo $database_id_stat; ?> Database: <?php echo $database_id."\n"; ?> +<?php echo $priority_stat; ?> Priority: <?php echo $priority."\n"; ?> +<?php echo $assignedto_stat; ?> Assigned To: <?php echo $assignedto."\n"; ?> ============================================================================ -{if $showcomments} +<?php if ($showcomments) { ?> COMMENTS ------ Posted by {$oldpostedby} at {$oldpostedon} ----- -{$oldcomments} +----- Posted by <?php echo $oldpostedby; ?> at <?php echo $oldpostedon; ?> ----- +<?php echo $oldcomments."\n"; ?> ------ Posted by {$newpostedby} at {$newpostedon} ----- -{$newcomments} +----- Posted by <?php echo $newpostedby; ?> at <?php echo $newpostedon; ?> ----- +<?php echo $newcomments."\n"; ?> -{/if} +<?php } ?> |
|
From: Benjamin C. <bc...@us...> - 2004-07-03 12:59:25
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5823 Modified Files: Tag: htmltemplates include.php Log Message: Added the fetch function to the template class Index: include.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/include.php,v retrieving revision 1.126.4.7 retrieving revision 1.126.4.8 diff -u -r1.126.4.7 -r1.126.4.8 --- include.php 30 Jun 2004 13:49:51 -0000 1.126.4.7 +++ include.php 3 Jul 2004 12:59:16 -0000 1.126.4.8 @@ -109,13 +109,22 @@ $this->vars = array(); } - function render($content_template, $page_title, $wrap_file = '') { + function render($content_template, $page_title, $wrap_file = '', $nowrap = false) { extract($this->vars); $path = defined('TEMPLATE_PATH') ? './templates/'.THEME.'/'.TEMPLATE_PATH.'/' : './templates/'.THEME.'/'; - include($wrap_file ? $path.$wrap_file : $path.'wrap.html'); + include($nowrap ? $path.$content_template : ($wrap_file ? $path.$wrap_file : $path.'wrap.html')); } + + function fetch($content_template) { + ob_start(); + $this->render($content_template, '', '', true); + $rettext = ob_get_contents(); + ob_end_clean(); + return $rettext; + } + function assign($var, $value = '') { if (is_array($var)) { |
|
From: Benjamin C. <bc...@us...> - 2004-07-03 12:58:22
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5709 Modified Files: Tag: htmltemplates bug.php Log Message: Switched the change mailing code to use htmlMimeMail. Index: bug.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/bug.php,v retrieving revision 1.134.2.5 retrieving revision 1.134.2.6 diff -u -r1.134.2.5 -r1.134.2.6 --- bug.php 20 Jun 2004 23:14:23 -0000 1.134.2.5 +++ bug.php 3 Jul 2004 12:58:13 -0000 1.134.2.6 @@ -270,25 +270,27 @@ // Later add a watcher (such as QA person) check here if (count($maillist)) { - if ($toemail = delimit_list(', ',$maillist)) { - $t->assign(array( - 'bugid' => $buginfo['bug_id'], - 'siteroot' => INSTALL_URL, - 'bugurl' => INSTALL_URL."/bug.php?op=show&bugid={$buginfo['bug_id']}", - 'priority' => $select['priority'][(!empty($cf['priority']) - ? $cf['priority'] : $buginfo['priority'])], - 'priority_stat' => !empty($cf['priority']) ? '!' : ' ', - 'reporter' => $reporter, - 'reporter_stat' => $reporterstat, - 'assignedto' => $assignedto, - 'assignedto_stat' => $assignedtostat - )); - - qp_mail($toemail,"[Bug {$buginfo['bug_id']}] ".($newbug ? 'New' : 'Changed').' - '. - stripslashes((!empty($cf['title']) ? $cf['title'] : $buginfo['title'])), - $t->fetch($template), - sprintf("From: %s\nReply-To: %s\nErrors-To: %s", ADMIN_EMAIL, ADMIN_EMAIL, ADMIN_EMAIL)); - } + $t->assign(array( + 'bugid' => $buginfo['bug_id'], + 'siteroot' => INSTALL_URL, + 'bugurl' => INSTALL_URL."/bug.php?op=show&bugid={$buginfo['bug_id']}", + 'priority' => $select['priority'][(!empty($cf['priority']) + ? $cf['priority'] : $buginfo['priority'])], + 'priority_stat' => !empty($cf['priority']) ? '!' : ' ', + 'reporter' => $reporter, + 'reporter_stat' => $reporterstat, + 'assignedto' => $assignedto, + 'assignedto_stat' => $assignedtostat + )); + + require_once('./inc/htmlMimeMail/htmlMimeMail.php'); + $mail = new htmlMimeMail(); + $mail->setText($t->fetch($template)); + $mail->setFrom(ADMIN_EMAIL); + $mail->setSubject("[Bug {$buginfo['bug_id']}] ". + ($newbug ? 'New' : 'Changed').' - '. + stripslashes((!empty($cf['title']) ? $cf['title'] : $buginfo['title']))); + $mail->send($maillist); } } |
|
From: Benjamin C. <bc...@us...> - 2004-07-03 12:55:19
|
Update of /cvsroot/phpbt/phpbt/inc/htmlMimeMail In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5312/inc/htmlMimeMail Log Message: Directory /cvsroot/phpbt/phpbt/inc/htmlMimeMail added to the repository --> Using per-directory sticky tag `htmltemplates' |
|
From: Benjamin C. <bc...@us...> - 2004-06-30 13:50:01
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28899 Modified Files: Tag: htmltemplates include.php Log Message: Changed function_exists() to is_callable() to help with gettext not really being available. Index: include.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/include.php,v retrieving revision 1.126.4.6 retrieving revision 1.126.4.7 diff -u -r1.126.4.6 -r1.126.4.7 --- include.php 21 May 2004 12:36:16 -0000 1.126.4.6 +++ include.php 30 Jun 2004 13:49:51 -0000 1.126.4.7 @@ -140,7 +140,7 @@ // End classes -- Begin page // Set the domain if gettext is available -if (function_exists('gettext')) { +if (is_callable('gettext')) { define('USE_GETTEXT', true); setlocale(LC_ALL, LOCALE); bindtextdomain('phpbt', './locale'); |
|
From: Benjamin C. <bc...@us...> - 2004-06-30 13:49:47
|
Update of /cvsroot/phpbt/phpbt/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28827/inc Modified Files: Tag: htmltemplates functions.php Log Message: Fixed a problem with $STRING not being available in translate(). Index: functions.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v retrieving revision 1.44.2.6 retrieving revision 1.44.2.7 diff -u -r1.44.2.6 -r1.44.2.7 --- functions.php 19 Jun 2004 19:57:05 -0000 1.44.2.6 +++ functions.php 30 Jun 2004 13:49:24 -0000 1.44.2.7 @@ -597,6 +597,8 @@ } function translate($string, $plural = false) { + global $STRING; + if (USE_GETTEXT) { return $plural ? ngettext($string) : gettext($string); } else { |
|
From: Benjamin C. <bc...@us...> - 2004-06-20 23:14:37
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17528 Modified Files: Tag: htmltemplates bug.php Log Message: Removing the references to $STRING Index: bug.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/bug.php,v retrieving revision 1.134.2.4 retrieving revision 1.134.2.5 diff -u -r1.134.2.4 -r1.134.2.5 --- bug.php 3 May 2004 13:34:37 -0000 1.134.2.4 +++ bug.php 20 Jun 2004 23:14:23 -0000 1.134.2.5 @@ -27,7 +27,7 @@ /// /// View the votes for a bug function vote_view($bug_id) { - global $u, $db, $t, $STRING; + global $u, $db, $t; $t->assign('votes', $db->getAll('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")); $t->render('bugvotes.html', translate("Bug Votes")); @@ -95,7 +95,7 @@ /// /// Show the activity for a bug function show_history($bugid) { - global $db, $t, $STRING, $QUERY; + global $db, $t, $QUERY; if (!is_numeric($bugid)) { show_text(translate("There is no history for this bug")); @@ -109,7 +109,7 @@ /// /// Send the email about changes to the bug and log the changes in the DB function do_changedfields($userid, &$buginfo, $cf = array(), $comments = '') { - global $db, $t, $u, $select, $now, $STRING, $QUERY; + global $db, $t, $u, $select, $now, $QUERY; // It's a new bug if the changedfields array is empty and there are no comments $newbug = (!count($cf) and !$comments); @@ -155,7 +155,7 @@ $newvalue = $db->getOne("select ${field}_name from $table where ${field}_id = {$cf[$field.'_id']}"); if (empty($newvalue)) $newvalue = 'None'; - $db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote($STRING['BUGDISPLAY'][$field]), $db->quote(stripslashes($oldvalue)), $db->quote(stripslashes($newvalue)), $u, $now)).")"); + $db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote(translate($field)), $db->quote(stripslashes($oldvalue)), $db->quote(stripslashes($newvalue)), $u, $now)).")"); $t->assign(array( $field.'_id' => stripslashes($newvalue), $field.'_id_stat' => '!' @@ -182,7 +182,7 @@ $newvalue = $db->getOne('select version_name from '.$cfgDatabase['version'].' where version_id = '.$cf[$field.'_id']); if (empty($newvalue)) $newvalue = 'None'; - $db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote($STRING['BUGDISPLAY'][$field_name]), + $db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote(translate($field_name)), $db->quote(stripslashes($oldvalue)), $db->quote(stripslashes($newvalue)), $u, $now)).")"); $t->assign(array( @@ -206,7 +206,7 @@ if (is_null($oldassignedto)) { $oldassignedto = ''; } - $db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote($STRING['BUGDISPLAY']['assignedto']), $db->quote($oldassignedto), $db->quote($assignedto), $u, $now)).")"); + $db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote(translate("Assigned To")), $db->quote($oldassignedto), $db->quote($assignedto), $u, $now)).")"); } else { $assignedtostat = ' '; } |
|
From: Benjamin C. <bc...@us...> - 2004-06-19 19:57:15
|
Update of /cvsroot/phpbt/phpbt/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3139/inc Modified Files: Tag: htmltemplates functions.php Log Message: Fixed a bug with the check_id function Index: functions.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v retrieving revision 1.44.2.5 retrieving revision 1.44.2.6 diff -u -r1.44.2.5 -r1.44.2.6 --- functions.php 18 May 2004 12:59:19 -0000 1.44.2.5 +++ functions.php 19 Jun 2004 19:57:05 -0000 1.44.2.6 @@ -75,7 +75,7 @@ ? $querystart." where ". ($selected ? "(active > 0 or project_id in ($selected))" : 'active > 0'). " order by {$box}_name" - : $querystart." where project_id not in ($restricted_projects)". + : $querystart." where project_id not in ($restricted_projects)". " and ". ($selected ? " (active > 0 or project_id in ($selected))" : 'active > 0'). " order by {$box}_name", @@ -87,7 +87,11 @@ switch($box) { case 'user_filter': - foreach ($STRING['user_filter'] as $k => $v) { + $options = array( + 0 => translate("All Users"), + 1 => translate("Active Users"), + 2 => translate("Inactive Users")); + foreach ($options as $k => $v) { $text .= sprintf("<option value=\"%d\"%s>%s</option>", $k, ($k == $selected ? ' selected' : ''), $v); } @@ -597,7 +601,7 @@ return $plural ? ngettext($string) : gettext($string); } else { @include_once('languages/'.LANGUAGE.'.php'); - if (!empty($_STRING[$string])) return $_STRING[$string]; + if (!empty($STRING[$string])) return $STRING[$string]; else return $string; } } @@ -628,7 +632,7 @@ // Check to make sure a bug is numeric function check_id($id) { - if (!is_numeric($id) or !$id) { + if (!is_numeric($id)) { show_text("Invalid ID"); exit; } |
|
From: Benjamin C. <bc...@us...> - 2004-05-21 12:36:27
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8055 Modified Files: Tag: htmltemplates include.php Log Message: Use the table name constant Index: include.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/include.php,v retrieving revision 1.126.4.5 retrieving revision 1.126.4.6 diff -u -r1.126.4.5 -r1.126.4.6 --- include.php 21 May 2004 12:25:57 -0000 1.126.4.5 +++ include.php 21 May 2004 12:36:16 -0000 1.126.4.6 @@ -63,7 +63,7 @@ define($k, $v); } define('OPEN_BUG_STATUSES', join(', ', - $db->getCol("select status_id from status where bug_open = 1"))); + $db->getCol("select status_id from " . TBL_STATUS ." where bug_open = 1"))); } require_once ('inc/db/'.DB_TYPE.'.php'); |
|
From: Benjamin C. <bc...@us...> - 2004-05-21 12:31:40
|
Update of /cvsroot/phpbt/phpbt/inc/smarty In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7143/smarty Removed Files: Tag: htmltemplates Config_File.class.php Smarty.class.php Smarty_Compiler.class.php Log Message: Smarty is no longer used --- Config_File.class.php DELETED --- --- Smarty.class.php DELETED --- --- Smarty_Compiler.class.php DELETED --- |
|
From: Benjamin C. <bc...@us...> - 2004-05-21 12:31:39
|
Update of /cvsroot/phpbt/phpbt/inc/smarty/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7143/smarty/plugins Removed Files: Tag: htmltemplates function.assign.php function.cycle.php function.fetch.php function.math.php function.popup.php modifier.default.php Log Message: Smarty is no longer used --- function.assign.php DELETED --- --- function.cycle.php DELETED --- --- function.fetch.php DELETED --- --- function.math.php DELETED --- --- function.popup.php DELETED --- --- modifier.default.php DELETED --- |
|
From: Benjamin C. <bc...@us...> - 2004-05-21 12:27:43
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6329 Modified Files: Tag: htmltemplates index.php Log Message: Fixes bug #956443 Index: index.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/index.php,v retrieving revision 1.39.2.4 retrieving revision 1.39.2.5 diff -u -r1.39.2.4 -r1.39.2.5 --- index.php 3 May 2004 13:34:38 -0000 1.39.2.4 +++ index.php 21 May 2004 12:27:32 -0000 1.39.2.5 @@ -127,7 +127,7 @@ // Lastly we will need a list of all statuses so we can exclude 'closed" // for the open query $sOpenStatusQuery = '&status%5B%5D='.@join('&status%5B%5D=', - $db->getCol("select status_id from status where bug_open = 1")); + $db->getCol("select status_id from " . TBL_STATUS ." where bug_open = 1")); // QUESTION: Will this still work with using translate('Project')? foreach ($aProjects['projects'] as $iProjectNumberKey => $value1) { |
|
From: Benjamin C. <bc...@us...> - 2004-05-21 12:26:37
|
Update of /cvsroot/phpbt/phpbt/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6181/templates/default Modified Files: Tag: htmltemplates upgrade.html Log Message: Fixes bug #956443 Index: upgrade.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/upgrade.html,v retrieving revision 1.10.6.1 retrieving revision 1.10.6.2 diff -u -r1.10.6.1 -r1.10.6.2 --- upgrade.html 30 Aug 2003 22:00:34 -0000 1.10.6.1 +++ upgrade.html 21 May 2004 12:26:28 -0000 1.10.6.2 @@ -6,7 +6,7 @@ <div align="center"> <br> <br> - <?php echo printf(translate('This script will upgrade your database from version %s to version %s of phpBugTracker.'), '0.8.x', '0.9.x'); ?> + <?php echo printf(translate('This script will upgrade your database from version %s to version %s of phpBugTracker.'), '0.9.x', '1.0'); ?> <br> <br> <a href="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>?doit=1"><?php echo translate('Do it!'); ?></a> |
|
From: Benjamin C. <bc...@us...> - 2004-05-21 12:26:37
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6181 Modified Files: Tag: htmltemplates upgrade.php Log Message: Fixes bug #956443 Index: upgrade.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/upgrade.php,v retrieving revision 1.35.2.2 retrieving revision 1.35.2.3 diff -u -r1.35.2.2 -r1.35.2.3 --- upgrade.php 19 May 2004 13:28:46 -0000 1.35.2.2 +++ upgrade.php 21 May 2004 12:26:28 -0000 1.35.2.3 @@ -23,7 +23,7 @@ // $Id$ define ('NO_AUTH', 1); - +$upgrading = true; @include 'include.php'; function upgrade() { @@ -97,7 +97,7 @@ include 'templates/default/upgrade-finished.html'; } -if (isset($_gv['doit'])) { +if (isset($_GET['doit'])) { upgrade(); } else { include 'templates/default/upgrade.html'; |
|
From: Benjamin C. <bc...@us...> - 2004-05-21 12:26:18
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6092 Modified Files: Tag: htmltemplates include.php Log Message: Fixes bug #956443 - Database query conflicts with upgrade.php Index: include.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/include.php,v retrieving revision 1.126.4.4 retrieving revision 1.126.4.5 diff -u -r1.126.4.4 -r1.126.4.5 --- include.php 3 May 2004 13:34:38 -0000 1.126.4.4 +++ include.php 21 May 2004 12:25:57 -0000 1.126.4.5 @@ -56,14 +56,15 @@ $db->setFetchMode(DB_FETCHMODE_ASSOC); $db->setErrorHandling(PEAR_ERROR_CALLBACK, "handle_db_error"); -// Set up the configuration variables -$rs = $db->query('select varname, varvalue from '.TBL_CONFIGURATION); -while (list($k, $v) = $rs->fetchRow(DB_FETCHMODE_ORDERED)) { - define($k, $v); +if (empty($upgrading)) { + // Set up the configuration variables + $rs = $db->query('select varname, varvalue from '.TBL_CONFIGURATION); + while (list($k, $v) = $rs->fetchRow(DB_FETCHMODE_ORDERED)) { + define($k, $v); + } + define('OPEN_BUG_STATUSES', join(', ', + $db->getCol("select status_id from status where bug_open = 1"))); } -define('OPEN_BUG_STATUSES', join(', ', - $db->getCol("select status_id from status where bug_open = 1"))); - require_once ('inc/db/'.DB_TYPE.'.php'); $me = $HTTP_SERVER_VARS['PHP_SELF']; |
|
From: Benjamin C. <bc...@us...> - 2004-05-19 13:28:56
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4237 Modified Files: Tag: htmltemplates upgrade.php Log Message: Oops, left off a ; Index: upgrade.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/upgrade.php,v retrieving revision 1.35.2.1 retrieving revision 1.35.2.2 diff -u -r1.35.2.1 -r1.35.2.2 --- upgrade.php 7 May 2004 13:04:58 -0000 1.35.2.1 +++ upgrade.php 19 May 2004 13:28:46 -0000 1.35.2.2 @@ -67,7 +67,7 @@ } break; case 'oci8' : - echo "Oracle is not supported in version 1.0" + echo "Oracle is not supported in version 1.0"; exit; $db->query("create table ".TBL_PROJECT_PERM." ( project_id number(10) default '0' NOT NULL, user_id number(10) default '0' NOT NULL )"); //! TBL_AUTH_GROUP |
|
From: Benjamin C. <bc...@us...> - 2004-05-18 13:00:07
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21133 Added Files: Tag: htmltemplates messages.po Log Message: --- NEW FILE: messages.po --- # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. #: attachment.php:41 attachment.php:46 attachment.php:52 msgid "That attachment does not exist" msgstr "" #: attachment.php:62 attachment.php:68 msgid "Please specify a file to upload" msgstr "" #: attachment.php:70 #, php-format msgid "The file you specified is larger than %s bytes" msgstr "" #: attachment.php:78 [...1435 lines suppressed...] #: templates/default/wrap.html:48 msgid "Remember me" msgstr "" #: templates/default/wrap.html:51 msgid "Bugs assigned to me" msgstr "" #: templates/default/wrap.html:52 msgid "Bugs reported by me" msgstr "" #: templates/default/wrap.html:53 msgid "Personal Page" msgstr "" #: templates/default/wrap.html:54 #, php-format msgid "Logout %s" msgstr "" |
|
From: Benjamin C. <bc...@us...> - 2004-05-18 12:59:32
|
Update of /cvsroot/phpbt/phpbt/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21036/inc Modified Files: Tag: htmltemplates functions.php Log Message: Fall back to strings file for translation Index: functions.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v retrieving revision 1.44.2.4 retrieving revision 1.44.2.5 diff -u -r1.44.2.4 -r1.44.2.5 --- functions.php 3 May 2004 13:37:19 -0000 1.44.2.4 +++ functions.php 18 May 2004 12:59:19 -0000 1.44.2.5 @@ -596,7 +596,9 @@ if (USE_GETTEXT) { return $plural ? ngettext($string) : gettext($string); } else { - return $string; + @include_once('languages/'.LANGUAGE.'.php'); + if (!empty($_STRING[$string])) return $_STRING[$string]; + else return $string; } } |
2 messages has been excluded from this view by a project administrator.
