[ModCVS] CVS: PN_PostCalendar/modules/PostCalendar index.php,1.1,1.2 pnadmin.php,1.17,1.18 pnadminapi.php,1.3,1.4 pninit.php,1.19,1.20 pntables.php,1.5,1.6 pnuser.php,1.25,1.26 pnuserapi.php,1.51,1.52 pnversion.php,1.3,1.4 popup.php,1.8,1.9

[Roger R. <eps...@us...>]

Update of /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar
In directory usw-pr-cvs1:/tmp/cvs-serv25066

Modified Files:
	index.php pnadmin.php pnadminapi.php pninit.php pntables.php 
	pnuser.php pnuserapi.php pnversion.php popup.php 
Log Message:
new license text

Index: index.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.php	27 Mar 2002 16:20:56 -0000	1.1
--- index.php	5 Apr 2002 22:04:28 -0000	1.2
***************
*** 1,25 ****
  <?php
! // $Id$
! /********************************************************/
! /* PostCalendar                                         */
! /* Version 2.6,  see changes.txt for details            */
! /* Originally by Rob Sutton (Events Calendar)           */
! /* Development continued by                             */
! /*                                                      */
! /*  The PostCalendar Development Team                   */
! /*     Mahmood Al-Yousif - ma...@ba...          */
! /*     Craig Hamlin - cr...@ha...             */
! /*     HotBird - ra...@bz...                        */
! /*     Roger Raymond - ia...@ya...                 */
! /*                                                      */
! /* This program is opensource so you can do whatever    */
! /* you want with it. However, I'm happy about any       */
! /* clever idea or nifty change you might have or have   */
! /* done, send them to                                   */
! /* cal...@ba...                                 */
! /*                                                      */
! /* Any new versions can be found at                     */
! /* http://www.bahraini.tv first                         */
! /********************************************************/
  
  /*******************************************************
--- 1,28 ----
  <?php
! /**
!  *  $Id$
!  *
!  *  PostCalendar::PostNuke Events Calendar Module
!  *  Copyright (C) 2002  The PostCalendar Team
!  *  http://www.alyousif.tv/cal
!  *  
!  *  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
!  *
!  *  To read the license please read the docs/license.txt or visit
!  *  http://www.gnu.org/copyleft/gpl.html
!  *
!  */
  
  /*******************************************************

Index: pnadmin.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/pnadmin.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** pnadmin.php	3 Apr 2002 21:04:43 -0000	1.17
--- pnadmin.php	5 Apr 2002 22:04:28 -0000	1.18
***************
*** 1,25 ****
  <?php
! // $Id$
! /********************************************************/
! /* PostCalendar                                         */
! /* Version 2.6,  see changes.txt for details            */
! /* Originally by Rob Sutton (Events Calendar)           */
! /* Development continued by                             */
! /*                                                      */
! /*  The PostCalendar Development Team                   */
! /*     Mahmood Al-Yousif - ma...@ba...          */
! /*     Craig Hamlin - cr...@ha...             */
! /*     HotBird - ra...@bz...                        */
! /*     Roger Raymond - ia...@ya...                 */
! /*                                                      */
! /* This program is opensource so you can do whatever    */
! /* you want with it. However, I'm happy about any       */
! /* clever idea or nifty change you might have or have   */
! /* done, send them to                                   */
! /* cal...@ba...                                 */
! /*                                                      */
! /* Any new versions can be found at                     */
! /* http://www.bahraini.tv first                         */
! /********************************************************/
  
  
--- 1,28 ----
  <?php
! /** 
!  *  $Id$
!  *
!  *  PostCalendar::PostNuke Events Calendar Module
!  *  Copyright (C) 2002  The PostCalendar Team
!  *  http://www.alyousif.tv/cal
!  *  
!  *  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
!  *
!  *  To read the license please read the docs/license.txt or visit
!  *  http://www.gnu.org/copyleft/gpl.html
!  *
!  */
  
  

Index: pnadminapi.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/pnadminapi.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pnadminapi.php	1 Apr 2002 16:23:03 -0000	1.3
--- pnadminapi.php	5 Apr 2002 22:04:28 -0000	1.4
***************
*** 1,25 ****
  <?php
