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

[phpws-comm-commits] modules/sitemap/docs AUTHORS, NONE, 1.1 CHANGELOG, NONE, 1.1 COPYING, NONE, 1.1 COPYRIGHT, NONE, 1.1 INSTALL, NONE, 1.1

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

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

Added Files:
	AUTHORS CHANGELOG COPYING COPYRIGHT INSTALL 
Log Message:
adding docs

--- NEW FILE: COPYING ---
		    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
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
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
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

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.

--- NEW FILE: AUTHORS ---
# sitemap - phpwebsite module
# @version $Id: AUTHORS,v 1.1 2008/06/30 12:08:27 verdonv Exp $
# @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>

People who have made sitemap possible (in alphabetical order):

	Verdon Vaillancourt <verdonv at users dot sourceforge dot net>
     - Developer

sitemap contains works from the following projects:

    PHPWebSite
    http://phpwebsite.appstate.edu

--- NEW FILE: COPYRIGHT ---
# sitemap - phpwebsite module
# @version $Id: COPYRIGHT,v 1.1 2008/06/30 12:08:27 verdonv Exp $
# @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>

Copyright (C) 2008 by the following:

(If you have contributed code to sitemap, you should be on this list)

Verdon Vaillancourt <verdonv at users dot sourceforge dot net>

--- NEW FILE: INSTALL ---
# sitemap - phpwebsite module
# @version $Id: INSTALL,v 1.1 2008/06/30 12:08:27 verdonv Exp $
# @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net>

INSTALL steps for sitemap

IMPORTANT: sitemap is a module for phpWebSite 1.5.0 or better.
 You HAVE to install phpWebSite >= 1.5.0 first, sitemap will
not work with earlier versions of phpWebSite.

If you don't have phpWebSite installed, first get the latest code here: 
https://sourceforge.net/project/showfiles.php?group_id=15539

Then follow the install instructions found in the INSTALL.txt included
in the docs directory of that download.

Once this is done then you can start installing sitemap:

1. Download the .tar.gz from a sourceforge mirror.  (There is also a
   .zip file for windows users.)

2. Unpack the tarball with:
    tar -xvzf module-sitemap-*.tar.gz

3. Move the new directory into your phpwebsite mod directory

    Example: If you are installing sitemap and your
    phpwebsite doc root is /home/username/public_html, you could run
    
    mv sitemap /home/username/public_html/mod/sitemap

4. Go to your phpwebsite control panel and install sitemap from Boost.


--- NEW FILE: CHANGELOG ---
Version 0.1.0 -- June 2008
------------------------------------------------------------------
JUne 28 - 29
+ Initial writing of mod

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

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

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

Modified Files:
	avail 
Log Message:
Giving Verdon access to sitemap

Index: avail
===================================================================
RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** avail	1 Jun 2008 16:51:28 -0000	1.71
--- avail	30 Jun 2008 03:02:09 -0000	1.72
***************
*** 30,33 ****
--- 30,34 ----
  avail|verdonv|modules/rolodex
  avail|boyrock|modules/sdmsphpws
+ avail|verdonv|modules/sitemap
  avail|gbrackett|modules/staffman
  avail|ykuendig|modules/static

[phpws-comm-commits] modules/rolodex/docs TODO,1.12,1.13

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

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

Modified Files:
	TODO 
Log Message:
0.9.0 updates

Index: TODO
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/TODO,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TODO	24 Jun 2008 11:23:29 -0000	1.12
--- TODO	25 Jun 2008 12:32:09 -0000	1.13
***************
*** 5,22 ****
  
  
  consider option to delete demographics records when uninstalling rolodex
  consider option to delete demographics record when deleting rolodex member
- I don't think I should do this...
- 
  
  consider improved messages for privacy and expired notices
  consider more advanced export with some pre-selection or options
  
- 
- can I add some text fields to the advanced search?
- Looks like it
- 
- seems to be a bug when using advanced search to get to list, then the search form in the result doesn't work
- 
  do a final update of language file
  
--- 5,15 ----
  
  
+ I don't think I should do this...
  consider option to delete demographics records when uninstalling rolodex
  consider option to delete demographics record when deleting rolodex member
  
  consider improved messages for privacy and expired notices
  consider more advanced export with some pre-selection or options
  
  do a final update of language file
  

[phpws-comm-commits] modules/rolodex/templates list_member.tpl, 1.3, 1.4

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

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

Modified Files:
	list_member.tpl 
Log Message:
0.9.0 updates

Index: list_member.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/list_member.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** list_member.tpl	24 Jun 2008 11:23:33 -0000	1.3
--- list_member.tpl	25 Jun 2008 02:48:46 -0000	1.4
***************
*** 61,64 ****
  </div>
  <div class="align-right">
! {SEARCH}
  </div>
--- 61,64 ----
  </div>
  <div class="align-right">
! {SEARCH} {CLEAR_FILTERS}
  </div>

[phpws-comm-commits] modules/rolodex/class RDX_Forms.php, 1.13, 1.14 RDX_Mypage.php, 1.7, 1.8

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

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

Modified Files:
	RDX_Forms.php RDX_Mypage.php 
Log Message:
0.9.0 updates

Index: RDX_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** RDX_Forms.php	24 Jun 2008 11:23:27 -0000	1.13
--- RDX_Forms.php	25 Jun 2008 02:48:43 -0000	1.14
***************
*** 244,250 ****
          } 
          
!         /* unset the browseLetter if a search is being done */
          if (isset($_REQUEST['search'])) {
              unset($_REQUEST['browseLetter']);
          }
  
--- 244,254 ----
          } 
          
!         /* unset the filters if a search is being done */
! //        if (isset($_REQUEST['search']) && $_REQUEST['clearFilters']) {
          if (isset($_REQUEST['search'])) {
              unset($_REQUEST['browseLetter']);
+             unset($_REQUEST['locations']);
+             unset($_REQUEST['features']);
+             unset($_REQUEST['categories']);
          }
  
***************
*** 303,306 ****
--- 307,315 ----
              }
          }
+ 
+ //        $ptags['CLEAR_FILTERS'] = '<input type="radio" name="clearFilters" value="1" checked="checked" />' . dgettext('rolodex', 'Clear filters or');
+ //        $ptags['CLEAR_FILTERS'] .= ' <input type="radio" name="clearFilters" value="0" />' . dgettext('rolodex', 'Search within results');
+         $ptags['CLEAR_FILTERS'] = dgettext('rolodex', 'Clears filters and searches all records.');
+ 
          $pager->addPageTags($ptags);
          $pager->addToggle('class="toggle1"');
***************
*** 453,456 ****
--- 462,466 ----
          $form = new PHPWS_Form('rolodex_adv_search');
  
+         $form->setMethod('get');
          $form->addHidden('module', 'rolodex');
          $form->addHidden('uop', 'adv_search');

