Menu
▾
▴
[phpws-comm-commits] modules/phpwsrssfeeds/class Multi_RSS.php,1.23,1.24 RSS.php,1.36,1.37 backend.php,1.26,1.27
|
From: Darren G. <dg...@us...> - 2004-09-23 19:07:40
|
Update of /cvsroot/phpwebsite-comm/modules/phpwsrssfeeds/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20512/class Modified Files: Multi_RSS.php RSS.php backend.php Log Message: added multi-view ability to organize feeds by date Index: backend.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/phpwsrssfeeds/class/backend.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** backend.php 17 Sep 2004 18:55:23 -0000 1.26 --- backend.php 23 Sep 2004 19:06:58 -0000 1.27 *************** *** 440,443 **** --- 440,444 ---- <link>http://$source_http</link> <description>".RSS_common::get_htmlentities(PHPWS_Text::parseOutput($this->_description),ENT_QUOTES)."</description>"; + if($this->_image['thumb_name']) $output .="<image rdf:resource=\"http://".$source_http."images/phpwsrssfeeds/thumbs/".$this->_image['thumb_name']."\" />"; *************** *** 557,560 **** --- 558,562 ---- $id = $calFeed['data'][$n]['id']; if($id){ + $title = PHPWS_Text::parseOutput($calFeed['data'][$n]['title']); $title = RSS_common::get_htmlentities($title, ENT_QUOTES); *************** *** 585,592 **** $endMinute = substr($endTime,2,2); $endHour = substr($endTime,0,2); if($calFeed['data'][$n]["eventType"]=="allday"){ ! $output .= "<br /><br />".$calFeed['FullDate']."<br />All Day Event"; ! $dcdate = $startYear."-".$startMonth."-".$startDay; }else{ //Determine AM or PM and set vars --- 587,598 ---- $endMinute = substr($endTime,2,2); $endHour = substr($endTime,0,2); + + $startTS = mktime(0,0,0,$startMonth, $startDay, $startYear); + $endTS = mktime(0,0,0,$endMonth, $endDay, $endYear); + $repeatTS = mktime(0,0,0, $repeatMonth, $repeatDay, $repeatYear); if($calFeed['data'][$n]["eventType"]=="allday"){ ! $output .= "<br />".$calFeed['FullDate']."<br />All Day Event"; ! }else{ //Determine AM or PM and set vars *************** *** 604,610 **** $deadline = ltrim($endHour,"\0x00").":".$endMinute; if($calFeed['data'][$n]["eventType"]=="deadline"){ ! $dcdate = $endYear."-".$endMonth."-".$endDay; ! $output .= "<br /><br />".$calFeed['FullDate']."<br />Deadline: ".$deadline.$eampm; } if($calFeed['data'][$n]["eventType"]=="interval" && ($endRepeat)){ $startHour = ($startHour + 1) > 12 ? $startHour - 12 : $startHour; --- 610,618 ---- $deadline = ltrim($endHour,"\0x00").":".$endMinute; if($calFeed['data'][$n]["eventType"]=="deadline"){ ! $output .= "<br />". ! "The deadline is ". ! $deadline.$eampm." on ".$calFeed['FullDate']."."; } + if($calFeed['data'][$n]["eventType"]=="interval" && ($endRepeat)){ $startHour = ($startHour + 1) > 12 ? $startHour - 12 : $startHour; *************** *** 614,623 **** $endHour = sprintf("%02d", $endHour==0 ? 12 : $endHour); $ends = ltrim($endHour,"\0x00").":".$endMinute; ! if($startDate == $endRepeat) ! $dcdate = $startYear."-".$startMonth."-".$startDay; ! else ! $dcdate = $startYear."-".$startMonth."-".$startDay."/".$repeatYear."-".$repeatMonth."-".$repeatDay; ! $output .= "<br /><br />".$calFeed['FullDate']."<br />".$starts.$sampm." - ".$ends.$eampm; } if($calFeed['data'][$n]["eventType"]=="interval" && (!$endRepeat)){ $startHour = ($startHour + 1) > 12 ? $startHour - 12 : $startHour; --- 622,630 ---- $endHour = sprintf("%02d", $endHour==0 ? 12 : $endHour); $ends = ltrim($endHour,"\0x00").":".$endMinute; ! ! $output .= "<br />Event is from ".$starts.$sampm." to ".$ends.$eampm . " on ".$calFeed['FullDate']."."; ! $dcdate = $calFeed["dcdate"]; } + if($calFeed['data'][$n]["eventType"]=="interval" && (!$endRepeat)){ $startHour = ($startHour + 1) > 12 ? $startHour - 12 : $startHour; *************** *** 627,637 **** $endHour = sprintf("%02d", $endHour==0 ? 12 : $endHour); $ends = ltrim($endHour,"\0x00").":".$endMinute; ! if($startDate == $endDate) ! $dcdate = $startYear."-".$startMonth."-".$startDay; ! else ! $dcdate = $startYear."-".$startMonth."-".$startDay."/".$endYear."-".$endMonth."-".$endDay; ! $output .= "<br /><br /><b>From: </b>" ! .$starts.$sampm.", ".$startYear."-".$startMonth."-".$startDay."<br /> ! <b>To: </b>".$ends.$eampm.", ".$endYear."-".$endMonth."-".$endDay; } if($calFeed['data'][$n]["eventType"]=="start"){ --- 634,648 ---- $endHour = sprintf("%02d", $endHour==0 ? 12 : $endHour); $ends = ltrim($endHour,"\0x00").":".$endMinute; ! ! if($endTS != $startTS) { ! $output .= "<br />Begins at " ! .$starts.$sampm." on ".$startMonth."/".$startDay."/".$startYear." and ends at ".$ends.$eampm." on ".$endMonth."/".$endDay."/".$endYear."."; ! } else { ! $output .= "<br />Event begins at " ! .$starts.$sampm." and ends at ".$ends.$eampm." on ". ! $startMonth."/".$startDay."/".$startYear."."; ! } ! ! } if($calFeed['data'][$n]["eventType"]=="start"){ *************** *** 642,650 **** $endHour = sprintf("%02d", $endHour==0 ? 12 : $endHour); $ends = ltrim($endHour,"\0x00").":".$endMinute; ! $dcdate = $startYear."-".$startMonth."-".$startDay; ! $output .= "<br /><br /><b>Starts: </b>" ! .$starts.$sampm.", ".$startYear."-".$startMonth."-".$startDay; } } $output .= "</description> <dc:date>$dcdate</dc:date> --- 653,663 ---- $endHour = sprintf("%02d", $endHour==0 ? 12 : $endHour); $ends = ltrim($endHour,"\0x00").":".$endMinute; ! ! $output .= "<br /><br />Event begins at " ! .$starts.$sampm." on ".$startYear."-".$startMonth."-".$startDay."."; } } + + $dcdate = $calFeed["dcdate"]; $output .= "</description> <dc:date>$dcdate</dc:date> *************** *** 697,703 **** $i = 0; $maxnum = 0; ! while($end->after($date)){ if ($events = PHPWS_Calendar::getEvents($date, $eventList)){ $thisdate = $date->format("%a. %e %b. %Y"); $num = 0; foreach ($events as $time=>$weekday){ --- 710,717 ---- $i = 0; $maxnum = 0; ! while($end->after($date)) { if ($events = PHPWS_Calendar::getEvents($date, $eventList)){ $thisdate = $date->format("%a. %e %b. %Y"); + $dcDate = $date->format("%Y-%m-%d"); $num = 0; foreach ($events as $time=>$weekday){ *************** *** 706,709 **** --- 720,724 ---- return $eventdata; $eventdata[$i]['FullDate'] = $thisdate; + $eventdata[$i]['dcdate'] = $dcDate; $eventdata[$i]['data'][$num]= $event; $num++; Index: Multi_RSS.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/phpwsrssfeeds/class/Multi_RSS.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Multi_RSS.php 17 Sep 2004 18:55:23 -0000 1.23 --- Multi_RSS.php 23 Sep 2004 19:06:57 -0000 1.24 *************** *** 68,71 **** --- 68,73 ---- var $_show_cat_link; var $_sort_order; + var $_orgn_by_date; + var $_days_ahead; var $_expandedFeed; var $_content; *************** *** 86,89 **** --- 88,93 ---- $this->_show_empty_feeds = 1; $this->_sort_order = 0; + $this->_orgn_by_date = 0; + $this->_days_ahead = 0; } *************** *** 167,170 **** --- 171,259 ---- }//End function getFeedLinks() + function showBlog($id) { + $allBlogs = array(); + foreach($this->_availFeeds as $feed) { + if($id == $feed["id"]) + continue; + $feedObj = RSS::getRSS($feed["id"]); + + //Standard error checking + if (is_object($feedObj->_error)) + continue; + + if($feedObj->_hidden || !$feedObj->_approved) + continue; + + if($feedObj->expired()) + $_SESSION['PHPWSRSSFEEDS']['update'][$feedObj->getId()] = $feedObj->getId(); + + $tags = $feedObj->_content; + if($this->_show_empty_feeds == 0 && empty($tags["MULTI_CONTENT"])) + continue; + + $today = mktime(0,0,0); + $endDate = NULL; + + if($this->_days_ahead != 0) { + $endDate = mktime(12,12,12,date("m"), date("d")+$this->_days_ahead, date("Y")); + } + + if(isset($tags["BLOG_DATES"])) { + foreach($tags["BLOG_DATES"] as $date=>$blog) { + if($date >= $today && + (!isset($endDate) || (isset($endDate) && $date <= $endDate))) + { + $allBlogs[$date][$tags["TITLE"]]["items"] = $blog; + $allBlogs[$date][$tags["TITLE"]]["id"] = $feedObj->_id; + } + } + } + } + + ksort($allBlogs); + + foreach($allBlogs as $date=>$feed) { + if($dateTags["DATE"] != date("l, F j, Y", $date)) { + $dateTags["DATE"] = date("l, F j, Y", $date); + if($dateTags["DATE"] == date("l, F j, Y")) + $dateTags["TODAY"] = $_SESSION["translate"]->it("Today"); + else + $dateTags["TODAY"] = NULL; + $content .= PHPWS_Template::processTemplate($dateTags, "phpwsrssfeeds", "multi_rss/date_blog/date.tpl"); + } + + $feedTags = array(); + foreach($feed as $title=>$feedContent) { + if($title == "id") + continue; + + $feedTags["FEED_TITLE"] = $title; + $feedTags["FEED_CONTENT"] = ""; + $itemCount = 0; + foreach($feedContent["items"] as $item) { + $itemCount++; + if($itemCount > $this->_max_multi_items) + break; + + if(isset($item["MODULE"]) && $item["MODULE"] == "calendar") { + $item["ITEM_TITLE"] = substr($item["ITEM_TITLE"], strpos($item["ITEM_TITLE"], '-')+2); + } + + $itemTags["ITEM_TITLE"] = $item["ITEM_TITLE"]; + $itemTags["ITEM_DESC"] = $item["ITEM_DESC"]; + + $feedTags["FEED_CONTENT"] .= PHPWS_Template::processTemplate($itemTags,"phpwsrssfeeds", "multi_rss/date_blog/item.tpl"); + } + + if($_SESSION['OBJ_user']->allow_access("phpwsrssfeeds", "edit")) + $feedTags["EDIT_FEED"] = PHPWS_Text::moduleLink($_SESSION["translate"]->it("Edit This Feed"), "phpwsrssfeeds", array("RSS_MAN_op"=>"edit", "PHPWS_MAN_ITEMS[]"=>$feedContent["id"])); + + $content .= PHPWS_Template::processTemplate($feedTags, "phpwsrssfeeds", "multi_rss/date_blog/feed.tpl"); + } + } + + return $content; + } + function getUnexpandedFeeds($id) { $item_count = 0; *************** *** 270,278 **** } ! $tags["UNEXPANDED_FEEDS"] = $this->getUnexpandedFeeds($omit_item); ! ! if(empty($tags["EXPANDED_FEED"]) && empty($tags["UNEXPANDED_FEEDS"])) { ! $tags["FEED_ITEMS"] = $_SESSION["translate"]->it("Feed currently unavailable"); ! } --- 359,373 ---- } ! if($this->_orgn_by_date) ! $tags["DATE_BLOGS"] = $this->showBlog($id); ! else ! $tags["UNEXPANDED_FEEDS"] = $this->getUnexpandedFeeds($omit_item); ! ! if(empty($tags["EXPANDED_FEED"]) && empty($tags["UNEXPANDED_FEEDS"]) && ! empty($tags["DATE_BLOGS"])) { ! if($this->_orgn_by_date) ! $tags["FEED_ITEMS"] = $_SESSION["translate"]->it("No items to show for the upcoming week."); ! else ! $tags["FEED_ITEMS"] = $_SESSION["translate"]->it("No feeds available to display"); } *************** *** 527,530 **** --- 622,629 ---- $form->setTab("SHOW_CAT_LINK", $tab++); + $form->add("ORGN_BY_DATE", "checkbox"); + $form->setMatch("ORGN_BY_DATE", $this->_orgn_by_date); + $form->setTab("ORGN_BY_DATE", $tab++); + $form->add("SUBMIT_BUTTON", "submit", $this->getId() ? $_SESSION["translate"]->it("Update") : $_SESSION["translate"]->it("Save")); *************** *** 533,541 **** "onClick=\"selectAll(this.form.elements['SHOW_MULTIVIEW_SEL[]'])\""); - $form->add("module", "hidden", "phpwsrssfeeds"); $form->add("PHPWS_MAN_ITEMS[]", "hidden", $this->getId()); $form->add("RSS_MULTI_MAN_op", "hidden", "save"); $tags = $form->getTemplate(true, true, $tags); --- 632,646 ---- "onClick=\"selectAll(this.form.elements['SHOW_MULTIVIEW_SEL[]'])\""); $form->add("module", "hidden", "phpwsrssfeeds"); $form->add("PHPWS_MAN_ITEMS[]", "hidden", $this->getId()); $form->add("RSS_MULTI_MAN_op", "hidden", "save"); + $ahead = array($_SESSION["translate"]->it("Any")); + for($i=1; $i < 15;$i++) + $ahead[] = $i; + + $form->add("DAYS_AHEAD", "select", $ahead); + $form->setMatch("DAYS_AHEAD", $this->_days_ahead); + $tags = $form->getTemplate(true, true, $tags); *************** *** 582,585 **** --- 687,693 ---- $tags["SHOW_CAT_LINK_HELP"] = RSS_common::show_link("phpwsrssfeeds", "catLink"); $tags["SHOW_CAT_LINK_LBL"] = $_SESSION['translate']->it("Show Category Link"); + $tags["ORGN_BY_DATE_HELP"] = RSS_common::show_link("phpwsrssfeeds", "orgnByDate"); + $tags["ORGN_BY_DATE_LBL"] = $_SESSION['translate']->it("Organize Feeds By Date"); + $tags["DAYS_AHEAD_LBL"] = $_SESSION["translate"]->it("Days Ahead"); $tags['YES'] = $_SESSION["translate"]->it("Yes"); $tags['NO'] = $_SESSION["translate"]->it("No"); *************** *** 658,661 **** --- 766,780 ---- $this->_show_empty_feeds = 0; + if(isset($_POST["ORGN_BY_DATE"])) + $this->_orgn_by_date = @$_POST["ORGN_BY_DATE"]; + else + $this->_orgn_by_date = 0; + + if(isset($_POST["DAYS_AHEAD"])) { + $this->_days_ahead = @$_POST["DAYS_AHEAD"]; + } else { + $this->_days_ahead = 0; + } + if(isset($_POST["SHOW_ANCHOR_LINKS"])) $this->_show_anchor_links = @$_POST["SHOW_ANCHOR_LINKS"]; Index: RSS.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/phpwsrssfeeds/class/RSS.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** RSS.php 2 Sep 2004 17:48:57 -0000 1.36 --- RSS.php 23 Sep 2004 19:06:58 -0000 1.37 *************** *** 567,571 **** if(isset($_POST["fatcatProcess"])) { require_once(PHPWS_SOURCE_DIR.'mod/phpwsrssfeeds/class/RSS_Fatcat.php'); ! $element_link = "index.php?module=phpwsrssfeeds&RSS_MAN_op=sView&RSS_id=" . $_id; RSS_Fatcat::saveSelect($this->getLabel(), $element_link, $_id); } --- 567,571 ---- if(isset($_POST["fatcatProcess"])) { require_once(PHPWS_SOURCE_DIR.'mod/phpwsrssfeeds/class/RSS_Fatcat.php'); ! $element_link = "index.php?module=phpwsrssfeeds&RSS_MAN_op=view&PHPWS_MAN_ITEMS=" . $_id; RSS_Fatcat::saveSelect($this->getLabel(), $element_link, $_id); } *************** *** 665,765 **** */ function getContent(){ ! //Add PEAR RSS Class ! require_once ("XML/RSS.php"); ! ! //Get RSS Channel info an structure ! $rss =& new XML_RSS($this->_channel); ! $rss->parse(); ! $info = $rss->getChannelInfo(); ! $structure = $rss->getStructure(); ! //Check to see if we got anything ! if(sizeof(array_merge($info, $structure)) == '0') ! return FALSE; ! //Now we'll parse the new input for problems ! $info = $this->clean($info); ! $feed = array(); ! foreach($structure as $key => $value){ ! if($key == $this->_max_items) ! break; ! $item = $this->clean($value); ! if(!empty($item)) ! $feed[$key] = $item; ! } ! //Check for errors and pass on ! $rss_feed = array_merge($info, $feed); ! if(sizeof($rss_feed) == '0') ! return FALSE; ! return $rss_feed; }//end function_getContent ! function buildView() { ! $tags = array(); ! $tags["RSS_VIEW"] = PHPWS_Text::moduleLink($_SESSION["translate"]->it("More Feeds"), "phpwsrssfeeds", array("RSS_MAN_op"=>"list")); ! if($this->_show_title) ! $tags["TITLE"] = PHPWS_Text::parseOutput($this->getLabel()); ! if($this->_show_title && $this->_show_url){ ! $tags["TITLE_LINK"] = RSS_common::get_htmlentities($this->_content['link']); ! $tags["TITLE_TARGET"] = $this->_target; ! $tags["END_ANCHOR"] = ''; ! } ! ! if($this->_show_image && $this->_content[0]['type'] == 'image'){ ! $num = NULL; ! //add support for RSS 1.0 Dublin Core ! //add support for RSS 2.0 Garbage ! if(isset($this->_content[0]['url'])) /* this is a 2.0 feed */ ! $num = 0; ! elseif(isset($this->_content[1]['url'])) ! $num = 1; ! elseif(isset($this->_content[2]['url'])) ! $num = 2; ! if($num !== NULL){ ! $tags["CHANNEL_IMG_URL"] = RSS_common::get_htmlentities($this->_content[$num]['link']); ! $tags["CHANNEL_IMG_TARGET"] = $this->_target; ! $tags["CHANNEL_IMAGE"] = RSS_common::get_htmlentities($this->_content[$num]['url']); ! $tags["CHANNEL_IMG_ALT"] = $this->_content[$num]['title']; ! } ! } ! if($this->_show_desc) ! $tags["CHANNEL_DESC"] = $this->_content['description']; ! ! if($this->_footer) ! $tags["CHANNEL_FOOTER"] = PHPWS_Text::parseOutput($this->_footer); ! $item_count = 0; ! $items = ''; ! $block_items = ''; ! $multi_items = ''; ! foreach ($this->_content as $item) { ! if($item_count == $this->_max_items) ! break; ! if ($item['type'] == 'item'){ ! $elements['ITEM_LINK'] = RSS_common::get_htmlentities(@$item['link']); ! $elements['ITEM_TITLE'] = @$item['title']; ! if(isset($item['description'])) ! $elements['ITEM_DESC'] = $item['description']; ! //Stubbed this out for future inclusion in PEAR::XML_RSS ! elseif(isset($item['content:encoded'])) ! $elements['ITEM_DESC'] = $item['content:encoded']; ! $elements["TARGET"] = $this->_target; ! $multi_items[$item_count] = PHPWS_Template::processTemplate($elements, "phpwsrssfeeds", "multi_rss/unexpanded_feed_item.tpl"); ! $block_items .= PHPWS_Template::processTemplate($elements, "phpwsrssfeeds", "block_item.tpl"); ! $items .= PHPWS_Template::processTemplate($elements, "phpwsrssfeeds", "item.tpl"); ! $item_count++; ! } ! } ! ! if(!empty($items)) ! $tags["CONTENT"] = $items; ! else ! $tags["CONTENT"] = "<i>".$_SESSION["translate"]->it("Feed Contains No Content") . "</i>"; ! $tags["BLOCK_CONTENT"] = $block_items; ! ! $tags["MULTI_CONTENT"] = $multi_items; ! ! return $tags; ! } //END function buildView() /** * Cleans feed array for input into database --- 665,789 ---- */ function getContent(){ ! //Add PEAR RSS Class ! require_once ("XML/RSS.php"); ! ! //Get RSS Channel info an structure ! $rss =& new XML_RSS($this->_channel); ! $rss->parse(); ! $info = $rss->getChannelInfo(); ! $structure = $rss->getStructure(); ! //Check to see if we got anything ! if(sizeof(array_merge($info, $structure)) == '0') ! return FALSE; ! //Now we'll parse the new input for problems ! $info = $this->clean($info); ! $feed = array(); ! ! foreach($structure as $key => $value){ ! if($key == $this->_max_items) ! break; ! $item = $this->clean($value); ! if(!empty($item)) ! $feed[$key] = $item; ! } ! //Check for errors and pass on ! $rss_feed = array_merge($info, $feed); ! if(sizeof($rss_feed) == '0') ! return FALSE; ! ! return $rss_feed; }//end function_getContent ! function buildView() { ! $tags = array(); ! $tags["RSS_VIEW"] = PHPWS_Text::moduleLink($_SESSION["translate"]->it("More Feeds"), "phpwsrssfeeds", array("RSS_MAN_op"=>"list")); ! if($this->_show_title) ! $tags["TITLE"] = PHPWS_Text::parseOutput($this->getLabel()); ! if($this->_show_title && $this->_show_url){ ! $tags["TITLE_LINK"] = RSS_common::get_htmlentities($this->_content['link']); ! $tags["TITLE_TARGET"] = $this->_target; ! $tags["END_ANCHOR"] = ''; ! } ! ! if($this->_show_image && $this->_content[0]['type'] == 'image'){ ! $num = NULL; ! //add support for RSS 1.0 Dublin Core ! //add support for RSS 2.0 Garbage ! if(isset($this->_content[0]['url'])) /* this is a 2.0 feed */ ! $num = 0; ! elseif(isset($this->_content[1]['url'])) ! $num = 1; ! elseif(isset($this->_content[2]['url'])) ! $num = 2; ! if($num !== NULL){ ! $tags["CHANNEL_IMG_URL"] = RSS_common::get_htmlentities($this->_content[$num]['link']); ! $tags["CHANNEL_IMG_TARGET"] = $this->_target; ! $tags["CHANNEL_IMAGE"] = RSS_common::get_htmlentities($this->_content[$num]['url']); ! $tags["CHANNEL_IMG_ALT"] = $this->_content[$num]['title']; ! } ! } ! ! if($this->_show_desc) ! $tags["CHANNEL_DESC"] = $this->_content['description']; ! if($this->_footer) ! $tags["CHANNEL_FOOTER"] = PHPWS_Text::parseOutput($this->_footer); ! $item_count = 0; ! $items = ''; ! $block_items = ''; ! $multi_items = ''; ! $blog_items = array(); ! ! foreach ($this->_content as $item) { ! if($item_count == 0 && isset($item["link"])) { ! if(stristr($item["link"], "module=calendar")) { ! $elements["MODULE"] = "calendar"; ! } ! } ! ! if($item_count == $this->_max_items) ! break; + if ($item['type'] == 'item'){ + $elements['ITEM_LINK'] = RSS_common::get_htmlentities(@$item['link']); + $elements['ITEM_TITLE'] = @$item['title']; + + if(isset($item['description'])) + $elements['ITEM_DESC'] = $item['description']; + + //Stubbed this out for future inclusion in PEAR::XML_RSS + elseif(isset($item['content:encoded'])) + $elements['ITEM_DESC'] = $item['content:encoded']; + + $elements["TARGET"] = $this->_target; + $multi_items[$item_count] = PHPWS_Template::processTemplate($elements, "phpwsrssfeeds", "multi_rss/unexpanded_feed_item.tpl"); + $block_items .= PHPWS_Template::processTemplate($elements, "phpwsrssfeeds", "block_item.tpl"); + $items .= PHPWS_Template::processTemplate($elements, "phpwsrssfeeds", "item.tpl"); + + if(isset($item['dc:date'])) { + $date = explode('-', $item['dc:date']); + $timeTS = mktime(12,12,12, $date[1], $date[2], $date[0]); + $blog_items[$timeTS][] = $elements; + } + + $item_count++; + } + } + + if(!empty($items)) + $tags["CONTENT"] = $items; + else + $tags["CONTENT"] = "<i>".$_SESSION["translate"]->it("Feed Contains No Content") . "</i>"; + $tags["BLOCK_CONTENT"] = $block_items; + if(!empty($blog_items)) + $tags["BLOG_DATES"] = $blog_items; + else + $tags["BLOG_DATES"] = NULL; + + $tags["MULTI_CONTENT"] = $multi_items; + return $tags; + } //END function buildView() + /** * Cleans feed array for input into database *************** *** 948,952 **** */ function update($ids) { ! if(isset($ids)) { ignore_user_abort(1); set_time_limit(15); --- 972,976 ---- */ function update($ids) { ! if(isset($ids)) { ignore_user_abort(1); set_time_limit(15); *************** *** 979,985 **** $this->_content = $feed; $this->channel_desc = $this->_content['description']; $this->_content = $this->buildView(); // save the feed ! $this->commit(); } } --- 1003,1010 ---- $this->_content = $feed; $this->channel_desc = $this->_content['description']; + $this->_content = $this->buildView(); // save the feed ! $this->commit(); } } |
