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

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

2 files changed, 125 insertions, 125 deletions

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');
+    }
+}