stud-cvs Mailing List for Stuff Database

Brought to you by: gustra, mr_morden

stud-cvs — For automatic cvs notifications only

You can subscribe to this list here.

2004	_Jan (11)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (1)
2005	_Jan (2)	_Feb	_Mar	_Apr (1)	_May	_Jun	_Jul	_Aug	_Sep	_Oct (7)	_Nov	_Dec (1)
2006	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov (2)	_Dec

Flat | Threaded

[Stud-cvs] stud/docs changelog.txt,1.9,1.10

From: Peter B. <mr_...@us...> - 2006-11-24 08:29:04

Update of /cvsroot/stud/stud/docs
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv503

Modified Files:
	changelog.txt 
Log Message:


Index: changelog.txt
===================================================================
RCS file: /cvsroot/stud/stud/docs/changelog.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** changelog.txt	31 Oct 2005 11:23:47 -0000	1.9
--- changelog.txt	24 Nov 2006 08:29:00 -0000	1.10
***************
*** 5,8 ****
--- 5,10 ----
  Next Release
  
+ RFE: [ 1602144 ] Implemented CGI::Carp qw(fatalsToBrowser); to give more info on SW errors.
+ 
  RFE: [ 1220361 ] Implemented LDAP support for validating users.

[Stud-cvs] stud ClubDb.pm,1.25,1.26

From: Peter B. <mr_...@us...> - 2006-11-24 08:25:54

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31244

Modified Files:
	ClubDb.pm 
Log Message:
RFE: 1602144 implemented. Added use of CGI::Carp qw(fatalsToBroser); to give more info about SW errors.

Index: ClubDb.pm
===================================================================
RCS file: /cvsroot/stud/stud/ClubDb.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ClubDb.pm	31 Oct 2005 11:17:57 -0000	1.25
--- ClubDb.pm	24 Nov 2006 08:24:47 -0000	1.26
***************
*** 50,53 ****
--- 50,55 ----
  use Net::LDAP;
  
+ use CGI::Carp qw(fatalsToBrowser);
+ 
  my $dbh;

[Stud-cvs] stud booking,1.33,1.34

From: Peter B. <mr_...@us...> - 2005-12-28 10:05:09

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2222

Modified Files:
	booking 
Log Message:
Minor fix to sort latest tags by name after date

Index: booking
===================================================================
RCS file: /cvsroot/stud/stud/booking,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** booking	31 Oct 2005 11:17:57 -0000	1.33
--- booking	28 Dec 2005 10:04:59 -0000	1.34
***************
*** 1461,1465 ****
  
    my $i = 0;
!   foreach(sort {$$items{$b}{added_date} cmp $$items{$a}{added_date}} keys %$items) {
      # Cue balls
      my $ball;
--- 1461,1465 ----
  
    my $i = 0;
!   foreach(sort {$$items{$b}{added_date} cmp $$items{$a}{added_date} || $$items{$a}{title} cmp $$items{$b}{title}} keys %$items) {
      # Cue balls
      my $ball;

[Stud-cvs] stud admin_booking,1.29,1.30

From: Peter B. <mr_...@us...> - 2005-10-31 13:59:44

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22802

Modified Files:
	admin_booking 
Log Message:
RFE:1220361. Minor fix so that removal of priviligies for a user does not need to be a valid user (any more).

Index: admin_booking
===================================================================
RCS file: /cvsroot/stud/stud/admin_booking,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** admin_booking	31 Oct 2005 11:17:57 -0000	1.29
--- admin_booking	31 Oct 2005 13:59:33 -0000	1.30
***************
*** 1768,1777 ****
    my ($info, $dummy);
  
!   unless (!$db->authenticate_user($user) && $password &&
! 	  !$db->authenticate_user($administrator)) {
      user_error("<b>You did not give at least these data</b>\n<ul>",
! 	       "- Valid user id<br>",
! 	       "- Valid password<br>",
! 	       "- Valid administrator id: '$administrator'</ul>");
      return;
    }
--- 1768,1782 ----
    my ($info, $dummy);
  
!   if ($is_granting) {
!     unless (!$db->authenticate_user($administrator)) {
!       user_error("<b>You did not give a valid administrator id: '$administrator'</b>\n<ul>");
!       return;
!     }
!   }
! 
!   unless ($password && !$db->authenticate_user($user)) {
      user_error("<b>You did not give at least these data</b>\n<ul>",
!                "- Valid user id<br>",
! 	       "- Valid password<br>");
      return;
    }

[Stud-cvs] stud/docs changelog.txt,1.8,1.9

From: Peter B. <mr_...@us...> - 2005-10-31 11:24:17

Update of /cvsroot/stud/stud/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19792

Modified Files:
	changelog.txt 
Log Message:


Index: changelog.txt
===================================================================
RCS file: /cvsroot/stud/stud/docs/changelog.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** changelog.txt	11 Oct 2005 10:17:39 -0000	1.8
--- changelog.txt	31 Oct 2005 11:23:47 -0000	1.9
***************
*** 1,3 ****
! bgChange log for Stud
  
  $Id$
--- 1,3 ----
! Change log for Stud
  
  $Id$
***************
*** 5,8 ****
--- 5,10 ----
  Next Release
  
+ RFE: [ 1220361 ] Implemented LDAP support for validating users.
+ 
  RFE: [ 528049  ] Partionally implemented. Supports tags STAT (statistics) and LATEST (Newest items).

[Stud-cvs] stud booking,1.32,1.33 admin_booking,1.28,1.29 StudIni.pm,1.9,1.10 ClubDb.pm,1.24,1.25

From: Peter B. <mr_...@us...> - 2005-10-31 11:18:07

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18393

Modified Files:
	booking admin_booking StudIni.pm ClubDb.pm 
Log Message:
RFE:1220361. Added LDAP support for validating users.

Index: StudIni.pm
===================================================================
RCS file: /cvsroot/stud/stud/StudIni.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** StudIni.pm	23 May 2003 22:11:47 -0000	1.9
--- StudIni.pm	31 Oct 2005 11:17:57 -0000	1.10
***************
*** 15,19 ****
  #
  #@author Peter Backman
! #@version 2.1.0
  package StudIni;
  
--- 15,19 ----
  #
  #@author Peter Backman
! #@version 2.4.0
  package StudIni;
  
***************
*** 62,65 ****
--- 62,77 ----
  my $DB_DSN = "DBI:mysql:database=";
  
+ # Method for Authentication
+ # Possible alternatives
+ # getpwnam, LDAP
+ my $AUTHENTICATION_METHOD = "getpwnam";
+ 
+ # LDAP settings
+ # See Net::LDAP for more information
+ # Used if $AUTHENTICATION_METHOD = "LDAP"
+ my $LDAP_SERVER = 'LDAP SERVER';
+ my $LDAP_BASE = "LDAP BASE";
+ my $LDAP_FILTER = "LDAP FILTER";
+ 
  #
  # Public part 
***************
*** 128,130 ****
--- 140,169 ----
  }
  
+ #*
+ # Gets authentication method.
+ #@return Authentication method
+ sub getAuthMethod () {
+   return $AUTHENTICATION_METHOD;
+ }
+ 
+ #*
+ # Gets LDAP server.
+ #@return LDAP server.
+ sub getLDAPServer () {
+   return $LDAP_SERVER;
+ }
+ 
+ #*
+ # Gets LDAP base.
+ #@return LDAP base.
+ sub getLDAPBase () {
+   return $LDAP_BASE;
+ }
+ 
+ #*
+ # Gets LDAP filter.
+ #@return LDAP filter.
+ sub getLDAPFilter () {
+   return $LDAP_FILTER;
+ }
  1;

Index: admin_booking
===================================================================
RCS file: /cvsroot/stud/stud/admin_booking,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** admin_booking	14 Jan 2004 18:46:35 -0000	1.28
--- admin_booking	31 Oct 2005 11:17:57 -0000	1.29
***************
*** 8,12 ****
  #
  #@author Gunnar Strand
! #@version 2.2.3
  
  use strict;
--- 8,12 ----
  #
  #@author Gunnar Strand
! #@version 2.4.0
  
  use strict;
***************
*** 28,32 ****
  my $default_background = StudIni::getImgPath()."back_admin.gif";
  
! my $version = "2.3.0";
  
  my $q = new CGI();
--- 28,32 ----
  my $default_background = StudIni::getImgPath()."back_admin.gif";
  
! my $version = "2.4.0";
  
  my $q = new CGI();
***************
*** 1431,1438 ****
    }
  
