diff -uNr openpom-1.0.5.orig/ack.php openpom-1.0.5/ack.php
--- openpom-1.0.5.orig/ack.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/ack.php	2010-09-03 21:46:32.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 11 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/ack.php $
@@ -25,12 +25,12 @@
   <div class="popact" id="popack">
   <form action="" name="ack" method="post" id="ack">
     <script>
-      getallselectline(<?=$nb_rows?>,"ack");
+      getallselectline(<?php echo $nb_rows?>,"ack");
      </script>
     <table class="popact">
-      <tr><th colspan="2"><?=ucfirst($LANG[$MYLANG]['acknowledge'])?></th></tr>
+      <tr><th colspan="2"><?php echo ucfirst($LANG[$MYLANG]['acknowledge'])?></th></tr>
       <tr>
-        <td><?=ucfirst($LANG[$MYLANG]['comment'])?></td>
+        <td><?php echo ucfirst($LANG[$MYLANG]['comment'])?></td>
         <td>
           <input type="text" name="comment" id="comment" />
           <input type="hidden" name="ack" value="Ok" />
@@ -39,8 +39,8 @@
       <tr>
         <td class="submitline" colspan="2">
           <input type="submit" name="ack" value="Ok" />
-          <input type="submit" name="track" value="<?=ucfirst($LANG[$MYLANG]['track'])?>" onclick="this.form.comment.value='<?=$LANG[$MYLANG]['track']?> ' + this.form.comment.value" />
-          <input type="button" name="cancel" value="<?=ucfirst($LANG[$MYLANG]['cancel'])?>" onclick="$.fn.colorbox.close();" />
+          <input type="submit" name="track" value="<?php echo ucfirst($LANG[$MYLANG]['track'])?>" onclick="this.form.comment.value='<?php echo $LANG[$MYLANG]['track']?> ' + this.form.comment.value" />
+          <input type="button" name="cancel" value="<?php echo ucfirst($LANG[$MYLANG]['cancel'])?>" onclick="$.fn.colorbox.close();" />
         </td>
       </tr>
     </table>
diff -uNr openpom-1.0.5.orig/action.php openpom-1.0.5/action.php
--- openpom-1.0.5.orig/action.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/action.php	2010-09-03 21:46:32.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 2 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/action.php $
@@ -14,22 +14,22 @@
  
   if (!isset($_SESSION['USER'])) die(); ?>
 
-  <form action="index.php<?=$MY_GET?>" method="post" name="action" />
+  <form action="index.php<?php echo $MY_GET?>" method="post" name="action" />
     <a class="ack" href="#" id="acklink"><input type="button" name="ack"
-      value="<?=ucfirst($LANG[$MYLANG]['acknowledge'])?>" /></a>
+      value="<?php echo ucfirst($LANG[$MYLANG]['acknowledge'])?>" /></a>
 
     <a class="down" href="#" id="downlink"><input type="button" name="down"
-      value="<?=ucfirst($LANG[$MYLANG]['downtime'])?>" /></a>
+      value="<?php echo ucfirst($LANG[$MYLANG]['downtime'])?>" /></a>
 
     <input type="submit" name="recheck"
-      value="<?=ucfirst($LANG[$MYLANG]['recheck'])?>" />
+      value="<?php echo ucfirst($LANG[$MYLANG]['recheck'])?>" />
 
     <input type="submit" name="disable"
-      value="<?=ucfirst($LANG[$MYLANG]['disable'])?>" 
-      onClick="EvalSound('sound1')" title="<?=ucfirst($LANG[$MYLANG]['disable_title'])?>" />
+      value="<?php echo ucfirst($LANG[$MYLANG]['disable'])?>" 
+      onClick="EvalSound('sound1')" title="<?php echo ucfirst($LANG[$MYLANG]['disable_title'])?>" />
 
     <input type="submit" name="reset"
-      value="<?=ucfirst($LANG[$MYLANG]['reset'])?>" title="<?=ucfirst($LANG[$MYLANG]['reset_title'])?>" />
+      value="<?php echo ucfirst($LANG[$MYLANG]['reset'])?>" title="<?php echo ucfirst($LANG[$MYLANG]['reset_title'])?>" />
 
     <a class="comment" href="#" id="commentlink"><input type="button" name="comment"
-      value="<?=ucfirst($LANG[$MYLANG]['comment0'])?>" /></a>
+      value="<?php echo ucfirst($LANG[$MYLANG]['comment0'])?>" /></a>
diff -uNr openpom-1.0.5.orig/alert.php openpom-1.0.5/alert.php
--- openpom-1.0.5.orig/alert.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/alert.php	2010-09-03 21:46:32.000000000 +0200
@@ -1,4 +1,4 @@
-<? 
+<?php 
 /*
   OpenPom $Revision: 11 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/alert.php $
@@ -18,28 +18,28 @@
 
     <table width="100%" class="alert" id="alert">
       <tr class="headers">
-        <? 
+        <?php 
           foreach($COLS AS $key => $val) { 
             if ($key == 'checkbox') {
         ?>
         <th class="checkall">
-          <input type="checkbox" onclick='selectall(<?=$nb_rows?>);' />
+          <input type="checkbox" onclick='selectall(<?php echo $nb_rows?>);' />
         </th>
-        <? } else { ?>
+        <?php } else { ?>
         <th style="white-space:nowrap;">
-          <? if ( ($SORTFIELD == $val) && ($SORTORDERFIELD == "ASC") ) { ?>
-          <a class="col_sort_up" href="<?=$MY_GET_NO_SORT?>&sort=<?=$key?>&order=1">
-          <? } else if ($SORTFIELD == $val) { ?>
-          <a class="col_sort_down" href="<?=$MY_GET_NO_SORT?>&sort=<?=$key?>&order=0">
-	  <? } else { ?>
-          <a class="col_no_sort" href="<?=$MY_GET_NO_SORT?>&sort=<?=$key?>&order=0">
-          <? } ?>
-            <?=ucfirst($LANG[$MYLANG][$key])?>
+          <?php if ( ($SORTFIELD == $val) && ($SORTORDERFIELD == "ASC") ) { ?>
+          <a class="col_sort_up" href="<?php echo $MY_GET_NO_SORT?>&sort=<?php echo $key?>&order=1">
+          <?php } else if ($SORTFIELD == $val) { ?>
+          <a class="col_sort_down" href="<?php echo $MY_GET_NO_SORT?>&sort=<?php echo $key?>&order=0">
+	  <?php } else { ?>
+          <a class="col_no_sort" href="<?php echo $MY_GET_NO_SORT?>&sort=<?php echo $key?>&order=0">
+          <?php } ?>
+            <?php echo ucfirst($LANG[$MYLANG][$key])?>
           </a>
         </th>
-        <? } } ?>
+        <?php } } ?>
       </tr>
-      <?
+      <?php
         while($data = mysql_fetch_array($rep, MYSQL_ASSOC)) { 
 
           if ($data['SVCST'] == 0) { $COLOR = "soft"; $soft= "soft"; }
@@ -58,12 +58,12 @@
              $COLOR = $TRACK;
           }
       ?>
-      <tr class="<?=$COLOR?>" id="<?=$data['SVCID']?>" style="font-size:<?=$_SESSION['FONTSIZE']?>px;"
-         onmouseover='to = setTimeout("get_data(\"<?=$data['TYPE']?>\", \"<?=$data['SVCID']?>\")",500); 
-           this.className="over<?=$soft?>";' 
-           onmouseout='clearTimeout(to); hide_data(); this.className="<?=$COLOR?>";'
-         onclick='selectline(<?=$line?>);'>
-        <? 
+      <tr class="<?php echo $COLOR?>" id="<?php echo $data['SVCID']?>" style="font-size:<?php echo $_SESSION['FONTSIZE']?>px;"
+         onmouseover='to = setTimeout("get_data(\"<?php echo $data['TYPE']?>\", \"<?php echo $data['SVCID']?>\")",500); 
+           this.className="over<?php echo $soft?>";' 
+           onmouseout='clearTimeout(to); hide_data(); this.className="<?php echo $COLOR?>";'
+         onclick='selectline(<?php echo $line?>);'>
+        <?php 
           foreach($COLS AS $key => $val) { 
 
             if ($key == 'checkbox')
@@ -110,27 +110,27 @@
             }
           if (isset($_GET['monitor'])) {
         ?>
-        <td<?=($key=="flag")?" class=\"".$COLOR."dark\"":""?> style="white-space:nowrap;">
-        <? } else { ?>
-        <td<?=($key=="checkbox")?" style=\"text-align:center;\" class=\"".$COLOR."dark\"":""?> style="white-space:nowrap;">
-        <? } ?>
-          <?=$toprint?>
+        <td<?php echo ($key=="flag")?" class=\"".$COLOR."dark\"":""?> style="white-space:nowrap;">
+        <?php } else { ?>
+        <td<?php echo ($key=="checkbox")?" style=\"text-align:center;\" class=\"".$COLOR."dark\"":""?> style="white-space:nowrap;">
+        <?php } ?>
+          <?php echo $toprint?>
         </td>
-        <? } //end foreach ?>
+        <?php } //end foreach ?>
       </tr>
-      <?
+      <?php
           $line++;  
         } //end while
       ?>
     </table>
-    <? if (isset($_GET['monitor'])) { ?>
-    <?=ucfirst($LANG[$MYLANG]['refreshing'])?> <b><span id="refreshspan"></span></b> <?=ucfirst($LANG[$MYLANG]['second'])?>
-    <a href="index.php"><?=ucfirst($LANG[$MYLANG]['mode0'])?></a>
-    <? } else { ?>
+    <?php if (isset($_GET['monitor'])) { ?>
+    <?php echo ucfirst($LANG[$MYLANG]['refreshing'])?> <b><span id="refreshspan"></span></b> <?php echo ucfirst($LANG[$MYLANG]['second'])?>
+    <a href="index.php"><?php echo ucfirst($LANG[$MYLANG]['mode0'])?></a>
+    <?php } else { ?>
     </form>
-    <? } ?>
+    <?php } ?>
 
-<? /*
+<?php /*
 if ($nb_rows > 0) {
 mysql_data_seek($rep, 0);
 while($data = mysql_fetch_array($rep, MYSQL_ASSOC)) { 
diff -uNr openpom-1.0.5.orig/comment.php openpom-1.0.5/comment.php
--- openpom-1.0.5.orig/comment.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/comment.php	2010-09-03 21:46:32.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 4 $                                                           
   $HeadURL: http://openpom.googlecode.com/svn/trunk/comment.php $
@@ -25,12 +25,12 @@
   <div class="popact" id="popack">
   <form action="" name="comment" method="post" id="com">
     <script>
-      getallselectline(<?=$nb_rows?>,"comment");
+      getallselectline(<?php echo $nb_rows?>,"comment");
      </script>
     <table class="popact">
-      <tr><th colspan="2"><?=ucfirst($LANG[$MYLANG]['comment0'])?></th></tr>
+      <tr><th colspan="2"><?php echo ucfirst($LANG[$MYLANG]['comment0'])?></th></tr>
       <tr>
-        <td><?=ucfirst($LANG[$MYLANG]['comment'])?></td>
+        <td><?php echo ucfirst($LANG[$MYLANG]['comment'])?></td>
         <td>
           <input type="text" name="comment" id="comment" />
           <input type="hidden" name="comment_persistent" value="Ok" />
@@ -39,7 +39,7 @@
       <tr>
         <td class="submitline" colspan="2">
           <input type="submit" name="comment_persistent" value="Ok" />
-          <input type="button" name="cancel" value="<?=ucfirst($LANG[$MYLANG]['cancel'])?>" onclick="$.fn.colorbox.close();" />
+          <input type="button" name="cancel" value="<?php echo ucfirst($LANG[$MYLANG]['cancel'])?>" onclick="$.fn.colorbox.close();" />
         </td>
       </tr>
     </table>
diff -uNr openpom-1.0.5.orig/config.php openpom-1.0.5/config.php
--- openpom-1.0.5.orig/config.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/config.php	2010-09-03 21:48:12.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 12 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/config.php $
@@ -74,12 +74,12 @@
 $CODENAME           = "OpenPom";
 
 /* NAGIOS VARIABLE */
-$EXEC_CMD           = "./nagios-send-order";
+$EXEC_CMD           = "./icinga-send-order";
 $EXEC_PARAM         = "";
 $SUDO_EXEC          = "/usr/bin/sudo";
 $SUDO_PARAM         = "";
-$CMD_FILE           = "/usr/local/nagios/var/rw/nagios.cmd";
-$NAGIOSLINK         = "/nagios/cgi-bin/extinfo.cgi";
+$CMD_FILE           = "/var/log/icinga/rw/icinga.cmd";
+$NAGIOSLINK         = "/icinga/cgi-bin/extinfo.cgi";
 
 /* ILLEGAL_CHAR IN POST / GET DATA */
 $ILLEGAL_CHAR       = "`~!$%^&*|'\"<>?(),;"; 
diff -uNr openpom-1.0.5.orig/down.php openpom-1.0.5/down.php
--- openpom-1.0.5.orig/down.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/down.php	2010-09-03 21:46:32.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 4 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/down.php $
@@ -24,23 +24,23 @@
   <script type='text/javascript' src='js/func.js'></script>
   <div class="popact" id="popack">
     <form action="" name="down" method="post" id="down">
-    <script>getallselectline(<?=$nb_rows?>,"down");</script>
+    <script>getallselectline(<?php echo $nb_rows?>,"down");</script>
       <table>
-        <tr><th colspan="3"><?=ucfirst($LANG[$MYLANG]['downtime'])?></th></tr>
+        <tr><th colspan="3"><?php echo ucfirst($LANG[$MYLANG]['downtime'])?></th></tr>
         <tr>
-          <td><?=ucfirst($LANG[$MYLANG]['duration'])?></td>
+          <td><?php echo ucfirst($LANG[$MYLANG]['duration'])?></td>
           <td><input id="time" type="text" name="time" style="width: 100px;" value="" /></td>
-          <td><?=ucfirst($LANG[$MYLANG]['hour'])?></td>
+          <td><?php echo ucfirst($LANG[$MYLANG]['hour'])?></td>
         </tr>
         <tr>
-          <td><?=ucfirst($LANG[$MYLANG]['comment'])?></td>
+          <td><?php echo ucfirst($LANG[$MYLANG]['comment'])?></td>
           <input type="hidden" name="down" value="Ok" />
           <td colspan="2"><input type="text" name="comment" id="comment" /></td>
         </tr>
         <tr>
           <td class="submitline" colspan="3">
             <input type="submit" name="down" value="Ok" />
-            <input type="button" name="cancel" value="<?=ucfirst($LANG[$MYLANG]['cancel'])?>" onclick="$.fn.colorbox.close();" />
+            <input type="button" name="cancel" value="<?php echo ucfirst($LANG[$MYLANG]['cancel'])?>" onclick="$.fn.colorbox.close();" />
           </td>
         </tr>
       </table>
diff -uNr openpom-1.0.5.orig/filter.php openpom-1.0.5/filter.php
--- openpom-1.0.5.orig/filter.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/filter.php	2010-09-03 21:46:32.000000000 +0200
@@ -1,4 +1,4 @@
-<? 
+<?php 
 /*
   OpenPom $Revision: 2 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/filter.php $
@@ -23,54 +23,54 @@
   <table width="100%" class="filter">
       <tr>
         <th class="filter" width="4px" style="white-space:nowrap;">
-	  <span title="<?=ucfirst($LANG[$MYLANG]['refreshing'])?>" id="refreshspan"></span>
+	  <span title="<?php echo ucfirst($LANG[$MYLANG]['refreshing'])?>" id="refreshspan"></span>
         </th>
         <th class="filter" width="50px">
-          <a class="refresh" href="<?=$MY_GET?>" alt="<?=ucfirst($LANG[$MYLANG]['refresh'])?>" title="<?=ucfirst($LANG[$MYLANG]['refresh'])?>"></a>
+          <a class="refresh" href="<?php echo $MY_GET?>" alt="<?php echo ucfirst($LANG[$MYLANG]['refresh'])?>" title="<?php echo ucfirst($LANG[$MYLANG]['refresh'])?>"></a>
         </th>
         <th class="filters" width="1">
 	<form method="get" class="filt" name="filt" action="?filter=1" id="filt"> 
           <select name="level" onChange='add_input("filter","filt"); this.form.submit();'>
-            <? 
+            <?php 
               for ($sub_level=1; $sub_level <= 6; $sub_level++) { 
             ?>
-            <option value="<?=$sub_level?>" <?=($sub_level==$LEVEL)?"selected":""?>><?=$sub_level?> - <?=ucfirst($LANG[$MYLANG]['level'.$sub_level])?></option>
-            <? } ?>
+            <option value="<?php echo $sub_level?>" <?php echo ($sub_level==$LEVEL)?"selected":""?>><?php echo $sub_level?> - <?php echo ucfirst($LANG[$MYLANG]['level'.$sub_level])?></option>
+            <?php } ?>
           </select>
         </th>
         <th class="filter" width="1">
-          <input type="text" name="filtering" value="<?=$FILTER?>" id="filtering" title="<?=ucfirst($LANG[$MYLANG]['search'])?>"/>
+          <input type="text" name="filtering" value="<?php echo $FILTER?>" id="filtering" title="<?php echo ucfirst($LANG[$MYLANG]['search'])?>"/>
         </th>
         <th class="filter" width="1">
           <input type="submit" name="filter" id="filter"
-            value="<?=ucfirst($LANG[$MYLANG]['filter'])?>" />
+            value="<?php echo ucfirst($LANG[$MYLANG]['filter'])?>" />
         </th>
         <th class="filter" width="1">
-	  <input type="submit" name="clear" value="<?=ucfirst($LANG[$MYLANG]['clear'])?>" onclick='filtering.value="";' />
+	  <input type="submit" name="clear" value="<?php echo ucfirst($LANG[$MYLANG]['clear'])?>" onclick='filtering.value="";' />
 	</form>
         </th>
         <th class="monitor">
-          <a href="?monitor"><?=ucfirst($LANG[$MYLANG]['mode'])?></a>
+          <a href="?monitor"><?php echo ucfirst($LANG[$MYLANG]['mode'])?></a>
         </th>
-        <th width="200px" style="white-space:nowrap;" title="<?=$LANG[$MYLANG]['meter']?>">
-          C=<?=$hit_critical?> W=<?=$hit_warning?> U=<?=$hit_unknown?> 
-          D=<?=$hit_down?> A=<?=$hit_ack?> T=<?=$hit_any?> 
+        <th width="200px" style="white-space:nowrap;" title="<?php echo $LANG[$MYLANG]['meter']?>">
+          C=<?php echo $hit_critical?> W=<?php echo $hit_warning?> U=<?php echo $hit_unknown?> 
+          D=<?php echo $hit_down?> A=<?php echo $hit_ack?> T=<?php echo $hit_any?> 
         </th>
-        <? if ($FIRST >= $LINE_BY_PAGE) { ?>
+        <?php if ($FIRST >= $LINE_BY_PAGE) { ?>
         <th width="1">
-          <a href="<?=$MY_GET_NO_NEXT?>&prev=<?=$FIRST-$LINE_BY_PAGE?>"><?=ucfirst($LANG[$MYLANG]['prev'])?></a> 
+          <a href="<?php echo $MY_GET_NO_NEXT?>&prev=<?php echo $FIRST-$LINE_BY_PAGE?>"><?php echo ucfirst($LANG[$MYLANG]['prev'])?></a> 
         </th>
-        <? } ?>
+        <?php } ?>
         <th width="1" style="white-space:nowrap;">
-          <? echo $FIRST."-".($FIRST+$nb_rows)."/".$hit_any; ?>
+          <?php echo $FIRST."-".($FIRST+$nb_rows)."/".$hit_any; ?>
         </th>
-        <? if ($nb_rows >= $LINE_BY_PAGE) { ?>
+        <?php if ($nb_rows >= $LINE_BY_PAGE) { ?>
         <th width="1">
-          <a href="<?=$MY_GET_NO_NEXT?>&next=<?=$FIRST+$LINE_BY_PAGE?>"><?=ucfirst($LANG[$MYLANG]['next'])?></a>
+          <a href="<?php echo $MY_GET_NO_NEXT?>&next=<?php echo $FIRST+$LINE_BY_PAGE?>"><?php echo ucfirst($LANG[$MYLANG]['next'])?></a>
         </th>
-        <? } ?>
+        <?php } ?>
         <th width="1">
-          <a class="option" href="#" id="optlink"><?=ucfirst($LANG[$MYLANG]['option'])?></a>
+          <a class="option" href="#" id="optlink"><?php echo ucfirst($LANG[$MYLANG]['option'])?></a>
         </th>
       </tr>
     </table>
diff -uNr openpom-1.0.5.orig/footer.php openpom-1.0.5/footer.php
--- openpom-1.0.5.orig/footer.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/footer.php	2010-09-03 21:46:32.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 2 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/footer.php $
@@ -14,20 +14,20 @@
  
   if (basename($_SERVER['SCRIPT_NAME']) != "index.php") die() ; ?>
     <div align="center">
-      <?=$CODENAME?> - <?=$VERSION?> - GPL -
+      <?php echo $CODENAME?> - <?php echo $VERSION?> - GPL -
       <a href="http://www.exosec.fr/" target="_blank">Exosec</a> - 2010 - 
-      <?=$LANG[$MYLANG]['querytime']?> <?=sprintf($str_query_time, $query_time)?>
+      <?php echo $LANG[$MYLANG]['querytime']?> <?php echo sprintf($str_query_time, $query_time)?>
     </div>
-  <? if ($_SESSION['FRAME'] == 1) { ?>
+  <?php if ($_SESSION['FRAME'] == 1) { ?>
   </td></tr></table>
-  <? } ?>
+  <?php } ?>
   </body>
   <script>
     refresh  = document.getElementById("refreshspan");
-    autorefresh("<?=$MY_GET?>");
-    document.getElementById("acklink").href = "ack.php?num=<?=$nb_rows?>";
-    document.getElementById("downlink").href = "down.php?num=<?=$nb_rows?>";
+    autorefresh("<?php echo $MY_GET?>");
+    document.getElementById("acklink").href = "ack.php?num=<?php echo $nb_rows?>";
+    document.getElementById("downlink").href = "down.php?num=<?php echo $nb_rows?>";
     document.getElementById("optlink").href = "option.php";
-    document.getElementById("commentlink").href = "comment.php?num=<?=$nb_rows?>";
+    document.getElementById("commentlink").href = "comment.php?num=<?php echo $nb_rows?>";
   </script>
 </html> 
diff -uNr openpom-1.0.5.orig/header.php openpom-1.0.5/header.php
--- openpom-1.0.5.orig/header.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/header.php	2010-09-03 21:46:32.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 9 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/header.php $
@@ -17,7 +17,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
   <head>
     <title>
-      <?=$CODENAME?> E=<?=$hit_critical?> W=<?=$hit_warning?> U=<?=$hit_unknown?> T=<?=$hit_any?>
+      <?php echo $CODENAME?> E=<?php echo $hit_critical?> W=<?php echo $hit_warning?> U=<?php echo $hit_unknown?> T=<?php echo $hit_any?>
     </title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
     <meta http-equiv="CACHE-CONTROL" content="NO-CACHE" />
@@ -30,8 +30,8 @@
       var cache    = new Array();
       var popup;
       var refresh; 
-      var mytime   = <?=($REFRESHTIME+1)?>;
-      var filter   = "<?=$FILTER?>";
+      var mytime   = <?php echo ($REFRESHTIME+1)?>;
+      var filter   = "<?php echo $FILTER?>";
     </script>
   </head>
   <body>
@@ -41,9 +41,9 @@
       popup.style.visibility = "hidden";                                                  
       document.onmousemove = WhereMouse;
     </script>
-    <? if ($_SESSION['FRAME'] == 1) { ?>
-    <table width="100%" height="100%" class="frame" id="type_<?=$framecolor?>">
+    <?php if ($_SESSION['FRAME'] == 1) { ?>
+    <table width="100%" height="100%" class="frame" id="type_<?php echo $framecolor?>">
       <tr>
         <td valign="top">
-    <? } ?>
+    <?php } ?>
 
diff -uNr openpom-1.0.5.orig/icinga-send-order openpom-1.0.5/icinga-send-order
--- openpom-1.0.5.orig/icinga-send-order	1970-01-01 01:00:00.000000000 +0100
+++ openpom-1.0.5/icinga-send-order	2010-09-03 21:46:32.000000000 +0200
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+#  OpenPom $Revision: 2 $
+#  $HeadURL: http://openpom.googlecode.com/svn/trunk/icinga-send-order $
+# 
+#  Copyright 2010, Exosec
+#  Licensed under GPL Version 2.
+#  http://www.gnu.org/licenses/
+# 
+#  $Date: 2010-07-30 16:09:43 +0200 (Fri, 30 Jul 2010) $
+#
+#  Sylvain Choisnard - schoisnard@exosec.fr  
+#
+#
+# This bash script is just an exemple,
+# you must improve it for you needs
+#
+# exec("\"$EXEC_CMD\" \"$CMD_FILE\" \"$cmd\" &");
+#
+
+# uncomment for debug
+# out=/tmp/${0##*/}.$RANDOM
+# echo $0 $* > $out
+# exec 2>> $out
+# set -x
+
+[ $# -ne 2 ] && exit 2
+
+echo -e $2 > $1
+
+exit $? 
+
diff -uNr openpom-1.0.5.orig/index.php openpom-1.0.5/index.php
--- openpom-1.0.5.orig/index.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/index.php	2010-09-03 21:36:10.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 14 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/index.php $
diff -uNr openpom-1.0.5.orig/lang.php openpom-1.0.5/lang.php
--- openpom-1.0.5.orig/lang.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/lang.php	2010-09-03 21:45:04.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 11 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/lang.php $
@@ -56,7 +56,7 @@
 'comment'            => 'comments',
 'comment0'           => 'add comment',
 'hour'               => 'hours',
-'reload'             => 'nagios is reloading',
+'reload'             => 'icinga is reloading',
 'host'               => 'host',
 'curstat'            => 'current status',
 'curat'              => 'current attempt',
@@ -127,7 +127,7 @@
 'comment'            => 'commentaires',
 'comment0'           => 'ajout commentaire',
 'hour'               => 'heures',
-'reload'             => 'nagios est en cours de red&eacute;marrage',
+'reload'             => 'icinga est en cours de red&eacute;marrage',
 'host'               => 'h&ocirc;te',
 'curstat'            => 'etat actuel',
 'curat'              => 'nombre de test',
diff -uNr openpom-1.0.5.orig/nagios-send-order openpom-1.0.5/nagios-send-order
--- openpom-1.0.5.orig/nagios-send-order	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/nagios-send-order	1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-#!/bin/bash
-#
-#  OpenPom $Revision: 2 $
-#  $HeadURL: http://openpom.googlecode.com/svn/trunk/nagios-send-order $
-# 
-#  Copyright 2010, Exosec
-#  Licensed under GPL Version 2.
-#  http://www.gnu.org/licenses/
-# 
-#  $Date: 2010-07-30 16:09:43 +0200 (Fri, 30 Jul 2010) $
-#
-#  Sylvain Choisnard - schoisnard@exosec.fr  
-#
-#
-# This bash script is just an exemple,
-# you must improve it for you needs
-#
-# exec("\"$EXEC_CMD\" \"$CMD_FILE\" \"$cmd\" &");
-#
-
-# uncomment for debug
-# out=/tmp/${0##*/}.$RANDOM
-# echo $0 $* > $out
-# exec 2>> $out
-# set -x
-
-[ $# -ne 2 ] && exit 2
-
-echo -e $2 > $1
-
-exit $? 
-
diff -uNr openpom-1.0.5.orig/option.php openpom-1.0.5/option.php
--- openpom-1.0.5.orig/option.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/option.php	2010-09-03 21:50:48.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 4 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/option.php $
@@ -35,88 +35,88 @@
   <div class="popact" id="popack">
   <form action="" name="fopt" method="get" class="fopt" id="fopt">
     <table class="popact">
-      <tr><th colspan="2"><?=ucfirst($LANG[$MYLANG]['option'])?></th></tr>
+      <tr><th colspan="2"><?php echo ucfirst($LANG[$MYLANG]['option'])?></th></tr>
       <tr>
-        <td><?=ucfirst($LANG[$MYLANG]['refreshing0'])?></td>
+        <td><?php echo ucfirst($LANG[$MYLANG]['refreshing0'])?></td>
         <td>
           <input type="text" size="4" maxlength="4" name="refresh" id="refresh"
-            value="<?=$_SESSION['REFRESH']?>" />
-          <?=$LANG[$MYLANG]['second']?> (min 10, max 3600)
+            value="<?php echo $_SESSION['REFRESH']?>" />
+          <?php echo $LANG[$MYLANG]['second']?> (min 10, max 3600)
         </td>
       </tr>
       <tr>
-        <td><?=ucfirst($LANG[$MYLANG]['lang'])?></td>
-        <td><? foreach(array_keys($LANG) AS $lang) { ?>
-          <input type="radio" name="lang" value="<?=$lang?>" <?=($_SESSION['LANG']==$lang)?"checked":""?> /> <?=$lang?>
-          <? } ?>
+        <td><?php echo ucfirst($LANG[$MYLANG]['lang'])?></td>
+        <td><?php foreach(array_keys($LANG) AS $lang) { ?>
+          <input type="radio" name="lang" value="<?php echo $lang?>" <?php echo ($_SESSION['LANG']==$lang)?"checked":""?> /> <?php echo $lang?>
+          <?php } ?>
         </td>
       </tr>
       <tr>
-        <td><?=ucfirst($LANG[$MYLANG]['step'])?></td>
+        <td><?php echo ucfirst($LANG[$MYLANG]['step'])?></td>
         <td>
-          <input type="text" size="3" maxlength="3" name="step" value="<?=$_SESSION['STEP']?>" /> (min 1, max 999)
+          <input type="text" size="3" maxlength="3" name="step" value="<?php echo $_SESSION['STEP']?>" /> (min 1, max 999)
         </td>
       </tr>
       <tr>
-        <td><?=ucfirst($LANG[$MYLANG]['level'])?></td>
+        <td><?php echo ucfirst($LANG[$MYLANG]['level'])?></td>
         <td>
-          <input type="text" size="1" maxlength="1" name="defaultlevel" value="<?=$_SESSION['LEVEL']?>" /> 
+          <input type="text" size="1" maxlength="1" name="defaultlevel" value="<?php echo $_SESSION['LEVEL']?>" /> 
         </td>
       </tr>
       <tr>
-        <td><?=ucfirst($LANG[$MYLANG]['maxlentd'])?></td>
+        <td><?php echo ucfirst($LANG[$MYLANG]['maxlentd'])?></td>
         <td>
-          <input type="text" size="3" maxlength="3" name="maxlentd" value="<?=$_SESSION['MAXLENTD']?>" /> (min 1, max 999)
+          <input type="text" size="3" maxlength="3" name="maxlentd" value="<?php echo $_SESSION['MAXLENTD']?>" /> (min 1, max 999)
         </td>
       </tr>
       <tr>
-        <td><?=ucfirst($LANG[$MYLANG]['fontsize'])?></td>
+        <td><?php echo ucfirst($LANG[$MYLANG]['fontsize'])?></td>
         <td>
-          <input type="text" size="3" maxlength="3" name="fontsize" value="<?=$_SESSION['FONTSIZE']?>" /> (min 1, max 100)
+          <input type="text" size="3" maxlength="3" name="fontsize" value="<?php echo $_SESSION['FONTSIZE']?>" /> (min 1, max 100)
         </td>
       </tr>
       <tr>
-        <td><?=ucfirst($LANG[$MYLANG]['frame'])?></td>
+        <td><?php echo ucfirst($LANG[$MYLANG]['frame'])?></td>
         <td>
-          <input type="checkbox" name="frame" value="0" <?=($_SESSION['FRAME']==0)?"checked":""?> />
+          <input type="checkbox" name="frame" value="0" <?php echo ($_SESSION['FRAME']==0)?"checked":""?> />
         </td>
       </tr>
       <tr>
-        <td><?=ucfirst($LANG[$MYLANG]['cols'])?></td>
+        <td><?php echo ucfirst($LANG[$MYLANG]['cols'])?></td>
         <td>
-          <? foreach($COLS AS $key => $val) { 
+          <?php foreach($COLS AS $key => $val) { 
                if (preg_match('/^(flag|duration|last|stinfo|group)$/', $key)) {
                  $pattern = ",".$key.",";
           ?>
-          <input type="checkbox" name="<?=$key?>" value="<?=$key?>" <?=(preg_match($pattern,$_SESSION['COLS']))?"checked":""?> /> <?=ucfirst($LANG[$MYLANG][$key])?><br />
-          <? } } ?>
+          <input type="checkbox" name="<?php echo $key?>" value="<?php echo $key?>" <?php echo (preg_match($pattern,$_SESSION['COLS']))?"checked":""?> /> <?php echo ucfirst($LANG[$MYLANG][$key])?><br />
+          <?php } } ?>
         </td>
       </tr>
       <tr>
         <td class="submitline" colspan="2">
           <input type="hidden" name="stop" value="stop" id="check_1" checked />
-          <? if (isset($qfilt)) { ?>
-          <input type="hidden" name="filtering" value="<?=$qfilt?>" />
+          <?php if (isset($qfilt)) { ?>
+          <input type="hidden" name="filtering" value="<?php echo $qfilt?>" />
           <input type="hidden" name="filter" value="1" />
-          <? } ?>
-          <? if (isset($next)) { ?>
-          <input type="hidden" name="next" value="<?=$next?>" />
-          <? } ?>
-          <? if (isset($prev)) { ?>
-          <input type="hidden" name="prev" value="<?=$prev?>" />
-          <? } ?>
-          <? if (isset($sort)) { ?>
-          <input type="hidden" name="sort" value="<?=$sort?>" />
-          <? } ?>
-          <? if (isset($order)) { ?>
-          <input type="hidden" name="order" value="<?=$order?>" />
-          <? } ?>
-          <? if (isset($level)) { ?>
-          <input type="hidden" name="level" value="<?=$level?>" />
-          <? } ?>
+          <?php } ?>
+          <?php if (isset($next)) { ?>
+          <input type="hidden" name="next" value="<?php echo $next?>" />
+          <?php } ?>
+          <?php if (isset($prev)) { ?>
+          <input type="hidden" name="prev" value="<?php echo $prev?>" />
+          <?php } ?>
+          <?php if (isset($sort)) { ?>
+          <input type="hidden" name="sort" value="<?php echo $sort?>" />
+          <?php } ?>
+          <?php if (isset($order)) { ?>
+          <input type="hidden" name="order" value="<?php echo $order?>" />
+          <?php } ?>
+          <?php if (isset($level)) { ?>
+          <input type="hidden" name="level" value="<?php echo $level?>" />
+          <?php } ?>
           <input type="submit" name="option" value="Ok" />
-          <input type="button" name="cancel" value="<?=ucfirst($LANG[$MYLANG]['cancel'])?>" onclick="$.fn.colorbox.close();" /> 
-          <input type="submit" name="reset" value="<?=ucfirst($LANG[$MYLANG]['reset0'])?>" /> 
+          <input type="button" name="cancel" value="<?php echo ucfirst($LANG[$MYLANG]['cancel'])?>" onclick="$.fn.colorbox.close();" /> 
+          <input type="submit" name="reset" value="<?php echo ucfirst($LANG[$MYLANG]['reset0'])?>" /> 
         </td>
       </tr>
     </table>
diff -uNr openpom-1.0.5.orig/query-downtime.php openpom-1.0.5/query-downtime.php
--- openpom-1.0.5.orig/query-downtime.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/query-downtime.php	2010-09-03 21:46:01.000000000 +0200
@@ -1,4 +1,4 @@
-<? 
+<?php 
 /*
   OpenPom $Revision: 2 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/query-downtime.php $
@@ -15,16 +15,16 @@
 
 $QUERY_DOWNTIME_HOST_ID = "
   SELECT o.name1,o.name2,d.internal_downtime_id
-  FROM nagios_scheduleddowntime AS d
-  JOIN nagios_objects AS o
+  FROM icinga_scheduleddowntime AS d
+  JOIN icinga_objects AS o
   ON o.object_id = d.object_id WHERE downtime_type = 2
   AND o.name1 = 'define_mhost'
 ";
 
 $QUERY_DOWNTIME_SVC_ID = "
   SELECT o.name1,o.name2,d.internal_downtime_id
-  FROM nagios_scheduleddowntime AS d
-  JOIN nagios_objects AS o
+  FROM icinga_scheduleddowntime AS d
+  JOIN icinga_objects AS o
   ON o.object_id = d.object_id WHERE downtime_type = 1
   AND o.name1 = 'define_mhost'
   AND o.name2 = 'define_msvc'
diff -uNr openpom-1.0.5.orig/query-status.php openpom-1.0.5/query-status.php
--- openpom-1.0.5.orig/query-status.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/query-status.php	2010-09-03 21:46:04.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 7 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/query-status.php $
@@ -46,7 +46,7 @@
     S.display_name                         AS SERVICE,
     ( SELECT 
       concat_ws(';', author_name, comment_data)
-      FROM nagios_commenthistory AS ACO
+      FROM icinga_commenthistory AS ACO
       WHERE ACO.object_id = SS.service_object_id
       AND entry_type = 4
       AND author_name != '(Nagios Process)'
@@ -55,14 +55,14 @@
       LIMIT 1 )                            AS ACKCOMMENT,
     ( SELECT 
       concat_ws(';', author_name, comment_data, scheduled_end_time)
-      FROM nagios_downtimehistory AS DCO
+      FROM icinga_downtimehistory AS DCO
       WHERE DCO.object_id = SS.service_object_id
       AND actual_end_time = '000-00-00 00:00:00' 
       ORDER BY DCO.entry_time DESC
       LIMIT 1 )                            AS DOWNCOMMENT,
     ( SELECT 
       concat_ws(';', author_name, comment_data)
-      FROM nagios_commenthistory AS CO
+      FROM icinga_commenthistory AS CO
       WHERE CO.object_id = SS.service_object_id
       AND entry_type = 1
       AND author_name != '(Nagios Process)'
@@ -71,9 +71,9 @@
       LIMIT 1 )                           AS COMMENT
 
   FROM
-    nagios_servicestatus AS SS
-    INNER JOIN nagios_services AS S      ON S.service_object_id = SS.service_object_id
-    INNER JOIN nagios_hosts AS H         ON H.host_object_id = S.host_object_id
+    icinga_servicestatus AS SS
+    INNER JOIN icinga_services AS S      ON S.service_object_id = SS.service_object_id
+    INNER JOIN icinga_hosts AS H         ON H.host_object_id = S.host_object_id
   WHERE
     SS.servicestatus_id = define_my_id
 " ;
@@ -114,7 +114,7 @@
     H.display_name                         AS HOSTNAME,
     ( SELECT 
       concat_ws(';', author_name, comment_data)
-      FROM nagios_commenthistory AS ACO
+      FROM icinga_commenthistory AS ACO
       WHERE ACO.object_id = HS.host_object_id
       AND entry_type = 4
       AND author_name != '(Nagios Process)'
@@ -123,14 +123,14 @@
       LIMIT 1 )                            AS ACKCOMMENT,
     ( SELECT 
       concat_ws(';', author_name, comment_data, scheduled_end_time)
-      FROM nagios_downtimehistory AS DCO
+      FROM icinga_downtimehistory AS DCO
       WHERE DCO.object_id = HS.host_object_id
       AND actual_end_time = '000-00-00 00:00:00' 
       ORDER BY DCO.entry_time DESC
       LIMIT 1 )                            AS DOWNCOMMENT,
     ( SELECT 
       concat_ws(';', author_name, comment_data)
-      FROM nagios_commenthistory AS CO
+      FROM icinga_commenthistory AS CO
       WHERE CO.object_id = HS.host_object_id
       AND entry_type = 1
       AND author_name != '(Nagios Process)'
@@ -139,8 +139,8 @@
       LIMIT 1 )                            AS COMMENT
 
   FROM
-    nagios_hoststatus AS HS
-    INNER JOIN nagios_hosts AS H      ON H.host_object_id = HS.host_object_id
+    icinga_hoststatus AS HS
+    INNER JOIN icinga_hosts AS H      ON H.host_object_id = HS.host_object_id
   WHERE
     HS.hoststatus_id = define_my_id
 " ;
diff -uNr openpom-1.0.5.orig/query.php openpom-1.0.5/query.php
--- openpom-1.0.5.orig/query.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/query.php	2010-09-03 21:46:07.000000000 +0200
@@ -1,4 +1,4 @@
-<? 
+<?php 
 /*
   OpenPom $Revision: 12 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/query.php $
@@ -60,7 +60,7 @@
     SS.scheduled_downtime_depth          AS DOWNTIME,
     SS.notifications_enabled             AS NOTIF,
     ( SELECT count(*)
-      FROM nagios_commenthistory AS CO
+      FROM icinga_commenthistory AS CO
       WHERE CO.object_id = S.service_object_id
       AND entry_type = 1
       AND author_name != '(Nagios Process)'
@@ -69,18 +69,18 @@
       LIMIT 1 )                          AS COMMENT
 
   FROM
-         nagios_hosts AS H
-    JOIN nagios_hoststatus AS HS             ON H.host_object_id = HS.host_object_id
-    JOIN nagios_services AS S                ON H.host_object_id = S.host_object_id
-    JOIN nagios_servicestatus AS SS          ON S.service_object_id = SS.service_object_id
-    JOIN nagios_service_contactgroups AS SCG ON SCG.service_id = S.service_id
-    JOIN nagios_contactgroups AS HCG         ON SCG.contactgroup_object_id = HCG.contactgroup_object_id
-    JOIN nagios_contactgroup_members AS CGM  ON CGM.contactgroup_id = HCG.contactgroup_id
-    JOIN nagios_contacts AS C                ON C.contact_object_id = CGM.contact_object_id
-    JOIN nagios_objects AS O                 ON O.object_id = C.contact_object_id
-    LEFT JOIN nagios_hostgroup_members AS HGM ON H.host_object_id = HGM.host_object_id
-    LEFT JOIN nagios_hostgroups AS HG        ON HGM.hostgroup_id = HG.hostgroup_id
-    LEFT JOIN nagios_objects AS OHG          ON HG.hostgroup_object_id = OHG.object_id
+         icinga_hosts AS H
+    JOIN icinga_hoststatus AS HS             ON H.host_object_id = HS.host_object_id
+    JOIN icinga_services AS S                ON H.host_object_id = S.host_object_id
+    JOIN icinga_servicestatus AS SS          ON S.service_object_id = SS.service_object_id
+    JOIN icinga_service_contactgroups AS SCG ON SCG.service_id = S.service_id
+    JOIN icinga_contactgroups AS HCG         ON SCG.contactgroup_object_id = HCG.contactgroup_object_id
+    JOIN icinga_contactgroup_members AS CGM  ON CGM.contactgroup_id = HCG.contactgroup_id
+    JOIN icinga_contacts AS C                ON C.contact_object_id = CGM.contact_object_id
+    JOIN icinga_objects AS O                 ON O.object_id = C.contact_object_id
+    LEFT JOIN icinga_hostgroup_members AS HGM ON H.host_object_id = HGM.host_object_id
+    LEFT JOIN icinga_hostgroups AS HG        ON HGM.hostgroup_id = HG.hostgroup_id
+    LEFT JOIN icinga_objects AS OHG          ON HG.hostgroup_object_id = OHG.object_id
 
   WHERE
     (
@@ -93,7 +93,7 @@
     AND SS.current_state IN (define_my_svcfilt)
     AND ( HS.problem_has_been_acknowledged IN (define_my_hostacklist)
       OR  ( SELECT substring( comment_data, 1 ,1) 
-            FROM nagios_commenthistory
+            FROM icinga_commenthistory
             WHERE object_id = S.service_object_id
             AND entry_type = 4
             AND author_name != '(Nagios Process)'
@@ -105,7 +105,7 @@
     AND ( ( SS.problem_has_been_acknowledged IN (define_my_svcacklist) AND
           HS.problem_has_been_acknowledged IN (define_my_acklist) )
       OR  ( SELECT substring( comment_data, 1 ,1) 
-            FROM nagios_commenthistory
+            FROM icinga_commenthistory
             WHERE object_id = S.service_object_id
             AND entry_type = 4
             AND author_name != '(Nagios Process)'
@@ -148,7 +148,7 @@
     HS.scheduled_downtime_depth          AS DOWNTIME,
     HS.notifications_enabled             AS NOTIF,
     ( SELECT count(*)
-      FROM nagios_commenthistory AS CO
+      FROM icinga_commenthistory AS CO
       WHERE CO.object_id = H.host_object_id
       AND entry_type = 1
       AND author_name != '(Nagios Process)'
@@ -157,16 +157,16 @@
       LIMIT 1 )                          AS COMMENT
 
   FROM
-         nagios_hosts AS H
-    JOIN nagios_hoststatus AS HS            ON H.host_object_id = HS.host_object_id
-    JOIN nagios_host_contactgroups AS HCG   ON HCG.host_id = H.host_id
-    JOIN nagios_contactgroups As OCG        ON HCG.contactgroup_object_id = OCG.contactgroup_object_id
-    JOIN nagios_contactgroup_members AS CGM ON CGM.contactgroup_id = OCG.contactgroup_id
-    JOIN nagios_contacts AS C               ON C.contact_object_id = CGM.contact_object_id
-    JOIN nagios_objects AS O                ON O.object_id = C.contact_object_id
-    LEFT JOIN nagios_hostgroup_members AS HGM ON H.host_object_id = HGM.host_object_id
-    LEFT JOIN nagios_hostgroups AS HG       ON HGM.hostgroup_id = HG.hostgroup_id
-    LEFT JOIN nagios_objects AS OHG         ON HG.hostgroup_object_id = OHG.object_id
+         icinga_hosts AS H
+    JOIN icinga_hoststatus AS HS            ON H.host_object_id = HS.host_object_id
+    JOIN icinga_host_contactgroups AS HCG   ON HCG.host_id = H.host_id
+    JOIN icinga_contactgroups As OCG        ON HCG.contactgroup_object_id = OCG.contactgroup_object_id
+    JOIN icinga_contactgroup_members AS CGM ON CGM.contactgroup_id = OCG.contactgroup_id
+    JOIN icinga_contacts AS C               ON C.contact_object_id = CGM.contact_object_id
+    JOIN icinga_objects AS O                ON O.object_id = C.contact_object_id
+    LEFT JOIN icinga_hostgroup_members AS HGM ON H.host_object_id = HGM.host_object_id
+    LEFT JOIN icinga_hostgroups AS HG       ON HGM.hostgroup_id = HG.hostgroup_id
+    LEFT JOIN icinga_objects AS OHG         ON HG.hostgroup_object_id = OHG.object_id
 
   WHERE
     (
@@ -180,7 +180,7 @@
     AND HS.scheduled_downtime_depth IN (define_my_hostdownlist)
     AND ( HS.problem_has_been_acknowledged IN (define_my_hostacklist)
       OR ( SELECT substring( comment_data, 1 ,1) 
-            FROM nagios_commenthistory
+            FROM icinga_commenthistory
             WHERE object_id = H.host_object_id
             AND entry_type = 4
             AND author_name != '(Nagios Process)'
diff -uNr openpom-1.0.5.orig/status.php openpom-1.0.5/status.php
--- openpom-1.0.5.orig/status.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/status.php	2010-09-03 21:40:38.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 7 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/status.php $
@@ -61,9 +61,9 @@
 
 ?>
   <table class="popuptable">
-    <tr><th><b><?=ucfirst($LANG[$MYLANG]['reload'])?></b></th></tr>
+    <tr><th><b><?php echo ucfirst($LANG[$MYLANG]['reload'])?></b></th></tr>
   </table>
-<?
+<?php
   exit (0);
 }
 
@@ -109,29 +109,29 @@
 $COMMENT           = explode(';', $st_data['COMMENT']);
 ?>
 
-<table class="popuptable<?=$COLOR?>" id="popuptable">
-  <tr><th><?=ucfirst($LANG[$MYLANG]['host'])?></th><td><?=$HOSTNAME?> (<?=$ADDRESS?>)</td></tr>
-  <tr><th class="<?=$COLOR?>dark"><?=ucfirst($LANG[$MYLANG]['curstat'])?></th><td><?=$STATUS?> (for <?=$LASTCHANGEDIFF?>)</td></tr>
-  <tr><th><?=ucfirst($LANG[$MYLANG]['stinfo'])?></th><td><?=linebreak($OUTPUT)?></td></tr>
-  <tr><th><?=ucfirst($LANG[$MYLANG]['curat'])?></th><td><?=$CURATTEMP?>/<?=$MAXATTEMP?></td></tr>
-  <tr><th><?=ucfirst($LANG[$MYLANG]['last'])?></th><td><?=$LASTCHECKTIME?> (<?=$LASTCHECKTIMEDIFF?>)</td></tr>
-  <tr><th><?=ucfirst($LANG[$MYLANG]['chktyp'])?></th><td><?=$CHKTYPE?></td></tr>
-  <tr><th><?=ucfirst($LANG[$MYLANG]['latency'])?> / <?=ucfirst($LANG[$MYLANG]['duration'])?></th><td><?=$LATENCY?> / <?=$EXEC_TIME?></td></tr>
-  <tr><th><?=ucfirst($LANG[$MYLANG]['lastchange'])?></th><td><?=$LASTCHANGE?></td></tr>
-  <tr><th><?=ucfirst($LANG[$MYLANG]['flapping'])?> ?</th><td><?=$FLAPPING?><? if ($st_data['FLAPPING'] != 2) { echo " ($PERCENT% state change)"; } ?></td></tr>
-  <tr><th><?=ucfirst($LANG[$MYLANG]['lastup'])?></th><td><?=$UPDATETIME?> (<?=$UPDATETIMEDIFF?> ago)</td></tr>
-  <? if (isset($ACKCOMMENT[1])) { ?>
-  <tr><th><img src="img/ack.gif" alt="ack comment" /> (<?=$ACKCOMMENT[0]?>) </th><td><?=$ACKCOMMENT[1]?></td></tr>
-  <? } ?>
-  <? if (isset($DOWNCOMMENT[1])) { ?>
-  <tr><th><img src="img/downtime.gif" alt="downtime comment" /> (<?=$DOWNCOMMENT[0]?>) </th><td><?=$DOWNCOMMENT[1]?>, <?=ucfirst($LANG[$MYLANG]['end_down'])?> <?=$DOWNCOMMENT[2]?></td></tr>
-  <? } ?>
-  <? if (isset($COMMENT[1])) { ?>
-  <tr><th><img src="img/comment.gif" alt="comment" /> (<?=$COMMENT[0]?>) </th><td><?=$COMMENT[1]?></td></tr>
-  <? } ?>
+<table class="popuptable<?php echo $COLOR?>" id="popuptable">
+  <tr><th><?php echo ucfirst($LANG[$MYLANG]['host'])?></th><td><?php echo $HOSTNAME?> (<?php echo $ADDRESS?>)</td></tr>
+  <tr><th class="<?php echo $COLOR?>dark"><?php echo ucfirst($LANG[$MYLANG]['curstat'])?></th><td><?php echo $STATUS?> (for <?php echo $LASTCHANGEDIFF?>)</td></tr>
+  <tr><th><?php echo ucfirst($LANG[$MYLANG]['stinfo'])?></th><td><?php echo linebreak($OUTPUT)?></td></tr>
+  <tr><th><?php echo ucfirst($LANG[$MYLANG]['curat'])?></th><td><?php echo $CURATTEMP?>/<?php echo $MAXATTEMP?></td></tr>
+  <tr><th><?php echo ucfirst($LANG[$MYLANG]['last'])?></th><td><?php echo $LASTCHECKTIME?> (<?php echo $LASTCHECKTIMEDIFF?>)</td></tr>
+  <tr><th><?php echo ucfirst($LANG[$MYLANG]['chktyp'])?></th><td><?php echo $CHKTYPE?></td></tr>
+  <tr><th><?php echo ucfirst($LANG[$MYLANG]['latency'])?> / <?php echo ucfirst($LANG[$MYLANG]['duration'])?></th><td><?php echo $LATENCY?> / <?php echo $EXEC_TIME?></td></tr>
+  <tr><th><?php echo ucfirst($LANG[$MYLANG]['lastchange'])?></th><td><?php echo $LASTCHANGE?></td></tr>
+  <tr><th><?php echo ucfirst($LANG[$MYLANG]['flapping'])?> ?</th><td><?php echo $FLAPPING?><?php if ($st_data['FLAPPING'] != 2) { echo " ($PERCENT% state change)"; } ?></td></tr>
+  <tr><th><?php echo ucfirst($LANG[$MYLANG]['lastup'])?></th><td><?php echo $UPDATETIME?> (<?php echo $UPDATETIMEDIFF?> ago)</td></tr>
+  <?php if (isset($ACKCOMMENT[1])) { ?>
+  <tr><th><img src="img/ack.gif" alt="ack comment" /> (<?php echo $ACKCOMMENT[0]?>) </th><td><?php echo $ACKCOMMENT[1]?></td></tr>
+  <?php } ?>
+  <?php if (isset($DOWNCOMMENT[1])) { ?>
+  <tr><th><img src="img/downtime.gif" alt="downtime comment" /> (<?php echo $DOWNCOMMENT[0]?>) </th><td><?php echo $DOWNCOMMENT[1]?>, <?php echo ucfirst($LANG[$MYLANG]['end_down'])?> <?php echo $DOWNCOMMENT[2]?></td></tr>
+  <?php } ?>
+  <?php if (isset($COMMENT[1])) { ?>
+  <tr><th><img src="img/comment.gif" alt="comment" /> (<?php echo $COMMENT[0]?>) </th><td><?php echo $COMMENT[1]?></td></tr>
+  <?php } ?>
 </table>
 
-<?
+<?php
 /*  free resources */
 mysql_free_result($st_rep);
 mysql_close();
diff -uNr openpom-1.0.5.orig/utils.php openpom-1.0.5/utils.php
--- openpom-1.0.5.orig/utils.php	2010-09-03 21:30:29.000000000 +0200
+++ openpom-1.0.5/utils.php	2010-09-03 21:46:09.000000000 +0200
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
   OpenPom $Revision: 12 $
   $HeadURL: http://openpom.googlecode.com/svn/trunk/utils.php $