[evolvis-commits] r9469: implemented correctly $sys_use_people in all GForge↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 17:25:39 CET 2011
Author: mirabilos
Date: 2011-02-24 17:25:38 +0100 (Thu, 24 Feb 2011)
New Revision: 9469
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/www/account/index.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/include/user_home.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/people/admin/index.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/people/createjob.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/people/editjob.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/people/editprofile.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/people/helpwanted-latest.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/people/index.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/people/viewjob.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/people/viewprofile.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/project_admin_utils.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/project/memberlist.php
Log:
implemented correctly $sys_use_people in all GForge
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/account/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/account/index.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/index.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -69,14 +69,16 @@
?>
-<p> <?php echo $Language->getText('account_options', 'welcome'); ?> <strong><?php print $u->getUnixName(); ?></strong>. </p>
+<p> <?php echo $Language->getText('account_options', 'welcome'); ?> <strong><?php print $u->getRealName(); ?></strong>. </p>
<p>
<?php echo $Language->getText('account_options', 'intro'); ?>
</p>
<ul>
<li><a href="/users/<?php print $u->getUnixName(); ?>/"><strong><?php echo $Language->getText('account_options', 'view_developer_profile'); ?></strong></a></li>
-<li><a href="/people/editprofile.php"><strong><?php echo $Language->getText('account_options', 'edit_skills_profile'); ?></strong></a></li>
+<?php if($GLOBALS['sys_use_people']) { ?>
+ <li><a href="/people/editprofile.php"><strong><?php echo $Language->getText('account_options', 'edit_skills_profile'); ?></strong></a></li>
+<?php } ?>
<li><a href="/themes/"><strong><?php echo $Language->getText('menu', 'change_my_theme'); ?></strong></a></li>
</ul>
<?php echo $HTML->boxBottom(); ?>
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-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -71,22 +71,24 @@
print '<br />'.$Language->getText('group', 'activitystat', $group_id);
}
-$jobs_res = db_query("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);
-if ($jobs_res) {
- $num=db_numrows($jobs_res);
- if ($num>0) {
- print '<br /><br />'.$Language->getText('project_home','help_wanted').' ';
- if ($num==1) {
- print '<a href="/people/?group_id='.$group_id.'">'. db_result($jobs_res,0,"name").'(s)</a>';
- } else {
- print $Language->getText('project_home','help_wanted_multiple', '<a href="/people/?group_id='.$group_id.'">').' </a>';
- }
- }
+if($GLOBALS['sys_use_people']) {
+ $jobs_res = db_query("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);
+ if ($jobs_res) {
+ $num=db_numrows($jobs_res);
+ if ($num>0) {
+ print '<br /><br />'.$Language->getText('project_home','help_wanted').' ';
+ if ($num==1) {
+ print '<a href="/people/?group_id='.$group_id.'">'. db_result($jobs_res,0,"name").'(s)</a>';
+ } else {
+ print $Language->getText('project_home','help_wanted_multiple', '<a href="/people/?group_id='.$group_id.'">').' </a>';
+ }
+ }
+ }
}
plugin_hook ("project_after_description",false) ;
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/user_home.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/user_home.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/user_home.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -25,7 +25,7 @@
<?php echo $HTML->boxTop($Language->getText('user_home','personal_information')); ?>
<tr>
<td><?php echo $Language->getText('user_home','user_id') ?> </td>
- <td><strong><?php print $user_id; ?></strong> ( <a href="/people/viewprofile.php?user_id=<?php print $user_id; ?>"><strong><?php echo $Language->getText('user_home','skills_profile') ?></strong></a> )</td>
+ <td><strong><?php print $user_id; ?></strong> <?php if($GLOBALS['sys_use_people']) { ?>( <a href="/people/viewprofile.php?user_id=<?php print $user_id; ?>"><strong><?php echo $Language->getText('user_home','skills_profile') ?></strong></a> )<?php } ?></td>
</tr>
<tr valign="top">
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/people/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/people/admin/index.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/people/admin/index.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -15,6 +15,10 @@
require_once('pre.php');
require_once('www/people/people_utils.php');
+if (!$sys_use_people) {
+ exit_disabled();
+}
+
if (user_ismember(1,'A')) {
if ($post_changes) {
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/people/createjob.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/people/createjob.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/people/createjob.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -16,6 +16,10 @@
require_once('www/people/people_utils.php');
require_once('www/project/admin/project_admin_utils.php');
+if (!$sys_use_people) {
+ exit_disabled();
+}
+
if ($group_id && (user_ismember($group_id, 'A'))) {
project_admin_header(array());
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/people/editjob.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/people/editjob.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/people/editjob.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -15,6 +15,10 @@
require_once('pre.php');
require_once('www/people/people_utils.php');
+if (!$sys_use_people) {
+ exit_disabled();
+}
+
if ($group_id && (user_ismember($group_id, 'A'))) {
if ($add_job) {
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/people/editprofile.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/people/editprofile.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/people/editprofile.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -14,6 +14,10 @@
require_once('people_utils.php');
require_once('skills_utils.php');
+if (!$sys_use_people) {
+ exit_disabled();
+}
+
if (session_loggedin()) {
if ($update_profile) {
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/people/helpwanted-latest.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/people/helpwanted-latest.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/people/helpwanted-latest.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -15,6 +15,10 @@
require_once('pre.php');
require_once('www/people/people_utils.php');
+if (!$sys_use_people) {
+ exit_disabled();
+}
+
people_header(array('title'=>$Language->getText('people_help_wanted_latest','title'),'pagename'=>'people_helpwanted_latest'));
{
@@ -33,4 +37,4 @@
people_footer(array());
-?>
+?>
\ No newline at end of file
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/people/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/people/index.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/people/index.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -16,6 +16,10 @@
require_once('www/people/people_utils.php');
require_once('www/project/admin/project_admin_utils.php');
+if (!$sys_use_people) {
+ exit_disabled();
+}
+
if ($group_id) {
project_admin_header(array());
@@ -59,4 +63,4 @@
people_footer(array());
-?>
+?>
\ No newline at end of file
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/people/viewjob.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/people/viewjob.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/people/viewjob.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -15,6 +15,10 @@
require_once('pre.php');
require_once('www/people/people_utils.php');
+if (!$sys_use_people) {
+ exit_disabled();
+}
+
if ($group_id && $job_id) {
/*
@@ -91,4 +95,4 @@
}
}
-?>
+?>
\ No newline at end of file
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/people/viewprofile.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/people/viewprofile.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/people/viewprofile.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -14,6 +14,9 @@
require_once('people_utils.php');
require_once('skills_utils.php');
+if (!$sys_use_people) {
+ exit_disabled();
+}
if ($user_id) {
@@ -60,4 +63,4 @@
exit_error('Error','user_id not found.');
}
-?>
+?>
\ No newline at end of file
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/project_admin_utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/project_admin_utils.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/project_admin_utils.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -51,7 +51,7 @@
$labels[] = $Language->getText('project_admin_utils','edit_public_info');
$labels[] = $Language->getText('project_admin_utils','project_history');
$labels[] = $Language->getText('project_admin_utils','vhosts');
- if($GLOBALS['$sys_use_people']) {
+ if($GLOBALS['sys_use_people']) {
$labels[] = $Language->getText('project_admin_utils','post_jobs');
$labels[] = $Language->getText('project_admin_utils','edit_jobs');
}
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/project/memberlist.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/project/memberlist.php 2011-02-24 16:25:37 UTC (rev 9468)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/project/memberlist.php 2011-02-24 16:25:38 UTC (rev 9469)
@@ -20,7 +20,7 @@
site_project_header(array('title'=>$Language->getText('project_memberlist','title'),'group'=>$group_id,'toptab'=>'memberlist'));
-print $Language->getText('project_memberlist', 'joining');
+echo $Language->getText('project_memberlist', 'joining');
// list members
$query = "SELECT users.*,user_group.admin_flags,people_job_category.name AS role
@@ -36,27 +36,31 @@
$title_arr[]=$Language->getText('project_memberlist', 'developer');
$title_arr[]=$Language->getText('project_memberlist', 'username');
$title_arr[]=$Language->getText('project_memberlist', 'role');
-$title_arr[]=$Language->getText('project_memberlist', 'skills');
+if($GLOBALS['sys_use_people']) {
+ $title_arr[]=$Language->getText('project_memberlist', 'skills');
+}
echo $GLOBALS['HTML']->listTableTop ($title_arr);
$res_memb = db_query($query);
while ( $row_memb=db_fetch_array($res_memb) ) {
- print "<tr ".$HTML->boxGetAltRowStyle($i++).">";
+ echo "<tr ".$HTML->boxGetAltRowStyle($i++).">";
if ( trim($row_memb['admin_flags'])=='A' ) {
- print "\t\t<td><strong>$row_memb[realname]</strong></td>\n";
+ print "\t\t<td><strong>".$row_memb['realname']."</strong></td>\n";
} else {
- print "\t\t<td>$row_memb[realname]</td>\n";
+ echo "\t\t<td>".$row_memb['realname']."</td>\n";
}
- print "
- <td align=\"center\"><a href=\"/users/$row_memb[user_name]/\">$row_memb[user_name]</a></td>
- <td align=\"center\">$row_memb[role]</td>
- <td align=\"center\"><a href=\"/people/viewprofile.php?user_id=$row_memb[user_id]\">".$Language->getText('project_memberlist','view')."</a></td>
- </tr>";
+ echo "
+ <td align=\"center\"><a href=\"/users/".$row_memb['user_name']."/\">".$row_memb['user_name']."</a></td>
+ <td align=\"center\">".$row_memb['role']."</td>";
+ if($GLOBALS['sys_use_people']) {
+ echo "<td align=\"center\"><a href=\"/people/viewprofile.php?user_id=".$row_memb['user_id']."\">".$Language->getText('project_memberlist','view')."</a></td>";
+ }
+ echo "</tr>";
}
echo $GLOBALS['HTML']->listTableBottom();
site_project_footer(array());
-?>
+?>
\ No newline at end of file
More information about the evolvis-commits
mailing list