[geeklog-cvs] Geeklog-1.x/public_html/admin syndication.php, 1.56, 1.57

[Dirk Haun]

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

Modified Files:
	syndication.php 
Log Message:
Renamed the syndication feed type "geeklog" to "article" since that's what they are nowadays


Index: syndication.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/syndication.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** syndication.php	27 Jul 2008 07:35:56 -0000	1.56
--- syndication.php	27 Jul 2008 09:11:30 -0000	1.57
***************
*** 94,103 ****
  
  /**
! * Create a list of feed types that Geeklog offers.
  *
  * @return   string   an array with id/name pairs for every feed
  *
  */
! function get_geeklogFeeds ()
  {
      global $_CONF, $_TABLES, $LANG33;
--- 94,103 ----
  
  /**
! * Return list of types available for article feeds
  *
  * @return   string   an array with id/name pairs for every feed
  *
  */
! function get_articleFeeds()
  {
      global $_CONF, $_TABLES, $LANG33;
***************
*** 191,195 ****
  *
  * @param    int      $fid    feed id (0 for new feeds)
! * @param    string   $type   type of feed, e.g. 'geeklog'
  * @return   string           HTML for the feed editor
  *
--- 191,195 ----
  *
  * @param    int      $fid    feed id (0 for new feeds)
! * @param    string   $type   type of feed, e.g. 'article'
  * @return   string           HTML for the feed editor
  *
***************
*** 288,292 ****
      $feed_template->set_var ('feed_filename', $A['filename']);
      $feed_template->set_var ('feed_type', $A['type']);
!     $feed_template->set_var ('feed_type_display', ucwords ($A['type']));
      $feed_template->set_var ('feed_charset', $A['charset']);
      $feed_template->set_var ('feed_language', $A['language']);
--- 288,296 ----
      $feed_template->set_var ('feed_filename', $A['filename']);
      $feed_template->set_var ('feed_type', $A['type']);
!     if ($A['type'] == 'article') {
!         $feed_template->set_var('feed_type_display', $LANG33[55]);
!     } else {
!         $feed_template->set_var('feed_type_display', ucwords($A['type']));
!     }
      $feed_template->set_var ('feed_charset', $A['charset']);
      $feed_template->set_var ('feed_language', $A['language']);
***************
*** 332,337 ****
      $feed_template->set_var ('feed_limits_what', $selection);
  
!     if ($A['type'] == 'geeklog') {
!         $options = get_geeklogFeeds ();
      } else {
          $result = DB_query("SELECT pi_enabled FROM {$_TABLES['plugins']} WHERE pi_name='{$A['type']}'");
--- 336,341 ----
      $feed_template->set_var ('feed_limits_what', $selection);
  
!     if ($A['type'] == 'article') {
!         $options = get_articleFeeds();
      } else {
          $result = DB_query("SELECT pi_enabled FROM {$_TABLES['plugins']} WHERE pi_name='{$A['type']}'");
***************
*** 390,398 ****
          // - go directly to the feed editor
          $retval = COM_siteHeader ('menu', $LANG33[11])
!                 . editfeed (0, 'geeklog')
                  . COM_siteFooter ();
      } else {
          $selection = '<select name="type">' . LB;
!         $selection .= '<option value="geeklog">Geeklog</option>' . LB;
          foreach ($plugins as $p) {
              $selection .= '<option value="' . $p . '">' . ucwords ($p)
--- 394,403 ----
          // - go directly to the feed editor
          $retval = COM_siteHeader ('menu', $LANG33[11])
!                 . editfeed (0, 'article')
                  . COM_siteFooter ();
      } else {
          $selection = '<select name="type">' . LB;
!         $selection .= '<option value="article">' . $LANG33[55]
!                    . '</option>' . LB;
          foreach ($plugins as $p) {
              $selection .= '<option value="' . $p . '">' . ucwords ($p)
***************
*** 412,416 ****
          $feed_template->set_var ('type_selection', $selection);
  
!         $feed_template->set_var ('lang_explain', $LANG33[37]);
          $feed_template->set_var ('lang_go', $LANG33[1]);
  
--- 417,421 ----
          $feed_template->set_var ('type_selection', $selection);
  
!         $feed_template->set_var ('lang_explain', $LANG33[54]);
          $feed_template->set_var ('lang_go', $LANG33[1]);