Index: RDX_Mypage.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Mypage.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RDX_Mypage.php	17 Jun 2008 13:27:34 -0000	1.7
--- RDX_Mypage.php	25 Jun 2008 02:48:43 -0000	1.8
***************
*** 90,93 ****
--- 90,94 ----
      {
          $form = new PHPWS_Form('rolodex_search');
+         $form->setMethod('get');
          $form->addHidden('module', 'rolodex');
          $form->addHidden('uop', 'list');

[phpws-comm-commits] modules/rolodex/boost boost.php,1.3,1.4

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

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

Modified Files:
	boost.php 
Log Message:
0.9.0 updates

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/boost.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** boost.php	24 Jun 2008 11:23:25 -0000	1.3
--- boost.php	24 Jun 2008 11:31:57 -0000	1.4
***************
*** 24,28 ****
  
  $proper_name  = 'Rolodex';
! $version      = '0.8.0';
  $image_dir    = true;
  $import_sql   = true;
--- 24,28 ----
  
  $proper_name  = 'Rolodex';
! $version      = '0.9.0';
  $image_dir    = true;
  $import_sql   = true;

[phpws-comm-commits] modules/rolodex/inc settings.php,1.4,1.5

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

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

Modified Files:
	settings.php 
Log Message:
0.9.0 updates

Index: settings.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/inc/settings.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** settings.php	11 Jun 2008 17:43:34 -0000	1.4
--- settings.php	24 Jun 2008 11:23:31 -0000	1.5
***************
*** 33,36 ****
--- 33,37 ----
  $settings['comments_anon_enable']   = 0;
  $settings['comments_anon_enforce']  = 0;
+ $settings['contact_type']           = 1;
  $settings['privacy_contact']        = 1;
  $settings['privacy_web']            = 0;
***************
*** 42,45 ****
--- 43,57 ----
  $settings['enable_expiry']          = 0;
  $settings['expiry_interval']        = 365;
+ $settings['use_captcha']            = 1;
+ $settings['list_address']           = 1;
+ $settings['browse_address']         = 0;
+ $settings['list_phone']             = 1;
+ $settings['browse_phone']           = 0;
+ $settings['list_categories']        = 1;
+ $settings['browse_categories']      = 0;
+ $settings['list_locations']         = 1;
+ $settings['browse_locations']       = 0;
+ $settings['list_features']          = 1;
+ $settings['browse_features']        = 0;
  $settings['max_img_width']          = 200;
  $settings['max_img_height']         = 300;
***************
*** 59,62 ****
--- 71,82 ----
  $settings['custom7_name']          = null;
  $settings['custom8_name']          = null;
+ $settings['custom1_list']          = 0;
+ $settings['custom2_list']          = 0;
+ $settings['custom3_list']          = 0;
+ $settings['custom4_list']          = 0;
+ $settings['custom5_list']          = 0;
+ $settings['custom6_list']          = 0;
+ $settings['custom7_list']          = 0;
+ $settings['custom8_list']          = 0;
  
  ?>
\ No newline at end of file

[phpws-comm-commits] modules/rolodex/class RDX_Feature.php, 1.3, 1.4 RDX_Forms.php, 1.12, 1.13 RDX_Location.php, 1.3, 1.4 RDX_Member.php, 1.10, 1.11 Rolodex.php, 1.11, 1.12

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

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

Modified Files:
	RDX_Feature.php RDX_Forms.php RDX_Location.php RDX_Member.php 
	Rolodex.php 
Log Message:
0.9.0 updates

Index: RDX_Feature.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Feature.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RDX_Feature.php	16 Jun 2008 18:21:32 -0000	1.3
--- RDX_Feature.php	24 Jun 2008 11:23:27 -0000	1.4
***************
*** 269,273 ****
      function featureLinks()
      {
! 
          if (Current_User::allow('rolodex', 'settings')) {
              $vars['feature'] = $this->id;
--- 269,273 ----
      function featureLinks()
      {
!         $links = array();
          if (Current_User::allow('rolodex', 'settings')) {
              $vars['feature'] = $this->id;

Index: RDX_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RDX_Forms.php	17 Jun 2008 13:27:32 -0000	1.12
--- RDX_Forms.php	24 Jun 2008 11:23:27 -0000	1.13
***************
*** 68,71 ****
--- 68,78 ----
                  break;
      
+             case 'message_member':
+                 if (empty($this->rolodex->member)) {
+                     $this->rolodex->loadMember();
+                 }
+                 $this->contactMember();
+                 break;
+     
              case 'edit_location':
                  if (empty($this->rolodex->location)) {
***************
*** 151,163 ****
          }
  
          /* init the pager */
          $pager = new DBPager('rolodex_member', 'Rolodex_Member');
          $pager->setModule('rolodex');
-         $pager->db->addColumn('demographics.*');
          $pager->db->addColumn('rolodex_member.*');
  
          $pager->db->addWhere('rolodex_member.user_id', 'demographics.user_id');
  
- 
          /* approved yes/no */
          if (isset($approved)) {
--- 158,212 ----
          }
  
+         /* check for custom fields to include */
+         if (PHPWS_Settings::get('rolodex', 'custom1_name') && PHPWS_Settings::get('rolodex', 'custom1_list')) {
+             $ptags['CUSTOM1_HEADER'] = PHPWS_Text::parseOutput(PHPWS_Settings::get('rolodex', 'custom1_name'));
+         } else {
+             $ptags['CUSTOM1_SORT'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom2_name') && PHPWS_Settings::get('rolodex', 'custom2_list')) {
+             $ptags['CUSTOM2_HEADER'] = PHPWS_Text::parseOutput(PHPWS_Settings::get('rolodex', 'custom2_name'));
+         } else {
+             $ptags['CUSTOM2_SORT'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom3_name') && PHPWS_Settings::get('rolodex', 'custom3_list')) {
+             $ptags['CUSTOM3_HEADER'] = PHPWS_Text::parseOutput(PHPWS_Settings::get('rolodex', 'custom3_name'));
+         } else {
+             $ptags['CUSTOM3_SORT'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom4_name') && PHPWS_Settings::get('rolodex', 'custom4_list')) {
+             $ptags['CUSTOM4_HEADER'] = PHPWS_Text::parseOutput(PHPWS_Settings::get('rolodex', 'custom4_name'));
+         } else {
+             $ptags['CUSTOM4_SORT'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom5_name') && PHPWS_Settings::get('rolodex', 'custom5_list') && Current_User::allow('rolodex', 'view_privates')) {
+             $ptags['CUSTOM5_HEADER'] = PHPWS_Text::parseOutput(PHPWS_Settings::get('rolodex', 'custom5_name'));
+         } else {
+             $ptags['CUSTOM5_SORT'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom6_name') && PHPWS_Settings::get('rolodex', 'custom6_list') && Current_User::allow('rolodex', 'view_privates')) {
+             $ptags['CUSTOM6_HEADER'] = PHPWS_Text::parseOutput(PHPWS_Settings::get('rolodex', 'custom6_name'));
+         } else {
+             $ptags['CUSTOM6_SORT'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom7_name') && PHPWS_Settings::get('rolodex', 'custom7_list') && Current_User::allow('rolodex', 'view_privates')) {
+             $ptags['CUSTOM7_HEADER'] = PHPWS_Text::parseOutput(PHPWS_Settings::get('rolodex', 'custom7_name'));
+         } else {
+             $ptags['CUSTOM7_SORT'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom8_name') && PHPWS_Settings::get('rolodex', 'custom8_list') && Current_User::allow('rolodex', 'view_privates')) {
+             $ptags['CUSTOM8_HEADER'] = PHPWS_Text::parseOutput(PHPWS_Settings::get('rolodex', 'custom8_name'));
+         } else {
+             $ptags['CUSTOM8_SORT'] = null;
+         }
+ 
+ 
          /* init the pager */
          $pager = new DBPager('rolodex_member', 'Rolodex_Member');
          $pager->setModule('rolodex');
          $pager->db->addColumn('rolodex_member.*');
+         $pager->db->addColumn('demographics.*');
  
          $pager->db->addWhere('rolodex_member.user_id', 'demographics.user_id');
  
          /* approved yes/no */
          if (isset($approved)) {
***************
*** 257,261 ****
          $pager->addToggle('class="toggle1"');
  //        $pager->setSearch('last_name','title'); // the alias doesn't work here so we do the below
!         $pager->setSearch('demographics.business_name', 'demographics.first_name', 'demographics.last_name');
  
          /* debug stuff */
--- 306,310 ----
          $pager->addToggle('class="toggle1"');
  //        $pager->setSearch('last_name','title'); // the alias doesn't work here so we do the below
!         $pager->setSearch('demographics.business_name', 'demographics.first_name', 'demographics.last_name', 'rolodex_member.description');
  
          /* debug stuff */
***************
*** 406,409 ****
--- 455,460 ----
          $form->addHidden('module', 'rolodex');
          $form->addHidden('uop', 'adv_search');
+ //        $form->addHidden('uop', 'adv_search');
+         $form->addText('pager_c_search');
  
          $form->addSubmit(dgettext('rolodex', 'Go'));
***************
*** 418,421 ****
--- 469,474 ----
          $tpl['CATEGORY_LABEL'] = dgettext('rolodex', 'Category(s)');
          $tpl['CRITERIA_LABEL'] = dgettext('rolodex', 'Criteria');
+         $tpl['SEARCH_LABEL'] = dgettext('rolodex', 'Search');
+         $tpl['TIP'] = dgettext('rolodex', 'Select one or more of the available options below to filter a list of members. It is possible to get too specific. If your search returns an empty list, try selecting fewer criteria.');
  
          $this->rolodex->title = sprintf(dgettext('rolodex', '%s Advanced Search'), PHPWS_Settings::get('rolodex', 'module_title'));
***************
*** 472,475 ****
--- 525,532 ----
          $form->setLabel('comments_anon_enforce', dgettext('rolodex', 'Force anonymous comments enabled, on all profiles'));
  
+         $form->addRadio('contact_type', array(0, 1));
+         $form->setLabel('contact_type', array(dgettext('rolodex', 'Email link'), dgettext('rolodex', 'Web form')));
+         $form->setMatch('contact_type', PHPWS_Settings::get('rolodex', 'contact_type'));
+     
          $form->addRadio('privacy_contact', array(0, 1, 2));
          $form->setLabel('privacy_contact', array(dgettext('rolodex', 'Public'), dgettext('rolodex', 'Members only'), dgettext('rolodex', 'Restricted users')));
***************
*** 508,511 ****
--- 565,612 ----
          $form->setLabel('expiry_interval', dgettext('rolodex', 'Default expiry interval (in days), if expiry is enabled'));
  
+         $form->addCheckbox('use_captcha', 1);
+         $form->setMatch('use_captcha', PHPWS_Settings::get('rolodex', 'use_captcha'));
+         $form->setLabel('use_captcha', dgettext('rolodex', 'Use graphical confirmation on contact form (CAPTCHA)'));
+ 
+         $form->addRadio('list_address', array(0, 1, 2));
+         $form->setLabel('list_address', array(dgettext('rolodex', 'None'), dgettext('rolodex', 'Business'), dgettext('rolodex', 'Home')));
+         $form->setMatch('list_address', PHPWS_Settings::get('rolodex', 'list_address'));
+     
+         $form->addRadio('browse_address', array(0, 1, 2));
+         $form->setLabel('browse_address', array(dgettext('rolodex', 'None'), dgettext('rolodex', 'Business'), dgettext('rolodex', 'Home')));
+         $form->setMatch('browse_address', PHPWS_Settings::get('rolodex', 'browse_address'));
+     
+         $form->addCheckbox('list_phone', 1);
+         $form->setMatch('list_phone', PHPWS_Settings::get('rolodex', 'list_phone'));
+         $form->setLabel('list_phone', dgettext('rolodex', 'List'));
+ 
+         $form->addCheckbox('browse_phone', 1);
+         $form->setMatch('browse_phone', PHPWS_Settings::get('rolodex', 'browse_phone'));
+         $form->setLabel('browse_phone', dgettext('rolodex', 'Browse'));
+ 
+         $form->addCheckbox('list_categories', 1);
+         $form->setMatch('list_categories', PHPWS_Settings::get('rolodex', 'list_categories'));
+         $form->setLabel('list_categories', dgettext('rolodex', 'List'));
+ 
+         $form->addCheckbox('browse_categories', 1);
+         $form->setMatch('browse_categories', PHPWS_Settings::get('rolodex', 'browse_categories'));
+         $form->setLabel('browse_categories', dgettext('rolodex', 'Browse'));
+ 
+         $form->addCheckbox('list_locations', 1);
+         $form->setMatch('list_locations', PHPWS_Settings::get('rolodex', 'list_locations'));
+         $form->setLabel('list_locations', dgettext('rolodex', 'List'));
+ 
+         $form->addCheckbox('browse_locations', 1);
+         $form->setMatch('browse_locations', PHPWS_Settings::get('rolodex', 'browse_locations'));
+         $form->setLabel('browse_locations', dgettext('rolodex', 'Browse'));
+ 
+         $form->addCheckbox('list_features', 1);
+         $form->setMatch('list_features', PHPWS_Settings::get('rolodex', 'list_features'));
+         $form->setLabel('list_features', dgettext('rolodex', 'List'));
+ 
+         $form->addCheckbox('browse_features', 1);
+         $form->setMatch('browse_features', PHPWS_Settings::get('rolodex', 'browse_features'));
+         $form->setLabel('browse_features', dgettext('rolodex', 'Browse'));
+ 
          $form->addTextField('max_img_width', PHPWS_Settings::get('rolodex', 'max_img_width'));
          $form->setLabel('max_img_width', dgettext('rolodex', 'Maximum image width (50-600)'));
***************
*** 576,579 ****
--- 677,704 ----
          $form->setSize('custom8_name', 30);
  
+         $form->addCheckbox('custom1_list', 1);
+         $form->setMatch('custom1_list', PHPWS_Settings::get('rolodex', 'custom1_list'));
+ 
+         $form->addCheckbox('custom2_list', 1);
+         $form->setMatch('custom2_list', PHPWS_Settings::get('rolodex', 'custom2_list'));
+ 
+         $form->addCheckbox('custom3_list', 1);
+         $form->setMatch('custom3_list', PHPWS_Settings::get('rolodex', 'custom3_list'));
+ 
+         $form->addCheckbox('custom4_list', 1);
+         $form->setMatch('custom4_list', PHPWS_Settings::get('rolodex', 'custom4_list'));
+ 
+         $form->addCheckbox('custom5_list', 1);
+         $form->setMatch('custom5_list', PHPWS_Settings::get('rolodex', 'custom5_list'));
+ 
+         $form->addCheckbox('custom6_list', 1);
+         $form->setMatch('custom6_list', PHPWS_Settings::get('rolodex', 'custom6_list'));
+ 
+         $form->addCheckbox('custom7_list', 1);
+         $form->setMatch('custom7_list', PHPWS_Settings::get('rolodex', 'custom7_list'));
+ 
+         $form->addCheckbox('custom8_list', 1);
+         $form->setMatch('custom8_list', PHPWS_Settings::get('rolodex', 'custom8_list'));
+ 
  
  
***************
*** 583,586 ****
--- 708,712 ----
          $tpl['SETTINGS_GROUP_LABEL'] = dgettext('rolodex', 'General Settings');
          $tpl['SORTBY_TITLE'] = dgettext('rolodex', 'Default sort lists by');
+         $tpl['CONTACT_TYPE_TITLE'] = dgettext('rolodex', 'Contact link type');
          $tpl['PRIVACY_CONTACT_TITLE'] = dgettext('rolodex', 'Contact link');
          $tpl['PRIVACY_WEB_TITLE'] = dgettext('rolodex', 'Website link');
***************
*** 590,598 ****
--- 716,733 ----
          $tpl['PRIVACY_EXPORT_TITLE'] = dgettext('rolodex', 'CSV Export');
          $tpl['PRIVACY_USE_SEARCH_TITLE'] = dgettext('rolodex', 'Register records in search module');
+         $tpl['LIST_SETTINGS_TIP'] = dgettext('rolodex', 'The following settings respect the privacy settings above and do not over-ride them.');
+         $tpl['LIST_ADDRESS_TITLE'] = dgettext('rolodex', 'Address to display on list views');
+         $tpl['BROWSE_ADDRESS_TITLE'] = dgettext('rolodex', 'Address to display on browse views');
+         $tpl['LIST_PHONE_TITLE'] = dgettext('rolodex', 'Display phone numbers');
+         $tpl['LIST_CATEGORIES_TITLE'] = dgettext('rolodex', 'Display categories');
+         $tpl['LIST_LOCATIONS_TITLE'] = dgettext('rolodex', 'Display locations');
+         $tpl['LIST_FEATURES_TITLE'] = dgettext('rolodex', 'Display features');
          $tpl['COMMENTS_GROUP_LABEL'] = dgettext('rolodex', 'Comments Settings');
          $tpl['PRIVACY_GROUP_LABEL'] = dgettext('rolodex', 'Privacy Settings');
+         $tpl['LIST_GROUP_LABEL'] = dgettext('rolodex', 'List Settings');
          $tpl['IMAGE_GROUP_LABEL'] = dgettext('rolodex', 'Image Settings');
          $tpl['FIELDS_GROUP_LABEL'] = dgettext('rolodex', 'Custom Fields');
          $tpl['FIELDS_NOTE'] = dgettext('rolodex', 'You may use up to 8 custom fields. To add a field to your member profile template, enter a title for it here. Fields 1-4 follow whatever other security/privacy settings are in place. Fields 5-8 are only visible to Rolodex admins. Leave these fields empty if you do not wish to add custom fields to your profiles.');
+         $tpl['FIELDS_LIST_LABEL'] = dgettext('rolodex', 'Select checkbox to also include field in browse view');
  
          $this->rolodex->title = dgettext('rolodex', 'Settings');
***************
*** 988,991 ****
--- 1123,1183 ----
  
  
+     function contactMember()
+     {
+         $form = new PHPWS_Form;
+         $form->addHidden('module', 'rolodex');
+         $form->addHidden('uop', 'send_message');
+         $form->addHidden('user_id', $this->rolodex->member->user_id);
+ 
+         $form->addText('name', $_POST['name']);
+         $form->setLabel('name', dgettext('rolodex', 'Your name'));
+         $form->setSize('name', 40);
+ 
+         $form->addText('email', $_POST['email']);
+         $form->setLabel('email', dgettext('rolodex', 'Your email'));
+         $form->setSize('email', 40);
+ 
+         $form->addText('subject', $_POST['subject']);
+         $form->setLabel('subject', dgettext('rolodex', 'Subject'));
+         $form->setSize('subject', 40);
+ 
+         $form->addTextArea('message', $_POST['message']);
+         $form->setRows('message', '15');
+         $form->setCols('message', '50');
+         $form->setLabel('message', dgettext('rolodex', 'Message'));
+ 
+         $form->addText('confirm_phrase');
+         $form->setLabel('confirm_phrase', dgettext('rolodex', 'Confirm text'));
+  
+         if (PHPWS_Settings::get('rolodex', 'use_captcha') && extension_loaded('gd')) {
+             $result = $this->confirmGraphic();
+             if (PEAR::isError($result)) {
+                 PHPWS_Error::log($result);
+             } else {
+                 $form->addTplTag('CONFIRM_INSTRUCTIONS', dgettext('rolodex', 'Please type the word seen in the image.'));
+                 $form->addText('confirm_graphic');
+                 $form->setLabel('confirm_graphic', dgettext('rolodex', 'Confirm Graphic'));
+                 $form->addTplTag('GRAPHIC', $result);
+             }
+         }
+ 
+         $form->addSubmit('submit', dgettext('rolodex', 'Send Message'));
+  
+         $tpl = $form->getTemplate();
+         $tpl['FORM_LABEL'] = dgettext('rolodex', 'Compose message');
+         $tpl['FORM_INSTRUCTION'] = dgettext('rolodex', 'All fields are required.');
+         $tpl['LINKS'] = implode(' | ', Rolodex::navLinks());
+ 
+         $this->rolodex->content = PHPWS_Template::process($tpl, 'rolodex', 'message_member.tpl');
+     }
+     
+ 
+     function confirmGraphic()
+     {
+         PHPWS_Core::initCoreClass('Captcha.php');
+         return Captcha::get();
+     }
+ 
+ 
      function utilities()
      {

Index: RDX_Location.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Location.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RDX_Location.php	16 Jun 2008 18:21:33 -0000	1.3
--- RDX_Location.php	24 Jun 2008 11:23:27 -0000	1.4
***************
*** 268,272 ****
      function locationLinks()
      {
! 
          if (Current_User::allow('rolodex', 'settings')) {
              $vars['location'] = $this->id;
--- 268,272 ----
      function locationLinks()
      {
!         $links = array();
          if (Current_User::allow('rolodex', 'settings')) {
              $vars['location'] = $this->id;

Index: Rolodex.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Rolodex.php	17 Jun 2008 13:27:34 -0000	1.11
--- Rolodex.php	24 Jun 2008 11:23:27 -0000	1.12
***************
*** 431,434 ****
--- 431,454 ----
                  break;
  
+             case 'message_member':
+                 $this->loadForm('message_member');
+                 $this->title = sprintf(dgettext('rolodex', 'Send a message to %s'), $this->member->getDisplay_name());
+                 break;
+ 
+             case 'send_message':
+                 if ($this->checkMessage()) {
+                     if (PHPWS_Error::logIfError($this->sendMail())) {
+                         $this->forwardMessage(dgettext('rolodex', 'Message sent succesfully.'));
+                         PHPWS_Core::reroute('index.php?module=rolodex&id=' . $this->member->user_id);
+                     } else {
+                         $this->forwardMessage(dgettext('rolodex', 'There was a problem sending the message.'));
+                         PHPWS_Core::reroute('index.php?module=rolodex&id=' . $this->member->user_id);
+                     }
+                 } else {
+                     $this->loadForm('message_member');
+                     $this->title = sprintf(dgettext('rolodex', 'Send a message to %s'), $this->member->getDisplay_name());
+                 }
+                 break;
+ 
              case 'post_member':
                  if (Current_User::getId() !== $_POST['user_id']) {
***************
*** 673,676 ****
--- 693,697 ----
          }
  
+         PHPWS_Settings::set('rolodex', 'contact_type', $_POST['contact_type']);
          PHPWS_Settings::set('rolodex', 'privacy_contact', $_POST['privacy_contact']);
          PHPWS_Settings::set('rolodex', 'privacy_web', $_POST['privacy_web']);
***************
*** 681,684 ****
--- 702,741 ----
          PHPWS_Settings::set('rolodex', 'privacy_use_search', $_POST['privacy_use_search']);
  
+         PHPWS_Settings::set('rolodex', 'list_address', $_POST['list_address']);
+         PHPWS_Settings::set('rolodex', 'browse_address', $_POST['browse_address']);
+ 
+         isset($_POST['list_phone']) ?
+             PHPWS_Settings::set('rolodex', 'list_phone', 1) :
+             PHPWS_Settings::set('rolodex', 'list_phone', 0);
+ 
+         isset($_POST['browse_phone']) ?
+             PHPWS_Settings::set('rolodex', 'browse_phone', 1) :
+             PHPWS_Settings::set('rolodex', 'browse_phone', 0);
+ 
+         isset($_POST['list_categories']) ?
+             PHPWS_Settings::set('rolodex', 'list_categories', 1) :
+             PHPWS_Settings::set('rolodex', 'list_categories', 0);
+ 
+         isset($_POST['browse_categories']) ?
+             PHPWS_Settings::set('rolodex', 'browse_categories', 1) :
+             PHPWS_Settings::set('rolodex', 'browse_categories', 0);
+ 
+         isset($_POST['list_locations']) ?
+             PHPWS_Settings::set('rolodex', 'list_locations', 1) :
+             PHPWS_Settings::set('rolodex', 'list_locations', 0);
+ 
+         isset($_POST['browse_locations']) ?
+             PHPWS_Settings::set('rolodex', 'browse_locations', 1) :
+             PHPWS_Settings::set('rolodex', 'browse_locations', 0);
+ 
+         isset($_POST['list_features']) ?
+             PHPWS_Settings::set('rolodex', 'list_features', 1) :
+             PHPWS_Settings::set('rolodex', 'list_features', 0);
+ 
+         isset($_POST['browse_features']) ?
+             PHPWS_Settings::set('rolodex', 'browse_features', 1) :
+             PHPWS_Settings::set('rolodex', 'browse_features', 0);
+ 
+ 
          isset($_POST['enable_expiry']) ?
              PHPWS_Settings::set('rolodex', 'enable_expiry', 1) :
***************
*** 691,694 ****
--- 748,755 ----
          }
  
+         isset($_POST['use_captcha']) ?
+             PHPWS_Settings::set('rolodex', 'use_captcha', 1) :
+             PHPWS_Settings::set('rolodex', 'use_captcha', 0);
+ 
          if ( !empty($_POST['max_img_width']) ) {
              $max_img_width = (int)$_POST['max_img_width'];
***************
*** 775,778 ****
--- 836,871 ----
          }
  
+         isset($_POST['custom1_list']) ?
+             PHPWS_Settings::set('rolodex', 'custom1_list', 1) :
+             PHPWS_Settings::set('rolodex', 'custom1_list', 0);
+ 
+         isset($_POST['custom2_list']) ?
+             PHPWS_Settings::set('rolodex', 'custom2_list', 1) :
+             PHPWS_Settings::set('rolodex', 'custom2_list', 0);
+ 
+         isset($_POST['custom3_list']) ?
+             PHPWS_Settings::set('rolodex', 'custom3_list', 1) :
+             PHPWS_Settings::set('rolodex', 'custom3_list', 0);
+ 
+         isset($_POST['custom4_list']) ?
+             PHPWS_Settings::set('rolodex', 'custom4_list', 1) :
+             PHPWS_Settings::set('rolodex', 'custom4_list', 0);
+ 
+         isset($_POST['custom5_list']) ?
+             PHPWS_Settings::set('rolodex', 'custom5_list', 1) :
+             PHPWS_Settings::set('rolodex', 'custom5_list', 0);
+ 
+         isset($_POST['custom6_list']) ?
+             PHPWS_Settings::set('rolodex', 'custom6_list', 1) :
+             PHPWS_Settings::set('rolodex', 'custom6_list', 0);
+ 
+         isset($_POST['custom7_list']) ?
+             PHPWS_Settings::set('rolodex', 'custom7_list', 1) :
+             PHPWS_Settings::set('rolodex', 'custom7_list', 0);
+ 
+         isset($_POST['custom8_list']) ?
+             PHPWS_Settings::set('rolodex', 'custom8_list', 1) :
+             PHPWS_Settings::set('rolodex', 'custom8_list', 0);
+ 
  
          if (isset($errors)) {
***************
*** 1092,1095 ****
--- 1185,1253 ----
  
  
+     function checkMessage()
+     {
+         $this->loadMember();
+ 
+         if (!empty($_POST['name'])) {
+             $_POST['name'] = strip_tags($_POST['name']);
+         } else {
+             $errors[] = dgettext('rolodex', 'Please provide your name.');
+         }
+         
+         if (!empty($_POST['email'])) {
+             if (PHPWS_Text::isValidInput($_POST['email'], 'email')) {
+                 $_POST['email'] = $_POST['email'];
+             } else {
+                 $errors[] = dgettext('rolodex', 'Your email address is improperly formatted.');
+             }
+         } else {
+             $errors[] = dgettext('rolodex', 'Please provide your email address.');
+         }
+         
+         if (!empty($_POST['subject'])) {
+             $_POST['subject'] = strip_tags($_POST['subject']);
+         } else {
+             $errors[] = dgettext('rolodex', 'Please provide a subject.');
+         }
+         
+         if (!empty($_POST['message'])) {
+             $_POST['message'] = strip_tags($_POST['message']);
+         } else {
+             $errors[] = dgettext('rolodex', 'Please provide a message.');
+         }
+         
+         if (isset($errors)) {
+             $this->message = implode('<br />', $errors);
+             return false;
+         } else {
+             return true;
+         }
+     }
+     
+ 
+     function sendMail() 
+     {
+         $this->loadMember();
+ 
+         $url = PHPWS_Core::getHomeHttp();
+         $from = $_POST['name'];
+         $sender = $_POST['email'];
+         $sendto = $this->member->getDisplay_email();
+         $subject = $_POST['subject'];
+         $message = sprintf(dgettext('rolodex', 'This message from %s was sent via %s.'), $from, $url) . "\n\n";
+         $message .= $_POST['message'];
+ 
+         PHPWS_Core::initCoreClass('Mail.php');
+         $mail = new PHPWS_Mail;
+         $mail->addSendTo($sendto);
+         $mail->setSubject($subject);
+         $mail->setFrom(sprintf('%s<%s>', $from, $sender));
+         $mail->setMessageBody($message);
+ 
+         return $mail->send();
+         
+     }
+ 
+ 
      function resetExpired($interval)
      {
***************
*** 1271,1281 ****
          $template['IMAGE'] = $this->category->getIcon();
  
!         $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Browse members'), 'rolodex', array('uop'=>'list'));
!         $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Categories'), "rolodex",  array('uop'=>'categories'));
!         $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Locations'), "rolodex",  array('uop'=>'locations'));
!         $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Features'), "rolodex",  array('uop'=>'features'));
!         $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Advanced'), "rolodex",  array('uop'=>'advanced'));
!         if($links)
!             $template['CATEGORY_LINKS'] = implode(' | ', $links);
  
          $members = $this->getCatMembers(true);
--- 1429,1433 ----
          $template['IMAGE'] = $this->category->getIcon();
  
!         $template['CATEGORY_LINKS'] = implode(' | ', Rolodex::navLinks());
  
          $members = $this->getCatMembers(true);

Index: RDX_Member.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RDX_Member.php	17 Jun 2008 13:27:34 -0000	1.10
--- RDX_Member.php	24 Jun 2008 11:23:27 -0000	1.11
***************
*** 104,123 ****
      {
          if ($print) {
!             if ($nolink) {
!                 $cat_result = Categories::catList($this->key_id);
!                 if (empty($cat_result)) {
!                     $link[] = null;
!                 } else {
!                     foreach ($cat_result as $cat){
!                         if (!$cat->id) {
!                             continue;
!                         }
                          $link[] = $cat->getTitle();
                      }
                  }
-                 $result = $link;
-             } else {
-                 $result = Categories::getSimpleLinks($this->key_id, true);
              }
          } else {
              $db = new PHPWS_DB('category_items');
--- 104,123 ----
      {
          if ($print) {
!             $cat_result = Categories::catList($this->key_id);
!             if (empty($cat_result)) {
!                 $link[] = null;
!             } else {
!                 foreach ($cat_result as $cat){
!                     if (!$cat->id) {
!                         continue;
!                     }
!                     if ($nolink) {
                          $link[] = $cat->getTitle();
+                     } else {
+                         $link[] = PHPWS_Text::moduleLink($cat->getTitle(), "rolodex",  array('uop'=>'view_category', 'category'=>$cat->getId()));
                      }
                  }
              }
+             $result = $link;
          } else {
              $db = new PHPWS_DB('category_items');
***************
*** 488,494 ****
              }
              if ($icon) {
!                 return sprintf('<a class="email" href="mailto:%s"><img src="images/mod/rolodex/email.png" alt="%s" title="%s" /></a>', $this->contact_email, dgettext('rolodex', 'Email'), dgettext('rolodex', 'Email'));
              } else {
!                 return '<a href="mailto:' . $this->contact_email . '" />' . $this->getDisplay_name() . '</a>';
              }
          } else {
--- 488,502 ----
              }
              if ($icon) {
!                 if (PHPWS_Settings::get('rolodex', 'contact_type')) {
!                     return PHPWS_Text::moduleLink(sprintf('<img src="images/mod/rolodex/email.png" alt="%s" title="%s" />', dgettext('rolodex', 'Email'), dgettext('rolodex', 'Email')), "rolodex",  array('uop'=>'message_member', 'id'=>$this->user_id));
!                 } else {
!                     return sprintf('<a class="email" href="mailto:%s"><img src="images/mod/rolodex/email.png" alt="%s" title="%s" /></a>', $this->contact_email, dgettext('rolodex', 'Email'), dgettext('rolodex', 'Email'));
!                 }
              } else {
!                 if (PHPWS_Settings::get('rolodex', 'contact_type')) {
!                     return PHPWS_Text::moduleLink($this->getDisplay_name(), "rolodex",  array('uop'=>'message_member', 'id'=>$this->user_id));
!                 } else {
!                     return '<a href="mailto:' . $this->contact_email . '" />' . $this->getDisplay_name() . '</a>';
!                 }
              }
          } else {
***************
*** 511,517 ****
          if ($print) {
              if ($icon) {
!                 return sprintf('<a class="email" href="mailto:%s"><img src="images/mod/rolodex/email.png" alt="%s" title="%s" /></a>', $email, dgettext('rolodex', 'Email'), dgettext('rolodex', 'Email'));
              } else {
!                 return '<a href="mailto:' . $email . '" />' . $this->getDisplay_name() . '</a>';
              }
          } else {
--- 519,533 ----
          if ($print) {
              if ($icon) {
!                 if (PHPWS_Settings::get('rolodex', 'contact_type')) {
!                     return PHPWS_Text::moduleLink(sprintf('<img src="images/mod/rolodex/email.png" alt="%s" title="%s" />', dgettext('rolodex', 'Email'), dgettext('rolodex', 'Email')), "rolodex",  array('uop'=>'message_member', 'id'=>$this->user_id));
!                 } else {
!                     return sprintf('<a class="email" href="mailto:%s"><img src="images/mod/rolodex/email.png" alt="%s" title="%s" /></a>', $email, dgettext('rolodex', 'Email'), dgettext('rolodex', 'Email'));
!                 }
              } else {
!                 if (PHPWS_Settings::get('rolodex', 'contact_type')) {
!                     return PHPWS_Text::moduleLink($this->getDisplay_name(), "rolodex",  array('uop'=>'message_member', 'id'=>$this->user_id));
!                 } else {
!                     return '<a href="mailto:' . $email . '" />' . $this->getDisplay_name() . '</a>';
!                 }
              }
          } else {
***************
*** 1071,1074 ****
--- 1087,1091 ----
      function memberLinks()
      {
+         $links = array();
          if ($this->editLink()) {
              $links[] = $this->editLink();
***************
*** 1139,1150 ****
  
          if ($this->isDataVisible('privacy_phone')) {
!             $tpl['DAY_PHONE'] = $this->getDay_phone(true);
!             $tpl['DAY_PHONE_LABEL'] = dgettext('rolodex', 'Day phone');
!             $tpl['DAY_PHONE_EXT'] = $this->getDay_phone_ext(true);
!             $tpl['DAY_PHONE_EXT_LABEL'] = dgettext('rolodex', 'Ext');
!             $tpl['FAX_NUMBER'] = $this->getFax_number(true);
!             $tpl['FAX_NUMBER_LABEL'] = dgettext('rolodex', 'Fax');
!             $tpl['TOLLFREE_PHONE'] = $this->getTollfree_phone(true);
!             $tpl['TOLLFREE_PHONE_LABEL'] = dgettext('rolodex', 'Tollfree');
          }
  
--- 1156,1175 ----
  
          if ($this->isDataVisible('privacy_phone')) {
!             if ($this->getDay_phone()) {
!                 $tpl['DAY_PHONE_LABEL'] = dgettext('rolodex', 'Day phone');
!                 $tpl['DAY_PHONE'] = $this->getDay_phone(true);
!             }
!             if ($this->getDay_phone_ext()) {
!                 $tpl['DAY_PHONE_EXT'] = $this->getDay_phone_ext(true);
!                 $tpl['DAY_PHONE_EXT_LABEL'] = dgettext('rolodex', 'Ext');
!             }
!             if ($this->getFax_number()) {
!                 $tpl['FAX_NUMBER'] = $this->getFax_number(true);
!                 $tpl['FAX_NUMBER_LABEL'] = dgettext('rolodex', 'Fax');
!             }
!             if ($this->getTollfree_phone()) {
!                 $tpl['TOLLFREE_PHONE'] = $this->getTollfree_phone(true);
!                 $tpl['TOLLFREE_PHONE_LABEL'] = dgettext('rolodex', 'Tollfree');
!             }
          }
  
***************
*** 1305,1308 ****
--- 1330,1476 ----
              $tpl['WEBSITE_LINK'] = $this->getWebsite(true, true);
          }
+         if (PHPWS_Settings::get('rolodex', 'browse_address') == 1) {
+             if ($this->isDataVisible('privacy_business')) {
+                 $tpl['ADDRESS_1'] = $this->getBusiness_address_1(true);
+                 $tpl['ADDRESS_2'] = $this->getBusiness_address_2(true);
+                 $tpl['CITY'] = $this->getBusiness_city(true);
+                 $tpl['STATE'] = $this->getBusiness_state(true);
+                 $tpl['COUNTRY'] = $this->getBusiness_country(true);
+                 $tpl['ZIP_CODE'] = $this->getBusiness_zip_code(true);
+                 if ($this->getBusiness_address_1() || $this->getBusiness_address_2() || $this->getBusiness_city() || $this->getBusiness_state() || $this->getBusiness_country() || $this->getBusiness_zip_code()) {
+                     $tpl['LABEL'] = dgettext('rolodex', 'Business address');
+                 }
+                 $tpl['GOOGLE_MAP'] = $this->getGoogleMap('business');
+             }
+         } elseif (PHPWS_Settings::get('rolodex', 'browse_address') == 2) {
+             if ($this->isDataVisible('privacy_home')) {
+                 $tpl['ADDRESS_1'] = $this->getMailing_address_1(true);
+                 $tpl['ADDRESS_2'] = $this->getMailing_address_2(true);
+                 $tpl['CITY'] = $this->getMailing_city(true);
+                 $tpl['STATE'] = $this->getMailing_state(true);
+                 $tpl['COUNTRY'] = $this->getMailing_country(true);
+                 $tpl['ZIP_CODE'] = $this->getMailing_zip_code(true);
+                 if ($this->getMailing_address_1() || $this->getMailing_address_2() || $this->getMailing_city() || $this->getMailing_state() || $this->getMailing_country() || $this->getMailing_zip_code()) {
+                     $tpl['LABEL'] = dgettext('rolodex', 'Home address');
+                 }
+                 $tpl['GOOGLE_MAP'] = $this->getGoogleMap('mailing');
+             }
+         }
+ 
+         if (PHPWS_Settings::get('rolodex', 'browse_phone')) {
+             if ($this->isDataVisible('privacy_phone')) {
+                 if ($this->getDay_phone()) {
+                     $tpl['LIST_DAY_PHONE_LABEL'] = dgettext('rolodex', 'Day phone');
+                     $tpl['LIST_DAY_PHONE'] = $this->getDay_phone(true);
+                 }
+                 if ($this->getDay_phone_ext()) {
+                     $tpl['LIST_DAY_PHONE_EXT'] = $this->getDay_phone_ext(true);
+                     $tpl['LIST_DAY_PHONE_EXT_LABEL'] = dgettext('rolodex', 'Ext');
+                 }
+                 if ($this->getFax_number()) {
+                     $tpl['LIST_FAX_NUMBER'] = $this->getFax_number(true);
+                     $tpl['LIST_FAX_NUMBER_LABEL'] = dgettext('rolodex', 'Fax');
+                 }
+                 if ($this->getTollfree_phone()) {
+                     $tpl['LIST_TOLLFREE_PHONE'] = $this->getTollfree_phone(true);
+                     $tpl['LIST_TOLLFREE_PHONE_LABEL'] = dgettext('rolodex', 'Tollfree');
+                 }
+             }
+         }
+         
+         if (PHPWS_Settings::get('rolodex', 'browse_categories')) {
+             if ($this->get_categories(true)) {
+                 $tpl['CATEGORY_LINKS'] = implode(', ', $this->get_categories(true));
+                 $tpl['CATEGORY_LINKS_LABEL'] = dgettext('rolodex', 'Category(s)');
+             }
+         }
+         
+         if (PHPWS_Settings::get('rolodex', 'browse_locations')) {
+             if ($this->get_locations(true)) {
+                 $tpl['LOCATION_LINKS'] = implode(', ', $this->get_locations(true));
+                 $tpl['LOCATION_LINKS_LABEL'] = dgettext('rolodex', 'Location(s)');
+             }
+         }
+         
+         if (PHPWS_Settings::get('rolodex', 'browse_features')) {
+             if ($this->get_features(true)) {
+                 $tpl['FEATURE_LINKS'] = implode(', ', $this->get_features(true));
+                 $tpl['FEATURE_LINKS_LABEL'] = dgettext('rolodex', 'Feature(s)');
+             }
+         }
+ 
+         if (PHPWS_Settings::get('rolodex', 'custom1_name') && PHPWS_Settings::get('rolodex', 'custom1_list')) {
+             if ($this->getCustom1()) {
+                 $tpl['CUSTOM1'] = $this->getCustom1(true);
+             } else {
+                 $tpl['CUSTOM1'] = '';
+             }
+         } else {
+             $tpl['CUSTOM1'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom2_name') && PHPWS_Settings::get('rolodex', 'custom2_list')) {
+             if ($this->getCustom2()) {
+                 $tpl['CUSTOM2'] = $this->getCustom2(true);
+             } else {
+                 $tpl['CUSTOM2'] = '';
+             }
+         } else {
+             $tpl['CUSTOM2'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom3_name') && PHPWS_Settings::get('rolodex', 'custom3_list')) {
+             if ($this->getCustom3()) {
+                 $tpl['CUSTOM3'] = $this->getCustom3(true);
+             } else {
+                 $tpl['CUSTOM3'] = '';
+             }
+         } else {
+             $tpl['CUSTOM3'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom4_name') && PHPWS_Settings::get('rolodex', 'custom4_list')) {
+             if ($this->getCustom4()) {
+                 $tpl['CUSTOM4'] = $this->getCustom4(true);
+             } else {
+                 $tpl['CUSTOM4'] = '';
+             }
+         } else {
+             $tpl['CUSTOM4'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom5_name') && PHPWS_Settings::get('rolodex', 'custom5_list') && Current_User::allow('rolodex', 'view_privates')) {
+             if ($this->getCustom5()) {
+                 $tpl['CUSTOM5'] = $this->getCustom5(true);
+             } else {
+                 $tpl['CUSTOM5'] = '';
+             }
+         } else {
+             $tpl['CUSTOM5'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom6_name') && PHPWS_Settings::get('rolodex', 'custom6_list') && Current_User::allow('rolodex', 'view_privates')) {
+             if ($this->getCustom6()) {
+                 $tpl['CUSTOM6'] = $this->getCustom6(true);
+             } else {
+                 $tpl['CUSTOM6'] = '';
+             }
+         } else {
+             $tpl['CUSTOM6'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom7_name') && PHPWS_Settings::get('rolodex', 'custom7_list') && Current_User::allow('rolodex', 'view_privates')) {
+             if ($this->getCustom7()) {
+                 $tpl['CUSTOM7'] = $this->getCustom7(true);
+             } else {
+                 $tpl['CUSTOM7'] = '';
+             }
+         } else {
+             $tpl['CUSTOM7'] = null;
+         }
+         if (PHPWS_Settings::get('rolodex', 'custom8_name') && PHPWS_Settings::get('rolodex', 'custom8_list') && Current_User::allow('rolodex', 'view_privates')) {
+             if ($this->getCustom8()) {
+                 $tpl['CUSTOM8'] = $this->getCustom8(true);
+             } else {
+                 $tpl['CUSTOM8'] = '';
+             }
+         } else {
+             $tpl['CUSTOM8'] = null;
+         }
+ 
          if($links)
              $tpl['ACTION'] = implode(' | ', $links);
***************
*** 1336,1344 ****
      function viewTpl()
      {
!         $template['MEMBER_TITLE'] = $this->viewLink();
!         $template['MEMBER_DESCRIPTION'] = $this->getDescription(true);
!         $template['MEMBER_LINKS'] = $this->editLink();
  
!         return $template;
      }
  
--- 1504,1590 ----
      function viewTpl()
      {
!         $tpl['MEMBER_TITLE'] = $this->viewLink();
!         $tpl['MEMBER_DESCRIPTION'] = $this->getListDescription(300);
!         $tpl['MEMBER_LINKS'] = $this->editLink();
!         $tpl['THUMBNAIL'] = $this->getThumbnail(true, true);
  
!         if (PHPWS_Settings::get('rolodex', 'list_address') == 1) {
!             if ($this->isDataVisible('privacy_business')) {
!                 $tpl['ADDRESS_1'] = $this->getBusiness_address_1(true);
!                 $tpl['ADDRESS_2'] = $this->getBusiness_address_2(true);
!                 $tpl['CITY'] = $this->getBusiness_city(true);
!                 $tpl['STATE'] = $this->getBusiness_state(true);
!                 $tpl['COUNTRY'] = $this->getBusiness_country(true);
!                 $tpl['ZIP_CODE'] = $this->getBusiness_zip_code(true);
!                 if ($this->getBusiness_address_1() || $this->getBusiness_address_2() || $this->getBusiness_city() || $this->getBusiness_state() || $this->getBusiness_country() || $this->getBusiness_zip_code()) {
!                     $tpl['LABEL'] = dgettext('rolodex', 'Business address');
!                 }
!                 $tpl['GOOGLE_MAP'] = $this->getGoogleMap('business');
!             }
!         } elseif (PHPWS_Settings::get('rolodex', 'list_address') == 2) {
!             if ($this->isDataVisible('privacy_home')) {
!                 $tpl['ADDRESS_1'] = $this->getMailing_address_1(true);
!                 $tpl['ADDRESS_2'] = $this->getMailing_address_2(true);
!                 $tpl['CITY'] = $this->getMailing_city(true);
!                 $tpl['STATE'] = $this->getMailing_state(true);
!                 $tpl['COUNTRY'] = $this->getMailing_country(true);
!                 $tpl['ZIP_CODE'] = $this->getMailing_zip_code(true);
!                 if ($this->getMailing_address_1() || $this->getMailing_address_2() || $this->getMailing_city() || $this->getMailing_state() || $this->getMailing_country() || $this->getMailing_zip_code()) {
!                     $tpl['LABEL'] = dgettext('rolodex', 'Home address');
!                 }
!                 $tpl['GOOGLE_MAP'] = $this->getGoogleMap('mailing');
!             }
!         }
! 
!         if (PHPWS_Settings::get('rolodex', 'list_phone')) {
!             if ($this->isDataVisible('privacy_phone')) {
!                 if ($this->getDay_phone()) {
!                     $tpl['LIST_DAY_PHONE_LABEL'] = dgettext('rolodex', 'Day phone');
!                     $tpl['LIST_DAY_PHONE'] = $this->getDay_phone(true);
!                 }
!                 if ($this->getDay_phone_ext()) {
!                     $tpl['LIST_DAY_PHONE_EXT'] = $this->getDay_phone_ext(true);
!                     $tpl['LIST_DAY_PHONE_EXT_LABEL'] = dgettext('rolodex', 'Ext');
!                 }
!                 if ($this->getFax_number()) {
!                     $tpl['LIST_FAX_NUMBER'] = $this->getFax_number(true);
!                     $tpl['LIST_FAX_NUMBER_LABEL'] = dgettext('rolodex', 'Fax');
!                 }
!                 if ($this->getTollfree_phone()) {
!                     $tpl['LIST_TOLLFREE_PHONE'] = $this->getTollfree_phone(true);
!                     $tpl['LIST_TOLLFREE_PHONE_LABEL'] = dgettext('rolodex', 'Tollfree');
!                 }
!             }
!         }
! 
!         if (PHPWS_Settings::get('rolodex', 'list_categories')) {
!             if ($this->get_categories(true)) {
!                 $tpl['CATEGORY_LINKS'] = implode(', ', $this->get_categories(true));
!                 $tpl['CATEGORY_LINKS_LABEL'] = dgettext('rolodex', 'Category(s)');
!             }
!         }
!         
!         if (PHPWS_Settings::get('rolodex', 'list_locations')) {
!             if ($this->get_locations(true)) {
!                 $tpl['LOCATION_LINKS'] = implode(', ', $this->get_locations(true));
!                 $tpl['LOCATION_LINKS_LABEL'] = dgettext('rolodex', 'Location(s)');
!             }
!         }
!         
!         if (PHPWS_Settings::get('rolodex', 'list_features')) {
!             if ($this->get_features(true)) {
!                 $tpl['FEATURE_LINKS'] = implode(', ', $this->get_features(true));
!                 $tpl['FEATURE_LINKS_LABEL'] = dgettext('rolodex', 'Feature(s)');
!             }
!         }
!         
!         if ($this->isDataVisible('privacy_contact')) {
!             $tpl['CONTACT_EMAIL_LINK'] = $this->getDisplay_email(true, true);
!         }
!         if ($this->isDataVisible('privacy_web')) {
!             $tpl['WEBSITE_LINK'] = $this->getWebsite(true, true);
!         }
! 
!         return $tpl;
      }
  

[phpws-comm-commits] modules/rolodex/docs CHANGELOG, 1.3, 1.4 TODO, 1.11, 1.12

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

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

Modified Files:
	CHANGELOG TODO 
Log Message:
0.9.0 updates

Index: TODO
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/TODO,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TODO	17 Jun 2008 13:27:36 -0000	1.11
--- TODO	24 Jun 2008 11:23:29 -0000	1.12
***************
*** 7,14 ****
  consider option to delete demographics records when uninstalling rolodex
  consider option to delete demographics record when deleting rolodex member
! consider display in list switch for custom fields
! consider contact form instead of email address
  consider improved messages for privacy and expired notices
  consider more advanced export with some pre-selection or options
  
  
--- 7,22 ----
  consider option to delete demographics records when uninstalling rolodex
  consider option to delete demographics record when deleting rolodex member
! I don't think I should do this...
! 
! 
  consider improved messages for privacy and expired notices
  consider more advanced export with some pre-selection or options
  
  
+ can I add some text fields to the advanced search?
+ Looks like it
+ 
+ seems to be a bug when using advanced search to get to list, then the search form in the result doesn't work
+ 
+ do a final update of language file
+ 

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CHANGELOG	17 Jun 2008 13:27:36 -0000	1.3
--- CHANGELOG	24 Jun 2008 11:23:29 -0000	1.4
***************
*** 26,27 ****
--- 26,39 ----
  + Consolidated various nav links arrays into one function
  
+ Version 0.8.0 -- June 2008
+ ------------------------------------------------------------------
+ + Added new setting to use link or form for contact
+ + Added memnber contact form
+ + Added setting for CAPTCHA on contact form
+ 
+ Version 0.9.0 -- June 2008
+ ------------------------------------------------------------------
+ + Various text improvements throughout
+ + Added more details to list views
+ + Added new settings for customizing list views
+ + Added options for including custom fields in lists

[phpws-comm-commits] modules/rolodex/boost boost.php, 1.2, 1.3 update.php, 1.5, 1.6

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

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

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

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/boost.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** boost.php	11 Jun 2008 17:43:28 -0000	1.2
--- boost.php	24 Jun 2008 11:23:25 -0000	1.3
***************
*** 24,28 ****
  
  $proper_name  = 'Rolodex';
! $version      = '0.7.0';
  $image_dir    = true;
  $import_sql   = true;
--- 24,28 ----
  
  $proper_name  = 'Rolodex';
! $version      = '0.8.0';
  $image_dir    = true;
  $import_sql   = true;

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** update.php	17 Jun 2008 13:27:27 -0000	1.5
--- update.php	24 Jun 2008 11:23:25 -0000	1.6
***************
*** 57,64 ****
              $content[] = '0.7.0 changes
  ----------------
! + Added support for locations and features 
  </pre>';
          }
  
  
  
--- 57,112 ----
              $content[] = '0.7.0 changes
  ----------------
! + Add support for Location(s) and Feature(s)
! + Added a bunch of new views to support those
! + Improved Category views
! + Improved image handling
! + Removed avatar support (its in My Page > Comments anyways)
! + Improved CSV export
! + A few security tweaks
! + Added en_US language file
! + Added inc/remove_user.php for new user mod features
! + Added a couple date format examples to config.php
! + Consolidated various nav links arrays into one function
  </pre>';
          }
  
+     case version_compare($currentVersion, '0.8.0', '<'):
+         $content[] = '<pre>';
+ 
+         $files = array('templates/message_member.tpl',
+                        'templates/edit_settings.tpl'
+         );
+         rolodexUpdateFiles($files, $content);
+         
+         $content[] = '0.8.0 changes
+ ----------------
+ + Added new setting to use link or form for contact
+ + Added memnber contact form
+ + Added setting for CAPTCHA on contact form
+ </pre>';
+ 
+ 
+     case version_compare($currentVersion, '0.9.0', '<'):
+         $content[] = '<pre>';
+ 
+         $files = array('templates/adv_search_form.tpl',
+                        'templates/list_member.tpl',
+                        'templates/view_location.tpl',
+                        'templates/view_feature.tpl',
+                        'templates/view_member.tpl',
+                        'templates/view_category.tpl',
+                        'templates/message_member.tpl',
+                        'templates/edit_settings.tpl'
+         );
+         rolodexUpdateFiles($files, $content);
+         
+         $content[] = '0.9.0 changes
+ ----------------
+ + Various text improvements throughout
+ + Added more details to list views
+ + Added new settings for customizing list views
+ + Added options for including custom fields in lists
+ </pre>';
+ 
  
  

[phpws-comm-commits] modules/rolodex/templates adv_search_form.tpl, 1.2, 1.3 edit_settings.tpl, 1.4, 1.5 list_member.tpl, 1.2, 1.3 view_category.tpl, 1.1, 1.2 view_feature.tpl, 1.1, 1.2 view_location.tpl, 1.1, 1.2 view_member.tpl, 1.4, 1.5

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

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

Modified Files:
	adv_search_form.tpl edit_settings.tpl list_member.tpl 
	view_category.tpl view_feature.tpl view_location.tpl 
	view_member.tpl 
Log Message:
0.9.0 updates

Index: adv_search_form.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/adv_search_form.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** adv_search_form.tpl	13 Jun 2008 03:51:18 -0000	1.2
--- adv_search_form.tpl	24 Jun 2008 11:23:33 -0000	1.3
***************
*** 3,9 ****
--- 3,11 ----
  <fieldset>
      <legend><strong>{CRITERIA_LABEL}</strong></legend>
+     <p>{TIP}</p>
      <p>{LOCATION_LABEL}<br />{LOCATION_SELECT}</p>
      <p>{FEATURE_LABEL}<br />{FEATURE_SELECT}</p>
      <p>{CATEGORY_LABEL}<br />{CATEGORY_SELECT}</p>
+     <p>{SEARCH_LABEL}<br />{PAGER_C_SEARCH}</p>
  </fieldset>
  {SUBMIT}

Index: view_location.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/view_location.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** view_location.tpl	12 Jun 2008 21:18:55 -0000	1.1
--- view_location.tpl	24 Jun 2008 11:23:33 -0000	1.2
***************
*** 8,12 ****
      <div class="rolodex-member">
          <fieldset><legend>{MEMBER_TITLE}</legend>
!             <p>{MEMBER_DESCRIPTION}</p>
              <p>{MEMBER_LINKS}</p>
          </fieldset>
--- 8,27 ----
      <div class="rolodex-member">
          <fieldset><legend>{MEMBER_TITLE}</legend>
!             <!-- BEGIN thumbnail --><div style="float: right; margin: 0 0 .2em .5em;">{THUMBNAIL}</div><!-- END thumbnail -->
!             <!-- BEGIN member_description --><p>{MEMBER_DESCRIPTION}</p><!-- END member_description -->
!             <p>
!                 <!-- BEGIN address_1 -->{ADDRESS_1}<!-- END address_1 -->
!                 <!-- BEGIN address_2 --><br />{ADDRESS_2}<!-- END address_2 -->
!                 <!-- BEGIN city --><br />{CITY},<!-- END city --> <!-- BEGIN state -->{STATE}<!-- END state -->
!                 <!-- BEGIN country --><br />{COUNTRY}<!-- END country --> <!-- BEGIN zip_code -->{ZIP_CODE}<!-- END zip_code -->
!                 <!-- BEGIN google_map --><br />{GOOGLE_MAP}<!-- END google_map -->
!                 <!-- BEGIN list_day_phone --><br />{LIST_DAY_PHONE_LABEL}: {LIST_DAY_PHONE}<!-- END list_day_phone --> <!-- BEGIN list_day_phone_ext -->{LIST_DAY_PHONE_EXT_LABEL}: {LIST_DAY_PHONE_EXT}<!-- END list_day_phone_ext -->
!                 <!-- BEGIN list_fax_number --><br />{LIST_FAX_NUMBER_LABEL}: {LIST_FAX_NUMBER}<!-- END list_fax_number -->
!                 <!-- BEGIN list_tollfree_phone --><br />{LIST_TOLLFREE_PHONE_LABEL}: {LIST_TOLLFREE_PHONE}<!-- END list_tollfree_phone -->
!             </p>
!             <!-- BEGIN category_links --><div>{CATEGORY_LINKS_LABEL}: {CATEGORY_LINKS}</div><!-- END category_links -->
!             <!-- BEGIN location_links --><div>{LOCATION_LINKS_LABEL}: {LOCATION_LINKS}</div><!-- END location_links -->
!             <!-- BEGIN feature_links --><div>{FEATURE_LINKS_LABEL}: {FEATURE_LINKS}</div><!-- END   feature_links -->
!             <p><!-- BEGIN contact_email_link -->{CONTACT_EMAIL_LINK}<!-- END contact_email_link -->  <!-- BEGIN website_link -->{WEBSITE_LINK}<!-- END website_link --> </p>
              <p>{MEMBER_LINKS}</p>
          </fieldset>

Index: list_member.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/list_member.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** list_member.tpl	4 Feb 2008 19:29:44 -0000	1.2
--- list_member.tpl	24 Jun 2008 11:23:33 -0000	1.3
***************
*** 7,10 ****
--- 7,18 ----
          <!-- BEGIN contact_email_header --><th><!--{CONTACT_EMAIL_HEADER}--></th><!-- END contact_email_header -->
          <!-- BEGIN website_header --><th><!--{WEBSITE_HEADER}--></th><!-- END website_header -->
+         <!-- BEGIN custom1_header --><th>{CUSTOM1_HEADER} {CUSTOM1_SORT}</th><!-- END custom1_header -->
+         <!-- BEGIN custom2_header --><th>{CUSTOM2_HEADER} {CUSTOM2_SORT}</th><!-- END custom2_header -->
+         <!-- BEGIN custom3_header --><th>{CUSTOM3_HEADER} {CUSTOM3_SORT}</th><!-- END custom3_header -->
+         <!-- BEGIN custom4_header --><th>{CUSTOM4_HEADER} {CUSTOM4_SORT}</th><!-- END custom4_header -->
+         <!-- BEGIN custom5_header --><th>{CUSTOM5_HEADER} {CUSTOM5_SORT}</th><!-- END custom5_header -->
+         <!-- BEGIN custom6_header --><th>{CUSTOM6_HEADER} {CUSTOM6_SORT}</th><!-- END custom6_header -->
+         <!-- BEGIN custom7_header --><th>{CUSTOM7_HEADER} {CUSTOM7_SORT}</th><!-- END custom7_header -->
+         <!-- BEGIN custom8_header --><th>{CUSTOM8_HEADER} {CUSTOM8_SORT}</th><!-- END custom8_header -->
          <th>&nbsp;</th>
      </tr>
***************
*** 16,23 ****
          <!-- BEGIN contact_email_link --><td>{CONTACT_EMAIL_LINK}</td><!-- END contact_email_link -->
          <!-- BEGIN website --><td>{WEBSITE_LINK}</td><!-- END website -->
          <td>{ACTION}</td>
      </tr>
      <tr {TOGGLE}>
!         <td colspan="6" class="smaller">{DESCRIPTION}</td>
      </tr>
  <!-- END listrows -->
--- 24,54 ----
          <!-- BEGIN contact_email_link --><td>{CONTACT_EMAIL_LINK}</td><!-- END contact_email_link -->
          <!-- BEGIN website --><td>{WEBSITE_LINK}</td><!-- END website -->
+         <!-- BEGIN custom1 --><td>{CUSTOM1}</td><!-- END custom1 -->
+         <!-- BEGIN custom2 --><td>{CUSTOM2}</td><!-- END custom2 -->
+         <!-- BEGIN custom3 --><td>{CUSTOM3}</td><!-- END custom3 -->
+         <!-- BEGIN custom4 --><td>{CUSTOM4}</td><!-- END custom4 -->
+         <!-- BEGIN custom5 --><td>{CUSTOM5}</td><!-- END custom5 -->
+         <!-- BEGIN custom6 --><td>{CUSTOM6}</td><!-- END custom6 -->
+         <!-- BEGIN custom7 --><td>{CUSTOM7}</td><!-- END custom7 -->
+         <!-- BEGIN custom8 --><td>{CUSTOM8}</td><!-- END custom8 -->
          <td>{ACTION}</td>
      </tr>
      <tr {TOGGLE}>
!         <td colspan="14" class="smaller">
!             {DESCRIPTION}
!             <p>
!                 <!-- BEGIN address_1 -->{ADDRESS_1}<!-- END address_1 -->
!                 <!-- BEGIN address_2 --><br />{ADDRESS_2}<!-- END address_2 -->
!                 <!-- BEGIN city --><br />{CITY},<!-- END city --> <!-- BEGIN state -->{STATE}<!-- END state -->
!                 <!-- BEGIN country --><br />{COUNTRY}<!-- END country --> <!-- BEGIN zip_code -->{ZIP_CODE}<!-- END zip_code -->
!                 <!-- BEGIN google_map --><br />{GOOGLE_MAP}<!-- END google_map -->
!                 <!-- BEGIN list_day_phone --><br />{LIST_DAY_PHONE_LABEL}: {LIST_DAY_PHONE}<!-- END list_day_phone --> <!-- BEGIN list_day_phone_ext -->{LIST_DAY_PHONE_EXT_LABEL}: {LIST_DAY_PHONE_EXT}<!-- END list_day_phone_ext -->
!                 <!-- BEGIN list_fax_number --><br />{LIST_FAX_NUMBER_LABEL}: {LIST_FAX_NUMBER}<!-- END list_fax_number -->
!                 <!-- BEGIN list_tollfree_phone --><br />{LIST_TOLLFREE_PHONE_LABEL}: {LIST_TOLLFREE_PHONE}<!-- END list_tollfree_phone -->
!             </p>
!             <!-- BEGIN category_links --><div>{CATEGORY_LINKS_LABEL}: {CATEGORY_LINKS}</div><!-- END category_links -->
!             <!-- BEGIN location_links --><div>{LOCATION_LINKS_LABEL}: {LOCATION_LINKS}</div><!-- END location_links -->
!             <!-- BEGIN feature_links --><div>{FEATURE_LINKS_LABEL}: {FEATURE_LINKS}</div><!-- END   feature_links -->
!         </td>
      </tr>
  <!-- END listrows -->

Index: view_member.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/view_member.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** view_member.tpl	12 Jun 2008 21:18:55 -0000	1.4
--- view_member.tpl	24 Jun 2008 11:23:33 -0000	1.5
***************
*** 17,21 ****
              <!-- BEGIN contact_email -->{CONTACT_EMAIL_LABEL}: {CONTACT_EMAIL}<!-- END contact_email -->
              <!-- BEGIN website --><br />{WEBSITE_LABEL}: {WEBSITE}<!-- END website -->
!             <!-- BEGIN day_phone --><br />{DAY_PHONE_LABEL}: {DAY_PHONE} {DAY_PHONE_EXT_LABEL}: {DAY_PHONE_EXT}<!-- END day_phone -->
              <!-- BEGIN fax_number --><br />{FAX_NUMBER_LABEL}: {FAX_NUMBER}<!-- END fax_number -->
              <!-- BEGIN tollfree_phone --><br />{TOLLFREE_PHONE_LABEL}: {TOLLFREE_PHONE}<!-- END tollfree_phone -->
--- 17,21 ----
              <!-- BEGIN contact_email -->{CONTACT_EMAIL_LABEL}: {CONTACT_EMAIL}<!-- END contact_email -->
              <!-- BEGIN website --><br />{WEBSITE_LABEL}: {WEBSITE}<!-- END website -->
!             <!-- BEGIN day_phone --><br />{DAY_PHONE_LABEL}: {DAY_PHONE}<!-- END day_phone --> <!-- BEGIN day_phone_ext -->{DAY_PHONE_EXT_LABEL}: {DAY_PHONE_EXT}<!-- END day_phone_ext -->
              <!-- BEGIN fax_number --><br />{FAX_NUMBER_LABEL}: {FAX_NUMBER}<!-- END fax_number -->
              <!-- BEGIN tollfree_phone --><br />{TOLLFREE_PHONE_LABEL}: {TOLLFREE_PHONE}<!-- END tollfree_phone -->

Index: view_category.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/view_category.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** view_category.tpl	13 Jun 2008 03:51:18 -0000	1.1
--- view_category.tpl	24 Jun 2008 11:23:33 -0000	1.2
***************
*** 8,12 ****
      <div class="rolodex-member">
          <fieldset><legend>{MEMBER_TITLE}</legend>
!             <p>{MEMBER_DESCRIPTION}</p>
              <p>{MEMBER_LINKS}</p>
          </fieldset>
--- 8,27 ----
      <div class="rolodex-member">
          <fieldset><legend>{MEMBER_TITLE}</legend>
!             <!-- BEGIN thumbnail --><div style="float: right; margin: 0 0 .2em .5em;">{THUMBNAIL}</div><!-- END thumbnail -->
!             <!-- BEGIN member_description --><p>{MEMBER_DESCRIPTION}</p><!-- END member_description -->
!             <p>
!                 <!-- BEGIN address_1 -->{ADDRESS_1}<!-- END address_1 -->
!                 <!-- BEGIN address_2 --><br />{ADDRESS_2}<!-- END address_2 -->
!                 <!-- BEGIN city --><br />{CITY},<!-- END city --> <!-- BEGIN state -->{STATE}<!-- END state -->
!                 <!-- BEGIN country --><br />{COUNTRY}<!-- END country --> <!-- BEGIN zip_code -->{ZIP_CODE}<!-- END zip_code -->
!                 <!-- BEGIN google_map --><br />{GOOGLE_MAP}<!-- END google_map -->
!                 <!-- BEGIN list_day_phone --><br />{LIST_DAY_PHONE_LABEL}: {LIST_DAY_PHONE}<!-- END list_day_phone --> <!-- BEGIN list_day_phone_ext -->{LIST_DAY_PHONE_EXT_LABEL}: {LIST_DAY_PHONE_EXT}<!-- END list_day_phone_ext -->
!                 <!-- BEGIN list_fax_number --><br />{LIST_FAX_NUMBER_LABEL}: {LIST_FAX_NUMBER}<!-- END list_fax_number -->
!                 <!-- BEGIN list_tollfree_phone --><br />{LIST_TOLLFREE_PHONE_LABEL}: {LIST_TOLLFREE_PHONE}<!-- END list_tollfree_phone -->
!             </p>
!             <!-- BEGIN category_links --><div>{CATEGORY_LINKS_LABEL}: {CATEGORY_LINKS}</div><!-- END category_links -->
!             <!-- BEGIN location_links --><div>{LOCATION_LINKS_LABEL}: {LOCATION_LINKS}</div><!-- END location_links -->
!             <!-- BEGIN feature_links --><div>{FEATURE_LINKS_LABEL}: {FEATURE_LINKS}</div><!-- END   feature_links -->
!             <p><!-- BEGIN contact_email_link -->{CONTACT_EMAIL_LINK}<!-- END contact_email_link -->  <!-- BEGIN website_link -->{WEBSITE_LINK}<!-- END website_link --> </p>
              <p>{MEMBER_LINKS}</p>
          </fieldset>

Index: view_feature.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/view_feature.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** view_feature.tpl	12 Jun 2008 21:18:55 -0000	1.1
--- view_feature.tpl	24 Jun 2008 11:23:33 -0000	1.2
***************
*** 8,12 ****
      <div class="rolodex-member">
          <fieldset><legend>{MEMBER_TITLE}</legend>
!             <p>{MEMBER_DESCRIPTION}</p>
              <p>{MEMBER_LINKS}</p>
          </fieldset>
--- 8,27 ----
      <div class="rolodex-member">
          <fieldset><legend>{MEMBER_TITLE}</legend>
!             <!-- BEGIN thumbnail --><div style="float: right; margin: 0 0 .2em .5em;">{THUMBNAIL}</div><!-- END thumbnail -->
!             <!-- BEGIN member_description --><p>{MEMBER_DESCRIPTION}</p><!-- END member_description -->
!             <p>
!                 <!-- BEGIN address_1 -->{ADDRESS_1}<!-- END address_1 -->
!                 <!-- BEGIN address_2 --><br />{ADDRESS_2}<!-- END address_2 -->
!                 <!-- BEGIN city --><br />{CITY},<!-- END city --> <!-- BEGIN state -->{STATE}<!-- END state -->
!                 <!-- BEGIN country --><br />{COUNTRY}<!-- END country --> <!-- BEGIN zip_code -->{ZIP_CODE}<!-- END zip_code -->
!                 <!-- BEGIN google_map --><br />{GOOGLE_MAP}<!-- END google_map -->
!                 <!-- BEGIN list_day_phone --><br />{LIST_DAY_PHONE_LABEL}: {LIST_DAY_PHONE}<!-- END list_day_phone --> <!-- BEGIN list_day_phone_ext -->{LIST_DAY_PHONE_EXT_LABEL}: {LIST_DAY_PHONE_EXT}<!-- END list_day_phone_ext -->
!                 <!-- BEGIN list_fax_number --><br />{LIST_FAX_NUMBER_LABEL}: {LIST_FAX_NUMBER}<!-- END list_fax_number -->
!                 <!-- BEGIN list_tollfree_phone --><br />{LIST_TOLLFREE_PHONE_LABEL}: {LIST_TOLLFREE_PHONE}<!-- END list_tollfree_phone -->
!             </p>
!             <!-- BEGIN category_links --><div>{CATEGORY_LINKS_LABEL}: {CATEGORY_LINKS}</div><!-- END category_links -->
!             <!-- BEGIN location_links --><div>{LOCATION_LINKS_LABEL}: {LOCATION_LINKS}</div><!-- END location_links -->
!             <!-- BEGIN feature_links --><div>{FEATURE_LINKS_LABEL}: {FEATURE_LINKS}</div><!-- END   feature_links -->
!             <p><!-- BEGIN contact_email_link -->{CONTACT_EMAIL_LINK}<!-- END contact_email_link -->  <!-- BEGIN website_link -->{WEBSITE_LINK}<!-- END website_link --> </p>
              <p>{MEMBER_LINKS}</p>
          </fieldset>

Index: edit_settings.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_settings.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** edit_settings.tpl	11 Jun 2008 17:43:36 -0000	1.4
--- edit_settings.tpl	24 Jun 2008 11:23:33 -0000	1.5
***************
*** 10,13 ****
--- 10,14 ----
      <p>{SHOW_BLOCK} {SHOW_BLOCK_LABEL} - {BLOCK_ORDER_BY_RAND_1}{BLOCK_ORDER_BY_RAND_1_LABEL} {BLOCK_ORDER_BY_RAND_2}{BLOCK_ORDER_BY_RAND_2_LABEL} - {BLOCK_ON_HOME_ONLY} {BLOCK_ON_HOME_ONLY_LABEL}</p>
      <p>{ENABLE_EXPIRY} {ENABLE_EXPIRY_LABEL} - {EXPIRY_INTERVAL} {EXPIRY_INTERVAL_LABEL}</p>
+     <p>{USE_CAPTCHA} {USE_CAPTCHA_LABEL}</p>
  </fieldset>
  <fieldset>
***************
*** 21,24 ****
--- 22,26 ----
      <legend><strong>{PRIVACY_GROUP_LABEL}</strong></legend>
      <p>{PRIVACY_CONTACT_TITLE} - {PRIVACY_CONTACT_1}{PRIVACY_CONTACT_1_LABEL} {PRIVACY_CONTACT_2}{PRIVACY_CONTACT_2_LABEL} {PRIVACY_CONTACT_3}{PRIVACY_CONTACT_3_LABEL}</p>
+     <p>{CONTACT_TYPE_TITLE} - {CONTACT_TYPE_1}{CONTACT_TYPE_1_LABEL} {CONTACT_TYPE_2}{CONTACT_TYPE_2_LABEL}</p>
      <p>{PRIVACY_WEB_TITLE} - {PRIVACY_WEB_1}{PRIVACY_WEB_1_LABEL} {PRIVACY_WEB_2}{PRIVACY_WEB_2_LABEL} {PRIVACY_WEB_3}{PRIVACY_WEB_3_LABEL}</p>
      <p>{PRIVACY_PHONE_TITLE} - {PRIVACY_PHONE_1}{PRIVACY_PHONE_1_LABEL} {PRIVACY_PHONE_2}{PRIVACY_PHONE_2_LABEL} {PRIVACY_PHONE_3}{PRIVACY_PHONE_3_LABEL}</p>
***************
*** 29,32 ****
--- 31,44 ----
  </fieldset>
  <fieldset>
+     <legend><strong>{LIST_GROUP_LABEL}</strong></legend>
+     <div class="smaller">{LIST_SETTINGS_TIP}</div>
+     <p>{LIST_ADDRESS_TITLE} - {LIST_ADDRESS_1}{LIST_ADDRESS_1_LABEL} {LIST_ADDRESS_2}{LIST_ADDRESS_2_LABEL} {LIST_ADDRESS_3}{LIST_ADDRESS_3_LABEL}</p>
+     <p>{BROWSE_ADDRESS_TITLE} - {BROWSE_ADDRESS_1}{BROWSE_ADDRESS_1_LABEL} {BROWSE_ADDRESS_2}{BROWSE_ADDRESS_2_LABEL} {BROWSE_ADDRESS_3}{BROWSE_ADDRESS_3_LABEL}</p>
+     <p>{LIST_PHONE_TITLE} - {LIST_PHONE}{LIST_PHONE_LABEL} {BROWSE_PHONE}{BROWSE_PHONE_LABEL}</p>
+     <p>{LIST_CATEGORIES_TITLE} - {LIST_CATEGORIES}{LIST_CATEGORIES_LABEL} {BROWSE_CATEGORIES}{BROWSE_CATEGORIES_LABEL}</p>
+     <p>{LIST_LOCATIONS_TITLE} - {LIST_LOCATIONS}{LIST_LOCATIONS_LABEL} {BROWSE_LOCATIONS}{BROWSE_LOCATIONS_LABEL}</p>
+     <p>{LIST_FEATURES_TITLE} - {LIST_FEATURES}{LIST_FEATURES_LABEL} {BROWSE_FEATURES}{BROWSE_FEATURES_LABEL}</p>
+ </fieldset>
+ <fieldset>
      <legend><strong>{IMAGE_GROUP_LABEL}</strong></legend>
      <p>{MAX_IMG_WIDTH} {MAX_IMG_WIDTH_LABEL}</p>
***************
*** 40,51 ****
      <legend><strong>{FIELDS_GROUP_LABEL}</strong></legend>
      <div class="smaller">{FIELDS_NOTE}</div>
!     <p>{CUSTOM1_NAME} {CUSTOM1_NAME_LABEL}</p>
!     <p>{CUSTOM2_NAME} {CUSTOM2_NAME_LABEL}</p>
!     <p>{CUSTOM3_NAME} {CUSTOM3_NAME_LABEL}</p>
!     <p>{CUSTOM4_NAME} {CUSTOM4_NAME_LABEL}</p>
!     <p>{CUSTOM5_NAME} {CUSTOM5_NAME_LABEL}</p>
!     <p>{CUSTOM6_NAME} {CUSTOM6_NAME_LABEL}</p>
!     <p>{CUSTOM7_NAME} {CUSTOM7_NAME_LABEL}</p>
!     <p>{CUSTOM8_NAME} {CUSTOM8_NAME_LABEL}</p>
  </fieldset>
  {SAVE}
--- 52,64 ----
      <legend><strong>{FIELDS_GROUP_LABEL}</strong></legend>
      <div class="smaller">{FIELDS_NOTE}</div>
!     <p class="smaller">{FIELDS_LIST_LABEL}</p>
!     <p>{CUSTOM1_LIST} {CUSTOM1_NAME} {CUSTOM1_NAME_LABEL}</p>
!     <p>{CUSTOM2_LIST} {CUSTOM2_NAME} {CUSTOM2_NAME_LABEL}</p>
!     <p>{CUSTOM3_LIST} {CUSTOM3_NAME} {CUSTOM3_NAME_LABEL}</p>
!     <p>{CUSTOM4_LIST} {CUSTOM4_NAME} {CUSTOM4_NAME_LABEL}</p>
!     <p>{CUSTOM5_LIST} {CUSTOM5_NAME} {CUSTOM5_NAME_LABEL}</p>
!     <p>{CUSTOM6_LIST} {CUSTOM6_NAME} {CUSTOM6_NAME_LABEL}</p>
!     <p>{CUSTOM7_LIST} {CUSTOM7_NAME} {CUSTOM7_NAME_LABEL}</p>
!     <p>{CUSTOM8_LIST} {CUSTOM8_NAME} {CUSTOM8_NAME_LABEL}</p>
  </fieldset>
  {SAVE}

[phpws-comm-commits] modules/rolodex/templates message_member.tpl, NONE, 1.1

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

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

Added Files:
	message_member.tpl 
Log Message:
add message form

--- NEW FILE: message_member.tpl ---
<div align="right">{LINKS}</div>
{START_FORM}
<fieldset>
    <legend><strong>{FORM_LABEL}</strong></legend>
    <p><strong>{FORM_INSTRUCTION}</strong></p>
    {NAME} {NAME_LABEL}<br />
    {EMAIL} {EMAIL_LABEL}<br />
    {SUBJECT} {SUBJECT_LABEL}<br />
    {MESSAGE} {MESSAGE_LABEL}<br />
    {CONFIRM_GRAPHIC_LABEL}<br />
    {GRAPHIC}<br />
    {CONFIRM_GRAPHIC} {CONFIRM_INSTRUCTIONS}
    <!-- BEGIN graphic-error -->
    <div class="error">{CONFIRM_ERROR}</div>
    <!-- END graphic-error -->
</fieldset>
{SUBMIT}
{END_FORM}

[phpws-comm-commits] modules/ads/docs ChangeLog,1.9,1.10

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

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

Modified Files:
	ChangeLog 
Log Message:
Releasing 1.2.0

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/docs/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ChangeLog	22 Jun 2008 20:04:20 -0000	1.9
--- ChangeLog	23 Jun 2008 02:17:23 -0000	1.10
***************
*** 3,7 ****
  
  
! *cvs
  
      DBPager queries now cached.
--- 3,7 ----
  
  
! *ads-1.2.0 (22 Jun 2008)
  
      DBPager queries now cached.

[phpws-comm-commits] modules/ads/class ad.php, 1.14, 1.15 admin.php, 1.20, 1.21 advertiser.php, 1.8, 1.9 campaign.php, 1.11, 1.12

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

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

Modified Files:
	ad.php admin.php advertiser.php campaign.php 
Log Message:
No longer save username in advertisers table.  DBPager queries now cached.

Index: campaign.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/campaign.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** campaign.php	22 Jun 2008 15:55:07 -0000	1.11
--- campaign.php	22 Jun 2008 20:04:19 -0000	1.12
***************
*** 104,109 ****
      {
          $db = new PHPWS_DB('ads_advertisers');
!         $db->addWhere('id', $this->advertiser_id);
!         $db->addColumn('username');
          $result = $db->select('col');
          if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))
--- 104,110 ----
      {
          $db = new PHPWS_DB('ads_advertisers');
!         $db->addWhere('ads_advertisers.id', $this->advertiser_id);
!         $db->addWhere('users.id', 'ads_advertisers.user_id');
!         $db->addColumn('users.username');
          $result = $db->select('col');
          if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))
***************
*** 153,158 ****
          {
              $db = new PHPWS_DB('ads_advertisers');
!             $db->addWhere('id', $this->advertiser_id);
!             $db->addColumn('username');
              $result = $db->select('col');
              if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))
--- 154,160 ----
          {
              $db = new PHPWS_DB('ads_advertisers');
!             $db->addWhere('ads_advertisers.id', $this->advertiser_id);
!             $db->addWhere('users.id', 'ads_advertisers.user_id');
!             $db->addColumn('users.username');
              $result = $db->select('col');
              if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))

Index: admin.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/admin.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** admin.php	29 Mar 2008 17:01:25 -0000	1.20
--- admin.php	22 Jun 2008 20:04:19 -0000	1.21
***************
*** 336,340 ****
  
              case 'manageCampaigns':
!                 $title = sprintf(dgettext('ads', 'Manage Campaigns: %s'), $advertiser->getUsername());
                  $content = Ads_Admin::listCampaigns($_GET['advertiser_id']);
                  break;
--- 336,340 ----
  
              case 'manageCampaigns':
!                 $title = sprintf(dgettext('ads', 'Manage Campaigns: %s'), $advertiser->getDisplayName());
                  $content = Ads_Admin::listCampaigns($_GET['advertiser_id']);
                  break;
***************
*** 680,683 ****
--- 680,684 ----
          $pager->setDefaultOrder('title', 'asc');
          $pager->setEmptyMessage(dgettext('ads', 'No zones found.'));
+         $pager->cacheQueries();
  
          return $pager->get();
***************
*** 729,733 ****
          $form->addText('username');
          $form->setLabel('username', dgettext('ads', 'Username'));
!         $form->setSize('username', 30, 30);
  
          $form->addText('business');
--- 730,734 ----
          $form->addText('username');
          $form->setLabel('username', dgettext('ads', 'Username'));
!         $form->setSize('username', 30, 255);
  
          $form->addText('business');
***************
*** 762,766 ****
                  {
                      $advertiser->setUserId($result[0]);
-                     $advertiser->setUsername($_POST['username']);
                      $advertiser->setBusiness($_POST['business']);
                      $advertiser->setCreated(mktime());
--- 763,766 ----
***************
*** 777,781 ****
          PHPWS_Core::initCoreClass('DBPager.php');
  
!         $pageTags['USERNAME'] = dgettext('ads', 'Username');
          $pageTags['BUSINESS'] = dgettext('ads', 'Business Name');
          $pageTags['CREATED']  = dgettext('ads', 'Advertising Since');
--- 777,781 ----
          PHPWS_Core::initCoreClass('DBPager.php');
  
!         $pageTags['DISPLAY_NAME'] = dgettext('ads', 'Username');
          $pageTags['BUSINESS'] = dgettext('ads', 'Business Name');
          $pageTags['CREATED']  = dgettext('ads', 'Advertising Since');
***************
*** 787,793 ****
          $pager->addPageTags($pageTags);
          $pager->addRowTags('getTpl');
!         $pager->setSearch('username', 'business');
          $pager->setDefaultOrder('business', 'asc');
          $pager->setEmptyMessage(dgettext('ads', 'No advertisers found.'));
  
          return $pager->get();
--- 787,795 ----
          $pager->addPageTags($pageTags);
          $pager->addRowTags('getTpl');
!         $pager->setSearch('business');
          $pager->setDefaultOrder('business', 'asc');
          $pager->setEmptyMessage(dgettext('ads', 'No advertisers found.'));
+         $pager->joinResult('user_id', 'users', 'id', 'display_name', 'display_name');
+         $pager->cacheQueries();
  
          return $pager->get();
***************
*** 877,880 ****
--- 879,883 ----
          $pager->addWhere('advertiser_id', $advertiser_id);
          $pager->setEmptyMessage(dgettext('ads', 'No campaigns found.'));
+         $pager->cacheQueries();
  
          return $pager->get();
***************
*** 1075,1078 ****
--- 1078,1082 ----
          $pager->addWhere('campaign_id', $campaign_id);
          $pager->setEmptyMessage(dgettext('ads', 'No ads found.'));
+         $pager->cacheQueries();
  
          return $pager->get();

Index: advertiser.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/advertiser.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** advertiser.php	22 Jun 2008 15:55:07 -0000	1.8
--- advertiser.php	22 Jun 2008 20:04:19 -0000	1.9
***************
*** 25,33 ****
  class Ads_Advertiser
  {
!     var $id          = 0;
!     var $user_id     = 0;
!     var $username    = NULL;
!     var $business    = NULL;
!     var $created     = 0;
  
  
--- 25,35 ----
  class Ads_Advertiser
  {
!     var $id           = 0;
!     var $user_id      = 0;
!     var $business     = NULL;
!     var $created      = 0;
! 
!     /* Joined variables. */
!     var $display_name = NULL;
  
  
***************
*** 63,76 ****
      }
  
-     function setUsername($username)
-     {
-         $this->username = $username;
-     }
- 
-     function getUsername()
-     {
-         return $this->username;
-     }
- 
      function setBusiness($business)
      {
--- 65,68 ----
***************
*** 93,96 ****
--- 85,101 ----
      }
  
+     function getDisplayName()
+     {
+         if (empty($this->display_name))
+         {
+             $db = new PHPWS_DB('users');
+             $db->addWhere('users.id', $this->user_id);
+             $db->addColumn('username');
+             $this->display_name = $db->select('one');
+         }
+ 
+         return $this->display_name;
+     }
+ 
      function save()
      {
***************
*** 161,165 ****
  
          $template['ACTION'] = implode(' | ', $links);
!         $template['USERNAME'] = $this->getUsername();
          $template['BUSINESS'] = $this->getBusiness();
          $template['CREATED'] = $this->getCreated();
--- 166,170 ----
  
          $template['ACTION'] = implode(' | ', $links);
!         $template['DISPLAY_NAME'] = $this->getDisplayName();
          $template['BUSINESS'] = $this->getBusiness();
          $template['CREATED'] = $this->getCreated();

Index: ad.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/ad.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ad.php	22 Jun 2008 15:55:07 -0000	1.14
--- ad.php	22 Jun 2008 20:04:19 -0000	1.15
***************
*** 259,263 ****
          $db->addWhere('ads_campaigns.id', $this->campaign_id);
          $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id');
!         $db->addColumn('ads_advertisers.username');
          $result = $db->select('col');
          if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))
--- 259,264 ----
          $db->addWhere('ads_campaigns.id', $this->campaign_id);
          $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id');
!         $db->addWhere('users.id', 'ads_advertisers.user_id');
!         $db->addColumn('users.username');
          $result = $db->select('col');
          if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))
***************
*** 313,317 ****
              $db->addWhere('ads_campaigns.id', $this->campaign_id);
              $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id');
!             $db->addColumn('ads_advertisers.username');
              $result = $db->select('col');
              if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))
--- 314,319 ----
              $db->addWhere('ads_campaigns.id', $this->campaign_id);
              $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id');
!             $db->addWhere('users.id', 'ads_advertisers.user_id');
!             $db->addColumn('users.username');
              $result = $db->select('col');
              if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))

[phpws-comm-commits] modules/ads/boost boost.php, 1.4, 1.5 dependency.xml, 1.4, 1.5 install.sql, 1.10, 1.11 update.php, 1.1, 1.2

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

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

Modified Files:
	boost.php dependency.xml install.sql update.php 
Log Message:
No longer save username in advertisers table.  DBPager queries now cached.

Index: install.sql
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/boost/install.sql,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** install.sql	11 Feb 2007 23:38:23 -0000	1.10
--- install.sql	22 Jun 2008 20:04:15 -0000	1.11
***************
*** 20,24 ****
  id INT NOT NULL,
  user_id INT DEFAULT '0' NOT NULL,
- username VARCHAR(30) NOT NULL default '',
  business VARCHAR(100) NOT NULL default '',
  created INT NOT NULL,
--- 20,23 ----

Index: dependency.xml
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/boost/dependency.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dependency.xml	22 Jun 2008 14:27:43 -0000	1.4
--- dependency.xml	22 Jun 2008 20:04:15 -0000	1.5
***************
*** 4,8 ****
      <title>core</title>
      <properName>phpWebSite Core</properName>
!     <version>1.5.0</version>
      <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url>
    </module>
--- 4,8 ----
      <title>core</title>
      <properName>phpWebSite Core</properName>
!     <version>1.8.2</version>
      <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url>
    </module>

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/boost/boost.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** boost.php	28 May 2007 21:21:47 -0000	1.4
--- boost.php	22 Jun 2008 20:04:15 -0000	1.5
***************
*** 24,28 ****
  
  $proper_name  = 'Ads';
! $version      = '1.1.0';
  $register     = FALSE;
  $unregister   = FALSE;
--- 24,28 ----
  
  $proper_name  = 'Ads';
! $version      = '1.2.0';
  $register     = FALSE;
  $unregister   = FALSE;

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/boost/update.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** update.php	28 May 2007 21:21:47 -0000	1.1
--- update.php	22 Jun 2008 20:04:15 -0000	1.2
***************
*** 29,32 ****
--- 29,45 ----
          case version_compare($currentVersion, '1.1.0', '<'):
              $content[] = '- Updated to new translation functions.';
+ 
+         case version_compare($currentVersion, '1.2.0', '<'):
+             $db = new PHPWS_DB('ads_advertisers');
+             PHPWS_Error::logIfError($db->dropTableColumn('username'));
+ 
+             $files = array('templates/advertiser/list.tpl');
+             ads_update_files($files, $content);
+ 
+             $content[] = '- Drop username column from advertisers table.';
+             $content[] = '- Advertisers deleted when associated site user is deleted.';
+             $content[] = '- Switched to PHPWS_LIST_TOGGLE_CLASS define for DBPager.';
+             $content[] = '- Added empty messages to DBPager.';
+             $content[] = '- Corrected a few phrases that were not being translated.';
      }
  
***************
*** 34,36 ****
--- 47,66 ----
  }
  
+ function ads_update_files($files, &$content)
+ {
+     if (PHPWS_Boost::updateFiles($files, 'ads'))
+     {
+         $content[] = '- Updated the following files:';
+     }
+     else
+     {
+         $content[] = '- Unable to update the following files:';
+     }
+ 
+     foreach ($files as $file)
+     {
+         $content[] = '--- ' . $file;
+     }
+ }
+ 
  ?>
\ No newline at end of file

[phpws-comm-commits] modules/ads/templates/advertiser list.tpl, 1.2, 1.3

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

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

Modified Files:
	list.tpl 
Log Message:
No longer save username in advertisers table.  DBPager queries now cached.

Index: list.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/templates/advertiser/list.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** list.tpl	11 Feb 2007 23:38:29 -0000	1.2
--- list.tpl	22 Jun 2008 20:04:22 -0000	1.3
***************
*** 2,6 ****
    <tr>
      <th>{BUSINESS} {BUSINESS_SORT}</th>
!     <th>{USERNAME} {USERNAME_SORT}</th>
      <th>{CREATED} {CREATED_SORT}</th>
      <th>{ACTION}</th>
--- 2,6 ----
    <tr>
      <th>{BUSINESS} {BUSINESS_SORT}</th>
!     <th>{DISPLAY_NAME} {DISPLAY_NAME_SORT}</th>
      <th>{CREATED} {CREATED_SORT}</th>
      <th>{ACTION}</th>
***************
*** 9,13 ****
    <tr{TOGGLE}>
      <td>{BUSINESS}</td>
!     <td>{USERNAME}</td>
      <td>{CREATED}</td>
      <td>{ACTION}</td>
--- 9,13 ----
    <tr{TOGGLE}>
      <td>{BUSINESS}</td>
!     <td>{DISPLAY_NAME}</td>
      <td>{CREATED}</td>
      <td>{ACTION}</td>

[phpws-comm-commits] modules/ads/docs ChangeLog,1.8,1.9

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

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

Modified Files:
	ChangeLog 
Log Message:
No longer save username in advertisers table.  DBPager queries now cached.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/docs/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ChangeLog	22 Jun 2008 14:27:48 -0000	1.8
--- ChangeLog	22 Jun 2008 20:04:20 -0000	1.9
***************
*** 5,8 ****
--- 5,10 ----
  *cvs
  
+     DBPager queries now cached.
+     RFE #2000048: Drop username column from advertisers table.
      RFE #1988283: Advertisers deleted when associated site user is deleted.
      Switched to PHPWS_LIST_TOGGLE_CLASS define for DBPager.

[phpws-comm-commits] modules/ads/class ad.php, 1.13, 1.14 advertiser.php, 1.7, 1.8 campaign.php, 1.10, 1.11

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

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

Modified Files:
	ad.php advertiser.php campaign.php 
Log Message:
Override needs to be passed from advertiser to campaign to ad.

Index: campaign.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/campaign.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** campaign.php	28 May 2007 21:21:49 -0000	1.10
--- campaign.php	22 Jun 2008 15:55:07 -0000	1.11
***************
*** 37,48 ****
      function Ads_Campaign($id=NULL)
      {
!         if (empty($id))
          {
!             return;
!         }
!         $this->setId($id);
  
!         $db = new PHPWS_DB('ads_campaigns');
!         $db->loadObject($this);
      }
  
--- 37,47 ----
      function Ads_Campaign($id=NULL)
      {
!         if (!empty($id))
          {
!             $this->setId($id);
  
!             $db = new PHPWS_DB('ads_campaigns');
!             $db->loadObject($this);
!         }
      }
  
***************
*** 129,174 ****
      }
  
!     function clearAds()
      {
          $db = new PHPWS_DB('ads');
          $db->addWhere('campaign_id', $this->id);
          $ads = $db->getObjects('Ads_Ad');
!         if (PEAR::isError($ads))
!         {
!             PHPWS_Error::log($ads);
!         }
!         else if ($ads != NULL)
          {
              foreach ($ads as $ad)
              {
!                 $ad->kill();
              }
          }
      }
  
!     function kill()
      {
!         $db = new PHPWS_DB('ads_advertisers');
!         $db->addWhere('id', $this->advertiser_id);
!         $db->addColumn('username');
!         $result = $db->select('col');
!         if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))
          {
!             Current_User::disallow();
!             return;
          }
  
          $this->clearPins();
!         $this->clearAds();
          $db = new PHPWS_DB('ads_campaigns');
          $db->addWhere('id', $this->id);
  
!         $result = $db->delete();
!         if (PEAR::isError($result))
!         {
!             PHPWS_Error::log($result);
!             return FALSE;
!         }
!         return TRUE;
      }
  
--- 128,172 ----
      }
  
!     function clearAds($override)
      {
          $db = new PHPWS_DB('ads');
          $db->addWhere('campaign_id', $this->id);
          $ads = $db->getObjects('Ads_Ad');
! 
!         if (!PHPWS_Error::logIfError($ads) && ($ads != NULL))
          {
              foreach ($ads as $ad)
              {
!                 $ad->kill($override);
              }
          }
      }
  
!     /**
!      * Removes campaign and associated ads from the database.
!      *
!      * @param  override  Should ONLY be used when user being deleted (see remove_user.php).
!      */
!     function kill($override=false)
      {
!         if (!$override)
          {
!             $db = new PHPWS_DB('ads_advertisers');
!             $db->addWhere('id', $this->advertiser_id);
!             $db->addColumn('username');
!             $result = $db->select('col');
!             if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))
!             {
!                 Current_User::disallow();
!                 return;
!             }
          }
  
          $this->clearPins();
!         $this->clearAds($override);
          $db = new PHPWS_DB('ads_campaigns');
          $db->addWhere('id', $this->id);
  
!         return !PHPWS_Error::logIfError($db->delete());
      }
  
***************
*** 183,189 ****
          $db->addWhere('ad_type', $zone->ad_type);
          $result = $db->getObjects('Ads_Ad');
!         if (PEAR::isError($result))
          {
-             PHPWS_Error::log($result);
              return FALSE;
          }
--- 181,186 ----
          $db->addWhere('ad_type', $zone->ad_type);
          $result = $db->getObjects('Ads_Ad');
!         if (PHPWS_Error::logIfError($result))
          {
              return FALSE;
          }
***************
*** 250,256 ****
          $db->addWhere('campaign_id', $this->getId());
          $result = $db->count();
!         if (PEAR::isError($result))
          {
-             PHPWS_Error::log($result);
              return dgettext('ads', 'N/A');
          }
--- 247,252 ----
          $db->addWhere('campaign_id', $this->getId());
          $result = $db->count();
!         if (PHPWS_Error::logIfError($result))
          {
              return dgettext('ads', 'N/A');
          }

Index: advertiser.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/advertiser.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** advertiser.php	22 Jun 2008 14:27:46 -0000	1.7
--- advertiser.php	22 Jun 2008 15:55:07 -0000	1.8
***************
*** 109,113 ****
      }
  
!     function clearCampaigns()
      {
          $db = new PHPWS_DB('ads_campaigns');
--- 109,113 ----
      }
  
!     function clearCampaigns($override)
      {
          $db = new PHPWS_DB('ads_campaigns');
***************
*** 119,123 ****
              foreach ($campaigns as $campaign)
              {
!                 $campaign->kill();
              }
          }
--- 119,123 ----
              foreach ($campaigns as $campaign)
              {
!                 $campaign->kill($override);
              }
          }
***************
*** 137,141 ****
          }
  
!         $this->clearCampaigns();
          $db = new PHPWS_DB('ads_advertisers');
          $db->addWhere('id', $this->id);
--- 137,141 ----
          }
  
!         $this->clearCampaigns($override);
          $db = new PHPWS_DB('ads_advertisers');
          $db->addWhere('id', $this->id);

Index: ad.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/ad.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ad.php	28 May 2007 21:21:48 -0000	1.13
--- ad.php	22 Jun 2008 15:55:07 -0000	1.14
***************
*** 41,52 ****
      function Ads_Ad($id=NULL)
      {
!         if (empty($id))
          {
!             return;
!         }
!         $this->setId($id);
  
!         $db = new PHPWS_DB('ads');
!         $db->loadObject($this);
      }
  
--- 41,51 ----
      function Ads_Ad($id=NULL)
      {
!         if (!empty($id))
          {
!             $this->setId($id);
  
!             $db = new PHPWS_DB('ads');
!             $db->loadObject($this);
!         }
      }
  
***************
*** 139,146 ****
              return PHPWS_Text::parseOutput($this->ad_text);
          }
!         else
!         {
!             return $this->ad_text;
!         }
      }
  
--- 138,143 ----
              return PHPWS_Text::parseOutput($this->ad_text);
          }
! 
!         return $this->ad_text;
      }
  
***************
*** 157,186 ****
      function getActive()
      {
!         $vars['ad_id'] = $this->getId();
  
!         if ($this->active)
!         {
!             if (Current_User::allow('ads', 'hide_ads') && ($_REQUEST['module'] == 'ads'))
!             {
!                 $vars['action'] = 'hideAd';
!                 return PHPWS_Text::secureLink(dgettext('ads', 'Active'), 'ads', $vars);
!             }
!             else
!             {
!                 return dgettext('ads', 'Active');
!             }
!         }
!         else
          {
!             if (Current_User::allow('ads', 'hide_ads') && ($_REQUEST['module'] == 'ads'))
!             {
!                 $vars['action'] = 'hideAd';
!                 return PHPWS_Text::secureLink(dgettext('ads', 'Inactive'), 'ads', $vars);
!             }
!             else
!             {
!                 return dgettext('ads', 'Inactive');
!             }
          }
      }
  
--- 154,168 ----
      function getActive()
      {
!         $active   = dgettext('ads', 'Active');
!         $inactive = dgettext('ads', 'Inactive');
  
!         if (Current_User::allow('ads', 'hide_ads') && ($_REQUEST['module'] == 'ads'))
          {
!             $vars['ad_id'] = $this->getId();
!             $vars['action'] = 'hideAd';
!             return PHPWS_Text::secureLink(($this->active ? $active : $inactive), 'ads', $vars);
          }
+ 
+         return ($this->active ? $active : $inactive);
      }
  
***************
*** 255,265 ****
          $db = new PHPWS_DB('ads_stats');
          $db->addWhere('id', $this->id);
!         $result = $db->incrementColumn($stat);
!         if (PEAR::isError($result))
!         {
!             PHPWS_Error::log($result);
!             return FALSE;
!         }
!         return TRUE;
      }
  
--- 237,241 ----
          $db = new PHPWS_DB('ads_stats');
          $db->addWhere('id', $this->id);
!         return !PHPWS_Error::logIfError($db->incrementColumn($stat));
      }
  
***************
*** 272,284 ****
          }
  
