[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gforge-commits] gforge/www/mail index.php, 1.10, 1.11 mail_utils.php, 1
From: |
tperdue |
Subject: |
[Gforge-commits] gforge/www/mail index.php, 1.10, 1.11 mail_utils.php, 1.5, 1.6 |
Date: |
Tue, 14 Sep 2004 23:21:50 -0500 |
Update of /cvsroot/gforge/gforge/www/mail
In directory db.perdue.net:/home/tperdue/share/dev.gforge.org/www/mail
Modified Files:
index.php mail_utils.php
Log Message:
minor mailing list changes
Index: index.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/mail/index.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- index.php 13 Apr 2004 20:25:53 -0000 1.10
+++ index.php 15 Sep 2004 04:21:47 -0000 1.11
@@ -18,19 +18,21 @@
if ($group_id) {
$Group =& group_get_object($group_id);
- if (!$Group || !is_object($Group) || $Group->isError()) {
+ if (!$Group || !is_object($Group)) {
+ exit_error($Language->getText('general', 'error'), 'Could Not
Get Group');
+ } elseif ($Group->isError()) {
exit_no_group();
}
$mlFactory = new MailingListFactory($Group);
- if (!$mlFactory || !is_object($mlFactory) || $mlFactory->isError()) {
+ if (!$mlFactory || !is_object($mlFactory)) {
+ exit_error($Language->getText('general', 'error'), 'Could Not
Get MailingListFactory');
+ } elseif ($mlFactory->isError()) {
exit_error($Language->getText('general', 'error'),
$mlFactory->getErrorMessage());
}
mail_header(array(
- 'title' => $Language->getText('mail', 'mailinglists_for',
array($Group->getPublicName())),
- 'pagename' => 'mail',
- 'sectionvals' => array($Group->getPublicName())
+ 'title' => $Language->getText('mail', 'mailinglists_for',
array($Group->getPublicName()))
));
@@ -56,7 +58,8 @@
$tableHeaders = array(
$Language->getText('mail_common', 'mailing_list'),
- ''
+ $Language->getText('mail_common', 'description'),
+ $Language->getText('mail_common', 'prefs')
);
echo $HTML->listTableTop($tableHeaders);
@@ -64,18 +67,18 @@
$currentList =& $mlArray[$j];
echo '<tr '. $HTML->boxGetAltRowStyle($j) .'>';
if ($currentList->isError()) {
- echo '<td
colspan="2">'.$currentList->getErrorMessage().'</td></tr>';
+ echo '<td
colspan="3">'.$currentList->getErrorMessage().'</td></tr>';
} else if($currentList->getStatus() ==
MAIL__MAILING_LIST_IS_REQUESTED) {
- echo '<td width="60%">'.
-
'<strong>'.$currentList->getName().'</strong><br />'.
-
htmlspecialchars($currentList->getDescription()). '</td>'.
- '<td width="40%"
align="center">'.$Language->getText('mail_common',
'list_not_activated').'</td></tr>';
+ echo '<td width="33%">'.
+
'<strong>'.$currentList->getName().'</strong></td>'.
+ '<td
width="33%">'.htmlspecialchars($currentList->getDescription()). '</td>'.
+ '<td width="33%"
align="center">'.$Language->getText('mail_common',
'list_not_activated').'</td></tr>';
} else {
- echo '<td width="60%">'.
+ echo '<td width="33%">'.
'<strong><a
href="'.$currentList->getArchivesUrl().'">' .
- $Language->getText('mail', 'archives',
array($currentList->getName())).'</a></strong><br />'.
-
htmlspecialchars($currentList->getDescription()). '</td>'.
- '<td width="40%" align="center"><a
href="'.$currentList->getExternalInfoUrl().'">'.$Language->getText('mail',
'external_administration').'</a>'.
+ $Language->getText('mail', 'archives',
array($currentList->getName())).'</a></strong></td>'.
+
'<td>'.htmlspecialchars($currentList->getDescription()). '</td>'.
+ '<td width="33%" align="center"><a
href="'.$currentList->getExternalInfoUrl().'">'.$Language->getText('mail',
'external_administration').'</a>'.
'</td>';
}
echo '</tr>';
Index: mail_utils.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/mail/mail_utils.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mail_utils.php 10 Jul 2004 16:23:39 -0000 1.5
+++ mail_utils.php 15 Sep 2004 04:21:47 -0000 1.6
@@ -39,16 +39,7 @@
)
);
} else {
- $params['toptab'] = 'mail';
- site_project_header($params);
- echo $HTML->subMenu(
- array(
- $Language->getText('group','short_mail'),
- ),
- array(
- '/mail/?group_id='.$group_id,
- )
- );
+ exit_no_group();
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gforge-commits] gforge/www/mail index.php, 1.10, 1.11 mail_utils.php, 1.5, 1.6,
tperdue <=