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

[phpws-comm-commits] modules/elections/javascript - New directory

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

Update of /cvsroot/phpwebsite-comm/modules/elections/javascript
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21487/javascript

Log Message:
Directory /cvsroot/phpwebsite-comm/modules/elections/javascript added to the repository

[phpws-comm-commits] modules/elections/docs README, NONE, 1.1 TODO, NONE, 1.1

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

Update of /cvsroot/phpwebsite-comm/modules/elections/docs
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19786/docs

Added Files:
	README TODO 
Log Message:
prep for 2.0.0

--- NEW FILE: README ---
<p>This is the first release of elections for the new 1.x series
phpwebsite. </p>

<p>Elections is a module that allows you to run one or more elections
(ballots). A ballot may have a title, a description, an image, and any
number of candidates. Ballots may be set to be public viewable (or not),
public may vote (or not), min and max selections settings, and many
other options. Ballots may also be set to allow ranking of candidates
(assign points to candidates).</p>

<p>Candidates may have a title, description and image, as well as up to
four optional custom fields.</p>

<p>Although voting is logged, only the fact that a vote was cast is
logged. All voting is secret. At this time, a recorded vote is not
supported.<p>

<p>There are many options, settings and reports. Please explore.</p>
--- NEW FILE: TODO ---
what about deleting related pics from FC when deleting candidate?

think about if I should be checking canvote for each candidate or if I should just once for the ballot
i.e. will I ever need to know at a candidate level when not looking at a ballot

further test ALL can vote case tests

think about including custom fields in results export, is it possible, is it needed

messages not returning when purging logs

do js tests around js calls and provide non-js options
(in view/post ballot)

[phpws-comm-commits] modules/elections/conf errors.php,NONE,1.1

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

Update of /cvsroot/phpwebsite-comm/modules/elections/conf
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19786/conf

Added Files:
	errors.php 
Log Message:
prep for 2.0.0

--- NEW FILE: errors.php ---
<?php
/**
    * elections - 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: errors.php,v 1.1 2009/02/19 21:30:10 verdonv Exp $
    * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
*/

$errors = array (ELEC_NO_FILE_ID => dgettext('elections', 'Include is missing file id.')
                 );

?>

[phpws-comm-commits] modules/elections/boost about.html, NONE, 1.1 boost.php, NONE, 1.1 controlpanel.php, NONE, 1.1 dependency.xml, NONE, 1.1 permission.php, NONE, 1.1

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

Update of /cvsroot/phpwebsite-comm/modules/elections/boost
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19786/boost

Added Files:
	about.html boost.php controlpanel.php dependency.xml 
	permission.php 
Log Message:
prep for 2.0.0

--- NEW FILE: controlpanel.php ---
<?php
/**
    * elections - 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: controlpanel.php,v 1.1 2009/02/19 21:30:09 verdonv Exp $
    * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
*/

$link[] = array(
        'label'         => 'Elections',
        'restricted'    => true,
        'url'           => 'index.php?module=elections&amp;aop=menu',
        'description'   => 'Manage various types of ballots.',
        'image'         => 'elections.png',
        'tab'           => 'content'
        );

?>
--- NEW FILE: about.html ---
<html>
<head>
<title>Elections Module</title>
<link rel="stylesheet" type="text/css" href="themes/default/style.css" />
<link rel="stylesheet" type="text/css" href="themes/default/default.css" />
</head>
<body class="padded">
<h1>Elections</h1>
<h3>By Verdon Vaillancourt</h3>

<p>Elections is a module that allows you to run one or more elections
(ballots). A ballot may have a title, a description, an image, and any
number of candidates. Ballots may be set to be public viewable (or not),
public may vote (or not), min and max selections settings, and many
other options. Ballots may also be set to allow ranking of candidates
(assign points to candidates).</p>

<p>Candidates may have a title, description and image, as well as up to
four optional custom fields.</p>

<p>Although voting is logged, only the fact that a vote was cast is
logged. All voting is secret. At this time, a recorded vote is not
supported.<p>

<p>There are many options, settings and reports. Please explore.</p>
<p class="align-center padded"><input type="button" onclick="window.close()" value="Close" /></p>
</body>
</html>

--- NEW FILE: dependency.xml ---
<?xml version="1.0"?>
<dependency>
  <module>
    <title>core</title>
    <properName>phpWebSite Core</properName>
    <version>1.9.0</version>
    <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url>
  </module>
</dependency>

--- NEW FILE: permission.php ---
<?php
/**
    * elections - 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: permission.php,v 1.1 2009/02/19 21:30:09 verdonv Exp $
    * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
*/

$use_permissions  = true;
$item_permissions = false;

?>
--- NEW FILE: boost.php ---
<?php
/**
    * elections - 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: boost.php,v 1.1 2009/02/19 21:30:09 verdonv Exp $
    * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
*/

$proper_name  = 'Elections';
$version      = '2.0.0';
$import_sql   = true;
$version_http = 'http://verdon.ca/downloads/modules/elections/check.xml';
$about        = true;
$priority     = 50;
$dependency   = true;

?>

[phpws-comm-commits] modules/elections/templates edit_ballot.tpl, NONE, 1.1 info.tpl, NONE, 1.1 list_ballots.tpl, NONE, 1.1 list_candidates.tpl, NONE, 1.1 list_votes.tpl, NONE, 1.1 main_admin.tpl, NONE, 1.1 main_user.tpl, NONE, 1.1 reports.tpl, NONE, 1.1 select_ballot.tpl, NONE, 1.1

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

Update of /cvsroot/phpwebsite-comm/modules/elections/templates
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19786/templates

Added Files:
	edit_ballot.tpl info.tpl list_ballots.tpl list_candidates.tpl 
	list_votes.tpl main_admin.tpl main_user.tpl reports.tpl 
	select_ballot.tpl 
Log Message:
prep for 2.0.0

--- NEW FILE: edit_ballot.tpl ---
{START_FORM}
<fieldset>
    <legend><strong>{DETAILS_LABEL}</strong></legend>
    <p>{TITLE} {TITLE_LABEL}</p>
    <p>{DESCRIPTION_LABEL}<br />{DESCRIPTION}</p>
    <p>{FILE_MANAGER}</p>
    <p>{SHOW_IN_BLOCK} {SHOW_IN_BLOCK_LABEL}<br />
       {PUBVIEW} {PUBVIEW_LABEL}<br />
       {PUBVOTE} {PUBVOTE_LABEL}
    </p>
    <p>{VOTEGROUPS_LABEL}<br />{VOTEGROUPS}</p>
    <p>{MINCHOICE} {MINCHOICE_LABEL}<br />
       {MAXCHOICE} {MAXCHOICE_LABEL}<br />
       {RANKING} {RANKING_LABEL}
    </p>
    <p>{OPENING} {OPENING_CAL} {OPENING_LABEL} <span class="smaller">{EXAMPLE}</span><br />
       {CLOSING} {CLOSING_CAL} {CLOSING_LABEL} <span class="smaller">{EXAMPLE}</span>
    </p>
    <p>
        {CUSTOMFIELDS_TEXT}<br />
        <span class="smalltext">{CUSTOMFIELDS_NOTE}</span><br />
        {CUSTOM1LABEL}{CUSTOM1LABEL_LABEL}<br />
        {CUSTOM2LABEL}{CUSTOM2LABEL_LABEL}<br />
        {CUSTOM3LABEL}{CUSTOM3LABEL_LABEL}<br />
        {CUSTOM4LABEL}{CUSTOM4LABEL_LABEL}<br />
    </p>
</fieldset>
{SUBMIT}
{END_FORM}

--- NEW FILE: select_ballot.tpl ---
{START_FORM}
<fieldset>
    <legend><strong>{BALLOT_ID_GROUP_LABEL}</strong></legend>
    <p>{BALLOT_ID} {BALLOT_ID_LABEL}</p>
    <p>{NO_BALLOTS_NOTE}</p>
</fieldset>
{SAVE}
{END_FORM}

--- NEW FILE: info.tpl ---
<fieldset>
    <legend><strong>{TITLE}</strong></legend>
    <p>{INFO}</p>
    <p>{DONATE}</p>
</fieldset>

--- NEW FILE: list_candidates.tpl ---
<table width="99%" cellpadding="4">
    <tr>
        <th>{TITLE_HEADER} {TITLE_SORT}</th>
        <th>{BALLOT_HEADER} {BALLOT_ID_SORT}</th>
        <th>{VOTES_HEADER} {VOTES_SORT}</th>
        <th>&nbsp;</th>
    </tr>
<!-- BEGIN listrows -->
    <tr {TOGGLE}>
        <td>{TITLE}</td>
        <td>{BALLOT}</td>
        <td>{VOTES}</td>
        <td>{ACTION}</td>
    </tr>
    <tr {TOGGLE}>
        <td colspan="6" class="smaller">{DESCRIPTION}</td>
    </tr>
<!-- END listrows -->
</table>
{EMPTY_MESSAGE}
<div class="align-center">
    {TOTAL_ROWS}<br />
    {PAGE_LABEL} {PAGES}<br />
    {LIMIT_LABEL} {LIMITS}
</div>
<div class="align-right">
    {SEARCH}
</div>

--- NEW FILE: list_votes.tpl ---
<table width="99%" cellpadding="4">
    <tr>
        <th>{BALLOT_HEADER} {BALLOT_ID_SORT}</th>
        <th>{USER_HEADER} {USERNAME_SORT}</th>
        <th>{DATE_HEADER} {VOTEDATE_SORT}</th>
        <th>{IP_HEADER} {IP_SORT}</th>
        <th>&nbsp;</th>
    </tr>
<!-- BEGIN listrows -->
    <tr {TOGGLE}>
        <td>{BALLOT}</td>
        <td>{USER}</td>
        <td>{DATE}</td>
        <td>{IP}</td>
        <td>{ACTION}</td>
    </tr>
<!-- END listrows -->
</table>
{EMPTY_MESSAGE}
<div class="align-center">
    {TOTAL_ROWS}<br />
    {PAGE_LABEL} {PAGES}<br />
    {LIMIT_LABEL} {LIMITS}
</div>
<div class="align-right">
    {SEARCH}
</div>

--- NEW FILE: main_admin.tpl ---
<div class="panel-title"><h1>{TITLE}</h1></div>
<!-- BEGIN message --><h2>{MESSAGE}</h2><!-- END message -->
{CONTENT}

--- NEW FILE: reports.tpl ---
{START_FORM}
<fieldset>
    <legend><strong>{RESULTS_TITLE}</strong></legend>
    <p class="smaller">{RESULTS_INFO}</p>
    <p>{RESULTS} {EXPORT_RESULTS_BUTTON} {LIST_RESULTS_BUTTON}</p>
</fieldset>
<fieldset>
    <legend><strong>{CANDIDATES_TITLE}</strong></legend>
    <p class="smaller">{CANDIDATES_INFO}</p>
    <p>{CANDIDATES} {CANDIDATES_BUTTON}</p>
</fieldset>
<fieldset>
    <legend><strong>{VOTES_TITLE}</strong></legend>
    <p class="smaller">{VOTES_INFO}</p>
    <p>{VOTES} {EXPORT_VOTES_BUTTON} {LIST_VOTES_BUTTON} {PURGE_VOTES_BUTTON}</p>