!         if ($this->active)
!         {
!             $this->active = 0;
!         }
!         else
!         {
!             $this->active = 1;
!         }
! 
          return $this->save(FALSE);
      }
--- 248,252 ----
          }
  
!         $this->active = ($this->active ? 0 : 1);
          return $this->save(FALSE);
      }
***************
*** 331,347 ****
      }
  
!     function kill()
      {
          PHPWS_Core::initModClass('version', 'Version.php');
  
!         $db = new PHPWS_DB('ads_campaigns');
!         $db->addWhere('ads_campaigns.id', $this->campaign_id);
!         $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id');
!         $db->addColumn('ads_advertisers.username');
!         $result = $db->select('col');
!         if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))
          {
!             Current_User::disallow();
!             return;
          }
  
--- 299,323 ----
      }
  
!     /**
!      * Removes ads and associated stats from the database.
!      *
!      * @param  override  Should ONLY be used when user being deleted (see remove_user.php).
!      */
!     function kill($override=false)
      {
          PHPWS_Core::initModClass('version', 'Version.php');
  
!         if (!$override)
          {
!             $db = new PHPWS_DB('ads_campaigns');
!             $db->addWhere('ads_campaigns.id', $this->campaign_id);
!             $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id');
!             $db->addColumn('ads_advertisers.username');
!             $result = $db->select('col');
!             if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads'))
!             {
!                 Current_User::disallow();
!                 return;
!             }
          }
  
***************
*** 355,373 ****
          $db = new PHPWS_DB('ads_stats');
          $db->addWhere('id', $this->id);
!         $result = $db->delete();
!         if (PEAR::isError($result))
!         {
!             PHPWS_Error::log($result);
!         }
  
          $db = new PHPWS_DB('ads');
          $db->addWhere('id', $this->id);
!         $result = $db->delete();
!         if (PEAR::isError($result))
!         {
!             PHPWS_Error::log($result);
!             return FALSE;
!         }
!         return TRUE;
      }
  