!   unless ($user && getpwnam($user) &&
! 	  (!$$global_settings{least_user_id} ||
! 	   ($$global_settings{least_user_id} <= getpwnam($user)))) {
!     user_error("No valid user id was given.");
      return;
    }
--- 1431,1436 ----
    }
  
!   if ($_ = $db->authenticate_user($user)) {
!     user_error($_);
      return;
    }
***************
*** 1486,1490 ****
      $q->textfield(-name => "full_name",
  		  -value => iff($$settings{full_name},
! 				(split(',', (getpwnam($user))[6]))[0]),
  		  -override => 1,
  		  -size => 50,
--- 1484,1488 ----
      $q->textfield(-name => "full_name",
  		  -value => iff($$settings{full_name},
! 				$db->getFullName($user)),
  		  -override => 1,
  		  -size => 50,
***************
*** 1615,1620 ****
    my ($settings, $salt, $password);
    
!   unless ($$data{user} && getpwnam($$data{user})) {
!     user_error("No or illegal user id was given.");
      return;
    }
--- 1613,1619 ----
    my ($settings, $salt, $password);
    
! 
!   if ($_ = $db->authenticate_user($$data{user})) {
!     user_error($_);
      return;
    }
***************
*** 1686,1691 ****
  
    # Id must exist on system
!   unless ($user && getpwnam($user)) {
!     logg("Authorization failed for user '$user'. Id does not exist on system!");
      return 0;
    }
--- 1685,1690 ----
  
    # Id must exist on system
!   if ($_ = $db->authenticate_user($user)) {
!     logg("Authorization failed for user '$user'. Error: $_");
      return 0;
    }
***************
*** 1769,1774 ****
    my ($info, $dummy);
  
!   unless ($user && getpwnam($user) && $password &&
! 	  $administrator && getpwnam($administrator)) {
      user_error("<b>You did not give at least these data</b>\n<ul>",
  	       "- Valid user id<br>",
--- 1768,1773 ----
    my ($info, $dummy);
  
!   unless (!$db->authenticate_user($user) && $password &&
! 	  !$db->authenticate_user($administrator)) {
      user_error("<b>You did not give at least these data</b>\n<ul>",
  	       "- Valid user id<br>",

Index: ClubDb.pm
===================================================================
RCS file: /cvsroot/stud/stud/ClubDb.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ClubDb.pm	11 Oct 2005 13:00:19 -0000	1.24
--- ClubDb.pm	31 Oct 2005 11:17:57 -0000	1.25
***************
*** 38,42 ****
  #
  #@author Gunnar Strand
! #@version 2.3.1
  package ClubDb;
  
--- 38,42 ----
  #
  #@author Gunnar Strand
! #@version 2.4.0
  package ClubDb;
  
***************
*** 48,51 ****
--- 48,53 ----
                    Add_Delta_Days
                    Today);
+ use Net::LDAP;
+ 
  my $dbh;
  
***************
*** 1721,1724 ****
--- 1723,1819 ----
  
  #*
+ # Checks whether the specified user exists.
+ #@param $user The user id
+ #@return undef if authentication suceeded otherwise an error string
+ sub authenticate_user ( $$ ) {
+   my ($self, $user) = @_;
+ 
+   if (StudIni::getAuthMethod() eq "getpwnam") {
+     my $global_settings;
+     unless ($global_settings = $self->get_global_settings) {
+       internal_error($self->{errstr});
+       return "User validation failed: $self->{errstr}";
+     }
+ 
+     unless ($user && getpwnam($user) && (!$$global_settings{least_user_id} || $$global_settings{least_user_id} <= getpwnam($user))) {
+       return "User $user is not a valid user id.\n";
+     }
+   }
+   elsif (StudIni::getAuthMethod() eq "LDAP") {
+     my $ldap = Net::LDAP->new(StudIni::getLDAPServer()) or die "$@";
+     my $mesg = $ldap->bind ;    # an anonymous bind
+     my $ldf = StudIni::getLDAPFilter();
+     $mesg = $ldap->search(      # perform a search
+                           base   => StudIni::getLDAPBase(),
+                           filter => "&(cn=$user) $ldf",
+                           attrs  => ['username', 'fullName', 'telephoneNumber', 'l']
+                      );
+     if ($mesg->code) {
+       $mesg = $ldap->unbind;   # take down session
+       return "User validation failed. Error fetching information from LDAP server: $mesg->code.\n";
+     }
+ 
+     unless ($mesg->entries) {
+       return "User $user not a valid user on LDAP server.\n";
+     }
+ 
+     $mesg = $ldap->unbind;   # take down session
+ 
+   }
+   else {
+     return "User validation faild. Unknown validation method: " . StudIni::getAuthMethod() .".\n";
+   }
+ 
+   return;
+ }
+ 
+ #*
+ # Get full user name
+ #@param $user User id
+ #@return User name if exists or "No Name"
+ sub getFullName ( $ ) {
+   my ($self, $user) = @_;
+   my $settings;
+ 
+   unless ($settings = $self->get_user_settings($user)) {
+     internal_error($self->{ERRSTR});
+     return "No Name";
+   }
+ 
+   if ($$settings{full_name}) {
+     return $$settings{full_name};
+   }
+   
+   if (StudIni::getAuthMethod() eq "getpwnam") {
+     return (iff((getpwnam($user))[6], "No Name"));
+   }
+ 
+   elsif (StudIni::getAuthMethod() eq "LDAP") {
+     my $ldap = Net::LDAP->new(StudIni::getLDAPServer()) or die "$@";
+     my $mesg = $ldap->bind ;    # an anonymous bind
+     my $ldf = StudIni::getLDAPFilter();
+ 
+     $mesg = $ldap->search(      # perform a search
+                           base   => StudIni::getLDAPBase(),
+                           filter => "&(cn=$user) $ldf",
+                           attrs  => ['fullName']
+                      );
+ 
+     if ($mesg->code) {
+       $mesg = $ldap->unbind;   # take down session
+       return "No Name";
+     }
+ 
+     foreach my $entry ($mesg->entries) { 
+       my $retStr = $entry->get_value("fullName");
+       $mesg = $ldap->unbind;   # take down session
+       return $retStr;
+     }
+     $mesg = $ldap->unbind;   # take down session
+     return "No Name";
+   }
+ }
+ 
+ #*
  # Tests if a user has super user privileges
  #@param $user User id
***************
*** 2038,2040 ****
--- 2133,2142 ----
  }
  
+ #*
+ # Returns first argument if it is true, else returns second
+ sub iff ($$) {
+   return ($#_ < 1 ? $_[0] :
+ 	  ($_[0] ? $_[0] : $_[1]));
+ }
+ 
  1;

Index: booking
===================================================================
RCS file: /cvsroot/stud/stud/booking,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** booking	11 Oct 2005 10:16:37 -0000	1.32
--- booking	31 Oct 2005 11:17:57 -0000	1.33
***************
*** 38,42 ****
  use ClubDb;
  
! my $version = "2.4.0b";
  
  my $q = new CGI();
--- 38,42 ----
  use ClubDb;
  
! my $version = "2.4.0";
  
  my $q = new CGI();
***************
*** 890,895 ****
    }
    
!   unless (getpwnam($user) && $$global_settings{least_user_id} <= getpwnam($user)) {
!     user_error("User $user is not a valid user id.\n");
      return;
    }
--- 890,895 ----
    }
    
!   if ($_ = $db->authenticate_user($user)) {
!     user_error($_);
      return;
    }
***************
*** 1073,1078 ****
      ($$globals{user_page_string} ?
       ("<a href=" . sprintf($$globals{user_page_string}, $user) . ">" .
!       iff($$settings{full_name}, iff((getpwnam($user))[6], "No Name")) . "</a>") : 
!      iff($$settings{full_name}, iff((getpwnam($user))[6], "No Name"))),
  	" ($user)</td>",
  	"<td>$start_date</td><td>$end_date</td></tr>\n</table><p>",
--- 1073,1077 ----
      ($$globals{user_page_string} ?
       ("<a href=" . sprintf($$globals{user_page_string}, $user) . ">" .
!       $db->getFullName($user) . "</a>") : $db->getFullName($user)),
  	" ($user)</td>",
  	"<td>$start_date</td><td>$end_date</td></tr>\n</table><p>",

[Stud-cvs] stud ClubDb.pm,1.23,1.24

From: Peter B. <mr_...@us...> - 2005-10-11 13:00:22

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13652

Modified Files:
	ClubDb.pm 
Log Message:
RFE:528049, updated statistics to support future dates

Index: ClubDb.pm
===================================================================
RCS file: /cvsroot/stud/stud/ClubDb.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ClubDb.pm	8 Dec 2004 15:37:02 -0000	1.23
--- ClubDb.pm	11 Oct 2005 13:00:19 -0000	1.24
***************
*** 1891,1894 ****
--- 1891,1895 ----
  #       $category Id of the category to get information about. 0 = ALL
  #       $period Number of days for the period which some statistics is gathered for
+ #               Negative value for the past, positive for the future.
  #@return Hash with "club-category-item" as key to an array with
  #        Name of item, number of bookings, number of booked days, number of booked days last $period days, number of bookings last period
***************
*** 1948,1953 ****
    }
  
!   my ($period_end_year, $period_end_month, $period_end_day) = Today();
!   my ($period_start_year, $period_start_month, $period_start_day) = Add_Delta_Days($period_end_year, $period_end_month, $period_end_day, -$period + 1);
  
    foreach(@$bookings) {
--- 1949,1965 ----
    }
  
!   my ($period_end_year, $period_end_month, $period_end_day);
!   my ($period_start_year, $period_start_month, $period_start_day);
!   
!   if ($period > 0)
!   {
!     ($period_end_year, $period_end_month, $period_end_day) = Today();
!     ($period_start_year, $period_start_month, $period_start_day) = Add_Delta_Days($period_end_year, $period_end_month, $period_end_day, -$period + 1);
!   }
!   else
!   {
!     ($period_start_year, $period_start_month, $period_start_day) = Today();
!     ($period_end_year, $period_end_month, $period_end_day) = Add_Delta_Days($period_start_year, $period_start_month, $period_start_day, -$period);
!   }
  
    foreach(@$bookings) {

[Stud-cvs] stud/docs changelog.txt,1.7,1.8

From: Peter B. <mr_...@us...> - 2005-10-11 10:17:40

Update of /cvsroot/stud/stud/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7604

Modified Files:
	changelog.txt 
Log Message:
changelog.txt

Index: changelog.txt
===================================================================
RCS file: /cvsroot/stud/stud/docs/changelog.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** changelog.txt	4 Jan 2005 14:16:02 -0000	1.7
--- changelog.txt	11 Oct 2005 10:17:39 -0000	1.8
***************
*** 1,3 ****
! Change log for Stud
  
  $Id$
--- 1,3 ----
! bgChange log for Stud
  
  $Id$
***************
*** 5,8 ****
--- 5,12 ----
  Next Release
  
+ RFE: [ 528049  ] Partionally implemented. Supports tags STAT (statistics) and LATEST (Newest items).
+ 
+ Bug: [ 1185012 ] Workaround implemented to get RFE 528049 working.
+ 
  Bug: [ 1095101 ] Wrong display of boking dates at week 53: Fixed display of
                   booking dates for an item.

[Stud-cvs] stud booking,1.31,1.32

From: Peter B. <mr_...@us...> - 2005-10-11 10:16:30

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7395

Modified Files:
	booking 
Log Message:
RFE:528049: Minor cosmetic HTML change.

Index: booking
===================================================================
RCS file: /cvsroot/stud/stud/booking,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** booking	11 Oct 2005 10:05:56 -0000	1.31
--- booking	11 Oct 2005 10:16:37 -0000	1.32
***************
*** 1377,1383 ****
    my $out = "";
  
- #$club =3;
- #$category = 5;
- 
    # Expected TAGS
    # <STUD TAG=STAT TYPE=BOOKINGS|BOOKERS|DAYSBOOKED [PERIOD=N] [LENGHT=N]>
--- 1377,1380 ----
***************
*** 1592,1606 ****
  
      if ($sortOrder==1) {
!     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[1]);  
      } elsif ($sortOrder==2) {
!     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[2]);  
      } elsif ($sortOrder==4) {
!     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[4]);  
      } elsif ($sortOrder==6) {
!     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[6]);  
      } elsif ($sortOrder==3) {
!     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d (%.1f%%)</td></tr>",$statistics{$key}->[0], $statistics{$key}->[3], $statistics{$key}->[3]/abs($period)*100);  
      } elsif ($sortOrder==5) {
!     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[5]);  
      }
  
