[geeklog-cvs] Geeklog-1.x/public_html lib-common.php, 1.675, 1.676 usersettings.php, 1.167, 1.168

[Michael Jervis]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv60922/public_html

Modified Files:
	lib-common.php usersettings.php 
Log Message:
Support for Podcasts in portal blocks improved.
Fixed error where REALLY long syndication feeds could blow portal blocks up.

Index: usersettings.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/usersettings.php,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** usersettings.php	9 Dec 2007 18:05:39 -0000	1.167
--- usersettings.php	15 Feb 2008 19:10:28 -0000	1.168
***************
*** 168,176 ****
      }
  
- // @@@@ 2007/09/16 changed by dengen ----->>
- //  $selection = '<select name="cooktime">' . LB;
- // @@@@ 2007/09/16 changed by dengen -----||
      $selection = '<select id="cooktime" name="cooktime">' . LB;
- // @@@@ 2007/09/16 changed by dengen -----<<
      $selection .= COM_optionList ($_TABLES['cookiecodes'], 'cc_value,cc_descr',
                                    $A['cookietimeout'], 0);
--- 168,172 ----

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.675
retrieving revision 1.676
diff -C2 -d -r1.675 -r1.676
*** lib-common.php	3 Feb 2008 20:21:23 -0000	1.675
--- lib-common.php	15 Feb 2008 19:10:28 -0000	1.676
***************
*** 3597,3601 ****
  * Syndication import function. Imports headline data to a portal block.
  *
! * Rewritten December 19th 2004 by Michael Jervis (mike at fuckingbrit.com). Now
  * utilises a Factory Pattern to open a URL and automaticaly retreive a feed
  * object populated with feed data. Then import it into the portal block.
--- 3597,3601 ----
  * Syndication import function. Imports headline data to a portal block.
  *
! * Rewritten December 19th 2004 by Michael Jervis (mike@*censored*ingbrit.com). Now
  * utilises a Factory Pattern to open a URL and automaticaly retreive a feed
  * object populated with feed data. Then import it into the portal block.
***************
*** 3676,3680 ****
                  $title = utf8_decode($feed->articles[$i]['title']);
              }
!             $content = COM_createLink($title, $feed->articles[$i]['link']);
              $articles[] = $content;
          }
--- 3676,3686 ----
                  $title = utf8_decode($feed->articles[$i]['title']);
              }
!             if ($feed->articles[$i]['link'] != '') {
!                 $content = COM_createLink($title, $feed->articles[$i]['link']);
!             } elseif ($feed->articles[$i]['enclosureurl'] != '') {
!                 $content = COM_createLink($title, $feed->articles[$i]['enclosureurl']);
!             } else {
!                 $content = $title;
!             }
              $articles[] = $content;
          }
***************
*** 3683,3686 ****
--- 3689,3696 ----
          $content = COM_makeList($articles, 'list-feed');
          $content = preg_replace("/(\015\012)|(\015)|(\012)/", '', $content);
+        
+         if (strlen($content) > 65000) {
+             $content = $LANG21[68];
+         }
  
          // Standard theme based function to put it in the block