phpwebsite-comm-cvs-commits — Read-Only CVS commits log list

[phpws-comm-commits] modules/podcaster/class PCR_Category.php, NONE, 1.1 PCR_Channel.php, 1.2, 1.3 PCR_Forms.php, 1.4, 1.5 Podcaster.php, 1.3, 1.4

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17620/class

Modified Files:
	PCR_Channel.php PCR_Forms.php Podcaster.php 
Added Files:
	PCR_Category.php 
Log Message:
getting ready for 1.0.5 itunes cats changes

--- NEW FILE: PCR_Category.php ---
<?php
/**
    * podcaster - phpwebsite module
    *
    * See docs/AUTHORS and docs/COPYRIGHT for relevant info.
    *
    * This program 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 program 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 program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    *
    * @version $Id $
    * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
*/

class Podcaster_Category {

    var $id             = 0;
    var $title          = null;
    var $parent_id      = 0;
    var $_error         = null;


    function Podcaster_Category($id=0)
    {
        if (!$id) {
            return;
        }

        $this->id = (int)$id;
        $this->init();
    }


    function init()
    {
        $db = new PHPWS_DB('podcaster_category');
        $result = $db->loadObject($this);
        if (PEAR::isError($result)) {
            $this->_error = & $result;
            $this->id = 0;
        } elseif (!$result) {
            $this->id = 0;
        }
    }


    function setTitle($title)
    {
        $this->title = strip_tags($title);
    }


    function setParent_id($parent_id)
    {
        $this->parent_id = $parent_id;
    }


    function getTitle($print=false)
    {
        if (empty($this->title)) {
            return null;
        }

        if ($print) {
            return PHPWS_Text::parseOutput($this->title);
        } else {
            return $this->title;
        }
    }




    function view()
    {
        if (!$this->id) {
            PHPWS_Core::errorPage(404);
        }

        $template['TITLE'] = $this->getTitle(true);
        $template['PARENT'] = $this->getParent(true);

        return PHPWS_Template::process($template, 'podcaster', 'view_category.tpl');

    }


    function delete()
    {
        if (!$this->id) {
            return;
        }

        $db = new PHPWS_DB('podcaster_category');
        $db->addWhere('id', $this->id);
        PHPWS_Error::logIfError($db->delete());

        PHPWS_Error::logIfError($db->delete());
    }


    function rowTag()
    {
        $vars['id'] = $this->id;
        $vars2['id'] = $this->id;
        $vars2['uop'] = 'view_rss';

        $links[] = '<a href="./index.php?module=podcaster&amp;id=' . $this->id . '&amp;uop=view_rss"><img src="./images/mod/podcaster/rss.gif" width="80" height="15" border="0" alt="' . dgettext('podcaster', 'Subscribe RSS') . '" title="' . dgettext('podcaster', 'Subscribe RSS') . '" /></a>';

        if (Current_User::allow('podcaster', 'edit_episode')){
            $vars['aop']  = 'new_episode';
            $links[] = PHPWS_Text::secureLink(dgettext('podcaster', 'New Episode'), 'podcaster', $vars);
        }

        if (Current_User::allow('podcaster', 'edit_channel')){
            $vars['aop']  = 'edit_channel';
            $links[] = PHPWS_Text::secureLink(dgettext('podcaster', 'Edit'), 'podcaster', $vars);
        }

        if (Current_User::isUnrestricted('podcaster')) {
            if ($this->active) {
                $vars['aop'] = 'deactivate_channel';
                $active = PHPWS_Text::secureLink(dgettext('podcaster', 'Deactivate'), 'podcaster', $vars);
            } else {
                $vars['aop'] = 'activate_channel';
                $active = PHPWS_Text::secureLink(dgettext('podcaster', 'Activate'), 'podcaster', $vars);
            }
            $links[] = $active;
        } else {
            if (Current_User::allow('podcaster'))
                $links[] = $this->active ? dgettext('podcaster', 'Active') : dgettext('podcaster', 'Not Active');
        }

        if (Current_User::allow('podcaster', 'delete_channel')){
            $vars['aop'] = 'delete_channel';
            $js['ADDRESS'] = PHPWS_Text::linkAddress('podcaster', $vars, true);
            $js['QUESTION'] = sprintf(dgettext('podcaster', 'Are you sure you want to delete the channel %s?\nAll related episodes and channel information will be permanently removed.'), $this->getTitle());
            $js['LINK'] = dgettext('podcaster', 'Delete');
            $links[] = javascript('confirm', $js);
        }

        $tpl['TITLE'] = $this->viewLink();
        $tpl['DATE_UPDATED'] = $this->getDateUpdated();
        $tpl['DESCRIPTION'] = $this->getListDescription(120);
        if($links)
            $tpl['ACTION'] = implode(' | ', $links);
        return $tpl;
    }


    function save()
    {
        $db = new PHPWS_DB('podcaster_category');

        $result = $db->saveObject($this);
        if (PEAR::isError($result)) {
            return $result;
        }
    }

}

?>
Index: Podcaster.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/Podcaster.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Podcaster.php	6 Jan 2008 04:29:39 -0000	1.3
--- Podcaster.php	9 Jan 2008 21:41:12 -0000	1.4
***************
*** 485,488 ****
--- 485,490 ----
          if (isset($_POST['itunes_category'])) {
              $this->channel->setItunes_category($_POST['itunes_category']);
+         } else {
+             $this->channel->setItunes_category(0);
          }
  

Index: PCR_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Forms.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PCR_Forms.php	7 Jan 2008 03:41:54 -0000	1.4
--- PCR_Forms.php	9 Jan 2008 21:41:12 -0000	1.5
***************
*** 118,126 ****
          $form->setMatch('itunes_explicit', $channel->getItunes_explicit());
  
!         $form->addTextArea('itunes_category', $channel->getItunes_category());
!         $form->setRows('itunes_category', '10');
!         $form->setCols('itunes_category', '50');
!         $form->setLabel('itunes_category', dgettext('podcaster', 'iTunes Category(s)'));
  
  
          $tpl = $form->getTemplate();
--- 118,137 ----
          $form->setMatch('itunes_explicit', $channel->getItunes_explicit());
  
!         PHPWS_Core::initModClass('podcaster', 'PCR_Category.php');
!         $db = new PHPWS_DB('podcaster_category');
!         $db->addOrder('id asc');
!         $result = $db->getObjects('Podcaster_Category');
!         foreach ($result as $cat) {
!             if ($cat->parent_id > 0) {
!                 $iTunesCats[$cat->id] = ' - ' . $cat->title;
!             } else {
!                 $iTunesCats[$cat->id] = $cat->title;
!             }
!         }
  
+         $catsMatch = $channel->itunes_category;
+         $form->addMultiple('itunes_category', $iTunesCats);
+         $form->setLabel('itunes_category', dgettext('podcaster', 'iTunes Category(s)'));
+         $form->setMatch('itunes_category', $catsMatch);
  
          $tpl = $form->getTemplate();
***************
*** 128,138 ****
          $tpl['SETTINGS_LABEL'] = dgettext('podcaster', 'Settings');
          $tpl['ITUNES_INFO_LABEL'] = dgettext('podcaster', 'A note on iTunes categories:');
!         $tpl['ITUNES_INFO'] = dgettext('podcaster', 'iTunes categories are used to classify your podcasts in the iTunes podcast directory. They are limited and specific. Although it is OK to leave this field empty, choosing the correct categories is good for your feed and may be used by other podcast directories and readers too. I have not polished the interface for choosing iTunes categories yet. It will come in the next version of podcaster. For now, you must carefully enter these yourself when creating a channel. I have provided a few examples in the categories field, and you can click on the link in the channel settings area of an add/edit channel form, to see a complete official list that you can copy and paste from.');
! 
!         $js['address'] = 'mod/podcaster/inc/itunescatscomplete.txt';
!         $js['label'] = dgettext('podcaster', 'Complete official list');
!         $js['width'] = 500;
!         $js['height'] = 400;
!         $tpl['ITUNES_CATEGORY_EXAMPLE'] = javascript('open_window', $js);
  
          $this->podcaster->content = PHPWS_Template::process($tpl, 'podcaster', 'edit_channel.tpl');
--- 139,143 ----
          $tpl['SETTINGS_LABEL'] = dgettext('podcaster', 'Settings');
          $tpl['ITUNES_INFO_LABEL'] = dgettext('podcaster', 'A note on iTunes categories:');
!         $tpl['ITUNES_INFO'] = dgettext('podcaster', 'iTunes categories are used to classify your podcasts in the iTunes podcast directory. They are limited and specific. Although it is OK to leave this field empty, choosing the correct categories is good for your feed and may be used by other podcast directories and readers too.');
  
          $this->podcaster->content = PHPWS_Template::process($tpl, 'podcaster', 'edit_channel.tpl');
***************
*** 343,348 ****
          $tpl['INFO_2_LABEL'] = dgettext('podcaster', 'A note on media files:');
          $tpl['INFO_2'] = dgettext('podcaster', 'In a future version of podcaster, there will be a media "mini-app" embedded in add/edit episode forms, like the image mini-app in the add/edit channel forms. This is dependant on changes coming to filecabinet. Until then, use filecabinet directly to upload your media file into a Multimedia folder, make note of the multimedia_id value there, and then return and enter it here in the episode\'s Media_id field. One way you can find the multimedia_id is to mouse over the "Clip" link for your multimedia file and look in your browser\'s status bar.');
!         $tpl['INFO_3_LABEL'] = dgettext('podcaster', 'A note on iTunes categories:');
!         $tpl['INFO_3'] = dgettext('podcaster', 'iTunes categories are used to classify your podcasts in the iTunes podcast directory. They are limited and specific. Although it is OK to leave this field empty, choosing the correct categories is good for your feed and may be used by other podcast directories and readers too. I have not polished the interface for choosing iTunes categories yet. It will come in the next version of podcaster. For now, you must carefully enter these yourself when creating a channel. I have provided a few examples in the categories field, and you can click on the link in the channel settings area of an add/edit channel form, to see a complete official list that you can copy and paste from.');
          $tpl['INFO_4_LABEL'] = dgettext('podcaster', 'A note on permissons:');
          $tpl['INFO_4'] = dgettext('podcaster', 'Honestly, I\'m still working on understanding the new system completely. I\'ve done a basic security audit and although I am sure there is no gross holes, I\'m sure I may have something wrong too ;-) I wanted to get this rewrite out asap and will do a more thorough permissioning review for the next podcaster release.');
--- 348,355 ----
          $tpl['INFO_2_LABEL'] = dgettext('podcaster', 'A note on media files:');
          $tpl['INFO_2'] = dgettext('podcaster', 'In a future version of podcaster, there will be a media "mini-app" embedded in add/edit episode forms, like the image mini-app in the add/edit channel forms. This is dependant on changes coming to filecabinet. Until then, use filecabinet directly to upload your media file into a Multimedia folder, make note of the multimedia_id value there, and then return and enter it here in the episode\'s Media_id field. One way you can find the multimedia_id is to mouse over the "Clip" link for your multimedia file and look in your browser\'s status bar.');
! //        $tpl['INFO_3_LABEL'] = dgettext('podcaster', 'A note on iTunes categories:');
! //        $tpl['INFO_3'] = dgettext('podcaster', 'iTunes categories are used to classify your podcasts in the iTunes podcast directory. They are limited and specific. Although it is OK to leave this field empty, choosing the correct categories is good for your feed and may be used by other podcast directories and readers too. I have not polished the interface for choosing iTunes categories yet. It will come in the next version of podcaster. For now, you must carefully enter these yourself when creating a channel. I have provided a few examples in the categories field, and you can click on the link in the channel settings area of an add/edit channel form, to see a complete official list that you can copy and paste from.');
!         $tpl['INFO_3_LABEL'] = null;
!         $tpl['INFO_3'] = null;
          $tpl['INFO_4_LABEL'] = dgettext('podcaster', 'A note on permissons:');
          $tpl['INFO_4'] = dgettext('podcaster', 'Honestly, I\'m still working on understanding the new system completely. I\'ve done a basic security audit and although I am sure there is no gross holes, I\'m sure I may have something wrong too ;-) I wanted to get this rewrite out asap and will do a more thorough permissioning review for the next podcaster release.');

Index: PCR_Channel.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Channel.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PCR_Channel.php	6 Jan 2008 00:34:43 -0000	1.2
--- PCR_Channel.php	9 Jan 2008 21:41:12 -0000	1.3
***************
*** 99,103 ****
      function setItunes_category($itunes_category)
      {
!         $this->itunes_category = PHPWS_Text::parseInput($itunes_category);
      }
  
--- 99,103 ----
      function setItunes_category($itunes_category)
      {
!         $this->itunes_category = serialize($itunes_category);
      }
  
