diff --git a/admin/mnet/delete.html b/admin/mnet/delete.html
index d42352b296b..8a8c02efa0d 100644
--- a/admin/mnet/delete.html
+++ b/admin/mnet/delete.html
@@ -14,7 +14,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
                     <td colspan="2" class="header" cellpadding="0"><span><?php print_string('deleteaserver', 'mnet'); ?>Deleting a Server</span></td>
                 </tr>
                 <?php
-                if (count($warn) > 0):
+                if (count($warn) > 0){
                 ?>
                 <tr valign="top">
                     <td align="right" colspan="2"><?php print_string('receivedwarnings','mnet'); ?>:<br />
@@ -22,7 +22,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
                     </td>
                 </tr>
                 <?php
-                endif;
+                }
                 ?>
                 <tr valign="top">
                     <td colspan="2"><?php print_string('reallydeleteserver','mnet'); ?>: "<?php echo $mnet_peer->name; ?>"?</td>
diff --git a/admin/mnet/mnet_review.html b/admin/mnet/mnet_review.html
index f017df6153d..cdce78e8f12 100644
--- a/admin/mnet/mnet_review.html
+++ b/admin/mnet/mnet_review.html
@@ -74,7 +74,7 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) {
 </tr>
 <?php
 
-if(!empty($currentkey)):
+if(!empty($currentkey)) {
 ?>
     <tr>
         <td align="right" valign="top"></td>
@@ -85,18 +85,18 @@ if(!empty($currentkey)):
         <td valign="top"><pre style="font-size: 8px;"><?php echo $currentkey;?></pre></td>
     </tr>
 <?php
-endif;
+}
 
-if (isset($mnet_peer->id) && $mnet_peer->id > 0):
+if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
 ?>
     <tr>
         <td align="right" valign="top"><?php print_string('last_connect_time', 'mnet'); ?>:</td>
         <td valign="top"><?php echo ($mnet_peer->last_connect_time == 0)? get_string('never','mnet') : date('H:i:s d/m/Y',$mnet_peer->last_connect_time);?></td>
     </tr>
 <?php
-endif;
+}
 
-if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0):
+if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0){
 ?>
     <tr>
         <td align="right" valign="top"><?php print_string('deleted'); ?>:</td>
@@ -106,9 +106,9 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0):
         </td>
     </tr>
 <?php
-endif;
+}
 
-if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address):
+if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address){
 ?>
     <tr>
         <td align="right" valign="top"><?php print_string('ipaddress', 'mnet');
@@ -119,7 +119,7 @@ if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address):
     </tr>
 
 <?php
-endif;
+}
 ?>
 <tr>
     <td></td>
diff --git a/admin/mnet/peers.html b/admin/mnet/peers.html
index 56a311d34b9..857993344fb 100644
--- a/admin/mnet/peers.html
+++ b/admin/mnet/peers.html
@@ -48,13 +48,13 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
         <td class="cell c1"><a href="peers.php?step=update&amp;hostid=<?php echo $host->id; ?>"><?php echo $host->wwwroot; ?></a></td>
         <td class="cell c2" nowrap="nowrap"><?php if ($host->id != $CFG->mnet_all_hosts_id) echo $last_connect; ?></td>
         <td class="cell c3">
-<?php   if ($host->id != $CFG->mnet_all_hosts_id): ?>
+<?php   if ($host->id != $CFG->mnet_all_hosts_id){ ?>
             <form method="post" action="delete.php">
                 <input type="hidden" name="hostid" value="<?php echo $host->id; ?>" />
                 <input type="hidden" name="step" value="verify" />
                 <input type="submit" name="submit" value="<?php print_string('delete'); ?>"/>
             </form>
-<?php   endif; ?>
+<?php   } ?>
         </td>
     </tr>
 <?php
@@ -85,4 +85,4 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
 </center>
 <?php
 admin_externalpage_print_footer($adminroot);
-?>
\ No newline at end of file
+?>
diff --git a/mod/wiki/ewiki/fragments/wiki_format.inc b/mod/wiki/ewiki/fragments/wiki_format.inc
index 4a03a58cb81..0c09749b5bb 100644
--- a/mod/wiki/ewiki/fragments/wiki_format.inc
+++ b/mod/wiki/ewiki/fragments/wiki_format.inc
@@ -255,7 +255,7 @@ function wiki_link_regex_callback( $uu ) {
    $href = trim($href);
 
    /* create _no_ WikiLinks */
-   if ( false ):
+   if ( false ){
      // interwiki links
      if ( strpos($href, ":") &&
           !strpos($href, "//") &&
@@ -275,7 +275,7 @@ function wiki_link_regex_callback( $uu ) {
          EWIKI_SCRIPT . urlencode($href) /*.EWIKI_ADDPARAMDELIM.'edit'*/ .
          ' ">?</a>';
      }
-   endif;
+   }
 
    // convert normal URLs
    foreach ( $ewiki_idf_url as $find ) {