Merge branch 'cleanup' of https://github.com/pascalchevrel/moonmoon into pascalchevrel-cleanup

Conflicts:
	admin/default.css
	app/classes/Planet.class.php

3 files changed, 269 insertions, 280 deletions

diff --git a/app/classes/Planet.class.php b/app/classes/Planet.class.php
index 4344abc..5444bf6 100644
--- a/app/classes/Planet.class.php
+++ b/app/classes/Planet.class.php
@@ -1,155 +1,144 @@
-<?php

-/*

-Copyright (c) 2006, Maurice Svay

-All rights reserved.

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions are

-met:

-

-* Redistributions of source code must retain the above copyright notice,

-this list of conditions and the following disclaimer.

-* Redistributions in binary form must reproduce the above copyright

-notice, this list of conditions and the following disclaimer in the

-documentation and/or other materials provided with the distribution.

-* Neither the name of Maurice Svay nor the names of its

-contributors may be used to endorse or promote products derived from

-this software without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A

-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER

-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-*/

-

-/**

- * Planet, main app class

- */

-class Planet

-{

-    public $config;

-    public $items;

-    public $people;

-    public $errors;

-

-    public function __construct($config=null)

-    {

-

-        if ($config == null) {

-            $this->config = new PlanetConfig(array());

-        } else {

-            $this->config = $config;

-        }

-

-        $this->items  = array();

-        $this->people = array();

-        $this->errors = array();

-    }

-

-    /**

-     * Getters

-     */

-    public function getItems()

-    {

-        return $this->items;

-    }

-

-    public function getPeople()

-    {

-        return $this->people;

-    }

-

-    /**

-     * Adds a feed to the planet

-     * @param PlanetFeed feed

-     */

-    public function addPerson(&$feed)

-    {

-        $this->people[] = $feed;

-    }

-

-    /**

-     * Load people from an OPML

-     * @return integer Number of people loaded

-     */

-    public function loadOpml($file)

-    {

-        if (!is_file($file)) {

-            $this->errors[] = new PlanetError(3, $file.' is missing.');

-            return 0;

-        }

-

-        $opml = OpmlManager::load($file);

-        $opml_people = $opml->getPeople();

-        foreach ($opml_people as $opml_person){

-            $this->addPerson(

-                new PlanetFeed(

-                    $opml_person['name'],

-                    $opml_person['feed'],

-                    $opml_person['website']

-                )

-            );

-        }

-        return count($opml_people);

-    }

-

-    /**

-     * Load feeds

-     */

-    public function loadFeeds()

-    {

-        foreach ($this->people as $person) {

-            $person->set_timeout(-1);

-            $person->init();

-            $this->items = array_merge($this->items, $person->get_items());

-        }

-

-        $this->sort();

-    }

-

-    /**

-     * Download

-     * @var $max_load percentage of feeds to load

-     */

-    public function download($max_load=0.1)

-    {

-

-        $max_load_feeds = ceil(count($this->people) * $max_load);

-

-        foreach ($this->people as $person) {

-            //Avoid mass loading with variable cache duration

-            //$person->set_cache_duration($this->config->getCacheTimeout()+rand(0,30));

-            $person->set_cache_duration($this->config->getCacheTimeout());

-

-            //Load only a few feeds, force other to fetch from the cache

-            if (0 > $max_load_feeds--) {

-                $person->set_timeout(-1);

-                $this->errors[] = new PlanetError(1, 'Forced from cache : '.$person->getFeed());

-            }

-

-            //Load feed

-            $person->init();

-

-            // http://simplepie.org/wiki/reference/simplepie/merge_items ?

-            //Add items to index

-            if (($person->data) && ($person->get_item_quantity() > 0)){

-                $items = $person->get_items();

-                $this->items = array_merge($this->items, $items);

-            } else {

-                $this->errors[] = new PlanetError(1, 'No items : '.$person->getFeed());

-            }

-        }

-    }

-

-    public function sort()

-    {

-        usort($this->items, array('PlanetItem','compare'));

-    }

-}

