From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 2 21:50:15 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 76B6616A428 for ; Wed, 2 Nov 2005 21:50:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 658E843D4C for ; Wed, 2 Nov 2005 21:50:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jA2LoE6l079403 for ; Wed, 2 Nov 2005 21:50:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jA2LoEju079400; Wed, 2 Nov 2005 21:50:14 GMT (envelope-from gnats) Date: Wed, 2 Nov 2005 21:50:14 GMT Message-Id: <200511022150.jA2LoEju079400@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Nick Hilliard Cc: Subject: Re: ports/88332: Update port: devel/flyspray -> 0.9.8 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Nick Hilliard List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2005 21:50:15 -0000 The following reply was made to PR ports/88332; it has been noted by GNATS. From: Nick Hilliard To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/88332: Update port: devel/flyspray -> 0.9.8 Date: Wed, 2 Nov 2005 21:42:27 +0000 diff -ruN flyspray/Makefile flyspray-0.9.8.1/Makefile --- flyspray/Makefile Fri Apr 29 16:56:05 2005 +++ flyspray-0.9.8.1/Makefile Tue Nov 1 12:10:12 2005 @@ -6,7 +6,8 @@ # PORTNAME= flyspray -PORTVERSION= 0.9.7 +PORTVERSION= 0.9.8 +PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://flyspray.rocks.cc/files/ @@ -21,38 +22,49 @@ NO_BUILD= yes +FLYSPRAYDIR= ${PREFIX}/share/${PORTNAME} +ATTACHMENTDIR= ${DBDIR}/${PORTNAME}/attachments DBDIR= /var/db -DOC_FILES= AUTHORS.txt BUGS.txt CHANGELOG.txt INSTALL.txt README.txt \ - TODO.txt UPGRADING.txt README.FreeBSD \ +DOC_FILES= AUTHORS.txt BUGS.txt CHANGELOG.txt INSTALL.txt \ + QA_CHECKLIST.txt README.txt TODO.txt UPGRADING.txt \ + README.FreeBSD \ licences/ADOdb.licence.txt \ licences/Flyspray.licence.txt \ licences/NuvolaIcons.licence.txt \ + licences/class.jabber.php.licence.txt \ licences/jsCalendar.licence.txt \ - licences/phpMarkdown.licence.txt + licences/phpMarkdown.licence.txt \ + licences/phpmailer.licence.txt \ -FLYSPRAY_FILES= favicon.ico header.php includes index.php lang scripts sql themes +FLYSPRAY_FILES= .htaccess favicon.ico header.php index.php \ + remote-client.php remote.php docs/licences/gnu_lgpl.html \ + includes lang scripts setup sql themes PKGMESSAGE= ${WRKSRC}/pkg-message post-patch: @${CP} ${PKGDIR}/files/README.FreeBSD ${WRKSRC}/docs/ - @${REINPLACE_CMD} -e "s|realpath('../')|'${PREFIX}/share'|g" \ - ${WRKSRC}/sql/install-${PORTVERSION}.php - @${RM} ${WRKSRC}/sql/install-${PORTVERSION}.php.bak + @${REINPLACE_CMD} -e "s|%%FLYSPRAYDIR%%|"${FLYSPRAYDIR}"|g" \ + -e "s|%%DOCSDIR%%|"${DOCSDIR}"|g" \ + ${WRKSRC}/docs/README.FreeBSD + @${FIND} ${WRKSRC} -name \*.orig -exec ${RM} '{}' ';' do-install: - @${MKDIR} ${PREFIX}/share/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/share/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/header.php ${PREFIX}/share/${PORTNAME}/header.php-dist + @${MKDIR} ${FLYSPRAYDIR} + ${CHMOD} 755 ${FLYSPRAYDIR} + ${INSTALL_DATA} ${WRKSRC}/flyspray.conf.php \ + ${FLYSPRAYDIR}/flyspray.conf.php-dist + ${TOUCH} ${FLYSPRAYDIR}/flyspray.conf.php cd ${WRKSRC} && \ tar cf - ${FLYSPRAY_FILES} | \ - (cd ${PREFIX}/share/${PORTNAME} && tar -xf -) - ${LN} -s ${DBDIR}/${PORTNAME}/attachments ${PREFIX}/share/${PORTNAME}/attachments - @${MKDIR} ${DBDIR}/${PORTNAME}/attachments - ${CHMOD} 750 ${DBDIR}/${PORTNAME}/attachments - ${CHOWN} ${WWWOWN}:${WWWGRP} ${DBDIR}/${PORTNAME}/attachments - ${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/share/${PORTNAME} + (cd ${FLYSPRAYDIR} && tar -xf -) + ${LN} -s ${ATTACHMENTDIR} ${FLYSPRAYDIR}/attachments + ${LN} -s ${PREFIX}/share/adodb ${FLYSPRAYDIR} + @${MKDIR} ${ATTACHMENTDIR} + ${CHMOD} 750 ${ATTACHMENTDIR} + ${CHOWN} ${WWWOWN}:${WWWGRP} ${ATTACHMENTDIR} + ${CHOWN} ${WWWOWN}:${WWWGRP} ${FLYSPRAYDIR}/flyspray.conf.php post-install: install-doc @${SED} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' pkg-message > ${PKGMESSAGE} diff -ruN flyspray/distinfo flyspray-0.9.8.1/distinfo --- flyspray/distinfo Fri Apr 29 16:56:05 2005 +++ flyspray-0.9.8.1/distinfo Tue Nov 1 11:03:30 2005 @@ -1,2 +1,2 @@ -MD5 (flyspray-0.9.7.tar.gz) = ab686864412a0fb4590560ee360bb1f5 -SIZE (flyspray-0.9.7.tar.gz) = 347443 +MD5 (flyspray-0.9.8.tar.gz) = e034c2f1638cca65c41c7cb3590e2014 +SIZE (flyspray-0.9.8.tar.gz) = 385283 diff -ruN flyspray/files/README.FreeBSD flyspray-0.9.8.1/files/README.FreeBSD --- flyspray/files/README.FreeBSD Fri Mar 25 00:09:01 2005 +++ flyspray-0.9.8.1/files/README.FreeBSD Tue Nov 1 14:31:43 2005 @@ -10,67 +10,43 @@ # mysqladmin -u root -p create flyspray -2) Import the Flyspray database tables into your new empty database. Here is - the unix/linux command line method; be sure to enter your mysql root - password when prompted: +2) Insert the following configuration command into your Apache httpd.conf: -# mysql -u root -p flyspray < flyspray-version.sql + Alias "/flyspray/" "%%FLYSPRAYDIR%%/" + + AllowOverride All + Options Indexes FollowSymLinks + Order allow,deny + Allow from all + -3) Insert the following configuration command into your httpd.conf: - - Alias "/flyspray/" "/usr/local/share/flyspray/" - -4) Point your browser to http://yourserver.com/flyspray/ and you should +3) Point your browser to http://yourserver.com/flyspray/ and you should see the Flyspray setup script! -5) If you are upgrading from an old version of Flyspray, skip to note 10 - below. Otherwise, create youself a new user, and put this user into the - Admin group. - -6) CHANGE THE PASSWORD FOR THE super/super ACCOUNT by clicking the 'Change - Password' link near the top of the page. You might like to disable the - account entirely, or it will appear in the list of members to be assigned - tasks. +4) Click on the admin links to set up your Options and lists. -7) Click on the admin links to set up your Options and lists. +5) Close the sample task, and begin adding your own. -8) Close the sample task, and begin adding your own. - -9) Report any bugs you find back to http://flyspray.rocks.cc/?p=Support or the +6) Report any bugs you find back to http://flyspray.rocks.cc/bts/ or the mailing list linked from the Flyspray homepage. -Upgrading from Previous Versions of Flyspray -============================================ +Upgrading from Flyspray 0.9.7 +============================= You can upgrade from a previous version of Flyspray by doing the following: -0) read /usr/local/share/doc/flyspray/UPGRADING.txt. +0) read %%DOCSDIR%%/UPGRADING.txt. 1) back up your old flyspray task database using "mysqldump". No, really, - you seriously run the risk of losing ALL your data if you don't do this. - -2) load http://yourserver.com/flyspray/ in your browser, set up the - database access parameters and click the "continue to next page" button. - DO NOT click "Continue to next page" a second time (i.e. on the page - which reads "Next, we are going to try setting up your database...") - -3) If you are upgrading from 0.9.5, you will need to upgrade your database - settings to 0.9.6 before going to 0.9.7. You can do this by loading the - upgrade script on: - - http://yourserver.com/flyspray/sql/upgrade_0.9.5_to_0.9.6-mysql.php - - You will need to click "Perform upgrade now!". - -4) To upgrade your database structure from 0.9.6 format to 0.9.7 load the - following URL into your browser: - - http://yourserver.com/flyspray/sql/upgrade_0.9.6_to_0.9.7.php + you seriously run the risk of losing data if you don't do this. - You will need to click "Take me to Flyspray 0.9.7 now!" +2) load http://yourserver.com/flyspray/ in your browser and follow the + installation instructions. On the "Database setup" page, set the + "Install/Upgrade" field to "Upgrade 0.9.7 - 0.9.8" and enter your + database parameters. -5) That's it! flyspray has been upgraded to 0.9.7. If you messed up the +5) That's it! flyspray has been upgraded to 0.9.8. If you messed up the sequence of commands, you will probably have lost data in the process, and may need to re-install your database from your backup. You did take a backup, right? diff -ruN flyspray/files/patch-.htaccess flyspray-0.9.8.1/files/patch-.htaccess --- flyspray/files/patch-.htaccess Thu Jan 1 01:00:00 1970 +++ flyspray-0.9.8.1/files/patch-.htaccess Tue Nov 1 13:17:14 2005 @@ -0,0 +1,20 @@ +--- .htaccess.orig Tue Nov 1 13:13:20 2005 ++++ .htaccess Tue Nov 1 13:13:20 2005 +@@ -5,6 +5,8 @@ + + RewriteEngine on + ++ReWriteBase /flyspray ++ + RewriteRule ^.*\?do=admin&area=prefs$ index.php?do=admin&area=prefs [L] + + RewriteRule ^([0-9]+)$ index.php?do=details&id=$1 [L] +@@ -12,7 +14,7 @@ + RewriteRule ^task/([0-9]+)comment([0-9]+)$ index.php?do=details&id=$1comment$2 [L] + RewriteRule ^task/([0-9]+)/depends$ index.php?do=depends&id=$1 [L] + RewriteRule ^task/([0-9]+)/edit$ index.php?do=details&id=$1&edit=yep [L] +- ++RewriteRule ^task/([0-9]+)/depends&prune=([0-9]+)$ index.php?do=depends&id=$1&prune=$2 [L] + RewriteRule ^newtask$ index.php?do=newtask [L] + RewriteRule ^newtask/proj([0-9]+)$ index.php?do=newtask&project=$1 [L] + diff -ruN flyspray/files/patch-docs::CHANGELOG.txt flyspray-0.9.8.1/files/patch-docs::CHANGELOG.txt --- flyspray/files/patch-docs::CHANGELOG.txt Thu Jan 1 01:00:00 1970 +++ flyspray-0.9.8.1/files/patch-docs::CHANGELOG.txt Tue Nov 1 11:24:56 2005 @@ -0,0 +1,18 @@ +--- docs/CHANGELOG.txt.orig Sun Oct 23 01:22:26 2005 ++++ docs/CHANGELOG.txt Sun Oct 30 07:11:06 2005 +@@ -1,4 +1,14 @@ +-0.9.8 - 23 October 2005 ++0.9.8 update1 - 30 October 05 ++ ++FIXED - Lack of .htaccess rewrite rule for dependency graphs ++FIXED - Cross Site Scripting security hole ++FIXED - Project selector permission query ++FIXED - Date range for Reports ++FIXED - Bugs with language pack function ++FIXED - error_reporting() in header.php ++ ++ ++0.9.8 - 23 October 05 + + NEW - Full-featured installer + NEW - Address rewriting for human-readable URLs diff -ruN flyspray/files/patch-header.php flyspray-0.9.8.1/files/patch-header.php --- flyspray/files/patch-header.php Thu Jan 1 01:00:00 1970 +++ flyspray-0.9.8.1/files/patch-header.php Tue Nov 1 11:24:57 2005 @@ -0,0 +1,16 @@ +--- header.php.orig Sun Oct 23 01:11:14 2005 ++++ header.php Wed Oct 26 04:16:53 2005 +@@ -4,8 +4,11 @@ + // move flyspray.conf.php to a directory where a browser can't access it. + // (RECOMMENDED). + +-// Turn off PHP notices +-error_reporting(E_ALL & -E_NOTICE); ++// You might like to uncomment the next line if you are receiving lots of ++// PHP NOTICE errors. We are in the process of making Flyspray stop making ++// these errors, but this will help hide them until we are finished. ++ ++//error_reporting(E_ALL & ~E_NOTICE); + + // Check PHP Version (Must Be at least 4.3) + // For 0.9.9, this should redirect to the error page diff -ruN flyspray/files/patch-includes::functions.inc.php flyspray-0.9.8.1/files/patch-includes::functions.inc.php --- flyspray/files/patch-includes::functions.inc.php Thu Jan 1 01:00:00 1970 +++ flyspray-0.9.8.1/files/patch-includes::functions.inc.php Tue Nov 1 11:24:58 2005 @@ -0,0 +1,78 @@ +--- includes/functions.inc.php.orig Sun Oct 23 09:03:37 2005 ++++ includes/functions.inc.php Sun Oct 30 10:51:12 2005 +@@ -18,19 +18,31 @@ + */ + function get_language_pack($lang, $module) + { +- $before = get_defined_vars(); ++ // MC: functions module is in functions.*inc*.php ++ if ($module == 'functions') { ++ $module .= '.inc'; ++ } ++ ++ $before = get_defined_vars(); + require_once("lang/en/$module.php"); + $after_en = get_defined_vars(); +- $new_var = array_keys(array_diff($after_en, $before)); +- $new_var_name = @$new_var[1]; +- $new_var['en'] = @$$new_var_name; +- if (file_exists("lang/$lang/$module.php")) +- { +- require_once("lang/$lang/$module.php"); +- } +- $new_var[$lang] = @$$new_var_name; ++ $new_var = array_keys(array_diff($after_en, $before)); + +- $$new_var_name = @array_merge($new_var['en'], $new_var[$lang]); ++ if (isset($new_var[1])) { ++ list(, $new_var_name) = $new_var; ++ $new_var['en'] = $$new_var_name; ++ ++ if (file_exists("lang/$lang/$module.php")) { ++ require_once("lang/$lang/$module.php"); ++ } ++ $new_var[$lang] = $$new_var_name; ++ // $$new_var_name = array_merge($new_var['en'], $new_var[$lang]); ++ $$new_var_name = $new_var['en']; ++ $merge_ref =& $$new_var_name; ++ foreach ($new_var[$lang] as $key => $val) { ++ $merge_ref[$key] = $val; ++ } ++ } + } + + /** Redirects the browser to the page in $url +@@ -189,17 +201,19 @@ + + $status_id = $get_details['item_status']; + +- require("lang/$lang/status.php"); ++ global $status_list, $severity_list, $priority_list; ++ $this->get_language_pack($lang, 'status'); ++ $this->get_language_pack($lang, 'severity'); ++ $this->get_language_pack($lang, 'priority'); ++ + $tmp_array = array("status_name" => $status_list[$status_id]); + $get_details = $get_details + $tmp_array; + + $severity_id = $get_details['task_severity']; +- require("lang/$lang/severity.php"); + $tmp_array = array("severity_name" => $severity_list[$severity_id]); + $get_details = $get_details + $tmp_array; + + $priority_id = $get_details['task_priority']; +- require("lang/$lang/priority.php"); + $tmp_array = array("priority_name" => $priority_list[$priority_id]); + $get_details = $get_details + $tmp_array; + +@@ -301,8 +315,9 @@ + global $db; + global $dbprefix; + global $lang; ++ global $functions_text; + +- require("lang/$lang/functions.inc.php"); ++ $this->get_language_pack($lang, 'functions'); + + // Just in case $perpage is something weird, like 0, fix it here: + if ($perpage < 1) { $perpage = ($totalcount > 0 ? $totalcount : 1); } diff -ruN flyspray/files/patch-includes::regexp.php flyspray-0.9.8.1/files/patch-includes::regexp.php --- flyspray/files/patch-includes::regexp.php Thu Jan 1 01:00:00 1970 +++ flyspray-0.9.8.1/files/patch-includes::regexp.php Tue Nov 1 11:24:59 2005 @@ -0,0 +1,94 @@ +--- includes/regexp.php.orig Sun Jul 24 12:00:47 2005 ++++ includes/regexp.php Wed Oct 26 23:03:01 2005 +@@ -55,6 +55,20 @@ + + }; + ++if (isset($_GET['sort2']) && !empty($_GET['sort2'])) ++{ ++ // Yes. Now check its regex format for safety -- Limited range ++ if (preg_match ("/^(asc|desc)$/", $_GET['sort2'])) { ++ ++ // continue; ++ } else { ++ ++ $fs->Redirect($fs->CreateURL('error', null)); ++// print "Sorting request is invalid."; exit; ++ }; ++ ++}; ++ + if (isset($_GET['project']) && !empty($_GET['project'])) { + + // Yes. Now check its regex format for safety -- Numbers only +@@ -69,6 +83,21 @@ + }; + }; + ++if (isset($_GET['type']) && !empty($_GET['type'])) { ++ ++ // Yes. Now check its regex format for safety -- Numbers only ++ if (preg_match ("/^\d+$/", $_GET['type'])) { ++ ++ // continue; ++ ++ } else { ++ ++ $fs->Redirect($fs->CreateURL('error', null)); ++// print "Tasktype request is invalid."; exit; ++ }; ++}; ++ ++ + if (isset($_GET['page']) && !empty($_GET['page'])) + { + // Yes. Now check its regex format for safety -- Numbers only +@@ -324,4 +353,48 @@ + // print "Magic URL is invalid."; exit; + }; + }; ++ ++if (isset($_GET['tasks']) && !empty($_GET['tasks'])) ++{ ++ // Yes. Now check its regex format for safety -- Limited range ++ if (preg_match ("/^(all|assigned|reported|watched)$/", $_GET['tasks'])) { ++ ++ // continue; ++ } else { ++ ++ $fs->Redirect($fs->CreateURL('error', null)); ++// print "Tasks request is invalid."; exit; ++ }; ++ ++}; ++ ++if (isset($_GET['due']) && !empty($_GET['due'])) { ++ ++ // Yes. Now check its regex format for safety -- Numbers only ++ if (preg_match ("/^\d+$/", $_GET['due'])) { ++ ++ // continue; ++ } else { ++ ++ $fs->Redirect($fs->CreateURL('error', null)); ++// print "Due version request is invalid."; exit; ++ }; ++}; ++ ++if (isset($_GET['string']) && !empty($_GET['string'])) { ++ ++ // Yes. Now check its regex format for safety -- Numbers only ++ if (preg_match ("!<.*>!", $_GET['string'])) { ++ $fs->Redirect($fs->CreateURL('error', null)); ++ }; ++}; ++ ++if (isset($_GET['PHPSESSID']) && !empty($_GET['PHPSESSID'])) { ++ ++ // Yes. Now check its regex format for safety -- Numbers only ++ if (preg_match ("!<.*>!", $_GET['PHPSESSID'])) { ++ $fs->Redirect($fs->CreateURL('error', null)); ++ }; ++}; ++ + ?> diff -ruN flyspray/files/patch-index.php flyspray-0.9.8.1/files/patch-index.php --- flyspray/files/patch-index.php Thu Jan 1 01:00:00 1970 +++ flyspray-0.9.8.1/files/patch-index.php Tue Nov 1 11:24:59 2005 @@ -0,0 +1,29 @@ +--- index.php.orig Sat Oct 22 13:40:26 2005 ++++ index.php Thu Oct 27 00:09:01 2005 +@@ -384,15 +384,17 @@ + // or, if the user is logged in + } elseif (isset($_COOKIE['flyspray_userid'])) + { +- $get_projects = $db->Query("SELECT DISTINCT p.* +- FROM {$dbprefix}users_in_groups uig +- LEFT JOIN {$dbprefix}groups g ON uig.group_id = g.group_id, +- {$dbprefix}projects p +- WHERE ((uig.user_id = ? +- AND g.view_tasks = '1') +- OR p.others_view = '1') +- AND p.project_is_active = '1' +- GROUP BY p.project_id", ++ $get_projects = $db->Query("SELECT p.* FROM {$dbprefix}projects p ++ LEFT JOIN {$dbprefix}groups g ++ ON p.project_id=g.belongs_to_project ++ AND g.view_tasks=1 ++ LEFT JOIN {$dbprefix}users_in_groups uig ++ ON uig.group_id = g.group_id ++ AND uig.user_id = ? ++ WHERE p.project_is_active='1' ++ AND (p.others_view ++ OR uig.user_id IS NOT NULL) ++ ORDER BY p.project_title", + array($current_user['user_id']) + ); + // Anonymous users diff -ruN flyspray/files/patch-remote.php flyspray-0.9.8.1/files/patch-remote.php --- flyspray/files/patch-remote.php Thu Jan 1 01:00:00 1970 +++ flyspray-0.9.8.1/files/patch-remote.php Tue Nov 1 11:25:00 2005 @@ -0,0 +1,10 @@ +--- remote.php.orig Thu Aug 25 01:53:36 2005 ++++ remote.php Wed Oct 26 23:03:01 2005 +@@ -564,6 +564,7 @@ + { + global $fs; + global $db; ++ global $dbprefix; + include_once('includes/notify.inc.php'); + $notify = new Notifications; + diff -ruN flyspray/files/patch-scripts::details.php flyspray-0.9.8.1/files/patch-scripts::details.php --- flyspray/files/patch-scripts::details.php Thu Jan 1 01:00:00 1970 +++ flyspray-0.9.8.1/files/patch-scripts::details.php Tue Nov 1 11:25:01 2005 @@ -0,0 +1,60 @@ +--- scripts/details.php.orig Sat Oct 22 13:41:22 2005 ++++ scripts/details.php Thu Oct 27 00:09:01 2005 +@@ -91,17 +91,19 @@ + } elseif (isset($_COOKIE['flyspray_userid'])) + { + +- $get_projects = $db->Query("SELECT DISTINCT p.* +- FROM {$dbprefix}users_in_groups uig +- LEFT JOIN {$dbprefix}groups g ON uig.group_id = g.group_id, +- {$dbprefix}projects p +- WHERE ((uig.user_id = ? +- AND g.view_tasks = '1') +- OR p.others_view = '1') +- AND p.project_is_active = '1' +- ORDER BY p.project_title", +- array($current_user['user_id']) +- ); ++ $get_projects = $db->Query("SELECT p.* FROM {$dbprefix}projects p ++ LEFT JOIN {$dbprefix}groups g ++ ON p.project_id=g.belongs_to_project ++ AND g.view_tasks=1 ++ LEFT JOIN {$dbprefix}users_in_groups uig ++ ON uig.group_id = g.group_id ++ AND uig.user_id = ? ++ WHERE p.project_is_active='1' ++ AND (p.others_view ++ OR uig.user_id IS NOT NULL) ++ ORDER BY p.project_title", ++ array($current_user['user_id']) ++ ); + + } else + { +@@ -242,7 +244,7 @@ + + get_language_pack($lang, 'severity'); + foreach($severity_list as $key => $val) + { + if ($task_details['task_severity'] == $key) +@@ -340,7 +342,7 @@ + + + get_language_pack($lang, 'severity'); + foreach($severity_list as $key => $val) + { + if (isset($_GET['sev']) && $_GET['sev'] == $key) +@@ -430,7 +432,7 @@ + + + get_language_pack($lang, 'status'); + foreach($status_list as $key => $val) + { + if (isset($_GET['status']) && $_GET['status'] == $key) +@@ -739,18 +741,18 @@ + { + // Get the full status name + $status_id = $task_details['item_status']; +- require("lang/$lang/status.php"); ++ $fs->get_language_pack($lang, 'status'); + $status = $status_list[$status_id]; + } + + // Get the full severity name + $severity_id = $task_details['task_severity']; +- require("lang/$lang/severity.php"); ++ $fs->get_language_pack($lang, 'severity'); + $severity = $severity_list[$severity_id]; + + // Get the full priority name + $priority_id = $task_details['task_priority']; +- require("lang/$lang/priority.php"); ++ $fs->get_language_pack($lang, 'priority'); + $priority = $priority_list[$priority_id]; + + // see if it's been assigned diff -ruN flyspray/files/patch-scripts::newtask.php flyspray-0.9.8.1/files/patch-scripts::newtask.php --- flyspray/files/patch-scripts::newtask.php Thu Jan 1 01:00:00 1970 +++ flyspray-0.9.8.1/files/patch-scripts::newtask.php Tue Nov 1 11:25:03 2005 @@ -0,0 +1,29 @@ +--- scripts/newtask.php.orig Thu Sep 29 21:43:25 2005 ++++ scripts/newtask.php Wed Oct 26 23:03:01 2005 +@@ -104,7 +104,7 @@ + + get_language_pack($lang, 'severity'); + foreach($severity_list as $key => $val) + { + if ($key == '2') +@@ -198,7 +198,7 @@ +