***************
*** 211,221 ****
      {
          if (empty($this->itunes_category)) {
! //            return null;
!             $example = file_get_contents(PHPWS_SOURCE_DIR . 'mod/podcaster/inc/itunescats.txt');
!             return htmlspecialchars($example);
          }
  
          if ($print) {
!             return PHPWS_Text::parseOutput($this->itunes_category);
          } else {
              return $this->itunes_category;
--- 211,232 ----
      {
          if (empty($this->itunes_category)) {
!             return null;
          }
  
          if ($print) {
!             PHPWS_Core::initModClass('podcaster', 'PCR_Category.php');
!             $cats = NULL;
!             foreach ($this->itunes_category as $cat_id) {
!                 $cat = new Podcaster_Category($cat_id);
!                 if ($cat->parent_id > 0) {
!                     $parent = new Podcaster_Category($cat->parent_id);
!                     $cats .= '<itunes:category text="' . htmlentities($parent->getTitle()) . '">' . "\n";
!                     $cats .= '<itunes:category text="' . htmlentities($cat->getTitle()) . '" />' . "\n";
!                     $cats .= '</itunes:category>' . "\n";
!                 } else {
!                     $cats .= '<itunes:category text="' . htmlentities($cat->getTitle()) . '" />' . "\n";
!                 }
!             }
!             return $cats;
          } else {
              return $this->itunes_category;
***************
*** 224,234 ****
  
  
-     function getItunes_cat_examples()
-     {
-         $example = file_get_contents(PHPWS_SOURCE_DIR . 'mod/podcaster/inc/itunescatscomplete.txt');
-         return htmlspecialchars($example);
-     }
- 
- 
      function view()
      {
--- 235,238 ----
***************
*** 569,573 ****
          $template['LAST_BUILD_DATE']     = gmstrftime('%a, %d %b %Y %R GMT', mktime());
          $template['ITUNES_EXPLICIT']     = $this->getItunes_explicit(true);
!         $template['ITUNES_CATEGORY']     = htmlspecialchars_decode($this->getItunes_category(false));
  
          if ($this->_feeds) {
--- 573,577 ----
          $template['LAST_BUILD_DATE']     = gmstrftime('%a, %d %b %Y %R GMT', mktime());
          $template['ITUNES_EXPLICIT']     = $this->getItunes_explicit(true);
!         $template['ITUNES_CATEGORY']     = $this->getItunes_category(true);
  
          if ($this->_feeds) {

[phpws-comm-commits] modules/podcaster/boost install.sql, 1.2, 1.3 update.php, 1.8, 1.9

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17620/boost

Modified Files:
	install.sql update.php 
Log Message:
getting ready for 1.0.5 itunes cats changes

Index: install.sql
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/install.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install.sql	2 Jan 2008 04:24:01 -0000	1.2
--- install.sql	9 Jan 2008 21:41:09 -0000	1.3
***************
*** 42,43 ****
--- 42,119 ----
  
  CREATE INDEX podcastepisode_idx on podcaster_episode(channel_id);
+ 
+ CREATE TABLE podcaster_category (
+     id int NOT NULL default 0,
+     title varchar(255) NOT NULL,
+     parent_id int NOT NULL default 0,
+     PRIMARY KEY  (id)
+ );
+ 
+ INSERT INTO podcaster_category (id, title, parent_id) VALUES 
+ (10, 'Arts', 0),
+ (11, 'Design', 10),
+ (12, 'Fashion & Beauty', 10),
+ (13, 'Food', 10),
+ (14, 'Literature', 10),
+ (15, 'Performing Arts', 10),
+ (16, 'Visual Arts', 10),
+ (20, 'Business', 0),
+ (21, 'Business News', 20),
+ (22, 'Careers', 20),
+ (23, 'Investing', 20),
+ (24, 'Management & Marketing', 20),
+ (25, 'Shopping', 20),
+ (30, 'Comedy', 0),
+ (40, 'Education', 0),
+ (41, 'Education Technology', 40),
+ (42, 'Higher Education', 40),
+ (43, 'K-12', 40),
+ (44, 'Language Courses', 40),
+ (45, 'Training', 40),
+ (50, 'Games & Hobbies', 0),
+ (51, 'Automotive', 50),
+ (52, 'Aviation', 50),
+ (53, 'Hobbies', 50),
+ (54, 'Other Games', 50),
+ (55, 'Video Games', 50),
+ (60, 'Government & Organizations', 0),
+ (61, 'Local', 60),
+ (62, 'National', 60),
+ (63, 'Non-Profit', 60),
+ (64, 'Regional', 60),
+ (70, 'Health', 0),
+ (71, 'Alternative Health', 70),
+ (72, 'Fitness & Nutrition', 70),
+ (73, 'Self-Help', 70),
+ (74, 'Sexuality', 70),
+ (80, 'Kids & Family', 0),
+ (90, 'Music', 0),
+ (100, 'News & Politics', 0),
+ (110, 'Religion & Spirituality', 0),
+ (111, 'Buddhism', 110),
+ (112, 'Christianity', 110),
+ (113, 'Hinduism', 110),
+ (114, 'Islam', 110),
+ (115, 'Judaism', 110),
+ (116, 'Other', 110),
+ (117, 'Spirituality', 110),
+ (120, 'Science & Medicine', 0),
+ (121, 'Medicine', 120),
+ (122, 'Natural Sciences', 120),
+ (123, 'Social Sciences', 120),
+ (130, 'Society & Culture', 0),
+ (131, 'History', 130),
+ (132, 'Personal Journals', 130),
+ (133, 'Philosophy', 130),
+ (134, 'Places & Travel', 130),
+ (140, 'Sports & Recreation', 0),
+ (141, 'Amateur', 140),
+ (142, 'College & High School', 140),
+ (143, 'Outdoor', 140),
+ (144, 'Professional', 140),
+ (150, 'Technology', 0),
+ (151, 'Gadgets', 150),
+ (152, 'Tech News', 150),
+ (153, 'Podcasting', 150),
+ (154, 'Software How-To', 150),
+ (160, 'TV & Film', 0);

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/update.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** update.php	7 Jan 2008 03:41:51 -0000	1.8
--- update.php	9 Jan 2008 21:41:10 -0000	1.9
***************
*** 76,89 ****
      case version_compare($currentVersion, '1.0.4', '<'):
          $content[] = '<pre>';
-         
-         $new_icon = PHPWS_SOURCE_DIR . 'mod/podcaster/img/rss_sm.png';
-         $destination_directory = $home_dir . 'images/mod/podcaster/';
-         $icon_name = 'rss_sm.png';
-         if (PHPWS_File::fileCopy($file_origin, $destination_directory, $file_destination, 1, 1)) {
-             $content[] = "--- Successfully copied $icon_name to $destination_directory";
-         } else {
-             $content[] = "--- Failed to copy $icon_name to $destination_directory</pre>";
-             return false;
-         }
  
          $files = array('templates/edit_settings.tpl',
--- 76,79 ----
***************
*** 96,99 ****
--- 86,90 ----
                         'templates/info.tpl',
                         'templates/block.tpl',
+                        'img/rss_sm.png',
                         'conf/config.php'
          );
***************
*** 114,117 ****
--- 105,118 ----
  
  
+     case version_compare($currentVersion, '1.0.5', '<'):
+         $content[] = '<pre>';
+ 
+         $content[] = '1.0.5 changes
+ ----------------
+ + Added db and class for iTunes categories
+ + Improved iTunes categories functions in channel and form class
+ 
+ </pre>';
+ 
  
  

[phpws-comm-commits] modules/podcaster/docs CHANGELOG, 1.3, 1.4 ChangeLog, 1.9, 1.10

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17620/docs

Modified Files:
	CHANGELOG ChangeLog 
Log Message:
getting ready for 1.0.5 itunes cats changes

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/CHANGELOG,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CHANGELOG	6 Jan 2008 00:34:45 -0000	1.3
--- CHANGELOG	9 Jan 2008 21:41:14 -0000	1.4
***************
*** 1,2 ****
--- 1,9 ----
+ Version 1.0.5 -- Jan 2008
+ ------------------------------------------------------------------
+ Jan 09 2008
+ + Added db and class for iTunes categories
+ + Improved iTunes categories functions in channel and form class
+ 
+ 
  Version 1.0.4 -- Jan 2008
  ------------------------------------------------------------------

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ChangeLog	6 Jan 2008 00:34:45 -0000	1.9
--- ChangeLog	9 Jan 2008 21:41:14 -0000	1.10
***************
*** 1,2 ****
--- 1,9 ----
+ Version 1.0.5 -- Jan 2008
+ ------------------------------------------------------------------
+ Jan 09 2008
+ + Added db and class for iTunes categories
+ + Improved iTunes categories functions in channel and form class
+ 
+ 
  Version 1.0.4 -- Jan 2008
  ------------------------------------------------------------------

[phpws-comm-commits] modules/podcaster/templates edit_channel.tpl, 1.3, 1.4 info.tpl, 1.2, 1.3

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17620/templates

Modified Files:
	edit_channel.tpl info.tpl 
Log Message:
getting ready for 1.0.5 itunes cats changes

Index: edit_channel.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/edit_channel.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** edit_channel.tpl	6 Jan 2008 00:34:50 -0000	1.3
--- edit_channel.tpl	9 Jan 2008 21:41:19 -0000	1.4
***************
*** 11,15 ****
      <p>{ACTIVE} {ACTIVE_LABEL}</p>
      <p>{ITUNES_EXPLICIT} {ITUNES_EXPLICIT_LABEL}</p>
!     <p>{ITUNES_CATEGORY} {ITUNES_CATEGORY_LABEL} - {ITUNES_CATEGORY_EXAMPLE}</p>
      <p><strong>{ITUNES_INFO_LABEL}</strong> {ITUNES_INFO}</p>
  </fieldset>
--- 11,16 ----
      <p>{ACTIVE} {ACTIVE_LABEL}</p>
      <p>{ITUNES_EXPLICIT} {ITUNES_EXPLICIT_LABEL}</p>
!     <p>{ITUNES_CATS}</p>
!     <p>{ITUNES_CATEGORY} {ITUNES_CATEGORY_LABEL}</p>
      <p><strong>{ITUNES_INFO_LABEL}</strong> {ITUNES_INFO}</p>
  </fieldset>

Index: info.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/info.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** info.tpl	7 Jan 2008 03:41:55 -0000	1.2
--- info.tpl	9 Jan 2008 21:41:19 -0000	1.3
***************
*** 1,8 ****
  <fieldset>
      <legend><strong>{TITLE}</strong></legend>
!     <p><strong>{INFO_1_LABEL}</strong> {INFO_1}</p>
!     <p><strong>{INFO_2_LABEL}</strong> {INFO_2}</p>
!     <p><strong>{INFO_3_LABEL}</strong> {INFO_3}</p>
!     <p><strong>{INFO_4_LABEL}</strong> {INFO_4}</p>
!     <p><strong>{INFO_5_LABEL}</strong> {INFO_5}</p>
  </fieldset>
--- 1,8 ----
  <fieldset>
      <legend><strong>{TITLE}</strong></legend>
!     <!-- BEGIN info_1 --><p><strong>{INFO_1_LABEL}</strong> {INFO_1}</p><!-- END info_1 -->
!     <!-- BEGIN info_2 --><p><strong>{INFO_2_LABEL}</strong> {INFO_2}</p><!-- END info_2 -->
!     <!-- BEGIN info_3 --><p><strong>{INFO_3_LABEL}</strong> {INFO_3}</p><!-- END info_3 -->
!     <!-- BEGIN info_4 --><p><strong>{INFO_4_LABEL}</strong> {INFO_4}</p><!-- END info_4 -->
!     <!-- BEGIN info_5 --><p><strong>{INFO_5_LABEL}</strong> {INFO_5}</p><!-- END info_5 -->
  </fieldset>

[phpws-comm-commits] modules/podcaster/inc itunescats.txt, 1.1, NONE itunescatscomplete.txt, 1.1, NONE

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17620/inc

Removed Files:
	itunescats.txt itunescatscomplete.txt 
Log Message:
getting ready for 1.0.5 itunes cats changes

--- itunescatscomplete.txt DELETED ---

--- itunescats.txt DELETED ---

[phpws-comm-commits] modules/podcaster/boost update.php,1.7,1.8

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3466/boost

Modified Files:
	update.php 
Log Message:
getting ready for 1.0.4 and release

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/update.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** update.php	6 Jan 2008 00:44:54 -0000	1.7
--- update.php	7 Jan 2008 03:41:51 -0000	1.8
***************
*** 95,99 ****
                         'templates/view_rss.tpl',
                         'templates/info.tpl',
!                        'templates/block_home.tpl',
                         'conf/config.php'
          );
--- 95,99 ----
                         'templates/view_rss.tpl',
                         'templates/info.tpl',
!                        'templates/block.tpl',
                         'conf/config.php'
          );

[phpws-comm-commits] modules/podcaster/templates block.tpl, 1.3, 1.4 info.tpl, 1.1, 1.2 block_home.tpl, 1.1, NONE

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3466/templates

Modified Files:
	info.tpl 
Added Files:
	block.tpl 
Removed Files:
	block_home.tpl 
Log Message:
getting ready for 1.0.4 and release

--- NEW FILE: block.tpl ---
<div class="podcaster-sidebox">
  <div class="box">
    <div class="box-title"><h1>{TITLE}</h1></div>
    <div class="box-content">
        {EPISODE_LABEL}<br />
        {EPISODE_TITLE}<br />
        <span class="smaller">{CHANNEL_LABEL}</span><br />
        {CHANNEL_TITLE}<br />
    </div>
  </div>
</div>

Index: info.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/info.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** info.tpl	6 Jan 2008 00:34:50 -0000	1.1
--- info.tpl	7 Jan 2008 03:41:55 -0000	1.2
***************
*** 5,7 ****
--- 5,8 ----
      <p><strong>{INFO_3_LABEL}</strong> {INFO_3}</p>
      <p><strong>{INFO_4_LABEL}</strong> {INFO_4}</p>
+     <p><strong>{INFO_5_LABEL}</strong> {INFO_5}</p>
  </fieldset>

--- block_home.tpl DELETED ---

[phpws-comm-commits] modules/podcaster/class PCR_Forms.php, 1.3, 1.4 PCR_Runtime.php, 1.1, 1.2

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3466/class

Modified Files:
	PCR_Forms.php PCR_Runtime.php 
Log Message:
getting ready for 1.0.4 and release

Index: PCR_Runtime.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Runtime.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PCR_Runtime.php	6 Jan 2008 00:34:43 -0000	1.1
--- PCR_Runtime.php	7 Jan 2008 03:41:54 -0000	1.2
***************
*** 66,70 ****
              $tpl['CHANNEL_TITLE'] = $episode->getChannel(true, true);
              PHPWS_Core::initModClass('layout', 'Layout.php');
!             Layout::add(PHPWS_Template::process($tpl, 'podcaster', 'block_home.tpl'), 'podcaster', 'pcr_sidebox');
          }
  
--- 66,70 ----
              $tpl['CHANNEL_TITLE'] = $episode->getChannel(true, true);
              PHPWS_Core::initModClass('layout', 'Layout.php');
!             Layout::add(PHPWS_Template::process($tpl, 'podcaster', 'block.tpl'), 'podcaster', 'pcr_sidebox');
          }
  

Index: PCR_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Forms.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PCR_Forms.php	6 Jan 2008 04:29:39 -0000	1.3
--- PCR_Forms.php	7 Jan 2008 03:41:54 -0000	1.4
***************
*** 347,350 ****
--- 347,352 ----
          $tpl['INFO_4_LABEL'] = dgettext('podcaster', 'A note on permissons:');
          $tpl['INFO_4'] = dgettext('podcaster', 'Honestly, I\'m still working on understanding the new system completely. I\'ve done a basic security audit and although I am sure there is no gross holes, I\'m sure I may have something wrong too ;-) I wanted to get this rewrite out asap and will do a more thorough permissioning review for the next podcaster release.');
+         $tpl['INFO_5_LABEL'] = dgettext('podcaster', 'A note on caching:');
+         $tpl['INFO_5'] = dgettext('podcaster', 'There is a typo in the core class Cache.php that although fixed in svn, the fix hasn\'t been released as of Jan 6 2008. If your channel RSS feeds don\'t seem to refresh after the cache duration, try disabling the cache in the Settings tab.');
  
          $this->podcaster->title = dgettext('podcaster', 'Read me');

[phpws-comm-commits] modules/podcaster/locale/en_US/LC_MESSAGES podcaster.po, 1.2, 1.3

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/locale/en_US/LC_MESSAGES
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23080/locale/en_US/LC_MESSAGES

Modified Files:
	podcaster.po 
Log Message:
getting ready for 1.0.4 and release

Index: podcaster.po
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/locale/en_US/LC_MESSAGES/podcaster.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** podcaster.po	6 Jan 2008 00:34:49 -0000	1.2
--- podcaster.po	6 Jan 2008 04:29:40 -0000	1.3
***************
*** 33,37 ****
  "Content-Transfer-Encoding: 8bit\n"
  
! msgid "? Info"
  msgstr ""
  
--- 33,37 ----
  "Content-Transfer-Encoding: 8bit\n"
  
! msgid "Read me"
  msgstr ""
  

[phpws-comm-commits] modules/podcaster/class PCR_Forms.php, 1.2, 1.3 Podcaster.php, 1.2, 1.3

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23080/class

Modified Files:
	PCR_Forms.php Podcaster.php 
Log Message:
getting ready for 1.0.4 and release

Index: Podcaster.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/Podcaster.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Podcaster.php	6 Jan 2008 00:34:43 -0000	1.2
--- Podcaster.php	6 Jan 2008 04:29:39 -0000	1.3
***************
*** 402,406 ****
          }
          if (Current_User::allow('podcaster', 'edit_channel') || Current_User::allow('podcaster', 'edit_episode')){
!             $tags['info'] = array('title'=>dgettext('podcaster', '? Info'),
                                   'link'=>$link);
          }
--- 402,406 ----
          }
          if (Current_User::allow('podcaster', 'edit_channel') || Current_User::allow('podcaster', 'edit_episode')){
!             $tags['info'] = array('title'=>dgettext('podcaster', 'Read me'),
                                   'link'=>$link);
          }

Index: PCR_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Forms.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PCR_Forms.php	6 Jan 2008 00:34:43 -0000	1.2
--- PCR_Forms.php	6 Jan 2008 04:29:39 -0000	1.3
***************
*** 348,352 ****
          $tpl['INFO_4'] = dgettext('podcaster', 'Honestly, I\'m still working on understanding the new system completely. I\'ve done a basic security audit and although I am sure there is no gross holes, I\'m sure I may have something wrong too ;-) I wanted to get this rewrite out asap and will do a more thorough permissioning review for the next podcaster release.');
  
!         $this->podcaster->title = dgettext('podcaster', '? Info');
          $this->podcaster->content = PHPWS_Template::process($tpl, 'podcaster', 'info.tpl');
      }
