[UseBB-Checkins] UseBB/sources common.php,1.20,1.21 functions.php,1.42,1.43

[PC_Freak <pc_...@us...>]

Update of /cvsroot/usebb/UseBB/sources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15310/sources

Modified Files:
	common.php functions.php 
Log Message:
Some cleanup and unnecessary testing stuff removed.


Index: functions.php
===================================================================
RCS file: /cvsroot/usebb/UseBB/sources/functions.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** functions.php	23 Jun 2004 08:36:10 -0000	1.42
--- functions.php	13 Jul 2004 21:20:29 -0000	1.43
***************
*** 217,291 ****
  	
  	//
- 	// Resync statistics
- 	//
- 	function resync($what, $id=NULL) {
- 		
- 		global $db;
- 		
- 		if ( $what == 'global_forums' ) {
- 			
- 			//
- 			// Get forum count
- 			//
- 			if ( !($result = $db->query("SELECT id FROM ".TABLE_PREFIX."forums")) )
- 				$this->usebb_die('SQL', 'Unable to get forum count!', __FILE__, __LINE__);
- 			$forum_count = $db->num_rows($result);
- 			
- 			//
- 			// Set forum count
- 			//
- 			if ( !($result = $db->query("UPDATE ".TABLE_PREFIX."stats SET content = ".$forum_count." WHERE name = 'forums'")) )
- 				$this->usebb_die('SQL', 'Unable to set forum count!', __FILE__, __LINE__);
- 			
- 		} elseif ( $what == 'global_topics' ) {
- 			
- 			//
- 			// Get topic count
- 			//
- 			if ( !($result = $db->query("SELECT id FROM ".TABLE_PREFIX."topics")) )
- 				$this->usebb_die('SQL', 'Unable to get topic count!', __FILE__, __LINE__);
- 			$topic_count = $db->num_rows($result);
- 			
- 			//
- 			// Set topic count
- 			//
- 			if ( !($result = $db->query("UPDATE ".TABLE_PREFIX."stats SET content = ".$topic_count." WHERE name = 'topics'")) )
- 				$this->usebb_die('SQL', 'Unable to set topic count!', __FILE__, __LINE__);
- 			
- 		} elseif ( $what == 'global_posts' ) {
- 			
- 			//
- 			// Get post count
- 			//
- 			if ( !($result = $db->query("SELECT id FROM ".TABLE_PREFIX."posts")) )
- 				$this->usebb_die('SQL', 'Unable to get post count!', __FILE__, __LINE__);
- 			$post_count = $db->num_rows($result);
- 			
- 			//
- 			// Set post count
- 			//
- 			if ( !($result = $db->query("UPDATE ".TABLE_PREFIX."stats SET content = ".$post_count." WHERE name = 'posts'")) )
- 				$this->usebb_die('SQL', 'Unable to set post count!', __FILE__, __LINE__);
- 			
- 		} elseif ( $what == 'global_members' ) {
- 			
- 			//
- 			// Get member count
- 			//
- 			if ( !($result = $db->query("SELECT id FROM ".TABLE_PREFIX."users")) )
- 				$this->usebb_die('SQL', 'Unable to get member count!', __FILE__, __LINE__);
- 			$member_count = $db->num_rows($result);
- 			
- 			//
- 			// Set member count
- 			//
- 			if ( !($result = $db->query("UPDATE ".TABLE_PREFIX."stats SET content = ".$member_count." WHERE name = 'members'")) )
- 				$this->usebb_die('SQL', 'Unable to set member count!', __FILE__, __LINE__);
- 			
- 		}
- 		
- 	}
- 	
- 	//
  	// Interactive URL builder
  	//
--- 217,220 ----

Index: common.php
===================================================================
RCS file: /cvsroot/usebb/UseBB/sources/common.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** common.php	23 Jun 2004 09:01:21 -0000	1.20
--- common.php	13 Jul 2004 21:20:29 -0000	1.21
***************
*** 37,44 ****
  
  //
! // Disable notices of uninitialized
! // variables and the magic quotes runtime
  //
- #error_reporting(E_ALL & ~E_NOTICE);
  error_reporting(E_ALL);
  set_magic_quotes_runtime(0);
--- 37,44 ----
  
  //
! // Show all errors so that we avoid making stupid
! // but dangerous mistakes + disable that annoying
! // magic quotes runtime.
  //
  error_reporting(E_ALL);
  set_magic_quotes_runtime(0);
***************
*** 53,67 ****
  
  //
- // Define some constants
- //
- define('TABLE_PREFIX', $dbs['prefix']);
- define('USEBB_VERSION', '0.2.3');
- define('USER_PREG', '#^[a-z0-9\.\-\+\[\]_ ]+$#is');
- define('EMAIL_PREG', '#^[a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+$#is');
- define('PWD_PREG', '#^[^\'\"\s]+$#is');
- define('WEB_PREG', '#^[\w]+?://[^ \"\n\r\t<]*?$#is');
- define('IMG_PREG', '#^[\w]+?://[^ \"\n\r\t<]*?\.(gif|png|jpe?g)$#is');
- 
- //
  // Create objects
  //
--- 53,56 ----
***************
*** 118,121 ****
--- 107,121 ----
  
  //
+ // Define some constants
+ //
+ define('TABLE_PREFIX', $dbs['prefix']);
+ define('USEBB_VERSION', '0.2.3');
+ define('USER_PREG', '#^[a-z0-9\.\-\+\[\]_ ]+$#is');
+ define('EMAIL_PREG', '#^[a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+$#is');
+ define('PWD_PREG', '#^[^\'\"\s]+$#is');
+ define('WEB_PREG', '#^[\w]+?://[^ \"\n\r\t<]*?$#is');
+ define('IMG_PREG', '#^[\w]+?://[^ \"\n\r\t<]*?\.(gif|png|jpe?g)$#is');
+ 
+ //
  // Connect to DB
  //