[evolvis-commits] r13767: db_query_params() migration
mirabilos at evolvis.org
mirabilos at evolvis.org
Mon Feb 28 02:58:04 CET 2011
Author: mirabilos
Date: 2011-02-28 02:58:04 +0100 (Mon, 28 Feb 2011)
New Revision: 13767
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php
Log:
db_query_params() migration
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php 2011-02-28 01:58:02 UTC (rev 13766)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php 2011-02-28 01:58:04 UTC (rev 13767)
@@ -97,12 +97,14 @@
}
if($GLOBALS['sys_use_people']) {
- $jobs_res = db_query("SELECT name
+ $jobs_res = db_query_params ('SELECT name
FROM people_job,people_job_category
WHERE people_job.category_id=people_job_category.category_id
AND people_job.status_id=1
- AND group_id='$group_id'
- GROUP BY name",2);
+ AND group_id=$1
+ GROUP BY name',
+ array ($group_id),
+ 2);
if ($jobs_res) {
$num=db_numrows($jobs_res);
if ($num>0) {
@@ -197,25 +199,21 @@
// Members of projects can see all packages
// Non-members can only see public packages
//
- if (session_loggedin()) {
- if (user_ismember($group_id) || user_ismember(1,'A')) {
- $pub_sql='';
- } else {
- $pub_sql=' AND frs_package.is_public=1 ';
- }
- } else {
- $pub_sql=' AND frs_package.is_public=1 ';
+ $public_required = 1;
+ if (session_loggedin() &&
+ (user_ismember($group_id) || user_ismember(1,'A'))) {
+ $public_required = 0 ;
}
- $sql="SELECT frs_package.package_id,frs_package.name AS package_name,frs_release.name AS release_name,frs_release.release_id AS release_id,frs_release.release_date AS release_date
+ $res_files = db_query_params ('SELECT frs_package.package_id,frs_package.name AS package_name,frs_release.name AS release_name,frs_release.release_id AS release_id,frs_release.release_date AS release_date
FROM frs_package,frs_release
WHERE frs_package.package_id=frs_release.package_id
- AND frs_package.group_id='$group_id'
+ AND frs_package.group_id=$1
AND frs_release.status_id=1
- $pub_sql
- ORDER BY frs_package.package_id,frs_release.release_date DESC";
-
- $res_files = db_query($sql);
+ AND (frs_package.is_public=1 AND 1=$2)
+ ORDER BY frs_package.package_id,frs_release.release_date DESC',
+ array ($group_id,
+ $public_required));
$rows_files=db_numrows($res_files);
if (!$res_files || $rows_files < 1) {
echo db_error();
@@ -350,8 +348,8 @@
print '<hr size="1" /><a href="'.util_make_url ('/pm/?group_id='.$group_id).'">';
print html_image('ic/taskman20g.png','20','20',array('alt'=>_('Tasks')));
print ' '._('Task Manager').'</a>';
- $sql="SELECT * FROM project_group_list WHERE group_id='$group_id' AND is_public=1";
- $result = db_query ($sql);
+ $result = db_query_params ('SELECT * FROM project_group_list WHERE group_id=$1 AND is_public=1',
+ array ($group_id));
$rows = db_numrows($result);
if (!$result || $rows < 1) {
echo '<br /><em>'._('There are no public subprojects available').'</em>';
@@ -382,21 +380,6 @@
print html_image('ic/cvs16b.png','20','20',array('alt'=>_('SCM')));
print ' '._('SCM Repository')."</a>";
- /*
- $result = db_query("
- SELECT sum(commits) AS commits,sum(adds) AS adds
- FROM stats_cvs_group
- WHERE group_id='$group_id'
- ", -1, 0, SYS_DB_STATS);
- $cvs_commit_num = db_result($result,0,0);
- $cvs_add_num = db_result($result,0,1);
- if (!$cvs_commit_num) {
- $cvs_commit_num=0;
- }
- if (!$cvs_add_num) {
- $cvs_add_num=0;
- }
- */
$hook_params = array () ;
$hook_params['group_id'] = $group_id ;
plugin_hook ("scm_stats", $hook_params) ;
More information about the evolvis-commits
mailing list