--- 1589,1603 ----
  
      if ($sortOrder==1) {
!     $out .= sprintf ("<tr><td>$ball <a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[1]);  
      } elsif ($sortOrder==2) {
!     $out .= sprintf ("<tr><td>$ball <a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[2]);  
      } elsif ($sortOrder==4) {
!     $out .= sprintf ("<tr><td>$ball <a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[4]);  
      } elsif ($sortOrder==6) {
!     $out .= sprintf ("<tr><td>$ball <a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[6]);  
      } elsif ($sortOrder==3) {
!     $out .= sprintf ("<tr><td>$ball <a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d (%.1f%%)</td></tr>",$statistics{$key}->[0], $statistics{$key}->[3], $statistics{$key}->[3]/abs($period)*100);  
      } elsif ($sortOrder==5) {
!     $out .= sprintf ("<tr><td>$ball <a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[5]);  
      }

[Stud-cvs] stud booking,1.30,1.31

From: Peter B. <mr_...@us...> - 2005-10-11 10:05:49

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4915

Modified Files:
	booking 
Log Message:
B:1185012. Implemented workaround for RFE:528049

Index: booking
===================================================================
RCS file: /cvsroot/stud/stud/booking,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** booking	21 Apr 2005 13:00:59 -0000	1.30
--- booking	11 Oct 2005 10:05:56 -0000	1.31
***************
*** 1477,1481 ****
  
      $i++;
!     $out .= "<tr><td>$ball<a href=\"$url?club=$club&category=$category&item=$_\">$$items{$_}{title}</a></td><td>$$items{$_}{added_date}</td></tr>\n";
      if ($listLength == $i) {
        last;
--- 1477,1485 ----
  
      $i++;
! 
!     # Patch for BUG 1185012, fixes that month is stored zero-based 
!     $$items{$_}{added_date} =~ /(.*-)([0-9]+)(-.*)/;
!     my $corrDate = sprintf("%s%02d%s", $1, $2+1, $3);
!     $out .= "<tr><td>$ball <a href=\"$url?club=$club&category=$category&item=$_\">$$items{$_}{title}</a></td><td>$corrDate</td></tr>\n";
      if ($listLength == $i) {
        last;

[Stud-cvs] stud booking,1.29,1.30

From: Peter B. <mr_...@us...> - 2005-04-21 13:01:10

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26574

Modified Files:
	booking 
Log Message:
Partially solved RFE:528049. TAGS added to category description for statistics and newest items.

Index: booking
===================================================================
RCS file: /cvsroot/stud/stud/booking,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** booking	4 Jan 2005 14:13:36 -0000	1.29
--- booking	21 Apr 2005 13:00:59 -0000	1.30
***************
*** 38,42 ****
  use ClubDb;
  
! my $version = "2.3.0";
  
  my $q = new CGI();
--- 38,42 ----
  use ClubDb;
  
! my $version = "2.4.0b";
  
  my $q = new CGI();
***************
*** 396,400 ****
  				 -bgcolor => $default_bgcolor,
  				 -background => $default_background),
!     "<center><h1>$$data{'title'}</h1></center>\n", $$data{description},
      ($$data{locked} ? "\n<p>$$data{locked}" : ""),
      render_toolbox("", "", $club, $club_info, $category, $data, 0, 0),
--- 396,400 ----
  				 -bgcolor => $default_bgcolor,
  				 -background => $default_background),
!     "<center><h1>$$data{'title'}</h1></center>\n", expandTags($club, $category, $$data{description}),
      ($$data{locked} ? "\n<p>$$data{locked}" : ""),
      render_toolbox("", "", $club, $club_info, $category, $data, 0, 0),
***************
*** 1368,1371 ****
--- 1368,1616 ----
  
  #*
+ # Expand STUD TAGS in description
+ #@param $club
+ #@param $category
+ #@param $description
+ #@return Description with expanded tags
+ sub expandTags($$$) {
+   my ($club, $category, $description) = @_;
+   my $out = "";
+ 
+ #$club =3;
+ #$category = 5;
+ 
+   # Expected TAGS
+   # <STUD TAG=STAT TYPE=BOOKINGS|BOOKERS|DAYSBOOKED [PERIOD=N] [LENGHT=N]>
+   # <STUD TAG=LATEST [PERIOD=N] [LENGTH=N]>
+   # <STUD TAG=SQL SELECT="NNN">
+ 
+   # SELECT id FROM symbols where club=3 AND category=5 AND symbol="Description";
+   # SELECT id FROM symbols where club=3 AND category=5 AND symbol="Purchased date";
+   while ( $description =~ s/^(.*?)<STUD ([^>]*)>//s ) 
+   { 
+     $out .= $1;
+     my %h = map { split("=", $_)} split( " ", $2 );
+     if (defined $h{"TAG"})
+     {
+       if ($h{"TAG"} eq "STAT")
+       {
+         if ($h{"TYPE"} eq "BOOKINGS")
+         {
+           $out .= tag_stat($club, $category, 1, iff($h{"LENGTH"},10), iff($h{"PERIOD"},0));
+         }
+         elsif ($h{"TYPE"} eq "DAYSBOOKED")  
+         {
+           $out .= tag_stat($club, $category, 2, iff($h{"LENGTH"},10), iff($h{"PERIOD"},0));
+         }
+         elsif ($h{"TYPE"} eq "BOOKERS")  
+         {
+           $out .= tag_stat($club, $category, 3, iff($h{"LENGTH"},10), iff($h{"PERIOD"},0));
+         }
+         else
+         {
+           $out .= "STUD TAG: " . $h{"TAG"} . " Unrecognized TYPE: " . $h{"TYPE"};
+         }
+       }
+       elsif ($h{"TAG"} eq "LATEST")
+       {
+         $out .= tag_latest($club, $category, iff($h{"LENGTH"},10), iff($h{"PERIOD"}, 0));
+       }
+       elsif ($h{"TAG"} eq "SQL")
+       {
+         $out .= tag_sql($h{"SELECT"}, $h{"FROM"}, $h{"ORDERBY"});
+       }
+       else
+       {
+         $out .= "STUD Unrecognized TAG: " . $h{"TAG"};
+       }
+     }
+     else
+     {
+       $out .= "STUD TAG missing! ";
+     }
+   }
+   $out .= $description;
+ 
+   return $out;
+ }
+ 
+ #*
+ # Generates a HTML tag from a generic database query.
+ #@param $select SELECT sql statement
+ #@param $from FROM sql statement
+ #@param $orderby ORDER BY sql statement
+ #
+ sub tag_sql ( $$$ ) {
+   my ($select, $from, $orderby) = @_;
+   my $out = "";
+   #my %dbq = $db->generic_sql_query($select, $from, $orderby);
+   return $out;
+ }
+ #*
+ # Generates a HTML tag with newest items.
+ #@param $club Name of the club in the database.
+ #@param $category The id of the category.
+ #@param $listLength How many items that shall be shown, 0=ALL
+ #@param $period How many days the period is. 0 = all items, >0 number of days
+ #
+ sub tag_latest ( $$$$ ) {
+   my ($club, $category, $listLength, $period) = @_;
+   my $items = $db->get_items( $club, $category );
+   my ($year, $month, $day) = Today();
+   my $date = sprintf("%4d-%02d-%02d", $year, $month, $day);
+   my $state = $db->get_item_state($club, $category, 0, $date);
+   my $out = "";
+ 
+   $out .= sprintf("<table border=1>\n<tr><td>Item</td><td>Date added</td></tr>\n");
+ 
+   my $i = 0;
+   foreach(sort {$$items{$b}{added_date} cmp $$items{$a}{added_date}} keys %$items) {
+     # Cue balls
+     my $ball;
+     if ($$state{"$club-$category-$_"} == 3) {
+       $ball = "<img src=".StudIni::getImgPath()."padlock.gif width=12 height=15>";
+     } elsif ($$state{"$club-$category-$_"} == 2) {
+       $ball = "<img src=".StudIni::getImgPath()."ball_booked.gif width=12 height=12>";
+     } else {
+       $ball = "<img src=".StudIni::getImgPath()."ball_unbooked.gif width=12 height=12>";
+     }
+ 
+     $i++;
+     $out .= "<tr><td>$ball<a href=\"$url?club=$club&category=$category&item=$_\">$$items{$_}{title}</a></td><td>$$items{$_}{added_date}</td></tr>\n";
+     if ($listLength == $i) {
+       last;
+     }
+   }
+   $out .= sprintf("</table>\n");
+ 
+   return $out;
+ }
+ 
+ #*
+ # Generates a HTML tag with statistics about a category.
+ # Both a complete set and a set for $period days.
+ #@param $club Name of the club in the database.
+ #@param $category The id of the category.
+ #@param $statType Statistict type (1=Bookings, 2=Days Booked, 3=Bookers
+ #@param $listLength How many items that shall be shown, 0=ALL
+ #@param $period How many days the period is. 0 = all past bookings, >0 past bookings, <0 future bookings
+ #
+ sub tag_stat ( $$$$$ ) {
+   my ($club, $category, $statType, $listLength, $period) = @_;
+   my $out = "";
+ 
+   # Fetch state for all items
+   my ($year, $month, $day) = Today();
+   my $date = sprintf("%4d-%02d-%02d", $year, $month, $day);
+ 
+   my $state = $db->get_item_state($club, $category, 0, $date);
+   my $sortOrder = 0;
+ 
+   my %statistics = $db->get_category_booking_statistics($club, $category, $period);
+ 
+   $out = sprintf("<table border=1>\n<tr><td>Item</td>\n");
+   if ($statType==1) 
+   {
+     if ($period > 0) 
+     {
+       $sortOrder = 6;
+       $out .= sprintf ("<td>Bookings Last %d Days</td>\n", $period);
+     }
+     elsif ($period < 0)
+     {
+       $sortOrder = 6;
+       $out .= sprintf ("<td>Bookings Next %d Days</td>\n", -$period);
+     }
+     else
+     {
+       $sortOrder = 1;
+       $out .= sprintf ("<td>Bookings (Total)</td>\n");
+     }
+   }
+   elsif ($statType==2) 
+   {
+     if ($period > 0) 
+     {
+       $sortOrder = 3;
+       $out .= sprintf ("<td>Days Booked Last %d Days</td>\n", $period);
+     }
+     elsif ($period < 0)
+     {
+       $sortOrder = 3;
+       $out .= sprintf ("<td>Days Booked Next %d Days</td>\n", -$period);
+     }
+     else
+     {
+       $sortOrder = 2;
+       $out .= sprintf ("<td>Days Booked (Total)</td>\n");
+     }
+   }
+   elsif ($statType==3) 
+   {
+     if ($period > 0) 
+     {
+       $sortOrder = 5;
+       $out .= sprintf ("<td>Bookers Last %d Days</td>\n", $period);
+     }
+     elsif ($period < 0)
+     {
+       $sortOrder = 5;
+       $out .= sprintf ("<td>Bookers Next %d Days</td>\n", -$period);
+     } 
+     else
+     {
+       $sortOrder = 4;
+       $out .= sprintf ("<td>Bookers (Total)</td>\n");
+     }
+   }
+   $out .= sprintf ("</tr>\n");
+ 
+   my $i = 0;
+   my $key;
+   my @keys;
+   @keys = sort {-(iff($statistics{$a}->[$sortOrder], 0) <=> iff($statistics{$b}->[$sortOrder], 0))} keys %statistics;
+ 
+   foreach $key (@keys){
+     $key =~ /(.*)-(.*)-(.*)/;
+     my $clb = $1;
+     my $cat = $2;
+     my $item = $3;
+ 
+     # Cue balls
+     my $ball;
+     if ($$state{"$clb-$cat-$item"} == 3) {
+       $ball = "<img src=".StudIni::getImgPath()."padlock.gif width=12 height=15>";
+     } elsif ($$state{"$clb-$cat-$item"} == 2) {
+       $ball = "<img src=".StudIni::getImgPath()."ball_booked.gif width=12 height=12>";
+     } else {
+       $ball = "<img src=".StudIni::getImgPath()."ball_unbooked.gif width=12 height=12>";
+     }
+ 
+     if ($sortOrder==1) {
+     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[1]);  
+     } elsif ($sortOrder==2) {
+     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[2]);  
+     } elsif ($sortOrder==4) {
+     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[4]);  
+     } elsif ($sortOrder==6) {
+     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[6]);  
+     } elsif ($sortOrder==3) {
+     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d (%.1f%%)</td></tr>",$statistics{$key}->[0], $statistics{$key}->[3], $statistics{$key}->[3]/abs($period)*100);  
+     } elsif ($sortOrder==5) {
+     $out .= sprintf ("<tr><td>$ball<a href=\"$url?club=$clb&category=$cat&item=$item\">%s</a></td><td align=center>%d</td></tr>",$statistics{$key}->[0], $statistics{$key}->[5]);  
+     }
+ 
+     ++$i;
+     if ($i == $listLength) {
+       last; # Break loop
+     }
+   }
+ 
+   $out .= sprintf ("</table>\n");
+ 
+   return $out;
+ }
+ 
+ #*
  # Renders HTML for accessing the corresponding page in the bookings interface
  #@param $user

[Stud-cvs] stud/docs changelog.txt,1.6,1.7

From: Peter B. <mr_...@us...> - 2005-01-04 14:16:19

Update of /cvsroot/stud/stud/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20580

Modified Files:
	changelog.txt 
Log Message:



Index: changelog.txt
===================================================================
RCS file: /cvsroot/stud/stud/docs/changelog.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** changelog.txt	14 Jan 2004 18:46:25 -0000	1.6
--- changelog.txt	4 Jan 2005 14:16:02 -0000	1.7
***************
*** 3,6 ****
--- 3,15 ----
  $Id$
  
+ Next Release
+ 
+ Bug: [ 1095101 ] Wrong display of boking dates at week 53: Fixed display of
+                  booking dates for an item.
+ 
+ Bug: [ 1081267 ] Cache func in get_club_categories wrong: Removed cache
+                  functionality in this function.
+ 
+ 
  Release 2.3.0 version

[Stud-cvs] stud booking,1.28,1.29

From: Peter B. <mr_...@us...> - 2005-01-04 14:13:48

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20227

Modified Files:
	booking 
Log Message:
Bug:1095101. Fixed display of booking dates for an item.

Index: booking
===================================================================
RCS file: /cvsroot/stud/stud/booking,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** booking	14 Jan 2004 18:46:35 -0000	1.28
--- booking	4 Jan 2005 14:13:36 -0000	1.29
***************
*** 620,623 ****
--- 620,626 ----
    my $today_weekday = Day_of_Week(Today());
    my ($today_week, $today_year) = Week_of_Year(Today());
+   my $today_month;
+   my $today_day;
+   ($today_year, $today_month, $today_day) = Today();
  
    print
***************
*** 753,759 ****
  	    ($yy > $today_year || 
  	     ($yy == $today_year &&
! 	      ($ww > $today_week ||
! 	       ($ww == $today_week &&
! 		($d+1) >= $today_weekday))))) {
  	  $color = " bgcolor=lightblue";
  	  $remove_is_ok = 1;
--- 756,762 ----
  	    ($yy > $today_year || 
  	     ($yy == $today_year &&
! 	      ($mm > $today_month ||
! 	       ($mm == $today_month &&
! 		($dd) >= $today_day))))) {
  	  $color = " bgcolor=lightblue";
  	  $remove_is_ok = 1;

[Stud-cvs] stud ClubDb.pm,1.22,1.23

From: Peter B. <mr_...@us...> - 2004-12-08 15:37:12

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10510

Modified Files:
	ClubDb.pm 
Log Message:
B:1081267. Removed cache func for get_club_categories. Also minor fix in add_category related to caching.

Index: ClubDb.pm
===================================================================
RCS file: /cvsroot/stud/stud/ClubDb.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ClubDb.pm	11 Jan 2004 11:59:53 -0000	1.22
--- ClubDb.pm	8 Dec 2004 15:37:02 -0000	1.23
***************
*** 38,42 ****
  #
  #@author Gunnar Strand
! #@version 2.2.3
  package ClubDb;
  
--- 38,42 ----
  #
  #@author Gunnar Strand
! #@version 2.3.1
  package ClubDb;
  
***************
*** 554,565 ****
    my ($str);
    
!   if ( $self->{CACHE_ON} &&
!        $self->{CACHE_CATEGORY}{$club} ) {
!     $gDebugCache && $self->log( "Cache: hit for club $club" );
!     return {
!             map {( $_, $self->{CACHE_CATEGORY}{$_}{title} )
!                } keys %{ $self->{CACHE_CATEGORY} }
!            };
!   }
  
    $str = "SELECT category,title FROM $self->{CATEGORIES_TABLE} WHERE club=$club;";
--- 554,566 ----
    my ($str);
    
! # Removed to solve B:1081267 
! #  if ( $self->{CACHE_ON} &&
! #       $self->{CACHE_CATEGORY}{$club} ) {
! #    $gDebugCache && $self->log( "Cache: hit for club $club" );
! #    return {
! #            map {( $_, $self->{CACHE_CATEGORY}{$_}{title} )
! #               } keys %{ $self->{CACHE_CATEGORY} }
! #           };
! #  }
  
    $str = "SELECT category,title FROM $self->{CATEGORIES_TABLE} WHERE club=$club;";
***************
*** 591,597 ****
    my ($err, $id, $categories, $sth, $str, $i, $s);
  
!   if ( $$self->{CACHE_ON} ) {
      $gDebugCache && $self->log( "Cache: clearing club $club" );
!     delete $$self->{CACHE_CATEGORY}{$club};
    }
  
--- 592,598 ----
    my ($err, $id, $categories, $sth, $str, $i, $s);
  
!   if ( $self->{CACHE_ON} ) {
      $gDebugCache && $self->log( "Cache: clearing club $club" );
!     delete $self->{CACHE_CATEGORY}{$club};
    }

[Stud-cvs] stud check_bookings,1.10,1.11 admin_booking,1.27,1.28 booking,1.27,1.28

From: <mr_...@us...> - 2004-01-14 18:46:41

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1:/tmp/cvs-serv5753

Modified Files:
	check_bookings admin_booking booking 
Log Message:
Updated $version to version 2.3.0

Index: check_bookings
===================================================================
RCS file: /cvsroot/stud/stud/check_bookings,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** check_bookings	8 May 2003 09:32:54 -0000	1.10
--- check_bookings	14 Jan 2004 18:46:35 -0000	1.11
***************
*** 15,19 ****
  use Net::SMTP;
  
! my $version = "2.2.3";
  
  my $db;
--- 15,19 ----
  use Net::SMTP;
  
! my $version = "2.3.0";
  
  my $db;

Index: admin_booking
===================================================================
RCS file: /cvsroot/stud/stud/admin_booking,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** admin_booking	13 Jan 2004 19:13:03 -0000	1.27
--- admin_booking	14 Jan 2004 18:46:35 -0000	1.28
***************
*** 28,32 ****
  my $default_background = StudIni::getImgPath()."back_admin.gif";
  
! my $version = "2.2.3";
  
  my $q = new CGI();
--- 28,32 ----
  my $default_background = StudIni::getImgPath()."back_admin.gif";
  
! my $version = "2.3.0";
  
  my $q = new CGI();

Index: booking
===================================================================
RCS file: /cvsroot/stud/stud/booking,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** booking	23 May 2003 22:25:26 -0000	1.27
--- booking	14 Jan 2004 18:46:35 -0000	1.28
***************
*** 38,42 ****
  use ClubDb;
  
! my $version = "2.2.3";
  
  my $q = new CGI();
--- 38,42 ----
  use ClubDb;
  
! my $version = "2.3.0";
  
  my $q = new CGI();

[Stud-cvs] stud/docs changelog.txt,1.5,1.6

From: <mr_...@us...> - 2004-01-14 18:46:28

Update of /cvsroot/stud/stud/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv5717/docs

Modified Files:
	changelog.txt 
Log Message:
Release 2.3.0

Index: changelog.txt
===================================================================
RCS file: /cvsroot/stud/stud/docs/changelog.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** changelog.txt	13 Jan 2004 12:26:00 -0000	1.5
--- changelog.txt	14 Jan 2004 18:46:25 -0000	1.6
***************
*** 3,7 ****
  $Id$
  
! Pending release version
  
  Bug: [ 737168 ] Bad check in setup.pl for URL: Added intelligence
--- 3,7 ----
  $Id$
  
! Release 2.3.0 version
  
  Bug: [ 737168 ] Bad check in setup.pl for URL: Added intelligence

[Stud-cvs] stud setup.pl,1.15,1.16

From: <mr_...@us...> - 2004-01-14 18:45:40

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1:/tmp/cvs-serv5534

Modified Files:
	setup.pl 
Log Message:
Corrected cvs command from ci -c to ci -m

Index: setup.pl
===================================================================
RCS file: /cvsroot/stud/stud/setup.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** setup.pl	13 Jan 2004 20:51:57 -0000	1.15
--- setup.pl	14 Jan 2004 18:45:37 -0000	1.16
***************
*** 813,819 ****
      close FILE;
      if ( $test_only ) {
!       print "cvs ci -c 'Release $new_version' docs/changelog.txt", "\n";
      } else {
!       system("cvs ci -c 'Release $new_version' docs/changelog.txt");
      }
    }
--- 813,819 ----
      close FILE;
      if ( $test_only ) {
!       print "cvs ci -m 'Release $new_version' docs/changelog.txt", "\n";
      } else {
!       system("cvs ci -m 'Release $new_version' docs/changelog.txt");
      }
    }
