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

[phpws-comm-commits] modules/openid/class OpenID_Admin.php, 1.1.1.1, 1.2 OpenID_MyPage.php, 1.1, 1.2 OpenID_User.php, 1.2, 1.3

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

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

Modified Files:
	OpenID_Admin.php OpenID_MyPage.php OpenID_User.php 
Log Message:
More work completed on OpenID mapping and new user signup.

Index: OpenID_Admin.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/OpenID_Admin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OpenID_Admin.php	4 Feb 2008 04:54:31 -0000	1.1.1.1
--- OpenID_Admin.php	9 Feb 2008 22:19:05 -0000	1.2
***************
*** 97,100 ****
--- 97,107 ----
          PHPWS_Settings::set('openid', 'allow_openid',    (int)isset($_POST['allow_openid']));
  
+         if (PHPWS_Settings::get('openid', 'no_password_md5') == 0)
+         {
+             /* Generate random MD5 to use as password for accounts created by OpenID.
+              * Only do this once so all accounts with no real password have same MD5. */
+             PHPWS_Settings::set('openid', 'no_password_md5', md5(rand()));
+         }
+ 
          if (isset($_POST['delegate']))
          {

Index: OpenID_User.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/OpenID_User.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OpenID_User.php	6 Feb 2008 04:40:24 -0000	1.2
--- OpenID_User.php	9 Feb 2008 22:19:05 -0000	1.3
***************
*** 44,51 ****
  
                  case 'completeLogin':
!                     $tags['TITLE'] = dgettext('openid', 'First Log In');
                      $tags['CONTENT'] = OpenID_User::completeLogin();
                      break;
  
                  case 'removeMapping':
                      OpenID_User::removeMapping();
--- 44,56 ----
  
                  case 'completeLogin':
!                     $tags['TITLE'] = dgettext('openid', 'New Account Sign-up');
                      $tags['CONTENT'] = OpenID_User::completeLogin();
                      break;
  
+                 case 'createUser':
+                     $tags['TITLE'] = dgettext('openid', 'New Account Sign-up');
+                     $tags['CONTENT'] = OpenID_User::createUser();
+                     break;
+ 
                  case 'removeMapping':
                      OpenID_User::removeMapping();
***************
*** 198,206 ****
                  if (!empty($result))
                  {
!                     // Log in user
!                     $user = new PHPWS_User($result);
!                     $user->login();
!                     $_SESSION['User'] = $user;
!                     PHPWS_Core::returnToBookmark();
                  }
                  else if (Current_User::isLogged())
--- 203,220 ----
                  if (!empty($result))
                  {
!                     if (!Current_User::isLogged())
!                     {
!                         // Log in user
!                         $user = new PHPWS_User($result[0]);
!                         if ($user->approved && $user->active)
!                         {
!                             $user->login();
!                             $_SESSION['User'] = $user;
!                             PHPWS_Core::returnToBookmark();
!                         }
! 
!                         $_SESSION['openid_message'] = dgettext('openid', 'User account for this site is not active.');
!                     }
!                     OpenID_ReturnToBookmark();
                  }
                  else if (Current_User::isLogged())
***************
*** 240,251 ****
      }
  
!     function createUserForm($session_key, $email, $nickname, $fullname)
      {
!         return 'TODO';
      }
  
      function removeMapping()
      {
!         // TODO
  
          OpenID_ReturnToBookmark();
--- 254,352 ----
      }
  
!     function createUserForm($session_key, $email, $nickname, $fullname, $error=NULL)
      {
!         $form = new PHPWS_Form;
!         $form->addHidden('module', 'openid');
!         $form->addHidden('user', 'createUser');
!         $form->addHidden('session_key', $session_key);
! 
!         $form->addText('username', $nickname);
!         $form->setLabel('username', dgettext('openid', 'Username'));
!         $form->setSize('username', 30, 30);
! 
!         $form->addText('displayname', $fullname);
!         $form->setLabel('displayname', dgettext('openid', 'Display Name'));
!         $form->setSize('displayname', 30, 30);
! 
!         $form->addText('email', $email);
!         $form->setLabel('email', dgettext('openid', 'Email Address'));
!         $form->setSize('email', 50, 100);
! 
!         $form->addSubmit('submit', dgettext('openid', 'Finish'));
! 
!         $tags = $form->getTemplate();
!         $tags['INSTRUCTIONS'] = dgettext('openid',
!                                          'Verify your account information then click finish to complete registration.');
!         $tags['OPENID_LABEL'] = dgettext('openid', 'OpenID');
!         $tags['OPENID'] = $_SESSION['openid_identifier'][$session_key];
! 
!         if (is_array($error))
!         {
!             $tags = array_merge($tags, $error);
!         }
! 
!         return PHPWS_Template::process($tags, 'openid', 'createuser.tpl');
!     }
! 
!     function createUser()
!     {
!         PHPWS_Core::initModClass('users', 'Action.php');
!         $user = new PHPWS_User;
! 
!         if (PEAR::isError($user->setUsername($_POST['username'])) || !User_Action::testForbidden($user))
!         {
!             $error['USERNAME_ERROR'] = dgettext('openid', 'Please try another user name.');
!         }
! 
!         if (PEAR::isError($user->setDisplayName($_POST['displayname'])))
!         {
!             $error['DISPLAYNAME_ERROR'] = dgettext('openid', 'Please try another display name.');
!         }
! 
!         if (empty($_POST['email']))
!         {
!             $error['EMAIL_ERROR'] = dgettext('openid', 'Missing an email address.');
!         }
!         else if (PEAR::isError($user->setEmail($_POST['email'])))
!         {
!             $error['EMAIL_ERROR'] = dgettext('openid', 'This email address cannot be used.');
!         }
! 
!         if (is_array($error))
!         {
!             $content = OpenID_User::createUserForm($_POST['session_key'], $_POST['email'],
!                                                    $_POST['username'], $_POST['displayname'], $error);
!         }
!         else
!         {
!             $user->setPassword(PHPWS_Settings::get('openid', 'no_password_md5'), false);
!             $content = User_Action::successfulSignup($user);
! 
!             if ($user->id > 0)
!             {
!                 /* Need to set password again to no_password_md5 password.  The call to
!                 * successfulSignup above will call md5() on the password before saving. */
!                 $user->setPassword(PHPWS_Settings::get('openid', 'no_password_md5'), false);
!                 $user->saveLocalAuthorization();
! 
!                 $db = new PHPWS_DB('openid_mapping');
!                 $values['user_id'] = $user->id;
!                 $values['openid_identifier'] = $_SESSION['openid_identifier'][$_POST['session_key']];
!                 $db->addValue($values);
!                 $db->insert();
! 
!                 unset($_SESSION['openid_identifier'][$_POST['session_key']]);
!             }
!         }
! 
!         return $content;
      }
  
      function removeMapping()
      {
!         $db = new PHPWS_DB('openid_mapping');
!         $db->addWhere('user_id', Current_User::getId());
!         $db->addWhere('id', $_REQUEST['mapping_id']);
!         PHPWS_Error::logIfError($db->count());
  
          OpenID_ReturnToBookmark();

Index: OpenID_MyPage.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/OpenID_MyPage.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OpenID_MyPage.php	6 Feb 2008 04:40:24 -0000	1.1
--- OpenID_MyPage.php	9 Feb 2008 22:19:05 -0000	1.2
***************
*** 71,77 ****
      {
          static $num_openid = 0;
  
          $template['OPENID_IDENTIFIER'] = $row['openid_identifier'];
!         $template['ACTION'] = NULL;
  
          if ($num_openid == 0)
--- 71,78 ----
      {
          static $num_openid = 0;
+         static $no_password = -1;
  
          $template['OPENID_IDENTIFIER'] = $row['openid_identifier'];
!         $template['ACTION'] = '';
  
          if ($num_openid == 0)
***************
*** 86,90 ****
          }
  
!         if (($num_openid > 1) /* || TODO: password set */)
          {
              $vars['user'] = 'removeMapping';
--- 87,104 ----
          }
  
!         if ($no_password == -1)
!         {
!             $db_user = new PHPWS_DB('user_authorization');
!             $db_user->addWhere('username', Current_User::getUsername());
!             $db_user->addWhere('password', PHPWS_Settings::get('openid', 'no_password_md5'));
!             $result = $db_user->count();
!             if (!PHPWS_Error::logIfError($result))
!             {
!                 $no_password = $result;
!             }
!         }
! 
!         /* Only allow user to remove OpenID if this isn't the last OpenID and no password is set. */
!         if (($num_openid > 1) || ($no_password == 0))
          {
              $vars['user'] = 'removeMapping';

[phpws-comm-commits] modules/openid/templates createuser.tpl, NONE, 1.1

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

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

Added Files:
	createuser.tpl 
Log Message:
More work completed on OpenID mapping and new user signup.

--- NEW FILE: createuser.tpl ---
{START_FORM}

<div class="padded">{INSTRUCTIONS}</div>
<div class="padded">
    <strong>{OPENID_LABEL}</strong><br />
    <img src="images/mod/openid/openid_small_logo.png" alt="OpenID" title="OpenID" /> {OPENID}
</div>
<div class="padded">
    <strong>{USERNAME_LABEL}</strong><br />{USERNAME}
    <!-- BEGIN username_error --><div class="error">{USERNAME_ERROR}</div><!-- END username_error -->
</div>
<div class="padded">
    <strong>{DISPLAYNAME_LABEL}</strong><br />{DISPLAYNAME}
    <!-- BEGIN displayname_error --><div class="error">{DISPLAYNAME_ERROR}</div><!-- END displayname_error -->
</div>
<div class="padded">
    <strong>{EMAIL_LABEL}</strong><br />{EMAIL}
    <!-- BEGIN email_error --><div class="error">{EMAIL_ERROR}</div><!-- END email_error -->
</div>
<div class="padded">{SUBMIT}</div>

{END_FORM}

[phpws-comm-commits] modules/openid/inc settings.php,1.1.1.1,1.2

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

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

Modified Files:
	settings.php 
Log Message:
More work completed on OpenID mapping and new user signup.

Index: settings.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/openid/inc/settings.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** settings.php	4 Feb 2008 04:54:30 -0000	1.1.1.1
--- settings.php	9 Feb 2008 22:19:07 -0000	1.2
***************
*** 26,30 ****
                    'delegate'        => 0,
                    'delegate_openid' => '',
!                   'delegate_server' => '');
  
  ?>
\ No newline at end of file
--- 26,31 ----
                    'delegate'        => 0,
                    'delegate_openid' => '',
!                   'delegate_server' => '',
!                   'no_password_md5' => 0);
  
  ?>
\ No newline at end of file

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

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

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

Modified Files:
	PCR_Channel.php PCR_Episode.php PCR_Forms.php Podcaster.php 
Log Message:
near ready for 1.1.0 release

Index: PCR_Episode.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Episode.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PCR_Episode.php	6 Jan 2008 00:34:43 -0000	1.2
--- PCR_Episode.php	9 Feb 2008 19:01:10 -0000	1.3
***************
*** 149,172 ****
          }
  