+<?php
+/*
+Copyright (c) 2006, Maurice Svay
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+* Neither the name of Maurice Svay nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * Planet, main app class
+ */
+class Planet{
+    var $config;
+    var $items;
+    var $people;
+
+    var $errors;
+
+    function Planet($config=null) {
+        if ($config == null){
+            $this->config = new PlanetConfig(array());
+        }
+        else{
+            $this->config = $config;
+        }
+        $this->items = array();
+        $this->people = array();
+        $this->errors = array();
+    }
+
+    /**
+     * Getters
+     */
+    function getItems() {
+        return $this->items;
+    }
+    function getPeople() {
+        return $this->people;
+    }
+
+    /**
+     * Adds a feed to the planet
+     * @param PlanetFeed feed
+     */
+    function addPerson(&$feed) {
+        $this->people[] = $feed;
+    }
+
+    /**
+     * Load people from an OPML
+     * @return integer Number of people loaded
+     */
+    function loadOpml($file) {
+        if (!is_file($file)){
+            $this->errors[] = new PlanetError(3, $file.' is missing.');
+            return 0;
+        }
+        $opml = OpmlManager::load($file);
+        $opml_people = $opml->getPeople();
+        foreach ($opml_people as $opml_person){
+            $this->addPerson(
+                new PlanetFeed(
+                    $opml_person['name'],
+                    $opml_person['feed'],
+                    $opml_person['website']
+                )
+            );
+        }
+        return count($opml_people);
+    }
+
+    /**
+     * Load feeds
+     */
+    function loadFeeds() {
+        foreach ($this->people as $person) {
+            $person->set_timeout(-1);
+            $person->init();
+            $this->items = array_merge($this->items, $person->get_items());
+        }
+        $this->sort();
+    }
+
+    /**
+     * Download
+     * @var $max_load percentage of feeds to load
+     */
+    function download($max_load=0.1){
+
+        $max_load_feeds = ceil(count($this->people) * $max_load);
+
+        foreach ($this->people as $person) {
+            //Avoid mass loading with variable cache duration
+            //$person->set_cache_duration($this->config->getCacheTimeout()+rand(0,30));
+            $person->set_cache_duration($this->config->getCacheTimeout());
+
+            //Load only a few feeds, force other to fetch from the cache
+            if (0 > $max_load_feeds--) {
+                $person->set_timeout(-1);
+                $this->errors[] = new PlanetError(1, 'Forced from cache : '.$person->getFeed());
+            }
+
+            //Load feed
+            $person->init();
+
+            // http://simplepie.org/wiki/reference/simplepie/merge_items ?
+            //Add items to index
+            if (($person->data) && ($person->get_item_quantity() > 0)){
+                $items = $person->get_items();
+                $this->items = array_merge($this->items, $items);
+            } else {
+                $this->errors[] = new PlanetError(1, 'No items : '.$person->getFeed());
+            }
+        }
+    }
+
+    function sort() {
+        usort($this->items, array('PlanetItem','compare'));
+    }
+}
+?>
\ No newline at end of file
diff --git a/app/lib/Cache.php b/app/lib/Cache.php
index 9425de3..c028110 100644
--- a/app/lib/Cache.php
+++ b/app/lib/Cache.php
@@ -1,20 +1,20 @@
 <?php