***************
*** 861,867 ****
    chop $files if $files;
    if ( $test_only ) {
!     print "cvs ci -c 'Release $version' ".$files,"\n";
    } else {
!     system("cvs ci -c 'Updated \$version to version $version' ".$files);
    }
  }
--- 861,867 ----
    chop $files if $files;
    if ( $test_only ) {
!     print "cvs ci -m 'Release $version' ".$files,"\n";
    } else {
!     system("cvs ci -m 'Updated \$version to version $version' ".$files);
    }
  }

[Stud-cvs] stud setup.pl,1.14,1.15

From: <mr_...@us...> - 2004-01-13 20:52:00

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1:/tmp/cvs-serv20651

Modified Files:
	setup.pl 
Log Message:
Removed junk characters that accidently was added to the file.

Index: setup.pl
===================================================================
RCS file: /cvsroot/stud/stud/setup.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** setup.pl	13 Jan 2004 20:46:53 -0000	1.14
--- setup.pl	13 Jan 2004 20:51:57 -0000	1.15
***************
*** 1066,1070 ****
  my $log_file = "/tmp/bokning.log";
  if (@log && open(LOG, ">>$log_file")) {
! ./set  print LOG "--------------- ", scalar(localtime), " ---------------", "\n", join("\n", @log), "\n";
    close(LOG);
  }
