[evolvis-commits] r10929: [#1045] Remove references to shell accounts on a gforge which doesn ' t provide them↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 17:58:05 CET 2011
Author: mirabilos
Date: 2011-02-24 17:58:05 +0100 (Thu, 24 Feb 2011)
New Revision: 10929
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
trunk/gforge_base/evolvisforge-5.1/gforge/www/account/index.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/approve-pending.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/groupedit.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/useredit.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/index.php
Log:
[#1045] Remove references to shell accounts on a gforge which doesn't provide them
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog 2011-02-24 16:58:04 UTC (rev 10928)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog 2011-02-24 16:58:05 UTC (rev 10929)
@@ -1,8 +1,10 @@
2005-04-27 Christian Bayle <bayle at debian.org>
- * Added the capability to change db port in setup: Closes [#1082]
+ * [#1082] Added the capability to change db port in setup
* Don't ask to choose scm when only one is available
* Removed unused outdated ./www/include/proj_email.php
+ * [#1045] Remove references to shell accounts on a gforge which doesn't
+ provide them
2005-05-17 Marcelo Mottalli <marcelo at gforgegroup.com>
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:58:04 UTC (rev 10928)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/index.php 2011-02-24 16:58:05 UTC (rev 10929)
@@ -216,7 +216,7 @@
// ############################### Shell Account
-if ($u->getUnixStatus() == 'A') {
+if (($u->getUnixStatus() == 'A') && ($sys_use_shell)) {
echo $HTML->boxTop($Language->getText('account_shell','title')."");
print '
<br />'.$Language->getText('account_shell','shell_box').': <strong>'.$u->getUnixBox().'</strong>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/approve-pending.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/approve-pending.php 2011-02-24 16:58:04 UTC (rev 10928)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/approve-pending.php 2011-02-24 16:58:05 UTC (rev 10929)
@@ -169,7 +169,14 @@
<p>
<strong><?php echo $Language->getText('admin','license')." "; print license_getname($row_grp['license']); ?></strong>
+ <?php
+ global $sys_use_shell;
+ if ($sys_use_shell) {
+ ?>
<br /><strong><?php echo $Language->getText('admin_approve_pending','home_box')." "; print $row_grp['unix_box']; ?></strong>
+ <?php
+ } //end of sys_use_shell
+ ?>
<br /><strong><?php echo $Language->getText('admin','http_domain')." "; print $row_grp['http_domain']; ?></strong>
<br />
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/groupedit.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/groupedit.php 2011-02-24 16:58:04 UTC (rev 10928)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/groupedit.php 2011-02-24 16:58:05 UTC (rev 10929)
@@ -176,6 +176,10 @@
</td>
</tr>
<?php } ?>
+<?php
+ global $sys_use_shell;
+ if ($sys_use_shell) {
+?>
<tr>
<td>
<?php echo $Language->getText('admin','home_box'); ?>
@@ -184,6 +188,7 @@
<input type="text" name="form_box" value="<?php echo $group->getUnixBox(); ?>" />
</td>
</tr>
+<?php } //end sus_use_shell condition ?>
<tr>
<td>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/useredit.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/useredit.php 2011-02-24 16:58:04 UTC (rev 10928)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/admin/useredit.php 2011-02-24 16:58:05 UTC (rev 10929)
@@ -55,6 +55,7 @@
} elseif ($action == "update_user" && $delete_user == '') {
+ //XXX use_shell
if (!$u->setEmail($email)
|| !$u->setShell($shell)
|| !$u->setStatus($status)) {
@@ -140,25 +141,33 @@
</td>
</tr>
+<?php
+ global $sys_use_shell;
+
+ if ($sys_use_shell) {
+?>
<tr>
-<td>
-<?php echo $Language->getText('admin_useredit','unix_account_status'); ?><sup>2</sup>:
-</td>
-<td>
-<?php echo $unix_status2str[$u->getUnixStatus()]; ?>
-</td>
+ <td>
+ <?php echo $Language->getText('admin_useredit','unix_account_status'); ?><sup>2</sup>:
+ </td>
+ <td>
+ <?php echo $unix_status2str[$u->getUnixStatus()]; ?>
+ </td>
</tr>
<tr>
-<td>
-<?php echo $Language->getText('admin_useredit','unix_shell'); ?>
-</td>
-<td>
+ <td>
+ <?php echo $Language->getText('admin_useredit','unix_shell'); ?>
+ </td>
+ <td>
<select name="shell">
<?php account_shellselects($u->getShell()); ?>
</select>
-</td>
+ </td>
</tr>
+<?php
+ } // end of sys_use_shell conditionnal
+?>
<tr>
<td>
@@ -189,9 +198,18 @@
<p>
<sup>1</sup><?php echo $Language->getText('admin_useredit','this_page_allows'); ?>
</p>
+
+<?php
+ global $sys_use_shell;
+
+ if ($sys_use_shell) {
+?>
<p>
<sup>2</sup><?php echo $Language->getText('admin_useredit','unix_status_updated_mirroring'); ?>
</p>
+<?php
+ } //end of sys_use_shell condition
+?>
</form>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/index.php 2011-02-24 16:58:04 UTC (rev 10928)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/index.php 2011-02-24 16:58:05 UTC (rev 10929)
@@ -136,13 +136,21 @@
<br />
<?php echo $Language->getText('project_admin','short_description') ?><?php echo $group->getDescription(); ?>
<p><?php echo $Language->getText('project_admin','homepage_link') ?><strong><?php echo $group->getHomepage(); ?></strong></p>
+
+<?php
+ global $sys_use_shell;
+ if ($sys_use_shell) {
+?>
<p><?php echo $Language->getText('project_admin','shell_server') ?><strong><?php echo $group->getUnixName().'.'.$GLOBALS['sys_default_domain']; ?></strong></p>
<p><?php echo $Language->getText('project_admin','shell_server_group_directory') ?><br/><strong><?php echo account_group_homedir($group->getUnixName()); ?></strong></p>
<p><?php echo $Language->getText('project_admin','www_directory') ?><br /><strong><?php echo account_group_homedir($group->getUnixName()).'/htdocs'; ?></p>
+<?php
+ } //end of use_shell condition
+?>
-<?php if($sys_use_scm) { ?>
+<?php if($sys_use_scm) { ?>
<p>[ <a href="/tarballs.php?group_id=<?php echo $group_id; ?>"><?php echo $Language->getText('project_admin', 'download_tarball') ?></a> ]</p>
-<?php } ?>
+<?php } ?>
<hr />
<p>
More information about the evolvis-commits
mailing list