Continue la mise au propre

This commit is contained in:
Alan Garcia 2013-04-19 12:39:51 +00:00
parent 6c391ad8ba
commit f976438093
4 changed files with 20 additions and 22 deletions

View File

@ -321,7 +321,7 @@ function actmoveto_not_empty() {
</script> </script>
</th> </th>
<?php if ($p["showicons"]) { ?> <?php if ($p["showicons"]) { ?>
<th><?php if (!empty($R)) { echo "<a href=''>".$bro->PathList($R,"bro_main.php",true)."</a>"; }?></th> <th style="text-align: center;"><?php if (!empty($R)) { echo $bro->PathList($R,"bro_main.php",true); }?></th>
<?php } ?> <?php } ?>
<th><?php __("Filename"); ?></th> <th><?php __("Filename"); ?></th>
<th><?php __("Size"); ?></th> <th><?php __("Size"); ?></th>
@ -340,7 +340,7 @@ function actmoveto_not_empty() {
if ($c[$i]["type"]) { if ($c[$i]["type"]) {
echo " <td width=\"28\"><input type=\"checkbox\" class=\"inc\" name=\"d[]\" value=\"".htmlentities($c[$i]["name"])."\" /></td>"; echo " <td width=\"28\"><input type=\"checkbox\" class=\"inc\" name=\"d[]\" value=\"".htmlentities($c[$i]["name"])."\" /></td>";
if ($p["showicons"]) { if ($p["showicons"]) {
echo "<td width=\"28\"><img src=\"icon/".$bro->icon($c[$i]["name"])."\" width=\"16\" height=\"16\" alt=\"\" /></td>"; echo "<td style='text-align: center;' width=\"28\"><img src=\"icon/".$bro->icon($c[$i]["name"])."\" width=\"16\" height=\"16\" alt=\"\" /></td>";
} }
echo "<td><a href=\""; echo "<td><a href=\"";
$canedit = $bro->can_edit($R,$c[$i]["name"]); $canedit = $bro->can_edit($R,$c[$i]["name"]);
@ -613,7 +613,7 @@ if ($id=$ftp->is_ftp($R)) {
else { else {
?> ?>
<span class="ina"> <span class="ina">
<a href="ftp_edit.php?create=1&dir=<?php ehe($R); ?>"><?php __("Create an ftp account in this folder"); ?></a> <a href="ftp_edit.php?create=1&amp;dir=<?php ehe($R); ?>"><?php __("Create an ftp account in this folder"); ?></a>
</span> &nbsp; </span> &nbsp;
<?php <?php
} }

View File

@ -80,16 +80,16 @@ __("You can choose what to do with emails sent to unexisting address of this dom
<th colspan="3"><b><?php __("No catch-all");?></b></th> <th colspan="3"><b><?php __("No catch-all");?></b></th>
</tr> </tr>
<tr> <tr>
<td width=1px><input type="radio" name="target_type" id='target_type_none' value="none" <?php if ($catch['type']=='none') {echo 'checked';}?> /></td> <td width="1px"><input type="radio" name="target_type" id='target_type_none' value="none" <?php if ($catch['type']=='none') {echo 'checked="checked"';}?> /></td>
<td colspan='2' style="width: 50%; text-align: justify"><label for='target_type_none'/><?php echo __("No catch-all for this domain.");?></label></td> <td colspan='2' style="width: 50%; text-align: justify"><label for='target_type_none'><?php echo __("No catch-all for this domain.");?></label></td>
</tr> </tr>
<tr> <tr>
<th colspan="3"><b><?php __("Redirect to same address on a different domain");?></b></th> <th colspan="3"><b><?php __("Redirect to same address on a different domain");?></b></th>
</tr> </tr>
<tr> <tr>
<td width=1px><input type="radio" name="target_type" id='target_type_domain' value="domain" <?php if ($catch['type']=='domain') {echo 'checked';}?> /> <td width="1px"><input type="radio" name="target_type" id='target_type_domain' value="domain" <?php if ($catch['type']=='domain') {echo 'checked="checked"';}?> /></td>
<td style="width: 50%; text-align: justify"><label for='target_type_domain'/><?php echo sprintf(_("Mails sent to john.doe@%s will be redirect to john.doe@anotherdomain.tld"),$catch['domain']);?></label></td> <td style="width: 50%; text-align: justify"><label for='target_type_domain'><?php echo sprintf(_("Mails sent to john.doe@%s will be redirect to john.doe@anotherdomain.tld"),$catch['domain']);?></label></td>
<td> <td>
<p> <p>
<i><?php __("Enter the 'target' domain"); ?></i><br/> <i><?php __("Enter the 'target' domain"); ?></i><br/>
@ -106,8 +106,8 @@ __("You can choose what to do with emails sent to unexisting address of this dom
<th colspan="3"><b><?php __("Redirect to a specific email");?></b></th> <th colspan="3"><b><?php __("Redirect to a specific email");?></b></th>
</tr> </tr>
<tr> <tr>
<td width=1px><input type="radio" name="target_type" id='target_type_mail' value="mail" <?php if ($catch['type']=='mail') {echo 'checked';}?> /> <td width="1px"><input type="radio" name="target_type" id='target_type_mail' value="mail" <?php if ($catch['type']=='mail') {echo 'checked="checked"';}?> /></td>
<td style="width: 50%; text-align: justify"><label for='target_type_mail'/><?php echo sprintf(_("Mails sent to an unexisting email on '@%s' will be redirect to user@example.tld."),$catch['domain']);?></label></td> <td style="width: 50%; text-align: justify"><label for='target_type_mail'><?php echo sprintf(_("Mails sent to an unexisting email on '@%s' will be redirect to user@example.tld."),$catch['domain']);?></label></td>
<td> <td>
<p> <p>
<input type="text" name="target_mail" size="30" value="<?php if($catch['type']=='mail') { echo $catch['target']; } ?>" placeholder="<?php __("john.doe@example.tld");?>" /> <input type="text" name="target_mail" size="30" value="<?php if($catch['type']=='mail') { echo $catch['target']; } ?>" placeholder="<?php __("john.doe@example.tld");?>" />

View File

@ -69,8 +69,8 @@ foreach ($xml->channel->item as $val) {
if ($count < $max) { if ($count < $max) {
echo ' echo '
<tr> <tr>
<td '.(empty($val->pubDate)?'colpan=2':'').'><a target=_blank href="'.$val->link.'">'.$val->title.'</a></td>'; <td '.(empty($val->pubDate)?'colpan=2':'').'><a target="_blank" href="'.$val->link.'">'.$val->title.'</a></td>';
if (!empty($val->pubDate)) { echo '<td>'.strftime("%d/%m/%Y" , strtotime($val->pubDate)).'</td></td>'; } if (!empty($val->pubDate)) { echo '<td>'.strftime("%d/%m/%Y" , strtotime($val->pubDate)).'</td>'; }
echo '</tr>'; echo '</tr>';
} }
$count++; $count++;
@ -88,12 +88,13 @@ if($admin->enabled) {
echo "<table cellspacing=\"2\" cellpadding=\"4\">\n"; echo "<table cellspacing=\"2\" cellpadding=\"4\">\n";
echo "<tr><th>"._("uid")."</th><th>"._("Last name, surname")."</th><th>"._("Expiry")."</th></tr>\n"; echo "<tr><th>"._("uid")."</th><th>"._("Last name, surname")."</th><th>"._("Expiry")."</th></tr>\n";
if (is_array($expiring)) { if (is_array($expiring)) {
foreach($expiring as $account) { foreach($expiring as $account) {
echo "<tr class=\"exp{$account['status']}\"><td>{$account['uid']}</td>"; echo "<tr class=\"exp{$account['status']}\"><td>{$account['uid']}</td>";
if($admin->checkcreator($account['uid'])) if($admin->checkcreator($account['uid'])) {
echo "<td><a href=\"adm_edit.php?uid={$account['uid']}\">{$account['nom']}, {$account['prenom']}</a></td>"; echo "<td><a href=\"adm_edit.php?uid={$account['uid']}\">{$account['nom']}, {$account['prenom']}</a></td>";
else }else{
echo "<td>{$account['nom']}, {$account['prenom']}</td>"; echo "<td>{$account['nom']}, {$account['prenom']}</td>";
}
echo "<td>{$account['expiry']}</td></tr>\n"; echo "<td>{$account['expiry']}</td></tr>\n";
} }
} }
@ -102,7 +103,7 @@ if($admin->enabled) {
echo "<hr/><p>"; echo "<hr/><p>";
__("You are using the AlternC Panel. You can contact the AlternC community for information or feedback by joining the mailing-list"); __("You are using the AlternC Panel. You can contact the AlternC community for information or feedback by joining the mailing-list");
echo "&nbsp;<a target=_blank href='http://lists.alternc.org/listinfo/users'>users@alternc.org</a>"; echo "&nbsp;<a target='_blank' href='http://lists.alternc.org/listinfo/users'>users@alternc.org</a>";
echo "</p>"; echo "</p>";
} // if $admin->enabled } // if $admin->enabled

View File

@ -10,7 +10,7 @@ if (!isset($mode)) { # when included from adm_login, mode is not set
?> ?>
<center> <center>
<h3><center><?php printf(_("<b>%s</b> account"),$mem->user["login"]); ?></center></h3> <h3 style="text-align:center;"><?php printf(_("<b>%s</b> account"),$mem->user["login"]); ?></h3>
<div style="width: 550px"> <div style="width: 550px">
@ -48,9 +48,6 @@ if (!isset($mode)) { # when included from adm_login, mode is not set
} }
$t=$quota->get_size_unit($totalmail); $t=$quota->get_size_unit($totalmail);
echo "<p>"._("Mailboxes size:")." ";
echo sprintf("%.1f", $t['size'])."&nbsp;".$t['unit'];
echo "</p>";
foreach ($domaines_user as $domaine) { foreach ($domaines_user as $domaine) {
$alias_sizes = $quota->get_size_mail_details_domain($domaine); $alias_sizes = $quota->get_size_mail_details_domain($domaine);