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

[phpws-comm-commits] modules/rolodex/templates edit_member.tpl, 1.8, 1.9 list_member.tpl, 1.6, 1.7 view_member.tpl, 1.6, 1.7

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

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

Modified Files:
	edit_member.tpl list_member.tpl view_member.tpl 
Log Message:
steps toward 1.1.0

Index: list_member.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/list_member.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** list_member.tpl	7 Jul 2008 13:30:19 -0000	1.6
--- list_member.tpl	24 Jul 2008 12:40:21 -0000	1.7
***************
*** 24,28 ****
      <tr {TOGGLE}>
          <td rowspan="2" align="right">{THUMBNAIL}</td>
!         <td>{TITLE}</td>
          <td>{DATE_UPDATED}</td>
          <!-- BEGIN contact_email_link --><td>{CONTACT_EMAIL_LINK}</td><!-- END contact_email_link -->
--- 24,28 ----
      <tr {TOGGLE}>
          <td rowspan="2" align="right">{THUMBNAIL}</td>
!         <td><strong>{TITLE}</strong></td>
          <td>{DATE_UPDATED}</td>
          <!-- BEGIN contact_email_link --><td>{CONTACT_EMAIL_LINK}</td><!-- END contact_email_link -->
***************
*** 40,44 ****
      <tr {TOGGLE}>
          <td colspan="14" class="smaller">
!             {DESCRIPTION}
              <p>
                  <!-- BEGIN b_label --><br /><strong>{B_LABEL}</strong><!-- END b_label -->
--- 40,44 ----
      <tr {TOGGLE}>
          <td colspan="14" class="smaller">
!             <!-- BEGIN description -->{DESCRIPTION}<!-- END description -->
              <p>
                  <!-- BEGIN b_label --><br /><strong>{B_LABEL}</strong><!-- END b_label -->

Index: view_member.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/view_member.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** view_member.tpl	6 Jul 2008 13:05:21 -0000	1.6
--- view_member.tpl	24 Jul 2008 12:40:21 -0000	1.7
***************
*** 22,28 ****
              <!-- BEGIN evening_phone --><br />{EVENING_PHONE_LABEL}: {EVENING_PHONE}<!-- END evening_phone -->
          </p>
-         <legend><strong>{HOME_LABEL}</strong></legend>
          <p>
!             <!-- BEGIN mailing_address_1 -->{MAILING_ADDRESS_1}<!-- END mailing_address_1 -->
              <!-- BEGIN mailing_address_2 --><br />{MAILING_ADDRESS_2}<!-- END mailing_address_2 -->
              <!-- BEGIN mailing_city --><br />{MAILING_CITY},<!-- END mailing_city --> <!-- BEGIN mailing_state -->{MAILING_STATE}<!-- END mailing_state -->
--- 22,28 ----
              <!-- BEGIN evening_phone --><br />{EVENING_PHONE_LABEL}: {EVENING_PHONE}<!-- END evening_phone -->
          </p>
          <p>
!             <!-- BEGIN home_label --><strong>{HOME_LABEL}</strong><!-- END home_label -->
!             <!-- BEGIN mailing_address_1 --><br />{MAILING_ADDRESS_1}<!-- END mailing_address_1 -->
              <!-- BEGIN mailing_address_2 --><br />{MAILING_ADDRESS_2}<!-- END mailing_address_2 -->
              <!-- BEGIN mailing_city --><br />{MAILING_CITY},<!-- END mailing_city --> <!-- BEGIN mailing_state -->{MAILING_STATE}<!-- END mailing_state -->
***************
*** 30,36 ****
              <!-- BEGIN mailing_google_map --><br />{MAILING_GOOGLE_MAP}<!-- END mailing_google_map -->
          </p>
-         <legend><strong>{BUSINESS_LABEL}</strong></legend>
          <p>
!             <!-- BEGIN business_address_1 -->{BUSINESS_ADDRESS_1}<!-- END business_address_1 -->
              <!-- BEGIN business_address_2 --><br />{BUSINESS_ADDRESS_2}<!-- END business_address_2 -->
              <!-- BEGIN business_city --><br />{BUSINESS_CITY},<!-- END business_city --> <!-- BEGIN business_state -->{BUSINESS_STATE}<!-- END business_state -->
--- 30,36 ----
              <!-- BEGIN mailing_google_map --><br />{MAILING_GOOGLE_MAP}<!-- END mailing_google_map -->
          </p>
          <p>
!             <!-- BEGIN business_label --><strong>{BUSINESS_LABEL}</strong><!-- END business_label -->
!             <!-- BEGIN business_address_1 --><br />{BUSINESS_ADDRESS_1}<!-- END business_address_1 -->
              <!-- BEGIN business_address_2 --><br />{BUSINESS_ADDRESS_2}<!-- END business_address_2 -->
              <!-- BEGIN business_city --><br />{BUSINESS_CITY},<!-- END business_city --> <!-- BEGIN business_state -->{BUSINESS_STATE}<!-- END business_state -->
***************
*** 39,43 ****
          </p>
      </fieldset>
!     <p><!-- BEGIN date_created_label --><strong>{DATE_CREATED_LABEL}:</strong> {DATE_CREATED}<!-- END date_created_label --><!-- BEGIN date_updated_label --> <strong>{DATE_UPDATED_LABEL}:</strong> {DATE_UPDATED}<!-- END date_updated_label --><!-- BEGIN date_expires_label --> <strong>{DATE_EXPIRES_LABEL}:</strong> {DATE_EXPIRES}<!-- END date_expires_label --></p>
      <!-- BEGIN custom1_label --><p><strong>{CUSTOM1_LABEL}:</strong> {CUSTOM1}</p><!-- END custom1_label -->
      <!-- BEGIN custom2_label --><p><strong>{CUSTOM2_LABEL}:</strong> {CUSTOM2}</p><!-- END custom2_label -->
--- 39,43 ----
          </p>
      </fieldset>
!     <p><!-- BEGIN date_created_label --><strong>{DATE_CREATED_LABEL}:</strong> {DATE_CREATED}<!-- END date_created_label --> <!-- BEGIN date_updated_label --> <strong>{DATE_UPDATED_LABEL}:</strong> {DATE_UPDATED}<!-- END date_updated_label --> <!-- BEGIN date_expires_label --> <strong>{DATE_EXPIRES_LABEL}:</strong> {DATE_EXPIRES}<!-- END date_expires_label --></p>
      <!-- BEGIN custom1_label --><p><strong>{CUSTOM1_LABEL}:</strong> {CUSTOM1}</p><!-- END custom1_label -->
      <!-- BEGIN custom2_label --><p><strong>{CUSTOM2_LABEL}:</strong> {CUSTOM2}</p><!-- END custom2_label -->

Index: edit_member.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_member.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** edit_member.tpl	17 Jul 2008 13:50:24 -0000	1.8
--- edit_member.tpl	24 Jul 2008 12:40:21 -0000	1.9
***************
*** 19,24 ****
      <br style="clear: both" />
      <p>{BUSINESS_NAME} {BUSINESS_NAME_LABEL}</p>
!     <p>{DEPARTMENT} {DEPARTMENT_LABEL} {POSITION_TITLE} {POSITION_TITLE_LABEL}</p>
!     <p>{DESCRIPTION} {DESCRIPTION_LABEL}</p>
      <p>{IMAGE} {IMAGE_LABEL}</p>
      <!-- BEGIN current_image --><p>{CURRENT_IMAGE} {CURRENT_THUMB} {CLEAR_IMAGE} {CLEAR_IMAGE_LABEL}</p><!-- END current_image -->
--- 19,24 ----
      <br style="clear: both" />
      <p>{BUSINESS_NAME} {BUSINESS_NAME_LABEL}</p>
!     <p>{DEPARTMENT} {DEPARTMENT_LABEL}<br />{POSITION_TITLE} {POSITION_TITLE_LABEL}</p>
!     <p>{DESCRIPTION_LABEL}<br />{DESCRIPTION}</p>
      <p>{IMAGE} {IMAGE_LABEL}</p>
      <!-- BEGIN current_image --><p>{CURRENT_IMAGE} {CURRENT_THUMB} {CLEAR_IMAGE} {CLEAR_IMAGE_LABEL}</p><!-- END current_image -->
***************
*** 37,51 ****
      <fieldset>
          <legend><strong>{HOME_LABEL}</strong></legend>
!         <p>{MAILING_ADDRESS_1} {MAILING_ADDRESS_1_LABEL}</p>
!         <p>{MAILING_ADDRESS_2} {MAILING_ADDRESS_2_LABEL}</p>
!         <p>{MAILING_CITY} {MAILING_CITY_LABEL} {MAILING_STATE} {MAILING_STATE_LABEL} </p>
!         <p>{MAILING_COUNTRY} {MAILING_COUNTRY_LABEL} {MAILING_ZIP_CODE} {MAILING_ZIP_CODE_LABEL}</p>
      </fieldset>
      <fieldset>
          <legend><strong>{BUSINESS_LABEL}</strong></legend>
