WebSVN – computer_asset_manager_v1 – Diff – /modules/sysinfo/cli_tools/parse_sysinfo.php

  * them to simpl eval() blocks.
+ *
 */
 require 'library.php';
-$VERSION='0.9';
+$VERSION='0.9.1';
 class sysinfo {
    private $report; // this will hold an entire report
    private $messages = array();
             "Report on $this->reportDateSQL, client $this->clientName, system $this->machineName ($this->fileType)");
       // now, we do every step in turn. If they set the FATAL flag, we exit.
       if ( $this->FATAL ) return $this->returnCode;
       $this->getMachineID();
       if ( empty( $this->machineID ) ) return $this->returnCode;
-      $this->recordReport();
+      $this->checkDuplicate();
       if ( $this->FATAL) return $this->returnCode;
       $this->updateComputerMakeup();
       $this->updateOS();
       $this->updateBootTime();
       $this->doIPAddresses();
       $this->processPCI();
       $this->processSoftwarePackages();
+      // at this point, we don't really need the report title information
+      // so we will remove it before recordReport has a chance to put it
+      // in database
+      array_shift( $this->messages );
+      // now record the report
+      $this->recordReport();
       return $this->returnCode;;
    } // function processReport
    /*
     * Name: loadFromFile
    private function processINI() {
       return false;
+   }
    public function dumpMessages () {
+      $return = '';
+      if ( $this->messages ) {
-      $return = implode( "\n", $this->messages );
+         $return = implode( "\n", $this->messages );
-      $return .= "\n";
+         $return .= "\n";
+      }
       return $return;
+   }
    /*
     * Name: validateReport
    /*
     * checks for a duplicate report, ie one that has already been run.
     * if this computer has a report already for this date/time
     */
-   private function recordReport() {
+   private function checkDuplicate() {
       $count = getOneDBValue("select count(*) from sysinfo_report where device_id = $this->machineID and report_date = '$this->reportDateSQL'");
       if ( $this->processDuplicates ) { $count = 0; } // for testing
       if ( $count ) {
          $this->messages[] = "Duplicate Report for $this->machineName (id $this->machineID) on $this->reportDateSQL";
          $this->returnCode = 4;
          $this->FATAL = true;
          return false;
+      }
+      return true;
+   } // recordReport
+   /*
+    * Creates an entry in the sysinfo_report table
+    */
+   private function recordReport() {
       $version = $this->report['report']['version'];
+      $messages = makeSafeSQLValue( $this->dumpMessages() );
-      # if we made it this far, we are ok, so just add the report id
+      // if we made it this far, we are ok, so just add the report id
-      queryDatabaseExtended("insert into sysinfo_report(device_id,version,report_date,added_date) values ($this->machineID ,'$version','$this->reportDateSQL',now())");
+      queryDatabaseExtended("insert into sysinfo_report(device_id,version,report_date, notes,added_date) values ($this->machineID ,'$version','$this->reportDateSQL',$messages,now())");
       $this->reportID = getOneDBValue("select max( sysinfo_report_id ) from sysinfo_report where device_id = $this->machineID and report_date = '$this->reportDateSQL'");
       return true;
-   }
+   } // recordReport
    function makeUnknown( $clientName, $machineName, $reportDate ) {
       $result = getOneDBValue("select report_date from unknown_entry where client_name = '$clientName' and device_name = '$machineName'");
       if ( empty( $result ) ) {
          $this->returnCode = 6;
          return "New entry detected, but entry already made. You must update Camp before this can be processed";
+      }
+   }
-   # simply used to get an attrib_id. If it does not exit, will create it
+   // simply used to get an attrib_id. If it does not exit, will create it
    private function getAttributeID ( $attributeName, $reportDate ) {
       $attributeName = makeSafeSQLValue( $attributeName );
       $result = getOneDBValue( "select attrib_id from attrib where name = $attributeName and removed_date is null" );
       if ( !isset( $result) ) {

Subversion Repositories computer_asset_manager_v1

(root)/modules/sysinfo/cli_tools/parse_sysinfo.php – Rev 6 → 9