[Gforge-commits] gforge/www/admin index.php, 1.23, 1.24 grouplist.php, 1.16, 1.17 useredit.php, 1.8, 1.9 approve-pending.php, 1.17, 1.18 userlist.php, 1.17, 1.18

[gsmet]

Update of /cvsroot/gforge/gforge/www/admin
In directory db.perdue.net:/tmp/cvs-serv5926/www/admin

Modified Files:
        index.php grouplist.php useredit.php approve-pending.php 
        userlist.php 
Log Message:
fixed a lot of malformed strings
fixed missing $ in variable name
fixed some parse errors

Index: index.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/index.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- index.php   29 Sep 2004 15:10:41 -0000      1.23
+++ index.php   8 Oct 2004 21:38:01 -0000       1.24
@@ -43,7 +43,7 @@
        <li><?php
                $res=db_query("SELECT count(*) AS count FROM users WHERE 
status='A'");
                $row = db_fetch_array($res);
-               echo $Language->getText('admin_index','active_users_count', 
array($row[count]));
+               echo $Language->getText('admin_index','active_users_count', 
array($row['count']));
        ?></li>
 </ul>
 <ul>
@@ -71,17 +71,17 @@
        <li><?php
                $res=db_query("SELECT count(*) AS count FROM groups");
                $row = db_fetch_array($res);
-               echo 
$Language->getText('admin_index','registered_projects_count', 
array($row[count]));
+               echo 
$Language->getText('admin_index','registered_projects_count', 
array($row['count']));
        ?></li>
        <li><?php
                $res=db_query("SELECT count(*) AS count FROM groups WHERE 
status='A'");
                $row = db_fetch_array($res);
-               echo $Language->getText('admin_index','active_projects_count', 
array($row[count]));
+               echo $Language->getText('admin_index','active_projects_count', 
array($row['count']));
        ?></li>
        <li><?php
                $res=db_query("SELECT count(*) AS count FROM groups WHERE 
status='P'");
                $row = db_fetch_array($res);
-               echo $Language->getText('admin_index','pending_projects_count', 
array($row[count]));
+               echo $Language->getText('admin_index','pending_projects_count', 
array($row['count']));
        ?></li>
 </ul>
 <ul>

Index: grouplist.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/grouplist.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- grouplist.php       27 Aug 2004 19:02:18 -0000      1.16
+++ grouplist.php       8 Oct 2004 21:38:01 -0000       1.17
@@ -66,7 +66,7 @@
                . "COUNT(user_group.group_id) AS members "
                . "FROM groups LEFT JOIN user_group ON 
user_group.group_id=groups.group_id,group_category "
                . "WHERE groups.group_id=group_category.group_id AND "
-               . "group_category.category_id=$GLOBALS[form_catroot] "
+               . "group_category.category_id=".$GLOBALS['form_catroot']." "
                . "GROUP BY 
group_name,register_time,unix_group_name,groups.group_id,is_public,status,license
 "
                . "ORDER BY $sortorder");
 }

Index: useredit.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/useredit.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- useredit.php        27 Aug 2004 19:02:18 -0000      1.8
+++ useredit.php        8 Oct 2004 21:38:01 -0000       1.9
@@ -200,12 +200,12 @@
 
 while ($row_cat = db_fetch_array($res_cat)) {
 
-       $row_cat[group_name] = htmlspecialchars($row_cat[group_name]);
+       $row_cat['group_name'] = htmlspecialchars($row_cat['group_name']);
        print '
                <tr '.$GLOBALS['HTML']->boxGetAltRowStyle($i++).'>
                <td>'.$row_cat['group_name'].'</td>
                <td>'.$row_cat['unix_group_name'].'</td>
-               <td width="40%"><a 
href="/project/admin/?group_id='.$row_cat[group_id].'">['.$Language->getText('admin_useredit','project_admin').']</a></td>
+               <td width="40%"><a 
href="/project/admin/?group_id='.$row_cat['group_id'].'">['.$Language->getText('admin_useredit','project_admin').']</a></td>
                </tr>
        ';
 

Index: approve-pending.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/approve-pending.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- approve-pending.php 27 Aug 2004 19:12:44 -0000      1.17
+++ approve-pending.php 8 Oct 2004 21:38:01 -0000       1.18
@@ -179,16 +179,16 @@
        // ########################## OTHER INFO
 
        print "<p><strong>" 
.$Language->getText('admin_approve_pending','other_information')."</strong></p>";
-       print "<p>" 
.$Language->getText('admin_approve_pending','unix_group_name'). " 
$row_grp[unix_group_name]</p>";
+       print "<p>" 
.$Language->getText('admin_approve_pending','unix_group_name'). " 
".$row_grp['unix_group_name']."</p>";
 
-       print "<p>" 
.$Language->getText('admin_approve_pending','submitted_description'). 
"</p><blockquote>$row_grp[register_purpose]</blockquote>";
+       print "<p>" 
.$Language->getText('admin_approve_pending','submitted_description'). 
"</p><blockquote>".$row_grp['register_purpose']."</blockquote>";
 
-       if ($row_grp[license]=="other") {
-               print "<p>" .$Language->getText('admin','license_other'). 
"</p><blockquote>$row_grp[license_other]</blockquote>";
+       if ($row_grp['license']=="other") {
+               print "<p>" .$Language->getText('admin','license_other'). 
"</p><blockquote>".$row_grp['license_other']."</blockquote>";
        }
 
-       if ($row_grp[status_comment]) {
-               print "<p>" 
.$Language->getText('admin_approve_pending','pending_reason'). "</p><span 
style=\"color:red\">$row_grp[status_comment]</span>";
+       if ($row_grp['status_comment']) {
+               print "<p>" 
.$Language->getText('admin_approve_pending','pending_reason'). "</p><span 
style=\"color:red\">".$row_grp['status_comment']."</span>";
        }
 
        echo "<p>&nbsp;</p><hr /><p>&nbsp;</p>";

Index: userlist.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/userlist.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- userlist.php        27 Aug 2004 19:02:18 -0000      1.17
+++ userlist.php        8 Oct 2004 21:38:01 -0000       1.18
@@ -73,8 +73,8 @@
                if ($usr['status'] == 'A') print "#00ff00";
                if ($usr['status'] == 'D') print "grey";
                if ($usr['status'] == 'S') print "red";
-               print "\"><a href=\"useredit.php?user_id=$usr[user_id]\">";
-               if ($usr[status] == 'P') print "*";
+               print "\"><a 
href=\"useredit.php?user_id=".$usr['user_id']."\">";
+               if ($usr['status'] == 'P') print "*";
                echo $usr['firstname'].' 
'.$usr['lastname'].'('.$usr['user_name'].')</a>';
                echo '</td>';
                echo '<td width="15%" align="center">';