!         <p>{BUSINESS_ADDRESS_1} {BUSINESS_ADDRESS_1_LABEL}</p>
!         <p>{BUSINESS_ADDRESS_2} {BUSINESS_ADDRESS_2_LABEL}</p>
!         <p>{BUSINESS_CITY} {BUSINESS_CITY_LABEL} {BUSINESS_STATE} {BUSINESS_STATE_LABEL} </p>
!         <p>{BUSINESS_COUNTRY} {BUSINESS_COUNTRY_LABEL} {BUSINESS_ZIP_CODE} {BUSINESS_ZIP_CODE_LABEL}</p>
      </fieldset>
  </fieldset>
--- 37,51 ----
      <fieldset>
          <legend><strong>{HOME_LABEL}</strong></legend>
!         <p>{MAILING_ADDRESS_1}<br />{MAILING_ADDRESS_1_LABEL}</p>
!         <p>{MAILING_ADDRESS_2}<br />{MAILING_ADDRESS_2_LABEL}</p>
!         <p>{MAILING_CITY} {MAILING_CITY_LABEL}<br />{MAILING_STATE} {MAILING_STATE_LABEL} </p>
!         <p>{MAILING_COUNTRY} {MAILING_COUNTRY_LABEL}<br />{MAILING_ZIP_CODE} {MAILING_ZIP_CODE_LABEL}</p>
      </fieldset>
      <fieldset>
          <legend><strong>{BUSINESS_LABEL}</strong></legend>
!         <p>{BUSINESS_ADDRESS_1}<br />{BUSINESS_ADDRESS_1_LABEL}</p>
!         <p>{BUSINESS_ADDRESS_2}<br />{BUSINESS_ADDRESS_2_LABEL}</p>
!         <p>{BUSINESS_CITY} {BUSINESS_CITY_LABEL}<br />{BUSINESS_STATE} {BUSINESS_STATE_LABEL} </p>
!         <p>{BUSINESS_COUNTRY} {BUSINESS_COUNTRY_LABEL}<br />{BUSINESS_ZIP_CODE} {BUSINESS_ZIP_CODE_LABEL}</p>
      </fieldset>
  </fieldset>

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

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

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

Modified Files:
	settings.php 
Log Message:
tweaks and fixes to prepare for release

Index: settings.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/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	22 Jul 2008 12:24:39 -0000	1.1.1.1
--- settings.php	22 Jul 2008 15:18:42 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  $settings['enable']         = 1;
  $settings['homeonly']       = 1;
+ $settings['title']          = dgettext('whatsnew', 'What\'s New');
  $settings['text']           = null;
  $settings['cache_timeout']  = 3600;

[phpws-comm-commits] modules/whatsnew/docs CHANGELOG, 1.1.1.1, 1.2 TODO, 1.1.1.1, NONE

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

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

Modified Files:
	CHANGELOG 
Removed Files:
	TODO 
Log Message:
tweaks and fixes to prepare for release

--- TODO DELETED ---

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/docs/CHANGELOG,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CHANGELOG	22 Jul 2008 12:24:39 -0000	1.1.1.1
--- CHANGELOG	22 Jul 2008 15:18:41 -0000	1.2
***************
*** 1,4 ****
! Version 0.-.1 -- July 2008
  ------------------------------------------------------------------
  July 21 -22
  + Initial rough-in of mod
--- 1,14 ----
! Version 0.0.1 -- July 2008
  ------------------------------------------------------------------
  July 21 -22
  + Initial rough-in of mod
+ 
+ Version 0.1.0 -- July 2008
+ ------------------------------------------------------------------
+ + Added caching to the whatsnew list
+ 
+ Version 0.2.0 -- July 2008
+ ------------------------------------------------------------------
+ + Added sidebox title to settings
+ + Implimented text parsing to title and text settings
+ + Added English language file

[phpws-comm-commits] modules/whatsnew/class Whatsnew.php, 1.1.1.1, 1.2 Whatsnew_Forms.php, 1.1.1.1, 1.2

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

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

Modified Files:
	Whatsnew.php Whatsnew_Forms.php 
Log Message:
tweaks and fixes to prepare for release