--- 348,352 ----
          $tpl['INFO_4'] = dgettext('podcaster', 'Honestly, I\'m still working on understanding the new system completely. I\'ve done a basic security audit and although I am sure there is no gross holes, I\'m sure I may have something wrong too ;-) I wanted to get this rewrite out asap and will do a more thorough permissioning review for the next podcaster release.');
  
!         $this->podcaster->title = dgettext('podcaster', 'Read me');
          $this->podcaster->content = PHPWS_Template::process($tpl, 'podcaster', 'info.tpl');
      }

[phpws-comm-commits] modules/podcaster/boost update.php,1.6,1.7

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7913/boost

Modified Files:
	update.php 
Log Message:
getting ready for 1.0.4 and release

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/update.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** update.php	6 Jan 2008 00:34:42 -0000	1.6
--- update.php	6 Jan 2008 00:44:54 -0000	1.7
***************
*** 90,96 ****
                         'templates/edit_channel.tpl',
                         'templates/edit_episode.tpl',
!                        'templates/block_home.tpl',
                         'templates/view_rss.tpl',
                         'templates/info.tpl',
                         'conf/config.php'
          );
--- 90,99 ----
                         'templates/edit_channel.tpl',
                         'templates/edit_episode.tpl',
!                        'templates/list_channel.tpl',
!                        'templates/list_episode.tpl',
!                        'templates/list_episode_channel.tpl',
                         'templates/view_rss.tpl',
                         'templates/info.tpl',
+                        'templates/block_home.tpl',
                         'conf/config.php'
          );

[phpws-comm-commits] modules/podcaster/inc init.php, NONE, 1.1 settings.php, 1.1, 1.2

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4231/inc

Modified Files:
	settings.php 
Added Files:
	init.php 
Log Message:
getting ready for 1.0.4 and release

--- NEW FILE: init.php ---
<?php
/**
    * podcaster - phpwebsite module
    *
    * See docs/AUTHORS and docs/COPYRIGHT for relevant info.
    *
    * This program 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 program 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 program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    *
    * @version $id $
    * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
*/


PHPWS_Core::initModClass('podcaster', 'PCR_Runtime.php');
PCR_Runtime::showBlock();

?>
Index: settings.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/inc/settings.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** settings.php	2 Jan 2008 04:48:38 -0000	1.1
--- settings.php	6 Jan 2008 00:34:48 -0000	1.2
***************
*** 23,35 ****
  */
  
! $settings['channel_limit']           = 10;
! $settings['req_approval']            = 1;
! $settings['editor']                  = null;
! $settings['webmaster']               = null;
! $settings['copyright']               = sprintf('Copyright %s', date('Y'));
! $settings['max_width']               = 160;
! $settings['max_height']              = 160;
! $settings['mod_folders_only']        = 1;
! $settings['rm_media']                = 1;
  
  ?>
\ No newline at end of file
--- 23,39 ----
  */
  
! $settings['channel_limit']          = 10;
! $settings['req_approval']           = 1;
! $settings['editor']                 = null;
! $settings['webmaster']              = null;
! $settings['copyright']              = sprintf('Copyright %s', date('Y'));
! $settings['max_width']              = 160;
! $settings['max_height']             = 160;
! $settings['mod_folders_only']       = 1;
! $settings['rm_media']               = 1;
! $settings['show_block']             = 1;
! $settings['block_on_home_only']     = 1;
! $settings['block_order_by_rand']    = 1;
! $settings['cache_timeout']          = 3600;
  
  ?>
\ No newline at end of file

[phpws-comm-commits] modules/podcaster/docs theme_tags.txt, NONE, 1.1 CHANGELOG, 1.2, 1.3 COPYRIGHT, 1.2, 1.3 ChangeLog, 1.8, 1.9 INSTALL, 1.5, 1.6 TODO, 1.6, 1.7

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4231/docs

Modified Files:
	CHANGELOG COPYRIGHT ChangeLog INSTALL TODO 
Added Files:
	theme_tags.txt 
Log Message:
getting ready for 1.0.4 and release

--- NEW FILE: theme_tags.txt ---
Podcaster only uses one theme tag.

Name: sidebox
Tag : PCR_SIDEBOX
---------------
Podcaster will put this content into the DEFAULT tag if the theme does
not assign it. It contains either the most recent or a random episode,
in a sidebox, if enabled in podcaster's settings.


Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/COPYRIGHT,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** COPYRIGHT	2 Jan 2008 04:44:05 -0000	1.2
--- COPYRIGHT	6 Jan 2008 00:34:45 -0000	1.3
***************
*** 3,7 ****
  # @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
  
! Copyright (C) 2007 by the following:
  
  (If you have contributed code to podcaster, you should be on this list)
--- 3,7 ----
  # @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
  
! Copyright (C) 2007-08 by the following:
  
  (If you have contributed code to podcaster, you should be on this list)

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/CHANGELOG,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CHANGELOG	2 Jan 2008 05:29:49 -0000	1.2
--- CHANGELOG	6 Jan 2008 00:34:45 -0000	1.3
***************
*** 1,2 ****
--- 1,15 ----
+ Version 1.0.4 -- Jan 2008
+ ------------------------------------------------------------------
+ Jan 03-05 2008
+ + Updated documentation
+ + Got channel rss caching working (needs updated /core/class/cache.php)
+ + Added empty message and create link, in empty channel list
+ + Fixed default for approved flag for new episode by unrestricted users
+ + Added podcaster block and related settings
+ + Made RSS cache timeout configurable in settings tab
+ + Added an info tab and a few notes on media files and iTunes categories
+ + General code tidying and review to prepare for release
+ 
+ 
  Version 1.0.3 -- Dec 2007
  ------------------------------------------------------------------

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ChangeLog	2 Jan 2008 05:29:49 -0000	1.8
--- ChangeLog	6 Jan 2008 00:34:45 -0000	1.9
***************
*** 1,2 ****
--- 1,15 ----
+ Version 1.0.4 -- Jan 2008
+ ------------------------------------------------------------------
+ Jan 03-05 2008
+ + Updated documentation
+ + Got channel rss caching working (needs updated /core/class/cache.php)
+ + Added empty message and create link, in empty channel list
+ + Fixed default for approved flag for new episode by unrestricted users
+ + Added podcaster block and related settings
+ + Made RSS cache timeout configurable in settings tab
+ + Added an info tab and a few notes on media files and iTunes categories
+ + General code tidying and review to prepare for release
+ 
+ 
  Version 1.0.3 -- Dec 2007
  ------------------------------------------------------------------

Index: INSTALL
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/INSTALL,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** INSTALL	2 Jan 2008 04:44:05 -0000	1.5
--- INSTALL	6 Jan 2008 00:34:45 -0000	1.6
***************
*** 30,34 ****
      mv podcaster /home/username/public_html/mod/podcaster
  
! 4. Go to your phpWS control panel and install podcaster from Boost.
  
  
--- 30,34 ----
      mv podcaster /home/username/public_html/mod/podcaster
  
! 4. Go to your phpwebsite control panel and install podcaster from Boost.
  
  
***************
*** 36,71 ****
  !!!IMPORTANT NOTE ON FILE SIZES!!!
  ==================================