</fieldset>
{END_FORM}

--- NEW FILE: list_ballots.tpl ---
<table width="99%" cellpadding="4">
    <tr>
        <th>{TITLE_HEADER} {TITLE_SORT}</th>
        <th>{OPENS_HEADER} {OPENING_SORT}</th>
        <th>{CLOSES_HEADER} {CLOSING_SORT}</th>
        <th>{CANDIDATES_HEADER}</th>
        <!-- BEGIN votes_header --><th>{VOTES_HEADER}</th><!-- END votes_header -->
        <th>&nbsp;</th>
    </tr>
<!-- BEGIN listrows -->
    <tr {TOGGLE}>
        <td>{TITLE}</td>
        <td>{OPENS}</td>
        <td>{CLOSES}</td>
        <td>{CANDIDATES}</td>
        <!-- BEGIN votes --><td>{VOTES}</td><!-- END votes -->
        <td>{ACTION}</td>
    </tr>
    <tr {TOGGLE}>
        <td colspan="6" class="smaller">{DESCRIPTION}</td>
    </tr>
<!-- END listrows -->
</table>
{EMPTY_MESSAGE}
<div class="align-center">
    {TOTAL_ROWS}<br />
    {PAGE_LABEL} {PAGES}<br />
    {LIMIT_LABEL} {LIMITS}
</div>
<div class="align-right">
    {SEARCH}
</div>

--- NEW FILE: main_user.tpl ---
<div class="box elections">
   <!-- BEGIN title --><div class="box-title"><h1>{TITLE}</h1></div><!-- END title -->
   <div class="box-content">
      <!-- BEGIN message --><h2>{MESSAGE}</h2><!-- END message -->
      {CONTENT}
   </div>
</div>

[phpws-comm-commits] modules/elections/inc errordefines.php, NONE, 1.1 settings.php, NONE, 1.1

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

Update of /cvsroot/phpwebsite-comm/modules/elections/inc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19786/inc

Added Files:
	errordefines.php settings.php 
Log Message:
prep for 2.0.0

--- NEW FILE: errordefines.php ---
<?php
/**
    * elections - 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: errordefines.php,v 1.1 2009/02/19 21:30:10 verdonv Exp $
    * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
*/

define('ELEC_NO_FILE_ID', 1);
?>

--- NEW FILE: settings.php ---
<?php
/**
    * elections - 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: settings.php,v 1.1 2009/02/19 21:30:10 verdonv Exp $
    * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
*/

$settings['enable_elections']   = 1;
$settings['enable_sidebox']     = 0;
$settings['sidebox_homeonly']   = 0;
$settings['title']              = dgettext('elections', 'Elections');
$settings['sidebox_text']       = null;
$settings['enable_images']      = 1;
$settings['max_width']          = 300;
$settings['max_height']         = 300;
$settings['expiry_interval']    = 30;

?>

[phpws-comm-commits] modules/elections/locale/en_US/LC_MESSAGES - New directory

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

Update of /cvsroot/phpwebsite-comm/modules/elections/locale/en_US/LC_MESSAGES
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21194/locale/en_US/LC_MESSAGES

Log Message:
Directory /cvsroot/phpwebsite-comm/modules/elections/locale/en_US/LC_MESSAGES added to the repository

[phpws-comm-commits] modules/elections/templates/electioncandidates list.tpl, 1.2, NONE row.tpl, 1.2, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/templates/electioncandidates
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17562/templates/electioncandidates

Removed Files:
	list.tpl row.tpl 
Log Message:
prep for 2.0.0

--- row.tpl DELETED ---

--- list.tpl DELETED ---

[phpws-comm-commits] modules/elections/lang elections.da.lng, 1.2, NONE elections.en.lng, 1.4, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/lang
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17562/lang

Removed Files:
	elections.da.lng elections.en.lng 
Log Message:
prep for 2.0.0

--- elections.da.lng DELETED ---

--- elections.en.lng DELETED ---

[phpws-comm-commits] modules/elections/img delete.gif, 1.1.1.1, NONE edit.gif, 1.1.1.1, NONE view.gif, 1.1.1.1, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/img
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17562/img

Removed Files:
	delete.gif edit.gif view.gif 
Log Message:
prep for 2.0.0

--- edit.gif DELETED ---

--- view.gif DELETED ---

--- delete.gif DELETED ---

[phpws-comm-commits] modules/elections/conf layout.php, 1.1.1.1, NONE manager.php, 1.1.1.1, NONE menuman.php, 1.1.1.1, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/conf
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17562/conf

Removed Files:
	layout.php manager.php menuman.php 
Log Message:
prep for 2.0.0

--- manager.php DELETED ---

--- layout.php DELETED ---

--- menuman.php DELETED ---

[phpws-comm-commits] modules/elections/templates/voters list.tpl, 1.1.1.1, NONE row.tpl, 1.1.1.1, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/templates/voters
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17562/templates/voters

Removed Files:
	list.tpl row.tpl 
Log Message:
prep for 2.0.0

--- row.tpl DELETED ---

--- list.tpl DELETED ---

[phpws-comm-commits] modules/elections/templates/candidates list.tpl, 1.1.1.1, NONE row.tpl, 1.1.1.1, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/templates/candidates
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17562/templates/candidates

Removed Files:
	list.tpl row.tpl 
Log Message:
prep for 2.0.0

--- row.tpl DELETED ---

--- list.tpl DELETED ---

[phpws-comm-commits] modules/elections/templates block_item.tpl, 1.1, NONE delete_candidate.tpl, 1.1.1.1, NONE delete_election.tpl, 1.1.1.1, NONE delete_voter.tpl, 1.1.1.1, NONE edit_election.tpl, 1.2, NONE edit_voter.tpl, 1.1.1.1, NONE utilities.tpl, 1.1.1.1, NONE view_election.tpl, 1.1.1.1, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/templates
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17562/templates

Removed Files:
	block_item.tpl delete_candidate.tpl delete_election.tpl 
	delete_voter.tpl edit_election.tpl edit_voter.tpl 
	utilities.tpl view_election.tpl 
Log Message:
prep for 2.0.0

--- delete_voter.tpl DELETED ---

--- block_item.tpl DELETED ---

--- delete_election.tpl DELETED ---

--- delete_candidate.tpl DELETED ---

--- edit_voter.tpl DELETED ---

--- edit_election.tpl DELETED ---

--- utilities.tpl DELETED ---

--- view_election.tpl DELETED ---

[phpws-comm-commits] modules/elections/templates/elections list.tpl, 1.1.1.1, NONE row.tpl, 1.1.1.1, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/templates/elections
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17562/templates/elections

Removed Files:
	list.tpl row.tpl 
Log Message:
prep for 2.0.0

--- row.tpl DELETED ---

--- list.tpl DELETED ---

[phpws-comm-commits] modules/elections/templates view_ballot.tpl, NONE, 1.1

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

Update of /cvsroot/phpwebsite-comm/modules/elections/templates
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12157/templates

Added Files:
	view_ballot.tpl 
Log Message:
preparing for 2.0.0

--- NEW FILE: view_ballot.tpl ---
{START_FORM}
<div align="right">{BALLOT_LINKS}</div>
<strong>{TITLE}</strong>
<!-- BEGIN description --><p>{DESCRIPTION}</p><!-- END description -->
<!-- BEGIN msg --><p>{MSG}</p><!-- END msg -->
<!-- BEGIN candidates -->
<div class="elections-candidate">
    <fieldset><legend>{CANDIDATE_TITLE}</legend>
        <p>{DESCRIPTION}</p>
        <!-- BEGIN custom1 --><div><strong>{CUSTOM1_LABEL}:</strong> {CUSTOM1}</div><!-- END custom1 -->
        <!-- BEGIN custom2 --><div><strong>{CUSTOM2_LABEL}:</strong> {CUSTOM2}</div><!-- END custom2 -->
        <!-- BEGIN custom3 --><div><strong>{CUSTOM3_LABEL}:</strong> {CUSTOM3}</div><!-- END custom3 -->
        <!-- BEGIN custom4 --><div><strong>{CUSTOM4_LABEL}:</strong> {CUSTOM4}</div><!-- END custom4 -->
        <p>
          <!-- BEGIN vote_box --><div style="float: right;">{VOTE_BOX}</div><!-- END vote_box -->
          {LINKS}
        </p>
    </fieldset>
</div>
<!-- END candidates -->
<div align="right">{VOTE_BUTTON}</div>
<!-- BEGIN opening --><b>{OPENING_TEXT}:</b> {OPENING}<br /><!-- END opening -->
<!-- BEGIN closing --><b>{CLOSING_TEXT}:</b> {CLOSING}<br /><!-- END closing -->
<!-- BEGIN minchoice --><b>{MINCHOICE_TEXT}:</b> {MINCHOICE}<br /><!-- END minchoice -->
<!-- BEGIN maxchoice --><b>{MAXCHOICE_TEXT}:</b> {MAXCHOICE}<br /><!-- END maxchoice -->
<!-- BEGIN pubview --><b>{PUBVIEW_TEXT}:</b> {PUBVIEW}<br /><!-- END pubview -->
<!-- BEGIN pubvote --><b>{PUBVOTE_TEXT}:</b> {PUBVOTE}<br /><!-- END pubvote -->
<!-- BEGIN votegroups --><b>{VOTEGROUPS_TEXT}:</b> {VOTEGROUPS}<br /><!-- END votegroups -->
<!-- BEGIN showin_block --><b>{SHOWIN_BLOCK_TEXT}:</b> {SHOWIN_BLOCK}<br /><!-- END showin_block -->
{END_FORM}

[phpws-comm-commits] modules/elections/boost install.sql, 1.1.1.1, 1.2 uninstall.php, 1.1.1.1, 1.2 install.php, 1.1.1.1, NONE uninstall.sql, 1.1.1.1, NONE update.php, 1.4, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/boost
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11368/boost

Modified Files:
	install.sql uninstall.php 
Removed Files:
	install.php uninstall.sql update.php 
Log Message:
preparing for 2.0.0

Index: install.sql
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/boost/install.sql,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** install.sql	14 Nov 2006 00:50:49 -0000	1.1.1.1
--- install.sql	19 Feb 2009 20:31:59 -0000	1.2
***************
*** 1,62 ****
! CREATE TABLE mod_elections_settings (
!     enable_elections    smallint NOT NULL default '1',
!     enable_sidebox      smallint NOT NULL default '0',
!     sidebox_homeonly    smallint NOT NULL default '0',
!     sidebox_text        varchar(255),
!     enableImages        smallint NOT NULL default '0',
! 	maxImgWidth 		int NOT NULL DEFAULT '1600',
! 	maxImgHeight		int NOT NULL DEFAULT '1600',
! 	maxImgSize			int NOT NULL DEFAULT '200000',
! 	useResize			smallint NOT NULL DEFAULT '0',
! 	resizeWidth			int NOT NULL DEFAULT '500',
! 	resizeHeight		int NOT NULL DEFAULT '500',
! 	thumbWidth			int NOT NULL DEFAULT '100',
! 	thumbHeight			int NOT NULL DEFAULT '100'
!     );
! 
! INSERT INTO mod_elections_settings VALUES ('1', '0', '0', '', '1', '1600', '1600', '200000', '1', '500', '500', '100', '100');    
  
! CREATE TABLE mod_elections_elections (
!     election_id   int NOT NULL default '0',
!     title         varchar(255),
!     description   text,
!     pubview       smallint NOT NULL default '0',
!     pubvote       smallint NOT NULL default '0',
!     votegroups    text DEFAULT NULL,
!     opening       datetime NOT NULL,
!     closing       datetime NOT NULL,
!     showin_block  smallint NOT NULL default '1',
!     maxchoice     int NOT NULL DEFAULT '1',
!     custom1label  varchar(255),
!     custom2label  varchar(255),
!     custom3label  varchar(255),
!     custom4label  varchar(255),
!     PRIMARY KEY   (election_id)
  );
  
! CREATE TABLE mod_elections_candidates (
!     candidate_id    int NOT NULL default '0',
!     election_id     int NOT NULL default '0',
      title           varchar(255),
      description     text,
!     image           text,
!     votes           int NOT NULL default '0',
      custom1         varchar(255),
      custom2         varchar(255),
      custom3         varchar(255),
      custom4         varchar(255),
!     PRIMARY KEY (candidate_id),
!     index (election_id)
  );
  
! CREATE TABLE mod_elections_voters (
!     voter_id        int NOT NULL default '0',
!     election_id     int NOT NULL default '0',
      username        varchar(255),
!     votedate        datetime NOT NULL,
!     ip              varchar(255) NULL,
!     PRIMARY KEY (voter_id),
!     index (election_id)
  );
- 
- 
--- 1,52 ----
! -- elections - phpwebsite module
! -- @version $Id$
! -- @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
  
! CREATE TABLE elections_ballots (
!     id              int not null default 0,
!     key_id          int not null default 0,
!     title           varchar(255),
!     description     text,
!     image_id        int not null default 0,
!     pubview         smallint not null default 0,
!     pubvote         smallint not null default 0,
!     votegroups      text default null,
!     opening         int not null default 0,
!     closing         int not null default 0,
!     showin_block    smallint not null default 1,
!     minchoice       int not null default 1,
!     maxchoice       int not null default 1,
!     ranking         smallint not null default 0,
!     custom1label    varchar(255),
!     custom2label    varchar(255),
!     custom3label    varchar(255),
!     custom4label    varchar(255),
!     PRIMARY KEY   (id)
  );
  
! CREATE INDEX electionsballots_idx on elections_ballots(key_id);
! 
! CREATE TABLE elections_candidates (
!     id              int not null default 0,
!     ballot_id       int not null default 0,
      title           varchar(255),
      description     text,
!     image_id        int not null default 0,
!     votes           int not null default 0,
      custom1         varchar(255),
      custom2         varchar(255),
      custom3         varchar(255),
      custom4         varchar(255),
!     PRIMARY KEY (id),
!     index (ballot_id)
  );
  
! CREATE TABLE elections_votes (
!     id              int not null default 0,
!     ballot_id       int not null default 0,
      username        varchar(255),
!     votedate        int not null default 0,
!     ip              varchar(255) null,
!     PRIMARY KEY (id),
!     index (ballot_id)
  );

Index: uninstall.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/boost/uninstall.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** uninstall.php	14 Nov 2006 00:50:50 -0000	1.1.1.1
--- uninstall.php	19 Feb 2009 20:31:59 -0000	1.2
***************
*** 1,59 ****
! <?php
! /**
!  * elections
!  *
!  * 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$
!  */
!  
! 	if (!$_SESSION['OBJ_user']->isDeity()){
! 		header('location:index.php');
! 		exit();
! 	}
! 	
! 	if ($GLOBALS['core']->sqlImport($core->source_dir.'mod/elections/boost/uninstall.sql', 1, 1)) {
! 		$content .= 'All Elections tables successfully removed.<br />';
! 
! 
! 		$content .= 'Removing images directory ' . PHPWS_SOURCE_DIR . 'images/elections<br />';
! 		require_once (PHPWS_SOURCE_DIR . "core/File.php");
! 		if (PHPWS_File::rmdir($GLOBALS['core']->home_dir . 'images/elections/')) {
! 			$content .= 'The Elections images directory was fully removed.<br />';
! 		} else {
! 			$content .= 'The Elections images directory could not be removed.<br />';
! 		}
! 
! 		if(isset($_SESSION["OBJ_menuman"])) {
! 			if($GLOBALS["core"]->sqlDelete("mod_menuman_items", "menu_item_url", "%module=elections%", "LIKE"))
! 				$content .= "Removed link(s) to Elections from menu.<br />";
! 		}
! 	
! 		// Remove help information
! 		require_once(PHPWS_SOURCE_DIR . 'mod/help/class/CLS_help.php');
! 		CLS_help::uninstall_help('elections');
! 
! 		// Remove translation
! 		require_once(PHPWS_SOURCE_DIR . 'mod/language/class/Language.php');
! 		PHPWS_Language::uninstallLanguages('elections');
! 
! 		$status = 1;
! 	} else {
! 		$content .= 'There was a problem accessing the database.<br />';
! 	}
! 
! ?>
--- 1,34 ----
! <?php
! /**
!     * elections - phpwebsite module
!     *
!     * See docs/AUTHORS and docs/COPYRIGHT for relevant info.
!     *
!     * This program is free software; you can redistribute it and/or modify
!     * it under the terms of the GNU General Public License as published by
!     * the Free Software Foundation; either version 2 of the License, or
!     * (at your option) any later version.
!     * 
!     * This program is distributed in the hope that it will be useful,
!     * but WITHOUT ANY WARRANTY; without even the implied warranty of
!     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     * GNU General Public License for more details.
!     * 
!     * You should have received a copy of the GNU General Public License
!     * along with this program; if not, write to the Free Software
!     * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!     *
!     * @version $Id$
!     * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
! */
! 
! function elections_uninstall(&$content) {
! 
!     PHPWS_DB::dropTable('elections_ballots');
!     PHPWS_DB::dropTable('elections_candidates');
!     PHPWS_DB::dropTable('elections_votes');
!     $content[] = dgettext('elections', 'Elections tables dropped.');
! 
!     return true;
! }
! ?>
\ No newline at end of file

--- install.php DELETED ---

--- uninstall.sql DELETED ---

--- update.php DELETED ---

[phpws-comm-commits] modules/elections index.php, 1.1.1.1, 1.2 README, 1.2, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11368

Modified Files:
	index.php 
Removed Files:
	README 
Log Message:
preparing for 2.0.0

--- README DELETED ---

Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.php	14 Nov 2006 00:50:49 -0000	1.1.1.1
--- index.php	19 Feb 2009 20:30:58 -0000	1.2
***************
*** 1,44 ****
! <?php
! /**
!  * elections
!  *
!  * 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$
!  */
! 
! 
! $CNT_elections['content'] = NULL;
! 
! if (!isset($_SESSION['ELECTIONS_Manager']))
!     $_SESSION['ELECTIONS_Manager'] = new ELECTIONS_Manager;
! 
! if (isset($_REQUEST['Man_OP']))
!     $_SESSION['ELECTIONS_Manager']->action();
! 
! if (isset($_REQUEST['Election_OP']) && isset($_SESSION['ELECTIONS_Manager']->election))
!     $_SESSION['ELECTIONS_Manager']->election->action();
! 
! if (isset($_REQUEST['Candidate_OP']) && isset($_SESSION['ELECTIONS_Manager']->candidate))
!     $_SESSION['ELECTIONS_Manager']->candidate->action();
! 
! if (isset($_REQUEST['Voter_OP']) && isset($_SESSION['ELECTIONS_Manager']->voter))
!     $_SESSION['ELECTIONS_Manager']->voter->action();
! 
! 
! ?>
! 
--- 1,53 ----
! <?php
! /**
!     * elections - phpwebsite module
!     *
!     * See docs/AUTHORS and docs/COPYRIGHT for relevant info.
!     *
!     * This program is free software; you can redistribute it and/or modify
!     * it under the terms of the GNU General Public License as published by
!     * the Free Software Foundation; either version 2 of the License, or
!     * (at your option) any later version.
!     * 
!     * This program is distributed in the hope that it will be useful,
!     * but WITHOUT ANY WARRANTY; without even the implied warranty of
!     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     * GNU General Public License for more details.
!     * 
!     * You should have received a copy of the GNU General Public License
!     * along with this program; if not, write to the Free Software
!     * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!     *
!     * @version $Id$
!     * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
! */
! 
! if (!defined('PHPWS_SOURCE_DIR')) {
!     include '../../config/core/404.html';
!     exit();
! }
! 
! PHPWS_Core::initModClass('elections', 'Election.php');
! $election = new Election;
! 
! if (isset($_REQUEST['aop'])) {
!     $election->adminMenu();
! } elseif (isset($_REQUEST['uop'])) {
!     $election->userMenu();
! } elseif (isset($_REQUEST['id']) && isset($_REQUEST['candidate_id'])) {
!     $election->userMenu('view_candidate');
! } elseif (isset($_REQUEST['id'])) {
!     $election->userMenu('view_ballot');
! } elseif (isset($_REQUEST['ballot']) && isset($_REQUEST['candidate'])) {
!     $election->userMenu('view_candidate');
! } elseif (isset($_REQUEST['ballot'])) {
!     $election->userMenu('view_ballot');
! } elseif (isset($_REQUEST['candidate'])) {
!     $election->userMenu('view_candidate');
! } else {
! //    PHPWS_Core::home();
!     $election->userMenu('list_ballots');
! }
! 
! 
! ?>
\ No newline at end of file

[phpws-comm-commits] modules/elections/docs AUTHORS, 1.2, 1.3 COPYING, 1.1.1.1, 1.2 COPYRIGHT, 1.2, 1.3 ChangeLog, 1.8, 1.9 INSTALL, 1.2, 1.3

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

Update of /cvsroot/phpwebsite-comm/modules/elections/docs
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11368/docs

Modified Files:
	AUTHORS COPYING COPYRIGHT ChangeLog INSTALL 
Log Message:
preparing for 2.0.0

Index: COPYING
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/docs/COPYING,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** COPYING	14 Nov 2006 00:50:51 -0000	1.1.1.1
--- COPYING	19 Feb 2009 20:32:01 -0000	1.2
***************
*** 1,376 ****
! 		  GNU LESSER GENERAL PUBLIC LICENSE
! 		       Version 2.1, February 1999
  
!  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
!      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   Everyone is permitted to copy and distribute verbatim copies
   of this license document, but changing it is not allowed.
  
- [This is the first released version of the Lesser GPL.  It also counts
-  as the successor of the GNU Library Public License, version 2, hence
-  the version number 2.1.]
- 
  			    Preamble
  
    The licenses for most software are designed to take away your
  freedom to share and change it.  By contrast, the GNU General Public
! Licenses are intended to guarantee your freedom to share and change
! free software--to make sure the software is free for all its users.
! 
!   This license, the Lesser General Public License, applies to some
! specially designated software packages--typically libraries--of the
! Free Software Foundation and other authors who decide to use it.  You
! can use it too, but we suggest you first think carefully about whether
! this license or the ordinary General Public License is the better
! strategy to use in any particular case, based on the explanations below.
  