! // $Id$
! /********************************************************/
! /* PostCalendar                                         */
! /* Version 2.6,  see changes.txt for details            */
! /* Originally by Rob Sutton (Events Calendar)           */
! /* Development continued by                             */
! /*                                                      */
! /*  The PostCalendar Development Team                   */
! /*     Mahmood Al-Yousif - ma...@ba...          */
! /*     Craig Hamlin - cr...@ha...             */
! /*     HotBird - ra...@bz...                        */
! /*     Roger Raymond - ia...@ya...                 */
! /*                                                      */
! /* This program is opensource so you can do whatever    */
! /* you want with it. However, I'm happy about any       */
! /* clever idea or nifty change you might have or have   */
! /* done, send them to                                   */
! /* cal...@ba...                                 */
! /*                                                      */
! /* Any new versions can be found at                     */
! /* http://www.bahraini.tv first                         */
! /********************************************************/
  
  /**
--- 1,28 ----
  <?php
! /**
!  *  $Id$
!  *
!  *  PostCalendar::PostNuke Events Calendar Module
!  *  Copyright (C) 2002  The PostCalendar Team
!  *  http://www.alyousif.tv/cal
!  *  
!  *  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
!  *
!  *  To read the license please read the docs/license.txt or visit
!  *  http://www.gnu.org/copyleft/gpl.html
!  *
!  */
  
  /**

Index: pninit.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/pninit.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** pninit.php	2 Apr 2002 00:20:26 -0000	1.19
--- pninit.php	5 Apr 2002 22:04:28 -0000	1.20
***************
*** 1,25 ****
  <?php
! // $Id$
! /********************************************************/
! /* PostCalendar                                         */
! /* Version 2.6,  see changes.txt for details            */
! /* Originally by Rob Sutton (Events Calendar)           */
! /* Development continued by                             */
! /*                                                      */
! /*  The PostCalendar Development Team                   */
! /*     Mahmood Al-Yousif - ma...@ba...          */
! /*     Craig Hamlin - cr...@ha...             */
! /*     HotBird - ra...@bz...                        */
! /*     Roger Raymond - ia...@ya...                 */
! /*                                                      */
! /* This program is opensource so you can do whatever    */
! /* you want with it. However, I'm happy about any       */
! /* clever idea or nifty change you might have or have   */
! /* done, send them to                                   */
! /* cal...@ba...                                 */
! /*                                                      */
! /* Any new versions can be found at                     */
! /* http://www.bahraini.tv first                         */
! /********************************************************/
  
  /**
--- 1,28 ----
  <?php
! /**
!  *  $Id$
!  *
!  *  PostCalendar::PostNuke Events Calendar Module
!  *  Copyright (C) 2002  The PostCalendar Team
!  *  http://www.alyousif.tv/cal
!  *  
!  *  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
!  *
!  *  To read the license please read the docs/license.txt or visit
!  *  http://www.gnu.org/copyleft/gpl.html
!  *
!  */
  
  /**
***************
*** 75,79 ****
      pnModSetVar('PostCalendar', 'firstdayofweek',           '0');
      pnModSetVar('PostCalendar', 'doappointments',           '1');
!     pnModSetVar('PostCalendar', 'times',                    array('08:00:00','10:00:00','12:00:00','14:00:00','16:00:00','18:00:00','20:00:00','22:00:00'));
      pnModSetVar('PostCalendar', 'dayhighlightcolor',        'red');
      pnModSetVar('PostCalendar', 'monthtableborder',         '0');
--- 78,82 ----
      pnModSetVar('PostCalendar', 'firstdayofweek',           '0');
      pnModSetVar('PostCalendar', 'doappointments',           '1');
!     pnModSetVar('PostCalendar', 'times',                    array('09:00:00','17:00:00'));
      pnModSetVar('PostCalendar', 'dayhighlightcolor',        'red');
      pnModSetVar('PostCalendar', 'monthtableborder',         '0');
***************
*** 107,315 ****
  {
      // Upgrade dependent on old version number
-     // of course, none of this will really work for the old style modules
-     // so we'll probably be forced to write an upgrade script for those using older
-     // versions of the code.
-     // 
-     // The following section should provide as a decent reference for the upgrade paths
-     // please make any necessary changes.
-     
      list($dbconn) = pnDBGetConn();
      $pntable = pnDBGetTables();
!     $events_table           = $pntable['postcalendar_events'];
!     $events_column          = &$pntable['postcalendar_events_column'];
!     $events_queue_table     = $pntable['postcalendar_events_queue'];
!     $events_queue_column    = &$pntable['postcalendar_events_queue_column'];
      
      switch($oldversion) {
!         case '2.6':
!             // upgrade from verion 2.6
!             
!             $sql = "SELECT $events_column[recurrfreq] FROM $events_table";
!             $result = $dbconn->execute($sql);
!             if ($dbconn->ErrorNo() == 0) {
!                 $sql = "ALTER TABLE $events_table
!                         ADD $events_column[recurrfreq] int(3) NOT NULL default 0";
!                 $dbconn->Execute($sql);
!                 if ($dbconn->ErrorNo() != 0) {
!                     pnSessionSetVar('errormsg', 'Events Table Update Failed');
!                     return false;
!                 }
!             }
!             
!             $sql = "SELECT $events_queue_column[recurrfreq] FROM $events_queue_table";
!             $result = $dbconn->execute($sql);
!             if ($dbconn->ErrorNo() == 0) {
!                 $sql = "ALTER TABLE $events_queue_table
!                         ADD $events_queue_column[recurrfreq] int(3) NOT NULL default 0";
!                 $dbconn->Execute($sql);
!                 if ($dbconn->ErrorNo() != 0) {
!                     pnSessionSetVar('errormsg', 'Events Queue Table Update Failed');
!                     return false;
!                 }
!             }
!             /*
!             // bug in PostNuke .71 does not set new module version
!             // so i will do it :)
!             $modid = pnModGetIDFromName('PostCalendar');
!             $modules_table = $pntable['modules'];
!             $modules_column = &$pntable['modules_column'];
!             $sql = "UPDATE $modules_table SET $modules_column[version] = '2.6.1' 
!                     WHERE $modules_column[id] = $modid";
!             $dbconn->Execute($sql);
!             if ($dbconn->ErrorNo() != 0) {
!                 pnSessionSetVar('errormsg', 'Modules Table Update Failed');
!                 return false;
!             }
!             */
!             return PostCalendar_upgrade('2.6.1');
!         
!         case '2.6.1':
!             // upgrade from version 2.6.1
!             
!             $sqlADD     = "ALTER TABLE $events_table ADD $events_column[eventstatus] int(3) NOT NULL default 0";
!             $sqlMODIFY  = "ALTER TABLE $events_table MODIFY $events_column[hometext] TEXT DEFAULT NULL";
!             $sqlUPDATE  = "UPDATE $events_table SET $events_column[eventstatus] = 1 WHERE 1";
!                     
!             $dbconn->Execute($sqlADD);
!             if ($dbconn->ErrorNo() != 0) {
!                 pnSessionSetVar('errormsg', 'Events Table ADD Failed');
!                 return false;
!             }
!             
!             $dbconn->Execute($sqlMODIFY);
!             if ($dbconn->ErrorNo() != 0) {
!                 pnSessionSetVar('errormsg', 'Events Table MODIFY Failed');
!                 return false;
!             }
!             
!             $dbconn->Execute($sqlUPDATE);
!             if ($dbconn->ErrorNo() != 0) {
!                 pnSessionSetVar('errormsg', 'Events Table UPDATE Failed');
!                 return false;
!             }
!             
!             
!             // get the queued events and move them to the main table
!             $sqlSELECT = "SELECT $events_queue_column[uname],
!                            $events_queue_column[title],
!                            $events_queue_column[story],
!                            $events_queue_column[timestamp],
!                            $events_queue_column[topic],
!                            $events_queue_column[eventDate],
!                            $events_queue_column[endDate],
!                            $events_queue_column[recurrtype],
!                            $events_queue_column[recurrspec],
!                            $events_queue_column[recurrfreq],
!                            $events_queue_column[startTime],
!                            $events_queue_column[endTime],
!                            $events_queue_column[alldayevent],
!                            $events_queue_column[barcolor],
!                            $events_queue_column[location],
!                            $events_queue_column[conttel],
!                            $events_queue_column[contname],
!                            $events_queue_column[contemail],
!                            $events_queue_column[website],
!                            $events_queue_column[fee]
! 
!                     FROM $events_queue_table
!                      
!                     ORDER BY $events_queue_column[timestamp]";
! 
!             $result = $dbconn->Execute($sqlSELECT);
!             $insertsql = '';  
!             if ($dbconn->ErrorNo() == 0) {
!                 for(; !$result->EOF; $result->MoveNext()) {
!                 
!                     // grab em
!                     list($uname,$title,$story,$timestamp,$topic,$eventDate,
!                          $endDate,$recurrtype,$recurrspec,$recurrfreq,$startTime,
!                          $endTime,$alldayevent,$barcolor,$location,$conttel,$contname,
!                          $contemail,$website,$fee) = $result->fields;
!                     // prep em
!                     list($uname,$title,$story,$timestamp,$topic,$eventDate,
!                          $endDate,$recurrtype,$recurrspec,$recurrfreq,$startTime,
!                          $endTime,$alldayevent,$barcolor,$location,$conttel,$contname,
!                          $contemail,$website,$fee) = pnVarPrepForStore($uname,$title,$story,$timestamp,$topic,$eventDate,
!                                                                        $endDate,$recurrtype,$recurrspec,$recurrfreq,$startTime,
!                                                                        $endTime,$alldayevent,$barcolor,$location,$conttel,$contname,
!                                                                        $contemail,$website,$fee);
!                
!         
!         
!                     $insertsql = "INSERT INTO $events_table (
!                                                $events_column[title],
!                                                $events_column[time],
!                                     $events_column[hometext],
!                                     $events_column[topic],
!                                     $events_column[informant],
!                                     $events_column[eventDate],
!                                     $events_column[endDate],
!                                     $events_column[recurrtype],
!                                     $events_column[recurrspec],
!                                     $events_column[recurrfreq],
!                                     $events_column[startTime],
!                                     $events_column[endTime],
!                                     $events_column[alldayevent],
!                                     $events_column[barcolor],
!                                     $events_column[location],
!                                     $events_column[conttel],
!                                     $events_column[contname],
!                                     $events_column[contemail],
!                                     $events_column[website],
!                                     $events_column[fee],
!                                     $events_column[eventstatus])
!                                 VALUES ('$title', 
!                                         '$timestamp',
!                                         '$story',
!                                          $topic,
!                                         '$uname',
!                                         '$eventDate',
!                                         '$endDate',
!                                          $recurrtype,
!                                          '$recurrspec',
!                                          $recurrfreq,
!                                         '$startTime',
!                                         '$endTime',
!                                          $alldayevent,
!                                         '$barcolor',
!                                         '$location',
!                                         '$conttel',
!                                         '$contname',
!                                         '$contemail',
!                                         '$website',
!                                         '$fee',
!                                         0);";
!                                         
!                     $dbconn->Execute($insertsql);
!                     if ($dbconn->ErrorNo() != 0) {
!                         pnSessionSetVar('errormsg', 'Event Queue Update Failed');
!                         return false;
!                     }
!                 }
!             }
!             
!             // get rid of the old table queue
!             $sqlDROP = "DROP TABLE IF EXISTS $events_queue_table";
!             $dbconn->Execute($sqlDROP);
!             if ($dbconn->ErrorNo() != 0) {
!                 pnSessionSetVar('errormsg', 'Events Queue Table DROP Failed');
!                 return false;
!             }
!             
!             /*
!             // bug in PostNuke .71 does not set new module version
!             // so i will do it :)
!             $modid = pnModGetIDFromName('PostCalendar');
!             $modules_table = $pntable['modules'];
!             $modules_column = &$pntable['modules_column'];
!             $sql = "UPDATE $modules_table SET $modules_column[version] = '3.0' 
!                     WHERE $modules_column[id] = $modid";
!             $dbconn->Execute($sql);
!             if ($dbconn->ErrorNo() != 0) {
!                 pnSessionSetVar('errormsg', 'Modules Table Update Failed');
!                 return false;
!             }
!             */
!             break;
          }
  