!         PHPWS_Core::initModClass('filecabinet', 'Multimedia.php');
!         $media = new PHPWS_Multimedia($this->media_id);
!         if (!$media->id) {
!             $media->logErrors();
              return null;
          }
  
!         if ($print) {
! //            return $media->getTag();
! //            return $media->getThumbnail();
!             if ($icon) {
!                 return $media->getJSView(true);
!             } elseif ($text) {
!                 return $media->getJSView(false,$text);
              } else {
!                 return $media->getJSView();
              }
-         } else {
-             return $media;
          }
      }
  
--- 149,197 ----
          }
  
!         PHPWS_Core::initModClass('filecabinet', 'File_Assoc.php');
!         $file = new FC_File_Assoc($this->media_id);
!         if (!$file->id) {
!             $file->logErrors();
              return null;
          }
  
!         if ($file->file_type == 3) {
!             PHPWS_Core::initModClass('filecabinet', 'Multimedia.php');
!             $media = new PHPWS_Multimedia($file->file_id);
!             if (!$media->id) {
!                 $media->logErrors();
!                 return null;
!             }
!             if ($print) {
!                 if ($icon) {
!                     return $media->getJSView(true);
!                 } elseif ($text) {
!                     return $media->getJSView(false,$text);
!                 } else {
!                     return $media->getJSView();
!                 }
              } else {
!                 return $media;
!             }
!         } elseif ($file->file_type == 2) {
!             PHPWS_Core::initModClass('filecabinet', 'Document.php');
!             $media = new PHPWS_Document($file->file_id);
!             if (!$media->id) {
!                 $media->logErrors();
!                 return null;
!             }
!             if ($print) {
!                 if ($icon) {
!                     return $media->getViewLink(true, 'icon');
!                 } elseif ($text) {
!                     return $media->getViewLink(true, 'title');
!                 } else {
!                     return $media->getTag();
!                 }
!             } else {
!                 return $media;
              }
          }
+ 
      }
  
***************
*** 414,418 ****
          }
  
-     /* not sure if I need the key stuff */
          $key = new Key($this->key_id);
  
--- 439,442 ----
***************
*** 440,443 ****
--- 464,469 ----
          $template['EPISODE_LINKS'] = $this->episodeLinks();
  
+         $key->flag();
+ 
          return PHPWS_Template::process($template, 'podcaster', 'view_episode.tpl');
  

Index: Podcaster.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/Podcaster.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Podcaster.php	9 Jan 2008 21:41:12 -0000	1.4
--- Podcaster.php	9 Feb 2008 19:01:10 -0000	1.5
***************
*** 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');
--- 130,133 ----
***************
*** 401,405 ****
                                    'link'=>$link);
          }
!         if (Current_User::allow('podcaster', 'edit_channel') || Current_User::allow('podcaster', 'edit_episode')){
              $tags['info'] = array('title'=>dgettext('podcaster', 'Read me'),
                                   'link'=>$link);
--- 399,403 ----
                                    'link'=>$link);
          }
!         if (Current_User::isUnrestricted('podcaster')) {
              $tags['info'] = array('title'=>dgettext('podcaster', 'Read me'),
                                   'link'=>$link);
***************
*** 479,482 ****
--- 477,484 ----
          }
  
+         if (isset($_POST['media_type'])) {
+             $this->channel->setMedia_type((int)$_POST['media_type']);
+         }
+ 
          if (isset($_POST['itunes_explicit'])) {
              $this->channel->setItunes_explicit((int)$_POST['itunes_explicit']);

Index: PCR_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Forms.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PCR_Forms.php	9 Jan 2008 21:41:12 -0000	1.5
--- PCR_Forms.php	9 Feb 2008 19:01:10 -0000	1.6
***************
*** 98,108 ****
  
          PHPWS_Core::initModClass('filecabinet', 'Cabinet.php');
!         $manager = Cabinet::imageManager($channel->image_id, 'image_id',
!                                          PHPWS_Settings::get('podcaster', 'max_width'),
!                                          PHPWS_Settings::get('podcaster', 'max_height'),
!                                          PHPWS_Settings::get('podcaster', 'mod_folders_only'));
          if ($manager) {
!             $form->addTplTag('IMAGE_MANAGER', $manager->get());
!             $form->addTplTag('IMAGE_LABEL', dgettext('podcaster', 'Image'));
          }
  
--- 98,108 ----
  
          PHPWS_Core::initModClass('filecabinet', 'Cabinet.php');
!         $manager = Cabinet::fileManager('image_id', $channel->image_id);
!         $manager->imageOnly();
!         $manager->maxImageWidth(PHPWS_Settings::get('podcaster', 'max_width'));
!         $manager->maxImageHeight(PHPWS_Settings::get('podcaster', 'max_height'));
! 
          if ($manager) {
!             $form->addTplTag('FILE_MANAGER', $manager->get());
          }
  
***************
*** 113,116 ****
--- 113,121 ----
          }
          
+         $choices = array ('0' => dgettext('podcaster', 'Audio/Video'), '1' => dgettext('podcaster', 'Document'));
+         $form->addSelect('media_type', $choices);
+         $form->setLabel('media_type', dgettext('podcaster', 'Media type for this channel'));
+         $form->setMatch('media_type', $channel->getMedia_type());
+ 
          $choices = array ('0' => dgettext('podcaster', 'No'), '1' => dgettext('podcaster', 'Yes'), '2' => dgettext('podcaster', 'Clean'));
          $form->addSelect('itunes_explicit', $choices);
***************
*** 169,175 ****
          $form->setLabel('description', dgettext('podcaster', 'Description'));
  