! podcaster, of course, depends on uploading mp3 files for feeds. You will
! be restricted to the value set in upload_max_filesize of your servers
! php.ini file. On many servers, this defaults to around 2MB, obviously
! not enough for an audio file of much length. If you have access to the
  php.ini file, you can increase this value, or you can ask your sys admin
! to do it for you. Another way to increase this amount (also useful if
! your sys admin doesn't want to make this change server-wide) is through
! the use of an .htaccess file at the root of your domain. Keep in mind,
! if you increase upload_max_filesize a lot, you may also need to increase
! post_max_size. post_max_size should always be larger than
! upload_max_filesize.
! 
! I have provided another means to deal with larger audio files also. You
! may also upload files to your /files/podcaster directory via ftp or some
! other emans, and then use the 'Import' function in any add/edit podcast
! screens to register these files with the module. If you do use this
! method, be sure to stick to legal file names and avoid spaces or special
! characters.
! 
! 
! A NOTE ON CATEGORIES:
! =====================
! Currently, podcaster channels make use of fatcat categories. As any text
! may be used in the rss <category> tag, these categories are also used in
! the rss feed for any given channel.
  
! I am working on a mechanism for the next release of podcaster, that will
! provide support for <itunes:category> tags as well. The itunes
! categories are quite specific, so editable fatcat categories are not
! suitable. I have provided example <itunes:category> tags in
! /templates/backend_feed.tpl and /templates/backend_item.tpl if you wish
! to hard-code itunes categories there in the interum, you could. Keep in
! mind, they would be global to all feeds though.
  
--- 36,51 ----
  !!!IMPORTANT NOTE ON FILE SIZES!!!
  ==================================
! podcaster, of course, depends on uploading mp3 files for feeds and uses
! Filecabinet to do it. You will be restricted to the value set in
! upload_max_filesize of your servers php.ini file and other settings in
! Filecabinet. On many servers, this defaults to around 2MB, obviously not
! enough for an audio file of much length. If you have access to the
  php.ini file, you can increase this value, or you can ask your sys admin
! to do it for you. For more information, refer to
! /docs/upload_limits.txt.
  
! Filecabinet provides another means to deal with larger media files. You
! may also upload files to your /files/filecabinet/incoming directory via
! ftp or some other emans, and then use the 'Classify' function in
! filecabinet to register these files with the system.
  

Index: TODO
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/TODO,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TODO	2 Jan 2008 05:29:49 -0000	1.6
--- TODO	6 Jan 2008 00:34:45 -0000	1.7
***************
*** 3,19 ****
  # @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
  
- ## figure out caching in channel viewrss
- 
- *) review episode save key and short url
-    can it be like webpages
- 
- *) consider an 'info' tab for admins
  
! *) put logic in (channel level?) to specify multimedia or document in episode class
  
! *) further user permission and security audit review, but so far so good
  
! *) some kind of front page block function
  
! *) review and improve default views, eg go to create channel instead of list when none exist, etc
  
--- 3,21 ----
  # @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
  
  
! Q: further user permission and security audit review, but so far so good
! A: take another look at restricted vs unrestricted correct usage
  
! Q: bullet-proof iTunes category entry
! A: next version (1.1?)
  
! Q: put logic in (channel level?) to specify multimedia or document in episode class
! A: future version (1.1 or 1.2?)
  
! Q: embedd multimedia javascript app
! A: waiting for filecabinet changes
  
+ Q: review episode save key and short url
+    can it be like webpages
+ A: only if either the default .htaccess rewrite expression is changed, or
+    if I change episode to page. still needs thought

[phpws-comm-commits] modules/podcaster/boost boost.php, 1.1, 1.2 dependency.xml, 1.1, 1.2 update.php, 1.5, 1.6

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4231/boost

Modified Files:
	boost.php dependency.xml update.php 
Log Message:
getting ready for 1.0.4 and release

Index: dependency.xml
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/dependency.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dependency.xml	2 Jan 2008 04:28:36 -0000	1.1
--- dependency.xml	6 Jan 2008 00:34:42 -0000	1.2
***************
*** 4,8 ****
      <title>core</title>
      <properName>phpWebSite Core</properName>
!     <version>1.7.0</version>
      <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url>
    </module>
--- 4,8 ----
      <title>core</title>
      <properName>phpWebSite Core</properName>
!     <version>1.7.2</version>
      <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url>
    </module>
***************
*** 10,14 ****
      <title>filecabinet</title>
      <properName>File Cabinet</properName>
!     <version>1.4.0</version>
      <url>http://phpwebsite.appstate.edu/downloads/modules/filecabinet/</url>
    </module>
--- 10,14 ----
      <title>filecabinet</title>
      <properName>File Cabinet</properName>
!     <version>1.4.2</version>
      <url>http://phpwebsite.appstate.edu/downloads/modules/filecabinet/</url>
    </module>

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/boost.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** boost.php	2 Jan 2008 04:28:36 -0000	1.1
--- boost.php	6 Jan 2008 00:34:42 -0000	1.2
***************
*** 24,28 ****
  
  $proper_name  = 'Podcaster';
! $version      = '1.0.3';
  $import_sql   = true;
  $version_http = 'http://verdon.ca/downloads/modules/podcaster/check.xml';
--- 24,28 ----
  
  $proper_name  = 'Podcaster';
! $version      = '1.0.4';
  $import_sql   = true;
  $version_http = 'http://verdon.ca/downloads/modules/podcaster/check.xml';

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/update.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** update.php	2 Jan 2008 05:29:48 -0000	1.5
--- update.php	6 Jan 2008 00:34:42 -0000	1.6
***************
*** 25,28 ****
--- 25,29 ----
  function podcaster_update(&$content, $currentVersion)
  {
+     $home_dir = PHPWS_Boost::getHomeDir();
      switch ($currentVersion) {
  
***************
*** 73,76 ****
--- 74,114 ----
  
  
+     case version_compare($currentVersion, '1.0.4', '<'):
+         $content[] = '<pre>';
+         
+         $new_icon = PHPWS_SOURCE_DIR . 'mod/podcaster/img/rss_sm.png';
+         $destination_directory = $home_dir . 'images/mod/podcaster/';
+         $icon_name = 'rss_sm.png';
+         if (PHPWS_File::fileCopy($file_origin, $destination_directory, $file_destination, 1, 1)) {
+             $content[] = "--- Successfully copied $icon_name to $destination_directory";
+         } else {
+             $content[] = "--- Failed to copy $icon_name to $destination_directory</pre>";
+             return false;
+         }
+ 
+         $files = array('templates/edit_settings.tpl',
+                        'templates/edit_channel.tpl',
+                        'templates/edit_episode.tpl',
+                        'templates/block_home.tpl',
+                        'templates/view_rss.tpl',
+                        'templates/info.tpl',
+                        'conf/config.php'
+         );
+         podcasterUpdateFiles($files, $content);
+         
+         $content[] = '1.0.4 changes
+ ----------------
+ + Updated documentation
+ + Got channel rss caching working (needs updated /core/class/cache.php)
+ + Added empty message and create link, in empty channel list
+ + Fixed default for approved flag for new episode by unrestricted users
+ + Added podcaster block and related settings
+ + Made RSS cache timeout configurable in settings tab
+ + Added an info tab and a few notes on media files and iTunes categories
+ + General code tidying and review to prepare for release
+ 
+ </pre>';
+ 
+ 
  
  

[phpws-comm-commits] modules/podcaster/conf config.php,1.5,1.6

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4231/conf

Modified Files:
	config.php 
Log Message:
getting ready for 1.0.4 and release

Index: config.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/conf/config.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config.php	2 Jan 2008 04:40:29 -0000	1.5
--- config.php	6 Jan 2008 00:34:44 -0000	1.6
***************
*** 24,28 ****
  
  define('PCR_DATE_FORMAT', '%T, %A, %B %e');
- define('PCR_CACHE_TIMEOUT', 3600);
  
  
--- 24,27 ----

[phpws-comm-commits] modules/podcaster/class PCR_Runtime.php, NONE, 1.1 PCR_Channel.php, 1.1, 1.2 PCR_Episode.php, 1.1, 1.2 PCR_Forms.php, 1.1, 1.2 Podcaster.php, 1.1, 1.2

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4231/class

Modified Files:
	PCR_Channel.php PCR_Episode.php PCR_Forms.php Podcaster.php 
Added Files:
	PCR_Runtime.php 
Log Message:
getting ready for 1.0.4 and release

Index: PCR_Episode.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Episode.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PCR_Episode.php	2 Jan 2008 04:34:55 -0000	1.1
--- PCR_Episode.php	6 Jan 2008 00:34:43 -0000	1.2
***************
*** 37,41 ****
      var $update_user_id = 0;
      var $updated_user   = null;
!     var $approved       = 0;
      var $active         = 1;
      var $_error         = null;
--- 37,41 ----
      var $update_user_id = 0;
      var $updated_user   = null;
!     var $approved       = 1;
      var $active         = 1;
      var $_error         = null;
***************
*** 104,108 ****
  
  
!     function getChannel($print=false)
      {
          if (empty($this->channel_id)) {
--- 104,108 ----
  
  
!     function getChannel($print=false, $icon=false)
      {
          if (empty($this->channel_id)) {
***************
*** 113,118 ****
              PHPWS_Core::initModClass('podcaster', 'PCR_Channel.php');
              $channel = new Podcaster_Channel($this->channel_id);
! //            return PHPWS_Text::parseOutput($channel->title);
!             return PHPWS_Text::rewriteLink($channel->title, 'podcaster', $this->channel_id);
          } else {
              return $this->channel_id;
--- 113,122 ----
              PHPWS_Core::initModClass('podcaster', 'PCR_Channel.php');
              $channel = new Podcaster_Channel($this->channel_id);
!             if ($icon) {
!                 $link = '<a href="./index.php?module=podcaster&amp;id=' . $this->channel_id . '&amp;uop=view_rss"><img src="./images/mod/podcaster/rss_sm.png" width="14" height="14" border="0" alt="' . dgettext('podcaster', 'Subscribe RSS') . '" title="' . dgettext('podcaster', 'Subscribe RSS') . '" /></a>';
!                 return $link . ' ' . PHPWS_Text::rewriteLink($channel->title, 'podcaster', $this->channel_id);
!             } else {
!                 return PHPWS_Text::rewriteLink($channel->title, 'podcaster', $this->channel_id);
!             }
          } else {
              return $this->channel_id;
***************
*** 327,332 ****
          $vars2['episode_id'] = $this->id;
  
- //        $vars2['uop'] = 'play_episode';
- //        $links[] = PHPWS_Text::moduleLink(dgettext('podcaster', 'Play'), 'podcaster', $vars2);
          $links[] = $this->getMedia(true,false,dgettext('podcaster', 'Play'));
  
--- 331,334 ----
***************
*** 422,426 ****
          $template['TITLE'] = $this->getTitle(true);
          $template['DESCRIPTION'] = PHPWS_Text::parseTag($this->getDescription(true));
- // vv        $template['IMAGE'] = $this->getImage(true);
  
          if (Current_User::allow('podcaster', 'edit_episode')) {
--- 424,427 ----
***************
*** 438,442 ****
          $template['MEDIA'] = $this->getMedia(true,true);
          $template['EPISODE_LINKS'] = $this->episodeLinks();
- //        print_r($this->getMedia());
  
          return PHPWS_Template::process($template, 'podcaster', 'view_episode.tpl');
--- 439,442 ----

Index: Podcaster.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/Podcaster.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Podcaster.php	2 Jan 2008 04:34:55 -0000	1.1
--- Podcaster.php	6 Jan 2008 00:34:43 -0000	1.2
***************
*** 68,72 ****
                      PHPWS_Core::reroute('index.php?module=podcaster&aop=list');
                  } else {
!                     $this->forwardMessage(dgettext('podcaster', 'Channel saved successfully.'));
                      PHPWS_Core::reroute('index.php?module=podcaster&aop=edit_episode&id=' . $this->channel->id);
                  }
--- 68,72 ----
                      PHPWS_Core::reroute('index.php?module=podcaster&aop=list');
                  } else {
!                     $this->forwardMessage(dgettext('podcaster', 'Channel saved successfully.') . ' ' . dgettext('podcaster', 'Add an episode below.'));
                      PHPWS_Core::reroute('index.php?module=podcaster&aop=edit_episode&id=' . $this->channel->id);
                  }
***************
*** 123,127 ****
                  } else {
                      if (!$this->episode->approved) {
!                         $this->forwardMessage(dgettext('podcaster', 'Episode submitted successfully.'));
                      } else {
                          $this->forwardMessage(dgettext('podcaster', 'Episode saved successfully.'));
--- 123,127 ----
                  } else {
                      if (!$this->episode->approved) {
!                         $this->forwardMessage(dgettext('podcaster', 'Episode submitted for approval successfully.'));
                      } else {
                          $this->forwardMessage(dgettext('podcaster', 'Episode saved successfully.'));
***************
*** 130,135 ****
                      PHPWS_Core::reroute('index.php?module=podcaster&uop=view_channel&id=' . $this->channel->id);
                  }
! // vv                javascript('close_refresh');
! // vv               Layout::nakedDisplay();
              } else {
                  $this->loadForm('edit_episode');
--- 130,135 ----
                      PHPWS_Core::reroute('index.php?module=podcaster&uop=view_channel&id=' . $this->channel->id);
                  }
! // vv huh?              javascript('close_refresh');
! // vv huh?              Layout::nakedDisplay();
              } else {
                  $this->loadForm('edit_episode');
***************
*** 166,171 ****
              $this->episode->approved = 1;
              $this->episode->save();
- //            $this->message = dgettext('podcaster', 'Podcaster episode approved.');
- //            $this->content = $this->channel->view();
              $this->forwardMessage(dgettext('podcaster', 'Podcaster episode approved.'));
              PHPWS_Core::reroute('index.php?module=podcaster&aop=menu&tab=approvals');
--- 166,169 ----
***************
*** 179,184 ****
              $this->episode->approved = 0;
              $this->episode->save();
- //            $this->message = dgettext('podcaster', 'Podcaster episode unapproved.');
- //            $this->content = $this->channel->view();
              $this->forwardMessage(dgettext('podcaster', 'Podcaster episode unapproved.'));
              PHPWS_Core::reroute('index.php?module=podcaster&aop=menu&tab=approvals');
--- 177,180 ----
***************
*** 197,201 ****
              if ($this->postSettings()) {
                  $this->forwardMessage(dgettext('podcaster', 'Podcaster settings saved.'));
- //                $this->loadForm('settings');
                  PHPWS_Core::reroute('index.php?module=podcaster&aop=menu');
              } else {
--- 193,196 ----
***************
*** 406,409 ****
--- 401,408 ----
                                    'link'=>$link);
          }
+         if (Current_User::allow('podcaster', 'edit_channel') || Current_User::allow('podcaster', 'edit_episode')){
+             $tags['info'] = array('title'=>dgettext('podcaster', '? Info'),
+                                  'link'=>$link);
+         }
          $this->panel->quickSetTabs($tags);
      }
***************
*** 450,456 ****
                  $this->episode->setApproved(0);
              }
!         } //else {
! //        }
! 
  
          if (isset($errors)) {
--- 449,453 ----
                  $this->episode->setApproved(0);
              }
!         } 
  
          if (isset($errors)) {
***************
*** 517,524 ****
--- 514,537 ----
          }
  