--- 1066,1070 ----
  my $log_file = "/tmp/bokning.log";
  if (@log && open(LOG, ">>$log_file")) {
!   print LOG "--------------- ", scalar(localtime), " ---------------", "\n", join("\n", @log), "\n";
    close(LOG);
  }

[Stud-cvs] stud setup.pl,1.13,1.14

From: <mr_...@us...> - 2004-01-13 20:46:57

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1:/tmp/cvs-serv19375

Modified Files:
	setup.pl 
Log Message:
Added new inventory images

Index: setup.pl
===================================================================
RCS file: /cvsroot/stud/stud/setup.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** setup.pl	5 Jan 2004 15:07:02 -0000	1.13
--- setup.pl	13 Jan 2004 20:46:53 -0000	1.14
***************
*** 25,28 ****
--- 25,30 ----
                    "images/ball_booked.gif",
                    "images/ball_unbooked.gif",
+                   "images/inv_booked.gif",
+                   "images/inv_unbooked.gif",
                    "images/padlock.gif",
                   );
***************
*** 1064,1068 ****
  my $log_file = "/tmp/bokning.log";
  if (@log && open(LOG, ">>$log_file")) {
!   print LOG "--------------- ", scalar(localtime), " ---------------", "\n", join("\n", @log), "\n";
    close(LOG);
  }