--- 110,122 ----
  {
      // Upgrade dependent on old version number
      list($dbconn) = pnDBGetConn();
      $pntable = pnDBGetTables();
!     $events_table  = $pntable['postcalendar_events'];
!     $events_column = &$pntable['postcalendar_events_column'];
      
      switch($oldversion) {
!         case 3.0 :
!             // pass thru
!             return PostCalendar_upgrade(3.1);
          }
  
***************
*** 329,334 ****
      $events_table           = $pntable['postcalendar_events'];
      $events_column          = &$pntable['postcalendar_events_column'];
-     $events_queue_table     = $pntable['postcalendar_events_queue'];
-     $events_queue_column    = &$pntable['postcalendar_events_queue_column'];
      $module_vars_table      = $pntable['module_vars'];
      $module_vars_column     = &$pntable['module_vars_column'];
--- 136,139 ----
***************
*** 339,342 ****
--- 144,148 ----
      $modid = pnModGetIDFromName('PostCalendar');
      
+     // remove the PostCalendar events table
      $sql = "DROP TABLE $events_table";
      $dbconn->Execute($sql);
***************
*** 346,357 ****
      }
      
-     // no longer in distro
-     //$sql = "DROP TABLE $events_queue_table";
-     //$dbconn->Execute($sql);
-     //if ($dbconn->ErrorNo() != 0) {
-     //    pnSessionSetVar('errormsg', 'Events Queue Table Drop Failed');
-     //    return false;
-     //}
-     
      // remove all the PostCalendar variables from the DB
      $sql = "DELETE FROM $module_vars_table WHERE $module_vars_column[modname] LIKE 'PostCalendar%'";
