diff --git a/cis/public/incoming/incoming.php b/cis/public/incoming/incoming.php index 83d8c54e0..7be66d80a 100644 --- a/cis/public/incoming/incoming.php +++ b/cis/public/incoming/incoming.php @@ -549,7 +549,7 @@ else if($method=="lehrveranstaltungen") AND (von is null OR von >= '$stsem->start') AND - (bis is null OR bis <= '$stsem->ende') + (bis is null OR bis <= (DATE '$stsem->ende' + INTERVAL '6 MONTH')) AND aktiv = true )a ) as anzahl FROM diff --git a/cis/public/incoming/index.php b/cis/public/incoming/index.php index 7917a748c..766a71232 100644 --- a/cis/public/incoming/index.php +++ b/cis/public/incoming/index.php @@ -57,7 +57,7 @@ if (isset($_POST['userid'])) ?> - Inoming-Verwaltung + Incoming-Verwaltung diff --git a/cms/admin.php b/cms/admin.php index 1dcb5c24a..eb37bbe2f 100644 --- a/cms/admin.php +++ b/cms/admin.php @@ -123,10 +123,13 @@ $version = isset($_GET['version'])?$_GET['version']:null; $content_id = isset($_GET['content_id'])?$_GET['content_id']:null; $action = isset($_GET['action'])?$_GET['action']:''; $method = isset($_GET['method'])?$_GET['method']:null; +$filter = isset($_GET['filter'])?$_GET['filter']:null; $message = ''; $submenu_depth=0; $datum_obj = new datum(); +$filterstr = explode(' ',TRIM(str_replace(array('!','.','?',','), '', $filter))); + //Inhalt Speichern if(isset($_POST['XSDFormPrinter_XML'])) { @@ -649,7 +652,7 @@ echo ' -
'; + '; $db = new basis_db(); @@ -659,10 +662,17 @@ echo '

Content | -News - +News
+
+ + + + + Filter: + + +
'; - $menu='content'; if(isset($_GET['menu'])) { @@ -685,7 +695,11 @@ if($menu=='news') else { $rootcontent = new content(); - $rootcontent->getRootContent(); + + if($filter!=null) + $rootcontent->searchCMS($filterstr); + else + $rootcontent->getRootContent(); } foreach($rootcontent->result as $row) @@ -703,14 +717,14 @@ foreach($rootcontent->result as $row) if($content->template_kurzbz=='news') { $output.= ''; } else { $output.= ''; $submenu_depth=0; @@ -779,7 +793,7 @@ echo ' */ function drawheader() { - global $content_id, $action, $sprache, $version, $action; + global $content_id, $action, $sprache, $version, $action, $filterstr; //vorhandene Versionen dieser Sprache anzeigen $content = new content(); @@ -799,7 +813,7 @@ function drawheader() else $class=''; - echo ' '; + echo ' '; echo $row->version; echo ', '; } @@ -815,12 +829,12 @@ function drawheader() $class='marked'; else $class=''; - echo ' '; //&version='.$version.' + echo ' '; //&version='.$version.' echo $lang; echo ','; } echo '\n"; $output.= '\n"; $output.= "\n"; @@ -906,8 +935,8 @@ function drawsubmenu($content_id, $einrueckung="  ") */ function get_content_link($key, $name) { - global $action, $content_id, $sprache, $version; - return ''.$name.''; + global $action, $content_id, $sprache, $version, $filterstr; + return ''.$name.''; } /** @@ -915,7 +944,7 @@ function get_content_link($key, $name) */ function print_childs() { - global $content_id, $sprache, $version, $action; + global $content_id, $sprache, $version, $action, $filterstr; $content = new content(); $content->getChilds($content_id); @@ -949,14 +978,14 @@ function print_childs() echo ''; echo ''; echo ''; echo ''; echo ''; @@ -966,7 +995,7 @@ function print_childs() $content = new content(); $content->getpossibleChilds($content_id); - echo ''; + echo ''; echo '
'; - $output.= drawmenulink($row->content_id, mb_substr($content->titel,0,15).' '.$datum_obj->formatDatum($content->insertamum,'d.m.Y'), $content->oe_kurzbz); + $output.= drawmenulink($row->content_id, mb_substr($content->titel,0,15).' '.$datum_obj->formatDatum($content->insertamum,'d.m.Y'), $content->oe_kurzbz, $content->aktiv); $output.= '
'; - $output.= drawmenulink($row->content_id, $content->titel, $content->oe_kurzbz); + $output.= drawmenulink($row->content_id, $content->titel, $content->oe_kurzbz, $content->aktiv); $output.= '		'; - echo '
'; + echo ''; echo ''; echo '
'; echo '		'; @@ -831,7 +845,7 @@ function drawheader() //wird ein Formular zum Erstellen der Uebersetzung angezeigt. if(count($vorhandene_sprachen)!=count($sprache_obj->result)) { - echo '
'; + echo ''; echo 'Übersetzung in
'; $output.= $einrueckung; - $output.=drawmenulink($row->child_content_id, $content->titel, $content->oe_kurzbz); + $output.=drawmenulink($row->child_content_id, $content->titel, $content->oe_kurzbz, $row->aktiv); $output.=drawsubmenu($row->child_content_id, $einrueckung."  "); $output.= "
',$row->sort; - echo ' up'; - echo ' down'; + echo ' up'; + echo ' down'; echo '',$row->child_content_id,'',$child->titel,' - +
@@ -1070,12 +1099,12 @@ function print_prefs() } echo '      '; - echo ''; + echo ''; $bf = new benutzerfunktion(); if($bf->benutzerfunktion_exists($user, 'review') || $rechte->isBerechtigt('basis/cms_review')) - echo ''; + echo ''; - echo ''; + echo ''; echo ' @@ -1092,7 +1121,7 @@ function print_prefs() */ function print_rights() { - global $content_id, $sprache, $version; + global $content_id, $sprache, $version, $filterstr; $content = new content(); $content->loadGruppen($content_id); @@ -1125,7 +1154,7 @@ function print_rights() echo ''; echo ''; echo ''; @@ -1139,7 +1168,7 @@ function print_rights() $gruppe = new gruppe(); $gruppe->getgruppe(null, null, null, null, true); - echo ''; + echo ''; echo 'Gruppe '; echo ''; } @@ -1181,7 +1210,7 @@ function print_content() } - echo ''; + echo ''; if($content->gesperrt_uid=='') echo ''; else @@ -1195,7 +1224,7 @@ function print_content() $template->load($content->template_kurzbz); $xfp = new XSDFormPrinter(); - $xfp->getparams='?content_id='.$content_id.'&sprache='.$sprache.'&version='.$version.'&action=content'; + $xfp->getparams='?content_id='.$content_id.'&sprache='.$sprache.'&version='.$version.'&action=content&filter='.implode(' ', $filterstr).''; $xfp->output($template->xsd,$content->content); echo ''; } @@ -1206,9 +1235,9 @@ function print_content() // Javascript in der Vorschau die CMS Seite geschlossen wird. if($content->template_kurzbz=='redirect') - echo 'Vorschau in eigenem Fenster öffnen'; + echo 'Vorschau in eigenem Fenster öffnen'; else - echo '
Vorlage - '; $template = new template(); $template->getAll(); foreach($template->result as $row) @@ -1009,7 +1038,7 @@ function print_prefs() echo ''; } echo ' - +   
',$row->gruppe_kurzbz,'',$row->bezeichnung,' - +