From a4e3b72507bd7bd06affd06595dde9ba4d3f2153 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Mon, 20 Aug 2012 08:49:22 +0000
Subject: [PATCH] Fix #1299

---
 bureau/admin/adm_deactivate.php  | 8 ++++----
 bureau/admin/adm_variables.php   | 2 +-
 bureau/admin/dom_subdodel.php    | 2 +-
 bureau/admin/mail_properties.php | 2 +-
 bureau/admin/menu_cron.php       | 2 +-
 bureau/admin/quotas_users.php    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bureau/admin/adm_deactivate.php b/bureau/admin/adm_deactivate.php
index 68ad36af..0974bb9d 100644
--- a/bureau/admin/adm_deactivate.php
+++ b/bureau/admin/adm_deactivate.php
@@ -54,10 +54,10 @@ if (! ($confirmed = ($_GET['submit'] == _("Confirm")) ) ) {
   __("The following domains will be deactivated and redirected to the URL entered in the following box. A backup of the domain configuration will be displayed as a serie of SQL request that you can run to restore the current configuration if you want. Click confirm if you are sure you want to deactivate all this user's domains.");
 
   ?>
-  <form action="<?=$PHP_SELF?>" method="GET">
-  <input type="hidden" name="uid" value="<?=$uid?>" />
-  <? __("Redirection URL:") ?> <input type="text" name="redirect" class="int" value="http://example.com/" />
-  <input type="submit" name="submit" class="inb" value="<?=_("Confirm")?>" />
+  <form action="<?php echo $PHP_SELF?>" method="GET">
+  <input type="hidden" name="uid" value="<?php echo $uid?>" />
+  <?php __("Redirection URL:") ?> <input type="text" name="redirect" class="int" value="http://example.com/" />
+  <input type="submit" name="submit" class="inb" value="<?php __("Confirm")?>" />
   <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='adm_list.php'"/>
   </form><?php
 
diff --git a/bureau/admin/adm_variables.php b/bureau/admin/adm_variables.php
index 8093eb39..e61723fe 100644
--- a/bureau/admin/adm_variables.php
+++ b/bureau/admin/adm_variables.php
@@ -69,7 +69,7 @@ while ($db->next_record()) {
  <td><input type="text" name="<?php ehe($vars['name']); ?>" value="<?php ehe($vars['value']); ?>" /></td>
  <td><?php echo $vars['comment']; ?></td>
  </tr>
-<? } ?>
+<?php } ?>
 </table>
 <p><input type="submit" class="inb" value="<?php __("Save variables"); ?>" /></p>
 </form>
diff --git a/bureau/admin/dom_subdodel.php b/bureau/admin/dom_subdodel.php
index e751cc5d..242d77b2 100644
--- a/bureau/admin/dom_subdodel.php
+++ b/bureau/admin/dom_subdodel.php
@@ -54,7 +54,7 @@ if (!$dom->del_sub_domain($domain,$sub,$type,$value)) {
 $dom->unlock();
 
 ?>
-<h3><?=sprintf(_("Deleting the subdomain %s:"),"http://".(($sub)?$sub.".":$sub).$domain); ?></h3>
+<h3><?php echo sprintf(_("Deleting the subdomain %s:"),"http://".(($sub)?$sub.".":$sub).$domain); ?></h3>
 <hr id="topbar"/>
 <br />
 <?php
diff --git a/bureau/admin/mail_properties.php b/bureau/admin/mail_properties.php
index a6af12c9..0f99bf54 100644
--- a/bureau/admin/mail_properties.php
+++ b/bureau/admin/mail_properties.php
@@ -151,7 +151,7 @@ toogle_properties('globalmail_');
 <?php 
 foreach ($lst_toggle as $t) { ?>
 toogle_properties('<?php echo $t ?>');
-<? } //foreach toggle ?>
+<?php } //foreach toggle ?>
 
 toggle_mailadv();
 </script>
diff --git a/bureau/admin/menu_cron.php b/bureau/admin/menu_cron.php
index a56a1dbc..86fb2298 100644
--- a/bureau/admin/menu_cron.php
+++ b/bureau/admin/menu_cron.php
@@ -37,7 +37,7 @@ if ($q['t'] > 0)  {
 <div class="menu-box">
 <div class="menu-title">
 <a href="cron.php">
-<img src="images/schedule.png" alt="<?php __("Scheduled tasks"); ?>" width=16px height=16px/>&nbsp;<?php __("Scheduled tasks"); ?> (<?= $q["u"]; ?>/<?= $q["t"]; ?>)
+<img src="images/schedule.png" alt="<?php __("Scheduled tasks"); ?>" width=16px height=16px/>&nbsp;<?php __("Scheduled tasks"); ?> (<?php echo $q["u"].'/'.$q["t"]; ?>)
 </a>
 </div>
 </div>
diff --git a/bureau/admin/quotas_users.php b/bureau/admin/quotas_users.php
index 8c2458ef..41656071 100644
--- a/bureau/admin/quotas_users.php
+++ b/bureau/admin/quotas_users.php
@@ -50,7 +50,7 @@ if (isset($error) && $error) {
       <span class="ina"><a href="quotas_users.php?mode=<?php echo $mode; ?>&amp;sd=0&amp;usr=<?php echo $usr; ?>"><?php __("Hide the domain names"); ?></a></span>
  <?php } } ?>
 <?php if ($usr) { ?>
-    <span class="ina"><a href="quotas_users.php?mode=<?php echo $mode; ?>&amp;sd=<? echo $sd; ?>"><?php __("All accounts"); ?></a></span>
+    <span class="ina"><a href="quotas_users.php?mode=<?php echo $mode; ?>&amp;sd=<?php echo $sd; ?>"><?php __("All accounts"); ?></a></span>
 <?php } ?>
 <?php } ?>
 </p>