--- 152,155 ----
***************
*** 370,399 ****
      }
      
-     /*
-     // Delete any module variables
-     pnModDelVar('PostCalendar', 'time24hours');
-     pnModDelVar('PostCalendar', 'eventsopeninnewwindow');
-     pnModDelVar('PostCalendar', 'useinternationaldates');
-     pnModDelVar('PostCalendar', 'firstdayofweek');
-     pnModDelVar('PostCalendar', 'doappointments');
-     pnModDelVar('PostCalendar', 'textevents');
-     pnModDelVar('PostCalendar', 'times');
-     pnModDelVar('PostCalendar', 'dayhighlightcolor');
-     pnModDelVar('PostCalendar', 'monthtableborder');
-     pnModDelVar('PostCalendar', 'monthtablecellspacing');
-     pnModDelVar('PostCalendar', 'monthtablecellpadding');
-     pnModDelVar('PostCalendar', 'yeartableborder');
-     pnModDelVar('PostCalendar', 'yeartablecellspacing');
-     pnModDelVar('PostCalendar', 'yeartablecellpadding');
-     pnModDelVar('PostCalendar', 'category1');
-     pnModDelVar('PostCalendar', 'category2');
-     pnModDelVar('PostCalendar', 'category3');
-     pnModDelVar('PostCalendar', 'category4');
-     pnModDelVar('PostCalendar', 'category5');
-     pnModDelVar('PostCalendar', 'displayballs');
-     pnModDelVar('PostCalendar', 'eventoverview');
-     pnModDelVar('PostCalendar', 'showtimeonevents');
-     pnModDelVar('PostCalendar', 'usepopups');
-     */
      // Deletion successful
      return true;
--- 168,171 ----

Index: pntables.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/pntables.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pntables.php	30 Mar 2002 20:10:52 -0000	1.5
--- pntables.php	5 Apr 2002 22:04:29 -0000	1.6
***************
*** 1,26 ****
  <?php
! // $Id$
! /********************************************************/
! /* PostCalendar                                         */
! /* Version 2.6,  see changes.txt for details            */
! /* Originally by Rob Sutton (Events Calendar)           */
! /* Development continued by                             */
! /*                                                      */
! /*  The PostCalendar Development Team                   */
! /*     Mahmood Al-Yousif - ma...@ba...          */
! /*     Craig Hamlin - cr...@ha...             */
! /*     HotBird - ra...@bz...                        */
! /*     Roger Raymond - ia...@ya...                 */
! /*                                                      */
! /* This program is opensource so you can do whatever    */
! /* you want with it. However, I'm happy about any       */
! /* clever idea or nifty change you might have or have   */
! /* done, send them to                                   */
! /* cal...@ba...                                 */
! /*                                                      */
! /* Any new versions can be found at                     */
! /* http://www.bahraini.tv first                         */
! /********************************************************/
! 
  /**
   * This function is called internally by the core whenever the module is
--- 1,29 ----
  <?php
! /**
!  *  $Id$
!  *
!  *  PostCalendar::PostNuke Events Calendar Module
!  *  Copyright (C) 2002  The PostCalendar Team
!  *  http://www.alyousif.tv/cal
!  *  
!  *  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
!  *
!  *  To read the license please read the docs/license.txt or visit
!  *  http://www.gnu.org/copyleft/gpl.html
!  *
!  */
!  
  /**
   * This function is called internally by the core whenever the module is
***************
*** 35,92 ****
      // but helps in the following statements and keeps them readable
      $events = pnConfigGetVar('prefix') . '_postcalendar_events';
!     $pntable['postcalendar_events']          = $events;
!     $pntable['postcalendar_events_column']   = array('eid'           => $events . '.pc_eid',        
!                                                      'aid'           => $events . '.pc_aid',       
!                                                      'title'         => $events . '.pc_title',     
!                                                      'time'          => $events . '.pc_time',      
!                                                      'hometext'      => $events . '.pc_hometext',   
!                                                      'comments'      => $events . '.pc_comments',   
!                                                      'counter'       => $events . '.pc_counter',   
!                                                      'topic'         => $events . '.pc_topic',     
!                                                      'informant'     => $events . '.pc_informant', 
!                                                      'eventDate'     => $events . '.pc_eventDate', 
!                                                      'endDate'       => $events . '.pc_endDate',   
!                                                      'recurrtype'    => $events . '.pc_recurrtype',
!                                                      'recurrspec'    => $events . '.pc_recurrspec',
!                                                      'recurrfreq'    => $events . '.pc_recurrfreq', 
!                                                      'startTime'     => $events . '.pc_startTime',  
!                                                      'endTime'       => $events . '.pc_endTime',   
!                                                      'alldayevent'   => $events . '.pc_alldayevent',
!                                                      'barcolor'      => $events . '.pc_barcolor',  
!                                                      'location'      => $events . '.pc_location',  
!                                                      'conttel'       => $events . '.pc_conttel',  
!                                                      'contname'      => $events . '.pc_contname',  
!                                                      'contemail'     => $events . '.pc_contemail', 
!                                                      'website'       => $events . '.pc_website',  
!                                                      'fee'           => $events . '.pc_fee',
!                                                      'eventstatus'   => $events . '.pc_eventstatus');
!     
!     $events_queue = pnConfigGetVar('prefix') . '_postcalendar_events_queue';                            
!     $pntable['postcalendar_events_queue']            = $events_queue;
!     $pntable['postcalendar_events_queue_column']     = array('qid'           => $events_queue . '.pc_qid',        
!                                                              'uid'           => $events_queue . '.pc_uid',       
!                                                              'uname'         => $events_queue . '.pc_uname',     
!                                                              'title'         => $events_queue . '.pc_title',      
!                                                              'story'         => $events_queue . '.pc_story',   
!                                                              'timestamp'     => $events_queue . '.pc_timestamp',   
!                                                              'topic'         => $events_queue . '.pc_topic',   
!                                                              'eventDate'     => $events_queue . '.pc_eventDate', 
!                                                              'endDate'       => $events_queue . '.pc_endDate',   
!                                                              'recurrtype'    => $events_queue . '.pc_recurrtype',
!                                                              'recurrspec'    => $events_queue . '.pc_recurrspec', 
!                                                              'recurrfreq'    => $events_queue . '.pc_recurrfreq', 
!                                                              'startTime'     => $events_queue . '.pc_startTime',  
!                                                              'endTime'       => $events_queue . '.pc_endTime',   
!                                                              'alldayevent'   => $events_queue . '.pc_alldayevent',
!                                                              'barcolor'      => $events_queue . '.pc_barcolor',  
!                                                              'location'      => $events_queue . '.pc_location',  
!                                                              'conttel'       => $events_queue . '.pc_conttel',  
!                                                              'contname'      => $events_queue . '.pc_contname',  
!                                                              'contemail'     => $events_queue . '.pc_contemail', 
!                                                              'website'       => $events_queue . '.pc_website',  
!                                                              'fee'           => $events_queue . '.pc_fee',
!                                                              'eventstatus'   => $events_queue . '.pc_eventstatus');
! 
!     // Return the table information
      return $pntable;
  }
--- 38,69 ----
      // but helps in the following statements and keeps them readable
      $events = pnConfigGetVar('prefix') . '_postcalendar_events';
!     $pntable['postcalendar_events'] = $events;
!     $pntable['postcalendar_events_column'] = array(
!         'eid'           => $events . '.pc_eid',        
!         'aid'           => $events . '.pc_aid',       
!         'title'         => $events . '.pc_title',     
!         'time'          => $events . '.pc_time',      
!         'hometext'      => $events . '.pc_hometext',   
!         'comments'      => $events . '.pc_comments',   
!         'counter'       => $events . '.pc_counter',   
!         'topic'         => $events . '.pc_topic',     
!         'informant'     => $events . '.pc_informant', 
!         'eventDate'     => $events . '.pc_eventDate', 
!         'endDate'       => $events . '.pc_endDate',   
!         'recurrtype'    => $events . '.pc_recurrtype',
!         'recurrspec'    => $events . '.pc_recurrspec',
!         'recurrfreq'    => $events . '.pc_recurrfreq', 
!         'startTime'     => $events . '.pc_startTime',  
!         'endTime'       => $events . '.pc_endTime',   
!         'alldayevent'   => $events . '.pc_alldayevent',
!         'barcolor'      => $events . '.pc_barcolor',  
!         'location'      => $events . '.pc_location',  
!         'conttel'       => $events . '.pc_conttel',  
!         'contname'      => $events . '.pc_contname',  
!         'contemail'     => $events . '.pc_contemail', 
!         'website'       => $events . '.pc_website',  
!         'fee'           => $events . '.pc_fee',
!         'eventstatus'   => $events . '.pc_eventstatus'
!     );
      return $pntable;
  }

Index: pnuser.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/pnuser.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** pnuser.php	3 Apr 2002 00:27:08 -0000	1.25
--- pnuser.php	5 Apr 2002 22:04:29 -0000	1.26
***************
*** 1,25 ****
  <?php
! // $Id$
! /********************************************************/
! /* PostCalendar                                         */
! /* Version 2.6,  see changes.txt for details            */
! /* Originally by Rob Sutton (Events Calendar)           */
! /* Development continued by                             */
! /*                                                      */
! /*  The PostCalendar Development Team                   */
! /*     Mahmood Al-Yousif - ma...@ba...          */
! /*     Craig Hamlin - cr...@ha...             */
! /*     HotBird - ra...@bz...                        */
! /*     Roger Raymond - ia...@ya...                 */
! /*                                                      */
! /* This program is opensource so you can do whatever    */
! /* you want with it. However, I'm happy about any       */
! /* clever idea or nifty change you might have or have   */
! /* done, send them to                                   */
! /* cal...@ba...                                 */
! /*                                                      */
! /* Any new versions can be found at                     */
! /* http://www.bahraini.tv first                         */
! /********************************************************/
  
  
--- 1,28 ----
  <?php
