From 45b5837e716ce7a2df9c087d170781c002302276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Fri, 13 May 2011 08:44:55 +0000 Subject: [PATCH] --- include/tw/cis_menu_main.inc.php | 27 + system/FH-Complete.txp | 1213 ++++++++++++++++++++++++++---- system/checksystem.php | 55 +- 3 files changed, 1160 insertions(+), 135 deletions(-) diff --git a/include/tw/cis_menu_main.inc.php b/include/tw/cis_menu_main.inc.php index e1c6ab1da..0e12b6641 100644 --- a/include/tw/cis_menu_main.inc.php +++ b/include/tw/cis_menu_main.inc.php @@ -22,6 +22,25 @@ /** * Hauptmenue fuer CIS */ +/* +function drawSubmenu($content_id) +{ + global $sprache; + $content = new content(); + $sprache = getSprache(); + + $arr = $content->getMenueArray($content_id, $sprache); + echo ''; + foreach ($arr as $row) + { + echo ' + + + + '; + } + echo '
 menu item '.$row['name'].'
'; +}*/ ?> @@ -69,6 +88,10 @@ + + + + @@ -921,6 +944,10 @@
menu item ÖH-Wahlen 2011
menu item ÖH-KandidatInnen 2011
menu item ÖH-Mandate Frühjahr 2010
+ menu item FAQ diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp index a1a7da724..fdd29c5f2 100644 --- a/system/FH-Complete.txp +++ b/system/FH-Complete.txp @@ -3334,6 +3334,8 @@ {BE043844-77D4-4670-900D-19605DE7464D} {03607C34-330A-4530-AB24-BB1B5CF63D5D} {1B9DF514-EA2E-46D2-B5B5-FB6454F0278D} + {DBB27540-4C11-42FE-AC7C-13DE03393965} + {DE1BBEC0-E06C-4AEB-A7CE-6228DF6FEC53} 0 0 @@ -7978,6 +7980,8 @@ {A1D92432-47E4-46A7-8C5E-60D68A486B2A} {C9911B75-91B8-4951-B78F-080EA9D4750C} + {DBB27540-4C11-42FE-AC7C-13DE03393965} + {5D00E8F7-8056-445B-AB99-B331ADF3BA31} 0 0 @@ -8260,6 +8264,44 @@ 0 1 + + {015B4BEF-0757-4CFB-BAEE-D97CBCEDCE2F} + tbl_contentlog + 0 + {5D0DDF13-79F7-4AB3-AA97-6170773E4A6C} + 0 + {812561B5-3134-413C-9757-2FF4925B8569} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + 176 + 6291 + 0 + 429 + 200 + 0 + 1 + 1 + 1 + 0 + + {DE1BBEC0-E06C-4AEB-A7CE-6228DF6FEC53} + {5D00E8F7-8056-445B-AB99-B331ADF3BA31} + + 0 + 0 + 2 + 0 + 0 + 0 + 1 + @@ -8285,15 +8327,15 @@ {AE958387-4CAC-43B9-8DB6-46E368970923} 3062 - 2020 + 2017 2011 - 1917 + 1911 2042 - 1917 + 1911 4082 @@ -9016,15 +9058,15 @@ {50220A2A-BBD0-4DE9-8DE1-B2496ECC6CDA} 4202 - 965 + 964 2011 - 1783 + 1782 2042 - 1783 + 1782 6362 @@ -9063,11 +9105,11 @@ 2011 - 1957 + 1958 2042 - 1957 + 1958 5730 @@ -9274,15 +9316,15 @@ {3FBDF806-A6E0-418B-A632-9E02C6784B78} 3572 - 2230 + 2232 2011 - 1930 + 1935 2042 - 1930 + 1935 5102 @@ -9317,15 +9359,15 @@ {00254DC2-89EE-441C-BC47-088D7BD254D6} 6838 - 1196 + 1200 2011 - 1810 + 1817 2042 - 1810 + 1817 11634 @@ -9360,15 +9402,15 @@ {2A9923DB-E256-4D6E-B571-DF1E915D3735} 4031 - 1967 + 1966 2011 - 1877 + 1876 2042 - 1877 + 1876 6020 @@ -9403,15 +9445,15 @@ {8CD50CD1-71FB-4FAC-8C97-E7FB4ACCA17A} 5796 - 2222 + 2221 2011 - 1890 + 1888 2042 - 1890 + 1888 9551 @@ -9489,15 +9531,15 @@ {8CB6E293-D364-4635-99BB-B716BD683617} 6548 - 1163 + 1168 2011 - 1797 + 1805 2042 - 1797 + 1805 11055 @@ -9575,15 +9617,15 @@ {FDA5C62A-FB2F-4276-A629-056A13FE389C} 4408 - 2123 + 2121 2011 - 1903 + 1899 2042 - 1903 + 1899 6775 @@ -9618,15 +9660,15 @@ {6361673E-711F-44A1-B2A2-567CEFE5EACD} 6832 - 1420 + 1421 2011 - 1850 + 1852 2042 - 1850 + 1852 11623 @@ -15009,11 +15051,11 @@ 2011 - 1863 + 1864 2042 - 1863 + 1864 2936 @@ -15091,7 +15133,7 @@ {50F56A06-2253-4C1B-B89F-1C7F3210F086} 6240 - 1302 + 1305 10469 @@ -15103,11 +15145,11 @@ 2042 - 1823 + 1829 2011 - 1823 + 1829 @@ -21866,15 +21908,15 @@ {5237A702-978B-4895-A700-E85AB4FAD842} 3784 - 1599 + 1601 2011 - 1837 + 1841 2042 - 1837 + 1841 5727 @@ -21931,7 +21973,7 @@ {14B56FD6-1D33-4319-B325-1157ED7990A4} - Relationship1 + fk_tag_bestelldetailtag 0 {386BD6B6-DACF-4C9C-8025-D89C70459A82} 0 @@ -21974,7 +22016,7 @@ {76B2619D-17A1-4A31-B0C4-F59158B55C3E} - Relationship2 + fk_bestelldetail_bestelldetailtag 0 {910FE21C-AE71-4B55-AA75-CA93B9E8AFAC} 0 @@ -22103,7 +22145,7 @@ {9F60846D-671D-41B2-A7FD-400EBC926EC0} - fkl_rechnungstyp_rechnung + fk_rechnungstyp_rechnung 0 {F1D7FEC8-BE9E-4538-B236-37A9045256F4} 0 @@ -22167,15 +22209,15 @@ {3BE3FDB1-C3BD-49BF-8EEE-E16D4E577FE1} 2646 - 2037 + 2038 2011 - 1943 + 1946 2042 - 1943 + 1946 3449 @@ -22511,7 +22553,7 @@ {98394113-7DC4-4BFF-BA0E-95FC67C24A1E} 4589 - 1912 + 1904 1521 @@ -22523,11 +22565,11 @@ 7826 - 2981 + 2964 7857 - 2981 + 2964 @@ -22554,7 +22596,7 @@ {98394113-7DC4-4BFF-BA0E-95FC67C24A1E} 7647 - 3002 + 3011 7636 @@ -22566,11 +22608,11 @@ 7826 - 3047 + 3064 7857 - 3047 + 3064 @@ -22877,7 +22919,7 @@ {366AB0AC-3702-43B3-A022-ADAF32E576D8} - Relationship3 + fk_organisationseinheit_dms 0 {2371B8E9-49A6-4589-AFB2-9C30F065127A} 0 @@ -23319,7 +23361,7 @@ {205E7F5E-4BB7-4178-B72B-BC9E0E9734D3} - Relationship4 + fk_person_preincoming_emergency 0 {32D9B054-39F2-47C7-9924-130AB3A739AE} 0 @@ -23362,7 +23404,7 @@ {B0D18A19-CB77-42C7-A0EC-8E1B3BAE8137} - Relationship5 + fk_person_preincoming_coordinator_dep 0 {18F58786-2FE2-4CC7-A5F4-A5A756D98D71} 0 @@ -23405,7 +23447,7 @@ {547E50FE-DE64-4161-B83F-D86D1C52458D} - Relationship6 + fk_person_preincoming_coordiantor_int 0 {5261EC7E-4542-4C97-9FE1-49BC985AFC8A} 0 @@ -23446,6 +23488,135 @@ + + {DBB27540-4C11-42FE-AC7C-13DE03393965} + fk_benutzer_contentsprache + 0 + {95C95494-71E6-4A6F-8B01-C64829F014F1} + 0 + {8111E3D0-73C9-47CF-BE5B-90191E5890FE} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {50F56A06-2253-4C1B-B89F-1C7F3210F086} + + + {98394113-7DC4-4BFF-BA0E-95FC67C24A1E} + + 4834 + 2409 + + + 2011 + 1923 + + + 2042 + 1923 + + + 7826 + 3014 + + + 7857 + 3014 + + + + + {DE1BBEC0-E06C-4AEB-A7CE-6228DF6FEC53} + fk_benutzer_contentlog + 0 + {3E21CE88-CE58-4168-8E03-56EB424383D3} + 0 + {FFA827CA-C2A5-4A33-BA51-FB481EB9D1E2} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {50F56A06-2253-4C1B-B89F-1C7F3210F086} + + + {015B4BEF-0757-4CFB-BAEE-D97CBCEDCE2F} + + 4051 + 975 + + + 2011 + 1794 + + + 2042 + 1794 + + + 6260 + 276 + + + 6291 + 276 + + + + + {5D00E8F7-8056-445B-AB99-B331ADF3BA31} + fk_contentsprache_contentlog + 0 + {B998FB4D-3D71-44FE-843F-D9E11D6072F1} + 0 + {0B11C02A-D788-4497-8C76-126F025CC7C9} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {98394113-7DC4-4BFF-BA0E-95FC67C24A1E} + + + {015B4BEF-0757-4CFB-BAEE-D97CBCEDCE2F} + + 7307 + 1520 + + + 8063 + 2914 + + + 8063 + 2883 + + + 6751 + 276 + + + 6720 + 276 + + + @@ -29169,7 +29340,7 @@ {6B98E4FF-C9AF-400D-AF4F-478D20577D5B} - Relationship4 + fk_person_preincoming_emergency 0 {AB902BA1-C8BE-4F03-BFEA-68124B3ED7F7} 0 @@ -29212,7 +29383,7 @@ {8235FE9E-9A2F-4203-9049-465C22FF32C2} - Relationship5 + fk_person_preincoming_coordinator_dep 0 {E4CD26C3-F8E3-49CF-89D8-B13D4B97C481} 0 @@ -29255,7 +29426,7 @@ {12FAF969-A82B-427B-BB80-93CCE3AD1234} - Relationship6 + fk_person_preincoming_coordiantor_int 0 {59ED84C6-175B-45FC-A698-0B79BBBB7CB2} 0 @@ -33963,7 +34134,7 @@ 6368 0 762 - 317 + 356 0 1 1 @@ -34038,7 +34209,7 @@ 5330 0 808 - 551 + 590 0 1 1 @@ -34047,6 +34218,7 @@ {ADFCFFB3-E504-46C5-9340-3499F0CC93D3} {CE6FA8DE-5C05-4212-B991-6DEDC6D96CE5} + {9BE92739-A6A7-4981-9C13-1527201F1DDE} 1 1 @@ -34076,7 +34248,7 @@ 6368 0 762 - 317 + 395 0 1 1 @@ -34285,6 +34457,43 @@ 1 1 + + {A35383EA-0703-4EBA-AB5F-A68F8E6BD16B} + tbl_contentlog + 0 + {DEC7AACA-31E6-44F5-BE2D-8EAD8E8EC838} + 0 + {812561B5-3134-413C-9757-2FF4925B8569} + 1 + 0 + 12639424 + 238 + 0 + Arial + 0 + 0 + -28 + 169 + 6236 + 0 + 876 + 239 + 0 + 1 + 1 + 1 + 1 + + {9BE92739-A6A7-4981-9C13-1527201F1DDE} + + 1 + 1 + 5 + 1 + 0 + 1 + 1 + @@ -35096,7 +35305,7 @@ {C63A5703-6646-4D24-8EE0-0DFE1EC072FB} 6767 - 853 + 872 6876 @@ -35108,11 +35317,11 @@ 6876 - 814 + 853 6876 - 783 + 822 @@ -35139,7 +35348,7 @@ {C63A5703-6646-4D24-8EE0-0DFE1EC072FB} 6513 - 853 + 872 6622 @@ -35151,11 +35360,11 @@ 6622 - 814 + 853 6622 - 783 + 822 @@ -35181,8 +35390,8 @@ {E1C9E6E3-90B8-49A2-85A0-2C382A2DEEB0} - 6140 - 1308 + 6141 + 1334 6131 @@ -35194,11 +35403,11 @@ 6337 - 1281 + 1333 6368 - 1281 + 1333 @@ -35225,23 +35434,23 @@ {EA51A6CA-3B44-4BC2-A8BE-355113344D54} 6144 - 1014 + 1037 6368 - 1176 + 1202 6337 - 1176 + 1202 6169 - 1000 + 1020 6138 - 1000 + 1020 @@ -35268,15 +35477,15 @@ {A98D91E4-4C4C-49F6-BBB7-DFB162F4DFA2} 6631 - 1444 + 1482 6749 - 1387 + 1465 6749 - 1418 + 1496 6730 @@ -35353,7 +35562,7 @@ {EA51A6CA-3B44-4BC2-A8BE-355113344D54} - 5632 + 5564 474 @@ -35365,11 +35574,11 @@ 402 - 5734 + 5599 694 - 5734 + 5599 725 @@ -35472,6 +35681,49 @@ + + {9BE92739-A6A7-4981-9C13-1527201F1DDE} + fk_contentsprache_contentlog + 0 + {9F70FAB2-4172-4D94-9746-9A6F82C74EC5} + 0 + {0B11C02A-D788-4497-8C76-126F025CC7C9} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {EA51A6CA-3B44-4BC2-A8BE-355113344D54} + + + {A35383EA-0703-4EBA-AB5F-A68F8E6BD16B} + + 5937 + 431 + + + 5869 + 725 + + + 5869 + 694 + + + 6205 + 288 + + + 6236 + 288 + + + @@ -39456,7 +39708,7 @@ 0 0 -28 - 2360 + 2385 4217 0 919 @@ -39495,8 +39747,8 @@ 0 0 -28 - 3096 - 4246 + 3110 + 4231 0 800 278 @@ -39685,8 +39937,8 @@ 0 0 -28 - 552 - 2907 + 566 + 2977 0 761 200 @@ -40779,7 +41031,7 @@ {DB59DF18-64A7-4185-8765-7238517341C0} 4093 - 1954 + 1967 3863 @@ -40791,11 +41043,11 @@ 4523 - 2329 + 2354 4523 - 2360 + 2385 @@ -40821,24 +41073,24 @@ {239C6766-B0BC-4E1F-9833-C49206AF8D54} - 4561 - 3002 + 4554 + 3022 4676 - 3028 + 3053 4676 - 3059 + 3084 - 4646 - 3065 + 4631 + 3079 - 4646 - 3096 + 4631 + 3110 @@ -41188,7 +41440,7 @@ {410A3505-2A9E-4EBB-9AC0-E4A73026A11E} - Relationship1 + fk_tag_bestelldetailtag 0 {879B782B-8C9B-4802-B9C1-C4362F24C161} 0 @@ -41208,8 +41460,8 @@ {B4891794-493A-4F6A-9EA2-76CEE5D5773B} - 2681 - 307 + 2715 + 314 2654 @@ -41220,18 +41472,18 @@ 83 - 2876 - 652 + 2946 + 666 - 2907 - 652 + 2977 + 666 {A4300989-E6DD-4970-8AC9-496E2D3CC336} - Relationship2 + fk_bestelldetail_bestelldetailtag 0 {F0B7691D-C531-4AF5-9092-FA1BCC233C35} 0 @@ -41251,8 +41503,8 @@ {B4891794-493A-4F6A-9EA2-76CEE5D5773B} - 3859 - 1063 + 3894 + 1070 4250 @@ -41263,12 +41515,12 @@ 1594 - 3699 - 652 + 3769 + 666 - 3668 - 652 + 3738 + 666 @@ -41360,7 +41612,7 @@ {CAD2FB6A-0365-4972-A665-44151E1804D9} - fkl_rechnungstyp_rechnung + fk_rechnungstyp_rechnung 0 {4BCD6B71-9B31-4C22-9FEE-75063CD549FA} 0 @@ -41381,7 +41633,7 @@ {DB59DF18-64A7-4185-8765-7238517341C0} 4652 - 2274 + 2286 4674 @@ -41393,11 +41645,11 @@ 4830 - 2329 + 2354 4830 - 2360 + 2385 @@ -41923,7 +42175,7 @@ Technikum Wien 2.0 2009-04-17T11:15:21.000+02:00 - 2011-05-10T11:12:32.806+02:00 + 2011-05-12T13:51:44.408+02:00 FH-Complete 2.0 @@ -42241,6 +42493,7 @@ {A2D07E22-6009-40D8-9292-E22C5FF15CCA} {31FBCB29-C23E-49BB-8F8C-646706D280B2} {4E1FB00A-4CD2-444B-BDE2-CE04524C814B} + {812561B5-3134-413C-9757-2FF4925B8569} 0 0 @@ -82386,6 +82639,8 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie {2BA97F49-1492-440A-A11A-5C38CC0615EE} {127B5AF9-EF16-4F96-940A-73A33BA8EE09} {CCBF5E97-827C-4A87-A10D-CE94B5CAC89A} + {8111E3D0-73C9-47CF-BE5B-90191E5890FE} + {FFA827CA-C2A5-4A33-BA51-FB481EB9D1E2} @@ -82438,6 +82693,8 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie {CF08AC9E-4FD5-4F1D-B38C-708027F34218} {B7455DCB-FB2A-4A2E-A9D8-B2912F496834} {02B95A0C-644B-4DD4-94C9-3BA34DADB850} + {DE0F0B99-B793-4215-BF9F-044E6F8475E7} + {8CA05996-6162-44E6-80A3-9903776309D4} @@ -82922,6 +83179,8 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie {CF08AC9E-4FD5-4F1D-B38C-708027F34218} {B7455DCB-FB2A-4A2E-A9D8-B2912F496834} {02B95A0C-644B-4DD4-94C9-3BA34DADB850} + {DE0F0B99-B793-4215-BF9F-044E6F8475E7} + {8CA05996-6162-44E6-80A3-9903776309D4} @@ -82947,6 +83206,8 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie {2BA97F49-1492-440A-A11A-5C38CC0615EE} {127B5AF9-EF16-4F96-940A-73A33BA8EE09} {CCBF5E97-827C-4A87-A10D-CE94B5CAC89A} + {8111E3D0-73C9-47CF-BE5B-90191E5890FE} + {FFA827CA-C2A5-4A33-BA51-FB481EB9D1E2} @@ -129228,6 +129489,88 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 + + {67471177-7A94-45A4-B1D8-1437296244AE} + menu_open + 0 + {38A788B6-A7B8-4BE0-8A23-B1CEEDE21082} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + true + 1 + 0 + menu_open + 0 + + + + + + + + + + {D64069A5-B04A-490B-B0A2-5144DEA81A2E} + + + + + + + + 0 + + + {1E5A12A4-5A5B-4B69-804B-7C5572D930D6} + aktiv + 0 + {6113E51E-9D52-465A-B5F0-6A0AC9A1A169} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + true + 1 + 0 + aktiv + 0 + + + + + + + + + + {D64069A5-B04A-490B-B0A2-5144DEA81A2E} + + + + + + + + 0 + @@ -129322,6 +129665,8 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {F43908D4-64E8-4DF9-9B6E-4BB548C0DA4A} {DEBEEF46-8564-48C3-AEE0-BA509FFFF864} + {8111E3D0-73C9-47CF-BE5B-90191E5890FE} + {0B11C02A-D788-4497-8C76-126F025CC7C9} @@ -129352,7 +129697,9 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {E7BA7BF5-F26E-4A41-ADBF-B3AC75808F89} - + + {66F2B47B-6B18-4A8C-ABB6-C2C1EE2EDF48} + @@ -129863,6 +130210,49 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 + + {DBD2C006-645C-4B67-814D-51CD0438FD74} + gesperrt_uid + 0 + {D84C40A9-6601-4E22-90FF-3878743FC8A1} + 0 + 0 + 0 + 0 + 1 + + + + + 32 + + 0 + + 0 + 1 + gesperrt_uid + 0 + + + + + + + {DE0F0B99-B793-4215-BF9F-044E6F8475E7} + + + + + {ECB8F02F-B683-4252-8508-ED9D064C9AF3} + + + + + + + + 0 + @@ -129896,10 +130286,14 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {819F4B37-7AA3-41FE-A8CA-D0678FD88D7B} - + + {66F2B47B-6B18-4A8C-ABB6-C2C1EE2EDF48} + - + + {0B11C02A-D788-4497-8C76-126F025CC7C9} + @@ -130536,6 +130930,47 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 + + {9CA627BB-FCAD-4A63-8D18-295755005C79} + sort + 0 + {9C321DD5-3464-4F7D-BA3C-A5053D6D84F5} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 0 + sort + 0 + + + + + + + + + + {3AA5E900-D254-4FBD-AD67-AD230407284C} + + + + + + + + 0 + @@ -133561,6 +133996,345 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a + + {812561B5-3134-413C-9757-2FF4925B8569} + tbl_contentlog + 0 + {E3B310DE-3210-4C2D-918E-26BA95EC2409} + 0 + 0 + 0 + 0 + 1 + + + + + tbl_contentlog + 0 + + {FFA827CA-C2A5-4A33-BA51-FB481EB9D1E2} + {0B11C02A-D788-4497-8C76-126F025CC7C9} + + + + {6456A383-22F4-4ECA-A57C-EE63B39BD02B} + contentlog_id + 1 + {A0E22EDA-699A-4868-8BA5-C1EAAFA66F22} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 1 + 0 + contentlog_id + 1 + + + + + {166B9E2E-D0E4-4891-AD4C-1B7A0CAD647D} + {582BA22E-76B2-4E2B-8900-C0D439EAF447} + + + + + + + {5F0FB0CB-62A1-4BDC-A4DA-882CACFC296A} + + + + + + + {7BA5FDF4-5E89-4225-BFC5-C5427AEC2BD9} + + + 0 + + + {CBEBA1CA-69E8-4416-BA62-225E0808872E} + contentsprache_id + 2 + {AECB83C6-FD22-4667-B529-E77F2F059541} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 1 + 1 + contentsprache_id + 0 + + + + + + + {66F2B47B-6B18-4A8C-ABB6-C2C1EE2EDF48} + + + + + {361EF147-269D-4247-8F7C-5A3876A3999A} + + + + + + + + 0 + + + {357B1558-1F2E-4CB8-A693-C814DEB6C536} + uid + 3 + {385B8AD0-02E6-4920-B7AF-C37F0C2B7C45} + 0 + 0 + 0 + 0 + 1 + + + + + 32 + + 0 + + 1 + 1 + uid + 0 + + + + + + + {8CA05996-6162-44E6-80A3-9903776309D4} + + + + + {ECB8F02F-B683-4252-8508-ED9D064C9AF3} + + + + + + + + 0 + + + {D3970B15-AB79-47FC-9211-68A05B54A58B} + start + 4 + {BFD66510-EB27-4FBD-89A2-8AD3D4580E1C} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 0 + start + 0 + + + + + + + + + + {342E3F36-138D-40F7-B1B2-D9489C848835} + + + + + + + + 0 + + + {A4A838FD-4A08-49B0-BB51-C5A7F3E127D0} + ende + 5 + {8E8D22D0-6760-42CD-B969-5E8077989AAF} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 0 + ende + 0 + + + + + + + + + + {342E3F36-138D-40F7-B1B2-D9489C848835} + + + + + + + + 0 + + + + + {675AA2E2-0392-404E-88AE-391617F21580} + Key38 + 0 + {492D5955-3568-4576-841D-9EB4C3B42D9D} + 0 + 0 + 0 + 0 + 1 + + + + + Key38 + + + {582BA22E-76B2-4E2B-8900-C0D439EAF447} + contentlog_id + 0 + {6AF97CF9-CDE3-4BBA-8EED-14A2A9069CD5} + 0 + 1 + + + + + 0 + + {6456A383-22F4-4ECA-A57C-EE63B39BD02B} + + + + + + + + + + + {7BA5FDF4-5E89-4225-BFC5-C5427AEC2BD9} + contentlog_id + 0 + {7C31C6EC-1AC9-4116-9F50-C025E6149EC8} + 0 + 0 + 0 + 0 + 1 + + + + + contentlog_id + + + {166B9E2E-D0E4-4891-AD4C-1B7A0CAD647D} + contentlog_id + 0 + {D226B0B8-E353-4FD4-B635-4528F27E0F04} + 0 + 1 + + + + + 0 + + {6456A383-22F4-4ECA-A57C-EE63B39BD02B} + + + + + + + {6456A383-22F4-4ECA-A57C-EE63B39BD02B} + + + + + + + {675AA2E2-0392-404E-88AE-391617F21580} + + + + + + + + + {A0178E89-8366-4582-834F-E124208C684D} + + + 0 + + 0 + + + + + @@ -152321,7 +153095,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {00D8F1D4-D9D2-4E1F-A3D0-CC1C78AC43B6} - Relationship1 + fk_tag_bestelldetailtag 0 {9EBDD338-F955-4FEF-A5A0-894EA0A8C8FE} 0 @@ -152339,7 +153113,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 -1 - Relationship1 + fk_tag_bestelldetailtag 0 0 @@ -152379,7 +153153,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {E71C8D04-54C0-45AD-84BF-A947DB5B9D04} - Relationship2 + fk_bestelldetail_bestelldetailtag 0 {892220C2-CECC-43E6-873C-6DF89DF8EC0A} 0 @@ -152397,7 +153171,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 -1 - Relationship2 + fk_bestelldetail_bestelldetailtag 0 0 @@ -152553,7 +153327,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {FF29CBAD-5507-49F3-B931-EE9C38126083} - fkl_rechnungstyp_rechnung + fk_rechnungstyp_rechnung 0 {5F0DA933-5697-4EC2-A600-8E2DF68A7938} 0 @@ -152571,7 +153345,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 -1 - fkl_rechnungstyp_rechnung + fk_rechnungstyp_rechnung 0 0 @@ -153597,7 +154371,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {A6F80362-90AA-499E-B5BA-A5A1FBA06229} - Relationship3 + fk_organisationseinheit_dms 0 {7B06F7AA-BC25-44FA-AAC0-4D84F92831D8} 0 @@ -153615,7 +154389,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 -1 - Relationship3 + fk_organisationseinheit_dms 0 0 @@ -154177,7 +154951,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {FD2F1CD5-644A-4D9A-BF4B-45F7985B224D} - Relationship4 + fk_person_preincoming_emergency 0 {92F54762-9239-444B-BF93-8CA0E807F748} 0 @@ -154195,7 +154969,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 -1 - Relationship4 + fk_person_preincoming_emergency 0 0 @@ -154235,7 +155009,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {9D8183BF-D517-43D0-82EC-341AC6975AA1} - Relationship5 + fk_person_preincoming_coordinator_dep 0 {5AA03DDF-A742-4EB3-98EB-F92B718C3969} 0 @@ -154253,7 +155027,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 -1 - Relationship5 + fk_person_preincoming_coordinator_dep 0 0 @@ -154293,7 +155067,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {B029A0EC-D181-46EA-B742-F08847F3725D} - Relationship6 + fk_person_preincoming_coordiantor_int 0 {9CD7BE63-AF68-461F-A0F1-598A3416C0F0} 0 @@ -154311,7 +155085,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 -1 - Relationship6 + fk_person_preincoming_coordiantor_int 0 0 @@ -154349,6 +155123,180 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a SIMPLE 1 + + {8111E3D0-73C9-47CF-BE5B-90191E5890FE} + fk_benutzer_contentsprache + 0 + {91D241F3-0723-4C4E-A618-A89CCD27A416} + 0 + + {20863D57-4A76-4276-B1E9-1FF7E0B4C0BB} + + + {045AEA5F-7410-408C-93BA-10188FC3281C} + + 1 + + + 0 + 0 + 0 + -1 + + fk_benutzer_contentsprache + + 0 + 0 + 0 + 0 + + {70EE0BEF-C69B-4791-AEBC-2767B8F1CFB3} + + + + {DE0F0B99-B793-4215-BF9F-044E6F8475E7} + FK uid - gesperrt_uid + 0 + {F6387012-D58E-49A4-88DD-B555A7536D3C} + 0 + 1 + + + + + + {FB409F67-7476-4E1F-88C7-F3E6BC9BE1C3} + + + {DBD2C006-645C-4B67-814D-51CD0438FD74} + + + {AA8ACCF4-983D-47F3-B631-844DA7380947} + + + + + 0 + 0 + SIMPLE + 1 + + + {FFA827CA-C2A5-4A33-BA51-FB481EB9D1E2} + fk_benutzer_contentlog + 0 + {137A2709-33D7-45A5-8359-678DDE584F93} + 0 + + {20863D57-4A76-4276-B1E9-1FF7E0B4C0BB} + + + {812561B5-3134-413C-9757-2FF4925B8569} + + 1 + + + 0 + 0 + 0 + -1 + + fk_benutzer_contentlog + + 2 + 1 + 0 + 0 + + {70EE0BEF-C69B-4791-AEBC-2767B8F1CFB3} + + + + {8CA05996-6162-44E6-80A3-9903776309D4} + FK uid - uid + 0 + {71C3E399-E584-4386-A97E-EC1BC58059D0} + 0 + 1 + + + + + + {FB409F67-7476-4E1F-88C7-F3E6BC9BE1C3} + + + {357B1558-1F2E-4CB8-A693-C814DEB6C536} + + + {AA8ACCF4-983D-47F3-B631-844DA7380947} + + + + + 0 + 0 + SIMPLE + 1 + + + {0B11C02A-D788-4497-8C76-126F025CC7C9} + fk_contentsprache_contentlog + 0 + {2DA36C56-677F-443E-B19E-CE9D0A3DA5F5} + 0 + + {045AEA5F-7410-408C-93BA-10188FC3281C} + + + {812561B5-3134-413C-9757-2FF4925B8569} + + 1 + + + 0 + 0 + 0 + -1 + + fk_contentsprache_contentlog + + 0 + 0 + 0 + 0 + + {A912E4E9-74EF-4FB1-B7C0-5151FB28EEA6} + + + + {66F2B47B-6B18-4A8C-ABB6-C2C1EE2EDF48} + FK contentsprache_id - contentsprache_id + 0 + {93CE6586-B9AF-459B-93FF-A9D90406EA00} + 0 + 1 + + + + + + {819F4B37-7AA3-41FE-A8CA-D0678FD88D7B} + + + {CBEBA1CA-69E8-4416-BA62-225E0808872E} + + + {E7BA7BF5-F26E-4A41-ADBF-B3AC75808F89} + + + + + 0 + 0 + SIMPLE + 1 + @@ -187845,6 +188793,7 @@ SELECT tbl_pruefling.prestudent_id, tbl_pruefling.pruefling_id, tbl_pruefling.st {DB658D91-19F0-4480-B24D-4756A4F668F0} {0B11ED35-FBB6-43BC-8E83-A3270BA78D60} {A2D07E22-6009-40D8-9292-E22C5FF15CCA} + {812561B5-3134-413C-9757-2FF4925B8569} diff --git a/system/checksystem.php b/system/checksystem.php index c93d1916b..4e6502631 100644 --- a/system/checksystem.php +++ b/system/checksystem.php @@ -2319,6 +2319,54 @@ if(!@$db->db_query("SELECT zgv FROM public.tbl_preincoming LIMIT 1")) echo 'Tabelle public.tbl_preincoming Erweiterungen hinzugefuegt!
'; } +// CMS Updates +if(!@$db->db_query("SELECT gesperrt_uid FROM campus.tbl_contentsprache LIMIT 1")) +{ + $qry = " + ALTER TABLE campus.tbl_contentsprache ADD COLUMN gesperrt_uid varchar(32); + ALTER TABLE campus.tbl_content ADD COLUMN aktiv boolean DEFAULT true; + ALTER TABLE campus.tbl_content ADD COLUMN menu_open boolean DEFAULT true; + ALTER TABLE campus.tbl_contentchild ADD COLUMN sort smallint; + + UPDATE campus.tbl_content SET aktiv=true; + ALTER TABLE campus.tbl_content ALTER COLUMN aktiv SET NOT NULL; + UPDATE campus.tbl_content SET menu_open=true; + ALTER TABLE campus.tbl_content ALTER COLUMN menu_open SET NOT NULL; + + CREATE TABLE campus.tbl_contentlog + ( + contentlog_id integer NOT NULL, + uid varchar(32) NOT NULL, + contentsprache_id integer NOT NULL, + start timestamp, + ende timestamp + ); + + CREATE SEQUENCE campus.seq_contentlog_contentlog_id + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + + ALTER TABLE campus.tbl_contentlog ALTER COLUMN contentlog_id SET DEFAULT nextval('campus.seq_contentlog_contentlog_id'); + + ALTER TABLE campus.tbl_contentlog ADD CONSTRAINT pk_contentlog PRIMARY KEY (contentlog_id); + ALTER TABLE campus.tbl_contentlog ADD CONSTRAINT uk_contentlog_contentlog_id UNIQUE (contentlog_id); + + GRANT SELECT, INSERT, UPDATE, DELETE ON campus.tbl_contentlog TO web; + GRANT SELECT, INSERT, UPDATE, DELETE ON campus.tbl_contentlog TO admin; + + ALTER TABLE campus.tbl_contentlog ADD CONSTRAINT fk_benutzer_contentlog FOREIGN KEY(uid) REFERENCES public.tbl_benutzer (uid) ON UPDATE CASCADE ON DELETE RESTRICT; + ALTER TABLE campus.tbl_contentlog ADD CONSTRAINT fk_contentsprache_contentlog FOREIGN KEY(contentsprache_id) REFERENCES campus.tbl_contentsprache (contentsprache_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + + "; + + if(!$db->db_query($qry)) + echo 'campus.tbl_content: '.$db->db_last_error().'
'; + else + echo 'Tabelle campus.tbl_content Erweiterungen hinzugefuegt!
'; +} echo '
'; $tabellen=array( @@ -2346,10 +2394,11 @@ $tabellen=array( "campus.tbl_abgabe" => array("abgabe_id","abgabedatei","abgabezeit","anmerkung"), "campus.tbl_beispiel" => array("beispiel_id","uebung_id","nummer","bezeichnung","punkte","updateamum","updatevon","insertamum","insertvon"), "campus.tbl_benutzerlvstudiensemester" => array("uid","studiensemester_kurzbz","lehrveranstaltung_id"), - "campus.tbl_content" => array("content_id","template_kurzbz","updatevon","updateamum","insertamum","insertvon","oe_kurzbz"), - "campus.tbl_contentchild" => array("contentchild_id","content_id","child_content_id","updatevon","updateamum","insertamum","insertvon"), + "campus.tbl_content" => array("content_id","template_kurzbz","updatevon","updateamum","insertamum","insertvon","oe_kurzbz","menu_open","aktiv"), + "campus.tbl_contentchild" => array("contentchild_id","content_id","child_content_id","updatevon","updateamum","insertamum","insertvon","sort"), "campus.tbl_contentgruppe" => array("content_id","gruppe_kurzbz","insertamum","insertvon"), - "campus.tbl_contentsprache" => array("contentsprache_id","content_id","sprache","version","sichtbar","content","reviewvon","reviewamum","updateamum","updatevon","insertamum","insertvon","titel"), + "campus.tbl_contentlog" => array("contentlog_id","contentsprache_id","uid","start","ende"), + "campus.tbl_contentsprache" => array("contentsprache_id","content_id","sprache","version","sichtbar","content","reviewvon","reviewamum","updateamum","updatevon","insertamum","insertvon","titel","gesperrt_uid"), "campus.tbl_dms" => array("dms_id","version","oe_kurzbz","dokument_kurzbz","kategorie_kurzbz","filename","mimetype","name","beschreibung","letzterzugriff","updateamum","updatevon","insertamum","insertvon"), "campus.tbl_dms_kategorie" => array("kategorie_kurzbz","bezeichnung","beschreibung","parent_kategorie_kurzbz"), "campus.tbl_erreichbarkeit" => array("erreichbarkeit_kurzbz","beschreibung","farbe"),