--- 1066,1070 ----
  my $log_file = "/tmp/bokning.log";
  if (@log && open(LOG, ">>$log_file")) {
! ./set  print LOG "--------------- ", scalar(localtime), " ---------------", "\n", join("\n", @log), "\n";
    close(LOG);
  }

[Stud-cvs] stud/docs Makefile,1.3,1.4

From: <gu...@us...> - 2004-01-13 19:28:06

Update of /cvsroot/stud/stud/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv30821

Modified Files:
	Makefile 
Log Message:
Added some requirement text and made printouts more verbose


Index: Makefile
===================================================================
RCS file: /cvsroot/stud/stud/docs/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	1 Apr 2002 13:35:04 -0000	1.3
--- Makefile	13 Jan 2004 19:28:03 -0000	1.4
***************
*** 35,38 ****
--- 35,40 ----
  help:
  	@echo "The following formats are supported by this Makefile:"
+ 	@echo "All format reqire that texinfo is installed since that"
+ 	@echo "is what the documentation is written in:"
  	@echo 
  	@echo "  make dvi"
***************
*** 68,91 ****
  
  $(DVI): $(SRC)
  	@texi2dvi -c -b $< > /dev/null 2>&1
- 	@echo $@
  
  $(HTML): $(SRC)
  	@texi2html $< > /dev/null 2>&1