! /**
!  *  $Id$
!  *
!  *  PostCalendar::PostNuke Events Calendar Module
!  *  Copyright (C) 2002  The PostCalendar Team
!  *  http://www.alyousif.tv/cal
!  *  
!  *  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
!  *
!  *  To read the license please read the docs/license.txt or visit
!  *  http://www.gnu.org/copyleft/gpl.html
!  *
!  */
  
  

Index: pnuserapi.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/pnuserapi.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** pnuserapi.php	5 Apr 2002 00:19:29 -0000	1.51
--- pnuserapi.php	5 Apr 2002 22:04:29 -0000	1.52
***************
*** 1,25 ****
  <?php
! // $Id$
! /********************************************************/
! /* PostCalendar                                         */
! /* Version 2.6,  see changes.txt for details            */
! /* Originally by Rob Sutton (Events Calendar)           */
! /* Development continued by                             */
! /*                                                      */
! /*  The PostCalendar Development Team                   */
! /*     Mahmood Al-Yousif - ma...@ba...          */
! /*     Craig Hamlin - cr...@ha...             */
! /*     HotBird - ra...@bz...                        */
! /*     Roger Raymond - ia...@ya...                 */
! /*                                                      */
! /* This program is opensource so you can do whatever    */
! /* you want with it. However, I'm happy about any       */
! /* clever idea or nifty change you might have or have   */
! /* done, send them to                                   */
! /* cal...@ba...                                 */
! /*                                                      */
! /* Any new versions can be found at                     */
! /* http://www.bahraini.tv first                         */
! /********************************************************/
  
  // set some globals for easier code readability
