CVS: ispman/ispman-web/cgi-bin/tmpl/users search.tmpl,1.8,1.9 notificationReadyToSend.tmpl,1.1,NONE notify.tmpl,1.1,NONE

Update of /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/users
In directory sc8-pr-cvs1:/tmp/cvs-serv23200/ispman-web/cgi-bin/tmpl/users

Modified Files:
	search.tmpl 
Removed Files:
	notificationReadyToSend.tmpl notify.tmpl 
Log Message:
rollback of HEAD to REL_1_0 versions
former HEAD development will continue in "experimental-branch" and merged back here
(more info on ispman-developer maillist and upcoming README.cvs in HEAD)


Index: search.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/users/search.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** search.tmpl	31 Jul 2003 15:10:18 -0000	1.8
--- search.tmpl	4 Jan 2004 18:56:14 -0000	1.9
***************
*** 20,28 ****
  Search where 
  <select class=selectlist name=attr>
! <option value="givenname">First name contains</option>
! <option value="sn">Last name contains</option>
! <option value="uid">User Id contains</option>
! <option value="mailAlias">Mail Alias is</option>
! </select> <input class="inputfield" type=text name=usersearchfilter>
  <input type=image src=../../icon.png>
  </div>
--- 20,28 ----
  Search where 
  <select class=selectlist name=attr>
! <option value="givenname">First name</option>
! <option value="sn">Last name</option>
! <option value="uid">User Id</option>
! <option value="mailAlias">Mail Alias</option>
! </select> contains <input class="inputfield" type=text name=usersearchfilter>
  <input type=image src=../../icon.png>
  </div>
***************
*** 36,52 ****
  my $filter="";
  my $text="";
- my %exactMatch = ( 'mailAlias' => 1 );
  
  if ($r->param('usersearchfilter') && $r->param('attr')){
!         my $attr = $r->param('attr');
!         $filter = '(' . $attr . '=';
!         if( ! $exactMatch{$attr} ) {
!             $filter .= '*';
!         }
!         $filter .= $r->param('usersearchfilter');
!         if( ! $exactMatch{$attr} ) {
!             $filter .= '*';
!         }
!         $filter .= ')';
  
          $text=qq|
--- 36,42 ----
  my $filter="";
  my $text="";
  
  if ($r->param('usersearchfilter') && $r->param('attr')){
!         $filter="(@{[$r->param('attr')]}=*@{[$r->param('usersearchfilter')]}*)";
  
          $text=qq|
***************
*** 70,73 ****
--- 60,65 ----
  $filter="&(objectclass=ispmanDomainUser)$filter";
  $users=$ispman->getEntriesAsHashRef($r->param("dn"),  $filter);
+ 
+ 
  
  for $user(sort keys %$users){

--- notificationReadyToSend.tmpl DELETED ---

--- notify.tmpl DELETED ---



-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click