- 	@echo $@
  
  $(INFO): $(SRC)
  	@makeinfo $< 2>&1
- 	@echo $@
  
  $(PS): $(DVI)
  	@dvips $< -o > /dev/null 2>&1
- 	@echo $@
  
  $(PDF): $(PS)
  	@ps2pdf $< > /dev/null 2>&1
- 	@echo $@
  
  $(TEXT): $(SRC)
  	@makeinfo --no-headers $< -o $@ 2>&1
- 	@echo $@
--- 70,93 ----
  
  $(DVI): $(SRC)
+ 	@echo Making $@
  	@texi2dvi -c -b $< > /dev/null 2>&1
  
  $(HTML): $(SRC)
+ 	@echo Making $@
  	@texi2html $< > /dev/null 2>&1
  
  $(INFO): $(SRC)
+ 	@echo Making $@
  	@makeinfo $< 2>&1
  
  $(PS): $(DVI)
+ 	@echo Making $@
  	@dvips $< -o > /dev/null 2>&1
  
  $(PDF): $(PS)
+ 	@echo Making $@
  	@ps2pdf $< > /dev/null 2>&1
  
  $(TEXT): $(SRC)
+ 	@echo Making $@
  	@makeinfo --no-headers $< -o $@ 2>&1

[Stud-cvs] stud admin_booking,1.26,1.27

