From b0c17192d0643b72bab40740174756a5f718df72 Mon Sep 17 00:00:00 2001
From: Jack-Benny Persson <jack-benny@cyberinfo.se>
Date: Sun, 14 Apr 2013 04:41:39 +0200
Subject: [PATCH] Cleand up code and completed check and warning/critical check

---
 .check_md5.php.swp | Bin 12288 -> 12288 bytes
 check_md5.php      |  46 +++++++++++++++++++++++++++++++++++++--------
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/.check_md5.php.swp b/.check_md5.php.swp
index 12e8813df877708a88223b084249037e9f2b4c07..10f7d03563b7db7a19a19cbd8c4b63081de122c7 100644
GIT binary patch
delta 1462
zcmZY9Uu;uV9Ki7(W7+8bu;CU=Fu_CFq}>*4A`6%?NZmgdT*tbO2`+)V?rgobJ-7DW
zW-J6dee%HvL(L?6!Gwo_7{fLnebYpvBu0Z83F4bPm>3O_7bW_=Wsxpx`nkF1_T1m^
zch2vmi)R<l?wNk><nV|(^z8G(r&%QQ<ZEM#N0j_qySnE=)3&AcUCsBK8uwO<T&#IC
zW2v-DwG?kQiF}0X_z=rDg;y|%m(YVScB2~GQH9@jirmIe_!?`tfn~gnG*Xzu7)Egv
z2k@{_<ex?<%6)GBz<2ltYgok!PT@sF(S;^7;_n8LFYy^xaT)KxLmsaqhi<f@1rO^f
z5?|pOGDz1KMNV+jjymi>EgsZ~{DoieGrqv*_yjj_1s8DvF7nVA!w?2>5PQ*z7F6NS
zfXF@kif{30k;@uB#&ul7RjgnMi+BTZ^xy>?#sReB_Z=cX;(Oe}O<cxXcoS1N4TYU(
zKt1l(irm5J54aSN_Xn6n2<>P<0JW&W51gD^Sj93f;eEV^68w{O4r!dJS>INDZ+q!(
zsIF7w*iq5Rl%s-EraX`f642*tFVr@kh$aTkOvH}IM*Uw(E8&i!3Qm}`GjEjZS)QIU
z!Ele97oBmnibT|)WoMM-s)9)yCUq&-$!afUn>jVFji*x9!n~c=G)Dq_H|6Pz4=0BE
zqAwFLaGnwfY0s)q+q{)Get_Oy6*NUB7_Ll|%-f!wv@%=6O-AFf;n>hdv@MYqw7WUd
zMj8ps&J$CI#uNPm@pzXCw$0iZZLF+TGmb90DmI!>S<6eN)JT7~N~Ux&?H00?J5f&N
zzoqu|s<!M*ce&)gjhV`Jm2o`fq|4h-xz(e`{c;}{FglUgR6xpl%2k$1I(eP+wxlmL
zhj%~WZ%$<<CtZ3b{PaQpsguoFd9A#ZR^{TXIm<S#SAI~r6k+m6bT~%8J4+^f=`iDQ
z%h=w+#%lSG+UTF(!@zW2TWRVJ1RnQF1=--z{*LkWcRO0EdWaCs&lR$q0Ty6pl#}yp
z$G9pqqjTEK`2BT^Ix!H9Q>SsAj2_Y+lftrorR&wILj)KsnB=3EL@E;*C)nec+^=V?
tLWboy>i<(wYKWXHS&{M5dZe>sYjlw#$8xEh?B5qDxcSJmZ6XZ2<v({oQwsn9

delta 748
zcmXZZUr19?9KiA4MlF}lO)JPzc-q7^iCtk>*fb;13M$CTNTl56m0jAdf9_UF#D)dE
z)YC1Bf?g~t>Lpga^kDQ}4<Q6)e=LO_LW01D3hTSA!}-AZaen7_4(C@GEDZV+t$q6s
zsvVK2Fnl7HJ{gA#9ZKFdJoYbp9TUYm-%qdSvrA;Is**8b*Qs^+S+B?w6funi;^;*;
zqEM)X2Y+itR<MY#c!lS<ja#^hi<rU~`q2sv%?M&OoLKZoUKTte?{FD8WN`|6up1Hl
zt`S+r0^VQ-_iz_?Z~;?DV<+0N5$~(1jTv0UB+lXtbPQGJMGmnzfbEDPh(^@If$wWY
zzF;1+c!6hlifLSd1p_G@M-Ms>Lo@vFp$2ZOfeSy5xkZ-n5)bhJ_i-K9a1wjbjS#kC
zJ?im?M*hMQ=J639FjrM{tor8K*R@OZWNJhO2Fw975UT`D!$w+<$$4>C_Kv3XNtKCb
zlc{pfIWdM+sGOuaJ5^I=s4Z+4LXCENIBc(kZfq`{WR|%T<9hsbjOc$c`*rxphH~9<
z1v8$}Rit!(ptz}}!C4&J)=%FxP4(o=WY!olEoD2kKKq2$Yd_Lj0?BmTvQ+7Xd|%gS
SYE*(-w461rB@9y|Y?FTk+>hx1

diff --git a/check_md5.php b/check_md5.php
index 2106a23..8990eff 100755
--- a/check_md5.php
+++ b/check_md5.php
@@ -1,20 +1,25 @@
 #!/usr/bin/php5
 <?php
 
-//include class file
+//include PEAR ConsoleGetopt
 include ("Console/Getopt.php");
 
+
 $VERSION="1.1";
 $AUTHOR="(c) 2013 Jack-Benny Persson (jack-benny@cyberinfo.se)";
 
+
 // Exit codes 
 $STATE_OK=0;
 $STATE_WARNING=1;
 $STATE_CRITICAL=2;
 $STATE_UNKNOWN=3;
 
-// Functions 
 
+// Default to critical
+$warning = "no";
+
+// Functions 
 function print_version()
 {
 	global $argv, $argc;
@@ -50,6 +55,8 @@ EOD;
 	echo "\n$HELP_TEXT\n";
 }
 
+
+// Arguments and options (depending on PEAR ConsoleGetopt)
 $options = new Console_Getopt();
 
 $shortoptions = "hV";
@@ -82,7 +89,6 @@ if(sizeof($opts) > 0)
 
 			case '--file':
 			$filename = $o[1];
-			echo $filename . "\n";
 			break;
 
 			case '--md5':
@@ -90,12 +96,14 @@ if(sizeof($opts) > 0)
 			break;
 
 			case '--warning':
-			echo "";
+			$warning = "yes";
 			break;
 		}
 	}
 }
 
+
+// Sanity checks
 if (empty($filename))
 {
 	fwrite(STDERR,"A filename is requierd\n");
@@ -107,14 +115,36 @@ if (empty($md5))
 	fwrite(STDERR,"You need to enter an MD5 checksum\n");
 	exit($STATE_UNKNOWN);
 }
+
+// MAIN
+// Compare the file against the MD5 checksum
 $file = md5_file($filename);
 
-if ($file == $md5)
+if ($file == $md5) // Checksum is ok
 {
-	echo "They match\n";
+	fwrite(STDOUT, "$filename has a corect MD5 checksum\n");
+	exit($STATE_OK);
 }
-echo $file;
-echo "\n\n";
+
+elseif ($file != $md5) // Checksum is not ok
+{
+	fwrite(STDERR, "$filename does NOT match MD5 checksum\n");
+	if ($warning == "yes") // Fail as warning
+	{
+		exit($STATE_WARNING);
+	}
+	elseif ($warning == "no") // Fail as critical
+	{
+		exit($STATE_CRITICAL);
+	}
+}
+
+else // Fail as unknown, something went haywire
+{
+	fwrite(STDERR, "Unkown state\n");
+	exit($STATE_UNKNOWN);
+}
+
 ?>