Added support for CERN reporter. Bug fixes.

etc/Config.php

@@ -45,13 +45,15 @@ final class Config {
   # Enable authorization?
   public static $ENABLE_AUTHZ = 1;
   # Debug
-  #public static $DEBUG = TRUE;
-  public static $DEBUG = FALSE;
+  public static $DEBUG = TRUE;
 
   # Directory, where to put the reports (only applied for asynchronous mode)
   public static $REPORTS_DIR = "/var/tmp/pakiti-reports/";
   # Should be report compressed?
   public static $COMPRESS_REPORTS = 1;
+
+  # If CERN reports are used, path to the private key must be defined, in order to decrypt incomming report
+  public static $CERN_REPORT_DECRYPTION_KEY = "/etc/ssl/cert.pem";
 
   # Do we want backup the reports
   public static $BACKUP = TRUE;

lib/common/Loader.php

@@ -26,7 +26,6 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE. 
-
 # Load the constants
 require_once(realpath(dirname(__FILE__)) . '/Constants.php');
 
@@ -59,8 +58,8 @@ function __autoload($className) {
     } elseif (preg_match('/.*Module$/', $className) > 0) {
       # Get the module name
       $moduleName = strtolower(preg_replace('/^(.*)Module$/','\1',$className));
-      if (file_exists(realpath(dirname(__FILE__)) . '/../modules/' . $moduleName . '/' . $className . '.php')) {
-        include_once(realpath(dirname(__FILE__)) . '/../modules/' . $moduleName . '/' . $className . '.php');
+      if (file_exists(realpath(dirname(__FILE__)) . '/../../modules/' . $moduleName . '/' . $className . '.php')) {
+        include_once(realpath(dirname(__FILE__)) . '/../../modules/' . $moduleName . '/' . $className . '.php');
       }
     } else {
       #  Models

lib/dao/InstalledPkgDao.php

@@ -91,17 +91,19 @@ public function getInstalledPkgs(Host &$host, $orderBy, $pageSize, $pageNum) {
     $installedPkgsDb =& $this->db->queryToMultiRow($sql);
     # Create objects
     $installedPkgs = array();
-    foreach ($installedPkgsDb as $installedPkgDb) {
-      $installedPkg = new InstalledPkg();
-      $installedPkg->setPkgId($installedPkgDb["pkgId"]);
-      $installedPkg->setHostId($installedPkgDb["hostId"]);
-      $installedPkg->setArchId($installedPkgDb["archId"]);
-      $installedPkg->setVersion($installedPkgDb["version"]);
-      $installedPkg->setRelease($installedPkgDb["release"]);
+    if ($installedPkgsDb != null) {
+      foreach ($installedPkgsDb as $installedPkgDb) {
+	$installedPkg = new InstalledPkg();
+	$installedPkg->setPkgId($installedPkgDb["pkgId"]);
+	$installedPkg->setHostId($installedPkgDb["hostId"]);
+	$installedPkg->setArchId($installedPkgDb["archId"]);
+	$installedPkg->setVersion($installedPkgDb["version"]);
+	$installedPkg->setRelease($installedPkgDb["release"]);
 
-      array_push($installedPkgs, $installedPkg);
+	array_push($installedPkgs, $installedPkg);
+      }
     }
-
+	    
     return $installedPkgs;
   }
 

lib/managers/DbManager.php

@@ -211,7 +211,7 @@ protected function rawSingleValueMultiRowFetch($res) {
    * Single raw object fetch, just check if the fetch was successfull and return the result
    */
   protected function rawSingleObjectFetch($res, $class, $params) {
-    if ($params == null) {
+    if ($params != null) {
       if (($row = $res->fetch_object($class, $params)) == null) {
         return null;
       }

lib/managers/ReportsManager.php

@@ -90,6 +90,12 @@ public function createReport(Report &$report, Host &$host) {
 
     $this->getPakiti()->getManager("DbManager")->query($sql);
 
+    # Assign the lastReportId to the host
+    $sql = "update Host set lastReportId=".$report->getId()." where id=".$host->getId();
+
+    $this->getPakiti()->getManager("DbManager")->query($sql);
+
+
     return $report;
   }