+         $cache_timeout = (int)$_POST['cache_timeout'];
+         if ((int)$cache_timeout <= 7200) {
+             PHPWS_Settings::set('podcaster', 'cache_timeout', $cache_timeout);
+         } else {
+             PHPWS_Settings::reset('podcaster', 'cache_timeout');
+         }
+ 
+         isset($_POST['show_block']) ?
+             PHPWS_Settings::set('podcaster', 'show_block', 1) :
+             PHPWS_Settings::set('podcaster', 'show_block', 0);
+ 
          isset($_POST['req_approval']) ?
              PHPWS_Settings::set('podcaster', 'req_approval', 1) :
              PHPWS_Settings::set('podcaster', 'req_approval', 0);
  
+         PHPWS_Settings::set('podcaster', 'block_order_by_rand', $_POST['block_order_by_rand']);
+ 
+         isset($_POST['block_on_home_only']) ?
+             PHPWS_Settings::set('podcaster', 'block_on_home_only', 1) :
+             PHPWS_Settings::set('podcaster', 'block_on_home_only', 0);
  
  

--- NEW FILE: PCR_Runtime.php ---
<?php
/**
    * podcaster - phpwebsite module
    *
    * See docs/AUTHORS and docs/COPYRIGHT for relevant info.
    *
    * This program 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 program 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 program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    *
    * @version $Id $
    * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
*/


class PCR_Runtime
{

    function showBlock() {
        if (PHPWS_Settings::get('podcaster', 'show_block')) {
            if (PHPWS_Settings::get('podcaster', 'block_on_home_only')) {
                $key = Key::getCurrent();
                if (!empty($key) && $key->isHomeKey()) {
                    PCR_Runtime::showPodcasterBlock();
                }
            } else {
                PCR_Runtime::showPodcasterBlock();
            }
        }
    }

    function showPodcasterBlock() {

        $db = new PHPWS_DB('podcaster_episode');
        $db->addColumn('id');
        $db->addWhere('active', 1);
        $db->addWhere('approved', 1);
        if (PHPWS_Settings::get('podcaster', 'block_order_by_rand')) {
            $db->addOrder('rand');
        } else {
            $db->addOrder('date_created desc');
        }
        $db->setLimit(1);
        $result = $db->select();
        if (!PHPWS_Error::logIfError($result) && !empty($result)) {
            $tpl['TITLE'] = dgettext('podcaster', 'Podcaster');
            if (PHPWS_Settings::get('podcaster', 'block_order_by_rand')) {
                $tpl['EPISODE_LABEL'] = dgettext('podcaster', 'Random Episode');
            } else {
                $tpl['EPISODE_LABEL'] = dgettext('podcaster', 'Most Recent Episode');
            }
            $tpl['CHANNEL_LABEL'] = dgettext('podcaster', 'From the  channel...');
            PHPWS_Core::initModClass('podcaster', 'PCR_Episode.php');
            $episode = new Podcaster_Episode($result[0]['id']);
            $tpl['EPISODE_TITLE'] = $episode->viewLink();
            $tpl['CHANNEL_TITLE'] = $episode->getChannel(true, true);
            PHPWS_Core::initModClass('layout', 'Layout.php');
            Layout::add(PHPWS_Template::process($tpl, 'podcaster', 'block_home.tpl'), 'podcaster', 'pcr_sidebox');
        }

    }

}

?>
Index: PCR_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Forms.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PCR_Forms.php	2 Jan 2008 04:34:55 -0000	1.1
--- PCR_Forms.php	6 Jan 2008 00:34:43 -0000	1.2
***************
*** 62,65 ****
--- 62,70 ----
              break;
  
+         case 'info':
+             $this->podcaster->panel->setCurrentTab('info');
+             $this->showInfo();
+             break;
+ 
          }
  
***************
*** 122,128 ****
          $tpl['DETAILS_LABEL'] = dgettext('podcaster', 'Details');
          $tpl['SETTINGS_LABEL'] = dgettext('podcaster', 'Settings');
  
- //        $vars['aop'] = 'itunes_cats_example';
- //        $js['address'] = PHPWS_Text::linkAddress('podcaster', $vars, true);
          $js['address'] = 'mod/podcaster/inc/itunescatscomplete.txt';
          $js['label'] = dgettext('podcaster', 'Complete official list');
--- 127,133 ----
          $tpl['DETAILS_LABEL'] = dgettext('podcaster', 'Details');
          $tpl['SETTINGS_LABEL'] = dgettext('podcaster', 'Settings');
+         $tpl['ITUNES_INFO_LABEL'] = dgettext('podcaster', 'A note on iTunes categories:');
+         $tpl['ITUNES_INFO'] = dgettext('podcaster', 'iTunes categories are used to classify your podcasts in the iTunes podcast directory. They are limited and specific. Although it is OK to leave this field empty, choosing the correct categories is good for your feed and may be used by other podcast directories and readers too. I have not polished the interface for choosing iTunes categories yet. It will come in the next version of podcaster. For now, you must carefully enter these yourself when creating a channel. I have provided a few examples in the categories field, and you can click on the link in the channel settings area of an add/edit channel form, to see a complete official list that you can copy and paste from.');
  
          $js['address'] = 'mod/podcaster/inc/itunescatscomplete.txt';
          $js['label'] = dgettext('podcaster', 'Complete official list');
***************
*** 176,179 ****
--- 181,186 ----
          $tpl['INFO_LABEL'] = dgettext('podcaster', 'Information');
          $tpl['MEDIA_LABEL'] = dgettext('podcaster', 'Media');
+         $tpl['MEDIA_NOTE_LABEL'] = dgettext('podcaster', 'Special Note:');
+         $tpl['MEDIA_NOTE'] = dgettext('podcaster', 'In a future version of podcaster, there will be a media "mini-app" embedded in add/edit episode forms, like the image mini-app in the add/edit channel forms. This is dependant on changes coming to filecabinet. Until then, use filecabinet directly to upload your media file into a Multimedia folder, make note of the multimedia_id value there, and then return and enter it here in the episode\'s Media_id field. One way you can find the multimedia_id is to mouse over the "Clip" link for your multimedia file and look in your browser\'s status bar.');
          if (Current_User::isUnrestricted('podcaster')) {
              $tpl['SETTINGS_LABEL'] = dgettext('podcaster', 'Settings');
***************
*** 198,201 ****
--- 205,219 ----
          $pager->setTemplate('list_channel.tpl');
          $pager->addRowTags('rowTag');
+         $num = $pager->getTotalRows();
+         if ($num == '0') {
+             if (Current_User::allow('podcaster', 'edit_channel')) {
+                 $vars['aop']  = 'menu';
+                 $vars['tab']  = 'settings';
+                 $vars2['aop']  = 'edit_channel';
+                 $ptags['EMPTY_MESSAGE'] = sprintf(dgettext('podcaster', 'Check your %s then create a %s to begin'), PHPWS_Text::secureLink(dgettext('podcaster', 'Settings'), 'podcaster', $vars),  PHPWS_Text::secureLink(dgettext('podcaster', 'New Channel'), 'podcaster', $vars2));
+             } else {
+                 $ptags['EMPTY_MESSAGE'] = dgettext('podcaster', 'Sorry, no channels are available at this time.');
+             }
+         }
          $pager->addPageTags($ptags);
          $pager->addToggle('class="toggle1"');
***************
*** 257,264 ****
          $form->setLabel('channel_limit', dgettext('podcaster', 'Show current episodes per channel limit (1-50)'));
  
          $form->addCheckbox('req_approval', 1);
          $form->setMatch('req_approval', PHPWS_Settings::get('podcaster', 'req_approval'));
!         $form->setLabel('req_approval', dgettext('podcaster', 'Require approval'));
! 
  
          $form->addText('editor', PHPWS_Settings::get('podcaster', 'editor'));
--- 275,297 ----
          $form->setLabel('channel_limit', dgettext('podcaster', 'Show current episodes per channel limit (1-50)'));
  
+         $form->addText('cache_timeout', PHPWS_Settings::get('podcaster', 'cache_timeout'));
+         $form->setSize('cache_timeout', 4, 4);
+         $form->setLabel('cache_timeout', dgettext('podcaster', 'Cache duration in seconds for rss feed (0-7200, set to 0 to disable cache)'));
+ 
+         $form->addCheckbox('show_block', 1);
+         $form->setMatch('show_block', PHPWS_Settings::get('podcaster', 'show_block'));
+         $form->setLabel('show_block', dgettext('podcaster', 'Show podcaster block'));
+ 
+         $form->addRadio('block_order_by_rand', array(0, 1));
+         $form->setLabel('block_order_by_rand', array(dgettext('podcaster', 'Most recent'), dgettext('podcaster', 'Random')));
+         $form->setMatch('block_order_by_rand', PHPWS_Settings::get('podcaster', 'block_order_by_rand'));
+     
+         $form->addCheckbox('block_on_home_only', 1);
+         $form->setMatch('block_on_home_only', PHPWS_Settings::get('podcaster', 'block_on_home_only'));
+         $form->setLabel('block_on_home_only', dgettext('podcaster', 'Show on home only'));
+ 
          $form->addCheckbox('req_approval', 1);
          $form->setMatch('req_approval', PHPWS_Settings::get('podcaster', 'req_approval'));
!         $form->setLabel('req_approval', dgettext('podcaster', 'Require approval for new episodes'));
  
          $form->addText('editor', PHPWS_Settings::get('podcaster', 'editor'));
***************
*** 302,305 ****
--- 335,356 ----
  
  
+     function showInfo()
+     {
+         
+         $tpl['TITLE'] = dgettext('podcaster', 'Important Information');
+         $tpl['INFO_1_LABEL'] = dgettext('podcaster', 'A note on this module:');
+         $tpl['INFO_1'] = dgettext('podcaster', 'This is the first rewriting of podcaster for the new 1.x series phpwebsite. Although I believe it to be pretty stable, there are still a few things that should be pointed out. There are a couple rough edges and a feature that is waiting for planned core filecabinet updates. I will release updated podcaster versions as they are available. Updating will be easy for the end user.');
+         $tpl['INFO_2_LABEL'] = dgettext('podcaster', 'A note on media files:');
+         $tpl['INFO_2'] = dgettext('podcaster', 'In a future version of podcaster, there will be a media "mini-app" embedded in add/edit episode forms, like the image mini-app in the add/edit channel forms. This is dependant on changes coming to filecabinet. Until then, use filecabinet directly to upload your media file into a Multimedia folder, make note of the multimedia_id value there, and then return and enter it here in the episode\'s Media_id field. One way you can find the multimedia_id is to mouse over the "Clip" link for your multimedia file and look in your browser\'s status bar.');
+         $tpl['INFO_3_LABEL'] = dgettext('podcaster', 'A note on iTunes categories:');
+         $tpl['INFO_3'] = dgettext('podcaster', 'iTunes categories are used to classify your podcasts in the iTunes podcast directory. They are limited and specific. Although it is OK to leave this field empty, choosing the correct categories is good for your feed and may be used by other podcast directories and readers too. I have not polished the interface for choosing iTunes categories yet. It will come in the next version of podcaster. For now, you must carefully enter these yourself when creating a channel. I have provided a few examples in the categories field, and you can click on the link in the channel settings area of an add/edit channel form, to see a complete official list that you can copy and paste from.');
+         $tpl['INFO_4_LABEL'] = dgettext('podcaster', 'A note on permissons:');
+         $tpl['INFO_4'] = dgettext('podcaster', 'Honestly, I\'m still working on understanding the new system completely. I\'ve done a basic security audit and although I am sure there is no gross holes, I\'m sure I may have something wrong too ;-) I wanted to get this rewrite out asap and will do a more thorough permissioning review for the next podcaster release.');
+ 
+         $this->podcaster->title = dgettext('podcaster', '? Info');
+         $this->podcaster->content = PHPWS_Template::process($tpl, 'podcaster', 'info.tpl');
+     }
+ 
+ 
  }
  

