Quelques modifs sur le HTML généré (fermeture de balises, etc...)

This commit is contained in:
Alan Garcia 2013-04-19 07:18:25 +00:00
parent 592d60334e
commit c93bc9bfa0
15 changed files with 58 additions and 51 deletions

View File

@ -69,8 +69,7 @@ $r=$admin->get_list($show == 'all' ? 1 : 0, $creator);
?>
<p>
<?php __("Here is the list of hosted AlternC accounts"); ?> (<?php printf(_("%s accounts"),count($r)); ?>)
&nbsp;
</p>
<?php
if ($subadmin==1 || $cuid==2000) {
@ -140,7 +139,7 @@ while (list($key,$val)=each($r))
<?php
if ($val["su"]) { ?>
<td>&nbsp;</td>
<td id="user_<?php echo $val["uid"]; ?>">&nbsp;</td>
<?php } else { ?>
<td><input type="checkbox" class="inc" name="d[]" id="user_<?php echo $val["uid"]; ?>" value="<?php echo $val["uid"]; ?>" /></td>
<?php } ?>
@ -158,7 +157,7 @@ while (list($key,$val)=each($r))
<tr class="lst<?php echo $col; ?>" >
<td/><td ><i><?php echo _("DB:").' '.$val['db_server_name']?></i></td>
<td colspan="8" >
<div id="admlistbtn">
<div name="admlistbtn">
<span class="ina<?php if ($col==2) echo "v"; ?> lst<?php echo $col; ?>">
<a href="adm_login.php?id=<?php echo $val["uid"];?>"><?php __("Connect as"); ?></a>
</span>&nbsp;
@ -255,7 +254,7 @@ if (isset($r[$z+2*$rz])) {
if (is_array($val)) {
?>
<?php if ($val["su"]) { ?>
<td>&nbsp;</td>
<td id="id_c_<?php echo $val["uid"]; ?>">&nbsp;</td>
<?php } else { ?>
<td align="center"><input type="checkbox" class="inc" name="d[]" value="<?php echo $val["uid"]; ?>" id="id_c_<?php echo $val["uid"]; ?>" /></td>
<?php } ?>

View File

@ -61,8 +61,8 @@ $dom->unlock();
if ($first_advanced) {
$first_advanced=false;
echo "<tr><td colspan=\"2\" class=\"advdom\"></td></tr>";
echo "<tr id='domtype_show' onClick=\"domtype_advanced_show();\"><td colspan=2><a href=\"javascript:domtype_advanced_show();\"><b>+ "; __("Show advanced options"); echo "</b></a></td></tr>";
echo "<tr id='domtype_hide' onClick=\"domtype_advanced_hide();\" style='display:none'><td colspan=2><a href=\"javascript:domtype_advanced_hide();\"><b>- "; __("Hide advanced options"); echo "</b></a></td></tr>";
echo "<tr id='domtype_show' onClick=\"domtype_advanced_show();\"><td colspan='2'><a href=\"javascript:domtype_advanced_show();\"><b>+ "; __("Show advanced options"); echo "</b></a></td></tr>";
echo "<tr id='domtype_hide' onClick=\"domtype_advanced_hide();\" style='display:none'><td colspan='2'><a href=\"javascript:domtype_advanced_hide();\"><b>- "; __("Hide advanced options"); echo "</b></a></td></tr>";
echo "<tr><td colspan=\"2\" class=\"advdom\"></td></tr>";
}
}
@ -98,7 +98,7 @@ $dom->unlock();
break;
case 'TXT':?>
<input type="text" class="int" name="t_<?php echo $dt['name']?>" id="t_<?php echo $dt['name']?>" value="<?php ehe($targval);?>" size="32" onKeyPress="getElementById('r_<?php echo $dt['name']?>').checked=true;" />
<small><?php __("(enter a TXT informations for this domain)"); ?></small></td><?php
<small><?php __("(enter a TXT informations for this domain)"); ?></small><?php
break;
case 'DOMAIN':?>
<input type="text" class="int" name="t_<?php echo $dt['name']?>" id="t_<?php echo $dt['name']?>" value="<?php ehe($targval);?>" size="32" onKeyPress="getElementById('r_<?php echo $dt['name']?>').checked=true;" />

View File

@ -122,7 +122,7 @@ for($i=0;$i<$r["nsub"];$i++) {
?>
<tr class="lst<?php echo $col; ?>">
<?php if ( $r['sub'][$i]['web_action'] =='DELETE') { echo "<td colspan=2 />"; } else { ?>
<?php if ( $r['sub'][$i]['web_action'] =='DELETE') { echo "<td colspan='2' />"; } else { ?>
<td class="center">
<?php if (!(!$isinvited && $dt[strtolower($r["sub"][$i]["type"])]["enable"] != "ALL" )) { ?>
<div class="ina"><a href="dom_subedit.php?sub_domain_id=<?php echo urlencode($r["sub"][$i]["id"]) ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /><?php __("Edit"); ?></a></div>
@ -163,7 +163,7 @@ for($i=0;$i<$r["nsub"];$i++) {
break;
case 'DISABLED':
__("Disabled");
echo "<br/><a href='dom_substatus.php?domain=".urlencode($r["name"])."&amp;sub=".urlencode($r["sub"][$i]["name"])."&amp;type=".urlencode($r["sub"][$i]["type"])."&amp;value=".urlencode($r["sub"][$i]['dest'])."&status=enable'>";__("Enable");echo "</a>";
echo "<br/><a href='dom_substatus.php?domain=".urlencode($r["name"])."&amp;sub=".urlencode($r["sub"][$i]["name"])."&amp;type=".urlencode($r["sub"][$i]["type"])."&amp;value=".urlencode($r["sub"][$i]['dest'])."&amp;status=enable'>";__("Enable");echo "</a>";
break;
case 'DISABLE':
__("Desactivation pending");
@ -205,7 +205,7 @@ if (!$r['noerase']) {
?>
<hr />
<h3><?php __("DNS & Email parameters"); ?></h3>
<h3><?php __("DNS &amp; Email parameters"); ?></h3>
<form action="dom_editdns.php?domain=<?php echo urlencode($r["name"]) ?>" method="post" id="fdns" name="fdns" onSubmit="return destruction_alert();">
<table class="tlist2">
@ -227,6 +227,7 @@ if (!$r['noerase']) {
<input type="radio" id="yesemail" class="inc" name="email" value="1"<?php cbox($r["mail"]); ?> />&nbsp;<label for="yesemail"><?php __("Yes"); ?></label>
</td><td><input type="radio" id="noemail" class="inc" name="email" value="0"<?php cbox(!$r["mail"]); ?> />&nbsp;<label for="noemail"><?php __("No"); ?></label>
</td>
</tr>
</table>
<p class="error"> <?php __("Warning: If you set this to 'no', all your email accounts and aliases on this domain will be immediately deleted."); ?></p>
<input type="submit" class="inb" name="submit" value="<?php __("Submit the changes"); ?>" />

View File

@ -1,4 +1,5 @@
</div>
</td>
</tr>
</table>

View File

@ -81,7 +81,7 @@ while (list($key,$val)=each($r))
<td align="center"><input type="checkbox" class="inc" id="del_<?php echo $val["id"]; ?>" name="del_<?php echo $val["id"]; ?>" value="<?php echo $val["id"]; ?>" /></td>
<td><div class="ina"><a href="ftp_edit.php?id=<?php echo $val["id"] ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /><?php __("Edit"); ?></a></div></td>
<td><a href='ftp_switch_enable.php?id=<?php echo $val['id'].'&status='.( ($val['enabled'])?'0':'1' ) ;?>' onClick='return confirm("<?php __("Are you sure you want to change his status?"); ?>");'><?php
<td><a href='ftp_switch_enable.php?id=<?php echo $val['id'].'&amp;status='.( ($val['enabled'])?'0':'1' ) ;?>' onClick='return confirm("<?php __("Are you sure you want to change his status?"); ?>");'><?php
if ( $val['enabled']) {
echo "<img src='images/check_ok.png' alt=\""._("Enabled")."\"/>";
} else {
@ -91,7 +91,7 @@ if ( $val['enabled']) {
?></a></td>
<td><label for="del_<?php echo $val["id"]; ?>"><?php echo $val["login"] ?></label>
<input type='hidden' name='names[<?php echo $val['id'];?>]' value='<?php echo $val["login"] ?>' >
<input type='hidden' name='names[<?php echo $val['id'];?>]' value='<?php echo $val["login"] ?>' />
</td>
<td><code><?php echo str_replace(getuserpath(),'', $val["dir"]) ?></code></td>
</tr>
@ -109,12 +109,13 @@ if ( $val['enabled']) {
<?php __("Here are some configuration informations you'll need to configure your FTP application.");?>
<p>
<ul>
<li><?php echo '<b>'._("Server:").'</b> '.$ftp->srv_name; ?></li>
<li><?php echo '<b>'._("FTP mode for data transfert:").'</b> '._("passive");?></li>
<li><?php echo '<b>'._("User/password:").'</b> '._("the one you specified when you created the account. You can edit them in the panel.");?></li>
<ul>
<br/>
</ul>
</p>
<?php
$mem->show_help("ftp_list");

View File

@ -58,7 +58,7 @@ if (!$charset) $charset="UTF-8";
if ( empty($logo) || ! $logo ) { $logo = 'images/logo.png'; }
?>
<p id="logo"> <img src="<?php echo $logo; ?>" border="0" alt="<?php __("Web Hosting Control Panel"); ?>" title="<?php __("Web Hosting Control Panel"); ?>" /></a>
<p id="logo"> <img src="<?php echo $logo; ?>" border="0" alt="<?php __("Web Hosting Control Panel"); ?>" title="<?php __("Web Hosting Control Panel"); ?>" />
</p>
<p>&nbsp;</p>
<?php if (isset($error) && $error) echo "<div class='error'>$error</div>"; ?>
@ -82,7 +82,7 @@ if (!$charset) $charset="UTF-8";
<tr><td colspan="2" align="center"><b><?php __("AlternC access"); ?></b></td></tr>
<tr><td align="right"><label for="username"><?php echo _("Username"); ?></label></td><td><input type="text" class="int" name="username" id="username" value="" maxlength="128" size="15" /></td></tr>
<tr><td align="right"><label for="password"><?php echo _("Password"); ?></label></td><td><input type="password" class="int" name="password" id="password" value="" maxlength="128" size="15" /></td></tr>
<tr><td colspan="2" align="center"><input type="submit" class="inb" name="submit" onClick='return logmein();' value="<?php __("Enter"); ?>" /><input type="hidden" id="restrictip" name="restrictip" value="1" /></td></tr>
<tr><td colspan="2" align="center"><input type="submit" class="inb" name="submit" onclick='return logmein();' value="<?php __("Enter"); ?>" /><input type="hidden" id="restrictip" name="restrictip" value="1" /></td></tr>
</table>
<input type="hidden" id="authip_token" name="authip_token" value="<?php echo htmlentities( (empty($authip_token)?'':$authip_token) ) ?>" />
</form>
@ -138,7 +138,7 @@ if (!$charset) $charset="UTF-8";
</div>
<script>
<script type="text/javascript">
$('#username').focus();
function logmein(){
@ -151,5 +151,6 @@ if (!$charset) $charset="UTF-8";
</script>
</div>
</div>
</body>
</html>

View File

@ -70,7 +70,7 @@ $lac = $authip->list_affected();
foreach ($lac as $ll) {
$col=3-$col;
echo "<tr class='lst$col' >";
echo "<td><pan title=\"{$list_ip[$ll['authorised_ip_id']]['ip_human']}\">".$list_ip[$ll['authorised_ip_id']]['infos'];
echo "<td><span title=\"{$list_ip[$ll['authorised_ip_id']]['ip_human']}\">".$list_ip[$ll['authorised_ip_id']]['infos'];
//echo "<br/>".$list_ip[$ll['authorised_ip_id']]['ip_human'];
echo "</span></td>";
echo "<td>".@$ac[$ll['protocol']]['name'];
@ -83,7 +83,6 @@ $lac = $authip->list_affected();
}
?>
</table>
</p>
<hr/>
<h3><?php __("Add a new rule"); ?></h3>
@ -111,7 +110,7 @@ $lac = $authip->list_affected();
<?php } else { ?>
<?php foreach ($a['values'] as $k => $v) { ?>
<label><b><?php echo htmlentities($v); ?></b></label>
<input type=hidden name="s_affect_<?php echo htmlentities($a['protocol']);?>" id="s_affect_<?php echo htmlentities($a['protocol']);?>" value="<?php echo htmlentities($k); ?>" readonly>
<input type=hidden name="s_affect_<?php echo htmlentities($a['protocol']);?>" id="s_affect_<?php echo htmlentities($a['protocol']);?>" value="<?php echo htmlentities($k); ?>" readonly />
<?php } ?>
<?php } ?>
</p>
@ -134,7 +133,7 @@ $lac = $authip->list_affected();
</tr>
<tr>
<th>&nbsp;</th>
<td valign=middle class="lst2">
<td valign='middle' class="lst2">
<input type="submit" class="inb" value="<?php __("Save")?>" onclick='return check_accesstype_selected();' />
</td>
</tr>
@ -146,7 +145,7 @@ $lac = $authip->list_affected();
<hr/>
<h3><?php __("Known IP and networks");?></h3>
<table class="tlist">
<tr><th><?php __("Name"); ?></th><th><?php __("IP or network"); ?></th><th><?php __("Type"); ?></th><th colspan=2/></th></tr>
<tr><th><?php __("Name"); ?></th><th><?php __("IP or network"); ?></th><th><?php __("Type"); ?></th><th colspan='2'></th></tr>
<?php
$col=1;
foreach($list_ip as $i) {
@ -178,18 +177,19 @@ foreach($list_ip as $i) {
<p><a href="javascript:edit_ip('','<?php echo htmlentities(get_remote_ip())."','Home IP'";?>);" ><?php echo __("Add my current IP"); ?></a></p>
<span id="form_add_ip">
<form method="post" action="ip_main.php" name="main" id="main">
<form method="post" action="ip_main.php" name="main" >
<p id="reset_edit_ip" style="display:none;"><a href="javascript:reset_edit_ip();"><?php __("Cancel edit")?></a></p>
<input type="hidden" name="id" value="" id="edit_id" >
<input type="hidden" name="id" value="" id="edit_id" />
<table class="tlistb">
<tr><th><?php __("Name"); ?></th><th><?php __("IP or network. <i>IPv4, IPv6 and subnet allowed</i>"); ?></th><th></th></tr>
<tr class="lst2">
<td><input type="text" size=20 maxlength=39 name="ipsub" id="edit_ip" /></td>
<td><input type="text" size=25 maxlength=200 name="infos" id="edit_infos" /></td>
<td><input type="text" size='20' maxlength='39' name="ipsub" id="edit_ip" /></td>
<td><input type="text" size='25' maxlength='200' name="infos" id="edit_infos" /></td>
<td><input type="submit" class="inb" value="<?php __("Save")?>" /></td>
</tr>
</table>
</form>
</span>

View File

@ -82,7 +82,7 @@ if ($quota->cancreate("mail")) {
<?php
}
?>
<td valign=bottom>
<td valign='bottom'>
</td>
</tr>
</table>
@ -108,7 +108,7 @@ if (empty($allmails_list) && empty($search)) {
<?php pager($offset,$count,$mail->total,"mail_list.php?domain_id=".$domain_id."&amp;count=".$count."&amp;search=".urlencode($search)."&amp;offset=%%offset%%"); ?>
</td>
<td style="text-align:center">
<input type="checkbox" id="show_systemmails" name="show_systemmails" <?php if($show_systemmails) {echo "checked";}?> value="1"onclick="document.getElementById('formlist1').submit();" ><label for="show_systemmails" ><?php __("Show system emails");?></label>
<input type="checkbox" id="show_systemmails" name="show_systemmails" <?php if($show_systemmails) {echo "checked";}?> value="1"onclick="document.getElementById('formlist1').submit();" /><label for="show_systemmails" ><?php __("Show system emails");?></label>
</td>
</form>
<td style="text-align:right">
@ -189,17 +189,17 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
<br/>
<br/>
<table width=100% class="tedit">
<table width='100%' class="tedit">
<tr>
<th width=50%>
<th width='50%'>
<b><?php __("Outgoing mail (SMTP)"); ?></b>
</th>
<th width=50%>
<th width='50%'>
<b><?php __("Incoming mails"); ?></b>
</th>
</tr>
<tr>
<td valign=top>
<td valign='top'>
<?php __("Which protocol would you use?"); ?>
<ul>
<li><b><a href="javascript:;" onClick="$('#cfg-submission').toggle();"><?php __("Submission");?></a></b>
@ -234,7 +234,7 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
</li>
</ul>
</td>
<td valign=top>
<td valign='top'>
<?php __("Which protocol would you use?"); ?>
<ul>
<li><b><a href="javascript:;" onClick="$('#cfg-imap').toggle();"><?php __("IMAP");?></a></b>

View File

@ -61,7 +61,7 @@ if (file_exists($cache_file) && $timedif < $cache_time) {
$xml = @simplexml_load_string($string);
echo '<div align="center"><table class="tedit" cellspacing="0" cellpadding="6">';
echo "<tr><th colspan=2><a target=_blank style='font-size: 18px;font-weight: bold;color: #10507C;' href='".$xml->channel->link."'>".$xml->channel->title."</a><br/><i>".$xml->channel->description."</i></th></tr>";
echo "<tr><th colspan=2><a target='_blank' style='font-size: 18px;font-weight: bold;color: #10507C;' href='".$xml->channel->link."'>".$xml->channel->title."</a><br/><i>".$xml->channel->description."</i></th></tr>";
//echo '<tr><th>'._("Title").'</th><th>'._("Date").'</th></tr>';
$count = 0;
$max = 5;

View File

@ -75,7 +75,7 @@ if (!$mem->user["canpass"]) {
</form>
<br />
<?php } ?>
<hr id="topbar"/>
<hr id="topbar2"/>
<form method="post" action="mem_chgmail.php">
<table border="1" cellspacing="0" cellpadding="4" class="tedit">
<tr><td colspan="2"><?php __("Change the email of the account"); ?><br />
@ -86,7 +86,7 @@ if (!$mem->user["canpass"]) {
</table>
</form>
<br />
<hr id="topbar"/>
<hr id="topbar3"/>
<form method="post" action="mem_param.php">
<table border="1" cellspacing="0" cellpadding="4" class="tedit">
<tr><td colspan="2"><?php __("Online help settings"); ?><br />
@ -99,7 +99,7 @@ if (!$mem->user["canpass"]) {
<?php
if ($mem->user["su"]) {
?>
<hr id="topbar"/>
<hr id="topbar4"/>
<p>
<?php __("Admin preferences"); ?> :
</p>
@ -114,7 +114,7 @@ if ($mem->user["su"]) {
</form>
<br />
<?php } ?>
<hr id="topbar"/>
<hr id="topbar5"/>
<script type="text/javascript">
document.forms['main'].oldpass.focus();
</script>

View File

@ -33,7 +33,7 @@ $logo = variable_get('logo_menu', 0 ,'You can specify a logo for the menu, examp
if ( empty($logo) || ! $logo ) { $logo = 'images/logo3.png'; }
?>
<img src="<?php echo $logo; ?>" class="menutoplogo" border="0" alt="AlternC" alt="<?php __("AlternC"); ?>"/>
<img src="<?php echo $logo; ?>" class="menutoplogo" border="0" alt="AlternC" />
<p class="currentuser"><?php echo sprintf(_("Welcome %s"),$mem->user["login"]); ?></p>
<?php
@ -83,11 +83,11 @@ foreach ($obj_menu as $k => $m ) {
echo '<div class="progress-bar">';
echo '<div style="width: ' . ($usage_percent > 100 ? 100 : $usage_percent) . '%; background: ' . $usage_color . ';">&nbsp;</div>';
echo '</div>';
echo "</ul>";
echo "</li>";
continue;
} // progressbar
echo "<li><a href=\"".$l['url']."\" ";
if (!empty($l['onclick'])) echo " onClick='". $l['onclick']."' ";
if (!empty($l['onclick'])) echo " onclick='". $l['onclick']."' ";
if (!empty($l['target'])) echo " target='". $l['target']."' ";
echo " ><span class='".(empty($l['class'])?'':$l['class'])."'>";
if (!empty($l['ico'])) echo "<img src='".$l['ico']."' alt='' />&nbsp;";

View File

@ -52,7 +52,9 @@ $r=$mysql->get_defaultsparam($dbname);
?>
<p><?php __("Your current connection settings are"); ?> : </p>
<table class="tedit">
<th colspan=2 style='text-align:center;'><?php echo '<h1>'.$mysql->dbus->HumanHostname.'</h1>'; ?></th>
<tr>
<th colspan="2" style='text-align:center;'><?php echo '<h1>'.$mysql->dbus->HumanHostname.'</h1>'; ?></th>
</tr>
<tr>
<th><?php __("Mysql Server"); ?></th>
<td><code><?php echo $mysql->dbus->Host; ?></code></td>
@ -73,10 +75,11 @@ if(isset($r['user'])){
<td><code><?php echo $r['password']; ?></code></td>
</tr>
<tr>
<td colspan=2 align=center>
<a href="/alternc-sql/" target=_blank><?php __("Web interface PhpMyAdmin"); ?></a>
<br/>
<xmp>http://<?php echo $L_FQDN; ?>/alternc-sql/</xmp>
<td colspan="2" align="center">
<a href="/alternc-sql/" target="_blank"><?php __("Web interface PhpMyAdmin"); ?></a>
<p>
<code>http://<?php echo $L_FQDN; ?>/alternc-sql/</code>
</p>
</td>
</tr>
<?php

View File

@ -92,12 +92,13 @@ for($i=0;$i<count($rdb);$i++) {
<p> <span class="ina"><a href="sql_doadd.php"><?php __("Create a new MySQL database"); ?></a></span> </p>
<?php }else{
?>
<form method="post" action="sql_doadd.php" id="main" name="main">
<form method="post" action="sql_doadd.php" id="main2" name="main2">
<table class="tedit">
<tr>
<th><label for="dbn"><?php __("MySQL Database"); ?></label></th>
<td>
<span class="int" id="dbnpfx"><?php echo $mem->user["login"]; ?>_</span><input type="text" class="int" name="dbn" id="dbn" value="" size="20" maxlength="30" />
</td>
</tr>
</table>
<br />

View File

@ -339,7 +339,7 @@ img {
.menu-box a .menu-title {
}
.menu-box .menu-conmargin: {
.menu-box .menu-conmargin {
margin: 0 5px 5px 5px;
}

View File

@ -618,10 +618,10 @@ define("DEFAULT_PASS_SIZE", 8);
/* Affiche un bouton qui permet de generer automatiquement des mots de passes */
function display_div_generate_password($pass_size=DEFAULT_PASS_SIZE, $fields_to_fill1="", $fields_to_fill2="") {
$id=rand(1,1000);
echo "<div id='$id' style='display:none;'><a href=\"javascript:generate_password_html('$id',$pass_size,'$fields_to_fill1','$fields_to_fill2');\">";
echo "<div id='z$id' style='display:none;'><a href=\"javascript:generate_password_html('$id',$pass_size,'$fields_to_fill1','$fields_to_fill2');\">";
__("Clic here to generate a password");
echo "</a></div>";
echo "<script type='text/javascript'>$('#$id').show();</script>";
echo "<script type='text/javascript'>$('#z$id').show();</script>";
return 0;
}