--- 1,28 ----
  <?php
! /**
!  *  $Id$
!  *
!  *  PostCalendar::PostNuke Events Calendar Module
!  *  Copyright (C) 2002  The PostCalendar Team
!  *  http://www.alyousif.tv/cal
!  *  
!  *  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
!  *
!  *  To read the license please read the docs/license.txt or visit
!  *  http://www.gnu.org/copyleft/gpl.html
!  *
!  */
  
  // set some globals for easier code readability

Index: pnversion.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/pnversion.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pnversion.php	30 Mar 2002 20:10:52 -0000	1.3
--- pnversion.php	5 Apr 2002 22:04:29 -0000	1.4
***************
*** 1,25 ****
  <?php
! // $Id$
! /********************************************************/
! /* PostCalendar                                         */
! /* Version 2.6,  see changes.txt for details            */
! /* Originally by Rob Sutton (Events Calendar)           */
! /* Development continued by                             */
! /*                                                      */
! /*  The PostCalendar Development Team                   */
! /*     Mahmood Al-Yousif - ma...@ba...          */
! /*     Craig Hamlin - cr...@ha...             */
! /*     HotBird - ra...@bz...                        */
! /*     Roger Raymond - ia...@ya...                 */
! /*                                                      */
! /* This program is opensource so you can do whatever    */
! /* you want with it. However, I'm happy about any       */
! /* clever idea or nifty change you might have or have   */
! /* done, send them to                                   */
! /* cal...@ba...                                 */
! /*                                                      */
! /* Any new versions can be found at                     */
! /* http://www.bahraini.tv first                         */
! /********************************************************/
  $modversion['name']             = 'PostCalendar';
  $modversion['version']          = '3.0';
