', $data);
+ $data = preg_replace('/<\/h[1-3]>/i', '', $data);
+ }
+
+ if ($is_url)
+ {
+ $data = $this->replace_urls($data, true);
+ }
+ else
+ {
+ $data = preg_replace_callback('/<(\S+)((\s*((\w+:)?\w+)\s*=\s*("([^"]*)"|\'([^\']*)\'|(.*)))*)\s*(\/>|>(.*)<\/\S+>)/msiU', array(&$this, 'replace_urls'), $data);
+ }
+
+ // If Bypass Image Hotlink is enabled, rewrite all the image tags.
+ if ($this->bypass_image_hotlink)
+ {
+ $images = SimplePie_Misc::get_element('img', $data);
+ foreach ($images as $img)
+ {
+ if (!empty($img['attribs']['SRC']['data']))
+ {
+ $pre = '';
+ if ($this->bypass_image_hotlink_page)
+ {
+ $pre = $this->bypass_image_hotlink_page;
+ }
+ $pre .= "?$this->bypass_image_hotlink=";
+ $img['attribs']['SRC']['data'] = $pre . rawurlencode(strtr($img['attribs']['SRC']['data'], array_flip(get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES))));
+ $data = str_replace($img['full'], SimplePie_Misc::element_implode($img), $data);
+ }
+ }
+ }
+
+ // Strip out HTML tags and attributes that might cause various security problems.
+ // Based on recommendations by Mark Pilgrim at:
+ // http://diveintomark.org/archives/2003/06/12/how_to_consume_rss_safely
+ if ($this->strip_htmltags)
+ {
+ foreach ($this->strip_htmltags as $tag)
+ {
+ $data = preg_replace_callback("/<($tag)((\s*((\w+:)?\w+)(\s*=\s*(\"([^\"]*)\"|'([^']*)'|(.*)))?)*)\s*(\/>|>(.*)<\/($tag)((\s*((\w+:)?\w+)(\s*=\s*(\"([^\"]*)\"|'([^']*)'|(.*)))?)*)\s*>)/msiU", array(&$this, 'do_strip_htmltags'), $data);
+ }
+ }
+
+ if ($this->strip_attributes)
+ {
+ foreach ($this->strip_attributes as $attrib)
+ {
+ $data = preg_replace('/ '. trim($attrib) .'=("|")(\w|\s|=|-|:|;|\/|\.|\?|&|,|#|!|\(|\)|\'|'|<|>|\+|{|})*("|")/i', '', $data);
+ $data = preg_replace('/ '. trim($attrib) .'=(\'|')(\w|\s|=|-|:|;|\/|\.|\?|&|,|#|!|\(|\)|"|"|<|>|\+|{|})*(\'|')/i', '', $data);
+ $data = preg_replace('/ '. trim($attrib) .'=(\w|\s|=|-|:|;|\/|\.|\?|&|,|#|!|\(|\)|\+|{|})*/i', '', $data);
+ }
+ }
+
+ // Convert encoding
+ $data = SimplePie_Misc::change_encoding($data, $this->input_encoding, $this->output_encoding);
+
+ return $data;
+ }
+
+ function do_strip_htmltags($match)
+ {
+ if ($this->encode_instead_of_strip)
+ {
+ if (isset($match[12]) && !in_array(strtolower($match[1]), array('script', 'style')))
+ {
+ return "<$match[1]$match[2]>$match[12]</$match[1]>";
+ }
+ else if (isset($match[12]))
+ {
+ return "<$match[1]$match[2]></$match[1]>";
+ }
+ else
+ {
+ return "<$match[1]$match[2]/>";
+ }
+ }
+ else
+ {
+ if (isset($match[12]) && !in_array(strtolower($match[1]), array('script', 'style')))
+ {
+ return $match[12];
+ }
+ else
+ {
+ return '';
+ }
+ }
+ }
+
+ function replace_urls($data, $raw_url = false)
+ {
+ if (!empty($this->attribs['XML:BASE']))
+ {
+ $xmlbase = $attribs['XML:BASE'];
+ }
+ else if (!empty($this->attribs['HTTP://WWW.W3.ORG/XML/1998/NAMESPACE:BASE']))
+ {
+ $xmlbase = $this->attribs['HTTP://WWW.W3.ORG/XML/1998/NAMESPACE:BASE'];
+ }
+ if (!empty($xmlbase))
+ {
+ if (!empty($this->item_xmlbase))
+ {
+ $xmlbase = SimplePie_Misc::absolutize_url($xmlbase, $this->item_xmlbase);
+ }
+ else
+ {
+ $xmlbase = SimplePie_Misc::absolutize_url($xmlbase, $this->feed_xmlbase);
+ }
+ }
+ else if (!empty($this->item_xmlbase))
+ {
+ $xmlbase = $this->item_xmlbase;
+ }
+ else
+ {
+ $xmlbase = $this->feed_xmlbase;
+ }
+
+ if ($raw_url)
+ {
+ return SimplePie_Misc::absolutize_url($data, $xmlbase);
+ }
+ else
+ {
+ $attributes = array(
+ 'background',
+ 'href',
+ 'src',
+ 'longdesc',
+ 'usemap',
+ 'codebase',
+ 'data',
+ 'classid',
+ 'cite',
+ 'action',
+ 'profile',
+ 'for'
+ );
+ foreach ($attributes as $attribute)
+ {
+ if (preg_match("/$attribute='(.*)'/siU", $data[0], $attrib) || preg_match("/$attribute=\"(.*)\"/siU", $data[0], $attrib) || preg_match("/$attribute=(.*)[ |\/|>]/siU", $data[0], $attrib))
+ {
+ $new_tag = str_replace($attrib[1], SimplePie_Misc::absolutize_url($attrib[1], $xmlbase), $attrib[0]);
+ $data[0] = str_replace($attrib[0], $new_tag, $data[0]);
+ }
+ }
+ return $data[0];
+ }
+ }
+
+ function entities_decode($data)
+ {
+ return preg_replace_callback('/&(#)?(x)?([0-9a-z]+);/mi', array(&$this, 'do_entites_decode'), $data);
+ }
+
+ function do_entites_decode($data)
+ {
+ if (isset($this->cached_entities[$data[0]]))
+ {
+ return $this->cached_entities[$data[0]];
+ }
+ else
+ {
+ $return = SimplePie_Misc::change_encoding(html_entity_decode($data[0], ENT_QUOTES), 'ISO-8859-1', $this->input_encoding);
+ if ($return == $data[0])
+ {
+ $return = SimplePie_Misc::change_encoding(preg_replace_callback('/&#([x]?[0-9a-f]+);/mi', array(&$this, 'replace_num_entity'), $data[0]), 'UTF-8', $this->input_encoding);
+ }
+ $this->cached_entities[$data[0]] = $return;
+ return $return;
+ }
+ }
+
+ function convert_entities($data)
+ {
+ return preg_replace_callback('/&#(x)?([0-9a-z]+);/mi', array(&$this, 'do_convert_entities'), $data);
+ }
+
+ function do_convert_entities($data)
+ {
+ if (isset($this->cache_convert_entities[$data[0]]))
+ {
+ return $this->cache_convert_entities[$data[0]];
+ }
+ else if (isset($this->cached_entities[$data[0]]))
+ {
+ $return = htmlentities($this->cached_entities[$data[0]], ENT_QUOTES, 'UTF-8');
+ }
+ else
+ {
+ $return = htmlentities(preg_replace_callback('/&#([x]?[0-9a-f]+);/mi', array(&$this, 'replace_num_entity'), $data[0]), ENT_QUOTES, 'UTF-8');
+ }
+ $this->cache_convert_entities[$data[0]] = $return;
+ return $return;
+ }
+
+ /*
+ * Escape numeric entities
+ * From a PHP Manual note (on html_entity_decode())
+ * Copyright (c) 2005 by "php dot net at c dash ovidiu dot tk",
+ * "emilianomartinezluque at yahoo dot com" and "hurricane at cyberworldz dot org".
+ *
+ * This material may be distributed only subject to the terms and conditions set forth in
+ * the Open Publication License, v1.0 or later (the latest version is presently available at
+ * http://www.opencontent.org/openpub/).
+ */
+ function replace_num_entity($ord)
+ {
+ $ord = $ord[1];
+ if (preg_match('/^x([0-9a-f]+)$/i', $ord, $match))
+ {
+ $ord = hexdec($match[1]);
+ }
+ else
+ {
+ $ord = intval($ord);
+ }
+
+ $no_bytes = 0;
+ $byte = array();
+ if ($ord < 128)
+ {
+ return chr($ord);
+ }
+ if ($ord < 2048)
+ {
+ $no_bytes = 2;
+ }
+ else if ($ord < 65536)
+ {
+ $no_bytes = 3;
+ }
+ else if ($ord < 1114112)
+ {
+ $no_bytes = 4;
+ }
+ else
+ {
+ return;
+ }
+ switch ($no_bytes)
+ {
+ case 2:
+ $prefix = array(31, 192);
+ break;
+
+ case 3:
+ $prefix = array(15, 224);
+ break;
+
+ case 4:
+ $prefix = array(7, 240);
+ break;
+ }
+
+ for ($i = 0; $i < $no_bytes; $i++)
+ {
+ $byte[$no_bytes-$i-1] = (($ord & (63 * pow(2,6*$i))) / pow(2,6*$i)) & 63 | 128;
+ }
+ $byte[0] = ($byte[0] & $prefix[0]) | $prefix[1];
+
+ $ret = '';
+ for ($i = 0; $i < $no_bytes; $i++)
+ {
+ $ret .= chr($byte[$i]);
+ }
+ return $ret;
+ }
+
+ function parse_date($date)
+ {
+ $military_timezone = array('A' => '-0100', 'B' => '-0200', 'C' => '-0300', 'D' => '-0400', 'E' => '-0500', 'F' => '-0600', 'G' => '-0700', 'H' => '-0800', 'I' => '-0900', 'K' => '-1000', 'L' => '-1100', 'M' => '-1200', 'N' => '+0100', 'O' => '+0200', 'P' => '+0300', 'Q' => '+0400', 'R' => '+0500', 'S' => '+0600', 'T' => '+0700', 'U' => '+0800', 'V' => '+0900', 'W' => '+1000', 'X' => '+1100', 'Y' => '+1200', 'Z' => '-0000');
+ $north_american_timezone = array('GMT' => '-0000', 'EST' => '-0500', 'EDT' => '-0400', 'CST' => '-0600', 'CDT' => '-0500', 'MST' => '-0700', 'MDT' => '-0600', 'PST' => '-0800', 'PDT' => '-0700');
+ if (preg_match('/([0-9]{2,4})-?([0-9]{2})-?([0-9]{2})T([0-9]{2}):?([0-9]{2})(:?([0-9]{2}(\.[0-9]*)?))?(UT|GMT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|[a-z]|(\\+|-)[0-9]{4}|(\\+|-)[0-9]{2}:[0-9]{2})?/i', $date, $matches))
+ {
+ if (!isset($matches[7]))
+ {
+ $matches[7] = '';
+ }
+ if (!isset($matches[9]))
+ {
+ $matches[9] = '';
+ }
+ $matches[7] = str_pad(round($matches[7]), 2, '0', STR_PAD_LEFT);
+ switch (strlen($matches[9]))
+ {
+ case 0:
+ $timezone = '';
+ break;
+
+ case 1:
+ $timezone = $military_timezone[strtoupper($matches[9])];
+ break;
+
+ case 2:
+ $timezone = '-0000';
+ break;
+
+ case 3:
+ $timezone = $north_american_timezone[strtoupper($matches[9])];
+ break;
+
+ case 5:
+ $timezone = $matches[9];
+ break;
+
+ case 6:
+ $timezone = substr_replace($matches[9], '', 3, 1);
+ break;
+ }
+ $date = strtotime("$matches[1]-$matches[2]-$matches[3] $matches[4]:$matches[5]:$matches[7] $timezone");
+ }
+ else if (preg_match('/([0-9]{1,2})\s*(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s*([0-9]{2}|[0-9]{4})\s*([0-9]{2}):([0-9]{2})(:([0-9]{2}(\.[0-9]*)?))?\s*(UT|GMT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|[a-z]|(\\+|-)[0-9]{4}|(\\+|-)[0-9]{2}:[0-9]{2})?/i', $date, $matches))
+ {
+ $three_month = array('Jan' => 1, 'Feb' => 2, 'Mar' => 3, 'Apr' => 4, 'May' => 5, 'Jun' => 6, 'Jul' => 7, 'Aug' => 8, 'Sep' => 9, 'Oct' => 10, 'Nov' => 11, 'Dec' => 12);
+ $month = $three_month[$matches[2]];
+ if (strlen($matches[3]) == 2)
+ {
+ $year = ($matches[3] < 70) ? "20$matches[3]" : "19$matches[3]";
+ }
+ else
+ {
+ $year = $matches[3];
+ }
+ if (!isset($matches[7]))
+ {
+ $matches[7] = '';
+ }
+ if (!isset($matches[9]))
+ {
+ $matches[9] = '';
+ }
+ $second = str_pad(round($matches[7]), 2, '0', STR_PAD_LEFT);
+ switch (strlen($matches[9]))
+ {
+ case 0:
+ $timezone = '';
+ break;
+
+ case 1:
+ $timezone = $military_timezone[strtoupper($matches[9])];
+ break;
+
+ case 2:
+ $timezone = '-0000';
+ break;
+
+ case 3:
+ $timezone = $north_american_timezone[strtoupper($matches[9])];
+ break;
+
+ case 5:
+ $timezone = $matches[9];
+ break;
+
+ case 6:
+ $timezone = substr_replace($matches[9], '', 3, 1);
+ break;
+ }
+ $date = strtotime("$year-$month-$matches[1] $matches[4]:$matches[5]:$second $timezone");
+ }
+ else
+ {
+ $date = strtotime($date);
+ }
+ if ($date !== false && $date !== -1)
+ {
+ return $date;
+ }
+ else
+ {
+ return false;
+ }
+ }
+}
+
+?>
\ No newline at end of file
diff --git a/db/gelato_db.sql b/db/gelato_db.sql
index 7024c54..77f69b4 100644
--- a/db/gelato_db.sql
+++ b/db/gelato_db.sql
@@ -51,6 +51,20 @@ CREATE TABLE `gel_comments` (
PRIMARY KEY (`id_comment`)
) ENGINE = MYISAM ;
+CREATE TABLE `gel_feeds` (
+ `id_feed` int(11) NOT NULL auto_increment,
+ `url` varchar(255) NOT NULL,
+ `title` varchar(255) NOT NULL,
+ `type` tinyint(4) NOT NULL default '1',
+ `updated_at` datetime NOT NULL,
+ `error` tinyint(1) NOT NULL default '0',
+ `credits` int(1) NOT NULL default '0',
+ `site_url` varchar(255) NOT NULL,
+ `id_user` int(10) NOT NULL,
+ PRIMARY KEY (`id_feed`)
+) ENGINE=MyISAM1 ;
+
+
-- Example data for table `gel_config`
INSERT INTO `gel_config` VALUES (10, 'Tumble title', 'tumble description', 'en', 'tumblr', 'http://localhost/gelato');
@@ -66,4 +80,5 @@ INSERT INTO `gel_options` VALUES ('url_friendly', '1');
INSERT INTO `gel_options` VALUES ('rich_text', '0');
INSERT INTO `gel_options` VALUES ('allow_comments', '0');
INSERT INTO `gel_options` VALUES ('offset_city', 'Mexico/General');
-INSERT INTO `gel_options` VALUES ('offset_time', '-6');
\ No newline at end of file
+INSERT INTO `gel_options` VALUES ('offset_time', '-6');
+INSERT INTO `gel_options` VALUES ('rss_import_frec', '5 minutes');
diff --git a/entry.php b/entry.php
index a1cc1d0..1d609ee 100644
--- a/entry.php
+++ b/entry.php
@@ -19,8 +19,8 @@
* admin/admin.php
* admin/comments.php
* admin/users.php
- * admin/form.autosave.php
* classes/imgsize.php
+ * admin/feeds.php
*/
@@ -43,6 +43,7 @@ require_once("classes/templates.class.php");
require_once("classes/pagination.class.php");
require_once("classes/user.class.php");
require_once("classes/comments.class.php");
+require_once("classes/feeds.class.php");
require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'mysql_connection.class.php');
require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'streams.class.php');
require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'gettext.class.php');
@@ -55,4 +56,8 @@ $tumble = new gelato();
session_start();
+$feeds = new feeds();
+$feeds->updateFeeds();
+unset($feeds);
+
?>
diff --git a/readme.txt b/readme.txt
index 48565c7..91ef353 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@
3) Run the gelato installation script by accessing install.php in your favorite web browser.
* If you installed gelato in the root directory, you should visit: http://example.com/install.php
* If you installed gelato in its own subdirectory called tumblelog, for example, you should visit: http://example.com/tumblelog/install.php
-4) Set CHMOD / permission ( Chmod 777 ) to the folder 'uploads'
+4) Set CHMOD / permission ( Chmod 777 ) to the folder 'uploads' and the folder 'uploads/CACHE'
That's it! gelato should now be installed.
@@ -20,7 +20,7 @@ That's it! gelato should now be installed.
Note: The test data on the script /db/gelato_db.sql use the table prefix 'gel_'
6) Place the gelato files in the desired location on your web server.
Note: The test data on the script /db/gelato_db.sql point the installation to http://localhost/gelato
-7) Set CHMOD / permission ( Chmod 777 ) to the folder 'uploads'
+7) Set CHMOD / permission ( Chmod 777 ) to the folder 'uploads' and the folder 'uploads/CACHE'
That's it! gelato should now be installed.
Demo user: admin
@@ -33,7 +33,7 @@ That's it! gelato should now be installed.
3) Replace all the old files with those from the new 0.90 EXCEPT for the file config.php
3.1) If you do replace it by error, use the backup you create during step two.
4) Execute the update.php file.
-7) Set CHMOD / permission ( Chmod 777 ) to the folder 'uploads'
+7) Set CHMOD / permission ( Chmod 777 ) to the folder 'uploads' and the folder 'uploads/CACHE'
That's it! gelato should now be updated.
diff --git a/update.php b/update.php
index ef7b3ae..ecb9e36 100644
--- a/update.php
+++ b/update.php
@@ -27,7 +27,7 @@ if (!file_exists($configFile)) {
$db = new Conexion_Mysql(DB_name, DB_Server, DB_User, DB_Password);
-$sqlStr = "INSERT INTO `".Table_prefix."options` VALUES ('allow_comments', '0');";
+/*$sqlStr = "INSERT INTO `".Table_prefix."options` VALUES ('allow_comments', '0');";
$db->ejecutarConsulta($sqlStr);
@@ -43,7 +43,34 @@ $sqlStr = "INSERT INTO `".Table_prefix."options` VALUES ('shorten_links', '0');"
$db->ejecutarConsulta($sqlStr);
+ AFTER v0.90 */
+
+$sqlStr = "INSERT INTO `".Table_prefix."options` VALUES ('rss_import_frec', '5 minutes');";
+
+$db->ejecutarConsulta($sqlStr);
+
+
+$sqlStr = "CREATE TABLE `".Table_prefix."feeds` (
+ `id_feed` int(11) NOT NULL auto_increment,
+ `url` varchar(255) NOT NULL,
+ `title` varchar(255) NOT NULL,
+ `type` tinyint(4) NOT NULL default '1',
+ `updated_at` datetime NOT NULL,
+ `error` tinyint(1) NOT NULL default '0',
+ `credits` int(1) NOT NULL default '0',
+ `site_url` varchar(255) NOT NULL,
+ `id_user` int(10) NOT NULL,
+ PRIMARY KEY (`id_feed`)
+) ENGINE=MyISAM ;";
+
+$db->ejecutarConsulta($sqlStr);
+
+if(!is_dir('upload/CACHE')){
+ mkdir('upload/CACHE');
+ chmod('upload/CACHE',777);
+}
+
echo "Finished!
";
-echo "Now you are running on the new 0.90 version!!!
";
+echo "Now you are running on the new After 0.90 version!!!
";
?>
'.__('Error updating').' '.((!empty($feed['title']))? $feed['title'] : $feed['url']).' ';
+ }else{
+ echo '