[Spidertree-cvs] spidertree/classes SUserBase.php,1.5,1.6 SUserTikiwiki.php,1.1.1.1,1.2

[<sp...@us...>]

Update of /cvsroot/spidertree/spidertree/classes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14108/classes

Modified Files:
	SUserBase.php SUserTikiwiki.php 
Log Message:
bring up to speed for CLYDE

Index: SUserBase.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/classes/SUserBase.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SUserBase.php	21 Apr 2004 20:18:45 -0000	1.5
+++ SUserBase.php	20 Nov 2004 20:07:26 -0000	1.6
@@ -30,9 +30,8 @@
 * @access   public
 */
 
-require_once( STREE_BASE_CLASS );
 
-class SUser extends TikiUser {
+class SUserBase extends TikiUser {
 	// {{{ properties
 
 	// }}}
@@ -48,7 +47,7 @@
 	function SUserBase( $iUID=NULL )
     {
 		$this->mUID = $iUID;
-		TikiBase::TikiBase();
+		TikiUser::TikiUser();
     }
     // }}}
 
@@ -68,25 +67,27 @@
 
 }
 
-function mkdir_p($target){
-	if(file_exists($target) || is_dir($target))
-		return 0;
-	if(substr($target, 0, 1) != '/')
-		$target = "/$target";
-	if(eregi('\.\.', $target) || eregi("[^a-zA-Z0-9\._\-\/]", $target))
-		return 0;
-	if( mkdir( $target ) ){
-		return 1;
-	}
-	if( mkdir_p(substr($target, 0, (strrpos($target, '/')))) == 1) {
-		if( mkdir_p($target) == 1 )
+if( !function_exists( 'mkdir_p' ) ) {	
+	function mkdir_p($target){
+		if(file_exists($target) || is_dir($target))
+			return 0;
+		if(substr($target, 0, 1) != '/')
+			$target = "/$target";
+		if(eregi('\.\.', $target) || eregi("[^a-zA-Z0-9\._\-\/]", $target))
+			return 0;
+		if( mkdir( $target ) ){
 			return 1;
-		else
+		}
+		if( mkdir_p(substr($target, 0, (strrpos($target, '/')))) == 1) {
+			if( mkdir_p($target) == 1 )
+				return 1;
+			else
+				return 0;
+			}
+		else {
 			return 0;
 		}
-	else {
-		return 0;
-	}
+	} 
 }
 
 ?>

Index: SUserTikiwiki.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/classes/SUserTikiwiki.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- SUserTikiwiki.php	7 Feb 2004 16:21:28 -0000	1.1.1.1
+++ SUserTikiwiki.php	20 Nov 2004 20:07:26 -0000	1.2
@@ -30,7 +30,7 @@
 * @access   public
 */
 
-require_once( 'SUserBase.php' );
+require_once( SPIDERTREE_PKG_PATH.'classes/SUserBase.php' );
 
 class SUserTikiwiki extends SUserBase {
 	// {{{ properties