!   When we speak of free software, we are referring to freedom of use,
! not price.  Our General Public Licenses are designed to make sure that
! you have the freedom to distribute copies of free software (and charge
! for this service if you wish); that you receive source code or can get
! it if you want it; that you can change the software and use pieces of
! it in new free programs; and that you are informed that you can do
! these things.
  
    To protect your rights, we need to make restrictions that forbid
! distributors to deny you these rights or to ask you to surrender these
! rights.  These restrictions translate to certain responsibilities for
! you if you distribute copies of the library or if you modify it.
! 
!   For example, if you distribute copies of the library, whether gratis
! or for a fee, you must give the recipients all the rights that we gave
! you.  You must make sure that they, too, receive or can get the source
! code.  If you link other code with the library, you must provide
! complete object files to the recipients, so that they can relink them
! with the library after making changes to the library and recompiling
! it.  And you must show them these terms so they know their rights.
! 
!   We protect your rights with a two-step method: (1) we copyright the
! library, and (2) we offer you this license, which gives you legal
! permission to copy, distribute and/or modify the library.
! 
!   To protect each distributor, we want to make it very clear that
! there is no warranty for the free library.  Also, if the library is
! modified by someone else and passed on, the recipients should know
! that what they have is not the original version, so that the original
! author's reputation will not be affected by problems that might be
! introduced by others.
! 
!   Finally, software patents pose a constant threat to the existence of
! any free program.  We wish to make sure that a company cannot
! effectively restrict the users of a free program by obtaining a
! restrictive license from a patent holder.  Therefore, we insist that
! any patent license obtained for a version of the library must be
! consistent with the full freedom of use specified in this license.
! 
!   Most GNU software, including some libraries, is covered by the
! ordinary GNU General Public License.  This license, the GNU Lesser
! General Public License, applies to certain designated libraries, and
! is quite different from the ordinary General Public License.  We use
! this license for certain libraries in order to permit linking those
! libraries into non-free programs.
! 
!   When a program is linked with a library, whether statically or using
! a shared library, the combination of the two is legally speaking a
! combined work, a derivative of the original library.  The ordinary
! General Public License therefore permits such linking only if the
! entire combination fits its criteria of freedom.  The Lesser General
! Public License permits more lax criteria for linking other code with
! the library.
  
!   We call this license the "Lesser" General Public License because it
! does Less to protect the user's freedom than the ordinary General
! Public License.  It also provides other free software developers Less
! of an advantage over competing non-free programs.  These disadvantages
! are the reason we use the ordinary General Public License for many
! libraries.  However, the Lesser license provides advantages in certain
! special circumstances.
  
!   For example, on rare occasions, there may be a special need to
! encourage the widest possible use of a certain library, so that it becomes
! a de-facto standard.  To achieve this, non-free programs must be
! allowed to use the library.  A more frequent case is that a free
! library does the same ad as widely used non-free libraries.  In this
! case, there is little to gain by limiting the free library to free
! software only, so we use the Lesser General Public License.
  
!   In other cases, permission to use a particular library in non-free
! programs enables a greater number of people to use a large body of
! free software.  For example, permission to use the GNU C Library in
! non-free programs enables many more people to use the whole GNU
! operating system, as well as its variant, the GNU/Linux operating
! system.
  
!   Although the Lesser General Public License is Less protective of the
! users' freedom, it does ensure that the user of a program that is
! linked with the Library has the freedom and the wherewithal to run
! that program using a modified version of the Library.
  
    The precise terms and conditions for copying, distribution and
! modification follow.  Pay close attention to the difference between a
! "work based on the library" and a "work that uses the library".  The
! former contains code derived from the library, whereas the latter must
! be combined with the library in order to run.
! 
! 		  GNU LESSER GENERAL PUBLIC LICENSE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  
!   0. This License Agreement applies to any software library or other
! program which contains a notice placed by the copyright holder or
! other authorized party saying it may be distributed under the terms of
! this Lesser General Public License (also called "this License").
! Each licensee is addressed as "you".
! 
!   A "library" means a collection of software functions and/or data
! prepared so as to be conveniently linked with application programs
! (which use some of those functions and data) to form executables.
! 
!   The "Library", below, refers to any such software library or work
! which has been distributed under these terms.  A "work based on the
! Library" means either the Library or any derivative work under
! copyright law: that is to say, a work containing the Library or a
! portion of it, either verbatim or with modifications and/or translated
! straightforwardly into another language.  (Hereinafter, translation is
! included without limitation in the term "modification".)
! 
!   "Source code" for a work means the preferred form of the work for
! making modifications to it.  For a library, complete source code means
! all the source code for all modules it contains, plus any associated
! interface definition files, plus the scripts used to control compilation
! and installation of the library.
  
!   Activities other than copying, distribution and modification are not
  covered by this License; they are outside its scope.  The act of
! running a program using the Library is not restricted, and output from
! such a program is covered only if its contents constitute a work based
! on the Library (independent of the use of the Library in a tool for
! writing it).  Whether that is true depends on what the Library does
! and what the program that uses the Library does.
!   
!   1. You may copy and distribute verbatim copies of the Library's
! complete source code as you receive it, in any medium, provided that
! you conspicuously and appropriately publish on each copy an
! appropriate copyright notice and disclaimer of warranty; keep intact
! all the notices that refer to this License and to the absence of any
! warranty; and distribute a copy of this License along with the
! Library.
  
!   You may charge a fee for the physical act of transferring a copy,
! and you may at your option offer warranty protection in exchange for a
! fee.
  
!   2. You may modify your copy or copies of the Library or any portion
! of it, thus forming a work based on the Library, and copy and
  distribute such modifications or work under the terms of Section 1
  above, provided that you also meet all of these conditions:
  
!     a) The modified work must itself be a software library.
! 
!     b) You must cause the files modified to carry prominent notices
      stating that you changed the files and the date of any change.
  
!     c) You must cause the whole of the work to be licensed at no
!     charge to all third parties under the terms of this License.
! 
!     d) If a facility in the modified Library refers to a function or a
!     table of data to be supplied by an application program that uses
!     the facility, other than as an argument passed when the facility
!     is invoked, then you must make a good faith effort to ensure that,
!     in the event an application does not supply such function or
!     table, the facility still operates, and performs whatever part of
!     its purpose remains meaningful.
! 
!     (For example, a function in a library to compute square roots has
!     a purpose that is entirely well-defined independent of the
!     application.  Therefore, Subsection 2d requires that any
!     application-supplied function or table used by this function must
!     be optional: if the application does not supply it, the square
!     root function must still compute square roots.)
  
  These requirements apply to the modified work as a whole.  If
! identifiable sections of that work are not derived from the Library,
  and can be reasonably considered independent and separate works in
  themselves, then this License, and its terms, do not apply to those
  sections when you distribute them as separate works.  But when you
  distribute the same sections as part of a whole which is a work based
! on the Library, the distribution of the whole must be on the terms of
  this License, whose permissions for other licensees extend to the
! entire whole, and thus to each and every part regardless of who wrote
! it.
  
  Thus, it is not the intent of this section to claim rights or contest
  your rights to work written entirely by you; rather, the intent is to
  exercise the right to control the distribution of derivative or
! collective works based on the Library.
  
! In addition, mere aggregation of another work not based on the Library
! with the Library (or with a work based on the Library) on a volume of
  a storage or distribution medium does not bring the other work under
  the scope of this License.
  
!   3. You may opt to apply the terms of the ordinary GNU General Public
! License instead of this License to a given copy of the Library.  To do
! this, you must alter all the notices that refer to this License, so
! that they refer to the ordinary GNU General Public License, version 2,
! instead of to this License.  (If a newer version than version 2 of the
! ordinary GNU General Public License has appeared, then you can specify
! that version instead if you wish.)  Do not make any other change in
! these notices.
! 
!   Once this change is made in a given copy, it is irreversible for
! that copy, so the ordinary GNU General Public License applies to all
! subsequent copies and derivative works made from that copy.
! 
!   This option is useful when you wish to copy part of the code of
! the Library into a program that is not a library.
! 
!   4. You may copy and distribute the Library (or a portion or
! derivative of it, under Section 2) in object code or executable form
! under the terms of Sections 1 and 2 above provided that you accompany
! it with the complete corresponding machine-readable source code, which
! must be distributed under the terms of Sections 1 and 2 above on a
! medium customarily used for software interchange.
! 
!   If distribution of object code is made by offering access to copy
! from a designated place, then offering equivalent access to copy the
! source code from the same place satisfies the requirement to
! distribute the source code, even though third parties are not
! compelled to copy the source along with the object code.
! 
!   5. A program that contains no derivative of any portion of the
! Library, but is designed to work with the Library by being compiled or
! linked with it, is called a "work that uses the Library".  Such a
! work, in isolation, is not a derivative work of the Library, and
! therefore falls outside the scope of this License.
! 
!   However, linking a "work that uses the Library" with the Library
! creates an executable that is a derivative of the Library (because it
! contains portions of the Library), rather than a "work that uses the
! library".  The executable is therefore covered by this License.
! Section 6 states terms for distribution of such executables.
! 
!   When a "work that uses the Library" uses material from a header file
! that is part of the Library, the object code for the work may be a
! derivative work of the Library even though the source code is not.
! Whether this is true is especially significant if the work can be
! linked without the Library, or if the work is itself a library.  The
! threshold for this to be true is not precisely defined by law.
! 
!   If such an object file uses only numerical parameters, data
! structure layouts and accessors, and small macros and small inline
! functions (ten lines or less in length), then the use of the object
! file is unrestricted, regardless of whether it is legally a derivative
! work.  (Executables containing this object code plus portions of the
! Library will still fall under Section 6.)
! 
!   Otherwise, if the work is a derivative of the Library, you may
! distribute the object code for the work under the terms of Section 6.
! Any executables containing that work also fall under Section 6,
! whether or not they are linked directly with the Library itself.
! 
!   6. As an exception to the Sections above, you may also combine or
! link a "work that uses the Library" with the Library to produce a
! work containing portions of the Library, and distribute that work
! under terms of your choice, provided that the terms permit
! modification of the work for the customer's own use and reverse
! engineering for debugging such modifications.
! 
!   You must give prominent notice with each copy of the work that the
! Library is used in it and that the Library and its use are covered by
! this License.  You must supply a copy of this License.  If the work
! during execution displays copyright notices, you must include the
! copyright notice for the Library among them, as well as a reference
! directing the user to the copy of this License.  Also, you must do one
! of these things:
! 
!     a) Accompany the work with the complete corresponding
!     machine-readable source code for the Library including whatever
!     changes were used in the work (which must be distributed under
!     Sections 1 and 2 above); and, if the work is an executable linked
!     with the Library, with the complete machine-readable "work that
!     uses the Library", as object code and/or source code, so that the
!     user can modify the Library and then relink to produce a modified
!     executable containing the modified Library.  (It is understood
!     that the user who changes the contents of definitions files in the
!     Library will not necessarily be able to recompile the application
!     to use the modified definitions.)
! 
!     b) Use a suitable shared library mechanism for linking with the
!     Library.  A suitable mechanism is one that (1) uses at run time a
!     copy of the library already present on the user's computer system,
!     rather than copying library functions into the executable, and (2)
!     will operate properly with a modified version of the library, if
!     the user installs one, as long as the modified version is
!     interface-compatible with the version that the work was made with.
! 
!     c) Accompany the work with a written offer, valid for at
!     least three years, to give the same user the materials
!     specified in Subsection 6a, above, for a charge no more
!     than the cost of performing this distribution.
! 
!     d) If distribution of the work is made by offering access to copy
!     from a designated place, offer equivalent access to copy the above
!     specified materials from the same place.
! 
!     e) Verify that the user has already received a copy of these
!     materials or that you have already sent this user a copy.
! 
!   For an executable, the required form of the "work that uses the
! Library" must include any data and utility programs needed for
! reproducing the executable from it.  However, as a special exception,
! the materials to be distributed need not include anything that is
! normally distributed (in either source or binary form) with the major
! components (compiler, kernel, and so on) of the operating system on
! which the executable runs, unless that component itself accompanies
! the executable.
  
