From 0077cb99704fe863cf731fc5cab792af2ede96c2 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Sun, 17 Apr 2011 20:13:07 -0400 Subject: Backporting retarded amount of changes outside of version control --- modules/rudi/header.php | 16 +- modules/rudi/images/medals/CIB_1st.gif | Bin 0 -> 2952 bytes modules/rudi/images/medals/CIB_2nd.gif | Bin 0 -> 3017 bytes modules/rudi/images/medals/CIB_3rd.gif | Bin 0 -> 2966 bytes modules/rudi/images/medals/CoD2.gif | Bin 0 -> 3810 bytes modules/rudi/images/medals/CoD2.jpg | Bin 0 -> 17220 bytes modules/rudi/images/medals/DUC.jpg | Bin 0 -> 26590 bytes modules/rudi/images/medals/SM.gif | Bin 0 -> 2275 bytes modules/rudi/images/medals/SS.gif | Bin 0 -> 1728 bytes modules/rudi/images/medals/afem.jpg | Bin 0 -> 15397 bytes modules/rudi/images/medals/arma2duc.jpg | Bin 0 -> 19957 bytes modules/rudi/images/medals/cib1.png | Bin 0 -> 13451 bytes modules/rudi/images/medals/cib2.png | Bin 0 -> 14463 bytes modules/rudi/images/medals/cib3.png | Bin 0 -> 14610 bytes modules/rudi/images/medals/cib4.png | Bin 0 -> 15201 bytes modules/rudi/images/medals/cod4unitcit.jpg | Bin 0 -> 18868 bytes modules/rudi/images/medals/dsm.jpg | Bin 18088 -> 14066 bytes modules/rudi/images/medals/eib.jpg | Bin 0 -> 12895 bytes modules/rudi/images/medals/eib.png | Bin 0 -> 4664 bytes modules/rudi/images/medals/expert.gif | Bin 0 -> 8271 bytes modules/rudi/images/medals/oak_leaf_clusters.gif | Bin 0 -> 2527 bytes modules/rudi/images/medals/pass.gif | Bin 0 -> 6413 bytes modules/rudi/images/medals/sniper_qual.gif | Bin 0 -> 8502 bytes modules/rudi/images/medals/sniper_qual.jpg | Bin 0 -> 31834 bytes modules/rudi/images/medals/success.gif | Bin 0 -> 6402 bytes modules/rudi/images/medals/valor_device.gif | Bin 0 -> 1676 bytes modules/rudi/images/medals/valor_device.jpg | Bin 0 -> 10855 bytes modules/rudi/images/ranks/tiny/1LT.png | Bin 0 -> 3239 bytes modules/rudi/images/ranks/tiny/1SG.png | Bin 0 -> 3620 bytes modules/rudi/images/ranks/tiny/2LT.png | Bin 0 -> 3351 bytes modules/rudi/images/ranks/tiny/CPL.png | Bin 0 -> 3242 bytes modules/rudi/images/ranks/tiny/CPT.png | Bin 0 -> 3641 bytes modules/rudi/images/ranks/tiny/CW2.png | Bin 0 -> 3364 bytes modules/rudi/images/ranks/tiny/CW3.png | Bin 0 -> 3263 bytes modules/rudi/images/ranks/tiny/CW4.png | Bin 0 -> 3319 bytes modules/rudi/images/ranks/tiny/LTC.png | Bin 0 -> 3921 bytes modules/rudi/images/ranks/tiny/MSG.png | Bin 0 -> 3609 bytes modules/rudi/images/ranks/tiny/PFC.png | Bin 0 -> 3272 bytes modules/rudi/images/ranks/tiny/PV2.png | Bin 0 -> 3248 bytes modules/rudi/images/ranks/tiny/SFC.png | Bin 0 -> 3775 bytes modules/rudi/images/ranks/tiny/SGT.png | Bin 0 -> 3302 bytes modules/rudi/images/ranks/tiny/SPC.png | Bin 0 -> 3175 bytes modules/rudi/images/ranks/tiny/SSG.png | Bin 0 -> 3698 bytes modules/rudi/images/ranks/tiny/WO1.png | Bin 0 -> 3222 bytes modules/rudi/images/uniform/ACoia.png | Bin 287047 -> 304441 bytes modules/rudi/images/uniform/ACourter.png | Bin 0 -> 329375 bytes modules/rudi/images/uniform/ADodge.png | Bin 0 -> 292604 bytes modules/rudi/images/uniform/AHernandez.png | Bin 0 -> 289382 bytes modules/rudi/images/uniform/AKlassen.png | Bin 0 -> 291212 bytes modules/rudi/images/uniform/ASherman.png | Bin 0 -> 303127 bytes modules/rudi/images/uniform/AZanesco.png | Bin 0 -> 289215 bytes modules/rudi/images/uniform/BMorgan.png | Bin 0 -> 288752 bytes modules/rudi/images/uniform/BSegal.png | Bin 303105 -> 296393 bytes modules/rudi/images/uniform/BWhiting.png | Bin 0 -> 309101 bytes modules/rudi/images/uniform/DHolson.png | Bin 291465 -> 307160 bytes modules/rudi/images/uniform/DKillian.png | Bin 0 -> 294978 bytes modules/rudi/images/uniform/EOConnell.png | Bin 304203 -> 305521 bytes modules/rudi/images/uniform/GTownsend.png | Bin 305424 -> 301622 bytes modules/rudi/images/uniform/INewton.png | Bin 0 -> 289010 bytes modules/rudi/images/uniform/JCiciotti.png | Bin 0 -> 289503 bytes modules/rudi/images/uniform/JHiggins.jpg | Bin 0 -> 172237 bytes modules/rudi/images/uniform/JHiggins.png | Bin 0 -> 261094 bytes modules/rudi/images/uniform/JMagers.png | Bin 0 -> 289275 bytes modules/rudi/images/uniform/JMelnyk.png | Bin 287114 -> 291327 bytes modules/rudi/images/uniform/JMervau.png | Bin 0 -> 289068 bytes modules/rudi/images/uniform/JSchroeder.png | Bin 0 -> 289372 bytes modules/rudi/images/uniform/KGrimes.png | Bin 301461 -> 309873 bytes modules/rudi/images/uniform/KOlson.png | Bin 0 -> 291381 bytes modules/rudi/images/uniform/LTrimble.png | Bin 302003 -> 300908 bytes modules/rudi/images/uniform/MAbballe.png | Bin 0 -> 292696 bytes modules/rudi/images/uniform/MCampeau.png | Bin 0 -> 294217 bytes modules/rudi/images/uniform/MLula.png | Bin 311178 -> 303705 bytes modules/rudi/images/uniform/MMark.png | Bin 301887 -> 298883 bytes modules/rudi/images/uniform/PBurris.png | Bin 303770 -> 304446 bytes modules/rudi/images/uniform/PPederson.png | Bin 289002 -> 293178 bytes modules/rudi/images/uniform/PRadziwonowicz.png | Bin 0 -> 294630 bytes modules/rudi/images/uniform/RECRUIT.png | Bin 0 -> 289726 bytes modules/rudi/images/uniform/RLeahy.png | Bin 308970 -> 303280 bytes modules/rudi/images/uniform/RStewart.png | Bin 0 -> 295927 bytes modules/rudi/images/uniform/SCorsaro.png | Bin 300741 -> 296160 bytes modules/rudi/images/uniform/SDayton.png | Bin 0 -> 299134 bytes modules/rudi/images/uniform/TKleiber.png | Bin 0 -> 292763 bytes modules/rudi/images/uniform/TMichaels.png | Bin 0 -> 293742 bytes modules/rudi/images/uniform/TMoore.png | Bin 0 -> 292788 bytes modules/rudi/images/uniform/ZBarrett.png | Bin 304753 -> 310121 bytes modules/rudi/includes/common.class.php | 303 +++++++++++++++++++++-- modules/rudi/includes/information.class.php | 66 ++--- modules/rudi/includes/rudi.css | 76 ++++-- modules/rudi/index.php | 14 +- modules/rudi/views/view.awards.php | 2 +- modules/rudi/views/view.information.php | 38 +-- modules/rudi/views/view.platoon.php | 42 ++-- modules/rudi/views/view.points.php | 35 +++ modules/rudi/views/view.profile.php | 64 +++-- modules/rudi/views/view.roster.php | 82 ++++-- modules/rudi/views/view.unit.php | 42 ++-- modules/rudi/views/view.weapons.php | 70 ++++++ 97 files changed, 665 insertions(+), 185 deletions(-) create mode 100644 modules/rudi/images/medals/CIB_1st.gif create mode 100644 modules/rudi/images/medals/CIB_2nd.gif create mode 100644 modules/rudi/images/medals/CIB_3rd.gif create mode 100644 modules/rudi/images/medals/CoD2.gif create mode 100644 modules/rudi/images/medals/CoD2.jpg create mode 100644 modules/rudi/images/medals/DUC.jpg create mode 100644 modules/rudi/images/medals/SM.gif create mode 100644 modules/rudi/images/medals/SS.gif create mode 100644 modules/rudi/images/medals/afem.jpg create mode 100644 modules/rudi/images/medals/arma2duc.jpg create mode 100644 modules/rudi/images/medals/cib1.png create mode 100644 modules/rudi/images/medals/cib2.png create mode 100644 modules/rudi/images/medals/cib3.png create mode 100644 modules/rudi/images/medals/cib4.png create mode 100644 modules/rudi/images/medals/cod4unitcit.jpg create mode 100644 modules/rudi/images/medals/eib.jpg create mode 100644 modules/rudi/images/medals/eib.png create mode 100644 modules/rudi/images/medals/expert.gif create mode 100644 modules/rudi/images/medals/oak_leaf_clusters.gif create mode 100644 modules/rudi/images/medals/pass.gif create mode 100644 modules/rudi/images/medals/sniper_qual.gif create mode 100644 modules/rudi/images/medals/sniper_qual.jpg create mode 100644 modules/rudi/images/medals/success.gif create mode 100644 modules/rudi/images/medals/valor_device.gif create mode 100644 modules/rudi/images/medals/valor_device.jpg create mode 100644 modules/rudi/images/ranks/tiny/1LT.png create mode 100644 modules/rudi/images/ranks/tiny/1SG.png create mode 100644 modules/rudi/images/ranks/tiny/2LT.png create mode 100644 modules/rudi/images/ranks/tiny/CPL.png create mode 100644 modules/rudi/images/ranks/tiny/CPT.png create mode 100644 modules/rudi/images/ranks/tiny/CW2.png create mode 100644 modules/rudi/images/ranks/tiny/CW3.png create mode 100644 modules/rudi/images/ranks/tiny/CW4.png create mode 100644 modules/rudi/images/ranks/tiny/LTC.png create mode 100644 modules/rudi/images/ranks/tiny/MSG.png create mode 100644 modules/rudi/images/ranks/tiny/PFC.png create mode 100644 modules/rudi/images/ranks/tiny/PV2.png create mode 100644 modules/rudi/images/ranks/tiny/SFC.png create mode 100644 modules/rudi/images/ranks/tiny/SGT.png create mode 100644 modules/rudi/images/ranks/tiny/SPC.png create mode 100644 modules/rudi/images/ranks/tiny/SSG.png create mode 100644 modules/rudi/images/ranks/tiny/WO1.png create mode 100644 modules/rudi/images/uniform/ACourter.png create mode 100644 modules/rudi/images/uniform/ADodge.png create mode 100644 modules/rudi/images/uniform/AHernandez.png create mode 100644 modules/rudi/images/uniform/AKlassen.png create mode 100644 modules/rudi/images/uniform/ASherman.png create mode 100644 modules/rudi/images/uniform/AZanesco.png create mode 100644 modules/rudi/images/uniform/BMorgan.png create mode 100644 modules/rudi/images/uniform/BWhiting.png create mode 100644 modules/rudi/images/uniform/DKillian.png create mode 100644 modules/rudi/images/uniform/INewton.png create mode 100644 modules/rudi/images/uniform/JCiciotti.png create mode 100644 modules/rudi/images/uniform/JHiggins.jpg create mode 100644 modules/rudi/images/uniform/JHiggins.png create mode 100644 modules/rudi/images/uniform/JMagers.png create mode 100644 modules/rudi/images/uniform/JMervau.png create mode 100644 modules/rudi/images/uniform/JSchroeder.png create mode 100644 modules/rudi/images/uniform/KOlson.png create mode 100644 modules/rudi/images/uniform/MAbballe.png create mode 100644 modules/rudi/images/uniform/MCampeau.png create mode 100644 modules/rudi/images/uniform/PRadziwonowicz.png create mode 100644 modules/rudi/images/uniform/RECRUIT.png create mode 100644 modules/rudi/images/uniform/RStewart.png create mode 100644 modules/rudi/images/uniform/SDayton.png create mode 100644 modules/rudi/images/uniform/TKleiber.png create mode 100644 modules/rudi/images/uniform/TMichaels.png create mode 100644 modules/rudi/images/uniform/TMoore.png create mode 100644 modules/rudi/views/view.points.php create mode 100644 modules/rudi/views/view.weapons.php (limited to 'modules/rudi') diff --git a/modules/rudi/header.php b/modules/rudi/header.php index 47c5ffa..7ea6723 100644 --- a/modules/rudi/header.php +++ b/modules/rudi/header.php @@ -1,6 +1,10 @@ - - -RUDI - - - + +
+
+
+
+
+
+
+ +
\ No newline at end of file diff --git a/modules/rudi/images/medals/CIB_1st.gif b/modules/rudi/images/medals/CIB_1st.gif new file mode 100644 index 0000000..eb218ec Binary files /dev/null and b/modules/rudi/images/medals/CIB_1st.gif differ diff --git a/modules/rudi/images/medals/CIB_2nd.gif b/modules/rudi/images/medals/CIB_2nd.gif new file mode 100644 index 0000000..d4fd78e Binary files /dev/null and b/modules/rudi/images/medals/CIB_2nd.gif differ diff --git a/modules/rudi/images/medals/CIB_3rd.gif b/modules/rudi/images/medals/CIB_3rd.gif new file mode 100644 index 0000000..2ddf96a Binary files /dev/null and b/modules/rudi/images/medals/CIB_3rd.gif differ diff --git a/modules/rudi/images/medals/CoD2.gif b/modules/rudi/images/medals/CoD2.gif new file mode 100644 index 0000000..8e936a0 Binary files /dev/null and b/modules/rudi/images/medals/CoD2.gif differ diff --git a/modules/rudi/images/medals/CoD2.jpg b/modules/rudi/images/medals/CoD2.jpg new file mode 100644 index 0000000..099ca27 Binary files /dev/null and b/modules/rudi/images/medals/CoD2.jpg differ diff --git a/modules/rudi/images/medals/DUC.jpg b/modules/rudi/images/medals/DUC.jpg new file mode 100644 index 0000000..566f81b Binary files /dev/null and b/modules/rudi/images/medals/DUC.jpg differ diff --git a/modules/rudi/images/medals/SM.gif b/modules/rudi/images/medals/SM.gif new file mode 100644 index 0000000..ac59604 Binary files /dev/null and b/modules/rudi/images/medals/SM.gif differ diff --git a/modules/rudi/images/medals/SS.gif b/modules/rudi/images/medals/SS.gif new file mode 100644 index 0000000..a488adc Binary files /dev/null and b/modules/rudi/images/medals/SS.gif differ diff --git a/modules/rudi/images/medals/afem.jpg b/modules/rudi/images/medals/afem.jpg new file mode 100644 index 0000000..6b0324c Binary files /dev/null and b/modules/rudi/images/medals/afem.jpg differ diff --git a/modules/rudi/images/medals/arma2duc.jpg b/modules/rudi/images/medals/arma2duc.jpg new file mode 100644 index 0000000..bf4bfcc Binary files /dev/null and b/modules/rudi/images/medals/arma2duc.jpg differ diff --git a/modules/rudi/images/medals/cib1.png b/modules/rudi/images/medals/cib1.png new file mode 100644 index 0000000..d96bf80 Binary files /dev/null and b/modules/rudi/images/medals/cib1.png differ diff --git a/modules/rudi/images/medals/cib2.png b/modules/rudi/images/medals/cib2.png new file mode 100644 index 0000000..ba6f8dd Binary files /dev/null and b/modules/rudi/images/medals/cib2.png differ diff --git a/modules/rudi/images/medals/cib3.png b/modules/rudi/images/medals/cib3.png new file mode 100644 index 0000000..abc2215 Binary files /dev/null and b/modules/rudi/images/medals/cib3.png differ diff --git a/modules/rudi/images/medals/cib4.png b/modules/rudi/images/medals/cib4.png new file mode 100644 index 0000000..d511343 Binary files /dev/null and b/modules/rudi/images/medals/cib4.png differ diff --git a/modules/rudi/images/medals/cod4unitcit.jpg b/modules/rudi/images/medals/cod4unitcit.jpg new file mode 100644 index 0000000..aad4498 Binary files /dev/null and b/modules/rudi/images/medals/cod4unitcit.jpg differ diff --git a/modules/rudi/images/medals/dsm.jpg b/modules/rudi/images/medals/dsm.jpg index b90e927..7cf0978 100644 Binary files a/modules/rudi/images/medals/dsm.jpg and b/modules/rudi/images/medals/dsm.jpg differ diff --git a/modules/rudi/images/medals/eib.jpg b/modules/rudi/images/medals/eib.jpg new file mode 100644 index 0000000..e8b5f59 Binary files /dev/null and b/modules/rudi/images/medals/eib.jpg differ diff --git a/modules/rudi/images/medals/eib.png b/modules/rudi/images/medals/eib.png new file mode 100644 index 0000000..909f057 Binary files /dev/null and b/modules/rudi/images/medals/eib.png differ diff --git a/modules/rudi/images/medals/expert.gif b/modules/rudi/images/medals/expert.gif new file mode 100644 index 0000000..b00bc76 Binary files /dev/null and b/modules/rudi/images/medals/expert.gif differ diff --git a/modules/rudi/images/medals/oak_leaf_clusters.gif b/modules/rudi/images/medals/oak_leaf_clusters.gif new file mode 100644 index 0000000..376ef8c Binary files /dev/null and b/modules/rudi/images/medals/oak_leaf_clusters.gif differ diff --git a/modules/rudi/images/medals/pass.gif b/modules/rudi/images/medals/pass.gif new file mode 100644 index 0000000..58d305f Binary files /dev/null and b/modules/rudi/images/medals/pass.gif differ diff --git a/modules/rudi/images/medals/sniper_qual.gif b/modules/rudi/images/medals/sniper_qual.gif new file mode 100644 index 0000000..9d51310 Binary files /dev/null and b/modules/rudi/images/medals/sniper_qual.gif differ diff --git a/modules/rudi/images/medals/sniper_qual.jpg b/modules/rudi/images/medals/sniper_qual.jpg new file mode 100644 index 0000000..1e19720 Binary files /dev/null and b/modules/rudi/images/medals/sniper_qual.jpg differ diff --git a/modules/rudi/images/medals/success.gif b/modules/rudi/images/medals/success.gif new file mode 100644 index 0000000..d3fca80 Binary files /dev/null and b/modules/rudi/images/medals/success.gif differ diff --git a/modules/rudi/images/medals/valor_device.gif b/modules/rudi/images/medals/valor_device.gif new file mode 100644 index 0000000..3a68d96 Binary files /dev/null and b/modules/rudi/images/medals/valor_device.gif differ diff --git a/modules/rudi/images/medals/valor_device.jpg b/modules/rudi/images/medals/valor_device.jpg new file mode 100644 index 0000000..facff6f Binary files /dev/null and b/modules/rudi/images/medals/valor_device.jpg differ diff --git a/modules/rudi/images/ranks/tiny/1LT.png b/modules/rudi/images/ranks/tiny/1LT.png new file mode 100644 index 0000000..83b6ab1 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/1LT.png differ diff --git a/modules/rudi/images/ranks/tiny/1SG.png b/modules/rudi/images/ranks/tiny/1SG.png new file mode 100644 index 0000000..4d9e872 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/1SG.png differ diff --git a/modules/rudi/images/ranks/tiny/2LT.png b/modules/rudi/images/ranks/tiny/2LT.png new file mode 100644 index 0000000..00df3a7 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/2LT.png differ diff --git a/modules/rudi/images/ranks/tiny/CPL.png b/modules/rudi/images/ranks/tiny/CPL.png new file mode 100644 index 0000000..b9dd559 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/CPL.png differ diff --git a/modules/rudi/images/ranks/tiny/CPT.png b/modules/rudi/images/ranks/tiny/CPT.png new file mode 100644 index 0000000..2c83daf Binary files /dev/null and b/modules/rudi/images/ranks/tiny/CPT.png differ diff --git a/modules/rudi/images/ranks/tiny/CW2.png b/modules/rudi/images/ranks/tiny/CW2.png new file mode 100644 index 0000000..43367ae Binary files /dev/null and b/modules/rudi/images/ranks/tiny/CW2.png differ diff --git a/modules/rudi/images/ranks/tiny/CW3.png b/modules/rudi/images/ranks/tiny/CW3.png new file mode 100644 index 0000000..7ec90e4 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/CW3.png differ diff --git a/modules/rudi/images/ranks/tiny/CW4.png b/modules/rudi/images/ranks/tiny/CW4.png new file mode 100644 index 0000000..91db1a3 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/CW4.png differ diff --git a/modules/rudi/images/ranks/tiny/LTC.png b/modules/rudi/images/ranks/tiny/LTC.png new file mode 100644 index 0000000..5a82ff1 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/LTC.png differ diff --git a/modules/rudi/images/ranks/tiny/MSG.png b/modules/rudi/images/ranks/tiny/MSG.png new file mode 100644 index 0000000..d045260 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/MSG.png differ diff --git a/modules/rudi/images/ranks/tiny/PFC.png b/modules/rudi/images/ranks/tiny/PFC.png new file mode 100644 index 0000000..cf7e41b Binary files /dev/null and b/modules/rudi/images/ranks/tiny/PFC.png differ diff --git a/modules/rudi/images/ranks/tiny/PV2.png b/modules/rudi/images/ranks/tiny/PV2.png new file mode 100644 index 0000000..6e2fa3c Binary files /dev/null and b/modules/rudi/images/ranks/tiny/PV2.png differ diff --git a/modules/rudi/images/ranks/tiny/SFC.png b/modules/rudi/images/ranks/tiny/SFC.png new file mode 100644 index 0000000..ec74e80 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/SFC.png differ diff --git a/modules/rudi/images/ranks/tiny/SGT.png b/modules/rudi/images/ranks/tiny/SGT.png new file mode 100644 index 0000000..fe5e441 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/SGT.png differ diff --git a/modules/rudi/images/ranks/tiny/SPC.png b/modules/rudi/images/ranks/tiny/SPC.png new file mode 100644 index 0000000..1d991f3 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/SPC.png differ diff --git a/modules/rudi/images/ranks/tiny/SSG.png b/modules/rudi/images/ranks/tiny/SSG.png new file mode 100644 index 0000000..956951e Binary files /dev/null and b/modules/rudi/images/ranks/tiny/SSG.png differ diff --git a/modules/rudi/images/ranks/tiny/WO1.png b/modules/rudi/images/ranks/tiny/WO1.png new file mode 100644 index 0000000..eb6f347 Binary files /dev/null and b/modules/rudi/images/ranks/tiny/WO1.png differ diff --git a/modules/rudi/images/uniform/ACoia.png b/modules/rudi/images/uniform/ACoia.png index 0e70357..e22cdd2 100644 Binary files a/modules/rudi/images/uniform/ACoia.png and b/modules/rudi/images/uniform/ACoia.png differ diff --git a/modules/rudi/images/uniform/ACourter.png b/modules/rudi/images/uniform/ACourter.png new file mode 100644 index 0000000..c422930 Binary files /dev/null and b/modules/rudi/images/uniform/ACourter.png differ diff --git a/modules/rudi/images/uniform/ADodge.png b/modules/rudi/images/uniform/ADodge.png new file mode 100644 index 0000000..77c9526 Binary files /dev/null and b/modules/rudi/images/uniform/ADodge.png differ diff --git a/modules/rudi/images/uniform/AHernandez.png b/modules/rudi/images/uniform/AHernandez.png new file mode 100644 index 0000000..c118b76 Binary files /dev/null and b/modules/rudi/images/uniform/AHernandez.png differ diff --git a/modules/rudi/images/uniform/AKlassen.png b/modules/rudi/images/uniform/AKlassen.png new file mode 100644 index 0000000..7051ae2 Binary files /dev/null and b/modules/rudi/images/uniform/AKlassen.png differ diff --git a/modules/rudi/images/uniform/ASherman.png b/modules/rudi/images/uniform/ASherman.png new file mode 100644 index 0000000..57facd0 Binary files /dev/null and b/modules/rudi/images/uniform/ASherman.png differ diff --git a/modules/rudi/images/uniform/AZanesco.png b/modules/rudi/images/uniform/AZanesco.png new file mode 100644 index 0000000..e38c659 Binary files /dev/null and b/modules/rudi/images/uniform/AZanesco.png differ diff --git a/modules/rudi/images/uniform/BMorgan.png b/modules/rudi/images/uniform/BMorgan.png new file mode 100644 index 0000000..010bac0 Binary files /dev/null and b/modules/rudi/images/uniform/BMorgan.png differ diff --git a/modules/rudi/images/uniform/BSegal.png b/modules/rudi/images/uniform/BSegal.png index 1c9c0f2..0428ed2 100644 Binary files a/modules/rudi/images/uniform/BSegal.png and b/modules/rudi/images/uniform/BSegal.png differ diff --git a/modules/rudi/images/uniform/BWhiting.png b/modules/rudi/images/uniform/BWhiting.png new file mode 100644 index 0000000..f9e754e Binary files /dev/null and b/modules/rudi/images/uniform/BWhiting.png differ diff --git a/modules/rudi/images/uniform/DHolson.png b/modules/rudi/images/uniform/DHolson.png index b372cf5..91b5e9e 100644 Binary files a/modules/rudi/images/uniform/DHolson.png and b/modules/rudi/images/uniform/DHolson.png differ diff --git a/modules/rudi/images/uniform/DKillian.png b/modules/rudi/images/uniform/DKillian.png new file mode 100644 index 0000000..eb6cb67 Binary files /dev/null and b/modules/rudi/images/uniform/DKillian.png differ diff --git a/modules/rudi/images/uniform/EOConnell.png b/modules/rudi/images/uniform/EOConnell.png index 9e46bfd..f9fd55d 100644 Binary files a/modules/rudi/images/uniform/EOConnell.png and b/modules/rudi/images/uniform/EOConnell.png differ diff --git a/modules/rudi/images/uniform/GTownsend.png b/modules/rudi/images/uniform/GTownsend.png index 6d6f314..b3e6c0b 100644 Binary files a/modules/rudi/images/uniform/GTownsend.png and b/modules/rudi/images/uniform/GTownsend.png differ diff --git a/modules/rudi/images/uniform/INewton.png b/modules/rudi/images/uniform/INewton.png new file mode 100644 index 0000000..02aa620 Binary files /dev/null and b/modules/rudi/images/uniform/INewton.png differ diff --git a/modules/rudi/images/uniform/JCiciotti.png b/modules/rudi/images/uniform/JCiciotti.png new file mode 100644 index 0000000..29b5722 Binary files /dev/null and b/modules/rudi/images/uniform/JCiciotti.png differ diff --git a/modules/rudi/images/uniform/JHiggins.jpg b/modules/rudi/images/uniform/JHiggins.jpg new file mode 100644 index 0000000..122bd3c Binary files /dev/null and b/modules/rudi/images/uniform/JHiggins.jpg differ diff --git a/modules/rudi/images/uniform/JHiggins.png b/modules/rudi/images/uniform/JHiggins.png new file mode 100644 index 0000000..c468434 Binary files /dev/null and b/modules/rudi/images/uniform/JHiggins.png differ diff --git a/modules/rudi/images/uniform/JMagers.png b/modules/rudi/images/uniform/JMagers.png new file mode 100644 index 0000000..aaeeb0e Binary files /dev/null and b/modules/rudi/images/uniform/JMagers.png differ diff --git a/modules/rudi/images/uniform/JMelnyk.png b/modules/rudi/images/uniform/JMelnyk.png index 111291c..8f7178f 100644 Binary files a/modules/rudi/images/uniform/JMelnyk.png and b/modules/rudi/images/uniform/JMelnyk.png differ diff --git a/modules/rudi/images/uniform/JMervau.png b/modules/rudi/images/uniform/JMervau.png new file mode 100644 index 0000000..d7d80bc Binary files /dev/null and b/modules/rudi/images/uniform/JMervau.png differ diff --git a/modules/rudi/images/uniform/JSchroeder.png b/modules/rudi/images/uniform/JSchroeder.png new file mode 100644 index 0000000..7556027 Binary files /dev/null and b/modules/rudi/images/uniform/JSchroeder.png differ diff --git a/modules/rudi/images/uniform/KGrimes.png b/modules/rudi/images/uniform/KGrimes.png index db03b87..35aa4cb 100644 Binary files a/modules/rudi/images/uniform/KGrimes.png and b/modules/rudi/images/uniform/KGrimes.png differ diff --git a/modules/rudi/images/uniform/KOlson.png b/modules/rudi/images/uniform/KOlson.png new file mode 100644 index 0000000..89e7f00 Binary files /dev/null and b/modules/rudi/images/uniform/KOlson.png differ diff --git a/modules/rudi/images/uniform/LTrimble.png b/modules/rudi/images/uniform/LTrimble.png index 3d8f2b6..3ec56da 100644 Binary files a/modules/rudi/images/uniform/LTrimble.png and b/modules/rudi/images/uniform/LTrimble.png differ diff --git a/modules/rudi/images/uniform/MAbballe.png b/modules/rudi/images/uniform/MAbballe.png new file mode 100644 index 0000000..596d551 Binary files /dev/null and b/modules/rudi/images/uniform/MAbballe.png differ diff --git a/modules/rudi/images/uniform/MCampeau.png b/modules/rudi/images/uniform/MCampeau.png new file mode 100644 index 0000000..c5711b7 Binary files /dev/null and b/modules/rudi/images/uniform/MCampeau.png differ diff --git a/modules/rudi/images/uniform/MLula.png b/modules/rudi/images/uniform/MLula.png index a674bc2..2b7feb0 100644 Binary files a/modules/rudi/images/uniform/MLula.png and b/modules/rudi/images/uniform/MLula.png differ diff --git a/modules/rudi/images/uniform/MMark.png b/modules/rudi/images/uniform/MMark.png index ed5ae93..063d1f8 100644 Binary files a/modules/rudi/images/uniform/MMark.png and b/modules/rudi/images/uniform/MMark.png differ diff --git a/modules/rudi/images/uniform/PBurris.png b/modules/rudi/images/uniform/PBurris.png index f64736d..c3546fd 100644 Binary files a/modules/rudi/images/uniform/PBurris.png and b/modules/rudi/images/uniform/PBurris.png differ diff --git a/modules/rudi/images/uniform/PPederson.png b/modules/rudi/images/uniform/PPederson.png index c5743f9..33b98be 100644 Binary files a/modules/rudi/images/uniform/PPederson.png and b/modules/rudi/images/uniform/PPederson.png differ diff --git a/modules/rudi/images/uniform/PRadziwonowicz.png b/modules/rudi/images/uniform/PRadziwonowicz.png new file mode 100644 index 0000000..46e60f4 Binary files /dev/null and b/modules/rudi/images/uniform/PRadziwonowicz.png differ diff --git a/modules/rudi/images/uniform/RECRUIT.png b/modules/rudi/images/uniform/RECRUIT.png new file mode 100644 index 0000000..3f9a97b Binary files /dev/null and b/modules/rudi/images/uniform/RECRUIT.png differ diff --git a/modules/rudi/images/uniform/RLeahy.png b/modules/rudi/images/uniform/RLeahy.png index 1c36abf..99d0c0d 100644 Binary files a/modules/rudi/images/uniform/RLeahy.png and b/modules/rudi/images/uniform/RLeahy.png differ diff --git a/modules/rudi/images/uniform/RStewart.png b/modules/rudi/images/uniform/RStewart.png new file mode 100644 index 0000000..a1c4e8a Binary files /dev/null and b/modules/rudi/images/uniform/RStewart.png differ diff --git a/modules/rudi/images/uniform/SCorsaro.png b/modules/rudi/images/uniform/SCorsaro.png index 1895adf..33373cf 100644 Binary files a/modules/rudi/images/uniform/SCorsaro.png and b/modules/rudi/images/uniform/SCorsaro.png differ diff --git a/modules/rudi/images/uniform/SDayton.png b/modules/rudi/images/uniform/SDayton.png new file mode 100644 index 0000000..8638b96 Binary files /dev/null and b/modules/rudi/images/uniform/SDayton.png differ diff --git a/modules/rudi/images/uniform/TKleiber.png b/modules/rudi/images/uniform/TKleiber.png new file mode 100644 index 0000000..27ed4b5 Binary files /dev/null and b/modules/rudi/images/uniform/TKleiber.png differ diff --git a/modules/rudi/images/uniform/TMichaels.png b/modules/rudi/images/uniform/TMichaels.png new file mode 100644 index 0000000..4935871 Binary files /dev/null and b/modules/rudi/images/uniform/TMichaels.png differ diff --git a/modules/rudi/images/uniform/TMoore.png b/modules/rudi/images/uniform/TMoore.png new file mode 100644 index 0000000..eceda1e Binary files /dev/null and b/modules/rudi/images/uniform/TMoore.png differ diff --git a/modules/rudi/images/uniform/ZBarrett.png b/modules/rudi/images/uniform/ZBarrett.png index c9d106b..1954d8f 100644 Binary files a/modules/rudi/images/uniform/ZBarrett.png and b/modules/rudi/images/uniform/ZBarrett.png differ diff --git a/modules/rudi/includes/common.class.php b/modules/rudi/includes/common.class.php index 2112853..0d5e63e 100644 --- a/modules/rudi/includes/common.class.php +++ b/modules/rudi/includes/common.class.php @@ -2,6 +2,7 @@ define('RUDI_PROFILE_SMALL', true); define('RUDI_PROFILE_BIG', false); +define('RUDI_ROSTER_RESERVES', 12); class Soldier { @@ -444,21 +445,61 @@ class RUDI_Common */ protected function getCombatRecord($member_id) { + $data = NULL; $query = sprintf( - "SELECT c.date, c.status, u1.name, u1.website, u.war_id " + "SELECT s.title, s.date, s.status, u1.name, u1.website, s.war_id, s.home_score, s.visit_score " ."FROM rudi_combat_record AS c " - ."RIGHT OUTER JOIN rudi_war_stats AS u ON u.visit_unit_id = c.visitor_id " - ."RIGHT OUTER JOIN rudi_war_units AS u1 ON u1.name " - ."LEFT OUTER JOIN rudi_unit_members AS m ON m.member_id = c.member_id " - ."WHERE c.member_id = %d ORDER BY c.date DESC ", + ."RIGHT OUTER JOIN rudi_war_stats AS s ON s.war_id = c.war_id " + ."RIGHT OUTER JOIN rudi_war_units AS u1 ON u1.visitor_id = s.visit_unit_id " + ."WHERE c.member_id = %d ORDER BY s.date DESC ", (int)$member_id); $result = $this->db->Query($query); + $data = $this->db->FetchObject($result,'CombatRecord'); return $data; } + + /** + * RUDI_Common::getUnitArr() + * + * @param member_id $mID + * @return an array of the member's units orders from Team - Unit with name, id, & leader + */ + function getUnitArr($mID){ + $unitArr = array(); + + $result = $this->db->Query("SELECT * FROM `rudi_unit_members` WHERE `member_id` = $mID LIMIT 1"); + $member = $this->db->FetchRow($result); + $curUnit = $member['cunit_id']; + + $i = 0; + + $subOf = $curUnit; + while($subOf != 0){ + $unitID = $subOf; + $result = $this->db->Query("SELECT * FROM `rudi_combat_units` WHERE `unit_id` = $subOf LIMIT 1"); + $data = $this->db->fetch($result); + foreach($data as $units){ + $subOf = $units['detachment']; + $leader = $units['leader_id']; + $name = $units['name']; + } + + $unitArr[$i]['unit_id'] = $unitID; + $unitArr[$i]['leader_id'] = $leader; + $unitArr[$i]['name'] = $name; + + + // echo "Unit ID: ".$unitArr[$i]['unit_id']."
Name: ".$unitArr[$i]['name']."
Leader ID: ".$unitArr[$i]['leader_id']."

"; + + $i++; + } + + return array_reverse($unitArr); + } /** * RUDI_Core::getSuperiorUnit() @@ -557,6 +598,7 @@ class RUDI_Common protected function getSuperiorTrue($id) { $superior =& $this->data[$id]->superior; //Reference only the data we need to use + $name =& $this->data[$id]->name; $leader = NULL; //Set the return value to null @@ -577,6 +619,48 @@ class RUDI_Common return $leader; } + /** + * RUDI_Core::getSuperior($unit_id) + * + * @param mixed $unit_id + * @return + */ + protected function getSuperior($id) + { + $leader = NULL; + $unit_id = $this->data[$id]->unit_id; + + $result = $this->db->Query("SELECT `leader_id`, `detachment` FROM `rudi_combat_units` WHERE `unit_id` = '$unit_id' LIMIT 1"); + $row = $this->db->FetchRow($result); + + $detachment = $row['detachment']; + $leader_id = $row['leader_id']; + if($leader_id == $id){ + $leader_id = 0; + } + while($leader_id == 0){ + if($detachment == 0){ + break; + } + $result = $this->db->Query("SELECT `leader_id`, `detachment` FROM `rudi_combat_units` WHERE `unit_id` = '$detachment' LIMIT 1"); + $row = $this->db->FetchRow($result); + $detachment = $row['detachment']; + $leader_id = $row['leader_id']; + } + + if($leader_id != 0){ + $result = $this->db->Query("SELECT CONCAT(r.shortname, ' ', m.last_name) AS name FROM rudi_unit_members AS m LEFT OUTER JOIN rudi_ranks AS r ON r.rank_id = m.rank_id WHERE m.member_id = '$leader_id' LIMIT 1"); + $row = $this->db->FetchRow($result); + + $leader->name = $row['name']; + $leader->leader_id = $leader_id; + } + + return $leader; + } + + + /** * RUDI_Core::getUnit() * @@ -667,17 +751,34 @@ class RUDI_Common * @param int $leader_id */ public function printRoster($unit_id, $leader_id){ + $num = 0; foreach($this->data as $member){ - if($member->unit_id == $unit_id && $member->status_id < 4){ -?> - + if($member->unit_id == $unit_id && $member->status_id < 3){ + decho($member); + if($num%2==0){ + echo ""; + } + else { + echo ''; + } + ?> - rank_short}.png"; ?>" alt="rank_short; ?>" /> + + rank_short}.png")){ + echo "rank_short}.png\" alt=\"{$member->rank_short}\" />"; + }else{ + //echo $member->rank_short; + } + ?> + - last_name . ', ' . $member->first_name; ?> + rank_long . ' ' . $member->first_name . ' ' . $member->last_name; ?> + role_name; ?> Roles) . ' roles attached to: ' . $member->last_name); for($role = 0; $role < count($member->Roles); ++$role) { @@ -688,9 +789,9 @@ class RUDI_Common echo $member->Roles[$role]->role_name; if($role < count($member->Roles) - 1) echo ', '; - echo ' '; + //echo ' '; } - } + } */ ?> @@ -698,10 +799,135 @@ class RUDI_Common status; ?> -data as $member){ + if($member->status_id == 3 || $member->unit_id == RUDI_ROSTER_RESERVES){ + decho($member); + + if($num == 0) + echo "Reserves"; + + if($num%2==0){ + echo ""; + } + else { + echo ''; + } + ?> + + + rank_short}.png")){ + echo "rank_short}.png\" alt=\"{$member->rank_short}\" />"; + }else{ + //echo $member->rank_short; + } + ?> + + + rank_long . ' ' . $member->first_name . ' ' . $member->last_name; ?> + + + role_name; ?> + Roles) . ' roles attached to: ' . $member->last_name); + for($role = 0; $role < count($member->Roles); ++$role) + { + if($member->Roles[$role]->role_name) + { + //decho($role . " = (" . $member->Roles[$role]->role_name . ")"); + + echo $member->Roles[$role]->role_name; + if($role < count($member->Roles) - 1) echo ', '; + + //echo ' '; + } + } */ + ?> + + + weapon_model; ?> + + status; ?> + +data); + $num=0; + foreach($this->data as $member){ + if($member->status_id >= 4){ + decho($member); +?> +"; + } + else { + echo ''; + } + ?> + + +rank_short}.png")){ + echo "rank_short}.png\" alt=\"{$member->rank_short}\" />"; + }else{ + //echo $member->rank_short; + } +?> + + + rank_long . ' ' . $member->first_name . ' ' . $member->last_name; ?> + + + role_name; ?> +Roles) . ' roles attached to: ' . $member->last_name); + for($role = 0; $role < count($member->Roles); ++$role) + { + if($member->Roles[$role]->role_name) + { + //decho($role . " = (" . $member->Roles[$role]->role_name . ")"); + + echo $member->Roles[$role]->role_name; + if($role < count($member->Roles) - 1) echo ', '; + + //echo ' '; + } + } */ +?> + + + getDiffTime($member->date_enlisted, $member->date_discharged); ?> + + status; ?> + +db->Query("SELECT * FROM `rudi_combat_units` WHERE `detachment` = '$unit_id' ORDER BY `weight`"); $row = $this->db->FetchObject($result,'UnitInfo'); foreach($row as $unit){ - echo "{$unit->name} : {$unit->callsign}"; - $this->printRoster($unit->unit_id, $unit->leader_id); + $num = 0; + $check = $this->db->Query("SELECT `member_id` FROM `rudi_unit_members` WHERE `cunit_id` = '$unit->unit_id' AND `date_discharged` IS NULL LIMIT 1"); + $num = $this->db->Rows($check); + if($num >= 1 && $unit->unit_id != RUDI_ROSTER_RESERVES){ + echo "{$unit->name} : {$unit->callsign}"; + $this->printRoster($unit->unit_id, $unit->leader_id); + } $this->displayUnitsRec($unit->unit_id); } } @@ -742,6 +973,9 @@ class RUDI_Common ."m.location_city, " ."m.location_province, " ."m.primary_mos, " + ."m.points, " + ."m.drillcount, " + ."m.attendcount, " ."r.rank_id, " ."r.image AS rank_image, " ."r.longname AS rank_long, " @@ -759,9 +993,14 @@ class RUDI_Common ."t.team_id, " ."t.name AS team_name, " ."t.leader_id AS team_leader_id, " + ."ro.role_id, " + ."ro.name AS role_name, " ."w.weapon_id, " ."w.manufacturer AS weapon_manufacturer, " ."w.model AS weapon_model, " + ."w2.weapon_id, " + ."w2.manufacturer AS weapon2_manufacturer, " + ."w2.model AS weapon2_model, " ."co.country_id, " ."co.name AS country_name, " ."co.image AS country_image, " @@ -780,7 +1019,9 @@ class RUDI_Common ."FROM rudi_unit_members AS m " ."LEFT OUTER JOIN rudi_weapons AS w ON w.weapon_id = m.weapon_id " - ."LEFT OUTER JOIN rudi_units AS u ON u.unit_id = m.unit_id " + ."LEFT OUTER JOIN rudi_weapons AS w2 ON w2.weapon_id = m.weapon2_id " + ."LEFT OUTER JOIN rudi_roles AS ro ON ro.role_id = m.role_id " + ."LEFT OUTER JOIN rudi_combat_units AS u ON u.unit_id = m.cunit_id " ."LEFT OUTER JOIN rudi_squads AS s ON s.squad_id = m.squad_id " ."LEFT OUTER JOIN rudi_teams AS t ON t.team_id = m.team_id " ."LEFT OUTER JOIN rudi_platoons AS p ON p.platoon_id = m.platoon_id " @@ -799,6 +1040,7 @@ class RUDI_Common ."m.status_id, " ."m.date_promotion, " ."m.date_enlisted, " + ."m.date_discharged, " ."m.primary_mos, " ."r.rank_id, " ."r.image AS rank_image, " @@ -816,6 +1058,8 @@ class RUDI_Common ."st.status_id, " ."t.team_id, " ."t.name AS team_name, " + ."ro.role_id, " + ."ro.name AS role_name, " ."w.weapon_id, " ."w.manufacturer AS weapon_manufacturer, " ."w.model AS weapon_model, " @@ -825,6 +1069,7 @@ class RUDI_Common ."FROM rudi_unit_members AS m " ."LEFT OUTER JOIN rudi_weapons AS w ON w.weapon_id = m.weapon_id " + ."LEFT OUTER JOIN rudi_roles AS ro ON ro.role_id = m.role_id " ."LEFT OUTER JOIN rudi_combat_units AS u ON u.unit_id = m.cunit_id " ."LEFT OUTER JOIN rudi_squads AS s ON s.squad_id = m.squad_id " ."LEFT OUTER JOIN rudi_teams AS t ON t.team_id = m.team_id " @@ -848,22 +1093,24 @@ class RUDI_Common { $count = $member->member_id; $this->data[$member->member_id] = $member; - $this->data[$count]->Roles = $this->getRoles($member->member_id,$member->rank_id); + /* $this->data[$count]->Roles = $this->getRoles($member->member_id,$member->rank_id); if(is_object($this->data[$count]->Roles)) { $this->data[$count]->Roles = array((object)$nothing); - } + } */ if($query_t != RUDI_PROFILE_SMALL) { $this->data[$count]->service_record = $this->getServiceRecord($member->member_id); $this->data[$count]->award_record = $this->getAwardRecord($member->member_id); $this->data[$count]->combat_record = $this->getCombatRecord($member->member_id); - $this->data[$count]->superior->unit = $this->getSuperiorUnit($member->unit_id); + //$this->data[$count]->superior_next = $this->getSuperiorTrue($member->member_id); + $this->data[$count]->superior = $this->getSuperior($member->member_id); + $this->data[$count]->superior->unit = $this->getSuperiorUnit($member->unit_id); $this->data[$count]->superior->platoon = $this->getSuperiorPlatoon($member->platoon_id); $this->data[$count]->superior->squad = $this->getSuperiorSquad($member->squad_id); $this->data[$count]->superior->team = $this->getSuperiorTeam($member->team_id); - $this->data[$count]->superior_next = $this->getSuperiorTrue($member->member_id); + $this->data[$count]->superior_next = $this->getSuperiorTrue($member->member_id); } $count++; } @@ -876,7 +1123,7 @@ class RUDI_Common $query = "SELECT a.award_id, a.image, a.name, a.description, a.class_id, c.name AS class_name " ."FROM rudi_awards AS a " ."LEFT OUTER JOIN rudi_award_classes AS c ON c.class_id = a.class_id " - ."ORDER BY c.class_id, a.award_id ASC"; + ."ORDER BY a.weight, c.class_id, a.award_id ASC"; $result = $this->db->Query($query); $row = $this->db->FetchObject($result,'Award'); return $row; @@ -890,6 +1137,16 @@ class RUDI_Common return $row; } + protected function getWeapons($order = "") + { + $query = "SELECT weapon_id, manufacturer, model, role, caliber FROM rudi_weapons"; + $query = $query ." ". $order; + $result = $this->db->Query($query); + $row = $this->db->Fetch($result); + return $row; + } + + protected function getRanks() { $query = "SELECT rank_id, shortname, longname, image FROM rudi_ranks WHERE active = 1 ORDER BY weight DESC"; diff --git a/modules/rudi/includes/information.class.php b/modules/rudi/includes/information.class.php index 2632675..d34c4aa 100644 --- a/modules/rudi/includes/information.class.php +++ b/modules/rudi/includes/information.class.php @@ -1,34 +1,34 @@ -db = $db; - } - - public function Unit($unit_id) - { - $query = sprintf("SELECT leader_id, name, logo, url, creed, bio - FROM rudi_units - WHERE unit_id = %d", (int)$unit_id); - $result = $this->db->Query($query); - $unit = $this->db->FetchObject($result, 'UnitInfo', true); - return $unit; - } - - public function Platoon($unit_id, $platoon_id) - { - $query = sprintf("SELECT leader_id, name, logo, creed, bio - FROM rudi_platoons - WHERE unit_id = %d AND platoon_id = %d", (int)$unit_id, (int)$platoon_id); - $result = $this->db->Query($query); - $platoon = $this->db->FetchObject($result, 'UnitInfo', true); - decho($platoon); - - return $platoon; - } -} - +db = $db; + } + + public function Unit($unit_id) + { + $query = sprintf("SELECT leader_id, name, logo, url, creed, bio + FROM rudi_units + WHERE unit_id = %d", (int)$unit_id); + $result = $this->db->Query($query); + $unit = $this->db->FetchObject($result, 'UnitInfo', true); + return $unit; + } + + public function Platoon($unit_id, $platoon_id) + { + $query = sprintf("SELECT leader_id, name, logo, creed, bio + FROM rudi_platoons + WHERE unit_id = %d AND platoon_id = %d", (int)$unit_id, (int)$platoon_id); + $result = $this->db->Query($query); + $platoon = $this->db->FetchObject($result, 'UnitInfo', true); + decho($platoon); + + return $platoon; + } +} + ?> \ No newline at end of file diff --git a/modules/rudi/includes/rudi.css b/modules/rudi/includes/rudi.css index 8c4ebf2..1eececd 100644 --- a/modules/rudi/includes/rudi.css +++ b/modules/rudi/includes/rudi.css @@ -1,25 +1,22 @@ -table.rudi { - /* background: green; */ -} /* -table{ +table.rudi{ border:1px solid #000; } -tr{ +table.rudi tr{ border:1px solid #000; } -th{ +table.rudi th{ padding:5px; border:1px solid #000; -} +} -td{ +table.rudi td{ text-align:center; padding:2px; border:1px solid #000; -} */ +}*/ table.rudi td.data{ text-align:left; @@ -36,17 +33,19 @@ table.rudi th { table.rudi td { text-align:center; vertical-align: middle; - /* border: 1px solid #a1a1a1; */ + /*border: 1px solid #a1a1a1;*/ } -table.rudi td.roster { + +/*table.rudi td.roster { text-align:center; vertical-align: middle; border: 1px solid #a1a1a1; -} + height: 40px; +}*/ table.rudi th.header { - /* table has a 5px padding so everything is 10px bigger than these values */ + /*table has a 5px padding so everything is 10px bigger than these values*/ width:100px; height:19px; color: #FFF; @@ -54,7 +53,8 @@ table.rudi th.header { border: 1px solid #666; font-family: arial, helvetica, sans-serif; font-size:12px; -} +} + table.rudi td.info { color: #333; @@ -64,8 +64,54 @@ table.rudi td.info { border: 1px solid #666; font-family: arial, helvetica, sans-serif; font-size:12px; -} +} #thin { border:1px outset #333; } + + table.rudiroster { + font-family: verdana; + font-size: 10px; + width: 850px; + text-align: center; + color: #2c2921; + /*background-color: #b0aea2;*/ + background-color: #6b675c; + } + + .rudiroster th { + background-color: #575551; + color: white; + } + .rudiroster td { + font-size: 10px; + height: 25px; + } + .rudiroster tr { + height: 25px; + /*background-color: #78756c;*/ + background-color: #d6d6d6; + } + .rudiroster tr.unfilled { + background-color: #7e7e7e; + color: #9d9d9d; + } + table.rudiroster td img { + padding:0px; + } + + tr.null { + height: 10px; + } + + .rudiroster tr.high { + /* background-color: #898577; */ + background-color: #e4e6e8; + } + + a.rosterlink, a.rosterlink:hover, a.rosterlink:visited { + font-size: 10px; + color: #2c2921; + text-decoration: none; + } \ No newline at end of file diff --git a/modules/rudi/index.php b/modules/rudi/index.php index 995c90d..4550ad7 100644 --- a/modules/rudi/index.php +++ b/modules/rudi/index.php @@ -1,11 +1,14 @@ RUDI: Realism Unit Data Interface"; @@ -66,7 +69,14 @@ class RUDI_Gateway extends RUDI_Common //$this->drills = $this->getDrills($_GET['id']); $drills = new RUDI_Drills($_GET['id']); include 'views/view.drills.php'; - break; + break; + case 'points': + $this->Update(); + include 'views/view.points.php'; + break; + case 'weapons': + include 'views/view.weapons.php'; + break; } echo ""; CloseTable(); diff --git a/modules/rudi/views/view.awards.php b/modules/rudi/views/view.awards.php index 5039e56..0a17005 100644 --- a/modules/rudi/views/view.awards.php +++ b/modules/rudi/views/view.awards.php @@ -1,4 +1,4 @@ - + images_path . "/medals/"; ?> diff --git a/modules/rudi/views/view.information.php b/modules/rudi/views/view.information.php index a62ba8a..d017564 100644 --- a/modules/rudi/views/view.information.php +++ b/modules/rudi/views/view.information.php @@ -1,20 +1,20 @@ - \ No newline at end of file diff --git a/modules/rudi/views/view.platoon.php b/modules/rudi/views/view.platoon.php index dbbb455..4ee60dc 100644 --- a/modules/rudi/views/view.platoon.php +++ b/modules/rudi/views/view.platoon.php @@ -1,22 +1,22 @@ -Platoon($unit_id, $platoon_id); ?> - - - - - - - - - - - - - - - - - - -
 <?php echo $data->logo; ?>
Platoonname; ?>
Creedcreed; ?>
Biographybio; ?>
- +Platoon($unit_id, $platoon_id); ?> + + + + + + + + + + + + + + + + + + +
 <?php echo $data->logo; ?>
Platoonname; ?>
Creedcreed; ?>
Biographybio; ?>
+ \ No newline at end of file diff --git a/modules/rudi/views/view.points.php b/modules/rudi/views/view.points.php new file mode 100644 index 0000000..bf6c2b6 --- /dev/null +++ b/modules/rudi/views/view.points.php @@ -0,0 +1,35 @@ +

Points Ticker:

+ + + + + + + + + + +data as $member){ + if($member->status_id < 4){ + if($num %2 == 0){ + echo ''; + }else{ + echo ''; + } +?> + + + + + + + + +
RankNamePointsMissed CountAttended Count
rank_short; ?>first_name." ".$member->last_name; ?>points; ?>drillcount; ?>attendcount; ?>
\ No newline at end of file diff --git a/modules/rudi/views/view.profile.php b/modules/rudi/views/view.profile.php index 6135ea4..97adead 100644 --- a/modules/rudi/views/view.profile.php +++ b/modules/rudi/views/view.profile.php @@ -1,10 +1,14 @@ data[$_GET['profile']]; -$uniform_image = $member->first_name[0].str_replace(array("'", "\""), "", $member->last_name).".png"; +$uniform_image = "modules/rudi/images/uniform/".$member->first_name[0].str_replace(array("'", "\""), "", $member->last_name).".png"; decho($member); define('BLOCK_RIGHT_DISABLE', true); + +$arrUnits = $this->getUnitArr($_GET['profile']); +decho($arrUnits); ?> + + + + + +getWeapons("ORDER BY role ASC, caliber ASC, model ASC"); ?> +
+ + + '; + } + if($num%2==0) + echo ''; + else + echo ""; + echo ""; + $role = $weapon['role']; + $num++; + } + + ?> + +
ModelCaliberRole
".$weapon['model']."".$weapon['caliber']."".$weapon['role']."
+
+ + + \ No newline at end of file -- cgit