[popfile-commit] windows CBP.nsh,1.1,1.2

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv12241

Modified Files:
	CBP.nsh 
Log Message:
Bucket names may now contain the digits 0 to 9.

Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CBP.nsh	15 Apr 2003 21:31:16 -0000	1.1
--- CBP.nsh	2 May 2003 19:25:11 -0000	1.2
***************
*** 636,640 ****
        "After installation, POPFile makes it easy to change the number of buckets \
        (and their names) to suit your needs.\r\n\r\nBucket names must be single words, \
!       containing lowercase letters, hyphens and underscores." \
        "${INFO_LEFT_MARGIN}" "${INFO_RIGHT_MARGIN}" "0" "60"
  
--- 636,640 ----
        "After installation, POPFile makes it easy to change the number of buckets \
        (and their names) to suit your needs.\r\n\r\nBucket names must be single words, \
!       using lowercase letters, digits 0 to 9, hyphens and underscores." \
        "${INFO_LEFT_MARGIN}" "${INFO_RIGHT_MARGIN}" "0" "60"
  
***************
*** 981,986 ****
  bad_name:
    MessageBox MB_OK "The name $\"${CBP_L_CREATE_NAME}$\" is not a valid name for a bucket.\
!       $\n$\nBucket names can only contain lowercase letters, hyphens and \
!       underscores.$\n$\nPlease choose a different name for the new bucket."
    goto get_next_bucket_cmd
  
--- 981,986 ----
  bad_name:
    MessageBox MB_OK "The name $\"${CBP_L_CREATE_NAME}$\" is not a valid name for a bucket.\
!       $\n$\nBucket names can only contain lowercase letters, the digits 0 to 9, \
!       hyphens and underscores.$\n$\nPlease choose a different name for the new bucket."
    goto get_next_bucket_cmd
  
***************
*** 1211,1217 ****
  # Function CBP_StrCheckName
  #==============================================================================================
! # Converts a string containing a bucket name to lowercase and ensures it only contains the
! # characters 'a' to 'z' plus '-' and '_' characters. If any invalid characters are found,
! # this function returns "" instead of the converted name.
  #----------------------------------------------------------------------------------------------
  # Inputs:
--- 1211,1217 ----
  # Function CBP_StrCheckName
  #==============================================================================================
! # Converts a string containing a bucket name to lowercase and ensures it only contains
! # characters in the ranges 'a' to 'z' and '0' to '9', plus the '-' and '_' characters.
! # If any invalid characters are found, this function returns "" instead of the converted name.
  #----------------------------------------------------------------------------------------------
  # Inputs:
***************
*** 1251,1257 ****
  Function CBP_StrCheckName
  
!   ; Bucket names can contain only lowercase letters, underscores (_) and hyphens (-)
  
!   !define CBP_VALIDCHARS    "abcdefghijklmnopqrstuvwxyz_-"
    
    Exch $0   ; The input string
--- 1251,1257 ----
  Function CBP_StrCheckName
  
!   ; Bucket names can contain only lowercase letters, digits (0-9), underscores (_) & hyphens (-)
  
!   !define CBP_VALIDCHARS    "abcdefghijklmnopqrstuvwxyz_-0123456789"
    
    Exch $0   ; The input string
***************
*** 1269,1273 ****
    StrCpy $3 $0 1              ; Get next character from the input string
    StrCmp $3 "" done
!   StrCpy $6 ${CBP_VALIDCHARS}$3   ; Add character to end of "validity check" to guarantee a match
    StrCpy $0 $0 "" 1
    StrCpy $4 -1
--- 1269,1273 ----
    StrCpy $3 $0 1              ; Get next character from the input string
    StrCmp $3 "" done
!   StrCpy $6 ${CBP_VALIDCHARS}$3  ; Add character to end of "validity check" to guarantee a match
    StrCpy $0 $0 "" 1
    StrCpy $4 -1