Changeset 2324

Timestamp:

12/21/10 16:14:40 (17 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Removing Feeds::adminNews() -- too much function for nothing. Replaced with jquery.
todo: Style the output properly.

Location:

branches/1.5

Files:

• content/admin_themes/admin_default/admin_header.php (modified) (1 diff)
• content/admin_themes/admin_default/admin_home.php (modified) (1 diff)
• content/admin_themes/admin_default/css/zrssfeed.css (added)
• content/admin_themes/admin_default/javascript/jquery.zrssfeed.min.js (added)
• content/themes/default/settings.php (modified) (1 diff)
• libs/Feeds.php (modified) (2 diffs)

branches/1.5/content/admin_themes/admin_default/admin_header.php

@@ -41 +41 @@
                 <link rel="stylesheet" href="<?php echo ADMIN_THEME_URL ?>css/style.css" type="text/css">
                 <!-- <link rel="shortcut icon" href="<?php echo SITEURL; ?>favicon.ico"> -->
+                <?php if($h->pageName == 'admin_home') { ?>
+                <link rel="stylesheet" href="<?php echo ADMIN_THEME_URL ?>css/zrssfeed.css" type="text/css" />
+                <script type="text/javascript" src="<?php echo ADMIN_THEME_URL?>javascript/jquery.zrssfeed.min.js"></script>
+                <script type="text/javascript">
+                        $(document).ready(function () {
+                                $("#admin_news").rssfeed('http://feeds2.feedburner.com/hotarucms', {
+                                        showerror: false,
+                                        header: false,
+                                        limit: 5
+                                });
+                        });
+                </script>
+                <?php } ?>
                 <?php $h->pluginHook('admin_header_include_raw'); ?>
         </head>

branches/1.5/content/admin_themes/admin_default/admin_home.php

@@ -36 +36 @@
                         <h3><?php echo $h->lang["admin_theme_main_help"]; ?></h3>
                         <!-- Feed items, number to show content for, max characters for content -->
-                        <?php 
-                                $feeds = new Feeds();
-                                $feeds->adminNews($h->lang, 10, 3, 300); //lang, max_items, items_with_content, max_chars
-                        ?>
+                        <div id="admin_news"></div>
                         <br/>
                         <h2><?php echo $h->lang["admin_theme_main_join_us"]; ?></h2>

branches/1.5/content/themes/default/settings.php

@@ -33 +33 @@
 ?>
 <form name="theme_settings_form" action="<?php echo BASEURL; ?>admin_index.php?page=theme_settings&amp;theme=<?php echo $theme_name; ?>" method="post">
-        <label>Tagline: <input type="text" size="70" name="tagline" value="<?php echo htmlentities($theme_settings['tagline'], ENT_QUOTES, 'UTF-8'); ?>"></label>
+        <label>Tagline: <input type="text" size="70" name="tagline" value="<?php echo htmlspecialchars($theme_settings['tagline'], ENT_QUOTES, 'UTF-8',FALSE); ?>"></label>
         <input type="submit" value="<?php echo $h->lang['main_form_save']; ?>" />
         <input type="hidden" name="submitted" value="true" /><input type="hidden" name="csrf" value="<?php echo $h->csrfToken; ?>" />

branches/1.5/libs/Feeds.php

@@ -25 +25 @@
  * @link      http://www.hotarucms.org/
  */
-class Feeds {
+class Feeds
+{
 
-         /**
+        /**
          * Create an RSS Feed
          *
@@ -36 +37 @@
          * @param string $content_type e.g. 'application/xml' or 'text/plain'
          */
-        public function rss($h, $title = '', $link = '', $description = '', $items = array(), $content_type = 'application/xml') {
-                require_once(LIBS.'RSS.php');
-                
-                $feed = new RSS($h->url(array('page'=>'rss')));
+        public function rss($h, $title = '', $link = '', $description = '', $items = array(), $content_type = 'application/xml')
+        {
+                $feed = new RSS($h->url(array('page' => 'rss')));
                 $feed->title = htmlspecialchars_decode($title, ENT_QUOTES);
                 $feed->link = htmlspecialchars_decode($link, ENT_QUOTES);
                 $feed->description = $description;
-                
+
                 if ($items) {
                         $feed->addItem($items);
                 }
 
-                $r = $feed->out($content_type);
-                echo $r;
+                echo $feed->out($content_type);
         }
-
-                                
-        /**
-         * Includes the SimplePie RSS file and sets the cache
-         *
-         * @param string $feed
-         * @param bool $cache
-         * @param int $cache_duration
-         *
-         * @return object|false $sp
-         */
-        public function newSimplePie($feed='', $cache=RSS_CACHE, $cache_duration=RSS_CACHE_DURATION) {
-                if ($feed != '') {
-                        $sp = new SimplePie();
-                        $sp->set_feed_url($feed);
-                        $sp->set_cache_location(CACHE."rss_cache/");
-                        $sp->set_cache_duration($cache_duration);
-                        $sp->enable_cache(($cache === 'true'));
-                        $sp->handle_content_type();
-                        return $sp;
-                }
-                return FALSE;
-        }
-        
-         /**
-         * Display Hotaru forums feed on Admin front page
-         *
-         * @param int $max_items
-         * @param int $items_with_content
-         * @param int $max_chars
-         */
-        public function adminNews($lang, $max_items = 10, $items_with_content = 3, $max_chars = 300) {
-                $feedurl = 'http://feeds2.feedburner.com/hotarucms';
-                $feed = $this->newSimplePie($feedurl);
-                $feed->init();
-                
-                $output = "";
-                $item_count = 0;
-                
-                if ($feed->data) { 
-                        foreach ($feed->get_items() as $item) {
-                                $output .= "<div class='admin_news'>";
-                                
-                                // Title
-                                $output .= "<a href='".$item->get_permalink()."'>".sanitize($item->get_title(), 'tags')."</a><br />";
-                                
-                                if ($item_count < $items_with_content) {
-                                        // Posted by
-                                        $output .= "<small>".$lang["admin_news_posted_by"]." ";
-                                        
-                                        foreach ($item->get_authors() as $author) {
-                                            $output .= $author->get_name(); 
-                                        }
-                                        
-                                        // Date
-                                        $output .= " ".$lang["admin_news_on"]." ".$item->get_date('j F Y')."</small><br />";
-                                        
-                                        // Content
-                                        $output .= truncate(sanitize($item->get_content(), 'tags'), $max_chars, TRUE);
-                                        
-                                        // Read more
-                                        $output .= "<small><a href='".$item->get_permalink()."' title='".sanitize($item->get_title(), 'tags')."'>[".$lang["admin_news_read_more"]."]</a></small>";
-                                }
-                                
-                                $output .= "</div>";
-                                if ($item_count < $items_with_content) {
-                                        $output .="<br />";
-                                }
-                                
-                                if ($item_count == ($items_with_content - 1)) {
-                                        $output .= "<h3>".$lang["admin_news_more_threads"]."</h3>";
-                                }
-
-                                $item_count++;
-                                if ($item_count >= $max_items) {
-                                        break;
-                        }
-                }
-                }
-                
-                echo $output;
-        }
-
 }