Index: PCR_Channel.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Channel.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PCR_Channel.php	2 Jan 2008 04:34:55 -0000	1.1
--- PCR_Channel.php	6 Jan 2008 00:34:43 -0000	1.2
***************
*** 176,180 ****
              return $image;
          }
- //        return $image->getTag();
      }
  
--- 176,179 ----
***************
*** 238,243 ****
          }
  
! //PRINT_R($this->loadFeeds());
!     /* not sure if I need the key stuff */
          $key = new Key($this->key_id);
  
--- 237,241 ----
          }
  
!         /* not sure if I need the key stuff */
          $key = new Key($this->key_id);
  
***************
*** 245,253 ****
              Current_User::requireLogin();            
          }
! //$home_http = PHPWS_Core::getHomeHttp();
! //$image = $this->getImage();
! //$path = $home_http.$image->file_directory.$image->file_name;
! //echo $path;
! ///print_r($image);
          Layout::addPageTitle($this->getTitle());
          $template['TITLE'] = $this->getTitle(true);
--- 243,247 ----
              Current_User::requireLogin();            
          }
! 
          Layout::addPageTitle($this->getTitle());
          $template['TITLE'] = $this->getTitle(true);
***************
*** 315,322 ****
              PHPWS_Core::initModClass('podcaster', 'PCR_Episode.php');
              $result = $db->getObjects('Podcaster_Episode');
!             foreach ($result as $episode) {
!                 $media = $episode->getMedia();
!                 if ($media) {
!                     $media->delete();
                  }
              }
--- 309,318 ----
              PHPWS_Core::initModClass('podcaster', 'PCR_Episode.php');
              $result = $db->getObjects('Podcaster_Episode');
!             if ($result) {
!                 foreach ($result as $episode) {
!                     $media = $episode->getMedia();
!                     if ($media) {
!                         $media->delete();
!                     }
                  }
              }
***************
*** 354,358 ****
          $vars2['uop'] = 'view_rss';
  
- //        $links[] = PHPWS_Text::moduleLink(dgettext('podcaster', 'Subscribe RSS'), 'podcaster', $vars2);
          $links[] = '<a href="./index.php?module=podcaster&amp;id=' . $this->id . '&amp;uop=view_rss"><img src="./images/mod/podcaster/rss.gif" width="80" height="15" border="0" alt="' . dgettext('podcaster', 'Subscribe RSS') . '" title="' . dgettext('podcaster', 'Subscribe RSS') . '" /></a>';
  
--- 350,353 ----
***************
*** 404,408 ****
  
          $vars2['uop'] = 'view_rss';
- //        $links[] = PHPWS_Text::moduleLink(dgettext('podcaster', 'Subscribe RSS'), 'podcaster', $vars2);
          $links[] = '<a href="./index.php?module=podcaster&amp;id=' . $this->id . '&amp;uop=view_rss"><img src="./images/mod/podcaster/rss.gif" width="80" height="15" border="0" alt="' . dgettext('podcaster', 'Subscribe RSS') . '" title="' . dgettext('podcaster', 'Subscribe RSS') . '" /></a>';
  
--- 399,402 ----
***************
*** 542,550 ****
      function viewRSS()
      {
- //        $cache_key = 'pcrchannel_'. $this->id .'_cache_key';
- //        $content = PHPWS_Cache::get($cache_key);
  
!         if (!empty($content)) {
!             return $content;
          }
  
--- 536,546 ----
      function viewRSS()
      {
  
!         if (PHPWS_Settings::get('podcaster', 'cache_timeout') > 0) {
!             $cache_key = 'pcrchannel_'. $this->id .'_cache_key';
!             $content = PHPWS_Cache::get($cache_key, PHPWS_Settings::get('podcaster', 'cache_timeout'));
!             if (!empty($content)) {
!                 return $content;
!             }
          }
  
***************
*** 599,603 ****
  
          $content = PHPWS_Template::process($template, 'podcaster', 'view_rss.tpl');
! //        PHPWS_Cache::save($cache_key, $content, PCR_CACHE_TIMEOUT);
          return $content;
      }
--- 595,601 ----
  
          $content = PHPWS_Template::process($template, 'podcaster', 'view_rss.tpl');
!         if (PHPWS_Settings::get('podcaster', 'cache_timeout') > 0) {
!             PHPWS_Cache::save($cache_key, $content);
!         }
          return $content;
      }

[phpws-comm-commits] modules/podcaster/templates block_home.tpl, NONE, 1.1 info.tpl, NONE, 1.1 edit_channel.tpl, 1.2, 1.3 edit_episode.tpl, 1.1, 1.2 edit_settings.tpl, 1.3, 1.4 list_channel.tpl, 1.1, 1.2 list_episode.tpl, 1.1, 1.2 list_episode_channel.tpl, 1.1, 1.2 view_rss.tpl, 1.1, 1.2

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4231/templates

Modified Files:
	edit_channel.tpl edit_episode.tpl edit_settings.tpl 
	list_channel.tpl list_episode.tpl list_episode_channel.tpl 
	view_rss.tpl 
Added Files:
	block_home.tpl info.tpl 
Log Message:
getting ready for 1.0.4 and release

Index: list_channel.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/list_channel.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** list_channel.tpl	2 Jan 2008 05:02:29 -0000	1.1
--- list_channel.tpl	6 Jan 2008 00:34:50 -0000	1.2
***************
*** 1,23 ****
  <table width="99%" cellpadding="4">
!   <tr>
!     <th>{TITLE_HEADER} {TITLE_SORT}</th>
!     <th>{DATE_UPDATED_HEADER} {DATE_UPDATED_SORT}</th>
!     <th>&nbsp;</th>
!   </tr>
  <!-- BEGIN listrows -->
!   <tr {TOGGLE}>
!     <td>{TITLE}</td>
!     <td>{DATE_UPDATED}</td>
!     <td>{ACTION}</td>
!   </tr>
!   <tr {TOGGLE}>
!     <td colspan="4" class="smaller">{DESCRIPTION}</td>
!   </tr>
  <!-- END listrows -->
  </table>
  {EMPTY_MESSAGE}
  <div class="align-center">
! {TOTAL_ROWS}<br />
! {PAGE_LABEL} {PAGES}<br />
! {LIMIT_LABEL} {LIMITS}
  </div>
--- 1,23 ----
  <table width="99%" cellpadding="4">
!     <tr>
!         <th>{TITLE_HEADER} {TITLE_SORT}</th>
!         <th>{DATE_UPDATED_HEADER} {DATE_UPDATED_SORT}</th>
!         <th>&nbsp;</th>
!     </tr>
  <!-- BEGIN listrows -->
!     <tr {TOGGLE}>
!         <td>{TITLE}</td>
!         <td>{DATE_UPDATED}</td>
!         <td>{ACTION}</td>
!     </tr>
!     <tr {TOGGLE}>
!         <td colspan="4" class="smaller">{DESCRIPTION}</td>
!     </tr>
  <!-- END listrows -->
  </table>
  {EMPTY_MESSAGE}
  <div class="align-center">
!     {TOTAL_ROWS}<br />
!     {PAGE_LABEL} {PAGES}<br />
!     {LIMIT_LABEL} {LIMITS}
  </div>

Index: list_episode_channel.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/list_episode_channel.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** list_episode_channel.tpl	2 Jan 2008 05:02:29 -0000	1.1
--- list_episode_channel.tpl	6 Jan 2008 00:34:50 -0000	1.2
***************
*** 1,23 ****
  <table width="99%" cellpadding="4">
!   <tr>
!     <th>{TITLE_HEADER} {TITLE_SORT}</th>
!     <th>{DATE_UPDATED_HEADER} {DATE_UPDATED_SORT}</th>
!     <th>&nbsp;</th>
!   </tr>
  <!-- BEGIN listrows -->
!   <tr {TOGGLE}>
!     <td>{TITLE}</td>
!     <td>{DATE_UPDATED}</td>
!     <td>{ACTION}</td>
!   </tr>
!   <tr {TOGGLE}>
!     <td colspan="4" class="smaller">{DESCRIPTION}</td>
!   </tr>
  <!-- END listrows -->
  </table>
  {EMPTY_MESSAGE}
  <div class="align-center">
! {TOTAL_ROWS}<br />
! {PAGE_LABEL} {PAGES}<br />
! {LIMIT_LABEL} {LIMITS}
  </div>
--- 1,23 ----
  <table width="99%" cellpadding="4">
!     <tr>
!         <th>{TITLE_HEADER} {TITLE_SORT}</th>
!         <th>{DATE_UPDATED_HEADER} {DATE_UPDATED_SORT}</th>
!         <th>&nbsp;</th>
!     </tr>
  <!-- BEGIN listrows -->
!     <tr {TOGGLE}>
!         <td>{TITLE}</td>
!         <td>{DATE_UPDATED}</td>
!         <td>{ACTION}</td>
!     </tr>
!     <tr {TOGGLE}>
!         <td colspan="4" class="smaller">{DESCRIPTION}</td>
!     </tr>
  <!-- END listrows -->
  </table>
  {EMPTY_MESSAGE}
  <div class="align-center">
!     {TOTAL_ROWS}<br />
!     {PAGE_LABEL} {PAGES}<br />
!     {LIMIT_LABEL} {LIMITS}
  </div>

Index: list_episode.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/list_episode.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** list_episode.tpl	2 Jan 2008 05:02:29 -0000	1.1
--- list_episode.tpl	6 Jan 2008 00:34:50 -0000	1.2
***************
*** 1,25 ****
  <table width="99%" cellpadding="4">
!   <tr>
!     <th>{TITLE_HEADER} {TITLE_SORT}</th>
!     <th>{CHANNEL_HEADER} {CHANNEL_ID_SORT}</th>
!     <th>{DATE_UPDATED_HEADER} {DATE_UPDATED_SORT}</th>
!     <th>&nbsp;</th>
!   </tr>
  <!-- BEGIN listrows -->
!   <tr {TOGGLE}>
!     <td>{TITLE}</td>
!     <td>{CHANNEL}</td>
!     <td>{DATE_UPDATED}</td>
!     <td>{ACTION}</td>
!   </tr>
!   <tr {TOGGLE}>
!     <td colspan="4" class="smaller">{DESCRIPTION}</td>
!   </tr>
  <!-- END listrows -->
  </table>
  {EMPTY_MESSAGE}
  <div class="align-center">
! {TOTAL_ROWS}<br />
! {PAGE_LABEL} {PAGES}<br />
! {LIMIT_LABEL} {LIMITS}
  </div>
--- 1,25 ----
  <table width="99%" cellpadding="4">
!     <tr>
!         <th>{TITLE_HEADER} {TITLE_SORT}</th>
!         <th>{CHANNEL_HEADER} {CHANNEL_ID_SORT}</th>
!         <th>{DATE_UPDATED_HEADER} {DATE_UPDATED_SORT}</th>
!         <th>&nbsp;</th>
!     </tr>
  <!-- BEGIN listrows -->
!     <tr {TOGGLE}>
!         <td>{TITLE}</td>
!         <td>{CHANNEL}</td>
!         <td>{DATE_UPDATED}</td>
!         <td>{ACTION}</td>
!     </tr>
!     <tr {TOGGLE}>
!         <td colspan="4" class="smaller">{DESCRIPTION}</td>
!     </tr>
  <!-- END listrows -->
  </table>
  {EMPTY_MESSAGE}
  <div class="align-center">
!     {TOTAL_ROWS}<br />
!     {PAGE_LABEL} {PAGES}<br />
!     {LIMIT_LABEL} {LIMITS}
  </div>

