WebSVN – computer_asset_manager_v1 – Diff – //modules/backup/cli_tools/getBackupMail.php

+ *
+ *
  */
 $VERSION = '0.1';
-$MAXDOWNLOAD = 5000; // maximum number of e-mails to download at one time
+$MAXDOWNLOAD = 10000; // maximum number of e-mails to download at one time
+$LOGGING = 1;
 $CLI = isset( $_SERVER["TERM"]); // only set if we are not in a cron job
 // where to load the configuration file from
 $confFileName = "rsbackupRead.conf.yaml";
 $searchPaths = array( '/etc/camp', '/opt/camp', '/opt/camp/backups', $_SERVER['SCRIPT_FILENAME'], getcwd() );
 /*
  * function loadConfig
  * Parameters $confFileName - the name of the configuration file
  *            $searchPaths - an array of paths to be searched
  * Returns    An array containing the configuration
+}
 function saveAttachments ( $attachments, $mailDate ) {
    $body = '';
+   $saved = false;
    foreach ( $attachments as $thisOne ) {
       if ( $thisOne['is_attachment'] ) {
          saveFile( makeFileName( $thisOne['filename'] ), $thisOne['attachment'], $mailDate );
+         $saved = true;
       } else {
          $body .= $thisOne['attachment'];
+      }
+   }
-   return $body;
+   return array( $saved, $body );
+}
 /* function makeFileName
  * Parameter $data
  *           $type - the type of the file
+   }
+}
 $listMailboxes =  isset( $argv[1] ) ; // anything passed on cli results in a list of mailboxes instead of the job
 foreach ( $configuration['servers'] as $thisServer ) {
    if ($MAXDOWNLOAD <= 0 ) break;
    if ( ! $thisServer['enabled'] ) continue; // ignore anything that is not enabled
    print "Working on " . $thisServer['servername'] . "\n";
    $messagesToDelete = array(); // trap the UID's of messages to delete, more accurate than using message number
       $list = imap_list($server, $connectString, "*");
       print_r( $list ); print "\n";
       continue;
+   }
    $count = 0;
+   $lookedAt = 0;
    if ( $server ) {
       $folderCount = imap_num_msg( $server );
       for ( $num = 1; ($num <= $folderCount) && $MAXDOWNLOAD; $num++ ) {
          list( $header, $attachments ) = getContents( $server, $num );
+         $lookedAt++;
          # $mailDate = getMailDate( $header );
-         $body = saveAttachments( $attachments, strtotime($header->date) );
+         list($saved,$body) = saveAttachments( $attachments, strtotime($header->date) );
+         if ( $saved ) {
-         $messagesToDelete[] = imap_uid( $server, $num );
+            $messagesToDelete[] = imap_uid( $server, $num );
-         $count++;
+            $count++;
+            $MAXDOWNLOAD--;
+         }
          if ( $CLI ) print '.'; // only do this if interactive session
-         $MAXDOWNLOAD--;
       } // for
-      /*
       if ( $thisServer['deleteProcessed'] ) {
          foreach ( $messagesToDelete as $uid ) {
             imap_delete( $server, $uid, FT_UID ) or logError( "Can't delete [$uid]: imap_last_error()" );
+         }
          imap_expunge( $server );
       }  // if delete
-      */
       imap_close( $server );
    } else {
       print "Could not open server " . $thisServer['servername'] . "\n";
    } // if..else
-   print "\nProcessed $count messages\n\n";
+   print "\nLooked at $lookedAt messages, Processed $count\n\n";
 } // outer for
 ?>

Subversion Repositories computer_asset_manager_v1

(root)//modules/backup/cli_tools/getBackupMail.php – Rev 23 → 24