!         $form->addText('media_id', $this->podcaster->episode->media_id);
!         $form->setSize('media_id', 5);
!         $form->setLabel('media_id', dgettext('podcaster', 'Media_id'));
  
          if (Current_User::isUnrestricted('podcaster')) {
--- 174,188 ----
          $form->setLabel('description', dgettext('podcaster', 'Description'));
  
!         PHPWS_Core::initModClass('filecabinet', 'Cabinet.php');
!         $manager = Cabinet::fileManager('media_id', $this->podcaster->episode->media_id);
!         if ($this->podcaster->channel->media_type == 0) {
!             $manager->mediaOnly();
!         } elseif ($this->podcaster->channel->media_type == 1) {
!             $manager->documentOnly();
!         }
! 
!         if ($manager) {
!             $form->addTplTag('FILE_MANAGER', $manager->get());
!         }
  
          if (Current_User::isUnrestricted('podcaster')) {
***************
*** 186,191 ****
          $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');
--- 199,202 ----
***************
*** 223,226 ****
--- 234,238 ----
          $pager->addPageTags($ptags);
          $pager->addToggle('class="toggle1"');
+         $pager->setSearch('title', 'description');
  
          $this->podcaster->content = $pager->get();
***************
*** 256,259 ****
--- 268,272 ----
          $pager->addPageTags($ptags);
          $pager->addToggle('class="toggle1"');
+         $pager->setSearch('title', 'description');
  
          if (isset($channel_id)) {
***************
*** 316,320 ****
          $form->setLabel('rm_media', dgettext('podcaster', 'Delete media from filecabinet when deleting episode'));
  
- 
          $form->addTextField('max_width', PHPWS_Settings::get('podcaster', 'max_width'));
          $form->setLabel('max_width', dgettext('podcaster', 'Maximum image width (50-600)'));
--- 329,332 ----
***************
*** 345,353 ****
          $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_3_LABEL'] = null;
          $tpl['INFO_3'] = null;
--- 357,363 ----
          $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 second release of podcaster for the new 1.x series phpwebsite. This release takes advantage of the new File Cabinet 2.0 features, and media upload/embed tools are now built right in. Support for PDF and other documents types has also been added.');
!         $tpl['INFO_2_LABEL'] = dgettext('podcaster', 'A note on media types:');
!         $tpl['INFO_2'] = dgettext('podcaster', 'You may specify at a channel level what media type you will allow for all episodes in that channel. Ideally, you should determine this before adding episodes to a channel, though it can be changed at any time.');
          $tpl['INFO_3_LABEL'] = null;
          $tpl['INFO_3'] = null;
***************
*** 356,359 ****
--- 366,370 ----
          $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.');
+         $tpl['DONATE'] = sprintf(dgettext('podcaster', 'If you would like to help out with the ongoing development of Podcaster, %s click here to donate %s.'), '<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=donations%40verdon%2eca&item_name=Podcaster%20Module%20Development&no_shipping=0&no_note=1&tax=0&currency_code=USD&lc=CA&bn=PP%2dDonationsBF&charset=UTF%2d8" target="new">', '</a>');
  
          $this->podcaster->title = dgettext('podcaster', 'Read me');

Index: PCR_Channel.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Channel.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PCR_Channel.php	9 Jan 2008 21:41:12 -0000	1.3
--- PCR_Channel.php	9 Feb 2008 19:01:10 -0000	1.4
***************
*** 30,33 ****
--- 30,34 ----
      var $description    = null;
      var $image_id       = 0;
+     var $media_type     = 0;
      var $date_created   = 0;
      var $date_updated   = 0;
***************
*** 91,94 ****
--- 92,101 ----
  
  
+     function setMedia_type($media_type)
+     {
+         $this->media_type = $media_type;
+     }
+ 
+ 
      function setItunes_explicit($itunes_explicit)
      {
***************
*** 158,161 ****
--- 165,176 ----
  
  
+     function getFile()
+     {
+         if (!$this->image_id) {
+             return null;
+         }
+         return Cabinet::getTag($this->image_id);
+     }
+ 
      function getImage($print=false)
      {
***************
*** 189,199 ****
  
  
!     function getItunes_explicit($print=false)
      {
!         if (empty($this->itunes_explicit)) {
              return null;
          }
  
          if ($print) {
              if ($this->itunes_explicit == '0') 
                  return dgettext('podcaster', 'No');
--- 204,227 ----
  
  
!     function getMedia_type($print=false)
      {
!         if (empty($this->media_type)) {
              return null;
          }
  
          if ($print) {
+             if ($this->media_type == '0') 
+                 return dgettext('podcaster', 'Audio/Video');
+             if ($this->media_type == '1') 
+                 return dgettext('podcaster', 'Document');
+         } else {
+             return $this->media_type;
+         }
+     }
+ 
+ 
+     function getItunes_explicit($print=false)
+     {
+         if ($print) {
              if ($this->itunes_explicit == '0') 
                  return dgettext('podcaster', 'No');
***************
*** 203,206 ****
--- 231,237 ----
                  return dgettext('podcaster', 'Clean');
          } else {
+             if (empty($this->itunes_explicit)) {
+                 return null;
+             }
              return $this->itunes_explicit;
          }
***************
*** 241,245 ****
          }
  
-         /* not sure if I need the key stuff */
          $key = new Key($this->key_id);
  
--- 272,275 ----
***************
*** 251,255 ****
          $template['TITLE'] = $this->getTitle(true);
          $template['DESCRIPTION'] = PHPWS_Text::parseTag($this->getDescription(true));
!         $template['IMAGE'] = $this->getImage(true);
  
          if (Current_User::allow('podcaster', 'edit_episode')) {
--- 281,286 ----
          $template['TITLE'] = $this->getTitle(true);
          $template['DESCRIPTION'] = PHPWS_Text::parseTag($this->getDescription(true));
! //        $template['IMAGE'] = $this->getImage(true);
!         $template['IMAGE'] = $this->getFile();
  
          if (Current_User::allow('podcaster', 'edit_episode')) {
***************
*** 289,292 ****
--- 320,324 ----
          }
  
+         $key->flag();
  
          return PHPWS_Template::process($template, 'podcaster', 'view_channel.tpl');
***************
*** 506,516 ****
  
  
-     function flag()
-     {
-         $key = new Key($this->key_id);
-         $key->flag();
-     }
-  
- 
      function loadFeeds()
      {
--- 538,541 ----
***************
*** 563,567 ****
          $template['CHANNEL_DESCRIPTION'] = strip_tags($this->description);
          $template['CHANNEL_DESCRIPTION_PREAMBLE'] = substr(ltrim(strip_tags(str_replace('<br />', ' ', $this->description))), 0, 60);
!         $template['LANGUAGE']            = CURRENT_LANGUAGE; // change later
          $template['SEARCH_LINK']         = sprintf('%sindex.php?module=search&amp;mod_title=podcaster&amp;user=search', $home_http);
          $template['SEARCH_DESCRIPTION']  = sprintf('Search in %s', $this->title);
--- 588,592 ----
          $template['CHANNEL_DESCRIPTION'] = strip_tags($this->description);
          $template['CHANNEL_DESCRIPTION_PREAMBLE'] = substr(ltrim(strip_tags(str_replace('<br />', ' ', $this->description))), 0, 60);
!         $template['LANGUAGE']            = substr(ltrim(CURRENT_LANGUAGE), 0, 2); // change later
          $template['SEARCH_LINK']         = sprintf('%sindex.php?module=search&amp;mod_title=podcaster&amp;user=search', $home_http);
          $template['SEARCH_DESCRIPTION']  = sprintf('Search in %s', $this->title);
***************
*** 569,574 ****
          $template['THUMB_URL']           = $home_http . $image->file_directory . $image->file_name;
          $template['COPYRIGHT']           = PHPWS_Settings::get('podcaster', 'copyright');
!         $template['WEBMASTER']           = PHPWS_Settings::get('podcaster', 'webmaster');
!         $template['MANAGING_EDITOR']     = PHPWS_Settings::get('podcaster', 'editor');
          $template['LAST_BUILD_DATE']     = gmstrftime('%a, %d %b %Y %R GMT', mktime());
          $template['ITUNES_EXPLICIT']     = $this->getItunes_explicit(true);
--- 594,599 ----
          $template['THUMB_URL']           = $home_http . $image->file_directory . $image->file_name;
          $template['COPYRIGHT']           = PHPWS_Settings::get('podcaster', 'copyright');
!         $template['WEBMASTER']           = PHPWS_Settings::get('podcaster', 'webmaster') . '(' . dgettext('podcaster', 'Webmaster') . ')';
!         $template['MANAGING_EDITOR']     = PHPWS_Settings::get('podcaster', 'editor') . '(' . dgettext('podcaster', 'Managing Editor') . ')';
          $template['LAST_BUILD_DATE']     = gmstrftime('%a, %d %b %Y %R GMT', mktime());
          $template['ITUNES_EXPLICIT']     = $this->getItunes_explicit(true);

[phpws-comm-commits] modules/podcaster/boost boost.php, 1.3, 1.4 dependency.xml, 1.2, 1.3 install.sql, 1.3, 1.4 uninstall.php, 1.3, 1.4 update.php, 1.12, 1.13

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

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

Modified Files:
	boost.php dependency.xml install.sql uninstall.php update.php 
Log Message:
near ready for 1.1.0 release

Index: install.sql
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/install.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** install.sql	9 Jan 2008 21:41:09 -0000	1.3
--- install.sql	9 Feb 2008 19:01:09 -0000	1.4
***************
*** 9,12 ****
--- 9,13 ----
      description text,
      image_id INT NOT NULL default 0,
+     media_type smallint NOT NULL default 0,
      date_created int NOT NULL default 0,
      date_updated int NOT NULL default 0,

Index: uninstall.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/uninstall.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** uninstall.php	10 Jan 2008 00:37:37 -0000	1.3
--- uninstall.php	9 Feb 2008 19:01:09 -0000	1.4
***************
*** 45,54 ****
              $num = count($episodes);
              foreach ($episodes as $episode) {
!                 PHPWS_Core::initModClass('filecabinet', 'Multimedia.php');
!                 $media = new PHPWS_Multimedia($episode->media_id);
!                 $result = $media->delete();
!                 if (PEAR::isError($result)) {
!                     PHPWS_Error::log($result);
!                     $error = true;
                  }
              }
--- 45,55 ----
              $num = count($episodes);
              foreach ($episodes as $episode) {
!                 $media = $episode->getMedia();
!                 if ($media) {
!                     $result = $media->delete();
!                     if (PEAR::isError($result)) {
!                         PHPWS_Error::log($result);
!                         $error = true;
!                     }
                  }
              }

Index: dependency.xml
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/dependency.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dependency.xml	6 Jan 2008 00:34:42 -0000	1.2
--- dependency.xml	9 Feb 2008 19:01:09 -0000	1.3
***************
*** 10,14 ****
      <title>filecabinet</title>
      <properName>File Cabinet</properName>
!     <version>1.4.2</version>
      <url>http://phpwebsite.appstate.edu/downloads/modules/filecabinet/</url>
    </module>
--- 10,14 ----
      <title>filecabinet</title>
      <properName>File Cabinet</properName>
!     <version>2.0.0</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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** boost.php	10 Jan 2008 00:47:51 -0000	1.3
--- boost.php	9 Feb 2008 19:01:09 -0000	1.4
***************
*** 24,28 ****
  
  $proper_name  = 'Podcaster';
! $version      = '1.0.5';
  $import_sql   = true;
  $version_http = 'http://verdon.ca/downloads/modules/podcaster/check.xml';
--- 24,28 ----
  
  $proper_name  = 'Podcaster';
! $version      = '1.1.0';
  $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.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** update.php	11 Jan 2008 15:53:26 -0000	1.12
--- update.php	9 Feb 2008 19:01:09 -0000	1.13
***************
*** 129,132 ****
--- 129,182 ----
  
  
+     case version_compare($currentVersion, '1.1.0', '<'):
+         $result = PHPWS_DB::importFile(PHPWS_SOURCE_DIR . 'mod/podcaster/boost/sql_update_110.sql');
+         if (PEAR::isError($result)) {
+             PHPWS_Error::log($result);
+             $content[] = '+ Unable to upgrade the channel table.';
+             return false;
+         } else {
+             $content[] = '<pre>';
+             $content[] = '--- Upgraded channel table.';
+     
+             $files = array('templates/edit_channel.tpl',
+                            'templates/edit_episode.tpl',
+                            'templates/view_channel.tpl',
+                            'templates/view_episode.tpl',
+                            'templates/list_channel.tpl',
+                            'templates/list_episode.tpl',
+                            'templates/list_episode_channel.tpl',
+                            'templates/view_rss.tpl',
+                            'templates/info.tpl'
+             );
+             podcasterUpdateFiles($files, $content);
+             PHPWS_Core::initModClass('filecabinet', 'Cabinet.php');
+             if (Cabinet::convertImagesToFileAssoc('podcaster_channel', 'image_id')) {
+                 $content[] = '--- Converted channel images to new File Cabinet format.';
+             } else {
+                 $content[] = '--- Could not convert channel images to new File Cabinet format.</pre>';
+                 return false;
+             }
+             if (Cabinet::convertMediaToFileAssoc('podcaster_episode', 'media_id')) {
+                 $content[] = '--- Converted episode media to new File Cabinet format.';
+             } else {
+                 $content[] = '--- Could not convert episode media to new File Cabinet format.</pre>';
+                 return false;
+             }
+     
+             $content[] = '
+ 1.1.0 changes
+ ----------------
+ + Added support for File Cabinet 2.0 features
+ + Added support for document types to episodes
+ + Improved the use of phpws key on channels and episodes, 
+   allows for phpws categorization, etc
+ + Some minor tweaks to view channel and episode templates
+ + Added search to list and archive views
+ + Resolved some validation issues with rss feed
+ 
+ </pre>';
+         }
+ 
+ 
  
      } // end switch

[phpws-comm-commits] modules/podcaster/templates edit_channel.tpl, 1.4, 1.5 edit_episode.tpl, 1.2, 1.3 info.tpl, 1.3, 1.4 list_channel.tpl, 1.2, 1.3 list_episode.tpl, 1.2, 1.3 list_episode_channel.tpl, 1.2, 1.3 view_channel.tpl, 1.4, 1.5 view_episode.tpl, 1.1, 1.2 view_rss.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-serv1055/templates

Modified Files:
	edit_channel.tpl edit_episode.tpl info.tpl list_channel.tpl 
	list_episode.tpl list_episode_channel.tpl view_channel.tpl 
	view_episode.tpl view_rss.tpl 
Log Message:
near ready for 1.1.0 release

Index: info.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/info.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** info.tpl	9 Jan 2008 21:41:19 -0000	1.3
--- info.tpl	9 Feb 2008 19:01:13 -0000	1.4
***************
*** 6,8 ****
--- 6,9 ----
      <!-- 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 -->
+     <!-- BEGIN donate --><p>{DONATE}</p><!-- END donate -->
  </fieldset>

Index: list_episode_channel.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/list_episode_channel.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** list_episode_channel.tpl	6 Jan 2008 00:34:50 -0000	1.2
--- list_episode_channel.tpl	9 Feb 2008 19:01:13 -0000	1.3
***************
*** 22,23 ****
--- 22,26 ----
      {LIMIT_LABEL} {LIMITS}
  </div>
+ <div class="align-right">
+     {SEARCH}
+ </div>

Index: view_episode.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/view_episode.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** view_episode.tpl	2 Jan 2008 05:02:30 -0000	1.1
--- view_episode.tpl	9 Feb 2008 19:01:13 -0000	1.2
***************
*** 1,6 ****
  <div id="podcaster-episode">
-     <div style="float: right; margin: 0 0 .2em .5em;">{IMAGE}</div>
      <p>{DESCRIPTION}</p>
!     <div style="clear: both;">{EPISODE_LINKS}</div>
      {MEDIA}
  </div>
--- 1,5 ----
  <div id="podcaster-episode">
      <p>{DESCRIPTION}</p>
!     <div>{EPISODE_LINKS}</div>
      {MEDIA}
  </div>

Index: list_episode.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/list_episode.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** list_episode.tpl	6 Jan 2008 00:34:50 -0000	1.2
--- list_episode.tpl	9 Feb 2008 19:01:13 -0000	1.3
***************
*** 24,25 ****
--- 24,28 ----
      {LIMIT_LABEL} {LIMITS}
  </div>
+ <div class="align-right">
+     {SEARCH}
+ </div>

Index: edit_episode.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/edit_episode.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** edit_episode.tpl	6 Jan 2008 00:34:50 -0000	1.2
--- edit_episode.tpl	9 Feb 2008 19:01:13 -0000	1.3
***************
*** 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 -->
--- 8,12 ----
      <legend><strong>{MEDIA_LABEL}</strong></legend>
      <p><strong>{MEDIA_ID_LABEL}</strong><br />{MEDIA_ID}</p>
!     <p>{FILE_MANAGER}</p>
  </fieldset>
  <!-- BEGIN settings_label -->

Index: list_channel.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/list_channel.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** list_channel.tpl	6 Jan 2008 00:34:50 -0000	1.2
--- list_channel.tpl	9 Feb 2008 19:01:13 -0000	1.3
***************
*** 22,23 ****
--- 22,26 ----
      {LIMIT_LABEL} {LIMITS}
  </div>
+ <div class="align-right">
+     {SEARCH}
+ </div>

Index: view_channel.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/view_channel.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** view_channel.tpl	2 Jan 2008 05:01:17 -0000	1.4
--- view_channel.tpl	9 Feb 2008 19:01:13 -0000	1.5
***************
*** 2,6 ****
      <div style="float: right; margin: 0 0 .2em .5em;">{IMAGE}</div>
      <p>{DESCRIPTION}</p>
!     <div style="clear: both;">{CHANNEL_LINKS}</div>
      <!-- BEGIN empty --><p>{EMPTY}</p><!-- END empty -->
      <!-- BEGIN current-episodes -->
--- 2,7 ----
      <div style="float: right; margin: 0 0 .2em .5em;">{IMAGE}</div>
      <p>{DESCRIPTION}</p>
!     <br style="clear: right;" />
!     <div>{CHANNEL_LINKS}</div>
      <!-- BEGIN empty --><p>{EMPTY}</p><!-- END empty -->
      <!-- BEGIN current-episodes -->

Index: edit_channel.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/edit_channel.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** edit_channel.tpl	9 Jan 2008 21:41:19 -0000	1.4
--- edit_channel.tpl	9 Feb 2008 19:01:13 -0000	1.5
***************
*** 5,12 ****
--- 5,14 ----
      <p>{DESCRIPTION} {DESCRIPTION_LABEL}</p>
      <p>{IMAGE_MANAGER} {IMAGE_MANAGER_LABEL}</p>
+     <p>{FILE_MANAGER}</p>
  </fieldset>
  <!-- BEGIN settings_label -->
  <fieldset>
      <legend><strong>{SETTINGS_LABEL}</strong></legend>
+     <p>{MEDIA_TYPE} {MEDIA_TYPE_LABEL}</p>
      <p>{ACTIVE} {ACTIVE_LABEL}</p>
      <p>{ITUNES_EXPLICIT} {ITUNES_EXPLICIT_LABEL}</p>

Index: view_rss.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/view_rss.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** view_rss.tpl	6 Jan 2008 00:34:50 -0000	1.2
--- view_rss.tpl	9 Feb 2008 19:01:13 -0000	1.3
***************
*** 1,4 ****
  <?xml version="1.0" encoding="utf-8"?>
! <rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" xmlns:pp="http://www.pupuplayer.com/ppexplination-rtf" version="2.0">
  
  <channel>
--- 1,4 ----
  <?xml version="1.0" encoding="utf-8"?>
! <rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
  
  <channel>
***************
*** 6,9 ****
--- 6,10 ----
      <title>{CHANNEL_TITLE}</title>
      <link>{CHANNEL_ADDRESS}</link>
+     <atom:link href="{CHANNEL_ADDRESS}" rel="self" type="application/rss+xml" />
      <description>{CHANNEL_DESCRIPTION}</description>
      <language>{LANGUAGE}</language>
***************
*** 26,35 ****
      <image>
          <url>{THUMB_URL}</url>
!         <title>{PAGE_TITLE}</title>
          <link>{HOME_ADDRESS}</link>
      </image>
      {ITUNES_CATEGORY}
      <itunes:explicit>{ITUNES_EXPLICIT}</itunes:explicit>
-     <pp:media  image="{THUMB_URL}" link="{HOME_ADDRESS}" />
  
      <!-- BEGIN item-listing -->
--- 27,35 ----
      <image>
          <url>{THUMB_URL}</url>
!         <title>{CHANNEL_TITLE}</title>
          <link>{HOME_ADDRESS}</link>
      </image>
      {ITUNES_CATEGORY}
      <itunes:explicit>{ITUNES_EXPLICIT}</itunes:explicit>
  
      <!-- BEGIN item-listing -->
***************
*** 39,43 ****
          <description>{ITEM_DESCRIPTION}</description>
          <enclosure url="{ITEM_URL}" length="{ITEM_LENGTH}" type="{ITEM_TYPE}" />
!         <author>{ITEM_AUTHOR}</author>
          <pubDate>{ITEM_PUBDATE}</pubDate>
          <guid isPermaLink="true">{ITEM_GUID}</guid>
--- 39,43 ----
          <description>{ITEM_DESCRIPTION}</description>
          <enclosure url="{ITEM_URL}" length="{ITEM_LENGTH}" type="{ITEM_TYPE}" />
!         <dc:creator>{ITEM_AUTHOR}</dc:creator>
          <pubDate>{ITEM_PUBDATE}</pubDate>
          <guid isPermaLink="true">{ITEM_GUID}</guid>

[phpws-comm-commits] modules/podcaster/docs CHANGELOG, 1.5, 1.6 TODO, 1.8, 1.9

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

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

Modified Files:
	CHANGELOG TODO 
Log Message:
near ready for 1.1.0 release

Index: TODO
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/TODO,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TODO	10 Jan 2008 00:41:57 -0000	1.8
--- TODO	9 Feb 2008 19:01:11 -0000	1.9
***************
*** 7,18 ****
  A: take another look at restricted vs unrestricted correct usage
  
- Q: put logic in (channel level?) to specify multimedia or document in episode class
- A: future version (1.1 or 1.2?) BUT I may not have to for filecabinet 1.5
- 
- Q: embedd multimedia javascript app
- A: waiting for filecabinet changes (fc 1.5)
- 
  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
--- 7,14 ----
  A: take another look at restricted vs unrestricted correct usage
  
  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 or something. still needs thought
! 
! 

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/CHANGELOG,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CHANGELOG	11 Jan 2008 15:51:57 -0000	1.5
--- CHANGELOG	9 Feb 2008 19:01:11 -0000	1.6
***************
*** 1,5 ****
  Version 1.0.5 -- Jan 2008
  ------------------------------------------------------------------
! Jan 09 2008
  + Added database table and class for iTunes categories
  + Improved iTunes categories functions in channel and form class
--- 1,17 ----
+ Version 1.1.0 -- Feb 2008
+ ------------------------------------------------------------------
+ Jan 30 - Feb 09
+ + Added support for File Cabinet 2.0 features
+ + Added support for document types to episodes
+ + Improved the use of phpws key on channels and episodes, 
+   allows for phpws categorization, etc
+ + Some minor tweaks to view channel and episode templates
+ + Added search to list and archive views
+ + Resolved some validation issues with rss feed
+ 
+ 
  Version 1.0.5 -- Jan 2008
  ------------------------------------------------------------------
! Jan 09-11 2008
  + Added database table and class for iTunes categories
  + Improved iTunes categories functions in channel and form class

[phpws-comm-commits] modules/rolodex/boost demographics.php, 1.1.1.1, 1.2 permission.php, 1.1.1.1, 1.2

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

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

Modified Files:
	demographics.php permission.php 
Log Message:
some tidy up, resolved list search and sort

Index: demographics.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/demographics.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** demographics.php	4 Feb 2008 03:09:14 -0000	1.1.1.1
--- demographics.php	8 Feb 2008 19:38:45 -0000	1.2
***************
*** 66,68 ****
  
  
! ?>
--- 66,68 ----
  
  
! ?>
\ No newline at end of file

Index: permission.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/permission.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** permission.php	4 Feb 2008 03:09:15 -0000	1.1.1.1
--- permission.php	8 Feb 2008 19:38:45 -0000	1.2
***************
*** 29,33 ****
  $permissions['delete_member']  = dgettext('rolodex', 'Delete member');
  $permissions['view_privates']  = dgettext('rolodex', 'View private members');
! $permissions['settings']       = dgettext('rolodex', 'Change settings (Unrestricted only)');
  
  ?>
\ No newline at end of file
--- 29,33 ----
  $permissions['delete_member']  = dgettext('rolodex', 'Delete member');
  $permissions['view_privates']  = dgettext('rolodex', 'View private members');
! $permissions['settings']       = dgettext('rolodex', 'Utilities & Change settings (Unrestricted only)');
  
  ?>
\ No newline at end of file

[phpws-comm-commits] modules/rolodex/class RDX_Forms.php, 1.3, 1.4 RDX_Member.php, 1.2, 1.3 RDX_Mypage.php, 1.1.1.1, 1.2 Rolodex.php, 1.2, 1.3

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

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

Modified Files:
	RDX_Forms.php RDX_Member.php RDX_Mypage.php Rolodex.php 
Log Message:
some tidy up, resolved list search and sort

Index: RDX_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RDX_Forms.php	4 Feb 2008 19:29:43 -0000	1.3
--- RDX_Forms.php	8 Feb 2008 19:38:48 -0000	1.4
***************
*** 171,180 ****
  
          /* the default sort order */
!         $pager->setOrder($sortby, 'asc');
  
-         /* experiments with advanced join for sort link - moved up to default sort logic */
- //        $pager->joinResult('source_col', 'jointotable', 'jointocol', 'coltoreturn', 'optionalalias');
- //        $pager->joinResult('rolodex_member.user_id', 'demographics', 'demographics.user_id', 'last_name', 'title');
- //        $pager->joinResult('user_id', 'demographics', 'user_id', 'last_name', 'title');
  
          /* setup the list page */
--- 171,176 ----
  
          /* the default sort order */
!         $pager->setOrder($sortby, 'asc', true);
  
  
          /* setup the list page */
***************
*** 189,202 ****
                  $vars2['tab']  = 'new';
                  if (isset($approved) && $approved == 1) {
!                     $ptags['EMPTY_MESSAGE'] = sprintf(dgettext('rolodex', 'Check your %s then create a %s to begin'), PHPWS_Text::secureLink(dgettext('rolodex', 'Settings'), 'rolodex', $vars),  PHPWS_Text::secureLink(dgettext('rolodex', 'New Member'), 'rolodex', $vars2));
                  }
              } else {
!                 $ptags['EMPTY_MESSAGE'] = dgettext('rolodex', 'Sorry, no members are available at this time. Try broadening your search or returning later.');
              }
          }
          $pager->addPageTags($ptags);
          $pager->addToggle('class="toggle1"');
! ///        $pager->setSearch('demographics.business_name', 'demographics.first_name', 'demographics.last_name');
!         $pager->setSearch('title');
  
          /* debug stuff */
--- 185,198 ----
                  $vars2['tab']  = 'new';
                  if (isset($approved) && $approved == 1) {
!                     $pager->setEmptyMessage(sprintf(dgettext('rolodex', 'Check your %s then create a %s to begin'), PHPWS_Text::secureLink(dgettext('rolodex', 'Settings'), 'rolodex', $vars),  PHPWS_Text::secureLink(dgettext('rolodex', 'New Member'), 'rolodex', $vars2)));
                  }
              } else {
!                 $pager->setEmptyMessage(dgettext('rolodex', 'Sorry, no members are available at this time. Try broadening your search or returning later.'));
              }
          }
          $pager->addPageTags($ptags);
          $pager->addToggle('class="toggle1"');
! //        $pager->setSearch('last_name','title'); // the alias doesn't work here so we do the below
!         $pager->setSearch('demographics.business_name', 'demographics.first_name', 'demographics.last_name');
  
          /* debug stuff */
***************
*** 397,401 ****
              $form->addSubmit('save', dgettext('rolodex', 'Continue'));
          } else {
- //            $tpl['NO_USERS_NOTE'] = dgettext('rolodex', 'Sorry, there are no users available. You will have to create a user account first.');
              $form->addTplTag('NO_USERS_NOTE', dgettext('rolodex', 'Sorry, there are no users available. You will have to create a user account first.'));
          }
--- 393,396 ----
***************
*** 653,656 ****
--- 648,673 ----
          $tpl = $form->getTemplate();
  
+ /* begin experiment with cats */
+         $key = new Key($member->key_id);
+         PHPWS_Core::initModClass('categories', 'Categories.php');
+         if (javascriptEnabled()) {
+             $js_vars['label'] = dgettext('categories', 'Categorize');
+             $js_vars['width'] = 640;
+             $js_vars['height'] = 250;
+ 
+             $vars['action'] = 'admin';
+             $vars['subaction'] = 'set_item_category';
+             $vars['key_id'] = $key->id;
+ 
+             $js_vars['address'] = PHPWS_Text::linkAddress('categories', $vars, TRUE);
+             $link = javascript('open_window', $js_vars);
+             $tpl['CATS'] = $link;
+         } else {
+             $content = Categories::showForm($key);
+             $tpl['CATS'] = $content;
+         }
+ /* end experiment with cats */
+ 
+ 
          if (Current_User::allow('rolodex', 'edit_member')) {
              $js_vars['form_name'] = 'rolodex_member';
***************
*** 684,688 ****
  
          $tpl['RESET_EXPIRED'] = PHPWS_Text::secureLink(sprintf(dgettext('rolodex', 'Reset all expiry dates to %s days from now'), PHPWS_Settings::get('rolodex', 'expiry_interval')), 'rolodex', array('aop'=>'reset_expired'));
!         $tpl['DELETE_EXPIRED'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Delete all expired members'), 'rolodex', array('aop'=>'delete_expired'));
  
          $tpl['ALL_COMMENTS_YES'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Reset "Allow comments" on all records to yes'), 'rolodex', array('aop'=>'all_comments_yes'));
--- 701,710 ----
  
          $tpl['RESET_EXPIRED'] = PHPWS_Text::secureLink(sprintf(dgettext('rolodex', 'Reset all expiry dates to %s days from now'), PHPWS_Settings::get('rolodex', 'expiry_interval')), 'rolodex', array('aop'=>'reset_expired'));
!             $vars['aop'] = 'delete_expired';
!             $js['ADDRESS'] = PHPWS_Text::linkAddress('rolodex', $vars, true);
!             $js['QUESTION'] = dgettext('rolodex', 'Are you sure you want to delete all expired members?\nEach user\'s demographic information will be retained for other modules, but all Rolodex information will be permanently removed.');
!             $js['LINK'] = dgettext('rolodex', 'Delete all expired members');
!         $tpl['DELETE_EXPIRED'] = javascript('confirm', $js);
! 
  
          $tpl['ALL_COMMENTS_YES'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Reset "Allow comments" on all records to yes'), 'rolodex', array('aop'=>'all_comments_yes'));

Index: Rolodex.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Rolodex.php	4 Feb 2008 04:16:21 -0000	1.2
--- Rolodex.php	8 Feb 2008 19:38:48 -0000	1.3
***************
*** 85,89 ****
                          $this->forwardMessage(dgettext('rolodex', 'Member profile saved successfully.'));
  //                        PHPWS_Core::reroute('index.php?module=rolodex&aop=edit_member&user_id=' . $this->member->user_id);
!                         PHPWS_Core::reroute('index.php?module=rolodex&aop=menu&tab=list');
                      }
                  } else {
--- 85,90 ----
                          $this->forwardMessage(dgettext('rolodex', 'Member profile saved successfully.'));
  //                        PHPWS_Core::reroute('index.php?module=rolodex&aop=edit_member&user_id=' . $this->member->user_id);
! //                        PHPWS_Core::reroute('index.php?module=rolodex&aop=menu&tab=list');
!                         PHPWS_Core::reroute('index.php?module=rolodex&id=' . $this->member->user_id);
                      }
                  } else {
***************
*** 274,287 ****
              case 'submit_member':
                  $this->loadForm('edit_my_member');
- //                $this->loadForm('submit');
- //                $this->title = $this->member->getDisplay_name(true);
- //                $this->content = $this->member->view();
                  break;
  
              case 'add_member':
                  $this->loadForm('edit_my_member');
- //                $this->loadForm('submit');
- //                $this->title = $this->member->getDisplay_name(true);
- //                $this->content = $this->member->view();
                  break;
  
--- 275,282 ----
***************
*** 306,314 ****
                          if (PHPWS_Settings::get('rolodex', 'req_approval') && $this->member->isNew()) {
                              $this->forwardMessage(dgettext('rolodex', 'Member profile submitted successfully. An admin will review.'));
                          } else {
                              $this->forwardMessage(dgettext('rolodex', 'Member profile saved successfully.'));
                          }
- //                        PHPWS_Core::reroute('index.php?module=rolodex&uop=edit_member&user_id=' . $this->member->user_id);
-                         PHPWS_Core::reroute('index.php?module=rolodex&uop=list');
                      }
                  } else {
--- 301,309 ----
                          if (PHPWS_Settings::get('rolodex', 'req_approval') && $this->member->isNew()) {
                              $this->forwardMessage(dgettext('rolodex', 'Member profile submitted successfully. An admin will review.'));
+                             PHPWS_Core::reroute('index.php?module=rolodex&uop=list');
                          } else {
                              $this->forwardMessage(dgettext('rolodex', 'Member profile saved successfully.'));
+                             PHPWS_Core::reroute('index.php?module=rolodex&id=' . $this->member->user_id);
                          }
                      }
                  } else {
***************
*** 662,677 ****
          }
  
- //        isset($_POST['allow_comments']) ?
- //            $this->member->setAllow_comments(1) :
- //            $this->member->setAllow_comments(0);
- 
- //        isset($_POST['allow_anon']) ?
- //            $this->member->setAllow_anon(1) :
- //            $this->member->setAllow_anon(0);
- 
- //        isset($_POST['active']) ?
- //            $this->member->setActive(1) :
- //            $this->member->setActive(0);
- 
          if (Current_User::allow('rolodex', 'edit_member')) {
              if (isset($_POST['active'])) {
--- 657,660 ----
***************
*** 801,805 ****
              }
  
- //            $this->member->setImage($image->getPath());
              $this->member->setImage($img_array);
          }
--- 784,787 ----

Index: RDX_Mypage.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Mypage.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** RDX_Mypage.php	4 Feb 2008 03:09:16 -0000	1.1.1.1
--- RDX_Mypage.php	8 Feb 2008 19:38:48 -0000	1.2
***************
*** 59,63 ****
      }
      
!     
      function action(&$title, &$content)
      {
--- 59,66 ----
      }
      
! 
! 
!     /* nothing below here used yet, maybe use in future */    
! 
      function action(&$title, &$content)
      {

Index: RDX_Member.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RDX_Member.php	4 Feb 2008 19:29:43 -0000	1.2
--- RDX_Member.php	8 Feb 2008 19:38:48 -0000	1.3
***************
*** 777,786 ****
  
  
- //    function setDate_expires($date_expires)
- //    {
- //        $this->date_expires = $date_expires;
- //    }
- 
- 
      function getDate_expires($print=false, $format=null)
      {
--- 777,780 ----

[phpws-comm-commits] modules/rolodex/docs INSTALL, 1.1.1.1, 1.2 TODO, 1.2, 1.3

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

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

Modified Files:
	INSTALL TODO 
Log Message:
some tidy up, resolved list search and sort

Index: TODO
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TODO	4 Feb 2008 04:16:22 -0000	1.2
--- TODO	8 Feb 2008 19:38:50 -0000	1.3
***************
*** 5,9 ****
  
  
- find why search won't show in list - does it need to be saved? like blog?
  send some kind of needs approval message on new submissions
  readme tab
--- 5,8 ----
***************
*** 19,22 ****
--- 18,23 ----
    - is it 'cause they are used in other mods, like comments?
  
+ consider option to delete demographics records when uninstalling rolodex
+ consider option to delete demographics record when deleting rolodex member
  consider display in list switch for custom fields
  consider contact form instead of email address
***************
*** 24,25 ****
--- 25,36 ----
  consider more advanced export with some pre-selection or options
  
+ 
+ 
+ 
+ #####################
+ UPDATE DEPENDENCY FILE WHEN NEW VERSIONS ARE AVAILABLE
+  - CORE ?
+  - FILECABINET ?
+  - DEMOGRAPHICS 1.1.0
+ #####################
+ 

Index: INSTALL
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/INSTALL,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** INSTALL	4 Feb 2008 03:09:17 -0000	1.1.1.1
--- INSTALL	8 Feb 2008 19:38:50 -0000	1.2
***************
*** 5,10 ****
  INSTALL steps for rolodex
  
! IMPORTANT: rolodex is a module for phpWebSite 1.4.0 or better.
!  You HAVE to install phpWebSite >= 1.4.0 first, rolodex will
  not work with earlier versions of phpWebSite.
  
--- 5,10 ----
  INSTALL steps for rolodex
  
! IMPORTANT: rolodex is a module for phpWebSite 1.5.0 or better.
!  You HAVE to install phpWebSite >= 1.5.0 first, rolodex will
  not work with earlier versions of phpWebSite.
  

[phpws-comm-commits] modules/rolodex/templates edit_member.tpl, 1.1.1.1, 1.2

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

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

Modified Files:
	edit_member.tpl 
Log Message:
some tidy up, resolved list search and sort

Index: edit_member.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_member.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** edit_member.tpl	4 Feb 2008 03:09:18 -0000	1.1.1.1
--- edit_member.tpl	8 Feb 2008 19:38:51 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
  <fieldset>
      <legend><strong>{SETTINGS_GROUP_LABEL}</strong></legend>
+     <p>{CATS}</p>
      <p>{ALLOW_COMMENTS} {ALLOW_COMMENTS_LABEL}</p>
      <p>{ALLOW_ANON} {ALLOW_ANON_LABEL}</p>

[phpws-comm-commits] modules/openid/class OpenID_MyPage.php, NONE, 1.1 OpenID_User.php, 1.1.1.1, 1.2

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

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

Modified Files:
	OpenID_User.php 
Added Files:
	OpenID_MyPage.php 
Log Message:
Made progress on MyPage support.

Index: OpenID_User.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/OpenID_User.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OpenID_User.php	4 Feb 2008 04:54:31 -0000	1.1.1.1
--- OpenID_User.php	6 Feb 2008 04:40:24 -0000	1.2
***************
*** 43,48 ****
                      break;
  
!                 case 'complete_login':
!                     OpenID_User::completeLogin();
                      break;
              }
--- 43,53 ----
                      break;
  
!                 case 'completeLogin':
!                     $tags['TITLE'] = dgettext('openid', 'First Log In');
!                     $tags['CONTENT'] = OpenID_User::completeLogin();
!                     break;
! 
!                 case 'removeMapping':
!                     OpenID_User::removeMapping();
                      break;
              }
***************
*** 113,117 ****
          if (!$root_only)
          {
!             $retval .= PHPWS_Text::linkAddress('openid', array('user'=>'complete_login'));
          }
  
--- 118,122 ----
          if (!$root_only)
          {
!             $retval .= PHPWS_Text::linkAddress('openid', array('user'=>'completeLogin'));
          }
  
***************
*** 193,196 ****
--- 198,202 ----
                  if (!empty($result))
                  {
+                     // Log in user
                      $user = new PHPWS_User($result);
                      $user->login();
***************
*** 198,210 ****
                      PHPWS_Core::returnToBookmark();
                  }
                  else if (PHPWS_Settings::get('users', 'new_user_method') != 0)
                  {
                      $sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse($response);
                      $sreg = $sreg_resp->contents();
  
!                     //@$sreg['email']
!                     //@$sreg['nickname']
!                     //@$sreg['fullname']
                  }
              }
          }