!   It may happen that this requirement contradicts the license
! restrictions of other proprietary libraries that do not normally
! accompany the operating system.  Such a contradiction means you cannot
! use both them and the Library together in an executable that you
! distribute.
  
!   7. You may place library facilities that are a work based on the
! Library side-by-side in a single library together with other library
! facilities not covered by this License, and distribute such a combined
! library, provided that the separate distribution of the work based on
! the Library and of the other library facilities is otherwise
! permitted, and provided that you do these two things:
  
!     a) Accompany the combined library with a copy of the same work
!     based on the Library, uncombined with any other library
!     facilities.  This must be distributed under the terms of the
!     Sections above.
  
!     b) Give prominent notice with the combined library of the fact
!     that part of it is a work based on the Library, and explaining
!     where to find the accompanying uncombined form of the same work.
  
!   8. You may not copy, modify, sublicense, link with, or distribute
! the Library except as expressly provided under this License.  Any
! attempt otherwise to copy, modify, sublicense, link with, or
! distribute the Library is void, and will automatically terminate your
! rights under this License.  However, parties who have received copies,
! or rights, from you under this License will not have their licenses
! terminated so long as such parties remain in full compliance.
  
!   9. You are not required to accept this License, since you have not
  signed it.  However, nothing else grants you permission to modify or
! distribute the Library or its derivative works.  These actions are
  prohibited by law if you do not accept this License.  Therefore, by
! modifying or distributing the Library (or any work based on the
! Library), you indicate your acceptance of this License to do so, and
  all its terms and conditions for copying, distributing or modifying
! the Library or works based on it.
  
!   10. Each time you redistribute the Library (or any work based on the
! Library), the recipient automatically receives a license from the
! original licensor to copy, distribute, link with or modify the Library
! subject to these terms and conditions.  You may not impose any further
  restrictions on the recipients' exercise of the rights granted herein.
! You are not responsible for enforcing compliance by third parties with
  this License.
  
!   11. If, as a consequence of a court judgment or allegation of patent
  infringement or for any other reason (not limited to patent issues),
  conditions are imposed on you (whether by court order, agreement or
--- 1,199 ----
! 		    GNU GENERAL PUBLIC LICENSE
! 		       Version 2, June 1991
  
!  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
!                        59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   Everyone is permitted to copy and distribute verbatim copies
   of this license document, but changing it is not allowed.
  
  			    Preamble
  
    The licenses for most software are designed to take away your
  freedom to share and change it.  By contrast, the GNU General Public
! License is intended to guarantee your freedom to share and change free
! software--to make sure the software is free for all its users.  This
! General Public License applies to most of the Free Software
! Foundation's software and to any other program whose authors commit to
! using it.  (Some other Free Software Foundation software is covered by
! the GNU Library General Public License instead.)  You can apply it to
! your programs, too.
  
!   When we speak of free software, we are referring to freedom, not
! price.  Our General Public Licenses are designed to make sure that you
! have the freedom to distribute copies of free software (and charge for
! this service if you wish), that you receive source code or can get it
! if you want it, that you can change the software or use pieces of it
! in new free programs; and that you know you can do these things.
  
    To protect your rights, we need to make restrictions that forbid
! anyone to deny you these rights or to ask you to surrender the rights.
! These restrictions translate to certain responsibilities for you if you
! distribute copies of the software, or if you modify it.
  
!   For example, if you distribute copies of such a program, whether
! gratis or for a fee, you must give the recipients all the rights that
! you have.  You must make sure that they, too, receive or can get the
! source code.  And you must show them these terms so they know their
! rights.
  
!   We protect your rights with two steps: (1) copyright the software, and
! (2) offer you this license which gives you legal permission to copy,
! distribute and/or modify the software.
  
!   Also, for each author's protection and ours, we want to make certain
! that everyone understands that there is no warranty for this free
! software.  If the software is modified by someone else and passed on, we
! want its recipients to know that what they have is not the original, so
! that any problems introduced by others will not reflect on the original
! authors' reputations.
  
!   Finally, any free program is threatened constantly by software
! patents.  We wish to avoid the danger that redistributors of a free
! program will individually obtain patent licenses, in effect making the
! program proprietary.  To prevent this, we have made it clear that any
! patent must be licensed for everyone's free use or not licensed at all.
  
    The precise terms and conditions for copying, distribution and
! modification follow.
! 
! 		    GNU GENERAL PUBLIC LICENSE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  
!   0. This License applies to any program or other work which contains
! a notice placed by the copyright holder saying it may be distributed
! under the terms of this General Public License.  The "Program", below,
! refers to any such program or work, and a "work based on the Program"
! means either the Program or any derivative work under copyright law:
! that is to say, a work containing the Program or a portion of it,
! either verbatim or with modifications and/or translated into another
! language.  (Hereinafter, translation is included without limitation in
! the term "modification".)  Each licensee is addressed as "you".
  
! Activities other than copying, distribution and modification are not
  covered by this License; they are outside its scope.  The act of
! running the Program is not restricted, and the output from the Program
! is covered only if its contents constitute a work based on the
! Program (independent of having been made by running the Program).
! Whether that is true depends on what the Program does.
  
!   1. You may copy and distribute verbatim copies of the Program's
! source code as you receive it, in any medium, provided that you
! conspicuously and appropriately publish on each copy an appropriate
! copyright notice and disclaimer of warranty; keep intact all the
! notices that refer to this License and to the absence of any warranty;
! and give any other recipients of the Program a copy of this License
! along with the Program.
  
! You may charge a fee for the physical act of transferring a copy, and
! you may at your option offer warranty protection in exchange for a fee.
! 
!   2. You may modify your copy or copies of the Program or any portion
! of it, thus forming a work based on the Program, and copy and
  distribute such modifications or work under the terms of Section 1
  above, provided that you also meet all of these conditions:
  
!     a) You must cause the modified files to carry prominent notices
      stating that you changed the files and the date of any change.
  
!     b) You must cause any work that you distribute or publish, that in
!     whole or in part contains or is derived from the Program or any
!     part thereof, to be licensed as a whole at no charge to all third
!     parties under the terms of this License.
  
+     c) If the modified program normally reads commands interactively
+     when run, you must cause it, when started running for such
+     interactive use in the most ordinary way, to print or display an
+     announcement including an appropriate copyright notice and a
+     notice that there is no warranty (or else, saying that you provide
+     a warranty) and that users may redistribute the program under
+     these conditions, and telling the user how to view a copy of this
+     License.  (Exception: if the Program itself is interactive but
+     does not normally print such an announcement, your work based on
+     the Program is not required to print an announcement.)
+ 
  These requirements apply to the modified work as a whole.  If
! identifiable sections of that work are not derived from the Program,
  and can be reasonably considered independent and separate works in
  themselves, then this License, and its terms, do not apply to those
  sections when you distribute them as separate works.  But when you
  distribute the same sections as part of a whole which is a work based
! on the Program, the distribution of the whole must be on the terms of
  this License, whose permissions for other licensees extend to the
! entire whole, and thus to each and every part regardless of who wrote it.
  
  Thus, it is not the intent of this section to claim rights or contest
  your rights to work written entirely by you; rather, the intent is to
  exercise the right to control the distribution of derivative or
! collective works based on the Program.
  
! In addition, mere aggregation of another work not based on the Program
! with the Program (or with a work based on the Program) on a volume of
  a storage or distribution medium does not bring the other work under
  the scope of this License.
  
!   3. You may copy and distribute the Program (or a work based on it,
! under Section 2) in object code or executable form under the terms of
! Sections 1 and 2 above provided that you also do one of the following:
  
!     a) Accompany it with the complete corresponding machine-readable
!     source code, which must be distributed under the terms of Sections
!     1 and 2 above on a medium customarily used for software interchange; or,
  
!     b) Accompany it with a written offer, valid for at least three
!     years, to give any third party, for a charge no more than your
!     cost of physically performing source distribution, a complete
!     machine-readable copy of the corresponding source code, to be
!     distributed under the terms of Sections 1 and 2 above on a medium
!     customarily used for software interchange; or,
  
!     c) Accompany it with the information you received as to the offer
!     to distribute corresponding source code.  (This alternative is
!     allowed only for noncommercial distribution and only if you
!     received the program in object code or executable form with such
!     an offer, in accord with Subsection b above.)
  
! The source code for a work means the preferred form of the work for
! making modifications to it.  For an executable work, complete source
! code means all the source code for all modules it contains, plus any
! associated interface definition files, plus the scripts used to
! control compilation and installation of the executable.  However, as a
! special exception, the source code distributed need not include
! anything that is normally distributed (in either source or binary
! form) with the major components (compiler, kernel, and so on) of the
! operating system on which the executable runs, unless that component
! itself accompanies the executable.
  
! If distribution of executable or object code is made by offering
! access to copy from a designated place, then offering equivalent
! access to copy the source code from the same place counts as
! distribution of the source code, even though third parties are not
! compelled to copy the source along with the object code.
! 
!   4. You may not copy, modify, sublicense, or distribute the Program
! except as expressly provided under this License.  Any attempt
! otherwise to copy, modify, sublicense or distribute the Program is
! void, and will automatically terminate your rights under this License.
! However, parties who have received copies, or rights, from you under
! this License will not have their licenses terminated so long as such
! parties remain in full compliance.
  
!   5. You are not required to accept this License, since you have not
  signed it.  However, nothing else grants you permission to modify or
! distribute the Program or its derivative works.  These actions are
  prohibited by law if you do not accept this License.  Therefore, by
! modifying or distributing the Program (or any work based on the
! Program), you indicate your acceptance of this License to do so, and
  all its terms and conditions for copying, distributing or modifying
! the Program or works based on it.
  
!   6. Each time you redistribute the Program (or any work based on the
! Program), the recipient automatically receives a license from the
! original licensor to copy, distribute or modify the Program subject to
! these terms and conditions.  You may not impose any further
  restrictions on the recipients' exercise of the rights granted herein.
! You are not responsible for enforcing compliance by third parties to
  this License.
  
