Explorar el Código

Removed Flickr from the rss importer, this need more research.

ravenlp hace 17 años
padre
commit
183deccc15
Se han modificado 2 ficheros con 1 adiciones y 3 borrados
  1. 0 1
      admin/feeds.php
  2. 1 2
      classes/feeds.class.php

+ 0 - 1
admin/feeds.php Ver fichero

@@ -86,7 +86,6 @@ if ($user->isAdmin()) {
86 86
 								<label for="source"><?php echo __("Import data from:")?></label>
87 87
 								<select name="source" id="source" onchange="selectFeedType('<?php echo __("Feed Url:")?>','<?php echo __(" username:")?>' )">
88 88
                                 	<option value="Rss" selected="selected">Rss/atom Feed</option>
89
-                                 	<option value="Flickr">Flickr</option>
90 89
                                     <option value="Twitter">Twitter</option>
91 90
                                     <option value="Youtube">Youtube</option>
92 91
                                     <option value="Last.fm">Last.fm</option>

+ 1 - 2
classes/feeds.class.php Ver fichero

@@ -38,8 +38,7 @@ class feeds extends Conexion_Mysql {
38 38
 			case 'VOX': 	$f['url'] = 'http://{{username}}.vox.com/library/posts/atom.xml'; $f['type'] = 1; break;
39 39
 			case 'Digg': 	$f['url'] = 'http://digg.com/rss/{{username}}/index2.xml'; $f['type'] = 1; break;
40 40
 			case 'Tumblr': 	$f['url'] = 'http://{{username}}.tumblr.com/rss'; $f['type'] = 1; break;
41
-/*>>*/		case 'Flickr': 	$f['url'] = 'http:/flickr.com/photos/{{username}}'; $f['type'] = 2; break; 
42
-/*>>*/		case 'Twitter': $f['url'] = 'http://twitter.com/{{username}}'; $f['type'] = 1; break;
41
+			case 'Twitter': $f['url'] = 'http://twitter.com/{{username}}'; $f['type'] = 1; break;
43 42
 			case 'Last.fm': $f['url'] = 'http://ws.audioscrobbler.com/1.0/user/{{username}}/recenttracks.rss'; $f['type'] = 1; break;
44 43
 			case 'Blogger': $f['url'] = 'http://{{username}}.blogspot.com/feeds/posts/default'; $f['type'] = 1; break;
45 44
 			case 'Youtube': $f['url'] = 'http://www.youtube.com/rss/user/{{username}}/videos.rss'; $f['type'] = 1; break;