--- 204,236 ----
                      PHPWS_Core::returnToBookmark();
                  }
+                 else if (Current_User::isLogged())
+                 {
+                     // Link this OpenID to user
+                     $db->reset();
+                     $values['user_id'] = Current_User::getId();
+                     $values['openid_identifier'] = $openid;
+                     $db->addValue($values);
+                     if (!PHPWS_Error::logIfError($db->insert()))
+                     {
+                         $_SESSION['openid_message'] = dgettext('openid', 'OpenID added to your account.');
+                     }
+ 
+                     OpenID_ReturnToBookmark();
+                 }
                  else if (PHPWS_Settings::get('users', 'new_user_method') != 0)
                  {
+                     // Create new site user (or link) for this OpenID
                      $sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse($response);
                      $sreg = $sreg_resp->contents();
  
!                     $session_key = rand();
!                     $_SESSION['openid_identifier'][$session_key] = $openid;
! 
!                     return OpenID_User::createUserForm($session_key, $sreg['email'],
!                                                        $sreg['nickname'], $sreg['fullname']);
                  }
+ 
+                 $_SESSION['openid_message'] = dgettext('openid', 'OpenID not registered in database.');
+                 OpenID_ReturnToBookmark();
              }
          }
***************
*** 214,217 ****
--- 240,255 ----
      }
  
+     function createUserForm($session_key, $email, $nickname, $fullname)
+     {
+         return 'TODO';
+     }
+ 
+     function removeMapping()
+     {
+         // TODO
+ 
+         OpenID_ReturnToBookmark();
+     }
+ 
  }// END CLASS OpenID_User
  

--- NEW FILE: OpenID_MyPage.php ---
<?php
/**
 * OpenID module for phpWebSite
 *
 * See docs/CREDITS for copyright information
 *
 * 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
 *
 * @author      Greg Meiste <bli...@NO...>
 * @version     $Id: OpenID_MyPage.php,v 1.1 2008/02/06 04:40:24 blindman1344 Exp $
 */

class OpenID_MyPage
{
    function show()
    {
        if (PHPWS_Settings::get('openid', 'allow_openid'))
        {
            OpenID_Bookmark();
            PHPWS_Core::initCoreClass('DBPager.php');

            $form = new PHPWS_Form;
            $form->addHidden('module', 'openid');
            $form->addHidden('user', 'login');

            $form->addText('openid_identifier');
            $form->setSize('openid_identifier', 40, 200);
            $form->setClass('openid_identifier', (FORCE_MOD_TEMPLATES ? 'openid openid_mod' : 'openid'));

            $form->addSubmit('submit', dgettext('openid', 'Add'));
            $form->addTplTag('MESSAGE', OpenID_GetMsg());

            $tags = $form->getTemplate();
            $tags['TITLE'] = dgettext('openid', 'OpenID Identifiers');
            $tags['OPENID'] = dgettext('openid', 'OpenID');
            $tags['ACTION'] = dgettext('openid', 'Action');

            $pager = new DBPager('openid_mapping');
            $pager->setModule('openid');
            $pager->setTemplate('my_page.tpl');
            $pager->addToggle(PHPWS_LIST_TOGGLE_CLASS);
            $pager->addPageTags($tags);
            $pager->addRowFunction(array('OpenID_MyPage', 'getRowTpl'));
            $pager->setDefaultOrder('openid_identifier', 'desc');
            $pager->setEmptyMessage(dgettext('openid', 'No OpenID identifiers linked to this account.'));
            $pager->addWhere('user_id', Current_User::getId());

            $content = $pager->get();
        }
        else
        {
            $content = dgettext('openid', 'OpenID login is not enabled at this time.');
        }

        return $content;
    }