--- 331,339 ----
          $db = new PHPWS_DB('ads_stats');
          $db->addWhere('id', $this->id);
!         PHPWS_Error::logIfError($db->delete());
  
          $db = new PHPWS_DB('ads');
          $db->addWhere('id', $this->id);
!         return !PHPWS_Error::logIfError($db->delete());
      }
  

[phpws-comm-commits] modules/ads/docs ChangeLog, 1.7, 1.8 INSTALL, 1.3, 1.4

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

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

Modified Files:
	ChangeLog INSTALL 
Log Message:
Advertisers deleted when associated site user is deleted.

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

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/docs/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ChangeLog	29 Mar 2008 17:01:26 -0000	1.7
--- ChangeLog	22 Jun 2008 14:27:48 -0000	1.8
***************
*** 5,8 ****
--- 5,9 ----
  *cvs
  
+     RFE #1988283: Advertisers deleted when associated site user is deleted.
      Switched to PHPWS_LIST_TOGGLE_CLASS define for DBPager.
      Started to use the core's logIfError function.

[phpws-comm-commits] modules/ads/class advertiser.php,1.6,1.7

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

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

Modified Files:
	advertiser.php 
Log Message:
Advertisers deleted when associated site user is deleted.

Index: advertiser.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/advertiser.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** advertiser.php	28 May 2007 21:21:49 -0000	1.6
--- advertiser.php	22 Jun 2008 14:27:46 -0000	1.7
***************
*** 34,45 ****
      function Ads_Advertiser($id=NULL)
      {
!         if (empty($id))
          {
!             return;
!         }
!         $this->setId($id);
  
!         $db = new PHPWS_DB('ads_advertisers');
!         $db->loadObject($this);
      }
  
