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 --- admin/adjutant/functions.php | 14 +- admin/adjutant/style.css | 24 +- admin/admins/functions.php | 656 ++++++------- admin/admins/index.php | 108 +-- admin/announcements/functions.php | 132 +-- admin/announcements/index.php | 66 +- admin/calendar/index.php | 180 ++-- admin/calendar/style.css | 96 ++ admin/functions.php | 1124 +++++++++++----------- admin/header.php | 160 +-- admin/images/tree_blank.gif | Bin 0 -> 62 bytes admin/images/tree_branch.gif | Bin 0 -> 74 bytes admin/images/tree_leaf.gif | Bin 0 -> 72 bytes admin/index.php | 20 +- admin/modules/functions.php | 211 +--- admin/modules/index.php | 118 +-- admin/navigation/functions.php | 180 ++-- admin/navigation/index.php | 106 +- admin/news/functions.php | 96 +- admin/news/index.php | 2 + admin/newsreel/functions.php | 318 +++--- admin/newsreel/index.php | 92 +- admin/newsreel/updateDB.php | 87 +- admin/rudi/functions.php | 140 +-- admin/rudi/includes/functions.awards.php | 38 +- admin/rudi/includes/functions.battles.php | 70 ++ admin/rudi/includes/functions.members.php | 48 +- admin/rudi/includes/functions.units.php | 33 + admin/rudi/index.php | 120 +-- admin/rudi/views/view.awards.add.php | 27 + admin/rudi/views/view.awards.delete.php | 29 + admin/rudi/views/view.awards.edit.php | 54 +- admin/rudi/views/view.awards.php | 78 +- admin/rudi/views/view.battles.list.php | 18 + admin/rudi/views/view.battles.php | 36 + admin/rudi/views/view.members.award.php | 39 +- admin/rudi/views/view.members.new.php | 179 ++++ admin/rudi/views/view.members.php | 20 +- admin/rudi/views/view.members.profile.php | 50 +- admin/rudi/views/view.units.php | 51 +- admin/scripts/mocha.js | 312 +++--- admin/settings/functions.php | 152 +-- admin/settings/index.php | 104 +- admin/settings/style.css | 126 +-- admin/style.css | 4 + include/classes.php | 474 ++++----- include/functions.php | 15 +- include/sql.class.php | 6 + index.php | 36 +- modules/admin/admin_functions.php | 302 +++--- modules/admin/blocks/functions.php | 346 +++---- modules/admin/blocks/index.php | 116 +-- modules/admin/index.php | 144 +-- modules/admin/operation.php | 104 +- modules/admin/pages/functions.php | 454 ++++----- modules/admin/pages/index.php | 136 +-- modules/cu3er/config.xml | 86 ++ modules/cu3er/config2.xml | 80 ++ modules/cu3er/cu3er.swf | Bin 0 -> 127487 bytes modules/cu3er/cuber.html | 25 + modules/cu3er/demo.htm | 35 + modules/cu3er/images/agwc3.png | Bin 0 -> 125318 bytes modules/cu3er/images/arma2.png | Bin 0 -> 390955 bytes modules/cu3er/images/arma2move.png | Bin 0 -> 409863 bytes modules/cu3er/images/holidays.png | Bin 0 -> 476292 bytes modules/cu3er/images/newsite.png | Bin 0 -> 251441 bytes modules/cu3er/images/recruitmentGT.png | Bin 0 -> 277092 bytes modules/cu3er/images/slide_1.jpg | Bin 0 -> 7729 bytes modules/cu3er/images/slide_2.jpg | Bin 0 -> 7374 bytes modules/cu3er/images/slide_3.jpg | Bin 0 -> 8544 bytes modules/cu3er/images/slide_4.jpg | Bin 0 -> 7930 bytes modules/cu3er/images/slide_5.jpg | Bin 0 -> 6966 bytes modules/cu3er/images/team.png | Bin 0 -> 369306 bytes modules/cu3er/images/team2.png | Bin 0 -> 370251 bytes modules/cu3er/images/teamwork.png | Bin 0 -> 83906 bytes modules/cu3er/index.php | 35 + modules/cu3er/js/swfobject/expressInstall.swf | Bin 0 -> 732 bytes modules/cu3er/js/swfobject/swfobject.js | 777 +++++++++++++++ modules/cu3er/license.txt | 53 + modules/download/files/MILPACS_RC1_b.zip | Bin 0 -> 703837 bytes modules/download/files/MarneMessenger_1-1.pdf | Bin 0 -> 956575 bytes modules/download/files/MarneMessenger_1-2.pdf | Bin 0 -> 1608153 bytes modules/download/files/MarneMessenger_2-1.pdf | Bin 0 -> 568232 bytes modules/download/files/MarneMessenger_2-2.pdf | Bin 0 -> 5640610 bytes modules/download/files/Milpacs_RC2.zip | Bin 0 -> 781652 bytes modules/download/index.php | 268 +++--- modules/index/index.php | 2 +- modules/news/functions.php | 23 +- modules/news/index.php | 28 +- modules/newsreel/index.php | 9 +- modules/newsreel/slides/agwc3.png | Bin 0 -> 125318 bytes modules/newsreel/slides/arma2.png | Bin 0 -> 390955 bytes modules/newsreel/slides/decade.png | Bin 0 -> 218935 bytes modules/newsreel/slides/drilltimes.png | Bin 0 -> 297915 bytes modules/newsreel/slides/holidays.png | Bin 0 -> 476292 bytes modules/newsreel/slides/joinus.png | Bin 0 -> 376759 bytes modules/newsreel/slides/leadership.png | Bin 0 -> 545745 bytes modules/newsreel/slides/team.png | Bin 0 -> 369306 bytes modules/newsreel/slides/team2.png | Bin 0 -> 370251 bytes modules/page/index.php | 1 + 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 ++ themes/default/images/add.gif | Bin 0 -> 59 bytes themes/default/images/addnewarticle.png | Bin 0 -> 6420 bytes themes/default/images/addnewpage.png | Bin 0 -> 7511 bytes themes/default/images/annoucement.png | Bin 0 -> 9409 bytes themes/default/images/announcement.png | Bin 0 -> 9409 bytes themes/default/images/arrowleft.png | Bin 0 -> 2861 bytes themes/default/images/arrowright.png | Bin 0 -> 2867 bytes themes/default/images/bayonetLogo.png | Bin 0 -> 15516 bytes themes/default/images/blockbackground.jpg | Bin 0 -> 12055 bytes themes/default/images/calendar.png | Bin 0 -> 10174 bytes themes/default/images/delete.gif | Bin 0 -> 60 bytes themes/default/images/dicon.png | Bin 0 -> 3431 bytes themes/default/images/dlaxlogo.png | Bin 0 -> 34718 bytes themes/default/images/editfiles.png | Bin 0 -> 7336 bytes themes/default/images/editpage.png | Bin 0 -> 7775 bytes themes/default/images/error.gif | Bin 0 -> 1083 bytes themes/default/images/error.png | Bin 0 -> 3746 bytes themes/default/images/file_doc.png | Bin 0 -> 6993 bytes themes/default/images/file_pdf.png | Bin 0 -> 7336 bytes themes/default/images/file_rtf.png | Bin 0 -> 6958 bytes themes/default/images/file_word.png | Bin 0 -> 9196 bytes themes/default/images/hgrad.png | Bin 0 -> 109 bytes themes/default/images/larrow.png | Bin 0 -> 3596 bytes themes/default/images/leftshadow.png | Bin 0 -> 3146 bytes themes/default/images/limericklax.png | Bin 0 -> 5497 bytes themes/default/images/logo.jpg | Bin 0 -> 83085 bytes themes/default/images/lvgrad.png | Bin 0 -> 627 bytes themes/default/images/navbackground.jpg | Bin 0 -> 11901 bytes themes/default/images/navbg.png | Bin 0 -> 2880 bytes themes/default/images/navigation.png | Bin 0 -> 11330 bytes themes/default/images/navspacer.png | Bin 0 -> 2810 bytes themes/default/images/news_header.png | Bin 0 -> 3558 bytes themes/default/images/nvgrad.png | Bin 0 -> 860 bytes themes/default/images/photogallery.png | Bin 0 -> 9687 bytes themes/default/images/photoleft.png | Bin 0 -> 2917 bytes themes/default/images/photoright.png | Bin 0 -> 2918 bytes themes/default/images/rarrow.png | Bin 0 -> 3581 bytes themes/default/images/rightshadow.png | Bin 0 -> 3155 bytes themes/default/images/sandbackground.jpg | Bin 0 -> 523597 bytes themes/default/images/spacer.png | Bin 0 -> 2904 bytes themes/default/images/vgrad.png | Bin 0 -> 110 bytes themes/default/images/view.gif | Bin 0 -> 61 bytes themes/default/images/xoma_logo.jpg | Bin 0 -> 33996 bytes themes/default/include/functions.php | 40 + themes/default/include/style_bbcode.css | 142 +-- themes/gttheme/footer.php | 64 ++ themes/gttheme/header.php | 40 + themes/gttheme/images/Medal.png | Bin 0 -> 38627 bytes themes/gttheme/images/add.gif | Bin 0 -> 59 bytes themes/gttheme/images/addnewarticle.png | Bin 0 -> 6420 bytes themes/gttheme/images/addnewpage.png | Bin 0 -> 7511 bytes themes/gttheme/images/annoucement.png | Bin 0 -> 9409 bytes themes/gttheme/images/announcement.png | Bin 0 -> 9409 bytes themes/gttheme/images/arrowleft.png | Bin 0 -> 2861 bytes themes/gttheme/images/arrowright.png | Bin 0 -> 2867 bytes themes/gttheme/images/background.jpg | Bin 0 -> 1874170 bytes themes/gttheme/images/banner.jpg | Bin 0 -> 128273 bytes themes/gttheme/images/bayonetLogo.png | Bin 0 -> 15516 bytes themes/gttheme/images/blockbackground.jpg | Bin 0 -> 12055 bytes themes/gttheme/images/calendar.png | Bin 0 -> 10174 bytes themes/gttheme/images/delete.gif | Bin 0 -> 60 bytes themes/gttheme/images/editfiles.png | Bin 0 -> 7336 bytes themes/gttheme/images/editpage.png | Bin 0 -> 7775 bytes themes/gttheme/images/error.gif | Bin 0 -> 1083 bytes themes/gttheme/images/error.png | Bin 0 -> 3746 bytes themes/gttheme/images/file_doc.png | Bin 0 -> 6993 bytes themes/gttheme/images/file_pdf.png | Bin 0 -> 7336 bytes themes/gttheme/images/file_rtf.png | Bin 0 -> 6958 bytes themes/gttheme/images/file_word.png | Bin 0 -> 9196 bytes themes/gttheme/images/headingbg.jpg | Bin 0 -> 37929 bytes themes/gttheme/images/hgrad.png | Bin 0 -> 109 bytes themes/gttheme/images/larrow.png | Bin 0 -> 3596 bytes themes/gttheme/images/leftshadow.png | Bin 0 -> 3146 bytes themes/gttheme/images/logo.jpg | Bin 0 -> 132072 bytes themes/gttheme/images/lvgrad.png | Bin 0 -> 627 bytes themes/gttheme/images/navbackground.jpg | Bin 0 -> 11901 bytes themes/gttheme/images/navbg.jpg | Bin 0 -> 54131 bytes themes/gttheme/images/navbg.png | Bin 0 -> 2880 bytes themes/gttheme/images/navigation.png | Bin 0 -> 11330 bytes themes/gttheme/images/navspacer.png | Bin 0 -> 2810 bytes themes/gttheme/images/news_header.png | Bin 0 -> 3558 bytes themes/gttheme/images/nvgrad.png | Bin 0 -> 860 bytes themes/gttheme/images/photogallery.png | Bin 0 -> 9687 bytes themes/gttheme/images/photoleft.png | Bin 0 -> 2917 bytes themes/gttheme/images/photoright.png | Bin 0 -> 2918 bytes themes/gttheme/images/rarrow.png | Bin 0 -> 3581 bytes themes/gttheme/images/rightshadow.png | Bin 0 -> 3155 bytes themes/gttheme/images/sandbackground.jpg | Bin 0 -> 523597 bytes themes/gttheme/images/spacer.png | Bin 0 -> 2904 bytes themes/gttheme/images/vgrad.png | Bin 0 -> 110 bytes themes/gttheme/images/view.gif | Bin 0 -> 61 bytes themes/gttheme/include/functions.php | 40 + themes/gttheme/include/primary.css | 286 ++++++ themes/gttheme/include/style_bbcode.css | 71 ++ themes/gttheme/include/theme.ini | 2 + themes/gttheme/index.php | 61 ++ themes/gttheme/navigation.php | 24 + themes/new/footer.php | 57 ++ themes/new/header.php | 55 ++ themes/new/images/active_nav_bg.jpg | Bin 0 -> 546 bytes themes/new/images/btn_collapse.gif | Bin 0 -> 2946 bytes themes/new/images/content_tile.jpg | Bin 0 -> 668 bytes themes/new/images/footer_tile.jpg | Bin 0 -> 673 bytes themes/new/images/footerwidget_bg.jpg | Bin 0 -> 551 bytes themes/new/images/footerwidget_border.jpg | Bin 0 -> 511 bytes themes/new/images/header_tile.png | Bin 0 -> 222 bytes themes/new/images/header_tile_ie6.gif | Bin 0 -> 808 bytes themes/new/images/logo-trans.png | Bin 0 -> 30008 bytes themes/new/images/nav_a.gif | Bin 0 -> 860 bytes themes/new/images/search_btn.jpg | Bin 0 -> 1135 bytes themes/new/images/w (1).png | Bin 0 -> 25506 bytes themes/new/images/w.png | Bin 0 -> 5520 bytes themes/new/images/widget_bg.jpg | Bin 0 -> 543 bytes themes/new/include/functions.php | 34 + themes/new/include/primary.css | 115 +++ themes/new/include/style_bbcode.css | 71 ++ themes/new/include/theme.ini | 2 + themes/new/index.php | 84 ++ themes/new/navigation.php | 22 + themes/throwback/footer.php | 64 ++ themes/throwback/header.php | 40 + themes/throwback/images/Medal.png | Bin 0 -> 38627 bytes themes/throwback/images/acu_bg.jpg | Bin 0 -> 357576 bytes themes/throwback/images/add.gif | Bin 0 -> 59 bytes themes/throwback/images/arrowleft.png | Bin 0 -> 2861 bytes themes/throwback/images/arrowright.png | Bin 0 -> 2867 bytes themes/throwback/images/background.jpg | Bin 0 -> 1874170 bytes themes/throwback/images/banner.jpg | Bin 0 -> 86710 bytes themes/throwback/images/blockbackground.jpg | Bin 0 -> 12055 bytes themes/throwback/images/contentbg.png | Bin 0 -> 2943 bytes themes/throwback/images/delete.gif | Bin 0 -> 60 bytes themes/throwback/images/error.gif | Bin 0 -> 1083 bytes themes/throwback/images/error.png | Bin 0 -> 3746 bytes themes/throwback/images/headingbg.jpg | Bin 0 -> 11792 bytes themes/throwback/images/hgrad.png | Bin 0 -> 109 bytes themes/throwback/images/larrow.png | Bin 0 -> 3596 bytes themes/throwback/images/leftshadow.png | Bin 0 -> 3146 bytes themes/throwback/images/logo.jpg | Bin 0 -> 132072 bytes themes/throwback/images/lvgrad.png | Bin 0 -> 627 bytes themes/throwback/images/navbackground.jpg | Bin 0 -> 11901 bytes themes/throwback/images/navbg.jpg | Bin 0 -> 12070 bytes themes/throwback/images/navspacer.jpg | Bin 0 -> 10650 bytes themes/throwback/images/navspacer.png | Bin 0 -> 2841 bytes themes/throwback/images/news_header.png | Bin 0 -> 3558 bytes themes/throwback/images/nvgrad.png | Bin 0 -> 860 bytes themes/throwback/images/photoleft.png | Bin 0 -> 2917 bytes themes/throwback/images/photoright.png | Bin 0 -> 2918 bytes themes/throwback/images/rightshadow.png | Bin 0 -> 3155 bytes themes/throwback/images/sandbackground.jpg | Bin 0 -> 523597 bytes themes/throwback/images/spacer.png | Bin 0 -> 2904 bytes themes/throwback/images/vgrad.png | Bin 0 -> 110 bytes themes/throwback/images/view.gif | Bin 0 -> 61 bytes themes/throwback/include/functions.php | 38 + themes/throwback/include/primary.css | 278 ++++++ themes/throwback/include/style_bbcode.css | 71 ++ themes/throwback/include/theme.ini | 2 + themes/throwback/index.php | 61 ++ themes/throwback/navigation.php | 21 + 355 files changed, 7758 insertions(+), 3950 deletions(-) create mode 100644 admin/calendar/style.css create mode 100644 admin/images/tree_blank.gif create mode 100644 admin/images/tree_branch.gif create mode 100644 admin/images/tree_leaf.gif create mode 100644 admin/rudi/includes/functions.battles.php create mode 100644 admin/rudi/includes/functions.units.php create mode 100644 admin/rudi/views/view.awards.add.php create mode 100644 admin/rudi/views/view.awards.delete.php create mode 100644 admin/rudi/views/view.battles.list.php create mode 100644 admin/rudi/views/view.battles.php create mode 100644 admin/rudi/views/view.members.new.php create mode 100644 modules/cu3er/config.xml create mode 100644 modules/cu3er/config2.xml create mode 100644 modules/cu3er/cu3er.swf create mode 100644 modules/cu3er/cuber.html create mode 100644 modules/cu3er/demo.htm create mode 100644 modules/cu3er/images/agwc3.png create mode 100644 modules/cu3er/images/arma2.png create mode 100644 modules/cu3er/images/arma2move.png create mode 100644 modules/cu3er/images/holidays.png create mode 100644 modules/cu3er/images/newsite.png create mode 100644 modules/cu3er/images/recruitmentGT.png create mode 100644 modules/cu3er/images/slide_1.jpg create mode 100644 modules/cu3er/images/slide_2.jpg create mode 100644 modules/cu3er/images/slide_3.jpg create mode 100644 modules/cu3er/images/slide_4.jpg create mode 100644 modules/cu3er/images/slide_5.jpg create mode 100644 modules/cu3er/images/team.png create mode 100644 modules/cu3er/images/team2.png create mode 100644 modules/cu3er/images/teamwork.png create mode 100644 modules/cu3er/index.php create mode 100644 modules/cu3er/js/swfobject/expressInstall.swf create mode 100644 modules/cu3er/js/swfobject/swfobject.js create mode 100644 modules/cu3er/license.txt create mode 100644 modules/download/files/MILPACS_RC1_b.zip create mode 100644 modules/download/files/MarneMessenger_1-1.pdf create mode 100644 modules/download/files/MarneMessenger_1-2.pdf create mode 100644 modules/download/files/MarneMessenger_2-1.pdf create mode 100644 modules/download/files/MarneMessenger_2-2.pdf create mode 100644 modules/download/files/Milpacs_RC2.zip create mode 100644 modules/newsreel/slides/agwc3.png create mode 100644 modules/newsreel/slides/arma2.png create mode 100644 modules/newsreel/slides/decade.png create mode 100644 modules/newsreel/slides/drilltimes.png create mode 100644 modules/newsreel/slides/holidays.png create mode 100644 modules/newsreel/slides/joinus.png create mode 100644 modules/newsreel/slides/leadership.png create mode 100644 modules/newsreel/slides/team.png create mode 100644 modules/newsreel/slides/team2.png 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 create mode 100644 themes/default/images/add.gif create mode 100644 themes/default/images/addnewarticle.png create mode 100644 themes/default/images/addnewpage.png create mode 100644 themes/default/images/annoucement.png create mode 100644 themes/default/images/announcement.png create mode 100644 themes/default/images/arrowleft.png create mode 100644 themes/default/images/arrowright.png create mode 100644 themes/default/images/bayonetLogo.png create mode 100644 themes/default/images/blockbackground.jpg create mode 100644 themes/default/images/calendar.png create mode 100644 themes/default/images/delete.gif create mode 100644 themes/default/images/dicon.png create mode 100644 themes/default/images/dlaxlogo.png create mode 100644 themes/default/images/editfiles.png create mode 100644 themes/default/images/editpage.png create mode 100644 themes/default/images/error.gif create mode 100644 themes/default/images/error.png create mode 100644 themes/default/images/file_doc.png create mode 100644 themes/default/images/file_pdf.png create mode 100644 themes/default/images/file_rtf.png create mode 100644 themes/default/images/file_word.png create mode 100644 themes/default/images/hgrad.png create mode 100644 themes/default/images/larrow.png create mode 100644 themes/default/images/leftshadow.png create mode 100644 themes/default/images/limericklax.png create mode 100644 themes/default/images/logo.jpg create mode 100644 themes/default/images/lvgrad.png create mode 100644 themes/default/images/navbackground.jpg create mode 100644 themes/default/images/navbg.png create mode 100644 themes/default/images/navigation.png create mode 100644 themes/default/images/navspacer.png create mode 100644 themes/default/images/news_header.png create mode 100644 themes/default/images/nvgrad.png create mode 100644 themes/default/images/photogallery.png create mode 100644 themes/default/images/photoleft.png create mode 100644 themes/default/images/photoright.png create mode 100644 themes/default/images/rarrow.png create mode 100644 themes/default/images/rightshadow.png create mode 100644 themes/default/images/sandbackground.jpg create mode 100644 themes/default/images/spacer.png create mode 100644 themes/default/images/vgrad.png create mode 100644 themes/default/images/view.gif create mode 100644 themes/default/images/xoma_logo.jpg create mode 100644 themes/default/include/functions.php create mode 100644 themes/gttheme/footer.php create mode 100644 themes/gttheme/header.php create mode 100644 themes/gttheme/images/Medal.png create mode 100644 themes/gttheme/images/add.gif create mode 100644 themes/gttheme/images/addnewarticle.png create mode 100644 themes/gttheme/images/addnewpage.png create mode 100644 themes/gttheme/images/annoucement.png create mode 100644 themes/gttheme/images/announcement.png create mode 100644 themes/gttheme/images/arrowleft.png create mode 100644 themes/gttheme/images/arrowright.png create mode 100644 themes/gttheme/images/background.jpg create mode 100644 themes/gttheme/images/banner.jpg create mode 100644 themes/gttheme/images/bayonetLogo.png create mode 100644 themes/gttheme/images/blockbackground.jpg create mode 100644 themes/gttheme/images/calendar.png create mode 100644 themes/gttheme/images/delete.gif create mode 100644 themes/gttheme/images/editfiles.png create mode 100644 themes/gttheme/images/editpage.png create mode 100644 themes/gttheme/images/error.gif create mode 100644 themes/gttheme/images/error.png create mode 100644 themes/gttheme/images/file_doc.png create mode 100644 themes/gttheme/images/file_pdf.png create mode 100644 themes/gttheme/images/file_rtf.png create mode 100644 themes/gttheme/images/file_word.png create mode 100644 themes/gttheme/images/headingbg.jpg create mode 100644 themes/gttheme/images/hgrad.png create mode 100644 themes/gttheme/images/larrow.png create mode 100644 themes/gttheme/images/leftshadow.png create mode 100644 themes/gttheme/images/logo.jpg create mode 100644 themes/gttheme/images/lvgrad.png create mode 100644 themes/gttheme/images/navbackground.jpg create mode 100644 themes/gttheme/images/navbg.jpg create mode 100644 themes/gttheme/images/navbg.png create mode 100644 themes/gttheme/images/navigation.png create mode 100644 themes/gttheme/images/navspacer.png create mode 100644 themes/gttheme/images/news_header.png create mode 100644 themes/gttheme/images/nvgrad.png create mode 100644 themes/gttheme/images/photogallery.png create mode 100644 themes/gttheme/images/photoleft.png create mode 100644 themes/gttheme/images/photoright.png create mode 100644 themes/gttheme/images/rarrow.png create mode 100644 themes/gttheme/images/rightshadow.png create mode 100644 themes/gttheme/images/sandbackground.jpg create mode 100644 themes/gttheme/images/spacer.png create mode 100644 themes/gttheme/images/vgrad.png create mode 100644 themes/gttheme/images/view.gif create mode 100644 themes/gttheme/include/functions.php create mode 100644 themes/gttheme/include/primary.css create mode 100644 themes/gttheme/include/style_bbcode.css create mode 100644 themes/gttheme/include/theme.ini create mode 100644 themes/gttheme/index.php create mode 100644 themes/gttheme/navigation.php create mode 100644 themes/new/footer.php create mode 100644 themes/new/header.php create mode 100644 themes/new/images/active_nav_bg.jpg create mode 100644 themes/new/images/btn_collapse.gif create mode 100644 themes/new/images/content_tile.jpg create mode 100644 themes/new/images/footer_tile.jpg create mode 100644 themes/new/images/footerwidget_bg.jpg create mode 100644 themes/new/images/footerwidget_border.jpg create mode 100644 themes/new/images/header_tile.png create mode 100644 themes/new/images/header_tile_ie6.gif create mode 100644 themes/new/images/logo-trans.png create mode 100644 themes/new/images/nav_a.gif create mode 100644 themes/new/images/search_btn.jpg create mode 100644 themes/new/images/w (1).png create mode 100644 themes/new/images/w.png create mode 100644 themes/new/images/widget_bg.jpg create mode 100644 themes/new/include/functions.php create mode 100644 themes/new/include/primary.css create mode 100644 themes/new/include/style_bbcode.css create mode 100644 themes/new/include/theme.ini create mode 100644 themes/new/index.php create mode 100644 themes/new/navigation.php create mode 100644 themes/throwback/footer.php create mode 100644 themes/throwback/header.php create mode 100644 themes/throwback/images/Medal.png create mode 100644 themes/throwback/images/acu_bg.jpg create mode 100644 themes/throwback/images/add.gif create mode 100644 themes/throwback/images/arrowleft.png create mode 100644 themes/throwback/images/arrowright.png create mode 100644 themes/throwback/images/background.jpg create mode 100644 themes/throwback/images/banner.jpg create mode 100644 themes/throwback/images/blockbackground.jpg create mode 100644 themes/throwback/images/contentbg.png create mode 100644 themes/throwback/images/delete.gif create mode 100644 themes/throwback/images/error.gif create mode 100644 themes/throwback/images/error.png create mode 100644 themes/throwback/images/headingbg.jpg create mode 100644 themes/throwback/images/hgrad.png create mode 100644 themes/throwback/images/larrow.png create mode 100644 themes/throwback/images/leftshadow.png create mode 100644 themes/throwback/images/logo.jpg create mode 100644 themes/throwback/images/lvgrad.png create mode 100644 themes/throwback/images/navbackground.jpg create mode 100644 themes/throwback/images/navbg.jpg create mode 100644 themes/throwback/images/navspacer.jpg create mode 100644 themes/throwback/images/navspacer.png create mode 100644 themes/throwback/images/news_header.png create mode 100644 themes/throwback/images/nvgrad.png create mode 100644 themes/throwback/images/photoleft.png create mode 100644 themes/throwback/images/photoright.png create mode 100644 themes/throwback/images/rightshadow.png create mode 100644 themes/throwback/images/sandbackground.jpg create mode 100644 themes/throwback/images/spacer.png create mode 100644 themes/throwback/images/vgrad.png create mode 100644 themes/throwback/images/view.gif create mode 100644 themes/throwback/include/functions.php create mode 100644 themes/throwback/include/primary.css create mode 100644 themes/throwback/include/style_bbcode.css create mode 100644 themes/throwback/include/theme.ini create mode 100644 themes/throwback/index.php create mode 100644 themes/throwback/navigation.php diff --git a/admin/adjutant/functions.php b/admin/adjutant/functions.php index 57e9fe8..87bc4b4 100644 --- a/admin/adjutant/functions.php +++ b/admin/adjutant/functions.php @@ -21,7 +21,7 @@ global $db; - $result = $db->Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE rudi_unit_members.status_id != 4 AND rudi_unit_members.status_id != 5 ORDER BY rudi_ranks.weight DESC , rudi_unit_members.date_promotion ASC , rudi_unit_members.date_enlisted ASC"); + $result = $db->Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE rudi_unit_members.status_id < 4 ORDER BY rudi_ranks.weight DESC , rudi_unit_members.date_promotion ASC , rudi_unit_members.date_enlisted ASC"); $row = $db->Fetch($result); if(isset($_POST['processed'])){ @@ -29,10 +29,11 @@ foreach($row as $soldier){ $mID = $soldier['member_id']; $missed = $_POST[$mID.'missed']; + $attended = $_POST[$mID.'attended']; $points = $_POST[$mID.'points']; if($missed !="" && $points != ""){ - $db->Query("UPDATE `rudi_unit_members` SET `points` = $points, `drillcount` = $missed WHERE `member_id` = $mID LIMIT 1"); + $db->Query("UPDATE `rudi_unit_members` SET `points` = $points, `drillcount` = $missed, `attendcount` = $attended WHERE `member_id` = $mID LIMIT 1"); }else{ ReportError("Error updating points for soldier id# '$mID'. Please contact administrator."); } @@ -42,9 +43,9 @@ } ?>
- +
- + {$soldier['first_name']} {$soldier['last_name']} - "; + + "; echo "\n"; @@ -104,7 +106,7 @@ $num = 1; foreach($row as $member){ if($num %2 == 0) - echo ""; + echo ""; else echo ""; echo ""; diff --git a/admin/adjutant/style.css b/admin/adjutant/style.css index 24a3eb8..823873b 100644 --- a/admin/adjutant/style.css +++ b/admin/adjutant/style.css @@ -1,13 +1,13 @@ - input.lrg { - font-size:14px; - font-weight:bold; - text-align:center; - font-family: Arial, Sans-Serif; - } - - tr.inactive { - background-color:#dfdfdf; - } - tr.inactive td { - color:#a2a2a2; + input.lrg { + font-size:14px; + font-weight:bold; + text-align:center; + font-family: Arial, Sans-Serif; + } + + tr.inactive { + background-color:#dfdfdf; + } + tr.inactive td { + color:#a2a2a2; } \ No newline at end of file diff --git a/admin/admins/functions.php b/admin/admins/functions.php index d28ff7d..f3da1be 100644 --- a/admin/admins/functions.php +++ b/admin/admins/functions.php @@ -1,329 +1,329 @@ - - - -. - */ - - function ListAdmins() - { - global $db; - $result = $db->Query("SELECT `user_id`, `username`, `level` FROM `bayonet_users` ORDER BY `level` DESC, `username` ASC"); - $admins = $db->fetch($result); - - $num = 1; - OpenTable("300px"); - echo ""; - foreach($admins as $admin) - { - if($admin['level'] != $level){ - $level = $admin['level']; - echo ""; - } - echo ""; - $num++; - } - CloseTable(); - } - - function NewAdmin() - { - - global $db; - $maxLevel = $_SESSION['level']; - - if(isset($_POST['processed'])){ - - $username = addslashes($_POST['username']); - $email = addslashes($_POST['email']); - $first = addslashes($_POST['first']); - $last = addslashes($_POST['last']); - - $level = $_POST['level']; - $all = $_POST['all']; - $squadleader = $_POST['squadleader']; - $adjutant = $_POST['adjutant']; - $quartermaster = $_POST['quartermaster']; - - $level = (int)$level; - $all = (int)$all; - $squadleader = (int)$squadleader; - $adjutant = (int)$adjutant; - $quartermaster = (int)$quartermaster; - - $password = GeneratePassword(8); - $cryptpassword = crypt(md5($password),'iamnotadirtywhorebitch'); - - if(empty($username)) - { - ReportError("This user must have a username to continue."); - return; - } - - $result = $db->Query("SELECT `level` FROM `bayonet_users` WHERE `username` = '$username' OR `email` = '$email'"); - if($db->Rows($result) > 0){ - ReportError("The email and or username you entered is already in use."); - return; - } - - - $Name = "Rocky the Marne Dog"; - $subject = "3rd ID Admin Password"; - $header = "From: ". $Name . " < DO NOT RESPOND >\r\n"; //optional headerfields - $mail_body = "Do not respond to this email.\n\n------------------------------\nUsername: ".$username."\nPassword: ".$password."\n------------------------------\n\nTo login click on this link. http://testbed.3rd-infantry-division.org/cms/admin/ \n\nIt is recommended that you change your password once you login. To do so, click on Account Settings>Change Password."; - - $sent = mail($email, $subject, $mail_body, $header); - if(!$sent){ - ReportError("Error validating email. This user was not saved."); - return; - } - - $db->Query("INSERT INTO `bayonet_users` (`user_id` ,`username` ,`password` ,`lastname` ,`firstname` ,`email` ,`joined` ,`level` ,`all` ,`squadleader` ,`adjutant` ,`quartermaster`) VALUES (NULL, '$username', '$cryptpassword', '$last', '$first', '$email', CURRENT_TIMESTAMP, $level, $all, $squadleader, $adjutant, $quartermaster)"); - - echo "Admin, '$username' level '$level' has been added. An email has been sent to him with his username and password.\n

- Please wait while you are redirected.

- Click here if you don't feel like waiting."; - - // 3 second redirect to go back to the edit page - PageRedirect(2, "?op=admins"); - return; - } -?> -
Cancel
-
- -
RankSoldierStatusPointsDrills Missed
RankSoldierStatusPointsDrills MissedDrills Attended
".getStatus($soldier['status_id'])." /100/3/3/3
{$member['shortname']}{$member['first_name']} {$member['last_name']}Edit
UsernameLevel
{$num}.{$admin['username']}{$admin['level']}
- - - - - - - - - - - -
Username:*
First Name:
Last Name:
Email Address:*
Level: - -
- -
-
- -
- - -
- - - - - - - - -
Everything elseSquad LeaderAdjutantQuartermaster
- - "; - else - echo ""; - ?> - - - "; - else - echo ""; - ?> - - - "; - else - echo ""; - ?> - - - "; - else - echo ""; - ?> -
-
- -

Show/Hide Permissions

- Query("UPDATE `bayonet_users` SET `username` = '$username', `level` = '$level', `all` = '$all', `squadleader` = '$squadleader', `adjutant` = '$adjutant', `quartermaster` = '$quartermaster' WHERE `user_id` = '$user_id' LIMIT 1"); - - echo "Admin, '$username' level '$level' has been edited.\n

- Please wait while you are redirected.

- Click here if you don't feel like waiting."; - - // 3 second redirect to go back to the edit page - PageRedirect(2, "?op=admins&edit={$user_id}"); - return; - } - - $result = $db->Query("SELECT * FROM `bayonet_users` WHERE `user_id` = '$user_id' LIMIT 1"); - $admin = $db->FetchRow($result); - - if($maxLevel < $admin['level']){ - ReportError("You do not have permission to access this user."); - return; - } -?> -
- Edit the attributes of this administrator.
-
- - - - - - - - - -
Username:
Level: - -
- - -
-
- -
-
-Query("SELECT `username` FROM `bayonet_users` WHERE `user_id` = '$user_id'"); - $admin = $db->Fetch($result); - - if(isset($_POST['proceed'])) - { - echo "Admin '{$admin['username']}', was deleted."; - $db->Query("DELETE FROM `bayonet_users` WHERE `user_id` = '$user_id' LIMIT 1"); - PageRedirect(3,"?op=admins"); - return; - } - if(isset($_POST['cancel'])) - { - echo "User cancelled deletion of admin: '{$admin['username']}'"; - PageRedirect(1,"?op=admins"); - return; - } - ?> -
-
- - - -
Are you SURE you want to delete the administrative user: ''?
   
-
-
- + $(document).ready(function(){ + $(".flip").click(function(){ + $(".slidepanel").slideToggle("slow"); + }); + }); + + + +. + */ + + function ListAdmins() + { + global $db; + $result = $db->Query("SELECT `user_id`, `username`, `level` FROM `bayonet_users` ORDER BY `level` DESC, `username` ASC"); + $admins = $db->fetch($result); + + $num = 1; + OpenTable("300px"); + echo "UsernameLevel"; + foreach($admins as $admin) + { + if($admin['level'] != $level){ + $level = $admin['level']; + echo "
"; + } + echo "{$num}.{$admin['username']}{$admin['level']}"; + $num++; + } + CloseTable(); + } + + function NewAdmin() + { + + global $db; + $maxLevel = $_SESSION['level']; + + if(isset($_POST['processed'])){ + + $username = addslashes($_POST['username']); + $email = addslashes($_POST['email']); + $first = addslashes($_POST['first']); + $last = addslashes($_POST['last']); + + $level = $_POST['level']; + $all = $_POST['all']; + $squadleader = $_POST['squadleader']; + $adjutant = $_POST['adjutant']; + $quartermaster = $_POST['quartermaster']; + + $level = (int)$level; + $all = (int)$all; + $squadleader = (int)$squadleader; + $adjutant = (int)$adjutant; + $quartermaster = (int)$quartermaster; + + $password = GeneratePassword(8); + $cryptpassword = crypt(md5($password),'iamnotadirtywhorebitch'); + + if(empty($username)) + { + ReportError("This user must have a username to continue."); + return; + } + + $result = $db->Query("SELECT `level` FROM `bayonet_users` WHERE `username` = '$username' OR `email` = '$email'"); + if($db->Rows($result) > 0){ + ReportError("The email and or username you entered is already in use."); + return; + } + + + $Name = "Rocky the Marne Dog"; + $subject = "3rd ID Admin Password"; + $header = "From: ". $Name . " < DO NOT RESPOND >\r\n"; //optional headerfields + $mail_body = "Do not respond to this email.\n\n------------------------------\nUsername: ".$username."\nPassword: ".$password."\n------------------------------\n\nTo login click on this link. http://testbed.3rd-infantry-division.org/cms/admin/ \n\nIt is recommended that you change your password once you login. To do so, click on Account Settings>Change Password."; + + $sent = mail($email, $subject, $mail_body, $header); + if(!$sent){ + ReportError("Error validating email. This user was not saved."); + return; + } + + $db->Query("INSERT INTO `bayonet_users` (`user_id` ,`username` ,`password` ,`lastname` ,`firstname` ,`email` ,`joined` ,`level` ,`all` ,`squadleader` ,`adjutant` ,`quartermaster`) VALUES (NULL, '$username', '$cryptpassword', '$last', '$first', '$email', CURRENT_TIMESTAMP, $level, $all, $squadleader, $adjutant, $quartermaster)"); + + echo "Admin, '$username' level '$level' has been added. An email has been sent to him with his username and password.\n

+ Please wait while you are redirected.

+ Click here if you don't feel like waiting."; + + // 3 second redirect to go back to the edit page + PageRedirect(2, "?op=admins"); + return; + } +?> +
Cancel
+
+
+ + + + + + + + + + + + +
Username:*
First Name:
Last Name:
Email Address:*
Level: + +
+ +
+
+ +
+
+ +
+ + + + + + + + +
Everything elseSquad LeaderAdjutantQuartermaster
+ + "; + else + echo ""; + ?> + + + "; + else + echo ""; + ?> + + + "; + else + echo ""; + ?> + + + "; + else + echo ""; + ?> +
+
+ +

Show/Hide Permissions

+ Query("UPDATE `bayonet_users` SET `username` = '$username', `level` = '$level', `all` = '$all', `squadleader` = '$squadleader', `adjutant` = '$adjutant', `quartermaster` = '$quartermaster' WHERE `user_id` = '$user_id' LIMIT 1"); + + echo "Admin, '$username' level '$level' has been edited.\n

+ Please wait while you are redirected.

+ Click here if you don't feel like waiting."; + + // 3 second redirect to go back to the edit page + PageRedirect(2, "?op=admins&edit={$user_id}"); + return; + } + + $result = $db->Query("SELECT * FROM `bayonet_users` WHERE `user_id` = '$user_id' LIMIT 1"); + $admin = $db->FetchRow($result); + + if($maxLevel < $admin['level']){ + ReportError("You do not have permission to access this user."); + return; + } +?> +
+ Edit the attributes of this administrator.
+
+ + + + + + + + + +
Username:
Level: + +
+ + +
+
+ +
+
+Query("SELECT `username` FROM `bayonet_users` WHERE `user_id` = '$user_id'"); + $admin = $db->Fetch($result); + + if(isset($_POST['proceed'])) + { + echo "Admin '{$admin['username']}', was deleted."; + $db->Query("DELETE FROM `bayonet_users` WHERE `user_id` = '$user_id' LIMIT 1"); + PageRedirect(3,"?op=admins"); + return; + } + if(isset($_POST['cancel'])) + { + echo "User cancelled deletion of admin: '{$admin['username']}'"; + PageRedirect(1,"?op=admins"); + return; + } + ?> +
+
+ + + +
Are you SURE you want to delete the administrative user: ''?
   
+
+
+ \ No newline at end of file diff --git a/admin/admins/index.php b/admin/admins/index.php index 1223d3a..a2e71e9 100644 --- a/admin/admins/index.php +++ b/admin/admins/index.php @@ -1,54 +1,54 @@ -. - */ -?> -

- Edit Admins

- - - - - - - -
- - -
Add New Admin','?op=admins&create=true'); ?>
- - 		- -
+. + */ +?> +

- Edit Admins

+ + + + + + + +
+ + +
Add New Admin','?op=admins&create=true'); ?>
+ + 		+ +
diff --git a/admin/announcements/functions.php b/admin/announcements/functions.php index f45a7e3..b089cf3 100644 --- a/admin/announcements/functions.php +++ b/admin/announcements/functions.php @@ -1,67 +1,67 @@ -. - */ - -/** - * Note to anyone feeling the need to edit this file... - * You MUST declare $db as global inside your functions in order access MySQL from here. - */ - -function EditAnnouncements() -{ - global $db; - - if(isset($_POST['processed'])) - { - //Secure our data to prevent injection attacks. - $title = addslashes($_POST['title']); - $text = addslashes($_POST['text']); - if(empty($title) || empty($text)) - { - echo "You must fill everything out before proceeding."; - return; - } - - //Update the database with the new data. - $db->Query("UPDATE bayonet_announcements SET title = '$title', text = '$text' WHERE announcement_id = 0"); - echo "Announcement, '$title', has been edited.\n

Please wait while you are redirected.

- Click here if you don't feel like waiting."; - - // 3 second redirect to go back to the edit page - PageRedirect(2, "?op=announcements"); - - //die, because we have completed what we wanted to do. - return; - } - - - //Grab the page from the database according to the $article_id passed to the function. - $result = $db->Query("SELECT title,text FROM bayonet_announcements WHERE announcement_id = 0"); - $announcement = $db->FetchRow($result); - - ?> -
- - - - -
Announcement Title:
-
- . + */ + +/** + * Note to anyone feeling the need to edit this file... + * You MUST declare $db as global inside your functions in order access MySQL from here. + */ + +function EditAnnouncements() +{ + global $db; + + if(isset($_POST['processed'])) + { + //Secure our data to prevent injection attacks. + $title = addslashes($_POST['title']); + $text = addslashes($_POST['text']); + if(empty($title) || empty($text)) + { + echo "You must fill everything out before proceeding."; + return; + } + + //Update the database with the new data. + $db->Query("UPDATE bayonet_announcements SET title = '$title', text = '$text' WHERE announcement_id = 0"); + echo "Announcement, '$title', has been edited.\n

Please wait while you are redirected.

+ Click here if you don't feel like waiting."; + + // 3 second redirect to go back to the edit page + PageRedirect(2, "?op=announcements"); + + //die, because we have completed what we wanted to do. + return; + } + + + //Grab the page from the database according to the $article_id passed to the function. + $result = $db->Query("SELECT title,text FROM bayonet_announcements WHERE announcement_id = 0"); + $announcement = $db->FetchRow($result); + + ?> +
+ + + + +
Announcement Title:
+
+ \ No newline at end of file diff --git a/admin/announcements/index.php b/admin/announcements/index.php index 6b0874e..14d7710 100644 --- a/admin/announcements/index.php +++ b/admin/announcements/index.php @@ -1,34 +1,34 @@ -. - */ - ?> - -

- Edit Announcements

- - - - +. + */ + ?> + +

- Edit Announcements

+ + +
+
\ No newline at end of file diff --git a/admin/calendar/index.php b/admin/calendar/index.php index 2b631d8..097622f 100644 --- a/admin/calendar/index.php +++ b/admin/calendar/index.php @@ -1,90 +1,90 @@ -. - */ - ?> - -

- Manage Calendar & Events

- - - - - - - - - -
- Add New Event

- - Click on a day to add/edit/delete events - 		- -
- +. + */ + ?> + +

- Manage Calendar & Events

+ + + + + + + + + +
+ Add New Event

+ + Click on a day to add/edit/delete events + 		+ +
+ diff --git a/admin/calendar/style.css b/admin/calendar/style.css new file mode 100644 index 0000000..167b75f --- /dev/null +++ b/admin/calendar/style.css @@ -0,0 +1,96 @@ +/* START>> CALENDAR STYLES*/ + .monthTitle{ + color:black; + text-align:center; + font-size:12px; + font-weight:bold; + font-family:arial; + } + td.weekday { + width:40px; + height:20px; + background-color:#cb2121; + color:green; + text-align:center; + font-size:10px; + font-weight:bold; + } + th.weekday { + width:40px; + height:29px; + background-color:white; + color:black; + text-align:center; + font-size:11px; + font-weight:bold; + } + .monthday { + width:40px; + height:20px; + background-color:#aea2a2; + color:white; + text-align:left; + font-size:10pt; + font-weight:bold; + + } + .monthtoday { + width:38px; + height:38px; + /* background-color:#3666ba; */ + color:#225eac; + text-align:center; + font-size:14px; + font-weight:bold; + border:1px solid #333333; + } + .event { + width:38px; + height:38px; + background-color:#225eac; + text-align:center; + border:1px solid #333333; + } + table.calendar a, table.calendar a:visited, table.calendar a:active, table.calendar a:hover { + color:white; + } + .eventtoday{ + width:38px; + height:38px; + background-color:#225eac; + color:#ef8e25; + text-align:center; + font-size:14px; + font-weight:bold; + border:1px solid #333333; + } + td.cal_weekday { + width:40px; + height:40px; + background-color:#a1a1a1; + vertical-align:top; + color:#eeeeee; + font-family:arial; + text-align:center; + font-size:14px; + } + td.cal_weekend { + width:40px; + height:40px; + background-color:#8f8f8f; + vertical-align:top; + color:#eeeeee; + font-family:arial; + text-align:center; + font-size:14px; + } + td.cal_notmonth { + width:40px; + height:40px; + background-color:#6e6e6e; + vertical-align:top; + color:#d4d4d4; + text-align:left; + font-size:11px; + } +/* END>> CALENDAR STYLES */ \ No newline at end of file diff --git a/admin/functions.php b/admin/functions.php index 9b950c4..5c018a0 100644 --- a/admin/functions.php +++ b/admin/functions.php @@ -1,563 +1,563 @@ -. - */ - -/** - * bbcode_format() - * - * Modified public domain code from www.phpit.net - * - * @param mixed $str - * @return - */ -function bbcode_format ($str) -{ - $str = htmlentities($str); - $str = strip_tags($str); - $str = wordwrap($str,100,"\n",true); - - $simple_search = array( - '/\[b\](.*?)\[\/b\]/is', - '/\[i\](.*?)\[\/i\]/is', - '/\[u\](.*?)\[\/u\]/is', - '/\[hr\]/is', - '/\[pi\](.*?)\[\/pi\]/is', - '/\[center\](.*?)\[\/center\]/is', - '/\[title\](.*?)\[\/title\]/is', - '/\[article\](.*?)\[\/article\]/is', - '/\[section\](.*?)\[\/section\]/is', - '/\[code\](.*?)\[\/code\]/is', - '/\[quote\](.*?)\[\/quote\]/is', - '/\[quote\=(.*?)\](.*?)\[\/quote\]/is', - '/\[url\=(.*?)\](.*?)\[\/url\]/is', - '/\[align\=(.*?)\](.*?)\[\/align\]/is', - '/\[size\=(.*?)\](.*?)\[\/size\]/is', - '/\[img\=(.*?)\](.*?)\[\/img\]/is' - ); - - $simple_replace = array( - '$1', - '$1', - '$1', - '
', - '

$1

', - '
$1
', - '

$1

', - '

$1

', - '

$1

', - '
$1
', - '
$1
', - '$1 wrote:
$2
', - '$2', - '$2', - '$2', - '$2' - ); - - $order = array("\r\n", "\n", "\r"); - $replace = "\n
"; - - $str = preg_replace ($simple_search, $simple_replace, $str); - $str = str_ireplace($order,$replace,$str); - return $str; -} - - //BBcode 2 HTML was written by WAY2WEB.net - - function BBCode($Text) - { - // Replace any html brackets with HTML Entities to prevent executing HTML or script - // Don't use strip_tags here because it breaks [url] search by replacing & with amp - $Text = str_replace("<", "<", $Text); - $Text = str_replace(">", ">", $Text); - - // Convert new line chars to html
tags - $Text = nl2br($Text); - - // Set up the parameters for a URL search string - $URLSearchString = " a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'"; - // Set up the parameters for a MAIL search string - $MAILSearchString = $URLSearchString . " a-zA-Z0-9\.@"; - - // Perform URL Search - $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '$1', $Text); - $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '$2', $Text); - //$Text = preg_replace("(\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[/url\])", '$2', $Text); - - // Perform MAIL Search - $Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '$1', $Text); - $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.+?)\[\/mail\]/", '$2', $Text); - - // Check for bold text - $Text = preg_replace("(\[b\](.+?)\[\/b])is",'$1',$Text); - - // Check for Italics text - $Text = preg_replace("(\[i\](.+?)\[\/i\])is",'$1',$Text); - - // Check for Underline text - $Text = preg_replace("(\[u\](.+?)\[\/u\])is",'$1',$Text); - - // Check for strike-through text - $Text = preg_replace("(\[s\](.+?)\[\/s\])is",'$1',$Text); - - // Check for over-line text - $Text = preg_replace("(\[o\](.+?)\[\/o\])is",'$1',$Text); - - // Check for colored text - $Text = preg_replace("(\[color=(.+?)\](.+?)\[\/color\])is","$2",$Text); - - // Check for sized text - $Text = preg_replace("(\[size=(.+?)\](.+?)\[\/size\])is","$2",$Text); - - // Check for list text - $Text = preg_replace("/\[list\](.+?)\[\/list\]/is", '' ,$Text); - $Text = preg_replace("/\[list=1\](.+?)\[\/list\]/is", '' ,$Text); - $Text = preg_replace("/\[list=i\](.+?)\[\/list\]/s", '' ,$Text); - $Text = preg_replace("/\[list=I\](.+?)\[\/list\]/s", '' ,$Text); - $Text = preg_replace("/\[list=a\](.+?)\[\/list\]/s", '' ,$Text); - $Text = preg_replace("/\[list=A\](.+?)\[\/list\]/s", '' ,$Text); - $Text = str_replace("[*]", "
  • ", $Text); - - // Check for font change text - $Text = preg_replace("(\[font=(.+?)\](.+?)\[\/font\])","$2",$Text); - - // Declare the format for [code] layout - $CodeLayout = ' - - - - - - -
    Code:
    $1
    '; - // Check for [code] text - $Text = preg_replace("/\[code\](.+?)\[\/code\]/is","$CodeLayout", $Text); - // Declare the format for [php] layout - $phpLayout = ' - - - - - - -
    Code:
    $1
    '; - // Check for [php] text - $Text = preg_replace("/\[php\](.+?)\[\/php\]/is",$phpLayout, $Text); - - // Declare the format for [quote] layout - $QuoteLayout = ' - - - - - - -
    Quote:
    $1
    '; - - // Check for [quote] text - $Text = preg_replace("/\[quote\](.+?)\[\/quote\]/is","$QuoteLayout", $Text); - - // Images - // [img]pathtoimage[/img] - $Text = preg_replace("/\[img\](.+?)\[\/img\]/", '', $Text); - - //[img=align]image source[/img] - $Text = preg_replace("(\[img align\=(.+?)\](.+?)\[\/img\])is","",$Text); - - // [img=widthxheight]image source[/img] - $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '', $Text); - - // Alignment - // [align=type]text[/align] - $Text = preg_replace("(\[align=(.+?)\](.+?)\[\/align\])is","
    $2
    ",$Text); - - return $Text; - } - -function articleHeading($text){ - - // Set the content-type - header('Content-type: image/png'); - - //$text = $_GET['text']; - - $im = imagecreatefrompng('images/news_header.png'); // open image - imagealphablending($im, true); // setting alpha blending on - imagesavealpha($im, true); // save alphablending setting (important) - - // Create some colors - $black = imagecolorallocate($im, 0, 0, 0); - - - // Replace path by your own font path - //$font = 'TrajanPro-Regular.otf'; - //$font = 'TrajanPro-Bold.otf'; - $font = 'BrushScriptStd.otf'; - //$font = 'TRATS__.TTF'; - //$text = strtoupper($text); - - // Add the text - imagettftext($im, 18, 0, 0, 17, $black, $font, $text); - - // Using imagepng() results in clearer text compared with imagejpeg() - imagepng($im); - imagedestroy($im); -} - -function LinkList($array) -{ - if(!is_array($array)) - { - ReportError("List was not an array"); - return; - } - - echo "
      "; - foreach($array as $text => $link) - { - echo "
    • $text
      • "; - } - echo "
    "; -} - -/** - * LinkModule() - * - * Helper function to link to Bayonet modules. - * - * @param mixed $module_name - * @param mixed $link_name - * @return - */ -function LinkModule($module_name,$args = NULL,$link_name) -{ - return "{$link_name}"; -} - -/** - * LinkPage() - * - * Helper function to link to Bayonet pages. - * - * @param mixed $page_id - * @param mixed $page_name - * @return - */ -function LinkPage($page_id,$page_name) -{ - return "{$page_name}"; -} - -/** - * LinkInternal() - * - * Helper function to link to a relative Bayonet path. - * - * @param mixed $name - * @param string $rel_path - * @param string $file - * @return - */ -function LinkInternal($name,$file,$rel_path = "./") -{ - return "{$name}"; -} - -if(!defined("CALLED_FROM_ADMIN")) -{ - /** - * OpenTable() - * - * Begins a Bayonet site table. - * - * @return - */ - function OpenTable($width = "100%") - { - //width="100%" is important. Otherwise all of our tables will be text width. - echo "\n"; - } - - /** - * CloseTable() - * - * Closes a Bayonet site table. - * - * @return - */ - function CloseTable() - { - echo "
    "; - } -} - -function OpenBlock($title = 'New Block') -{ - OpenTable(); - echo "
    {$title}
    "; - echo "
    "; -} - -function CloseBlock() -{ - echo "
    "; - CloseTable(); -} -/** - * ReportError() - * - * This function should be called in the event that an error has occured. - * - * @param mixed $message - automatically logged - * @return - */ -function ReportError($message) -{ - //WriteLog($message,BAYONET_LOG_ERROR); - OpenTable(); - echo "Error Message{$message}"; - CloseTable(); -} - -/** - * ReportHack() - * - * This function should be called in the event that we are confirming - * a hacking attempt. - * - * @param mixed $message - automatically logged - * @return void - */ -function ReportHack($message) -{ - //WriteLog($message,BAYONET_LOG_HACK); - OpenTable(); - echo "Hack Attempt{$message}"; - CloseTable(); -} - - -/** - * array_dump() - * - * Useful against $_POST and $_GET variables, for dumping data to - * a log file, or to stdout. The return value is a single string, - * with each array key => value pair delimited by a character. - * The default character is a pipe -> '|'. It is assumed that if - * wanted to have a newline character inserted, just replace $spacer - * with '\n'. - * - * @param mixed $array - * @param string $spacer - * @return - */ -function array_dump($array, $spacer = '|') -{ - $retval = NULL; - foreach($array as $challenge => $answer) - { - $retval .= " $challenge => $answer " . $spacer; - } - - return $retval; -} - -/** - * WriteLog() - * - * This function can be accessed directly, however, anything that is - * passed to ReportError() or ReportHack(), or decho() will be logged in their - * appropriate log file. - * - * Change made: added checks to see if the log files exist before opening - * - * @param mixed $message - * @param mixed $flag - * @return - */ -define('BAYONET_LOG_HACK','bayonet_log_hack'); -define('BAYONET_LOG_ERROR','bayonet_log_error'); -define('BAYONET_LOG_WARN','bayonet_log_warn'); -define('BAYONET_LOG_INFO','bayonet_log_info'); - -function WriteLog($message,$flag) -{ - global $config; - $enabled = $config['logs']['enabled']; - - if(!$enabled) - { - return false; - } - - $dir = $config['logs']['dir']; - date_default_timezone_set($config['logs']['timezone']); - $varstr = array_dump($_GET); - $type = NULL; - $ip = $_SERVER['REMOTE_ADDR']; - $hostname = gethostbyaddr($ip); - $executed = $_SERVER['PHP_SELF']; - $timestamp = date('Y-M-d H:i:s T'); - - - $message = str_replace("\n",'',$message); - $message = str_replace("
    ",'',$message); - - switch($flag) - { - case BAYONET_LOG_HACK: - if(!file_exists($dir.'hacks.log')){ - break; - } - $fp = fopen($dir.'hacks.log','a'); - $type = 'HACK'; - $full_message = "TIMESTAMP: {$timestamp}\n\t\tIP: {$ip}\n\t\tHOSTNAME: {$hostname}\n\t\tACTION: {$type} of {$executed}\n\t\tDEFERRAL: {$message}\n\t\tVAR: ({$varstr})\n\n"; - break; - case BAYONET_LOG_ERROR: - if(!file_exists($dir.'error.log')){ - break; - } - $fp = fopen($dir.'error.log','a'); - $type = 'ERROR'; - $full_message = "({$timestamp}) - {$type} - {$message} - ({$varstr})\n"; - break; - case BAYONET_LOG_WARN: - if(!file_exists($dir.'warn.log')){ - break; - } - $fp = fopen($dir.'warn.log','a'); - $type = 'WARN'; - $full_message = "({$timestamp}) - {$type} - {$message} - ({$varstr})\n"; - break; - case BAYONET_LOG_INFO: - if(!file_exists($dir.'info.log')){ - break; - } - $fp = fopen($dir.'info.log','a'); - $type = 'INFO'; - $full_message = "({$timestamp}) - {$type} - {$message}\n"; - break; - default: - echo 'To log something, you need to define a log to write to.
    '; - return; - } - if(file_exists($fp)){ - fwrite($fp,$full_message); - fclose($fp); - }else{ - //echo "could not write to file because file does not exist.
    "; - } -} - -/** - * UnderConstruction() - * - * Displays a site-wide message across the page header. - * - * @param mixed $message - * @param mixed $flag Acceptable flags are BAYONET_SITE, and BAYONET_SECTION - * @return - */ -define('BAYONET_SITE','bayonet_site'); -define('BAYONET_SECTION','bayonet_section'); -function UnderConstruction($message = NULL, $flag = BAYONET_SITE) -{ - $timestamp = date("Y-M-d h:m:s"); - OpenTable(); - switch($flag) - { - case BAYONET_SITE: - echo "Site is currently under construction : $timestamp"; - break; - case BAYONET_SECTION: - echo "Section currently under construction : $timestamp"; - } - - if(!is_null($message)) - { - echo "$message"; - } - - CloseTable(); - echo "
    "; -} - -/** - * GetBlocks() - * - * Includes all directories listed in blocks/ and uses the bayonet_blocks - * MySQL table to determine the order of the blocks displayed. - * - * @return - */ - -define('BLOCK_LEFT',false); -define('BLOCK_RIGHT',false); - -function GetBlocks($position = BLOCK_LEFT) -{ - global $config; - /** - * I had to reconnect to the database for some fucking reason at this point. - * I have no idea why, but I was recieving errors telling me that $db was no longer - * an object. This is/was bullshit. - */ - $db = new Bayonet_SQL(); - $db->Connect( - $config['sql']['hostname'], - $config['sql']['username'], - $config['sql']['password'] - ); - $db->Select_db($config['sql']['database']); - - $result = $db->Query("SELECT * FROM `bayonet_blocks` ORDER BY weight, position"); - $blocks = $db->Fetch($result); - - foreach($blocks as $block) - { - if($block['position'] == $position && $block['active'] == true) - { - $load = 'blocks/'.$block['dir_name'].'/index.php'; - if(file_exists($load)) - { - OpenBlock($block['title']); - include $load; - CloseBlock(); - } - else - { - ReportError("Failed to load block, '{$block['dir_name']}'. Check block config."); - } - if($config['blocks']['spacer']) echo "
    "; - } - } -} - -/** - * PageRedirect() - * - * performs an http redirect - * - * @param $delay - * @param $link - */ -function PageRedirect($delay, $link) -{ - echo ""; -} +. + */ + +/** + * bbcode_format() + * + * Modified public domain code from www.phpit.net + * + * @param mixed $str + * @return + */ +function bbcode_format ($str) +{ + $str = htmlentities($str); + $str = strip_tags($str); + $str = wordwrap($str,100,"\n",true); + + $simple_search = array( + '/\[b\](.*?)\[\/b\]/is', + '/\[i\](.*?)\[\/i\]/is', + '/\[u\](.*?)\[\/u\]/is', + '/\[hr\]/is', + '/\[pi\](.*?)\[\/pi\]/is', + '/\[center\](.*?)\[\/center\]/is', + '/\[title\](.*?)\[\/title\]/is', + '/\[article\](.*?)\[\/article\]/is', + '/\[section\](.*?)\[\/section\]/is', + '/\[code\](.*?)\[\/code\]/is', + '/\[quote\](.*?)\[\/quote\]/is', + '/\[quote\=(.*?)\](.*?)\[\/quote\]/is', + '/\[url\=(.*?)\](.*?)\[\/url\]/is', + '/\[align\=(.*?)\](.*?)\[\/align\]/is', + '/\[size\=(.*?)\](.*?)\[\/size\]/is', + '/\[img\=(.*?)\](.*?)\[\/img\]/is' + ); + + $simple_replace = array( + '$1', + '$1', + '$1', + '
    ', + '

    $1

    ', + '
    $1
    ', + '

    $1

    ', + '

    $1

    ', + '

    $1

    ', + '
    $1
    ', + '
    $1
    ', + '$1 wrote:
    $2
    ', + '$2', + '$2', + '$2', + '$2' + ); + + $order = array("\r\n", "\n", "\r"); + $replace = "\n
    "; + + $str = preg_replace ($simple_search, $simple_replace, $str); + $str = str_ireplace($order,$replace,$str); + return $str; +} + + //BBcode 2 HTML was written by WAY2WEB.net + + function BBCode($Text) + { + // Replace any html brackets with HTML Entities to prevent executing HTML or script + // Don't use strip_tags here because it breaks [url] search by replacing & with amp + $Text = str_replace("<", "<", $Text); + $Text = str_replace(">", ">", $Text); + + // Convert new line chars to html
    tags + $Text = nl2br($Text); + + // Set up the parameters for a URL search string + $URLSearchString = " a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'"; + // Set up the parameters for a MAIL search string + $MAILSearchString = $URLSearchString . " a-zA-Z0-9\.@"; + + // Perform URL Search + $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '$1', $Text); + $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '$2', $Text); + //$Text = preg_replace("(\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[/url\])", '$2', $Text); + + // Perform MAIL Search + $Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '$1', $Text); + $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.+?)\[\/mail\]/", '$2', $Text); + + // Check for bold text + $Text = preg_replace("(\[b\](.+?)\[\/b])is",'$1',$Text); + + // Check for Italics text + $Text = preg_replace("(\[i\](.+?)\[\/i\])is",'$1',$Text); + + // Check for Underline text + $Text = preg_replace("(\[u\](.+?)\[\/u\])is",'$1',$Text); + + // Check for strike-through text + $Text = preg_replace("(\[s\](.+?)\[\/s\])is",'$1',$Text); + + // Check for over-line text + $Text = preg_replace("(\[o\](.+?)\[\/o\])is",'$1',$Text); + + // Check for colored text + $Text = preg_replace("(\[color=(.+?)\](.+?)\[\/color\])is","$2",$Text); + + // Check for sized text + $Text = preg_replace("(\[size=(.+?)\](.+?)\[\/size\])is","$2",$Text); + + // Check for list text + $Text = preg_replace("/\[list\](.+?)\[\/list\]/is", '
      $1
    ' ,$Text); + $Text = preg_replace("/\[list=1\](.+?)\[\/list\]/is", '
      $1
    ' ,$Text); + $Text = preg_replace("/\[list=i\](.+?)\[\/list\]/s", '
      $1
    ' ,$Text); + $Text = preg_replace("/\[list=I\](.+?)\[\/list\]/s", '
      $1
    ' ,$Text); + $Text = preg_replace("/\[list=a\](.+?)\[\/list\]/s", '
      $1
    ' ,$Text); + $Text = preg_replace("/\[list=A\](.+?)\[\/list\]/s", '
      $1
    ' ,$Text); + $Text = str_replace("[*]", "
  • ", $Text); + + // Check for font change text + $Text = preg_replace("(\[font=(.+?)\](.+?)\[\/font\])","$2",$Text); + + // Declare the format for [code] layout + $CodeLayout = ' + + + + + + +
    Code:
    $1
    '; + // Check for [code] text + $Text = preg_replace("/\[code\](.+?)\[\/code\]/is","$CodeLayout", $Text); + // Declare the format for [php] layout + $phpLayout = ' + + + + + + +
    Code:
    $1
    '; + // Check for [php] text + $Text = preg_replace("/\[php\](.+?)\[\/php\]/is",$phpLayout, $Text); + + // Declare the format for [quote] layout + $QuoteLayout = ' + + + + + + +
    Quote:
    $1
    '; + + // Check for [quote] text + $Text = preg_replace("/\[quote\](.+?)\[\/quote\]/is","$QuoteLayout", $Text); + + // Images + // [img]pathtoimage[/img] + $Text = preg_replace("/\[img\](.+?)\[\/img\]/", '', $Text); + + //[img=align]image source[/img] + $Text = preg_replace("(\[img align\=(.+?)\](.+?)\[\/img\])is","",$Text); + + // [img=widthxheight]image source[/img] + $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '', $Text); + + // Alignment + // [align=type]text[/align] + $Text = preg_replace("(\[align=(.+?)\](.+?)\[\/align\])is","
    $2
    ",$Text); + + return $Text; + } + +function articleHeading($text){ + + // Set the content-type + header('Content-type: image/png'); + + //$text = $_GET['text']; + + $im = imagecreatefrompng('images/news_header.png'); // open image + imagealphablending($im, true); // setting alpha blending on + imagesavealpha($im, true); // save alphablending setting (important) + + // Create some colors + $black = imagecolorallocate($im, 0, 0, 0); + + + // Replace path by your own font path + //$font = 'TrajanPro-Regular.otf'; + //$font = 'TrajanPro-Bold.otf'; + $font = 'BrushScriptStd.otf'; + //$font = 'TRATS__.TTF'; + //$text = strtoupper($text); + + // Add the text + imagettftext($im, 18, 0, 0, 17, $black, $font, $text); + + // Using imagepng() results in clearer text compared with imagejpeg() + imagepng($im); + imagedestroy($im); +} + +function LinkList($array) +{ + if(!is_array($array)) + { + ReportError("List was not an array"); + return; + } + + echo "
      "; + foreach($array as $text => $link) + { + echo "
    • $text
      • "; + } + echo "
    "; +} + +/** + * LinkModule() + * + * Helper function to link to Bayonet modules. + * + * @param mixed $module_name + * @param mixed $link_name + * @return + */ +function LinkModule($module_name,$args = NULL,$link_name) +{ + return "{$link_name}"; +} + +/** + * LinkPage() + * + * Helper function to link to Bayonet pages. + * + * @param mixed $page_id + * @param mixed $page_name + * @return + */ +function LinkPage($page_id,$page_name) +{ + return "{$page_name}"; +} + +/** + * LinkInternal() + * + * Helper function to link to a relative Bayonet path. + * + * @param mixed $name + * @param string $rel_path + * @param string $file + * @return + */ +function LinkInternal($name,$file,$rel_path = "./") +{ + return "{$name}"; +} + +if(!defined("CALLED_FROM_ADMIN")) +{ + /** + * OpenTable() + * + * Begins a Bayonet site table. + * + * @return + */ + function OpenTable($width = "100%") + { + //width="100%" is important. Otherwise all of our tables will be text width. + echo "\n"; + } + + /** + * CloseTable() + * + * Closes a Bayonet site table. + * + * @return + */ + function CloseTable() + { + echo "
    "; + } +} + +function OpenBlock($title = 'New Block') +{ + OpenTable(); + echo "
    {$title}
    "; + echo "
    "; +} + +function CloseBlock() +{ + echo "
    "; + CloseTable(); +} +/** + * ReportError() + * + * This function should be called in the event that an error has occured. + * + * @param mixed $message - automatically logged + * @return + */ +function ReportError($message) +{ + //WriteLog($message,BAYONET_LOG_ERROR); + OpenTable(); + echo "Error Message{$message}"; + CloseTable(); +} + +/** + * ReportHack() + * + * This function should be called in the event that we are confirming + * a hacking attempt. + * + * @param mixed $message - automatically logged + * @return void + */ +function ReportHack($message) +{ + //WriteLog($message,BAYONET_LOG_HACK); + OpenTable(); + echo "Hack Attempt{$message}"; + CloseTable(); +} + + +/** + * array_dump() + * + * Useful against $_POST and $_GET variables, for dumping data to + * a log file, or to stdout. The return value is a single string, + * with each array key => value pair delimited by a character. + * The default character is a pipe -> '|'. It is assumed that if + * wanted to have a newline character inserted, just replace $spacer + * with '\n'. + * + * @param mixed $array + * @param string $spacer + * @return + */ +function array_dump($array, $spacer = '|') +{ + $retval = NULL; + foreach($array as $challenge => $answer) + { + $retval .= " $challenge => $answer " . $spacer; + } + + return $retval; +} + +/** + * WriteLog() + * + * This function can be accessed directly, however, anything that is + * passed to ReportError() or ReportHack(), or decho() will be logged in their + * appropriate log file. + * + * Change made: added checks to see if the log files exist before opening + * + * @param mixed $message + * @param mixed $flag + * @return + */ +define('BAYONET_LOG_HACK','bayonet_log_hack'); +define('BAYONET_LOG_ERROR','bayonet_log_error'); +define('BAYONET_LOG_WARN','bayonet_log_warn'); +define('BAYONET_LOG_INFO','bayonet_log_info'); + +function WriteLog($message,$flag) +{ + global $config; + $enabled = $config['logs']['enabled']; + + if(!$enabled) + { + return false; + } + + $dir = $config['logs']['dir']; + date_default_timezone_set($config['logs']['timezone']); + $varstr = array_dump($_GET); + $type = NULL; + $ip = $_SERVER['REMOTE_ADDR']; + $hostname = gethostbyaddr($ip); + $executed = $_SERVER['PHP_SELF']; + $timestamp = date('Y-M-d H:i:s T'); + + + $message = str_replace("\n",'',$message); + $message = str_replace("
    ",'',$message); + + switch($flag) + { + case BAYONET_LOG_HACK: + if(!file_exists($dir.'hacks.log')){ + break; + } + $fp = fopen($dir.'hacks.log','a'); + $type = 'HACK'; + $full_message = "TIMESTAMP: {$timestamp}\n\t\tIP: {$ip}\n\t\tHOSTNAME: {$hostname}\n\t\tACTION: {$type} of {$executed}\n\t\tDEFERRAL: {$message}\n\t\tVAR: ({$varstr})\n\n"; + break; + case BAYONET_LOG_ERROR: + if(!file_exists($dir.'error.log')){ + break; + } + $fp = fopen($dir.'error.log','a'); + $type = 'ERROR'; + $full_message = "({$timestamp}) - {$type} - {$message} - ({$varstr})\n"; + break; + case BAYONET_LOG_WARN: + if(!file_exists($dir.'warn.log')){ + break; + } + $fp = fopen($dir.'warn.log','a'); + $type = 'WARN'; + $full_message = "({$timestamp}) - {$type} - {$message} - ({$varstr})\n"; + break; + case BAYONET_LOG_INFO: + if(!file_exists($dir.'info.log')){ + break; + } + $fp = fopen($dir.'info.log','a'); + $type = 'INFO'; + $full_message = "({$timestamp}) - {$type} - {$message}\n"; + break; + default: + echo 'To log something, you need to define a log to write to.
    '; + return; + } + if(file_exists($fp)){ + fwrite($fp,$full_message); + fclose($fp); + }else{ + //echo "could not write to file because file does not exist.
    "; + } +} + +/** + * UnderConstruction() + * + * Displays a site-wide message across the page header. + * + * @param mixed $message + * @param mixed $flag Acceptable flags are BAYONET_SITE, and BAYONET_SECTION + * @return + */ +define('BAYONET_SITE','bayonet_site'); +define('BAYONET_SECTION','bayonet_section'); +function UnderConstruction($message = NULL, $flag = BAYONET_SITE) +{ + $timestamp = date("Y-M-d h:m:s"); + OpenTable(); + switch($flag) + { + case BAYONET_SITE: + echo "Site is currently under construction : $timestamp"; + break; + case BAYONET_SECTION: + echo "Section currently under construction : $timestamp"; + } + + if(!is_null($message)) + { + echo "$message"; + } + + CloseTable(); + echo "
    "; +} + +/** + * GetBlocks() + * + * Includes all directories listed in blocks/ and uses the bayonet_blocks + * MySQL table to determine the order of the blocks displayed. + * + * @return + */ + +define('BLOCK_LEFT',false); +define('BLOCK_RIGHT',false); + +function GetBlocks($position = BLOCK_LEFT) +{ + global $config; + /** + * I had to reconnect to the database for some fucking reason at this point. + * I have no idea why, but I was recieving errors telling me that $db was no longer + * an object. This is/was bullshit. + */ + $db = new Bayonet_SQL(); + $db->Connect( + $config['sql']['hostname'], + $config['sql']['username'], + $config['sql']['password'] + ); + $db->Select_db($config['sql']['database']); + + $result = $db->Query("SELECT * FROM `bayonet_blocks` ORDER BY weight, position"); + $blocks = $db->Fetch($result); + + foreach($blocks as $block) + { + if($block['position'] == $position && $block['active'] == true) + { + $load = 'blocks/'.$block['dir_name'].'/index.php'; + if(file_exists($load)) + { + OpenBlock($block['title']); + include $load; + CloseBlock(); + } + else + { + ReportError("Failed to load block, '{$block['dir_name']}'. Check block config."); + } + if($config['blocks']['spacer']) echo "
    "; + } + } +} + +/** + * PageRedirect() + * + * performs an http redirect + * + * @param $delay + * @param $link + */ +function PageRedirect($delay, $link) +{ + echo ""; +} ?> \ No newline at end of file diff --git a/admin/header.php b/admin/header.php index 61c19fa..7ecc702 100644 --- a/admin/header.php +++ b/admin/header.php @@ -1,81 +1,81 @@ -. - */ - -ob_start(); -$starttime = explode(' ', microtime()); -$starttime = $starttime[1] + $starttime[0]; -?> - - - - -Bayonet CMS Admin Tools - - - - - - - - - - - - - - - - - - - +. + */ + +ob_start(); +$starttime = explode(' ', microtime()); +$starttime = $starttime[1] + $starttime[0]; +?> + + + + +Bayonet CMS Admin Tools + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/admin/images/tree_blank.gif b/admin/images/tree_blank.gif new file mode 100644 index 0000000..a2a96d6 Binary files /dev/null and b/admin/images/tree_blank.gif differ diff --git a/admin/images/tree_branch.gif b/admin/images/tree_branch.gif new file mode 100644 index 0000000..5e13681 Binary files /dev/null and b/admin/images/tree_branch.gif differ diff --git a/admin/images/tree_leaf.gif b/admin/images/tree_leaf.gif new file mode 100644 index 0000000..94ef67a Binary files /dev/null and b/admin/images/tree_leaf.gif differ diff --git a/admin/index.php b/admin/index.php index da8e92d..c1209e5 100644 --- a/admin/index.php +++ b/admin/index.php @@ -55,6 +55,23 @@ include 'header.php'; //this is so dirty... sigh. if(is_loggedin()) { + + //GET ADMIN USER INFO - DEFINE IMPORTANT INFO + $username = $_SESSION['username']; + $result = $db->Query("SELECT user_id, level FROM bayonet_users WHERE username = '$username' LIMIT 1"); + $row = $db->FetchRow($result); + define("ADMIN_USERNAME", $username); + define("ADMIN_ID", $row['user_id']); + define("ADMIN_LEVEL", $row['level']); + + + if(isset($_GET['op'])){ + ?> + +
    @@ -65,7 +82,7 @@ include 'header.php'; bayonet online web admin Account Settings  |  - Logout, + Logout, @@ -109,6 +126,7 @@ include 'header.php';
    +
    diff --git a/admin/modules/functions.php b/admin/modules/functions.php index 3c44b5a..1d8d917 100644 --- a/admin/modules/functions.php +++ b/admin/modules/functions.php @@ -1,171 +1,42 @@ -. - */ - -function ListModules() -{ - global $db; - $result = $db->Query("SELECT * FROM `bayonet_blocks` ORDER BY `active` DESC, `weight` ASC, `position`"); - $blocks = $db->fetch($result); - - echo ""; - foreach($blocks as $block) - { - echo ""; - } - echo "
    Existing Blocks
    {$block['weight']} : {$block['dir_name']}EditDelete
    "; -} - -function NewModule() -{ - global $db; - if(isset($_POST['processed'])) - { - //Secure our data to prevent injection attacks. - $weight = addslashes($_POST['weight']); - $dir_name = addslashes($_POST['dir_name']); - $position = addslashes($_POST['position']); - $active = addslashes($_POST['active']); - $title = addslashes($_POST['title']); - - if(!is_int($weight) || empty($dir_name) || empty($title) || !is_int($position)) - { - echo "You must fill everything out before proceeding."; - return; - } - //Update the database with the new data. - $db->Query("INSERT INTO `bayonet_blocks` SET `weight` = '$weight', `dir_name` = '$dir_name', `title` = '$title', `position` = '$position', `active` = '$active'"); - //die, because we have completed what we wanted to do. - echo "New block, '$dir_name', at position '$weight' added.\n"; - return; - } - - ?> -
    - - - - - - - -
    Title
    Weight
    Position
    Directory Name
    Active -
    -
    - 'Yes',0 => 'No'); - foreach($options as $option => $value) - { - $selected = NULL; - if($active == $option) - { - $selected = "selected"; - } - echo "\n"; - } - - -} - -function EditModule($module_id) -{ - global $db; - if(isset($_POST['processed'])) - { - //Secure our data to prevent injection attacks. - $weight = (int) addslashes($_POST['weight']); - $dir_name = addslashes($_POST['dir_name']); - $position = (int) addslashes($_POST['position']); - $active = addslashes($_POST['active']); - $title = addslashes($_POST['title']); - - if(!is_int($weight) || empty($dir_name) || empty($title) || !is_int($position)) - { - echo "You must fill everything out before proceeding."; - return; - } - - //Update the database with the new data. - $db->Query("UPDATE bayonet_blocks SET weight = '$weight', dir_name = '$dir_name', position = '$position', active = '$active' WHERE block_id = '$block_id'"); - //$isActive = $active ? "IS" : "IS NOT"; - echo "Block, '$dir_name', at position '$weight' has been edited.\n"; - PageRedirect(3, "?op=blocks"); - //die, because we have completed what we wanted to do. - return; - } - - //Grab the page from the database according to the $page_id passed to the function. - $result = $db->Query("SELECT weight,dir_name,position,active,title FROM bayonet_blocks WHERE block_id = '$block_id'"); - $block = $db->Fetch($result) - - ?> -
    - - - - - - - - -
    Title
    Weight
    Position
    Directory Name
    Active - -
    -
    - Query("SELECT dir_name FROM bayonet_blocks WHERE block_id = '$block_id'"); - $block = $db->Fetch($result); - - if(isset($_POST['proceed'])) - { - echo "Block '{$block['dir_name']}', was deleted."; - $db->Query("DELETE FROM bayonet_blocks WHERE block_id = '$block_id' LIMIT 1"); - return; - } - if(isset($_POST['cancel'])) - { - echo "User cancelled deletion of page: '{$block['dir_name']}'"; - return; - } - - ?> -
    - - - -
    Are you SURE you want to delete the block titled: ''?
       
    -
    - . + */ + +function ListModules(){ + + global $db; + $result = $db->Query("SELECT dir_name, weight, status FROM bayonet_modules ORDER BY status DESC, weight ASC"); + $modules = $db->Fetch($result); + + OpenTable("50%"); + echo "Directory NameWeightStatus"; + foreach($modules as $module){ + echo "".$module['dir_name']."".$module['weight']."".$module['status'].""; + } + CloseTable(); +} + +function EditModule($module_id){ + +} + +function DeleteModule($module_id){ + +} + ?> \ No newline at end of file diff --git a/admin/modules/index.php b/admin/modules/index.php index 94e2814..28382eb 100644 --- a/admin/modules/index.php +++ b/admin/modules/index.php @@ -1,59 +1,61 @@ -. - */ - -/** - * This file administers the site modules. - * - * -weight - * -directory name - */ - -if(!defined("ADMIN_FILE")) -{ - die("Access denied."); -} - -echo "Do a database for the index modules, thats all this really is anyway.
    "; -include $basedir.'modules/functions.php'; - -if(isset($_GET['edit'])) -{ - $module_id = $_GET['edit']; - EditModule($module_id); - return; -} - -if(isset($_GET['delete'])) -{ - $module_id = $_GET['delete']; - DeleteModule($module_id); - return; -} - -if(isset($_GET['create'])) -{ - NewModule(); - return; -} - -//echo "
    ".LinkInternal('Create a Module','?load=admin&op=modules&create=true')."
    "; - -//ListModules(); - +. + */ + +/** + * This file administers the site modules. + * + * -weight + * -directory name + */ + + ?> +

    - Manage Modules

    + "; +include $basedir.'modules/functions.php'; + +if(isset($_GET['edit'])){ + $module_id = $_GET['edit']; + EditModule($module_id); + return; + +}else if(isset($_GET['delete'])){ + $module_id = $_GET['delete']; + DeleteModule($module_id); + return; + +}else if(isset($_GET['create'])){ + NewModule(); + return; + +}else{ + ListModules(); +} + +//echo "
    ".LinkInternal('Create a Module','?load=admin&op=modules&create=true')."
    "; + +//ListModules(); + ?> \ No newline at end of file diff --git a/admin/navigation/functions.php b/admin/navigation/functions.php index 68ab7c3..da8a8e4 100644 --- a/admin/navigation/functions.php +++ b/admin/navigation/functions.php @@ -1,91 +1,91 @@ - - - -. - */ - -/** - * Note to anyone feeling the need to edit this file... - * You MUST declare $db as global inside your functions in order access MySQL from here. - */ - -function ListNavigation(){ - - global $db; - $result = $db->Query("SELECT `nav_id`, `title`, `weight` FROM `bayonet_navigation` ORDER BY `weight`"); - $data = $db->Fetch($result); - - ?> -
    - - - - - -
    News Reel Order
    -
      - {$nav['title']}"; - } - ?> -
    - Click and drag on a slide to change the order. Wait for confirmation indicating the changes have been saved. -
    - + +ul { + margin: 0; +} + +#contentLeft { + width: 400px; +} + +#contentLeft li { + list-style: none; + margin: 0 0 4px 0; + padding: 10px; + background-color:#a1a1a1; + border: #CCCCCC solid 1px; + color:#fff; + text-align:center; + cursor:move; +} + + + + +. + */ + +/** + * Note to anyone feeling the need to edit this file... + * You MUST declare $db as global inside your functions in order access MySQL from here. + */ + +function ListNavigation(){ + + global $db; + $result = $db->Query("SELECT `nav_id`, `title`, `weight` FROM `bayonet_navigation` ORDER BY `weight`"); + $data = $db->Fetch($result); + + ?> +
    + + + + + +
    News Reel Order
    +
      + {$nav['title']}"; + } + ?> +
    + Click and drag on a slide to change the order. Wait for confirmation indicating the changes have been saved. +
    + \ No newline at end of file diff --git a/admin/navigation/index.php b/admin/navigation/index.php index e2179a1..fff3196 100644 --- a/admin/navigation/index.php +++ b/admin/navigation/index.php @@ -1,54 +1,54 @@ -. - */ - ?> - -

    - Navigation Links

    - -Edit Order, Edit Page, Delete Pages, Add Pages
    - -. + */ + ?> + +

    - Navigation Links

    + -Edit Order, Edit Page, Delete Pages, Add Pages
    + + \ No newline at end of file diff --git a/admin/news/functions.php b/admin/news/functions.php index 6feabcf..9645311 100644 --- a/admin/news/functions.php +++ b/admin/news/functions.php @@ -21,24 +21,20 @@ function ListNews(){ global $db; - $result = $db->Query("SELECT n.news_id, n.title, n.message, n.date, n.category_id, u.username AS author, c.name AS catname, c.image AS catimage ". + $result = $db->Query("SELECT n.news_id, n.title, n.date, n.category_id, u.username AS author, c.name AS catname, c.image AS catimage ". "FROM `bayonet_news` AS n ". "INNER JOIN `bayonet_news_categories` AS c ON c.category_id = n.category_id ". - "LEFT OUTER JOIN `mybb_users` AS u ON u.uid = n.author_id ORDER BY `date` DESC"); + "LEFT OUTER JOIN `bayonet_users` AS u ON u.user_id = n.author_id ORDER BY `date` DESC"); $row = $db->Fetch($result); foreach($row as $news) { - $newsBody = $news['message']; - echo ""; - echo "{$news['title']} | {$news['catname']}  
    "; - if(($len = strlen($newsBody))>150) - echo substr($newsBody, 0, 150)."..."; - else - echo $newsBody; - echo '
    '; - echo "Posted By: {$news['author']} on ".date('D M j, Y g:i a T', strtotime($news['date'])); - echo '

    '; +?> + +  |   
    + Posted By: on +

    +Query("UPDATE `bayonet_news` SET `title` = '$title', `message` = '$text', `author_id` = '$author_id', `edited` = '$datetime', `edited_id` = '$edited_id' WHERE `news_id` = '$news_id'"); + decho("UPDATE `bayonet_news` SET `title` = '$title', `message` = '$text', `author_id` = '$author_id', `edited` = '$datetime', `edited_id` = '$edited_id' WHERE `news_id` = '$news_id'"); + PageRedirect(1, "?op=news"); return; } - $result = $db->Query("SELECT `author_id`, `title`, `message`, `date`, `category_id` FROM `bayonet_news` WHERE `news_id` = '$news_id' LIMIT 1"); + $result = $db->Query("SELECT `author_id`, `title`, `message`, `date`, `category_id`, `edited`, `edited_id` FROM `bayonet_news` WHERE `news_id` = '$news_id' LIMIT 1"); $row = $db->FetchRow($result); - ?> +?> +

    Edit News

    -
    + + Originally posted on +Last edited on ".date('n/j/Y @ g:ia e', strtotime($row['edited'])); + } +?> - -
    Author
    Title
    Date
    Time
    Text
    - Query("INSERT INTO `bayonet_news` SET `title` = '$title', `message` = '$text', `author_id` = '$author_id', `date` = '$datetime', `category_id` = '$category_id'"); + + decho("INSERT INTO `bayonet_news` SET `title` = '$title', `message` = '$text', `author_id` = '$author_id', `date` = '$datetime', `category_id` = '$category_id'"); + PageRedirect(1, "?op=news"); + return; + } +?> + +

    Post News

    +
    + + + + +
     
    +
    +"; + CreateNews(); } diff --git a/admin/newsreel/functions.php b/admin/newsreel/functions.php index 6bde17c..f8cb759 100644 --- a/admin/newsreel/functions.php +++ b/admin/newsreel/functions.php @@ -1,160 +1,160 @@ - - - -. - */ - - define(MAX_SLIDES, 6); - - function EditOrder(){ - - global $db; - ?> -
    - - - - - -
    News Reel Order
    -
      - Query("SELECT `title`, `slide_id`, `src` FROM `bayonet_newsreel` WHERE `visible` = 1 ORDER BY `weight` ASC"); - $row = $db->Fetch($result); - - foreach($row as $slide){ - echo "
    • "; - PrintSlide($slide); - echo "
      • "; - } -?> -
    - Click and drag on a slide to change the order. Wait for confirmation indicating the changes have been saved. -
    -= MAX_SLIDES){ - ReportError("There are already 6 active slides. You must disable one in order to enable another."); - PageRedirect(3,"?op=newsreel"); - return; - } - $weight = $lastspot+1; - $db->Query("UPDATE `bayonet_newsreel` SET `visible` = 1, `weight` = '$weight' WHERE `slide_id` = '$slide_id' LIMIT 1"); - PageRedirect(0,"?op=newsreel"); - } - - function DisableSlide($slide_id){ - - global $db; - $result = $db->Query("SELECT `weight` FROM `bayonet_newsreel` WHERE `slide_id` = '$slide_id' LIMIT 1"); - $slide = $db->FetchRow($result); - - $oldWeight = $slide['weight']; - - if($oldWeight < MAX_SLIDES){ - $total = getNumOfActive(); - for($i=$oldWeight+1; $i<=$total; $i++){ - //echo "Change Weight:".$i." to ".($i-1)."
    "; - $new = $i-1; - $db->Query("UPDATE `bayonet_newsreel` SET `weight` = '$new' WHERE `weight` = '$i' LIMIT 1"); - } - } - - $db->Query("UPDATE `bayonet_newsreel` SET `visible` = 0, `weight` = 0 WHERE `slide_id` = '$slide_id' LIMIT 1"); - PageRedirect(0,"?op=newsreel"); - } - - function ListInactive(){ - - global $db; - echo "

    Disabled Slides

    "; - $result = $db->Query("SELECT `slide_id`, `title`, `src` FROM `bayonet_newsreel` WHERE `visible` = 0 ORDER BY `slide_id` DESC"); - $row = $db->Fetch($result); - - foreach($row as $slide){ - echo PrintSlide($slide); - echo "


    "; - } - } - - function PrintSlide($slide){ - echo "{$slide['title']}"; - if(file_exists("../modules/newsreel/slides/{$slide['src']}") && $slide['src'] != ""){ - echo "
    "; - } - } - - function GetLastPosition(){ - - global $db; - $result = $db->Query("SELECT `weight` FROM `bayonet_newsreel` WHERE `visible` = 1 ORDER BY `weight` DESC LIMIT 1"); - $row = $db->FetchRow($result); - - return $row['weight']; - } - - function getNumOfActive(){ - global $db; - $result = $db->Query("SELECT `slide_id` FROM `bayonet_newsreel` WHERE `visible` = 1"); - return $db->Rows($result); - } - - + + + +. + */ + + define(MAX_SLIDES, 6); + + function EditOrder(){ + + global $db; + ?> +
    + + + + + +
    News Reel Order
    +
      + Query("SELECT `title`, `slide_id`, `src` FROM `bayonet_newsreel` WHERE `visible` = 1 ORDER BY `weight` ASC"); + $row = $db->Fetch($result); + + foreach($row as $slide){ + echo "
    • "; + PrintSlide($slide); + echo "
      • "; + } +?> +
    + Click and drag on a slide to change the order. Wait for confirmation indicating the changes have been saved. +
    += MAX_SLIDES){ + ReportError("There are already 6 active slides. You must disable one in order to enable another."); + PageRedirect(3,"?op=newsreel"); + return; + } + $weight = $lastspot+1; + $db->Query("UPDATE `bayonet_newsreel` SET `visible` = 1, `weight` = '$weight' WHERE `slide_id` = '$slide_id' LIMIT 1"); + PageRedirect(0,"?op=newsreel"); + } + + function DisableSlide($slide_id){ + + global $db; + $result = $db->Query("SELECT `weight` FROM `bayonet_newsreel` WHERE `slide_id` = '$slide_id' LIMIT 1"); + $slide = $db->FetchRow($result); + + $oldWeight = $slide['weight']; + + if($oldWeight < MAX_SLIDES){ + $total = getNumOfActive(); + for($i=$oldWeight+1; $i<=$total; $i++){ + //echo "Change Weight:".$i." to ".($i-1)."
    "; + $new = $i-1; + $db->Query("UPDATE `bayonet_newsreel` SET `weight` = '$new' WHERE `weight` = '$i' LIMIT 1"); + } + } + + $db->Query("UPDATE `bayonet_newsreel` SET `visible` = 0, `weight` = 0 WHERE `slide_id` = '$slide_id' LIMIT 1"); + PageRedirect(0,"?op=newsreel"); + } + + function ListInactive(){ + + global $db; + echo "

    Disabled Slides

    "; + $result = $db->Query("SELECT `slide_id`, `title`, `src` FROM `bayonet_newsreel` WHERE `visible` = 0 ORDER BY `slide_id` DESC"); + $row = $db->Fetch($result); + + foreach($row as $slide){ + echo PrintSlide($slide); + echo "


    "; + } + } + + function PrintSlide($slide){ + echo "{$slide['title']}"; + if(file_exists("../modules/newsreel/slides/{$slide['src']}") && $slide['src'] != ""){ + echo "
    "; + } + } + + function GetLastPosition(){ + + global $db; + $result = $db->Query("SELECT `weight` FROM `bayonet_newsreel` WHERE `visible` = 1 ORDER BY `weight` DESC LIMIT 1"); + $row = $db->FetchRow($result); + + return $row['weight']; + } + + function getNumOfActive(){ + global $db; + $result = $db->Query("SELECT `slide_id` FROM `bayonet_newsreel` WHERE `visible` = 1"); + return $db->Rows($result); + } + + ?> \ No newline at end of file diff --git a/admin/newsreel/index.php b/admin/newsreel/index.php index 0b97deb..18a239d 100644 --- a/admin/newsreel/index.php +++ b/admin/newsreel/index.php @@ -1,46 +1,46 @@ -. - */ - -if(!defined("ADMIN_FILE")) -{ - die("Access denied."); -} - -include $basedir.'newsreel/functions.php'; -?> -

    - Manage News Reel

    - -Add/Edit/Delete needs to be completed. - - - - - -
    - -
    +. + */ + +if(!defined("ADMIN_FILE")) +{ + die("Access denied."); +} + +include $basedir.'newsreel/functions.php'; +?> +

    - Manage News Reel

    + -Add/Edit/Delete needs to be completed. + + + + + +
    + +
    diff --git a/admin/newsreel/updateDB.php b/admin/newsreel/updateDB.php index f4031a2..cd1a311 100644 --- a/admin/newsreel/updateDB.php +++ b/admin/newsreel/updateDB.php @@ -1,40 +1,49 @@ -Connect( - $config['sql']['hostname'], - $config['sql']['username'], - $config['sql']['password'] - ); -$db->Select_db($config['sql']['database']); - -if ($action == "updateReelOrder"){ - - $listingCounter = 1; - foreach ($updateRecordsArray as $recordIDValue) { - - $db->Query("UPDATE `bayonet_newsreel` SET `weight` = '$listingCounter' WHERE `slide_id` = '$recordIDValue'"); - $listingCounter = $listingCounter + 1; - } - echo ""; -/* - echo '
    ';
-	print_r($updateRecordsArray);
-	echo '
    '; - echo 'If you refresh the page, you will see that records will stay just as you modified.'; -*/ -} -else{ - echo ""; -} -date_default_timezone_set("America/New_York"); -echo " Updated at ".date("g:i:s a", time()); +Connect($config['sql']['hostname'], $config['sql']['username'], $config['sql']['password']); +$db->Select_db($config['sql']['database']); + +/*----------------------------- */ + +$action = $_POST['action']; +$updateRecordsArray = $_POST['recordsArray']; + +if ($action == "updateReelOrder"){ + + $listingCounter = 1; + foreach ($updateRecordsArray as $recordIDValue) { + + $db->Query("UPDATE `bayonet_newsreel` SET `weight` = '$listingCounter' WHERE `slide_id` = '$recordIDValue'"); + $listingCounter = $listingCounter + 1; + } + echo ""; +/* + echo '
    ';
+	print_r($updateRecordsArray);
+	echo '
    '; + echo 'If you refresh the page, you will see that records will stay just as you modified.'; +*/ +} +else{ + echo ""; +} +date_default_timezone_set("America/New_York"); +echo " Updated at ".date("g:i:s a", time()); ?> \ No newline at end of file diff --git a/admin/rudi/functions.php b/admin/rudi/functions.php index b22468b..dc6faea 100644 --- a/admin/rudi/functions.php +++ b/admin/rudi/functions.php @@ -1,71 +1,71 @@ -. - */ - /* - include $basedir.'rudi/functions.php'; - - //chek to see if the person is indeed an quartermaster - - if(isset($_GET['edit'])){ - - if($_GET['edit'] == "profile"){ - $member_id = $_GET['id']; - EditProfile($member_id); - return; - } - if($_GET['edit'] == "service"){ - if(isset($_GET['var'])){ - if($_GET['var'] == "add"){ - $member_id = $_GET['id']; - AddServiceRecord($member_id); - } - if($_GET['var'] == "edit"){ - $record_id = $_GET['id']; - EditServiceRecord($record_id); - } - if($_GET['var'] == "delete"){ - $record_id = $_GET['id']; - } - }else{ - $member_id = $_GET['id']; - ListServiceRecord($member_id); - } - return; - } - if($_GET['edit'] == "medals"){ - if(isset($_GET['var'])){ - if($_GET['var'] == "add"){ - - } - if($_GET['var'] == "edit"){ - - } - if($_GET['var'] == "delete"){ - - } - }else{ - $member_id = $_GET['id']; - ListMedalRecord($member_id); - } - - return; - } - } - - ListMembers(); */ +. + */ + /* + include $basedir.'rudi/functions.php'; + + //chek to see if the person is indeed an quartermaster + + if(isset($_GET['edit'])){ + + if($_GET['edit'] == "profile"){ + $member_id = $_GET['id']; + EditProfile($member_id); + return; + } + if($_GET['edit'] == "service"){ + if(isset($_GET['var'])){ + if($_GET['var'] == "add"){ + $member_id = $_GET['id']; + AddServiceRecord($member_id); + } + if($_GET['var'] == "edit"){ + $record_id = $_GET['id']; + EditServiceRecord($record_id); + } + if($_GET['var'] == "delete"){ + $record_id = $_GET['id']; + } + }else{ + $member_id = $_GET['id']; + ListServiceRecord($member_id); + } + return; + } + if($_GET['edit'] == "medals"){ + if(isset($_GET['var'])){ + if($_GET['var'] == "add"){ + + } + if($_GET['var'] == "edit"){ + + } + if($_GET['var'] == "delete"){ + + } + }else{ + $member_id = $_GET['id']; + ListMedalRecord($member_id); + } + + return; + } + } + + ListMembers(); */ ?> \ No newline at end of file diff --git a/admin/rudi/includes/functions.awards.php b/admin/rudi/includes/functions.awards.php index 439f0e1..0b4b1e2 100644 --- a/admin/rudi/includes/functions.awards.php +++ b/admin/rudi/includes/functions.awards.php @@ -1,20 +1,20 @@ -Query("SELECT `name`, `class_id` FROM `rudi_award_classes`"); - return $db->Fetch($result); - } - - function getAwardsByClass($class_id){ - global $db; - $result = $db->Query("SELECT `award_id`, `name`, `image`, `description` FROM `rudi_awards` WHERE `class_id` = '$class_id' ORDER BY `name`"); - return $db->Fetch($result); - } - - function getAward($award_id){ - global $db; - $result = $db->Query("SELECT `award_id`, `name`, `image`, `description`, `class_id` FROM `rudi_awards` WHERE `award_id` = '$award_id' LIMIT 1"); - return $db->FetchRow($result); - } +Query("SELECT `name`, `class_id` FROM `rudi_award_classes`"); + return $db->Fetch($result); + } + + function getAwardsByClass($class_id){ + global $db; + $result = $db->Query("SELECT `award_id`, `name`, `image`, `description` FROM `rudi_awards` WHERE `class_id` = '$class_id' ORDER BY `name`"); + return $db->Fetch($result); + } + + function getAward($award_id){ + global $db; + $result = $db->Query("SELECT `award_id`, `name`, `image`, `description`, `class_id` FROM `rudi_awards` WHERE `award_id` = '$award_id' LIMIT 1"); + return $db->FetchRow($result); + } ?> \ No newline at end of file diff --git a/admin/rudi/includes/functions.battles.php b/admin/rudi/includes/functions.battles.php new file mode 100644 index 0000000..2b878da --- /dev/null +++ b/admin/rudi/includes/functions.battles.php @@ -0,0 +1,70 @@ +Query("SELECT w.war_id, + w.title, + w.visit_unit_id, + w.home_score, + w.visit_score, + w.date, + w.status, + v.name + FROM rudi_war_stats AS w + LEFT OUTER JOIN rudi_war_units AS v + ON v.visitor_id = w.visit_unit_id + ORDER BY w.date"); + $data = $db->Fetch($result); + + return $data; + } + + function getBattleInfo($war_id){ + global $db; + + $result = $db->Query("SELECT w.war_id, + w.title, + w.visit_unit_id, + w.home_score, + w.visit_score, + w.date, + w.status, + v.name + FROM rudi_war_stats AS w + LEFT OUTER JOIN rudi_war_units AS v + ON v.visitor_id = w.visit_unit_id + WHERE w.war_id = {$war_id}"); + $data = $db->FetchRow($result); + + return $data; + } + + function getCombatSoldiers($war_id){ + global $db; + + $query = "SELECT m.member_id, + m.first_name, + m.last_name, + r.shortname, + r.longname, + w.record_id, + + FROM rudi_combat_record AS w + JOIN rudi_unit_members AS m + ON m.member_id = w.member_id + JOIN rudi_ranks AS r + ON m.rank_id = r.rank_id + WHERE m.status_id < 4, w.war_id = {$war_id} OR w.war_id IS NULL + ORDER BY r.weight DESC , m.date_promotion ASC , m.date_enlisted ASC"; + + decho($query); + $result = $db->Query($query); + $data = $db->Fetch($result); + + + + return $data; + } + +?> \ No newline at end of file diff --git a/admin/rudi/includes/functions.members.php b/admin/rudi/includes/functions.members.php index 6a4970e..86848dc 100644 --- a/admin/rudi/includes/functions.members.php +++ b/admin/rudi/includes/functions.members.php @@ -48,9 +48,17 @@ function GetRoles(){ global $db; - $result = $db->Query("SELECT * FROM `rudi_roles`"); - $row = $db->Fetch($result); - return $row; + $data = array(); + $result = $db->Query("SELECT * FROM `rudi_role_classes` ORDER BY `weight` ASC"); + $classes = $db->Fetch($result); + + foreach($classes as $class){ + $rclass_id = $class['rclass_id']; + $result2 = $db->Query("SELECT * FROM rudi_roles WHERE rclass_id = '$rclass_id' ORDER BY `weight` ASC"); + $data[] = array("name" => $class['name'], "roles" => $db->Fetch($result2)); + } + + return $data; } function GetCountry(){ @@ -177,7 +185,7 @@ Edit - Delete + Delete Query("SELECT r.date_added, r.record_note, r.member_id, a.name FROM rudi_award_record AS r LEFT OUTER JOIN rudi_awards AS a ON a.award_id = r.award_id WHERE r.record_id = '$record_id' LIMIT 1"); + $record = $db->FetchRow($result); + decho($record_id); + decho($record); + $form = new BayonetForm("", "POST"); + + if(isset($_POST['proceed'])) + { + echo "Award '{$record['name']}', was deleted from that soldiers record."; + $db->Query("DELETE FROM `rudi_award_record` WHERE `record_id` = '$record_id' LIMIT 1"); + PageRedirect(2, "?op=rudi&show=members&award={$record['member_id']}"); + return; + } + if(isset($_POST['cancel'])) + { + echo "User cancelled deletion of award: '{$record['name']}'"; + PageRedirect(2, "?op=rudi&show=members&award={$award['member_id']}"); + return; + } + + OpenTable(); +?> + Are you SURE you want to delete the award record: ''? for this member?
    All changes are final. +     +__destruct(); + } + function AddAwardRecord($member_id){ global $db; diff --git a/admin/rudi/includes/functions.units.php b/admin/rudi/includes/functions.units.php new file mode 100644 index 0000000..5005fa0 --- /dev/null +++ b/admin/rudi/includes/functions.units.php @@ -0,0 +1,33 @@ +Query("SELECT `unit_id`, `name` FROM `rudi_combat_units` WHERE `detachment` = 0 "); + $row = $db->Fetch($result); + foreach($row as $unit){ + $unit_name = $unit['name']; + $unit_id = $unit['unit_id']; + echo ' '.$unit_name.'
    '; + selectUnits($unit_id, 0, $member['cunit_id']); + } + } + + function selectUnits($previous_unit, $indent, $members_unit){ + global $db; + + $indent++; + //$formatting = str_repeat("     ", $indent); + $formatting = str_repeat('', $indent); + + $result = $db->Query("SELECT `unit_id`, `name` FROM `rudi_combat_units` WHERE `detachment` = '$previous_unit'"); + $row = $db->Fetch($result); + foreach($row as $unit){ + $unit_id = $unit['unit_id']; + $unit_name = $unit['name']; + echo $formatting.' '.$unit_name.'
    '; + + selectUnits($unit_id, $indent, $members_unit); + } + } + +?> \ No newline at end of file diff --git a/admin/rudi/index.php b/admin/rudi/index.php index 2e4a42a..62eaacf 100644 --- a/admin/rudi/index.php +++ b/admin/rudi/index.php @@ -1,59 +1,63 @@ -. - */ - - ?> - -

    - RUDI/Quartermaster Control Panel

    - . + */ + + ?> + +

    - RUDI/Quartermaster Control Panel

    + \ No newline at end of file diff --git a/admin/rudi/views/view.awards.add.php b/admin/rudi/views/view.awards.add.php new file mode 100644 index 0000000..9c97c54 --- /dev/null +++ b/admin/rudi/views/view.awards.add.php @@ -0,0 +1,27 @@ +verifySubmit('processed')) + { + global $db; + $name = $form->request['name']; + $text = $form->request['text']; + $db->Query("INSERT INTO `rudi_awards` SET `class_id` = '$class_id', `name` = '$name', `image` = '', `description` = '$text'"); + + PageRedirect(1, "?op=rudi&show=awards&cid={$class_id}"); + return; + } + echo LinkInternal("Cancel","?op=rudi&show=awards&cid={$class_id}"); + OpenTable(); +?> + +Name:textField('name', "", false, "50"); ?> +Image: +Text:textArea('text',10,30); ?> +submitButton('processed', 'Add'); ?> + +__destruct(); +?> + diff --git a/admin/rudi/views/view.awards.delete.php b/admin/rudi/views/view.awards.delete.php new file mode 100644 index 0000000..6fde068 --- /dev/null +++ b/admin/rudi/views/view.awards.delete.php @@ -0,0 +1,29 @@ +Query("SELECT `name`, `class_id` FROM `rudi_awards` WHERE `award_id` = '$award_id' LIMIT 1"); + $award = $db->FetchRow($result); + $form = new BayonetForm("", "POST"); + + if(isset($_POST['proceed'])) + { + echo "Award '{$award['name']}', was deleted."; + $db->Query("DELETE FROM `rudi_awards` WHERE `award_id` = '$award_id' LIMIT 1"); + PageRedirect(2, "?op=rudi&show=awards&cid={$award['class_id']}"); + return; + } + if(isset($_POST['cancel'])) + { + echo "User cancelled deletion of award: '{$award['name']}'"; + PageRedirect(2, "?op=rudi&show=awards&cid={$award['class_id']}"); + return; + } + + OpenTable(); +?> + Are you SURE you want to delete the award titled: ''?
    All users who have recieved this award will lose it off their records (not yet at least). +     +__destruct(); +?> \ No newline at end of file diff --git a/admin/rudi/views/view.awards.edit.php b/admin/rudi/views/view.awards.edit.php index 21ec156..0b82ef6 100644 --- a/admin/rudi/views/view.awards.edit.php +++ b/admin/rudi/views/view.awards.edit.php @@ -1,27 +1,27 @@ -verifySubmit('processed')) - { - global $db; - $name = $form->request['name']; - $text = $form->request['text']; - $db->Query("UPDATE `rudi_awards` SET `name` = '$name', `description` = '$text' WHERE `award_id` = '$award_id' LIMIT 1"); - - PageRedirect(1, "?op=rudi&show=awards&award={$award_id}"); - return; - } - echo LinkInternal("Cancel","?op=rudi&show=awards&cid={$award['class_id']}"); - OpenTable(); -?> - -Name:textField('name', $award['name'], false, "50"); ?> -Image: -Text:textArea('text',10,30,$award['description']); ?> -submitButton('processed', 'Update'); ?> - -__destruct(); -?> - +verifySubmit('processed')) + { + global $db; + $name = $form->request['name']; + $text = $form->request['text']; + $db->Query("UPDATE `rudi_awards` SET `name` = '$name', `description` = '$text' WHERE `award_id` = '$award_id' LIMIT 1"); + + PageRedirect(1, "?op=rudi&show=awards&award={$award_id}"); + return; + } + echo LinkInternal("Cancel","?op=rudi&show=awards&cid={$award['class_id']}"); + OpenTable(); +?> + +Name:textField('name', $award['name'], false, "50"); ?> +Image: +Text:textArea('text',10,30,$award['description']); ?> +submitButton('processed', 'Update'); ?> + +__destruct(); +?> + diff --git a/admin/rudi/views/view.awards.php b/admin/rudi/views/view.awards.php index b4c912f..3a5729f 100644 --- a/admin/rudi/views/view.awards.php +++ b/admin/rudi/views/view.awards.php @@ -1,40 +1,40 @@ -Award Classes"; - $classes = getAwardClasses(); - OpenTable(); - echo ""; - foreach($classes as $class){ - echo "".LinkInternal($class['name'],'?op=rudi&show=awards&cid='.$class['class_id']).""; - } - echo ""; - CloseTable(); - - if(isset($_GET['cid'])){ - $class_id = $_GET['cid']; - $awards = getAwardsByClass($class_id); - echo "

    Awards

    "; - echo LinkInternal(' Add New Award','?op=rudi&show=awards&cid={$class_id}&add=true'); - OpenTable(); - foreach($awards as $award){ - echo "".$award['name']." - Edit - Delete"; - } - CloseTable(); - //include 'view.members.profile.php'; - }else if(isset($_GET['aid'])){ - $award_id = $_GET['aid']; - //include 'view.members.service.php'; - } - } +Award Classes"; + $classes = getAwardClasses(); + OpenTable(); + echo ""; + foreach($classes as $class){ + echo "".LinkInternal($class['name'],'?op=rudi&show=awards&cid='.$class['class_id']).""; + } + echo ""; + CloseTable(); + + if(isset($_GET['cid'])){ + $class_id = $_GET['cid']; + $awards = getAwardsByClass($class_id); + echo "

    Awards

    "; + echo LinkInternal(' Add New Award','?op=rudi&show=awards&cid={$class_id}&add=true'); + OpenTable(); + foreach($awards as $award){ + echo "".$award['name']." + Edit + Delete"; + } + CloseTable(); + //include 'view.members.profile.php'; + }else if(isset($_GET['aid'])){ + $award_id = $_GET['aid']; + //include 'view.members.service.php'; + } + } ?> \ No newline at end of file diff --git a/admin/rudi/views/view.battles.list.php b/admin/rudi/views/view.battles.list.php new file mode 100644 index 0000000..573d422 --- /dev/null +++ b/admin/rudi/views/view.battles.list.php @@ -0,0 +1,18 @@ + Use AJAX oncheck to save the status of that member + + $battle = getBattleInfo($war_id); + + decho($battle); + + $members = getCombatSoldiers($war_id); + + decho($members); + +?> +

    Engagement :

    \ No newline at end of file diff --git a/admin/rudi/views/view.battles.php b/admin/rudi/views/view.battles.php new file mode 100644 index 0000000..d00452e --- /dev/null +++ b/admin/rudi/views/view.battles.php @@ -0,0 +1,36 @@ + click one to view who was attending (lists everyone in the unit and those attending) + // buttons to add/edit/delete battles + + // definitely gonna use ajax for this... + + include $basedir.'rudi/includes/functions.battles.php'; + + if(isset($_GET['id'])){ + $war_id = $_GET['id']; + include 'view.battles.list.php'; + }else if(isset($_GET['service'])){ + $member_id = $_GET['service']; + include 'view.members.service.php'; + }else{ + + // list all battles + $battles = getAllBattles(); + decho($battles); + +?> +

    Unit Engagement:

    + + +"; + + } + CloseTable(); + } +?> \ No newline at end of file diff --git a/admin/rudi/views/view.members.award.php b/admin/rudi/views/view.members.award.php index cda8595..db6f88e 100644 --- a/admin/rudi/views/view.members.award.php +++ b/admin/rudi/views/view.members.award.php @@ -1,19 +1,22 @@ -Query("SELECT `first_name`, `last_name` FROM `rudi_unit_members` WHERE `member_id` = '$member_id' LIMIT 1"); - $member = $db->FetchRow($result); - echo "

    Award Record of {$member['first_name']} {$member['last_name']}

    "; - - if(isset($_GET['edit'])){ - $record_id = $_GET['edit']; - EditAwardRecord($record_id); - }else if(isset($_GET['add'])){ - if($_GET['add']){ - AddAwardRecord($_GET['award']); - } - }else{ - - echo "
    ".LinkInternal('Back to Roster', '?op=rudi&show=members')."
    "; - ListAwardRecord($_GET['award']); - } +Query("SELECT `first_name`, `last_name` FROM `rudi_unit_members` WHERE `member_id` = '$member_id' LIMIT 1"); + $member = $db->FetchRow($result); + echo "

    Award Record of {$member['first_name']} {$member['last_name']}

    "; + + if(isset($_GET['edit'])){ + $record_id = $_GET['edit']; + EditAwardRecord($record_id); + }else if(isset($_GET['add'])){ + if($_GET['add']){ + AddAwardRecord($_GET['award']); + } + }else if(isset($_GET['delete'])){ + $record_id = $_GET['delete']; + DeleteAwardRecord($record_id); + }else{ + + echo "
    ".LinkInternal('Back to Roster', '?op=rudi&show=members')."
    "; + ListAwardRecord($_GET['award']); + } ?> \ No newline at end of file diff --git a/admin/rudi/views/view.members.new.php b/admin/rudi/views/view.members.new.php new file mode 100644 index 0000000..cbc086f --- /dev/null +++ b/admin/rudi/views/view.members.new.php @@ -0,0 +1,179 @@ +Query($query); + + $member_id = $db->InsertID(); + decho($member_id); + $db->Query("INSERT INTO `rudi_roles_container` SET `role_id` = '$role_id', `member_id` = '$member_id'"); + + PageRedirect(1, "?op=rudi&show=members"); + return; + } +?> + Cancel
    + +
    TitleOpponentResultDate
    {$battle['title']}vs {$battle['name']}{$battle['status']} {$battle['home_score']}-{$battle['visit_score']}"; + echo date("M j Y", strtotime($battle['date'])); + echo "
    + + + +
    Personnel File of
    Rank: + +
    Country: + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Vital Statistics
    First:
    Last:
    Username:
    City:
    Province:
    Status: + +
    Primary MOS:
    Role: + +
    Unit: + +
    Weapons: + +
    Enlisted Date:
    Promotion Date: + +
    Discharge Date:
    Xfire:
    E-Mail:
    +
    + + + + +
    Personal Bio
    + \ No newline at end of file diff --git a/admin/rudi/views/view.members.php b/admin/rudi/views/view.members.php index 38929df..9013b8e 100644 --- a/admin/rudi/views/view.members.php +++ b/admin/rudi/views/view.members.php @@ -9,13 +9,18 @@ }else if(isset($_GET['award'])){ $member_id = $_GET['award']; include 'view.members.award.php'; + }else if(isset($_GET['create']) && $_GET['create'] == "soldier"){ + include 'view.members.new.php'; }else{ global $db; - echo "

    Current Members

    "; - echo ""; - echo ""; + echo LinkInternal('New Soldier','?op=rudi&show=members&create=soldier'); +?> +

    Current Members

    +
    RankSoldierMain InfoService RecordMedal Record
    + +Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE rudi_unit_members.status_id <= 3 ORDER BY rudi_ranks.weight DESC , rudi_unit_members.date_promotion ASC , rudi_unit_members.date_enlisted ASC"); $row = $db->Fetch($result); @@ -28,10 +33,11 @@ echo ""; } CloseTable(); - - echo "

    Previous Members

    "; - echo "
    RankSoldierMain InfoService RecordMedal Record
    "; - echo ""; +?> +

    Previous Members

    +
    RankSoldierMain InfoService RecordMedal Record
    + +Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE rudi_unit_members.status_id > 3 ORDER BY rudi_ranks.weight DESC, rudi_unit_members.date_promotion ASC, rudi_unit_members.date_enlisted ASC"); $row = $db->Fetch($result); diff --git a/admin/rudi/views/view.members.profile.php b/admin/rudi/views/view.members.profile.php index bd776d7..6355d2e 100644 --- a/admin/rudi/views/view.members.profile.php +++ b/admin/rudi/views/view.members.profile.php @@ -10,7 +10,10 @@ $status_id = $_POST['status']; $role_id = $_POST['role']; $unit_id = $_POST['unit']; + $a2_id = $_POST['a2_id']; + $oa_id = $_POST['oa_id']; $weapon_id = $_POST['weapon']; + $weapon2_id = $_POST['weapon2']; $first_name = addslashes($_POST['first']); $last_name = addslashes($_POST['last']); $username = addslashes($_POST['username']); @@ -29,9 +32,13 @@ $query = "UPDATE `rudi_unit_members` SET" ." `rank_id` = '$rank_id'," ." `country_id` = '$country_id'," + ." `role_id` = '$role_id', " ." `status_id` = '$status_id'," ." `cunit_id` = '$unit_id'," ." `weapon_id` = '$weapon_id'," + ." `weapon2_id` = '$weapon2_id'," + ." `a2_id` = '$a2_id'," + ." `oa_id` = '$oa_id'," ." `username` = '$username'," ." `email` = '$email'," ." `xfire` = '$xfire'," @@ -51,10 +58,10 @@ decho($query); $db->Query($query); - $db->Query("UPDATE `rudi_roles_container` SET `role_id` = '$role_id' WHERE `member_id` = '$member_id' LIMIT 1"); + //$db->Query("UPDATE `rudi_roles_container` SET `role_id` = '$role_id' WHERE `member_id` = '$member_id' LIMIT 1"); /* do the role query as well */ - PageRedirect(1, "?op=rudi&show=members&profile={$member_id}"); + PageRedirect(1, "?op=rudi&show=members"); return; } $member = GetMember($member_id); @@ -87,6 +94,8 @@ ?> + +
    RankSoldierMain InfoService RecordMedal Record
    ArmA2 ID
    ArmA2:OA ID
    @@ -118,15 +127,21 @@ - + diff --git a/admin/rudi/views/view.units.php b/admin/rudi/views/view.units.php index 2ccf35a..ab3dedd 100644 --- a/admin/rudi/views/view.units.php +++ b/admin/rudi/views/view.units.php @@ -1,22 +1,29 @@ - -
    - Kilo Company
    - 1st Platoon
    - 1st Squad
    - Fireteam Alpha
    - Fireteam Bravo
    - 2nd Squad
    - Fireteam Alpha
    - Fireteam Bravo
    -
    \ No newline at end of file +

    Unit Structure

    +
    +'; + DisplayUnits(); + echo ''; + + } + + +?> +
    + \ No newline at end of file diff --git a/admin/scripts/mocha.js b/admin/scripts/mocha.js index a220424..2e250c2 100644 --- a/admin/scripts/mocha.js +++ b/admin/scripts/mocha.js @@ -1,156 +1,156 @@ -/* - * -------------------------------------------------------------------- - * Simple Password Strength Checker - * by Siddharth S, www.ssiddharth.com, hello@ssiddharth.com - * for Net Tuts, www.net.tutsplus.com - * Version: 1.0, 05.10.2009 - * -------------------------------------------------------------------- - */ - - -$(document).ready(function() -{ - var strPassword; - var charPassword; - var complexity = $("#complexity"); - var rating = $("#rating") - var minPasswordLength = 6; - var baseScore = 0, score = 0; - - var num = {}; - num.Excess = 0; - num.Upper = 0; - num.Numbers = 0; - num.Symbols = 0; - - var bonus = {}; - bonus.Excess = 3; - bonus.Upper = 4; - bonus.Numbers = 5; - bonus.Symbols = 5; - bonus.Combo = 0; - bonus.FlatLower = 0; - bonus.FlatNumber = 0; - - outputResult(); - $("#inputPassword").bind("keyup", checkVal); - -function checkVal() -{ - init(); - - if (charPassword.length >= minPasswordLength) - { - baseScore = 50; - analyzeString(); - calcComplexity(); - } - else - { - baseScore = 0; - } - - outputResult(); -} - -function init() -{ - strPassword= $("#inputPassword").val(); - charPassword = strPassword.split(""); - - num.Excess = 0; - num.Upper = 0; - num.Numbers = 0; - num.Symbols = 0; - bonus.Combo = 0; - bonus.FlatLower = 0; - bonus.FlatNumber = 0; - baseScore = 0; - score =0; -} - -function analyzeString () -{ - for (i=0; i=50 && score<75) - { - complexity.html("Good"); - rating.removeClass("strong secure").addClass("good"); - } - else if (score>=75 && score<100) - { - complexity.html("Strong"); - rating.removeClass("secure").addClass("strong"); - } - else if (score>=100) - { - complexity.html("Secure"); - rating.addClass("secure"); - } - - /* - $("#details").html("Base Score :" + baseScore + "" - + "
    Length Bonus :" + (num.Excess*bonus.Excess) + " ["+num.Excess+"x"+bonus.Excess+"] " - + "
    Upper case bonus :" + (num.Upper*bonus.Upper) + " ["+num.Upper+"x"+bonus.Upper+"] " - + "
    Number Bonus : " + (num.Numbers*bonus.Numbers) + " ["+num.Numbers+"x"+bonus.Numbers+"]" - + "
    Symbol Bonus : " + (num.Symbols*bonus.Symbols) + " ["+num.Symbols+"x"+bonus.Symbols+"]" - + "
    Combination Bonus : " + bonus.Combo + "" - + "
    Lower case only penalty : " + bonus.FlatLower + "" - + "
    Numbers only penalty : " + bonus.FlatNumber + "" - + "
    Total Score: " + score + "" ); */ -} - -} -); +/* + * -------------------------------------------------------------------- + * Simple Password Strength Checker + * by Siddharth S, www.ssiddharth.com, hello@ssiddharth.com + * for Net Tuts, www.net.tutsplus.com + * Version: 1.0, 05.10.2009 + * -------------------------------------------------------------------- + */ + + +$(document).ready(function() +{ + var strPassword; + var charPassword; + var complexity = $("#complexity"); + var rating = $("#rating") + var minPasswordLength = 6; + var baseScore = 0, score = 0; + + var num = {}; + num.Excess = 0; + num.Upper = 0; + num.Numbers = 0; + num.Symbols = 0; + + var bonus = {}; + bonus.Excess = 3; + bonus.Upper = 4; + bonus.Numbers = 5; + bonus.Symbols = 5; + bonus.Combo = 0; + bonus.FlatLower = 0; + bonus.FlatNumber = 0; + + outputResult(); + $("#inputPassword").bind("keyup", checkVal); + +function checkVal() +{ + init(); + + if (charPassword.length >= minPasswordLength) + { + baseScore = 50; + analyzeString(); + calcComplexity(); + } + else + { + baseScore = 0; + } + + outputResult(); +} + +function init() +{ + strPassword= $("#inputPassword").val(); + charPassword = strPassword.split(""); + + num.Excess = 0; + num.Upper = 0; + num.Numbers = 0; + num.Symbols = 0; + bonus.Combo = 0; + bonus.FlatLower = 0; + bonus.FlatNumber = 0; + baseScore = 0; + score =0; +} + +function analyzeString () +{ + for (i=0; i=50 && score<75) + { + complexity.html("Good"); + rating.removeClass("strong secure").addClass("good"); + } + else if (score>=75 && score<100) + { + complexity.html("Strong"); + rating.removeClass("secure").addClass("strong"); + } + else if (score>=100) + { + complexity.html("Secure"); + rating.addClass("secure"); + } + + /* + $("#details").html("Base Score :" + baseScore + "" + + "
    Length Bonus :" + (num.Excess*bonus.Excess) + " ["+num.Excess+"x"+bonus.Excess+"] " + + "
    Upper case bonus :" + (num.Upper*bonus.Upper) + " ["+num.Upper+"x"+bonus.Upper+"] " + + "
    Number Bonus : " + (num.Numbers*bonus.Numbers) + " ["+num.Numbers+"x"+bonus.Numbers+"]" + + "
    Symbol Bonus : " + (num.Symbols*bonus.Symbols) + " ["+num.Symbols+"x"+bonus.Symbols+"]" + + "
    Combination Bonus : " + bonus.Combo + "" + + "
    Lower case only penalty : " + bonus.FlatLower + "" + + "
    Numbers only penalty : " + bonus.FlatNumber + "" + + "
    Total Score: " + score + "" ); */ +} + +} +); diff --git a/admin/settings/functions.php b/admin/settings/functions.php index 1e3ada4..74155fa 100644 --- a/admin/settings/functions.php +++ b/admin/settings/functions.php @@ -1,77 +1,77 @@ -. - */ - -/** - * Note to anyone feeling the need to edit this file... - * You MUST declare $db as global inside your functions in order access MySQL from here. - */ - - -function changePassword(){ -echo ""; - global $db; - - if(isset($_POST['processed'])) - { - $password = $_POST['password']; - $confirm = $_POST['confirm']; - - if($password != $confirm){ - ReportError("The passwords you entered did not match."); - PageRedirect(3, "?op=settings&change=password"); - return; - }else if(strlen($password)<6){ - ReportError("The password you entered is less than 6 characters."); - PageRedirect(3, "?op=settings&change=password"); - return; - } - $newpassword = crypt(md5($password),'iamnotadirtywhorebitch'); - $username = $_SESSION['username']; - $db->Query("UPDATE `bayonet_users` SET `password` = '$newpassword' WHERE `username` = '$username' LIMIT 1"); - - echo "Your password has successfully been changed."; - PageRedirect(3,"?op=settings"); - return; - } -?> -
    -
    -

    Change Your Password

    -
    Vital Statistics
    Role: @@ -153,7 +168,7 @@
    Weapons: +
    Primary Weapon: +
    Secondary Weapon: +
    - - - - - - - - - - - -
    Password: - - - -
    Password Strength:
    -
    Minimum of 6 Characters
    Confirm Password:
    - - -. + */ + +/** + * Note to anyone feeling the need to edit this file... + * You MUST declare $db as global inside your functions in order access MySQL from here. + */ + + +function changePassword(){ +echo ""; + global $db; + + if(isset($_POST['processed'])) + { + $password = $_POST['password']; + $confirm = $_POST['confirm']; + + if($password != $confirm){ + ReportError("The passwords you entered did not match."); + PageRedirect(3, "?op=settings&change=password"); + return; + }else if(strlen($password)<6){ + ReportError("The password you entered is less than 6 characters."); + PageRedirect(3, "?op=settings&change=password"); + return; + } + $newpassword = crypt(md5($password),'iamnotadirtywhorebitch'); + $username = $_SESSION['username']; + $db->Query("UPDATE `bayonet_users` SET `password` = '$newpassword' WHERE `username` = '$username' LIMIT 1"); + + echo "Your password has successfully been changed."; + PageRedirect(3,"?op=settings"); + return; + } +?> +
    +
    +

    Change Your Password

    + + + + + + + + + + + + +
    Password: + + + +
    Password Strength:
    +
    Minimum of 6 Characters
    Confirm Password:
    +
    +
    +. - */ - ?> - -

    - Account Settings

    - -Change password, email, name
    -
    - - - - - - - - +. + */ + ?> + +

    - Account Settings

    + -Change password, email, name
    +
    + + + + + + + + \ No newline at end of file diff --git a/admin/settings/style.css b/admin/settings/style.css index 9969542..ff45ec6 100644 --- a/admin/settings/style.css +++ b/admin/settings/style.css @@ -1,64 +1,64 @@ -/* START>> PASSWORD STYLES */ - -input{ - font-family: "Lucida Grande", "Verdana", sans-serif; -} - -#pwordCont{ - font-family: "Lucida Grande", "Verdana", sans-serif; - width: 820px; - font-size:12px; - margin-left: auto; - margin-right: auto; - padding: 50px 0 0 0; -} - -#complexity{ - color: #000; - font-size: 10px; - text-align: center; -} - -.outer { - width:180px; - height:5px; - background-color: #CCC; -} - -.default { - height:5px; - background-color: #CCC; - width:0px; -} -.short { - height:5px; - background-color: #aa0033; - width:15px; -} -.weak { - height:5px; - background-color: #aa0033; - width:45px; -} -.good { - height:5px; - background-color: #6699cc; - width:90px; -} -.strong { - height:5px; - background-color: #008000; - width:135px; -} -.secure { - height:5px; - background-color: #008000; - width:180px; -} - -span.value{ - font-weight:bold; - float: right; -} - +/* START>> PASSWORD STYLES */ + +input{ + font-family: "Lucida Grande", "Verdana", sans-serif; +} + +#pwordCont{ + font-family: "Lucida Grande", "Verdana", sans-serif; + width: 820px; + font-size:12px; + margin-left: auto; + margin-right: auto; + padding: 50px 0 0 0; +} + +#complexity{ + color: #000; + font-size: 10px; + text-align: center; +} + +.outer { + width:180px; + height:5px; + background-color: #CCC; +} + +.default { + height:5px; + background-color: #CCC; + width:0px; +} +.short { + height:5px; + background-color: #aa0033; + width:15px; +} +.weak { + height:5px; + background-color: #aa0033; + width:45px; +} +.good { + height:5px; + background-color: #6699cc; + width:90px; +} +.strong { + height:5px; + background-color: #008000; + width:135px; +} +.secure { + height:5px; + background-color: #008000; + width:180px; +} + +span.value{ + font-weight:bold; + float: right; +} + /* END>> PASSWORD STYLES */ \ No newline at end of file diff --git a/admin/style.css b/admin/style.css index 686276b..48ab804 100644 --- a/admin/style.css +++ b/admin/style.css @@ -140,4 +140,8 @@ fieldset { .right{ text-align:right; } + +.bold { + font-size:18px; +} \ No newline at end of file diff --git a/include/classes.php b/include/classes.php index 5f51e99..ac62115 100644 --- a/include/classes.php +++ b/include/classes.php @@ -1,238 +1,238 @@ -"; - echo "
    "; - } - - function CloseContent() - { - echo "
    "; - echo ""; - } -} - -class Bayonet_Theme extends Bayonet_Layout -{ - static public $index; - static public $header; - static public $footer; - - static public $name; - static public $root_path; - static public $include_path; - static public $image_path; - static public $config_path; - static public $config; - static public $primary_css; - - static function init() - { - if (!isset($_GET['theme'])) - { - self::$name = Bayonet_Config::$ini['site']['theme']; - } - else - { - self::$name = $_GET['theme']; - } - - decho('Initializing theme variables for \'' . self::$name . '\''); - self::$root_path = dirname(BAYONET_ROOT) . '/themes/' . self::$name; - self::$include_path = self::$root_path . '/include'; - self::$image_path = self::$root_path . '/images'; - self::$primary_css = self::$include_path . '/primary.css'; - self::$config_path = self::$include_path . '/theme.ini'; - - if (!self::is_valid()) - { - die('Theme failed during initialization.'); - } - self::$config = parse_ini_file(self::$config_path, true); - - self::$index = self::$root_path . '/index.php'; - self::$header = self::$root_path . '/header.php'; - self::$footer = self::$root_path . '/footer.php'; - - //decho(get_class_vars(Bayonet_Theme)); //do not re-enable this - self::load(); - } - - static private function is_valid() - { - if (file_exists(self::$root_path) && file_exists(self::$include_path) && - file_exists(self::$config_path)) return true; - else return false; - } - - static function load() - { - global $db, $config; - decho("Loading theme: '" . self::$name . "'"); - require self::$index; - } -} - -class Bayonet_Config -{ - static $ini; - static function init() - { - decho('Parsing configuration data'); - if (file_exists(BAYONET_CONFIG)) - { - self::$ini = parse_ini_file(BAYONET_CONFIG, true); - decho(self::$ini); - } - else die(BAYONET_CONFIG . ' not found'); - } -} - -class Bayonet -{ - static function init() - { - global $db, $config; - Bayonet_Config::init(); - - // Set globally referenced configuration and database variables - $config = Bayonet_Config::$ini; - $db = new Bayonet_SQL(); - - //Connect to the MySQL server - $db->Connect($config['sql']['hostname'], $config['sql']['username'], $config['sql']['password']); - $db->Select_db($config['sql']['database']); - - decho('Initializing Bayonet'); - Bayonet_Theme::init(); - } -} - - -define('PASSWORD', true); -define('NO_PASSWORD', false); -define('CHECKED', true); - -class BayonetForm -{ - static public $request; - - public function __construct($action, $method) - { - $this->request = $_POST; - echo "
    \n"; - } - - public function __destruct() - { - echo "
    \n"; - } - - function getKeyStates($keys) - { - $good = array(); - $bad = array(); - - if (!is_array($keys)) return array(); - - foreach ($keys as $key => $value) - { - if (!empty($value)) $good[$key] = $value; - else $bad[$key] = $value; - } - - $data = array('set' => $good, 'unset' => $bad); - - return $data; - } - - function verify($submit_key) - { - return $this->verifySubmit($submit_key); - } - - function verifySubmit($submit_key) - { - return isset($this->request[$submit_key]) ? true : false; - } - - function button($extern_name, $value, $text = "Button") - { - echo "\n"; - } - - function submitButton($extern_name, $value = "Submit") - { - echo "\n"; - } - - function reset($value = "Reset") - { - echo "\n"; - } - - function textField($extern_name, $value = null, $isPassword = false, $size = null, - $max = null) - { - $type = 'text'; - if ($isPassword) $type = 'password'; - - $value = filter_var($value, FILTER_SANITIZE_STRING); - echo "\n"; - } - - function radioButton($extern_name, $value, $isChecked = false) - { - if ($isChecked) - { - echo "\n"; - } - else - { - echo "\n"; - } - } - - function checkBox($extern_name, $value, $isChecked = false) - { - if ($isChecked) - { - echo "\n"; - } - else - { - echo "\n"; - } - } - - function dropDown($extern_name, $values = array('None'), $select = null) - { - $selectIterator = 1; - - echo "\n"; - } - - function textArea($extern_name, $rows = 10, $cols = 30, $value = null) - { - $value = filter_var($value, FILTER_SANITIZE_STRING); - echo "\n"; - } -} - +"; + echo "
    "; + } + + function CloseContent() + { + echo "
    "; + echo ""; + } +} + +class Bayonet_Theme extends Bayonet_Layout +{ + static public $index; + static public $header; + static public $footer; + + static public $name; + static public $root_path; + static public $include_path; + static public $image_path; + static public $config_path; + static public $config; + static public $primary_css; + + static function init() + { + if (!isset($_GET['theme'])) + { + self::$name = Bayonet_Config::$ini['site']['theme']; + } + else + { + self::$name = $_GET['theme']; + } + + decho('Initializing theme variables for \'' . self::$name . '\''); + self::$root_path = dirname(BAYONET_ROOT) . '/themes/' . self::$name; + self::$include_path = self::$root_path . '/include'; + self::$image_path = self::$root_path . '/images'; + self::$primary_css = self::$include_path . '/primary.css'; + self::$config_path = self::$include_path . '/theme.ini'; + + if (!self::is_valid()) + { + die('Theme failed during initialization.'); + } + self::$config = parse_ini_file(self::$config_path, true); + + self::$index = self::$root_path . '/index.php'; + self::$header = self::$root_path . '/header.php'; + self::$footer = self::$root_path . '/footer.php'; + + //decho(get_class_vars(Bayonet_Theme)); //do not re-enable this + self::load(); + } + + static private function is_valid() + { + if (file_exists(self::$root_path) && file_exists(self::$include_path) && + file_exists(self::$config_path)) return true; + else return false; + } + + static function load() + { + global $db, $config; + decho("Loading theme: '" . self::$name . "'"); + require self::$index; + } +} + +class Bayonet_Config +{ + static $ini; + static function init() + { + decho('Parsing configuration data'); + if (file_exists(BAYONET_CONFIG)) + { + self::$ini = parse_ini_file(BAYONET_CONFIG, true); + decho(self::$ini); + } + else die(BAYONET_CONFIG . ' not found'); + } +} + +class Bayonet +{ + static function init() + { + global $db, $config; + Bayonet_Config::init(); + + // Set globally referenced configuration and database variables + $config = Bayonet_Config::$ini; + $db = new Bayonet_SQL(); + + //Connect to the MySQL server + $db->Connect($config['sql']['hostname'], $config['sql']['username'], $config['sql']['password']); + $db->Select_db($config['sql']['database']); + + decho('Initializing Bayonet'); + Bayonet_Theme::init(); + } +} + + +define('PASSWORD', true); +define('NO_PASSWORD', false); +define('CHECKED', true); + +class BayonetForm +{ + static public $request; + + public function __construct($action, $method) + { + $this->request = $_POST; + echo "
    \n"; + } + + public function __destruct() + { + echo "
    \n"; + } + + function getKeyStates($keys) + { + $good = array(); + $bad = array(); + + if (!is_array($keys)) return array(); + + foreach ($keys as $key => $value) + { + if (!empty($value)) $good[$key] = $value; + else $bad[$key] = $value; + } + + $data = array('set' => $good, 'unset' => $bad); + + return $data; + } + + function verify($submit_key) + { + return $this->verifySubmit($submit_key); + } + + function verifySubmit($submit_key) + { + return isset($this->request[$submit_key]) ? true : false; + } + + function button($extern_name, $value, $text = "Button") + { + echo "\n"; + } + + function submitButton($extern_name, $value = "Submit") + { + echo "\n"; + } + + function reset($value = "Reset") + { + echo "\n"; + } + + function textField($extern_name, $value = null, $isPassword = false, $size = null, + $max = null) + { + $type = 'text'; + if ($isPassword) $type = 'password'; + + $value = filter_var($value, FILTER_SANITIZE_STRING); + echo "\n"; + } + + function radioButton($extern_name, $value, $isChecked = false) + { + if ($isChecked) + { + echo "\n"; + } + else + { + echo "\n"; + } + } + + function checkBox($extern_name, $value, $isChecked = false) + { + if ($isChecked) + { + echo "\n"; + } + else + { + echo "\n"; + } + } + + function dropDown($extern_name, $values = array('None'), $select = null) + { + $selectIterator = 1; + + echo "\n"; + } + + function textArea($extern_name, $rows = 10, $cols = 30, $value = null) + { + $value = filter_var($value, FILTER_SANITIZE_STRING); + echo "\n"; + } +} + ?> \ No newline at end of file diff --git a/include/functions.php b/include/functions.php index 109f11c..370ed9f 100644 --- a/include/functions.php +++ b/include/functions.php @@ -51,11 +51,13 @@ function bbcode_format ($str) '/\[url\=(.*?)\](.*?)\[\/url\]/is', '/\[align\=(.*?)\](.*?)\[\/align\]/is', '/\[size\=(.*?)\](.*?)\[\/size\]/is', - '/\[img\=(.*?)\](.*?)\[\/img\]/is', + '/\[img\](.*?)\[\/img\]/is', '/\[img align\=(.+?)\](.+?)\[\/img\]/is', '/\[mail\](.*?)\[\/mail\]/is', '/\[mail\=(.*?)\](.*?)\[\/mail\]/is', - '/\[list\](.*?)\[\/list\]/is' + '/\[list\](.*?)\[\/list\]/is', + '/\[list=1\](.*?)\[\/list\]/is', + '/\[\*\]/is' ); $simple_replace = array( @@ -75,13 +77,16 @@ function bbcode_format ($str) '$2', '
    $2', '$2', - '$2', - '', + '', + '', '$1', '$2', - '
  • $1
    • ' + '
      $1
    ', + '
      $1
    ', + '
  • ' ); + $str = preg_replace ($simple_search, $simple_replace, $str); $str = nl2br($str); return $str; diff --git a/include/sql.class.php b/include/sql.class.php index c32de63..cb95a83 100644 --- a/include/sql.class.php +++ b/include/sql.class.php @@ -162,6 +162,12 @@ class Bayonet_SQL return mysqli_num_rows($result); } + + public function InsertID(){ + decho("Fetching insert id for auto increment"); + + return mysqli_insert_id($GLOBALS['___mysqli_ston']); + } } ?> diff --git a/index.php b/index.php index d6280da..e28f48c 100644 --- a/index.php +++ b/index.php @@ -1,19 +1,19 @@ - \ No newline at end of file diff --git a/modules/admin/admin_functions.php b/modules/admin/admin_functions.php index 6c2b394..d0d54a8 100644 --- a/modules/admin/admin_functions.php +++ b/modules/admin/admin_functions.php @@ -1,152 +1,152 @@ -. - */ - /* -if(!defined("ADMIN_FILE")) -{ - die("Access denied."); - return; -} - -function is_loggedin() -{ - $id = session_id(); - if($id == "") - { - header("location: index.php"); - return false; - } - return true; -} - -function login() -{ - global $db; - - if(isset($_SESSION['username']) || isset($_SESSION['password'])) - { - return true; - } - - if(isset($_POST['processed'])) - { - $username = addslashes($_POST['username']); - $password = addslashes($_POST['password']); - $password = crypt(md5($password),'iamnotadirtywhorebitch'); - $result = $db->Query("SELECT * FROM bayonet_users WHERE username = '$username' AND password = '$password'"); - $rows = $db->Rows($result); - - if($rows > 0) - { - $_SESSION['username'] = stripslashes($username); - $_SESSION['password'] = stripslashes($password); - return true; - } - else - { - ReportError("Login incorrect."); - return false; - } - - } - else - { - echo "
    \n"; - OpenTable(); - echo "Administrative Login\n"; - - echo "\n - \n - \n - \n -
    Username
    Password
    \n"; - CloseTable(); - echo "
    \n"; - return false; - } -} - -function logout() -{ - session_unset(); - session_destroy(); -} -*/ -/** - * CompileAdmin() - * - * because we want to have a horizontal display of options, we need to have - * the data separated by arrays. the data is processed into single tables, and is - * echoed in realtime. we checked to make sure they were arrays, but there is no - * checking to make sure the data passed is not malicious in nature. - * - * @param mixed $head - * @param mixed $body - * @return - */ - /* -function CompileAdmin($head,$body) -{ - /*if we were not passed arrays, then say goodbye - if(!is_array($head) || !is_array($body)) - { - echo "must be array\n"; - return; - } - - echo ""; - echo ""; - - $num = 1; - foreach($body as $td) - { - echo "\n"; - if($num%4 == 0){ - echo ""; - } - $num++; - } - echo "
    $td
    \n"; -} - - - * OpenTable() - * - * The administration OpenTable() function requires an argument to define - * the header title. It may be wise to replace the standard OpenTable() function - * with this one... that's alot of code to unfuck though. - * - * @param mixed $title - * @return - -function OpenTable_Ex($title) -{ - echo "
    {$title}
    "; -} - - - * CloseTable() - * - * @return - -function CloseTable_Ex() -{ - echo "
    "; -} - */ +. + */ + /* +if(!defined("ADMIN_FILE")) +{ + die("Access denied."); + return; +} + +function is_loggedin() +{ + $id = session_id(); + if($id == "") + { + header("location: index.php"); + return false; + } + return true; +} + +function login() +{ + global $db; + + if(isset($_SESSION['username']) || isset($_SESSION['password'])) + { + return true; + } + + if(isset($_POST['processed'])) + { + $username = addslashes($_POST['username']); + $password = addslashes($_POST['password']); + $password = crypt(md5($password),'iamnotadirtywhorebitch'); + $result = $db->Query("SELECT * FROM bayonet_users WHERE username = '$username' AND password = '$password'"); + $rows = $db->Rows($result); + + if($rows > 0) + { + $_SESSION['username'] = stripslashes($username); + $_SESSION['password'] = stripslashes($password); + return true; + } + else + { + ReportError("Login incorrect."); + return false; + } + + } + else + { + echo "
    \n"; + OpenTable(); + echo "Administrative Login\n"; + + echo "\n + \n + \n + \n +
    Username
    Password
    \n"; + CloseTable(); + echo "
    \n"; + return false; + } +} + +function logout() +{ + session_unset(); + session_destroy(); +} +*/ +/** + * CompileAdmin() + * + * because we want to have a horizontal display of options, we need to have + * the data separated by arrays. the data is processed into single tables, and is + * echoed in realtime. we checked to make sure they were arrays, but there is no + * checking to make sure the data passed is not malicious in nature. + * + * @param mixed $head + * @param mixed $body + * @return + */ + /* +function CompileAdmin($head,$body) +{ + /*if we were not passed arrays, then say goodbye + if(!is_array($head) || !is_array($body)) + { + echo "must be array\n"; + return; + } + + echo ""; + echo ""; + + $num = 1; + foreach($body as $td) + { + echo "\n"; + if($num%4 == 0){ + echo ""; + } + $num++; + } + echo "
    $td
    \n"; +} + + + * OpenTable() + * + * The administration OpenTable() function requires an argument to define + * the header title. It may be wise to replace the standard OpenTable() function + * with this one... that's alot of code to unfuck though. + * + * @param mixed $title + * @return + +function OpenTable_Ex($title) +{ + echo "
    {$title}
    "; +} + + + * CloseTable() + * + * @return + +function CloseTable_Ex() +{ + echo "
    "; +} + */ ?> \ No newline at end of file diff --git a/modules/admin/blocks/functions.php b/modules/admin/blocks/functions.php index 0138839..2c7b166 100644 --- a/modules/admin/blocks/functions.php +++ b/modules/admin/blocks/functions.php @@ -1,173 +1,173 @@ -. - */ - -function ListBlocks() -{ - global $db; - $result = $db->Query("SELECT * FROM bayonet_blocks"); - $blocks = $db->Fetch(); - - echo ""; - foreach($blocks as $block) - { - echo ""; - } - echo "
    Existing Blocks
    {$block['weight']} : {$block['dir_name']}EditDelete
    "; -} - -function NewBlock() -{ - global $db; - if(isset($_POST['processed'])) - { - //Secure our data to prevent injection attacks. - $weight = addslashes($_POST['weight']); - $dir_name = addslashes($_POST['dir_name']); - $position = addslashes($_POST['position']); - $active = addslashes($_POST['active']); - - if(empty($weight) || empty($dir_name) || empty($position)) - { - echo "You must fill everything out before proceeding."; - return; - } - //Update the database with the new data. - $db->Query("INSERT INTO bayonet_blocks SET weight = '$weight', dir_name = '$dir_name', position = '$position', active = '$active'"); - //die, because we have completed what we wanted to do. - echo "New block, '$dir_name', at position '$weight' added.\n"; - return; - } - - ?> -
    - - - - - - -
    Weight
    Position
    Directory Name
    Active -
    -
    - 'Yes',0 => 'No'); - foreach($options as $option => $value) - { - $selected = NULL; - if($active == $option) - { - $selected = "selected"; - } - echo "\n"; - } - - -} - -function EditBlock($block_id) -{ - global $db; - if(isset($_POST['processed'])) - { - //Secure our data to prevent injection attacks. - $weight = addslashes($_POST['weight']); - $dir_name = addslashes($_POST['dir_name']); - $position = addslashes($_POST['position']); - $active = addslashes($_POST['active']); - - if(empty($weight) || empty($dir_name) || empty($position)) - { - echo "You must fill everything out before proceeding."; - return; - } - - //Update the database with the new data. - $db->Query("UPDATE bayonet_blocks SET weight = '$weight', dir_name = '$dir_name', position = '$position', active = '$active' WHERE block_id = '$block_id'"); - //$isActive = $active ? "IS" : "IS NOT"; - echo "Block, '$dir_name', at position '$weight' has been edited.\n"; - //die, because we have completed what we wanted to do. - return; - } - - //Grab the page from the database according to the $page_id passed to the function. - // {{{ XXX: FIXME -- Re-write this - /* - $result = $db->Query("SELECT weight,dir_name,position,active FROM bayonet_blocks WHERE block_id = '$block_id'"); - while(($row = $db->Fetch($result))!=false) - { - //We only want one row, so we don't have to $block[]... No foreach necessary. - $block = $row; - } - */ - // }}} - ?> -
    - - - - - - - -
    Weight
    Position
    Directory Name
    Active - -
    -
    - Query("SELECT dir_name FROM bayonet_blocks WHERE block_id = '$block_id'"); - $block = $db->Fetch($result); - - if(isset($_POST['proceed'])) - { - echo "Block '{$block['dir_name']}', was deleted."; - $db->Query("DELETE FROM bayonet_blocks WHERE block_id = '$block_id' LIMIT 1"); - return; - } - if(isset($_POST['cancel'])) - { - echo "User cancelled deletion of page: '{$block['dir_name']}'"; - return; - } - - ?> -
    - - - -
    Are you SURE you want to delete the block titled: ''?
       
    -
    - +. + */ + +function ListBlocks() +{ + global $db; + $result = $db->Query("SELECT * FROM bayonet_blocks"); + $blocks = $db->Fetch(); + + echo ""; + foreach($blocks as $block) + { + echo ""; + } + echo "
    Existing Blocks
    {$block['weight']} : {$block['dir_name']}EditDelete
    "; +} + +function NewBlock() +{ + global $db; + if(isset($_POST['processed'])) + { + //Secure our data to prevent injection attacks. + $weight = addslashes($_POST['weight']); + $dir_name = addslashes($_POST['dir_name']); + $position = addslashes($_POST['position']); + $active = addslashes($_POST['active']); + + if(empty($weight) || empty($dir_name) || empty($position)) + { + echo "You must fill everything out before proceeding."; + return; + } + //Update the database with the new data. + $db->Query("INSERT INTO bayonet_blocks SET weight = '$weight', dir_name = '$dir_name', position = '$position', active = '$active'"); + //die, because we have completed what we wanted to do. + echo "New block, '$dir_name', at position '$weight' added.\n"; + return; + } + + ?> +
    + + + + + + +
    Weight
    Position
    Directory Name
    Active +
    +
    + 'Yes',0 => 'No'); + foreach($options as $option => $value) + { + $selected = NULL; + if($active == $option) + { + $selected = "selected"; + } + echo "\n"; + } + + +} + +function EditBlock($block_id) +{ + global $db; + if(isset($_POST['processed'])) + { + //Secure our data to prevent injection attacks. + $weight = addslashes($_POST['weight']); + $dir_name = addslashes($_POST['dir_name']); + $position = addslashes($_POST['position']); + $active = addslashes($_POST['active']); + + if(empty($weight) || empty($dir_name) || empty($position)) + { + echo "You must fill everything out before proceeding."; + return; + } + + //Update the database with the new data. + $db->Query("UPDATE bayonet_blocks SET weight = '$weight', dir_name = '$dir_name', position = '$position', active = '$active' WHERE block_id = '$block_id'"); + //$isActive = $active ? "IS" : "IS NOT"; + echo "Block, '$dir_name', at position '$weight' has been edited.\n"; + //die, because we have completed what we wanted to do. + return; + } + + //Grab the page from the database according to the $page_id passed to the function. + // {{{ XXX: FIXME -- Re-write this + /* + $result = $db->Query("SELECT weight,dir_name,position,active FROM bayonet_blocks WHERE block_id = '$block_id'"); + while(($row = $db->Fetch($result))!=false) + { + //We only want one row, so we don't have to $block[]... No foreach necessary. + $block = $row; + } + */ + // }}} + ?> +
    + + + + + + + +
    Weight
    Position
    Directory Name
    Active + +
    +
    + Query("SELECT dir_name FROM bayonet_blocks WHERE block_id = '$block_id'"); + $block = $db->Fetch($result); + + if(isset($_POST['proceed'])) + { + echo "Block '{$block['dir_name']}', was deleted."; + $db->Query("DELETE FROM bayonet_blocks WHERE block_id = '$block_id' LIMIT 1"); + return; + } + if(isset($_POST['cancel'])) + { + echo "User cancelled deletion of page: '{$block['dir_name']}'"; + return; + } + + ?> +
    + + + +
    Are you SURE you want to delete the block titled: ''?
       
    +
    + diff --git a/modules/admin/blocks/index.php b/modules/admin/blocks/index.php index 6dac3d2..8d63b6d 100644 --- a/modules/admin/blocks/index.php +++ b/modules/admin/blocks/index.php @@ -1,59 +1,59 @@ -. - */ - -/** - * This file administers the site blocks. - * - * -weight - * -directory name - */ - -if(!defined("ADMIN_FILE")) -{ - die("Access denied."); -} - - -include $basedir.'blocks/functions.php'; - -if(isset($_GET['edit'])) -{ - $block_id = $_GET['edit']; - EditBlock($block_id); - return; -} - -if(isset($_GET['delete'])) -{ - $block_id = $_GET['delete']; - DeleteBlock($block_id); - return; -} - -if(isset($_GET['create'])) -{ - NewBlock(); - return; -} - -echo "
    ".LinkInternal('Create a Block','?load=admin&op=blocks&create=true')."
    "; - -ListBlocks(); - +. + */ + +/** + * This file administers the site blocks. + * + * -weight + * -directory name + */ + +if(!defined("ADMIN_FILE")) +{ + die("Access denied."); +} + + +include $basedir.'blocks/functions.php'; + +if(isset($_GET['edit'])) +{ + $block_id = $_GET['edit']; + EditBlock($block_id); + return; +} + +if(isset($_GET['delete'])) +{ + $block_id = $_GET['delete']; + DeleteBlock($block_id); + return; +} + +if(isset($_GET['create'])) +{ + NewBlock(); + return; +} + +echo "
    ".LinkInternal('Create a Block','?load=admin&op=blocks&create=true')."
    "; + +ListBlocks(); + ?> \ No newline at end of file diff --git a/modules/admin/index.php b/modules/admin/index.php index fc379ea..667dc6e 100644 --- a/modules/admin/index.php +++ b/modules/admin/index.php @@ -1,73 +1,73 @@ -. - */ - /* - if(!defined("MODULE_FILE")) - { - die("Access denied."); - } - - define("ADMIN_FILE",'admin_file'); - include 'admin_functions.php'; - - if($_GET['op'] == 'logout') - { - logout(); - } - - if(login()) - { - //this is so dirty... sigh. - if(is_loggedin()) - { - ?> - - - - - - -
    - -
    -
    - Administrative Tools: -
    Manage Pages','?load=admin&op=pages'), - LinkInternal('
    Edit Navigation','?load=admin'), - LinkInternal('
    Edit Announcements','?load=admin'), - LinkInternal('
    Manage Events','?load=admin'), - LinkInternal('
    Manage Galleries', '?load=admin') - - ); - - //render administration table - CompileAdmin($th,$td); - ?> -
    - -
    -
    • - . + */ + /* + if(!defined("MODULE_FILE")) + { + die("Access denied."); + } + + define("ADMIN_FILE",'admin_file'); + include 'admin_functions.php'; + + if($_GET['op'] == 'logout') + { + logout(); + } + + if(login()) + { + //this is so dirty... sigh. + if(is_loggedin()) + { + ?> + + + + + + +
    + +
    +
    + Administrative Tools: +
    Manage Pages','?load=admin&op=pages'), + LinkInternal('
    Edit Navigation','?load=admin'), + LinkInternal('
    Edit Announcements','?load=admin'), + LinkInternal('
    Manage Events','?load=admin'), + LinkInternal('
    Manage Galleries', '?load=admin') + + ); + + //render administration table + CompileAdmin($th,$td); + ?> +
    + +
    + + \ No newline at end of file diff --git a/modules/admin/operation.php b/modules/admin/operation.php index 2c66ff4..4fb687b 100644 --- a/modules/admin/operation.php +++ b/modules/admin/operation.php @@ -1,53 +1,53 @@ -. - */ - /* -if(!defined("ADMIN_FILE")) -{ - die("Access denied."); - return; -} - -if(!isset($_GET['op'])) -{ - echo "
    No operation selected
    \n"; - return; -} - -$op = $_GET['op']; -$basedir = 'modules/admin/'; - -if(file_exists($basedir)) -{ - if(file_exists($basedir . $op)) - { - include $basedir . $op . '/index.php'; - } - else - { - ReportError("Administrative operation '$op' does not exist."); - } -} -else -{ - ReportError("Administrative base directory path does not exist."); -} - - -*/ +. + */ + /* +if(!defined("ADMIN_FILE")) +{ + die("Access denied."); + return; +} + +if(!isset($_GET['op'])) +{ + echo "
    No operation selected
    \n"; + return; +} + +$op = $_GET['op']; +$basedir = 'modules/admin/'; + +if(file_exists($basedir)) +{ + if(file_exists($basedir . $op)) + { + include $basedir . $op . '/index.php'; + } + else + { + ReportError("Administrative operation '$op' does not exist."); + } +} +else +{ + ReportError("Administrative base directory path does not exist."); +} + + +*/ ?> \ No newline at end of file diff --git a/modules/admin/pages/functions.php b/modules/admin/pages/functions.php index fc97ffc..f71f90f 100644 --- a/modules/admin/pages/functions.php +++ b/modules/admin/pages/functions.php @@ -1,227 +1,227 @@ -. - */ - -/** - * Note to anyone feeling the need to edit this file... - * You MUST declare $db as global inside your functions in order access MySQL from here. - */ - -function ListArticles($pageid){ - - global $db; - $result = $db->Query("SELECT article_id,title FROM bayonet_articles WHERE `page_id` = $pageid ORDER BY `weight`"); - $articles = $db->Fetch($result); - - echo ""; - - if(count($articles)==0){ - echo "
    There are no articles posted on this page.
    "; - return; - } - foreach($articles as $article) - { - if($_GET['aid'] == $article['article_id']) - echo ''; - else - echo ''; - ?> - - ^ - - - - v - - - "; - - - -} - -function EditArticle($article_id){ - - global $db; - //Grab the page from the database according to the $article_id passed to the function. - // {{{ XXX: FIXME -- Needs to be re-written - /* - $result = $db->Query("SELECT title,text FROM bayonet_articles WHERE article_id = '$article_id'"); - while(($row = $db->Fetch($result))!=false) - { - //We only want one row, so we don't have to $article[]... No foreach necessary. - $article = $row; - } - */ - // }}} - ?> -
    - - - -
    - - -
    -
    - Query("SELECT page_id,title FROM bayonet_pages"); - - echo 'Select page: '; - // echo ""; -} - -function NewPage() -{ - global $db; - if(isset($_POST['processed'])) - { - //Secure our data to prevent injection attacks. - $title = addslashes($_POST['title']); - $text = addslashes($_POST['text']); - if(empty($title) || empty($text)) - { - echo "You must fill everything out before proceeding."; - return; - } - - //Update the database with the new data. - $db->Query("INSERT INTO bayonet_pages SET title = '$title', text = '$text'"); - echo "New page, '$title', has been added.\n"; - //die, because we have completed what we wanted to do. - return; - } - - ?> -

    Add New Page

    -
    - - - - -
    Title
    Text
    -
    - Query("UPDATE bayonet_pages SET title = '$title', text = '$text' WHERE page_id = '$page_id'"); - echo "Page, '$title', has been edited.\n"; - //die, because we have completed what we wanted to do. - return; - } - - $aid = $_GET['aid']; -?> - - - - - - -
     View this Page','?load=page&id='.$page_id); ?> Delete this Page','?load=admin&op=pages&delete='.$page_id); ?>
    -
    - - - - - -
    - - - 0){ - EditArticle($aid); - } - ?> -
    - Query("SELECT title FROM bayonet_pages WHERE page_id = '$page_id'"); - $page = $db->Fetch($result); - - if(isset($_POST['proceed'])) - { - echo "Page '{$page['title']}', was deleted."; - $db->Query("DELETE FROM bayonet_pages WHERE page_id = '$page_id' LIMIT 1"); - return; - } - if(isset($_POST['cancel'])) - { - echo "User cancelled deletion of page: '{$page['title']}'"; - return; - } - if($page_id == 1){ - echo "You can not delete the home page."; - return; - } - - ?> -
    - - - -
    Are you SURE you want to delete the page titled: ''?
       
    -
    - +. + */ + +/** + * Note to anyone feeling the need to edit this file... + * You MUST declare $db as global inside your functions in order access MySQL from here. + */ + +function ListArticles($pageid){ + + global $db; + $result = $db->Query("SELECT article_id,title FROM bayonet_articles WHERE `page_id` = $pageid ORDER BY `weight`"); + $articles = $db->Fetch($result); + + echo ""; + + if(count($articles)==0){ + echo "
    There are no articles posted on this page.
    "; + return; + } + foreach($articles as $article) + { + if($_GET['aid'] == $article['article_id']) + echo ''; + else + echo ''; + ?> + + ^ + + + + v + + + "; + + + +} + +function EditArticle($article_id){ + + global $db; + //Grab the page from the database according to the $article_id passed to the function. + // {{{ XXX: FIXME -- Needs to be re-written + /* + $result = $db->Query("SELECT title,text FROM bayonet_articles WHERE article_id = '$article_id'"); + while(($row = $db->Fetch($result))!=false) + { + //We only want one row, so we don't have to $article[]... No foreach necessary. + $article = $row; + } + */ + // }}} + ?> +
    + + + +
    + + +
    +
    + Query("SELECT page_id,title FROM bayonet_pages"); + + echo 'Select page: '; + // echo ""; +} + +function NewPage() +{ + global $db; + if(isset($_POST['processed'])) + { + //Secure our data to prevent injection attacks. + $title = addslashes($_POST['title']); + $text = addslashes($_POST['text']); + if(empty($title) || empty($text)) + { + echo "You must fill everything out before proceeding."; + return; + } + + //Update the database with the new data. + $db->Query("INSERT INTO bayonet_pages SET title = '$title', text = '$text'"); + echo "New page, '$title', has been added.\n"; + //die, because we have completed what we wanted to do. + return; + } + + ?> +

    Add New Page

    +
    + + + + +
    Title
    Text
    +
    + Query("UPDATE bayonet_pages SET title = '$title', text = '$text' WHERE page_id = '$page_id'"); + echo "Page, '$title', has been edited.\n"; + //die, because we have completed what we wanted to do. + return; + } + + $aid = $_GET['aid']; +?> + + + + + + +
     View this Page','?load=page&id='.$page_id); ?> Delete this Page','?load=admin&op=pages&delete='.$page_id); ?>
    +
    + + + + + +
    + + + 0){ + EditArticle($aid); + } + ?> +
    + Query("SELECT title FROM bayonet_pages WHERE page_id = '$page_id'"); + $page = $db->Fetch($result); + + if(isset($_POST['proceed'])) + { + echo "Page '{$page['title']}', was deleted."; + $db->Query("DELETE FROM bayonet_pages WHERE page_id = '$page_id' LIMIT 1"); + return; + } + if(isset($_POST['cancel'])) + { + echo "User cancelled deletion of page: '{$page['title']}'"; + return; + } + if($page_id == 1){ + echo "You can not delete the home page."; + return; + } + + ?> +
    + + + +
    Are you SURE you want to delete the page titled: ''?
       
    +
    + diff --git a/modules/admin/pages/index.php b/modules/admin/pages/index.php index 0fb6cff..cb36250 100644 --- a/modules/admin/pages/index.php +++ b/modules/admin/pages/index.php @@ -1,68 +1,68 @@ -. - */ - ?> - -
    -
    - Manage Pages: - - - - - - - - -
    -  Create a Page','?load=admin&op=pages&create=true'); ?> -
    -
    -
    +. + */ + ?> + +
    +
    + Manage Pages: + + + + + + + + +
    +  Create a Page','?load=admin&op=pages&create=true'); ?> +
    +
    +
    diff --git a/modules/cu3er/config.xml b/modules/cu3er/config.xml new file mode 100644 index 0000000..6cfef6e --- /dev/null +++ b/modules/cu3er/config.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://www.3rd-infantry-division.org/modules/cu3er/images/team2.png + + + + + + http://www.3rd-infantry-division.org/modules/cu3er/images/arma2.png + http://www.3rd-infantry-division.org/forums/index.php?board=13.0 + + + + + + http://www.3rd-infantry-division.org/modules/cu3er/images/agwc3.png + + + + + + http://www.3rd-infantry-division.org/modules/cu3er/images/recruitmentGT.png + + + + + + http://www.3rd-infantry-division.org/modules/cu3er/images/arma2move.png + + + + \ No newline at end of file diff --git a/modules/cu3er/config2.xml b/modules/cu3er/config2.xml new file mode 100644 index 0000000..90db48a --- /dev/null +++ b/modules/cu3er/config2.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://www.3rd-infantry-division.org/modules/cu3er/images/team2.png + + + + + + http://www.3rd-infantry-division.org/modules/cu3er/images/arma2.png + http://www.3rd-infantry-division.org/forums/index.php?board=13.0 + + + + + + http://www.3rd-infantry-division.org/modules/cu3er/images/agwc3.png + http://www.armedglobalwarfare.com + + + + + + http://www.3rd-infantry-division.org/modules/cu3er/images/recruitmentGT.png + + + + + + http://www.3rd-infantry-division.org/modules/cu3er/images/arma2move.png + + + + + diff --git a/modules/cu3er/cu3er.swf b/modules/cu3er/cu3er.swf new file mode 100644 index 0000000..eac3a9e Binary files /dev/null and b/modules/cu3er/cu3er.swf differ diff --git a/modules/cu3er/cuber.html b/modules/cu3er/cuber.html new file mode 100644 index 0000000..c7eee14 --- /dev/null +++ b/modules/cu3er/cuber.html @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/modules/cu3er/demo.htm b/modules/cu3er/demo.htm new file mode 100644 index 0000000..8ff0064 --- /dev/null +++ b/modules/cu3er/demo.htm @@ -0,0 +1,35 @@ + + + + +CU3ER - demo! + + + + + + + + + + + + + diff --git a/modules/cu3er/images/agwc3.png b/modules/cu3er/images/agwc3.png new file mode 100644 index 0000000..7b6f9a7 Binary files /dev/null and b/modules/cu3er/images/agwc3.png differ diff --git a/modules/cu3er/images/arma2.png b/modules/cu3er/images/arma2.png new file mode 100644 index 0000000..94fab4a Binary files /dev/null and b/modules/cu3er/images/arma2.png differ diff --git a/modules/cu3er/images/arma2move.png b/modules/cu3er/images/arma2move.png new file mode 100644 index 0000000..6bffbae Binary files /dev/null and b/modules/cu3er/images/arma2move.png differ diff --git a/modules/cu3er/images/holidays.png b/modules/cu3er/images/holidays.png new file mode 100644 index 0000000..48a1c72 Binary files /dev/null and b/modules/cu3er/images/holidays.png differ diff --git a/modules/cu3er/images/newsite.png b/modules/cu3er/images/newsite.png new file mode 100644 index 0000000..b2d2b69 Binary files /dev/null and b/modules/cu3er/images/newsite.png differ diff --git a/modules/cu3er/images/recruitmentGT.png b/modules/cu3er/images/recruitmentGT.png new file mode 100644 index 0000000..c74ae8c Binary files /dev/null and b/modules/cu3er/images/recruitmentGT.png differ diff --git a/modules/cu3er/images/slide_1.jpg b/modules/cu3er/images/slide_1.jpg new file mode 100644 index 0000000..77706a2 Binary files /dev/null and b/modules/cu3er/images/slide_1.jpg differ diff --git a/modules/cu3er/images/slide_2.jpg b/modules/cu3er/images/slide_2.jpg new file mode 100644 index 0000000..3707266 Binary files /dev/null and b/modules/cu3er/images/slide_2.jpg differ diff --git a/modules/cu3er/images/slide_3.jpg b/modules/cu3er/images/slide_3.jpg new file mode 100644 index 0000000..c633d52 Binary files /dev/null and b/modules/cu3er/images/slide_3.jpg differ diff --git a/modules/cu3er/images/slide_4.jpg b/modules/cu3er/images/slide_4.jpg new file mode 100644 index 0000000..08bc870 Binary files /dev/null and b/modules/cu3er/images/slide_4.jpg differ diff --git a/modules/cu3er/images/slide_5.jpg b/modules/cu3er/images/slide_5.jpg new file mode 100644 index 0000000..2564999 Binary files /dev/null and b/modules/cu3er/images/slide_5.jpg differ diff --git a/modules/cu3er/images/team.png b/modules/cu3er/images/team.png new file mode 100644 index 0000000..fe307c1 Binary files /dev/null and b/modules/cu3er/images/team.png differ diff --git a/modules/cu3er/images/team2.png b/modules/cu3er/images/team2.png new file mode 100644 index 0000000..889a266 Binary files /dev/null and b/modules/cu3er/images/team2.png differ diff --git a/modules/cu3er/images/teamwork.png b/modules/cu3er/images/teamwork.png new file mode 100644 index 0000000..99f760b Binary files /dev/null and b/modules/cu3er/images/teamwork.png differ diff --git a/modules/cu3er/index.php b/modules/cu3er/index.php new file mode 100644 index 0000000..0e5202d --- /dev/null +++ b/modules/cu3er/index.php @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + http://www.3rd-infantry-division.org/forums/index.php?board=13.0 + Enlist Today! + Some text. + */ \ No newline at end of file diff --git a/modules/cu3er/js/swfobject/expressInstall.swf b/modules/cu3er/js/swfobject/expressInstall.swf new file mode 100644 index 0000000..e972996 Binary files /dev/null and b/modules/cu3er/js/swfobject/expressInstall.swf differ diff --git a/modules/cu3er/js/swfobject/swfobject.js b/modules/cu3er/js/swfobject/swfobject.js new file mode 100644 index 0000000..9378c8f --- /dev/null +++ b/modules/cu3er/js/swfobject/swfobject.js @@ -0,0 +1,777 @@ +/*! SWFObject v2.2 + is released under the MIT License +*/ + +var swfobject = function() { + + var UNDEF = "undefined", + OBJECT = "object", + SHOCKWAVE_FLASH = "Shockwave Flash", + SHOCKWAVE_FLASH_AX = "ShockwaveFlash.ShockwaveFlash", + FLASH_MIME_TYPE = "application/x-shockwave-flash", + EXPRESS_INSTALL_ID = "SWFObjectExprInst", + ON_READY_STATE_CHANGE = "onreadystatechange", + + win = window, + doc = document, + nav = navigator, + + plugin = false, + domLoadFnArr = [main], + regObjArr = [], + objIdArr = [], + listenersArr = [], + storedAltContent, + storedAltContentId, + storedCallbackFn, + storedCallbackObj, + isDomLoaded = false, + isExpressInstallActive = false, + dynamicStylesheet, + dynamicStylesheetMedia, + autoHideShow = true, + + /* Centralized function for browser feature detection + - User agent string detection is only used when no good alternative is possible + - Is executed directly for optimal performance + */ + ua = function() { + var w3cdom = typeof doc.getElementById != UNDEF && typeof doc.getElementsByTagName != UNDEF && typeof doc.createElement != UNDEF, + u = nav.userAgent.toLowerCase(), + p = nav.platform.toLowerCase(), + windows = p ? /win/.test(p) : /win/.test(u), + mac = p ? /mac/.test(p) : /mac/.test(u), + webkit = /webkit/.test(u) ? parseFloat(u.replace(/^.*webkit\/(\d+(\.\d+)?).*$/, "$1")) : false, // returns either the webkit version or false if not webkit + ie = !+"\v1", // feature detection based on Andrea Giammarchi's solution: http://webreflection.blogspot.com/2009/01/32-bytes-to-know-if-your-browser-is-ie.html + playerVersion = [0,0,0], + d = null; + if (typeof nav.plugins != UNDEF && typeof nav.plugins[SHOCKWAVE_FLASH] == OBJECT) { + d = nav.plugins[SHOCKWAVE_FLASH].description; + if (d && !(typeof nav.mimeTypes != UNDEF && nav.mimeTypes[FLASH_MIME_TYPE] && !nav.mimeTypes[FLASH_MIME_TYPE].enabledPlugin)) { // navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin indicates whether plug-ins are enabled or disabled in Safari 3+ + plugin = true; + ie = false; // cascaded feature detection for Internet Explorer + d = d.replace(/^.*\s+(\S+\s+\S+$)/, "$1"); + playerVersion[0] = parseInt(d.replace(/^(.*)\..*$/, "$1"), 10); + playerVersion[1] = parseInt(d.replace(/^.*\.(.*)\s.*$/, "$1"), 10); + playerVersion[2] = /[a-zA-Z]/.test(d) ? parseInt(d.replace(/^.*[a-zA-Z]+(.*)$/, "$1"), 10) : 0; + } + } + else if (typeof win.ActiveXObject != UNDEF) { + try { + var a = new ActiveXObject(SHOCKWAVE_FLASH_AX); + if (a) { // a will return null when ActiveX is disabled + d = a.GetVariable("$version"); + if (d) { + ie = true; // cascaded feature detection for Internet Explorer + d = d.split(" ")[1].split(","); + playerVersion = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)]; + } + } + } + catch(e) {} + } + return { w3:w3cdom, pv:playerVersion, wk:webkit, ie:ie, win:windows, mac:mac }; + }(), + + /* Cross-browser onDomLoad + - Will fire an event as soon as the DOM of a web page is loaded + - Internet Explorer workaround based on Diego Perini's solution: http://javascript.nwbox.com/IEContentLoaded/ + - Regular onload serves as fallback + */ + onDomLoad = function() { + if (!ua.w3) { return; } + if ((typeof doc.readyState != UNDEF && doc.readyState == "complete") || (typeof doc.readyState == UNDEF && (doc.getElementsByTagName("body")[0] || doc.body))) { // function is fired after onload, e.g. when script is inserted dynamically + callDomLoadFunctions(); + } + if (!isDomLoaded) { + if (typeof doc.addEventListener != UNDEF) { + doc.addEventListener("DOMContentLoaded", callDomLoadFunctions, false); + } + if (ua.ie && ua.win) { + doc.attachEvent(ON_READY_STATE_CHANGE, function() { + if (doc.readyState == "complete") { + doc.detachEvent(ON_READY_STATE_CHANGE, arguments.callee); + callDomLoadFunctions(); + } + }); + if (win == top) { // if not inside an iframe + (function(){ + if (isDomLoaded) { return; } + try { + doc.documentElement.doScroll("left"); + } + catch(e) { + setTimeout(arguments.callee, 0); + return; + } + callDomLoadFunctions(); + })(); + } + } + if (ua.wk) { + (function(){ + if (isDomLoaded) { return; } + if (!/loaded|complete/.test(doc.readyState)) { + setTimeout(arguments.callee, 0); + return; + } + callDomLoadFunctions(); + })(); + } + addLoadEvent(callDomLoadFunctions); + } + }(); + + function callDomLoadFunctions() { + if (isDomLoaded) { return; } + try { // test if we can really add/remove elements to/from the DOM; we don't want to fire it too early + var t = doc.getElementsByTagName("body")[0].appendChild(createElement("span")); + t.parentNode.removeChild(t); + } + catch (e) { return; } + isDomLoaded = true; + var dl = domLoadFnArr.length; + for (var i = 0; i < dl; i++) { + domLoadFnArr[i](); + } + } + + function addDomLoadEvent(fn) { + if (isDomLoaded) { + fn(); + } + else { + domLoadFnArr[domLoadFnArr.length] = fn; // Array.push() is only available in IE5.5+ + } + } + + /* Cross-browser onload + - Based on James Edwards' solution: http://brothercake.com/site/resources/scripts/onload/ + - Will fire an event as soon as a web page including all of its assets are loaded + */ + function addLoadEvent(fn) { + if (typeof win.addEventListener != UNDEF) { + win.addEventListener("load", fn, false); + } + else if (typeof doc.addEventListener != UNDEF) { + doc.addEventListener("load", fn, false); + } + else if (typeof win.attachEvent != UNDEF) { + addListener(win, "onload", fn); + } + else if (typeof win.onload == "function") { + var fnOld = win.onload; + win.onload = function() { + fnOld(); + fn(); + }; + } + else { + win.onload = fn; + } + } + + /* Main function + - Will preferably execute onDomLoad, otherwise onload (as a fallback) + */ + function main() { + if (plugin) { + testPlayerVersion(); + } + else { + matchVersions(); + } + } + + /* Detect the Flash Player version for non-Internet Explorer browsers + - Detecting the plug-in version via the object element is more precise than using the plugins collection item's description: + a. Both release and build numbers can be detected + b. Avoid wrong descriptions by corrupt installers provided by Adobe + c. Avoid wrong descriptions by multiple Flash Player entries in the plugin Array, caused by incorrect browser imports + - Disadvantage of this method is that it depends on the availability of the DOM, while the plugins collection is immediately available + */ + function testPlayerVersion() { + var b = doc.getElementsByTagName("body")[0]; + var o = createElement(OBJECT); + o.setAttribute("type", FLASH_MIME_TYPE); + var t = b.appendChild(o); + if (t) { + var counter = 0; + (function(){ + if (typeof t.GetVariable != UNDEF) { + var d = t.GetVariable("$version"); + if (d) { + d = d.split(" ")[1].split(","); + ua.pv = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)]; + } + } + else if (counter < 10) { + counter++; + setTimeout(arguments.callee, 10); + return; + } + b.removeChild(o); + t = null; + matchVersions(); + })(); + } + else { + matchVersions(); + } + } + + /* Perform Flash Player and SWF version matching; static publishing only + */ + function matchVersions() { + var rl = regObjArr.length; + if (rl > 0) { + for (var i = 0; i < rl; i++) { // for each registered object element + var id = regObjArr[i].id; + var cb = regObjArr[i].callbackFn; + var cbObj = {success:false, id:id}; + if (ua.pv[0] > 0) { + var obj = getElementById(id); + if (obj) { + if (hasPlayerVersion(regObjArr[i].swfVersion) && !(ua.wk && ua.wk < 312)) { // Flash Player version >= published SWF version: Houston, we have a match! + setVisibility(id, true); + if (cb) { + cbObj.success = true; + cbObj.ref = getObjectById(id); + cb(cbObj); + } + } + else if (regObjArr[i].expressInstall && canExpressInstall()) { // show the Adobe Express Install dialog if set by the web page author and if supported + var att = {}; + att.data = regObjArr[i].expressInstall; + att.width = obj.getAttribute("width") || "0"; + att.height = obj.getAttribute("height") || "0"; + if (obj.getAttribute("class")) { att.styleclass = obj.getAttribute("class"); } + if (obj.getAttribute("align")) { att.align = obj.getAttribute("align"); } + // parse HTML object param element's name-value pairs + var par = {}; + var p = obj.getElementsByTagName("param"); + var pl = p.length; + for (var j = 0; j < pl; j++) { + if (p[j].getAttribute("name").toLowerCase() != "movie") { + par[p[j].getAttribute("name")] = p[j].getAttribute("value"); + } + } + showExpressInstall(att, par, id, cb); + } + else { // Flash Player and SWF version mismatch or an older Webkit engine that ignores the HTML object element's nested param elements: display alternative content instead of SWF + displayAltContent(obj); + if (cb) { cb(cbObj); } + } + } + } + else { // if no Flash Player is installed or the fp version cannot be detected we let the HTML object element do its job (either show a SWF or alternative content) + setVisibility(id, true); + if (cb) { + var o = getObjectById(id); // test whether there is an HTML object element or not + if (o && typeof o.SetVariable != UNDEF) { + cbObj.success = true; + cbObj.ref = o; + } + cb(cbObj); + } + } + } + } + } + + function getObjectById(objectIdStr) { + var r = null; + var o = getElementById(objectIdStr); + if (o && o.nodeName == "OBJECT") { + if (typeof o.SetVariable != UNDEF) { + r = o; + } + else { + var n = o.getElementsByTagName(OBJECT)[0]; + if (n) { + r = n; + } + } + } + return r; + } + + /* Requirements for Adobe Express Install + - only one instance can be active at a time + - fp 6.0.65 or higher + - Win/Mac OS only + - no Webkit engines older than version 312 + */ + function canExpressInstall() { + return !isExpressInstallActive && hasPlayerVersion("6.0.65") && (ua.win || ua.mac) && !(ua.wk && ua.wk < 312); + } + + /* Show the Adobe Express Install dialog + - Reference: http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=6a253b75 + */ + function showExpressInstall(att, par, replaceElemIdStr, callbackFn) { + isExpressInstallActive = true; + storedCallbackFn = callbackFn || null; + storedCallbackObj = {success:false, id:replaceElemIdStr}; + var obj = getElementById(replaceElemIdStr); + if (obj) { + if (obj.nodeName == "OBJECT") { // static publishing + storedAltContent = abstractAltContent(obj); + storedAltContentId = null; + } + else { // dynamic publishing + storedAltContent = obj; + storedAltContentId = replaceElemIdStr; + } + att.id = EXPRESS_INSTALL_ID; + if (typeof att.width == UNDEF || (!/%$/.test(att.width) && parseInt(att.width, 10) < 310)) { att.width = "310"; } + if (typeof att.height == UNDEF || (!/%$/.test(att.height) && parseInt(att.height, 10) < 137)) { att.height = "137"; } + doc.title = doc.title.slice(0, 47) + " - Flash Player Installation"; + var pt = ua.ie && ua.win ? "ActiveX" : "PlugIn", + fv = "MMredirectURL=" + win.location.toString().replace(/&/g,"%26") + "&MMplayerType=" + pt + "&MMdoctitle=" + doc.title; + if (typeof par.flashvars != UNDEF) { + par.flashvars += "&" + fv; + } + else { + par.flashvars = fv; + } + // IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it, + // because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work + if (ua.ie && ua.win && obj.readyState != 4) { + var newObj = createElement("div"); + replaceElemIdStr += "SWFObjectNew"; + newObj.setAttribute("id", replaceElemIdStr); + obj.parentNode.insertBefore(newObj, obj); // insert placeholder div that will be replaced by the object element that loads expressinstall.swf + obj.style.display = "none"; + (function(){ + if (obj.readyState == 4) { + obj.parentNode.removeChild(obj); + } + else { + setTimeout(arguments.callee, 10); + } + })(); + } + createSWF(att, par, replaceElemIdStr); + } + } + + /* Functions to abstract and display alternative content + */ + function displayAltContent(obj) { + if (ua.ie && ua.win && obj.readyState != 4) { + // IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it, + // because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work + var el = createElement("div"); + obj.parentNode.insertBefore(el, obj); // insert placeholder div that will be replaced by the alternative content + el.parentNode.replaceChild(abstractAltContent(obj), el); + obj.style.display = "none"; + (function(){ + if (obj.readyState == 4) { + obj.parentNode.removeChild(obj); + } + else { + setTimeout(arguments.callee, 10); + } + })(); + } + else { + obj.parentNode.replaceChild(abstractAltContent(obj), obj); + } + } + + function abstractAltContent(obj) { + var ac = createElement("div"); + if (ua.win && ua.ie) { + ac.innerHTML = obj.innerHTML; + } + else { + var nestedObj = obj.getElementsByTagName(OBJECT)[0]; + if (nestedObj) { + var c = nestedObj.childNodes; + if (c) { + var cl = c.length; + for (var i = 0; i < cl; i++) { + if (!(c[i].nodeType == 1 && c[i].nodeName == "PARAM") && !(c[i].nodeType == 8)) { + ac.appendChild(c[i].cloneNode(true)); + } + } + } + } + } + return ac; + } + + /* Cross-browser dynamic SWF creation + */ + function createSWF(attObj, parObj, id) { + var r, el = getElementById(id); + if (ua.wk && ua.wk < 312) { return r; } + if (el) { + if (typeof attObj.id == UNDEF) { // if no 'id' is defined for the object element, it will inherit the 'id' from the alternative content + attObj.id = id; + } + if (ua.ie && ua.win) { // Internet Explorer + the HTML object element + W3C DOM methods do not combine: fall back to outerHTML + var att = ""; + for (var i in attObj) { + if (attObj[i] != Object.prototype[i]) { // filter out prototype additions from other potential libraries + if (i.toLowerCase() == "data") { + parObj.movie = attObj[i]; + } + else if (i.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword + att += ' class="' + attObj[i] + '"'; + } + else if (i.toLowerCase() != "classid") { + att += ' ' + i + '="' + attObj[i] + '"'; + } + } + } + var par = ""; + for (var j in parObj) { + if (parObj[j] != Object.prototype[j]) { // filter out prototype additions from other potential libraries + par += ''; + } + } + el.outerHTML = '' + par + ''; + objIdArr[objIdArr.length] = attObj.id; // stored to fix object 'leaks' on unload (dynamic publishing only) + r = getElementById(attObj.id); + } + else { // well-behaving browsers + var o = createElement(OBJECT); + o.setAttribute("type", FLASH_MIME_TYPE); + for (var m in attObj) { + if (attObj[m] != Object.prototype[m]) { // filter out prototype additions from other potential libraries + if (m.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword + o.setAttribute("class", attObj[m]); + } + else if (m.toLowerCase() != "classid") { // filter out IE specific attribute + o.setAttribute(m, attObj[m]); + } + } + } + for (var n in parObj) { + if (parObj[n] != Object.prototype[n] && n.toLowerCase() != "movie") { // filter out prototype additions from other potential libraries and IE specific param element + createObjParam(o, n, parObj[n]); + } + } + el.parentNode.replaceChild(o, el); + r = o; + } + } + return r; + } + + function createObjParam(el, pName, pValue) { + var p = createElement("param"); + p.setAttribute("name", pName); + p.setAttribute("value", pValue); + el.appendChild(p); + } + + /* Cross-browser SWF removal + - Especially needed to safely and completely remove a SWF in Internet Explorer + */ + function removeSWF(id) { + var obj = getElementById(id); + if (obj && obj.nodeName == "OBJECT") { + if (ua.ie && ua.win) { + obj.style.display = "none"; + (function(){ + if (obj.readyState == 4) { + removeObjectInIE(id); + } + else { + setTimeout(arguments.callee, 10); + } + })(); + } + else { + obj.parentNode.removeChild(obj); + } + } + } + + function removeObjectInIE(id) { + var obj = getElementById(id); + if (obj) { + for (var i in obj) { + if (typeof obj[i] == "function") { + obj[i] = null; + } + } + obj.parentNode.removeChild(obj); + } + } + + /* Functions to optimize JavaScript compression + */ + function getElementById(id) { + var el = null; + try { + el = doc.getElementById(id); + } + catch (e) {} + return el; + } + + function createElement(el) { + return doc.createElement(el); + } + + /* Updated attachEvent function for Internet Explorer + - Stores attachEvent information in an Array, so on unload the detachEvent functions can be called to avoid memory leaks + */ + function addListener(target, eventType, fn) { + target.attachEvent(eventType, fn); + listenersArr[listenersArr.length] = [target, eventType, fn]; + } + + /* Flash Player and SWF content version matching + */ + function hasPlayerVersion(rv) { + var pv = ua.pv, v = rv.split("."); + v[0] = parseInt(v[0], 10); + v[1] = parseInt(v[1], 10) || 0; // supports short notation, e.g. "9" instead of "9.0.0" + v[2] = parseInt(v[2], 10) || 0; + return (pv[0] > v[0] || (pv[0] == v[0] && pv[1] > v[1]) || (pv[0] == v[0] && pv[1] == v[1] && pv[2] >= v[2])) ? true : false; + } + + /* Cross-browser dynamic CSS creation + - Based on Bobby van der Sluis' solution: http://www.bobbyvandersluis.com/articles/dynamicCSS.php + */ + function createCSS(sel, decl, media, newStyle) { + if (ua.ie && ua.mac) { return; } + var h = doc.getElementsByTagName("head")[0]; + if (!h) { return; } // to also support badly authored HTML pages that lack a head element + var m = (media && typeof media == "string") ? media : "screen"; + if (newStyle) { + dynamicStylesheet = null; + dynamicStylesheetMedia = null; + } + if (!dynamicStylesheet || dynamicStylesheetMedia != m) { + // create dynamic stylesheet + get a global reference to it + var s = createElement("style"); + s.setAttribute("type", "text/css"); + s.setAttribute("media", m); + dynamicStylesheet = h.appendChild(s); + if (ua.ie && ua.win && typeof doc.styleSheets != UNDEF && doc.styleSheets.length > 0) { + dynamicStylesheet = doc.styleSheets[doc.styleSheets.length - 1]; + } + dynamicStylesheetMedia = m; + } + // add style rule + if (ua.ie && ua.win) { + if (dynamicStylesheet && typeof dynamicStylesheet.addRule == OBJECT) { + dynamicStylesheet.addRule(sel, decl); + } + } + else { + if (dynamicStylesheet && typeof doc.createTextNode != UNDEF) { + dynamicStylesheet.appendChild(doc.createTextNode(sel + " {" + decl + "}")); + } + } + } + + function setVisibility(id, isVisible) { + if (!autoHideShow) { return; } + var v = isVisible ? "visible" : "hidden"; + if (isDomLoaded && getElementById(id)) { + getElementById(id).style.visibility = v; + } + else { + createCSS("#" + id, "visibility:" + v); + } + } + + /* Filter to avoid XSS attacks + */ + function urlEncodeIfNecessary(s) { + var regex = /[\\\"<>\.;]/; + var hasBadChars = regex.exec(s) != null; + return hasBadChars && typeof encodeURIComponent != UNDEF ? encodeURIComponent(s) : s; + } + + /* Release memory to avoid memory leaks caused by closures, fix hanging audio/video threads and force open sockets/NetConnections to disconnect (Internet Explorer only) + */ + var cleanup = function() { + if (ua.ie && ua.win) { + window.attachEvent("onunload", function() { + // remove listeners to avoid memory leaks + var ll = listenersArr.length; + for (var i = 0; i < ll; i++) { + listenersArr[i][0].detachEvent(listenersArr[i][1], listenersArr[i][2]); + } + // cleanup dynamically embedded objects to fix audio/video threads and force open sockets and NetConnections to disconnect + var il = objIdArr.length; + for (var j = 0; j < il; j++) { + removeSWF(objIdArr[j]); + } + // cleanup library's main closures to avoid memory leaks + for (var k in ua) { + ua[k] = null; + } + ua = null; + for (var l in swfobject) { + swfobject[l] = null; + } + swfobject = null; + }); + } + }(); + + return { + /* Public API + - Reference: http://code.google.com/p/swfobject/wiki/documentation + */ + registerObject: function(objectIdStr, swfVersionStr, xiSwfUrlStr, callbackFn) { + if (ua.w3 && objectIdStr && swfVersionStr) { + var regObj = {}; + regObj.id = objectIdStr; + regObj.swfVersion = swfVersionStr; + regObj.expressInstall = xiSwfUrlStr; + regObj.callbackFn = callbackFn; + regObjArr[regObjArr.length] = regObj; + setVisibility(objectIdStr, false); + } + else if (callbackFn) { + callbackFn({success:false, id:objectIdStr}); + } + }, + + getObjectById: function(objectIdStr) { + if (ua.w3) { + return getObjectById(objectIdStr); + } + }, + + embedSWF: function(swfUrlStr, replaceElemIdStr, widthStr, heightStr, swfVersionStr, xiSwfUrlStr, flashvarsObj, parObj, attObj, callbackFn) { + var callbackObj = {success:false, id:replaceElemIdStr}; + if (ua.w3 && !(ua.wk && ua.wk < 312) && swfUrlStr && replaceElemIdStr && widthStr && heightStr && swfVersionStr) { + setVisibility(replaceElemIdStr, false); + addDomLoadEvent(function() { + widthStr += ""; // auto-convert to string + heightStr += ""; + var att = {}; + if (attObj && typeof attObj === OBJECT) { + for (var i in attObj) { // copy object to avoid the use of references, because web authors often reuse attObj for multiple SWFs + att[i] = attObj[i]; + } + } + att.data = swfUrlStr; + att.width = widthStr; + att.height = heightStr; + var par = {}; + if (parObj && typeof parObj === OBJECT) { + for (var j in parObj) { // copy object to avoid the use of references, because web authors often reuse parObj for multiple SWFs + par[j] = parObj[j]; + } + } + if (flashvarsObj && typeof flashvarsObj === OBJECT) { + for (var k in flashvarsObj) { // copy object to avoid the use of references, because web authors often reuse flashvarsObj for multiple SWFs + if (typeof par.flashvars != UNDEF) { + par.flashvars += "&" + k + "=" + flashvarsObj[k]; + } + else { + par.flashvars = k + "=" + flashvarsObj[k]; + } + } + } + if (hasPlayerVersion(swfVersionStr)) { // create SWF + var obj = createSWF(att, par, replaceElemIdStr); + if (att.id == replaceElemIdStr) { + setVisibility(replaceElemIdStr, true); + } + callbackObj.success = true; + callbackObj.ref = obj; + } + else if (xiSwfUrlStr && canExpressInstall()) { // show Adobe Express Install + att.data = xiSwfUrlStr; + showExpressInstall(att, par, replaceElemIdStr, callbackFn); + return; + } + else { // show alternative content + setVisibility(replaceElemIdStr, true); + } + if (callbackFn) { callbackFn(callbackObj); } + }); + } + else if (callbackFn) { callbackFn(callbackObj); } + }, + + switchOffAutoHideShow: function() { + autoHideShow = false; + }, + + ua: ua, + + getFlashPlayerVersion: function() { + return { major:ua.pv[0], minor:ua.pv[1], release:ua.pv[2] }; + }, + + hasFlashPlayerVersion: hasPlayerVersion, + + createSWF: function(attObj, parObj, replaceElemIdStr) { + if (ua.w3) { + return createSWF(attObj, parObj, replaceElemIdStr); + } + else { + return undefined; + } + }, + + showExpressInstall: function(att, par, replaceElemIdStr, callbackFn) { + if (ua.w3 && canExpressInstall()) { + showExpressInstall(att, par, replaceElemIdStr, callbackFn); + } + }, + + removeSWF: function(objElemIdStr) { + if (ua.w3) { + removeSWF(objElemIdStr); + } + }, + + createCSS: function(selStr, declStr, mediaStr, newStyleBoolean) { + if (ua.w3) { + createCSS(selStr, declStr, mediaStr, newStyleBoolean); + } + }, + + addDomLoadEvent: addDomLoadEvent, + + addLoadEvent: addLoadEvent, + + getQueryParamValue: function(param) { + var q = doc.location.search || doc.location.hash; + if (q) { + if (/\?/.test(q)) { q = q.split("?")[1]; } // strip question mark + if (param == null) { + return urlEncodeIfNecessary(q); + } + var pairs = q.split("&"); + for (var i = 0; i < pairs.length; i++) { + if (pairs[i].substring(0, pairs[i].indexOf("=")) == param) { + return urlEncodeIfNecessary(pairs[i].substring((pairs[i].indexOf("=") + 1))); + } + } + } + return ""; + }, + + // For internal usage only + expressInstallCallback: function() { + if (isExpressInstallActive) { + var obj = getElementById(EXPRESS_INSTALL_ID); + if (obj && storedAltContent) { + obj.parentNode.replaceChild(storedAltContent, obj); + if (storedAltContentId) { + setVisibility(storedAltContentId, true); + if (ua.ie && ua.win) { storedAltContent.style.display = "block"; } + } + if (storedCallbackFn) { storedCallbackFn(storedCallbackObj); } + } + isExpressInstallActive = false; + } + } + }; +}(); diff --git a/modules/cu3er/license.txt b/modules/cu3er/license.txt new file mode 100644 index 0000000..24f51bb --- /dev/null +++ b/modules/cu3er/license.txt @@ -0,0 +1,53 @@ +Copyright (c) 2010, Stefan Kovac +All rights reserved. + +By downloading CU3ER v0.9.2 - flash 3D slider, you agree to the following: + +Stefan Kovac grants you the non-exclusive, non-transferable license +to use CU3ER subject to the restrictions defined below. + + * You may use CU3ER in personal and / or commercial projects. + + * You may implement CU3ER in an unlimited number of websites and + offline presentations, as long as you are acting as the administrator + and / or developer for those websites and / or presentations. + + * You may deploy SWFs containing CU3ER as part of hired work for + a third party as long as the SWF is unique to said party and not + replicated / resold / redistributed as part of a template, + application or service to additional parties. + + * SWF containing CU3ER may not be embedded as part of a template, + application, and / or web site where stated template, application, + and/or web site is re-sold and / or re-distributed for independent + use by third parties, without specific prior written permission. + + * SWFs containing CU3ER may not be embedded in a template, content + management system, and / or online web service in a manner where the + SWF is replicated and used as a slideshow viewer for photos contributed + by more than one party. + + * CU3ER may not be sub-licensed or resold. + + * You agree not to decompile, reverse engineer, disassemble, or otherwise + determine or attempt to determine source code for the executable code + of CU3ER, and agrees not to permit or authorize anyone else to do so. + + * CU3ER redistribution must reproduce the above copyright notice, this + list of conditions and the disclaimer in the documentation and/or + other materials provided with the distribution. + + * Neither the name of CU3ER nor the name of it contributor (Stefan Kovac) + may be used to endorse or promote products associated with CU3ER without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY STEFAN KOVAC ''AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL STEFAN KOVAC BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/modules/download/files/MILPACS_RC1_b.zip b/modules/download/files/MILPACS_RC1_b.zip new file mode 100644 index 0000000..24b7dab Binary files /dev/null and b/modules/download/files/MILPACS_RC1_b.zip differ diff --git a/modules/download/files/MarneMessenger_1-1.pdf b/modules/download/files/MarneMessenger_1-1.pdf new file mode 100644 index 0000000..12bead4 Binary files /dev/null and b/modules/download/files/MarneMessenger_1-1.pdf differ diff --git a/modules/download/files/MarneMessenger_1-2.pdf b/modules/download/files/MarneMessenger_1-2.pdf new file mode 100644 index 0000000..0090c30 Binary files /dev/null and b/modules/download/files/MarneMessenger_1-2.pdf differ diff --git a/modules/download/files/MarneMessenger_2-1.pdf b/modules/download/files/MarneMessenger_2-1.pdf new file mode 100644 index 0000000..614e329 Binary files /dev/null and b/modules/download/files/MarneMessenger_2-1.pdf differ diff --git a/modules/download/files/MarneMessenger_2-2.pdf b/modules/download/files/MarneMessenger_2-2.pdf new file mode 100644 index 0000000..016ccf9 Binary files /dev/null and b/modules/download/files/MarneMessenger_2-2.pdf differ diff --git a/modules/download/files/Milpacs_RC2.zip b/modules/download/files/Milpacs_RC2.zip new file mode 100644 index 0000000..7546eda Binary files /dev/null and b/modules/download/files/Milpacs_RC2.zip differ diff --git a/modules/download/index.php b/modules/download/index.php index b819e8d..8cd1d99 100644 --- a/modules/download/index.php +++ b/modules/download/index.php @@ -1,134 +1,134 @@ -. - */ - -if(!defined("MODULE_FILE")) -{ - die("Access denied..."); -} - -function getCategoryList() -{ - global $db; - $query = sprintf("SELECT category_id, title FROM bayonet_downloads_categories"); - $result = $db->Query($query); - $categories = $db->Fetch($result); - - return $categories; -} - -function getCategoryName($category) -{ - global $db; - if(!filter_var($category, FILTER_VALIDATE_INT)) - return array(); - - $query = sprintf("SELECT category_id, title FROM bayonet_downloads_categories WHERE category_id = %d", (int)$category); - $result = $db->Query($query); - $data = $db->FetchRow($result); - - return $data['title']; - //return is_array($data) ? $data : array(); -} - -function getCategoryFiles($category) -{ - global $db; - $query = sprintf("SELECT ca.category_id, ca.title AS category, dl.name, dl.filename, dl.description FROM bayonet_downloads_categories AS ca LEFT OUTER JOIN bayonet_downloads AS dl ON dl.category_id = ca.category_id WHERE ca.category_id = %d", (int)$category); - - $result = $db->Query($query); - $downloads = $db->FetchArray($result); - decho('downloads data'); - decho($downloads); - decho('downloads data done'); - - return $downloads; -} - -global $db; -$downloads = NULL; -$download_relative_path = "modules/" . basename(dirname(__FILE__)) . "/files/"; -$download_absolute_path = dirname(__FILE__) . "/files/"; - -$category = $_GET['category']; -if(isset($category) && !filter_var($category, FILTER_VALIDATE_INT)) -{ - ReportHack("Purposely invalid category entry."); - return; -} - -$downloads = getCategoryFiles($category); -decho($downloads); - -OpenContent(); -echo "
    Categories
    \n"; -echo "
    \n"; - -$categoryList = getCategoryList(); - - foreach($categoryList as $categoryListItem) - { - echo "

    "; - echo LinkModule("download", "&category={$categoryListItem['category_id']}",$categoryListItem['title']); - echo "

    \n"; - } - - -echo "
    \n\n"; -CloseContent(); - -echo "
    "; //spacer between div tags - -if(isset($category)) -{ - OpenContent(); - echo "
    " . getCategoryName($category) . "
    \n"; - echo "
    \n"; - - OpenContent(); - echo "
    Files
    \n"; - echo "
    \n"; - - if(empty($downloads)) - { - echo "No downloads available.\n"; - return; - } - - foreach($downloads as $file) - { - $download_full_path = $download_absolute_path . $file['filename']; - - if(!file_exists($download_full_path)) $broken = "(Broken link detected)"; - echo "

    "; - echo LinkInternal($file['name'], $file['filename'], $download_relative_path) . " $broken
    \n"; - echo "Filename: {$file['filename']}
    \n"; - printf("Size: %.2fKB
    \n", filesize($download_full_path) / 1024); - echo "MD5 Hash: " . md5_file($download_full_path) . "
    \n"; - echo "Description: {$file['description']}
    \n"; - echo "

    "; - - } - //logQueueFlush(FORCE); - - echo "
    \n
    "; - echo "\n"; -} - CloseContent(); -CloseContent(); -?> +. + */ + +if(!defined("MODULE_FILE")) +{ + die("Access denied..."); +} + +function getCategoryList() +{ + global $db; + $query = sprintf("SELECT category_id, title FROM bayonet_downloads_categories"); + $result = $db->Query($query); + $categories = $db->Fetch($result); + + return $categories; +} + +function getCategoryName($category) +{ + global $db; + if(!filter_var($category, FILTER_VALIDATE_INT)) + return array(); + + $query = sprintf("SELECT category_id, title FROM bayonet_downloads_categories WHERE category_id = %d", (int)$category); + $result = $db->Query($query); + $data = $db->FetchRow($result); + + return $data['title']; + //return is_array($data) ? $data : array(); +} + +function getCategoryFiles($category) +{ + global $db; + $query = sprintf("SELECT ca.category_id, ca.title AS category, dl.name, dl.filename, dl.description FROM bayonet_downloads_categories AS ca LEFT OUTER JOIN bayonet_downloads AS dl ON dl.category_id = ca.category_id WHERE ca.category_id = %d", (int)$category); + + $result = $db->Query($query); + $downloads = $db->FetchArray($result); + decho('downloads data'); + decho($downloads); + decho('downloads data done'); + + return $downloads; +} + +global $db; +$downloads = NULL; +$download_relative_path = "modules/" . basename(dirname(__FILE__)) . "/files/"; +$download_absolute_path = dirname(__FILE__) . "/files/"; + +$category = $_GET['category']; +if(isset($category) && !filter_var($category, FILTER_VALIDATE_INT)) +{ + ReportHack("Purposely invalid category entry."); + return; +} + +$downloads = getCategoryFiles($category); +decho($downloads); + +OpenContent(); +echo "
    Categories
    \n"; +echo "
    \n"; + +$categoryList = getCategoryList(); + + foreach($categoryList as $categoryListItem) + { + echo "

    "; + echo LinkModule("download", "&category={$categoryListItem['category_id']}",$categoryListItem['title']); + echo "

    \n"; + } + + +echo "
    \n\n"; +CloseContent(); + +echo "
    "; //spacer between div tags + +if(isset($category)) +{ + OpenContent(); + echo "
    " . getCategoryName($category) . "
    \n"; + echo "
    \n"; + + OpenContent(); + echo "
    Files
    \n"; + echo "
    \n"; + + if(empty($downloads)) + { + echo "No downloads available.\n"; + return; + } + + foreach($downloads as $file) + { + $download_full_path = $download_absolute_path . $file['filename']; + + if(!file_exists($download_full_path)) $broken = "(Broken link detected)"; + echo "

    "; + echo LinkInternal($file['name'], $file['filename'], $download_relative_path) . " $broken
    \n"; + echo "Filename: {$file['filename']}
    \n"; + printf("Size: %.2fKB
    \n", filesize($download_full_path) / 1024); + echo "MD5 Hash: " . md5_file($download_full_path) . "
    \n"; + echo "Description: {$file['description']}
    \n"; + echo "

    "; + + } + //logQueueFlush(FORCE); + + echo "
    \n
    "; + echo "\n"; +} + CloseContent(); +CloseContent(); +?> diff --git a/modules/index/index.php b/modules/index/index.php index 54c8dbd..83b542c 100644 --- a/modules/index/index.php +++ b/modules/index/index.php @@ -10,7 +10,7 @@ define('INDEX_MODULE', true); -$result = $db->Query("SELECT `dir_name` FROM `bayonet_modules` ORDER BY `weight` ASC"); +$result = $db->Query("SELECT `dir_name` FROM `bayonet_modules` WHERE `status` = 'Active' ORDER BY `weight` ASC"); $modules = $db->Fetch($result); foreach($modules as $module) { diff --git a/modules/news/functions.php b/modules/news/functions.php index f3505df..67e9b43 100644 --- a/modules/news/functions.php +++ b/modules/news/functions.php @@ -130,10 +130,11 @@ function getNumOfComments($id){ function getNews($id = NULL, $limit = NULL, $index = 0){ global $db; - $query = "SELECT n.news_id, n.title, n.message, n.date, n.category_id, u.username AS author, c.name AS catname, c.image AS catimage ". + $query = "SELECT n.news_id, n.title, n.message, n.date, n.edited, n.category_id, u.username AS author, e.username AS eauthor, c.name AS catname, c.image AS catimage ". "FROM `bayonet_news` AS n ". "INNER JOIN `bayonet_news_categories` AS c ON c.category_id = n.category_id ". - "LEFT OUTER JOIN `mybb_users` AS u ON u.uid = n.author_id "; + "LEFT OUTER JOIN `bayonet_users` AS u ON u.user_id = n.author_id ". + "LEFT OUTER JOIN `bayonet_users` AS e ON e.user_id = n.edited_id "; if(isset($id)){ $query = $query."WHERE n.news_id = '$id' "; }else{ @@ -155,7 +156,7 @@ function getNews($id = NULL, $limit = NULL, $index = 0){ * Function that takes an array of news and displays it as html * @param data - associative array of news from the database */ -function displayNews($data){ +function displayNews($data, $short = false){ date_default_timezone_set("America/New_York"); @@ -182,7 +183,19 @@ function displayNews($data){
    <?php echo $news['catname']; ?> - +
    Continue reading.'; + } else { + echo bbcode_format($news['message']); + } + ?> +
    Last edit: ".date('F j, Y, g:i a T', strtotime($news['edited']))." by ".$news['eauthor']."
    "; + } +?>
    @@ -190,7 +203,7 @@ function displayNews($data){ - +
    View Comments: Comments Posted on: Posted:
    diff --git a/modules/news/index.php b/modules/news/index.php index 1dfd98a..47688be 100644 --- a/modules/news/index.php +++ b/modules/news/index.php @@ -28,6 +28,7 @@ include 'modules/news/functions.php'; $logged_id = 2; if(!defined('INDEX_MODULE')){ + define('BLOCK_RIGHT_DISABLE', true); $page_num = 1; $page_num = $_GET['page']; //get variable for page number @@ -50,10 +51,11 @@ if(isset($_GET['id'])) } else { - $news = getNews(null, $limit, $index); - displayNews($news); - OpenContent(); + if(defined('INDEX_MODULE')){ + $news = getNews(null, $limit, $index); + displayNews($news, true); + OpenContent(); ?>
    Read All  @@ -61,6 +63,26 @@ else 0) + echo " More Recent News"; + if(count($news) == $limit){ +?> +
    + Older News  +
    +
    +"; + displayNews($news); + OpenContent(); + if($page_num > 0) echo " More Recent News"; diff --git a/modules/newsreel/index.php b/modules/newsreel/index.php index f45f2f5..3caa86b 100644 --- a/modules/newsreel/index.php +++ b/modules/newsreel/index.php @@ -1,6 +1,7 @@ +
    -
    - newsreel + + newsreel + +
    -
    + \ No newline at end of file diff --git a/modules/newsreel/slides/agwc3.png b/modules/newsreel/slides/agwc3.png new file mode 100644 index 0000000..7b6f9a7 Binary files /dev/null and b/modules/newsreel/slides/agwc3.png differ diff --git a/modules/newsreel/slides/arma2.png b/modules/newsreel/slides/arma2.png new file mode 100644 index 0000000..94fab4a Binary files /dev/null and b/modules/newsreel/slides/arma2.png differ diff --git a/modules/newsreel/slides/decade.png b/modules/newsreel/slides/decade.png new file mode 100644 index 0000000..0ba39aa Binary files /dev/null and b/modules/newsreel/slides/decade.png differ diff --git a/modules/newsreel/slides/drilltimes.png b/modules/newsreel/slides/drilltimes.png new file mode 100644 index 0000000..497b406 Binary files /dev/null and b/modules/newsreel/slides/drilltimes.png differ diff --git a/modules/newsreel/slides/holidays.png b/modules/newsreel/slides/holidays.png new file mode 100644 index 0000000..48a1c72 Binary files /dev/null and b/modules/newsreel/slides/holidays.png differ diff --git a/modules/newsreel/slides/joinus.png b/modules/newsreel/slides/joinus.png new file mode 100644 index 0000000..950a2bc Binary files /dev/null and b/modules/newsreel/slides/joinus.png differ diff --git a/modules/newsreel/slides/leadership.png b/modules/newsreel/slides/leadership.png new file mode 100644 index 0000000..52730a4 Binary files /dev/null and b/modules/newsreel/slides/leadership.png differ diff --git a/modules/newsreel/slides/team.png b/modules/newsreel/slides/team.png new file mode 100644 index 0000000..fe307c1 Binary files /dev/null and b/modules/newsreel/slides/team.png differ diff --git a/modules/newsreel/slides/team2.png b/modules/newsreel/slides/team2.png new file mode 100644 index 0000000..889a266 Binary files /dev/null and b/modules/newsreel/slides/team2.png differ diff --git a/modules/page/index.php b/modules/page/index.php index 5b943ce..aeba18a 100644 --- a/modules/page/index.php +++ b/modules/page/index.php @@ -18,6 +18,7 @@ */ define("MODULE_FAIL", "You cannot access this module directly.
    \n",true); +define('BLOCK_RIGHT_DISABLE', true); if(!defined("MODULE_FILE")) { 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 diff --git a/themes/default/images/add.gif b/themes/default/images/add.gif new file mode 100644 index 0000000..836dbf2 Binary files /dev/null and b/themes/default/images/add.gif differ diff --git a/themes/default/images/addnewarticle.png b/themes/default/images/addnewarticle.png new file mode 100644 index 0000000..0e29960 Binary files /dev/null and b/themes/default/images/addnewarticle.png differ diff --git a/themes/default/images/addnewpage.png b/themes/default/images/addnewpage.png new file mode 100644 index 0000000..c60c68c Binary files /dev/null and b/themes/default/images/addnewpage.png differ diff --git a/themes/default/images/annoucement.png b/themes/default/images/annoucement.png new file mode 100644 index 0000000..c70591d Binary files /dev/null and b/themes/default/images/annoucement.png differ diff --git a/themes/default/images/announcement.png b/themes/default/images/announcement.png new file mode 100644 index 0000000..c70591d Binary files /dev/null and b/themes/default/images/announcement.png differ diff --git a/themes/default/images/arrowleft.png b/themes/default/images/arrowleft.png new file mode 100644 index 0000000..502ae41 Binary files /dev/null and b/themes/default/images/arrowleft.png differ diff --git a/themes/default/images/arrowright.png b/themes/default/images/arrowright.png new file mode 100644 index 0000000..ddd163b Binary files /dev/null and b/themes/default/images/arrowright.png differ diff --git a/themes/default/images/bayonetLogo.png b/themes/default/images/bayonetLogo.png new file mode 100644 index 0000000..4183a88 Binary files /dev/null and b/themes/default/images/bayonetLogo.png differ diff --git a/themes/default/images/blockbackground.jpg b/themes/default/images/blockbackground.jpg new file mode 100644 index 0000000..ea6c7d3 Binary files /dev/null and b/themes/default/images/blockbackground.jpg differ diff --git a/themes/default/images/calendar.png b/themes/default/images/calendar.png new file mode 100644 index 0000000..86b9861 Binary files /dev/null and b/themes/default/images/calendar.png differ diff --git a/themes/default/images/delete.gif b/themes/default/images/delete.gif new file mode 100644 index 0000000..4e2a37f Binary files /dev/null and b/themes/default/images/delete.gif differ diff --git a/themes/default/images/dicon.png b/themes/default/images/dicon.png new file mode 100644 index 0000000..e9323cb Binary files /dev/null and b/themes/default/images/dicon.png differ diff --git a/themes/default/images/dlaxlogo.png b/themes/default/images/dlaxlogo.png new file mode 100644 index 0000000..b4991ae Binary files /dev/null and b/themes/default/images/dlaxlogo.png differ diff --git a/themes/default/images/editfiles.png b/themes/default/images/editfiles.png new file mode 100644 index 0000000..500e206 Binary files /dev/null and b/themes/default/images/editfiles.png differ diff --git a/themes/default/images/editpage.png b/themes/default/images/editpage.png new file mode 100644 index 0000000..ab3fd58 Binary files /dev/null and b/themes/default/images/editpage.png differ diff --git a/themes/default/images/error.gif b/themes/default/images/error.gif new file mode 100644 index 0000000..cb1fcbe Binary files /dev/null and b/themes/default/images/error.gif differ diff --git a/themes/default/images/error.png b/themes/default/images/error.png new file mode 100644 index 0000000..5bc1824 Binary files /dev/null and b/themes/default/images/error.png differ diff --git a/themes/default/images/file_doc.png b/themes/default/images/file_doc.png new file mode 100644 index 0000000..b1da1ef Binary files /dev/null and b/themes/default/images/file_doc.png differ diff --git a/themes/default/images/file_pdf.png b/themes/default/images/file_pdf.png new file mode 100644 index 0000000..500e206 Binary files /dev/null and b/themes/default/images/file_pdf.png differ diff --git a/themes/default/images/file_rtf.png b/themes/default/images/file_rtf.png new file mode 100644 index 0000000..39304c1 Binary files /dev/null and b/themes/default/images/file_rtf.png differ diff --git a/themes/default/images/file_word.png b/themes/default/images/file_word.png new file mode 100644 index 0000000..3011f00 Binary files /dev/null and b/themes/default/images/file_word.png differ diff --git a/themes/default/images/hgrad.png b/themes/default/images/hgrad.png new file mode 100644 index 0000000..86daf8b Binary files /dev/null and b/themes/default/images/hgrad.png differ diff --git a/themes/default/images/larrow.png b/themes/default/images/larrow.png new file mode 100644 index 0000000..554b6e9 Binary files /dev/null and b/themes/default/images/larrow.png differ diff --git a/themes/default/images/leftshadow.png b/themes/default/images/leftshadow.png new file mode 100644 index 0000000..1f32159 Binary files /dev/null and b/themes/default/images/leftshadow.png differ diff --git a/themes/default/images/limericklax.png b/themes/default/images/limericklax.png new file mode 100644 index 0000000..1a565ea Binary files /dev/null and b/themes/default/images/limericklax.png differ diff --git a/themes/default/images/logo.jpg b/themes/default/images/logo.jpg new file mode 100644 index 0000000..cfe19c2 Binary files /dev/null and b/themes/default/images/logo.jpg differ diff --git a/themes/default/images/lvgrad.png b/themes/default/images/lvgrad.png new file mode 100644 index 0000000..487d7e3 Binary files /dev/null and b/themes/default/images/lvgrad.png differ diff --git a/themes/default/images/navbackground.jpg b/themes/default/images/navbackground.jpg new file mode 100644 index 0000000..93ffece Binary files /dev/null and b/themes/default/images/navbackground.jpg differ diff --git a/themes/default/images/navbg.png b/themes/default/images/navbg.png new file mode 100644 index 0000000..00a8f88 Binary files /dev/null and b/themes/default/images/navbg.png differ diff --git a/themes/default/images/navigation.png b/themes/default/images/navigation.png new file mode 100644 index 0000000..739c95f Binary files /dev/null and b/themes/default/images/navigation.png differ diff --git a/themes/default/images/navspacer.png b/themes/default/images/navspacer.png new file mode 100644 index 0000000..cdc8cb4 Binary files /dev/null and b/themes/default/images/navspacer.png differ diff --git a/themes/default/images/news_header.png b/themes/default/images/news_header.png new file mode 100644 index 0000000..00861bf Binary files /dev/null and b/themes/default/images/news_header.png differ diff --git a/themes/default/images/nvgrad.png b/themes/default/images/nvgrad.png new file mode 100644 index 0000000..5e4c05c Binary files /dev/null and b/themes/default/images/nvgrad.png differ diff --git a/themes/default/images/photogallery.png b/themes/default/images/photogallery.png new file mode 100644 index 0000000..a161a55 Binary files /dev/null and b/themes/default/images/photogallery.png differ diff --git a/themes/default/images/photoleft.png b/themes/default/images/photoleft.png new file mode 100644 index 0000000..f4eb3af Binary files /dev/null and b/themes/default/images/photoleft.png differ diff --git a/themes/default/images/photoright.png b/themes/default/images/photoright.png new file mode 100644 index 0000000..16a251b Binary files /dev/null and b/themes/default/images/photoright.png differ diff --git a/themes/default/images/rarrow.png b/themes/default/images/rarrow.png new file mode 100644 index 0000000..9a272d9 Binary files /dev/null and b/themes/default/images/rarrow.png differ diff --git a/themes/default/images/rightshadow.png b/themes/default/images/rightshadow.png new file mode 100644 index 0000000..bc970f0 Binary files /dev/null and b/themes/default/images/rightshadow.png differ diff --git a/themes/default/images/sandbackground.jpg b/themes/default/images/sandbackground.jpg new file mode 100644 index 0000000..2a2d800 Binary files /dev/null and b/themes/default/images/sandbackground.jpg differ diff --git a/themes/default/images/spacer.png b/themes/default/images/spacer.png new file mode 100644 index 0000000..f187f4a Binary files /dev/null and b/themes/default/images/spacer.png differ diff --git a/themes/default/images/vgrad.png b/themes/default/images/vgrad.png new file mode 100644 index 0000000..e7a96e8 Binary files /dev/null and b/themes/default/images/vgrad.png differ diff --git a/themes/default/images/view.gif b/themes/default/images/view.gif new file mode 100644 index 0000000..52cbddb Binary files /dev/null and b/themes/default/images/view.gif differ diff --git a/themes/default/images/xoma_logo.jpg b/themes/default/images/xoma_logo.jpg new file mode 100644 index 0000000..36914ff Binary files /dev/null and b/themes/default/images/xoma_logo.jpg differ diff --git a/themes/default/include/functions.php b/themes/default/include/functions.php new file mode 100644 index 0000000..4a401fd --- /dev/null +++ b/themes/default/include/functions.php @@ -0,0 +1,40 @@ +"; + echo "
    "; + } + + /** + * CloseContent() + * Closes a Bayonet site content block. + * @return + */ + function CloseContent() + { + echo "
    "; + echo ""; + } + + function OpenBlock($title = 'New Block') + { + OpenContent(); + echo "
    {$title}
    "; + echo "
    "; + } + + function CloseBlock() + { + echo "
    "; + CloseContent(); + } + +?> \ No newline at end of file diff --git a/themes/default/include/style_bbcode.css b/themes/default/include/style_bbcode.css index 7299c06..05333f9 100644 --- a/themes/default/include/style_bbcode.css +++ b/themes/default/include/style_bbcode.css @@ -1,71 +1,71 @@ -.bold { - font-weight: bold; -} - -.italics { - font-style: italic; -} - -.underline { - text-decoration: underline; -} - -.strikethrough { - text-decoration: line-through; -} - -.overline { - text-decoration: overline; -} - -.quotecodeheader { - font-family: Verdana, arial, helvetica, sans-serif; - font-size: 12px; - font-weight: bold; -} - -.codebody { - background-color: #FFFFFF; - font-family: Courier new, courier, mono; - font-size: 12px; - color: #006600; - border: 1px solid #BFBFBF; -} - -.quotebody { - background-color: #FFFFFF; - font-family: Courier new, courier, mono; - font-size: 12px; - color: #660002; - border: 1px solid #BFBFBF; -} - -.listbullet { - list-style-type: disc; - list-style-position: inside; -} - -.listdecimal { - list-style-type: decimal; - list-style-position: inside; -} - -.listlowerroman { - list-style-type: lower-roman; - list-style-position: inside; -} - -.listupperroman { - list-style-type: upper-roman; - list-style-position: inside; -} - -.listloweralpha { - list-style-type: lower-alpha; - list-style-position: inside; -} - -.listupperalpha { - list-style-type: upper-alpha; - list-style-position: inside; -} +.bold { + font-weight: bold; +} + +.italics { + font-style: italic; +} + +.underline { + text-decoration: underline; +} + +.strikethrough { + text-decoration: line-through; +} + +.overline { + text-decoration: overline; +} + +.quotecodeheader { + font-family: Verdana, arial, helvetica, sans-serif; + font-size: 12px; + font-weight: bold; +} + +.codebody { + background-color: #FFFFFF; + font-family: Courier new, courier, mono; + font-size: 12px; + color: #006600; + border: 1px solid #BFBFBF; +} + +.quotebody { + background-color: #FFFFFF; + font-family: Courier new, courier, mono; + font-size: 12px; + color: #660002; + border: 1px solid #BFBFBF; +} + +.listbullet { + list-style-type: disc; + list-style-position: inside; +} + +.listdecimal { + list-style-type: decimal; + list-style-position: inside; +} + +.listlowerroman { + list-style-type: lower-roman; + list-style-position: inside; +} + +.listupperroman { + list-style-type: upper-roman; + list-style-position: inside; +} + +.listloweralpha { + list-style-type: lower-alpha; + list-style-position: inside; +} + +.listupperalpha { + list-style-type: upper-alpha; + list-style-position: inside; +} diff --git a/themes/gttheme/footer.php b/themes/gttheme/footer.php new file mode 100644 index 0000000..72ddb3a --- /dev/null +++ b/themes/gttheme/footer.php @@ -0,0 +1,64 @@ +. + */ + +$phpversion = preg_replace('/[a-z-]/', '', phpversion()); +$mtime = explode(' ', microtime()); +$totaltime = $mtime[0] + $mtime[1] - $starttime; +$debug_output = sprintf("Page generated in %.3f seconds | Memory: real(%.3fmb) peak(%.3fmb) | PHP: %s
    Connections: %d | Queries: %d | Fetches: %d | Frees: %d
    \n", + $totaltime, ((float)memory_get_usage()/1024/1024), ((float)memory_get_peak_usage()/1024/1024), $phpversion, $db_connections, $db_queries, $db_fetches, $db_frees); +?> + +
    + +
    + + All logos and trademarks on this site are property of their respective owner. The comments are property of their posters, all the rest © 2001- 3rd Infantry Division. + +

    + + Administrative Control Panel
    +
    +
    +
    + +

    + +
    + + + + + + + + + + diff --git a/themes/gttheme/header.php b/themes/gttheme/header.php new file mode 100644 index 0000000..76dc2f9 --- /dev/null +++ b/themes/gttheme/header.php @@ -0,0 +1,40 @@ +. + */ + +global $config; +ob_start(); +$starttime = explode(' ', microtime()); +$starttime = $starttime[1] + $starttime[0]; +?> + + + + + +3rd Infantry Division - 8 years strong - ArmaII Unit + + + + + + + + + \ No newline at end of file diff --git a/themes/gttheme/images/Medal.png b/themes/gttheme/images/Medal.png new file mode 100644 index 0000000..1d9974b Binary files /dev/null and b/themes/gttheme/images/Medal.png differ diff --git a/themes/gttheme/images/add.gif b/themes/gttheme/images/add.gif new file mode 100644 index 0000000..836dbf2 Binary files /dev/null and b/themes/gttheme/images/add.gif differ diff --git a/themes/gttheme/images/addnewarticle.png b/themes/gttheme/images/addnewarticle.png new file mode 100644 index 0000000..0e29960 Binary files /dev/null and b/themes/gttheme/images/addnewarticle.png differ diff --git a/themes/gttheme/images/addnewpage.png b/themes/gttheme/images/addnewpage.png new file mode 100644 index 0000000..c60c68c Binary files /dev/null and b/themes/gttheme/images/addnewpage.png differ diff --git a/themes/gttheme/images/annoucement.png b/themes/gttheme/images/annoucement.png new file mode 100644 index 0000000..c70591d Binary files /dev/null and b/themes/gttheme/images/annoucement.png differ diff --git a/themes/gttheme/images/announcement.png b/themes/gttheme/images/announcement.png new file mode 100644 index 0000000..c70591d Binary files /dev/null and b/themes/gttheme/images/announcement.png differ diff --git a/themes/gttheme/images/arrowleft.png b/themes/gttheme/images/arrowleft.png new file mode 100644 index 0000000..502ae41 Binary files /dev/null and b/themes/gttheme/images/arrowleft.png differ diff --git a/themes/gttheme/images/arrowright.png b/themes/gttheme/images/arrowright.png new file mode 100644 index 0000000..ddd163b Binary files /dev/null and b/themes/gttheme/images/arrowright.png differ diff --git a/themes/gttheme/images/background.jpg b/themes/gttheme/images/background.jpg new file mode 100644 index 0000000..e96f267 Binary files /dev/null and b/themes/gttheme/images/background.jpg differ diff --git a/themes/gttheme/images/banner.jpg b/themes/gttheme/images/banner.jpg new file mode 100644 index 0000000..854561b Binary files /dev/null and b/themes/gttheme/images/banner.jpg differ diff --git a/themes/gttheme/images/bayonetLogo.png b/themes/gttheme/images/bayonetLogo.png new file mode 100644 index 0000000..4183a88 Binary files /dev/null and b/themes/gttheme/images/bayonetLogo.png differ diff --git a/themes/gttheme/images/blockbackground.jpg b/themes/gttheme/images/blockbackground.jpg new file mode 100644 index 0000000..ea6c7d3 Binary files /dev/null and b/themes/gttheme/images/blockbackground.jpg differ diff --git a/themes/gttheme/images/calendar.png b/themes/gttheme/images/calendar.png new file mode 100644 index 0000000..86b9861 Binary files /dev/null and b/themes/gttheme/images/calendar.png differ diff --git a/themes/gttheme/images/delete.gif b/themes/gttheme/images/delete.gif new file mode 100644 index 0000000..4e2a37f Binary files /dev/null and b/themes/gttheme/images/delete.gif differ diff --git a/themes/gttheme/images/editfiles.png b/themes/gttheme/images/editfiles.png new file mode 100644 index 0000000..500e206 Binary files /dev/null and b/themes/gttheme/images/editfiles.png differ diff --git a/themes/gttheme/images/editpage.png b/themes/gttheme/images/editpage.png new file mode 100644 index 0000000..ab3fd58 Binary files /dev/null and b/themes/gttheme/images/editpage.png differ diff --git a/themes/gttheme/images/error.gif b/themes/gttheme/images/error.gif new file mode 100644 index 0000000..cb1fcbe Binary files /dev/null and b/themes/gttheme/images/error.gif differ diff --git a/themes/gttheme/images/error.png b/themes/gttheme/images/error.png new file mode 100644 index 0000000..5bc1824 Binary files /dev/null and b/themes/gttheme/images/error.png differ diff --git a/themes/gttheme/images/file_doc.png b/themes/gttheme/images/file_doc.png new file mode 100644 index 0000000..b1da1ef Binary files /dev/null and b/themes/gttheme/images/file_doc.png differ diff --git a/themes/gttheme/images/file_pdf.png b/themes/gttheme/images/file_pdf.png new file mode 100644 index 0000000..500e206 Binary files /dev/null and b/themes/gttheme/images/file_pdf.png differ diff --git a/themes/gttheme/images/file_rtf.png b/themes/gttheme/images/file_rtf.png new file mode 100644 index 0000000..39304c1 Binary files /dev/null and b/themes/gttheme/images/file_rtf.png differ diff --git a/themes/gttheme/images/file_word.png b/themes/gttheme/images/file_word.png new file mode 100644 index 0000000..3011f00 Binary files /dev/null and b/themes/gttheme/images/file_word.png differ diff --git a/themes/gttheme/images/headingbg.jpg b/themes/gttheme/images/headingbg.jpg new file mode 100644 index 0000000..3597c21 Binary files /dev/null and b/themes/gttheme/images/headingbg.jpg differ diff --git a/themes/gttheme/images/hgrad.png b/themes/gttheme/images/hgrad.png new file mode 100644 index 0000000..86daf8b Binary files /dev/null and b/themes/gttheme/images/hgrad.png differ diff --git a/themes/gttheme/images/larrow.png b/themes/gttheme/images/larrow.png new file mode 100644 index 0000000..554b6e9 Binary files /dev/null and b/themes/gttheme/images/larrow.png differ diff --git a/themes/gttheme/images/leftshadow.png b/themes/gttheme/images/leftshadow.png new file mode 100644 index 0000000..1f32159 Binary files /dev/null and b/themes/gttheme/images/leftshadow.png differ diff --git a/themes/gttheme/images/logo.jpg b/themes/gttheme/images/logo.jpg new file mode 100644 index 0000000..8b59067 Binary files /dev/null and b/themes/gttheme/images/logo.jpg differ diff --git a/themes/gttheme/images/lvgrad.png b/themes/gttheme/images/lvgrad.png new file mode 100644 index 0000000..487d7e3 Binary files /dev/null and b/themes/gttheme/images/lvgrad.png differ diff --git a/themes/gttheme/images/navbackground.jpg b/themes/gttheme/images/navbackground.jpg new file mode 100644 index 0000000..93ffece Binary files /dev/null and b/themes/gttheme/images/navbackground.jpg differ diff --git a/themes/gttheme/images/navbg.jpg b/themes/gttheme/images/navbg.jpg new file mode 100644 index 0000000..9bd90ce Binary files /dev/null and b/themes/gttheme/images/navbg.jpg differ diff --git a/themes/gttheme/images/navbg.png b/themes/gttheme/images/navbg.png new file mode 100644 index 0000000..00a8f88 Binary files /dev/null and b/themes/gttheme/images/navbg.png differ diff --git a/themes/gttheme/images/navigation.png b/themes/gttheme/images/navigation.png new file mode 100644 index 0000000..739c95f Binary files /dev/null and b/themes/gttheme/images/navigation.png differ diff --git a/themes/gttheme/images/navspacer.png b/themes/gttheme/images/navspacer.png new file mode 100644 index 0000000..cdc8cb4 Binary files /dev/null and b/themes/gttheme/images/navspacer.png differ diff --git a/themes/gttheme/images/news_header.png b/themes/gttheme/images/news_header.png new file mode 100644 index 0000000..00861bf Binary files /dev/null and b/themes/gttheme/images/news_header.png differ diff --git a/themes/gttheme/images/nvgrad.png b/themes/gttheme/images/nvgrad.png new file mode 100644 index 0000000..5e4c05c Binary files /dev/null and b/themes/gttheme/images/nvgrad.png differ diff --git a/themes/gttheme/images/photogallery.png b/themes/gttheme/images/photogallery.png new file mode 100644 index 0000000..a161a55 Binary files /dev/null and b/themes/gttheme/images/photogallery.png differ diff --git a/themes/gttheme/images/photoleft.png b/themes/gttheme/images/photoleft.png new file mode 100644 index 0000000..f4eb3af Binary files /dev/null and b/themes/gttheme/images/photoleft.png differ diff --git a/themes/gttheme/images/photoright.png b/themes/gttheme/images/photoright.png new file mode 100644 index 0000000..16a251b Binary files /dev/null and b/themes/gttheme/images/photoright.png differ diff --git a/themes/gttheme/images/rarrow.png b/themes/gttheme/images/rarrow.png new file mode 100644 index 0000000..9a272d9 Binary files /dev/null and b/themes/gttheme/images/rarrow.png differ diff --git a/themes/gttheme/images/rightshadow.png b/themes/gttheme/images/rightshadow.png new file mode 100644 index 0000000..bc970f0 Binary files /dev/null and b/themes/gttheme/images/rightshadow.png differ diff --git a/themes/gttheme/images/sandbackground.jpg b/themes/gttheme/images/sandbackground.jpg new file mode 100644 index 0000000..2a2d800 Binary files /dev/null and b/themes/gttheme/images/sandbackground.jpg differ diff --git a/themes/gttheme/images/spacer.png b/themes/gttheme/images/spacer.png new file mode 100644 index 0000000..f187f4a Binary files /dev/null and b/themes/gttheme/images/spacer.png differ diff --git a/themes/gttheme/images/vgrad.png b/themes/gttheme/images/vgrad.png new file mode 100644 index 0000000..e7a96e8 Binary files /dev/null and b/themes/gttheme/images/vgrad.png differ diff --git a/themes/gttheme/images/view.gif b/themes/gttheme/images/view.gif new file mode 100644 index 0000000..52cbddb Binary files /dev/null and b/themes/gttheme/images/view.gif differ diff --git a/themes/gttheme/include/functions.php b/themes/gttheme/include/functions.php new file mode 100644 index 0000000..4a401fd --- /dev/null +++ b/themes/gttheme/include/functions.php @@ -0,0 +1,40 @@ +"; + echo "
    "; + } + + /** + * CloseContent() + * Closes a Bayonet site content block. + * @return + */ + function CloseContent() + { + echo "
    "; + echo ""; + } + + function OpenBlock($title = 'New Block') + { + OpenContent(); + echo "
    {$title}
    "; + echo "
    "; + } + + function CloseBlock() + { + echo "
    "; + CloseContent(); + } + +?> \ No newline at end of file diff --git a/themes/gttheme/include/primary.css b/themes/gttheme/include/primary.css new file mode 100644 index 0000000..025b0fc --- /dev/null +++ b/themes/gttheme/include/primary.css @@ -0,0 +1,286 @@ + /********************************* + ** Layout Styles ** + *********************************/ + div.container { + width: 990px; + position: relative; + /* width: 1000px; */ + color: #000000; + margin: auto auto; + text-align: left; /* IE 5 fix */ + } + div.banner { + /* width: 990px; */ + text-align:center; + /* margin: auto auto; */ + } + img.head_medal { + position: absolute; + left: 26px; + top: -42px; + } + div.nav { + /*width: 990px; */ + height: 24px; + background: #284c75; + background-image:url('../images/navbg.jpg'); + color: #000000; + text-align:center; + /* margin: auto auto; */ + font-size:14px; + line-height: 24px; + border: 3px solid black; + border-top: 1px solid black; + } + table.main { + /*background-image:url('../images/sandbackground.jpg'); */ + padding: 0px; + color:#ffffff; + width:990px; + /*width: 1134px; */ + /* width: 1234px; */ + margin: auto auto; + /* background-color:#a3a2a0; */ + } + + table.main td { + /* color:white; */ + } + td.midcol { + width: 644px; + background-color:transparent; + vertical-align:top; + } + td.rightcol { + vertical-align:top; + } + td.leftcol { + width: 275px; + vertical-align:top; + } + div.footer { + text-align:center; + font-family:verdana; + font-size:10pt; + color:#5e5e5e; + background-color:#333333; + border-top: 1px solid #5e5e5e; + } + + /********************************* + ** Content Styles ** + *********************************/ + div.contentBorder1 { + background-color:white; + border: 1px solid #000; /*#3666ba;*/ + } + div.contentBorder2 { + background-color:white; + border:1px solid #000; /* 333 */ + } + div.contentHeading { + background-image:url(../images/headingbg.jpg); + background-repeat:repeat-x; + background-color:#112f50; + border: 0px solid black; + border-bottom: 2px solid black; + height:25px; + line-height: 25px; + padding-left:10px; + padding-right:10px; + color:white; + } + div.content { + padding:10px; + color:#333333; + /*background-color:#383838; + color:white; */ + background-color:#f1f1f1; + } + div.content img { + padding:10px; + } + div.contentFooter { + border-top:1px solid #333333; + background-color:#a4a4a4; + color:white; + padding-left:5px; + padding-right:5px; + } + span.footer-text { + font-size: 10px; + } + + .clear { + clear: both; + } + + /********************************* + ** Nav Links Styles ** + *********************************/ + table.navLinks a, table.navLinks a:visited, table.navLinks a:active { + background-color:transparent; + color:white; + font-family:verdana; + font-size:11px; + font-weight:bold; + text-decoration:none; + } + + table.navLinks a:hover, table.navLinks a:visited:hover { + background-color:transparent; + color:#d2d2d2; + font-size:11px; + font-weight:bold; + text-decoration:none; + } + + table.navLinks { + height:25px; + } + + table.navLinks td { + border-right: 1px solid #213f61; + vertical-align:middle; + } + + /********************************* + ** Misc. Styles ** + *********************************/ + + h1, h2, h3, h4, h5, h6 { + font-family: Helvetica, Arial, sans-serif; + font-weight: normal; + } + table, tr, td { + padding:0px; + border:0px; + margin:0px + } + body, td, div { + font-size:10pt; + /* color:black; */ + font-family:verdana; + font-weight:normal; + } + a, a:visited, a:active { + background-color:transparent; + color:#3666ba; + font-family:verdana; + font-size:12px; + text-decoration:none; + } + + a:hover, a:visited:hover { + background-color:transparent; + color:#3666ba; + font-family:verdana; + font-size:12px; + text-decoration:underline; + } + a.rudi_roster, a.rudi_roster:visited, a.rudi_roster:active, a.rudi_roster:hover { + color:#2b5bae; + } + body { + background-color:#091a34; + background-image: url('../images/Background.jpg'); + background-position: top center; + background-attachment: fixed; + margin:0; + margin-top: 15px; + padding:0; + text-align:left; + } + a img { + border:0px; + } + form { + margin:0; + } + tr.rownorm{ + background-color:white; + + } + tr.rowhigh{ + background-color:#e0e0e0; + } + /* photo gallery styles */ + .photoleft{ + background-image:url("../images/photoleft.png"); + background-repeat:repeat-y; + text-align:center; + width:49px; + } + .photoright{ + background-image:url("../images/photoright.png"); + background-repeat:repeat-y; + text-align:center; + width:49px; + } + /* end photo gallery styles */ + + /* stuff we might need in order to add drop shadows */ + + div.topbar { + height:25px; + text-align:center; + background-color:black; + font-family:verdana; + font-size:10pt; + color:#797e4f; + } + div.botbar { + height:50px; + padding:5px; + text-align:center; + background-color:black; + font-family:verdana; + font-size:10pt; + } + /* may need these two when we add the background images back */ + .leftbar { + /* background-image:url("../images/leftshadow.png"); */ + background-repeat: + repeat-y; + width:50px; + } + .rightbar { + /* background-image:url("../images/rightshadow.png"); */ + background-repeat: + repeat-y; + width:15px; + } + + .fl-left{ + float:left; + } + + .fl-right{ + float:right; + } + + .clear { + clear:both; + } + + .inline { + display: inline; + } + + .left{ + text-align:left; + } + .right{ + text-align:right; + } + .center{ + text-align:center; + } + .title{ + font-size:14px; + font-weight:bold; + font-family:arial; + } + +@import "style_bbcode.css" + diff --git a/themes/gttheme/include/style_bbcode.css b/themes/gttheme/include/style_bbcode.css new file mode 100644 index 0000000..05333f9 --- /dev/null +++ b/themes/gttheme/include/style_bbcode.css @@ -0,0 +1,71 @@ +.bold { + font-weight: bold; +} + +.italics { + font-style: italic; +} + +.underline { + text-decoration: underline; +} + +.strikethrough { + text-decoration: line-through; +} + +.overline { + text-decoration: overline; +} + +.quotecodeheader { + font-family: Verdana, arial, helvetica, sans-serif; + font-size: 12px; + font-weight: bold; +} + +.codebody { + background-color: #FFFFFF; + font-family: Courier new, courier, mono; + font-size: 12px; + color: #006600; + border: 1px solid #BFBFBF; +} + +.quotebody { + background-color: #FFFFFF; + font-family: Courier new, courier, mono; + font-size: 12px; + color: #660002; + border: 1px solid #BFBFBF; +} + +.listbullet { + list-style-type: disc; + list-style-position: inside; +} + +.listdecimal { + list-style-type: decimal; + list-style-position: inside; +} + +.listlowerroman { + list-style-type: lower-roman; + list-style-position: inside; +} + +.listupperroman { + list-style-type: upper-roman; + list-style-position: inside; +} + +.listloweralpha { + list-style-type: lower-alpha; + list-style-position: inside; +} + +.listupperalpha { + list-style-type: upper-alpha; + list-style-position: inside; +} diff --git a/themes/gttheme/include/theme.ini b/themes/gttheme/include/theme.ini new file mode 100644 index 0000000..223cd14 --- /dev/null +++ b/themes/gttheme/include/theme.ini @@ -0,0 +1,2 @@ +[author] +name = "Joseph Hunkeler" \ No newline at end of file diff --git a/themes/gttheme/index.php b/themes/gttheme/index.php new file mode 100644 index 0000000..b5ac212 --- /dev/null +++ b/themes/gttheme/index.php @@ -0,0 +1,61 @@ + + +
    + + + + +
    + + + + + + + + + + + + +
    + + + +
    + +
    + +td.short{width:100%;}" . "" . "" . "" . "
    Code" . $e->getCode() . "
    In File" . $e->getFile() . "
    " . $e->getLine() . " - " . $e->getMessage() . "
    " + ); +} +?> diff --git a/themes/gttheme/navigation.php b/themes/gttheme/navigation.php new file mode 100644 index 0000000..5765712 --- /dev/null +++ b/themes/gttheme/navigation.php @@ -0,0 +1,24 @@ + + + + +Query("SELECT * FROM `bayonet_navigation` ORDER BY `weight`"); + $nav = $db->Fetch($result); + + foreach ($nav as $link) { + echo ''; + } + ?> + +
      HOME    ' . strtoupper($link['title']) . '  
    diff --git a/themes/new/footer.php b/themes/new/footer.php new file mode 100644 index 0000000..0aab911 --- /dev/null +++ b/themes/new/footer.php @@ -0,0 +1,57 @@ +. + */ + +$phpversion = preg_replace('/[a-z-]/', '', phpversion()); +$mtime = explode(' ', microtime()); +$totaltime = $mtime[0] + $mtime[1] - $starttime; +$debug_output = sprintf("Page generated in %.3f seconds | Memory: real(%.3fmb) peak(%.3fmb) | PHP: %s
    Connections: %d | Queries: %d | Fetches: %d | Frees: %d
    \n", + $totaltime, ((float)memory_get_usage()/1024/1024), ((float)memory_get_peak_usage()/1024/1024), $phpversion, $db_connections, $db_queries, $db_fetches, $db_frees); +?> + +
    + +
    + +
    +
    + +
    +
    + + + + + + + + + \ No newline at end of file diff --git a/themes/new/header.php b/themes/new/header.php new file mode 100644 index 0000000..353a083 --- /dev/null +++ b/themes/new/header.php @@ -0,0 +1,55 @@ +. + */ + +global $config; +ob_start(); +$starttime = explode(' ', microtime()); +$starttime = $starttime[1] + $starttime[0]; +?> + + + + + +Bayonet CMS Default Theme + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/new/images/active_nav_bg.jpg b/themes/new/images/active_nav_bg.jpg new file mode 100644 index 0000000..402bbe7 Binary files /dev/null and b/themes/new/images/active_nav_bg.jpg differ diff --git a/themes/new/images/btn_collapse.gif b/themes/new/images/btn_collapse.gif new file mode 100644 index 0000000..4f875e8 Binary files /dev/null and b/themes/new/images/btn_collapse.gif differ diff --git a/themes/new/images/content_tile.jpg b/themes/new/images/content_tile.jpg new file mode 100644 index 0000000..3d292c5 Binary files /dev/null and b/themes/new/images/content_tile.jpg differ diff --git a/themes/new/images/footer_tile.jpg b/themes/new/images/footer_tile.jpg new file mode 100644 index 0000000..6e3f2ba Binary files /dev/null and b/themes/new/images/footer_tile.jpg differ diff --git a/themes/new/images/footerwidget_bg.jpg b/themes/new/images/footerwidget_bg.jpg new file mode 100644 index 0000000..3f4da4a Binary files /dev/null and b/themes/new/images/footerwidget_bg.jpg differ diff --git a/themes/new/images/footerwidget_border.jpg b/themes/new/images/footerwidget_border.jpg new file mode 100644 index 0000000..5b3bcfb Binary files /dev/null and b/themes/new/images/footerwidget_border.jpg differ diff --git a/themes/new/images/header_tile.png b/themes/new/images/header_tile.png new file mode 100644 index 0000000..be956a5 Binary files /dev/null and b/themes/new/images/header_tile.png differ diff --git a/themes/new/images/header_tile_ie6.gif b/themes/new/images/header_tile_ie6.gif new file mode 100644 index 0000000..9b15b1a Binary files /dev/null and b/themes/new/images/header_tile_ie6.gif differ diff --git a/themes/new/images/logo-trans.png b/themes/new/images/logo-trans.png new file mode 100644 index 0000000..87b6cf9 Binary files /dev/null and b/themes/new/images/logo-trans.png differ diff --git a/themes/new/images/nav_a.gif b/themes/new/images/nav_a.gif new file mode 100644 index 0000000..531cced Binary files /dev/null and b/themes/new/images/nav_a.gif differ diff --git a/themes/new/images/search_btn.jpg b/themes/new/images/search_btn.jpg new file mode 100644 index 0000000..3f8ba67 Binary files /dev/null and b/themes/new/images/search_btn.jpg differ diff --git a/themes/new/images/w (1).png b/themes/new/images/w (1).png new file mode 100644 index 0000000..2dae5d3 Binary files /dev/null and b/themes/new/images/w (1).png differ diff --git a/themes/new/images/w.png b/themes/new/images/w.png new file mode 100644 index 0000000..e0bf686 Binary files /dev/null and b/themes/new/images/w.png differ diff --git a/themes/new/images/widget_bg.jpg b/themes/new/images/widget_bg.jpg new file mode 100644 index 0000000..c704d59 Binary files /dev/null and b/themes/new/images/widget_bg.jpg differ diff --git a/themes/new/include/functions.php b/themes/new/include/functions.php new file mode 100644 index 0000000..ec2e6e2 --- /dev/null +++ b/themes/new/include/functions.php @@ -0,0 +1,34 @@ +"; + } + + /** + * CloseContent() + * Closes a Bayonet site content block. + * @return + */ + function CloseContent() + { + echo "CLOSE CONTENT
    "; + } + + function OpenBlock($title = 'New Block') + { + echo "

    {$title}

    "; + } + + function CloseBlock() + { + } + +?> \ No newline at end of file diff --git a/themes/new/include/primary.css b/themes/new/include/primary.css new file mode 100644 index 0000000..94a4c28 --- /dev/null +++ b/themes/new/include/primary.css @@ -0,0 +1,115 @@ +/* -----BODY STUFF----- */ +body {height:auto; width:auto; font-family:'Arial', Sans-Serif; color:#333; margin:0; padding:0; background: #b8b8b8; +line-height:1.7em; padding:0; margin:0; font-size: 13px;} + +/*--- P TAG STUFF ---*/ +p {font-size: 12px; line-height: 1.7em;} +.entry{ } + + +#sidebar h2.widgettitle {padding: 0; margin: 0; font-size: 12px; text-transform: uppercase; color: #555; border: 1px solid #ebebeb; font-weight: normal;} +#sidebar h2.widgettitle span {padding: 8px; display: block; border: 1px solid #fff; font-weight: normal; background: url('../images/widget_bg.jpg') repeat-x center;} + + + +/* -----A TAG STUFF----- */ +a {text-decoration:none;} +a:hover {text-decoration:underline;} + + +/* -----PAGE STUFF----- */ +#contentContainer {width: 100%; background: #f5f5f5 url('../images/content_tile.jpg') repeat-y center; border: 1px solid #fff; border-width:0 0 1px;} +#content {padding:30px 0 0; margin:0 auto; width:960px; background: #f8f8f8;} +#main {width:640px; float: left; padding:0; margin: 0; overflow: hidden; line-height: 1.5em;} +#main-full {width:100%; float: left; padding:0; margin: 0; overflow: hidden; line-height: 1.5em;} +#sidebar {float: right; margin: 0; overflow: hidden; width: 290px;} + +/*---------HEADER STUFF-----------*/ +#headerContainer {width: 100%; background: #4B72A6 url('../images/header_tile.png') repeat-x;} +#header {height:259px; margin:0 auto; width:960px; position: relative; color:white;} +#topBarContainer {width: 100%; background-color:black;} +#topBar {width:960px; height: 42px; color: #eee; font-size: 10px; margin:0 auto;} +#topBar #today {padding: 13px 0 0;} +#logo {margin: 0; padding: 41px 0 0;} +#logo a {margin: 0; padding: 0; display: block; height: 86px; width: 601px; overflow: hidden; background: url('../images/logo-trans.png') no-repeat; text-indent: -999px;} +#navigation {padding:0;margin:0; width: 100%; height: 42px; position: absolute; bottom: 0; _bottom:-1px; left:0; z-index:6000;} + +/*--------FOOTER STUFF--------*/ +#footerContainer {width: 100%; background: #b8b8b8 url('../images/footer_tile.jpg') repeat-y center; border: 1px solid #9c9c9c; border-width: 1px 0 0;} +#footer {padding:20px 0 0; margin:0 auto; width:960px; clear:both;} +#footer a {color:#fff;} +#bottomBarContainer {width: 100%; background: #1a1a1a;} +#bottomBar {width:960px; margin: 0 auto; height: 53px; color: #eee;} +#bottomBar #copyright {font-size: 10px; margin:0; padding:20px 0 0;} +#bottomBar #socialbuttons {float: right; font-size: 10px; padding:20px 0 0; text-transform: uppercase; letter-spacing: 1px;} +#bottomBar #socialbuttons a {color: #fff;} + +/*-------MAIN NAVIGATION STUFF--------*/ +#menu {padding: 0; margin:0; list-style:none; position:relative; width:100%; z-index: 4000;} +#menu li {list-style:none; padding:0; margin:0; position:relative; float: left; line-height: 42px;} +#menu li a {margin: 0; padding: 0 13px; display: block; line-height: 42px; color: #fff; text-transform: uppercase; font-size: 12px;} +#menu li a:hover {text-decoration: none; background: url('../images/active_nav_bg.jpg') repeat-x; color: #999;} +#menu li ul {margin:0; padding:0; list-style:none; display:none; position:absolute; width:200px; z-index:3000; top:41px; _top:42px;/*IE6 fix*/ left: -1px; background: #F8F8F8; border: 1px solid #ddd; border-width: 0 1px 1px;} +#menu li ul li {margin:0; position:relative; border: 1px solid #fff; border-width: 0 1px 1px; border-top:1px solid #ebebeb; line-height: 20px; padding:0;} +#menu li ul li a {padding:0 10px; margin:0; width:178px; color: #999; font-size: 12px; line-height: 30px;} +#menu li ul li a:hover {background: none; color: #555;} +#menu li ul li ul {position:absolute;top:-1px; left:199px; margin:0; z-index: 2000;} +#menu li:hover ul ul, +#menu li:hover ul ul ul, +#menu li:hover ul ul ul ul {display:none;} +#menu li:hover ul, +#menu li li:hover ul, +#menu li li li:hover ul, +#menu li li li li:hover ul {display:block;} +#menu li.current_page_item, #menu li.current-cat {background: url('../images/active_nav_bg.jpg') repeat-x;} +#menu li li.current_page_item, #menu li li.current-cat {background:none;} +#menu li.current_page_item a, #menu li.current-cat a {color: #555;} + +/* -----SEARCH STUFF----- */ +#searchform #s {width:200px; padding: 5px;} +#searchform #searchsubmit {cursor: pointer; padding:5px;} +#searchform #searchsubmit:hover {text-decoration: none;} + +#searcher {float: right; padding:2px 0 0;} +#searcher #searchform #s {font-size:9px; width:200px; padding: 3px; background: #1f1f1f; border: 1px solid #3b3b3b; color: #bbb; text-transform: uppercase; margin: 0 4px 0 0;} +#searcher #searchform #searchsubmit { +cursor: pointer; +padding:0px; +width: 38px; +height: 22px; +background: transparent url('../images/search_btn.jpg') no-repeat 0 2px !important; +border: none; +overflow: hidden; +text-indent: -999px; +line-height: 0; +} + + +/*---FORM STUFF---*/ +input, textarea {padding: 5px;} +input {width:170px; margin:5px 0 0 0; } +textarea {width:100%;} +input[type="submit"] {padding:5px 0; cursor: pointer;} + +/* -----UNIVERSAL STUFF----- */ +code {font:1.1em 'Courier New', Courier, Fixed;} +acronym,abbr,span.caps {font-size:.9em;letter-spacing:.07em;cursor:help;} +p img {max-width:100%;padding:0;} +img.centered {display:block;margin:0 auto;} +img.alignright {display:inline;margin:0 0 10px 10px;} +img.alignleft {display:inline;margin:0 10px 10px 0;} +.alignright {float:right;} +.alignleft {float:left;} +acronym.abbr {border-bottom:1px dashed #999;} +blockquote {padding-left:20px;margin:15px;} +blockquote cite {display:block;margin:5px 0 0;} +.center {text-align:center;} +hr {display:none;} +a img {border:none;} +img#wpstats {width:0;height:0;border:none;overflow:hidden;padding:0;} +#hideme {visibility:hidden;} +.hidden {visibility: hidden; display: none;} +.rssSummary {padding-bottom:15px;} +.clear {clear: both;} +p.clear {height:1px; width:1px; margin:0; padding:0;} +.hide {display: none;} \ No newline at end of file diff --git a/themes/new/include/style_bbcode.css b/themes/new/include/style_bbcode.css new file mode 100644 index 0000000..05333f9 --- /dev/null +++ b/themes/new/include/style_bbcode.css @@ -0,0 +1,71 @@ +.bold { + font-weight: bold; +} + +.italics { + font-style: italic; +} + +.underline { + text-decoration: underline; +} + +.strikethrough { + text-decoration: line-through; +} + +.overline { + text-decoration: overline; +} + +.quotecodeheader { + font-family: Verdana, arial, helvetica, sans-serif; + font-size: 12px; + font-weight: bold; +} + +.codebody { + background-color: #FFFFFF; + font-family: Courier new, courier, mono; + font-size: 12px; + color: #006600; + border: 1px solid #BFBFBF; +} + +.quotebody { + background-color: #FFFFFF; + font-family: Courier new, courier, mono; + font-size: 12px; + color: #660002; + border: 1px solid #BFBFBF; +} + +.listbullet { + list-style-type: disc; + list-style-position: inside; +} + +.listdecimal { + list-style-type: decimal; + list-style-position: inside; +} + +.listlowerroman { + list-style-type: lower-roman; + list-style-position: inside; +} + +.listupperroman { + list-style-type: upper-roman; + list-style-position: inside; +} + +.listloweralpha { + list-style-type: lower-alpha; + list-style-position: inside; +} + +.listupperalpha { + list-style-type: upper-alpha; + list-style-position: inside; +} diff --git a/themes/new/include/theme.ini b/themes/new/include/theme.ini new file mode 100644 index 0000000..34bd055 --- /dev/null +++ b/themes/new/include/theme.ini @@ -0,0 +1,2 @@ +[author] +name = "Evan O'Connell" \ No newline at end of file diff --git a/themes/new/index.php b/themes/new/index.php new file mode 100644 index 0000000..17bbc46 --- /dev/null +++ b/themes/new/index.php @@ -0,0 +1,84 @@ + +
    + + +
    + +
    +
    + + +
    + +
    + + + + + + +
    + THIS IS SOME MAIN TEXT + +
    + + + +
    +
    +
    + + +td.short{width:100%;}" . "" . "" . "" . "
    Code" . $e->getCode() . "
    In File" . $e->getFile() . "
    " . $e->getLine() . " - " . $e->getMessage() . "
    " + ); +} +?> \ No newline at end of file diff --git a/themes/new/navigation.php b/themes/new/navigation.php new file mode 100644 index 0000000..45bcdf9 --- /dev/null +++ b/themes/new/navigation.php @@ -0,0 +1,22 @@ + + \ No newline at end of file diff --git a/themes/throwback/footer.php b/themes/throwback/footer.php new file mode 100644 index 0000000..72ddb3a --- /dev/null +++ b/themes/throwback/footer.php @@ -0,0 +1,64 @@ +. + */ + +$phpversion = preg_replace('/[a-z-]/', '', phpversion()); +$mtime = explode(' ', microtime()); +$totaltime = $mtime[0] + $mtime[1] - $starttime; +$debug_output = sprintf("Page generated in %.3f seconds | Memory: real(%.3fmb) peak(%.3fmb) | PHP: %s
    Connections: %d | Queries: %d | Fetches: %d | Frees: %d
    \n", + $totaltime, ((float)memory_get_usage()/1024/1024), ((float)memory_get_peak_usage()/1024/1024), $phpversion, $db_connections, $db_queries, $db_fetches, $db_frees); +?> + +
    + +
    + + All logos and trademarks on this site are property of their respective owner. The comments are property of their posters, all the rest © 2001- 3rd Infantry Division. + +

    + + Administrative Control Panel
    +
    +
    +
    + +

    + +
    + + + + + + + + + + diff --git a/themes/throwback/header.php b/themes/throwback/header.php new file mode 100644 index 0000000..76dc2f9 --- /dev/null +++ b/themes/throwback/header.php @@ -0,0 +1,40 @@ +. + */ + +global $config; +ob_start(); +$starttime = explode(' ', microtime()); +$starttime = $starttime[1] + $starttime[0]; +?> + + + + + +3rd Infantry Division - 8 years strong - ArmaII Unit + + + + + + + + + \ No newline at end of file diff --git a/themes/throwback/images/Medal.png b/themes/throwback/images/Medal.png new file mode 100644 index 0000000..1d9974b Binary files /dev/null and b/themes/throwback/images/Medal.png differ diff --git a/themes/throwback/images/acu_bg.jpg b/themes/throwback/images/acu_bg.jpg new file mode 100644 index 0000000..550cd82 Binary files /dev/null and b/themes/throwback/images/acu_bg.jpg differ diff --git a/themes/throwback/images/add.gif b/themes/throwback/images/add.gif new file mode 100644 index 0000000..836dbf2 Binary files /dev/null and b/themes/throwback/images/add.gif differ diff --git a/themes/throwback/images/arrowleft.png b/themes/throwback/images/arrowleft.png new file mode 100644 index 0000000..502ae41 Binary files /dev/null and b/themes/throwback/images/arrowleft.png differ diff --git a/themes/throwback/images/arrowright.png b/themes/throwback/images/arrowright.png new file mode 100644 index 0000000..ddd163b Binary files /dev/null and b/themes/throwback/images/arrowright.png differ diff --git a/themes/throwback/images/background.jpg b/themes/throwback/images/background.jpg new file mode 100644 index 0000000..e96f267 Binary files /dev/null and b/themes/throwback/images/background.jpg differ diff --git a/themes/throwback/images/banner.jpg b/themes/throwback/images/banner.jpg new file mode 100644 index 0000000..702a361 Binary files /dev/null and b/themes/throwback/images/banner.jpg differ diff --git a/themes/throwback/images/blockbackground.jpg b/themes/throwback/images/blockbackground.jpg new file mode 100644 index 0000000..ea6c7d3 Binary files /dev/null and b/themes/throwback/images/blockbackground.jpg differ diff --git a/themes/throwback/images/contentbg.png b/themes/throwback/images/contentbg.png new file mode 100644 index 0000000..2c13089 Binary files /dev/null and b/themes/throwback/images/contentbg.png differ diff --git a/themes/throwback/images/delete.gif b/themes/throwback/images/delete.gif new file mode 100644 index 0000000..4e2a37f Binary files /dev/null and b/themes/throwback/images/delete.gif differ diff --git a/themes/throwback/images/error.gif b/themes/throwback/images/error.gif new file mode 100644 index 0000000..cb1fcbe Binary files /dev/null and b/themes/throwback/images/error.gif differ diff --git a/themes/throwback/images/error.png b/themes/throwback/images/error.png new file mode 100644 index 0000000..5bc1824 Binary files /dev/null and b/themes/throwback/images/error.png differ diff --git a/themes/throwback/images/headingbg.jpg b/themes/throwback/images/headingbg.jpg new file mode 100644 index 0000000..3fdc664 Binary files /dev/null and b/themes/throwback/images/headingbg.jpg differ diff --git a/themes/throwback/images/hgrad.png b/themes/throwback/images/hgrad.png new file mode 100644 index 0000000..86daf8b Binary files /dev/null and b/themes/throwback/images/hgrad.png differ diff --git a/themes/throwback/images/larrow.png b/themes/throwback/images/larrow.png new file mode 100644 index 0000000..554b6e9 Binary files /dev/null and b/themes/throwback/images/larrow.png differ diff --git a/themes/throwback/images/leftshadow.png b/themes/throwback/images/leftshadow.png new file mode 100644 index 0000000..1f32159 Binary files /dev/null and b/themes/throwback/images/leftshadow.png differ diff --git a/themes/throwback/images/logo.jpg b/themes/throwback/images/logo.jpg new file mode 100644 index 0000000..8b59067 Binary files /dev/null and b/themes/throwback/images/logo.jpg differ diff --git a/themes/throwback/images/lvgrad.png b/themes/throwback/images/lvgrad.png new file mode 100644 index 0000000..487d7e3 Binary files /dev/null and b/themes/throwback/images/lvgrad.png differ diff --git a/themes/throwback/images/navbackground.jpg b/themes/throwback/images/navbackground.jpg new file mode 100644 index 0000000..93ffece Binary files /dev/null and b/themes/throwback/images/navbackground.jpg differ diff --git a/themes/throwback/images/navbg.jpg b/themes/throwback/images/navbg.jpg new file mode 100644 index 0000000..04bf7a8 Binary files /dev/null and b/themes/throwback/images/navbg.jpg differ diff --git a/themes/throwback/images/navspacer.jpg b/themes/throwback/images/navspacer.jpg new file mode 100644 index 0000000..cc6d8fa Binary files /dev/null and b/themes/throwback/images/navspacer.jpg differ diff --git a/themes/throwback/images/navspacer.png b/themes/throwback/images/navspacer.png new file mode 100644 index 0000000..01b0ac9 Binary files /dev/null and b/themes/throwback/images/navspacer.png differ diff --git a/themes/throwback/images/news_header.png b/themes/throwback/images/news_header.png new file mode 100644 index 0000000..00861bf Binary files /dev/null and b/themes/throwback/images/news_header.png differ diff --git a/themes/throwback/images/nvgrad.png b/themes/throwback/images/nvgrad.png new file mode 100644 index 0000000..5e4c05c Binary files /dev/null and b/themes/throwback/images/nvgrad.png differ diff --git a/themes/throwback/images/photoleft.png b/themes/throwback/images/photoleft.png new file mode 100644 index 0000000..f4eb3af Binary files /dev/null and b/themes/throwback/images/photoleft.png differ diff --git a/themes/throwback/images/photoright.png b/themes/throwback/images/photoright.png new file mode 100644 index 0000000..16a251b Binary files /dev/null and b/themes/throwback/images/photoright.png differ diff --git a/themes/throwback/images/rightshadow.png b/themes/throwback/images/rightshadow.png new file mode 100644 index 0000000..bc970f0 Binary files /dev/null and b/themes/throwback/images/rightshadow.png differ diff --git a/themes/throwback/images/sandbackground.jpg b/themes/throwback/images/sandbackground.jpg new file mode 100644 index 0000000..2a2d800 Binary files /dev/null and b/themes/throwback/images/sandbackground.jpg differ diff --git a/themes/throwback/images/spacer.png b/themes/throwback/images/spacer.png new file mode 100644 index 0000000..f187f4a Binary files /dev/null and b/themes/throwback/images/spacer.png differ diff --git a/themes/throwback/images/vgrad.png b/themes/throwback/images/vgrad.png new file mode 100644 index 0000000..e7a96e8 Binary files /dev/null and b/themes/throwback/images/vgrad.png differ diff --git a/themes/throwback/images/view.gif b/themes/throwback/images/view.gif new file mode 100644 index 0000000..52cbddb Binary files /dev/null and b/themes/throwback/images/view.gif differ diff --git a/themes/throwback/include/functions.php b/themes/throwback/include/functions.php new file mode 100644 index 0000000..afcd130 --- /dev/null +++ b/themes/throwback/include/functions.php @@ -0,0 +1,38 @@ +"; + } + + /** + * CloseContent() + * Closes a Bayonet site content block. + * @return + */ + function CloseContent() + { + echo ""; + } + + function OpenBlock($title = 'New Block') + { + OpenContent(); + echo "
    {$title}
    "; + echo "
    "; + } + + function CloseBlock() + { + echo "
    "; + CloseContent(); + } + +?> \ No newline at end of file diff --git a/themes/throwback/include/primary.css b/themes/throwback/include/primary.css new file mode 100644 index 0000000..c02a3ff --- /dev/null +++ b/themes/throwback/include/primary.css @@ -0,0 +1,278 @@ + /********************************* + ** Layout Styles ** + *********************************/ + div.container { + width: 990px; + position: relative; + /* width: 1000px; */ + color: #000000; + margin: auto auto; + text-align: left; /* IE 5 fix */ + } + div.banner { + /* width: 990px; */ + text-align:center; + /* margin: auto auto; */ + } + div.nav { + /*width: 990px; */ + height: 25px; + line-height: 23px; + background-color: #284c75; + background-image:url('../images/navbg.jpg'); + color: #000000; + text-align:center; + /* margin: auto auto; */ + font-size:14px; + border-top: 1px solid black; + } + table.main { + background-image:url('../images/acu_bg.jpg'); + padding: 0px; + color:#ffffff; + width:990px; + /*width: 1134px; */ + /* width: 1234px; */ + margin: auto auto; + /* background-color:#a3a2a0; */ + } + + table.main td { + /* color:white; */ + } + td.midcol { + width: 644px; + background-color:transparent; + vertical-align:top; + } + td.rightcol { + vertical-align:top; + } + td.leftcol { + width: 275px; + vertical-align:top; + } + div.footer { + text-align:center; + font-family:verdana; + font-size:10pt; + color:#5e5e5e; + background-color:#333333; + border-top: 1px solid #5e5e5e; + } + + /********************************* + ** Content Styles ** + *********************************/ + div.contentBorder { + border: 1px solid #070707; /*#3666ba;*/ + } + div.contentBorder2 { + background-color:white; + /*border:1px solid #000; /* 333 */ + } + div.contentHeading { + background-image:url(../images/headingbg.jpg); + background-repeat:repeat-x; + background-color:#112f50; + border: 0px solid black; + height:25px; + line-height: 25px; + padding-left:10px; + padding-right:10px; + color:white; + } + div.content { + padding:10px; + color: #CCC; + /*background-color:#383838; + color:white; */ + /*background-color:#f1f1f1;*/ + background-image: url(../images/contentbg.png); + border: 1px solid #3b3b3b; + } + div.content img { + padding:10px; + } + div.contentFooter { + border-top:1px solid #333333; + background-color:#a4a4a4; + color:white; + padding-left:5px; + padding-right:5px; + } + span.footer-text { + font-size: 10px; + } + + .clear { + clear: both; + } + + /********************************* + ** Nav Links Styles ** + *********************************/ + div.nav a, div.nav a:visited, div.nav a:active { + background-color:transparent; + color:white; + font-family:verdana; + font-size:11px; + font-weight:bold; + text-decoration:none; + } + + div.nav a:hover, div.nav a:visited:hover { + background-color:transparent; + color:#d2d2d2; + font-size:11px; + font-weight:bold; + text-decoration:none; + } + + table.navLinks { + height:25px; + } + + table.navLinks td { + /*border-left: 1px solid #404040; + border-right: 1px solid #000000;*/ + vertical-align:middle; + } + + /********************************* + ** Misc. Styles ** + *********************************/ + + h1, h2, h3, h4, h5, h6 { + font-family: Helvetica, Arial, sans-serif; + font-weight: normal; + } + table, tr, td { + padding:0px; + border:0px; + margin:0px + } + body, td, div { + font-size:11px; + /* color:black; */ + font-family: Tahoma, Verdana, Arial; + font-weight: normal; + } + a, a:visited, a:active { + background-color:transparent; + /*color:#3666ba;*/ + color:#CCC; + text-decoration:none; + } + + a:hover, a:visited:hover { + background-color:transparent; + /*color:#3666ba;*/ + color:#CCC; + text-decoration:underline; + } + a.rudi_roster, a.rudi_roster:visited, a.rudi_roster:active, a.rudi_roster:hover { + color:#2b5bae; + } + body { + background-color: black; + /*background-image: url('../images/Background.jpg');*/ + background-position: top center; + background-attachment: fixed; + margin:0; + padding:0; + text-align:left; + } + a img { + border:0px; + } + form { + margin:0; + } + tr.rownorm{ + background-color:white; + + } + tr.rowhigh{ + background-color:#e0e0e0; + } + /* photo gallery styles */ + .photoleft{ + background-image:url("../images/photoleft.png"); + background-repeat:repeat-y; + text-align:center; + width:49px; + } + .photoright{ + background-image:url("../images/photoright.png"); + background-repeat:repeat-y; + text-align:center; + width:49px; + } + /* end photo gallery styles */ + + /* stuff we might need in order to add drop shadows */ + + div.topbar { + height:25px; + text-align:center; + background-color:black; + font-family:verdana; + font-size:10pt; + color:#797e4f; + } + div.botbar { + height:50px; + padding:5px; + text-align:center; + background-color:black; + font-family:verdana; + font-size:10pt; + } + /* may need these two when we add the background images back */ + .leftbar { + /* background-image:url("../images/leftshadow.png"); */ + background-repeat: + repeat-y; + width:50px; + } + .rightbar { + /* background-image:url("../images/rightshadow.png"); */ + background-repeat: + repeat-y; + width:15px; + } + + .fl-left{ + float:left; + } + + .fl-right{ + float:right; + } + + .clear { + clear:both; + } + + .inline { + display: inline; + } + + .left{ + text-align:left; + } + .right{ + text-align:right; + } + .center{ + text-align:center; + } + .title{ + font-size:14px; + font-weight:bold; + font-family:arial; + } + +@import "style_bbcode.css" + diff --git a/themes/throwback/include/style_bbcode.css b/themes/throwback/include/style_bbcode.css new file mode 100644 index 0000000..05333f9 --- /dev/null +++ b/themes/throwback/include/style_bbcode.css @@ -0,0 +1,71 @@ +.bold { + font-weight: bold; +} + +.italics { + font-style: italic; +} + +.underline { + text-decoration: underline; +} + +.strikethrough { + text-decoration: line-through; +} + +.overline { + text-decoration: overline; +} + +.quotecodeheader { + font-family: Verdana, arial, helvetica, sans-serif; + font-size: 12px; + font-weight: bold; +} + +.codebody { + background-color: #FFFFFF; + font-family: Courier new, courier, mono; + font-size: 12px; + color: #006600; + border: 1px solid #BFBFBF; +} + +.quotebody { + background-color: #FFFFFF; + font-family: Courier new, courier, mono; + font-size: 12px; + color: #660002; + border: 1px solid #BFBFBF; +} + +.listbullet { + list-style-type: disc; + list-style-position: inside; +} + +.listdecimal { + list-style-type: decimal; + list-style-position: inside; +} + +.listlowerroman { + list-style-type: lower-roman; + list-style-position: inside; +} + +.listupperroman { + list-style-type: upper-roman; + list-style-position: inside; +} + +.listloweralpha { + list-style-type: lower-alpha; + list-style-position: inside; +} + +.listupperalpha { + list-style-type: upper-alpha; + list-style-position: inside; +} diff --git a/themes/throwback/include/theme.ini b/themes/throwback/include/theme.ini new file mode 100644 index 0000000..34bd055 --- /dev/null +++ b/themes/throwback/include/theme.ini @@ -0,0 +1,2 @@ +[author] +name = "Evan O'Connell" \ No newline at end of file diff --git a/themes/throwback/index.php b/themes/throwback/index.php new file mode 100644 index 0000000..bfcab58 --- /dev/null +++ b/themes/throwback/index.php @@ -0,0 +1,61 @@ + + +
    + + + + +
    + + + + + + + + + + + + +
    + + + +
    + +
    + +td.short{width:100%;}" . "" . "" . "" . "
    Code" . $e->getCode() . "
    In File" . $e->getFile() . "
    " . $e->getLine() . " - " . $e->getMessage() . "
    " + ); +} +?> diff --git a/themes/throwback/navigation.php b/themes/throwback/navigation.php new file mode 100644 index 0000000..ac81b6b --- /dev/null +++ b/themes/throwback/navigation.php @@ -0,0 +1,21 @@ + +   HOME    +Query("SELECT * FROM `bayonet_navigation` ORDER BY `weight`"); + $nav = $db->Fetch($result); + + foreach ($nav as $link) { + echo '   ' . strtoupper($link['title']) . '   '; + //echo ''; + } +?> -- cgit