-/**

-* This library is free software; you can redistribute it and/or modify

-* it under the terms of the GNU General Public License as published by

-* the Free Software Foundation; either version 2 of the License, or

-* (at your option) any later version.

-*

-* This library is distributed in the hope that it will be useful,

-* but WITHOUT ANY WARRANTY; without even the implied warranty of

-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-* GNU General Public License for more details.

-*

-* You should have received a copy of the GNU General Public License

-* along with this software; if not, write to the Free Software

-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

-* 

-* © Copyright 2005 Richard Heyes

+/**
+* This library is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this software; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+* 
+* © Copyright 2005 Richard Heyes
 */
 
 /**
diff --git a/app/lib/lib.opml.php b/app/lib/lib.opml.php
index 21890d2..7767979 100644
--- a/app/lib/lib.opml.php
+++ b/app/lib/lib.opml.php
@@ -1,109 +1,109 @@
-<?php

-class opml

-{

-    var $_xml = null;

-    var $_currentTag = '';

-

-    var $title = '';

-    var $entries = array();

-    var $map  =

-        array(

-            'URL'         => 'website',

-            'HTMLURL'     => 'website',

-            'TEXT'        => 'name',

-            'TITLE'       => 'name',

-            'XMLURL'      => 'feed',

-            'DESCRIPTION' => 'description'

-            );

-

-

-    function parse($data)

-    {

-        $this->_xml = xml_parser_create('UTF-8');

-        //xml_parser_set_option($this->_xml, XML_OPTION_CASE_FOLDING, false);

-        //xml_parser_set_option($this->_xml, XML_OPTION_SKIP_WHITE, true);

-        xml_set_object($this->_xml, $this);

-        xml_set_element_handler($this->_xml,'_openTag','_closeTag');

-        xml_set_character_data_handler ($this->_xml, '_cData');

-

-        xml_parse($this->_xml,$data);

-        xml_parser_free($this->_xml);

-        return $this->entries;

-    }

-

-

-    function _openTag($p,$tag,$attrs)

-    {

-        $this->_currentTag = $tag;

-

-        if ($tag == 'OUTLINE')

-        {

-            $i = count($this->entries);

-            foreach (array_keys($this->map) as $key)

-            {

-                if (isset($attrs[$key])) {

-                    $this->entries[$i][$this->map[$key]] = $attrs[$key];

-                }

-            }

-        }

-    }

-

-    function _closeTag($p, $tag){

-        $this->_currentTag = '';

-    }

-

-    function _cData($p, $cdata){

-        if ($this->_currentTag == 'TITLE'){

-            $this->title = $cdata;

-        }

-    }

-

-    function getTitle(){

-        return $this->title;

-    }

-

-    function getPeople(){

-        return $this->entries;

-    }

-}

-

-class OpmlManager

-{

-    public function load($file) {

-        if (@file_exists($file)) {

-            $opml = new opml();

-

-            //Remove BOM if needed

-            $BOM = '/^/';

-            $fileContent = file_get_contents($file);

-            $fileContent = preg_replace($BOM, '', $fileContent, 1);

-

-            //Parse

-            $opml->parse($fileContent);

-

-            return $opml;

-        }

-    }

-

-    public function save($opml, $file){

-        $out = '<?xml version="1.0"?>'."\n";

-        $out.= '<opml version="1.1">'."\n";

-        $out.= '<head>'."\n";

-        $out.= '<title>'.htmlspecialchars($opml->getTitle()).'</title>'."\n";

-        $out.= '<dateCreated>'.date('c').'</dateCreated>'."\n";

-        $out.= '<dateModified>'.date('c').'</dateModified>'."\n";

-        $out.= '</head>'."\n";

-        $out.= '<body>'."\n";

-        foreach ($opml->entries as $person){

-            $out.= '<outline text="' . htmlspecialchars($person['name']) . '" htmlUrl="' . htmlspecialchars($person['website']) . '" xmlUrl="' . htmlspecialchars($person['feed']) . '"/>'."\n";

-        }

-        $out.= '</body>'."\n";

-        $out.= '</opml>';

-

-        file_put_contents($file, $out);

-    }

-

-    public function backup($file){

-        copy($file, $file.'.bak');

-    }

-}

+<?php
+class opml
+{
+    var $_xml = null;
+    var $_currentTag = '';
+
+    var $title = '';
+    var $entries = array();
+    var $map  =
+        array(
+            'URL'         => 'website',
+            'HTMLURL'     => 'website',
+            'TEXT'        => 'name',
+            'TITLE'       => 'name',
+            'XMLURL'      => 'feed',
+            'DESCRIPTION' => 'description'
+            );
+
+
+    function parse($data)
+    {
+        $this->_xml = xml_parser_create('UTF-8');
+        //xml_parser_set_option($this->_xml, XML_OPTION_CASE_FOLDING, false);
+        //xml_parser_set_option($this->_xml, XML_OPTION_SKIP_WHITE, true);
+        xml_set_object($this->_xml, $this);
+        xml_set_element_handler($this->_xml,'_openTag','_closeTag');
+        xml_set_character_data_handler ($this->_xml, '_cData');
+
+        xml_parse($this->_xml,$data);
+        xml_parser_free($this->_xml);
+        return $this->entries;
+    }
+
+
+    function _openTag($p,$tag,$attrs)
+    {
+        $this->_currentTag = $tag;
+
+        if ($tag == 'OUTLINE')
+        {
+            $i = count($this->entries);
+            foreach (array_keys($this->map) as $key)
+            {
+                if (isset($attrs[$key])) {
+                    $this->entries[$i][$this->map[$key]] = $attrs[$key];
+                }
+            }
+        }
+    }
+
+    function _closeTag($p, $tag){
+        $this->_currentTag = '';
+    }
+
+    function _cData($p, $cdata){
+        if ($this->_currentTag == 'TITLE'){
+            $this->title = $cdata;
+        }
+    }
+
+    function getTitle(){
+        return $this->title;
+    }
+
+    function getPeople(){
+        return $this->entries;
+    }
+}
+
+class OpmlManager
+{
+    public function load($file) {
+        if (@file_exists($file)) {
+            $opml = new opml();
+
+            //Remove BOM if needed
+            $BOM = '/^/';
+            $fileContent = file_get_contents($file);
+            $fileContent = preg_replace($BOM, '', $fileContent, 1);
+
+            //Parse
+            $opml->parse($fileContent);
+
+            return $opml;
+        }
+    }
+
+    public function save($opml, $file){
+        $out = '<?xml version="1.0"?>'."\n";
+        $out.= '<opml version="1.1">'."\n";
+        $out.= '<head>'."\n";
+        $out.= '<title>'.htmlspecialchars($opml->getTitle()).'</title>'."\n";
+        $out.= '<dateCreated>'.date('c').'</dateCreated>'."\n";
+        $out.= '<dateModified>'.date('c').'</dateModified>'."\n";
+        $out.= '</head>'."\n";
+        $out.= '<body>'."\n";
+        foreach ($opml->entries as $person){
+            $out.= '<outline text="' . htmlspecialchars($person['name']) . '" htmlUrl="' . htmlspecialchars($person['website']) . '" xmlUrl="' . htmlspecialchars($person['feed']) . '"/>'."\n";
+        }
+        $out.= '</body>'."\n";
+        $out.= '</opml>';
+
+        file_put_contents($file, $out);
+    }
+
+    public function backup($file){
+        copy($file, $file.'.bak');
+    }
+}