!   7. If, as a consequence of a court judgment or allegation of patent
  infringement or for any other reason (not limited to patent issues),
  conditions are imposed on you (whether by court order, agreement or
***************
*** 379,396 ****
  distribute so as to satisfy simultaneously your obligations under this
  License and any other pertinent obligations, then as a consequence you
! may not distribute the Library at all.  For example, if a patent
! license would not permit royalty-free redistribution of the Library by
  all those who receive copies directly or indirectly through you, then
  the only way you could satisfy both it and this License would be to
! refrain entirely from distribution of the Library.
  
! If any portion of this section is held invalid or unenforceable under any
! particular circumstance, the balance of the section is intended to apply,
! and the section as a whole is intended to apply in other circumstances.
  
  It is not the purpose of this section to induce you to infringe any
  patents or other property right claims or to contest validity of any
  such claims; this section has the sole purpose of protecting the
! integrity of the free software distribution system which is
  implemented by public license practices.  Many people have made
  generous contributions to the wide range of software distributed
--- 202,220 ----
  distribute so as to satisfy simultaneously your obligations under this
  License and any other pertinent obligations, then as a consequence you
! may not distribute the Program at all.  For example, if a patent
! license would not permit royalty-free redistribution of the Program by
  all those who receive copies directly or indirectly through you, then
  the only way you could satisfy both it and this License would be to
! refrain entirely from distribution of the Program.
  
! If any portion of this section is held invalid or unenforceable under
! any particular circumstance, the balance of the section is intended to
! apply and the section as a whole is intended to apply in other
! circumstances.
  
  It is not the purpose of this section to induce you to infringe any
  patents or other property right claims or to contest validity of any
  such claims; this section has the sole purpose of protecting the
! integrity of the free software distribution system, which is
  implemented by public license practices.  Many people have made
  generous contributions to the wide range of software distributed
***************
*** 402,491 ****
  This section is intended to make thoroughly clear what is believed to
  be a consequence of the rest of this License.
! 
!   12. If the distribution and/or use of the Library is restricted in
  certain countries either by patents or by copyrighted interfaces, the
! original copyright holder who places the Library under this License may add
! an explicit geographical distribution limitation excluding those countries,
! so that distribution is permitted only in or among countries not thus
! excluded.  In such case, this License incorporates the limitation as if
! written in the body of this License.
  
!   13. The Free Software Foundation may publish revised and/or new
! versions of the Lesser General Public License from time to time.
! Such new versions will be similar in spirit to the present version,
! but may differ in detail to address new problems or concerns.
  
! Each version is given a distinguishing version number.  If the Library
! specifies a version number of this License which applies to it and
! "any later version", you have the option of following the terms and
! conditions either of that version or of any later version published by
! the Free Software Foundation.  If the Library does not specify a
! license version number, you may choose any version ever published by
! the Free Software Foundation.
  
!   14. If you wish to incorporate parts of the Library into other free
! programs whose distribution conditions are incompatible with these,
! write to the author to ask for permission.  For software which is
! copyrighted by the Free Software Foundation, write to the Free
! Software Foundation; we sometimes make exceptions for this.  Our
! decision will be guided by the two goals of preserving the free status
! of all derivatives of our free software and of promoting the sharing
! and reuse of software generally.
  
  			    NO WARRANTY
  
!   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
! WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
! EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
! OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
! KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
! PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
! LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
! THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  
!   16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
! WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
! AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
! FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
! CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
! LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
! RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
! FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
! SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
! DAMAGES.
  
  		     END OF TERMS AND CONDITIONS
  
!            How to Apply These Terms to Your New Libraries
! 
!   If you develop a new library, and you want it to be of the greatest
! possible use to the public, we recommend making it free software that
! everyone can redistribute and change.  You can do so by permitting
! redistribution under these terms (or, alternatively, under the terms of the
! ordinary General Public License).
  
!   To apply these terms, attach the following notices to the library.  It is
! safest to attach them to the start of each source file to most effectively
! convey the exclusion of warranty; and each file should have at least the
! "copyright" line and a pointer to where the full notice is found.
  
!     phpWebSite Modules
!     Copyright (C) 2003  Appalachian State University
  
!     This library is free software; you can redistribute it and/or
!     modify it under the terms of the GNU Lesser General Public
!     License as published by the Free Software Foundation; either
!     version 2.1 of the License, or (at your option) any later version.
  
!     This library 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
!     Lesser General Public License for more details.
  
!     You should have received a copy of the GNU Lesser General Public
!     License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
!   Appalachian State University, hereby disclaims all copyright interest in the
!   phpWebSite Modules library written by Appalachian State University.
--- 226,340 ----
  This section is intended to make thoroughly clear what is believed to
  be a consequence of the rest of this License.
! 
!   8. If the distribution and/or use of the Program is restricted in
  certain countries either by patents or by copyrighted interfaces, the
! original copyright holder who places the Program under this License
! may add an explicit geographical distribution limitation excluding
! those countries, so that distribution is permitted only in or among
! countries not thus excluded.  In such case, this License incorporates
! the limitation as if written in the body of this License.
  
!   9. The Free Software Foundation may publish revised and/or new versions
! of the General Public License from time to time.  Such new versions will
! be similar in spirit to the present version, but may differ in detail to
! address new problems or concerns.
  
! Each version is given a distinguishing version number.  If the Program
! specifies a version number of this License which applies to it and "any
! later version", you have the option of following the terms and conditions
! either of that version or of any later version published by the Free
! Software Foundation.  If the Program does not specify a version number of
! this License, you may choose any version ever published by the Free Software
! Foundation.
  
!   10. If you wish to incorporate parts of the Program into other free
! programs whose distribution conditions are different, write to the author
! to ask for permission.  For software which is copyrighted by the Free
! Software Foundation, write to the Free Software Foundation; we sometimes
! make exceptions for this.  Our decision will be guided by the two goals
! of preserving the free status of all derivatives of our free software and
! of promoting the sharing and reuse of software generally.
  
  			    NO WARRANTY
  
!   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
! FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
! OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
! PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
! OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
! MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
! TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
! PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
! REPAIR OR CORRECTION.
  
!   12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
! WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
! REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
! INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
! OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
! TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
! YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
! PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
! POSSIBILITY OF SUCH DAMAGES.
  
  		     END OF TERMS AND CONDITIONS
+ 
+ 	    How to Apply These Terms to Your New Programs
  
!   If you develop a new program, and you want it to be of the greatest
! possible use to the public, the best way to achieve this is to make it
! free software which everyone can redistribute and change under these terms.
  
!   To do so, attach the following notices to the program.  It is safest
! to attach them to the start of each source file to most effectively
! convey the exclusion of warranty; and each file should have at least
! the "copyright" line and a pointer to where the full notice is found.
  
!     <one line to give the program's name and a brief idea of what it does.>
!     Copyright (C) <year>  <name of author>
  
!     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
  
! 
! Also add information on how to contact you by electronic and paper mail.
! 
! If the program is interactive, make it output a short notice like this
! when it starts in an interactive mode:
! 
!     Gnomovision version 69, Copyright (C) year name of author
!     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
!     This is free software, and you are welcome to redistribute it
!     under certain conditions; type `show c' for details.
! 
! The hypothetical commands `show w' and `show c' should show the appropriate
! parts of the General Public License.  Of course, the commands you use may
! be called something other than `show w' and `show c'; they could even be
! mouse-clicks or menu items--whatever suits your program.
! 
! You should also get your employer (if you work as a programmer) or your
! school, if any, to sign a "copyright disclaimer" for the program, if
! necessary.  Here is a sample; alter the names:
! 
!   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
!   `Gnomovision' (which makes passes at compilers) written by James Hacker.
! 
!   <signature of Ty Coon>, 1 April 1989
!   Ty Coon, President of Vice
! 
! This General Public License does not permit incorporating your program into
! proprietary programs.  If your program is a subroutine library, you may
! consider it more useful to permit linking proprietary applications with the
! library.  If this is what you want to do, use the GNU Library General
! Public License instead of this License.

Index: AUTHORS
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/docs/AUTHORS,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AUTHORS	23 Nov 2006 14:38:20 -0000	1.2
--- AUTHORS	19 Feb 2009 20:32:01 -0000	1.3
***************
*** 1,8 ****
! # elections AUTHORS
! # $Id$
  
  People who have made elections possible (in alphabetical order):
  
! 	Verdon Vaillancourt <ve...@NO...>
       - Developer
  
--- 1,9 ----
! # elections - phpwebsite module
! # @version $Id$
! # @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
  
  People who have made elections possible (in alphabetical order):
  
! 	Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
       - Developer
  

Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/docs/COPYRIGHT,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** COPYRIGHT	23 Nov 2006 14:38:20 -0000	1.2
--- COPYRIGHT	19 Feb 2009 20:32:01 -0000	1.3
***************
*** 1,9 ****
! # elections Copyright
! # $Id$
  
! elections
! Copyright (C) 2006 by the following:
  
  (If you have contributed code to elections, you should be on this list)
  
! Verdon Vaillancourt <ve...@NO...>
--- 1,9 ----
! # elections - phpwebsite module
! # @version $Id$
! # @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
  
! Copyright (C) 2008 by the following:
  
  (If you have contributed code to elections, you should be on this list)
  
! Verdon Vaillancourt <verdonv at users dot sourceforge dot net>

Index: INSTALL
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/docs/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** INSTALL	23 Nov 2006 14:38:20 -0000	1.2
--- INSTALL	19 Feb 2009 20:32:01 -0000	1.3
***************
*** 1,12 ****
! <pre>
! 
! # INSTALL for elections
! # $Id$
  
  INSTALL steps for elections
  
! IMPORTANT: elections is a module for phpWebSite 0.10.1 or better, but
! not the phpWebsite 1.x.x series.
! You HAVE to install phpWebSite >= 0.10.1 first, elections will
  not work with earlier versions of phpWebSite.
  
--- 1,10 ----
! # elections - phpwebsite module
! # @version $Id$
! # @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
  
  INSTALL steps for elections
  
! IMPORTANT: elections is a module for phpWebSite 1.6.1 or better.
!  You HAVE to install phpWebSite >= 1.6.1 first, elections will
  not work with earlier versions of phpWebSite.
  
***************
*** 28,42 ****
  
      Example: If you are installing elections and your
!     phpwebsite doc root is /home/httpd/htdocs/phpwebsite, you could run
      
!     mv elections /home/httpd/htdocs/phpwebsite/mod/elections
! 
! 4. Go to your phpWS website and install elections from Boost.
  
!    NOTE: If you are on a server with php SAFE_MODE=ON , you may need to
!    create this module's  image directory manually. Be sure
!    it is writable by the webserver. The following directory is
!    required for this module:
!    /images/elections
  
- </pre>
--- 26,33 ----
  
      Example: If you are installing elections and your
!     phpwebsite doc root is /home/username/public_html, you could run
      
!     mv elections /home/username/public_html/mod/elections
  
! 4. Go to your phpwebsite control panel and install elections from Boost.
  

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/docs/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ChangeLog	28 Dec 2006 18:16:21 -0000	1.8
--- ChangeLog	19 Feb 2009 20:32:01 -0000	1.9
***************
*** 1,51 ****
! # ChangeLog for elections
! # $Id$
! 
! *elections-1.0.2 (28 December 2006)
! 
! 	New Features:
! 	* Show results in election view to authorized users
! 	  sf tracker id 1610926
! 	
! 	Updates:
! 	* Added Danish language file (thanks Kenneth Poulsen)
! 	* Minor tweaks to side-box display
! 	* Moved some html from runtime.php to template for side-box
! 	  sf tracker id 1610609
! 	
! 	Bug Fixes:
! 	* Corrected default date in new elections for some users
! 	  sf tracker id 1619864
! 	* Language file tweaks (thanks Kenneth Poulsen)
! 	  sf tracker ids 1610607 and 1610664
! 	
! *elections-1.0.1 (24 November 2006)
! 
! 	Updates:
! 	* Corrected version number in boost
! 	
! *elections-1.0.0 (24 November 2006)
! 
! 	Updates:
! 	* Minor UI tweak in add/edit election
! 	* Bumped version to 1.0.0
! 	* Package first official release
! 	
! *elections-0.9.5 (24 November 2006)
! 
! 	Updates:
! 	* Added eng language file
! 	
! *elections-0.9.0 (23 November 2006)
! 
! 	Updates:
! 	* Added help balloons
! 	* Improvements to UI
! 	
! 	Bug Fixes:
! 	* Added listGroupsID() to Election class
! 
! *elections-0.5.0 (21 November 2006)
! 
! 	Updates:
! 	* Initial packaging
--- 1,3 ----
! Version 0.0.1 -- Feb 2009
! ------------------------------------------------------------------
! + Initial rough-in of mod

[phpws-comm-commits] modules/elections/class Election.php, 1.6, 1.7 Candidate.php, 1.3, NONE Manager.php, 1.3, NONE Voter.php, 1.1.1.1, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/class
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11368/class

Modified Files:
	Election.php 
Removed Files:
	Candidate.php Manager.php Voter.php 
Log Message:
preparing for 2.0.0

--- Manager.php DELETED ---

--- Candidate.php DELETED ---

--- Voter.php DELETED ---

Index: Election.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/class/Election.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Election.php	28 Dec 2006 18:16:18 -0000	1.6
--- Election.php	19 Feb 2009 20:32:00 -0000	1.7
***************
*** 1,818 ****
  <?php
  /**
!  * elections
!  *
!  * 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.
[...1535 lines suppressed...]
! 
!     public function navLinks()
!     {
! 
!         $links[] = PHPWS_Text::moduleLink(dgettext('elections', 'List ballots'), 'elections', array('uop'=>'list_ballots'));
! 
!         if (Current_User::allow('elections') && !isset($_REQUEST['aop'])){
!             $links[] = PHPWS_Text::moduleLink(dgettext('elections', 'Settings'), "elections",  array('aop'=>'menu', 'tab'=>'settings'));
!         }
!         
!         return $links;
!     }
! 
! 
! 
! 
! 
! }
! ?>
\ No newline at end of file

[phpws-comm-commits] modules/elections/img elections.png, 1.1.1.1, 1.2

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

Update of /cvsroot/phpwebsite-comm/modules/elections/img
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11368/img

Modified Files:
	elections.png 
Log Message:
preparing for 2.0.0

Index: elections.png
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/img/elections.png,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsMTSdBe and /tmp/cvsYAqaHj differ

[phpws-comm-commits] modules/elections/templates block.tpl, 1.2, 1.3 edit_candidate.tpl, 1.1.1.1, 1.2 edit_settings.tpl, 1.2, 1.3 view_candidate.tpl, 1.1.1.1, 1.2 view_voter.tpl, 1.1.1.1, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/templates
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11368/templates

Modified Files:
	block.tpl edit_candidate.tpl edit_settings.tpl 
	view_candidate.tpl 
Removed Files:
	view_voter.tpl 
Log Message:
preparing for 2.0.0

--- view_voter.tpl DELETED ---

Index: edit_candidate.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/templates/edit_candidate.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** edit_candidate.tpl	14 Nov 2006 00:50:51 -0000	1.1.1.1
--- edit_candidate.tpl	19 Feb 2009 20:32:02 -0000	1.2
***************
*** 1,35 ****
  {START_FORM}
! {TITLE_TEXT}:<br />
! {TITLE}<br /><br />
! {DESCRIPTION_TEXT}:<br />
! {DESCRIPTION}<br />
! <br />
! <!-- BEGIN IMAGE_TEXT -->
! {IMAGE_TEXT} {IMAGE}{CANDIDATE_IMAGE}<br />
! {REMOVE_IMAGE} {REMOVE_TEXT}<br />
! <!-- END IMAGE_TEXT -->
! <!-- BEGIN IMAGE_ALT_TEXT -->
! {IMAGE_ALT_TEXT} {IMAGE_ALT}<br />
! <span class="smalltext">{IMAGE_ALT_CAPTION}</span><br />
! <!-- END IMAGE_ALT_TEXT -->
! <br />
! <!-- BEGIN CUSTOM_TEXT -->
! <b>{CUSTOM_TEXT}</b><br />
! <br />
! <!-- END CUSTOM_TEXT -->
! <!-- BEGIN CUSTOM1 -->
! {CUSTOM1_TEXT}: {CUSTOM1}<br />
! <!-- END CUSTOM1 -->
! <!-- BEGIN CUSTOM2 -->
! {CUSTOM2_TEXT}: {CUSTOM2}<br />
! <!-- END CUSTOM2 -->
! <!-- BEGIN CUSTOM3 -->
! {CUSTOM3_TEXT}: {CUSTOM3}<br />
! <!-- END CUSTOM3 -->
! <!-- BEGIN CUSTOM4 -->
! {CUSTOM4_TEXT}: {CUSTOM4}<br />
! <!-- END CUSTOM4 -->
! <br />
! 
! {SAVE}
  {END_FORM}
--- 1,18 ----
  {START_FORM}
! <fieldset>
!     <legend><strong>{INFO_LABEL}</strong></legend>
!     <p><strong>{TITLE_LABEL}</strong><br />{TITLE}</p>
!     <p><strong>{DESCRIPTION_LABEL}</strong><br />{DESCRIPTION}</p>
!     <p>{FILE_MANAGER}</p>
! </fieldset>
! <!-- BEGIN custom_label -->
! <fieldset>
!     <legend><strong>{CUSTOM_LABEL}</strong></legend>
!     <!-- BEGIN custom1 --><p><strong>{CUSTOM1_LABEL}</strong><br />{CUSTOM1}</p><!-- END custom1 -->
!     <!-- BEGIN custom2 --><p><strong>{CUSTOM2_LABEL}</strong><br />{CUSTOM2}</p><!-- END custom2 -->
!     <!-- BEGIN custom3 --><p><strong>{CUSTOM3_LABEL}</strong><br />{CUSTOM3}</p><!-- END custom3 -->
!     <!-- BEGIN custom4 --><p><strong>{CUSTOM4_LABEL}</strong><br />{CUSTOM4}</p><!-- END custom4 -->
! </fieldset>
! <!-- END custom_label -->
! {SUBMIT}
  {END_FORM}

Index: block.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/templates/block.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** block.tpl	28 Dec 2006 15:52:15 -0000	1.2
--- block.tpl	19 Feb 2009 20:32:02 -0000	1.3
***************
*** 1,14 ****
! <!-- BEGIN TEXT -->
! <span class="smalltext">{TEXT}</span><br />
! <!-- END TEXT -->
! <!-- BEGIN MSG -->
! {MSG}<br />
! <!-- END MSG -->
! <!-- BEGIN LIST -->
! <ul class="tightlist">
! {LIST}
! </ul>
! <!-- END LIST -->
! <!-- BEGIN MOD_LINK -->
! <br />{MOD_LINK}<br />
! <!-- END MOD_LINK -->
--- 1,14 ----
! <div class="elections-sidebox">
!   <div class="box">
!     <div class="box-title"><h1>{TITLE}</h1></div>
!     <div class="box-content">
!         <!-- BEGIN text -->{TEXT}<!-- END text -->
!         <ul class="no-bullet">
!         <!-- BEGIN ballot_links -->
!         <li>{BALLOT_LINK}</li>
!         <!-- END ballot_links -->
!         </ul>
!         <div align="center">{BROWSE_LINK}</div>
!     </div>
!   </div>
! </div>

Index: view_candidate.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/templates/view_candidate.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** view_candidate.tpl	14 Nov 2006 00:50:51 -0000	1.1.1.1
--- view_candidate.tpl	19 Feb 2009 20:32:02 -0000	1.2
***************
*** 1,33 ****
! <!-- BEGIN EDIT -->
! <div align="right">{EDIT}</div>
! <!-- END EDIT -->
! <!-- BEGIN TITLE -->
! <h2>{TITLE}</h2>
! <!-- END TITLE -->
! <!-- BEGIN IMAGE -->
! <div align="center" style="float: right; margin: 0px 0px 5px 15px;">
! {IMAGE}<br />
! {CAPTION}<br />
! </div>
! <!-- END IMAGE -->
! <!-- BEGIN ELECTION -->
! {ELECTION_TEXT}: {ELECTION}<br />
! <!-- END ELECTION -->
! <!-- BEGIN VOTES -->
! {VOTES_TEXT}: {VOTES}<br />
! <!-- END VOTES -->
! <!-- BEGIN DESCRIPTION -->
! <br />{DESCRIPTION}<br /><br />
! <!-- END DESCRIPTION -->
! <!-- BEGIN CUSTOM1 -->
! <b>{CUSTOM1_TEXT}:</b> {CUSTOM1}<br />
! <!-- END CUSTOM1 -->
! <!-- BEGIN CUSTOM2 -->
! <b>{CUSTOM2_TEXT}:</b> {CUSTOM2}<br />
! <!-- END CUSTOM2 -->
! <!-- BEGIN CUSTOM3 -->
! <b>{CUSTOM3_TEXT}:</b> {CUSTOM3}<br />
! <!-- END CUSTOM3 -->
! <!-- BEGIN CUSTOM4 -->
! <b>{CUSTOM4_TEXT}:</b> {CUSTOM4}<br />
! <!-- END CUSTOM4 -->
--- 1,7 ----
! <div align="right"{CANDIDATE_LINKS}</div>
! <strong>{TITLE}</strong>
! <!-- BEGIN description --><p>{DESCRIPTION}</p><!-- END description -->
! <!-- BEGIN custom1 --><div><strong>{CUSTOM1_LABEL}:</strong> {CUSTOM1}</div><!-- END custom1 -->
! <!-- BEGIN custom2 --><div><strong>{CUSTOM2_LABEL}:</strong> {CUSTOM2}</div><!-- END custom2 -->
! <!-- BEGIN custom3 --><div><strong>{CUSTOM3_LABEL}:</strong> {CUSTOM3}</div><!-- END custom3 -->
! <!-- BEGIN custom4 --><div><strong>{CUSTOM4_LABEL}:</strong> {CUSTOM4}</div><!-- END custom4 -->

Index: edit_settings.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/templates/edit_settings.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** edit_settings.tpl	24 Nov 2006 04:31:54 -0000	1.2
--- edit_settings.tpl	19 Feb 2009 20:32:02 -0000	1.3
***************
*** 1,26 ****
- <h2>{TITLE}</h2>
  {START_FORM}
! {SETTINGS_ENABLE_ELECTIONS} {ENABLE_ELECTIONS_LABEL} {ENABLE_ELECTIONS_HELP}<br />
! {SETTINGS_ENABLE_SIDEBOX} {ENABLE_SIDEBOX_LABEL}<br />
! {SETTINGS_SIDEBOX_HOMEONLY} {SIDEBOX_HOMEONLY_LABEL}<br />
! {SIDEBOX_TEXT_LABEL}<br />
! {SETTINGS_SIDEBOX_TEXT}
! 
! <h3>{IMG_SUBTITLE}</h3>
! 
! {SETTINGS_ENABLEIMAGES}{ENABLEIMAGES_LABEL}<br />
! <br />
! {SETTINGS_MAXIMGWIDTH}{MAX_IMG_WIDTH_LABEL}<br />
! {SETTINGS_MAXIMGHEIGHT}{MAX_IMG_HEIGHT_LABEL}<br />
! {SETTINGS_MAXIMGSIZE}{MAX_IMG_SIZE_LABEL}<br />
! <br />
! {SETTINGS_THUMBWIDTH}{THUMB_WIDTH_LABEL}<br />
! {SETTINGS_THUMBHEIGHT}{THUMB_HEIGHT_LABEL}<br />
! <br />
! {SETTINGS_USERESIZE}{USE_IMG_RESIZE_LABEL}<br />
! {SETTINGS_RESIZEWIDTH}{RESIZE_WIDTH_LABEL}<br />
! {SETTINGS_RESIZEHEIGHT}{RESIZE_HEIGHT_LABEL}<br />
! <br />
! 
! {SETTINGS_SAVE}
  {END_FORM}
--- 1,15 ----
  {START_FORM}
! <fieldset>
!     <legend><strong>{SETTINGS_LABEL}</strong></legend>
!     <p>{ENABLE_ELECTIONS} {ENABLE_ELECTIONS_LABEL}</p>
!     <p>{ENABLE_SIDEBOX} {ENABLE_SIDEBOX_LABEL}</p>
!     <p>{SIDEBOX_HOMEONLY} {SIDEBOX_HOMEONLY_LABEL}</p>
!     <p>{TITLE_LABEL}<br />{TITLE}</p>
!     <p>{SIDEBOX_TEXT_LABEL}<br />{SIDEBOX_TEXT}</p>
!     <p>{ENABLE_IMAGES} {ENABLE_IMAGES_LABEL}</p>
!     <p>{MAX_WIDTH} {MAX_WIDTH_LABEL}</p>
!     <p>{MAX_HEIGHT} {MAX_HEIGHT_LABEL}</p>
!     <p>{EXPIRY_INTERVAL} {EXPIRY_INTERVAL_LABEL}</p>
! </fieldset>
! {SAVE}
  {END_FORM}

[phpws-comm-commits] modules/elections/inc runtime.php,1.2,1.3

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

Update of /cvsroot/phpwebsite-comm/modules/elections/inc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11368/inc

Modified Files:
	runtime.php 
Log Message:
preparing for 2.0.0

Index: runtime.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/inc/runtime.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** runtime.php	28 Dec 2006 15:52:13 -0000	1.2
--- runtime.php	19 Feb 2009 20:32:01 -0000	1.3
***************
*** 1,83 ****
! <?php
! /**
!  * elections
!  *
!  * 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$
!  */
! 
! require_once(PHPWS_SOURCE_DIR.'mod/elections/class/Manager.php');
! 
! // get the settings
! $electionsSettings = ELECTIONS_Manager::getSettingsRow();
! 
! 
! if ($electionsSettings['enable_sidebox']) { 
! 	if ($electionsSettings['sidebox_homeonly'] && $GLOBALS['module'] == 'home') {
! 		renderElectionsBlock();
! 	} elseif (!$electionsSettings['sidebox_homeonly']) {
! 		renderElectionsBlock();
! 	}
! }
! 
! function renderElectionsBlock() {
! 
! 	$electionsSettings = ELECTIONS_Manager::getSettingsRow();
! 	$tags = array();
! 	if (isset($electionsSettings['sidebox_text']) && $electionsSettings['sidebox_text'] != '')
!         $tags['TEXT'] = $electionsSettings['sidebox_text'];
! 	
! 	if ($electionsSettings['enable_elections'] || $_SESSION['OBJ_user']->allow_access('elections')) {
! 		
! 		$now = date("Y-m-d H:i:s");
! 		$where = NULL;
! 		$where .= "showin_block = '1'";
! 		if (!isset($_SESSION['OBJ_user']->username))
! 			$where .= " AND pubview = '1'";
! 		$where .= " AND closing >= '" . $now . "'";
! 
! 		$sql = "SELECT election_id, title FROM " . $GLOBALS['core']->tbl_prefix . "mod_elections_elections WHERE " . $where . "";
! //		echo $sql;
! 		$result = $GLOBALS['core']->getAllAssoc($sql);
! 		
! 		if (!$result) {
! 			$tags['MSG'] = $_SESSION['translate']->it('Sorry, there are no available elections.');
! 		} else {
!             $list = NULL;
!             $ops = array();
! 			foreach ($result as $element) {
! 				$ops['ITEM'] = '<a href="./index.php?module=elections&amp;Man_OP=view_election&amp;election_id='.$element['election_id'].'">' . $element['title'] . '</a>';
! 				$list .= PHPWS_template::processTemplate($ops, "elections", "block_item.tpl");
! 			}
! 			$tags['LIST'] = $list;
! 		}
! 
! 	} else {
! 		$tags['MSG'] = $_SESSION['translate']->it('Thank you for your interest. However, all elections are currently closed.');
! 	}
! 	
! 	if ($_SESSION['OBJ_user']->allow_access('elections'))
! 		$tags['MOD_LINK'] = '<a href="index.php?module=elections&amp;Man_OP=list_elections">' . $_SESSION['translate']->it('Go to Elections Module') . '</a>';
! 	
! 	$content = PHPWS_template::processTemplate($tags, "elections", "block.tpl");
! 	  
! 	$GLOBALS['CNT_elections_box']['title'] = $_SESSION['translate']->it("Elections");
! 	$GLOBALS['CNT_elections_box']['content'] = $content;
! }
! 
  ?>
\ No newline at end of file
--- 1,29 ----
! <?php
! /**
!     * elections - phpwebsite module
!     *
!     * See docs/AUTHORS and docs/COPYRIGHT for relevant info.
!     *
!     * This program is free software; you can redistribute it and/or modify
!     * it under the terms of the GNU General Public License as published by
!     * the Free Software Foundation; either version 2 of the License, or
!     * (at your option) any later version.
!     * 
!     * This program is distributed in the hope that it will be useful,
!     * but WITHOUT ANY WARRANTY; without even the implied warranty of
!     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     * GNU General Public License for more details.
!     * 
!     * You should have received a copy of the GNU General Public License
!     * along with this program; if not, write to the Free Software
!     * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!     *
!     * @version $Id$
!     * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
! */
! 
! 
! PHPWS_Core::initModClass('elections', 'ELEC_Runtime.php');
! ELEC_Runtime::showBlock();
! 
  ?>
\ No newline at end of file

[phpws-comm-commits] modules/elections/conf config.php, 1.1.1.1, 1.2 boost.php, 1.6, NONE controlpanel.php, 1.1.1.1, NONE help.php, 1.3, NONE

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

Update of /cvsroot/phpwebsite-comm/modules/elections/conf
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11368/conf

Modified Files:
	config.php 
Removed Files:
	boost.php controlpanel.php help.php 
Log Message:
preparing for 2.0.0

--- controlpanel.php DELETED ---

Index: config.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/elections/conf/config.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** config.php	14 Nov 2006 00:50:51 -0000	1.1.1.1
--- config.php	19 Feb 2009 20:32:00 -0000	1.2
***************
*** 1,33 ****
! <?php
! /**
!  * elections
!  *
!  * 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$
!  */
! 
! 
! //define('ELECTIONS_SECURE_URL', '');
! //define('ELECTIONS_NONSECURE_URL', $GLOBALS['core']->home_http);
! define('ELECTIONS_CONTACT', 'us...@yo...');
! // The cutoff description size before '...' are added to the end
! define("ELECTIONS_DESC_CUTOFF", 350);
! // The buffer size between the max length and the next space in a string
! define("ELECTIONS_CUTOFF_BUFFER", 3);
! 
  ?>
\ No newline at end of file
--- 1,29 ----
! <?php
! /**
!     * elections - phpwebsite module
!     *
!     * See docs/AUTHORS and docs/COPYRIGHT for relevant info.
!     *
!     * This program is free software; you can redistribute it and/or modify
!     * it under the terms of the GNU General Public License as published by
!     * the Free Software Foundation; either version 2 of the License, or
!     * (at your option) any later version.
!     * 
!     * This program is distributed in the hope that it will be useful,
!     * but WITHOUT ANY WARRANTY; without even the implied warranty of
!     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     * GNU General Public License for more details.
!     * 
!     * You should have received a copy of the GNU General Public License
!     * along with this program; if not, write to the Free Software
!     * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!     *
!     * @version $Id$
!     * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
! */
! 
! //define('ELEC_DATE_FORMAT', '%T, %A, %B %e');
! define('ELEC_DATE_FORMAT', '%H:%M, %A, %B %e, %Y');
! 
! 
  ?>
\ No newline at end of file

--- boost.php DELETED ---

--- help.php DELETED ---

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

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

Update of /cvsroot/phpwebsite-comm/modules/whatsnew/templates
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2436/templates

Modified Files:
	info.tpl 
Log Message:
new features prepping for 1.0.0

Index: info.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/templates/info.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** info.tpl	22 Jul 2008 12:24:39 -0000	1.1.1.1
--- info.tpl	11 Feb 2009 15:54:28 -0000	1.2
***************
*** 1,9 ****
  <fieldset>
      <legend><strong>{TITLE}</strong></legend>
!     <!-- BEGIN info_1 --><p><strong>{INFO_1_LABEL}</strong> {INFO_1}</p><!-- END info_1 -->
!     <!-- BEGIN info_2 --><p><strong>{INFO_2_LABEL}</strong> {INFO_2}</p><!-- END info_2 -->
!     <!-- BEGIN info_3 --><p><strong>{INFO_3_LABEL}</strong> {INFO_3}</p><!-- END info_3 -->
!     <!-- BEGIN info_4 --><p><strong>{INFO_4_LABEL}</strong> {INFO_4}</p><!-- END info_4 -->
!     <!-- BEGIN info_5 --><p><strong>{INFO_5_LABEL}</strong> {INFO_5}</p><!-- END info_5 -->
      <!-- BEGIN donate --><p>{DONATE}</p><!-- END donate -->
  </fieldset>
--- 1,5 ----
  <fieldset>
      <legend><strong>{TITLE}</strong></legend>
!     <!-- BEGIN info --><p>{INFO}</p><!-- END info -->
      <!-- BEGIN donate --><p>{DONATE}</p><!-- END donate -->
  </fieldset>