--- 1,28 ----
  <?php
! /**
!  *  $Id$
!  *
!  *  PostCalendar::PostNuke Events Calendar Module
!  *  Copyright (C) 2002  The PostCalendar Team
!  *  http://www.alyousif.tv/cal
!  *  
!  *  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
!  *
!  *  To read the license please read the docs/license.txt or visit
!  *  http://www.gnu.org/copyleft/gpl.html
!  *
!  */
  $modversion['name']             = 'PostCalendar';
  $modversion['version']          = '3.0';

Index: popup.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/popup.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** popup.php	5 Apr 2002 00:19:29 -0000	1.8
--- popup.php	5 Apr 2002 22:04:29 -0000	1.9
***************
*** 1,25 ****
  <?php
! // $Id$
! /********************************************************/
! /* PostCalendar                                         */
! /* Version 2.6,  see changes.txt for details            */
! /* Originally by Rob Sutton (Events Calendar)           */
! /* Development continued by                             */
! /*                                                      */
! /*  The PostCalendar Development Team                   */
! /*     Mahmood Al-Yousif - ma...@ba...          */
! /*     Craig Hamlin - cr...@ha...             */
! /*     HotBird - ra...@bz...                        */
! /*     Roger Raymond - ia...@ya...                 */
! /*                                                      */
! /* This program is opensource so you can do whatever    */
! /* you want with it. However, I'm happy about any       */
! /* clever idea or nifty change you might have or have   */
! /* done, send them to                                   */
! /* cal...@ba...                                 */
! /*                                                      */
! /* Any new versions can be found at                     */
! /* http://www.bahraini.tv first                         */
! /********************************************************/
  
  /**
--- 1,28 ----
  <?php
! /**
!  *  $Id$
!  *
!  *  PostCalendar::PostNuke Events Calendar Module
!  *  Copyright (C) 2002  The PostCalendar Team
!  *  http://www.alyousif.tv/cal
!  *  
!  *  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
!  *
!  *  To read the license please read the docs/license.txt or visit
!  *  http://www.gnu.org/copyleft/gpl.html
!  *
!  */
  
  /**