From 75448045cfe70054c8f4bae1bcfaf9bb0f70d330 Mon Sep 17 00:00:00 2001 From: Moritz helios Rudert Date: Wed, 1 Jun 2011 12:13:39 +0200 Subject: [PATCH] fixes --- DB/ChangeLog.sql | 6 +- DB/Himmel.sql | 44 +- DB/SDrohnen.sql | 2 +- DB/Sprache.sql | 2 +- DB/UserPicture.sql | 2 +- default-conf/var_www_includes/config.php | 6 +- default-conf/var_www_includes/config_IAX.php | 2 +- default-conf/var_www_includes/config_db.php | 0 .../var_www_includes/config_jabber.php | 0 .../var_www_includes/config_modem.php | 15 +- includes/UserCVS.php | 148 ++-- includes/config_MessegeServer.php | 11 +- includes/config_modem.php | 15 +- includes/crypt.php | 22 +- includes/error_handler.php | 82 ++- includes/footer.php | 70 +- includes/funktion_SendMessenges.php | 32 +- includes/funktion_activeUser.php | 94 ++- includes/funktion_counter.php | 32 +- includes/funktion_cron.php | 255 ++++--- includes/funktion_db.php | 278 ++++---- includes/funktion_db_list.php | 100 ++- includes/funktion_faq.php | 16 +- includes/funktion_flag.php | 17 +- includes/funktion_jabber.php | 0 includes/funktion_lang.php | 53 +- includes/funktion_menu.php | 75 +- includes/funktion_modem.php | 49 +- includes/funktion_schichtplan.php | 654 +++++++++--------- includes/funktion_schichtplan_Tage.php | 160 +++-- includes/funktion_schichtplan_aray.php | 48 +- includes/funktion_schichtplan_beamer.php | 286 ++++---- includes/funktion_user.php | 197 +++--- includes/funktion_xml.php | 220 +++--- includes/funktion_xml_room.php | 130 ++-- includes/funktion_xml_schudle.php | 524 +++++++------- includes/funktionen.php | 43 +- includes/header.php | 172 +++-- includes/header_start.php | 72 +- includes/login_eingabefeld.php | 33 +- includes/menu.php | 58 +- includes/secure.php | 54 +- services/cron_dect.php | 92 ++- services/dect_clear.php | 32 +- services/jabberserver.php | 188 ++--- txt/LICENSE | 0 txt/README | 4 +- www-ssl/ShowUserPicture.php | 93 ++- www-ssl/admin/EngelType.php | 282 ++++---- www-ssl/admin/Recentchanges.php | 14 +- www-ssl/admin/UserPicture.php | 226 +++--- www-ssl/admin/aktiv.php | 106 +-- www-ssl/admin/dbUpdateFromXLS.php | 406 +++++------ www-ssl/admin/debug.php | 42 +- www-ssl/admin/dect.php | 86 +-- www-ssl/admin/dect_call.php | 2 +- www-ssl/admin/faq.1.php | 2 +- www-ssl/admin/faq.php | 362 +++++----- www-ssl/admin/free.php | 66 +- www-ssl/admin/free_DECT.php | 68 +- www-ssl/admin/group.php | 60 +- www-ssl/admin/index.php | 8 +- www-ssl/admin/news.php | 170 ++--- www-ssl/admin/room.php | 314 ++++----- www-ssl/admin/schichtplan.1.php | 0 www-ssl/admin/schichtplan.php | 620 ++++++++--------- www-ssl/admin/schichtplan_druck.1.php | 0 www-ssl/admin/schichtplan_druck.php | 144 ++-- www-ssl/admin/shiftadd.php | 494 ++++++------- www-ssl/admin/sprache.php | 198 +++--- www-ssl/admin/tshirt.php | 30 +- www-ssl/admin/user.php | 222 +++--- www-ssl/admin/userArrived.php | 36 +- www-ssl/admin/userChangeNormal.php | 226 +++--- www-ssl/admin/userChangeSecure.php | 178 ++--- www-ssl/admin/userDefaultSetting.php | 164 ++--- www-ssl/admin/userSaveNormal.php | 210 +++--- www-ssl/admin/userSaveSecure.php | 298 ++++---- www-ssl/css/grossbild.js | 0 www-ssl/css/style.css.old | 0 www-ssl/css/style.css.old2 | 0 www-ssl/css/style1.css | 0 www-ssl/css/style1.css.old | 0 www-ssl/css/style2.css | 0 www-ssl/css/style3.css | 0 www-ssl/css/style4.css | 0 www-ssl/css/style5.css | 0 www-ssl/css/style6.css | 0 www-ssl/css/style7.css | 0 www-ssl/css/style8.css | 0 www-ssl/css/style9.css | 0 www-ssl/faq.php | 30 +- www-ssl/index.php | 22 +- www-ssl/lageplan.php | 13 +- www-ssl/logout.php | 17 +- www-ssl/makeuser.php | 377 +++++----- www-ssl/nonpublic/auth.php | 84 +-- www-ssl/nonpublic/einstellungen.php | 633 ++++++++--------- www-ssl/nonpublic/engelbesprechung.php | 46 +- www-ssl/nonpublic/faq.php | 59 +- www-ssl/nonpublic/index.php | 110 +-- www-ssl/nonpublic/messages.php | 237 ++++--- www-ssl/nonpublic/myschichtplan.php | 296 ++++---- www-ssl/nonpublic/myschichtplan_ical.php | 32 +- www-ssl/nonpublic/news.php | 13 +- www-ssl/nonpublic/news_comments.php | 72 +- www-ssl/nonpublic/news_output.php | 36 +- www-ssl/nonpublic/schichtplan.1.php | 16 +- www-ssl/nonpublic/schichtplan.2.php | 18 +- www-ssl/nonpublic/schichtplan.php | 335 +++++---- www-ssl/nonpublic/schichtplan_add.php | 205 +++--- www-ssl/nonpublic/schichtplan_beamer.php | 94 ++- www-ssl/nonpublic/waeckliste.php | 50 +- www-ssl/nonpublic/wecken.php | 102 +-- www-ssl/pic/avatar/avatar1.gif | Bin www-ssl/pic/avatar/avatar10.gif | Bin www-ssl/pic/avatar/avatar100.gif | Bin www-ssl/pic/avatar/avatar101.gif | Bin www-ssl/pic/avatar/avatar102.gif | Bin www-ssl/pic/avatar/avatar103.gif | Bin www-ssl/pic/avatar/avatar104.gif | Bin www-ssl/pic/avatar/avatar105.gif | Bin www-ssl/pic/avatar/avatar106.gif | Bin www-ssl/pic/avatar/avatar107.gif | Bin www-ssl/pic/avatar/avatar108.gif | Bin www-ssl/pic/avatar/avatar109.gif | Bin www-ssl/pic/avatar/avatar11.gif | Bin www-ssl/pic/avatar/avatar110.gif | Bin www-ssl/pic/avatar/avatar111.gif | Bin www-ssl/pic/avatar/avatar112.gif | Bin www-ssl/pic/avatar/avatar113.gif | Bin www-ssl/pic/avatar/avatar114.gif | Bin www-ssl/pic/avatar/avatar115.gif | Bin www-ssl/pic/avatar/avatar116.gif | Bin www-ssl/pic/avatar/avatar117.gif | Bin www-ssl/pic/avatar/avatar118.gif | Bin www-ssl/pic/avatar/avatar119.gif | Bin www-ssl/pic/avatar/avatar12.gif | Bin www-ssl/pic/avatar/avatar120.gif | Bin www-ssl/pic/avatar/avatar121.gif | Bin www-ssl/pic/avatar/avatar122.gif | Bin www-ssl/pic/avatar/avatar123.gif | Bin www-ssl/pic/avatar/avatar124.gif | Bin www-ssl/pic/avatar/avatar125.gif | Bin www-ssl/pic/avatar/avatar126.gif | Bin www-ssl/pic/avatar/avatar127.gif | Bin www-ssl/pic/avatar/avatar128.gif | Bin www-ssl/pic/avatar/avatar129.gif | Bin www-ssl/pic/avatar/avatar13.gif | Bin www-ssl/pic/avatar/avatar130.gif | Bin www-ssl/pic/avatar/avatar131.gif | Bin www-ssl/pic/avatar/avatar132.gif | Bin www-ssl/pic/avatar/avatar133.gif | Bin www-ssl/pic/avatar/avatar134.gif | Bin www-ssl/pic/avatar/avatar135.gif | Bin www-ssl/pic/avatar/avatar136.gif | Bin www-ssl/pic/avatar/avatar137.gif | Bin www-ssl/pic/avatar/avatar138.gif | Bin www-ssl/pic/avatar/avatar139.gif | Bin www-ssl/pic/avatar/avatar14.gif | Bin www-ssl/pic/avatar/avatar140.gif | Bin www-ssl/pic/avatar/avatar141.gif | Bin www-ssl/pic/avatar/avatar142.gif | Bin www-ssl/pic/avatar/avatar143.gif | Bin www-ssl/pic/avatar/avatar144.gif | Bin www-ssl/pic/avatar/avatar145.gif | Bin www-ssl/pic/avatar/avatar146.gif | Bin www-ssl/pic/avatar/avatar147.gif | Bin www-ssl/pic/avatar/avatar148.gif | Bin www-ssl/pic/avatar/avatar149.gif | Bin www-ssl/pic/avatar/avatar15.gif | Bin www-ssl/pic/avatar/avatar150.gif | Bin www-ssl/pic/avatar/avatar151.gif | Bin www-ssl/pic/avatar/avatar152.gif | Bin www-ssl/pic/avatar/avatar153.gif | Bin www-ssl/pic/avatar/avatar154.gif | Bin www-ssl/pic/avatar/avatar155.gif | Bin www-ssl/pic/avatar/avatar156.gif | Bin www-ssl/pic/avatar/avatar157.gif | Bin www-ssl/pic/avatar/avatar158.gif | Bin www-ssl/pic/avatar/avatar159.gif | Bin www-ssl/pic/avatar/avatar16.gif | Bin www-ssl/pic/avatar/avatar160.gif | Bin www-ssl/pic/avatar/avatar161.gif | Bin www-ssl/pic/avatar/avatar162.gif | Bin www-ssl/pic/avatar/avatar163.gif | Bin www-ssl/pic/avatar/avatar164.gif | Bin www-ssl/pic/avatar/avatar165.gif | Bin www-ssl/pic/avatar/avatar166.gif | Bin www-ssl/pic/avatar/avatar167.gif | Bin www-ssl/pic/avatar/avatar168.gif | Bin www-ssl/pic/avatar/avatar169.gif | Bin www-ssl/pic/avatar/avatar17.gif | Bin www-ssl/pic/avatar/avatar170.gif | Bin www-ssl/pic/avatar/avatar171.gif | Bin www-ssl/pic/avatar/avatar172.gif | Bin www-ssl/pic/avatar/avatar173.gif | Bin www-ssl/pic/avatar/avatar174.gif | Bin www-ssl/pic/avatar/avatar175.gif | Bin www-ssl/pic/avatar/avatar176.gif | Bin www-ssl/pic/avatar/avatar177.gif | Bin www-ssl/pic/avatar/avatar178.gif | Bin www-ssl/pic/avatar/avatar179.gif | Bin www-ssl/pic/avatar/avatar18.gif | Bin www-ssl/pic/avatar/avatar180.gif | Bin www-ssl/pic/avatar/avatar181.gif | Bin www-ssl/pic/avatar/avatar182.gif | Bin www-ssl/pic/avatar/avatar183.gif | Bin www-ssl/pic/avatar/avatar184.gif | Bin www-ssl/pic/avatar/avatar185.gif | Bin www-ssl/pic/avatar/avatar186.gif | Bin www-ssl/pic/avatar/avatar187.gif | Bin www-ssl/pic/avatar/avatar188.gif | Bin www-ssl/pic/avatar/avatar189.gif | Bin www-ssl/pic/avatar/avatar19.gif | Bin www-ssl/pic/avatar/avatar190.gif | Bin www-ssl/pic/avatar/avatar191.gif | Bin www-ssl/pic/avatar/avatar192.gif | Bin www-ssl/pic/avatar/avatar193.gif | Bin www-ssl/pic/avatar/avatar194.gif | Bin www-ssl/pic/avatar/avatar195.gif | Bin www-ssl/pic/avatar/avatar196.gif | Bin www-ssl/pic/avatar/avatar197.gif | Bin www-ssl/pic/avatar/avatar198.gif | Bin www-ssl/pic/avatar/avatar199.gif | Bin www-ssl/pic/avatar/avatar2.gif | Bin www-ssl/pic/avatar/avatar20.gif | Bin www-ssl/pic/avatar/avatar200.gif | Bin www-ssl/pic/avatar/avatar201.gif | Bin www-ssl/pic/avatar/avatar202.gif | Bin www-ssl/pic/avatar/avatar203.gif | Bin www-ssl/pic/avatar/avatar204.gif | Bin www-ssl/pic/avatar/avatar205.gif | Bin www-ssl/pic/avatar/avatar206.gif | Bin www-ssl/pic/avatar/avatar207.gif | Bin www-ssl/pic/avatar/avatar208.gif | Bin www-ssl/pic/avatar/avatar209.gif | Bin www-ssl/pic/avatar/avatar21.gif | Bin www-ssl/pic/avatar/avatar210.gif | Bin www-ssl/pic/avatar/avatar211.gif | Bin www-ssl/pic/avatar/avatar212.gif | Bin www-ssl/pic/avatar/avatar213.gif | Bin www-ssl/pic/avatar/avatar214.gif | Bin www-ssl/pic/avatar/avatar215.gif | Bin www-ssl/pic/avatar/avatar216.gif | Bin www-ssl/pic/avatar/avatar217.gif | Bin www-ssl/pic/avatar/avatar218.gif | Bin www-ssl/pic/avatar/avatar219.gif | Bin www-ssl/pic/avatar/avatar22.gif | Bin www-ssl/pic/avatar/avatar220.gif | Bin www-ssl/pic/avatar/avatar221.gif | Bin www-ssl/pic/avatar/avatar222.gif | Bin www-ssl/pic/avatar/avatar223.gif | Bin www-ssl/pic/avatar/avatar224.gif | Bin www-ssl/pic/avatar/avatar225.gif | Bin www-ssl/pic/avatar/avatar226.gif | Bin www-ssl/pic/avatar/avatar227.gif | Bin www-ssl/pic/avatar/avatar228.gif | Bin www-ssl/pic/avatar/avatar229.gif | Bin www-ssl/pic/avatar/avatar23.gif | Bin www-ssl/pic/avatar/avatar230.gif | Bin www-ssl/pic/avatar/avatar231.gif | Bin www-ssl/pic/avatar/avatar232.gif | Bin www-ssl/pic/avatar/avatar233.gif | Bin www-ssl/pic/avatar/avatar234.gif | Bin www-ssl/pic/avatar/avatar235.gif | Bin www-ssl/pic/avatar/avatar236.gif | Bin www-ssl/pic/avatar/avatar237.gif | Bin www-ssl/pic/avatar/avatar238.gif | Bin www-ssl/pic/avatar/avatar239.gif | Bin www-ssl/pic/avatar/avatar24.gif | Bin www-ssl/pic/avatar/avatar240.gif | Bin www-ssl/pic/avatar/avatar241.gif | Bin www-ssl/pic/avatar/avatar242.gif | Bin www-ssl/pic/avatar/avatar243.gif | Bin www-ssl/pic/avatar/avatar244.gif | Bin www-ssl/pic/avatar/avatar245.gif | Bin www-ssl/pic/avatar/avatar246.gif | Bin www-ssl/pic/avatar/avatar247.gif | Bin www-ssl/pic/avatar/avatar248.gif | Bin www-ssl/pic/avatar/avatar249.gif | Bin www-ssl/pic/avatar/avatar25.gif | Bin www-ssl/pic/avatar/avatar250.gif | Bin www-ssl/pic/avatar/avatar251.gif | Bin www-ssl/pic/avatar/avatar252.gif | Bin www-ssl/pic/avatar/avatar253.gif | Bin www-ssl/pic/avatar/avatar254.gif | Bin www-ssl/pic/avatar/avatar255.gif | Bin www-ssl/pic/avatar/avatar256.gif | Bin www-ssl/pic/avatar/avatar257.gif | Bin www-ssl/pic/avatar/avatar258.gif | Bin www-ssl/pic/avatar/avatar259.gif | Bin www-ssl/pic/avatar/avatar26.gif | Bin www-ssl/pic/avatar/avatar260.gif | Bin www-ssl/pic/avatar/avatar261.gif | Bin www-ssl/pic/avatar/avatar262.gif | Bin www-ssl/pic/avatar/avatar263.gif | Bin www-ssl/pic/avatar/avatar264.gif | Bin www-ssl/pic/avatar/avatar265.gif | Bin www-ssl/pic/avatar/avatar266.gif | Bin www-ssl/pic/avatar/avatar267.gif | Bin www-ssl/pic/avatar/avatar268.gif | Bin www-ssl/pic/avatar/avatar269.gif | Bin www-ssl/pic/avatar/avatar27.gif | Bin www-ssl/pic/avatar/avatar270.gif | Bin www-ssl/pic/avatar/avatar271.gif | Bin www-ssl/pic/avatar/avatar272.gif | Bin www-ssl/pic/avatar/avatar273.gif | Bin www-ssl/pic/avatar/avatar274.gif | Bin www-ssl/pic/avatar/avatar275.gif | Bin www-ssl/pic/avatar/avatar276.gif | Bin www-ssl/pic/avatar/avatar277.gif | Bin www-ssl/pic/avatar/avatar278.gif | Bin www-ssl/pic/avatar/avatar279.gif | Bin www-ssl/pic/avatar/avatar28.gif | Bin www-ssl/pic/avatar/avatar280.gif | Bin www-ssl/pic/avatar/avatar281.gif | Bin www-ssl/pic/avatar/avatar282.gif | Bin www-ssl/pic/avatar/avatar283.gif | Bin www-ssl/pic/avatar/avatar284.gif | Bin www-ssl/pic/avatar/avatar285.gif | Bin www-ssl/pic/avatar/avatar286.gif | Bin www-ssl/pic/avatar/avatar287.gif | Bin www-ssl/pic/avatar/avatar288.gif | Bin www-ssl/pic/avatar/avatar289.gif | Bin www-ssl/pic/avatar/avatar29.gif | Bin www-ssl/pic/avatar/avatar290.gif | Bin www-ssl/pic/avatar/avatar291.gif | Bin www-ssl/pic/avatar/avatar292.gif | Bin www-ssl/pic/avatar/avatar293.gif | Bin www-ssl/pic/avatar/avatar294.gif | Bin www-ssl/pic/avatar/avatar295.gif | Bin www-ssl/pic/avatar/avatar296.gif | Bin www-ssl/pic/avatar/avatar297.gif | Bin www-ssl/pic/avatar/avatar298.gif | Bin www-ssl/pic/avatar/avatar299.gif | Bin www-ssl/pic/avatar/avatar3.gif | Bin www-ssl/pic/avatar/avatar30.gif | Bin www-ssl/pic/avatar/avatar300.gif | Bin www-ssl/pic/avatar/avatar301.gif | Bin www-ssl/pic/avatar/avatar302.gif | Bin www-ssl/pic/avatar/avatar303.gif | Bin www-ssl/pic/avatar/avatar304.gif | Bin www-ssl/pic/avatar/avatar305.gif | Bin www-ssl/pic/avatar/avatar306.gif | Bin www-ssl/pic/avatar/avatar307.gif | Bin www-ssl/pic/avatar/avatar308.gif | Bin www-ssl/pic/avatar/avatar309.gif | Bin www-ssl/pic/avatar/avatar31.gif | Bin www-ssl/pic/avatar/avatar310.gif | Bin www-ssl/pic/avatar/avatar311.gif | Bin www-ssl/pic/avatar/avatar312.gif | Bin www-ssl/pic/avatar/avatar313.gif | Bin www-ssl/pic/avatar/avatar314.gif | Bin www-ssl/pic/avatar/avatar315.gif | Bin www-ssl/pic/avatar/avatar316.gif | Bin www-ssl/pic/avatar/avatar317.gif | Bin www-ssl/pic/avatar/avatar318.gif | Bin www-ssl/pic/avatar/avatar319.gif | Bin www-ssl/pic/avatar/avatar32.gif | Bin www-ssl/pic/avatar/avatar320.gif | Bin www-ssl/pic/avatar/avatar321.gif | Bin www-ssl/pic/avatar/avatar322.gif | Bin www-ssl/pic/avatar/avatar323.gif | Bin www-ssl/pic/avatar/avatar324.gif | Bin www-ssl/pic/avatar/avatar325.gif | Bin www-ssl/pic/avatar/avatar326.gif | Bin www-ssl/pic/avatar/avatar327.gif | Bin www-ssl/pic/avatar/avatar328.gif | Bin www-ssl/pic/avatar/avatar329.gif | Bin www-ssl/pic/avatar/avatar33.gif | Bin www-ssl/pic/avatar/avatar330.gif | Bin www-ssl/pic/avatar/avatar331.gif | Bin www-ssl/pic/avatar/avatar332.gif | Bin www-ssl/pic/avatar/avatar333.gif | Bin www-ssl/pic/avatar/avatar334.gif | Bin www-ssl/pic/avatar/avatar335.gif | Bin www-ssl/pic/avatar/avatar336.gif | Bin www-ssl/pic/avatar/avatar337.gif | Bin www-ssl/pic/avatar/avatar338.gif | Bin www-ssl/pic/avatar/avatar339.gif | Bin www-ssl/pic/avatar/avatar34.gif | Bin www-ssl/pic/avatar/avatar340.gif | Bin www-ssl/pic/avatar/avatar341.gif | Bin www-ssl/pic/avatar/avatar342.gif | Bin www-ssl/pic/avatar/avatar343.gif | Bin www-ssl/pic/avatar/avatar344.gif | Bin www-ssl/pic/avatar/avatar345.gif | Bin www-ssl/pic/avatar/avatar346.gif | Bin www-ssl/pic/avatar/avatar347.gif | Bin www-ssl/pic/avatar/avatar348.gif | Bin www-ssl/pic/avatar/avatar349.gif | Bin www-ssl/pic/avatar/avatar35.gif | Bin www-ssl/pic/avatar/avatar350.gif | Bin www-ssl/pic/avatar/avatar351.gif | Bin www-ssl/pic/avatar/avatar352.gif | Bin www-ssl/pic/avatar/avatar353.gif | Bin www-ssl/pic/avatar/avatar354.gif | Bin www-ssl/pic/avatar/avatar355.gif | Bin www-ssl/pic/avatar/avatar356.gif | Bin www-ssl/pic/avatar/avatar357.gif | Bin www-ssl/pic/avatar/avatar358.gif | Bin www-ssl/pic/avatar/avatar359.gif | Bin www-ssl/pic/avatar/avatar36.gif | Bin www-ssl/pic/avatar/avatar360.gif | Bin www-ssl/pic/avatar/avatar361.gif | Bin www-ssl/pic/avatar/avatar362.gif | Bin www-ssl/pic/avatar/avatar363.gif | Bin www-ssl/pic/avatar/avatar364.gif | Bin www-ssl/pic/avatar/avatar365.gif | Bin www-ssl/pic/avatar/avatar366.gif | Bin www-ssl/pic/avatar/avatar367.gif | Bin www-ssl/pic/avatar/avatar368.gif | Bin www-ssl/pic/avatar/avatar369.gif | Bin www-ssl/pic/avatar/avatar37.gif | Bin www-ssl/pic/avatar/avatar370.gif | Bin www-ssl/pic/avatar/avatar371.gif | Bin www-ssl/pic/avatar/avatar372.gif | Bin www-ssl/pic/avatar/avatar373.gif | Bin www-ssl/pic/avatar/avatar374.gif | Bin www-ssl/pic/avatar/avatar375.gif | Bin www-ssl/pic/avatar/avatar376.gif | Bin www-ssl/pic/avatar/avatar377.gif | Bin www-ssl/pic/avatar/avatar378.gif | Bin www-ssl/pic/avatar/avatar379.gif | Bin www-ssl/pic/avatar/avatar38.gif | Bin www-ssl/pic/avatar/avatar380.gif | Bin www-ssl/pic/avatar/avatar381.gif | Bin www-ssl/pic/avatar/avatar382.gif | Bin www-ssl/pic/avatar/avatar383.gif | Bin www-ssl/pic/avatar/avatar384.gif | Bin www-ssl/pic/avatar/avatar385.gif | Bin www-ssl/pic/avatar/avatar386.gif | Bin www-ssl/pic/avatar/avatar387.gif | Bin www-ssl/pic/avatar/avatar388.gif | Bin www-ssl/pic/avatar/avatar389.gif | Bin www-ssl/pic/avatar/avatar39.gif | Bin www-ssl/pic/avatar/avatar390.gif | Bin www-ssl/pic/avatar/avatar391.gif | Bin www-ssl/pic/avatar/avatar392.gif | Bin www-ssl/pic/avatar/avatar393.gif | Bin www-ssl/pic/avatar/avatar394.gif | Bin www-ssl/pic/avatar/avatar395.gif | Bin www-ssl/pic/avatar/avatar396.gif | Bin www-ssl/pic/avatar/avatar397.gif | Bin www-ssl/pic/avatar/avatar398.gif | Bin www-ssl/pic/avatar/avatar399.gif | Bin www-ssl/pic/avatar/avatar4.gif | Bin www-ssl/pic/avatar/avatar40.gif | Bin www-ssl/pic/avatar/avatar400.gif | Bin www-ssl/pic/avatar/avatar401.gif | Bin www-ssl/pic/avatar/avatar402.gif | Bin www-ssl/pic/avatar/avatar403.gif | Bin www-ssl/pic/avatar/avatar404.gif | Bin www-ssl/pic/avatar/avatar405.gif | Bin www-ssl/pic/avatar/avatar406.gif | Bin www-ssl/pic/avatar/avatar407.gif | Bin www-ssl/pic/avatar/avatar408.gif | Bin www-ssl/pic/avatar/avatar409.gif | Bin www-ssl/pic/avatar/avatar41.gif | Bin www-ssl/pic/avatar/avatar410.gif | Bin www-ssl/pic/avatar/avatar411.gif | Bin www-ssl/pic/avatar/avatar412.gif | Bin www-ssl/pic/avatar/avatar413.gif | Bin www-ssl/pic/avatar/avatar414.gif | Bin www-ssl/pic/avatar/avatar415.gif | Bin www-ssl/pic/avatar/avatar416.gif | Bin www-ssl/pic/avatar/avatar417.gif | Bin www-ssl/pic/avatar/avatar418.gif | Bin www-ssl/pic/avatar/avatar419.gif | Bin www-ssl/pic/avatar/avatar42.gif | Bin www-ssl/pic/avatar/avatar420.gif | Bin www-ssl/pic/avatar/avatar421.gif | Bin www-ssl/pic/avatar/avatar422.gif | Bin www-ssl/pic/avatar/avatar423.gif | Bin www-ssl/pic/avatar/avatar424.gif | Bin www-ssl/pic/avatar/avatar425.gif | Bin www-ssl/pic/avatar/avatar426.gif | Bin www-ssl/pic/avatar/avatar427.gif | Bin www-ssl/pic/avatar/avatar428.gif | Bin www-ssl/pic/avatar/avatar429.gif | Bin www-ssl/pic/avatar/avatar43.gif | Bin www-ssl/pic/avatar/avatar430.gif | Bin www-ssl/pic/avatar/avatar431.gif | Bin www-ssl/pic/avatar/avatar432.gif | Bin www-ssl/pic/avatar/avatar433.gif | Bin www-ssl/pic/avatar/avatar434.gif | Bin www-ssl/pic/avatar/avatar435.gif | Bin www-ssl/pic/avatar/avatar436.gif | Bin www-ssl/pic/avatar/avatar437.gif | Bin www-ssl/pic/avatar/avatar438.gif | Bin www-ssl/pic/avatar/avatar439.gif | Bin www-ssl/pic/avatar/avatar44.gif | Bin www-ssl/pic/avatar/avatar440.gif | Bin www-ssl/pic/avatar/avatar441.gif | Bin www-ssl/pic/avatar/avatar442.gif | Bin www-ssl/pic/avatar/avatar443.gif | Bin www-ssl/pic/avatar/avatar444.gif | Bin www-ssl/pic/avatar/avatar445.gif | Bin www-ssl/pic/avatar/avatar446.gif | Bin www-ssl/pic/avatar/avatar447.gif | Bin www-ssl/pic/avatar/avatar448.gif | Bin www-ssl/pic/avatar/avatar449.gif | Bin www-ssl/pic/avatar/avatar45.gif | Bin www-ssl/pic/avatar/avatar450.gif | Bin www-ssl/pic/avatar/avatar451.gif | Bin www-ssl/pic/avatar/avatar452.gif | Bin www-ssl/pic/avatar/avatar453.gif | Bin www-ssl/pic/avatar/avatar454.gif | Bin www-ssl/pic/avatar/avatar455.gif | Bin www-ssl/pic/avatar/avatar456.gif | Bin www-ssl/pic/avatar/avatar457.gif | Bin www-ssl/pic/avatar/avatar458.gif | Bin www-ssl/pic/avatar/avatar459.gif | Bin www-ssl/pic/avatar/avatar46.gif | Bin www-ssl/pic/avatar/avatar460.gif | Bin www-ssl/pic/avatar/avatar461.gif | Bin www-ssl/pic/avatar/avatar462.gif | Bin www-ssl/pic/avatar/avatar463.gif | Bin www-ssl/pic/avatar/avatar464.gif | Bin www-ssl/pic/avatar/avatar465.gif | Bin www-ssl/pic/avatar/avatar466.gif | Bin www-ssl/pic/avatar/avatar467.gif | Bin www-ssl/pic/avatar/avatar468.gif | Bin www-ssl/pic/avatar/avatar469.gif | Bin www-ssl/pic/avatar/avatar47.gif | Bin www-ssl/pic/avatar/avatar470.gif | Bin www-ssl/pic/avatar/avatar471.gif | Bin www-ssl/pic/avatar/avatar472.gif | Bin www-ssl/pic/avatar/avatar473.gif | Bin www-ssl/pic/avatar/avatar474.gif | Bin www-ssl/pic/avatar/avatar475.gif | Bin www-ssl/pic/avatar/avatar476.gif | Bin www-ssl/pic/avatar/avatar477.gif | Bin www-ssl/pic/avatar/avatar478.gif | Bin www-ssl/pic/avatar/avatar479.gif | Bin www-ssl/pic/avatar/avatar48.gif | Bin www-ssl/pic/avatar/avatar480.gif | Bin www-ssl/pic/avatar/avatar481.gif | Bin www-ssl/pic/avatar/avatar482.gif | Bin www-ssl/pic/avatar/avatar483.gif | Bin www-ssl/pic/avatar/avatar484.gif | Bin www-ssl/pic/avatar/avatar485.gif | Bin www-ssl/pic/avatar/avatar486.gif | Bin www-ssl/pic/avatar/avatar487.gif | Bin www-ssl/pic/avatar/avatar488.gif | Bin www-ssl/pic/avatar/avatar489.gif | Bin www-ssl/pic/avatar/avatar49.gif | Bin www-ssl/pic/avatar/avatar490.gif | Bin www-ssl/pic/avatar/avatar491.gif | Bin www-ssl/pic/avatar/avatar492.gif | Bin www-ssl/pic/avatar/avatar493.gif | Bin www-ssl/pic/avatar/avatar494.gif | Bin www-ssl/pic/avatar/avatar495.gif | Bin www-ssl/pic/avatar/avatar496.gif | Bin www-ssl/pic/avatar/avatar497.gif | Bin www-ssl/pic/avatar/avatar498.gif | Bin www-ssl/pic/avatar/avatar499.gif | Bin www-ssl/pic/avatar/avatar5.gif | Bin www-ssl/pic/avatar/avatar50.gif | Bin www-ssl/pic/avatar/avatar51.gif | Bin www-ssl/pic/avatar/avatar52.gif | Bin www-ssl/pic/avatar/avatar53.gif | Bin www-ssl/pic/avatar/avatar54.gif | Bin www-ssl/pic/avatar/avatar55.gif | Bin www-ssl/pic/avatar/avatar56.gif | Bin www-ssl/pic/avatar/avatar57.gif | Bin www-ssl/pic/avatar/avatar58.gif | Bin www-ssl/pic/avatar/avatar59.gif | Bin www-ssl/pic/avatar/avatar6.gif | Bin www-ssl/pic/avatar/avatar60.gif | Bin www-ssl/pic/avatar/avatar61.gif | Bin www-ssl/pic/avatar/avatar62.gif | Bin www-ssl/pic/avatar/avatar63.gif | Bin www-ssl/pic/avatar/avatar64.gif | Bin www-ssl/pic/avatar/avatar65.gif | Bin www-ssl/pic/avatar/avatar66.gif | Bin www-ssl/pic/avatar/avatar67.gif | Bin www-ssl/pic/avatar/avatar68.gif | Bin www-ssl/pic/avatar/avatar69.gif | Bin www-ssl/pic/avatar/avatar7.gif | Bin www-ssl/pic/avatar/avatar70.gif | Bin www-ssl/pic/avatar/avatar71.gif | Bin www-ssl/pic/avatar/avatar72.gif | Bin www-ssl/pic/avatar/avatar73.gif | Bin www-ssl/pic/avatar/avatar74.gif | Bin www-ssl/pic/avatar/avatar75.gif | Bin www-ssl/pic/avatar/avatar76.gif | Bin www-ssl/pic/avatar/avatar77.gif | Bin www-ssl/pic/avatar/avatar78.gif | Bin www-ssl/pic/avatar/avatar79.gif | Bin www-ssl/pic/avatar/avatar8.gif | Bin www-ssl/pic/avatar/avatar80.gif | Bin www-ssl/pic/avatar/avatar81.gif | Bin www-ssl/pic/avatar/avatar82.gif | Bin www-ssl/pic/avatar/avatar83.gif | Bin www-ssl/pic/avatar/avatar84.gif | Bin www-ssl/pic/avatar/avatar85.gif | Bin www-ssl/pic/avatar/avatar86.gif | Bin www-ssl/pic/avatar/avatar87.gif | Bin www-ssl/pic/avatar/avatar88.gif | Bin www-ssl/pic/avatar/avatar89.gif | Bin www-ssl/pic/avatar/avatar9.gif | Bin www-ssl/pic/avatar/avatar90.gif | Bin www-ssl/pic/avatar/avatar91.gif | Bin www-ssl/pic/avatar/avatar92.gif | Bin www-ssl/pic/avatar/avatar93.gif | Bin www-ssl/pic/avatar/avatar94.gif | Bin www-ssl/pic/avatar/avatar95.gif | Bin www-ssl/pic/avatar/avatar96.gif | Bin www-ssl/pic/avatar/avatar97.gif | Bin www-ssl/pic/avatar/avatar98.gif | Bin www-ssl/pic/avatar/avatar99.gif | Bin www-ssl/pic/external.png | Bin www-ssl/pic/flag/de.gif | Bin www-ssl/pic/flag/en.gif | Bin www-ssl/pic/himmel.png | Bin www-ssl/pic/himmel_w.png | Bin www-ssl/pic/smiles/aerger2.gif | Bin www-ssl/pic/smiles/alien.gif | Bin www-ssl/pic/smiles/blush.gif | Bin www-ssl/pic/smiles/boggle.gif | Bin www-ssl/pic/smiles/bounce.gif | Bin www-ssl/pic/smiles/bun.gif | Bin www-ssl/pic/smiles/candycane.gif | Bin www-ssl/pic/smiles/cheesy.gif | Bin www-ssl/pic/smiles/dead.gif | Bin www-ssl/pic/smiles/depressed.gif | Bin www-ssl/pic/smiles/ginger.gif | Bin www-ssl/pic/smiles/hirsch1.gif | Bin www-ssl/pic/smiles/huh.gif | Bin www-ssl/pic/smiles/icon_arrow.gif | Bin www-ssl/pic/smiles/icon_biggrin.gif | Bin www-ssl/pic/smiles/icon_confused.gif | Bin www-ssl/pic/smiles/icon_cool.gif | Bin www-ssl/pic/smiles/icon_cry.gif | Bin www-ssl/pic/smiles/icon_eek.gif | Bin www-ssl/pic/smiles/icon_evil.gif | Bin www-ssl/pic/smiles/icon_exclaim.gif | Bin www-ssl/pic/smiles/icon_frown.gif | Bin www-ssl/pic/smiles/icon_idea.gif | Bin www-ssl/pic/smiles/icon_lol.gif | Bin www-ssl/pic/smiles/icon_mad.gif | Bin www-ssl/pic/smiles/icon_mrgreen.gif | Bin www-ssl/pic/smiles/icon_neutral.gif | Bin www-ssl/pic/smiles/icon_question.gif | Bin www-ssl/pic/smiles/icon_razz.gif | Bin www-ssl/pic/smiles/icon_redface.gif | Bin www-ssl/pic/smiles/icon_rolleyes.gif | Bin www-ssl/pic/smiles/icon_sad.gif | Bin www-ssl/pic/smiles/icon_smile.gif | Bin www-ssl/pic/smiles/icon_surprised.gif | Bin www-ssl/pic/smiles/icon_twisted.gif | Bin www-ssl/pic/smiles/icon_wind.gif | Bin www-ssl/pic/smiles/koenig1.gif | Bin www-ssl/pic/smiles/laser1.gif | Bin www-ssl/pic/smiles/love1.gif | Bin www-ssl/pic/smiles/moo.gif | Bin www-ssl/pic/smiles/nuts.gif | Bin www-ssl/pic/smiles/robin.gif | Bin www-ssl/pic/smiles/sheep.gif | Bin www-ssl/pic/smiles/sick.gif | Bin www-ssl/pic/smiles/sleep.gif | Bin www-ssl/pic/smiles/soppy.gif | Bin www-ssl/pic/smiles/stress.gif | Bin www-ssl/pic/smiles/sweet.gif | Bin www-ssl/pic/smiles/tired.gif | Bin www-ssl/pic/smiles/urgh.gif | Bin www-ssl/pic/smiles/winken1.gif | Bin www-ssl/pic/smiles/worm.gif | Bin www-ssl/pic/smiles/worry.gif | Bin www/404.php | 4 +- www/index.php | 5 +- 673 files changed, 6044 insertions(+), 6384 deletions(-) mode change 100755 => 100644 DB/ChangeLog.sql mode change 100755 => 100644 DB/Himmel.sql mode change 100755 => 100644 DB/SDrohnen.sql mode change 100755 => 100644 DB/Sprache.sql mode change 100755 => 100644 default-conf/var_www_includes/config.php mode change 100755 => 100644 default-conf/var_www_includes/config_db.php mode change 100755 => 100644 default-conf/var_www_includes/config_jabber.php mode change 100755 => 100644 includes/UserCVS.php mode change 100755 => 100644 includes/crypt.php mode change 100755 => 100644 includes/error_handler.php mode change 100755 => 100644 includes/footer.php mode change 100755 => 100644 includes/funktion_activeUser.php mode change 100755 => 100644 includes/funktion_cron.php mode change 100755 => 100644 includes/funktion_db_list.php mode change 100755 => 100644 includes/funktion_faq.php mode change 100755 => 100644 includes/funktion_jabber.php mode change 100755 => 100644 includes/funktion_lang.php mode change 100755 => 100644 includes/funktion_menu.php mode change 100755 => 100644 includes/funktion_modem.php mode change 100755 => 100644 includes/funktion_schichtplan.php mode change 100755 => 100644 includes/funktion_schichtplan_Tage.php mode change 100755 => 100644 includes/funktion_schichtplan_aray.php mode change 100755 => 100644 includes/funktion_schichtplan_beamer.php mode change 100755 => 100644 includes/funktion_user.php mode change 100755 => 100644 includes/funktion_xml.php mode change 100755 => 100644 includes/funktion_xml_room.php mode change 100755 => 100644 includes/funktion_xml_schudle.php mode change 100755 => 100644 includes/funktionen.php mode change 100755 => 100644 includes/header.php mode change 100755 => 100644 includes/header_start.php mode change 100755 => 100644 includes/login_eingabefeld.php mode change 100755 => 100644 includes/menu.php mode change 100755 => 100644 includes/secure.php mode change 100755 => 100644 txt/LICENSE mode change 100755 => 100644 www-ssl/admin/EngelType.php mode change 100755 => 100644 www-ssl/admin/Recentchanges.php mode change 100755 => 100644 www-ssl/admin/UserPicture.php mode change 100755 => 100644 www-ssl/admin/aktiv.php mode change 100755 => 100644 www-ssl/admin/dbUpdateFromXLS.php mode change 100755 => 100644 www-ssl/admin/debug.php mode change 100755 => 100644 www-ssl/admin/dect.php mode change 100755 => 100644 www-ssl/admin/dect_call.php mode change 100755 => 100644 www-ssl/admin/faq.1.php mode change 100755 => 100644 www-ssl/admin/faq.php mode change 100755 => 100644 www-ssl/admin/free.php mode change 100755 => 100644 www-ssl/admin/free_DECT.php mode change 100755 => 100644 www-ssl/admin/group.php mode change 100755 => 100644 www-ssl/admin/index.php mode change 100755 => 100644 www-ssl/admin/news.php mode change 100755 => 100644 www-ssl/admin/room.php mode change 100755 => 100644 www-ssl/admin/schichtplan.1.php mode change 100755 => 100644 www-ssl/admin/schichtplan.php mode change 100755 => 100644 www-ssl/admin/schichtplan_druck.1.php mode change 100755 => 100644 www-ssl/admin/schichtplan_druck.php mode change 100755 => 100644 www-ssl/admin/shiftadd.php mode change 100755 => 100644 www-ssl/admin/sprache.php mode change 100755 => 100644 www-ssl/admin/tshirt.php mode change 100755 => 100644 www-ssl/admin/user.php mode change 100755 => 100644 www-ssl/admin/userArrived.php mode change 100755 => 100644 www-ssl/admin/userChangeNormal.php mode change 100755 => 100644 www-ssl/admin/userChangeSecure.php mode change 100755 => 100644 www-ssl/admin/userDefaultSetting.php mode change 100755 => 100644 www-ssl/admin/userSaveNormal.php mode change 100755 => 100644 www-ssl/admin/userSaveSecure.php mode change 100755 => 100644 www-ssl/css/grossbild.js mode change 100755 => 100644 www-ssl/css/style.css.old mode change 100755 => 100644 www-ssl/css/style.css.old2 mode change 100755 => 100644 www-ssl/css/style1.css mode change 100755 => 100644 www-ssl/css/style1.css.old mode change 100755 => 100644 www-ssl/css/style2.css mode change 100755 => 100644 www-ssl/css/style3.css mode change 100755 => 100644 www-ssl/css/style4.css mode change 100755 => 100644 www-ssl/css/style5.css mode change 100755 => 100644 www-ssl/css/style6.css mode change 100755 => 100644 www-ssl/css/style7.css mode change 100755 => 100644 www-ssl/css/style8.css mode change 100755 => 100644 www-ssl/css/style9.css mode change 100755 => 100644 www-ssl/faq.php mode change 100755 => 100644 www-ssl/index.php mode change 100755 => 100644 www-ssl/lageplan.php mode change 100755 => 100644 www-ssl/logout.php mode change 100755 => 100644 www-ssl/makeuser.php mode change 100755 => 100644 www-ssl/nonpublic/auth.php mode change 100755 => 100644 www-ssl/nonpublic/einstellungen.php mode change 100755 => 100644 www-ssl/nonpublic/engelbesprechung.php mode change 100755 => 100644 www-ssl/nonpublic/faq.php mode change 100755 => 100644 www-ssl/nonpublic/index.php mode change 100755 => 100644 www-ssl/nonpublic/messages.php mode change 100755 => 100644 www-ssl/nonpublic/myschichtplan.php mode change 100755 => 100644 www-ssl/nonpublic/myschichtplan_ical.php mode change 100755 => 100644 www-ssl/nonpublic/news.php mode change 100755 => 100644 www-ssl/nonpublic/news_comments.php mode change 100755 => 100644 www-ssl/nonpublic/news_output.php mode change 100755 => 100644 www-ssl/nonpublic/schichtplan.1.php mode change 100755 => 100644 www-ssl/nonpublic/schichtplan.2.php mode change 100755 => 100644 www-ssl/nonpublic/schichtplan.php mode change 100755 => 100644 www-ssl/nonpublic/schichtplan_add.php mode change 100755 => 100644 www-ssl/nonpublic/schichtplan_beamer.php mode change 100755 => 100644 www-ssl/nonpublic/waeckliste.php mode change 100755 => 100644 www-ssl/nonpublic/wecken.php mode change 100755 => 100644 www-ssl/pic/avatar/avatar1.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar10.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar100.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar101.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar102.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar103.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar104.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar105.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar106.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar107.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar108.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar109.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar11.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar110.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar111.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar112.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar113.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar114.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar115.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar116.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar117.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar118.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar119.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar12.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar120.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar121.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar122.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar123.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar124.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar125.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar126.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar127.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar128.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar129.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar13.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar130.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar131.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar132.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar133.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar134.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar135.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar136.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar137.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar138.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar139.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar14.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar140.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar141.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar142.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar143.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar144.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar145.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar146.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar147.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar148.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar149.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar15.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar150.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar151.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar152.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar153.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar154.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar155.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar156.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar157.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar158.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar159.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar16.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar160.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar161.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar162.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar163.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar164.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar165.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar166.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar167.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar168.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar169.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar17.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar170.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar171.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar172.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar173.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar174.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar175.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar176.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar177.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar178.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar179.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar18.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar180.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar181.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar182.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar183.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar184.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar185.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar186.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar187.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar188.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar189.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar19.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar190.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar191.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar192.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar193.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar194.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar195.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar196.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar197.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar198.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar199.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar2.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar20.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar200.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar201.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar202.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar203.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar204.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar205.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar206.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar207.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar208.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar209.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar21.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar210.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar211.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar212.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar213.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar214.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar215.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar216.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar217.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar218.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar219.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar22.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar220.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar221.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar222.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar223.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar224.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar225.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar226.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar227.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar228.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar229.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar23.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar230.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar231.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar232.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar233.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar234.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar235.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar236.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar237.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar238.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar239.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar24.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar240.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar241.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar242.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar243.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar244.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar245.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar246.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar247.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar248.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar249.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar25.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar250.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar251.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar252.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar253.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar254.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar255.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar256.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar257.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar258.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar259.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar26.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar260.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar261.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar262.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar263.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar264.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar265.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar266.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar267.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar268.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar269.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar27.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar270.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar271.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar272.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar273.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar274.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar275.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar276.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar277.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar278.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar279.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar28.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar280.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar281.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar282.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar283.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar284.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar285.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar286.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar287.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar288.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar289.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar29.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar290.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar291.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar292.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar293.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar294.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar295.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar296.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar297.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar298.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar299.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar3.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar30.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar300.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar301.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar302.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar303.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar304.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar305.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar306.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar307.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar308.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar309.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar31.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar310.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar311.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar312.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar313.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar314.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar315.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar316.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar317.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar318.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar319.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar32.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar320.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar321.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar322.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar323.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar324.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar325.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar326.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar327.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar328.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar329.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar33.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar330.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar331.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar332.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar333.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar334.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar335.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar336.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar337.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar338.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar339.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar34.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar340.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar341.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar342.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar343.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar344.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar345.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar346.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar347.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar348.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar349.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar35.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar350.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar351.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar352.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar353.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar354.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar355.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar356.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar357.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar358.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar359.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar36.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar360.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar361.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar362.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar363.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar364.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar365.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar366.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar367.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar368.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar369.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar37.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar370.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar371.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar372.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar373.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar374.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar375.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar376.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar377.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar378.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar379.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar38.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar380.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar381.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar382.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar383.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar384.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar385.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar386.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar387.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar388.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar389.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar39.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar390.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar391.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar392.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar393.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar394.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar395.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar396.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar397.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar398.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar399.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar4.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar40.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar400.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar401.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar402.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar403.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar404.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar405.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar406.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar407.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar408.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar409.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar41.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar410.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar411.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar412.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar413.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar414.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar415.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar416.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar417.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar418.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar419.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar42.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar420.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar421.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar422.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar423.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar424.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar425.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar426.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar427.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar428.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar429.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar43.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar430.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar431.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar432.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar433.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar434.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar435.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar436.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar437.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar438.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar439.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar44.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar440.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar441.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar442.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar443.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar444.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar445.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar446.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar447.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar448.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar449.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar45.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar450.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar451.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar452.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar453.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar454.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar455.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar456.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar457.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar458.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar459.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar46.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar460.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar461.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar462.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar463.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar464.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar465.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar466.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar467.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar468.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar469.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar47.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar470.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar471.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar472.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar473.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar474.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar475.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar476.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar477.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar478.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar479.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar48.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar480.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar481.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar482.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar483.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar484.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar485.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar486.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar487.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar488.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar489.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar49.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar490.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar491.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar492.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar493.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar494.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar495.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar496.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar497.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar498.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar499.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar5.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar50.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar51.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar52.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar53.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar54.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar55.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar56.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar57.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar58.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar59.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar6.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar60.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar61.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar62.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar63.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar64.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar65.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar66.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar67.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar68.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar69.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar7.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar70.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar71.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar72.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar73.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar74.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar75.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar76.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar77.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar78.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar79.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar8.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar80.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar81.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar82.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar83.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar84.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar85.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar86.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar87.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar88.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar89.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar9.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar90.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar91.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar92.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar93.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar94.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar95.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar96.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar97.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar98.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar99.gif mode change 100755 => 100644 www-ssl/pic/external.png mode change 100755 => 100644 www-ssl/pic/flag/de.gif mode change 100755 => 100644 www-ssl/pic/flag/en.gif mode change 100755 => 100644 www-ssl/pic/himmel.png mode change 100755 => 100644 www-ssl/pic/himmel_w.png mode change 100755 => 100644 www-ssl/pic/smiles/aerger2.gif mode change 100755 => 100644 www-ssl/pic/smiles/alien.gif mode change 100755 => 100644 www-ssl/pic/smiles/blush.gif mode change 100755 => 100644 www-ssl/pic/smiles/boggle.gif mode change 100755 => 100644 www-ssl/pic/smiles/bounce.gif mode change 100755 => 100644 www-ssl/pic/smiles/bun.gif mode change 100755 => 100644 www-ssl/pic/smiles/candycane.gif mode change 100755 => 100644 www-ssl/pic/smiles/cheesy.gif mode change 100755 => 100644 www-ssl/pic/smiles/dead.gif mode change 100755 => 100644 www-ssl/pic/smiles/depressed.gif mode change 100755 => 100644 www-ssl/pic/smiles/ginger.gif mode change 100755 => 100644 www-ssl/pic/smiles/hirsch1.gif mode change 100755 => 100644 www-ssl/pic/smiles/huh.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_arrow.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_biggrin.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_confused.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_cool.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_cry.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_eek.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_evil.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_exclaim.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_frown.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_idea.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_lol.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_mad.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_mrgreen.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_neutral.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_question.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_razz.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_redface.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_rolleyes.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_sad.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_smile.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_surprised.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_twisted.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_wind.gif mode change 100755 => 100644 www-ssl/pic/smiles/koenig1.gif mode change 100755 => 100644 www-ssl/pic/smiles/laser1.gif mode change 100755 => 100644 www-ssl/pic/smiles/love1.gif mode change 100755 => 100644 www-ssl/pic/smiles/moo.gif mode change 100755 => 100644 www-ssl/pic/smiles/nuts.gif mode change 100755 => 100644 www-ssl/pic/smiles/robin.gif mode change 100755 => 100644 www-ssl/pic/smiles/sheep.gif mode change 100755 => 100644 www-ssl/pic/smiles/sick.gif mode change 100755 => 100644 www-ssl/pic/smiles/sleep.gif mode change 100755 => 100644 www-ssl/pic/smiles/soppy.gif mode change 100755 => 100644 www-ssl/pic/smiles/stress.gif mode change 100755 => 100644 www-ssl/pic/smiles/sweet.gif mode change 100755 => 100644 www-ssl/pic/smiles/tired.gif mode change 100755 => 100644 www-ssl/pic/smiles/urgh.gif mode change 100755 => 100644 www-ssl/pic/smiles/winken1.gif mode change 100755 => 100644 www-ssl/pic/smiles/worm.gif mode change 100755 => 100644 www-ssl/pic/smiles/worry.gif diff --git a/DB/ChangeLog.sql b/DB/ChangeLog.sql old mode 100755 new mode 100644 index 383c897a..bfb41cb5 --- a/DB/ChangeLog.sql +++ b/DB/ChangeLog.sql @@ -18,8 +18,8 @@ DROP TABLE IF EXISTS `ChangeLog`; CREATE TABLE IF NOT EXISTS `ChangeLog` ( - `Time` timestamp(14) NOT NULL, - `UID` int(11) NOT NULL default '0', + `Time` timestamp NOT NULL, + `UID` int(11) NOT NULL default 0, `Commend` text NOT NULL, `SQLCommad` text NOT NULL -) TYPE=MyISAM; +) ENGINE=MyISAM; diff --git a/DB/Himmel.sql b/DB/Himmel.sql old mode 100755 new mode 100644 index e8edbc80..e513441c --- a/DB/Himmel.sql +++ b/DB/Himmel.sql @@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `EngelType` ( `Man` text, PRIMARY KEY (`TID`), UNIQUE KEY `Name` (`Name`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -43,23 +43,23 @@ CREATE TABLE IF NOT EXISTS `FAQ` ( `Frage` text NOT NULL, `Antwort` text NOT NULL, PRIMARY KEY (`FID`) -) TYPE=MyISAM AUTO_INCREMENT=24 ; +) ENGINE=MyISAM AUTO_INCREMENT=24 ; -- -- Daten für Tabelle `FAQ` -- -INSERT INTO `FAQ` (`FID`, `Frage`, `Antwort`) VALUES (1, 'Komme ich als Engel billiger/kostenlos auf den Congress?
\r\nDo I get in cheaper / for free to the congress as an angel ?', 'Nein, jeder Engel muss normal Eintritt bezahlen.
\r\nNo, every angel has to pay full price.'), -(2, 'Was bekomme ich für meine Mitarbeit?
\r\nWhat can i expect in return for my help? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung
\r\nEvery working angel gets a free shirt after the event. '), -(3, 'Wie lange muss ich als Engel arbeiten?
\r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es hängt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen.
\r\nThis is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend. '), -(6, 'Ich bin erst XX Jahre alt. Kann ich überhaupt helfen?
\r\nI''m only XX years old. Can I help anyway?', 'Wir können jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen.
\r\nWe need every help we can get. If your old enough to come to the congress, your old enough to help.'), -(8, 'Wer sind eigentlich die Erzengel?
\r\nWho are the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty
\r\nThe ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty\r\n'), -(9, 'Gibt es dieses Jahr wieder einen IRC-Channel für Engel?
\r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!
\r\nYes, in the IRC-net there''s #chaos-angel. Just have a look!'), -(10, 'Wie gehe ich mit den Besuchern um?
\r\nHow do I treat visitors?', 'Man soll gegenüber den Besuchern immer höflich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gefühl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterstützung holen, bevor man selbst auch gestresst wird :-)
\r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'), -(11, 'Wann sind die Engelbesprechungen?
\r\nWhen are the angels briefings?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.
\r\nThe information on the Angel Briefings will be in the news section of this system.'), -(12, 'Was muss ich noch bedenken?
\r\nAnything else I should know?', 'Man sollte nicht total übermüdet oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.
\r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'), -(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden?
\r\nI have a guestion not answered here. Who can I ask?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.
\r\nIf you have further questions, you can use the Questions for the ArchAngels form.'), -(20, 'Wer muss alles Eintritt zahlen?
\r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie älter als 12 Jahre ist...
\r\nEveryone who is at older than 12 years old.'); +INSERT INTO `FAQ` (`FID`, `Frage`, `Antwort`) VALUES (1, 'Komme ich als Engel billiger/kostenlos auf den Congress?
\r\nDo I get in cheaper / for free to the congress as an angel ?', 'Nein, jeder Engel muss normal Eintritt bezahlen.
\r\nNo, every angel has to pay full price.'), +(2, 'Was bekomme ich für meine Mitarbeit?
\r\nWhat can i expect in return for my help? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung
\r\nEvery working angel gets a free shirt after the event. '), +(3, 'Wie lange muss ich als Engel arbeiten?
\r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es hängt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen.
\r\nThis is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend. '), +(6, 'Ich bin erst XX Jahre alt. Kann ich überhaupt helfen?
\r\nI''m only XX years old. Can I help anyway?', 'Wir können jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen.
\r\nWe need every help we can get. If your old enough to come to the congress, your old enough to help.'), +(8, 'Wer sind eigentlich die Erzengel?
\r\nWho are the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty
\r\nThe ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty\r\n'), +(9, 'Gibt es dieses Jahr wieder einen IRC-Channel für Engel?
\r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!
\r\nYes, in the IRC-net there''s #chaos-angel. Just have a look!'), +(10, 'Wie gehe ich mit den Besuchern um?
\r\nHow do I treat visitors?', 'Man soll gegenüber den Besuchern immer höflich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gefühl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterstützung holen, bevor man selbst auch gestresst wird :-)
\r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'), +(11, 'Wann sind die Engelbesprechungen?
\r\nWhen are the angels briefings?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.
\r\nThe information on the Angel Briefings will be in the news section of this system.'), +(12, 'Was muss ich noch bedenken?
\r\nAnything else I should know?', 'Man sollte nicht total übermüdet oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.
\r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'), +(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden?
\r\nI have a guestion not answered here. Who can I ask?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.
\r\nIf you have further questions, you can use the Questions for the ArchAngels form.'), +(20, 'Wer muss alles Eintritt zahlen?
\r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie älter als 12 Jahre ist...
\r\nEveryone who is at older than 12 years old.'); -- -------------------------------------------------------- @@ -79,7 +79,7 @@ CREATE TABLE IF NOT EXISTS `News` ( `UID` int(11) NOT NULL default '0', `Treffen` tinyint(4) NOT NULL default '0', PRIMARY KEY (`ID`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -98,7 +98,7 @@ CREATE TABLE IF NOT EXISTS `Questions` ( `AID` int(11) NOT NULL default '0', `Answer` text NOT NULL, PRIMARY KEY (`QID`) -) TYPE=MyISAM COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ; +) ENGINE=MyISAM COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ; -- -------------------------------------------------------- @@ -118,7 +118,7 @@ CREATE TABLE IF NOT EXISTS `Room` ( `show` char(1) NOT NULL default 'Y', `Number` int(11) default NULL, PRIMARY KEY (`RID`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -137,7 +137,7 @@ CREATE TABLE IF NOT EXISTS `ShiftEntry` ( `TID` int(11) NOT NULL default '0', `UID` int(11) NOT NULL default '0', `Comment` text -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -161,7 +161,7 @@ CREATE TABLE IF NOT EXISTS `Shifts` ( `URL` text, `PSID` text, PRIMARY KEY (`SID`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -180,7 +180,7 @@ CREATE TABLE IF NOT EXISTS `Wecken` ( `Ort` text NOT NULL, `Bemerkung` text NOT NULL, PRIMARY KEY (`ID`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -201,7 +201,7 @@ CREATE TABLE IF NOT EXISTS `news_comments` ( `UID` int(11) NOT NULL default '0', PRIMARY KEY (`ID`), KEY `Refid` (`Refid`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Tabellenstruktur für Tabelle `Counter` @@ -212,7 +212,7 @@ CREATE TABLE IF NOT EXISTS `Counter` ( `URL` varchar(255) NOT NULL default '', `Anz` bigint(20) NOT NULL default '0', PRIMARY KEY (`URL`) -) TYPE=MyISAM COMMENT='Counter der Seiten'; +) ENGINE=MyISAM COMMENT='Counter der Seiten'; -- -- Tabellenstruktur für Tabelle `ShiftFreeloader` @@ -225,5 +225,5 @@ CREATE TABLE IF NOT EXISTS `ShiftFreeloader` ( `Length` int(11) NOT NULL, `Comment` text NOT NULL, PRIMARY KEY (`ID`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; diff --git a/DB/SDrohnen.sql b/DB/SDrohnen.sql old mode 100755 new mode 100644 index 8cb4fc42..a2c93fab --- a/DB/SDrohnen.sql +++ b/DB/SDrohnen.sql @@ -22,7 +22,7 @@ CREATE TABLE `Sprache` ( `Sprache` char(2) NOT NULL default 'DE', `Text` text NOT NULL, KEY `TextID` (`TextID`,`Sprache`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Daten fuer Tabelle `Sprache` diff --git a/DB/Sprache.sql b/DB/Sprache.sql old mode 100755 new mode 100644 index 76597b71..52434198 --- a/DB/Sprache.sql +++ b/DB/Sprache.sql @@ -22,7 +22,7 @@ CREATE TABLE `Sprache` ( `Sprache` char(2) NOT NULL default 'DE', `Text` text NOT NULL, KEY `TextID` (`TextID`,`Sprache`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Daten für Tabelle `Sprache` diff --git a/DB/UserPicture.sql b/DB/UserPicture.sql index 6dfbe523..095684b3 100644 --- a/DB/UserPicture.sql +++ b/DB/UserPicture.sql @@ -22,7 +22,7 @@ CREATE TABLE `UserPicture` ( `ContentType` varchar(20) NOT NULL default '', `show` char(1) NOT NULL default 'N', PRIMARY KEY (`UID`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Daten für Tabelle `UserPicture` diff --git a/default-conf/var_www_includes/config.php b/default-conf/var_www_includes/config.php old mode 100755 new mode 100644 index 574d9947..4c8237f1 --- a/default-conf/var_www_includes/config.php +++ b/default-conf/var_www_includes/config.php @@ -1,4 +1,4 @@ -MD5SED
\n". - "SHA1:
SHA1SED"; + "SHA1:
SHA1SED"; //globale const. fuer schischtplan $GlobalZeileProStunde = 4; diff --git a/default-conf/var_www_includes/config_IAX.php b/default-conf/var_www_includes/config_IAX.php index e7eca465..87c3d8ea 100644 --- a/default-conf/var_www_includes/config_IAX.php +++ b/default-conf/var_www_includes/config_IAX.php @@ -1,4 +1,4 @@ - diff --git a/includes/UserCVS.php b/includes/UserCVS.php old mode 100755 new mode 100644 index ad7e1d66..7798ee66 --- a/includes/UserCVS.php +++ b/includes/UserCVS.php @@ -1,103 +1,79 @@ $v) { + if($v == "G") + $_SESSION['CVS'][$k] = $_SESSION['CVS_Group'][$k]; + } + } -// CVS import Data -$SQL_CVS = "SELECT * FROM `UserCVS` WHERE UID=".$_SESSION['UID']; -$Erg_CVS = mysql_query($SQL_CVS, $con); -$_SESSION['CVS'] = mysql_fetch_array($Erg_CVS); + // pagename ermitteln + $Page["Name"] = basename($_SERVER['PHP_SELF']); + //recht fuer diese seite auslesen + if(isset($_SESSION['CVS'][$Page["Name"]])) + $Page["CVS"] = $_SESSION['CVS'][$Page["Name"]]; + else { + echo "SYSTEM ERROR: now right for " . $Page["Name"] . " exists."; + die; + } -// Group import Data, if nesseary -if( isset( $_SESSION['CVS'][ "GroupID" ])) -{ - $SQL_GRP = "SELECT * FROM `UserCVS` WHERE UID=".$_SESSION['CVS'][ "GroupID" ]; - $Erg_GRP = mysql_query($SQL_GRP, $con); - $_SESSION['CVS_Group'] = mysql_fetch_array($Erg_GRP); - - foreach( $_SESSION['CVS'] as $k => $v) - { - if($v=="G") // Right == Group - $_SESSION['CVS'][$k] = $_SESSION['CVS_Group'][$k]; - } -} + if($debug) { + echo "
\$_SESSION:\n";
+    print_r($_SESSION);
+    echo "
"; -//pagename ermitteln -$Page["Name"] = substr( $_SERVER['PHP_SELF'], strlen($ENGEL_ROOT) ); + if( strlen($Page["CVS"]) == 0 ) + echo "

CVS ERROR, on page '". $Page["Name"]. "'

"; + else + echo "CVS: ". $Page["Name"]. " => '". $Page["CVS"]. "'
"; + } -//recht f?r diese seite auslesen -if( isset( $_SESSION['CVS'][ $Page["Name"] ])) - $Page["CVS"] = $_SESSION['CVS'][ $Page["Name"] ]; -else -{ - echo "SYSTEM ERROR: now right for ". $Page["Name"]. "exist"; - die; -} + function funktion_isLinkAllowed($PageName) { + global $_SESSION; -if( $DEBUG ) -{ -// foreach( $_SESSION as $k => $v) -// echo "$k = $v
\n"; - echo "
\$_SESSION:\n";
-		print_r($_SESSION);
-	echo "
"; + // separate page parameter + $ParameterPos = strpos($PageName, ".php?"); - if( strlen($Page["CVS"]) == 0 ) - echo "

CVS ERROR, on page '". $Page["Name"]. "'

"; - else - echo "CVS: ". $Page["Name"]. " => '". $Page["CVS"]. "'
"; - -} + if($ParameterPos === false) + $pName = $PageName; + else + $pName = substr($PageName, 0, $ParameterPos + 4); + + // check rights + if((isset( $_SESSION['CVS'][ $pName ]) === true) && $_SESSION['CVS'][ $pName ] == "Y") + return true; -function funktion_isLinkAllowed( $PageName) -{ - global $_SESSION; + return false; + } - // separate page parameter - $ParameterPos = strpos( $PageName, ".php?"); - if( $ParameterPos === FALSE) - { - $pName = $PageName; - } - else - { - $pName = substr( $PageName, 0, $ParameterPos + 4); - } - - // check rights - if( (isset( $_SESSION['CVS'][ $pName ]) === TRUE) && - ($_SESSION['CVS'][ $pName ] == "Y") ) - { - return TRUE; - } + function funktion_isLinkAllowed_addLink_OrLinkText( $PageName, $LinkText) { + global $url, $ENGEL_ROOT; - return FALSE; -} + if(funktion_isLinkAllowed( $PageName) === true) + return "" . $LinkText . ""; + + return $LinkText; + } -function funktion_isLinkAllowed_addLink_OrLinkText( $PageName, $LinkText) -{ - global $url, $ENGEL_ROOT; + function funktion_isLinkAllowed_addLink_OrEmpty( $PageName, $LinkText) { + global $url, $ENGEL_ROOT; - if( funktion_isLinkAllowed( $PageName) === TRUE) - { - return "". $LinkText. ""; - } - - return $LinkText; -} - -function funktion_isLinkAllowed_addLink_OrEmpty( $PageName, $LinkText) -{ - global $url, $ENGEL_ROOT; - - if( funktion_isLinkAllowed( $PageName) === TRUE) - { - return "". $LinkText. ""; - } - - return ""; -} + if(funktion_isLinkAllowed( $PageName) === true) + return "" . $LinkText . ""; + return ""; + } ?> diff --git a/includes/config_MessegeServer.php b/includes/config_MessegeServer.php index 3454ae0c..ce7c7c3a 100644 --- a/includes/config_MessegeServer.php +++ b/includes/config_MessegeServer.php @@ -1,8 +1,7 @@ - diff --git a/includes/config_modem.php b/includes/config_modem.php index 0625936d..2de37cb7 100644 --- a/includes/config_modem.php +++ b/includes/config_modem.php @@ -1,11 +1,10 @@ - diff --git a/includes/crypt.php b/includes/crypt.php old mode 100755 new mode 100644 index 9707e719..d511e4f4 --- a/includes/crypt.php +++ b/includes/crypt.php @@ -1,18 +1,12 @@ diff --git a/includes/error_handler.php b/includes/error_handler.php old mode 100755 new mode 100644 index 10f27d58..5a58076b --- a/includes/error_handler.php +++ b/includes/error_handler.php @@ -1,88 +1,86 @@ $v ) - if( (strpos( "0$k", "sql") > 0) || (strpos( "0$k", "SQL") > 0)) - $Temp .= "Error Context: $k = $v\n"; + foreach ($error_context as $k => $v) + if((strpos( "0$k", "sql") > 0) || (strpos( "0$k", "SQL") > 0)) + $Temp .= "Error Context: $k = $v\n"; - if( (strpos( "0$error_string", "MySQL") > 0) ) - $Temp .= "Error MySQL: ". mysql_error($con). "\n"; - - //übergeben des arrays - array_push( $error_messages, "Error Number: $error_number\n". - "Error String: $error_string\n". - "Error File: $error_file\n". - "Error Line: $error_line\n". - (strlen($Temp)? "$Temp": "") - ); + if((strpos( "0$error_string", "MySQL") > 0)) + $Temp .= "Error MySQL: ". mysql_error($con). "\n"; + + // Uebergeben des arrays + array_push($error_messages, "Error Number: " . $error_number . "\n". + "Error String: " . $error_string . "\n". + "Error File: " . $error_file . "\n". + "Error Line: " . $error_line . "\n". + (strlen($Temp)? "$Temp": "")); } // register error handler set_error_handler("Error_Handler"); - ini_set( "error_reporting", E_ALL); - if( $DEBUG) - { - ini_set( "display_errors", "On"); - ini_set( "display_startup_errors", "On"); - ini_set( "html_errors", "On"); + error_reporting(E_ALL); + + if($debug) { + ini_set("display_errors", "On"); + ini_set("display_startup_errors", "On"); + ini_set("html_errors", "On"); } // send errors - function send_errors() - { + function send_errors() { global $error_messages; - if (!$error_messages) return; - + if(!$error_messages) + return; + $message = ""; foreach($error_messages as $value) $message .= $value."\n"; + $message .= "\n"; - - if( isset( $_POST)) - { - foreach ($_POST as $k => $v ) + + if(isset($_POST)) { + foreach ($_POST as $k => $v) $message .= "_POST: $k = ". ( $k!="password"? $v : "???..."). "\n"; + $message .= "\n"; } - - if( isset( $_GET)) - { - foreach ($_GET as $k => $v ) - $message .= "_GET: $k = $v\n"; + + if(isset($_GET)) { + foreach ($_GET as $k => $v) + $message .= "_GET: $k = $v\n"; + $message .= "\n"; } - + $message .= "\n\n"; if( isset( $_SESSION)) { - foreach ($_SESSION as $k => $v ) + foreach ($_SESSION as $k => $v ) $message .= "_SESSION: $k = $v\n"; $message .= "\n"; } if( isset( $_SESSION['CVS'])) { - foreach ($_SESSION['CVS'] as $k => $v ) + foreach ($_SESSION['CVS'] as $k => $v ) if( strlen($k)>3 ) $message .= "_SESSION['CVS']: $k = $v\n"; $message .= "\n"; } - - foreach ($_SERVER as $k => $v ) + + foreach ($_SERVER as $k => $v ) if( strpos( "0$k", "SERVER_")==0) $message .= "_SERVER: $k = $v\n"; diff --git a/includes/footer.php b/includes/footer.php old mode 100755 new mode 100644 index f65e8a7e..8f736c4d --- a/includes/footer.php +++ b/includes/footer.php @@ -1,57 +1,39 @@ - - - - - - - - -
-

- ".Get_Text("back")." "; - ?> - -

- - +
+

+ " . Get_Text("back") . " "; + ?> + +

+ + - - - - + - - - - - - - - - -
© copyleft - Kontakt -
- - + + + +
© copyleft - Kontakt +
+ + - + - - - + + diff --git a/includes/funktion_SendMessenges.php b/includes/funktion_SendMessenges.php index d71e4804..b6de67cc 100644 --- a/includes/funktion_SendMessenges.php +++ b/includes/funktion_SendMessenges.php @@ -1,18 +1,14 @@ - + diff --git a/includes/funktion_activeUser.php b/includes/funktion_activeUser.php old mode 100755 new mode 100644 index d19895a8..e214a1f9 --- a/includes/funktion_activeUser.php +++ b/includes/funktion_activeUser.php @@ -1,59 +1,57 @@ -Engel online"; + $SQL = "SELECT UID, Nick, lastLogIn " . + "FROM User " . + "WHERE (`lastLogIn` > '" . gmdate("YmdHis", time() - (60 * 60)) . "' AND NOT (UID=" . $_SESSION['UID'] . ")) " . + "ORDER BY lastLogIn DESC;"; -echo "

Engel online

"; + $Erg = mysql_query($SQL, $con); + + $Tist = (gmdate("d", time()) * 60 * 60 * 24) + // Tag + (gmdate("H", time()) * 60 * 60) + // Stunde + (gmdate("i", time()) * 60) + // Minute + (gmdate("s", time()) ); // Sekunde -$SQL = "SELECT UID, Nick, lastLogIn ". - "FROM User ". - "WHERE (`lastLogIn` > '". gmdate("YmdHis", time()-(60*60)). "' AND NOT (UID=". $_SESSION['UID']. ")) ". - "ORDER BY lastLogIn DESC;"; + echo ""; ?> diff --git a/includes/funktion_counter.php b/includes/funktion_counter.php index 70b104d4..39d65a1f 100644 --- a/includes/funktion_counter.php +++ b/includes/funktion_counter.php @@ -1,24 +1,14 @@ - diff --git a/includes/funktion_cron.php b/includes/funktion_cron.php old mode 100755 new mode 100644 index 17ac5a76..3a0e984b --- a/includes/funktion_cron.php +++ b/includes/funktion_cron.php @@ -1,144 +1,131 @@ -$v) - { - $o.= "$k=".urlencode(utf8_encode($v))."&"; - } - $post_data=substr($o,0,-1); + if($TimeM < 0) { + $TimeM += 60; + $TimeH -= 1; + } - $ch = curl_init(); - curl_setopt($ch, CURLOPT_POST, 1); - curl_setopt($ch, CURLOPT_HEADER, 0); - curl_setopt($ch, CURLOPT_URL, $url); - curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); - $result = curl_exec($ch); - echo curl_error($ch); - curl_close($ch); - } - else - { - // IAX file Schareiebn - $CallFile = $Tempdir. "/call_". date("Ymd_His"). "_$DECTnumber"; - - if($DebugDECT) echo "IAX create file for dialing Number $DECTnumber\n"; - $file = fopen( $CallFile, 'w' ); - if( $file != FALSE) - { - fputs( $file, "Channel: SIP/$DECTnumber@$IAXserver\n"); //Ziel nummer - fputs( $file, "Callerid: Engelserver\n"); - // fputs( $file, "Callerid: $IAXcontent\n"); - // fputs( $file, "Context: $DECTnumber@$IAXserver\n"); - fputs( $file, "Extension: s\n"); - fputs( $file, "MaxRetries: 1\n"); - fputs( $file, "RetryTime: 10\n"); - fputs( $file, "SetVar: msg=$Message\n"); -// fputs( $file, "SetVar: TimeH=$TimeH\n"); -// fputs( $file, "SetVar: TimeM=$TimeM\n"); -// fputs( $file, "SetVar: DECTnumber=$DECTnumber\n"); -// fputs( $file, "SetVar: Room=". RID2Room( $RID). "\n"); -// fputs( $file, "SetVar: Engeltype=". TID2Engeltype( $TID). "\n"); - fclose($file); - system( "chmod 777 ". $CallFile); - system( "mv ". $CallFile. " ". $AsteriskOutputDir); - - } - else - echo "error: $CallFile not created"; - } - } - else - if($DebugDECT) echo "IAX is disable\n"; -} + if($TimeH < 0) + $TimeH += 24; + + if(strlen( $TimeH) == 1) + $TimeH = "0" . $TimeH; + + if($IAXenable) { + $Message = "die-nee shisht beh-kinned, in where-neegin me-nooten . . . your shift beginns in a few minutes"; -function DialNumberModem( $DECTnumber, $Time) -{ - global $AnrufDelay; - - //Parameter verarbeiten - $TimeH = substr( $Time, 11, 2); - $TimeM = substr( $Time, 14, 2); - $TimeM = substr( $Time, 14, 2) + $AnrufDelay; - if( $TimeM < 0 ) - { - $TimeM += 60; - $TimeH -= 1; - } - if( $TimeH < 0 ) - $TimeH += 24; - - if( strlen( $TimeH) == 1) - $TimeH = "0".$TimeH; - - SetWackeup( $DECTnumber, $TimeH, $TimeM); -} + if(isset($SetHttpIAX)) { + $post_data = array(); + $post_data['code'] = "89o8eu9cg4"; + $post_data['callerid'] = "1023"; + $post_data['nr'] = "$DECTnumber"; + //$post_data['message'] = "Deine schicht beginnt in ein paar minuten . . . your shift beginns in a few minutes "; + $post_data['message'] = "die-nee shisht beh-kinned , in where-neegin me-nooten . . . your shift beginns in a few minutes "; + $url = "https://23c3.eventphone.de/~bef/call.php"; -return 0; + $o = ""; + foreach ($post_data as $k => $v) { + $o.= "$k=" . urlencode(utf8_encode($v)) . "&"; + } + $post_data = substr($o, 0, -1); + + $ch = curl_init(); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_HEADER, 0); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + $result = curl_exec($ch); + echo curl_error($ch); + curl_close($ch); + } else { + // IAX file Schareiebn + $CallFile = $Tempdir. "/call_". date("Ymd_His"). "_$DECTnumber"; + + if($DebugDECT) + echo "IAX create file for dialing Number $DECTnumber\n"; + + $file = fopen( $CallFile, 'w'); + + if($file != false) { + fputs($file, "Channel: SIP/$DECTnumber@$IAXserver\n"); + fputs($file, "Callerid: Engelserver\n"); + fputs($file, "Extension: s\n"); + fputs($file, "MaxRetries: 1\n"); + fputs($file, "RetryTime: 10\n"); + fputs($file, "SetVar: msg=$Message\n"); + fclose($file); + system("chmod 777 " . $CallFile); + system("mv " . $CallFile . " " . $AsteriskOutputDir); + } else + echo "error: $CallFile not created"; + } + } else + if($DebugDECT) + echo "IAX is disable\n"; + } + + function DialNumberModem($DECTnumber, $Time) { + global $AnrufDelay; + + // Parameter verarbeiten + $TimeH = substr($Time, 11, 2); + $TimeM = substr($Time, 14, 2); + $TimeM = substr($Time, 14, 2) + $AnrufDelay; + + if($TimeM < 0) { + $TimeM += 60; + $TimeH -= 1; + } + + if($TimeH < 0) + $TimeH += 24; + + if(strlen( $TimeH) == 1) + $TimeH = "0" . $TimeH; + + SetWackeup($DECTnumber, $TimeH, $TimeM); + } ?> - diff --git a/includes/funktion_db.php b/includes/funktion_db.php index cbfb198f..160a9c59 100644 --- a/includes/funktion_db.php +++ b/includes/funktion_db.php @@ -1,149 +1,145 @@ -"; - $Diff .= ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - $Diff .= "". mysql_field_name($Erg, $m). ""; - $Diff .= ""; - - for ($n = 0 ; $n < $Zeilen ; $n++) - { - $Diff .= ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - $Diff .= "".mysql_result($Erg, $n, $m). ""; - $Diff .= ""; - } - $Diff .= ""; - return $Diff; - } - - function db_querry_getDatenAssocArray($SQL) - { - global $con; - - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); - - $Daten = array(); - for( $i=0; $i $Data1) - { - if( isset( $Daten2[$DataKey])) - { - $Data2 = $Daten2[$DataKey]; - foreach($Data1 as $key => $value) - if( $value != $Data2[$key]) - { - $Gefunden=TRUE; - $Diff .= "\n\t$key\n\t$value\n\t".$Data2[$key]."\n"; - } - } - else - foreach($Data1 as $key => $value) - { - $Gefunden=TRUE; - $Diff .= "\n\t$key\n\t$value\n\t\n"; - } - } - $Diff .= "\n"; - - if( $Gefunden) - return $Diff; - else - return "\nno changes Fount\n"; - } - - function db_query( $SQL, $comment) - { - global $con, $Page; - $Diff = ""; - - //commed anlyse udn daten sicherung - if( strpos( "#$SQL", "UPDATE") > 0) - { - //Tabellen name ermitteln - $Table_Start = strpos( $SQL, "`"); - $Table_End = strpos( $SQL, "`", $Table_Start+1); - $Table = substr( $SQL, $Table_Start, ($Table_End-$Table_Start+1)); - - //SecureTest - if( $Table_Start == 0 || $Table_End == 0) die("

funktion_db ERROR SQL: '$SQL' nicht OK

"); - - //WHERE ermitteln - $Where_Start = strpos( $SQL, "WHERE"); - $Where = substr( $SQL, $Where_Start); - if( $Where_Start == 0) $Where = ";"; - - if( strlen( $Where) < 2) - { - $Diff = "can't show, too mutch data (no filter was set)"; - $querry_erg = mysql_query($SQL, $con); - } - else - { - $Daten1 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where"); - $querry_erg = mysql_query($SQL, $con); - $Daten2 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where"); - $Diff = db_querry_diffDaten($Daten1, $Daten2); - } - } - elseif( strpos( "#$SQL", "DELETE") > 0) - { - $TableWhere = substr( $SQL, 6); - $Diff .= Ausgabe_Daten( "SELECT * $TableWhere"); + $Zeilen = mysql_num_rows($Erg); + $Anzahl_Felder = mysql_num_fields($Erg); - //execute command - $querry_erg = mysql_query($SQL, $con); - } - elseif( strpos( "#$SQL", "INSERT") > 0) - { - //execute command - $querry_erg = mysql_query($SQL, $con); - } - else - { - //execute command - $querry_erg = mysql_query($SQL, $con); - } + $Diff = ""; + $Diff .= ""; - $SQLCommand = "SQL:
". htmlentities( $SQL, ENT_QUOTES); - if( strlen($Diff) > 0) - $SQLCommand .= "

Diff:
$Diff"; + for ($m = 0 ; $m < $Anzahl_Felder ; $m++) + $Diff .= ""; - $Commend = htmlentities( ($Page["Name"]. ": ". $comment), ENT_QUOTES); - //LOG commands in DB - $SQL_SEC = "INSERT INTO `ChangeLog` ( `UID` , `SQLCommad` , `Commend` ) ". - " VALUES ( '". $_SESSION['UID']. "', ". - "'". mysql_escape_string( $SQLCommand). "', ". - "'". mysql_escape_string( $Commend). "' );"; - $erg = mysql_query($SQL_SEC, $con); - echo mysql_error($con); - return $querry_erg; - }//function db_query( + $Diff .= ""; + + for ($n = 0 ; $n < $Zeilen ; $n++) { + $Diff .= ""; + + for ($m = 0 ; $m < $Anzahl_Felder ; $m++) + $Diff .= ""; + + $Diff .= ""; + } + + $Diff .= "
". mysql_field_name($Erg, $m). "
".mysql_result($Erg, $n, $m). "
"; + return $Diff; + } + + function db_querry_getDatenAssocArray($SQL) { + global $con; + + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); + + $Daten = array(); + + for( $i=0; $i $Data1) { + if(isset( $Daten2[$DataKey])) { + $Data2 = $Daten2[$DataKey]; + + foreach($Data1 as $key => $value) + if( $value != $Data2[$key]) { + $Gefunden = true; + $Diff .= "\n\t$key\n\t$value\n\t" . $Data2[$key] . "\n"; + } + } else + foreach($Data1 as $key => $value) { + $Gefunden = true; + $Diff .= "\n\t$key\n\t$value\n\t\n"; + } + } + + $Diff .= "\n"; + + if($Gefunden) + return $Diff; + else + return "\nno changes Fount\n"; + } + + function db_query( $SQL, $comment) { + global $con, $Page; + $Diff = ""; + + // commed anlyse udn daten sicherung + if(strpos("#$SQL", "UPDATE") > 0) { + // Tabellen name ermitteln + $Table_Start = strpos( $SQL, "`"); + $Table_End = strpos( $SQL, "`", $Table_Start+1); + $Table = substr( $SQL, $Table_Start, ($Table_End-$Table_Start+1)); + + //SecureTest + if( $Table_Start == 0 || $Table_End == 0) die("

funktion_db ERROR SQL: '$SQL' nicht OK

"); + + //WHERE ermitteln + $Where_Start = strpos( $SQL, "WHERE"); + $Where = substr( $SQL, $Where_Start); + if( $Where_Start == 0) $Where = ";"; + + if( strlen( $Where) < 2) + { + $Diff = "can't show, too mutch data (no filter was set)"; + $querry_erg = mysql_query($SQL, $con); + } + else + { + $Daten1 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where"); + $querry_erg = mysql_query($SQL, $con); + $Daten2 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where"); + $Diff = db_querry_diffDaten($Daten1, $Daten2); + } + } + elseif( strpos( "#$SQL", "DELETE") > 0) + { + $TableWhere = substr( $SQL, 6); + $Diff .= Ausgabe_Daten( "SELECT * $TableWhere"); + + //execute command + $querry_erg = mysql_query($SQL, $con); + } + elseif( strpos( "#$SQL", "INSERT") > 0) + { + //execute command + $querry_erg = mysql_query($SQL, $con); + } + else + { + //execute command + $querry_erg = mysql_query($SQL, $con); + } + + $SQLCommand = "SQL:
". htmlentities( $SQL, ENT_QUOTES); + if( strlen($Diff) > 0) + $SQLCommand .= "

Diff:
$Diff"; + + $Commend = htmlentities( ($Page["Name"]. ": ". $comment), ENT_QUOTES); + //LOG commands in DB + $SQL_SEC = "INSERT INTO `ChangeLog` ( `UID` , `SQLCommad` , `Commend` ) ". + " VALUES ( '". $_SESSION['UID']. "', ". + "'". mysql_escape_string( $SQLCommand). "', ". + "'". mysql_escape_string( $Commend). "' );"; + $erg = mysql_query($SQL_SEC, $con); + echo mysql_error($con); + return $querry_erg; + }//function db_query( } ?> diff --git a/includes/funktion_db_list.php b/includes/funktion_db_list.php old mode 100755 new mode 100644 index 9393e97e..1131ffd3 --- a/includes/funktion_db_list.php +++ b/includes/funktion_db_list.php @@ -1,67 +1,65 @@ -"; + echo "DB: $Table_Name"; - echo ""; - echo ""; + echo ""; + for ($m = 0 ; $m < $Anzahl_Felder ; $m++) + { + echo ""; + } + echo ""; - echo ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - { - echo ""; - } - echo ""; - - for ($n = 0 ; $n < $Zeilen ; $n++) - { - echo ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - { - echo ""; - } - echo ""; - } - echo "
DB: $Table_Name
". mysql_field_name($Erg, $m). "
". mysql_field_name($Erg, $m). "
".mysql_result($Erg, $n, $m). "
"; + for ($n = 0 ; $n < $Zeilen ; $n++) + { + echo ""; + for ($m = 0 ; $m < $Anzahl_Felder ; $m++) + { + echo "".mysql_result($Erg, $n, $m). ""; + } + echo ""; + } + echo ""; } function funktion_db_element_list_2row( $TopicName, $SQL) { - global $con; + global $con; - echo "\n"; - echo ""; -# echo "\t\n"; + echo "
$TopicName

$TopicName
\n"; + echo ""; +# echo "\t\n"; - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); - - echo ""; - for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) - { - echo ""; - } - echo ""; + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); + + echo ""; + for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) + { + echo ""; + } + echo ""; - for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) - { - echo ""; - for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) - { - echo ""; - } - echo ""; - } - echo "
$TopicName

$TopicName
". mysql_field_name($Erg, $m). "
". mysql_field_name($Erg, $m). "
".mysql_result($Erg, $n, $m). "
\n"; + for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) + { + echo ""; + for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) + { + echo "".mysql_result($Erg, $n, $m). ""; + } + echo ""; + } + echo "\n"; } ?> diff --git a/includes/funktion_faq.php b/includes/funktion_faq.php old mode 100755 new mode 100644 index 641ea38d..e9f09e7c --- a/includes/funktion_faq.php +++ b/includes/funktion_faq.php @@ -1,12 +1,10 @@ - diff --git a/includes/funktion_flag.php b/includes/funktion_flag.php index 56d8a993..b6a02242 100644 --- a/includes/funktion_flag.php +++ b/includes/funktion_flag.php @@ -1,12 +1,9 @@ -"; - -if( strpos( $_SERVER["REQUEST_URI"], "?") >0) - $URL = $_SERVER["REQUEST_URI"]. "&SetLanguage="; -else - $URL = $_SERVER["REQUEST_URI"]. "?SetLanguage="; - -echo "\"DE\" "; -echo "\"EN\" "; + 0) + $URL = $_SERVER["REQUEST_URI"] . "&SetLanguage="; + else + $URL = $_SERVER["REQUEST_URI"] . "?SetLanguage="; + echo "\"DE\" "; + echo "\"EN\" "; ?> diff --git a/includes/funktion_jabber.php b/includes/funktion_jabber.php old mode 100755 new mode 100644 diff --git a/includes/funktion_lang.php b/includes/funktion_lang.php old mode 100755 new mode 100644 index d5d3e144..e04dd8eb --- a/includes/funktion_lang.php +++ b/includes/funktion_lang.php @@ -1,35 +1,28 @@ - diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php old mode 100755 new mode 100644 index 87196ede..c751c764 --- a/includes/funktion_menu.php +++ b/includes/funktion_menu.php @@ -1,44 +1,41 @@ -". Get_Text("$MenuName/"). "
    "; - //Überschift - $Text = "

    ". Get_Text("$MenuName/"). "

    "; - - //einträge - foreach( $_SESSION['CVS'] as $Key => $Entry ) - if( strpos( $Key, ".php") > 0) - if( (strpos( "00$Key", "0$MenuName") > 0) || - ((strlen($MenuName)==0) && (strpos( "0$Key", "/") == 0) ) ) - { - $TempName = Get_Text($Key, TRUE); - if(( TRUE||$DEBUG) && (strlen($TempName)==0) ) - $TempName = "not found: \"$Key\""; - - if( $Entry == "Y") - { - //zum absichtlkichen ausblenden von einträgen - if( strlen($TempName)>1) - { - //sonderfälle: - if( $Key=="admin/faq.php") - $TempName .= " (". noAnswer(). ")"; - //ausgabe - $Text .= "\t\t\t
  • $TempName
    • \n"; - $Gefunden = TRUE; - } - } - elseif( $DEBUG ) - { - $Gefunden = TRUE; - $Text .= "\t\t\t
  • $TempName ($Key)
    • \n"; - } - } - if( $Gefunden) - echo $MenueTableStart.$Text.$MenueTableEnd; + // Eintraege + foreach($_SESSION['CVS'] as $Key => $Entry) + if( strpos( $Key, ".php") > 0) + if( (strpos( "00$Key", "0$MenuName") > 0) || + ((strlen($MenuName)==0) && (strpos( "0$Key", "/") == 0) ) ) { + $TempName = Get_Text($Key, true); + + if(( true||$debug) && (strlen($TempName)==0) ) + $TempName = "not found: \"$Key\""; + + if( $Entry == "Y") { + //zum absichtlkichen ausblenden von einträgen + if( strlen($TempName)>1) { + //sonderfälle: + + if( $Key=="admin/faq.php") + $TempName .= " (". noAnswer(). ")"; + //ausgabe + $Text .= "\t\t\t
  • $TempName
    • \n"; + $Gefunden = true; + } + } + elseif( $debug ) + { + $Gefunden = true; + $Text .= "\t\t\t
  • $TempName ($Key)
    • \n"; + } + } + if( $Gefunden) + echo $MenueTableStart.$Text.$MenueTableEnd; }//function ShowMenue ?> diff --git a/includes/funktion_modem.php b/includes/funktion_modem.php old mode 100755 new mode 100644 index 3a74e0f8..8e93ebf4 --- a/includes/funktion_modem.php +++ b/includes/funktion_modem.php @@ -1,35 +1,34 @@ -$Number' was called
    \n"; - $fp = fopen( $ModemDev, "w"); - sleep(1); - fwrite( $fp, "+++"); - sleep(1); - fwrite( $fp, "ATZ\n"); - sleep(1); - fwrite( $fp, "ATX1\n"); - sleep(1); - fwrite( $fp, "ATD $Number \n"); - sleep(8); - fclose($fp); - sleep(1); - } - else - echo "Modem is Disable, number: '$Number' was not called
    \n"; + if($ModemEnable) { + echo "Dial number: '$Number' was called
    \n"; + + $fp = fopen( $ModemDev, "w"); + sleep(1); + fwrite( $fp, "+++"); + sleep(1); + fwrite( $fp, "ATZ\n"); + sleep(1); + fwrite( $fp, "ATX1\n"); + sleep(1); + fwrite( $fp, "ATD $Number \n"); + sleep(8); + fclose($fp); + sleep(1); + } + else + echo "Modem is Disable, number: '$Number' was not called
    \n"; } function SetWackeup( $Number, $TimeH, $TimeM) { - global $WackupNumber; - DialNumber( "$WackupNumber$TimeH$TimeM$Number"); + global $WakeupNumber; + DialNumber( "$WakeupNumber$TimeH$TimeM$Number"); } ?> diff --git a/includes/funktion_schichtplan.php b/includes/funktion_schichtplan.php old mode 100755 new mode 100644 index 0b5b9910..afa79144 --- a/includes/funktion_schichtplan.php +++ b/includes/funktion_schichtplan.php @@ -2,181 +2,181 @@ /*####################################################### -# gibt die engelschischten aus # +# gibt die engelschischten aus # #######################################################*/ function ausgabe_Feld_Inhalt( $SID, $Man ) { // gibt, nach übergabe der der SchichtID (SID) und der RaumBeschreibung, // die eingetragenden und und offenden Schichteintäge zurück - global $EngelType, $EngelTypeID, $TID2Name, $con, $DEBUG, $gmdateOffset; + global $EngelType, $EngelTypeID, $TID2Name, $con, $debug, $gmdateOffset; - $Spalten = ""; + $Spalten = ""; - if( !isset($_GET["Icon"])) - $_GET["Icon"]=1; + if( !isset($_GET["Icon"])) + $_GET["Icon"]=1; - /////////////////////////////////////////////////////////////////// - // Schow Admin Page - /////////////////////////////////////////////////////////////////// - $Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( - "admin/schichtplan.php?action=change&SID=$SID", - "edit
    \n\t\t"); + /////////////////////////////////////////////////////////////////// + // Schow Admin Page + /////////////////////////////////////////////////////////////////// + $Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( + "admin/schichtplan.php?action=change&SID=$SID", + "edit
    \n\t\t"); - /////////////////////////////////////////////////////////////////// - // Ausgabe des Schischtnamens - /////////////////////////////////////////////////////////////////// - $SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');"; - $Erg = mysql_query($SQL, $con); - if( mysql_result($Erg, 0, 0) != "") - $Spalten.="$Man:
    "; - else - $Spalten.="".$Man.":
    "; + /////////////////////////////////////////////////////////////////// + // Ausgabe des Schischtnamens + /////////////////////////////////////////////////////////////////// + $SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');"; + $Erg = mysql_query($SQL, $con); + if( mysql_result($Erg, 0, 0) != "") + $Spalten.="$Man:
    "; + else + $Spalten.="".$Man.":
    "; - /////////////////////////////////////////////////////////////////// - // SQL abfrage für die benötigten schichten - /////////////////////////////////////////////////////////////////// - $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;"; - $Erg = mysql_query($SQL, $con); - - $Anzahl = mysql_num_rows($Erg); - $Feld=0; - $Temp_TID_old=-1; - for( $i = 0; $i < $Anzahl; $i++ ) - { - if( isset($Temp[$Feld]["TID"])) - $Temp_TID_old = $Temp[$Feld]["TID"]; - if( isset($Temp[$Feld]["UID"])) - $Temp_UID_old = $Temp[$Feld]["UID"]; - - $Temp_TID = mysql_result($Erg, $i, "TID"); - - // wenn sich der Type ändert wird zumnästen feld geweckselt - if( $Temp_TID_old != $Temp_TID ) - $Feld++; - - $Temp[$Feld]["TID"] = $Temp_TID; - $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID"); - - // sonderfall ersten durchlauf - if( $i == 0 ) - { - $Temp_TID_old = $Temp[$Feld]["TID"]; - $Temp_UID_old = $Temp[$Feld]["UID"]; - } - - // ist es eine zu vergeben schicht? - if( $Temp[$Feld]["UID"] == 0 ) - { - if( isset($Temp[$Feld]["free"])) - $Temp[$Feld]["free"]++; - else - $Temp[$Feld]["free"]=1; - } - else - $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"]; - } // FOR - + /////////////////////////////////////////////////////////////////// + // SQL abfrage für die benötigten schichten + /////////////////////////////////////////////////////////////////// + $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;"; + $Erg = mysql_query($SQL, $con); + + $Anzahl = mysql_num_rows($Erg); + $Feld=0; + $Temp_TID_old=-1; + for( $i = 0; $i < $Anzahl; $i++ ) + { + if( isset($Temp[$Feld]["TID"])) + $Temp_TID_old = $Temp[$Feld]["TID"]; + if( isset($Temp[$Feld]["UID"])) + $Temp_UID_old = $Temp[$Feld]["UID"]; + + $Temp_TID = mysql_result($Erg, $i, "TID"); + + // wenn sich der Type ändert wird zumnästen feld geweckselt + if( $Temp_TID_old != $Temp_TID ) + $Feld++; + + $Temp[$Feld]["TID"] = $Temp_TID; + $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID"); + + // sonderfall ersten durchlauf + if( $i == 0 ) + { + $Temp_TID_old = $Temp[$Feld]["TID"]; + $Temp_UID_old = $Temp[$Feld]["UID"]; + } + + // ist es eine zu vergeben schicht? + if( $Temp[$Feld]["UID"] == 0 ) + { + if( isset($Temp[$Feld]["free"])) + $Temp[$Feld]["free"]++; + else + $Temp[$Feld]["free"]=1; + } + else + $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"]; + } // FOR + - /////////////////////////////////////////////////////////////////// - // Aus gabe der Schicht - /////////////////////////////////////////////////////////////////// - if( isset($Temp)) - if( count($Temp) ) - foreach( $Temp as $TempEntry => $TempValue ) - { - if( !isset($TempValue["free"])) - $TempValue["free"] = 0; - - // ausgabe EngelType - $Spalten.= $EngelTypeID[ $TempValue["TID"] ]. " "; - - // ausgabe Eingetragener Engel - if( isset($TempValue["Engel"])) - if( count($TempValue["Engel"]) > 0 ) - { - if( count($TempValue["Engel"]) == 1 ) - $Spalten.= Get_Text("inc_schicht_ist"). ":
    \n\t\t"; - else - $Spalten.= Get_Text("inc_schicht_sind"). ":
    \n\t\t"; - - foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID ) - { - if( funktion_isLinkAllowed( "admin/user.php") === TRUE) - { - // add color, wenn Engel "Gekommen" - $TempText= - ((UIDgekommen( $TempEngelID ) == "1") - ? "" - : ""). - UID2Nick( $TempEngelID). ""; - } - else - { - $TempText = UID2Nick( $TempEngelID ); - } - - // add link to user - $TempText= funktion_isLinkAllowed_addLink_OrLinkText( - "admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal", - $TempText); - - $Spalten.= "  ". $TempText. - ( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): ""). - "
    \n\t\t"; + /////////////////////////////////////////////////////////////////// + // Aus gabe der Schicht + /////////////////////////////////////////////////////////////////// + if( isset($Temp)) + if( count($Temp) ) + foreach( $Temp as $TempEntry => $TempValue ) + { + if( !isset($TempValue["free"])) + $TempValue["free"] = 0; + + // ausgabe EngelType + $Spalten.= $EngelTypeID[ $TempValue["TID"] ]. " "; + + // ausgabe Eingetragener Engel + if( isset($TempValue["Engel"])) + if( count($TempValue["Engel"]) > 0 ) + { + if( count($TempValue["Engel"]) == 1 ) + $Spalten.= Get_Text("inc_schicht_ist"). ":
    \n\t\t"; + else + $Spalten.= Get_Text("inc_schicht_sind"). ":
    \n\t\t"; + + foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID ) + { + if( funktion_isLinkAllowed( "admin/user.php") === TRUE) + { + // add color, wenn Engel "Gekommen" + $TempText= + ((UIDgekommen( $TempEngelID ) == "1") + ? "" + : ""). + UID2Nick( $TempEngelID). ""; + } + else + { + $TempText = UID2Nick( $TempEngelID ); + } + + // add link to user + $TempText= funktion_isLinkAllowed_addLink_OrLinkText( + "admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal", + $TempText); + + $Spalten.= "  ". $TempText. + ( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): ""). + "
    \n\t\t"; - } - $Spalten = substr( $Spalten, 0, strlen($Spalten)-7 ); - } - - // ausgabe benötigter Engel - //////////////////////////// - //in vergangenheit - $SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '". - gmdate("Y-m-d H:i:s", time()+ $gmdateOffset). "')"; - $Ergtime = mysql_query($SQLtime, $con); - if( mysql_num_rows( $Ergtime) > 0) - { - //wenn keien rechte definiert sind - if( !isset($_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ])) - $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] = "Y"; + } + $Spalten = substr( $Spalten, 0, strlen($Spalten)-7 ); + } + + // ausgabe benötigter Engel + //////////////////////////// + //in vergangenheit + $SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '". + gmdate("Y-m-d H:i:s", time()+ $gmdateOffset). "')"; + $Ergtime = mysql_query($SQLtime, $con); + if( mysql_num_rows( $Ergtime) > 0) + { + //wenn keien rechte definiert sind + if( !isset($_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ])) + $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] = "Y"; - if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y") - if( $TempValue["free"] > 0 ) - { - $Spalten.= "
    \n\t\t  "; - $Spalten.= $TempValue["free"]; - if( $TempValue["free"] != 1 ) - $Spalten.= Get_Text("inc_schicht_weitere"). - " ".Get_Text("inc_schicht_Engel"). - Get_Text("inc_schicht_wird"); - else - $Spalten.= Get_Text("inc_schicht_weiterer"). - " ".Get_Text("inc_schicht_Engel"). - Get_Text("inc_schicht_werden"); - $Spalten.= Get_Text("inc_schicht_noch_gesucht"); - $Spalten.= ""; - } - } - else - { - if( isset($TempValue["free"])) - if( $TempValue["free"] > 0 ) - $Spalten.= "
    \n\t\t  

    Fehlen noch: ". - $TempValue["free"]. "

    "; - } - $Spalten.= "
    \n\t\t"; - - } // FOREACH - return $Spalten; + if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y") + if( $TempValue["free"] > 0 ) + { + $Spalten.= "
    \n\t\t  "; + $Spalten.= $TempValue["free"]; + if( $TempValue["free"] != 1 ) + $Spalten.= Get_Text("inc_schicht_weitere"). + " ".Get_Text("inc_schicht_Engel"). + Get_Text("inc_schicht_wird"); + else + $Spalten.= Get_Text("inc_schicht_weiterer"). + " ".Get_Text("inc_schicht_Engel"). + Get_Text("inc_schicht_werden"); + $Spalten.= Get_Text("inc_schicht_noch_gesucht"); + $Spalten.= ""; + } + } + else + { + if( isset($TempValue["free"])) + if( $TempValue["free"] > 0 ) + $Spalten.= "
    \n\t\t  

    Fehlen noch: ". + $TempValue["free"]. "

    "; + } + $Spalten.= "
    \n\t\t"; + + } // FOREACH + return $Spalten; } // function Ausgabe_Feld_Inhalt /*####################################################### -# gibt die engelschischten Druckergerecht aus # +# gibt die engelschischten Druckergerecht aus # #######################################################*/ function Ausgabe_Feld_Inhalt_Druck($RID, $Man ) { @@ -190,200 +190,200 @@ function Ausgabe_Feld_Inhalt_Druck($RID, $Man ) /*####################################################### -# Ausgabe der Raum Spalten # +# Ausgabe der Raum Spalten # #######################################################*/ function CreateRoomShifts( $raum ) { - global $Spalten, $ausdatum, $con, $DEBUG, $GlobalZeileProStunde, $error_messages; - - ///////////////////////////////////////////////////////////// - // beginnt die erste schicht vor dem heutigen tag und geht darüber hinaus - ///////////////////////////////////////////////////////////// - $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND ". - "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; - $ErgSonder = mysql_query($SQLSonder, $con); - if( (mysql_num_rows( $ErgSonder) > 1) ) - { - if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE ) - { - echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; - for( $i=0; $i". - mysql_result($ErgSonder, $i, "DateS"). - " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)". - "
    \n\t\t"; - } - } - } - elseif( (mysql_num_rows( $ErgSonder) == 1) ) - { - $Spalten[0].= "\t\t\n". - "\t\t\t

    ↑↑↑

    ". - Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), - mysql_result($ErgSonder, 0, "Man") ). - "\t\t\t

    ↓↓↓

    ". - "\n\t\t\n"; - return; - } - - $ZeitZeiger = 0; + global $Spalten, $ausdatum, $con, $debug, $GlobalZeileProStunde, $error_messages; + + ///////////////////////////////////////////////////////////// + // beginnt die erste schicht vor dem heutigen tag und geht darüber hinaus + ///////////////////////////////////////////////////////////// + $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ". + "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND ". + "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; + $ErgSonder = mysql_query($SQLSonder, $con); + if( (mysql_num_rows( $ErgSonder) > 1) ) + { + if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE ) + { + echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; + for( $i=0; $i". + mysql_result($ErgSonder, $i, "DateS"). + " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)". + "
    \n\t\t"; + } + } + } + elseif( (mysql_num_rows( $ErgSonder) == 1) ) + { + $Spalten[0].= "\t\t\n". + "\t\t\t

    ↑↑↑

    ". + Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), + mysql_result($ErgSonder, 0, "Man") ). + "\t\t\t

    ↓↓↓

    ". + "\n\t\t\n"; + return; + } + + $ZeitZeiger = 0; - ///////////////////////////////////////////////////////////// - // beginnt die erste schicht vor dem heutigen tag? - ///////////////////////////////////////////////////////////// - $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND ". - "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; - $ErgSonder = mysql_query($SQLSonder, $con); - if( (mysql_num_rows( $ErgSonder) > 1) ) - { - if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE ) - { - echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; - for( $i=0; $i". - mysql_result($ErgSonder, $i, "DateS"). - " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)". - "
    \n\t\t"; - } - } - } - elseif( (mysql_num_rows( $ErgSonder) == 1) ) - { - $ZeitZeiger = substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+ - (substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60); - $Spalten[0].= "\t\t\n". - "\t\t\t

    ↑↑↑

    ". - Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), - mysql_result($ErgSonder, 0, "Man") ). - "\n\t\t\n"; - } - - ///////////////////////////////////////////////////////////// - // gibt die schichten für den tag aus - ///////////////////////////////////////////////////////////// - $SQL = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') and ". - "(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and ". - "(`DateS` like '$ausdatum%')) ORDER BY `DateS`;"; - $Erg = mysql_query($SQL, $con); - for( $i = 0; $i < mysql_num_rows($Erg); ++$i ) - { - $ZeitPos = substr( mysql_result($Erg, $i, "DateS"), 11, 2 )+ - (substr( mysql_result($Erg, $i, "DateS"), 14, 2 ) / 60); - $len = mysql_result($Erg, $i, "Len"); + ///////////////////////////////////////////////////////////// + // beginnt die erste schicht vor dem heutigen tag? + ///////////////////////////////////////////////////////////// + $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ". + "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND ". + "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; + $ErgSonder = mysql_query($SQLSonder, $con); + if( (mysql_num_rows( $ErgSonder) > 1) ) + { + if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE ) + { + echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; + for( $i=0; $i". + mysql_result($ErgSonder, $i, "DateS"). + " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)". + "
    \n\t\t"; + } + } + } + elseif( (mysql_num_rows( $ErgSonder) == 1) ) + { + $ZeitZeiger = substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+ + (substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60); + $Spalten[0].= "\t\t\n". + "\t\t\t

    ↑↑↑

    ". + Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), + mysql_result($ErgSonder, 0, "Man") ). + "\n\t\t\n"; + } + + ///////////////////////////////////////////////////////////// + // gibt die schichten für den tag aus + ///////////////////////////////////////////////////////////// + $SQL = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ". + "WHERE ((`RID` = '$raum') and ". + "(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and ". + "(`DateS` like '$ausdatum%')) ORDER BY `DateS`;"; + $Erg = mysql_query($SQL, $con); + for( $i = 0; $i < mysql_num_rows($Erg); ++$i ) + { + $ZeitPos = substr( mysql_result($Erg, $i, "DateS"), 11, 2 )+ + (substr( mysql_result($Erg, $i, "DateS"), 14, 2 ) / 60); + $len = mysql_result($Erg, $i, "Len"); - if( $len <= 0) - array_push( $error_messages, "Error in shift denition SID=". mysql_result($Erg, $i, "SID"). " Len=$len"); - - if( $ZeitZeiger < $ZeitPos ) - { - $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= - "\t\t \n"; + if( $len <= 0) + array_push( $error_messages, "Error in shift denition SID=". mysql_result($Erg, $i, "SID"). " Len=$len"); + + if( $ZeitZeiger < $ZeitPos ) + { + $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= + "\t\t \n"; - $ZeitZeiger += $ZeitPos - $ZeitZeiger; - } - if($ZeitZeiger == $ZeitPos ) - { - //sonderfall wenn die schicht über dei 24 stunden hinaus geht - // (eintrag abkürzen, pfeiel ausgeben) - $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= - "\t\t\n". - "\t\t\t". - Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), - mysql_result($Erg, $i, "Man") ). - (( ($ZeitZeiger+$len) > 24)? "\t\t\t

    ↓↓↓

    " : ""). - "\n\t\t\n"; - $ZeitZeiger += $len; - } - else - { - echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; - echo "". - mysql_result($Erg, $i, "DateS"). - " '". mysql_result($Erg, $i, "Man"). "' ". - " (". mysql_result($Erg, $i, "SID"). " R$raum) (xx-xx)

    "; - } - } - if( $ZeitZeiger < 24 ) - $Spalten[($ZeitZeiger * $GlobalZeileProStunde)].= - "\t\t \n"; + $ZeitZeiger += $ZeitPos - $ZeitZeiger; + } + if($ZeitZeiger == $ZeitPos ) + { + //sonderfall wenn die schicht über dei 24 stunden hinaus geht + // (eintrag abkürzen, pfeiel ausgeben) + $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= + "\t\t\n". + "\t\t\t". + Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), + mysql_result($Erg, $i, "Man") ). + (( ($ZeitZeiger+$len) > 24)? "\t\t\t

    ↓↓↓

    " : ""). + "\n\t\t\n"; + $ZeitZeiger += $len; + } + else + { + echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; + echo "". + mysql_result($Erg, $i, "DateS"). + " '". mysql_result($Erg, $i, "Man"). "' ". + " (". mysql_result($Erg, $i, "SID"). " R$raum) (xx-xx)

    "; + } + } + if( $ZeitZeiger < 24 ) + $Spalten[($ZeitZeiger * $GlobalZeileProStunde)].= + "\t\t \n"; } // function CreateRoomShifts /*####################################################### -# Ausgabe der freien schichten # +# Ausgabe der freien schichten # #######################################################*/ function showEmptyShifts( ) { - global $con, $DEBUG, $RoomID, $gmdateOffset; + global $con, $debug, $RoomID, $gmdateOffset; - echo "\n"; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - - $sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ". - "WHERE (`Shifts`.`DateS`>='". gmdate("Y-m-d H:i:s", time()+$gmdateOffset). "') ". - "ORDER BY `DateS`, `RID`;"; - $Erg = mysql_query($sql, $con); + echo "
    ". Get_Text("inc_schicht_date"). "". Get_Text("inc_schicht_time"). "". Get_Text("inc_schicht_room"). "". Get_Text("inc_schicht_commend"). "
    \n"; + echo "\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\n"; + + $sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ". + "WHERE (`Shifts`.`DateS`>='". gmdate("Y-m-d H:i:s", time()+$gmdateOffset). "') ". + "ORDER BY `DateS`, `RID`;"; + $Erg = mysql_query($sql, $con); - $angezeigt = 0; - for ($i=0; ($i0) - { - $angezeigt++; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - } - } - - echo "
    ". Get_Text("inc_schicht_date"). "". Get_Text("inc_schicht_time"). "". Get_Text("inc_schicht_room"). "". Get_Text("inc_schicht_commend"). "
    ". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "". substr(mysql_result( $Erg, $i, "DateS"), 11). "". $RoomID[mysql_result( $Erg, $i, "RID")]. "". - ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")). - "
    \n"; - + $angezeigt = 0; + for ($i=0; ($i0) + { + $angezeigt++; + echo "\n"; + echo "\t". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "\n"; + echo "\t". substr(mysql_result( $Erg, $i, "DateS"), 11). "\n"; + echo "\t". $RoomID[mysql_result( $Erg, $i, "RID")]. "\n"; + echo "\t". + ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")). + "\n"; + echo "\n"; + } + } + + echo "\n"; + } //function showEmptyShifts - + /*####################################################### -# Gibt die anzahl der Schichten im Raum zurück # +# Gibt die anzahl der Schichten im Raum zurück # #######################################################*/ function SummRoomShifts( $raum ) { - global $ausdatum, $con, $DEBUG, $GlobalZeileProStunde; - - $SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND ". - "(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;"; + global $ausdatum, $con, $debug, $GlobalZeileProStunde; + + $SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ". + "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND ". + "(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;"; - $ErgSonder = mysql_query($SQLSonder, $con); - - return mysql_num_rows($ErgSonder); + $ErgSonder = mysql_query($SQLSonder, $con); + + return mysql_num_rows($ErgSonder); } ?> diff --git a/includes/funktion_schichtplan_Tage.php b/includes/funktion_schichtplan_Tage.php old mode 100755 new mode 100644 index 5ac92e7e..2c21a992 --- a/includes/funktion_schichtplan_Tage.php +++ b/includes/funktion_schichtplan_Tage.php @@ -1,87 +1,101 @@ - $Mmax) - { - $Tag = 1; - $Monat++; - } + if($Tag > $Mmax) { + $Tag = 1; + $Monat++; + } - if( $Monat > 12 ) - { - $Monat = 1; - $Jahr++; - } + if($Monat > 12) { + $Monat = 1; + $Jahr++; + } - $Tag = strlen( $Tag ) == 1 ? "0".$Tag : $Tag; - $Monat = strlen( $Monat ) == 1 ? "0".$Monat : $Monat; + $Tag = strlen( $Tag ) == 1 ? "0".$Tag : $Tag; + $Monat = strlen( $Monat ) == 1 ? "0".$Monat : $Monat; - return ("$Jahr-$Monat-$Tag"); - } //function DatumUm1Tagerhoehen( -} + return ("$Jahr-$Monat-$Tag"); + } + } -//suchen den ersten eintrags -$SQL = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` LIMIT 1"; -$Erg = mysql_query($SQL, $con); + // suchen den ersten eintrags + $SQL = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` LIMIT 1"; + $Erg = mysql_query($SQL, $con); -$Pos=0; + $Pos = 0; -if( mysql_num_rows($Erg)>0) -{ - do - { - //Startdatum einlesen und link ausgeben - $DateS = substr(mysql_result($Erg, 0 , 0), 0,10); - $VeranstaltungsTage[$Pos++] = $DateS; - - //auslesen den endes und eventuelle weitere tage ausgeben - $SQL2 = "SELECT MAX(`DateE`) FROM `Shifts` ". - "WHERE ( (`DateS` like '$DateS%') AND NOT (`DateE` like '%00:00:00'))"; - $Erg2 = mysql_query($SQL2, $con); - $DateE = substr(mysql_result($Erg2, 0 , 0), 0,10); + if(mysql_num_rows($Erg) > 0) { + do { + // Startdatum einlesen und link ausgeben + $DateS = substr(mysql_result($Erg, 0 , 0), 0,10); + $VeranstaltungsTage[$Pos++] = $DateS; + + // auslesen den endes und eventuelle weitere tage ausgeben + $SQL2 = "SELECT MAX(`DateE`) FROM `Shifts` WHERE ( (`DateS` like '$DateS%') AND NOT (`DateE` like '%00:00:00'))"; + $Erg2 = mysql_query($SQL2, $con); + $DateE = substr(mysql_result($Erg2, 0 , 0), 0,10); - if( strlen($DateE) == 0) - $DateE = $DateS; - else - while( $DateS != $DateE) - { - $DateS = DatumUm1TagErhoehen( $DateS); - $VeranstaltungsTage[$Pos++] = $DateS; - } + if(strlen($DateE) == 0) + $DateE = $DateS; + else + while( $DateS != $DateE) { + $DateS = DatumUm1TagErhoehen( $DateS); + $VeranstaltungsTage[$Pos++] = $DateS; + } - //suchen den nästen eintrag - $SQL = "SELECT `DateS` FROM `Shifts` ". - "WHERE (`DateS` > '$DateE 23:59:59' ) ". - "ORDER BY `DateS` ". - "LIMIT 1"; - $Erg = mysql_query($SQL, $con); + // suchen den naesten eintrag + $SQL = "SELECT `DateS` FROM `Shifts` ". + "WHERE (`DateS` > '$DateE 23:59:59' ) ". + "ORDER BY `DateS` ". + "LIMIT 1"; + $Erg = mysql_query($SQL, $con); } while( mysql_fetch_row($Erg) > 0); -} -$VeranstaltungsTageMax = $Pos-1; + } + $VeranstaltungsTageMax = $Pos - 1; ?> diff --git a/includes/funktion_schichtplan_aray.php b/includes/funktion_schichtplan_aray.php old mode 100755 new mode 100644 index 2f7f4b36..f9b04bd6 --- a/includes/funktion_schichtplan_aray.php +++ b/includes/funktion_schichtplan_aray.php @@ -5,34 +5,34 @@ #######################################################*/ // erstellt ein Array der Reume - $sql = "SELECT `RID`, `Name` FROM `Room` ". - "WHERE `Show`='Y'". - "ORDER BY `Number`, `Name`;"; - - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); + $sql = "SELECT `RID`, `Name` FROM `Room` ". + "WHERE `Show`='Y'". + "ORDER BY `Number`, `Name`;"; + + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); - $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); - - $RoomID[ mysql_result($Erg, $i, "RID") ] = mysql_result($Erg, $i, "Name"); - } + for ($i=0; $i<$rowcount; $i++) + { + $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); + $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); + + $RoomID[ mysql_result($Erg, $i, "RID") ] = mysql_result($Erg, $i, "Name"); + } // erstellt ein Aray der Engeltypen - $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); - $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); + $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); + for ($i=0; $i<$rowcount; $i++) + { + $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); + $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); - $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = - mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); - $TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name"); - } + $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = + mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); + $TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name"); + } include ("funktion_schichtplan_Tage.php"); ?> diff --git a/includes/funktion_schichtplan_beamer.php b/includes/funktion_schichtplan_beamer.php old mode 100755 new mode 100644 index ab935e0d..177b6cb3 --- a/includes/funktion_schichtplan_beamer.php +++ b/includes/funktion_schichtplan_beamer.php @@ -5,176 +5,176 @@ #######################################################*/ // erstellt ein Array der Reume - $sql = "SELECT `RID`, `Name` FROM `Room` ". - "WHERE `Show`='Y'". - "ORDER BY `Number`, `Name`;"; - - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); + $sql = "SELECT `RID`, `Name` FROM `Room` ". + "WHERE `Show`='Y'". + "ORDER BY `Number`, `Name`;"; + + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); - $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); - - $RoomID[ mysql_result($Erg, $i, "RID") ] = mysql_result($Erg, $i, "Name"); - } + for ($i=0; $i<$rowcount; $i++) + { + $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); + $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); + + $RoomID[ mysql_result($Erg, $i, "RID") ] = mysql_result($Erg, $i, "Name"); + } // erstellt ein Aray der Engeltypen - $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); - $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); + $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); + for ($i=0; $i<$rowcount; $i++) + { + $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); + $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); - $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = - mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); - } + $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = + mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); + } /*####################################################### -# gibt die engelschischten aus # +# gibt die engelschischten aus # #######################################################*/ function ausgabe_Feld_Inhalt( $SID, $Man ) { // gibt, nach übergabe der der SchichtID (SID) und der RaumBeschreibung, // die eingetragenden und und offenden Schichteintäge zurück - global $EngelType, $EngelTypeID, $con; - //form Config - global $DEBUG; + global $EngelType, $EngelTypeID, $con; + //form Config + global $debug; - $Out = ""; + $Out = ""; - $Out.= "\n"; + $Out.= "
    \n"; - $Out.= "\t\t\t\n". - "\t\t\t\t\n". - "\t\t\t\t\n". - "\t\t\t\t\n"; + $Out.= "\t\t\t\n". + "\t\t\t\t\n". + "\t\t\t\t\n". + "\t\t\t\t\n"; - /////////////////////////////////////////////////////////////////// - // SQL abfrage für die benötigten schichten - /////////////////////////////////////////////////////////////////// - $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;"; - $Erg = mysql_query($SQL, $con); - - $Anzahl = mysql_num_rows($Erg); - $Feld=-1; - for( $i = 0; $i < $Anzahl; $i++ ) - { - - $Temp_TID = mysql_result($Erg, $i, "TID"); - - // wenn sich der Type ändert wird zumnästen feld geweckselt - if( ($i==0) || ($Temp_TID_old != $Temp_TID) ) - { - $Feld++; - $Temp[$Feld]["free"]=0; - $Temp[$Feld]["Engel"]=array(); - } - - $Temp[$Feld]["TID"] = $Temp_TID; - $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID"); - - // ist es eine zu vergeben schicht? - if( $Temp[$Feld]["UID"] == 0 ) - $Temp[$Feld]["free"]++; - else - $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"]; - - $Temp_TID_old = $Temp[$Feld]["TID"]; - } // FOR - + /////////////////////////////////////////////////////////////////// + // SQL abfrage für die benötigten schichten + /////////////////////////////////////////////////////////////////// + $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;"; + $Erg = mysql_query($SQL, $con); + + $Anzahl = mysql_num_rows($Erg); + $Feld=-1; + for( $i = 0; $i < $Anzahl; $i++ ) + { + + $Temp_TID = mysql_result($Erg, $i, "TID"); + + // wenn sich der Type ändert wird zumnästen feld geweckselt + if( ($i==0) || ($Temp_TID_old != $Temp_TID) ) + { + $Feld++; + $Temp[$Feld]["free"]=0; + $Temp[$Feld]["Engel"]=array(); + } + + $Temp[$Feld]["TID"] = $Temp_TID; + $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID"); + + // ist es eine zu vergeben schicht? + if( $Temp[$Feld]["UID"] == 0 ) + $Temp[$Feld]["free"]++; + else + $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"]; + + $Temp_TID_old = $Temp[$Feld]["TID"]; + } // FOR + - /////////////////////////////////////////////////////////////////// - // Aus gabe der Schicht - /////////////////////////////////////////////////////////////////// - if( isset($Temp) && count($Temp) ) - foreach( $Temp as $TempEntry => $TempValue ) - { - $Out.= "\t\t\t\n"; - - // ausgabe EngelType - $Out.= "\t\t\t\t\n"; - $Out.= "\t\t\t\t\n"; - $Out.= "\t\t\t\t\n"; + + // ausgabe EngelType + $Out.= "\t\t\t\t\n"; + $Out.= "\t\t\t\t\n"; + $Out.= "\t\t\t\t\n"; - $Out.= "\t\t\t\n"; - - } // FOREACH + if ( $TempValue["free"] > 0) + { + if( count($TempValue["Engel"]) > 0) + $Out.= ", "; + $Out.= $TempValue["free"]. "x free "; + } + } + $Out.= "\n"; + $Out.= "\t\t\t\n"; + + } // FOREACH - $Out.= "\t\t\t
    ". $EngelTypeID[ $TempValue["TID"] ]; - - // ausgabe Eingetragener Engel - if( count($TempValue["Engel"]) > 0 ) - { - if( count($TempValue["Engel"]) == 1 ) - $Out.= " ". trim(Get_Text("inc_schicht_ist")). ":"; - else - $Out.= " ". trim(Get_Text("inc_schicht_sind")). ":"; - $Out.= ""; - - foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID ) - $Out.= UID2Nick( $TempEngelID ). ", "; -// $Out.= UID2Nick( $TempEngelID ). DisplayAvatar( $TempEngelID ). ", "; - $Out = substr( $Out, 0, strlen($Out)-2 ); - } - else - { - $Out.= ":\n"; - } - - - // ausgabe benötigter Engel - //////////////////////////// - if( $_SESSION['CVS']["nonpublic/schichtplan_add.php"] == "Y") + /////////////////////////////////////////////////////////////////// + // Aus gabe der Schicht + /////////////////////////////////////////////////////////////////// + if( isset($Temp) && count($Temp) ) + foreach( $Temp as $TempEntry => $TempValue ) + { + $Out.= "\t\t\t
    ". $EngelTypeID[ $TempValue["TID"] ]; + + // ausgabe Eingetragener Engel + if( count($TempValue["Engel"]) > 0 ) + { + if( count($TempValue["Engel"]) == 1 ) + $Out.= " ". trim(Get_Text("inc_schicht_ist")). ":"; + else + $Out.= " ". trim(Get_Text("inc_schicht_sind")). ":"; + $Out.= ""; + + foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID ) + $Out.= UID2Nick( $TempEngelID ). ", "; +// $Out.= UID2Nick( $TempEngelID ). DisplayAvatar( $TempEngelID ). ", "; + $Out = substr( $Out, 0, strlen($Out)-2 ); + } + else + { + $Out.= ":\n"; + } + + + // ausgabe benötigter Engel + //////////////////////////// + if( $_SESSION['CVS']["nonpublic/schichtplan_add.php"] == "Y") { - if ( $TempValue["free"] > 0) - { - if( count($TempValue["Engel"]) > 0) - $Out.= ", "; - $Out.= $TempValue["free"]. "x free "; - } - } - $Out.= "
    \n\t"; - - return $Out; + $Out.= "\t\t\t\n\t"; + + return $Out; } // function Ausgabe_Feld_Inhalt /*####################################################### -# gibt die engelschischten für einen Ruam aus # +# gibt die engelschischten für einen Ruam aus # #######################################################*/ function ausgabe_Zeile( $RID, $Time, &$AnzahlEintraege ) { - global $con; - - $SQL = "SELECT `SID`, `Len`, `Man` FROM `Shifts` ". - "WHERE ( (`RID` = '$RID') AND ". - "((`DateE` like '". gmdate("Y-m-d H", $Time+3600). "%') OR ". - " (`DateS` like '". gmdate("Y-m-d H", $Time). "%')) ) ORDER BY `DateS`;"; - - $ErgRoom = mysql_query($SQL, $con); - $Out= "\t"; - if( mysql_num_rows( $ErgRoom)>0 ) - for( $i=1; $i<=mysql_num_rows( $ErgRoom); $i++ ) - { - $AnzahlEintraege++; - $Out.= ausgabe_Feld_Inhalt( mysql_result( $ErgRoom, $i-1, "SID"), - mysql_result( $ErgRoom, $i-1, "Man")); - if( (mysql_num_rows( $ErgRoom) > 1) && !($i==mysql_num_rows( $ErgRoom)) ) - $Out.= "
    "; -// $Out.= "
    \n\t\t\t\t"; - - } - else - $Out.= " "; - - $Out.= "\n"; - - return $Out; + global $con; + + $SQL = "SELECT `SID`, `Len`, `Man` FROM `Shifts` ". + "WHERE ( (`RID` = '$RID') AND ". + "((`DateE` like '". gmdate("Y-m-d H", $Time+3600). "%') OR ". + " (`DateS` like '". gmdate("Y-m-d H", $Time). "%')) ) ORDER BY `DateS`;"; + + $ErgRoom = mysql_query($SQL, $con); + $Out= "\t"; + if( mysql_num_rows( $ErgRoom)>0 ) + for( $i=1; $i<=mysql_num_rows( $ErgRoom); $i++ ) + { + $AnzahlEintraege++; + $Out.= ausgabe_Feld_Inhalt( mysql_result( $ErgRoom, $i-1, "SID"), + mysql_result( $ErgRoom, $i-1, "Man")); + if( (mysql_num_rows( $ErgRoom) > 1) && !($i==mysql_num_rows( $ErgRoom)) ) + $Out.= "
    "; +// $Out.= "
    \n\t\t\t\t"; + + } + else + $Out.= " "; + + $Out.= "\n"; + + return $Out; } ?> diff --git a/includes/funktion_user.php b/includes/funktion_user.php old mode 100755 new mode 100644 index 0cdf8144..c015cb5a --- a/includes/funktion_user.php +++ b/includes/funktion_user.php @@ -1,132 +1,111 @@ 0) + $SQL = "SELECT Nick FROM `User` WHERE UID='$UID'"; + else + $SQL = "SELECT Name FROM `UserGroups` WHERE UID='$UID'"; - if( $UID>0) { - $SQL = "SELECT Nick FROM `User` WHERE UID='$UID'"; - } else { - $SQL = "SELECT Name FROM `UserGroups` WHERE UID='$UID'"; + $Erg = mysql_query($SQL, $con); + + if(mysql_num_rows($Erg)) { + if($UID > 0) + return mysql_result($Erg, 0); + else + return "Group-".mysql_result($Erg, 0); + } else { + if($UID == -1) + return "logout User"; + else + return "UserID $UID not found"; + } } - $Erg = mysql_query($SQL, $con); - //echo $UID."#"; - if( mysql_num_rows($Erg)) { - if( $UID>0 ) { - return mysql_result($Erg, 0); - } else { - return "Group-".mysql_result($Erg, 0); - } - } else { - if( $UID == -1) - return "logout User"; - else - return "UserID $UID not found"; - } -} - - -function TID2Type($TID) -{ - global $con; + function TID2Type($TID) { + global $con; - $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'"; - $Erg = mysql_query($SQL, $con); + $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'"; + $Erg = mysql_query($SQL, $con); - if( mysql_num_rows($Erg)) - return mysql_result($Erg, 0); - else - return ""; -} + if(mysql_num_rows($Erg)) + return mysql_result($Erg, 0); + else + return ""; + } + function ReplaceSmilies($neueckig) { + global $url, $ENGEL_ROOT; -function ReplaceSmilies($eckig) -{ - global $url, $ENGEL_ROOT; + $neueckig = str_replace(";o))", "", $neueckig); + $neueckig = str_replace(":-))", "", $neueckig); + $neueckig = str_replace(";o)", "", $neueckig); + $neueckig = str_replace(":)", "", $neueckig); + $neueckig = str_replace(":-)", "", $neueckig); + $neueckig = str_replace(":(", "", $neueckig); + $neueckig = str_replace(":-(", "", $neueckig); + $neueckig = str_replace(":o(", "", $neueckig); + $neueckig = str_replace(":o)", "", $neueckig); + $neueckig = str_replace(";o(", "", $neueckig); + $neueckig = str_replace(";(", "", $neueckig); + $neueckig = str_replace(";-(", "", $neueckig); + $neueckig = str_replace("8)", "", $neueckig); + $neueckig = str_replace("8o)", "", $neueckig); + $neueckig = str_replace(":P", "", $neueckig); + $neueckig = str_replace(":-P", "", $neueckig); + $neueckig = str_replace(":oP", "", $neueckig); + $neueckig = str_replace(";P", "", $neueckig); + $neueckig = str_replace(";oP", "", $neueckig); + $neueckig = str_replace("?)", "", $neueckig); - $neueckig = $eckig; - $neueckig = str_replace(";o))", "",$neueckig); - $neueckig = str_replace(":-))", "",$neueckig); - $neueckig = str_replace(";o)", "",$neueckig); - $neueckig = str_replace(":)", "",$neueckig); - $neueckig = str_replace(":-)", "",$neueckig); - $neueckig = str_replace(":(", "",$neueckig); - $neueckig = str_replace(":-(", "",$neueckig); - $neueckig = str_replace(":o(", "",$neueckig); - $neueckig = str_replace(":o)", "",$neueckig); - $neueckig = str_replace(";o(", "",$neueckig); - $neueckig = str_replace(";(", "",$neueckig); - $neueckig = str_replace(";-(", "",$neueckig); - $neueckig = str_replace("8)", "",$neueckig); - $neueckig = str_replace("8o)", "",$neueckig); - $neueckig = str_replace(":P", "",$neueckig); - $neueckig = str_replace(":-P", "",$neueckig); - $neueckig = str_replace(":oP", "",$neueckig); - $neueckig = str_replace(";P", "",$neueckig); - $neueckig = str_replace(";oP", "",$neueckig); - $neueckig = str_replace("?)", "",$neueckig); - return $neueckig; -} + return $neueckig; + } + function GetPicturShow($UID) { + global $con; -function GetPicturShow($UID) -{ - global $con; + $SQL = "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'"; + $res = mysql_query( $SQL, $con); - $SQL= "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'"; - $res = mysql_query( $SQL, $con); - if( mysql_num_rows($res) == 1) - return mysql_result( $res, 0, 0); - else - return ""; -} + if(mysql_num_rows($res) == 1) + return mysql_result($res, 0, 0); + else + return ""; + } + function displayPictur($UID, $height = "30") { + global $url, $ENGEL_ROOT; -/* Parameter: - - [] */ -function displayPictur($UID, $height="30") -{ - global $url, $ENGEL_ROOT; - if( $height > 0) - return( "\"picture"); - else - return( "\"picture"); -} + if($height > 0) + return( "\"picture"); + else + return( "\"picture"); + } + function displayavatar($UID, $height="30") { + global $con, $url, $ENGEL_ROOT; -/* Parameter: - - [] */ -function displayavatar( $UID, $height="30") -{ - global $con, $url, $ENGEL_ROOT; - - if( GetPicturShow($UID) == 'Y') - return " ". displayPictur( $UID, $height); + if( GetPicturShow($UID) == 'Y') + return " ". displayPictur( $UID, $height); - // show avator - $asql = "select * from User where UID = $UID"; - $aerg = mysql_query ($asql, $con); - if( mysql_num_rows($aerg) ) - if( mysql_result($aerg, 0, "Avatar") > 0) - return (" "); + // show avator + $asql = "select * from User where UID = $UID"; + $aerg = mysql_query ($asql, $con); -} + if(mysql_num_rows($aerg)) + if(mysql_result($aerg, 0, "Avatar") > 0) + return (" "); + } -function UIDgekommen($UID) -{ - global $con; + function UIDgekommen($UID) { + global $con; - $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'"; - $Erg = mysql_query($SQL, $con); - - //echo $UID."#"; - if( mysql_num_rows($Erg)) - return mysql_result($Erg, 0); - else - return "0"; -} + $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'"; + $Erg = mysql_query($SQL, $con); + if(mysql_num_rows($Erg)) + return mysql_result($Erg, 0); + else + return "0"; + } ?> diff --git a/includes/funktion_xml.php b/includes/funktion_xml.php old mode 100755 new mode 100644 index 8e911a4f..60eb26fa --- a/includes/funktion_xml.php +++ b/includes/funktion_xml.php @@ -1,13 +1,10 @@ -sub[ $XMLpos[$Tiefe] ]->data .= convertValues($Data); - $Objekt->sub[ $XMLpos[$Tiefe] ]->data .= htmlentities( convertValues($Data), ENT_QUOTES); - - if( $XMLDEBUG) - echo "???". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. "|$Data|$Tiefe???
    "; - } - else - dataXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1); + if(($depth-1) == $Tiefe) { + $Objekt->sub[ $XMLpos[$Tiefe] ]->data .= htmlentities( convertValues($Data), ENT_QUOTES); + + if($XMLDEBUG) + echo "???". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. "|$Data|$Tiefe???
    "; + } else + dataXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1); } -function startXMLmain( $Data, &$Objekt, $Tiefe ) -{ - global $XMLpos, $depth, $XMLDEBUG; +function startXMLmain( $Data, &$Objekt, $Tiefe ) { + global $XMLpos, $depth, $XMLDEBUG; - if( $XMLDEBUG) - if($Tiefe==1) - { print_r(array_values ($XMLpos)); echo "--".$Data->name; - echo " #$Tiefe/$depth#"; - } - - if( $depth==$Tiefe) - { - $Objekt->sub[ $XMLpos[$Tiefe] ] = $Data; - if( $XMLDEBUG) - echo "|". $XMLpos[$Tiefe]."|". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. " ". $Data->name." save|". "#-#
    "; - } - else - startXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1); + if( $XMLDEBUG) + if($Tiefe==1) + { print_r(array_values ($XMLpos)); echo "--".$Data->name; + echo " #$Tiefe/$depth#"; + } + + if( $depth==$Tiefe) + { + $Objekt->sub[ $XMLpos[$Tiefe] ] = $Data; + if( $XMLDEBUG) + echo "|". $XMLpos[$Tiefe]."|". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. " ". $Data->name." save|". "#-#
    "; + } + else + startXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1); } function start_element_handler($parser, $name, $attribs) { - global $depth, $XMLmain, $XMLpos; + global $depth, $XMLmain, $XMLpos; - $Data = new element; - $Data->name = $name; - while(list($key, $value) = each($attribs)) - $Data->attributes[$key] = convertValues($value); - $Data->depth = $depth; - $XMLpos[$depth]++; + $Data = new element; + $Data->name = $name; + while(list($key, $value) = each($attribs)) + $Data->attributes[$key] = convertValues($value); + $Data->depth = $depth; + $XMLpos[$depth]++; - if( $depth==0) - $XMLmain= $Data; - else - startXMLmain( $Data, $XMLmain, 1); + if( $depth==0) + $XMLmain= $Data; + else + startXMLmain( $Data, $XMLmain, 1); - $depth++; + $depth++; } function end_element_handler($parser, $name) { - global $depth, $XMLpos; - $XMLpos[$depth]=0; - $depth--; + global $depth, $XMLpos; + $XMLpos[$depth]=0; + $depth--; } function character_data_handler($parser, $data) { - global $XMLmain; - if( strlen(trim($data)) ) - dataXMLmain( $data, $XMLmain, 1); + global $XMLmain; + if( strlen(trim($data)) ) + dataXMLmain( $data, $XMLmain, 1); } /*#######################################################################################*/ function readXMLfile( $file ) { - global $XMLDEBUG; - - //$xml_parser = xml_parser_create_ns(); - $xml_parser = xml_parser_create("UTF-8"); - xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler"); - xml_set_character_data_handler($xml_parser, "character_data_handler"); - - if (file_exists($file)) - { - if (!($fp = fopen($file, "r"))) - { - echo("

    could not open XML file \"$file\"

    "); - return -1; - } - } - else - { - echo("

    XML file \"$file\" not exist

    "); - return -1; - } + global $XMLDEBUG; + + //$xml_parser = xml_parser_create_ns(); + $xml_parser = xml_parser_create("UTF-8"); + xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler"); + xml_set_character_data_handler($xml_parser, "character_data_handler"); + + if (file_exists($file)) + { + if (!($fp = fopen($file, "r"))) + { + echo("

    could not open XML file \"$file\"

    "); + return -1; + } + } + else + { + echo("

    XML file \"$file\" not exist

    "); + return -1; + } - if( $XMLDEBUG) echo "
    ";
-	while ($data = fread($fp, 4096)) 
-	{
-		if (!xml_parse($xml_parser, $data, feof($fp))) 
-		{
-			die(sprintf("XML error: %s at line %d",
-				    xml_error_string(xml_get_error_code($xml_parser)),
-				    xml_get_current_line_number($xml_parser)));
-		}
-	}
-	if( $XMLDEBUG)	echo "
    "; - xml_parser_free($xml_parser); - return 0; + if( $XMLDEBUG) echo "
    ";
+  while ($data = fread($fp, 4096)) 
+  {
+    if (!xml_parse($xml_parser, $data, feof($fp))) 
+    {
+      die(sprintf("XML error: %s at line %d",
+            xml_error_string(xml_get_error_code($xml_parser)),
+            xml_get_current_line_number($xml_parser)));
+    }
+  }
+  if( $XMLDEBUG)  echo "
    "; + xml_parser_free($xml_parser); + return 0; } /*#######################################################################################*/ function getXMLsubPease( $Sourse, $Name ) { - foreach($Sourse->sub as $key => $value) { - if ($value->name == $Name) { - return $value; - } - } + foreach($Sourse->sub as $key => $value) { + if ($value->name == $Name) { + return $value; + } + } - echo "

    Fehler: getXMLsubPease( $Sourse, $Name ) not found

    "; -// die; + echo "

    Fehler: getXMLsubPease( $Sourse, $Name ) not found

    "; +// die; } /*#######################################################################################*/ function getXMLsubData( $Sourse, $Name ) { - $XML = getXMLsubPease( $Sourse, $Name); - return $XML->data; + $XML = getXMLsubPease( $Sourse, $Name); + return $XML->data; } ?> diff --git a/includes/funktion_xml_room.php b/includes/funktion_xml_room.php old mode 100755 new mode 100644 index a8f626d1..cb91af6f --- a/includes/funktion_xml_room.php +++ b/includes/funktion_xml_room.php @@ -1,69 +1,61 @@ -\n

    Rooms:

    \n"; - -function saveRoomData() -{ - global $con; - if( isset($_GET["NameXML"])) - { - $SQL= "INSERT INTO `Room` ( `Name`, `FromPentabarf` ) ". - "VALUES ('". mysql_escape_string($_GET["NameXML"]). "', 'Y');"; - $Erg = mysql_query($SQL, $con); - if( $Erg ) - echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war erfogreich
    "; - else - echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war nicht erfogreich.(". - mysql_error($con). ")
    [$SQL]
    "; - } - else - echo "Fehler in den Parametern!
    "; -} /*function saveRoomData*/ - -if( isset($_GET["RoomUpdate"])) - saveRoomData(); - -//INIT Status counter -$DS_KO = 0; - -//Ausgabe -echo "\n"; -echo "\n"; -if( $EnableSchudle) -foreach($XMLmain->sub as $EventKey => $Event) -{ - if( $Event->name == "VEVENT") - { - $NameXML = getXMLsubData( $Event, "LOCATION"); - if( !isset( $RoomName[$NameXML])) - { - $RoomName[$NameXML] = ""; - - if( isset($_GET["UpdateALL"])) - { - $_GET["NameXML"] = $NameXML; - saveRoomData(); - CreateRoomArrays(); - } - else - { - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - $DS_KO++; - echo "\t\n"; - echo "\n"; - echo "
    "; - } - } - } -} -echo "\n"; -echo "
    Namestate
    status: $DS_KO nicht vorhanden.
    \n"; - -?> +Rooms:\n"; + + function saveRoomData() { + global $con; + + if(isset($_GET["NameXML"])) { + $SQL = "INSERT INTO `Room` ( `Name`, `FromPentabarf` ) ". + "VALUES ('". mysql_escape_string($_GET["NameXML"]). "', 'Y');"; + $Erg = mysql_query($SQL, $con); + + if($Erg) + echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war erfogreich
    "; + else + echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war nicht erfogreich.(". + + mysql_error($con). ")
    [$SQL]
    "; + } else + echo "Fehler in den Parametern!
    "; + } + + if(isset($_GET["RoomUpdate"])) + saveRoomData(); + + // INIT Status counter + $DS_KO = 0; + + // Ausgabe + echo "\n"; + echo "\n"; + + if($EnableSchudle) { + foreach($XMLmain->sub as $EventKey => $Event) { + if( $Event->name == "VEVENT") { + $NameXML = getXMLsubData( $Event, "LOCATION"); + + if( !isset( $RoomName[$NameXML])) { + $RoomName[$NameXML] = ""; + + if(isset($_GET["UpdateALL"])) { + $_GET["NameXML"] = $NameXML; + saveRoomData(); + CreateRoomArrays(); + } else { + echo "\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + $DS_KO++; + echo "\t\n"; + echo "\n"; + echo "
    "; + } + } + } + } + } + + echo "\n"; + echo "
    Namestate
    status: $DS_KO nicht vorhanden.
    \n"; +?> diff --git a/includes/funktion_xml_schudle.php b/includes/funktion_xml_schudle.php old mode 100755 new mode 100644 index 4ef0a42f..41efce04 --- a/includes/funktion_xml_schudle.php +++ b/includes/funktion_xml_schudle.php @@ -1,178 +1,178 @@ -Schedule:\n"; function SaveSchedule() { - global $RoomID, $RoomName; - global $con; + global $RoomID, $RoomName; + global $con; - if( isset($_GET["PSIDXML"]) && - isset($_GET["DateXML"]) && - isset($_GET["RIDXML"]) && - isset($_GET["LenXML"]) && - isset($_GET["ManXML"]) && - isset($_GET["URLXML"]) ) - { - //erzeuge von `DateE` - $TimeStart = substr( $_GET["DateXML"], 11, 2) + (substr($_GET["DateXML"], 14, 2)/60); - $TimeEnd = ($_GET["LenXML"] + $TimeStart) * 60; - $TimeM = $TimeEnd % 60; - $TimeH = ($TimeEnd - $TimeM)/60; - if( $TimeH>=24 ) - { - $TimeH -= 24; - $DateEnd = substr($_GET["DateXML"], 0, 8). - (substr($_GET["DateXML"], 8, 2)+1). " "; - } - else - $DateEnd = substr($_GET["DateXML"], 0, 11); - $DateEnd .= "$TimeH:$TimeM:00"; - - //Namen ermitteln - $_GET["RIDXML"] = $RoomName[$_GET["RIDXML"]]; - - //Update OR insert ? - $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';"; - $Erg1 = mysql_query($SQL1, $con); - - if( mysql_num_rows($Erg1)==0) - { - echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "'"; - $SQL= "INSERT INTO `Shifts` (`PSID`, `DateS`, `DateE`, `Len`, `RID`, `Man`, `URL`) ". - "VALUES ('". $_GET["PSIDXML"]. "', ". - "'". $_GET["DateXML"]. "', ". - "'". $DateEnd. "', ". - "'". $_GET["LenXML"]. "', ". - "'". $_GET["RIDXML"]. "', ". - "'". mysql_escape_string($_GET["ManXML"]). "', ". - "'". $_GET["URLXML"]. "'". - ");"; - } - else - { - echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "' (SID ". - mysql_result( $Erg1, 0, "SID"). ")"; - $SQL= "UPDATE `Shifts` SET ". - "`DateS` = '". $_GET["DateXML"]. "', ". - "`DateE` = '". $DateEnd. "', ". - "`Len` = '". $_GET["LenXML"]. "', ". - "`RID` = '". $_GET["RIDXML"]. "', ". - "`Man` = '". mysql_escape_string($_GET["ManXML"]). "', ". - "`URL`= '". $_GET["URLXML"]. "' ". - "WHERE `PSID` = '". $_GET["PSIDXML"]. "' LIMIT 1;"; - } - $Erg = mysql_query($SQL, $con); - if( $Erg ) - { - echo ", war erfogreich
    \n"; + if( isset($_GET["PSIDXML"]) && + isset($_GET["DateXML"]) && + isset($_GET["RIDXML"]) && + isset($_GET["LenXML"]) && + isset($_GET["ManXML"]) && + isset($_GET["URLXML"]) ) + { + //erzeuge von `DateE` + $TimeStart = substr( $_GET["DateXML"], 11, 2) + (substr($_GET["DateXML"], 14, 2)/60); + $TimeEnd = ($_GET["LenXML"] + $TimeStart) * 60; + $TimeM = $TimeEnd % 60; + $TimeH = ($TimeEnd - $TimeM)/60; + if( $TimeH>=24 ) + { + $TimeH -= 24; + $DateEnd = substr($_GET["DateXML"], 0, 8). + (substr($_GET["DateXML"], 8, 2)+1). " "; + } + else + $DateEnd = substr($_GET["DateXML"], 0, 11); + $DateEnd .= "$TimeH:$TimeM:00"; + + //Namen ermitteln + $_GET["RIDXML"] = $RoomName[$_GET["RIDXML"]]; + + //Update OR insert ? + $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';"; + $Erg1 = mysql_query($SQL1, $con); + + if( mysql_num_rows($Erg1)==0) + { + echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "'"; + $SQL= "INSERT INTO `Shifts` (`PSID`, `DateS`, `DateE`, `Len`, `RID`, `Man`, `URL`) ". + "VALUES ('". $_GET["PSIDXML"]. "', ". + "'". $_GET["DateXML"]. "', ". + "'". $DateEnd. "', ". + "'". $_GET["LenXML"]. "', ". + "'". $_GET["RIDXML"]. "', ". + "'". mysql_escape_string($_GET["ManXML"]). "', ". + "'". $_GET["URLXML"]. "'". + ");"; + } + else + { + echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "' (SID ". + mysql_result( $Erg1, 0, "SID"). ")"; + $SQL= "UPDATE `Shifts` SET ". + "`DateS` = '". $_GET["DateXML"]. "', ". + "`DateE` = '". $DateEnd. "', ". + "`Len` = '". $_GET["LenXML"]. "', ". + "`RID` = '". $_GET["RIDXML"]. "', ". + "`Man` = '". mysql_escape_string($_GET["ManXML"]). "', ". + "`URL`= '". $_GET["URLXML"]. "' ". + "WHERE `PSID` = '". $_GET["PSIDXML"]. "' LIMIT 1;"; + } + $Erg = mysql_query($SQL, $con); + if( $Erg ) + { + echo ", war erfogreich
    \n"; - //SID auslesen - $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';"; - $Erg1 = mysql_query($SQL1, $con); - $newSID = mysql_result($Erg1, 0, 0); + //SID auslesen + $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';"; + $Erg1 = mysql_query($SQL1, $con); + $newSID = mysql_result($Erg1, 0, 0); - // erstellt ein Array der Reume - $sql2 = "SELECT * FROM `Room` ". - "WHERE `RID`='".$_GET["RIDXML"]. "' ". - "ORDER BY `Number`, `Name`;"; - $Erg2 = mysql_query( $sql2, $con); - for( $j=0; $j $EngelNeeded_Exist) - { - echo "---->Create Shifts for engeltype: ". TID2Type($EngelTypeID). " ". - ($EngelNeeded-$EngelNeeded_Exist). "x
    \n------>\n"; - for( $i=0; $i < ($EngelNeeded-$EngelNeeded_Exist); $i++ ) - { - $SQL3 = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (". - "'". $newSID. "', ". - "'". $EngelTypeID. "');"; - $Erg3 = mysql_query($SQL3, $con); - if ($Erg3 == 1) - echo "pass "; - else - echo "fail ". mysql_error($con). - "($SQL3)
    \n"; - } - echo "
    \n"; - } - else if ($EngelNeeded < $EngelNeeded_Exist) - { - if( $EngelNeeded > $EngelNeeded_NotEmpty) - { - $EngelMin = $EngelNeeded; - } - else - { - $EngelMin = $EngelNeeded_NotEmpty; - echo "---> WARING ". $EngelNeeded_NotEmpty. - " shift is used, can't del ". TID2Type($EngelTypeID). " shifts\t"; - } + // chech exist shifts + $sqlShifts = "SELECT * FROM `ShiftEntry` ". + "WHERE `SID`='". $newSID. "' AND ". + "`TID` = '". $EngelTypeID. "';"; + $ErgShifts = mysql_query( $sqlShifts, $con); + $EngelNeeded_Exist = mysql_num_rows( $ErgShifts); + + // check for not empty shifts + $sqlShiftsNotEmpty = "SELECT * FROM `ShiftEntry` ". + "WHERE `SID`='". $newSID. "' AND ". + "`TID` = '". $EngelTypeID. "' AND ". + "`UID` != 0 ;"; + $ErgShiftsNotEmpty = mysql_query( $sqlShiftsNotEmpty, $con); + $EngelNeeded_NotEmpty = mysql_num_rows( $ErgShiftsNotEmpty); + + // Angel create/delte? + if( $EngelNeeded > $EngelNeeded_Exist) + { + echo "---->Create Shifts for engeltype: ". TID2Type($EngelTypeID). " ". + ($EngelNeeded-$EngelNeeded_Exist). "x
    \n------>\n"; + for( $i=0; $i < ($EngelNeeded-$EngelNeeded_Exist); $i++ ) + { + $SQL3 = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (". + "'". $newSID. "', ". + "'". $EngelTypeID. "');"; + $Erg3 = mysql_query($SQL3, $con); + if ($Erg3 == 1) + echo "pass "; + else + echo "fail ". mysql_error($con). + "($SQL3)
    \n"; + } + echo "
    \n"; + } + else if ($EngelNeeded < $EngelNeeded_Exist) + { + if( $EngelNeeded > $EngelNeeded_NotEmpty) + { + $EngelMin = $EngelNeeded; + } + else + { + $EngelMin = $EngelNeeded_NotEmpty; + echo "---> WARING ". $EngelNeeded_NotEmpty. + " shift is used, can't del ". TID2Type($EngelTypeID). " shifts\t"; + } - echo "---->Delete empty Shifts for engeltype: ". TID2Type($EngelTypeID). " ". - ($EngelNeeded_Exist-$EngelMin)."x
    \n------>\n"; - for( $i=$EngelMin; $i<$EngelNeeded_Exist; $i++ ) - { - $SQL3 = "DELETE FROM `ShiftEntry` ". - "WHERE `SID` = ". $newSID. " AND ". - "`TID` = ". $EngelTypeID. " AND ". - "`UID` = 0 ". - "LIMIT 1;"; - $Erg3 = mysql_query($SQL3, $con); - if ($Erg3 == 1) - echo "pass "; - else - echo "fail ". mysql_error($con). - "($SQL3)
    \n"; - } - echo "
    \n"; - } - else - { -// echo "---->Nothing to do, for engeltype: ". TID2Type($EngelTypeID). "
    \n"; - } - } - } + echo "---->Delete empty Shifts for engeltype: ". TID2Type($EngelTypeID). " ". + ($EngelNeeded_Exist-$EngelMin)."x
    \n------>\n"; + for( $i=$EngelMin; $i<$EngelNeeded_Exist; $i++ ) + { + $SQL3 = "DELETE FROM `ShiftEntry` ". + "WHERE `SID` = ". $newSID. " AND ". + "`TID` = ". $EngelTypeID. " AND ". + "`UID` = 0 ". + "LIMIT 1;"; + $Erg3 = mysql_query($SQL3, $con); + if ($Erg3 == 1) + echo "pass "; + else + echo "fail ". mysql_error($con). + "($SQL3)
    \n"; + } + echo "
    \n"; + } + else + { +// echo "---->Nothing to do, for engeltype: ". TID2Type($EngelTypeID). "
    \n"; + } + } + } - } - else - echo ", war nicht erfogreich.(". - mysql_error($con). ")
    [$SQL]
    \n"; - } - else - echo "Fehler in den Parametern!
    "; + } + else + echo ", war nicht erfogreich.(". + mysql_error($con). ")
    [$SQL]
    \n"; + } + else + echo "Fehler in den Parametern!
    "; } /*SaveSchedule*/ if( isset($_GET["ScheduleUpdate"])) - SaveSchedule(); + SaveSchedule(); //INIT Status counter $DS_OK = 0; @@ -182,127 +182,127 @@ $Where = ""; //ausgabe echo "\n"; echo "". - "\n"; + "\n"; echo "". - "\n"; + "\n"; if( $EnableSchudle) foreach($XMLmain->sub as $EventKey => $Event) { - if( $Event->name == "VEVENT") - { - echo "\n"; - echo "\t\n"; - - $PSIDXML = getXMLsubData( $Event, "UID"); - $DateXML = - substr( getXMLsubData( $Event, "DTSTART"), 0, 4). "-". - substr( getXMLsubData( $Event, "DTSTART"), 4, 2). "-". - substr( getXMLsubData( $Event, "DTSTART"), 6, 2). " ". - substr( getXMLsubData( $Event, "DTSTART"), 9, 2). ":". - substr( getXMLsubData( $Event, "DTSTART"), 11,2). ":00"; - $LenXML = substr( getXMLsubData( $Event, "DURATION"), 0, 2) + ( substr( getXMLsubData( $Event, "DURATION"), 3, 2)/60); - $RIDXML = getXMLsubData( $Event, "LOCATION"); - $ManXML = getXMLsubData( $Event, "SUMMARY"); - $URLXML = getXMLsubData( $Event, "URL"); - - if( isset($_GET["UpdateALL"])) - { - $_GET["PSIDXML"] = $PSIDXML; - $_GET["DateXML"] = $DateXML; - $_GET["LenXML"] = $LenXML; - $_GET["RIDXML"] = $RIDXML; - $_GET["ManXML"] = $ManXML; - $_GET["URLXML"] = $URLXML; - SaveSchedule(); - } - - $SQL = "SELECT * FROM `Shifts` WHERE `PSID`='$PSIDXML'"; - $Erg = mysql_query($SQL, $con); - if(mysql_num_rows($Erg)>0) - { - $SIDDB = mysql_result($Erg, 0, "SID"); - $PSIDDB = mysql_result($Erg, 0, "PSID"); - $TimeDB = mysql_result($Erg, 0, "DateS"); - $LenDB = mysql_result($Erg, 0, "Len"); - if( isset($RoomID[mysql_result($Erg, 0, "RID")])) - $RIDDB = $RoomID[mysql_result($Erg, 0, "RID")]; - else - $RIDDB = "RID". mysql_result($Erg, 0, "RID"); - - $ManDB = mysql_result($Erg, 0, "Man"); - $URLDB = mysql_result($Erg, 0, "URL"); - } - else - $SIDDB = $PSIDDB = $TimeDB = $LenDB = $RIDDB = $ManDB = $URLDB = ""; + if( $Event->name == "VEVENT") + { + echo "\n"; + echo "\t\n"; + + $PSIDXML = getXMLsubData( $Event, "UID"); + $DateXML = + substr( getXMLsubData( $Event, "DTSTART"), 0, 4). "-". + substr( getXMLsubData( $Event, "DTSTART"), 4, 2). "-". + substr( getXMLsubData( $Event, "DTSTART"), 6, 2). " ". + substr( getXMLsubData( $Event, "DTSTART"), 9, 2). ":". + substr( getXMLsubData( $Event, "DTSTART"), 11,2). ":00"; + $LenXML = substr( getXMLsubData( $Event, "DURATION"), 0, 2) + ( substr( getXMLsubData( $Event, "DURATION"), 3, 2)/60); + $RIDXML = getXMLsubData( $Event, "LOCATION"); + $ManXML = getXMLsubData( $Event, "SUMMARY"); + $URLXML = getXMLsubData( $Event, "URL"); + + if( isset($_GET["UpdateALL"])) + { + $_GET["PSIDXML"] = $PSIDXML; + $_GET["DateXML"] = $DateXML; + $_GET["LenXML"] = $LenXML; + $_GET["RIDXML"] = $RIDXML; + $_GET["ManXML"] = $ManXML; + $_GET["URLXML"] = $URLXML; + SaveSchedule(); + } + + $SQL = "SELECT * FROM `Shifts` WHERE `PSID`='$PSIDXML'"; + $Erg = mysql_query($SQL, $con); + if(mysql_num_rows($Erg)>0) + { + $SIDDB = mysql_result($Erg, 0, "SID"); + $PSIDDB = mysql_result($Erg, 0, "PSID"); + $TimeDB = mysql_result($Erg, 0, "DateS"); + $LenDB = mysql_result($Erg, 0, "Len"); + if( isset($RoomID[mysql_result($Erg, 0, "RID")])) + $RIDDB = $RoomID[mysql_result($Erg, 0, "RID")]; + else + $RIDDB = "RID". mysql_result($Erg, 0, "RID"); + + $ManDB = mysql_result($Erg, 0, "Man"); + $URLDB = mysql_result($Erg, 0, "URL"); + } + else + $SIDDB = $PSIDDB = $TimeDB = $LenDB = $RIDDB = $ManDB = $URLDB = ""; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - if( !( $PSIDXML==$PSIDDB && - $DateXML==$TimeDB && - $RIDXML==$RIDDB && - $LenXML==$LenDB && - $ManXML==$ManDB && - $URLXML==$URLDB) ) - { - echo "\t\n"; - $DS_KO++; - } - else - { - echo "\t\n"; - $DS_OK++; - } - echo "\t\n"; - echo "\n"; - $Where.= " OR `PSID`='$PSIDXML'"; - } + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + if( !( $PSIDXML==$PSIDDB && + $DateXML==$TimeDB && + $RIDXML==$RIDDB && + $LenXML==$LenDB && + $ManXML==$ManDB && + $URLXML==$URLDB) ) + { + echo "\t\n"; + $DS_KO++; + } + else + { + echo "\t\n"; + $DS_OK++; + } + echo "\t\n"; + echo "\n"; + $Where.= " OR `PSID`='$PSIDXML'"; + } } echo "\n"; //Anzeige von nicht im XML File vorkommende entraege if( $Where =="") - $SQL2 = "SELECT * FROM `Shifts` WHERE NOT `PSID`='';"; + $SQL2 = "SELECT * FROM `Shifts` WHERE NOT `PSID`='';"; else - $SQL2 = "SELECT * FROM `Shifts` WHERE NOT (".substr( $Where, 4). ") AND NOT PSID = '';"; - + $SQL2 = "SELECT * FROM `Shifts` WHERE NOT (".substr( $Where, 4). ") AND NOT PSID = '';"; + $Erg2 = mysql_query($SQL2, $con); echo mysql_error($con); if(mysql_num_rows($Erg2)>0 && $EnableSchudleDB ) - for( $i=0; $i\n"; - $SID = mysql_result($Erg2, $i, "SID"); - $Time = mysql_result($Erg2, $i, "DateS"); - $Len = mysql_result($Erg2, $i, "Len"); - if( isset($RoomID[ mysql_result($Erg2, $i, "RID")])) - $RID = $RoomID[ mysql_result($Erg2, $i, "RID")]; - else - $RID = "RID.". mysql_result($Erg2, $i, "RID"); - $Man = mysql_result($Erg2, $i, "Man"); - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - } + for( $i=0; $i\n"; + $SID = mysql_result($Erg2, $i, "SID"); + $Time = mysql_result($Erg2, $i, "DateS"); + $Len = mysql_result($Erg2, $i, "Len"); + if( isset($RoomID[ mysql_result($Erg2, $i, "RID")])) + $RID = $RoomID[ mysql_result($Erg2, $i, "RID")]; + else + $RID = "RID.". mysql_result($Erg2, $i, "RID"); + $Man = mysql_result($Erg2, $i, "Man"); + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + } echo "
    PSIDDateRoomLenNamestate
    RoomLenNamestate
    XML - DBXML - DBXML - DBXML - DBXML - DB
    XML - DBXML - DBXML - DB
    \n\t\t". - "\n\t\t". - "\n\t\t". - "\n\t\t". - "". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "
    \n\t\t". + "\n\t\t". + "\n\t\t". + "\n\t\t". + "". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "
    status: $DS_KO/$DS_OK nicht Aktuel.
    \n\t\t". - "\n\t\t". - "\n\t\t". - "\n\t\t". - "". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). - "
    \n\t\t". + "\n\t\t". + "\n\t\t". + "\n\t\t". + "". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). + "
    "; diff --git a/includes/funktionen.php b/includes/funktionen.php old mode 100755 new mode 100644 index d841e6ec..fb63b708 --- a/includes/funktionen.php +++ b/includes/funktionen.php @@ -1,26 +1,23 @@ diff --git a/includes/header.php b/includes/header.php old mode 100755 new mode 100644 index e5d97a0c..3b6a4c23 --- a/includes/header.php +++ b/includes/header.php @@ -1,61 +1,57 @@ -\n"; ?> - - - + -echo "--- $title ---\n"; -?> - - - - - - - - -.css"> -\n"; +<?php echo $title; ?> + + + + + + + + + +.css" /> + +\n"; } -if (isset($Page["AutoReload"])) -{ - echo "\n\n"; -} +if(isset($Page["AutoReload"])) + echo "\n\n"; -echo "\n"; +echo "\n"; ///////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////// B O D Y ///////////////////////////////////////////////////////////////////////////////////////////// -echo "\n"; +echo "\n"; -echo "
    \n\n"; +echo "
    \n\n"; if( isset($_SESSION['color']) && ($_SESSION['color']==6) ) { - echo "\t\"Unser\n"; + echo "\"Unser\n"; } else { - echo "\t\"Unser\n"; + echo "\"Unser\n"; } echo "
    \n\n"; @@ -65,73 +61,65 @@ if( isset($_SESSION['CVS']["nonpublic/messages.php"])) { if( $_SESSION['CVS']["nonpublic/messages.php"] == "Y") { - $SQL = "SELECT `Datum` FROM `Messages` WHERE `RUID`=". $_SESSION["UID"]. " AND `isRead`='N'"; - $erg = mysql_query($SQL, $con); - if( mysql_num_rows( $erg ) > 0 ) - echo "
    ". Get_Text("pub_messages_new1"). - " ". mysql_num_rows( $erg ). " ". - Get_Text("pub_messages_new2"). "

    "; + $SQL = "SELECT `Datum` FROM `Messages` WHERE `RUID`=". $_SESSION["UID"]. " AND `isRead`='N'"; + $erg = mysql_query($SQL, $con); + if( mysql_num_rows( $erg ) > 0 ) + echo "
    ". Get_Text("pub_messages_new1"). + " ". mysql_num_rows( $erg ). " ". + Get_Text("pub_messages_new2"). "

    "; } } ?> - - + - + +
    + - - + - - - + + + - + - -
    -"; - if( strlen( $header) == 0 ) - echo "\n\t". Get_Text($Page["Name"]). "\n"; - else - echo "\n\t$header\n"; +
    +"; + if( strlen( $header) == 0 ) + echo "\n". Get_Text($Page["Name"]). "\n"; + else + echo "\n$header\n"; ?> -
    -
    +
    +
    \n"; - If (IsSet($_SESSION['oldurl'])) - echo "".Get_Text("back")." geht's zurück...\n"; - else - echo "".Get_Text("back")." geht's zurück...\n"; - exit (); +if($Page["CVS"] != "Y") { + echo "Du besitzt kein Rechte für diesen Bereich.
    \n"; + + if(isset($_SESSION['oldurl'])) + echo "" . Get_Text("back") . " geht's zurück...\n"; + else + echo "" . Get_Text("back") . " geht's zurück...\n"; + + exit (); } ?> - - - - diff --git a/includes/header_start.php b/includes/header_start.php old mode 100755 new mode 100644 index 997fa94e..97b98fc3 --- a/includes/header_start.php +++ b/includes/header_start.php @@ -1,50 +1,40 @@ - 0)) { + echo "" . $SystemDisableMessage . ""; + echo "" . $SystemDisableMessage . "\n"; + die(); + } -if( isset($SystemDisableMessage) && ( strlen($SystemDisableMessage)>0) ) -{ - echo "\n". - "\n". $SystemDisableMessage. "\n\n". - ""; - die(); -} + if(!isset($_SESSION)) + session_start(); -if( !isset($_SESSION)) -{ - session_start(); -} -include ("secure.php"); + include "secure.php"; -if( !isset($_SESSION['IP'])) -{ - $_SESSION['IP'] = $_SERVER['REMOTE_ADDR']; -} + if(!isset($_SESSION['IP'])) + $_SESSION['IP'] = $_SERVER['REMOTE_ADDR']; -if (IsSet($_SESSION['UID']) and ($_SESSION['IP'] <> $_SERVER['REMOTE_ADDR'])) -{ - session_destroy (); - header("Location: $url". $ENGEL_ROOT ); -} + if(isset($_SESSION['UID']) && ($_SESSION['IP'] <> $_SERVER['REMOTE_ADDR'])) { + session_destroy (); + header("Location: " . $url . $ENGEL_ROOT); + } -include ("UserCVS.php"); - - -//UPdate LASTlogin -if( isset($_SESSION['UID'])) -{ - $SQLlastLogIn = "UPDATE `User` SET ". - "`lastLogIn` = '". gmdate("Y-m-j H:i:s", time()). "'". - " WHERE `UID` = '". $_SESSION['UID']. "' LIMIT 1;"; - mysql_query ($SQLlastLogIn, $con); -} + include "UserCVS.php"; + // update LASTlogin + if(isset($_SESSION['UID'])) { + $SQLlastLogIn = "UPDATE `User` SET " . + "`lastLogIn` = '" . gmdate("Y-m-j H:i:s", time()) . "'" . + " WHERE `UID` = '" . $_SESSION['UID'] . "' LIMIT 1;"; + mysql_query ($SQLlastLogIn, $con); + } ?> diff --git a/includes/login_eingabefeld.php b/includes/login_eingabefeld.php old mode 100755 new mode 100644 index bed1a2fd..e68639cf --- a/includes/login_eingabefeld.php +++ b/includes/login_eingabefeld.php @@ -1,18 +1,17 @@ -"; -echo "\n". - "\t". - "\t\t". - "\t\t". - "\t". - "\t". - "\t\t". - "\t\t". - "\t". - "
    ". Get_Text("index_lang_nick"). "
    ". Get_Text("index_lang_pass"). "
    ". - "
    "; -echo ""; - + +
    + + + + + + + + + +
    +
    "> +
    diff --git a/includes/menu.php b/includes/menu.php old mode 100755 new mode 100644 index 6133b856..799e6c75 --- a/includes/menu.php +++ b/includes/menu.php @@ -1,30 +1,30 @@ -     		- + -
    +
    "; -$MenueTableEnd=" -
    -

    +$MenueTableEnd=" +
    +

    "; ShowMenu(""); ShowMenu("nonpublic"); ShowMenu("admin"); -if( !isset($submenus)) - $submenus = 0; +if(!isset($submenus)) + $submenus = 0; -if ($submenus >= 1 ) { - $inc_name=$_SERVER['PHP_SELF']; - $filenamepos=strrpos($inc_name, '/'); - $filenamepos+=1; +if ($submenus >= 1) { + $inc_name = $_SERVER['PHP_SELF']; + $filenamepos = strrpos($inc_name, '/'); + $filenamepos += 1; $filename = substr ($inc_name, $filenamepos ); $filepost = substr ($filename, 0, -4); $filepre = substr ($filename, -4 ); @@ -33,15 +33,15 @@ if ($submenus >= 1 ) { for ($index_nummer=1; $index_nummer <= $submenus; $index_nummer++) { ?> - - - + + +
    - -
    + +
    -
    - + - - - + + +
    - -
    + +
    - - + diff --git a/includes/secure.php b/includes/secure.php old mode 100755 new mode 100644 index d6b5c512..1d1a9e46 --- a/includes/secure.php +++ b/includes/secure.php @@ -1,41 +1,25 @@ \n"; -if( $DEBUG) - echo "secure.php START
    \n"; + foreach ($_GET as $k => $v) { + $v = htmlentities($v, ENT_QUOTES); + preg_replace('/([\'"`\'])/', '', $v); + $_GET[$k] = $v; -foreach ($_GET as $k => $v) -{ -// $v = htmlspecialchars($v, ENT_QUOTES); -// $v = mysql_escape_string($v); - $v = htmlentities($v, ENT_QUOTES); - if (preg_match('/([\'"`\'])/', $v, $match)) - { - print "sorry get has illegal char '$match[1]'"; - exit; - } - $_GET[$k] = $v; - - if( $DEBUG) - echo "GET $k=\"$v\"
    "; -} + if($debug) + echo "GET $k=\"$v\"
    "; + } -foreach ($_POST as $k => $v) -{ -// $v = htmlspecialchars($v, ENT_QUOTES); -// $v = mysql_escape_string($v); - $v = htmlentities($v, ENT_QUOTES); - if (preg_match('/([\'"`\'])/', $v, $match)) { - print "sorry post has illegal char '$match[1]'"; - exit; - } - $_POST[$k] = $v; - - if( $DEBUG) - echo "POST $k=\"$v\"
    "; -} -if( $DEBUG) - echo "secure.php END
    \n"; + foreach ($_POST as $k => $v) { + $v = htmlentities($v, ENT_QUOTES); + preg_replace('/([\'"`\'])/', '', $v); + $_POST[$k] = $v; + + if($debug) + echo "POST $k=\"$v\"
    "; + } + if($debug) + echo "secure.php END
    \n"; ?> diff --git a/services/cron_dect.php b/services/cron_dect.php index b5e338c6..57d12e0f 100755 --- a/services/cron_dect.php +++ b/services/cron_dect.php @@ -1,61 +1,51 @@ -'2007-07-09 09:45:00' AND ". + "Shifts.DateS<='2007-07-09 11:00:00');"; + else + $SQL .= "WHERE ((`Shifts`.`DateS`>'". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset). "') AND ". + "(`Shifts`.`DateS`<='". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset+$StartTimeBeforEvent). "') );"; -//SQL zusammensetzen -$SQL = "SELECT Shifts.DateS, Shifts.RID, ShiftEntry.UID, ShiftEntry.TID ". - "FROM `Shifts` INNER JOIN `ShiftEntry` ON `Shifts`.`SID` = `ShiftEntry`.`SID` "; -if( $DebugDECT) - $SQL .= "WHERE (Shifts.DateS>'2007-07-09 09:45:00' AND ". - "Shifts.DateS<='2007-07-09 11:00:00');"; -else - $SQL .= "WHERE ((`Shifts`.`DateS`>'". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset). "') AND ". - "(`Shifts`.`DateS`<='". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset+$StartTimeBeforEvent). "') );"; + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); -$Erg = mysql_query($SQL, $con); -echo mysql_error($con); + $Z = 0; -$Z=0; -for( $i=0; $i0) - { - $DECTnumber = UID2DECT(mysql_result($Erg, $i, "UID")); - if( $DECTnumber!="") - { - echo "dial $DECTnumber\n"; - DialNumberIAX( $DECTnumber, - mysql_result($Erg, $i, "DateS"), - mysql_result($Erg, $i, "RID"), - mysql_result($Erg, $i, "TID")); - DialNumberModem( $DECTnumber, - mysql_result($Erg, $i, "DateS")); - if( $Z++>10) - { - $Z=0; - sleep(30); - } - } + for($i = 0; $i < mysql_num_rows($Erg); $i++) { + if(mysql_result($Erg, $i, "UID") > 0) { + $DECTnumber = UID2DECT(mysql_result($Erg, $i, "UID")); + + if($DECTnumber != "") { + echo "dial $DECTnumber\n"; + DialNumberIAX( $DECTnumber, mysql_result($Erg, $i, "DateS"), mysql_result($Erg, $i, "RID"), mysql_result($Erg, $i, "TID")); + DialNumberModem( $DECTnumber, mysql_result($Erg, $i, "DateS")); + + if($Z++ > 10) { + $Z = 0; + sleep(30); + } + } + } } -} - -return 0; - + return 0; ?> - diff --git a/services/dect_clear.php b/services/dect_clear.php index 713cce36..b49b1e40 100755 --- a/services/dect_clear.php +++ b/services/dect_clear.php @@ -1,25 +1,19 @@ -) + - diff --git a/services/jabberserver.php b/services/jabberserver.php index 8a80b35c..94ef3a8b 100755 --- a/services/jabberserver.php +++ b/services/jabberserver.php @@ -1,113 +1,75 @@ -Connect() && $jabber->SendAuth())) - die("Couldn't connect to Jabber Server."); -} - - -/****************************************************************************************************/ -// INIT socked -/****************************************************************************************************/ -echo "INIT socked\n"; - //http://de3.php.net/manual/de/function.socket-listen.php -// Create a UDP socket -$sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP) or die('Could not create socked ('.socket_strerror(socket_last_error()). ')'); -// Bind the socket to an address/port -socket_bind($sock, SERVER_ADDRESS, SERVER_PORT) or die('Could not bind to address ('.socket_strerror(socket_last_error()). ')'); -// Setzt Nonbock Mode -socket_set_nonblock($sock); - - -/****************************************************************************************************/ -// Loop continuos -/****************************************************************************************************/ -$RUNNING = TRUE; -while( $RUNNING ) -{ - if( @socket_recvfrom($sock, $data, 65535, 0, $ip, $port)) - { - //daten empfangen - $data = substr($data,0, strlen($data)-1); //ENTER entfernen - echo "\n". gmdate("Y-m-d H:i:s", time()). "\tresive from $ip:$port ". strlen($data). " byte data ($data)\n"; - PackedAnalyser( $data); - } - - usleep(100000); // 100ms delay keeps the doctor away -} // end while - -//disconnect jabber -if( !DEBUG) - $jabber->Disconnect(); - -// Close the master sockets -socket_close($sock); - -/****************************************************************************************************/ -/****************************************** MAIN END ************************************************/ -/****************************************************************************************************/ - - -/****************************************************************************************************/ -//***** function PackedAnalyser -/****************************************************************************************************/ -function PackedAnalyser( $data ) -{ - GLOBAL $jabber, $RUNNING; - // init array - $matches = array(); - - //#message - if( preg_match( "/^#(message) ([^ ]+) (.+)/i", $data, $matches ) ) - { - if( $matches[2]=="" || $matches[3]=="") - { - // Wrong syntax - echo "\t\t\t\t#messaage parameter fail\n"; - } - else - { - // Whisper - if( !DEBUG) - $jabber->SendMessage($value, "normal", NULL, array("body" => $message, "subject" => "Error in Pentabarf"), NULL); - else - echo "\t\t\t\tmessage to:\"". $matches[2]. "\" Text: \"". $matches[3]. "\"\n"; - } - } - elseif( preg_match( "/^#quit/i", $data, $matches ) ) - { - if( DEBUG) - { - echo "\t\t\t\tSystem Shutdown\n\n"; - $RUNNING = FALSE; - } - } - else - { - echo "\t\t\t\tcommand not found\n\n"; - } -} - -?> +Connect() && $jabber->SendAuth())) + die("Couldn't connect to Jabber Server."); + } + + echo "INIT socked\n"; + + // Create a UDP socket + $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP) or die('Could not create socked (' . socket_strerror(socket_last_error()) . ')'); + + // Bind the socket to an address/port + socket_bind($sock, SERVER_ADDRESS, SERVER_PORT) or die('Could not bind to address (' . socket_strerror(socket_last_error()) . ')'); + + // Setzt Nonbock Mode + socket_set_nonblock($sock); + + $RUNNING = true; + + while($RUNNING) { + if(@socket_recvfrom($sock, $data, 65535, 0, $ip, $port)) { + // daten empfangen + $data = substr($data, 0, strlen($data)-1); //ENTER entfernen + echo "\n". gmdate("Y-m-d H:i:s", time()). "\tresive from $ip:$port ". strlen($data). " byte data ($data)\n"; + PackedAnalyser( $data); + } + + usleep(100000); // 100ms delay keeps the doctor away + } // end while + + // disconnect jabber + if(!DEBUG) + $jabber->Disconnect(); + + // Close the master sockets + socket_close($sock); + + function PackedAnalyser($data) { + global $jabber, $RUNNING; + // init array + $matches = array(); + + //#message + if(preg_match("/^#(message) ([^ ]+) (.+)/i", $data, $matches)) { + if($matches[2]=="" || $matches[3]=="") + echo "\t\t\t\t#messaage parameter fail\n"; + else { + // Whisper + if(!DEBUG) + $jabber->SendMessage($value, "normal", NULL, array("body" => $message, "subject" => "Error in Pentabarf"), NULL); + else + echo "\t\t\t\tmessage to:\"". $matches[2]. "\" Text: \"". $matches[3]. "\"\n"; + } + } elseif(preg_match("/^#quit/i", $data, $matches)) { + if(DEBUG) { + echo "\t\t\t\tSystem Shutdown\n\n"; + $RUNNING = false; + } + } else + echo "\t\t\t\tcommand not found\n\n"; + } +?> diff --git a/txt/LICENSE b/txt/LICENSE old mode 100755 new mode 100644 diff --git a/txt/README b/txt/README index d516369a..4d8ca9bb 100644 --- a/txt/README +++ b/txt/README @@ -3,9 +3,9 @@ DIRS: ./DB Standart DB File ./www - daten für http verbindung + daten fuer http verbindung ./www-ssl - daten für https verbindung + daten fuer https verbindung Anfordeungen: ------------- diff --git a/www-ssl/ShowUserPicture.php b/www-ssl/ShowUserPicture.php index 793b5546..b6e95897 100644 --- a/www-ssl/ShowUserPicture.php +++ b/www-ssl/ShowUserPicture.php @@ -1,58 +1,51 @@ - diff --git a/www-ssl/admin/EngelType.php b/www-ssl/admin/EngelType.php old mode 100755 new mode 100644 index 6d640ae4..1aec80dc --- a/www-ssl/admin/EngelType.php +++ b/www-ssl/admin/EngelType.php @@ -6,42 +6,42 @@ include("../../../camp2011/includes/funktion_db.php"); function runSQL( $SQL) { - global $con; - // hier muesste das SQL ausgefuehrt werden... - $Erg = mysql_query($SQL, $con); - if ($Erg) - { - echo "Änderung wurde gesichert...
    "; - echo "[$SQL]
    "; - return 1; - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    "; - echo "[$SQL]
    "; - return 0; - } + global $con; + // hier muesste das SQL ausgefuehrt werden... + $Erg = mysql_query($SQL, $con); + if ($Erg) + { + echo "Änderung wurde gesichert...
    "; + echo "[$SQL]
    "; + return 1; + } + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    ".mysql_error( $con ). "
    "; + echo "[$SQL]
    "; + return 0; + } } function runSQL_log( $SQL, $commed) { - global $con; - // hier muesste das SQL ausgefuehrt werden... - $Erg = db_query($SQL, $commed); - if ($Erg) - { - echo "Änderung wurde gesichert...
    "; - echo "[$SQL]
    "; - return 1; - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    "; - echo "[$SQL]
    "; - return 0; - } + global $con; + // hier muesste das SQL ausgefuehrt werden... + $Erg = db_query($SQL, $commed); + if ($Erg) + { + echo "Änderung wurde gesichert...
    "; + echo "[$SQL]
    "; + return 1; + } + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    ".mysql_error( $con ). "
    "; + echo "[$SQL]
    "; + return 0; + } } @@ -51,33 +51,33 @@ $Erg = mysql_query($Sql, $con); if( !IsSet($_GET["action"]) ) { - echo "Hallo ".$_SESSION['Nick']. - ",
    \nhier hast du die Möglichkeit, neue Engeltypen für die Schichtpläne einzutragen ". - "oder vorhandene abzuändern:

    \n"; + echo "Hallo ".$_SESSION['Nick']. + ",
    \nhier hast du die Möglichkeit, neue Engeltypen für die Schichtpläne einzutragen ". + "oder vorhandene abzuändern:

    \n"; - echo "- Neuen EngelType eintragen
    \n"; - - echo "\n"; - echo "\n"; + echo "- Neuen EngelType eintragen
    \n"; + + echo "
    \n"; + echo "\n"; - for( $i = 1; $i < mysql_num_fields($Erg); $i++ ) - { - echo "\t"; - } - echo "\t"; - echo ""; + for( $i = 1; $i < mysql_num_fields($Erg); $i++ ) + { + echo "\t"; + } + echo "\t"; + echo ""; - for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) - { - echo "\t\n"; - for ($j = 1; $j < mysql_num_fields($Erg); $j++) - { - echo "\t\t\n"; - } - echo "\t\t\n"; - echo "\t\n"; - } // ende Auflistung Raeume - echo "
    ". mysql_field_name($Erg, $i). "Ändern
    ". mysql_field_name($Erg, $i). "Ändern
    ".mysql_result($Erg, $t, $j)."###
    "; + for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) + { + echo "\t\n"; + for ($j = 1; $j < mysql_num_fields($Erg); $j++) + { + echo "\t\t".mysql_result($Erg, $t, $j)."\n"; + } + echo "\t\t###\n"; + echo "\t\n"; + } // ende Auflistung Raeume + echo ""; } else { @@ -85,105 +85,105 @@ else switch ($_GET["action"]) { case 'new': - echo "Neuen EngelType einrichten:
    "; - echo "
    \n"; - echo "\n"; - - for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ ) - { - echo "". - "\n"; - } - echo "
    ".mysql_field_name($Erg, $Uj)."
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - break; + echo "Neuen EngelType einrichten:
    "; + echo "
    \n"; + echo "\n"; + + for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ ) + { + echo "". + "\n"; + } + echo "
    ".mysql_field_name($Erg, $Uj)."
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + break; case 'newsave': - $vars = $_GET; - $count = count($vars) - 1; - $vars = array_splice($vars, 0, $count); - $Keys=""; - $Values=""; - foreach($vars as $key => $value){ - $Keys .= ", `$key`"; - $Values .= ", '$value'"; - } - - if( runSQL_log( "INSERT INTO `EngelType` (". substr($Keys, 2). ") VALUES (". substr($Values, 2). ")", - "save new EngelType") ) - { - SetHeaderGo2Back(); - - $SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='". $_GET["Name"]. "'"; - $ERG = mysql_query($SQL2, $con); - - if( mysql_num_rows($ERG) == 1) - runSQL_log( "ALTER TABLE `Room` ADD `DEFAULT_EID_". mysql_result( $ERG, 0, 0). - "` INT DEFAULT '0' NOT NULL;", - "add new EngelType in Romm Table"); - } - break; + $vars = $_GET; + $count = count($vars) - 1; + $vars = array_splice($vars, 0, $count); + $Keys=""; + $Values=""; + foreach($vars as $key => $value){ + $Keys .= ", `$key`"; + $Values .= ", '$value'"; + } + + if( runSQL_log( "INSERT INTO `EngelType` (". substr($Keys, 2). ") VALUES (". substr($Values, 2). ")", + "save new EngelType") ) + { + SetHeaderGo2Back(); + + $SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='". $_GET["Name"]. "'"; + $ERG = mysql_query($SQL2, $con); + + if( mysql_num_rows($ERG) == 1) + runSQL_log( "ALTER TABLE `Room` ADD `DEFAULT_EID_". mysql_result( $ERG, 0, 0). + "` INT DEFAULT '0' NOT NULL;", + "add new EngelType in Romm Table"); + } + break; case 'change': - if (! IsSet($_GET["TID"])) - echo "Fehlerhafter Aufruf!"; - else - { - echo "Raum abändern:\n"; - echo "Hier kannst du eintragen, den EngelType ändern."; - echo "
    \n"; - echo "\n"; - - $SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'"; - $ERG = mysql_query($SQL2, $con); + if (! IsSet($_GET["TID"])) + echo "Fehlerhafter Aufruf!"; + else + { + echo "Raum abändern:\n"; + echo "Hier kannst du eintragen, den EngelType ändern."; + echo "\n"; + echo "
    \n"; + + $SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'"; + $ERG = mysql_query($SQL2, $con); - for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) - echo "". - "\n"; + for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) + echo "". + "\n"; - echo "
    ". mysql_field_name($ERG, $Uj). "
    ". mysql_field_name($ERG, $Uj). "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo ""; - echo "
    "; - } - break; - + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo ""; + echo "
    "; + } + break; + case 'changesave': $vars = $_GET; $count = count($vars) - 2; $vars = array_splice($vars, 0, $count); - $keys=""; - $sql=""; + $keys=""; + $sql=""; foreach($vars as $key => $value) - { - $keys = substr( $key, 1); - $sql .= ", `". $keys. "`='". $value. "'"; + { + $keys = substr( $key, 1); + $sql .= ", `". $keys. "`='". $value. "'"; } - runSQL_log( "UPDATE `EngelType` SET ". substr($sql, 2). " WHERE `TID`='". $_GET["eTID"]. "'", - "Save Change EngelType"); - SetHeaderGo2Back(); - break; + runSQL_log( "UPDATE `EngelType` SET ". substr($sql, 2). " WHERE `TID`='". $_GET["eTID"]. "'", + "Save Change EngelType"); + SetHeaderGo2Back(); + break; case 'delete': - if (IsSet($_GET["TID"])) - { - if( runSQL_log( "DELETE FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'", "delete EngelType")) - runSQL_log( "ALTER TABLE `Room` DROP `DEFAULT_EID_". $_GET["TID"]. "`;", - "delete EngelType in Room Table"); - } - else - echo "Fehlerhafter Aufruf"; - SetHeaderGo2Back(); - break; + if (IsSet($_GET["TID"])) + { + if( runSQL_log( "DELETE FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'", "delete EngelType")) + runSQL_log( "ALTER TABLE `Room` DROP `DEFAULT_EID_". $_GET["TID"]. "`;", + "delete EngelType in Room Table"); + } + else + echo "Fehlerhafter Aufruf"; + SetHeaderGo2Back(); + break; } } diff --git a/www-ssl/admin/Recentchanges.php b/www-ssl/admin/Recentchanges.php old mode 100755 new mode 100644 index 38c659dd..6bb8f59d --- a/www-ssl/admin/Recentchanges.php +++ b/www-ssl/admin/Recentchanges.php @@ -1,4 +1,4 @@ -\n\tTime\n\tUser\n\tCommend\n\tSQL Comm for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) { - echo "\n"; - echo "\t". mysql_result( $Erg, $n, "Time"). "\n"; - echo "\t". UID2Nick(mysql_result( $Erg, $n, "UID")). displayavatar(mysql_result( $Erg, $n, "UID")). "\n"; - echo "\t". mysql_result( $Erg, $n, "Commend"). "\n"; - echo "\t". mysql_result( $Erg, $n, "SQLCommad"). "\n"; - echo "\n"; + echo "\n"; + echo "\t". mysql_result( $Erg, $n, "Time"). "\n"; + echo "\t". UID2Nick(mysql_result( $Erg, $n, "UID")). displayavatar(mysql_result( $Erg, $n, "UID")). "\n"; + echo "\t". mysql_result( $Erg, $n, "Commend"). "\n"; + echo "\t". mysql_result( $Erg, $n, "SQLCommad"). "\n"; + echo "\n"; } echo "\n"; diff --git a/www-ssl/admin/UserPicture.php b/www-ssl/admin/UserPicture.php old mode 100755 new mode 100644 index 93e75bf1..00716329 --- a/www-ssl/admin/UserPicture.php +++ b/www-ssl/admin/UserPicture.php @@ -7,114 +7,114 @@ include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); if( IsSet($_GET["action"]) ) { - UnSet($SQL); + UnSet($SQL); - switch ($_GET["action"]) - { - case 'FormUpload': - echo "Hier kannst Du ein Foto hochladen för:"; - echo "
    \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t(max ". get_cfg_var("post_max_size"). "Byte)
    \n"; - echo "\t\n"; - echo "
    \n"; - break; - case 'sendPicture': - if( ($_FILES["file"]["size"] > 0) && (isset( $_POST["UID"])) ) - { - if( ($_FILES["file"]["type"] == "image/jpeg") || - ($_FILES["file"]["type"] == "image/png") || - ($_FILES["file"]["type"] == "image/gif") ) - { - $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); + switch ($_GET["action"]) + { + case 'FormUpload': + echo "Hier kannst Du ein Foto hochladen för:"; + echo "
    \n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t(max ". get_cfg_var("post_max_size"). "Byte)
    \n"; + echo "\t\n"; + echo "
    \n"; + break; + case 'sendPicture': + if( ($_FILES["file"]["size"] > 0) && (isset( $_POST["UID"])) ) + { + if( ($_FILES["file"]["type"] == "image/jpeg") || + ($_FILES["file"]["type"] == "image/png") || + ($_FILES["file"]["type"] == "image/gif") ) + { + $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); - if( GetPicturShow( $_POST['UID']) == "") - $SQL = "INSERT INTO `UserPicture` ". - "( `UID`,`Bild`, `ContentType`, `show`) ". - "VALUES ('". $_POST['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')"; - else - $SQL = "UPDATE `UserPicture` SET ". - "`Bild`='$data', ". - "`ContentType`='". $_FILES["file"]["type"]. "' ". - "WHERE `UID`='". $_POST['UID']. "'"; + if( GetPicturShow( $_POST['UID']) == "") + $SQL = "INSERT INTO `UserPicture` ". + "( `UID`,`Bild`, `ContentType`, `show`) ". + "VALUES ('". $_POST['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')"; + else + $SQL = "UPDATE `UserPicture` SET ". + "`Bild`='$data', ". + "`ContentType`='". $_FILES["file"]["type"]. "' ". + "WHERE `UID`='". $_POST['UID']. "'"; - echo "Upload Pictur:'" . $_FILES["file"]["name"] . "', ". - "MIME-Type: " . $_FILES["file"]["type"]. ", ". - $_FILES["file"]["size"]. " Byte ". - "for ". UID2Nick( $_POST["UID"]); - } - else - Print_Text("pub_einstellungen_send_KO"); - } - else - Print_Text("pub_einstellungen_send_KO"); - break; + echo "Upload Pictur:'" . $_FILES["file"]["name"] . "', ". + "MIME-Type: " . $_FILES["file"]["type"]. ", ". + $_FILES["file"]["size"]. " Byte ". + "for ". UID2Nick( $_POST["UID"]); + } + else + Print_Text("pub_einstellungen_send_KO"); + } + else + Print_Text("pub_einstellungen_send_KO"); + break; - case 'SetN': - if (IsSet($_GET["UID"])) - { - echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gesperrt:
    "; - $SQL = "UPDATE `UserPicture` SET `show`='N' WHERE `UID`='". $_GET["UID"]. "'"; - } - else - echo "Fehlerhafter Aufruf"; - break; - case 'SetY': - if (IsSet($_GET["UID"])) - { - echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde Freigegeben:
    "; - $SQL = "UPDATE `UserPicture` SET `show`='Y' WHERE `UID`='". $_GET["UID"]. "'"; - } - else - echo "Fehlerhafter Aufruf"; - break; - case 'del': - echo "Wollen Sie das Bild von '". UID2Nick( $_GET["UID"]). "' wirklich löschen? ". - "Yes"; - break; - case 'delYes': - if (IsSet($_GET["UID"])) - { - echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gelöscht:
    "; - $SQL = "DELETE FROM `UserPicture` WHERE `UID`='". $_GET["UID"]. "' LIMIT 1"; - } - else - echo "Fehlerhafter Aufruf"; - break; - default: - echo "Fehlerhafter Aufruf"; - - } //switch + case 'SetN': + if (IsSet($_GET["UID"])) + { + echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gesperrt:
    "; + $SQL = "UPDATE `UserPicture` SET `show`='N' WHERE `UID`='". $_GET["UID"]. "'"; + } + else + echo "Fehlerhafter Aufruf"; + break; + case 'SetY': + if (IsSet($_GET["UID"])) + { + echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde Freigegeben:
    "; + $SQL = "UPDATE `UserPicture` SET `show`='Y' WHERE `UID`='". $_GET["UID"]. "'"; + } + else + echo "Fehlerhafter Aufruf"; + break; + case 'del': + echo "Wollen Sie das Bild von '". UID2Nick( $_GET["UID"]). "' wirklich löschen? ". + "Yes"; + break; + case 'delYes': + if (IsSet($_GET["UID"])) + { + echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gelöscht:
    "; + $SQL = "DELETE FROM `UserPicture` WHERE `UID`='". $_GET["UID"]. "' LIMIT 1"; + } + else + echo "Fehlerhafter Aufruf"; + break; + default: + echo "Fehlerhafter Aufruf"; + + } //switch - // Update ??? - if (IsSet($SQL)) - { - // hier muesste das SQL ausgefuehrt werden... - $Erg = mysql_query($SQL, $con); - if ($Erg == 1) - echo "Änderung wurde gesichert...
    "; - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    ($SQL)
    "; - } - } // Ende Update - echo "
    \n
    \n
    \n\n"; + // Update ??? + if (IsSet($SQL)) + { + // hier muesste das SQL ausgefuehrt werden... + $Erg = mysql_query($SQL, $con); + if ($Erg == 1) + echo "Änderung wurde gesichert...
    "; + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    ".mysql_error( $con ). "
    ($SQL)
    "; + } + } // Ende Update + echo "
    \n
    \n
    \n\n"; } //IF IsSet($action) //ausgabe der Liste $Sql = "SELECT * FROM `UserPicture` WHERE `UID`>0;"; $Erg = mysql_query($Sql, $con); - -echo "Hallo ". $_SESSION['Nick']. ",
    \nhier hast du die Möglichkeit, die Bilder der Engel freizugeben:

    \n"; + +echo "Hallo ". $_SESSION['Nick']. ",
    \nhier hast du die Möglichkeit, die Bilder der Engel freizugeben:

    \n"; echo "\n"; echo "\n"; @@ -125,25 +125,25 @@ echo "\t\n"; echo ""; for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) -{ - $UIDs = mysql_result($Erg, $t, "UID"); - echo "\t\n"; - - echo "\t\t\n"; - echo "\t\t\n"; - - if( GetPicturShow( $UIDs) == "Y") - echo "\t\t\n"; - elseif( GetPicturShow( $UIDs) == "N") - echo "\t\t\n"; - else - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; +{ + $UIDs = mysql_result($Erg, $t, "UID"); + echo "\t\n"; + + echo "\t\t\n"; + echo "\t\t\n"; + + if( GetPicturShow( $UIDs) == "Y") + echo "\t\t\n"; + elseif( GetPicturShow( $UIDs) == "N") + echo "\t\t\n"; + else + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; } // ende Auflistung Raeume echo "
    Löschen
    ". UID2Nick(mysql_result($Erg, $t, "UID")). "". displayPictur( $UIDs, 0). "sperrenfreigebenERROR: show='". GetPicturShow( $UIDs). "'del
    ". UID2Nick(mysql_result($Erg, $t, "UID")). "". displayPictur( $UIDs, 0). "sperrenfreigebenERROR: show='". GetPicturShow( $UIDs). "'del
    "; -echo "
    picture upload\n"; +echo "
    picture upload\n"; include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/aktiv.php b/www-ssl/admin/aktiv.php old mode 100755 new mode 100644 index f5e8c9c3..68199cfa --- a/www-ssl/admin/aktiv.php +++ b/www-ssl/admin/aktiv.php @@ -1,4 +1,4 @@ -"; -echo Get_Text("pub_aktive_Text1")."
    \n"; -echo Get_Text("pub_aktive_Text2")."

    \n"; - +echo Get_Text("pub_aktive_Text1")."
    \n"; +echo Get_Text("pub_aktive_Text2")."

    \n"; + // auswahlbox echo Get_Text("pub_aktive_Text31")."\n"; echo ""; -echo Get_Text("pub_aktive_Text32")."

    \n"; +echo Get_Text("pub_aktive_Text32")."

    \n"; echo "\n"; echo "\n"; echo "\n"; echo "
    \n"; - echo "\t
    \n"; + echo "\t
    \n"; echo "
    \n"; if( Isset($_POST["ResetActive"]) ) { - $SQLreset = "UPDATE `User` SET `Aktiv`='0'"; - $ErgReset = db_query($SQLreset, "Reset Active"); - if ($ErgReset != 1) - echo "Fehler beim zuruecksetzen der Activ\n"; - else - echo "Active wurde erfolgreich zurueckgesetzt\n"; + $SQLreset = "UPDATE `User` SET `Aktiv`='0'"; + $ErgReset = db_query($SQLreset, "Reset Active"); + if ($ErgReset != 1) + echo "Fehler beim zuruecksetzen der Activ\n"; + else + echo "Active wurde erfolgreich zurueckgesetzt\n"; } if( IsSet($_POST["Anzahl"]) ) - echo "
    \n\n".Get_Text("pub_aktive_Text5_1"). $_POST["Anzahl"]. Get_Text("pub_aktive_Text5_2"). ":"; + echo "
    \n\n".Get_Text("pub_aktive_Text5_1"). $_POST["Anzahl"]. Get_Text("pub_aktive_Text5_2"). ":"; -echo "

    \n\n"; +echo "

    \n\n"; //ausgabe tabelle echo "\n"; @@ -51,15 +51,15 @@ echo "\t\n"; echo "\t\n"; echo "\t\n"; echo "\n"; - + $SQL = " SELECT d.UID, d.nr, d.len, d.lenWeight, f.nr AS nrFree, f.len AS lenFree, d.lenWeight - COALESCE(f.len, 0) as lenReal - FROM - (SELECT e.UID, COUNT(s.Len) as nr, SUM(s.Len) as len, SUM( s.Len*(1+(((HOUR(s.DateS)+2)%24)<10 and ((HOUR(s.DateE)+2)%24)<=10)) ) as lenWeight FROM `Shifts` AS s INNER JOIN `ShiftEntry` AS e USING(SID) WHERE NOT UID=0 GROUP BY UID) as d - LEFT JOIN - (SELECT UID, COUNT(Length) AS nr, SUM(Length) AS len FROM `ShiftFreeloader` GROUP BY UID) AS f - USING(UID) - ORDER BY lenReal DESC, nr DESC, UID"; + FROM + (SELECT e.UID, COUNT(s.Len) as nr, SUM(s.Len) as len, SUM( s.Len*(1+(((HOUR(s.DateS)+2)%24)<10 and ((HOUR(s.DateE)+2)%24)<=10)) ) as lenWeight FROM `Shifts` AS s INNER JOIN `ShiftEntry` AS e USING(SID) WHERE NOT UID=0 GROUP BY UID) as d + LEFT JOIN + (SELECT UID, COUNT(Length) AS nr, SUM(Length) AS len FROM `ShiftFreeloader` GROUP BY UID) AS f + USING(UID) + ORDER BY lenReal DESC, nr DESC, UID"; $Erg = mysql_query($SQL, $con); echo mysql_error($con); @@ -68,42 +68,42 @@ $rowcount = mysql_num_rows($Erg); $aktivecount=0; for ($i=0; $i<$rowcount; $i++) { - echo "\n\n\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; + echo "\n\n\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; - - echo "\t\t\n"; - echo "\t\n"; + + echo "\t\t\n"; + echo "\t\n"; } // ende Auflistung aktive Engel echo "
    Freeloader ". Get_Text("pub_aktive_Time"). "". Get_Text("pub_aktive_Time"). " result". Get_Text("pub_aktive_Active"). "
    ". UID2Nick(mysql_result($Erg, $i, "UID")). "". mysql_result($Erg, $i, "nr"). "x". mysql_result($Erg, $i, "len"). "h". mysql_result($Erg, $i, "lenWeight"). "h". mysql_result($Erg, $i, "nrFree"). "x". mysql_result($Erg, $i, "lenFree"). "h". mysql_result($Erg, $i, "lenReal"). "h
    ". UID2Nick(mysql_result($Erg, $i, "UID")). "". mysql_result($Erg, $i, "nr"). "x". mysql_result($Erg, $i, "len"). "h". mysql_result($Erg, $i, "lenWeight"). "h". mysql_result($Erg, $i, "nrFree"). "x". mysql_result($Erg, $i, "lenFree"). "h". mysql_result($Erg, $i, "lenReal"). "h"; - if (IsSet($_POST["Anzahl"])) - { - if( $_POST["Anzahl"] < mysql_result($Erg, $i, "lenReal") ) - { - $aktivecount++; - if( $_POST["SendType"]=="Show..") - echo "show set"; - else - { - $SQL2="UPDATE `User` SET `Aktiv`='1' WHERE `UID`='". mysql_result($Erg, $i, "UID"). "' LIMIT 1"; - $Erg2 = db_query($SQL2, "update Active State"); - if ($Erg2 != 1) - echo "Fehler beim speichern bei Engel ".UID2Nick(mysql_result($Erg, $i, "UID")); - else - echo "write set"; - } - } - } - echo "
    "; + if (IsSet($_POST["Anzahl"])) + { + if( $_POST["Anzahl"] < mysql_result($Erg, $i, "lenReal") ) + { + $aktivecount++; + if( $_POST["SendType"]=="Show..") + echo "show set"; + else + { + $SQL2="UPDATE `User` SET `Aktiv`='1' WHERE `UID`='". mysql_result($Erg, $i, "UID"). "' LIMIT 1"; + $Erg2 = db_query($SQL2, "update Active State"); + if ($Erg2 != 1) + echo "Fehler beim speichern bei Engel ".UID2Nick(mysql_result($Erg, $i, "UID")); + else + echo "write set"; + } + } + } + echo "
    "; -echo "
    Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)

    "; +echo "
    Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)

    "; include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php old mode 100755 new mode 100644 index 37612d7f..9a329355 --- a/www-ssl/admin/dbUpdateFromXLS.php +++ b/www-ssl/admin/dbUpdateFromXLS.php @@ -1,4 +1,4 @@ -\n

    XML File:

    \n"; +echo "\n\n
    \n

    XML File:

    \n"; if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST["PentabarfURL"])) { - echo "Update XCAL-File from Pentabarf.."; - if($PentabarfGetWith=="fsockopen") - { + echo "Update XCAL-File from Pentabarf.."; + if($PentabarfGetWith=="fsockopen") + { - //backup error messeges and delate - $Backuperror_messages = $error_messages; - $fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30); -// $error_messages = $Backuperror_messages; - - if( !$fp) - { - echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!". - "[$errstr ($errno)]

    "; - } - else - { - if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) - { - $head = 'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n". - 'Host: '. $PentabarfXMLhost. "\r\n". - 'User-Agent: Engelsystem'. "\r\n". - 'Authorization: Basic '. - base64_encode($_POST["PentabarfUser"]. ':'. $_POST["password"])."\r\n". - "\r\n"; - fputs( $fp, $head); - $Zeilen = -1; - while (!feof($fp)) - { - $Temp= fgets($fp,1024); - - // ende des headers - if( $Temp== "f20\r\n" ) - { - $Zeilen = 0; - $Temp=""; - } - - //file ende? - if( $Temp=="0\r\n") - break; + //backup error messeges and delate + $Backuperror_messages = $error_messages; + $fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30); +// $error_messages = $Backuperror_messages; + + if( !$fp) + { + echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!". + "[$errstr ($errno)]

    "; + } + else + { + if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) + { + $head = 'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n". + 'Host: '. $PentabarfXMLhost. "\r\n". + 'User-Agent: Engelsystem'. "\r\n". + 'Authorization: Basic '. + base64_encode($_POST["PentabarfUser"]. ':'. $_POST["password"])."\r\n". + "\r\n"; + fputs( $fp, $head); + $Zeilen = -1; + while (!feof($fp)) + { + $Temp= fgets($fp,1024); + + // ende des headers + if( $Temp== "f20\r\n" ) + { + $Zeilen = 0; + $Temp=""; + } + + //file ende? + if( $Temp=="0\r\n") + break; - if( ($Zeilen>-1) && ($Temp!="ffb\r\n") ) - { - //steuerzeichen ausfiltern - if( strpos( "#$Temp", "\r\n") > 0) - $Temp = substr($Temp, 0, strlen($Temp)-2); - if( strpos( "#$Temp", "1005") > 0) - $Temp = ""; - if( strpos( "#$Temp", "783") > 0) - $Temp = ""; - //schreiben in file - fputs( $fileOut, $Temp); - $Zeilen++; - } - } - fclose( $fileOut); - - echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; - } - else - echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; - fclose($fp); - } - } - elseif($PentabarfGetWith=="fopen") - { - //user uns password in url einbauen - $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". - $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"]; + if( ($Zeilen>-1) && ($Temp!="ffb\r\n") ) + { + //steuerzeichen ausfiltern + if( strpos( "#$Temp", "\r\n") > 0) + $Temp = substr($Temp, 0, strlen($Temp)-2); + if( strpos( "#$Temp", "1005") > 0) + $Temp = ""; + if( strpos( "#$Temp", "783") > 0) + $Temp = ""; + //schreiben in file + fputs( $fileOut, $Temp); + $Zeilen++; + } + } + fclose( $fileOut); + + echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; + } + else + echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; + fclose($fp); + } + } + elseif($PentabarfGetWith=="fopen") + { + //user uns password in url einbauen + $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". + $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"]; - if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE) - { - if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) - { - $Zeilen = 0; - while (!feof($fileIn)) - { - $Zeilen++; - fputs( $fileOut, fgets( $fileIn)); - } - fclose( $fileOut); - echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; - } - else - echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; - fclose( $fileIn); - } - else - echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!

    "; - } - elseif( $PentabarfGetWith=="wget") - { - $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. - " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML". - " --no-check-certificate"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - elseif( $PentabarfGetWith=="lynx") - { - $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - elseif($PentabarfGetWith=="fopen") - { - //user uns password in url einbauen - $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". - $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"]; + if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE) + { + if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) + { + $Zeilen = 0; + while (!feof($fileIn)) + { + $Zeilen++; + fputs( $fileOut, fgets( $fileIn)); + } + fclose( $fileOut); + echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; + } + else + echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; + fclose( $fileIn); + } + else + echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!

    "; + } + elseif( $PentabarfGetWith=="wget") + { + $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ". + "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. + " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML". + " --no-check-certificate"; + echo system( $Command, $Status); + if( $Status==0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } + elseif( $PentabarfGetWith=="lynx") + { + $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ". + "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML"; + echo system( $Command, $Status); + if( $Status==0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } + elseif($PentabarfGetWith=="fopen") + { + //user uns password in url einbauen + $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". + $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"]; - if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE) - { - if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) - { - $Zeilen = 0; - while (!feof($fileIn)) - { - $Zeilen++; - fputs( $fileOut, fgets( $fileIn)); - } - fclose( $fileOut); - echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; - } - else - echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; - fclose( $fileIn); - } - else - echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!

    "; - } - elseif( $PentabarfGetWith=="wget") - { - $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. - " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML". - " --no-check-certificate"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - elseif( $PentabarfGetWith=="lynx") - { - $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - else - echo "

    The PentabarfGetWith='$PentabarfGetWith' not supported

    "; + if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE) + { + if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) + { + $Zeilen = 0; + while (!feof($fileIn)) + { + $Zeilen++; + fputs( $fileOut, fgets( $fileIn)); + } + fclose( $fileOut); + echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; + } + else + echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; + fclose( $fileIn); + } + else + echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!

    "; + } + elseif( $PentabarfGetWith=="wget") + { + $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ". + "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. + " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML". + " --no-check-certificate"; + echo system( $Command, $Status); + if( $Status==0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } + elseif( $PentabarfGetWith=="lynx") + { + $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ". + "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML"; + echo system( $Command, $Status); + if( $Status==0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } + else + echo "

    The PentabarfGetWith='$PentabarfGetWith' not supported

    "; } else { - echo "
    \n"; - echo "\n"; - echo "\t". - "\n"; - echo "\t". - "\n"; - echo "\t". - "\n"; - echo "\t\n"; - echo "
    XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath
    Username:
    Password:
    \n"; - echo "
    \n"; + echo "
    \n"; + echo "\n"; + echo "\t". + "\n"; + echo "\t". + "\n"; + echo "\t". + "\n"; + echo "\t\n"; + echo "
    XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath
    Username:
    Password:
    \n"; + echo "
    \n"; } @@ -235,52 +235,52 @@ $XMLmain = getXMLsubPease( $XMLmain, "VCALENDAR"); if( $ShowDataStrukture) { - echo "

    ";
-	echo $XMLmain->name;
-	echo "
    ";
-	print_r(array_values ($XMLmain->sub));
-	echo "
    "; + echo "

    ";
+  echo $XMLmain->name;
+  echo "
    ";
+  print_r(array_values ($XMLmain->sub));
+  echo "
    "; } /* -echo "
    "; +echo "
    "; $Feld=7; -echo "$Feld#". $XMLmain->sub[$Feld]->name. "
    "; +echo "$Feld#". $XMLmain->sub[$Feld]->name. "
    "; echo "$Feld#". $XMLmain->sub[$Feld]->sub; //print_r(array_values ($XMLmain->sub[$Feld]->sub)); while(list($key, $value) = each($XMLmain->sub[$Feld]->sub)) - echo "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n"; + echo "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n"; echo ""; */ /*############################################################################################## - V e r s i o n + V e r s i o n ##############################################################################################*/ echo "
    \n"; $XMLrelease = getXMLsubPease( $XMLmain, "X-WR-CALDESC"); -echo "release: ". $XMLrelease->data. "
    \n"; +echo "release: ". $XMLrelease->data. "
    \n"; //$XMLreleaseDate = getXMLsubPease( $XMLmain, "RELEASE-DATE"); -//echo "release date: ". $XMLreleaseDate->data. "
    \n"; +//echo "release date: ". $XMLreleaseDate->data. "
    \n"; echo "
    \n"; /*############################################################################################## - V e r s i o n + V e r s i o n ##############################################################################################*/ if( $EnableRoomFunctions) - include("../../../camp2011/includes/funktion_xml_room.php"); + include("../../../camp2011/includes/funktion_xml_room.php"); if( $EnableSchudleFunctions) - include("../../../camp2011/includes/funktion_xml_schudle.php"); + include("../../../camp2011/includes/funktion_xml_schudle.php"); /*############################################################################################## - U P D A T E A L L + U P D A T E A L L ##############################################################################################*/ -echo "\n\n
    \n

    Update ALL:

    \n"; +echo "\n\n
    \n

    Update ALL:

    \n"; echo "
    \n"; echo "\t\n"; diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php old mode 100755 new mode 100644 index b01a8a6c..b2c6357f --- a/www-ssl/admin/debug.php +++ b/www-ssl/admin/debug.php @@ -1,4 +1,4 @@ -Web Counter"; funktion_db_list("Counter"); /* -echo "

    Raeume


    "; +echo "

    Raeume


    "; funktion_db_list("Raeume"); -echo "

    Schichtbelegung


    "; +echo "

    Schichtbelegung


    "; funktion_db_list("Schichtbelegung"); -echo "

    Schichtplan


    Hier findest du alle bisher eingetragenen Schichten:"; +echo "

    Schichtplan


    Hier findest du alle bisher eingetragenen Schichten:"; funktion_db_list("Schichtplan"); -echo "

    User


    "; +echo "

    User


    "; funktion_db_list("User"); -echo "

    News


    "; +echo "

    News


    "; funktion_db_list("News"); -echo "

    FAQ


    "; +echo "

    FAQ


    "; funktion_db_list("FAQ"); echo "Deaktiviert"; @@ -32,34 +32,34 @@ echo "Deaktiviert"; echo "
    \n"; funktion_db_element_list_2row( "Tshirt-Size aller engel", - "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); -echo "
    \n"; + "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); +echo "
    \n"; funktion_db_element_list_2row( "Tshirt ausgegeben", - "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); -echo "
    \n"; + "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); +echo "
    \n"; funktion_db_element_list_2row( "Tshirt nicht ausgegeben (Gekommen=1)", - "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`"); + "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`"); echo "
    \n"; funktion_db_element_list_2row( "Hometown", - "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); -echo "
    \n"; + "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); +echo "
    \n"; funktion_db_element_list_2row( "Engeltypen", - "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); + "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); echo "
    \n"; funktion_db_element_list_2row( "Gesamte Arbeit", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)"); -echo "
    \n"; + "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)"); +echo "
    \n"; funktion_db_element_list_2row( "Geleisteter Arbeit", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)"); + "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)"); echo "
    \n"; funktion_db_element_list_2row( "Gesamte Arbeit (Ohne Raum aufabau (RID=7)", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)"); -echo "
    \n"; + "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)"); +echo "
    \n"; funktion_db_element_list_2row( "Geleisteter Arbeit (Ohne Raum aufabau (RID=7)", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)"); + "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)"); diff --git a/www-ssl/admin/dect.php b/www-ssl/admin/dect.php old mode 100755 new mode 100644 index e6096d27..76409cc6 --- a/www-ssl/admin/dect.php +++ b/www-ssl/admin/dect.php @@ -1,4 +1,4 @@ -\n"; - echo "\n"; + echo "\n"; + echo "
    \n"; - echo "\n"; + echo "\n"; - echo "\n"; + $usql="SELECT * FROM `User` WHERE NOT `DECT`='' ORDER BY `Nick`"; + $uErg = mysql_query($usql, $con); + $urowcount = mysql_num_rows($uErg); + for ($k=0; $k<$urowcount; $k++) + { + echo "\t\n"; + } + echo "\n"; + + echo "\n"; + echo "\n"; - echo "\n"; - echo "\n"; - echo ""; - echo "
    Numberh:m
    Numberh:m
    \n"; - // Listet alle Nicks auf - echo "
    \n"; + // Listet alle Nicks auf + echo "\n"; - - echo "\n"; - echo ":"; - echo "
    \n"; - - echo "
    "; + echo ":"; + echo "\n"; + echo "\n"; + echo ""; + echo "\n"; + + echo ""; include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/dect_call.php b/www-ssl/admin/dect_call.php old mode 100755 new mode 100644 index c69efa17..58c7cfe1 --- a/www-ssl/admin/dect_call.php +++ b/www-ssl/admin/dect_call.php @@ -1,4 +1,4 @@ - Anfragen und FAQ
  • Alle Anfragen
    • -
  • Offene Anfragen ()
    • +
  • Offene Anfragen ()
  • FAQ-Liste editiern
    • diff --git a/www-ssl/admin/faq.php b/www-ssl/admin/faq.php old mode 100755 new mode 100644 index 645c08cd..217e9188 --- a/www-ssl/admin/faq.php +++ b/www-ssl/admin/faq.php @@ -22,119 +22,119 @@ switch ($_GET["quest"]) // *--------------------------------------------------------------------------- case "all": - $SQL="SELECT * FROM `Questions` ORDER BY QID DESC"; + $SQL="SELECT * FROM `Questions` ORDER BY QID DESC"; ?> - Alle Anfragen:
    + Alle Anfragen:
    - - + + - + -\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } - else - { - echo "Nein\n"; - echo "\n"; - echo "\n"; - } - echo ""; - echo "\n"; - } - echo "
    FrageAnfragenderFrageAnfragender Beantwortet? Antwort Antwort vonchangechange
    ".mysql_result($Erg, $n, "Question")."".UID2Nick(mysql_result($Erg, $n, "UID")).""; - if (mysql_result($Erg, $n, "AID")>0) - { - echo "Ja".mysql_result($Erg, $n, "Answer")."".UID2Nick(mysql_result($Erg, $n, "AID"))."  xxx
    \n"; - break; - + echo "\n"; + echo "".mysql_result($Erg, $n, "Question")."\n"; + echo "".UID2Nick(mysql_result($Erg, $n, "UID"))."\n"; + echo ""; + if (mysql_result($Erg, $n, "AID")>0) + { + echo "Ja\n"; + echo "".mysql_result($Erg, $n, "Answer")."\n"; + echo "".UID2Nick(mysql_result($Erg, $n, "AID"))."\n"; + } + else + { + echo "Nein\n"; + echo " \n"; + echo " \n"; + } + echo "xxx"; + echo "\n"; + } + echo "\n"; + break; + case "open": - $SQL="SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC"; - $quest_bearb=1; // Fragenliste anzeigen - echo "\t\tOffene Anfragen:
    \n"; - break; - + $SQL="SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC"; + $quest_bearb=1; // Fragenliste anzeigen + echo "\t\tOffene Anfragen:
    \n"; + break; + case "edit": - if (!IsSet($_GET["QID"])) - echo "\t\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; - else - { - $SQL = "SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'"; - $Erg = mysql_query($SQL, $con); - echo "\t\t
    \n"; - echo "\t\tAnfrage von ". UID2NICK(mysql_result($Erg, 0, "UID")). ":
    \n"; - echo "\t\t\n"; - echo "

    Antwort der Erzengel:
    \n"; - if (mysql_result($Erg, 0, "Answer")=="") - echo "\t\t
    \n"; - else - echo "\t\t\n
    \n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t
    \n"; - if (mysql_result($Erg, 0, "AID")<>"0") - { - echo "\tDu kannst diese Anfrage so wie sie ist, als Engel-FAQ eintrag übernehmen.
    \n"; - echo "Als FAQ-Eintrag sichern...\n"; - } - } // Abfrage der QID - break; + if (!IsSet($_GET["QID"])) + echo "\t\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; + else + { + $SQL = "SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'"; + $Erg = mysql_query($SQL, $con); + echo "\t\t
    \n"; + echo "\t\tAnfrage von ". UID2NICK(mysql_result($Erg, 0, "UID")). ":
    \n"; + echo "\t\t\n"; + echo "

    Antwort der Erzengel:
    \n"; + if (mysql_result($Erg, 0, "Answer")=="") + echo "\t\t
    \n"; + else + echo "\t\t\n
    \n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t
    \n"; + if (mysql_result($Erg, 0, "AID")<>"0") + { + echo "\tDu kannst diese Anfrage so wie sie ist, als Engel-FAQ eintrag übernehmen.
    \n"; + echo "Als FAQ-Eintrag sichern...\n"; + } + } // Abfrage der QID + break; case "save": - if (!IsSet($_GET["QID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten..."; + if (!IsSet($_GET["QID"])) + echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten..."; else - { - $SQL = "UPDATE `Questions` SET `Question`='". $_GET["Question"]. - "', `AID`='". $_SESSION['UID']. "' , `Answer`='". $_GET["Answer"]. "' ". - "WHERE `QID`='". $_GET["QID"]. "' LIMIT 1"; - $Erg = db_query($SQL, "save Question"); - if ($Erg == 1) - { - echo "\tDer Eintrag wurde geändert
    \n"; - SetHeaderGo2Back(); - } - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + { + $SQL = "UPDATE `Questions` SET `Question`='". $_GET["Question"]. + "', `AID`='". $_SESSION['UID']. "' , `Answer`='". $_GET["Answer"]. "' ". + "WHERE `QID`='". $_GET["QID"]. "' LIMIT 1"; + $Erg = db_query($SQL, "save Question"); + if ($Erg == 1) + { + echo "\tDer Eintrag wurde geändert
    \n"; + SetHeaderGo2Back(); + } + else + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; } - break; + break; case "transfer": - if (!IsSet($_GET["QID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; - else - { - $SQL1="SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'"; - $Erg = mysql_query($SQL1, $con); - $SQL2="INSERT INTO `FAQ` Values ('', '". - mysql_result($Erg, 0, "Question")."', '".mysql_result($Erg, 0, "Answer")."')"; - $Erg = db_query($SQL2, "trasfert to request to the FAQ"); - if ($Erg == 1) - echo "\tDer Eintrag wurde übertragen.
    \n"; - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; - } - - break; + if (!IsSet($_GET["QID"])) + echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; + else + { + $SQL1="SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'"; + $Erg = mysql_query($SQL1, $con); + $SQL2="INSERT INTO `FAQ` Values ('', '". + mysql_result($Erg, 0, "Question")."', '".mysql_result($Erg, 0, "Answer")."')"; + $Erg = db_query($SQL2, "trasfert to request to the FAQ"); + if ($Erg == 1) + echo "\tDer Eintrag wurde übertragen.
    \n"; + else + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + } + + break; // *--------------------------------------------------------------------------- // * FAQ - Bearbeitung @@ -143,105 +143,105 @@ case "transfer": // * geaendert oder geloscht werden... // *--------------------------------------------------------------------------- case "faq": - $quest_bearb=0; // keine Fragenliste anzeigen, FAQ editieren... - echo "\tFAQ-Liste:
    "; - echo "Neuen Eintrag"; - - $SQL = "SELECT * FROM `FAQ`"; - $Erg = mysql_query($SQL, $con); + $quest_bearb=0; // keine Fragenliste anzeigen, FAQ editieren... + echo "\tFAQ-Liste:
    "; + echo "Neuen Eintrag"; + + $SQL = "SELECT * FROM `FAQ`"; + $Erg = mysql_query($SQL, $con); - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); - for ($n = 0 ; $n < $Zeilen ; $n++) - if (mysql_result($Erg, $n, "Antwort")!="") - { - echo "\t

    ". mysql_result($Erg, $n, "Frage"). "

    \n"; - echo "\t

    ". mysql_result($Erg, $n, "Antwort")."

    \n"; - echo "\tBearbeiten\n
    ---
    \n"; - } - break; + for ($n = 0 ; $n < $Zeilen ; $n++) + if (mysql_result($Erg, $n, "Antwort")!="") + { + echo "\t

    ". mysql_result($Erg, $n, "Frage"). "

    \n"; + echo "\t

    ". mysql_result($Erg, $n, "Antwort")."

    \n"; + echo "\tBearbeiten\n
    ---
    \n"; + } + break; case "faqedit": if (!IsSet($_GET["FAQID"])) - echo "\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; - else - { - $SQL = "SELECT * FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "'"; - $Erg = mysql_query($SQL, $con); + echo "\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; + else + { + $SQL = "SELECT * FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "'"; + $Erg = mysql_query($SQL, $con); - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); ?> -
    - Frage:
    - -

    - Antwort:
    -
    - "> - - -
    -
    - "> + + Frage:
    + +

    + Antwort:
    +
    + "> + + +
    +
    + "> -
    + \n"; - else - echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gelöscht gewesen?\n"; - } - break; + if (!IsSet($_GET["FAQID"])) + echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; + else + { + $SQL = "DELETE FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1"; + $Erg = db_query($SQL, "delate faq item"); + if ($Erg == 1) + echo "\tDer Eintrag wurde gelöscht
    \n"; + else + echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gelöscht gewesen?\n"; + } + break; case "faqsave"; if (!IsSet($_GET["FAQID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; + echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; else - { - $SQL = "UPDATE `FAQ` SET `Frage`='". $_GET["Frage"]. "', `Antwort`='". $_GET["Antwort"]. - "' WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1"; - $Erg = db_query($SQL, $con); - if ($Erg == 1) - echo "\tDer Eintrag wurde geändert
    \n"; - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + { + $SQL = "UPDATE `FAQ` SET `Frage`='". $_GET["Frage"]. "', `Antwort`='". $_GET["Antwort"]. + "' WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1"; + $Erg = db_query($SQL, $con); + if ($Erg == 1) + echo "\tDer Eintrag wurde geändert
    \n"; + else + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; } - break; + break; case "faqnew": ?> -
    - Frage:
    -

    - Antwort:
    -
    + + Frage:
    +

    + Antwort:
    +
    \n"; + echo "\tDer Eintrag wurde erfasst.
    \n"; else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; break; } //switch ($_GET["quest"]) @@ -251,32 +251,32 @@ case "faqnewsave"; // Fragenliste anzeigen??? if ($quest_bearb==1) { - $Erg = mysql_query($SQL, $con); - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); + $Erg = mysql_query($SQL, $con); + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); - if ($Zeilen==0) - echo "\tkeine vorhanden...\n"; - else - for ($n = 0 ; $n < $Zeilen ; $n++) - { - echo "\t

    ". nl2br(mysql_result($Erg, $n, "Question"))."\n


    \n"; - echo "\tBearbeiten\n"; - echo "
    ---
    \n"; - } - + if ($Zeilen==0) + echo "\tkeine vorhanden...\n"; + else + for ($n = 0 ; $n < $Zeilen ; $n++) + { + echo "\t

    ". nl2br(mysql_result($Erg, $n, "Question"))."\n


    \n"; + echo "\tBearbeiten\n"; + echo "
    ---
    \n"; + } + } } //if (IsSet($_GET["quest"])) else { - echo "Bitte wähle aus, ob du:\n"; - echo "\n"; + echo "Bitte wähle aus, ob du:\n"; + echo "\n"; } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/free.php b/www-ssl/admin/free.php old mode 100755 new mode 100644 index 5ceaebb6..577ef7be --- a/www-ssl/admin/free.php +++ b/www-ssl/admin/free.php @@ -1,4 +1,4 @@ -\n"; +echo "Hallo ".$_SESSION['Nick'].",
    \n"; -echo "

    \n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht verplant sind:

    \n"; +echo "

    \n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht verplant sind:

    \n"; ####################################################### @@ -21,21 +21,21 @@ echo "

    \n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht /* geht nicht ??? unter stabel !! $SQL= "SELECT User.Nick, Schichtplan.*, Schichtbelegung.* ". - "FROM Schichtplan, User LEFT OUTER ". - "JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID ". - "WHERE Schichtplan.SID = Schichtbelegung.SID AND ". - "Schichtplan.Date < now() and ". - "Schichtplan.EndDate > now() ". - "ORDER BY Nick"; - + "FROM Schichtplan, User LEFT OUTER ". + "JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID ". + "WHERE Schichtplan.SID = Schichtbelegung.SID AND ". + "Schichtplan.Date < now() and ". + "Schichtplan.EndDate > now() ". + "ORDER BY Nick"; + $SQL = "SELECT Shifts.*, ShiftEntry.*, User.Nick ". - "FROM User ". - "INNER JOIN (Shifts INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID) ON User.UID = ShiftEntry.UID ". - "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() );"; + "FROM User ". + "INNER JOIN (Shifts INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID) ON User.UID = ShiftEntry.UID ". + "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() );"; */ $SQL = "SELECT Shifts.*, ShiftEntry.* ". - "FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ". - "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND ShiftEntry.UID>0);"; + "FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ". + "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND ShiftEntry.UID>0);"; //SELECT User.Nick, Schichtplan.*, Schichtbelegung. * FROM User LEFT JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID, Schichtplan LEFT JOIN Schichtbelegung ON Schichtplan.SID = Schichtbelegung.SID WHERE Schichtplan.Date < now() and Schichtplan.EndDate > now() ORDER BY Nick @@ -62,27 +62,27 @@ echo "\t\n"; $inuse=""; for ($i=0; $i < $Zeilen; $i++) { - echo "\n"; - echo "". - UID2Nick(mysql_result($Erg, $i, "UID")). "\n"; - echo "\n"; - echo "". mysql_result($Erg, $i, "RID"). "\n"; - echo "". mysql_result($Erg, $i, "DateS"). "\n"; - echo "". mysql_result($Erg, $i, "DateE"). "\n"; - echo "\n"; + echo "\n"; + echo "". + UID2Nick(mysql_result($Erg, $i, "UID")). "\n"; + echo "\n"; + echo "". mysql_result($Erg, $i, "RID"). "\n"; + echo "". mysql_result($Erg, $i, "DateS"). "\n"; + echo "". mysql_result($Erg, $i, "DateE"). "\n"; + echo "\n"; - if ($inuse!="") - $inuse.= " OR "; - $inuse.= "(Nick = \"". UID2Nick(mysql_result($Erg, $i, "UID")). "\")"; + if ($inuse!="") + $inuse.= " OR "; + $inuse.= "(Nick = \"". UID2Nick(mysql_result($Erg, $i, "UID")). "\")"; } if ($inuse!="") - $inuse=" WHERE NOT (".$inuse.")"; + $inuse=" WHERE NOT (".$inuse.")"; echo "\n"; //########################################################################################################## -echo "

    \n\nhier findest du alle Engel, welche zur Zeit in keiner Schichten verplant sind:

    \n"; +echo "

    \n\nhier findest du alle Engel, welche zur Zeit in keiner Schichten verplant sind:

    \n"; echo "\n"; echo "\t\n\t\t\n\t\t\n\t\n"; @@ -91,11 +91,11 @@ $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); for ($i=0; $i < $Zeilen; $i++) { - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\n\n"; + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\n\n"; } echo "
    NickDECT
    ". - mysql_result($Erg, $i, "Nick"). "". mysql_result($Erg, $i, "DECT"). "
    ". + mysql_result($Erg, $i, "Nick"). "". mysql_result($Erg, $i, "DECT"). "
    \n"; diff --git a/www-ssl/admin/free_DECT.php b/www-ssl/admin/free_DECT.php old mode 100755 new mode 100644 index c28c78af..83a4123f --- a/www-ssl/admin/free_DECT.php +++ b/www-ssl/admin/free_DECT.php @@ -1,4 +1,4 @@ -=Now() AND ShiftEntry.UID>0);"; + "FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ". + "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND ShiftEntry.UID>0);"; $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); @@ -21,17 +21,17 @@ $Zeilen = mysql_num_rows($Erg); $inuse=""; for ($i=0; $i < $Zeilen; $i++) { - if ($inuse!="") - $inuse.= " OR "; - $inuse.= "(UID = \"". mysql_result($Erg, $i, "UID"). "\")"; + if ($inuse!="") + $inuse.= " OR "; + $inuse.= "(UID = \"". mysql_result($Erg, $i, "UID"). "\")"; } if ($inuse!="") { - $inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')"; + $inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')"; } else { - $inuse=" WHERE (DECT!='')"; + $inuse=" WHERE (DECT!='')"; } @@ -42,36 +42,36 @@ $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); for ($i=0; $i < $Zeilen; $i++) { - // get DECT number - echo mysql_result($Erg, $i, "DECT"). "\t"; + // get DECT number + echo mysql_result($Erg, $i, "DECT"). "\t"; - // get all user rights - $SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=". mysql_result($Erg, $i, "UID"). ";"; - $Erg_RIGHT = mysql_query($SQL_RIGHT, $con); - $UserRights = mysql_fetch_array($Erg_RIGHT); + // get all user rights + $SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=". mysql_result($Erg, $i, "UID"). ";"; + $Erg_RIGHT = mysql_query($SQL_RIGHT, $con); + $UserRights = mysql_fetch_array($Erg_RIGHT); - foreach( $UserRights as $Var => $Value) - { - if( (strpos( $Var, ".php") === false) AND - (strpos( $Var, "/") === false) AND - (strpos( $Var, "UID") === false) AND - (is_numeric($Var) === false) ) - { - echo "\"".$Var. "\"=". $Value. "\t"; - } - } + foreach( $UserRights as $Var => $Value) + { + if( (strpos( $Var, ".php") === false) AND + (strpos( $Var, "/") === false) AND + (strpos( $Var, "UID") === false) AND + (is_numeric($Var) === false) ) + { + echo "\"".$Var. "\"=". $Value. "\t"; + } + } - // get shift types - $SQL_TYPES = "SELECT TID FROM `ShiftEntry` WHERE UID=". mysql_result($Erg, $i, "UID"). " GROUP BY TID;"; - $Erg_TYPES = mysql_query($SQL_TYPES, $con); - $Zeilen_Typen = mysql_num_rows($Erg_TYPES); - for ($j=0; $j < $Zeilen_Typen; $j++) - { - echo "\"TID_". TID2Type( mysql_result($Erg_TYPES, $j, "TID")). "\"=Y\t"; - } + // get shift types + $SQL_TYPES = "SELECT TID FROM `ShiftEntry` WHERE UID=". mysql_result($Erg, $i, "UID"). " GROUP BY TID;"; + $Erg_TYPES = mysql_query($SQL_TYPES, $con); + $Zeilen_Typen = mysql_num_rows($Erg_TYPES); + for ($j=0; $j < $Zeilen_Typen; $j++) + { + echo "\"TID_". TID2Type( mysql_result($Erg_TYPES, $j, "TID")). "\"=Y\t"; + } - echo "\n"; -// echo "
    "; + echo "\n"; +// echo "
    "; } ?> diff --git a/www-ssl/admin/group.php b/www-ssl/admin/group.php old mode 100755 new mode 100644 index 57945d0d..f42fea97 --- a/www-ssl/admin/group.php +++ b/www-ssl/admin/group.php @@ -1,4 +1,4 @@ -\n"; - echo "\n"; - echo "\tGroupname\n"; - echo "\tLink\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\t\n"; + echo "\t\n"; + echo "\n"; - for ($n = 0 ; $n < $Zeilen ; $n++) { - echo "\n"; - echo "\t\n"; - - echo "\n"; - echo "\n"; - } - - // new form - echo "\n"; - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; - echo "\n"; + for ($n = 0 ; $n < $Zeilen ; $n++) { + echo "\n"; + echo "\t\n"; + + echo "\n"; + echo "\n"; + } + + // new form + echo "\n"; + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; + echo "\n"; - echo "\t
    GroupnameLink
    ".mysql_result($Erg, $n, "Name")."change
    ".mysql_result($Erg, $n, "Name")."change
    \n"; - // Ende Userliste + echo "\t\n"; + // Ende Userliste } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/index.php b/www-ssl/admin/index.php old mode 100755 new mode 100644 index b89bdb93..e7be285c --- a/www-ssl/admin/index.php +++ b/www-ssl/admin/index.php @@ -1,19 +1,19 @@ -\n"; +echo "Hallo Erzengel ".$_SESSION['Nick'].",
    \n"; ?> -du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen.

    +du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen.

    Bitte melde dich hier nach getaner Arbeit immer ab, damit kein anderer hier Änderungen vornehmen kann. - diff --git a/www-ssl/admin/news.php b/www-ssl/admin/news.php old mode 100755 new mode 100644 index 78f49ee2..f25eab93 --- a/www-ssl/admin/news.php +++ b/www-ssl/admin/news.php @@ -1,4 +1,4 @@ - -Hallo ,
    + $rowcount = mysql_num_rows($Erg); + ?> +Hallo ,
    hier kannst du die News säubern... falls jemand auf die Idee kommt, -hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)

    +hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)

    @@ -24,97 +24,97 @@ hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)
    - - -Änd. + +\n"; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t\n"; - } - echo "
    Text Erfasser EngeltreffÄnd.
    ".mysql_result($Erg, $i, "Datum")."".mysql_result($Erg, $i, "Betreff")."".mysql_result($Erg, $i, "Text")."".UID2Nick(mysql_result($Erg, $i, "UID"))."".mysql_result($Erg, $i, "Treffen")."XXX
    "; + for ($i=0; $i < $rowcount; $i++) + { + echo "\t\n"; + echo "\t ".mysql_result($Erg, $i, "Datum").""; + echo "\t ".mysql_result($Erg, $i, "Betreff").""; + echo "\t ".mysql_result($Erg, $i, "Text").""; + echo "\t ".UID2Nick(mysql_result($Erg, $i, "UID")).""; + echo "\t ".mysql_result($Erg, $i, "Treffen").""; + echo "\t XXX"; + echo "\t\n"; + } + echo ""; } else { - unSet($chsql); + unSet($chsql); - switch ($_GET["action"]) - { - case 'change': - if (isset($_GET["date"])) - { - $SQL = "SELECT * FROM `News` WHERE (`Datum`='". $_GET["date"]. "')"; - $Erg = mysql_query($SQL, $con); + switch ($_GET["action"]) + { + case 'change': + if (isset($_GET["date"])) + { + $SQL = "SELECT * FROM `News` WHERE (`Datum`='". $_GET["date"]. "')"; + $Erg = mysql_query($SQL, $con); - if( mysql_num_rows( $Erg)>0) - { - echo "
    \n"; + if( mysql_num_rows( $Erg)>0) + { + echo "\n"; - echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
    Datum
    Betreff
    Text
    Engel
    Treffen
    "; + echo "\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    Datum
    Betreff
    Text
    Engel
    Treffen
    "; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - } - else - echo "FEHLER: Eintrag \"". $_GET["date"]. "\" nicht gefunden"; - } - else - echo "Fehler: \"date\" nicht übergeben"; - break; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + } + else + echo "FEHLER: Eintrag \"". $_GET["date"]. "\" nicht gefunden"; + } + else + echo "Fehler: \"date\" nicht übergeben"; + break; - case 'change_save': - if( isset($_GET["date"]) && isset($_GET["eBetreff"]) && isset($_GET["eText"]) ) - $chsql="UPDATE `News` SET `Betreff`='". $_GET["eBetreff"]. "', `Text`='". $_GET["eText"]. - "', `Treffen`='". $_GET["eTreffen"]. "' WHERE (`Datum`='". $_GET["date"]. "') limit 1"; - else - echo "Fehler: nicht genügend parameter übergeben"; - break; + case 'change_save': + if( isset($_GET["date"]) && isset($_GET["eBetreff"]) && isset($_GET["eText"]) ) + $chsql="UPDATE `News` SET `Betreff`='". $_GET["eBetreff"]. "', `Text`='". $_GET["eText"]. + "', `Treffen`='". $_GET["eTreffen"]. "' WHERE (`Datum`='". $_GET["date"]. "') limit 1"; + else + echo "Fehler: nicht genügend parameter übergeben"; + break; - case 'delete': - if (isset($_POST["date"])) - $chsql="DELETE FROM `News` WHERE `Datum`='". $_POST["date"]. "' LIMIT 1"; - else - echo "Fehler: \"date\" nicht übergeben"; - break; - } //SWITCH + case 'delete': + if (isset($_POST["date"])) + $chsql="DELETE FROM `News` WHERE `Datum`='". $_POST["date"]. "' LIMIT 1"; + else + echo "Fehler: \"date\" nicht übergeben"; + break; + } //SWITCH - if (IsSet($chsql)) - { - // SQL-Statement ausführen... - $Erg = mysql_query($chsql, $con); - If ($Erg == 1) - echo "Änderung erfolgreich gesichert..."; - else - echo "Ein Fehler ist aufgetreten... probiere es am besten nocheinmal... :)

    \n". - mysql_error($con). "

    \n[$chsql]"; - SetHeaderGo2Back(); - } + if (IsSet($chsql)) + { + // SQL-Statement ausführen... + $Erg = mysql_query($chsql, $con); + If ($Erg == 1) + echo "Änderung erfolgreich gesichert..."; + else + echo "Ein Fehler ist aufgetreten... probiere es am besten nocheinmal... :)

    \n". + mysql_error($con). "

    \n[$chsql]"; + SetHeaderGo2Back(); + } }// IF-ELSE include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/room.php b/www-ssl/admin/room.php old mode 100755 new mode 100644 index ebbe1e36..09006675 --- a/www-ssl/admin/room.php +++ b/www-ssl/admin/room.php @@ -9,36 +9,36 @@ $Erg = mysql_query($Sql, $con); if( !IsSet($_GET["action"]) ) { - echo "Hallo ".$_SESSION['Nick']. - ",
    \nhier hast du die Möglichkeit, neue Räume für die Schichtpläne einzutragen ". - "oder vorhandene abzuändern:

    \n"; + echo "Hallo ".$_SESSION['Nick']. + ",
    \nhier hast du die Möglichkeit, neue Räume für die Schichtpläne einzutragen ". + "oder vorhandene abzuändern:

    \n"; - echo "- Neuen Raum/Ort eintragen
    \n"; - - echo "\n"; - echo "\n"; + echo "- Neuen Raum/Ort eintragen
    \n"; + + echo "
    \n"; + echo "\n"; - for( $i = 1; $i < mysql_num_fields($Erg); $i++ ) - { - if( substr( mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_") - echo "\t"; - else - echo "\t"; - } - echo "\t"; - echo ""; + for( $i = 1; $i < mysql_num_fields($Erg); $i++ ) + { + if( substr( mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_") + echo "\t"; + else + echo "\t"; + } + echo "\t"; + echo ""; - for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) - { - echo "\t\n"; - for ($j = 1; $j < mysql_num_fields($Erg); $j++) - { - echo "\t\t\n"; - } - echo "\t\t\n"; - echo "\t\n"; - } // ende Auflistung Raeume - echo "
    Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $i), 12)]. "". mysql_field_name($Erg, $i)."Ändern
    Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $i), 12)]. "". mysql_field_name($Erg, $i)."Ändern
    ".mysql_result($Erg, $t, $j)."###
    "; + for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) + { + echo "\t\n"; + for ($j = 1; $j < mysql_num_fields($Erg); $j++) + { + echo "\t\t".mysql_result($Erg, $t, $j)."\n"; + } + echo "\t\t###\n"; + echo "\t\n"; + } // ende Auflistung Raeume + echo ""; } else { @@ -48,132 +48,132 @@ UnSet($SQL); switch ($_GET["action"]) { case 'new': - echo "Neuen Raum einrichten:
    "; - echo "
    \n"; - echo "\n"; - - for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ ) - { - if( (mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf") ) - { - echo "". - "\n"; - } - else - { - //sonderfall fuer Default Engel - if( substr( mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_") - $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $Uj), 12)]; - else - $FeldName = mysql_field_name($Erg, $Uj); - - echo "". - "\n"; - } - } - echo "
    ". mysql_field_name($Erg, $Uj). "". - "Yes". - "No". - "
    $FeldName"; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - break; + echo "Neuen Raum einrichten:
    "; + echo "
    \n"; + echo "\n"; + + for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ ) + { + if( (mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf") ) + { + echo "". + "\n"; + } + else + { + //sonderfall fuer Default Engel + if( substr( mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_") + $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $Uj), 12)]; + else + $FeldName = mysql_field_name($Erg, $Uj); + + echo "". + "\n"; + } + } + echo "
    ". mysql_field_name($Erg, $Uj). "". + "Yes". + "No". + "
    $FeldName"; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + break; case 'newsave': - $vars = $_GET; - $count = count($vars) - 1; - $vars = array_splice($vars, 0, $count); - $Keys = ""; - $Values = ""; - foreach($vars as $key => $value) - { - $Keys .= ", `$key`"; - $Values .= ", '$value'"; - } - $SQL = "INSERT INTO `Room` (". substr( $Keys, 2). ") VALUES (". substr( $Values, 2). ")"; - SetHeaderGo2Back(); - break; + $vars = $_GET; + $count = count($vars) - 1; + $vars = array_splice($vars, 0, $count); + $Keys = ""; + $Values = ""; + foreach($vars as $key => $value) + { + $Keys .= ", `$key`"; + $Values .= ", '$value'"; + } + $SQL = "INSERT INTO `Room` (". substr( $Keys, 2). ") VALUES (". substr( $Values, 2). ")"; + SetHeaderGo2Back(); + break; case 'change': - if (! IsSet($_GET["RID"])) - echo "Fehlerhafter Aufruf!"; - else - { - $SQL2 = "SELECT * FROM `Room` WHERE `RID`='". $_GET["RID"]. "'"; - $ERG = mysql_query($SQL2, $con); - - if( mysql_num_rows( $ERG)>0) - { - echo "Raum abändern:\n"; - echo "Hier kannst du eintragen, welche und wieviele Engel für den Raum zur Verf?gung stehen müssen."; - echo "
    \n"; - echo "\n"; - - for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) - { - if( (mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf") ) - { - echo "". - "\n"; - } - else - { - if( substr( mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_") - //sonderfall fuer Default Engel - $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($ERG, $Uj), 12)]; - else - $FeldName = mysql_field_name($ERG, $Uj); - echo "". - "\n"; - } - } - echo "
    ". mysql_field_name($Erg, $Uj). "". - "Yes". - "No". - "
    $FeldName". - "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo ""; - echo "
    "; - } - else - echo "FEHLER: Room ID ". $_GET["RID"]. " nicht gefunden"; - } - break; - + if (! IsSet($_GET["RID"])) + echo "Fehlerhafter Aufruf!"; + else + { + $SQL2 = "SELECT * FROM `Room` WHERE `RID`='". $_GET["RID"]. "'"; + $ERG = mysql_query($SQL2, $con); + + if( mysql_num_rows( $ERG)>0) + { + echo "Raum abändern:\n"; + echo "Hier kannst du eintragen, welche und wieviele Engel für den Raum zur Verf?gung stehen müssen."; + echo "
    \n"; + echo "\n"; + + for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) + { + if( (mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf") ) + { + echo "". + "\n"; + } + else + { + if( substr( mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_") + //sonderfall fuer Default Engel + $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($ERG, $Uj), 12)]; + else + $FeldName = mysql_field_name($ERG, $Uj); + echo "". + "\n"; + } + } + echo "
    ". mysql_field_name($Erg, $Uj). "". + "Yes". + "No". + "
    $FeldName". + "
    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo ""; + echo "
    "; + } + else + echo "FEHLER: Room ID ". $_GET["RID"]. " nicht gefunden"; + } + break; + case 'changesave': - $sql=""; - $vars = $_GET; - $count = count($vars) - 2; - $vars = array_splice($vars, 0, $count); - foreach($vars as $key => $value) - { - $keys = substr($key,1); - $sql .= ", `".$keys."`='".$value."' "; - } - $SQL = "UPDATE `Room` SET ". substr($sql, 2). " WHERE `RID`='". $_GET["eRID"]. "'"; - SetHeaderGo2Back(); - break; + $sql=""; + $vars = $_GET; + $count = count($vars) - 2; + $vars = array_splice($vars, 0, $count); + foreach($vars as $key => $value) + { + $keys = substr($key,1); + $sql .= ", `".$keys."`='".$value."' "; + } + $SQL = "UPDATE `Room` SET ". substr($sql, 2). " WHERE `RID`='". $_GET["eRID"]. "'"; + SetHeaderGo2Back(); + break; case 'delete': - if (IsSet($_GET["RID"])) { - $SQL="DELETE FROM `Room` WHERE `RID`='". $_GET["RID"]. "'"; - } else { - echo "Fehlerhafter Aufruf"; - } - SetHeaderGo2Back(); - break; + if (IsSet($_GET["RID"])) { + $SQL="DELETE FROM `Room` WHERE `RID`='". $_GET["RID"]. "'"; + } else { + echo "Fehlerhafter Aufruf"; + } + SetHeaderGo2Back(); + break; } //switch @@ -181,17 +181,17 @@ case 'delete': // Update ??? if (IsSet($SQL)){ -// echo $SQL; - // hier muesste das SQL ausgefuehrt werden... - $Erg = db_query($SQL, "exec SQL"); - if ($Erg == 1) - echo "Änderung wurde gesichert...
    "; - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    ($SQL)
    "; - } -} // Ende Update +// echo $SQL; + // hier muesste das SQL ausgefuehrt werden... + $Erg = db_query($SQL, "exec SQL"); + if ($Erg == 1) + echo "Änderung wurde gesichert...
    "; + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    ".mysql_error( $con ). "
    ($SQL)
    "; + } +} // Ende Update } //IF IsSet($action) diff --git a/www-ssl/admin/schichtplan.1.php b/www-ssl/admin/schichtplan.1.php old mode 100755 new mode 100644 diff --git a/www-ssl/admin/schichtplan.php b/www-ssl/admin/schichtplan.php old mode 100755 new mode 100644 index ba2f8d66..af3cd7d4 --- a/www-ssl/admin/schichtplan.php +++ b/www-ssl/admin/schichtplan.php @@ -6,59 +6,59 @@ include ("../../../camp2011/includes/header.php"); function executeSQL( $SQL) { - global $DEBUG, $con; - - $Erg = mysql_query($SQL, $con); - if( $DEBUG ) - echo "DEBUG SQL: $SQL
    \n"; - if ($Erg == 1) - { - echo "SQL war erfolgreich"; - } - else - { - echo "SQL Fehler (". mysql_error($con).")" ; - } + global $debug, $con; + + $Erg = mysql_query($SQL, $con); + if( $debug ) + echo "DEBUG SQL: $SQL
    \n"; + if ($Erg == 1) + { + echo "SQL war erfolgreich"; + } + else + { + echo "SQL Fehler (". mysql_error($con).")" ; + } } if (!IsSet($_GET["action"])) { -echo "Hallo ".$_SESSION['Nick'].",
    \n"; -echo "hier kannst du Schichten anlegen, ändern oder löschen.

    "; -echo "Neue Schicht einplanen

    \n\n"; +echo "Hallo ".$_SESSION['Nick'].",
    \n"; +echo "hier kannst du Schichten anlegen, ändern oder löschen.

    "; +echo "Neue Schicht einplanen

    \n\n"; echo "
    \n"; ?> - - - - - - - - + + + + + + +\n"; - echo "\t\t\n"; - echo "\t\t\n"; + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; - $sql2= "SELECT `Name` FROM `Room` WHERE `RID`='".mysql_result($Erg, $i, "RID")."'"; - $Erg2 = mysql_query($sql2, $con); - if( mysql_num_rows($Erg2) > 0) - echo "\t\t\n"; - else - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; + $sql2= "SELECT `Name` FROM `Room` WHERE `RID`='".mysql_result($Erg, $i, "RID")."'"; + $Erg2 = mysql_query($sql2, $con); + if( mysql_num_rows($Erg2) > 0) + echo "\t\t\n"; + else + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; } echo "
    DatumRaumDauerÄndern
    DatumRaumDauerÄndern
    ".mysql_result($Erg, $i, "DateS")."
    ".mysql_result($Erg, $i, "DateS")."".mysql_result($Erg2, 0, "Name")."Unbenkannt (RID=". mysql_result($Erg, $i, "RID"). ")".mysql_result($Erg, $i, "Len")." Std. ####
    ".mysql_result($Erg2, 0, "Name")."Unbenkannt (RID=". mysql_result($Erg, $i, "RID"). ")".mysql_result($Erg, $i, "Len")." Std. ####
    \n"; @@ -75,317 +75,317 @@ UnSet($chSQL); switch ($_GET["action"]){ case 'change': - if ( !IsSet($_GET["SID"]) ) - { - echo "Fehlerhafter Aufruf!\n"; - } - else - { - - $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )"; - $Erg = mysql_query($sql, $con); + if ( !IsSet($_GET["SID"]) ) + { + echo "Fehlerhafter Aufruf!\n"; + } + else + { + + $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )"; + $Erg = mysql_query($sql, $con); - echo "Schicht abändern:
    \n"; + echo "Schicht abändern:
    \n"; - // Anzeige Allgemeiner schaischt daten + // Anzeige Allgemeiner schaischt daten echo ""; echo "\n"; echo " ". - "\n"; - echo " \n"; + echo " \n"; - - echo " ". - "\n"; - echo " ". - "\n"; - echo " ". - "\n"; - if( $FromPentabarf == "Y") - { - echo " ". - "\n"; - } + $rowcount = mysql_num_rows($Erg2); + $FromPentabarf = "N"; + for( $i = 0; $i < $rowcount; $i++ ) + { + $RID=mysql_result($Erg2, $i, "RID"); + echo " \n"; + } + echo " \n\n"; + + echo " ". + "\n"; + echo " ". + "\n"; + echo " ". + "\n"; + if( $FromPentabarf == "Y") + { + echo " ". + "\n"; + } echo "
    Schichtbeginn
    Raum\n
    Raum\n\n
    Dauer in h
    Beschreibung
    URL

    !!! Imported from Pentabarf !!!

    Dauer in h
    Beschreibung
    URL

    !!! Imported from Pentabarf !!!

    \n"; - + echo "\n"; echo "\n"; echo "\n"; echo "
    \n\n"; - // Löschen - echo "
    \n"; + // Löschen + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "
    \n\n"; - - echo "ACHTUNG:
    \n"; - echo "Beim Löschen werden die bisher eingetragenen Engel für diese Schicht mitgelöscht.
    \n"; + + echo "ACHTUNG:
    \n"; + echo "Beim Löschen werden die bisher eingetragenen Engel für diese Schicht mitgelöscht.
    \n"; - echo "
    \n\n\n\n"; - - //Freie Engelschichten - $sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `UID`='0'"; - $Erg3 = mysql_query($sql3, $con); - $rowcount = mysql_num_rows($Erg3); - - echo "Folgende Engelschichten sind noch nicht vergeben.\n"; - echo "Und koenen, wenn diese nSchicht nicht benoetigt wird geloet werden:
    \n"; - for ($j=0; $j < $rowcount; $j++) - { - $TID = mysql_result($Erg3, $j, 0); - echo "". - "freie ". TID2Type($TID). Get_Text("inc_schicht_Engel"). "schicht loeschen
    \n"; - } - echo "
    \n\n\n\n"; + echo "
    \n\n\n\n"; + + //Freie Engelschichten + $sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `UID`='0'"; + $Erg3 = mysql_query($sql3, $con); + $rowcount = mysql_num_rows($Erg3); + + echo "Folgende Engelschichten sind noch nicht vergeben.\n"; + echo "Und koenen, wenn diese nSchicht nicht benoetigt wird geloet werden:
    \n"; + for ($j=0; $j < $rowcount; $j++) + { + $TID = mysql_result($Erg3, $j, 0); + echo "". + "freie ". TID2Type($TID). Get_Text("inc_schicht_Engel"). "schicht loeschen
    \n"; + } + echo "
    \n\n\n\n"; - //Ausgabe eingetragener schischten - $sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND NOT `UID`='0'"; - $Erg3 = mysql_query($sql3, $con); - $rowcount = mysql_num_rows($Erg3); - - echo "Folgende Engel Sind fuer die Schicht eingetargen.\n"; - echo "Und koennen, wenn diese nicht zu Schicht erschienen sind ausgetragen werden:
    \n"; - echo "\n". - "". - "". - "". - "". - "". - ""; - - for ($j=0; $j < $rowcount; $j++) - { - $userUID=mysql_result($Erg3, $j, "UID"); - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; - } // FOR + //Ausgabe eingetragener schischten + $sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND NOT `UID`='0'"; + $Erg3 = mysql_query($sql3, $con); + $rowcount = mysql_num_rows($Erg3); + + echo "Folgende Engel Sind fuer die Schicht eingetargen.\n"; + echo "Und koennen, wenn diese nicht zu Schicht erschienen sind ausgetragen werden:
    \n"; + echo "
    nicktypenormalfreeloader :-(
    ". UID2Nick($userUID). "". TID2Type(mysql_result($Erg3, $j, "TID")). Get_Text("inc_schicht_Engel"). "###-austragen-######-austragen-freeloader-###
    \n". + "". + "". + "". + "". + "". + ""; + + for ($j=0; $j < $rowcount; $j++) + { + $userUID=mysql_result($Erg3, $j, "UID"); + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; + } // FOR - echo "
    nicktypenormalfreeloader :-(
    ". UID2Nick($userUID). "". TID2Type(mysql_result($Erg3, $j, "TID")). Get_Text("inc_schicht_Engel"). "###-austragen-######-austragen-freeloader-###

    \n\n\n\n"; + echo "
    \n\n\n\n"; - //Nachtragen von Engeln - echo "Hat ein anderer Engel die Schicht übernommen, trage ihn bitte ein:"; - echo "
    \n"; - echo "\n"; + //Nachtragen von Engeln + echo "Hat ein anderer Engel die Schicht übernommen, trage ihn bitte ein:"; + echo "\n"; + echo "\n"; echo "\n"; - - // Listet alle Nicks auf - echo "\n"; - - echo " als \n"; - - // holt eine liste der benötigten Engel zu dieser Schischt - $sql3 = "SELECT Count(`TID`) AS `CTID`, `TID` FROM `ShiftEntry` "; - $sql3.= "WHERE (`SID`='". $_GET["SID"]. "' AND `UID`='0') "; - $sql3.= "GROUP BY `SID`, `TID`, `UID` "; - $Erg3 = mysql_query($sql3, $con); - $i=-1; - while( ++$i < mysql_num_rows($Erg3)) - { - $EngelNeed[mysql_result($Erg3, $i, "TID")] = mysql_result($Erg3, $i, "CTID"); - } - - // Gibt dei möglich Engeltypen aus und zeigt wíefiel noch beötigt werden - echo "\n"; + if( $FromPentabarf != "Y") + { + echo "\t\n"; + } + + $usql="SELECT * FROM `User` ORDER BY `Nick`"; + $uErg = mysql_query($usql, $con); + $urowcount = mysql_num_rows($uErg); + for ($k=0; $k<$urowcount; $k++) + { + echo "\t\n"; + } + echo "\n"; + + echo " als \n"; + + // holt eine liste der benötigten Engel zu dieser Schischt + $sql3 = "SELECT Count(`TID`) AS `CTID`, `TID` FROM `ShiftEntry` "; + $sql3.= "WHERE (`SID`='". $_GET["SID"]. "' AND `UID`='0') "; + $sql3.= "GROUP BY `SID`, `TID`, `UID` "; + $Erg3 = mysql_query($sql3, $con); + $i=-1; + while( ++$i < mysql_num_rows($Erg3)) + { + $EngelNeed[mysql_result($Erg3, $i, "TID")] = mysql_result($Erg3, $i, "CTID"); + } + + // Gibt dei möglich Engeltypen aus und zeigt wíefiel noch beötigt werden + echo "\n"; - - echo "\n"; - - echo "
    \n Anzahl New\n"; - - echo "
    "; + echo "\n"; + + echo "\n"; + + echo "
    \n Anzahl New\n"; + + echo ""; - } // IF ISSET( - break; + } // IF ISSET( + break; case 'engeladd': - if( $_GET["UIDs"]>0) - { - - $SQL = "SELECT * FROM `ShiftEntry` ". - "WHERE (`SID`='". $_GET["SID"]. "' AND `TID`='". $_GET["TID"]. "' AND `UID`='0')"; - $ERG = mysql_query($SQL, $con); - if( mysql_num_rows($ERG) != 0 ) - { - $chSQL = "UPDATE `ShiftEntry` SET ". - "`UID`='". $_GET["UIDs"]. "', `Comment`='shift added by ".$_SESSION['Nick']."' ". - "WHERE (`SID`='". $_GET["SID"]. "' AND ". - "`TID`='". $_GET["TID"]. "' AND `UID`='0' ) LIMIT 1"; - } - else - { - $chSQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (". - "'". $_GET["SID"]. "', '". $_GET["TID"]. "', ". - "'". $_GET["UIDs"]. "', 'shift added by ".$_SESSION['Nick']."')"; - } - echo "Es wird folgende Schicht zusätzlich eingetragen:
    \n"; - echo "Engel: ".UID2Nick($_GET["UIDs"])."
    \n"; - echo "Bemerkung: Schicht eingetragen durch Erzengel ".$_SESSION['Nick']."
    \n
    \n"; - } - else - { - echo "Es wird folgende Schicht wurde ". $_GET["eAnzahlNew"]. "x zusätzlich eingetragen:
    \n"; - for( $i=0; $i<$_GET["eAnzahlNew"]; $i++) - { - echo "$i.
    \n"; - $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES ("; - $SQL .= "'". $_GET["SID"]. "', '". $_GET["TID"]. "', '0', NULL)"; - $ERG = mysql_query($SQL, $con); - if( $DEBUG ) - echo "DEBUG SQL: $SQL
    \n"; - if ($ERG == 1) - { - echo "Änderung wurde gesichert...
    "; - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; - echo mysql_error($con); - } - echo "Es wird eine weitere Schicht eingetragen:

    \n"; - } - } - break; + if( $_GET["UIDs"]>0) + { + + $SQL = "SELECT * FROM `ShiftEntry` ". + "WHERE (`SID`='". $_GET["SID"]. "' AND `TID`='". $_GET["TID"]. "' AND `UID`='0')"; + $ERG = mysql_query($SQL, $con); + if( mysql_num_rows($ERG) != 0 ) + { + $chSQL = "UPDATE `ShiftEntry` SET ". + "`UID`='". $_GET["UIDs"]. "', `Comment`='shift added by ".$_SESSION['Nick']."' ". + "WHERE (`SID`='". $_GET["SID"]. "' AND ". + "`TID`='". $_GET["TID"]. "' AND `UID`='0' ) LIMIT 1"; + } + else + { + $chSQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (". + "'". $_GET["SID"]. "', '". $_GET["TID"]. "', ". + "'". $_GET["UIDs"]. "', 'shift added by ".$_SESSION['Nick']."')"; + } + echo "Es wird folgende Schicht zusätzlich eingetragen:
    \n"; + echo "Engel: ".UID2Nick($_GET["UIDs"])."
    \n"; + echo "Bemerkung: Schicht eingetragen durch Erzengel ".$_SESSION['Nick']."
    \n
    \n"; + } + else + { + echo "Es wird folgende Schicht wurde ". $_GET["eAnzahlNew"]. "x zusätzlich eingetragen:
    \n"; + for( $i=0; $i<$_GET["eAnzahlNew"]; $i++) + { + echo "$i.
    \n"; + $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES ("; + $SQL .= "'". $_GET["SID"]. "', '". $_GET["TID"]. "', '0', NULL)"; + $ERG = mysql_query($SQL, $con); + if( $debug ) + echo "DEBUG SQL: $SQL
    \n"; + if ($ERG == 1) + { + echo "Änderung wurde gesichert...
    "; + } + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; + echo mysql_error($con); + } + echo "Es wird eine weitere Schicht eingetragen:

    \n"; + } + } + break; case 'engeldel': - $chSQL = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`= 'NULL' WHERE (`SID`='". $_GET["SID"]. - "' AND `UID`='". $_GET["UIDs"]. "') LIMIT 1"; - if( isset($_GET["freeloader"]) && $_GET["freeloader"]==1) - { - $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )"; - $Erg = mysql_query($sql, $con); - if( mysql_num_rows( $Erg) == 1) - { - $UID = $_GET["UIDs"]; - $Length = mysql_result($Erg, 0, "Len"); - $Comment = "Start: ". mysql_result($Erg, 0, "DateS"). "; ". - "Beschreibung: ". mysql_result($Erg, 0, "Man"). "; ". - "Removed by ". $_SESSION['Nick']; - $ch2SQL = - "INSERT INTO `ShiftFreeloader` (`Remove_Time`, `UID`, `Length`, `Comment`) ". - "VALUES ( CURRENT_TIMESTAMP, '$UID', '$Length', '$Comment');"; - } - } - break; + $chSQL = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`= 'NULL' WHERE (`SID`='". $_GET["SID"]. + "' AND `UID`='". $_GET["UIDs"]. "') LIMIT 1"; + if( isset($_GET["freeloader"]) && $_GET["freeloader"]==1) + { + $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )"; + $Erg = mysql_query($sql, $con); + if( mysql_num_rows( $Erg) == 1) + { + $UID = $_GET["UIDs"]; + $Length = mysql_result($Erg, 0, "Len"); + $Comment = "Start: ". mysql_result($Erg, 0, "DateS"). "; ". + "Beschreibung: ". mysql_result($Erg, 0, "Man"). "; ". + "Removed by ". $_SESSION['Nick']; + $ch2SQL = + "INSERT INTO `ShiftFreeloader` (`Remove_Time`, `UID`, `Length`, `Comment`) ". + "VALUES ( CURRENT_TIMESTAMP, '$UID', '$Length', '$Comment');"; + } + } + break; case 'engelshiftdel': - $chSQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `TID`='". - $_GET["TID"]. "' AND `UID`='0' LIMIT 1"; - break; + $chSQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `TID`='". + $_GET["TID"]. "' AND `UID`='0' LIMIT 1"; + break; case 'changesave': - $query = mysql_query("SELECT DATE_ADD('". $_GET["eDate"]. "', INTERVAL '+0 ". $_GET["eDauer"]. "' DAY_HOUR)", $con); - $enddate = mysql_fetch_row($query); - - $chSQL = "UPDATE `Shifts` SET ". - "`DateS`='". $_GET["eDate"]. "', ". - "`DateE`='".$enddate[0]. "', ". - "`RID`='". $_GET["eRID"]. "', ". - "`Len`='". $_GET["eDauer"]. "', ". - "`Man`='". $_GET["eName"]. "', ". - "`URL`='". $_GET["eURL"]. "' ". - "WHERE `SID`='". $_GET["SID"]. "'"; - SetHeaderGo2Back(); - break; - + $query = mysql_query("SELECT DATE_ADD('". $_GET["eDate"]. "', INTERVAL '+0 ". $_GET["eDauer"]. "' DAY_HOUR)", $con); + $enddate = mysql_fetch_row($query); + + $chSQL = "UPDATE `Shifts` SET ". + "`DateS`='". $_GET["eDate"]. "', ". + "`DateE`='".$enddate[0]. "', ". + "`RID`='". $_GET["eRID"]. "', ". + "`Len`='". $_GET["eDauer"]. "', ". + "`Man`='". $_GET["eName"]. "', ". + "`URL`='". $_GET["eURL"]. "' ". + "WHERE `SID`='". $_GET["SID"]. "'"; + SetHeaderGo2Back(); + break; + case 'delete': - $chSQL = "DELETE FROM `Shifts` WHERE `SID`='". $_GET["SID"]. "' LIMIT 1"; - $ch2SQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "'"; - SetHeaderGo2Back(); - break; + $chSQL = "DELETE FROM `Shifts` WHERE `SID`='". $_GET["SID"]. "' LIMIT 1"; + $ch2SQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "'"; + SetHeaderGo2Back(); + break; case 'deleteShifs': - foreach ($_GET as $k => $v) - if( strpos( " ".$k, "SID") == 1) - { - echo "Shifts $v wird gelöscht..."; - executeSQL( "DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1"); - echo "
    \n"; - echo "ShiftEntry $v wird gelöscht..."; - executeSQL( "DELETE FROM `ShiftEntry` WHERE `SID`='$v'"); - echo "

    \n"; - } - break; + foreach ($_GET as $k => $v) + if( strpos( " ".$k, "SID") == 1) + { + echo "Shifts $v wird gelöscht..."; + executeSQL( "DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1"); + echo "
    \n"; + echo "ShiftEntry $v wird gelöscht..."; + executeSQL( "DELETE FROM `ShiftEntry` WHERE `SID`='$v'"); + echo "

    \n"; + } + break; } // end switch if (IsSet($chSQL)){ // echo $chSQL; - // hier muesste das SQL ausgefuehrt werden... - $Erg = mysql_query($chSQL, $con); - if( $DEBUG ) - echo "DEBUG SQL: $chSQL
    \n"; - if ($Erg == 1) - { - echo "Änderung wurde gesichert...
    "; - if( $DEBUG ) - echo "DEBUG: ergebniss". $Erg. "
    \n"; - if (IsSet($ch2SQL)) - { - $Erg = mysql_query($ch2SQL, $con); - if( $DEBUG ) - echo "DEBUG SQL: $ch2SQL
    \n"; - if( $DEBUG ) echo "DEBUG: ergebniss". $Erg. "
    \n"; - } - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; - echo mysql_error($con); - } + // hier muesste das SQL ausgefuehrt werden... + $Erg = mysql_query($chSQL, $con); + if( $debug ) + echo "DEBUG SQL: $chSQL
    \n"; + if ($Erg == 1) + { + echo "Änderung wurde gesichert...
    "; + if( $debug ) + echo "DEBUG: ergebniss". $Erg. "
    \n"; + if (IsSet($ch2SQL)) + { + $Erg = mysql_query($ch2SQL, $con); + if( $debug ) + echo "DEBUG SQL: $ch2SQL
    \n"; + if( $debug ) echo "DEBUG: ergebniss". $Erg. "
    \n"; + } + } + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; + echo mysql_error($con); + } } // Ende Update } diff --git a/www-ssl/admin/schichtplan_druck.1.php b/www-ssl/admin/schichtplan_druck.1.php old mode 100755 new mode 100644 diff --git a/www-ssl/admin/schichtplan_druck.php b/www-ssl/admin/schichtplan_druck.php old mode 100755 new mode 100644 index 23e65166..ef097043 --- a/www-ssl/admin/schichtplan_druck.php +++ b/www-ssl/admin/schichtplan_druck.php @@ -6,49 +6,49 @@ $submenus = 1; if (!IsSet($_GET["action"])) { - include ("../../../camp2011/includes/header.php"); - include ("../../../camp2011/includes/funktionen.php"); - include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); - include ("../../../camp2011/includes/funktion_schichtplan.php"); + include ("../../../camp2011/includes/header.php"); + include ("../../../camp2011/includes/funktionen.php"); + include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); + include ("../../../camp2011/includes/funktion_schichtplan.php"); - echo "Hallo ". $_SESSION['Nick']. "
    \n". - "auf dieser Seite kannst du dir den Schichtplan in einer Druckansicht generieren lassen. Wähle hierfür ein Datum und den Raum:\n". - "
    \n"; - - foreach( $VeranstaltungsTage as $k => $v) - { - - $res = mysql_query("SELECT Name, RID FROM `Room` WHERE `show`!='N' ORDER BY `Name`;",$con); - for ($i = 0; $i < mysql_num_rows($res); $i++) - { - $Tag = $VeranstaltungsTage[$k]; - $RID = mysql_result($res,$i,"RID"); - $Rname = mysql_result($res, $i, "Name"); - echo "\t$Tag $Rname
    \n"; - } - echo "
    \n"; - } - echo "

    "; - - include ("../../../camp2011/includes/footer.php"); + echo "Hallo ". $_SESSION['Nick']. "
    \n". + "auf dieser Seite kannst du dir den Schichtplan in einer Druckansicht generieren lassen. Wähle hierfür ein Datum und den Raum:\n". + "
    \n"; + + foreach( $VeranstaltungsTage as $k => $v) + { + + $res = mysql_query("SELECT Name, RID FROM `Room` WHERE `show`!='N' ORDER BY `Name`;",$con); + for ($i = 0; $i < mysql_num_rows($res); $i++) + { + $Tag = $VeranstaltungsTage[$k]; + $RID = mysql_result($res,$i,"RID"); + $Rname = mysql_result($res, $i, "Name"); + echo "\t$Tag $Rname
    \n"; + } + echo "
    \n"; + } + echo "

    "; + + include ("../../../camp2011/includes/footer.php"); } -else //################################################################# +else //################################################################# { if (IsSet($_GET["Raum"]) AND IsSet($_GET["ausdatum"])) - { - $Raum = $_GET["Raum"]; - $ausdatum = $_GET["ausdatum"]; + { + $Raum = $_GET["Raum"]; + $ausdatum = $_GET["ausdatum"]; - include ("../../../camp2011/includes/config_db.php"); - include ("../../../camp2011/includes/config.php"); - include ("../../../camp2011/includes/secure.php"); - //var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!! - $_SESSION['CVS'][ "admin/schichtplan.php" ] = "N"; - include ("../../../camp2011/includes/funktion_lang.php"); - include ("../../../camp2011/includes/funktion_schichtplan.php"); - include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); - include ("../../../camp2011/includes/funktion_user.php"); - ?> + include ("../../../camp2011/includes/config_db.php"); + include ("../../../camp2011/includes/config.php"); + include ("../../../camp2011/includes/secure.php"); + //var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!! + $_SESSION['CVS'][ "admin/schichtplan.php" ] = "N"; + include ("../../../camp2011/includes/funktion_lang.php"); + include ("../../../camp2011/includes/funktion_schichtplan.php"); + include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); + include ("../../../camp2011/includes/funktion_user.php"); + ?> @@ -67,55 +67,55 @@ else //#################################################################

    Schichtplan

    - - - - + + + +
    - Datum: - - - Raum: - -
    + Datum: + + + Raum: + +
    - - - - - + + + +\n"; - if( $j==0) - { - $Spalten[$i * $GlobalZeileProStunde + $j].= - "\t\t\n"; - - } - } + for( $j = 0; $j < $GlobalZeileProStunde; $j++) + { + $Spalten[$i * $GlobalZeileProStunde + $j] = + "\t\n"; + if( $j==0) + { + $Spalten[$i * $GlobalZeileProStunde + $j].= + "\t\t\n"; + + } + } CreateRoomShifts( $Raum ); // Ausgabe Zeilen - for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) echo $Spalten[$i]; + for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) echo $Spalten[$i]; // Ende echo "
    UhrzeitSchichtplanbelegung
    UhrzeitSchichtplanbelegung
    "; - if( $i < 10 ) - $Spalten[$i * $GlobalZeileProStunde + $j].= "0"; - $Spalten[$i * $GlobalZeileProStunde + $j].= "$i:"; - if( ( ($j*60) / $GlobalZeileProStunde) < 10 ) - $Spalten[$i * $GlobalZeileProStunde + $j].= "0"; - $Spalten[$i * $GlobalZeileProStunde + $j].= - ( ($j*60) / $GlobalZeileProStunde). "
    "; + if( $i < 10 ) + $Spalten[$i * $GlobalZeileProStunde + $j].= "0"; + $Spalten[$i * $GlobalZeileProStunde + $j].= "$i:"; + if( ( ($j*60) / $GlobalZeileProStunde) < 10 ) + $Spalten[$i * $GlobalZeileProStunde + $j].= "0"; + $Spalten[$i * $GlobalZeileProStunde + $j].= + ( ($j*60) / $GlobalZeileProStunde). "
    \n"; diff --git a/www-ssl/admin/shiftadd.php b/www-ssl/admin/shiftadd.php old mode 100755 new mode 100644 index 7c64543f..34c248fa --- a/www-ssl/admin/shiftadd.php +++ b/www-ssl/admin/shiftadd.php @@ -6,61 +6,61 @@ include ("../../../camp2011/includes/header.php"); $Time = time()+3600+3600; -echo "Hallo ".$_SESSION['Nick'].",
    \n"; +echo "Hallo ".$_SESSION['Nick'].",
    \n"; // erstellt ein Array der Reume - $sql = "SELECT `RID`, `Name` FROM `Room` ORDER BY `Name`"; - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); + $sql = "SELECT `RID`, `Name` FROM `Room` ORDER BY `Name`"; + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); - $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); - } + for ($i=0; $i<$rowcount; $i++) + { + $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); + $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); + } // erstellt ein Aray der Engeltypen - $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); + $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); - $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); - } + for ($i=0; $i<$rowcount; $i++) + { + $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); + $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); + } // sesion mit stanadrt werten befüllen if( !isset( $_SESSION['shiftadd.php']['SchichtName'])) { - $_SESSION['shiftadd.php']['SchichtName'] = "--???--"; - $_SESSION['shiftadd.php']['RID'] = ""; - $_SESSION['shiftadd.php']['MonthJahr'] = gmdate("Y-m", $Time); - $_SESSION['shiftadd.php']['SDatum'] = gmdate("d", $Time); - $_SESSION['shiftadd.php']['STime'] = "10"; - $_SESSION['shiftadd.php']['MoreThenOne'] = "ON"; - $_SESSION['shiftadd.php']['EDatum'] = gmdate("d", $Time); - $_SESSION['shiftadd.php']['ETime'] = "12"; - $_SESSION['shiftadd.php']['len'] = "2"; - $_SESSION['shiftadd.php']['NachtON'] = "OFF"; - $_SESSION['shiftadd.php']['len_night'] = "00-04-08-10-12-14-16-18-20-22-24"; + $_SESSION['shiftadd.php']['SchichtName'] = "--???--"; + $_SESSION['shiftadd.php']['RID'] = ""; + $_SESSION['shiftadd.php']['MonthJahr'] = gmdate("Y-m", $Time); + $_SESSION['shiftadd.php']['SDatum'] = gmdate("d", $Time); + $_SESSION['shiftadd.php']['STime'] = "10"; + $_SESSION['shiftadd.php']['MoreThenOne'] = "ON"; + $_SESSION['shiftadd.php']['EDatum'] = gmdate("d", $Time); + $_SESSION['shiftadd.php']['ETime'] = "12"; + $_SESSION['shiftadd.php']['len'] = "2"; + $_SESSION['shiftadd.php']['NachtON'] = "OFF"; + $_SESSION['shiftadd.php']['len_night'] = "00-04-08-10-12-14-16-18-20-22-24"; } // wenn werte übergeben in sesion eintragen if( !isset($_GET["NachtON"])) - $_GET["NachtON"] = "OFF"; + $_GET["NachtON"] = "OFF"; if( !isset($_GET["MoreThenOne"])) - $_GET["MoreThenOne"] = "OFF"; + $_GET["MoreThenOne"] = "OFF"; if( isset( $_GET["SchichtName"])) { - foreach ($_GET as $k => $v) - { - $_SESSION['shiftadd.php'][$k] = $v; - } + foreach ($_GET as $k => $v) + { + $_SESSION['shiftadd.php'][$k] = $v; + } } if (!IsSet($_GET["action"])) - $_GET["action"] = "new"; + $_GET["action"] = "new"; switch( $_GET["action"]) { @@ -70,187 +70,187 @@ Hier kannst du neue Schichten eintragen. Dazu musst du den Anfang und das Ende d Über die Länge der Schichten errechnet sich dadurch die Anzahl dieser. Dadurch können gleich mehrere Schichten auf einmal erfasst werden: -
    + - + - + - + - + - + - + - + - + -\n"; - echo " \n"; - } +\n"; + echo " \n"; + } ?>
    Name:">">
    Ort:
    Zeit:
    Month.Jahr:">">
    Beginn:Date"> - Time">Date"> + Time">
    More then One>>
    End:Date"> - Time">Date"> + Time">
    Länge in h:">">
    Sonderschichten ein:>>
    Sonder in h (Time;Time):">">
    Anzahl Engel je Type:
    ". $TTemp["Name"]. ":". $TTemp["Name"]. ":
    -
    +
    - 0)) { - $lenOrg = $_GET["len"]; - if( $_GET["NachtON"] == "ON" ) - { - $lenArrayDummy = explode( "-", $_GET["len_night"]); + $lenOrg = $_GET["len"]; + if( $_GET["NachtON"] == "ON" ) + { + $lenArrayDummy = explode( "-", $_GET["len_night"]); foreach ( $lenArrayDummy as $Temp ) { - if( isset($Temp2) ) - $lenArray[intval($Temp2)] = intval($Temp)-intval($Temp2); - $Temp2 = $Temp; - }//foreach - }//IF( $NachtON == "ON" ) + if( isset($Temp2) ) + $lenArray[intval($Temp2)] = intval($Temp)-intval($Temp2); + $Temp2 = $Temp; + }//foreach + }//IF( $NachtON == "ON" ) - echo "\n"; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - - $DateEnd = $_GET["SDatum"]; - $TimeEnd = intval($_GET["STime"]); - $len=0; - do - { - // define Start time - $Date = $DateEnd; - $Time = $TimeEnd; - $_DateS = $_GET["MonthJahr"]. "-". $Date. " ". $Time. ":00:00"; - - // define End time - if( $_GET["NachtON"] == "ON" ) - { - if( !isset($lenArray[$Time])) die("Zeit $Time h nicht definiert."); - $_GET["len"] = $lenArray[$Time]; - if( $_GET["len"]<1) die("len <1"); - } - $TimeEnd = $Time+ $_GET["len"]; - - //Tagesüberschreitung - while( $TimeEnd >= 24 ) - { - $TimeEnd -= 24; - $DateEnd += 1; - } - //ist schischt zu lang dan verkürzen - if( $DateEnd > $_GET["EDatum"] || ($DateEnd == $_GET["EDatum"] && $TimeEnd >= $_GET["ETime"]) ) - { - $_GET["len"] -= ($DateEnd- $_GET["EDatum"])*24; - $_GET["len"] -= ($TimeEnd- $_GET["ETime"]); // -(-) ->> + - $DateEnd = $_GET["EDatum"]; - $TimeEnd = $_GET["ETime"]; - } - $_DateE = $_GET["MonthJahr"]. "-". $DateEnd. " ". $TimeEnd. ":00:00"; + echo "
    StartEndlenRIDBeschreibungEntry 'Shifts'SIDEntrys
    \n"; + echo "\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\n"; + + $DateEnd = $_GET["SDatum"]; + $TimeEnd = intval($_GET["STime"]); + $len=0; + do + { + // define Start time + $Date = $DateEnd; + $Time = $TimeEnd; + $_DateS = $_GET["MonthJahr"]. "-". $Date. " ". $Time. ":00:00"; + + // define End time + if( $_GET["NachtON"] == "ON" ) + { + if( !isset($lenArray[$Time])) die("Zeit $Time h nicht definiert."); + $_GET["len"] = $lenArray[$Time]; + if( $_GET["len"]<1) die("len <1"); + } + $TimeEnd = $Time+ $_GET["len"]; + + //Tagesüberschreitung + while( $TimeEnd >= 24 ) + { + $TimeEnd -= 24; + $DateEnd += 1; + } + //ist schischt zu lang dan verkürzen + if( $DateEnd > $_GET["EDatum"] || ($DateEnd == $_GET["EDatum"] && $TimeEnd >= $_GET["ETime"]) ) + { + $_GET["len"] -= ($DateEnd- $_GET["EDatum"])*24; + $_GET["len"] -= ($TimeEnd- $_GET["ETime"]); // -(-) ->> + + $DateEnd = $_GET["EDatum"]; + $TimeEnd = $_GET["ETime"]; + } + $_DateE = $_GET["MonthJahr"]. "-". $DateEnd. " ". $TimeEnd. ":00:00"; - if( $_DateS != $_DateE ) - CreateNewEntry(); - - if( $_GET["MoreThenOne"]!="ON" ) break; - if( $DateEnd >= $_GET["EDatum"] && $TimeEnd >= intval($_GET["ETime"]) ) break; - } while( true ); - echo "
    StartEndlenRIDBeschreibungEntry 'Shifts'SIDEntrys
    "; - - if( $_GET["OnlyShow"]=="ON" ) - { - echo "
    "; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - foreach ($EngelType As $TTemp) - { - $Temp = "EngelType".$TTemp["TID"]; - echo "\n\t"; - } - echo "\n\t"; - echo "\n\t"; - echo "\n
    "; - } //if + if( $_DateS != $_DateE ) + CreateNewEntry(); + + if( $_GET["MoreThenOne"]!="ON" ) break; + if( $DateEnd >= $_GET["EDatum"] && $TimeEnd >= intval($_GET["ETime"]) ) break; + } while( true ); + echo ""; + + if( $_GET["OnlyShow"]=="ON" ) + { + echo "
    "; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + foreach ($EngelType As $TTemp) + { + $Temp = "EngelType".$TTemp["TID"]; + echo "\n\t"; + } + echo "\n\t"; + echo "\n\t"; + echo "\n
    "; + } //if } //IF break; case 'engeldel': - break; + break; } // end switch @@ -258,100 +258,100 @@ case 'engeldel': function CreateNewEntry() { - global $con, $_DateS, $_DateE, $EngelType, $DEBUG; - foreach ($EngelType As $TTemp) - { - $Temp = "EngelType".$TTemp["TID"]; - global $$Temp; - } + global $con, $_DateS, $_DateE, $EngelType, $debug; + foreach ($EngelType As $TTemp) + { + $Temp = "EngelType".$TTemp["TID"]; + global $$Temp; + } - echo "\n"; + echo "\n"; - echo "\t$_DateS\n"; - echo "\t$_DateE\n"; - echo "\t". $_GET["len"]. "\n"; - echo "\t". $_GET["RID"]. "\n"; - echo "\t". $_GET["SchichtName"]. "\n"; - - - // Ist eintarg schon vorhanden? - $SQL = "SELECT `SID` FROM `Shifts` "; - $SQL .= "WHERE (". - "`DateS` = '". $_DateS. "' AND ". - "`DateE` = '". $_DateE. "' AND ". - "`RID` = '". $_GET["RID"]. "');"; - $Erg = mysql_query($SQL, $con); - - if( mysql_num_rows($Erg) != 0 ) - echo "\texists"; - elseif( $_GET["OnlyShow"] == "OFF" ) - { - // erstellt Eintrag in Shifts für die algemeine schicht - $SQL = "INSERT INTO `Shifts` ( `DateS`, `DateE`, `Len`, `RID`, `Man`) VALUES ( "; - $SQL .= "'". $_DateS. "', '". $_DateE. "', "; - $SQL .= "'". $_GET["len"]. "', '". $_GET["RID"]. "', "; - $SQL .= "'". $_GET["SchichtName"]. "');"; - $Erg = db_query($SQL, "create shift"); + echo "\t$_DateS\n"; + echo "\t$_DateE\n"; + echo "\t". $_GET["len"]. "\n"; + echo "\t". $_GET["RID"]. "\n"; + echo "\t". $_GET["SchichtName"]. "\n"; + + + // Ist eintarg schon vorhanden? + $SQL = "SELECT `SID` FROM `Shifts` "; + $SQL .= "WHERE (". + "`DateS` = '". $_DateS. "' AND ". + "`DateE` = '". $_DateE. "' AND ". + "`RID` = '". $_GET["RID"]. "');"; + $Erg = mysql_query($SQL, $con); + + if( mysql_num_rows($Erg) != 0 ) + echo "\texists"; + elseif( $_GET["OnlyShow"] == "OFF" ) + { + // erstellt Eintrag in Shifts für die algemeine schicht + $SQL = "INSERT INTO `Shifts` ( `DateS`, `DateE`, `Len`, `RID`, `Man`) VALUES ( "; + $SQL .= "'". $_DateS. "', '". $_DateE. "', "; + $SQL .= "'". $_GET["len"]. "', '". $_GET["RID"]. "', "; + $SQL .= "'". $_GET["SchichtName"]. "');"; + $Erg = db_query($SQL, "create shift"); - $SQLFail = "\n\t
    [".$SQL. "]"; + $SQLFail = "\n\t
    [".$SQL. "]"; - if ($Erg == 1) echo "\tpass\n"; - else echo "\tfail
    \n". mysql_error($con). "$SQLFail\n"; + if ($Erg == 1) echo "\tpass\n"; + else echo "\tfail
    \n". mysql_error($con). "$SQLFail\n"; - } else - echo "\tonly show\n"; - - // sucht SID von eingetragennen schiten - $SQL = "SELECT SID FROM `Shifts` "; - $SQL .= "WHERE (". - "`DateS` = '". $_DateS. "' AND ". - "`DateE` = '". $_DateE. "' AND ". - "`Len` = '". $_GET["len"]. "' AND ". - "`RID` = '". $_GET["RID"]. "');"; - $Erg = mysql_query($SQL, $con); - if( mysql_num_rows($Erg) == 0 ) - echo "\t?"; - else - { - $SID = mysql_result($Erg, 0, "SID"); - echo "\t". $SID. ""; - } + } else + echo "\tonly show\n"; + + // sucht SID von eingetragennen schiten + $SQL = "SELECT SID FROM `Shifts` "; + $SQL .= "WHERE (". + "`DateS` = '". $_DateS. "' AND ". + "`DateE` = '". $_DateE. "' AND ". + "`Len` = '". $_GET["len"]. "' AND ". + "`RID` = '". $_GET["RID"]. "');"; + $Erg = mysql_query($SQL, $con); + if( mysql_num_rows($Erg) == 0 ) + echo "\t?"; + else + { + $SID = mysql_result($Erg, 0, "SID"); + echo "\t". $SID. ""; + } - // erstellt für jeden Engeltypen die eintrage in 'ShiftEntry' - echo "\t"; - foreach ($EngelType As $TTemp) - { - $Temp = "EngelType".$TTemp["TID"]; - - if( $_GET[$Temp] > 0 ) - { - $i = 0; - echo $_GET[$Temp]. " ".$TTemp["Name"]. "
    \t"; - while( $i++ < $_GET[$Temp] ) - { - if( $_GET["OnlyShow"] == "OFF" ) - { - $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES ("; - $SQL .= "'". $SID. "', "; - $SQL .= "'". $TTemp["TID"]. "');"; + // erstellt für jeden Engeltypen die eintrage in 'ShiftEntry' + echo "\t"; + foreach ($EngelType As $TTemp) + { + $Temp = "EngelType".$TTemp["TID"]; + + if( $_GET[$Temp] > 0 ) + { + $i = 0; + echo $_GET[$Temp]. " ".$TTemp["Name"]. "
    \t"; + while( $i++ < $_GET[$Temp] ) + { + if( $_GET["OnlyShow"] == "OFF" ) + { + $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES ("; + $SQL .= "'". $SID. "', "; + $SQL .= "'". $TTemp["TID"]. "');"; - $Erg = mysql_query($SQL, $con); + $Erg = mysql_query($SQL, $con); - if( $DEBUG ) $SQLFail = "\n\t
    [".$SQL. "]"; + if( $debug ) $SQLFail = "\n\t
    [".$SQL. "]"; - if ($Erg == 1) echo "'pass' "; - else echo "'fail' ". mysql_error($con). "$SQLFail\n"; + if ($Erg == 1) echo "'pass' "; + else echo "'fail' ". mysql_error($con). "$SQLFail\n"; - } - else - echo "+"; - } - echo "
    "; - } // IF $$TEMP - } // FOREACH - echo ""; - - echo "\n"; + } + else + echo "+"; + } + echo "
    "; + } // IF $$TEMP + } // FOREACH + echo ""; + + echo "\n"; } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/sprache.php b/www-ssl/admin/sprache.php old mode 100755 new mode 100644 index 050b0736..ebf1db32 --- a/www-ssl/admin/sprache.php +++ b/www-ssl/admin/sprache.php @@ -1,4 +1,4 @@ -\n"; - echo Get_Text("pub_sprache_text1")."

    \n"; + echo Get_Text("Hello").$_SESSION['Nick'].",
    \n"; + echo Get_Text("pub_sprache_text1")."

    \n"; - echo "". Get_Text("pub_sprache_ShowEntry"). ""; - // ausgabe Tabellenueberschift - $SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;"; - $erg_Sprachen = mysql_query($SQL_Sprachen, $con); - echo mysql_error($con); - - for( $i=0; $i". Get_Text("pub_sprache_ShowEntry"). ""; + // ausgabe Tabellenueberschift + $SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;"; + $erg_Sprachen = mysql_query($SQL_Sprachen, $con); + echo mysql_error($con); + + for( $i=0; $i\n\t\t"; - echo "\t\t". Get_Text("pub_sprache_TextID"). ""; - foreach( $Sprachen as $Name => $Value ) - echo "". - Get_Text("pub_sprache_Sprache"). " ". $Name. - ""; - echo "\t\t". Get_Text("pub_sprache_Edit"). ""; - echo "\t\t"; + echo "\t\n\t\t"; + echo "\t\t"; + foreach( $Sprachen as $Name => $Value ) + echo ""; + echo "\t\t"; + echo "\t\t"; - if( isset($_GET["ShowEntry"])) - { - // ausgabe eintraege - $SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;"; - $erg = mysql_query($SQL, $con); - echo mysql_error($con); + if( isset($_GET["ShowEntry"])) + { + // ausgabe eintraege + $SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;"; + $erg = mysql_query($SQL, $con); + echo mysql_error($con); - $TextID_Old = mysql_result( $erg, 0, "TextID" ); - for( $i=0; $i"; - echo "\n"; - echo "\t\t\n"; - - foreach( $Sprachen as $Name => $Value ) - { - $Value = html_entity_decode( $Value, ENT_QUOTES); - echo "\t\t\n"; - $Sprachen[ $Name ] = ""; - } - - echo "\t\t\n"; - echo ""; - echo "\n"; - $TextID_Old = $TextID_New; - } - $Sprachen[ mysql_result( $erg, $i, "Sprache" ) ] = mysql_result( $erg, $i, "Text" ); - } /*FOR*/ - } - - //fuer neu eintraege - echo ""; - echo "\n"; - echo "\t\t\n"; - - foreach( $Sprachen as $Name => $Value ) - echo "\t\t\n"; + $TextID_Old = mysql_result( $erg, 0, "TextID" ); + for( $i=0; $i"; + echo "\n"; + echo "\t\t\n"; + + foreach( $Sprachen as $Name => $Value ) + { + $Value = html_entity_decode( $Value, ENT_QUOTES); + echo "\t\t\n"; + $Sprachen[ $Name ] = ""; + } + + echo "\t\t\n"; + echo ""; + echo "\n"; + $TextID_Old = $TextID_New; + } + $Sprachen[ mysql_result( $erg, $i, "Sprache" ) ] = mysql_result( $erg, $i, "Text" ); + } /*FOR*/ + } + + //fuer neu eintraege + echo ""; + echo "\n"; + echo "\t\t\n"; + + foreach( $Sprachen as $Name => $Value ) + echo "\t\t\n"; - echo "\t\t\n"; - echo ""; - echo "\n"; - - - echo "
    ". Get_Text("pub_sprache_TextID"). "". + Get_Text("pub_sprache_Sprache"). " ". $Name. + "". Get_Text("pub_sprache_Edit"). "
    $TextID_Old ". - "
    $TextID_Old ". + "
    \n"; + echo "\t\t\n"; + echo ""; + echo "\n"; + + + echo "\n"; } /*if( !isset( $TextID ) )*/ else { - echo "edit: ". $_GET["TextID"]. "

    "; - foreach ($_GET as $k => $v) { - if( $k != "TextID" ) - { - $sql_test = "SELECT * FROM `Sprache` ". - "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k'"; - $erg_test = mysql_query($sql_test, $con); + echo "edit: ". $_GET["TextID"]. "

    "; + foreach ($_GET as $k => $v) { + if( $k != "TextID" ) + { + $sql_test = "SELECT * FROM `Sprache` ". + "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k'"; + $erg_test = mysql_query($sql_test, $con); - if( mysql_num_rows($erg_test)==0 ) - { - $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) ". - "VALUES ('". $_GET["TextID"]. "', '$k', '$v')"; - echo $sql_save."
    "; - $Erg = mysql_query($sql_save, $con); - if ($Erg == 1) - echo "\t $k Save: OK
    \n"; - else - echo "\t $k Save: KO
    \n"; - } - else if( mysql_result($erg_test, 0, "Text")!=$v ) - { - $sql_save = "UPDATE `Sprache` SET `Text`='$v' ". - "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k' "; - echo $sql_save."
    "; - $Erg = mysql_query($sql_save, $con); - if ($Erg == 1) - echo "\t $k Update: OK
    \n"; - else - echo "\t $k Update: KO
    \n"; - } - else - echo "\t $k no changes
    \n"; - } - } - + if( mysql_num_rows($erg_test)==0 ) + { + $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) ". + "VALUES ('". $_GET["TextID"]. "', '$k', '$v')"; + echo $sql_save."
    "; + $Erg = mysql_query($sql_save, $con); + if ($Erg == 1) + echo "\t $k Save: OK
    \n"; + else + echo "\t $k Save: KO
    \n"; + } + else if( mysql_result($erg_test, 0, "Text")!=$v ) + { + $sql_save = "UPDATE `Sprache` SET `Text`='$v' ". + "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k' "; + echo $sql_save."
    "; + $Erg = mysql_query($sql_save, $con); + if ($Erg == 1) + echo "\t $k Update: OK
    \n"; + else + echo "\t $k Update: KO
    \n"; + } + else + echo "\t $k no changes
    \n"; + } + } + } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/tshirt.php b/www-ssl/admin/tshirt.php old mode 100755 new mode 100644 index df33494d..6fc3551e --- a/www-ssl/admin/tshirt.php +++ b/www-ssl/admin/tshirt.php @@ -1,4 +1,4 @@ -"; + echo "Fehler beim speichern bei Engel ". UID2Nick($_GET["aktive"]). "
    "; } } ?> -Über die Suchen-Funktion des Browsers kann diese Liste schnell nach einem Nick abgesucht werden.
    -Hinter diesem erscheint ein Link, über den man eintragen kann, dass der Engel sein T-Shirt erhalten hat.

    +Über die Suchen-Funktion des Browsers kann diese Liste schnell nach einem Nick abgesucht werden.
    +Hinter diesem erscheint ein Link, über den man eintragen kann, dass der Engel sein T-Shirt erhalten hat.

    Liste aller aktiven Engel: - - - - - - -Nick + + + + +\n"; $eUID=mysql_result($Erg, $i, "UID"); @@ -45,9 +45,9 @@ for ($i=0; $i<$rowcount; $i++){ echo "\t\t\n"; if (mysql_result($Erg, $i, "Tshirt") =="1") { - echo "\t\t"; + echo "\t\t"; } else { - echo "\t\t"; + echo "\t\t"; } echo "\t\n"; } diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php old mode 100755 new mode 100644 index b86c2382..7d7c3a62 --- a/www-ssl/admin/user.php +++ b/www-ssl/admin/user.php @@ -1,4 +1,4 @@ -Neuen Engel eintragen

    \n"; - - if( !isset($_GET["OrderBy"]) ) $_GET["OrderBy"] = "Nick"; - $SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` ". - "LEFT JOIN `UserCVS` ON User.UID = UserCVS.UID ". - "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ". - "ORDER BY `". $_GET["OrderBy"]. "` ASC"; - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); + echo "Neuen Engel eintragen

    \n"; + + if( !isset($_GET["OrderBy"]) ) $_GET["OrderBy"] = "Nick"; + $SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` ". + "LEFT JOIN `UserCVS` ON User.UID = UserCVS.UID ". + "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ". + "ORDER BY `". $_GET["OrderBy"]. "` ASC"; + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); - echo "Anzahl Engel: $Zeilen

    \n"; + echo "Anzahl Engel: $Zeilen

    \n"; - ?>
    NickAktiv?GrösseT-Shirt ausgeben:Aktiv?GrösseT-Shirt ausgeben:".mysql_result($Erg, $i, "Size")."bereits erhaltenbereits erhaltenXXXXXXXXXXXXXXXX
    - - - - - - - - - - - - - + ?>
    - ?OrderBy=Nick">Nick | - ?OrderBy=CreateDate">CreateDate - ?OrderBy=Name">Name?OrderBy=Vorname">Vorname?OrderBy=Alter">Alter - ?OrderBy=email">@ | - ?OrderBy=DECT">DECT | - ?OrderBy=Hometown">Hometown | - ?OrderBy=lastLogIn">lastLogIn | - ?OrderBy=Art">Type | - ?OrderBy=ICQ">ICQ | - ?OrderBy=jabber">jabber | - ?OrderBy=Group">Group - ?OrderBy=Size">Größe?OrderBy=Gekommen">G?OrderBy=Aktiv">A?OrderBy=Tshirt">TÄnd.Secure
    + + + + + + + + + + + + + - \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - $Gekommen += mysql_result($Erg, $n, "Gekommen"); - echo "\t\n"; - $Active += mysql_result($Erg, $n, "Aktiv"); - echo "\t\n"; - $Tshirt += mysql_result($Erg, $n, "Tshirt"); - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - } - echo "". - "". - "\n"; - echo "\t
    + ?OrderBy=Nick">Nick | + ?OrderBy=CreateDate">CreateDate + ?OrderBy=Name">Name?OrderBy=Vorname">Vorname?OrderBy=Alter">Alter + ?OrderBy=email">@ | + ?OrderBy=DECT">DECT | + ?OrderBy=Hometown">Hometown | + ?OrderBy=lastLogIn">lastLogIn | + ?OrderBy=Art">Type | + ?OrderBy=ICQ">ICQ | + ?OrderBy=jabber">jabber | + ?OrderBy=Group">Group + ?OrderBy=Size">Größe?OrderBy=Gekommen">G?OrderBy=Aktiv">A?OrderBy=Tshirt">TÄnd.Secure
    ".mysql_result($Erg, $n, "Nick"). "
    (Create: ". mysql_result($Erg, $n, "CreateDate"). ")    		".mysql_result($Erg, $n, "Name")."".mysql_result($Erg, $n, "Vorname")."".mysql_result($Erg, $n, "Alter").""; - if( strlen( mysql_result($Erg, $n, "Telefon"))>0) - echo "\n\t\tTel: ". mysql_result($Erg, $n, "Telefon"). "
    "; - if( strlen( mysql_result($Erg, $n, "Handy"))>0) - echo "\n\t\tHandy: ". mysql_result($Erg, $n, "Handy"). "
    "; - if( strlen( mysql_result($Erg, $n, "DECT"))>0) - echo "\n\t\tDECT: ". - mysql_result($Erg, $n, "DECT"). "
    "; - if( strlen( mysql_result($Erg, $n, "email"))>0) - echo "\n\t\temail: ". - mysql_result($Erg, $n, "email")."
    "; - if( strlen( mysql_result($Erg, $n, "Hometown"))>0) - echo "\n\t\tHometown: ". mysql_result($Erg, $n, "Hometown"). "
    "; - if( strlen( mysql_result($Erg, $n, "lastLogIn"))>0) - echo "\n\t\tlastLogIn: ". mysql_result($Erg, $n, "lastLogIn"). "
    "; - if( strlen( mysql_result($Erg, $n, "Art"))>0) - echo "\n\t\tType: ". mysql_result($Erg, $n, "Art"). "
    "; - if( strlen( mysql_result($Erg, $n, "ICQ"))>0) - echo "\n\t\tICQ: ". mysql_result($Erg, $n, "ICQ"). "
    "; - if( strlen( mysql_result($Erg, $n, "jabber"))>0) - echo "\n\t\tjabber: ". mysql_result($Erg, $n, "jabber"). "
    "; - echo "\n\t\tGroup: ". mysql_result($Erg, $n, "Group"). "
    "; - echo "    		".mysql_result($Erg, $n, "Size")."".mysql_result($Erg, $n, "Gekommen")."".mysql_result($Erg, $n, "Aktiv")."".mysql_result($Erg, $n, "Tshirt")."". funktion_isLinkAllowed_addLink_OrEmpty( - "admin/userChangeNormal.php?enterUID=". - mysql_result($Erg, $n, "UID")."&Type=Normal", - "Änd."). - "". funktion_isLinkAllowed_addLink_OrEmpty( - "admin/userChangeSecure.php?enterUID=". - mysql_result($Erg, $n, "UID")."&Type=Secure", - "Secure"). - "
    $Gekommen$Active$Tshirt
    \n"; - // Ende Userliste + \n"; + echo "\t".mysql_result($Erg, $n, "Nick"). "
    (Create: ". mysql_result($Erg, $n, "CreateDate"). ")\n"; + echo "\t".mysql_result($Erg, $n, "Name")."\n"; + echo "\t".mysql_result($Erg, $n, "Vorname")."\n"; + echo "\t".mysql_result($Erg, $n, "Alter")."\n"; + echo "\t"; + if( strlen( mysql_result($Erg, $n, "Telefon"))>0) + echo "\n\t\tTel: ". mysql_result($Erg, $n, "Telefon"). "
    "; + if( strlen( mysql_result($Erg, $n, "Handy"))>0) + echo "\n\t\tHandy: ". mysql_result($Erg, $n, "Handy"). "
    "; + if( strlen( mysql_result($Erg, $n, "DECT"))>0) + echo "\n\t\tDECT: ". + mysql_result($Erg, $n, "DECT"). "
    "; + if( strlen( mysql_result($Erg, $n, "email"))>0) + echo "\n\t\temail: ". + mysql_result($Erg, $n, "email")."
    "; + if( strlen( mysql_result($Erg, $n, "Hometown"))>0) + echo "\n\t\tHometown: ". mysql_result($Erg, $n, "Hometown"). "
    "; + if( strlen( mysql_result($Erg, $n, "lastLogIn"))>0) + echo "\n\t\tlastLogIn: ". mysql_result($Erg, $n, "lastLogIn"). "
    "; + if( strlen( mysql_result($Erg, $n, "Art"))>0) + echo "\n\t\tType: ". mysql_result($Erg, $n, "Art"). "
    "; + if( strlen( mysql_result($Erg, $n, "ICQ"))>0) + echo "\n\t\tICQ: ". mysql_result($Erg, $n, "ICQ"). "
    "; + if( strlen( mysql_result($Erg, $n, "jabber"))>0) + echo "\n\t\tjabber: ". mysql_result($Erg, $n, "jabber"). "
    "; + echo "\n\t\tGroup: ". mysql_result($Erg, $n, "Group"). "
    "; + echo "\n"; + echo "\t".mysql_result($Erg, $n, "Size")."\n"; + $Gekommen += mysql_result($Erg, $n, "Gekommen"); + echo "\t".mysql_result($Erg, $n, "Gekommen")."\n"; + $Active += mysql_result($Erg, $n, "Aktiv"); + echo "\t".mysql_result($Erg, $n, "Aktiv")."\n"; + $Tshirt += mysql_result($Erg, $n, "Tshirt"); + echo "\t".mysql_result($Erg, $n, "Tshirt")."\n"; + echo "\t". funktion_isLinkAllowed_addLink_OrEmpty( + "admin/userChangeNormal.php?enterUID=". + mysql_result($Erg, $n, "UID")."&Type=Normal", + "Änd."). + "\n"; + echo "\t". funktion_isLinkAllowed_addLink_OrEmpty( + "admin/userChangeSecure.php?enterUID=". + mysql_result($Erg, $n, "UID")."&Type=Secure", + "Secure"). + "\n"; + echo "\n"; + } + echo "". + "". + "$Gekommen$Active$Tshirt\n"; + echo "\t\n"; + // Ende Userliste - echo "

    Statistics

    "; - funktion_db_element_list_2row( "Hometown", - "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); + echo "

    Statistics

    "; + funktion_db_element_list_2row( "Hometown", + "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); - echo "
    \n"; + echo "
    \n"; - funktion_db_element_list_2row( "Engeltypen", + funktion_db_element_list_2row( "Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); - echo "
    \n"; + echo "
    \n"; - funktion_db_element_list_2row( "Used Groups", - "SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` ". - "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ". - "WHERE (UserCVS.GroupID!='NULL') ". - "GROUP BY `GroupName` ". - ""); + funktion_db_element_list_2row( "Used Groups", + "SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` ". + "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ". + "WHERE (UserCVS.GroupID!='NULL') ". + "GROUP BY `GroupName` ". + ""); } else { - echo "error"; + echo "error"; } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/userArrived.php b/www-ssl/admin/userArrived.php old mode 100755 new mode 100644 index da68a5da..a8fdb71e --- a/www-ssl/admin/userArrived.php +++ b/www-ssl/admin/userArrived.php @@ -1,4 +1,4 @@ -". Get_Text("pri_userArrived_WriteOK"). " \"". UID2Nick($_GET["arrived"]). "\""; + echo "

    ". Get_Text("pri_userArrived_WriteOK"). " \"". UID2Nick($_GET["arrived"]). "\"

    "; } else { - echo "

    ". Get_Text("pri_userArrived_WriteError"). " \"". UID2Nick($_GET["arrived"]). "\"

    "; + echo "

    ". Get_Text("pri_userArrived_WriteError"). " \"". UID2Nick($_GET["arrived"]). "\"

    "; } } -echo Get_Text("pri_userArrived_Text1"). "
    "; -echo Get_Text("pri_userArrived_Text2"). "

    "; +echo Get_Text("pri_userArrived_Text1"). "
    "; +echo Get_Text("pri_userArrived_Text2"). "

    "; echo Get_Text("pri_userArrived_TableToppic"); $SQL = "SELECT * FROM `User` ORDER BY `Nick` ASC"; @@ -34,18 +34,18 @@ echo "\t\t". Get_Text("pri_userArrived_TableTD_ArrivedSet"). "\n"; echo "\t\n"; for ($i=0; $i<$rowcount; $i++){ - echo "\t\n"; - $eUID=mysql_result($Erg, $i, "UID"); - echo "\t\t".UID2Nick($eUID)."\n"; - echo "\t\t".mysql_result($Erg, $i, "Gekommen")."\n"; + echo "\t\n"; + $eUID=mysql_result($Erg, $i, "UID"); + echo "\t\t".UID2Nick($eUID)."\n"; + echo "\t\t".mysql_result($Erg, $i, "Gekommen")."\n"; - if (mysql_result($Erg, $i, "Gekommen") =="1") - { - echo "\t\t". Get_Text("pri_userArrived_TableEntry_Arrived"). ""; - } else { - echo "\t\t". Get_Text("pri_userArrived_TableEntry_Set"). ""; - } - echo "\t\n"; + if (mysql_result($Erg, $i, "Gekommen") =="1") + { + echo "\t\t". Get_Text("pri_userArrived_TableEntry_Arrived"). ""; + } else { + echo "\t\t". Get_Text("pri_userArrived_TableEntry_Set"). ""; + } + echo "\t\n"; } echo ""; diff --git a/www-ssl/admin/userChangeNormal.php b/www-ssl/admin/userChangeNormal.php old mode 100755 new mode 100644 index 51c49944..6785a030 --- a/www-ssl/admin/userChangeNormal.php +++ b/www-ssl/admin/userChangeNormal.php @@ -1,4 +1,4 @@ - Aendern... + // UserID wurde mit uebergeben --> Aendern... - echo "Hallo,
    ". - "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' ". - "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ". - "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ". - "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel ". - "bereits sein T-Shirt erhalten hat.

    \n"; + echo "Hallo,
    ". + "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' ". + "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ". + "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ". + "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel ". + "bereits sein T-Shirt erhalten hat.

    \n"; - echo "
    \n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "
    \n"; + echo "\n"; - $SQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["enterUID"]. "'"; - $Erg = mysql_query($SQL, $con); - - if (mysql_num_rows($Erg) != 1) - echo ""; - else - { - echo ""; + } - echo "\n"; - echo "
    Sorry, der Engel (UID=". $_GET["enterUID"]. - ") wurde in der Liste nicht gefunden.
    \n"; - echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + $SQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["enterUID"]. "'"; + $Erg = mysql_query($SQL, $con); + + if (mysql_num_rows($Erg) != 1) + echo ""; + else + { + echo ""; - } + echo " \n"; + + echo "
    Nick". - "
    lastLogIn". - "
    Name". - "
    Vorname". - "
    Alter". - "
    Telefon". - "
    Handy". - "
    DECT". - "
    email". - "
    ICQ". - "
    jabber". - "
    Size". - "
    Passwort". - "neues Kennwort setzen
    Sorry, der Engel (UID=". $_GET["enterUID"]. + ") wurde in der Liste nicht gefunden.
    \n"; + echo "\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; - // Gekommen? - echo " \n"; + // Gekommen? + echo " \n"; - // Aktiv? - echo " \n"; + // Aktiv? + echo " \n"; - // T-Shirt bekommen? - echo " \n"; + // T-Shirt bekommen? + echo " \n"; - echo " \n"; - - echo "
    Nick". + "
    lastLogIn". + "
    Name". + "
    Vorname". + "
    Alter". + "
    Telefon". + "
    Handy". + "
    DECT". + "
    email". + "
    ICQ". + "
    jabber". + "
    Size". + "
    Passwort". + "neues Kennwort setzen
    Gekommen\n"; - echo " No \n"; - echo " Yes \n"; - echo "
    Gekommen\n"; + echo " No \n"; + echo " Yes \n"; + echo "
    Aktiv\n"; - echo " No \n"; - echo " Yes \n"; - echo "
    Aktiv\n"; + echo " No \n"; + echo " Yes \n"; + echo "
    T-Shirt\n"; - echo " No \n"; - echo " Yes \n"; - echo "
    T-Shirt\n"; + echo " No \n"; + echo " Yes \n"; + echo "
    Hometown". - "
    \n    		". displayavatar($_GET["enterUID"], FALSE). "
    Hometown". + "
    \n    		". displayavatar($_GET["enterUID"], FALSE). "
    \n
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; + echo "\n"; + echo "\n
    \n"; + echo "\n"; + echo "\n"; + echo ""; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; - - echo "
    "; - funktion_db_element_list_2row( - "Freeloader Shifts", - "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); + + echo "
    "; + funktion_db_element_list_2row( + "Freeloader Shifts", + "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/userChangeSecure.php b/www-ssl/admin/userChangeSecure.php old mode 100755 new mode 100644 index c1799fb8..2eb84b85 --- a/www-ssl/admin/userChangeSecure.php +++ b/www-ssl/admin/userChangeSecure.php @@ -1,4 +1,4 @@ - Aendern... + // UserID wurde mit uebergeben --> Aendern... - echo "Hallo,
    ". - "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' ". - "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ". - "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ". - "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel ". - "bereits sein T-Shirt erhalten hat.

    \n"; + echo "Hallo,
    ". + "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' ". + "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ". + "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ". + "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel ". + "bereits sein T-Shirt erhalten hat.

    \n"; - $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_GET["enterUID"]. "'"; - $Erg_CVS = mysql_query($SQL_CVS, $con); - - if( mysql_num_rows($Erg_CVS) != 1) - echo "Sorry, der Engel (UID=". $_GET["enterUID"]. ") wurde in der Liste nicht gefunden."; - else - { - // Rename if is an group - if( $_GET["enterUID"] < 0 ) { - $SQLname = "SELECT `Name` FROM `UserGroups` WHERE `UID`='". $_GET["enterUID"]. "'"; - $ErgName = mysql_query($SQLname, $con); - echo mysql_error($con); + $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_GET["enterUID"]. "'"; + $Erg_CVS = mysql_query($SQL_CVS, $con); + + if( mysql_num_rows($Erg_CVS) != 1) + echo "Sorry, der Engel (UID=". $_GET["enterUID"]. ") wurde in der Liste nicht gefunden."; + else + { + // Rename if is an group + if( $_GET["enterUID"] < 0 ) { + $SQLname = "SELECT `Name` FROM `UserGroups` WHERE `UID`='". $_GET["enterUID"]. "'"; + $ErgName = mysql_query($SQLname, $con); + echo mysql_error($con); - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; - } + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "; + } - echo "
    \n"; - echo "\n"; - echo "\n"; - echo " \n"; + echo "\n"; + echo "

    Rights of \"". UID2Nick($_GET["enterUID"]). "\":
    \n"; + echo "\n"; + echo " \n"; - $CVS_Data = mysql_fetch_array($Erg_CVS); - $CVS_Data_i = 1; - foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) - { - $CVS_Data_i++; - //nur jeder zweiter sonst wird für jeden text noch die position (Zahl) ausgegeben - if( $CVS_Data_i%2 && $CVS_Data_Name!="UID") - { - if($CVS_Data_Name=="GroupID") { - if( $_GET["enterUID"] > 0 ) - { - echo "\n". - "\n". + ""; - } - } else { - echo "\n"; - } - } - } //IF - } //Foreach - echo "\n"; - - // Ende Formular - echo "\n"; - echo "

    Rights of \"". UID2Nick($_GET["enterUID"]). "\":
    Group
    Group
    $CVS_Data_Name"; - echo "allow \n"; - echo "denied \n"; - if( $_GET["enterUID"] > 0 ) - { - echo "group-setting \n"; - echo "
    \n
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; + $SQL_Group = "SELECT * FROM `UserGroups`"; + $Erg_Group = mysql_query($SQL_Group, $con); + for ($n = 0 ; $n < mysql_num_rows($Erg_Group) ; $n++) + { + $UID = mysql_result($Erg_Group, $n, "UID"); + echo "\t\n"; + } + echo ""; + } + } else { + echo "$CVS_Data_Name\n"; + echo "allow \n"; + echo "denied \n"; + if( $_GET["enterUID"] > 0 ) + { + echo "group-setting \n"; + echo ""; + } + } + } //IF + } //Foreach + echo "\n"; + + // Ende Formular + echo "\n"; + echo "\n
    \n"; + echo "\n"; + echo "\n"; + echo ""; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - } + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + } } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/userDefaultSetting.php b/www-ssl/admin/userDefaultSetting.php old mode 100755 new mode 100644 index d3564400..d4a230de --- a/www-ssl/admin/userDefaultSetting.php +++ b/www-ssl/admin/userDefaultSetting.php @@ -1,4 +1,4 @@ -\nhier hast du die Möglichkeit, die Defaulteinstellungen für neue User einzustellen:

    \n"; - + ",
    \nhier hast du die Möglichkeit, die Defaulteinstellungen für neue User einzustellen:

    \n"; + echo "\n"; echo "\t\n"; echo "\t\t\n\t\t\n\t\t\n"; @@ -15,55 +15,55 @@ echo "\t\n"; if( isset( $_GET["Field"]) && isset( $_GET["Default"]) && isset( $_GET["Send"])) { - switch( $_GET["Send"]) - { - case "New": - $SQL = "ALTER TABLE `UserCVS` ADD `". $_GET["Field"]. "` ". - "CHAR( 1 ) DEFAULT '". $_GET["Default"]. "' NOT NULL"; - $Erg = db_query( $SQL, "New user default setting"); - if( $Erg == 1) - echo "

    Create ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull

    \n"; - else - echo "

    Create ".$_GET["Field"]. " = ". $_GET["Default"]. " error...

    \n". - "[". mysql_error(). "]

    "; - break; - case "Del": - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; - break; - case "Del sure": - $SQL = "ALTER TABLE `UserCVS` DROP `". $_GET["Field"]. "` "; - $Erg = db_query( $SQL, "del user default setting"); - if( $Erg == 1) - echo "

    Delete ".$_GET["Field"]. " succesfull

    \n"; - else - echo "

    Delete ".$_GET["Field"]. " error...

    \n". - "[". mysql_error(). "]

    "; - break; - case "SetForAllUser": - $SQL = "UPDATE `UserCVS` SET `". $_GET["Field"]. "`='". $_GET["Default"]. "' WHERE UID>0"; - $Erg = db_query( $SQL, "Set new user default setting for all user"); - if( $Erg == 1) - echo "

    UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users succesfull

    \n"; - else - echo "

    UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users error...

    \n". - "[". mysql_error(). "]

    "; - case "Save": - $SQL = "ALTER TABLE `UserCVS` CHANGE `". $_GET["Field"]. "` ". - "`". $_GET["Field"]. "` CHAR( 1 ) NOT NULL DEFAULT '". $_GET["Default"]. "'"; - $Erg = db_query( $SQL, "Save user default setting"); - if( $Erg == 1) - echo "

    Write ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull

    \n"; - else - echo "

    Write ".$_GET["Field"]. " = ". $_GET["Default"]. " error...

    \n". - "[". mysql_error(). "]

    "; - break; - } //SWITCH + switch( $_GET["Send"]) + { + case "New": + $SQL = "ALTER TABLE `UserCVS` ADD `". $_GET["Field"]. "` ". + "CHAR( 1 ) DEFAULT '". $_GET["Default"]. "' NOT NULL"; + $Erg = db_query( $SQL, "New user default setting"); + if( $Erg == 1) + echo "

    Create ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull

    \n"; + else + echo "

    Create ".$_GET["Field"]. " = ". $_GET["Default"]. " error...

    \n". + "[". mysql_error(). "]

    "; + break; + case "Del": + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; + break; + case "Del sure": + $SQL = "ALTER TABLE `UserCVS` DROP `". $_GET["Field"]. "` "; + $Erg = db_query( $SQL, "del user default setting"); + if( $Erg == 1) + echo "

    Delete ".$_GET["Field"]. " succesfull

    \n"; + else + echo "

    Delete ".$_GET["Field"]. " error...

    \n". + "[". mysql_error(). "]

    "; + break; + case "SetForAllUser": + $SQL = "UPDATE `UserCVS` SET `". $_GET["Field"]. "`='". $_GET["Default"]. "' WHERE UID>0"; + $Erg = db_query( $SQL, "Set new user default setting for all user"); + if( $Erg == 1) + echo "

    UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users succesfull

    \n"; + else + echo "

    UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users error...

    \n". + "[". mysql_error(). "]

    "; + case "Save": + $SQL = "ALTER TABLE `UserCVS` CHANGE `". $_GET["Field"]. "` ". + "`". $_GET["Field"]. "` CHAR( 1 ) NOT NULL DEFAULT '". $_GET["Default"]. "'"; + $Erg = db_query( $SQL, "Save user default setting"); + if( $Erg == 1) + echo "

    Write ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull

    \n"; + else + echo "

    Write ".$_GET["Field"]. " = ". $_GET["Default"]. " error...

    \n". + "[". mysql_error(). "]

    "; + break; + } //SWITCH } //IF( @@ -79,11 +79,11 @@ $SQL_Group = "SELECT * FROM `UserGroups`"; $Erg_Group = mysql_query($SQL_Group, $con); for ($n = 0 ; $n < mysql_num_rows($Erg_Group) ; $n++) { - $UID = mysql_result($Erg_Group, $n, "UID"); - echo "\t\n"; + $UID = mysql_result($Erg_Group, $n, "UID"); + echo "\t\n"; } echo "\n"; echo "\t\t\t\n"; for( $i=2; $i\n"; - echo "\t\t
    \n"; - echo "\t\t\t\n"; - echo "\t\t\t    \n"; - echo "\t\t\t\n"; + echo "\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; } - + echo "\t\n"; echo "\t\t\n"; echo "\t\t\t\n"; diff --git a/www-ssl/admin/userSaveNormal.php b/www-ssl/admin/userSaveNormal.php old mode 100755 new mode 100644 index 4a7f7126..b1b42f96 --- a/www-ssl/admin/userSaveNormal.php +++ b/www-ssl/admin/userSaveNormal.php @@ -1,4 +1,4 @@ -"; + SetHeaderGo2Back(); + echo "Gesendeter Befehl: ". $_GET["action"]. "
    "; - switch ($_GET["action"]) - { - case "change": - if (IsSet($_POST["enterUID"])) - { - if ($_POST["Type"] == "Normal") - { - $SQL = "UPDATE `User` SET "; - $SQL.= " `Nick` = '". $_POST["eNick"]. "', `Name` = '". $_POST["eName"]. "', ". - "`Vorname` = '". $_POST["eVorname"]. "', ". - "`Telefon` = '". $_POST["eTelefon"]. "', ". - "`Handy` = '". $_POST["eHandy"]. "', ". - "`DECT` = '". $_POST["eDECT"]. "', ". - "`email` = '". $_POST["eemail"]. "', ". - "`ICQ` = '". $_POST["eICQ"]. "', ". - "`jabber` = '". $_POST["ejabber"]. "', ". - "`Size` = '". $_POST["eSize"]. "', ". - "`Gekommen`= '". $_POST["eGekommen"]. "', ". - "`Aktiv`= '". $_POST["eAktiv"]. "', ". - "`Tshirt` = '". $_POST["eTshirt"]. "', ". - "`Hometown` = '". $_POST["Hometown"]. "' ". - "WHERE `UID` = '". $_POST["enterUID"]. - "' LIMIT 1;"; - echo "User-"; - $Erg = db_query($SQL, "change user details"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "

    Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n

    \n"; - } - else - echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; - break; + switch ($_GET["action"]) + { + case "change": + if (IsSet($_POST["enterUID"])) + { + if ($_POST["Type"] == "Normal") + { + $SQL = "UPDATE `User` SET "; + $SQL.= " `Nick` = '". $_POST["eNick"]. "', `Name` = '". $_POST["eName"]. "', ". + "`Vorname` = '". $_POST["eVorname"]. "', ". + "`Telefon` = '". $_POST["eTelefon"]. "', ". + "`Handy` = '". $_POST["eHandy"]. "', ". + "`DECT` = '". $_POST["eDECT"]. "', ". + "`email` = '". $_POST["eemail"]. "', ". + "`ICQ` = '". $_POST["eICQ"]. "', ". + "`jabber` = '". $_POST["ejabber"]. "', ". + "`Size` = '". $_POST["eSize"]. "', ". + "`Gekommen`= '". $_POST["eGekommen"]. "', ". + "`Aktiv`= '". $_POST["eAktiv"]. "', ". + "`Tshirt` = '". $_POST["eTshirt"]. "', ". + "`Hometown` = '". $_POST["Hometown"]. "' ". + "WHERE `UID` = '". $_POST["enterUID"]. + "' LIMIT 1;"; + echo "User-"; + $Erg = db_query($SQL, "change user details"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } + else + echo "

    Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n

    \n"; + } + else + echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; + break; - case "delete": - if (IsSet($_POST["enterUID"])) - { - echo "delate User..."; - $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL, "User delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserCVS..."; - $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserEntry..."; - $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ". - "WHERE `UID`='". $_POST["enterUID"]. "';"; - $Erg = db_query($SQL3, "delate UserEntry"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - break; + case "delete": + if (IsSet($_POST["enterUID"])) + { + echo "delate User..."; + $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL, "User delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + echo "
    \ndelate UserCVS..."; + $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL2, "User CVS delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + echo "
    \ndelate UserEntry..."; + $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ". + "WHERE `UID`='". $_POST["enterUID"]. "';"; + $Erg = db_query($SQL3, "delate UserEntry"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } + break; - case "newpw": - echo "Bitte neues Kennwort für "; - // Get Nick - $USQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["eUID"]. "'"; - $Erg = mysql_query($USQL, $con); - echo mysql_result($Erg, 0, "Nick"); - echo " eingeben:
    "; - echo "\n"; - echo ""; - echo ""; - echo ""; - echo "\n"; - echo ""; - break; + case "newpw": + echo "Bitte neues Kennwort für "; + // Get Nick + $USQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["eUID"]. "'"; + $Erg = mysql_query($USQL, $con); + echo mysql_result($Erg, 0, "Nick"); + echo " eingeben:
    "; + echo "\n"; + echo ""; + echo ""; + echo ""; + echo "\n"; + echo ""; + break; - case "newpwsave": - if ($_POST["ePasswort"] == $_POST["ePasswort2"]) - { // beide Passwoerter passen... - $_POST["ePasswort"] = PassCrypt($_POST["ePasswort"]); - $SQL = "UPDATE `User` SET `Passwort`='". $_POST["ePasswort"]. "' ". - "WHERE `UID`='". $_POST["eUID"]. "'"; - $Erg = db_query($SQL, "User new passwort"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "Das Passwort wurde nicht übereinstimmend eingegeben!"; - break; - } // end switch + case "newpwsave": + if ($_POST["ePasswort"] == $_POST["ePasswort2"]) + { // beide Passwoerter passen... + $_POST["ePasswort"] = PassCrypt($_POST["ePasswort"]); + $SQL = "UPDATE `User` SET `Passwort`='". $_POST["ePasswort"]. "' ". + "WHERE `UID`='". $_POST["eUID"]. "'"; + $Erg = db_query($SQL, "User new passwort"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } + else + echo "Das Passwort wurde nicht übereinstimmend eingegeben!"; + break; + } // end switch // ende - Action ist gesetzt } else { - // kein Action gesetzt -> abbruch - echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; + // kein Action gesetzt -> abbruch + echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/userSaveSecure.php b/www-ssl/admin/userSaveSecure.php old mode 100755 new mode 100644 index 277c7127..e9ad6135 --- a/www-ssl/admin/userSaveSecure.php +++ b/www-ssl/admin/userSaveSecure.php @@ -1,4 +1,4 @@ - 0 ) { - $Right = $_SESSION['CVS'][ "admin/user.php"]; + $Right = $_SESSION['CVS'][ "admin/user.php"]; } else { - $Right = $_SESSION['CVS'][ "admin/group.php"]; + $Right = $_SESSION['CVS'][ "admin/group.php"]; } if ( ($Right=="Y") && IsSet($_GET["action"])) { - SetHeaderGo2Back(); - echo "Gesendeter Befehl: ". $_GET["action"]. "
    "; - - switch ($_GET["action"]) - { - case "change": - if (IsSet($_POST["enterUID"])) - { - if ($_POST["Type"] == "Secure") - { - $SQL2 = "UPDATE `UserCVS` SET "; - $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "'"; - $Erg_CVS = mysql_query($SQL_CVS, $con); - $CVS_Data = mysql_fetch_array($Erg_CVS); - $CVS_Data_i = 1; - foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) - { - if( ($CVS_Data_i+1)%2 && $CVS_Data_Name!="UID") { - if( $CVS_Data_Name == "GroupID") - { - if( $_POST["enterUID"] > 0 ) - $SQL2.= "`$CVS_Data_Name` = '". $_POST["GroupID"]."', "; - else - $SQL2.= "`$CVS_Data_Name` = NULL, "; - } else { - $SQL2.= "`$CVS_Data_Name` = '". $_POST[$CVS_Data_i]."', "; - } - } - $CVS_Data_i++; - } - $SQL2 = substr( $SQL2, 0, strlen($SQL2)-2 ); - $SQL2.= " WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - echo "
    Secure-"; - $Erg = db_query($SQL2, "change user CVS"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "

    Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n

    \n"; - } - else - echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; - break; + SetHeaderGo2Back(); + echo "Gesendeter Befehl: ". $_GET["action"]. "
    "; + + switch ($_GET["action"]) + { + case "change": + if (IsSet($_POST["enterUID"])) + { + if ($_POST["Type"] == "Secure") + { + $SQL2 = "UPDATE `UserCVS` SET "; + $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "'"; + $Erg_CVS = mysql_query($SQL_CVS, $con); + $CVS_Data = mysql_fetch_array($Erg_CVS); + $CVS_Data_i = 1; + foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) + { + if( ($CVS_Data_i+1)%2 && $CVS_Data_Name!="UID") { + if( $CVS_Data_Name == "GroupID") + { + if( $_POST["enterUID"] > 0 ) + $SQL2.= "`$CVS_Data_Name` = '". $_POST["GroupID"]."', "; + else + $SQL2.= "`$CVS_Data_Name` = NULL, "; + } else { + $SQL2.= "`$CVS_Data_Name` = '". $_POST[$CVS_Data_i]."', "; + } + } + $CVS_Data_i++; + } + $SQL2 = substr( $SQL2, 0, strlen($SQL2)-2 ); + $SQL2.= " WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + echo "
    Secure-"; + $Erg = db_query($SQL2, "change user CVS"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } + else + echo "

    Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n

    \n"; + } + else + echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; + break; - case "changeGroupName": - if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) - { - $SQL = "UPDATE `UserGroups` SET `Name`='". $_POST["GroupName"]. "' WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1 ;"; - $Erg = db_query($SQL, "Update Group Name"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; - break; + case "changeGroupName": + if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) + { + $SQL = "UPDATE `UserGroups` SET `Name`='". $_POST["GroupName"]. "' WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1 ;"; + $Erg = db_query($SQL, "Update Group Name"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } + else + echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; + break; - case "delete": - if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]>0) ) - { - echo "delate User..."; - $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL, "User delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserCVS..."; - $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserEntry..."; - $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ". - "WHERE `UID`='". $_POST["enterUID"]. "';"; - $Erg = db_query($SQL3, "delate UserEntry"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } elseif (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) { - echo "delate Group..."; - $SQL="DELETE FROM `UserGroups` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL, "Group delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserCVS..."; - $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - } - break; - } // end switch + case "delete": + if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]>0) ) + { + echo "delate User..."; + $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL, "User delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + echo "
    \ndelate UserCVS..."; + $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL2, "User CVS delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + echo "
    \ndelate UserEntry..."; + $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ". + "WHERE `UID`='". $_POST["enterUID"]. "';"; + $Erg = db_query($SQL3, "delate UserEntry"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } elseif (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) { + echo "delate Group..."; + $SQL="DELETE FROM `UserGroups` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL, "Group delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + echo "
    \ndelate UserCVS..."; + $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL2, "User CVS delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + } + break; + } // end switch // ende - Action ist gesetzt } elseif ( IsSet($_GET["new"]) && ($_SESSION['CVS']["admin/group.php"]=="Y") ) { - echo "Gesendeter Befehl: ". $_GET["new"]. "
    "; - - switch ($_GET["new"]) - { - case "newGroup": - echo "\tGenerate new Group ID...\n"; - $SQLid="SELECT MIN(`UID`) FROM `UserCVS`;"; - $Erg = mysql_query( $SQLid); - - if( mysql_num_rows($Erg) == 1) { - $NewId = mysql_result( $Erg, 0, 0)-1; - $SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '". $_POST["GroupName"]. "' );"; - $SQLnew2 = "INSERT INTO `UserCVS` (`UID`, `GroupID`) VALUES ('$NewId', NULL );"; - echo "\t
    Generate new UserGroup ...\n"; - $ErgNew1 = db_query($SQLnew1, "create UserGroups Entry"); - if ($ErgNew1 == 1) - { - echo "\t
    Generate new User rights...\n"; - $ErgNew2 = db_query($SQLnew2, "UserCVS Entry"); - if ($ErgNew1 == 1) { - echo "\t
    New group was created.\n"; - } else { - echo "Error on creation\n(". mysql_error($con). ")"; - } - } else { - echo "Error on creation\n(". mysql_error($con). ")"; - } + echo "Gesendeter Befehl: ". $_GET["new"]. "
    "; + + switch ($_GET["new"]) + { + case "newGroup": + echo "\tGenerate new Group ID...\n"; + $SQLid="SELECT MIN(`UID`) FROM `UserCVS`;"; + $Erg = mysql_query( $SQLid); + + if( mysql_num_rows($Erg) == 1) { + $NewId = mysql_result( $Erg, 0, 0)-1; + $SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '". $_POST["GroupName"]. "' );"; + $SQLnew2 = "INSERT INTO `UserCVS` (`UID`, `GroupID`) VALUES ('$NewId', NULL );"; + echo "\t
    Generate new UserGroup ...\n"; + $ErgNew1 = db_query($SQLnew1, "create UserGroups Entry"); + if ($ErgNew1 == 1) + { + echo "\t
    Generate new User rights...\n"; + $ErgNew2 = db_query($SQLnew2, "UserCVS Entry"); + if ($ErgNew1 == 1) { + echo "\t
    New group was created.\n"; + } else { + echo "Error on creation\n(". mysql_error($con). ")"; + } + } else { + echo "Error on creation\n(". mysql_error($con). ")"; + } - } + } - - break; - } + + break; + } } else { - // kein Action gesetzt -> abbruch - echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; + // kein Action gesetzt -> abbruch + echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/css/grossbild.js b/www-ssl/css/grossbild.js old mode 100755 new mode 100644 diff --git a/www-ssl/css/style.css.old b/www-ssl/css/style.css.old old mode 100755 new mode 100644 diff --git a/www-ssl/css/style.css.old2 b/www-ssl/css/style.css.old2 old mode 100755 new mode 100644 diff --git a/www-ssl/css/style1.css b/www-ssl/css/style1.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style1.css.old b/www-ssl/css/style1.css.old old mode 100755 new mode 100644 diff --git a/www-ssl/css/style2.css b/www-ssl/css/style2.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style3.css b/www-ssl/css/style3.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style4.css b/www-ssl/css/style4.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style5.css b/www-ssl/css/style5.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style6.css b/www-ssl/css/style6.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style7.css b/www-ssl/css/style7.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style8.css b/www-ssl/css/style8.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style9.css b/www-ssl/css/style9.css old mode 100755 new mode 100644 diff --git a/www-ssl/faq.php b/www-ssl/faq.php old mode 100755 new mode 100644 index 5bb6824e..26c261da --- a/www-ssl/faq.php +++ b/www-ssl/faq.php @@ -1,22 +1,22 @@ ".mysql_result($Erg, $n, "Frage")."

    "; - echo "

    ".mysql_result($Erg, $n, "Antwort")."

    "; + for ($n = 0; $n < $Zeilen; $n++) { + if (mysql_result($Erg, $n, "Antwort") != "") { + echo "
    "; + echo "
    " . mysql_result($Erg, $n, "Frage") . "
    "; + echo "
    " . mysql_result($Erg, $n, "Antwort") . "
    "; + echo "
    "; + } } -} -include ("../../camp2011/includes/footer.php"); + include "../../camp2011/includes/footer.php"; ?> - diff --git a/www-ssl/index.php b/www-ssl/index.php old mode 100755 new mode 100644 index 56e7223b..e61db41a --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -1,19 +1,15 @@
    "; -echo Get_Text("index_text2")."
    "; -echo Get_Text("index_text3")."
    "; + echo "

    " . Get_Text("index_text1") . "

    \n"; + echo "

    " . Get_Text("index_text2") . "

    \n"; + echo "

    " . Get_Text("index_text3") . "

    \n"; -include ("../../camp2011/includes/login_eingabefeld.php"); + include "../../camp2011/includes/login_eingabefeld.php"; -echo "
    ".Get_Text("index_text4")."
    "; + echo "
    " . Get_Text("index_text4") . "
    "; -//echo Get_Text("index_text5"). "
    ". $show_SSLCERT; - -include ("../../camp2011/includes/footer.php"); + include "../../camp2011/includes/footer.php"; ?> - - diff --git a/www-ssl/lageplan.php b/www-ssl/lageplan.php old mode 100755 new mode 100644 index 617eafe3..ca6ee4b0 --- a/www-ssl/lageplan.php +++ b/www-ssl/lageplan.php @@ -1,11 +1,10 @@ ". Get_Text("lageplan_text1"). "

    "; -echo "

    ."; + echo "

    " . Get_Text("lageplan_text1") . "

    "; + echo "

    \"\""; -include ("../../camp2011/includes/footer.php"); + include "../../camp2011/includes/footer.php"; ?> - diff --git a/www-ssl/logout.php b/www-ssl/logout.php old mode 100755 new mode 100644 index d413dfc7..c137f48c --- a/www-ssl/logout.php +++ b/www-ssl/logout.php @@ -1,13 +1,12 @@ diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php old mode 100755 new mode 100644 index 340d320c..ae205a62 --- a/www-ssl/makeuser.php +++ b/www-ssl/makeuser.php @@ -1,214 +1,181 @@ - 0) - { - $error= Get_Text("makeuser_error_nick1"). $_POST["Nick"]. Get_Text("makeuser_error_nick3"); - } - elseif( strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && - strstr($_POST["email"], ".") == FALSE ) - { - $error= Get_Text("makeuser_error_mail"); - } - elseif( !is_numeric($_POST["Alter"])) - { - $error= Get_Text("makeuser_error_Alter"); - } - elseif( $_POST["Passwort"] != $_POST["Passwort2"] ) - { - $error= Get_Text("makeuser_error_password1"); - } - elseif( strlen($_POST["Passwort"]) < 6 ) - { - $error= Get_Text("makeuser_error_password2"); - } - else - { - $_POST["Passwort"] = PassCrypt($_POST["Passwort"]); - unset($_POST["Passwort2"]); + include "../../camp2011/includes/config.php"; + include "../../camp2011/includes/header.php"; + include "../../camp2011/includes/config_db.php"; + include "../../camp2011/includes/crypt.php"; - $SQL = "INSERT INTO `User` (". - "`Nick` , ". "`Name` , ". - "`Vorname`, ". "`Alter` , ". - "`Telefon`, ". "`DECT`, ". - "`Handy`, ". "`email`, ". - "`ICQ`, ". "`jabber`, ". - "`Size`, ". "`Passwort`, ". - "`Art` , ". "`kommentar`, ". - "`Hometown`,". "`CreateDate` ) ". - "VALUES ( ". - "'". $_POST["Nick"]. "', ". "'". $_POST["Name"]. "', ". - "'". $_POST["Vorname"]. "', ". "'". $_POST["Alter"]. "', ". - "'". $_POST["Telefon"]. "', ". "'". $_POST["DECT"]. "', ". - "'". $_POST["Handy"]. "', ". "'". $_POST["email"]. "', ". - "'". $_POST["ICQ"]. "', ". "'". $_POST["jabber"]. "', ". - "'". $_POST["Size"]. "', ". "'". $_POST["Passwort"]. "', ". - "'". $_POST["Art"]. "', ". "'". $_POST["kommentar"]. "', ". - "'". $_POST["Hometown"]. "',". "NOW());"; - $Erg = mysql_query($SQL, $con); + if(isset($_POST["send"])) { + $eNick = trim($_POST["Nick"]); - if ($Erg != 1) - { - echo Get_Text("makeuser_error_write1"). "
    \n"; - $error = mysql_error($con); - } - else - { - echo "

    ". Get_Text("makeuser_writeOK"). "\n"; + if($_POST["Alter"] == "") + $_POST["Alter"] = 0; - $SQL2 = "SELECT `UID` FROM `User` WHERE `Nick`='". $_POST["Nick"]. "';"; - $Erg2 = mysql_query($SQL2, $con); - $Data = mysql_fetch_array($Erg2); + // user vorhanden? + $SQLans = "SELECT UID FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "'"; + $Ergans = mysql_query($SQLans, $con); - $SQL3 = "INSERT INTO `UserCVS` (`UID`) VALUES ('". $Data["UID"]. "');"; - $Erg3 = mysql_query($SQL3, $con); - if ($Erg3 != 1) - { - echo "

    ". Get_Text("makeuser_error_write2"). "
    \n"; - $error = mysql_error($con); - } - else - { - echo Get_Text("makeuser_writeOK2"). "
    \n"; - echo "

    ". Get_Text("makeuser_writeOK3"). "

    \n"; - } - echo Get_Text("makeuser_writeOK4"). "

    \n

    \n"; - $success="any"; - - if ( isset($SubscribeMailinglist) ) - { - if ( $_POST["subscribe-mailinglist"] == "") - { - $headers = "From: ". $_POST["email"]. "\r\n" . - "X-Mailer: PHP/" . phpversion(); - mail( $SubscribeMailinglist, "subject", "message", $headers); - } - } + if(strlen($_POST["Nick"]) < 2) + $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick2"); + elseif(mysql_num_rows( $Ergans) > 0) + $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick3"); + elseif(strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && strstr($_POST["email"], ".") == false) + $error = Get_Text("makeuser_error_mail"); + elseif(!is_numeric($_POST["Alter"])) + $error = Get_Text("makeuser_error_Alter"); + elseif($_POST["Passwort"] != $_POST["Passwort2"]) + $error = Get_Text("makeuser_error_password1"); + elseif(strlen($_POST["Passwort"]) < 6) + $error = Get_Text("makeuser_error_password2"); + else { + $_POST["Passwort"] = PassCrypt($_POST["Passwort"]); + unset($_POST["Passwort2"]); - } - } - if( isset($error) ){ - echo "

    \n$error\n

    \n\n"; - } -} -else -{ - //init vars - $_POST["Nick"] = ""; - $_POST["Name"] = ""; - $_POST["Vorname"] = ""; - $_POST["Alter"] = ""; - $_POST["Telefon"] = ""; - $_POST["DECT"] = ""; - $_POST["Handy"] = ""; - $_POST["email"] = ""; - $_POST["subscribe-mailinglist"] = ""; - $_POST["ICQ"] = ""; - $_POST["jabber"] = ""; - $_POST["Size"] = "L"; - $_POST["Art"] = ""; - $_POST["kommentar"] = ""; - $_POST["Hometown"] = ""; -} + $SQL = "INSERT INTO `User` (". + "`Nick` , ". "`Name` , ". + "`Vorname`, ". "`Alter` , ". + "`Telefon`, ". "`DECT`, ". + "`Handy`, ". "`email`, ". + "`ICQ`, ". "`jabber`, ". + "`Size`, ". "`Passwort`, ". + "`Art` , ". "`kommentar`, ". + "`Hometown`,". "`CreateDate` ) ". + "VALUES ( ". + "'". $_POST["Nick"]. "', ". "'". $_POST["Name"]. "', ". + "'". $_POST["Vorname"]. "', ". "'". $_POST["Alter"]. "', ". + "'". $_POST["Telefon"]. "', ". "'". $_POST["DECT"]. "', ". + "'". $_POST["Handy"]. "', ". "'". $_POST["email"]. "', ". + "'". $_POST["ICQ"]. "', ". "'". $_POST["jabber"]. "', ". + "'". $_POST["Size"]. "', ". "'". $_POST["Passwort"]. "', ". + "'". $_POST["Art"]. "', ". "'". $_POST["kommentar"]. "', ". + "'". $_POST["Hometown"]. "',". "NOW());"; + $Erg = mysql_query($SQL, $con); -if( $success=="none" ){ -echo "

    ".Get_Text("makeuser_text0")."

    ". "

    ". Get_Text("makeuser_text1"). "

    "; -echo "\t\n"; -echo "\t\t
    PageShow
    \n"; @@ -93,35 +93,35 @@ echo "\t
    ". mysql_result( $erg, $i, "Field"). "\n"; - - echo "\t\t\t\tallow\n"; + echo "\t
    ". mysql_result( $erg, $i, "Field"). "\n"; + + echo "\t\t\t\tallow\n"; - echo "\t\t\t\tdenied\n"; + echo "\t\t\t\tdenied\n"; - echo "\t\t\t\tgroup-setting\n"; + echo "\t\t\t\tgroup-setting\n"; - echo "\t\t\t\n"; - echo "\t\t\t \n"; - echo "\t\t\t
    \n"; + echo "\t\t\t \n"; + echo "\t\t\t
    \n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -if ( isset($SubscribeMailinglist) ) -{ - echo "\t\t\t\n"; -} -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t
    ". Get_Text("makeuser_Nickname"). - "*
    ". Get_Text("makeuser_Nachname"). - "
    ". Get_Text("makeuser_Vorname"). - "
    ". Get_Text("makeuser_Alter"). - "
    ". Get_Text("makeuser_Telefon"). - "
    ". Get_Text("makeuser_DECT"). - "\n"; -echo "\t\t\t
    ". Get_Text("makeuser_Handy"). - "
    ". Get_Text("makeuser_E-Mail"). - "*
    ". Get_Text("makeuser_subscribe-mailinglist"). - "($SubscribeMailinglist)
    ICQ
    jabber
    ". Get_Text("makeuser_T-Shirt"). - " Grösse*\n"; -echo "\t\t\t\n"; -echo "\t\t\t
    ". Get_Text("makeuser_Engelart"). - "\n"; -echo "\t\t\t\n"; -echo "\t\t\t
    ". Get_Text("makeuser_text2"). "
    ". Get_Text("makeuser_Hometown"). - "
    ". Get_Text("makeuser_Passwort"). - "*
    ". Get_Text("makeuser_Passwort2"). - "*
     
    \n"; -echo "\t\n"; -Print_Text("makeuser_text3"); -} + if ($Erg != 1) { + echo Get_Text("makeuser_error_write1") . "
    \n"; + $error = mysql_error($con); + } else { + echo "

    " . Get_Text("makeuser_writeOK") . "\n"; -include ("../../camp2011/includes/footer.php"); + $SQL2 = "SELECT `UID` FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "';"; + $Erg2 = mysql_query($SQL2, $con); + $Data = mysql_fetch_array($Erg2); + + $SQL3 = "INSERT INTO `UserCVS` (`UID`) VALUES ('" . $Data["UID"] . "');"; + $Erg3 = mysql_query($SQL3, $con); + + if ($Erg3 != 1) { + echo "

    ". Get_Text("makeuser_error_write2"). "
    \n"; + $error = mysql_error($con); + } else { + echo Get_Text("makeuser_writeOK2") . "
    \n"; + echo "

    " . Get_Text("makeuser_writeOK3") . "

    \n"; + } + + echo Get_Text("makeuser_writeOK4") . "

    \n

    \n"; + $success = "any"; + + if (isset($SubscribeMailinglist)) { + if ($_POST["subscribe-mailinglist"] == "") { + $headers = "From: " . $_POST["email"] . "\r\n" . + "X-Mailer: PHP/" . phpversion(); + mail($SubscribeMailinglist, "subject", "message", $headers); + } + } + } + } + + if(isset($error)) + echo "

    \n" . $error . "\n

    \n\n"; + } else { + // init vars + $_POST["Nick"] = ""; + $_POST["Name"] = ""; + $_POST["Vorname"] = ""; + $_POST["Alter"] = ""; + $_POST["Telefon"] = ""; + $_POST["DECT"] = ""; + $_POST["Handy"] = ""; + $_POST["email"] = ""; + $_POST["subscribe-mailinglist"] = ""; + $_POST["ICQ"] = ""; + $_POST["jabber"] = ""; + $_POST["Size"] = "L"; + $_POST["Art"] = ""; + $_POST["kommentar"] = ""; + $_POST["Hometown"] = ""; + } + + if($success == "none") { + echo "

    " . Get_Text("makeuser_text0") . "

    \n"; + echo "

    " . Get_Text("makeuser_text1") . "

    \n"; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + if(isset($SubscribeMailinglist)) + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    " . Get_Text("makeuser_Nickname") . "*
    " . Get_Text("makeuser_Nachname") . "
    ". Get_Text("makeuser_Vorname") . "
    ". Get_Text("makeuser_Alter") . "
    ". Get_Text("makeuser_Telefon"). "
    ". Get_Text("makeuser_DECT"). "\n"; + echo "
    ". Get_Text("makeuser_Handy"). "
    ". Get_Text("makeuser_E-Mail"). "*
    ". Get_Text("makeuser_subscribe-mailinglist"). "($SubscribeMailinglist)
    ICQ
    jabber
    ". Get_Text("makeuser_T-Shirt"). " Grösse*\n"; + echo "\n"; + echo "
    ". Get_Text("makeuser_Engelart"). "\n"; + echo "\n"; + echo "
    ". Get_Text("makeuser_text2"). "
    ". Get_Text("makeuser_Hometown"). "
    ". Get_Text("makeuser_Passwort"). "*
    ". Get_Text("makeuser_Passwort2"). "*
     
    \n"; + echo "
    \n"; + Print_Text("makeuser_text3"); + } + + include "../../camp2011/includes/footer.php"; ?> - diff --git a/www-ssl/nonpublic/auth.php b/www-ssl/nonpublic/auth.php old mode 100755 new mode 100644 index 3356a81c..2bd6f86f --- a/www-ssl/nonpublic/auth.php +++ b/www-ssl/nonpublic/auth.php @@ -1,66 +1,32 @@ - 'success', - 'rights' => $CVS - ); - echo json_encode($msg); - - } - else - { - echo json_encode(array('status' => 'failed')); - } - } - else - { - echo json_encode(array('status' => 'failed')); - } -} -else -{ - echo json_encode(array('status' => 'failed')); -} + if(mysql_num_rows($Erg) == 1) { + if(mysql_result($Erg, 0, "Passwort") == $Pass) { + $UID = mysql_result($Erg, 0, "UID"); + // get CVS import Data + $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='" . $UID . "'"; + $Erg_CVS = mysql_query($SQL, $con); + $CVS = mysql_fetch_array($Erg_CVS); + $msg = array('status' => 'success', 'rights' => $CVS); + echo json_encode($msg); + } else + echo json_encode(array('status' => 'failed')); + } else + echo json_encode(array('status' => 'failed')); + } else + echo json_encode(array('status' => 'failed')); ?> - - diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php old mode 100755 new mode 100644 index 5bbd63ce..6ddb093a --- a/www-ssl/nonpublic/einstellungen.php +++ b/www-ssl/nonpublic/einstellungen.php @@ -1,360 +1,377 @@ -\n\n"; - Print_Text(13); + if(!isset($_POST["action"])) { + echo Get_Text("Hallo").$_SESSION['Nick'].",
    \n\n"; + Print_Text(13); ?> -
    - +
    +
    - - - - + +
    ">
    + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - - + + + + + - - - + + + + -
    ">
    ICQ
    ICQ
    jabber
    jabber
    - "> + + ">
    -
    - - -
    - -
    - - - - - -
    - "> -
    -
    - +
    -
    - +
    - - - - - - -
    - -
    Menu>L - >R -
    - "> + + + + + +
    + ">
    -
    +
    +
    -
    - +
    +
    - - - - -
    - -
    - "> + + + + + + + + + + +
    + +
    Menu>L + >R +
    + "> +
    +
    +
    +
    + +
    + + + + + +
    + +
    + ">
    -\n
    \n
    \n\n"; - echo Get_Text('pub_einstellungen_PictureUpload')."
    "; - echo "
    \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t(max ". get_cfg_var("post_max_size"). "Byte)
    \n"; - echo "\t\n"; - echo "
    \n"; - } - - switch( GetPicturShow( $_SESSION['UID'])) - { - case 'Y': - echo Get_Text('pub_einstellungen_PictureShow'). "
    "; - echo displayPictur($_SESSION['UID'], 0); - echo "
    \n"; - echo "\t\n"; - echo "\t\n"; - echo "
    \n"; - break; - case 'N': - echo Get_Text('pub_einstellungen_PictureNoShow'). "
    "; - echo displayPictur($_SESSION['UID'], 0); - echo "
    \n"; - echo "\t\n"; - echo "\t\n"; - echo "
    \n"; - echo "
    \n
    \n
    \n\n"; - case '': - echo "
    \n
    \n
    \n\n"; - echo Get_Text(22). "
    "; - echo "\n
    \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\t\n\t\t\t\n\t\t\n"; - echo "\t\t\n"; - echo "\t\t\t\n\t\t\n"; - echo "\t
    ". Get_Text(23). "
    \n"; - echo "\t\t\t\t  \n"; - echo "\t\t\t\t\n"; - echo "\t\t\t
    \n"; - echo "\t\n"; - echo "
    \n"; - break; - } //CASE - -} else { - -switch ($_POST["action"]) { - -case 'set': - if ($_POST["new1"]==$_POST["new2"]){ - Print_Text(25); - $sql = "SELECT * FROM `User` WHERE `UID`='".$_SESSION['UID']. "'"; - $Erg = mysql_query($sql, $con); - if (PassCrypt($_POST["old"])==mysql_result($Erg, 0, "Passwort")) { - Print_Text(26); - Print_Text(27); - $usql = "UPDATE `User` SET `Passwort`='". PassCrypt($_POST["new1"]). "' ". - " WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; - $Erg = mysql_query($usql, $con); - if ($Erg==1) { - Print_Text(28); - } else { - Print_Text(29); - } - } else { - Print_Text(30); - } - } else { - Print_Text(31); +\n
    \n
    \n\n"; + echo Get_Text('pub_einstellungen_PictureUpload') . "
    "; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "(max ". get_cfg_var("post_max_size"). "Byte)
    \n"; + echo "\n"; + echo "
    \n"; } - break; -case 'colour': + switch( GetPicturShow( $_SESSION['UID'])) { + case 'Y': + echo Get_Text('pub_einstellungen_PictureShow'). "
    "; + echo displayPictur($_SESSION['UID'], 0); + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    \n"; + break; + case 'N': + echo Get_Text('pub_einstellungen_PictureNoShow'). "
    "; + echo displayPictur($_SESSION['UID'], 0); + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    \n"; + echo "
    \n
    \n
    \n\n"; + case '': + echo "
    \n
    \n
    \n\n"; + echo Get_Text(22). "
    "; + echo "\n
    \n"; + echo "\n"; + echo "\n"; + echo "\n\n\n"; + echo "\n"; + echo "\n\n"; + echo "
    ". Get_Text(23). "
    \n"; + echo "  \n"; + echo "\n"; + echo "
    \n"; + echo "\n"; + echo "
    \n"; + break; + } //CASE + + } else { + switch ($_POST["action"]) { + case 'set': + if($_POST["new1"] == $_POST["new2"]) { + Print_Text(25); + $sql = "SELECT * FROM `User` WHERE `UID`='".$_SESSION['UID']. "'"; + $Erg = mysql_query($sql, $con); + + if(PassCrypt($_POST["old"]) == mysql_result($Erg, 0, "Passwort")) { + Print_Text(26); + Print_Text(27); + $usql = "UPDATE `User` SET `Passwort`='". PassCrypt($_POST["new1"]). "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; + $Erg = mysql_query($usql, $con); + + if ($Erg==1) { + Print_Text(28); + } else { + Print_Text(29); + } + } else { + Print_Text(30); + } + } else { + Print_Text(31); + } + break; + + case 'colour': + + $chsql="UPDATE `User` SET ". + "`color`= '". $_POST["colourid"]. "', ". + "`Menu`= '". $_POST["eMenu"]. "' ". + "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; + $Erg = mysql_query($chsql, $con); + echo mysql_error($con); + $_SESSION['color']=$_POST["colourid"]; + $_SESSION['Menu']=$_POST["eMenu"]; + if ($Erg==1) { + Print_Text(32); + } else { + Print_Text(29); + } + break; case 'sprache': - $chsql="UPDATE `User` SET `Sprache` = '". $_POST["language"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; - $Erg = mysql_query($chsql, $con); - $_SESSION['Sprache']=$_POST["language"]; - if ($Erg==1) { - Print_Text(33); - } else { - Print_Text(29); - } - break; + $chsql="UPDATE `User` SET `Sprache` = '". $_POST["language"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; + $Erg = mysql_query($chsql, $con); + $_SESSION['Sprache']=$_POST["language"]; + if ($Erg==1) { + Print_Text(33); + } else { + Print_Text(29); + } + break; case 'avatar': - $chsql="UPDATE `User` SET `Avatar`='". $_POST["eAvatar"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; + $chsql="UPDATE `User` SET `Avatar`='". $_POST["eAvatar"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; $Erg = mysql_query($chsql, $con); - $_SESSION['Avatar']=$_POST["eAvatar"]; - if ($Erg==1) - Print_Text(34); + $_SESSION['Avatar']=$_POST["eAvatar"]; + if ($Erg==1) + Print_Text(34); else - Print_Text(29); + Print_Text(29); break; case 'setUserData': - if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" ) - { - $chsql= "UPDATE `User` SET ". - "`Nick`='". $_POST["eNick"]. "', `Name`='". $_POST["eName"]. "', ". - "`Vorname`='". $_POST["eVorname"]. "', `Alter`='". $_POST["eAlter"]. "', ". - "`Telefon`='". $_POST["eTelefon"]. "', `Handy`='". $_POST["eHandy"]. "', ". - "`DECT`='". $_POST["eDECT"]. "', `email`='". $_POST["eemail"]. "', ". - "`ICQ`='". $_POST["eICQ"]. "', `jabber`='". $_POST["ejabber"]."', ". - "`Hometown`='". $_POST["Hometown"]. "', `Size`='". $_POST["Sizeid"]. "' ". - "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;"; - } - else - { - $chsql= "UPDATE `User` SET ". - "`Nick`='". $_POST["eNick"]. "', `Name`='". $_POST["eName"]. "', ". - "`Vorname`='". $_POST["eVorname"]. "', `Alter`='". $_POST["eAlter"]. "', ". - "`Telefon`='". $_POST["eTelefon"]. "', `Handy`='". $_POST["eHandy"]. "', ". - "`DECT`='". $_POST["eDECT"]. "', `email`='". $_POST["eemail"]. "', ". - "`ICQ`='". $_POST["eICQ"]. "', `jabber`='". $_POST["ejabber"]."', ". - "`Hometown`='". $_POST["Hometown"]. "' ". - "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;"; - } + if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" ) + { + $chsql= "UPDATE `User` SET ". + "`Nick`='". $_POST["eNick"]. "', `Name`='". $_POST["eName"]. "', ". + "`Vorname`='". $_POST["eVorname"]. "', `Alter`='". $_POST["eAlter"]. "', ". + "`Telefon`='". $_POST["eTelefon"]. "', `Handy`='". $_POST["eHandy"]. "', ". + "`DECT`='". $_POST["eDECT"]. "', `email`='". $_POST["eemail"]. "', ". + "`ICQ`='". $_POST["eICQ"]. "', `jabber`='". $_POST["ejabber"]."', ". + "`Hometown`='". $_POST["Hometown"]. "', `Size`='". $_POST["Sizeid"]. "' ". + "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;"; + } + else + { + $chsql= "UPDATE `User` SET ". + "`Nick`='". $_POST["eNick"]. "', `Name`='". $_POST["eName"]. "', ". + "`Vorname`='". $_POST["eVorname"]. "', `Alter`='". $_POST["eAlter"]. "', ". + "`Telefon`='". $_POST["eTelefon"]. "', `Handy`='". $_POST["eHandy"]. "', ". + "`DECT`='". $_POST["eDECT"]. "', `email`='". $_POST["eemail"]. "', ". + "`ICQ`='". $_POST["eICQ"]. "', `jabber`='". $_POST["ejabber"]."', ". + "`Hometown`='". $_POST["Hometown"]. "' ". + "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;"; + } $Erg = mysql_query($chsql, $con); - if ($Erg==1) - { - $_SESSION['Nick'] = $_POST["eNick"]; - $_SESSION['Name'] = $_POST["eName"]; - $_SESSION['Vorname'] = $_POST["eVorname"]; - $_SESSION['Alter'] = $_POST["eAlter"]; - $_SESSION['Telefon'] = $_POST["eTelefon"]; - $_SESSION['Handy'] = $_POST["eHandy"]; - $_SESSION['DECT'] = $_POST["eDECT"]; - $_SESSION['email'] = $_POST["eemail"]; - $_SESSION['ICQ'] = $_POST["eICQ"]; - $_SESSION['jabber'] = $_POST["ejabber"]; - $_SESSION['Hometown'] = $_POST["Hometown"]; - if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" ) - { - $_SESSION['Size']=$_POST["Sizeid"]; - } - else if( $_SESSION['Size'] != $_POST["Sizeid"]) - { - array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n"); - } + if ($Erg==1) + { + $_SESSION['Nick'] = $_POST["eNick"]; + $_SESSION['Name'] = $_POST["eName"]; + $_SESSION['Vorname'] = $_POST["eVorname"]; + $_SESSION['Alter'] = $_POST["eAlter"]; + $_SESSION['Telefon'] = $_POST["eTelefon"]; + $_SESSION['Handy'] = $_POST["eHandy"]; + $_SESSION['DECT'] = $_POST["eDECT"]; + $_SESSION['email'] = $_POST["eemail"]; + $_SESSION['ICQ'] = $_POST["eICQ"]; + $_SESSION['jabber'] = $_POST["ejabber"]; + $_SESSION['Hometown'] = $_POST["Hometown"]; + if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" ) + { + $_SESSION['Size']=$_POST["Sizeid"]; + } + else if( $_SESSION['Size'] != $_POST["Sizeid"]) + { + array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n"); + } - - Print_Text("pub_einstellungen_UserDateSaved"); + + Print_Text("pub_einstellungen_UserDateSaved"); } - else - { - Print_Text(29); - echo mysql_error( $con); - } - break; + else + { + Print_Text(29); + echo mysql_error( $con); + } + break; case 'sendPicture': - if( $_FILES["file"]["size"] > 0) - { - if( ($_FILES["file"]["type"] == "image/jpeg") || - ($_FILES["file"]["type"] == "image/png") || - ($_FILES["file"]["type"] == "image/gif") ) - { - $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); + if( $_FILES["file"]["size"] > 0) + { + if( ($_FILES["file"]["type"] == "image/jpeg") || + ($_FILES["file"]["type"] == "image/png") || + ($_FILES["file"]["type"] == "image/gif") ) + { + $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); - if( GetPicturShow( $_SESSION['UID']) == "") - $SQL = "INSERT INTO `UserPicture` ". - "( `UID`,`Bild`, `ContentType`, `show`) ". - "VALUES ('". $_SESSION['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')"; - else - $SQL = "UPDATE `UserPicture` SET ". - "`Bild`='$data', ". - "`ContentType`='". $_FILES["file"]["type"]. "', ". - "`show`='N' ". - "WHERE `UID`='". $_SESSION['UID']. "'"; - - $res = mysql_query( $SQL, $con); - if( $res) - Print_Text("pub_einstellungen_send_OK"); - else - Print_Text("pub_einstellungen_send_KO"); - - echo "
    ('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"]. ", " . $_FILES["file"]["size"]. " Byte)
    "; - } - else - Print_Text("pub_einstellungen_send_KO"); - } - else - Print_Text("pub_einstellungen_send_KO"); - break; + if( GetPicturShow( $_SESSION['UID']) == "") + $SQL = "INSERT INTO `UserPicture` ". + "( `UID`,`Bild`, `ContentType`, `show`) ". + "VALUES ('". $_SESSION['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')"; + else + $SQL = "UPDATE `UserPicture` SET ". + "`Bild`='$data', ". + "`ContentType`='". $_FILES["file"]["type"]. "', ". + "`show`='N' ". + "WHERE `UID`='". $_SESSION['UID']. "'"; + + $res = mysql_query( $SQL, $con); + if( $res) + Print_Text("pub_einstellungen_send_OK"); + else + Print_Text("pub_einstellungen_send_KO"); + + echo "
    ('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"]. ", " . $_FILES["file"]["size"]. " Byte)
    "; + } + else + Print_Text("pub_einstellungen_send_KO"); + } + else + Print_Text("pub_einstellungen_send_KO"); + break; case 'delPicture': - $chsql="DELETE FROM `UserPicture` WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; + $chsql="DELETE FROM `UserPicture` WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; $Erg = mysql_query($chsql, $con); - if ($Erg==1) - Print_Text("pub_einstellungen_del_OK"); + if ($Erg==1) + Print_Text("pub_einstellungen_del_OK"); else - Print_Text("pub_einstellungen_del_KO"); - Break; + Print_Text("pub_einstellungen_del_KO"); + Break; } } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php old mode 100755 new mode 100644 index ea5c6e3c..0f2892b7 --- a/www-ssl/nonpublic/engelbesprechung.php +++ b/www-ssl/nonpublic/engelbesprechung.php @@ -1,37 +1,27 @@ + $title = "Himmel"; + $header = "Engelbesprechung"; + include "../../../camp2011/includes/header.php"; -
    + $SQL = "SELECT * FROM `News` ORDER BY 'Datum' DESC"; + $Erg = mysql_query($SQL, $con); -" . mysql_result($Erg, $n, "Betreff") . ""; -// anzahl zeilen -$Zeilen = mysql_num_rows($Erg); + // Show Admin Page + if($_SESSION['CVS']["admin/news.php"] == "Y") + echo " [edit]"; -for ($n = 0 ; $n < $Zeilen ; $n++) -{ - if (mysql_result($Erg, $n, "Treffen")=="1") - { - echo "

    ".mysql_result($Erg, $n, "Betreff").""; - - // Schow Admin Page - if( $_SESSION['CVS'][ "admin/news.php" ] == "Y" ) - echo " [edit]"; - - echo "
       ".mysql_result($Erg, $n, "Datum").", "; - echo UID2Nick(mysql_result($Erg, $n, "UID"))."

    \n"; - - - echo "

    ".nl2br(mysql_result($Erg, $n, "Text"))."

    \n"; + echo "
       ".mysql_result($Erg, $n, "Datum").", "; + echo UID2Nick(mysql_result($Erg, $n, "UID"))."

    \n"; + echo "

    ".nl2br(mysql_result($Erg, $n, "Text"))."

    \n"; + } } -} - -include ("../../../camp2011/includes/footer.php"); + include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php old mode 100755 new mode 100644 index 79044c2c..7f768282 --- a/www-ssl/nonpublic/faq.php +++ b/www-ssl/nonpublic/faq.php @@ -1,35 +1,32 @@ -

    +

    - -

    - "> + +

    + ">
    -".Get_Text(37)."

    \n".nl2br($_POST["frage"])."

    \n".Get_Text(38)."
    \n"; +echo "".Get_Text(37)."

    \n".nl2br($_POST["frage"])."

    \n".Get_Text(38)."
    \n"; $SQL = "INSERT INTO `Questions` VALUES ('', '".$_SESSION['UID']."', '". $_POST["frage"]. "', '', '')"; $Erg = mysql_query($SQL, $con); } // Bisherige Anfragen: -echo "
    \n".Get_Text(39)."
    \n"; +echo "
    \n".Get_Text(39)."
    \n"; echo "
    \n"; -echo "
    ".Get_Text(40)."
    \n"; +echo "
    ".Get_Text(40)."
    \n"; $SQL = "SELECT * FROM `Questions` WHERE `UID` = ". $_SESSION['UID']. " AND `AID`='0' ORDER BY 'QID' DESC"; $Erg = mysql_query($SQL, $con); @@ -38,19 +35,19 @@ $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); if ($Zeilen==0){ - Print_Text(41); + Print_Text(41); } else { - for ($n = 0 ; $n < $Zeilen ; $n++) { - echo "

    ".nl2br(mysql_result($Erg, $n, "Question"))."
    \n"; + for ($n = 0 ; $n < $Zeilen ; $n++) { + echo "

    ".nl2br(mysql_result($Erg, $n, "Question"))."
    \n"; // Es gibt ja noch keine Antwort: -// echo "

    ".nl2br(mysql_result($Erg, $n, "Answer"))."

    \n"; - echo "\n
    ---
    "; - } +// echo "

    ".nl2br(mysql_result($Erg, $n, "Answer"))."

    \n"; + echo "\n
    ---
    "; + } } echo "
    \n"; -echo "
    ".Get_Text(42)."
    \n"; +echo "
    ".Get_Text(42)."
    \n"; $SQL = "SELECT * FROM `Questions` WHERE `UID`='".$_SESSION['UID']."' and `AID`<>'0' ORDER BY 'QID' DESC"; $Erg = mysql_query($SQL, $con); @@ -58,14 +55,14 @@ $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); if ($Zeilen==0){ - Print_Text(41); + Print_Text(41); } else { - for ($n = 0 ; $n < $Zeilen ; $n++) { - echo "

    ".nl2br(mysql_result($Erg, $n, "Question"))."
    \n"; - echo "

    ".nl2br(mysql_result($Erg, $n, "Answer")). - "@". UID2Nick(mysql_result($Erg, $n, "AID"))."\n"; - echo "\n
    ---
    "; - } + for ($n = 0 ; $n < $Zeilen ; $n++) { + echo "

    ".nl2br(mysql_result($Erg, $n, "Question"))."
    \n"; + echo "

    ".nl2br(mysql_result($Erg, $n, "Answer")). + "@". UID2Nick(mysql_result($Erg, $n, "AID"))."\n"; + echo "\n
    ---
    "; + } } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php old mode 100755 new mode 100644 index 1072e2d6..a4b2e975 --- a/www-ssl/nonpublic/index.php +++ b/www-ssl/nonpublic/index.php @@ -9,73 +9,73 @@ session_start(); // alte Session - falls vorhanden - wiederherstellen... function LoginOK() { - include ("../../../camp2011/includes/config.php"); - header("HTTP/1.1 302 Moved Temporarily"); - header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php"); + include ("../../../camp2011/includes/config.php"); + header("HTTP/1.1 302 Moved Temporarily"); + header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php"); } if ( !IsSet($_POST["user"])) { // User ist bereits angemeldet... normaler Inhalt... - LoginOK(); + LoginOK(); } else { // User ist noch nicht angemeldet - $sql = "SELECT * FROM `User` WHERE `Nick`='". $_POST["user"]. "'"; - $userstring = mysql_query($sql, $con); + $sql = "SELECT * FROM `User` WHERE `Nick`='". $_POST["user"]. "'"; + $userstring = mysql_query($sql, $con); - // anzahl zeilen - $user_anz = mysql_num_rows($userstring); + // anzahl zeilen + $user_anz = mysql_num_rows($userstring); - if ($user_anz == 1) { // Check, ob User angemeldet wird... - if (mysql_result($userstring, 0, "Passwort") == PassCrypt($_POST["password"])) { // Passwort ok... - // Session wird eingeleitet und Session-Variablen gesetzt.. - // session_start(); - session_name("Himmel"); - $_SESSION['UID'] = mysql_result($userstring, 0, "UID"); - $_SESSION['Nick'] = mysql_result($userstring, 0, "Nick"); - $_SESSION['Name'] = mysql_result($userstring, 0, "Name"); - $_SESSION['Vorname'] = mysql_result($userstring, 0, "Vorname"); - $_SESSION['Alter'] = mysql_result($userstring, 0, "Alter"); - $_SESSION['Telefon'] = mysql_result($userstring, 0, "Telefon"); - $_SESSION['Handy'] = mysql_result($userstring, 0, "Handy"); - $_SESSION['DECT'] = mysql_result($userstring, 0, "DECT"); - $_SESSION['email'] = mysql_result($userstring, 0, "email"); - $_SESSION['ICQ'] = mysql_result($userstring, 0, "ICQ"); - $_SESSION['jabber'] = mysql_result($userstring, 0, "jabber"); - $_SESSION['Size'] = mysql_result($userstring, 0, "Size"); - $_SESSION['Gekommen'] = mysql_result($userstring, 0, "Gekommen"); - $_SESSION['Aktiv'] = mysql_result($userstring, 0, "Aktiv"); - $_SESSION['Tshirt'] = mysql_result($userstring, 0, "Tshirt"); - $_SESSION['Menu'] = mysql_result($userstring, 0, "Menu"); - $_SESSION['color'] = mysql_result($userstring, 0, "color"); - $_SESSION['Avatar'] = mysql_result($userstring, 0, "Avatar"); - $_SESSION['Sprache'] = mysql_result($userstring, 0, "Sprache"); - $_SESSION['Hometown'] = mysql_result($userstring, 0, "Hometown"); - $_SESSION['IP'] = $_SERVER['REMOTE_ADDR']; - - // CVS import Data - $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='".$_SESSION['UID']."'"; - $Erg_CVS = mysql_query($SQL, $con); - $_SESSION['CVS'] = mysql_fetch_array($Erg_CVS); - - LoginOK(); - } - else - { // Passwort nicht ok... - $ErrorText = "pub_index_pass_no_ok"; - } // Ende Passwort-Check - } - else - { // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung - if ($user_anz == 0) - $ErrorText = "pub_index_User_unset"; - else - $ErrorText = "pub_index_User_more_as_one"; - } // Ende Check, ob User angemeldet wurde + if ($user_anz == 1) { // Check, ob User angemeldet wird... + if (mysql_result($userstring, 0, "Passwort") == PassCrypt($_POST["password"])) { // Passwort ok... + // Session wird eingeleitet und Session-Variablen gesetzt.. + // session_start(); + session_name("Himmel"); + $_SESSION['UID'] = mysql_result($userstring, 0, "UID"); + $_SESSION['Nick'] = mysql_result($userstring, 0, "Nick"); + $_SESSION['Name'] = mysql_result($userstring, 0, "Name"); + $_SESSION['Vorname'] = mysql_result($userstring, 0, "Vorname"); + $_SESSION['Alter'] = mysql_result($userstring, 0, "Alter"); + $_SESSION['Telefon'] = mysql_result($userstring, 0, "Telefon"); + $_SESSION['Handy'] = mysql_result($userstring, 0, "Handy"); + $_SESSION['DECT'] = mysql_result($userstring, 0, "DECT"); + $_SESSION['email'] = mysql_result($userstring, 0, "email"); + $_SESSION['ICQ'] = mysql_result($userstring, 0, "ICQ"); + $_SESSION['jabber'] = mysql_result($userstring, 0, "jabber"); + $_SESSION['Size'] = mysql_result($userstring, 0, "Size"); + $_SESSION['Gekommen'] = mysql_result($userstring, 0, "Gekommen"); + $_SESSION['Aktiv'] = mysql_result($userstring, 0, "Aktiv"); + $_SESSION['Tshirt'] = mysql_result($userstring, 0, "Tshirt"); + $_SESSION['Menu'] = mysql_result($userstring, 0, "Menu"); + $_SESSION['color'] = mysql_result($userstring, 0, "color"); + $_SESSION['Avatar'] = mysql_result($userstring, 0, "Avatar"); + $_SESSION['Sprache'] = mysql_result($userstring, 0, "Sprache"); + $_SESSION['Hometown'] = mysql_result($userstring, 0, "Hometown"); + $_SESSION['IP'] = $_SERVER['REMOTE_ADDR']; + + // CVS import Data + $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='".$_SESSION['UID']."'"; + $Erg_CVS = mysql_query($SQL, $con); + $_SESSION['CVS'] = mysql_fetch_array($Erg_CVS); + + LoginOK(); + } + else + { // Passwort nicht ok... + $ErrorText = "pub_index_pass_no_ok"; + } // Ende Passwort-Check + } + else + { // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung + if ($user_anz == 0) + $ErrorText = "pub_index_User_unset"; + else + $ErrorText = "pub_index_User_more_as_one"; + } // Ende Check, ob User angemeldet wurde } include ("../../../camp2011/includes/header.php"); if( isset($ErrorText)) - echo "

    ". Get_Text($ErrorText). "


    \n"; + echo "

    ". Get_Text($ErrorText). "


    \n"; include ("../../../camp2011/includes/login_eingabefeld.php"); include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php old mode 100755 new mode 100644 index 2ba852d4..c85bf669 --- a/www-ssl/nonpublic/messages.php +++ b/www-ssl/nonpublic/messages.php @@ -1,127 +1,122 @@ \n"; - echo Get_Text("pub_messages_text1"). "

    \n"; - - //##################### - //show exist Messages - //##################### - $SQL = "SELECT * FROM `Messages` WHERE `SUID`='". $_SESSION["UID"]. "' OR `RUID`='". $_SESSION["UID"]. "'"; - $erg = mysql_query($SQL, $con); - - echo "\n"; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - - for( $i=0; $i\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - } - - //##################### - //send Messeges - //##################### - echo ""; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - // Listet alle Nicks auf - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - echo ""; - - echo "
    ". Get_Text("pub_messages_Datum"). "". Get_Text("pub_messages_Von"). "". Get_Text("pub_messages_An"). "". Get_Text("pub_messages_Text"). "
    ". mysql_result( $erg, $i, "Datum" ). "". UID2Nick( mysql_result( $erg, $i, "SUID" )). "". UID2Nick( mysql_result( $erg, $i, "RUID" )). "". mysql_result( $erg, $i, "Text" ). ""; - - if( mysql_result( $erg, $i, "RUID")==$_SESSION["UID"]) - { - echo "". Get_Text("pub_messages_DelMsg"). ""; - if( mysql_result( $erg, $i, "isRead")=="N") - echo "

    ". Get_Text("pub_messages_MarkRead"). ""; - } - else - { - if( mysql_result( $erg, $i, "isRead")=="N") - echo Get_Text("pub_messages_NotRead"); - } - - echo "
    \n"; - break; - - case "SendMsg": - echo Get_Text("pub_messages_Send1"). "...
    \n"; - - $SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (". - "'". gmdate("Y-m-j H:i:s", time()). "', ". - "'". $_SESSION["UID"]. "', ". - "'". $_POST["RUID"]."', ". - "'". $_POST["Text"]. "');"; - - $Erg = mysql_query($SQL, $con); - if ($Erg == 1) - echo Get_Text("pub_messages_Send_OK"). "\n"; - else - echo Get_Text("pub_messages_Send_Error"). "...\n(". mysql_error($con). ")"; - break; - - case "MarkRead": - $SQL = "UPDATE `Messages` SET `isRead` = 'Y' ". - "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID`='". $_SESSION["UID"]. "' ". - "LIMIT 1 ;"; - $Erg = mysql_query($SQL, $con); - if ($Erg == 1) - echo Get_Text("pub_messages_MarkRead_OK"). "\n"; - else - echo Get_Text("pub_messages_MarkRead_KO"). "...\n(". mysql_error($con). ")"; - break; - - case "DelMsg": - $SQL = "DELETE FROM `Messages` ". - "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID` ='". $_SESSION["UID"]. "' ". - "LIMIT 1;"; - $Erg = mysql_query($SQL, $con); - if ($Erg == 1) - echo Get_Text("pub_messages_DelMsg_OK"). "\n"; - else - echo Get_Text("pub_messages_DelMsg_KO"). "...\n(". mysql_error($con). ")"; - break; - - default: - echo Get_Text("pub_messages_NoCommand"); -} + switch( $_GET["action"]) { + case "start": + echo Get_Text("Hello"). $_SESSION['Nick']. ",
    \n"; + echo Get_Text("pub_messages_text1"). "

    \n"; -include ("../../../camp2011/includes/footer.php"); + //show exist Messages + $SQL = "SELECT * FROM `Messages` WHERE `SUID`='" . $_SESSION["UID"] . "' OR `RUID`='" . $_SESSION["UID"] . "'"; + $erg = mysql_query($SQL, $con); + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + for($i = 0; $i < mysql_num_rows($erg); $i++) { + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + } + + // send Messeges + echo ""; + echo "\n"; + echo "\n"; + echo "\n"; + + // Listet alle Nicks auf + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; + + echo "
    ". Get_Text("pub_messages_Datum"). "". Get_Text("pub_messages_Von"). "". Get_Text("pub_messages_An"). "". Get_Text("pub_messages_Text"). "
    " . mysql_result($erg, $i, "Datum") . "" . UID2Nick(mysql_result($erg, $i, "SUID")) . "" . UID2Nick(mysql_result($erg, $i, "RUID")) . "" . mysql_result($erg, $i, "Text") . ""; + + if(mysql_result($erg, $i, "RUID") == $_SESSION["UID"]) { + echo "" . Get_Text("pub_messages_DelMsg") . ""; + + if(mysql_result($erg, $i, "isRead") == "N") + echo "" . Get_Text("pub_messages_MarkRead") . ""; + } else { + if(mysql_result($erg, $i, "isRead") == "N") + echo Get_Text("pub_messages_NotRead"); + } + + echo "
    \n"; + break; + + case "SendMsg": + echo Get_Text("pub_messages_Send1") . "...
    \n"; + + $SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (". + "'" . gmdate("Y-m-j H:i:s", time()) . "', ". + "'" . $_SESSION["UID"]. "', ". + "'" . $_POST["RUID"]."', ". + "'" . $_POST["Text"]. "');"; + + $Erg = mysql_query($SQL, $con); + + if($Erg == 1) + echo Get_Text("pub_messages_Send_OK") . "\n"; + else + echo Get_Text("pub_messages_Send_Error") . "...\n(". mysql_error($con). ")"; + break; + + case "MarkRead": + $SQL = "UPDATE `Messages` SET `isRead` = 'Y' ". + "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID`='". $_SESSION["UID"]. "' ". + "LIMIT 1 ;"; + $Erg = mysql_query($SQL, $con); + + if ($Erg == 1) + echo Get_Text("pub_messages_MarkRead_OK"). "\n"; + else + echo Get_Text("pub_messages_MarkRead_KO"). "...\n(". mysql_error($con). ")"; + break; + + case "DelMsg": + $SQL = "DELETE FROM `Messages` ". + "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID` ='". $_SESSION["UID"]. "' ". + "LIMIT 1;"; + $Erg = mysql_query($SQL, $con); + + if ($Erg == 1) + echo Get_Text("pub_messages_DelMsg_OK"). "\n"; + else + echo Get_Text("pub_messages_DelMsg_KO"). "...\n(". mysql_error($con). ")"; + break; + + default: + echo Get_Text("pub_messages_NoCommand"); + } + + include "../../../camp2011/includes/footer.php"; ?> diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php old mode 100755 new mode 100644 index e11453c4..6bbabbb6 --- a/www-ssl/nonpublic/myschichtplan.php +++ b/www-ssl/nonpublic/myschichtplan.php @@ -1,118 +1,116 @@ \n"; + echo Get_Text("pub_mywake_beschreibung1")."
    \n"; + echo Get_Text("pub_mywake_beschreibung2")."

    \n"; + echo Get_Text("pub_mywake_beschreibung3").($LETZTES_AUSTRAGEN). + Get_Text("pub_mywake_beschreibung4")."

    \n"; -If( !IsSet($_GET["action"]) ) -{ + $USER_ID = $_SESSION['UID']; - echo Get_Text("Hello").$_SESSION['Nick'].",
    \n"; - echo Get_Text("pub_mywake_beschreibung1")."
    \n"; - echo Get_Text("pub_mywake_beschreibung2")."

    \n"; - echo Get_Text("pub_mywake_beschreibung3").($LETZTES_AUSTRAGEN). - Get_Text("pub_mywake_beschreibung4")."

    \n"; + if( $_SESSION['CVS'][ "admin/schichtplan.php" ] == "Y" ) { + if( !isset( $_GET["UIDs"]) ) + $_GET["UIDs"] = $_SESSION['UID']; + else + $USER_ID = $_GET["UIDs"]; - $USER_ID = $_SESSION['UID']; - if( $_SESSION['CVS'][ "admin/schichtplan.php" ] == "Y" ) - { - if( !isset( $_GET["UIDs"]) ) - $_GET["UIDs"] = $_SESSION['UID']; - else - $USER_ID = $_GET["UIDs"]; - - echo "
    "; + echo ""; - echo "Liste von anzeigen.\n"; - echo mysql_error($con); - - echo "\n"; + echo "Liste von \n"; - for( $i=0; $i"; + echo ""; + } + + $SQL = "SELECT *, `ShiftEntry`.`Comment`, `ShiftEntry`.`TID` FROM `Shifts` ". + "INNER JOIN `ShiftEntry` ". + "ON `Shifts`.`SID`=`ShiftEntry`.`SID` ". + "WHERE `ShiftEntry`.`UID`='$USER_ID' ". + "ORDER BY `DateS`"; + $erg = mysql_query($SQL, $con); - echo "". substr(mysql_result( $erg, $i, "DateS" ), 0, 10). "\n"; - echo "". substr(mysql_result( $erg, $i, "DateS" ), 11). "\n"; - echo "". mysql_result( $erg, $i, "Len" ). " h\n"; - echo "". mysql_result( $erg, $i, "Man" ). "\n"; - echo "". $RoomID[mysql_result( $erg, $i, "RID" )]. "
    \n". - "(". TID2Type(mysql_result( $erg, $i, "TID" )).Get_Text("inc_schicht_engel"). ")". - "\n"; - echo "
    \n". 
-		     mysql_result( $erg, $i, "Comment" ). 
-		     "\n
    \n"; - echo "
    # vi #\n"; - - // bis $LETZTES_AUSTRAGEN (aus dem config-file) soll es moeglich sein, seine Schichten - //// selber noch austragen zu koennen... - $schichtdate = mysql_result( $erg, $i, "DateS" ); - ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res ); - $info["year"] = $res[1]; - $info["month"] = $res[2]; - $info["day"] = $res[3]; - $info["hour"] = $res[4]; - $info["min"] = $res[5]; - $info["sec"] = $res[6]; - $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"])); - $lastAustragen = $LETZTES_AUSTRAGEN*3600; - $nowdate = time(); - // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen - // noch möglich sein - if( $schichtdatum > ($lastAustragen + $nowdate) ) - echo " ". - Get_Text("pub_mywake_austragen")."\n"; - else - echo "". Get_Text("pub_mywake_austragen_n_c"). "\n"; - - echo "\n"; - } + ?> + + + + + + + + + + + "; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + // bis $LETZTES_AUSTRAGEN (aus dem config-file) soll es moeglich sein, seine Schichten + //// selber noch austragen zu koennen... + $schichtdate = mysql_result( $erg, $i, "DateS" ); + ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res ); + $info["year"] = $res[1]; + $info["month"] = $res[2]; + $info["day"] = $res[3]; + $info["hour"] = $res[4]; + $info["min"] = $res[5]; + $info["sec"] = $res[6]; + $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"])); + $lastAustragen = $LETZTES_AUSTRAGEN*3600; + $nowdate = time(); + // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen + // noch möglich sein + if( $schichtdatum > ($lastAustragen + $nowdate) ) + echo "\n"; + else + echo "\n"; + + echo "\n"; + } echo "
    ". substr(mysql_result( $erg, $i, "DateS" ), 0, 10). "". substr(mysql_result( $erg, $i, "DateS" ), 11). "". mysql_result( $erg, $i, "Len" ). " h". mysql_result( $erg, $i, "Man" ). "". $RoomID[mysql_result( $erg, $i, "RID" )]. "
    \n". + "(". TID2Type(mysql_result( $erg, $i, "TID" )).Get_Text("inc_schicht_engel"). ")". + "
    \n". 
+         mysql_result( $erg, $i, "Comment" ). 
+         "\n
    \n"; + echo "
    # vi #    		 ". + Get_Text("pub_mywake_austragen")."". Get_Text("pub_mywake_austragen_n_c"). "
    \n\n"; if( $_SESSION['CVS'][ "nonpublic/myschichtplan_ical.php" ] == "Y" ) { - echo "
    ". Get_Text("pub_myschichtplan_ical"). "\n"; + echo "
    ". Get_Text("pub_myschichtplan_ical"). "\n"; } } @@ -120,65 +118,65 @@ else { If( $_GET["action"] == "austragen" ) { - echo Get_Text("pub_mywake_delate1")."
    \n"; + echo Get_Text("pub_mywake_delate1")."
    \n"; - $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "')"; - $Erg = mysql_query($sql, $con); + $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "')"; + $Erg = mysql_query($sql, $con); - $schichtdate = mysql_result( $Erg, 0, "DateS" ); - ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res ); - $info["year"] = $res[1]; - $info["month"] = $res[2]; - $info["day"] = $res[3]; - $info["hour"] = $res[4]; - $info["min"] = $res[5]; - $info["sec"] = $res[6]; - $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"])); - $lastAustragen = $LETZTES_AUSTRAGEN*3600; - $nowdate = time(); - // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen - // noch möglich sein - if( $schichtdatum > ($lastAustragen + $nowdate) ) - { - $sql2 = "UPDATE `ShiftEntry` ". - "SET `UID` = '0', `Comment` = NULL ". - "WHERE `SID` = '". $_GET["SID"]. "' AND `UID` = '". $_SESSION['UID']. "' LIMIT 1;"; - $Erg2 = mysql_query($sql2, $con); - if ($Erg2 == 1) - echo Get_Text("pub_mywake_add_ok"). "\n"; - else - echo Get_Text("pub_mywake_add_ko"). "\n"; - } - else - echo Get_Text("pub_mywake_after"). "\n"; + $schichtdate = mysql_result( $Erg, 0, "DateS" ); + ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res ); + $info["year"] = $res[1]; + $info["month"] = $res[2]; + $info["day"] = $res[3]; + $info["hour"] = $res[4]; + $info["min"] = $res[5]; + $info["sec"] = $res[6]; + $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"])); + $lastAustragen = $LETZTES_AUSTRAGEN*3600; + $nowdate = time(); + // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen + // noch möglich sein + if( $schichtdatum > ($lastAustragen + $nowdate) ) + { + $sql2 = "UPDATE `ShiftEntry` ". + "SET `UID` = '0', `Comment` = NULL ". + "WHERE `SID` = '". $_GET["SID"]. "' AND `UID` = '". $_SESSION['UID']. "' LIMIT 1;"; + $Erg2 = mysql_query($sql2, $con); + if ($Erg2 == 1) + echo Get_Text("pub_mywake_add_ok"). "\n"; + else + echo Get_Text("pub_mywake_add_ko"). "\n"; + } + else + echo Get_Text("pub_mywake_after"). "\n"; } elseif( $_GET["action"] == "edit" ) { - echo Get_Text("pub_myshift_Edit_Text1"). "\n"; - - $sql = "SELECT * FROM `ShiftEntry` WHERE "; - $sql.= "(`SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "')"; - $Erg = mysql_query($sql, $con); + echo Get_Text("pub_myshift_Edit_Text1"). "\n"; + + $sql = "SELECT * FROM `ShiftEntry` WHERE "; + $sql.= "(`SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "')"; + $Erg = mysql_query($sql, $con); - echo "
    \n"; - echo "

    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; + echo "
    \n"; + echo "

    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "; } elseif( $_GET["action"] == "editSave" ) { - echo Get_Text("pub_myshift_EditSave_Text1"). "
    \n"; - $sql = "UPDATE `ShiftEntry` ". - "SET `Comment` = '". $_GET["newtext"]. "' ". - "WHERE `SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "' LIMIT 1;"; - $Erg = mysql_query($sql, $con); - if ($Erg == 1) - echo "\t ...". Get_Text("pub_myshift_EditSave_OK"). "\n"; - else - echo "\t ...". Get_Text("pub_myshift_EditSave_KO"). "\n"; - SetHeaderGo2Back(); + echo Get_Text("pub_myshift_EditSave_Text1"). "
    \n"; + $sql = "UPDATE `ShiftEntry` ". + "SET `Comment` = '". $_GET["newtext"]. "' ". + "WHERE `SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "' LIMIT 1;"; + $Erg = mysql_query($sql, $con); + if ($Erg == 1) + echo " ...". Get_Text("pub_myshift_EditSave_OK"). "\n"; + else + echo " ...". Get_Text("pub_myshift_EditSave_KO"). "\n"; + SetHeaderGo2Back(); } } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/nonpublic/myschichtplan_ical.php b/www-ssl/nonpublic/myschichtplan_ical.php old mode 100755 new mode 100644 index bcb9eb6f..928f0c86 --- a/www-ssl/nonpublic/myschichtplan_ical.php +++ b/www-ssl/nonpublic/myschichtplan_ical.php @@ -27,22 +27,22 @@ echo "X-WR-CALNAME;VALUE=TEXT:". "Himmel - Schichtplan\n"; for( $i=0; $i" . Get_Text(3) . ""; + include "news_output.php"; -echo "".Get_Text(3).""; -include ("news_output.php"); - -include ("../../../camp2011/includes/footer.php"); + include "../../../camp2011/includes/footer.php"; ?> diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php old mode 100755 new mode 100644 index 826733c1..b90d5a82 --- a/www-ssl/nonpublic/news_comments.php +++ b/www-ssl/nonpublic/news_comments.php @@ -3,54 +3,50 @@ $title = "Kommentare zu den News"; $header = "Kommentar"; include ("../../../camp2011/includes/header.php"); +if(isset($_GET["nid"])) { + if(isset( $_GET["text"])) { + $ch_sql = "INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) ". + "VALUES ('". $_GET["nid"]. "', '". date("Y-m-d H:i:s"). "', '". $_GET["text"]. "', '". $_SESSION["UID"]. "')"; + $Erg = mysql_query($ch_sql, $con); -if( IsSet( $_GET["nid"])) -{ + if ($Erg == 1) { + echo "Eintrag wurde gespeichert

    "; + SetHeaderGo2Back(); + } + } + $SQL = "SELECT * FROM `news_comments` WHERE `Refid`='". $_GET["nid"]. "' ORDER BY 'ID'"; + $Erg = mysql_query($SQL, $con); + echo mysql_error( $con); -if( IsSet( $_GET["text"])) -{ - $ch_sql="INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) ". - "VALUES ('". $_GET["nid"]. "', '". date("Y-m-d H:i:s"). "', '". $_GET["text"]. "', '". $_SESSION["UID"]. "')"; - $Erg = mysql_query($ch_sql, $con); - if ($Erg == 1) - { - echo "Eintrag wurde gespeichert

    "; - SetHeaderGo2Back(); - } -} - -$SQL = "SELECT * FROM `news_comments` WHERE `Refid`='". $_GET["nid"]. "' ORDER BY 'ID'"; -$Erg = mysql_query($SQL, $con); -echo mysql_error( $con); -// anzahl zeilen -$news_rows = mysql_num_rows($Erg); - + // anzahl zeilen + $news_rows = mysql_num_rows($Erg); ?> - - - - - - - - - + + + + + + + + +"; echo "\t\t"; echo "\t\t"; echo ""; echo "\t"; echo "\t\t"; echo ""; } @@ -59,24 +55,24 @@ echo "
    DatumNick
    Kommentar
    DatumNick
    Kommentar
    "; - echo mysql_result($Erg, $n, "Datum"); + echo mysql_result($Erg, $n, "Datum"); echo "\t\t"; - echo UID2Nick(mysql_result($Erg, $n, "UID")); - // avatar anzeigen? - echo DisplayAvatar (mysql_result($Erg, $n, "UID")); + echo UID2Nick(mysql_result($Erg, $n, "UID")); + // avatar anzeigen? + echo DisplayAvatar (mysql_result($Erg, $n, "UID")); echo "\t\t
    "; - echo nl2br(mysql_result($Erg, $n, "Text"))."\n"; + echo nl2br(mysql_result($Erg, $n, "Text"))."\n"; echo "\t\t
    "; ?> -
    +

    Neuer Kommentar:

     
    -"> +">
    Text:
    -
    +
    -"; + echo "

    "; else - echo "

    "; + echo "

    "; echo "". ReplaceSmilies(mysql_result($Erg, $n, "Betreff")) ."\n"; // Schow Admin Page if( $_SESSION['CVS'][ "admin/news.php" ] == "Y" ) - echo " [edit]
    \n\t\t"; + echo " [edit]
    \n\t\t"; - echo "
       ".mysql_result($Erg, $n, "Datum").", "; + echo "
       ".mysql_result($Erg, $n, "Datum").", "; echo UID2Nick(mysql_result($Erg, $n, "UID")).""; // avatar anzeigen? echo DisplayAvatar (mysql_result($Erg, $n, "UID")); @@ -59,17 +59,17 @@ $dis_rows = round (($rows / $DISPLAY_NEWS)+0.5); Print_Text(5); for ($i=1; $i <= $dis_rows; $i++) { - if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) { - echo "$i  "; - } else { - echo "$i  "; - } + if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) { + echo "$i  "; + } else { + echo "$i  "; + } } echo "

    "; ?> -
    +

      @@ -101,6 +101,6 @@ if ($_SESSION['CVS']["nonpublic/newsAddMeting"] == "Y") { } ?> -
    +
    "> diff --git a/www-ssl/nonpublic/schichtplan.1.php b/www-ssl/nonpublic/schichtplan.1.php old mode 100755 new mode 100644 index 490167a0..1ed4d32f --- a/www-ssl/nonpublic/schichtplan.1.php +++ b/www-ssl/nonpublic/schichtplan.1.php @@ -5,17 +5,17 @@ include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); function Printlink( $Datum) { - GLOBAL $raum; - echo "\t
  • $Datum
    • \n"; + GLOBAL $raum; + echo "\t
  • $Datum
    • \n"; } //function Printlink( if( isset ($VeranstaltungsTage)) - foreach( $VeranstaltungsTage as $k => $v) - Printlink( $v); + foreach( $VeranstaltungsTage as $k => $v) + Printlink( $v); ?> diff --git a/www-ssl/nonpublic/schichtplan.2.php b/www-ssl/nonpublic/schichtplan.2.php old mode 100755 new mode 100644 index 59e58852..d0193178 --- a/www-ssl/nonpublic/schichtplan.2.php +++ b/www-ssl/nonpublic/schichtplan.2.php @@ -6,17 +6,17 @@ include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); if( isset ($Room)) foreach( $Room as $RoomEntry ) { - if(isset($ausdatum)) - echo "\t
  • ". - $RoomEntry["Name"]. "
    • \n"; - else - echo "\t
  • ". - $RoomEntry["Name"]. "
    • \n"; + if(isset($ausdatum)) + echo "\t
  • ". + $RoomEntry["Name"]. "
    • \n"; + else + echo "\t
  • ". + $RoomEntry["Name"]. "
    • \n"; } -echo "
    "; +echo "
    "; if(isset($ausdatum)) - echo "
  • alle
    • "; + echo "
  • alle
    • "; else - echo "
  • alle
    • "; + echo "
  • alle
    • "; ?> diff --git a/www-ssl/nonpublic/schichtplan.php b/www-ssl/nonpublic/schichtplan.php old mode 100755 new mode 100644 index 65907863..e8f8f02a --- a/www-ssl/nonpublic/schichtplan.php +++ b/www-ssl/nonpublic/schichtplan.php @@ -1,73 +1,68 @@ $v) - { - if( substr($k, 0, 5) == "raum_") - { - $raum = $raum. ";". $v; - } - } - } -} + if(isset($_GET["ausdatum"])) + $ausdatum = $_GET["ausdatum"]; + if(isset($_GET["raum"])) { + $raum = $_GET["raum"]; -include ("../../../camp2011/includes/header.php"); -include ("../../../camp2011/includes/funktionen.php"); -include ("../../../camp2011/includes/funktion_schichtplan.php"); -include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); -?> + if($raum==-1 && isset($_GET["show"])) { + $raum = ""; + foreach ($_GET as $k => $v) { + if(substr($k, 0, 5) == "raum_") { + $raum = $raum. ";". $v; + } + } + } + } -". - Get_Text("pub_schicht_beschreibung"). "

    "; + include ("../../../camp2011/includes/header.php"); + include ("../../../camp2011/includes/funktionen.php"); + include ("../../../camp2011/includes/funktion_schichtplan.php"); + include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); -function ShowSwitchDay() -{ - GLOBAL $VeranstaltungsTage, $VeranstaltungsTageMax, $ausdatum, $raum; - - echo "\n\n\n"; - - if( isset($VeranstaltungsTage)) - foreach( $VeranstaltungsTage as $k => $v) - if( $ausdatum == $v) - { - if( $k > 0) - echo "\t\t\t\n"; - if( $k < $VeranstaltungsTageMax) - echo "\t\t\t\n"; - } - echo "\n\n
    ". - "". $VeranstaltungsTage[$k-1]. "". - "". $VeranstaltungsTage[$k+1]. "
    "; + echo Get_Text("Hello").$_SESSION['Nick'].",
    ". + Get_Text("pub_schicht_beschreibung"). "

    "; + + function ShowSwitchDay() { + global $VeranstaltungsTage, $VeranstaltungsTageMax, $ausdatum, $raum; + + echo "\n\n\n"; + + if( isset($VeranstaltungsTage)) + foreach( $VeranstaltungsTage as $k => $v) + if( $ausdatum == $v) + { + if( $k > 0) + echo "\t\t\t\n"; + if( $k < $VeranstaltungsTageMax) + echo "\t\t\t\n"; + } + echo "\n\n
    ". + "". $VeranstaltungsTage[$k-1]. "". + "". $VeranstaltungsTage[$k+1]. "
    "; } // wenn kein Datum gesetzt ist (die Seite zum ersten mal aufgerufen wird), // das Datum auf den ersten Tag setzen... if( !isset($ausdatum) ) { - $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '". gmdate("Y-m-d", time()+$gmdateOffset). "%' ORDER BY `DateS`"; -// $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '2004-12-29%' ORDER BY `DateS`"; - $Erg = mysql_query($sql, $con); - if( mysql_num_rows( $Erg ) == 0 ) - { - $sql = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` ASC LIMIT 0, 1"; - $Erg = mysql_query($sql, $con); - } - if( mysql_num_rows( $Erg ) > 0 ) - $ausdatum = substr(mysql_result($Erg,0,"DateS"),0,10); - else - $ausdatum = gmdate("Y-m-d", time()+$gmdateOffset); + $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '". gmdate("Y-m-d", time()+$gmdateOffset). "%' ORDER BY `DateS`"; +// $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '2004-12-29%' ORDER BY `DateS`"; + $Erg = mysql_query($sql, $con); + if( mysql_num_rows( $Erg ) == 0 ) + { + $sql = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` ASC LIMIT 0, 1"; + $Erg = mysql_query($sql, $con); + } + if( mysql_num_rows( $Erg ) > 0 ) + $ausdatum = substr(mysql_result($Erg,0,"DateS"),0,10); + else + $ausdatum = gmdate("Y-m-d", time()+$gmdateOffset); } @@ -75,127 +70,127 @@ if( !isset($ausdatum) ) if ( !isset($raum) ) { - // Ausgabe wenn kein Raum Ausgewählt: - echo Get_Text("pub_schicht_auswahl_raeume"). "

    \n"; + // Ausgabe wenn kein Raum Ausgewählt: + echo Get_Text("pub_schicht_auswahl_raeume"). "

    \n"; - if( isset($Room)) - { - echo "
    \n"; - foreach( $Room as $RoomEntry ) - { - echo "\t
  • "; - echo "". $RoomEntry["Name"]. ""; - echo "
    • \n"; - } - echo ""; - echo ""; - echo "\n"; - echo "
    \n"; - } + if( isset($Room)) + { + echo "
    \n"; + foreach( $Room as $RoomEntry ) + { + echo "\t
  • "; + echo "". $RoomEntry["Name"]. ""; + echo "
    • \n"; + } + echo ""; + echo ""; + echo "\n"; + echo "
    \n"; + } - echo "

    "; - echo Get_Text("pub_schicht_alles_1"). " ". - Get_Text("pub_schicht_alles_2"). " ".Get_Text("pub_schicht_alles_3"); - echo "\n

    \n\n"; - echo "
    \n\n"; - echo Get_Text("pub_schicht_EmptyShifts"). "\n"; - - - // zeit die naesten freien schichten - showEmptyShifts(); + echo "

    "; + echo Get_Text("pub_schicht_alles_1"). " ". + Get_Text("pub_schicht_alles_2"). " ".Get_Text("pub_schicht_alles_3"); + echo "\n

    \n\n"; + echo "
    \n\n"; + echo Get_Text("pub_schicht_EmptyShifts"). "\n"; + + + // zeit die naesten freien schichten + showEmptyShifts(); } else -{ // Wenn einraum Ausgewählt ist: - if( $raum == -1 ) - echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":

    "; - elseif( substr( $raum, 0, 1) == ";" ) - echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":

    "; - else - echo Get_Text("pub_schicht_Anzeige_1"). $ausdatum. - Get_Text("pub_schicht_Anzeige_2"). $RoomID[$raum]. "

    "; +{ // Wenn einraum Ausgewählt ist: + if( $raum == -1 ) + echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":

    "; + elseif( substr( $raum, 0, 1) == ";" ) + echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":

    "; + else + echo Get_Text("pub_schicht_Anzeige_1"). $ausdatum. + Get_Text("pub_schicht_Anzeige_2"). $RoomID[$raum]. "

    "; - ShowSwitchDay(); + ShowSwitchDay(); - echo "\n\n\n"; - echo "\t\n"; - echo "\t\t\n"; + echo "\n\n
    start
    \n"; + echo "\t\n"; + echo "\t\t\n"; - //Ausgabe Spalten überschrift - if( $raum == -1 ) - { - if( isset($Room)) - foreach( $Room as $RoomEntry ) - if (SummRoomShifts($RoomEntry["RID"]) > 0) - echo "\t\t\n"; - } - elseif( substr( $raum, 0, 1) == ";" ) - { - $words = preg_split("/;/", $raum); - foreach ($words as $word) - { - if( strlen(trim($word)) > 0) - echo "\t\t\n"; - } - } - else - echo "\t\t\n"; - echo "\t\n"; - - //Zeit Ausgeben - for( $i = 0; $i < 24; $i++ ) - for( $j = 0; $j < $GlobalZeileProStunde; $j++) - { - $Spalten[$i * $GlobalZeileProStunde + $j] = - "\t\n\t\t"; + //Ausgabe Spalten überschrift + if( $raum == -1 ) + { + if( isset($Room)) + foreach( $Room as $RoomEntry ) + if (SummRoomShifts($RoomEntry["RID"]) > 0) + echo "\t\t\n"; + } + elseif( substr( $raum, 0, 1) == ";" ) + { + $words = preg_split("/;/", $raum); + foreach ($words as $word) + { + if( strlen(trim($word)) > 0) + echo "\t\t\n"; + } + } + else + echo "\t\t\n"; + echo "\t\n"; + + //Zeit Ausgeben + for( $i = 0; $i < 24; $i++ ) + for( $j = 0; $j < $GlobalZeileProStunde; $j++) + { + $Spalten[$i * $GlobalZeileProStunde + $j] = + "\t\n\t\t"; - //Stunde: - $SpaltenTemp=""; - $SpaltenTemp.= ($i<10)? "0$i:": "$i:"; + //Stunde: + $SpaltenTemp=""; + $SpaltenTemp.= ($i<10)? "0$i:": "$i:"; - //Minute - $TempMinuten = (($j*60) / $GlobalZeileProStunde); - $SpaltenTemp.= ($TempMinuten<10)? "0$TempMinuten": "$TempMinuten"; - - //aktuelle stunde markieren - if( ($j==0) && ($i == gmdate("H", time()+$gmdateOffset)) && (gmdate("Y-m-d", time()+ $gmdateOffset) == $ausdatum) ) - $SpaltenTemp = "

    $SpaltenTemp

    "; - - $SpaltenTemp = "\n"; - $Spalten[$i * $GlobalZeileProStunde + $j].= $SpaltenTemp; - } - - if( $raum == -1 ) - { - if( isset($Room)) - foreach( $Room as $RoomEntry ) - if (SummRoomShifts($RoomEntry["RID"]) > 0) - CreateRoomShifts( $RoomEntry["RID"] ); - } - elseif( substr( $raum, 0, 1) == ";" ) - { - if( isset($Room)) - { - $words = preg_split("/;/", $raum); - foreach ($words as $word) - { - if( strlen(trim($word)) > 0) - if (SummRoomShifts($word) > 0) - CreateRoomShifts( $word ); - } - } - } - else - CreateRoomShifts( $raum ); - - //Ausageb Zeilen - for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) - { - echo $Spalten[$i]."\t\n"; - } + //Minute + $TempMinuten = (($j*60) / $GlobalZeileProStunde); + $SpaltenTemp.= ($TempMinuten<10)? "0$TempMinuten": "$TempMinuten"; + + //aktuelle stunde markieren + if( ($j==0) && ($i == gmdate("H", time()+$gmdateOffset)) && (gmdate("Y-m-d", time()+ $gmdateOffset) == $ausdatum) ) + $SpaltenTemp = "

    $SpaltenTemp

    "; + + $SpaltenTemp = "\n"; + $Spalten[$i * $GlobalZeileProStunde + $j].= $SpaltenTemp; + } + + if( $raum == -1 ) + { + if( isset($Room)) + foreach( $Room as $RoomEntry ) + if (SummRoomShifts($RoomEntry["RID"]) > 0) + CreateRoomShifts( $RoomEntry["RID"] ); + } + elseif( substr( $raum, 0, 1) == ";" ) + { + if( isset($Room)) + { + $words = preg_split("/;/", $raum); + foreach ($words as $word) + { + if( strlen(trim($word)) > 0) + if (SummRoomShifts($word) > 0) + CreateRoomShifts( $word ); + } + } + } + else + CreateRoomShifts( $raum ); + + //Ausageb Zeilen + for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) + { + echo $Spalten[$i]."\t\n"; + } - echo "
    start". $RoomEntry["Name"]. "". $RoomID[trim($word)]. "". $RoomID[$raum]. "
    ". $RoomEntry["Name"]. "". $RoomID[trim($word)]. "". $RoomID[$raum]. "
    $SpaltenTemp
    $SpaltenTemp
    \n"; - - ShowSwitchDay(); + echo "\n"; + + ShowSwitchDay(); }//if (isset($raum)) diff --git a/www-ssl/nonpublic/schichtplan_add.php b/www-ssl/nonpublic/schichtplan_add.php old mode 100755 new mode 100644 index 359425bf..621cd97e --- a/www-ssl/nonpublic/schichtplan_add.php +++ b/www-ssl/nonpublic/schichtplan_add.php @@ -1,126 +1,111 @@ = '$beginSchicht') and ". - " (`Shifts`.`DateS` < '$endSchicht'))". - " OR ". - " ((`Shifts`.`DateE` > '$beginSchicht') and ". - " (`Shifts`.`DateE` <= '$endSchicht')) ". - ") and ". - "(`ShiftEntry`.`UID` = '". $_SESSION['UID']. "'));"; - $bErg = mysql_query($SSQL, $con); + if($_SESSION['CVS'][$TID2Name[$_POST["TID"]]] == "Y") { + // Ueberpruefung, ob der Engel bereits fuer eine Schicht zu dieser Zeit eingetragen ist + $SSQL = "SELECT * FROM `Shifts`". + " INNER JOIN `ShiftEntry` ON `ShiftEntry`.`SID` = `Shifts`.`SID`". + " WHERE ((". + " ((`Shifts`.`DateS` >= '$beginSchicht') and ". + " (`Shifts`.`DateS` < '$endSchicht'))". + " OR ". + " ((`Shifts`.`DateE` > '$beginSchicht') and ". + " (`Shifts`.`DateE` <= '$endSchicht')) ". + ") and ". + "(`ShiftEntry`.`UID` = '". $_SESSION['UID']. "'));"; + $bErg = mysql_query($SSQL, $con); - if( mysql_num_rows($bErg) != 0 ) - echo Get_Text("pub_schichtplan_add_AllreadyinShift"); - else - { - //ermitteln der noch gesuchten - $SQL3 = "SELECT * FROM `ShiftEntry`". - " WHERE ((`SID` = '". $_POST["SID"]. "') AND (`TID` = '". $_POST["TID"]. "') AND (`UID` = '0'));"; - $Erg3 = mysql_query($SQL3, $con); + if(mysql_num_rows($bErg) != 0) + echo Get_Text("pub_schichtplan_add_AllreadyinShift"); + else { + // ermitteln der noch gesuchten + $SQL3 = "SELECT * FROM `ShiftEntry`". + " WHERE ((`SID` = '". $_POST["SID"]. "') AND (`TID` = '". $_POST["TID"]. "') AND (`UID` = '0'));"; + $Erg3 = mysql_query($SQL3, $con); - if( mysql_num_rows($Erg3) <= 0 ) - echo Get_Text("pub_schichtplan_add_ToManyYousers"); - else - { - //write shift - $SQL = "UPDATE `ShiftEntry` SET ". - "`UID` = '". $_SESSION['UID']. "', ". - "`Comment` = '". $_POST["newtext"]. "' ". - "WHERE ( (`SID` = '". $_POST["SID"]. "') and ". - "(`TID` = '". $_POST["TID"]. "') and ". - "(`UID` = '0')) LIMIT 1;"; - $Erg = mysql_query($SQL, $con); + if(mysql_num_rows($Erg3) <= 0) + echo Get_Text("pub_schichtplan_add_ToManyYousers"); + else { + //write shift + $SQL = "UPDATE `ShiftEntry` SET ". + "`UID` = '". $_SESSION['UID']. "', ". + "`Comment` = '". $_POST["newtext"]. "' ". + "WHERE ( (`SID` = '". $_POST["SID"]. "') and ". + "(`TID` = '". $_POST["TID"]. "') and ". + "(`UID` = '0')) LIMIT 1;"; + $Erg = mysql_query($SQL, $con); - if ($Erg != 1) - echo Get_Text("pub_schichtplan_add_Error"); - else - echo Get_Text("pub_schichtplan_add_WriteOK"); - - }//TO Many USERS - }//Allready in Shift - } - else - { - echo "

    :-(

    "; - array_push($error_messages, "Hack atteck\n"); - } -} -elseif (isset($_GET["SID"]) && isset($_GET["TID"])) -{ - //wenn keien rechte definiert sind - if( !isset($_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ])) - $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] = "Y"; - + if($Erg != 1) + echo Get_Text("pub_schichtplan_add_Error"); + else + echo Get_Text("pub_schichtplan_add_WriteOK"); + } + } + } else { + echo "

    :-(

    "; + array_push($error_messages, "Hack atteck\n"); + } + } elseif (isset($_GET["SID"]) && isset($_GET["TID"])) { + //wenn keine Rechte definiert sind + if( !isset($_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ])) + $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] = "Y"; + if( $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] == "Y") { + echo Get_Text("pub_schichtplan_add_Text1"). "

    \n\n". + "
    \n". + "\n"; - if( $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] == "Y") - { + $SQL = "SELECT * FROM `Shifts` WHERE "; + $SQL .="(`SID` = '". $_GET["SID"]. "')"; + $Erg = mysql_query($SQL, $con); - echo Get_Text("pub_schichtplan_add_Text1"). "

    \n\n". - "\n". - "
    \n"; - - $SQL = "SELECT * FROM `Shifts` WHERE "; - $SQL .="(`SID` = '". $_GET["SID"]. "')"; - $Erg = mysql_query($SQL, $con); - - echo "\n"; + echo "\n"; - echo "\n"; - - echo "\n"; - - echo "\n"; - - echo "\n"; - - echo "\n \n"; + echo "\n"; - echo "\n". - "\n". - "
    ". Get_Text("pub_schichtplan_add_Date"). ": ". - mysql_result($Erg, 0, "DateS"). "
    ". Get_Text("pub_schichtplan_add_Date"). ": ". + mysql_result($Erg, 0, "DateS"). "
    ". Get_Text("pub_schichtplan_add_Place"). ": ". - $RoomID[ mysql_result($Erg, 0, "RID") ]. "
    ". Get_Text("pub_schichtplan_add_Job"). ": ". - $EngelTypeID[$_GET["TID"]]. "
    ". Get_Text("pub_schichtplan_add_Len"). ": ". - mysql_result($Erg, 0, "Len"). "h
    ". Get_Text("pub_schichtplan_add_TextFor"). ": ". - mysql_result($Erg, 0, "Man"). "
    ". Get_Text("pub_schichtplan_add_Comment"). ":". - "
    ". Get_Text("pub_schichtplan_add_Place"). ": ". + $RoomID[ mysql_result($Erg, 0, "RID") ]. "
     
    \n". - "\n". - "\n". - "
    "; - } - else - { - echo "

    :-(

    "; - array_push($error_messages, "Hack atteck\n"); - } + echo "". Get_Text("pub_schichtplan_add_Job"). ": ". + $EngelTypeID[$_GET["TID"]]. "\n"; -} + echo "". Get_Text("pub_schichtplan_add_Len"). ": ". + mysql_result($Erg, 0, "Len"). "h\n"; -include ("../../../camp2011/includes/footer.php"); + echo "". Get_Text("pub_schichtplan_add_TextFor"). ": ". + mysql_result($Erg, 0, "Man"). "\n"; + + echo "". Get_Text("pub_schichtplan_add_Comment"). ":\n ". + " \n"; + + echo " \n". + " \n". + "\n". + "\n". + "\n". + ""; + } else { + echo "

    :-(

    "; + array_push($error_messages, "Hack atteck\n"); + } + } + + include "../../../camp2011/includes/footer.php"; ?> diff --git a/www-ssl/nonpublic/schichtplan_beamer.php b/www-ssl/nonpublic/schichtplan_beamer.php old mode 100755 new mode 100644 index cc2a48e7..2e4e78c2 --- a/www-ssl/nonpublic/schichtplan_beamer.php +++ b/www-ssl/nonpublic/schichtplan_beamer.php @@ -1,61 +1,55 @@ - - - -Schichtpläne für Beamer - - - - -\n"; + + + +Schichtpläne für Beamer + + + + + +\n"; echo " - - - - - \n"; + + + + + \n"; -echo "\n". -// "\t \n". - "\t". gmdate("d.m.y", $Time). "\n". - "\t". gmdate("H", $Time-3600). ":00\n". - "\t". gmdate("H", $Time+0). ":00\n". - "\t". gmdate("H", $Time+3600). ":00\n". - "\n"; +echo "\n" . + "". gmdate("d.m.y", $Time) ."\n". + "". gmdate("H", $Time - 3600) . ":00\n". + "". gmdate("H", $Time + 0) . ":00\n". + "". gmdate("H", $Time + 3600) .":00\n". + "\n"; -foreach( $Room as $RoomEntry ) -{ - - //var-init - $AnzahlEintraege = 0; - - $Out = ausgabe_Zeile( $RoomEntry["RID"], $Time-3600, $AnzahlEintraege); - $Out.= ausgabe_Zeile( $RoomEntry["RID"], $Time, $AnzahlEintraege); - $Out.= ausgabe_Zeile( $RoomEntry["RID"], $Time+3600, $AnzahlEintraege); - +foreach($Room as $RoomEntry) { + // var-init + $AnzahlEintraege = 0; + + $Out = ausgabe_Zeile($RoomEntry["RID"], $Time - 3600, $AnzahlEintraege); + $Out .= ausgabe_Zeile($RoomEntry["RID"], $Time, $AnzahlEintraege); + $Out .= ausgabe_Zeile($RoomEntry["RID"], $Time + 3600, $AnzahlEintraege); - //entfernt leere zeilen - if( $AnzahlEintraege==0 ) - $Out = ""; - else - $Out = "\n\t_". $RoomEntry["Name"]. "_\n". $Out . "\n"; - - echo $Out; + if($AnzahlEintraege == 0) + $Out = ""; + else + $Out = "\n_" . $RoomEntry["Name"] . "_\n" . $Out . "\n"; + + echo $Out; } - -echo "\n"; - ?> - - + + + + + diff --git a/www-ssl/nonpublic/waeckliste.php b/www-ssl/nonpublic/waeckliste.php old mode 100755 new mode 100644 index c14505ab..bb9a0668 --- a/www-ssl/nonpublic/waeckliste.php +++ b/www-ssl/nonpublic/waeckliste.php @@ -1,40 +1,38 @@ -\n". - Get_Text("pub_waeckliste_Text1")?> -

    +

    \n" . Get_Text("pub_waeckliste_Text1"); ?>

    - - - - - - - - + + + + + + + - - - - - - - + + + + + +
    - diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php old mode 100755 new mode 100644 index 67e32e28..164a4bb0 --- a/www-ssl/nonpublic/wecken.php +++ b/www-ssl/nonpublic/wecken.php @@ -1,81 +1,81 @@ ".Get_Text("pub_wake_beschreibung"). "

    \n\n"; + if($Erg == 1) + Print_Text(4); + } + } + if(isset($_GET["eintragen"])) { + if ($_GET["eintragen"] == "loeschen") { + $SQL = "DELETE FROM `Wecken` WHERE `UID`='" . $_SESSION['UID'] . "' AND `ID`='" . $_GET["weckID"] . "' LIMIT 1"; + $Erg = mysql_query($SQL, $con); + if ($Erg == 1) + Print_Text(4); + } + } + + echo "

    " . Get_Text("Hello") . $_SESSION['Nick'] . ",
    " . Get_Text("pub_wake_beschreibung") . "

    \n\n"; + echo Get_Text("pub_wake_beschreibung2"); +?> -echo Get_Text("pub_wake_beschreibung2"); ?> -

    - - - - - + + + + + - - - - - - - - - + + + + + +
    ".Get_Text("pub_wake_del"); ?>
    " . Get_Text("pub_wake_del"); ?>
    -

    +

    -

    +

    - - + + - - + + - - + +
    ::
    -"> +" />
    - diff --git a/www-ssl/pic/avatar/avatar1.gif b/www-ssl/pic/avatar/avatar1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar10.gif b/www-ssl/pic/avatar/avatar10.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar100.gif b/www-ssl/pic/avatar/avatar100.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar101.gif b/www-ssl/pic/avatar/avatar101.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar102.gif b/www-ssl/pic/avatar/avatar102.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar103.gif b/www-ssl/pic/avatar/avatar103.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar104.gif b/www-ssl/pic/avatar/avatar104.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar105.gif b/www-ssl/pic/avatar/avatar105.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar106.gif b/www-ssl/pic/avatar/avatar106.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar107.gif b/www-ssl/pic/avatar/avatar107.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar108.gif b/www-ssl/pic/avatar/avatar108.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar109.gif b/www-ssl/pic/avatar/avatar109.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar11.gif b/www-ssl/pic/avatar/avatar11.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar110.gif b/www-ssl/pic/avatar/avatar110.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar111.gif b/www-ssl/pic/avatar/avatar111.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar112.gif b/www-ssl/pic/avatar/avatar112.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar113.gif b/www-ssl/pic/avatar/avatar113.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar114.gif b/www-ssl/pic/avatar/avatar114.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar115.gif b/www-ssl/pic/avatar/avatar115.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar116.gif b/www-ssl/pic/avatar/avatar116.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar117.gif b/www-ssl/pic/avatar/avatar117.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar118.gif b/www-ssl/pic/avatar/avatar118.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar119.gif b/www-ssl/pic/avatar/avatar119.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar12.gif b/www-ssl/pic/avatar/avatar12.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar120.gif b/www-ssl/pic/avatar/avatar120.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar121.gif b/www-ssl/pic/avatar/avatar121.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar122.gif b/www-ssl/pic/avatar/avatar122.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar123.gif b/www-ssl/pic/avatar/avatar123.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar124.gif b/www-ssl/pic/avatar/avatar124.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar125.gif b/www-ssl/pic/avatar/avatar125.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar126.gif b/www-ssl/pic/avatar/avatar126.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar127.gif b/www-ssl/pic/avatar/avatar127.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar128.gif b/www-ssl/pic/avatar/avatar128.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar129.gif b/www-ssl/pic/avatar/avatar129.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar13.gif b/www-ssl/pic/avatar/avatar13.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar130.gif b/www-ssl/pic/avatar/avatar130.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar131.gif b/www-ssl/pic/avatar/avatar131.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar132.gif b/www-ssl/pic/avatar/avatar132.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar133.gif b/www-ssl/pic/avatar/avatar133.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar134.gif b/www-ssl/pic/avatar/avatar134.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar135.gif b/www-ssl/pic/avatar/avatar135.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar136.gif b/www-ssl/pic/avatar/avatar136.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar137.gif b/www-ssl/pic/avatar/avatar137.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar138.gif b/www-ssl/pic/avatar/avatar138.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar139.gif b/www-ssl/pic/avatar/avatar139.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar14.gif b/www-ssl/pic/avatar/avatar14.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar140.gif b/www-ssl/pic/avatar/avatar140.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar141.gif b/www-ssl/pic/avatar/avatar141.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar142.gif b/www-ssl/pic/avatar/avatar142.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar143.gif b/www-ssl/pic/avatar/avatar143.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar144.gif b/www-ssl/pic/avatar/avatar144.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar145.gif b/www-ssl/pic/avatar/avatar145.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar146.gif b/www-ssl/pic/avatar/avatar146.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar147.gif b/www-ssl/pic/avatar/avatar147.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar148.gif b/www-ssl/pic/avatar/avatar148.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar149.gif b/www-ssl/pic/avatar/avatar149.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar15.gif b/www-ssl/pic/avatar/avatar15.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar150.gif b/www-ssl/pic/avatar/avatar150.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar151.gif b/www-ssl/pic/avatar/avatar151.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar152.gif b/www-ssl/pic/avatar/avatar152.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar153.gif b/www-ssl/pic/avatar/avatar153.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar154.gif b/www-ssl/pic/avatar/avatar154.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar155.gif b/www-ssl/pic/avatar/avatar155.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar156.gif b/www-ssl/pic/avatar/avatar156.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar157.gif b/www-ssl/pic/avatar/avatar157.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar158.gif b/www-ssl/pic/avatar/avatar158.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar159.gif b/www-ssl/pic/avatar/avatar159.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar16.gif b/www-ssl/pic/avatar/avatar16.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar160.gif b/www-ssl/pic/avatar/avatar160.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar161.gif b/www-ssl/pic/avatar/avatar161.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar162.gif b/www-ssl/pic/avatar/avatar162.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar163.gif b/www-ssl/pic/avatar/avatar163.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar164.gif b/www-ssl/pic/avatar/avatar164.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar165.gif b/www-ssl/pic/avatar/avatar165.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar166.gif b/www-ssl/pic/avatar/avatar166.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar167.gif b/www-ssl/pic/avatar/avatar167.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar168.gif b/www-ssl/pic/avatar/avatar168.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar169.gif b/www-ssl/pic/avatar/avatar169.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar17.gif b/www-ssl/pic/avatar/avatar17.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar170.gif b/www-ssl/pic/avatar/avatar170.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar171.gif b/www-ssl/pic/avatar/avatar171.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar172.gif b/www-ssl/pic/avatar/avatar172.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar173.gif b/www-ssl/pic/avatar/avatar173.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar174.gif b/www-ssl/pic/avatar/avatar174.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar175.gif b/www-ssl/pic/avatar/avatar175.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar176.gif b/www-ssl/pic/avatar/avatar176.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar177.gif b/www-ssl/pic/avatar/avatar177.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar178.gif b/www-ssl/pic/avatar/avatar178.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar179.gif b/www-ssl/pic/avatar/avatar179.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar18.gif b/www-ssl/pic/avatar/avatar18.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar180.gif b/www-ssl/pic/avatar/avatar180.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar181.gif b/www-ssl/pic/avatar/avatar181.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar182.gif b/www-ssl/pic/avatar/avatar182.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar183.gif b/www-ssl/pic/avatar/avatar183.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar184.gif b/www-ssl/pic/avatar/avatar184.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar185.gif b/www-ssl/pic/avatar/avatar185.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar186.gif b/www-ssl/pic/avatar/avatar186.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar187.gif b/www-ssl/pic/avatar/avatar187.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar188.gif b/www-ssl/pic/avatar/avatar188.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar189.gif b/www-ssl/pic/avatar/avatar189.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar19.gif b/www-ssl/pic/avatar/avatar19.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar190.gif b/www-ssl/pic/avatar/avatar190.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar191.gif b/www-ssl/pic/avatar/avatar191.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar192.gif b/www-ssl/pic/avatar/avatar192.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar193.gif b/www-ssl/pic/avatar/avatar193.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar194.gif b/www-ssl/pic/avatar/avatar194.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar195.gif b/www-ssl/pic/avatar/avatar195.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar196.gif b/www-ssl/pic/avatar/avatar196.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar197.gif b/www-ssl/pic/avatar/avatar197.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar198.gif b/www-ssl/pic/avatar/avatar198.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar199.gif b/www-ssl/pic/avatar/avatar199.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar2.gif b/www-ssl/pic/avatar/avatar2.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar20.gif b/www-ssl/pic/avatar/avatar20.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar200.gif b/www-ssl/pic/avatar/avatar200.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar201.gif b/www-ssl/pic/avatar/avatar201.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar202.gif b/www-ssl/pic/avatar/avatar202.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar203.gif b/www-ssl/pic/avatar/avatar203.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar204.gif b/www-ssl/pic/avatar/avatar204.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar205.gif b/www-ssl/pic/avatar/avatar205.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar206.gif b/www-ssl/pic/avatar/avatar206.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar207.gif b/www-ssl/pic/avatar/avatar207.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar208.gif b/www-ssl/pic/avatar/avatar208.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar209.gif b/www-ssl/pic/avatar/avatar209.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar21.gif b/www-ssl/pic/avatar/avatar21.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar210.gif b/www-ssl/pic/avatar/avatar210.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar211.gif b/www-ssl/pic/avatar/avatar211.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar212.gif b/www-ssl/pic/avatar/avatar212.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar213.gif b/www-ssl/pic/avatar/avatar213.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar214.gif b/www-ssl/pic/avatar/avatar214.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar215.gif b/www-ssl/pic/avatar/avatar215.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar216.gif b/www-ssl/pic/avatar/avatar216.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar217.gif b/www-ssl/pic/avatar/avatar217.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar218.gif b/www-ssl/pic/avatar/avatar218.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar219.gif b/www-ssl/pic/avatar/avatar219.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar22.gif b/www-ssl/pic/avatar/avatar22.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar220.gif b/www-ssl/pic/avatar/avatar220.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar221.gif b/www-ssl/pic/avatar/avatar221.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar222.gif b/www-ssl/pic/avatar/avatar222.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar223.gif b/www-ssl/pic/avatar/avatar223.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar224.gif b/www-ssl/pic/avatar/avatar224.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar225.gif b/www-ssl/pic/avatar/avatar225.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar226.gif b/www-ssl/pic/avatar/avatar226.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar227.gif b/www-ssl/pic/avatar/avatar227.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar228.gif b/www-ssl/pic/avatar/avatar228.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar229.gif b/www-ssl/pic/avatar/avatar229.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar23.gif b/www-ssl/pic/avatar/avatar23.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar230.gif b/www-ssl/pic/avatar/avatar230.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar231.gif b/www-ssl/pic/avatar/avatar231.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar232.gif b/www-ssl/pic/avatar/avatar232.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar233.gif b/www-ssl/pic/avatar/avatar233.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar234.gif b/www-ssl/pic/avatar/avatar234.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar235.gif b/www-ssl/pic/avatar/avatar235.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar236.gif b/www-ssl/pic/avatar/avatar236.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar237.gif b/www-ssl/pic/avatar/avatar237.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar238.gif b/www-ssl/pic/avatar/avatar238.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar239.gif b/www-ssl/pic/avatar/avatar239.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar24.gif b/www-ssl/pic/avatar/avatar24.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar240.gif b/www-ssl/pic/avatar/avatar240.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar241.gif b/www-ssl/pic/avatar/avatar241.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar242.gif b/www-ssl/pic/avatar/avatar242.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar243.gif b/www-ssl/pic/avatar/avatar243.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar244.gif b/www-ssl/pic/avatar/avatar244.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar245.gif b/www-ssl/pic/avatar/avatar245.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar246.gif b/www-ssl/pic/avatar/avatar246.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar247.gif b/www-ssl/pic/avatar/avatar247.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar248.gif b/www-ssl/pic/avatar/avatar248.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar249.gif b/www-ssl/pic/avatar/avatar249.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar25.gif b/www-ssl/pic/avatar/avatar25.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar250.gif b/www-ssl/pic/avatar/avatar250.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar251.gif b/www-ssl/pic/avatar/avatar251.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar252.gif b/www-ssl/pic/avatar/avatar252.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar253.gif b/www-ssl/pic/avatar/avatar253.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar254.gif b/www-ssl/pic/avatar/avatar254.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar255.gif b/www-ssl/pic/avatar/avatar255.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar256.gif b/www-ssl/pic/avatar/avatar256.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar257.gif b/www-ssl/pic/avatar/avatar257.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar258.gif b/www-ssl/pic/avatar/avatar258.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar259.gif b/www-ssl/pic/avatar/avatar259.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar26.gif b/www-ssl/pic/avatar/avatar26.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar260.gif b/www-ssl/pic/avatar/avatar260.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar261.gif b/www-ssl/pic/avatar/avatar261.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar262.gif b/www-ssl/pic/avatar/avatar262.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar263.gif b/www-ssl/pic/avatar/avatar263.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar264.gif b/www-ssl/pic/avatar/avatar264.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar265.gif b/www-ssl/pic/avatar/avatar265.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar266.gif b/www-ssl/pic/avatar/avatar266.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar267.gif b/www-ssl/pic/avatar/avatar267.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar268.gif b/www-ssl/pic/avatar/avatar268.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar269.gif b/www-ssl/pic/avatar/avatar269.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar27.gif b/www-ssl/pic/avatar/avatar27.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar270.gif b/www-ssl/pic/avatar/avatar270.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar271.gif b/www-ssl/pic/avatar/avatar271.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar272.gif b/www-ssl/pic/avatar/avatar272.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar273.gif b/www-ssl/pic/avatar/avatar273.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar274.gif b/www-ssl/pic/avatar/avatar274.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar275.gif b/www-ssl/pic/avatar/avatar275.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar276.gif b/www-ssl/pic/avatar/avatar276.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar277.gif b/www-ssl/pic/avatar/avatar277.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar278.gif b/www-ssl/pic/avatar/avatar278.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar279.gif b/www-ssl/pic/avatar/avatar279.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar28.gif b/www-ssl/pic/avatar/avatar28.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar280.gif b/www-ssl/pic/avatar/avatar280.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar281.gif b/www-ssl/pic/avatar/avatar281.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar282.gif b/www-ssl/pic/avatar/avatar282.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar283.gif b/www-ssl/pic/avatar/avatar283.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar284.gif b/www-ssl/pic/avatar/avatar284.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar285.gif b/www-ssl/pic/avatar/avatar285.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar286.gif b/www-ssl/pic/avatar/avatar286.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar287.gif b/www-ssl/pic/avatar/avatar287.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar288.gif b/www-ssl/pic/avatar/avatar288.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar289.gif b/www-ssl/pic/avatar/avatar289.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar29.gif b/www-ssl/pic/avatar/avatar29.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar290.gif b/www-ssl/pic/avatar/avatar290.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar291.gif b/www-ssl/pic/avatar/avatar291.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar292.gif b/www-ssl/pic/avatar/avatar292.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar293.gif b/www-ssl/pic/avatar/avatar293.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar294.gif b/www-ssl/pic/avatar/avatar294.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar295.gif b/www-ssl/pic/avatar/avatar295.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar296.gif b/www-ssl/pic/avatar/avatar296.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar297.gif b/www-ssl/pic/avatar/avatar297.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar298.gif b/www-ssl/pic/avatar/avatar298.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar299.gif b/www-ssl/pic/avatar/avatar299.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar3.gif b/www-ssl/pic/avatar/avatar3.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar30.gif b/www-ssl/pic/avatar/avatar30.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar300.gif b/www-ssl/pic/avatar/avatar300.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar301.gif b/www-ssl/pic/avatar/avatar301.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar302.gif b/www-ssl/pic/avatar/avatar302.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar303.gif b/www-ssl/pic/avatar/avatar303.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar304.gif b/www-ssl/pic/avatar/avatar304.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar305.gif b/www-ssl/pic/avatar/avatar305.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar306.gif b/www-ssl/pic/avatar/avatar306.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar307.gif b/www-ssl/pic/avatar/avatar307.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar308.gif b/www-ssl/pic/avatar/avatar308.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar309.gif b/www-ssl/pic/avatar/avatar309.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar31.gif b/www-ssl/pic/avatar/avatar31.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar310.gif b/www-ssl/pic/avatar/avatar310.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar311.gif b/www-ssl/pic/avatar/avatar311.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar312.gif b/www-ssl/pic/avatar/avatar312.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar313.gif b/www-ssl/pic/avatar/avatar313.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar314.gif b/www-ssl/pic/avatar/avatar314.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar315.gif b/www-ssl/pic/avatar/avatar315.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar316.gif b/www-ssl/pic/avatar/avatar316.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar317.gif b/www-ssl/pic/avatar/avatar317.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar318.gif b/www-ssl/pic/avatar/avatar318.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar319.gif b/www-ssl/pic/avatar/avatar319.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar32.gif b/www-ssl/pic/avatar/avatar32.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar320.gif b/www-ssl/pic/avatar/avatar320.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar321.gif b/www-ssl/pic/avatar/avatar321.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar322.gif b/www-ssl/pic/avatar/avatar322.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar323.gif b/www-ssl/pic/avatar/avatar323.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar324.gif b/www-ssl/pic/avatar/avatar324.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar325.gif b/www-ssl/pic/avatar/avatar325.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar326.gif b/www-ssl/pic/avatar/avatar326.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar327.gif b/www-ssl/pic/avatar/avatar327.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar328.gif b/www-ssl/pic/avatar/avatar328.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar329.gif b/www-ssl/pic/avatar/avatar329.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar33.gif b/www-ssl/pic/avatar/avatar33.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar330.gif b/www-ssl/pic/avatar/avatar330.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar331.gif b/www-ssl/pic/avatar/avatar331.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar332.gif b/www-ssl/pic/avatar/avatar332.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar333.gif b/www-ssl/pic/avatar/avatar333.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar334.gif b/www-ssl/pic/avatar/avatar334.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar335.gif b/www-ssl/pic/avatar/avatar335.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar336.gif b/www-ssl/pic/avatar/avatar336.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar337.gif b/www-ssl/pic/avatar/avatar337.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar338.gif b/www-ssl/pic/avatar/avatar338.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar339.gif b/www-ssl/pic/avatar/avatar339.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar34.gif b/www-ssl/pic/avatar/avatar34.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar340.gif b/www-ssl/pic/avatar/avatar340.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar341.gif b/www-ssl/pic/avatar/avatar341.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar342.gif b/www-ssl/pic/avatar/avatar342.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar343.gif b/www-ssl/pic/avatar/avatar343.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar344.gif b/www-ssl/pic/avatar/avatar344.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar345.gif b/www-ssl/pic/avatar/avatar345.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar346.gif b/www-ssl/pic/avatar/avatar346.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar347.gif b/www-ssl/pic/avatar/avatar347.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar348.gif b/www-ssl/pic/avatar/avatar348.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar349.gif b/www-ssl/pic/avatar/avatar349.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar35.gif b/www-ssl/pic/avatar/avatar35.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar350.gif b/www-ssl/pic/avatar/avatar350.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar351.gif b/www-ssl/pic/avatar/avatar351.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar352.gif b/www-ssl/pic/avatar/avatar352.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar353.gif b/www-ssl/pic/avatar/avatar353.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar354.gif b/www-ssl/pic/avatar/avatar354.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar355.gif b/www-ssl/pic/avatar/avatar355.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar356.gif b/www-ssl/pic/avatar/avatar356.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar357.gif b/www-ssl/pic/avatar/avatar357.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar358.gif b/www-ssl/pic/avatar/avatar358.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar359.gif b/www-ssl/pic/avatar/avatar359.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar36.gif b/www-ssl/pic/avatar/avatar36.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar360.gif b/www-ssl/pic/avatar/avatar360.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar361.gif b/www-ssl/pic/avatar/avatar361.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar362.gif b/www-ssl/pic/avatar/avatar362.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar363.gif b/www-ssl/pic/avatar/avatar363.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar364.gif b/www-ssl/pic/avatar/avatar364.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar365.gif b/www-ssl/pic/avatar/avatar365.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar366.gif b/www-ssl/pic/avatar/avatar366.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar367.gif b/www-ssl/pic/avatar/avatar367.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar368.gif b/www-ssl/pic/avatar/avatar368.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar369.gif b/www-ssl/pic/avatar/avatar369.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar37.gif b/www-ssl/pic/avatar/avatar37.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar370.gif b/www-ssl/pic/avatar/avatar370.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar371.gif b/www-ssl/pic/avatar/avatar371.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar372.gif b/www-ssl/pic/avatar/avatar372.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar373.gif b/www-ssl/pic/avatar/avatar373.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar374.gif b/www-ssl/pic/avatar/avatar374.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar375.gif b/www-ssl/pic/avatar/avatar375.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar376.gif b/www-ssl/pic/avatar/avatar376.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar377.gif b/www-ssl/pic/avatar/avatar377.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar378.gif b/www-ssl/pic/avatar/avatar378.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar379.gif b/www-ssl/pic/avatar/avatar379.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar38.gif b/www-ssl/pic/avatar/avatar38.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar380.gif b/www-ssl/pic/avatar/avatar380.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar381.gif b/www-ssl/pic/avatar/avatar381.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar382.gif b/www-ssl/pic/avatar/avatar382.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar383.gif b/www-ssl/pic/avatar/avatar383.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar384.gif b/www-ssl/pic/avatar/avatar384.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar385.gif b/www-ssl/pic/avatar/avatar385.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar386.gif b/www-ssl/pic/avatar/avatar386.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar387.gif b/www-ssl/pic/avatar/avatar387.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar388.gif b/www-ssl/pic/avatar/avatar388.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar389.gif b/www-ssl/pic/avatar/avatar389.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar39.gif b/www-ssl/pic/avatar/avatar39.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar390.gif b/www-ssl/pic/avatar/avatar390.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar391.gif b/www-ssl/pic/avatar/avatar391.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar392.gif b/www-ssl/pic/avatar/avatar392.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar393.gif b/www-ssl/pic/avatar/avatar393.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar394.gif b/www-ssl/pic/avatar/avatar394.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar395.gif b/www-ssl/pic/avatar/avatar395.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar396.gif b/www-ssl/pic/avatar/avatar396.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar397.gif b/www-ssl/pic/avatar/avatar397.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar398.gif b/www-ssl/pic/avatar/avatar398.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar399.gif b/www-ssl/pic/avatar/avatar399.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar4.gif b/www-ssl/pic/avatar/avatar4.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar40.gif b/www-ssl/pic/avatar/avatar40.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar400.gif b/www-ssl/pic/avatar/avatar400.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar401.gif b/www-ssl/pic/avatar/avatar401.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar402.gif b/www-ssl/pic/avatar/avatar402.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar403.gif b/www-ssl/pic/avatar/avatar403.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar404.gif b/www-ssl/pic/avatar/avatar404.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar405.gif b/www-ssl/pic/avatar/avatar405.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar406.gif b/www-ssl/pic/avatar/avatar406.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar407.gif b/www-ssl/pic/avatar/avatar407.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar408.gif b/www-ssl/pic/avatar/avatar408.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar409.gif b/www-ssl/pic/avatar/avatar409.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar41.gif b/www-ssl/pic/avatar/avatar41.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar410.gif b/www-ssl/pic/avatar/avatar410.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar411.gif b/www-ssl/pic/avatar/avatar411.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar412.gif b/www-ssl/pic/avatar/avatar412.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar413.gif b/www-ssl/pic/avatar/avatar413.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar414.gif b/www-ssl/pic/avatar/avatar414.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar415.gif b/www-ssl/pic/avatar/avatar415.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar416.gif b/www-ssl/pic/avatar/avatar416.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar417.gif b/www-ssl/pic/avatar/avatar417.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar418.gif b/www-ssl/pic/avatar/avatar418.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar419.gif b/www-ssl/pic/avatar/avatar419.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar42.gif b/www-ssl/pic/avatar/avatar42.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar420.gif b/www-ssl/pic/avatar/avatar420.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar421.gif b/www-ssl/pic/avatar/avatar421.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar422.gif b/www-ssl/pic/avatar/avatar422.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar423.gif b/www-ssl/pic/avatar/avatar423.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar424.gif b/www-ssl/pic/avatar/avatar424.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar425.gif b/www-ssl/pic/avatar/avatar425.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar426.gif b/www-ssl/pic/avatar/avatar426.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar427.gif b/www-ssl/pic/avatar/avatar427.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar428.gif b/www-ssl/pic/avatar/avatar428.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar429.gif b/www-ssl/pic/avatar/avatar429.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar43.gif b/www-ssl/pic/avatar/avatar43.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar430.gif b/www-ssl/pic/avatar/avatar430.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar431.gif b/www-ssl/pic/avatar/avatar431.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar432.gif b/www-ssl/pic/avatar/avatar432.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar433.gif b/www-ssl/pic/avatar/avatar433.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar434.gif b/www-ssl/pic/avatar/avatar434.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar435.gif b/www-ssl/pic/avatar/avatar435.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar436.gif b/www-ssl/pic/avatar/avatar436.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar437.gif b/www-ssl/pic/avatar/avatar437.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar438.gif b/www-ssl/pic/avatar/avatar438.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar439.gif b/www-ssl/pic/avatar/avatar439.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar44.gif b/www-ssl/pic/avatar/avatar44.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar440.gif b/www-ssl/pic/avatar/avatar440.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar441.gif b/www-ssl/pic/avatar/avatar441.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar442.gif b/www-ssl/pic/avatar/avatar442.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar443.gif b/www-ssl/pic/avatar/avatar443.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar444.gif b/www-ssl/pic/avatar/avatar444.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar445.gif b/www-ssl/pic/avatar/avatar445.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar446.gif b/www-ssl/pic/avatar/avatar446.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar447.gif b/www-ssl/pic/avatar/avatar447.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar448.gif b/www-ssl/pic/avatar/avatar448.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar449.gif b/www-ssl/pic/avatar/avatar449.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar45.gif b/www-ssl/pic/avatar/avatar45.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar450.gif b/www-ssl/pic/avatar/avatar450.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar451.gif b/www-ssl/pic/avatar/avatar451.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar452.gif b/www-ssl/pic/avatar/avatar452.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar453.gif b/www-ssl/pic/avatar/avatar453.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar454.gif b/www-ssl/pic/avatar/avatar454.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar455.gif b/www-ssl/pic/avatar/avatar455.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar456.gif b/www-ssl/pic/avatar/avatar456.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar457.gif b/www-ssl/pic/avatar/avatar457.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar458.gif b/www-ssl/pic/avatar/avatar458.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar459.gif b/www-ssl/pic/avatar/avatar459.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar46.gif b/www-ssl/pic/avatar/avatar46.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar460.gif b/www-ssl/pic/avatar/avatar460.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar461.gif b/www-ssl/pic/avatar/avatar461.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar462.gif b/www-ssl/pic/avatar/avatar462.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar463.gif b/www-ssl/pic/avatar/avatar463.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar464.gif b/www-ssl/pic/avatar/avatar464.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar465.gif b/www-ssl/pic/avatar/avatar465.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar466.gif b/www-ssl/pic/avatar/avatar466.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar467.gif b/www-ssl/pic/avatar/avatar467.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar468.gif b/www-ssl/pic/avatar/avatar468.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar469.gif b/www-ssl/pic/avatar/avatar469.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar47.gif b/www-ssl/pic/avatar/avatar47.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar470.gif b/www-ssl/pic/avatar/avatar470.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar471.gif b/www-ssl/pic/avatar/avatar471.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar472.gif b/www-ssl/pic/avatar/avatar472.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar473.gif b/www-ssl/pic/avatar/avatar473.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar474.gif b/www-ssl/pic/avatar/avatar474.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar475.gif b/www-ssl/pic/avatar/avatar475.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar476.gif b/www-ssl/pic/avatar/avatar476.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar477.gif b/www-ssl/pic/avatar/avatar477.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar478.gif b/www-ssl/pic/avatar/avatar478.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar479.gif b/www-ssl/pic/avatar/avatar479.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar48.gif b/www-ssl/pic/avatar/avatar48.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar480.gif b/www-ssl/pic/avatar/avatar480.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar481.gif b/www-ssl/pic/avatar/avatar481.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar482.gif b/www-ssl/pic/avatar/avatar482.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar483.gif b/www-ssl/pic/avatar/avatar483.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar484.gif b/www-ssl/pic/avatar/avatar484.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar485.gif b/www-ssl/pic/avatar/avatar485.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar486.gif b/www-ssl/pic/avatar/avatar486.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar487.gif b/www-ssl/pic/avatar/avatar487.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar488.gif b/www-ssl/pic/avatar/avatar488.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar489.gif b/www-ssl/pic/avatar/avatar489.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar49.gif b/www-ssl/pic/avatar/avatar49.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar490.gif b/www-ssl/pic/avatar/avatar490.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar491.gif b/www-ssl/pic/avatar/avatar491.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar492.gif b/www-ssl/pic/avatar/avatar492.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar493.gif b/www-ssl/pic/avatar/avatar493.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar494.gif b/www-ssl/pic/avatar/avatar494.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar495.gif b/www-ssl/pic/avatar/avatar495.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar496.gif b/www-ssl/pic/avatar/avatar496.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar497.gif b/www-ssl/pic/avatar/avatar497.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar498.gif b/www-ssl/pic/avatar/avatar498.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar499.gif b/www-ssl/pic/avatar/avatar499.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar5.gif b/www-ssl/pic/avatar/avatar5.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar50.gif b/www-ssl/pic/avatar/avatar50.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar51.gif b/www-ssl/pic/avatar/avatar51.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar52.gif b/www-ssl/pic/avatar/avatar52.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar53.gif b/www-ssl/pic/avatar/avatar53.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar54.gif b/www-ssl/pic/avatar/avatar54.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar55.gif b/www-ssl/pic/avatar/avatar55.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar56.gif b/www-ssl/pic/avatar/avatar56.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar57.gif b/www-ssl/pic/avatar/avatar57.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar58.gif b/www-ssl/pic/avatar/avatar58.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar59.gif b/www-ssl/pic/avatar/avatar59.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar6.gif b/www-ssl/pic/avatar/avatar6.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar60.gif b/www-ssl/pic/avatar/avatar60.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar61.gif b/www-ssl/pic/avatar/avatar61.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar62.gif b/www-ssl/pic/avatar/avatar62.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar63.gif b/www-ssl/pic/avatar/avatar63.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar64.gif b/www-ssl/pic/avatar/avatar64.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar65.gif b/www-ssl/pic/avatar/avatar65.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar66.gif b/www-ssl/pic/avatar/avatar66.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar67.gif b/www-ssl/pic/avatar/avatar67.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar68.gif b/www-ssl/pic/avatar/avatar68.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar69.gif b/www-ssl/pic/avatar/avatar69.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar7.gif b/www-ssl/pic/avatar/avatar7.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar70.gif b/www-ssl/pic/avatar/avatar70.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar71.gif b/www-ssl/pic/avatar/avatar71.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar72.gif b/www-ssl/pic/avatar/avatar72.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar73.gif b/www-ssl/pic/avatar/avatar73.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar74.gif b/www-ssl/pic/avatar/avatar74.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar75.gif b/www-ssl/pic/avatar/avatar75.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar76.gif b/www-ssl/pic/avatar/avatar76.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar77.gif b/www-ssl/pic/avatar/avatar77.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar78.gif b/www-ssl/pic/avatar/avatar78.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar79.gif b/www-ssl/pic/avatar/avatar79.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar8.gif b/www-ssl/pic/avatar/avatar8.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar80.gif b/www-ssl/pic/avatar/avatar80.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar81.gif b/www-ssl/pic/avatar/avatar81.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar82.gif b/www-ssl/pic/avatar/avatar82.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar83.gif b/www-ssl/pic/avatar/avatar83.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar84.gif b/www-ssl/pic/avatar/avatar84.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar85.gif b/www-ssl/pic/avatar/avatar85.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar86.gif b/www-ssl/pic/avatar/avatar86.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar87.gif b/www-ssl/pic/avatar/avatar87.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar88.gif b/www-ssl/pic/avatar/avatar88.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar89.gif b/www-ssl/pic/avatar/avatar89.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar9.gif b/www-ssl/pic/avatar/avatar9.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar90.gif b/www-ssl/pic/avatar/avatar90.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar91.gif b/www-ssl/pic/avatar/avatar91.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar92.gif b/www-ssl/pic/avatar/avatar92.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar93.gif b/www-ssl/pic/avatar/avatar93.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar94.gif b/www-ssl/pic/avatar/avatar94.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar95.gif b/www-ssl/pic/avatar/avatar95.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar96.gif b/www-ssl/pic/avatar/avatar96.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar97.gif b/www-ssl/pic/avatar/avatar97.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar98.gif b/www-ssl/pic/avatar/avatar98.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar99.gif b/www-ssl/pic/avatar/avatar99.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/external.png b/www-ssl/pic/external.png old mode 100755 new mode 100644 diff --git a/www-ssl/pic/flag/de.gif b/www-ssl/pic/flag/de.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/flag/en.gif b/www-ssl/pic/flag/en.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/himmel.png b/www-ssl/pic/himmel.png old mode 100755 new mode 100644 diff --git a/www-ssl/pic/himmel_w.png b/www-ssl/pic/himmel_w.png old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/aerger2.gif b/www-ssl/pic/smiles/aerger2.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/alien.gif b/www-ssl/pic/smiles/alien.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/blush.gif b/www-ssl/pic/smiles/blush.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/boggle.gif b/www-ssl/pic/smiles/boggle.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/bounce.gif b/www-ssl/pic/smiles/bounce.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/bun.gif b/www-ssl/pic/smiles/bun.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/candycane.gif b/www-ssl/pic/smiles/candycane.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/cheesy.gif b/www-ssl/pic/smiles/cheesy.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/dead.gif b/www-ssl/pic/smiles/dead.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/depressed.gif b/www-ssl/pic/smiles/depressed.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/ginger.gif b/www-ssl/pic/smiles/ginger.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/hirsch1.gif b/www-ssl/pic/smiles/hirsch1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/huh.gif b/www-ssl/pic/smiles/huh.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_arrow.gif b/www-ssl/pic/smiles/icon_arrow.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_biggrin.gif b/www-ssl/pic/smiles/icon_biggrin.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_confused.gif b/www-ssl/pic/smiles/icon_confused.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_cool.gif b/www-ssl/pic/smiles/icon_cool.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_cry.gif b/www-ssl/pic/smiles/icon_cry.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_eek.gif b/www-ssl/pic/smiles/icon_eek.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_evil.gif b/www-ssl/pic/smiles/icon_evil.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_exclaim.gif b/www-ssl/pic/smiles/icon_exclaim.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_frown.gif b/www-ssl/pic/smiles/icon_frown.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_idea.gif b/www-ssl/pic/smiles/icon_idea.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_lol.gif b/www-ssl/pic/smiles/icon_lol.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_mad.gif b/www-ssl/pic/smiles/icon_mad.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_mrgreen.gif b/www-ssl/pic/smiles/icon_mrgreen.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_neutral.gif b/www-ssl/pic/smiles/icon_neutral.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_question.gif b/www-ssl/pic/smiles/icon_question.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_razz.gif b/www-ssl/pic/smiles/icon_razz.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_redface.gif b/www-ssl/pic/smiles/icon_redface.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_rolleyes.gif b/www-ssl/pic/smiles/icon_rolleyes.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_sad.gif b/www-ssl/pic/smiles/icon_sad.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_smile.gif b/www-ssl/pic/smiles/icon_smile.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_surprised.gif b/www-ssl/pic/smiles/icon_surprised.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_twisted.gif b/www-ssl/pic/smiles/icon_twisted.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_wind.gif b/www-ssl/pic/smiles/icon_wind.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/koenig1.gif b/www-ssl/pic/smiles/koenig1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/laser1.gif b/www-ssl/pic/smiles/laser1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/love1.gif b/www-ssl/pic/smiles/love1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/moo.gif b/www-ssl/pic/smiles/moo.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/nuts.gif b/www-ssl/pic/smiles/nuts.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/robin.gif b/www-ssl/pic/smiles/robin.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/sheep.gif b/www-ssl/pic/smiles/sheep.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/sick.gif b/www-ssl/pic/smiles/sick.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/sleep.gif b/www-ssl/pic/smiles/sleep.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/soppy.gif b/www-ssl/pic/smiles/soppy.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/stress.gif b/www-ssl/pic/smiles/stress.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/sweet.gif b/www-ssl/pic/smiles/sweet.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/tired.gif b/www-ssl/pic/smiles/tired.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/urgh.gif b/www-ssl/pic/smiles/urgh.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/winken1.gif b/www-ssl/pic/smiles/winken1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/worm.gif b/www-ssl/pic/smiles/worm.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/worry.gif b/www-ssl/pic/smiles/worry.gif old mode 100755 new mode 100644 diff --git a/www/404.php b/www/404.php index b9e5ed58..dc19cd26 100644 --- a/www/404.php +++ b/www/404.php @@ -1,3 +1,3 @@ - diff --git a/www/index.php b/www/index.php index 2e218040..9105555e 100644 --- a/www/index.php +++ b/www/index.php @@ -1,4 +1,3 @@ - -