--- 34,44 ----
      function Ads_Advertiser($id=NULL)
      {
!         if (!empty($id))
          {
!             $this->setId($id);
  
!             $db = new PHPWS_DB('ads_advertisers');
!             $db->loadObject($this);
!         }
      }
  
***************
*** 115,123 ****
          $db->addWhere('advertiser_id', $this->id);
          $campaigns = $db->getObjects('Ads_Campaign');
!         if (PEAR::isError($campaigns))
!         {
!             PHPWS_Error::log($campaigns);
!         }
!         else if ($campaigns != NULL)
          {
              foreach ($campaigns as $campaign)
--- 114,119 ----
          $db->addWhere('advertiser_id', $this->id);
          $campaigns = $db->getObjects('Ads_Campaign');
! 
!         if (!PHPWS_Error::logIfError($campaigns) && ($campaigns != NULL))
          {
              foreach ($campaigns as $campaign)
***************
*** 128,134 ****
      }
  
!     function kill()
      {
!         if (!Current_User::authorized('ads', 'delete_advertisers', $this->id))
          {
              Current_User::disallow();
--- 124,135 ----
      }
  
!     /**
!      * Removes advertiser and associated campaigns from the database.
!      *
!      * @param  override  Should ONLY be used when user being deleted (see remove_user.php).
!      */
!     function kill($override=false)
      {
!         if (!Current_User::authorized('ads', 'delete_advertisers', $this->id) && !$override)
          {
              Current_User::disallow();
***************
*** 140,150 ****
          $db->addWhere('id', $this->id);
  
!         $result = $db->delete();
!         if (PEAR::isError($result))
!         {
!             PHPWS_Error::log($result);
!             return FALSE;
!         }
!         return TRUE;
      }
  
--- 141,145 ----
          $db->addWhere('id', $this->id);
  
!         return !PHPWS_Error::logIfError($db->delete());
      }
  

[phpws-comm-commits] modules/ads/boost dependency.xml,1.3,1.4

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

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

Modified Files:
	dependency.xml 
Log Message:
Advertisers deleted when associated site user is deleted.

Index: dependency.xml
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/boost/dependency.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dependency.xml	28 May 2007 21:21:47 -0000	1.3
--- dependency.xml	22 Jun 2008 14:27:43 -0000	1.4
***************
*** 7,9 ****
--- 7,15 ----
      <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url>
    </module>
+   <module>
+     <title>users</title>
+     <properName>Users</properName>
+     <version>2.5.0</version>
+     <url>http://phpwebsite.appstate.edu/downloads/modules/users/</url>
+   </module>
  </dependency>

[phpws-comm-commits] modules/ads/inc remove_user.php,NONE,1.1

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

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

Added Files:
	remove_user.php 
Log Message:
Advertisers deleted when associated site user is deleted.

--- NEW FILE: remove_user.php ---
<?php
/**
 * Ads for phpWebSite
 *
 * See docs/CREDITS for copyright information
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @author  Greg Meiste <blindman1344 [at] users dot sourceforge dot net>
 * @version $Id: remove_user.php,v 1.1 2008/06/22 14:27:50 blindman1344 Exp $
 */

function ads_remove_user($user_id)
{
    PHPWS_Core::initModClass('ads', 'advertiser.php');

    $db = new PHPWS_DB('ads_advertisers');
    $db->addWhere('user_id', $user_id);
    $advertisers = $db->getObjects('Ads_Advertiser');

    if (!PHPWS_Error::logIfError($advertisers) && !empty($advertisers))
    {
        /* Should only be one match, but just in case... */
        foreach ($advertisers as $advertiser)
        {
            $advertiser->kill(true);
        }
    }
}

?>

[phpws-comm-commits] modules/mailinglists/docs changelog.txt, 1.46, 1.47

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

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

Modified Files:
	changelog.txt 
Log Message:
Releasing 1.1.0

Index: changelog.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/mailinglists/docs/changelog.txt,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** changelog.txt	11 Jun 2008 02:53:32 -0000	1.46
--- changelog.txt	21 Jun 2008 15:25:36 -0000	1.47
***************
*** 7,11 ****
  
  
! *cvs
  
      - RFE #1274782: Purge deleted site users (Now requiring phpWebSite 1.5.2 or later)
--- 7,11 ----
  
  
! *mailinglists-1.1.0 (21 Jun 2008)
  
      - RFE #1274782: Purge deleted site users (Now requiring phpWebSite 1.5.2 or later)

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

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

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

Modified Files:
	uninstall.php 
Log Message:
final tidy up for 0.7 release

Index: uninstall.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/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	4 Feb 2008 03:09:15 -0000	1.1.1.1
--- uninstall.php	17 Jun 2008 13:47:00 -0000	1.2
***************
*** 32,35 ****
--- 32,39 ----
      }
      PHPWS_DB::dropTable('rolodex_member');
+     PHPWS_DB::dropTable('rolodex_location');
+     PHPWS_DB::dropTable('rolodex_feature');
+     PHPWS_DB::dropTable('rolodex_location_items');
+     PHPWS_DB::dropTable('rolodex_feature_items');
      $content[] = dgettext('rolodex', 'Rolodex tables dropped.');
  

[phpws-comm-commits] modules/rolodex/boost demographics.php, 1.2, 1.3 update.php, 1.4, 1.5

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

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

Modified Files:
	demographics.php update.php 
Log Message:
final tidy up for 0.7 release

Index: demographics.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/demographics.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** demographics.php	8 Feb 2008 19:38:45 -0000	1.2
--- demographics.php	17 Jun 2008 13:27:27 -0000	1.3
***************
*** 25,29 ****
  
    // New fields for rolodex
- $fields['avatar']['limit'] = 255; 
  $fields['tollfree_phone']['limit'] = 20; 
  $fields['business_name']['limit'] = 255; 
--- 25,28 ----

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** update.php	16 Jun 2008 15:59:15 -0000	1.4
--- update.php	17 Jun 2008 13:27:27 -0000	1.5
***************
*** 50,53 ****
--- 50,54 ----
                             'templates/view_category.tpl',
                             'templates/adv_search_form.tpl',
+                            'templates/alpha_click.tpl',
                             'templates/edit_settings.tpl'
              );
***************
*** 63,76 ****
  
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
      } // end switch
      return true;
--- 64,67 ----