[Phpslash-commit] CVS: phpslash-ft/class functions.inc,1.123,1.124 lib.resources.php,1.3,1.4 slashDB.class,1.6,1.7 tz.class,1.3,1.4

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv3066/phpslash-ft/class

Modified Files:
	functions.inc lib.resources.php slashDB.class tz.class 
Log Message:
error function is now pslError

Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** functions.inc	14 Jan 2003 18:20:56 -0000	1.123
--- functions.inc	22 Jan 2003 19:12:31 -0000	1.124
***************
*** 49,53 ****
  Parameters : $msg  -> The message you want to return to someone
  ****************************************************************************/
! function error ($msg) {
     
     echo getMessage( $msg, "error");
--- 49,53 ----
  Parameters : $msg  -> The message you want to return to someone
  ****************************************************************************/
! function pslError($msg) {
     
     echo getMessage( $msg, "error");
***************
*** 1018,1022 ****
  		$filename = sprintf('%s/%s.%s.php3',$_PSL['localedir'],$locale,$category);
  		if (!is_readable($filename)) {
! 			error("psl_getLocalinfo: file either nonexistent or not readable: $filename");
  		}
  		else {
--- 1018,1022 ----
  		$filename = sprintf('%s/%s.%s.php3',$_PSL['localedir'],$locale,$category);
  		if (!is_readable($filename)) {
! 			pslError("psl_getLocalinfo: file either nonexistent or not readable: $filename");
  		}
  		else {

Index: lib.resources.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/lib.resources.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lib.resources.php	19 Dec 2002 12:27:56 -0000	1.3
--- lib.resources.php	22 Jan 2003 19:12:32 -0000	1.4
***************
*** 91,95 ****
     } /* end if class_exists($class) */
     else {
!       error("No such class: $class");
        return false;
     }
--- 91,95 ----
     } /* end if class_exists($class) */
     else {
!       pslError("No such class: $class");
        return false;
     }
***************
*** 319,323 ****
     $success = true;
     if (!is_valid_urn($urn)) {
!       error("Resource $urn is not known.");
        $success = false;
     }
--- 319,323 ----
     $success = true;
     if (!is_valid_urn($urn)) {
!       pslError("Resource $urn is not known.");
        $success = false;
     }
***************
*** 333,337 ****
  	    if (!in_array($req,$includedFiles)) {
  	       if (!include_once($req)) {
! 		  error("Include failed: $req.");
  		  $success = false;
  	       }
--- 333,337 ----
  	    if (!in_array($req,$includedFiles)) {
  	       if (!include_once($req)) {
! 		  pslError("Include failed: $req.");
  		  $success = false;
  	       }
***************
*** 463,465 ****
  }
  
! ?>
\ No newline at end of file
--- 463,465 ----
  }
  
! ?>

Index: slashDB.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashDB.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** slashDB.class	21 Nov 2002 18:59:06 -0000	1.6
--- slashDB.class	22 Jan 2003 19:12:32 -0000	1.7
***************
*** 53,58 ****
           die("Session halted.");
        } else {
!          error(sprintf("Database error:  MySQL Error (%s). Please contact the webmaster and report the exact error message.", $this->Errno));
! 	 die("Session halted.");
        }
     }
--- 53,58 ----
           die("Session halted.");
        } else {
!          pslError(sprintf("Database error:  MySQL Error (%s). Please contact the webmaster and report the exact error message.", $this->Errno));
! 	      die("Session halted.");
        }
     }

Index: tz.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/tz.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tz.class	20 Dec 2002 22:17:30 -0000	1.3
--- tz.class	22 Jan 2003 19:12:33 -0000	1.4
***************
*** 346,350 ****
  		$old_name = $this->name;
  		if (!$this->select($ary['region'])) {
! 			error($this->error);
  			return false;
  		}
--- 346,350 ----
  		$old_name = $this->name;
  		if (!$this->select($ary['region'])) {
! 			pslError($this->error);
  			return false;
  		}
***************
*** 369,371 ****
  }
  
! ?>
\ No newline at end of file
--- 369,371 ----
  }
  
! ?>