    function getRowTpl($row)
    {
        static $num_openid = 0;

        $template['OPENID_IDENTIFIER'] = $row['openid_identifier'];
        $template['ACTION'] = NULL;

        if ($num_openid == 0)
        {
            $db = new PHPWS_DB('openid_mapping');
            $db->addWhere('user_id', Current_User::getId());
            $result = $db->count();
            if (!PHPWS_Error::logIfError($result))
            {
                $num_openid = $result;
            }
        }

        if (($num_openid > 1) /* || TODO: password set */)
        {
            $vars['user'] = 'removeMapping';
            $vars['mapping_id'] = $row['id'];
            $confirm_vars['QUESTION'] = dgettext('openid', 'Are you sure you want to remove this OpenID?');
            $confirm_vars['ADDRESS'] = PHPWS_Text::linkAddress('openid', $vars, TRUE);
            $confirm_vars['LINK'] = dgettext('openid', 'Remove');
            $template['ACTION'] = javascript('confirm', $confirm_vars);
        }

        return $template;
    }
}

?>

[phpws-comm-commits] modules/openid/boost install.sql,1.1.1.1,1.2

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

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

Modified Files:
	install.sql 
Log Message:
Made progress on MyPage support.

Index: install.sql
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/openid/boost/install.sql,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** install.sql	4 Feb 2008 04:54:31 -0000	1.1.1.1
--- install.sql	6 Feb 2008 04:40:21 -0000	1.2
***************
*** 20,24 ****
  
  CREATE TABLE openid_mapping (
    openid_identifier VARCHAR(255) NOT NULL,
!   user_id INT DEFAULT '0' NOT NULL
  );
--- 20,26 ----
  
  CREATE TABLE openid_mapping (
+   id INT NOT NULL,
    openid_identifier VARCHAR(255) NOT NULL,
!   user_id INT DEFAULT '0' NOT NULL,
!   PRIMARY KEY (id)
  );

[phpws-comm-commits] modules/openid/templates my_page.tpl, NONE, 1.1

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

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

Added Files:
	my_page.tpl 
Log Message:
Made progress on MyPage support.

--- NEW FILE: my_page.tpl ---
<h1>{TITLE}</h1>

<!-- BEGIN message -->
<div class="padded"><h3>{MESSAGE}</h3></div>
<!-- END message -->

<div>
<table cellpadding="4" cellspacing="1" width="100%">
  <tr>
    <th>{OPENID} {OPENID_IDENTIFIER_SORT}</th>
    <th>{ACTION}</th>
  </tr>
<!-- BEGIN listrows -->
  <tr{TOGGLE}>
    <td>{OPENID_IDENTIFIER}</td>
    <td>{ACTION}</td>
  </tr>
<!-- END listrows -->
<!-- BEGIN empty_message -->
  <tr{TOGGLE}>
    <td colspan="2">{EMPTY_MESSAGE}</td>
  </tr>
<!-- END empty_message -->
</table>
</div>

<!-- BEGIN navigation -->
<div class="align-center">
{TOTAL_ROWS}<br />
{PAGE_LABEL} {PAGES}<br />
{LIMIT_LABEL} {LIMITS}
</div>
<!-- END navigation -->

{START_FORM}
{OPENID_IDENTIFIER} {SUBMIT}<br />
<span class="smaller">e.g. http://username.myopenid.com</span>
{END_FORM}

