[Phpbb-checkins] CVS: phpBB2/admin index.php,1.25,1.26

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv1046/admin

Modified Files:
	index.php 
Log Message:
Moved avatar dir size lang generation into avatar dir size conditional

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** index.php	2001/11/21 03:10:10	1.25
--- index.php	2001/11/21 16:54:13	1.26
***************
*** 150,153 ****
--- 150,172 ----
  		}
  		@closedir($avatar_dir);
+ 
+ 		//
+ 		// This bit of code translates the avatar directory size into human readable format
+ 		// Borrowed the code from the PHP.net annoted manual, origanally written by:
+ 		// Jesse (je...@je...)
+ 		//
+ 		if($avatar_dir_size >= 1048576)
+ 		{
+ 			$avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB";
+ 		}
+ 		else if($avatar_dir_size >= 1024)
+ 		{
+ 			$avatar_dir_size = round($avatar_dir_size / 1024 * 100) / 100 . " KB";
+ 		}
+ 		else
+ 		{
+ 			$avatar_dir_size = $avatar_dir_size . " Bytes";
+ 		}
+ 
  	}
  	else
***************
*** 155,176 ****
  		// Couldn't open Avatar dir.
  		$avatar_dir_size = $lang['Not_available'];
- 	}
- 
- 	//
- 	// This bit of code translates the avatar directory size into human readable format
- 	// Borrowed the code from the PHP.net annoted manual, origanally written by:
- 	// Jesse (je...@je...)
- 	//
- 	if($avatar_dir_size >= 1048576)
- 	{
- 		$avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB";
- 	}
- 	else if($avatar_dir_size >= 1024)
- 	{
- 		$avatar_dir_size = round($avatar_dir_size / 1024 * 100) / 100 . " KB";
- 	}
- 	else
- 	{
- 		$avatar_dir_size = $avatar_dir_size . " Bytes";
  	}
  
--- 174,177 ----