Index: edit_episode.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/edit_episode.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** edit_episode.tpl	2 Jan 2008 05:02:29 -0000	1.1
--- edit_episode.tpl	6 Jan 2008 00:34:50 -0000	1.2
***************
*** 8,12 ****
      <legend><strong>{MEDIA_LABEL}</strong></legend>
      <p><strong>{MEDIA_ID_LABEL}</strong><br />{MEDIA_ID}</p>
!     <p>I need a media form like the JS image form from filecabinet. This is going to be added to core. Until then, use filecabinet itself to upload your media file, make note of the multimedia_id value there, and then return here and enter it.</p>
  </fieldset>
  <!-- BEGIN settings_label -->
--- 8,12 ----
      <legend><strong>{MEDIA_LABEL}</strong></legend>
      <p><strong>{MEDIA_ID_LABEL}</strong><br />{MEDIA_ID}</p>
!     <p><strong>{MEDIA_NOTE_LABEL}</strong> {MEDIA_NOTE}</p>
  </fieldset>
  <!-- BEGIN settings_label -->

--- NEW FILE: info.tpl ---
<fieldset>
    <legend><strong>{TITLE}</strong></legend>
    <p><strong>{INFO_1_LABEL}</strong> {INFO_1}</p>
    <p><strong>{INFO_2_LABEL}</strong> {INFO_2}</p>
    <p><strong>{INFO_3_LABEL}</strong> {INFO_3}</p>
    <p><strong>{INFO_4_LABEL}</strong> {INFO_4}</p>
</fieldset>

Index: edit_channel.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/edit_channel.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** edit_channel.tpl	2 Jan 2008 05:01:17 -0000	1.2
--- edit_channel.tpl	6 Jan 2008 00:34:50 -0000	1.3
***************
*** 12,15 ****
--- 12,16 ----
      <p>{ITUNES_EXPLICIT} {ITUNES_EXPLICIT_LABEL}</p>
      <p>{ITUNES_CATEGORY} {ITUNES_CATEGORY_LABEL} - {ITUNES_CATEGORY_EXAMPLE}</p>
+     <p><strong>{ITUNES_INFO_LABEL}</strong> {ITUNES_INFO}</p>
  </fieldset>
  <!-- END settings_label -->

--- NEW FILE: block_home.tpl ---
<div class="podcaster-sidebox">
  <div class="box">
    <div class="box-title"><h1>{TITLE}</h1></div>
    <div class="box-content">
        {EPISODE_LABEL}<br />
        {EPISODE_TITLE}<br />
        <span class="smaller">{CHANNEL_LABEL}</span><br />
        {CHANNEL_TITLE}<br />
    </div>
  </div>
</div>

Index: view_rss.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/view_rss.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** view_rss.tpl	2 Jan 2008 05:02:30 -0000	1.1
--- view_rss.tpl	6 Jan 2008 00:34:50 -0000	1.2
***************
*** 5,9 ****
  
      <title>{CHANNEL_TITLE}</title>
!     <link>{HOME_ADDRESS}</link>
      <description>{CHANNEL_DESCRIPTION}</description>
      <language>{LANGUAGE}</language>
--- 5,9 ----
  
      <title>{CHANNEL_TITLE}</title>
!     <link>{CHANNEL_ADDRESS}</link>
      <description>{CHANNEL_DESCRIPTION}</description>
      <language>{LANGUAGE}</language>

Index: edit_settings.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/edit_settings.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** edit_settings.tpl	2 Jan 2008 05:01:17 -0000	1.3
--- edit_settings.tpl	6 Jan 2008 00:34:50 -0000	1.4
***************
*** 3,7 ****
--- 3,9 ----
      <legend><strong>{SETTINGS_LABEL}</strong></legend>
      <p>{CHANNEL_LIMIT} {CHANNEL_LIMIT_LABEL}</p>
+     <p>{CACHE_TIMEOUT} {CACHE_TIMEOUT_LABEL}</p>
      <p>{REQ_APPROVAL} {REQ_APPROVAL_LABEL}</p>
+     <p>{SHOW_BLOCK} {SHOW_BLOCK_LABEL} - {BLOCK_ORDER_BY_RAND_1}{BLOCK_ORDER_BY_RAND_1_LABEL} {BLOCK_ORDER_BY_RAND_2}{BLOCK_ORDER_BY_RAND_2_LABEL} - {BLOCK_ON_HOME_ONLY} {BLOCK_ON_HOME_ONLY_LABEL}</p>
      <p>{EDITOR} {EDITOR_LABEL}</p>
      <p>{WEBMASTER} {WEBMASTER_LABEL}</p>

[phpws-comm-commits] modules/podcaster/locale/en_US/LC_MESSAGES podcaster.po, 1.1, 1.2

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/locale/en_US/LC_MESSAGES
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4231/locale/en_US/LC_MESSAGES

Modified Files:
	podcaster.po 
Log Message:
getting ready for 1.0.4 and release

Index: podcaster.po
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/locale/en_US/LC_MESSAGES/podcaster.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** podcaster.po	2 Jan 2008 05:18:48 -0000	1.1
--- podcaster.po	6 Jan 2008 00:34:49 -0000	1.2
***************
*** 25,29 ****
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2007-12-31 14:43-0500\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--- 25,29 ----
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-05 19:22-0500\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
***************
*** 33,36 ****
--- 33,51 ----
  "Content-Transfer-Encoding: 8bit\n"
  
+ msgid "? Info"
+ msgstr ""
+ 
+ msgid "A note on iTunes categories:"
+ msgstr ""
+ 
+ msgid "A note on media files:"
+ msgstr ""
+ 
+ msgid "A note on permissons:"
+ msgstr ""
+ 
+ msgid "A note on this module:"
+ msgstr ""
+ 
  msgid "Activate"
  msgstr ""
***************
*** 42,45 ****
--- 57,63 ----
  msgstr ""
  
+ msgid "Add an episode below."
+ msgstr ""
+ 
  #, php-format
  msgid "Add episode to %s"
***************
*** 87,90 ****
--- 105,112 ----
  msgstr ""
  
+ msgid ""
+ "Cache duration in seconds for rss feed (0-7200, set to 0 to disable cache)"
+ msgstr ""
+ 
  msgid "Change settings (Unrestricted only)"
  msgstr ""
***************
*** 96,99 ****
--- 118,125 ----
  msgstr ""
  
+ #, php-format
+ msgid "Check your %s then create a %s to begin"
+ msgstr ""
+ 
  msgid "Clean"
  msgstr ""
***************
*** 162,166 ****
  msgstr ""
  
! msgid "Episode submitted successfully."
  msgstr ""
  
--- 188,192 ----
  msgstr ""
  
! msgid "Episode submitted for approval successfully."
  msgstr ""
  
***************
*** 174,177 ****
--- 200,206 ----
  msgstr ""
  
+ msgid "From the  channel..."
+ msgstr ""
+ 
  msgid "General Settings"
  msgstr ""
***************
*** 180,183 ****
--- 209,220 ----
  msgstr ""
  
+ msgid ""
+ "Honestly, I'm still working on understanding the new system completely. I've "
+ "done a basic security audit and although I am sure there is no gross holes, "
+ "I'm sure I may have something wrong too ;-) I wanted to get this rewrite out "
+ "asap and will do a more thorough permissioning review for the next podcaster "
+ "release."
+ msgstr ""
+ 
  msgid "Image"
  msgstr ""
***************
*** 186,189 ****
--- 223,240 ----
  msgstr ""
  
+ msgid "Important Information"
+ msgstr ""
+ 
+ msgid ""
+ "In a future version of podcaster, there will be a media \"mini-app\" "
+ "embedded in add/edit episode forms, like the image mini-app in the add/edit "
+ "channel forms. This is dependant on changes coming to filecabinet. Until "
+ "then, use filecabinet directly to upload your media file into a Multimedia "
+ "folder, make note of the multimedia_id value there, and then return and "
+ "enter it here in the episode's Media_id field. One way you can find the "
+ "multimedia_id is to mouse over the \"Clip\" link for your multimedia file "
+ "and look in your browser's status bar."
+ msgstr ""
+ 
  #, php-format
  msgid "In channel: %s"
***************
*** 217,220 ****
--- 268,277 ----
  msgstr ""
  
+ msgid "Most Recent Episode"
+ msgstr ""
+ 
+ msgid "Most recent"
+ msgstr ""
+ 
  msgid "New Channel"
  msgstr ""
***************
*** 291,295 ****
  msgstr ""
  
! msgid "Require approval"
  msgstr ""
  
--- 348,358 ----
  msgstr ""
  
! msgid "Random"
! msgstr ""
! 
! msgid "Random Episode"
! msgstr ""
! 
! msgid "Require approval for new episodes"
  msgstr ""
  
***************
*** 306,312 ****
--- 369,396 ----
  msgstr ""
  
+ msgid "Show on home only"
+ msgstr ""
+ 
+ msgid "Show podcaster block"
+ msgstr ""
+ 
+ msgid "Sorry, no channels are available at this time."
+ msgstr ""
+ 
+ msgid "Special Note:"
+ msgstr ""
+ 
  msgid "Subscribe RSS"
  msgstr ""
  
+ msgid ""
+ "This is the first rewriting of podcaster for the new 1.x series phpwebsite. "
+ "Although I believe it to be pretty stable, there are still a few things that "
+ "should be pointed out. There are a couple rough edges and a feature that is "
+ "waiting for planned core filecabinet updates. I will release updated "
+ "podcaster versions as they are available. Updating will be easy for the end "
+ "user."
+ msgstr ""
+ 
  msgid "Title"
  msgstr ""
***************
*** 351,352 ****
--- 435,449 ----
  msgid "iTunes Explicit"
  msgstr ""
+ 
+ msgid ""
+ "iTunes categories are used to classify your podcasts in the iTunes podcast "
+ "directory. They are limited and specific. Although it is OK to leave this "
+ "field empty, choosing the correct categories is good for your feed and may "
+ "be used by other podcast directories and readers too. I have not polished "
+ "the interface for choosing iTunes categories yet. It will come in the next "
+ "version of podcaster. For now, you must carefully enter these yourself when "
+ "creating a channel. I have provided a few examples in the categories field, "
+ "and you can click on the link in the channel settings area of an add/edit "
+ "channel form, to see a complete official list that you can copy and paste "
+ "from."
+ msgstr ""

[phpws-comm-commits] modules/podcaster/img rss_sm.png,NONE,1.1