From: <mr_...@us...> - 2004-01-13 19:13:06

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1:/tmp/cvs-serv26517

Modified Files:
	admin_booking 
Log Message:
RFE:744485. Update to use new icons in inventory list.

Index: admin_booking
===================================================================
RCS file: /cvsroot/stud/stud/admin_booking,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** admin_booking	13 Jan 2004 12:26:00 -0000	1.26
--- admin_booking	13 Jan 2004 19:13:03 -0000	1.27
***************
*** 991,999 ****
        ++$noLocked;
      } elsif ($$state{"$club-$category-$$items[$i][0]"} == 2) {
!       $ball = "<img src=".StudIni::getImgPath()."ball_booked.gif width=12 height=12>";
  
        ++$noBooked;
      } else {
!       $ball = "<img src=".StudIni::getImgPath()."ball_unbooked.gif width=12 height=12>";
        ++$noUnbooked;
      }
--- 991,999 ----
        ++$noLocked;
      } elsif ($$state{"$club-$category-$$items[$i][0]"} == 2) {
!       $ball = "<img src=".StudIni::getImgPath()."inv_booked.gif width=12 height=12>";
  
        ++$noBooked;
      } else {
!       $ball = "<img src=".StudIni::getImgPath()."inv_unbooked.gif width=12 height=12>";
        ++$noUnbooked;
      }
***************
*** 1014,1019 ****
  
    print "<tr><td colspan=$no_cols><b>Number of locked items <img src=".StudIni::getImgPath()."padlock.gif width=12 height=15> :</b> $noLocked</td></tr>\n";
!   print "<tr><td colspan=$no_cols><b>Number of booked items <img src=".StudIni::getImgPath()."ball_booked.gif width=12 height=12> :</b> $noBooked</td></tr>\n";
!   print "<tr><td colspan=$no_cols><b>Number of unbooked items <img src=".StudIni::getImgPath()."ball_unbooked.gif width=12 height=12> :</b> $noUnbooked</td></tr>\n";
      print "</table>\n";
    }
--- 1014,1019 ----
  
    print "<tr><td colspan=$no_cols><b>Number of locked items <img src=".StudIni::getImgPath()."padlock.gif width=12 height=15> :</b> $noLocked</td></tr>\n";
!   print "<tr><td colspan=$no_cols><b>Number of booked items <img src=".StudIni::getImgPath()."inv_booked.gif width=12 height=12> :</b> $noBooked</td></tr>\n";
!   print "<tr><td colspan=$no_cols><b>Number of unbooked items <img src=".StudIni::getImgPath()."inv_unbooked.gif width=12 height=12> :</b> $noUnbooked</td></tr>\n";
      print "</table>\n";
    }

[Stud-cvs] stud/images inv_booked.gif,NONE,1.1 inv_unbooked.gif,NONE,1.1

From: <gu...@us...> - 2004-01-13 18:47:54

Update of /cvsroot/stud/stud/images
In directory sc8-pr-cvs1:/tmp/cvs-serv18226

Added Files:
	inv_booked.gif inv_unbooked.gif 
Log Message:
Icons for the inventory list

--- NEW FILE: inv_booked.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: inv_unbooked.gif ---
(This appears to be a binary file; contents omitted.)

[Stud-cvs] stud/docs changelog.txt,1.4,1.5

From: <mr_...@us...> - 2004-01-13 12:26:03

Update of /cvsroot/stud/stud/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv25089/docs

Modified Files:
	changelog.txt 
Log Message:
RFE:874373. Added mail-link to all club responsibles on top admin page

Index: changelog.txt
===================================================================
RCS file: /cvsroot/stud/stud/docs/changelog.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** changelog.txt	11 Jan 2004 20:59:38 -0000	1.4
--- changelog.txt	13 Jan 2004 12:26:00 -0000	1.5
***************
*** 27,30 ****
--- 27,32 ----
  RFE: [ 744485 ] Added inventory list functionality on category level.
  
+ RFE: [ 874373 ] Added mail-link to all club responsibles on top admin page. 
+ 
  Release 2.2.3

[Stud-cvs] stud admin_booking,1.25,1.26

From: <mr_...@us...> - 2004-01-13 12:26:03

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1:/tmp/cvs-serv25089

Modified Files:
	admin_booking 
Log Message:
RFE:874373. Added mail-link to all club responsibles on top admin page

Index: admin_booking
===================================================================
RCS file: /cvsroot/stud/stud/admin_booking,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** admin_booking	11 Jan 2004 12:04:07 -0000	1.25
--- admin_booking	13 Jan 2004 12:26:00 -0000	1.26
***************
*** 240,243 ****
--- 240,244 ----
  sub main_menu () {
    my ($clubs);
+   my $clubRespMail = "";
    
    $clubs = $db->get_clubs_hash();
***************
*** 264,267 ****
--- 265,272 ----
  				-labels => {$_ => ""} ),
        "</td></tr>\n";
+     my $val = $db->get_club_info($_);
+     if ($$val{'responsible_email'}) {
+       $clubRespMail .= ($clubRespMail ? "," : "").$$val{'responsible_email'};
+     }
    }
      print
***************
*** 276,279 ****
--- 281,285 ----
    
    print
+     "<a href=\"mailto:", $clubRespMail, "\">Send mail to all club responsibles</a>",
      &render_toolbox("", "", 0, 0, 0, 0, 0, 0),
      $page_footer,

[Stud-cvs] stud/docs manual.texinfo,1.11,1.12

From: <mr_...@us...> - 2004-01-11 21:07:43

Update of /cvsroot/stud/stud/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv5456

Modified Files:
	manual.texinfo 
Log Message:
Minor updae on docs/ directory

Index: manual.texinfo
===================================================================
RCS file: /cvsroot/stud/stud/docs/manual.texinfo,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** manual.texinfo	5 Jan 2004 13:58:49 -0000	1.11
--- manual.texinfo	11 Jan 2004 21:07:41 -0000	1.12
***************
*** 138,142 ****
  Contains the Stud documentation, which you are reading right now.
  The release should contain pre-generated documents in HTML,
! Text and PDF formats.
  @end table
  
--- 138,142 ----
  Contains the Stud documentation, which you are reading right now.
  The release should contain pre-generated documents in HTML,
! Text and PDF formats. Also contains a changelog.txt describing the changes for each version.
  @end table

Flat | Threaded

2004	Jan (11)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2005	Jan (2)	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct (7)	Nov	Dec (1)
2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec