Merge branch 'CronDeprecatedWarnings_Clamav_Mem' into 'develop'

Fixes PHP warnings in monitor for mem and clamav

See merge request !1810

server/lib/classes/cron.d/100-monitor_clamav_log.inc.php

@@ -104,24 +104,26 @@ class cronjob_monitor_clamav_log extends cronjob {
 
 		$tmp = explode("\n", $data);
 		$lastLog = array();
-		if ($tmp[sizeof($tmp) - 1] == '') {
-			/* the log ends with an empty line remove this */
-			array_pop($tmp);
-		}
-		if (strpos($tmp[sizeof($tmp) - 1], '-------------') !== false) {
-			/* the log ends with "-----..." remove this */
-			array_pop($tmp);
-		}
-		for ($i = sizeof($tmp) - 1; $i > 0; $i--) {
-			if (strpos($tmp[$i], '---------') === false) {
-				/* no delimiter found, so add this to the last-log */
-				$lastLog[] = $tmp[$i];
-			} else {
-				/* delimiter found, so there is no more line left! */
-				break;
+		if (count($tmp) >= 2) {
+			if ($tmp[sizeof($tmp) - 1] == '') {
+				/* the log ends with an empty line remove this */
+				array_pop($tmp);
+			}
+			if (strpos($tmp[sizeof($tmp) - 1], '-------------') !== false) {
+				/* the log ends with "-----..." remove this */
+				array_pop($tmp);
+			}
+			for ($i = sizeof($tmp) - 1; $i > 0; $i--) {
+				if (strpos($tmp[$i], '---------') === false) {
+					/* no delimiter found, so add this to the last-log */
+					$lastLog[] = $tmp[$i];
+				} else {
+					/* delimiter found, so there is no more line left! */
+					break;
+				}
 			}
 		}
-
+		
 		/*
 		 * Now we have the last log in the array.
 		 * Check if the outdated-string is found...

server/lib/classes/cron.d/100-monitor_mem_usage.inc.php

@@ -28,6 +28,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+
 class cronjob_monitor_mem_usage extends cronjob {
 
 	// job schedule
@@ -74,13 +75,15 @@ class cronjob_monitor_mem_usage extends cronjob {
 		$memInfo = explode("\n", $miData);
 
 		foreach ($memInfo as $line) {
-			$part = preg_split('/:/', $line);
-			$key = trim($part[0]);
-			$tmp = explode(' ', trim($part[1]));
-			$value = 0;
-			if (isset($tmp[1]) && $tmp[1] == 'kB')
-				$value = $tmp[0] * 1024;
-			$data[$key] = $value;
+			if (strlen($line) >= 1){
+				$part = preg_split('/:/', $line);
+				$key = trim($part[0]);
+				$tmp = explode(' ', trim($part[1]));
+				$value = 0;
+				if (isset($tmp[1]) && $tmp[1] == 'kB')
+					$value = $tmp[0] * 1024;
+				$data[$key] = $value;
+			}
 		}
 
 		/*