[Verdon V. <ve...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/podcaster/img
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4231/img

Added Files:
	rss_sm.png 
Log Message:
getting ready for 1.0.4 and release

--- NEW FILE: rss_sm.png ---
(This appears to be a binary file; contents omitted.)

[phpws-comm-commits] modules/mailinglists/docs changelog.txt, 1.44, 1.45 credits.txt, 1.7, 1.8

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/mailinglists/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12189/docs

Modified Files:
	changelog.txt credits.txt 
Log Message:
Releasing 1.0.0

Index: changelog.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/mailinglists/docs/changelog.txt,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** changelog.txt	2 Jan 2008 21:59:28 -0000	1.44
--- changelog.txt	4 Jan 2008 17:21:26 -0000	1.45
***************
*** 7,11 ****
  
  
! *cvs
  
      - Complete rewrite to support phpWebSite 1.4.0 and later
--- 7,11 ----
  
  
! *mailinglists-1.0.0 (04 Jan 2008)
  
      - Complete rewrite to support phpWebSite 1.4.0 and later

Index: credits.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/mailinglists/docs/credits.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** credits.txt	3 Jan 2008 15:44:25 -0000	1.7
--- credits.txt	4 Jan 2008 17:21:26 -0000	1.8
***************
*** 14,20 ****
  -----------------------------------------------------------------------
  
! Sourceforge
! http://sourceforge.net
! 
! phpWebsite Development Crew
! http://phpwebsite.appstate.edu
--- 14,19 ----
  -----------------------------------------------------------------------
  
! phpWebsite Development Crew (http://phpwebsite.appstate.edu)
! Tommy de Jesus
! Verdon Vaillancourt
! Sourceforge (http://sourceforge.net)

[phpws-comm-commits] modules/mailinglists/class MyPage.php, 1.1, 1.2

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/mailinglists/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17543/class

Modified Files:
	MyPage.php 
Log Message:
Need to send subscribe text on confirmation.

Index: MyPage.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/mailinglists/class/MyPage.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MyPage.php	2 Jan 2008 21:59:25 -0000	1.1
--- MyPage.php	3 Jan 2008 17:55:09 -0000	1.2
***************
*** 580,584 ****
              $email->setApproved(1);
              $email->setSubject(sprintf(dgettext('mailinglists', 'Welcome to %s'), $list->getName()));
!             $email->setMsgText(str_replace('[LISTNAME]', $list->getName(), $list->getUnsubscribeMsg()));
  
              if (!PHPWS_Error::logIfError($email->save()))
--- 580,584 ----
              $email->setApproved(1);
              $email->setSubject(sprintf(dgettext('mailinglists', 'Welcome to %s'), $list->getName()));
!             $email->setMsgText(str_replace('[LISTNAME]', $list->getName(), $list->getSubscribeMsg()));
  
              if (!PHPWS_Error::logIfError($email->save()))

[phpws-comm-commits] modules/wiki/docs ChangeLog,1.44,1.45

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/wiki/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4280/docs

Modified Files:
	ChangeLog 
Log Message:
Switch to logIfError function

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/wiki/docs/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** ChangeLog	3 Jan 2008 16:29:39 -0000	1.44
--- ChangeLog	3 Jan 2008 17:18:44 -0000	1.45
***************
*** 5,9 ****
  ========================== PHPWEBSITE 1.X.X RELEASES ==========================
  
! *cvs
  
      Updated to new translation functions. (Now requires phpWebSite 1.2.0.)
--- 5,9 ----
  ========================== PHPWEBSITE 1.X.X RELEASES ==========================
  
! *wiki-1.1.0 (03 Jan 2008)
  
      Updated to new translation functions. (Now requires phpWebSite 1.2.0.)
***************
*** 11,14 ****
--- 11,15 ----
      Requesting a restricted page forwards user to the login screen.
      Fixed image on SamplePage and SandBox pages.
+     Changed to use logIfError function in the core.
  
  *wiki-1.0.0 (03 Dec 2006)

[phpws-comm-commits] modules/wiki/class OldWikiPage.php, 1.26, 1.27 WikiPage.php, 1.76, 1.77 WikiSettings.php, 1.14, 1.15

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/wiki/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4280/class

Modified Files:
	OldWikiPage.php WikiPage.php WikiSettings.php 
Log Message:
Switch to logIfError function

Index: OldWikiPage.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/wiki/class/OldWikiPage.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** OldWikiPage.php	28 May 2007 19:00:16 -0000	1.26
--- OldWikiPage.php	3 Jan 2008 17:18:43 -0000	1.27
***************
*** 73,79 ****
          $db->addColumn('display_name');
          $result = $db->select('col');
!         if (PEAR::isError($result))
          {
-             PHPWS_Error::log($result);
              return dgettext('wiki', 'N/A');
          }
--- 73,78 ----
          $db->addColumn('display_name');
          $result = $db->select('col');
!         if (PHPWS_Error::logIfError($result))
          {
              return dgettext('wiki', 'N/A');
          }
***************
*** 129,135 ****
          $db->addColumn('allow_edit');
          $result = $db->select('col');
!         if (PEAR::isError($result))
          {
-             PHPWS_Error::log($result);
              return 0;
          }
--- 128,133 ----
          $db->addColumn('allow_edit');
          $result = $db->select('col');
!         if (PHPWS_Error::logIfError($result))
          {
              return 0;
          }

Index: WikiSettings.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/wiki/class/WikiSettings.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** WikiSettings.php	28 May 2007 19:00:16 -0000	1.14
--- WikiSettings.php	3 Jan 2008 17:18:43 -0000	1.15
***************
*** 273,280 ****
              PHPWS_Settings::set('wiki', 'discussion_anon', 0);
  
!         $result = PHPWS_Settings::save('wiki');
!         if (PEAR::isError($result))
          {
-             PHPWS_Error::log($result);
              return dgettext('wiki', 'There was an error saving the settings.');
          }
--- 273,278 ----
              PHPWS_Settings::set('wiki', 'discussion_anon', 0);
  
!         if (PHPWS_Error::logIfError(PHPWS_Settings::save('wiki')))
          {
              return dgettext('wiki', 'There was an error saving the settings.');
          }

Index: WikiPage.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/wiki/class/WikiPage.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** WikiPage.php	28 May 2007 19:00:16 -0000	1.76
--- WikiPage.php	3 Jan 2008 17:18:43 -0000	1.77
***************
*** 107,113 ****
          $db->addColumn('display_name');
          $result = $db->select('col');
!         if (PEAR::isError($result))
          {
-             PHPWS_Error::log($result);
              return dgettext('wiki', 'N/A');
          }
--- 107,112 ----
          $db->addColumn('display_name');
          $result = $db->select('col');
!         if (PHPWS_Error::logIfError($result))
          {
              return dgettext('wiki', 'N/A');
          }
***************
*** 177,185 ****
              {
                  $db = new PHPWS_DB('wiki_pages');
!                 $result = $db->saveObject($this);
!                 if (PEAR::isError($result))
!                 {
!                     PHPWS_Error::log($result);
!                 }
              }
          }
--- 176,180 ----
              {
                  $db = new PHPWS_DB('wiki_pages');
!                 PHPWS_Error::logIfError($db->saveObject($this));
              }
          }
***************
*** 216,233 ****
          }
  
!         if ($this->allow_edit)
!         {
!             $this->allow_edit = 0;
!         }
!         else
!         {
!             $this->allow_edit = 1;
!         }
! 
!         $result = $this->save(FALSE);
!         if (PEAR::isError($result))
!         {
!             PHPWS_Error::log($result);
!         }
      }
  
--- 211,216 ----
          }
  
!         $this->allow_edit = ($this->allow_edit) ? 0 : 1;
!         PHPWS_Error::logIfError($this->save(FALSE));
      }
  
***************
*** 442,449 ****
  
          $result = $this->save();
!         if (PEAR::isError($result))
          {
!             PHPWS_Error::log($result);
!             WikiManager::sendMessage(dgettext('wiki', 'Page could not be saved.'), array('page'=>$this->getTitle(FALSE)), FALSE);
          }
  
--- 425,432 ----
  
          $result = $this->save();
!         if (PHPWS_Error::logIfError($result))
          {
!             WikiManager::sendMessage(dgettext('wiki', 'Page could not be saved.'),
!                                      array('page'=>$this->getTitle(FALSE)), FALSE);
          }
  
***************
*** 525,532 ****
              $db = new PHPWS_DB('wiki_pages');
              $db->addWhere('id', $this->getId());
!             $result = $db->delete();
!             if (PEAR::isError($result))
              {
-                 PHPWS_Error::log($result);
                  WikiManager::sendMessage(dgettext('wiki', 'Page could not be deleted.'),
                                           array('page'=>$this->getTitle(FALSE)), FALSE);
--- 508,513 ----
              $db = new PHPWS_DB('wiki_pages');
              $db->addWhere('id', $this->getId());
!             if (PHPWS_Error::logIfError($db->delete()))
              {
                  WikiManager::sendMessage(dgettext('wiki', 'Page could not be deleted.'),
                                           array('page'=>$this->getTitle(FALSE)), FALSE);
***************
*** 537,545 ****
  
              $key = new Key($this->key_id);
!             $result = $key->delete();
!             if (PEAR::isError($result))
!             {
!                 PHPWS_Error::log($result);
!             }
  
              WikiManager::sendMessage(sprintf(dgettext('wiki', '%s deleted!'), $this->getTitle()), array(), FALSE);
--- 518,522 ----
  
              $key = new Key($this->key_id);
!             PHPWS_Error::logIfError($key->delete());
  
              WikiManager::sendMessage(sprintf(dgettext('wiki', '%s deleted!'), $this->getTitle()), array(), FALSE);
***************
*** 612,633 ****
          $result = $db->select('col');
  
!         if (PEAR::isError($result))
          {
-             PHPWS_Error::log($result);
              $tags['MESSAGE'] = dgettext('wiki', 'None');
          }
          else
          {
!             if ($result != NULL)
!             {
!                 foreach ($result as $row)
!                 {
!                     $link = PHPWS_Text::moduleLink(WikiManager::formatTitle($row), 'wiki', array('page'=>$row));
!                     $tags['LINKS'] .= PHPWS_Template::process(array('LINK'=>$link), 'wiki', 'whatlinkshere/link.tpl');
!                 }
!             }
!             else
              {
!                 $tags['MESSAGE'] = dgettext('wiki', 'None');
              }
          }
--- 589,602 ----
          $result = $db->select('col');
  
!         if (PHPWS_Error::logIfError($result) || ($result == NULL))
          {
              $tags['MESSAGE'] = dgettext('wiki', 'None');
          }
          else
          {
!             foreach ($result as $row)
              {
!                 $link = PHPWS_Text::moduleLink(WikiManager::formatTitle($row), 'wiki', array('page'=>$row));
!                 $tags['LINKS'] .= PHPWS_Template::process(array('LINK'=>$link), 'wiki', 'whatlinkshere/link.tpl');
              }
          }

[phpws-comm-commits] modules/wiki/boost samplepage.txt, 1.8, 1.9 sandbox.txt, 1.3, 1.4

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/wiki/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18725/boost

Modified Files:
	samplepage.txt sandbox.txt 
Log Message:
Fixed image on SamplePage and SandBox pages.

Index: sandbox.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/wiki/boost/sandbox.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sandbox.txt	25 Jul 2005 04:08:39 -0000	1.3
--- sandbox.txt	3 Jan 2008 16:29:37 -0000	1.4
***************
*** 91,95 ****
  http://c2.com/sig/wiki.gif
  
! [http://phpwebsite.appstate.edu/images/logos/phpwebsite_sicherman_logo1.gif phpWebSite]
  
  ----
--- 91,95 ----
  http://c2.com/sig/wiki.gif
  
! [http://www.web.appstate.edu/images/logo.gif Appalachian State University]
  
  ----

Index: samplepage.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/wiki/boost/samplepage.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** samplepage.txt	23 Oct 2006 02:51:09 -0000	1.8
--- samplepage.txt	3 Jan 2008 16:29:37 -0000	1.9
***************
*** 240,247 ****
  You can use the described-reference URL markup to give the image an ALT tag:
  <code>
! [http://phpwebsite.appstate.edu/images/logos/phpwebsite_sicherman_logo1.gif phpWebSite]
  </code>
  
! [http://phpwebsite.appstate.edu/images/logos/phpwebsite_sicherman_logo1.gif phpWebSite]
  
  ----
--- 240,247 ----
  You can use the described-reference URL markup to give the image an ALT tag:
  <code>
! [http://www.web.appstate.edu/images/logo.gif Appalachian State University]
  </code>
  
! [http://www.web.appstate.edu/images/logo.gif Appalachian State University]
  
  ----

[phpws-comm-commits] modules/wiki/class WikiManager.php,1.67,1.68

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/wiki/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18725/class

Modified Files:
	WikiManager.php 
Log Message:
Fixed image on SamplePage and SandBox pages.

Index: WikiManager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/wiki/class/WikiManager.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** WikiManager.php	29 May 2007 02:43:21 -0000	1.67
--- WikiManager.php	3 Jan 2008 16:29:38 -0000	1.68
***************
*** 246,250 ****
          $tags['IMAGE_UPLOAD_LABEL'] = dgettext('wiki', 'Image Upload');
          $tags['IMAGE_LIST_LABEL']   = dgettext('wiki', 'Image List');
!         $tags['USAGE']              = sprintf(dgettext('wiki', 'To include an image in a page, use %s.'), '[[image picture.jpg]]');
          $tags['LIST_FILENAME']      = dgettext('wiki', 'Filename');
          $tags['LIST_SIZE']          = dgettext('wiki', 'Size');
--- 246,251 ----
          $tags['IMAGE_UPLOAD_LABEL'] = dgettext('wiki', 'Image Upload');
          $tags['IMAGE_LIST_LABEL']   = dgettext('wiki', 'Image List');
!         $tags['USAGE']              = sprintf(dgettext('wiki', 'To include an image in a page, use %s.'),
!                                               '[[image picture.jpg]]');
          $tags['LIST_FILENAME']      = dgettext('wiki', 'Filename');
          $tags['LIST_SIZE']          = dgettext('wiki', 'Size');
***************
*** 310,318 ****
          $db->addColumn('title');
          $result = $db->select('col');
!         if (PEAR::isError($result))
!         {
!             PHPWS_Error::log($result);
!         }
!         else if ($result != NULL)
          {
              PHPWS_Core::reroute(PHPWS_Text::linkAddress('wiki', array('page'=>$result[0])));
--- 311,316 ----
          $db->addColumn('title');
          $result = $db->select('col');
! 
!         if (!PHPWS_Error::logIfError($result) && ($result != NULL))
          {
              PHPWS_Core::reroute(PHPWS_Text::linkAddress('wiki', array('page'=>$result[0])));
***************
*** 338,342 ****
              ($_REQUEST['page_op']=='view') && (PHPWS_Settings::get('wiki', 'what_links_here')))
          {
!             $links[] = PHPWS_Text::moduleLink($linkshere, 'wiki', array('page'=>$_REQUEST['page'], 'page_op'=>'whatlinkshere'));
          }
  
--- 336,341 ----
              ($_REQUEST['page_op']=='view') && (PHPWS_Settings::get('wiki', 'what_links_here')))
          {
!             $links[] = PHPWS_Text::moduleLink($linkshere, 'wiki',
!                                               array('page'=>$_REQUEST['page'], 'page_op'=>'whatlinkshere'));
          }