Index: Whatsnew.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/class/Whatsnew.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Whatsnew.php	22 Jul 2008 12:24:39 -0000	1.1.1.1
--- Whatsnew.php	22 Jul 2008 15:18:39 -0000	1.2
***************
*** 93,99 ****
          switch($action) {
  
!             case 'view_whatsnew':
!                 $this->title = $this->ballot->getTitle(true);
!                 $this->content = $this->ballot->view();
                  break;
  
--- 93,99 ----
          switch($action) {
  
!             case 'view':
!                 $this->title = PHPWS_Settings::get('whatsnew', 'title');
!                 $this->content = $this->whatsnewBlock();
                  break;
  
***************
*** 143,163 ****
  
  
- /*
-     function loadBallot($id=0)
-     {
-         PHPWS_Core::initModClass('whatsnew', 'Whatsnew_Ballot.php');
- 
-         if ($id) {
-             $this->ballot = new Whatsnew_Ballot($id);
-         } elseif (isset($_REQUEST['ballot_id'])) {
-             $this->ballot = new Whatsnew_Ballot($_REQUEST['ballot_id']);
-         } elseif (isset($_REQUEST['id'])) {
-             $this->ballot = new Whatsnew_Ballot($_REQUEST['id']);
-         } else {
-             $this->ballot = new Whatsnew_Ballot;
-         }
-     }
- */
- 
      function loadPanel()
      {
--- 143,146 ----
***************
*** 187,190 ****
--- 170,179 ----
              PHPWS_Settings::set('whatsnew', 'homeonly', 0);
  
+         if (!empty($_POST['title'])) {
+             PHPWS_Settings::set('whatsnew', 'title', strip_tags(PHPWS_Text::parseInput($_POST['title'])));
+         } else {
+             PHPWS_Settings::reset('whatsnew', 'title');
+         }
+ 
          if (!empty($_POST['text'])) {
              PHPWS_Settings::set('whatsnew', 'text', PHPWS_Text::parseInput($_POST['text']));
***************
*** 276,291 ****
  
      function showBlock() {
          if (PHPWS_Settings::get('whatsnew', 'homeonly')) {
              $key = Key::getCurrent();
              if (!empty($key) && $key->isHomeKey()) {
!                 Whatsnew::showWhatsnewBlock();
              }
          } else {
!             Whatsnew::showWhatsnewBlock();
          }
      }
  
  
!     function showWhatsnewBlock() {
  
          $final = null;
--- 265,289 ----
  
      function showBlock() {
+         PHPWS_Core::initModClass('layout', 'Layout.php');
          if (PHPWS_Settings::get('whatsnew', 'homeonly')) {
              $key = Key::getCurrent();
              if (!empty($key) && $key->isHomeKey()) {
!                 Layout::add(Whatsnew::whatsnewBlock(), 'whatsnew', 'whatsnew_sidebox');
              }
          } else {
!             Layout::add(Whatsnew::whatsnewBlock(), 'whatsnew', 'whatsnew_sidebox');
          }
      }
  
  
!     function whatsnewBlock() {
! 
!         if (PHPWS_Settings::get('whatsnew', 'cache_timeout') > 0) {
!             $cache_key = 'whatsnew_cache_key';
!             $content = PHPWS_Cache::get($cache_key, PHPWS_Settings::get('whatsnew', 'cache_timeout'));
!             if (!empty($content)) {
!                 return $content;
!             }
!         }
  
          $final = null;
***************
*** 307,324 ****
          $result = $db->select();
  
          if (!PHPWS_Error::logIfError($result) && !empty($result)) {
-             $tpl['TITLE'] = dgettext('whatsnew', 'What\'s New');
-             $tpl['TEXT'] = PHPWS_Settings::get('whatsnew', 'text');
              foreach ($result as $link) {
                  $final = '<a href="' . $link['url'] . '">' . $link['title'] . '</a>';
                  $tpl['new-links'][] = array('LINK'=>$final);
              }
!             PHPWS_Core::initModClass('layout', 'Layout.php');
!             Layout::add(PHPWS_Template::process($tpl, 'whatsnew', 'block.tpl'), 'whatsnew', 'whatsnew_sidebox');
          }
          
      }
  
  
  }
  ?>
\ No newline at end of file
--- 305,329 ----
          $result = $db->select();
  
+         $tpl['TITLE'] = PHPWS_Text::parseOutput(PHPWS_Settings::get('whatsnew', 'title'));
+         $tpl['TEXT'] = PHPWS_Text::parseOutput(PHPWS_Settings::get('whatsnew', 'text'));
          if (!PHPWS_Error::logIfError($result) && !empty($result)) {
              foreach ($result as $link) {
                  $final = '<a href="' . $link['url'] . '">' . $link['title'] . '</a>';
                  $tpl['new-links'][] = array('LINK'=>$final);
              }
!         } else {
!             $tpl['new-links'][] = array('LINK'=>dgettext('whatsnew', 'Sorry, no results'));
          }
          
+         $content = PHPWS_Template::process($tpl, 'whatsnew', 'block.tpl');
+         if (PHPWS_Settings::get('whatsnew', 'cache_timeout') > 0) {
+             PHPWS_Cache::save($cache_key, $content);
+         }
+ 
+         return $content;
      }
  
  
+ 
  }
  ?>
\ No newline at end of file

Index: Whatsnew_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/class/Whatsnew_Forms.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Whatsnew_Forms.php	22 Jul 2008 12:24:39 -0000	1.1.1.1
--- Whatsnew_Forms.php	22 Jul 2008 15:18:40 -0000	1.2
***************
*** 60,63 ****
--- 60,67 ----
          $form->setLabel('homeonly', dgettext('whatsnew', 'Show whatsnew sidebox on home page only'));
  
+         $form->addTextField('title', PHPWS_Settings::get('whatsnew', 'title'));
+         $form->setLabel('title', dgettext('whatsnew', 'Sidebox title'));
+         $form->setSize('title', 30);
+ 
          $form->addTextArea('text', PHPWS_Settings::get('whatsnew', 'text'));
          $form->setRows('text', '4');
***************
*** 90,96 ****
          $tpl['TITLE'] = dgettext('whatsnew', 'Important Information');
          $tpl['INFO_1_LABEL'] = dgettext('whatsnew', 'About this module:');
!         $tpl['INFO_1'] = dgettext('whatsnew', 'This is the first release of whatsnew for the new 1.x series phpwebsite. It\'s pretty simple and there may not be any further releases, unless bugs are found. I wrote this for a specific need I had and thought it may be of use to others also.');
!         $tpl['INFO_2_LABEL'] = dgettext('whatsnew', 'Caution');
!         $tpl['INFO_2'] = dgettext('whatsnew', 'This module could be dangerous. You are expected to have some idea of what you are doing, if you are going to use it. It could be used to do nasty or stupid things. I have intentionally not included file upload abilites to it. If you do not have access to the server, you should not be using this.');
          $tpl['INFO_3_LABEL'] = null;
          $tpl['INFO_3'] = null;
--- 94,100 ----
          $tpl['TITLE'] = dgettext('whatsnew', 'Important Information');
          $tpl['INFO_1_LABEL'] = dgettext('whatsnew', 'About this module:');
!         $tpl['INFO_1'] = dgettext('whatsnew', 'This is the first release of whatsnew. It\'s pretty simple and there may not be any need further releases, unless bugs are found. That said, I am considering further setup options. I wrote this for a specific need I had and thought it may be of use to others also.');
!         $tpl['INFO_2_LABEL'] = null;
!         $tpl['INFO_2'] = null;
          $tpl['INFO_3_LABEL'] = null;
          $tpl['INFO_3'] = null;

[phpws-comm-commits] modules/whatsnew/boost update.php, NONE, 1.1 boost.php, 1.2, 1.3

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

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

Modified Files:
	boost.php 
Added Files:
	update.php 
Log Message:
tweaks and fixes to prepare for release

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/boost/boost.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** boost.php	22 Jul 2008 12:47:26 -0000	1.2
--- boost.php	22 Jul 2008 15:18:38 -0000	1.3
***************
*** 24,28 ****
  
  $proper_name  = "What's New";
! $version      = '0.0.2';
  $import_sql   = false;
  $version_http = 'http://verdon.ca/downloads/modules/whatsnew/check.xml';
--- 24,28 ----
  
  $proper_name  = "What's New";
! $version      = '0.2.0';
  $import_sql   = false;
  $version_http = 'http://verdon.ca/downloads/modules/whatsnew/check.xml';

--- NEW FILE: update.php ---
<?php
/**
    * whatsnew - phpwebsite module
    *
    * See docs/AUTHORS and docs/COPYRIGHT for relevant info.
    *
    * This program is free software; you can redistribute it and/or modify
    * it under the terms of the GNU General Public License as published by
    * the Free Software Foundation; either version 2 of the License, or
    * (at your option) any later version.
    * 
    * This program is distributed in the hope that it will be useful,
    * but WITHOUT ANY WARRANTY; without even the implied warranty of
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    * GNU General Public License for more details.
    * 
    * You should have received a copy of the GNU General Public License
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    *
    * @version $Id: update.php,v 1.1 2008/07/22 15:18:38 verdonv Exp $
    * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
*/

function whatsnew_update(&$content, $currentVersion)
{
    $home_dir = PHPWS_Boost::getHomeDir();
    switch ($currentVersion) {

        case version_compare($currentVersion, '0.1.0', '<'):
            $content[] = '<pre>';
    
            $files = array('templates/block.tpl');
            whatsnewUpdateFiles($files, $content);
            
            $content[] = '0.1.0 changes
----------------
+ Added caching to the whatsnew list

</pre>';

        case version_compare($currentVersion, '0.2.0', '<'):
            $content[] = '<pre>';
    
            $files = array('templates/edit_settings.tpl');
            whatsnewUpdateFiles($files, $content);
            
            $content[] = '0.2.0 changes
----------------
+ Added sidebox title to settings
+ Implimented text parsing to title and text settings
+ Added English language file

</pre>';




    } // end switch
    return true;
}

function whatsnewUpdateFiles($files, &$content)
{
    if (PHPWS_Boost::updateFiles($files, 'whatsnew')) {
        $content[] = '--- Updated the following files:';
    } else {
        $content[] = '--- Unable to update the following files:';
    }
    $content[] = "    " . implode("\n    ", $files);
}

?>

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

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

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

Modified Files:
	edit_settings.tpl 
Log Message:
tweaks and fixes to prepare for release

Index: edit_settings.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/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	22 Jul 2008 12:24:39 -0000	1.1.1.1
--- edit_settings.tpl	22 Jul 2008 15:18:45 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
      <p>{ENABLE} {ENABLE_LABEL}</p>
      <p>{HOMEONLY} {HOMEONLY_LABEL}</p>
+     <p>{TITLE_LABEL}<br />{TITLE}</p>
      <p>{TEXT_LABEL}<br />{TEXT}</p>
      <p>{CACHE_TIMEOUT} {CACHE_TIMEOUT_LABEL}</p>

[phpws-comm-commits] modules/whatsnew/locale/en_US/LC_MESSAGES whatsnew.po, 1.1.1.1, 1.2

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

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

Modified Files:
	whatsnew.po 
Log Message:
tweaks and fixes to prepare for release

Index: whatsnew.po
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/locale/en_US/LC_MESSAGES/whatsnew.po,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** whatsnew.po	22 Jul 2008 12:24:39 -0000	1.1.1.1
--- whatsnew.po	22 Jul 2008 15:18:44 -0000	1.2
***************
*** 1,3 ****
! # recent - phpwebsite module
  #
  # See docs/AUTHORS and docs/COPYRIGHT for relevant info.
--- 1,3 ----
! # whatsnew - phpwebsite module
  #
  # See docs/AUTHORS and docs/COPYRIGHT for relevant info.
***************
*** 21,22 ****
--- 21,104 ----
  #
  #, fuzzy
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2008-07-22 11:13-0400\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL...@li...>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=CHARSET\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+ msgid "About this module:"
+ msgstr ""
+ 
+ msgid "Cache duration for whatsnew list (in seconds, 0-7200)"
+ msgstr ""
+ 
+ msgid "Enable whatsnew"
+ msgstr ""
+ 
+ msgid "General Settings"
+ msgstr ""
+ 
+ #, php-format
+ msgid ""
+ "If you would like to help out with the ongoing development of whatsnew, or "
+ "other modules by Verdon Vaillancourt, %s click here to donate %s (opens in "
+ "new browser window)."
+ msgstr ""
+ 
+ msgid "Important Information"
+ msgstr ""
+ 
+ msgid "No keyed items."
+ msgstr ""
+ 
+ msgid "Number of recent items to display (0-50)"
+ msgstr ""
+ 
+ msgid "Read me"
+ msgstr ""
+ 
+ msgid "Save settings"
+ msgstr ""
+ 
+ msgid "Select any modules you wish to exclude from your whatsnew box."
+ msgstr ""
+ 
+ msgid "Settings"
+ msgstr ""
+ 
+ msgid "Show whatsnew sidebox on home page only"
+ msgstr ""
+ 
+ msgid "Sidebox text"
+ msgstr ""
+ 
+ msgid "Sidebox title"
+ msgstr ""
+ 
+ msgid "Sorry, no results"
+ msgstr ""
+ 
+ msgid ""
+ "This is the first release of whatsnew. It's pretty simple and there may not "
+ "be any need further releases, unless bugs are found. That said, I am "
+ "considering further setup options. I wrote this for a specific need I had "
+ "and thought it may be of use to others also."
+ msgstr ""
+ 
+ msgid "What's New"
+ msgstr ""
+ 
+ msgid "Whatsnew settings saved."
+ msgstr ""
+ 
+ msgid "item"
+ msgstr ""
+ 
+ msgid "items"
+ msgstr ""

[phpws-comm-commits] modules/whatsnew/boost boost.php,1.1.1.1,1.2

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

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

Modified Files:
	boost.php 
Log Message:
tweaks and fixes to prepare for release

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/boost/boost.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** boost.php	22 Jul 2008 12:24:38 -0000	1.1.1.1
--- boost.php	22 Jul 2008 12:47:26 -0000	1.2
***************
*** 24,28 ****
  
  $proper_name  = "What's New";
! $version      = '0.0.1';
  $import_sql   = false;
  $version_http = 'http://verdon.ca/downloads/modules/whatsnew/check.xml';
--- 24,28 ----
  
  $proper_name  = "What's New";
! $version      = '0.0.2';
  $import_sql   = false;
  $version_http = 'http://verdon.ca/downloads/modules/whatsnew/check.xml';

[phpws-comm-commits] CVSROOT avail,1.72,1.73

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

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

Modified Files:
	avail 
Log Message:
Adding Verdon to whatsnew module

Index: avail
===================================================================
RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** avail	30 Jun 2008 03:02:09 -0000	1.72
--- avail	22 Jul 2008 12:44:12 -0000	1.73
***************
*** 37,40 ****
--- 37,41 ----
  avail|gbrackett|modules/uplink
  avail|techelephant|modules/wapstat
+ avail|verdonv|modules/whatsnew
  avail|adarkling, blindman1344|modules/wiki
  avail|ykuendig|modules/xoap

[phpws-comm-commits] modules/rolodex/class RDX_Forms.php, 1.18, 1.19 RDX_Member.php, 1.14, 1.15 Rolodex.php, 1.15, 1.16

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

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

Modified Files:
	RDX_Forms.php RDX_Member.php Rolodex.php 
Log Message:
1.0.1 changes

Index: RDX_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** RDX_Forms.php	7 Jul 2008 13:55:01 -0000	1.18
--- RDX_Forms.php	17 Jul 2008 13:50:21 -0000	1.19
***************
*** 1005,1008 ****
--- 1005,1012 ----
          $form->setMatch('privacy', $member->privacy);
  
+         $form->addCheckbox('email_privacy', 1);
+         $form->setMatch('email_privacy', $member->email_privacy);
+         $form->setLabel('email_privacy', dgettext('rolodex', 'Hide Email/Contact link from public'));
+ 
          if (PHPWS_Settings::get('rolodex', 'custom1_name')) {
              $form->addText('custom1', $member->custom1);

Index: Rolodex.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Rolodex.php	7 Jul 2008 13:30:15 -0000	1.15
--- Rolodex.php	17 Jul 2008 13:50:21 -0000	1.16
***************
*** 1048,1051 ****
--- 1048,1053 ----
          $this->member->setPrivacy($_POST['privacy']);
  
+         $this->member->setEmail_privacy($_POST['email_privacy']);
+ 
          if (isset($_POST['custom1'])) {
              $this->member->setCustom1($_POST['custom1']);

Index: RDX_Member.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** RDX_Member.php	7 Jul 2008 13:30:15 -0000	1.14
--- RDX_Member.php	17 Jul 2008 13:50:21 -0000	1.15
***************
*** 70,73 ****
--- 70,74 ----
      var $image              = null;
      var $privacy            = 0;
+     var $email_privacy      = 0;
      var $active             = 1;
      var $custom1            = null;
***************
*** 956,959 ****
--- 957,966 ----
  
  
+     function setEmail_privacy($email_privacy)
+     {
+         $this->email_privacy = $email_privacy;
+     }
+ 
+ 
      function setActive($active)
      {
***************
*** 1210,1220 ****
  
          if ($this->isDataVisible('privacy_contact')) {
!             $tpl['CONTACT_EMAIL'] = $this->getDisplay_email(true);
!             $tpl['CONTACT_EMAIL_LABEL'] = dgettext('rolodex', 'E-mail');
          }
  
          if ($this->isDataVisible('privacy_web')) {
!             $tpl['WEBSITE'] = $this->getWebsite(true);
!             $tpl['WEBSITE_LABEL'] = dgettext('rolodex', 'Web');
          }
  
--- 1217,1234 ----
  
          if ($this->isDataVisible('privacy_contact')) {
!             if ($this->email_privacy && !Current_User::getId()) {
!                 $tpl['CONTACT_EMAIL'] = null;
!                 $tpl['CONTACT_EMAIL_LABEL'] = null;
!             } else {
!                 $tpl['CONTACT_EMAIL'] = $this->getDisplay_email(true);
!                 $tpl['CONTACT_EMAIL_LABEL'] = dgettext('rolodex', 'E-mail');
!             }
          }
  
          if ($this->isDataVisible('privacy_web')) {
!             if ($this->getWebsite()) {
!                 $tpl['WEBSITE'] = $this->getWebsite(true);
!                 $tpl['WEBSITE_LABEL'] = dgettext('rolodex', 'Web');
!             }
          }
  
***************
*** 1360,1364 ****
          $tpl['THUMBNAIL'] = $this->getThumbnail(true, true);
          if ($this->isDataVisible('privacy_contact')) {
!             $tpl['CONTACT_EMAIL_LINK'] = $this->getDisplay_email(true, true);
          }
          if ($this->isDataVisible('privacy_web')) {
--- 1374,1382 ----
          $tpl['THUMBNAIL'] = $this->getThumbnail(true, true);
          if ($this->isDataVisible('privacy_contact')) {
!             if ($this->email_privacy && !Current_User::getId()) {
!                 $tpl['CONTACT_EMAIL_LINK'] = '';
!             } else {
!                 $tpl['CONTACT_EMAIL_LINK'] = $this->getDisplay_email(true, true);
!             }
          }
          if ($this->isDataVisible('privacy_web')) {

[phpws-comm-commits] modules/rolodex/boost boost.php, 1.5, 1.6 install.sql, 1.3, 1.4 update.php, 1.10, 1.11

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

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

Modified Files:
	boost.php install.sql update.php 
Log Message:
1.0.1 changes

Index: install.sql
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/install.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** install.sql	12 Jun 2008 21:18:48 -0000	1.3
--- install.sql	17 Jul 2008 13:50:16 -0000	1.4
***************
*** 14,17 ****
--- 14,18 ----
      image text,
      privacy smallint NOT NULL default 0,
+     email_privacy smallint NOT NULL default 0,
      active smallint NOT NULL default 0,
      custom1 varchar(255),

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/boost.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** boost.php	3 Jul 2008 14:09:59 -0000	1.5
--- boost.php	17 Jul 2008 13:50:16 -0000	1.6
***************
*** 24,28 ****
  
  $proper_name  = 'Rolodex';
! $version      = '1.0.0';
  $image_dir    = true;
  $import_sql   = true;
--- 24,28 ----
  
  $proper_name  = 'Rolodex';
! $version      = '1.0.1';
  $image_dir    = true;
  $import_sql   = true;

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** update.php	7 Jul 2008 14:06:16 -0000	1.10
--- update.php	17 Jul 2008 13:50:16 -0000	1.11
***************
*** 142,145 ****
--- 142,168 ----
  
  
+     case version_compare($currentVersion, '1.0.1', '<'):
+         $content[] = '<pre>';
+         $db = new PHPWS_DB('rolodex_member');
+         if (!$db->isTableColumn('email_privacy')) {
+             if (PHPWS_Error::logIfError($db->addTableColumn('email_privacy', 'smallint NOT NULL default 0'))) {
+                 $content[] = '--- Could not create column email_privacy on rolodex_member table.</pre>';
+                 return false;
+             } else {
+                 $content[] = '--- Created email_privacy column on rolodex_member table.';
+             }
+         }
+ 
+         $files = array('templates/edit_member.tpl');
+         rolodexUpdateFiles($files, $content);
+         
+         $content[] = '1.0.1 changes
+ ----------------
+ + Added support for email/contact link privacy at user level 
+ + Minor layout tweaks
+ </pre>';
+ 
+ 
+ 
  
  

[phpws-comm-commits] modules/rolodex/templates edit_member.tpl, 1.7, 1.8

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

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

Modified Files:
	edit_member.tpl 
Log Message:
1.0.1 changes

Index: edit_member.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_member.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** edit_member.tpl	6 Jul 2008 13:05:21 -0000	1.7
--- edit_member.tpl	17 Jul 2008 13:50:24 -0000	1.8
***************
*** 61,64 ****
--- 61,65 ----
      <p>{ACTIVE} {ACTIVE_LABEL}</p>
      <p>{PRIVACY} {PRIVACY_LABEL}</p>
+     <p>{EMAIL_PRIVACY} {EMAIL_PRIVACY_LABEL}</p>
  </fieldset>
  <!-- BEGIN meta_group_label -->

[phpws-comm-commits] modules/rolodex/docs CHANGELOG,1.7,1.8

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

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

Modified Files:
	CHANGELOG 
Log Message:
1.0.1 changes

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CHANGELOG	7 Jul 2008 13:30:16 -0000	1.7
--- CHANGELOG	17 Jul 2008 13:50:22 -0000	1.8
***************
*** 57,58 ****
--- 57,64 ----
  + Template tweaks
  
+ Version 1.0.1 -- July 2008
+ ------------------------------------------------------------------
+ + Added support for email/contact link privacy at user level 
+ + Minor layout tweaks
+ 
+ 

[phpws-comm-commits] modules/sitemap/inc settings.php,1.3,1.4

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

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

Modified Files:
	settings.php 
Log Message:
0.6.0 updates

Index: settings.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/inc/settings.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** settings.php	7 Jul 2008 21:01:37 -0000	1.3
--- settings.php	16 Jul 2008 19:07:14 -0000	1.4
***************
*** 32,36 ****
  $settings['allow_feed']             = 1;
  $settings['addkeys']                = 1;
! $settings['include_fc']             = 0;
  
  ?>
\ No newline at end of file
--- 32,36 ----
  $settings['allow_feed']             = 1;
  $settings['addkeys']                = 1;
! $settings['exclude_keys']           = serialize(array('filecabinet'));
  
  ?>
\ No newline at end of file

[phpws-comm-commits] modules/sitemap/class SM_Forms.php, 1.3, 1.4 Sitemap.php, 1.3, 1.4

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

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

Modified Files:
	SM_Forms.php Sitemap.php 
Log Message:
0.6.0 updates

Index: Sitemap.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/class/Sitemap.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Sitemap.php	7 Jul 2008 21:01:35 -0000	1.3
--- Sitemap.php	16 Jul 2008 19:07:11 -0000	1.4
***************
*** 183,190 ****
              PHPWS_Settings::set('sitemap', 'addkeys', 0);
  
!         isset($_POST['include_fc']) ?
!             PHPWS_Settings::set('sitemap', 'include_fc', 1) :
!             PHPWS_Settings::set('sitemap', 'include_fc', 0);
! 
          $cache_timeout = (int)$_POST['cache_timeout'];
          if ((int)$cache_timeout <= 7200) {
--- 183,190 ----
              PHPWS_Settings::set('sitemap', 'addkeys', 0);
  
!         if (isset($_POST['exclude_keys'])) {
!             PHPWS_Settings::set('sitemap', 'exclude_keys', $_POST['exclude_keys']);
!         } 
!         
          $cache_timeout = (int)$_POST['cache_timeout'];
          if ((int)$cache_timeout <= 7200) {
***************
*** 270,273 ****
--- 270,322 ----
  
  
+     function getKeyMods($match=null, $select_name='keys', $multiple=true, $count=true)
+     {
+ 
+         PHPWS_Core::initCoreClass('Key.php');
+         $db = new PHPWS_DB('phpws_key');
+         $db->addOrder('module asc');
+ 
+         $result = $db->getObjects('Key');
+ 
+         if ($result) {
+             foreach ($result as $item) {
+                 if ($count) {
+                     $db = new PHPWS_DB('phpws_key');
+                     $db->addWhere('module', $item->module);
+                     $qty = $db->count();
+                     if ($qty == 1) {
+                         $qty_label = dgettext('sitemap', 'item');
+                     } else {
+                         $qty_label = dgettext('sitemap', 'items');
+                     }
+                     $items[$item->module] = $item->module . ' ('.$qty.' '.$qty_label.')';
+                 } else {
+                     $items[$item->module] = $item->module;
+                 }
+             }
+         }
+ 
+         if ($items) {
+             if ($multiple) {
+                 $form = new PHPWS_Form;
+                 $form->addMultiple($select_name, $items);
+                 if (!empty($match) && is_array($match)) {
+                     $form->setMatch($select_name, $match);
+                 }
+                 return $form->get($select_name);
+             } else {
+                 $form = new PHPWS_Form;
+                 $form->addSelect($select_name, $items);
+                 if (!empty($match) && is_string($match)) {
+                     $form->setMatch($select_name, $match);
+                 }
+                 return $form->get($select_name);
+             }
+         } else {
+             return dgettext('sitemap', 'No keyed items.');
+         }
+ 
+     }
+ 
      function mapIt()
      {
***************
*** 276,279 ****
--- 325,331 ----
              $menus = $this->getMenuIds();
              
+             /* the default exclude_keys list */
+             $exclude_keys = unserialize(PHPWS_Settings::get('sitemap', 'exclude_keys'));
+             
              /* what to do about lastmod, nothing except for keyed items */
              $lastmod = null;
***************
*** 289,293 ****
              }
              
!             $content = $this->buildXML($menus, $lastmod, PHPWS_Settings::get('sitemap', 'addkeys'));
              if (PHPWS_Settings::get('sitemap', 'cache_timeout') > 0) {
                  PHPWS_Cache::save($cache_key, $content);
--- 341,345 ----
              }
              
!             $content = $this->buildXML($menus, $exclude_keys, $lastmod, PHPWS_Settings::get('sitemap', 'addkeys'));
              if (PHPWS_Settings::get('sitemap', 'cache_timeout') > 0) {
                  PHPWS_Cache::save($cache_key, $content);
***************
*** 316,320 ****
              $addkeys = null;
          }
!         $content = $this->buildXML($menus, $lastmod, $addkeys);
          if ($_REQUEST['build_type']) {
              /* save to server */
--- 368,377 ----
              $addkeys = null;
          }
!         if (isset($_REQUEST['exclude_keys'])) {
!             $exclude_keys = $_REQUEST['exclude_keys'];
!         } else {
!             $exclude_keys = null;
!         }
!         $content = $this->buildXML($menus, $exclude_keys, $lastmod, $addkeys);
          if ($_REQUEST['build_type']) {
              /* save to server */
***************
*** 334,338 ****
      }
  
!     function buildXML($menus, $lastmod=null, $addkeys=null)
      {
          $menuitems = array();
--- 391,395 ----
      }
  
!     function buildXML($menus, $exclude_keys=null, $lastmod=null, $addkeys=null)
      {
          $menuitems = array();
***************
*** 348,352 ****
          /* get other keyed items */
          if ($addkeys) {
!             $otheritems = $this->getOtherItems();
  //            print_r($otheritems); //exit;            
              /* compare the arrays for dupes and return the cleaned array */
--- 405,409 ----
          /* get other keyed items */
          if ($addkeys) {
!             $otheritems = $this->getOtherItems($exclude_keys);
  //            print_r($otheritems); //exit;            
              /* compare the arrays for dupes and return the cleaned array */
***************
*** 466,470 ****
                  if (PHPWS_Settings::get('sitemap', 'local_only')) {
                      if (!$link['local']) {
- //                        $link = null;
                          $tidy = null;
                      }
--- 523,526 ----
***************
*** 474,482 ****
                  if (PHPWS_Settings::get('sitemap', 'respect_privs')) {
                      if ($link['key_id'] && !$link['active']) {
- //                        $link = null;
                          $tidy = null;
                      }
                      if ($link['key_id'] && $link['restricted']) {
- //                        $link = null;
                          $tidy = null;
                      }
--- 530,536 ----
***************
*** 512,523 ****
  
  
!     function getOtherItems()
      {
          $final = null;
          $db = new PHPWS_DB('phpws_key');
  
!         if (!PHPWS_Settings::get('sitemap', 'include_fc')) {
!             $db->addWhere('module', 'filecabinet', '!=');
          }
          $db->addOrder('id');
          $db->setIndexBy('id');
--- 566,580 ----
  
  
!     function getOtherItems($exclude_keys=null)
      {
          $final = null;
          $db = new PHPWS_DB('phpws_key');
  
!         if ($exclude_keys) {
!             foreach ($exclude_keys as $module) {
!                 $db->addWhere('module', $module, '!=');
!             }
          }
+ 
          $db->addOrder('id');
          $db->setIndexBy('id');
***************
*** 552,556 ****
              if (PHPWS_Settings::get('sitemap', 'local_only')) {
                  if (!$link['local']) {
- //                    $link = null;
                      $tidy = null;
                  }
--- 609,612 ----
***************
*** 560,568 ****
              if (PHPWS_Settings::get('sitemap', 'respect_privs')) {
                  if (!$link['active']) {
- //                    $link = null;
                      $tidy = null;
                  }
                  if ($link['restricted']) {
- //                    $link = null;
                      $tidy = null;
                  }
--- 616,622 ----
***************
*** 622,624 ****
  
  }
! ?>
--- 676,678 ----
  
  }
! ?>
\ No newline at end of file

Index: SM_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/class/SM_Forms.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SM_Forms.php	7 Jul 2008 21:01:35 -0000	1.3
--- SM_Forms.php	16 Jul 2008 19:07:11 -0000	1.4
***************
*** 66,69 ****
--- 66,74 ----
              $mMatch = null;
          }
+         if ($_REQUEST['exclude_keys']) {
+             $kMatch = $_REQUEST['exclude_keys'];
+         } else {
+             $kMatch = unserialize(PHPWS_Settings::get('sitemap', 'exclude_keys'));
+         }
          if ($_REQUEST['lastmod_default']) {
              $dMatch = $_REQUEST['lastmod_default'];
***************
*** 74,78 ****
          $form->addCheckbox('addkeys', 1);
          $form->setMatch('addkeys', PHPWS_Settings::get('sitemap', 'addkeys'));
!         $form->setLabel('addkeys', dgettext('sitemap', 'Include keyed items not in menus in your sitemap'));
  
          $form->addRadio('build_type', array(0, 1));
--- 79,83 ----
          $form->addCheckbox('addkeys', 1);
          $form->setMatch('addkeys', PHPWS_Settings::get('sitemap', 'addkeys'));
!         $form->setLabel('addkeys', dgettext('sitemap', 'Include keyed module items not in menus in your sitemap'));
  
          $form->addRadio('build_type', array(0, 1));
***************
*** 90,93 ****
--- 95,100 ----
          $tpl['MENU_SELECT'] = $this->sitemap->getMenus($mMatch, 'menus');
          $tpl['MENU_SELECT_LABEL'] = dgettext('sitemap', 'Select one or more menus to include in your sitemap.');
+         $tpl['KEY_SELECT'] = $this->sitemap->getKeyMods($kMatch, 'exclude_keys');
+         $tpl['KEY_SELECT_LABEL'] = dgettext('sitemap', 'Select any modules you wish to exclude from your sitemap.');
  
          $this->sitemap->title = dgettext('sitemap', 'Create sitemap file');
***************
*** 136,143 ****
          $form->setLabel('addkeys', dgettext('sitemap', 'Include keyed items not in menus in your sitemap'));
  
-         $form->addCheckbox('include_fc', 1);
-         $form->setMatch('include_fc', PHPWS_Settings::get('sitemap', 'include_fc'));
-         $form->setLabel('include_fc', dgettext('sitemap', 'Include file cabinet items within keyed items'));
- 
          $form->addText('cache_timeout', PHPWS_Settings::get('sitemap', 'cache_timeout'));
          $form->setSize('cache_timeout', 4, 4);
--- 143,146 ----
***************
*** 148,151 ****
--- 151,156 ----
          $tpl = $form->getTemplate();
          $tpl['SETTINGS_LABEL'] = dgettext('sitemap', 'General Settings');
+         $tpl['KEY_SELECT'] = $this->sitemap->getKeyMods(unserialize(PHPWS_Settings::get('sitemap', 'exclude_keys')), 'exclude_keys');
+         $tpl['KEY_SELECT_LABEL'] = dgettext('sitemap', 'Select any modules you wish to exclude by default from your sitemap.');
          $tpl['FOOTNOTE_1'] = sprintf(dgettext('sitemap', '* More information on the Sitemap protocal is available %s'), '<a href="http://www.sitemaps.org/protocol.php" target="new">'. dgettext('sitemap', 'here') .'</a>');
          $tpl['FOOTNOTE_2'] = dgettext('sitemap', '** I do a rough calculation to achieve this. Everything starts as the average 0.5. I add 0.5 to top-level itmes. I then subtract 0.1 for each step down the menu order. Nothing is scored above 1.0 or below 0.1.');
***************
*** 162,168 ****
          $tpl['TITLE'] = dgettext('sitemap', 'Important Information');
          $tpl['INFO_1_LABEL'] = dgettext('sitemap', 'About this module:');
!         $tpl['INFO_1'] = dgettext('sitemap', 'This is the first release of sitemap for the new 1.x series phpwebsite. I wrote this for a specific need I had and thought it may be of use to others also.');
          $tpl['INFO_2_LABEL'] = dgettext('sitemap', 'What it does:');
!         $tpl['INFO_2'] = sprintf(dgettext('sitemap', 'Sitemap is used to generate a sitmap.xml file, following the standards at %s. These sitemap files are used by google and other popular search engines to help them index your website. Sitemap does this by gathering all the links from one or more of your menus, filtering and preparing according to your settings, and then writing the xml for you.'), '<a href="http://www.sitemaps.org/protocol.php" target="new">sitemaps.org</a>');
          $tpl['INFO_3_LABEL'] = dgettext('sitemap', 'How to use it:');
          if (MOD_REWRITE_ENABLED) {
--- 167,173 ----
          $tpl['TITLE'] = dgettext('sitemap', 'Important Information');
          $tpl['INFO_1_LABEL'] = dgettext('sitemap', 'About this module:');
!         $tpl['INFO_1'] = dgettext('sitemap', 'This is the third release of sitemap for the new 1.x series phpwebsite. I wrote this for a specific need I had and thought it may be of use to others also.');
          $tpl['INFO_2_LABEL'] = dgettext('sitemap', 'What it does:');
!         $tpl['INFO_2'] = sprintf(dgettext('sitemap', 'Sitemap is used to generate a sitmap.xml file, following the standards at %s. These sitemap files are used by google and other popular search engines to help them index your website. Sitemap does this by gathering all the links from one or more of your menus, as well as other keyed module items (such as blog posts) that may not be in a menu, filtering and preparing according to your settings, and then writing the xml for you.'), '<a href="http://www.sitemaps.org/protocol.php" target="new">sitemaps.org</a>');
          $tpl['INFO_3_LABEL'] = dgettext('sitemap', 'How to use it:');
          if (MOD_REWRITE_ENABLED) {

[phpws-comm-commits] modules/sitemap/docs CHANGELOG,1.4,1.5

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

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

Modified Files:
	CHANGELOG 
Log Message:
0.6.0 updates

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/docs/CHANGELOG,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CHANGELOG	7 Jul 2008 21:01:36 -0000	1.4
--- CHANGELOG	16 Jul 2008 19:07:12 -0000	1.5
***************
*** 33,34 ****
--- 33,42 ----
  + Added english lang file
  
+ Version 0.6.0 -- July 2008
+ ------------------------------------------------------------------
+ July 16
+ + Added ability to set default exclude list for keyed items
+ + Added ability to customize exclude list for manual sitemaps
+ + A bit more code tidy up
+ + Updated english lang file
+ 

[phpws-comm-commits] modules/sitemap/boost boost.php, 1.4, 1.5 update.php, 1.1, 1.2

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

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

Modified Files:
	boost.php update.php 
Log Message:
0.6.0 updates

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/boost/boost.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** boost.php	7 Jul 2008 21:01:33 -0000	1.4
--- boost.php	16 Jul 2008 19:07:09 -0000	1.5
***************
*** 24,28 ****
  
  $proper_name  = 'Sitemap';
! $version      = '0.5.0';
  $register     = false;
  $import_sql   = false;
--- 24,28 ----
  
  $proper_name  = 'Sitemap';
! $version      = '0.6.0';
  $register     = false;
  $import_sql   = false;

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/boost/update.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** update.php	7 Jul 2008 21:01:33 -0000	1.1
--- update.php	16 Jul 2008 19:07:10 -0000	1.2
***************
*** 47,50 ****
--- 47,68 ----
  
  
+         case version_compare($currentVersion, '0.6.0', '<'):
+             $content[] = '<pre>';
+     
+             $files = array('templates/edit_settings.tpl',
+                            'templates/map_settings.tpl'
+             );
+             sitemapUpdateFiles($files, $content);
+             
+             $content[] = '0.6.0 changes
+ ----------------
+ + Added ability to set default exclude list for keyed items
+ + Added ability to customize exclude list for manual sitemaps
+ + A bit more code tidy up
+ + Updated english lang file
+ 
+ </pre>';
+ 
+ 
  
      } // end switch

[phpws-comm-commits] modules/sitemap index.php,1.2,1.3

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

Update of /cvsroot/phpwebsite-comm/modules/sitemap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32471

Modified Files:
	index.php 
Log Message:
0.6.0 updates

Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	1 Jul 2008 03:43:53 -0000	1.2
--- index.php	16 Jul 2008 19:07:06 -0000	1.3
***************
*** 31,43 ****
  $sitemap = new Sitemap;
  
- /*
- if (isset($_REQUEST['mapit'])) {
-     $sitemap->siteMap();
-  } elseif(Current_User::allow('sitemap')) {
-      $sitemap->adminMenu();
-  } else {
-     PHPWS_Core::errorPage('404');
-  }
- */
  
  if (isset($_REQUEST['aop']) && Current_User::allow('sitemap')) {
--- 31,34 ----
***************
*** 47,50 ****
  }
  
- 
  ?>
\ No newline at end of file
--- 38,40 ----

[phpws-comm-commits] modules/sitemap/templates edit_settings.tpl, 1.3, 1.4 map_settings.tpl, 1.3, 1.4

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

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

Modified Files:
	edit_settings.tpl map_settings.tpl 
Log Message:
0.6.0 updates

Index: map_settings.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/templates/map_settings.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** map_settings.tpl	7 Jul 2008 21:01:41 -0000	1.3
--- map_settings.tpl	16 Jul 2008 19:07:16 -0000	1.4
***************
*** 3,7 ****
      <legend><strong>{OPTIONS_LABEL}</strong></legend>
      <p>{MENU_SELECT_LABEL}<br />{MENU_SELECT}</p>
!     <p>{ADDKEYS} {ADDKEYS_LABEL}</p>
      <!-- BEGIN lastmod_default --><p>{LASTMOD_DEFAULT} {LASTMOD_DEFAULT_LABEL}</p><!-- END lastmod_default -->
      <p>{BUILD_TYPE_1}{BUILD_TYPE_1_LABEL} {BUILD_TYPE_2}{BUILD_TYPE_2_LABEL}</p>
--- 3,10 ----
      <legend><strong>{OPTIONS_LABEL}</strong></legend>
      <p>{MENU_SELECT_LABEL}<br />{MENU_SELECT}</p>
!     <p>
!         {ADDKEYS} {ADDKEYS_LABEL}
!         <div style="margin: 0 0 0 2em;">{KEY_SELECT_LABEL}<br />{KEY_SELECT}</div>
!     </p>
      <!-- BEGIN lastmod_default --><p>{LASTMOD_DEFAULT} {LASTMOD_DEFAULT_LABEL}</p><!-- END lastmod_default -->
      <p>{BUILD_TYPE_1}{BUILD_TYPE_1_LABEL} {BUILD_TYPE_2}{BUILD_TYPE_2_LABEL}</p>

Index: edit_settings.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/templates/edit_settings.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** edit_settings.tpl	7 Jul 2008 21:01:41 -0000	1.3
--- edit_settings.tpl	16 Jul 2008 19:07:16 -0000	1.4
***************
*** 9,14 ****
      <p>{USE_PRIORITY} {USE_PRIORITY_LABEL}</p>
      <p>{ALLOW_FEED} {ALLOW_FEED_LABEL}</p>
!     <p>{ADDKEYS} {ADDKEYS_LABEL}</p>
!     <p>&#160;&#160;&#160;&#160;&#160;{INCLUDE_FC} {INCLUDE_FC_LABEL}</p>
      <p>{CACHE_TIMEOUT} {CACHE_TIMEOUT_LABEL}</p>
      <p class="smaller">{FOOTNOTE_1}</p>
--- 9,16 ----
      <p>{USE_PRIORITY} {USE_PRIORITY_LABEL}</p>
      <p>{ALLOW_FEED} {ALLOW_FEED_LABEL}</p>
!     <p>
!         {ADDKEYS} {ADDKEYS_LABEL}
!         <div style="margin: 0 0 0 2em;">{KEY_SELECT_LABEL}<br />{KEY_SELECT}</div>
!     </p>
      <p>{CACHE_TIMEOUT} {CACHE_TIMEOUT_LABEL}</p>
      <p class="smaller">{FOOTNOTE_1}</p>

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

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

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

Modified Files:
	sitemap.po 
Log Message:
0.6.0 updates

Index: sitemap.po
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/locale/en_US/LC_MESSAGES/sitemap.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sitemap.po	7 Jul 2008 21:01:39 -0000	1.1
--- sitemap.po	16 Jul 2008 19:07:15 -0000	1.2
***************
*** 25,29 ****
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-07-07 16:42-0400\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--- 25,29 ----
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-07-16 15:00-0400\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
***************
*** 117,124 ****
  msgstr ""
  
! msgid "Include file cabinet items within keyed items"
  msgstr ""
  
! msgid "Include keyed items not in menus in your sitemap"
  msgstr ""
  
--- 117,124 ----
  msgstr ""
  
! msgid "Include keyed items not in menus in your sitemap"
  msgstr ""
  
! msgid "Include keyed module items not in menus in your sitemap"
  msgstr ""
  
***************
*** 126,129 ****
--- 126,132 ----
  msgstr ""
  
+ msgid "No keyed items."
+ msgstr ""
+ 
  msgid "No menus created."
  msgstr ""
***************
*** 148,151 ****
--- 151,160 ----
  msgstr ""
  
+ msgid "Select any modules you wish to exclude by default from your sitemap."
+ msgstr ""
+ 
+ msgid "Select any modules you wish to exclude from your sitemap."
+ msgstr ""
+ 
  msgid "Select one or more menus to include in your sitemap."
  msgstr ""
***************
*** 162,167 ****
  "s. These sitemap files are used by google and other popular search engines "
  "to help them index your website. Sitemap does this by gathering all the "
! "links from one or more of your menus, filtering and preparing according to "
! "your settings, and then writing the xml for you."
  msgstr ""
  
--- 171,177 ----
  "s. These sitemap files are used by google and other popular search engines "
  "to help them index your website. Sitemap does this by gathering all the "
! "links from one or more of your menus, as well as other keyed module items "
! "(such as blog posts) that may not be in a menu, filtering and preparing "
! "according to your settings, and then writing the xml for you."
  msgstr ""
  
***************
*** 170,174 ****
  
  msgid ""
! "This is the second release of sitemap for the new 1.x series phpwebsite. I "
  "wrote this for a specific need I had and thought it may be of use to others "
  "also."
--- 180,184 ----
  
  msgid ""
! "This is the third release of sitemap for the new 1.x series phpwebsite. I "
  "wrote this for a specific need I had and thought it may be of use to others "
  "also."
***************
*** 181,184 ****
--- 191,200 ----
  msgstr ""
  
+ msgid "item"
+ msgstr ""
+ 
+ msgid "items"
+ msgstr ""
+ 
  msgid "link"
  msgstr ""

[phpws-comm-commits] modules/poll/boost boost.php, 1.2, 1.3 dependency.xml, 1.2, 1.3 update.php, 1.3, 1.4

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

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

Modified Files:
	boost.php dependency.xml update.php 
Log Message:
Now using mod_rewrite, added cacheQueries and addSortHeader, and saving a poll now sets manage tab.

Index: dependency.xml
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/boost/dependency.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dependency.xml	28 May 2007 20:52:43 -0000	1.2
--- dependency.xml	12 Jul 2008 02:45:14 -0000	1.3
***************
*** 4,8 ****
      <title>core</title>
      <properName>phpWebSite Core</properName>
!     <version>1.5.0</version>
      <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url>
    </module>
--- 4,8 ----
      <title>core</title>
      <properName>phpWebSite Core</properName>
!     <version>1.8.2</version>
      <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url>
    </module>

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/boost/boost.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** boost.php	28 May 2007 20:52:43 -0000	1.2
--- boost.php	12 Jul 2008 02:45:14 -0000	1.3
***************
*** 24,28 ****
  
  $proper_name  = 'Poll';
! $version      = '1.1.0';
  $register     = FALSE;
  $unregister   = FALSE;
--- 24,28 ----
  
  $proper_name  = 'Poll';
! $version      = '1.1.1';
  $register     = FALSE;
  $unregister   = FALSE;

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/boost/update.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** update.php	14 Oct 2007 23:30:03 -0000	1.3
--- update.php	12 Jul 2008 02:45:14 -0000	1.4
***************
*** 33,36 ****
--- 33,46 ----
              $content[] = '- Fixed case where edit link would appear when user didn\'t have permission.';
              $content[] = '- Now using the new logIfError() function in the core.';
+ 
+         case version_compare($currentVersion, '1.1.1', '<'):
+             $files = array('templates/poll/list.tpl');
+             poll_update_files($files, $content);
+ 
+             $content[] = '- Now using mod_rewrite for poll results page.';
+             $content[] = '- Added calls to cacheQueries and addSortHeader when using DBPager.';
+             $content[] = '- Saving a poll now sets the manage tab correctly.';
+             $content[] = '- Removed calls to help module which were not working anyway.';
+             $content[] = '- Corrected a few phrases that were not being translated.';
      }
  
***************
*** 38,40 ****
--- 48,67 ----
  }
  
+ function poll_update_files($files, &$content)
+ {
+     if (PHPWS_Boost::updateFiles($files, 'poll'))
+     {
+         $content[] = '- Updated the following files:';
+     }
+     else
+     {
+         $content[] = '- Unable to update the following files:';
+     }
+ 
+     foreach ($files as $file)
+     {
+         $content[] = '--- ' . $file;
+     }
+ }
+ 
  ?>
\ No newline at end of file

[phpws-comm-commits] modules/poll/class admin.php, 1.9, 1.10 poll.php, 1.10, 1.11

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

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

Modified Files:
	admin.php poll.php 
Log Message:
Now using mod_rewrite, added cacheQueries and addSortHeader, and saving a poll now sets manage tab.

Index: poll.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/class/poll.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** poll.php	15 Oct 2007 02:50:40 -0000	1.10
--- poll.php	12 Jul 2008 02:45:15 -0000	1.11
***************
*** 413,424 ****
              $template['TITLE']    = $this->getTitle();
              $template['QUESTION'] = $this->getQuestion();
!             $template['VOTES']    = PHPWS_Text::moduleLink($this->getTotalNumberVotes(TRUE), 'poll',
!                                                            array('user'=>'results', 'poll_id'=>$this->getId()));
              if ($this->allow_comments)
              {
                  PHPWS_Core::initModClass('comments', 'Comments.php');
                  $comments = Comments::getThread($this->key_id);
!                 $template['COMMENTS'] = PHPWS_Text::moduleLink($comments->countComments(TRUE), 'poll',
!                                                                array('user'=>'results', 'poll_id'=>$this->getId()));
              }
              return PHPWS_Template::process($template, 'poll', 'poll/boxstyles/default.tpl');
--- 413,441 ----
              $template['TITLE']    = $this->getTitle();
              $template['QUESTION'] = $this->getQuestion();
! 
!             if (MOD_REWRITE_ENABLED)
!             {
!                 $template['VOTES'] = sprintf('<a href="poll/%d">%s</a>', $this->getId(), $this->getTotalNumberVotes(TRUE));
!             }
!             else
!             {
!                 $template['VOTES'] = PHPWS_Text::moduleLink($this->getTotalNumberVotes(TRUE), 'poll',
!                                                             array('user'=>'results', 'poll_id'=>$this->getId()));
!             }
! 
              if ($this->allow_comments)
              {
                  PHPWS_Core::initModClass('comments', 'Comments.php');
                  $comments = Comments::getThread($this->key_id);
! 
!                 if (MOD_REWRITE_ENABLED)
!                 {
!                     $template['COMMENTS'] = sprintf('<a href="poll/%d#comments">%s</a>', $this->getId(), $comments->countComments(TRUE));
!                 }
!                 else
!                 {
!                     $template['COMMENTS'] = PHPWS_Text::moduleLink($comments->countComments(TRUE), 'poll',
!                                                                    array('user'=>'results', 'poll_id'=>$this->getId()));
!                 }
              }
              return PHPWS_Template::process($template, 'poll', 'poll/boxstyles/default.tpl');

Index: admin.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/class/admin.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** admin.php	12 Jul 2008 00:24:45 -0000	1.9
--- admin.php	12 Jul 2008 02:45:15 -0000	1.10
***************
*** 51,55 ****
          }
  
!         $panel->setContent(Poll_Admin::route($action));
          Layout::add(PHPWS_ControlPanel::display($panel->display()));
      }
--- 51,55 ----
          }
  
!         $panel->setContent(Poll_Admin::route($action, $panel));
          Layout::add(PHPWS_ControlPanel::display($panel->display()));
      }
***************
*** 73,77 ****
      }
  
!     function route($action)
      {
          $title   = NULL;
--- 73,77 ----
      }
  
!     function route($action, &$panel)
      {
          $title   = NULL;
***************
*** 191,194 ****
--- 191,196 ----
  
              case 'managePolls':
+                 /* Need to set tab in case we got here from another action. */
+                 $panel->setCurrentTab('managePolls');
                  $title = dgettext('poll', 'Manage Polls');
                  $content = Poll_Admin::listPolls();
***************
*** 384,394 ****
          PHPWS_Core::initCoreClass('DBPager.php');
  
!         $pageTags['TITLE']          = dgettext('poll', 'Title');
!         $pageTags['QUESTION']       = dgettext('poll', 'Question');
!         $pageTags['CREATED']        = dgettext('poll', 'Created');
!         $pageTags['USERS_ONLY']     = dgettext('poll', 'Users Only');
!         $pageTags['ALLOW_COMMENTS'] = dgettext('poll', 'Comments');
!         $pageTags['ACTIVE']         = dgettext('poll', 'Active');
!         $pageTags['ACTION']         = dgettext('poll', 'Action');
          $pager = new DBPager('poll', 'Poll');
          $pager->setModule('poll');
--- 386,390 ----
          PHPWS_Core::initCoreClass('DBPager.php');
  
!         $pageTags['ACTION'] = dgettext('poll', 'Action');
          $pager = new DBPager('poll', 'Poll');
          $pager->setModule('poll');
***************
*** 399,403 ****
--- 395,406 ----
          $pager->setSearch('title', 'question');
          $pager->setDefaultOrder('title', 'asc');
+         $pager->addSortHeader('title', dgettext('poll', 'Title'));
+         $pager->addSortHeader('question', dgettext('poll', 'Question'));
+         $pager->addSortHeader('created', dgettext('poll', 'Created'));
+         $pager->addSortHeader('users_only', dgettext('poll', 'Users Only'));
+         $pager->addSortHeader('allow_comments', dgettext('poll', 'Comments'));
+         $pager->addSortHeader('active', dgettext('poll', 'Active'));
          $pager->setEmptyMessage(dgettext('poll', 'No polls found.'));
+         $pager->cacheQueries();
  
          return $pager->get();

[phpws-comm-commits] modules/poll index.php,1.5,1.6

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

Update of /cvsroot/phpwebsite-comm/modules/poll
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9517

Modified Files:
	index.php 
Log Message:
Now using mod_rewrite, added cacheQueries and addSortHeader, and saving a poll now sets manage tab.

Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** index.php	28 May 2007 20:52:42 -0000	1.5
--- index.php	12 Jul 2008 02:45:12 -0000	1.6
***************
*** 31,34 ****
--- 31,41 ----
  PHPWS_Core::initModClass('poll', 'user.php');
  
+ /* mod_rewrite support */
+ if (isset($_GET['var1']) && is_numeric($_GET['var1']))
+ {
+     $_REQUEST['user'] = 'result';
+     $_REQUEST['poll_id'] = $_GET['var1'];
+ }
+ 
  if (isset($_REQUEST['user']))
  {

[phpws-comm-commits] modules/poll/templates/poll list.tpl,1.1,1.2

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

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

Modified Files:
	list.tpl 
Log Message:
Now using mod_rewrite, added cacheQueries and addSortHeader, and saving a poll now sets manage tab.

Index: list.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/templates/poll/list.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** list.tpl	20 Feb 2007 05:09:45 -0000	1.1
--- list.tpl	12 Jul 2008 02:45:18 -0000	1.2
***************
*** 1,10 ****
  <table cellpadding="4" cellspacing="1" width="100%">
    <tr>
!     <th>{TITLE} {TITLE_SORT}</th>
!     <th>{QUESTION} {QUESTION_SORT}</th>
!     <th>{CREATED} {CREATED_SORT}</th>
!     <th>{USERS_ONLY} {USERS_ONLY_SORT}</th>
!     <th>{ALLOW_COMMENTS} {ALLOW_COMMENTS_SORT}</th>
!     <th>{ACTIVE} {ACTIVE_SORT}</th>
      <th>{ACTION}</th>
    </tr>
--- 1,10 ----
  <table cellpadding="4" cellspacing="1" width="100%">
    <tr>
!     <th>{TITLE_SORT}</th>
!     <th>{QUESTION_SORT}</th>
!     <th>{CREATED_SORT}</th>
!     <th>{USERS_ONLY_SORT}</th>
!     <th>{ALLOW_COMMENTS_SORT}</th>
!     <th>{ACTIVE_SORT}</th>
      <th>{ACTION}</th>
    </tr>

[phpws-comm-commits] modules/poll/docs COPYING, 1.1, 1.2 CREDITS, 1.1, 1.2 ChangeLog, 1.9, 1.10 INSTALL, 1.3, 1.4

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

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

Modified Files:
	COPYING CREDITS ChangeLog INSTALL 
Log Message:
Now using mod_rewrite, added cacheQueries and addSortHeader, and saving a poll now sets manage tab.

Index: CREDITS
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/docs/CREDITS,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CREDITS	20 Feb 2007 05:09:39 -0000	1.1
--- CREDITS	12 Jul 2008 02:45:17 -0000	1.2
***************
*** 3,7 ****
  Credits and Acknowledgements
  
! Ads for phpWebSite is copyright (C) 2007 by those listed in the Developers
  section below.
  
--- 3,7 ----
  Credits and Acknowledgements
  
! Ads for phpWebSite is copyright (C) 2007-2008 by those listed in the Developers
  section below.
  

Index: COPYING
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/docs/COPYING,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** COPYING	20 Feb 2007 05:09:39 -0000	1.1
--- COPYING	12 Jul 2008 02:45:17 -0000	1.2
***************
*** 294,298 ****
  
  Poll
! Copyright (C) 2007  Gregory Meiste
  
  This program is free software; you can redistribute it and/or modify
--- 294,298 ----
  
  Poll
! Copyright (C) 2007-2008  Gregory Meiste
  
  This program is free software; you can redistribute it and/or modify

Index: INSTALL
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/docs/INSTALL,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** INSTALL	28 May 2007 20:52:47 -0000	1.3
--- INSTALL	12 Jul 2008 02:45:17 -0000	1.4
***************
*** 5,10 ****
  ===== IMPORTANT =====
  
! This module is for phpWebSite 1.2.0 or higher.  You have to install
! phpWebSite >= 1.2.0 first - earlier versions of phpWebSite will not work.
  
  If you don't have phpWebSite installed, first get the latest code here:
--- 5,10 ----
  ===== IMPORTANT =====
  
! This module is for phpWebSite 1.5.2 or higher.  You have to install
! phpWebSite >= 1.5.2 first - earlier versions of phpWebSite will not work.
  
  If you don't have phpWebSite installed, first get the latest code here:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/docs/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ChangeLog	12 Jul 2008 00:24:48 -0000	1.9
--- ChangeLog	12 Jul 2008 02:45:17 -0000	1.10
***************
*** 3,8 ****
  
  
! *cvs
  
      Removed calls to help module which weren't working anyway.
      Corrected a few phrases that were not being translated.
--- 3,11 ----
  
  
! *poll-1.1.1 (11 Jul 2008)
  
+     RFE #1897854: Now using mod_rewrite for poll results page.
+     Added calls to cacheQueries and addSortHeader when using DBPager.
+     Saving a poll now sets the manage tab correctly.
      Removed calls to help module which weren't working anyway.
      Corrected a few phrases that were not being translated.