[phpws-comm-commits] modules/openid/inc my_page.php,NONE,1.1

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

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

Added Files:
	my_page.php 
Log Message:
Made progress on MyPage support.

--- NEW FILE: my_page.php ---
<?php
/**
 * OpenID module for phpWebSite
 *
 * See docs/CREDITS for copyright information
 *
 * 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
 *
 * @author      Greg Meiste <bli...@NO...>
 * @version     $Id: my_page.php,v 1.1 2008/02/06 04:40:25 blindman1344 Exp $
 */

function my_page()
{
    PHPWS_Core::initModClass('openid', 'OpenID_MyPage.php');
    return OpenID_MyPage::show();
}

?>

[phpws-comm-commits] modules/rolodex/boost dependency.xml, 1.1.1.1, 1.2

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

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

Modified Files:
	dependency.xml 
Log Message:
a few tweaks to list

Index: dependency.xml
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/dependency.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dependency.xml	4 Feb 2008 03:09:14 -0000	1.1.1.1
--- dependency.xml	4 Feb 2008 19:29:42 -0000	1.2
***************
*** 13,15 ****
--- 13,21 ----
      <url>http://phpwebsite.appstate.edu/downloads/modules/filecabinet/</url>
    </module>
+   <module>
+     <title>demographics</title>
+     <properName>Demographics</properName>
+     <version>1.0.0</version>
+     <url>http://phpwebsite.appstate.edu/downloads/modules/demographics/</url>
+   </module>
  </dependency>

[phpws-comm-commits] modules/rolodex/templates list_member.tpl, 1.1.1.1, 1.2

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

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

Modified Files:
	list_member.tpl 
Log Message:
a few tweaks to list

Index: list_member.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/list_member.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** list_member.tpl	4 Feb 2008 03:09:18 -0000	1.1.1.1
--- list_member.tpl	4 Feb 2008 19:29:44 -0000	1.2
***************
*** 3,7 ****
      <tr>
          <th>&nbsp;</th>
!         <th>{TITLE_HEADER} {BUSINESS_NAME_SORT}</th>
          <th>{DATE_UPDATED_HEADER} {DATE_UPDATED_SORT}</th>
          <!-- BEGIN contact_email_header --><th><!--{CONTACT_EMAIL_HEADER}--></th><!-- END contact_email_header -->
--- 3,7 ----
      <tr>
          <th>&nbsp;</th>
!         <th>{TITLE_HEADER} {TITLE_SORT}</th>
          <th>{DATE_UPDATED_HEADER} {DATE_UPDATED_SORT}</th>
          <!-- BEGIN contact_email_header --><th><!--{CONTACT_EMAIL_HEADER}--></th><!-- END contact_email_header -->

[phpws-comm-commits] modules/rolodex/class RDX_Forms.php, 1.2, 1.3 RDX_Member.php, 1.1.1.1, 1.2

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

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

Modified Files:
	RDX_Forms.php RDX_Member.php 
Log Message:
a few tweaks to list

