pastebin

@@ -99,7 +99,7 @@ class pB

 		$this->loadGeshi();

 		// At this point we are ready to go.

-		if (pBS::get('use_smf_theme'))

+		if (pBS::get('smf_use_theme'))

 			echo '

 			<div id="paste_recent" class="alignright">', $this->showRecent(), '</div>';

 	}

@@ -152,6 +152,16 @@ class pB

 		$this->geshi_languages = $languages;

 	}

+	/*

+	* Handle a fatal Error

+	*/

+	public function error($msg)

+	{

+		// For now.

+		debug_print_backtrace();

+		exit($msg);

+	}

+

 	/*

 	* Format a URL

 	* @param $act string The action we want to use

@@ -222,11 +232,11 @@ class pB

 		// Trying to save this paste?

 		if (isset($_POST['save']))

-			$errors = $this->makePaste(0);

+			$warnings = $this->makePaste(0);

 		// Show any errors

-		if (!empty($errors))

-			echo '<div class="error_message">', implode('<br />', $errors), '</div>';

+		if (!empty($warnings))

+			echo '<div class="error_message">', implode('<br />', $warnings), '</div>';

 		$this->postForm((!empty($_POST['code']) ? $_POST['code'] : ''));

 	}

@@ -284,7 +294,7 @@ class pB

 		if (!$do_create)

 		{

-			$this->errors[] = 'Missing information (Username/email)';

+			$this->warningss[] = 'Missing information (Username/email)';

 			if (!empty($_POST['view']))

 				$this->action_view($_POST['view']);

@@ -446,9 +456,11 @@ class pB

 		// Get it from the database.

 		$paste = $this->db->fetchPaste($id);

-		if (!$this->usr->is_admin() && !empty($Paste['key']) && (empty($_REQUEST['key']) || $Paste['key'] != $_REQUEST['key']))

-			$this->error(pBL('error_no_access'), true);

-		elseif ($paste['board_id'] != pBS::get('paste_board'))

+		// The fetch threw an error.

+		if (isset($paste['error']))

+			$this->error($paste['error'], !empty($paste['fatal']) ? true : false);

+

+		if (!$this->usr->is_admin() && !empty($paste['key']) && (empty($_REQUEST['key']) || $paste['key'] != $_REQUEST['key']))

 			$this->error(pBL('error_no_access'), true);

 		elseif (empty($paste['approved']))

 			$this->error(pBL('error_approval'), true);

@@ -23,10 +23,10 @@ class pBS

 	// Where SMF is at.

 	private static $smf_dir = '../forum/';

-	private static $paste_board = 4;

-	private static $increase_postcout = true;

-	private static $enable_post_approval = false;

-	private static $use_smf_theme = false	;

+	private static $smf_paste_board = 4;

+	private static $smf_increase_postcout = true;

+	private static $smf_post_approval = false;

+	private static $smf_use_theme = false	;

 	private static $smf_theme_id = 1;

 	// The URLs

@@ -24,7 +24,7 @@ class pDB_smf extends pDB

 			$_COOKIE[$cookiename] = stripslashes($_COOKIE[$cookiename]);

 		// We need to setup this before we continue

-		if (pBS::get('use_smf_theme'))

+		if (pBS::get('smf_use_theme'))

 		{

 			$ssi_theme = pBS::get('smf_theme_id');

 			$ssi_layers = array('html', 'body');

@@ -47,7 +47,7 @@ class pDB_smf extends pDB

 			ORDER BY id_last_msg DESC

 			LIMIT {int:limit_recent}',

 			array(

-				'paste_board' => pBS::get('paste_board'),

+				'paste_board' => pBS::get('smf_paste_board'),

 				'limit_recent' => $limit,

 				));

@@ -73,12 +73,16 @@ class pDB_smf extends pDB

 			AND id_board = {int:paste_board}

 			ORDER BY poster_time DESC',

 			array(

-				'paste_board' => pBS::get('paste_board'),

+				'paste_board' => pBS::get('smf_paste_board'),

 				'id_topic' => $id,

 				));

 		$topic = smcFunc::db_fetch_assoc($request);

 		smcFunc::db_free_result($request);

+		// Need to check their access.

+		if ($topic['board_id'] != pBS::get('smf_paste_board'))

+			return array('error' => pBL('error_no_access'));

+

 		$ops = explode(':v:', $topic['subject']);

 		unset($ops[0]);

@@ -146,7 +150,7 @@ class pDB_smf extends pDB

 		// Options needed for our post.

 		$topicOptions = array(

 			'id'		=> (!empty($paste['id']) ? $topic['id'] : 0) ,

-			'board'		=> pBS::get('paste_board'),

+			'board'		=> pBS::get('smf_paste_board'),

 			'mark_as_read'	=> false,

 			);

 		$posterOptions = array(

@@ -154,13 +158,13 @@ class pDB_smf extends pDB

 			'name'		=> $data['name'],

 			'email'		=> $data['email'],

 			'ip'		=> userInfo::_()->ip,

-			'update_post_count'	=> (pBS::get('increase_postcout') && isset(userInfo::_()->id) ? 1 : 0),

+			'update_post_count'	=> (pBS::get('smf_increase_postcout') && isset(userInfo::_()->id) ? 1 : 0),

 			);

 		$msgOptions = array(

 			'id'		=> 0,

 			'subject'	=> 'Paste-' . time() . ':v:use_geshi-' . (!empty($data['use_geshi']) ? 1 : 0) . ':v:type-' . (!empty($data['language']) ? $data['language'] : 'php') . (!empty($data['key']) ? ':v:p-' . $data['key'] : ''),

 			'body'		=> htmlspecialchars($data['body']),

-			'approved'	=> pBS::get('enable_post_approval') ? 0 : 1,

+			'approved'	=> pBS::get('smf_post_approval') ? 0 : 1,

 			);

 		// Actually create the paste.