Index: RDX_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RDX_Forms.php	4 Feb 2008 04:16:21 -0000	1.2
--- RDX_Forms.php	4 Feb 2008 19:29:43 -0000	1.3
***************
*** 100,109 ****
      function listMembers($approved=null, $expired=false)
      {
! 
          PHPWS_Core::initModClass('rolodex', 'RDX_Member.php');
          PHPWS_Core::initCoreClass('DBPager.php');
          if (isset($approved) && $approved == 1) {
              $ptags['ALPHA_CLICK'] = $this->rolodex->alpha_click();
          }
          $ptags['TITLE_HEADER'] = dgettext('rolodex', 'Title');
          $ptags['DATE_UPDATED_HEADER'] = dgettext('rolodex', 'Updated');
--- 100,113 ----
      function listMembers($approved=null, $expired=false)
      {
!         /* init the classes */
          PHPWS_Core::initModClass('rolodex', 'RDX_Member.php');
          PHPWS_Core::initCoreClass('DBPager.php');
+ 
+         /* add the alpha click list for approved lists */
          if (isset($approved) && $approved == 1) {
              $ptags['ALPHA_CLICK'] = $this->rolodex->alpha_click();
          }
+ 
+         /* set the column headings */
          $ptags['TITLE_HEADER'] = dgettext('rolodex', 'Title');
          $ptags['DATE_UPDATED_HEADER'] = dgettext('rolodex', 'Updated');
***************
*** 115,124 ****
--- 119,135 ----
          }
  
+         /* init the pager */
          $pager = new DBPager('rolodex_member', 'Rolodex_Member');
          $pager->setModule('rolodex');
+         $pager->db->addColumn('demographics.*');
+         $pager->db->addColumn('rolodex_member.*');
+         $pager->db->addWhere('rolodex_member.user_id', 'demographics.user_id');
+ 
+         /* approved yes/no */
          if (isset($approved)) {
              $pager->addWhere('active', $approved);
          }
          
+         /* expired yes/no */
          if (PHPWS_Settings::get('rolodex', 'enable_expiry')) {
              if ($expired) {
***************
*** 129,176 ****
          }
  
!         $pager->db->addColumn('demographics.*');
!         $pager->db->addColumn('rolodex_member.*');
!         $pager->db->addWhere('rolodex_member.user_id', 'demographics.user_id');
! 
          if (!Current_User::isUnrestricted('rolodex')) {
              $pager->db->addWhere('active', 1);
          }
  
          if (PHPWS_Settings::get('rolodex', 'sortby')) {
              $sortby = 'demographics.last_name';
          } else {
              $sortby = 'demographics.business_name';
          }
  
          if (!$_SESSION['User']->id) {
              $pager->db->addWhere('rolodex_member.privacy', 0);
-             if (isset($_REQUEST['browseLetter'])) {
-                 if ($_REQUEST['browseLetter'] == 'Other') {
-                     $pager->db->addWhere($sortby, '^[^a-z]', 'REGEXP');
-                 } else {
-                     $pager->db->addWhere($sortby, $_REQUEST['browseLetter'].'%', 'LIKE');
-                 }
-             } 
          } elseif (!Current_User::allow('rolodex', 'view_privates')) {
              $pager->db->addWhere('rolodex_member.privacy', 1, '<=');
!             if (isset($_REQUEST['browseLetter'])) {
!                 if ($_REQUEST['browseLetter'] == 'Other') {
!                     $pager->db->addWhere($sortby, '^[^a-z]', 'REGEXP');
!                 } else {
!                     $pager->db->addWhere($sortby, $_REQUEST['browseLetter'].'%', 'LIKE');
!                 }
!             } 
!         } elseif (Current_User::isUnrestricted('rolodex')) {
!             if (isset($_REQUEST['browseLetter'])) {
!                 if ($_REQUEST['browseLetter'] == 'Other') {
!                     $pager->db->addWhere($sortby, '^[^a-z]', 'REGEXP');
!                 } else {
!                     $pager->db->addWhere($sortby, $_REQUEST['browseLetter'].'%', 'LIKE');
!                 }
              }
!         }
  
          $pager->setOrder($sortby, 'asc');
  
          $pager->setTemplate('list_member.tpl');
          $pager->addRowTags('rowTag');
--- 140,182 ----
          }
  
!         /* make sure only unrestricted users see inactive members */
          if (!Current_User::isUnrestricted('rolodex')) {
              $pager->db->addWhere('active', 1);
          }
  
+         /* set the default sort order and title column sort */
          if (PHPWS_Settings::get('rolodex', 'sortby')) {
              $sortby = 'demographics.last_name';
+             $pager->joinResult('user_id', 'demographics', 'user_id', 'last_name', 'title');
          } else {
              $sortby = 'demographics.business_name';
+             $pager->joinResult('user_id', 'demographics', 'user_id', 'business_name', 'title');
          }
  
+         /* deal with privacy levels */
          if (!$_SESSION['User']->id) {
              $pager->db->addWhere('rolodex_member.privacy', 0);
          } elseif (!Current_User::allow('rolodex', 'view_privates')) {
              $pager->db->addWhere('rolodex_member.privacy', 1, '<=');
!         } 
! 
!         /* if the alpha click list is being used */
!         if (isset($_REQUEST['browseLetter'])) {
!             if ($_REQUEST['browseLetter'] == 'Other') {
!                 $pager->db->addWhere($sortby, '^[^a-z]', 'REGEXP');
!             } else {
!                 $pager->db->addWhere($sortby, $_REQUEST['browseLetter'].'%', 'LIKE');
              }
!         } 
  
+         /* the default sort order */
          $pager->setOrder($sortby, 'asc');
  
+         /* experiments with advanced join for sort link - moved up to default sort logic */
+ //        $pager->joinResult('source_col', 'jointotable', 'jointocol', 'coltoreturn', 'optionalalias');
+ //        $pager->joinResult('rolodex_member.user_id', 'demographics', 'demographics.user_id', 'last_name', 'title');
+ //        $pager->joinResult('user_id', 'demographics', 'user_id', 'last_name', 'title');
+ 
+         /* setup the list page */
          $pager->setTemplate('list_member.tpl');
          $pager->addRowTags('rowTag');
***************
*** 191,199 ****
          $pager->addPageTags($ptags);
          $pager->addToggle('class="toggle1"');
!         $pager->setSearch('demographics.business_name', 'demographics.first_name', 'demographics.last_name');
  //        print_r($pager);
  //        $pager->db->setTestMode();
  
          $this->rolodex->content = $pager->get();
          if (isset($approved) && $approved == 0) {
              $this->rolodex->title = sprintf(dgettext('rolodex', 'Unapproved %s Members'), PHPWS_Settings::get('rolodex', 'module_title'));
--- 197,211 ----
          $pager->addPageTags($ptags);
          $pager->addToggle('class="toggle1"');
! ///        $pager->setSearch('demographics.business_name', 'demographics.first_name', 'demographics.last_name');
!         $pager->setSearch('title');
! 
!         /* debug stuff */
  //        print_r($pager);
  //        $pager->db->setTestMode();
  
+         /* get the final content */
          $this->rolodex->content = $pager->get();
+ 
+         /* set the list/page title */
          if (isset($approved) && $approved == 0) {
              $this->rolodex->title = sprintf(dgettext('rolodex', 'Unapproved %s Members'), PHPWS_Settings::get('rolodex', 'module_title'));

Index: RDX_Member.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** RDX_Member.php	4 Feb 2008 03:09:16 -0000	1.1.1.1
--- RDX_Member.php	4 Feb 2008 19:29:43 -0000	1.2
***************
*** 83,86 ****
--- 83,89 ----
      var $_table             = 'rolodex_member';
  
+     /* I might need this for the advanced join in list but am unsure */    
+     var $title              = null;
+ 
  
      function Rolodex_Member($user_id=null)

[phpws-comm-commits] CVSROOT avail,1.67,1.68

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

Update of /cvsroot/phpwebsite-comm/CVSROOT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21691

Modified Files:
	avail 
Log Message:
Adding me to my modules (for completeness)

Index: avail
===================================================================
RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** avail	4 Feb 2008 03:57:25 -0000	1.67
--- avail	4 Feb 2008 05:02:29 -0000	1.68
***************
*** 2,5 ****
--- 2,6 ----
  
  # Module Teams
+ avail|blindman1344|modules/ads
  avail|adarkling|modules/article
  avail|cl00bie|modules/blog
***************
*** 15,18 ****
--- 16,20 ----
  avail|cl00bie|modules/mailto
  avail|ykuendig|modules/mymodule
+ avail|blindman1344|modules/openid
  avail|singletrack|modules/pear
  avail|andyoflinux|modules/photobox

[phpws-comm-commits] modules/rolodex/docs TODO,1.1.1.1,1.2

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

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

Modified Files:
	TODO 
Log Message:
a few tweaks to csv export security

Index: TODO
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/TODO,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TODO	4 Feb 2008 03:09:17 -0000	1.1.1.1
--- TODO	4 Feb 2008 04:16:22 -0000	1.2
***************
*** 9,14 ****
  readme tab
  what to do about categories
! export security and error msg
! 
  
  further refine avatar and image routines - they work now, but
--- 9,13 ----
  readme tab
  what to do about categories
! think about where to put export link (use isDataVisible check on it)
  
  further refine avatar and image routines - they work now, but

[phpws-comm-commits] modules/rolodex/class RDX_Forms.php, 1.1.1.1, 1.2 Rolodex.php, 1.1.1.1, 1.2

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

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

Modified Files:
	RDX_Forms.php Rolodex.php 
Log Message:
a few tweaks to csv export security

Index: RDX_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** RDX_Forms.php	4 Feb 2008 03:09:15 -0000	1.1.1.1
--- RDX_Forms.php	4 Feb 2008 04:16:21 -0000	1.2
***************
*** 265,268 ****
--- 265,272 ----
          $form->setMatch('privacy_business', PHPWS_Settings::get('rolodex', 'privacy_business'));
      
+         $form->addRadio('privacy_export', array(0, 1, 2));
+         $form->setLabel('privacy_export', array(dgettext('rolodex', 'Public'), dgettext('rolodex', 'Members only'), dgettext('rolodex', 'Restricted users')));
+         $form->setMatch('privacy_export', PHPWS_Settings::get('rolodex', 'privacy_export'));
+     
          $form->addCheckbox('enable_expiry', 1);
          $form->setMatch('enable_expiry', PHPWS_Settings::get('rolodex', 'enable_expiry'));
***************
*** 345,348 ****
--- 349,353 ----
          $tpl['PRIVACY_HOME_TITLE'] = dgettext('rolodex', 'Home address');
          $tpl['PRIVACY_BUSINESS_TITLE'] = dgettext('rolodex', 'Business address');
+         $tpl['PRIVACY_EXPORT_TITLE'] = dgettext('rolodex', 'CSV Export');
          $tpl['COMMENTS_GROUP_LABEL'] = dgettext('rolodex', 'Comments Settings');
          $tpl['PRIVACY_GROUP_LABEL'] = dgettext('rolodex', 'Privacy Settings');

Index: Rolodex.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Rolodex.php	4 Feb 2008 03:09:17 -0000	1.1.1.1
--- Rolodex.php	4 Feb 2008 04:16:21 -0000	1.2
***************
*** 240,252 ****
      
              case 'export':
!                 if (!PHPWS_Settings::get('rolodex', 'allow_anon') && !Current_User::getId()) {
!                     $this->title = PHPWS_Settings::get('rolodex', 'module_title');
!                     $this->content = dgettext('rolodex', 'NEED PERM ERROR HERE.');
!                 } else {
! //                    PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php');
! //                    $this->forms = new Rolodex_Forms;
! //                    $this->forms->rolodex = & $this;
! //                    $this->forms->listMembers(1);
                      $this->exportCSV();
                  }
                  break;
--- 240,249 ----
      
              case 'export':
!                 PHPWS_Core::initModClass('rolodex', 'RDX_Member.php');
!                 if (Rolodex_Member::isDataVisible('privacy_export')) {
                      $this->exportCSV();
+                 } else {
+                     $this->title = PHPWS_Settings::get('rolodex', 'module_title');
+                     $this->content = dgettext('rolodex', 'Sorry, your access does not allow CSV exporting.');
                  }
                  break;
***************
*** 452,455 ****
--- 449,453 ----
          PHPWS_Settings::set('rolodex', 'privacy_home', $_POST['privacy_home']);
          PHPWS_Settings::set('rolodex', 'privacy_business', $_POST['privacy_business']);
+         PHPWS_Settings::set('rolodex', 'privacy_export', $_POST['privacy_export']);
  
          isset($_POST['enable_expiry']) ?

[phpws-comm-commits] modules/rolodex/inc settings.php,1.1.1.1,1.2

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

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

Modified Files:
	settings.php 
Log Message:
a few tweaks to csv export security

Index: settings.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/inc/settings.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** settings.php	4 Feb 2008 03:09:17 -0000	1.1.1.1
--- settings.php	4 Feb 2008 04:16:24 -0000	1.2
***************
*** 31,39 ****
  $settings['comments_anon_enable']   = 0;
  $settings['comments_anon_enforce']  = 0;
! $settings['privacy_contact']        = 0;
  $settings['privacy_web']            = 0;
  $settings['privacy_phone']          = 0;
! $settings['privacy_home']           = 0;
  $settings['privacy_business']       = 0;
  $settings['enable_expiry']          = 0;
  $settings['expiry_interval']        = 365;
--- 31,40 ----
  $settings['comments_anon_enable']   = 0;
  $settings['comments_anon_enforce']  = 0;
! $settings['privacy_contact']        = 1;
  $settings['privacy_web']            = 0;
  $settings['privacy_phone']          = 0;
! $settings['privacy_home']           = 1;
  $settings['privacy_business']       = 0;
+ $settings['privacy_export']         = 2;
  $settings['enable_expiry']          = 0;
  $settings['expiry_interval']        = 365;

[phpws-comm-commits] modules/rolodex/templates edit_settings.tpl, 1.1.1.1, 1.2

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

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

Modified Files:
	edit_settings.tpl 
Log Message:
a few tweaks to csv export security

Index: edit_settings.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_settings.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** edit_settings.tpl	4 Feb 2008 03:09:18 -0000	1.1.1.1
--- edit_settings.tpl	4 Feb 2008 04:16:25 -0000	1.2
***************
*** 12,18 ****
      <legend><strong>{COMMENTS_GROUP_LABEL}</strong></legend>
      <p>{COMMENTS_ENABLE} {COMMENTS_ENABLE_LABEL}</p>
!     <p>&nbsp;&nbsp;{COMMENTS_ENFORCE} {COMMENTS_ENFORCE_LABEL}</p>
!     <p>&nbsp;&nbsp;{COMMENTS_ANON_ENABLE} {COMMENTS_ANON_ENABLE_LABEL}</p>
!     <p>&nbsp;&nbsp;&nbsp;&nbsp;{COMMENTS_ANON_ENFORCE} {COMMENTS_ANON_ENFORCE_LABEL}</p>
  </fieldset>
  <fieldset>
--- 12,18 ----
      <legend><strong>{COMMENTS_GROUP_LABEL}</strong></legend>
      <p>{COMMENTS_ENABLE} {COMMENTS_ENABLE_LABEL}</p>
!     <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{COMMENTS_ENFORCE} {COMMENTS_ENFORCE_LABEL}</p>
!     <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{COMMENTS_ANON_ENABLE} {COMMENTS_ANON_ENABLE_LABEL}</p>
!     <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{COMMENTS_ANON_ENFORCE} {COMMENTS_ANON_ENFORCE_LABEL}</p>
  </fieldset>
  <fieldset>
***************
*** 23,26 ****
--- 23,27 ----
      <p>{PRIVACY_HOME_TITLE} - {PRIVACY_HOME_1}{PRIVACY_HOME_1_LABEL} {PRIVACY_HOME_2}{PRIVACY_HOME_2_LABEL} {PRIVACY_HOME_3}{PRIVACY_HOME_3_LABEL}</p>
      <p>{PRIVACY_BUSINESS_TITLE} - {PRIVACY_BUSINESS_1}{PRIVACY_BUSINESS_1_LABEL} {PRIVACY_BUSINESS_2}{PRIVACY_BUSINESS_2_LABEL} {PRIVACY_BUSINESS_3}{PRIVACY_BUSINESS_3_LABEL}</p>
+     <p>{PRIVACY_EXPORT_TITLE} - {PRIVACY_EXPORT_1}{PRIVACY_EXPORT_1_LABEL} {PRIVACY_EXPORT_2}{PRIVACY_EXPORT_2_LABEL} {PRIVACY_EXPORT_3}{PRIVACY_EXPORT_3_LABEL}</p>
  </fieldset>
  <fieldset>

[phpws-comm-commits] CVSROOT avail,1.66,1.67

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

Update of /cvsroot/phpwebsite-comm/CVSROOT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30644

Modified Files:
	avail 
Log Message:
Granting Verdon permission to rolodex

Index: avail
===================================================================
RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** avail	23 Nov 2006 18:17:19 -0000	1.66
--- avail	4 Feb 2008 03:57:25 -0000	1.67
***************
*** 24,27 ****
--- 24,28 ----
  avail|cl00bie|modules/quotes
  avail|ivan|modules/ras
+ avail|verdonv|modules/rolodex
  avail|boyrock|modules/sdmsphpws
  avail|gbrackett|modules/staffman

[phpws-comm-commits] modules/featuredphoto/docs ChangeLog, 1.28, 1.29

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

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

Modified Files:
	ChangeLog 
Log Message:
Time for 1.2.0

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/docs/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ChangeLog	27 Jan 2008 21:42:39 -0000	1.28
--- ChangeLog	28 Jan 2008 15:52:56 -0000	1.29
***************
*** 5,9 ****
  ========================== PHPWEBSITE 1.X.X RELEASES ==========================
  
! *cvs
  
      Now use PHPWS_LIST_TOGGLE_CLASS for toggle class when listing items.
--- 5,9 ----
  ========================== PHPWEBSITE 1.X.X RELEASES ==========================
  
! *featuredphoto-1.2.0 (28 Jan 2008)
  
      Now use PHPWS_LIST_TOGGLE_CLASS for toggle class when listing items.