pastebin

@@ -21,6 +21,10 @@ if (isset($_GET['view']))

 else

 	$pasteBin->action_index();

+// Shutdown.

+if (!defined('PB_CONTINUE'))

+	exit;

+

 /*

 * Main PasteBin class

 */

@@ -55,10 +59,10 @@ class pB

 			if (class_exists($class))

 				$this->db = new $class;

 			else

-				this->error('Database is defined but no such class exists.');

+				$this->error('Database is defined but no such class exists.');

 		}

 		else

-			this->error('No database handler is defined.');

+			$this->error('No database handler is defined.');

 		// Start up our User handler.

 		require_once(pBS::get('sources') . '/user.php');

@@ -70,10 +74,10 @@ class pB

 			if (class_exists($class))

 				$this->usr = new $class;

 			else

-				this->error('User is defined but no such class exists.');

+				$this->error('User is defined but no such class exists.');

 		}

 		else

-			this->error('No user handler is defined.');

+			$this->error('No user handler is defined.');

 		// Start up our Template handler.

 		require_once(pBS::get('sources') . '/tpl.php');

@@ -85,10 +89,10 @@ class pB

 			if (class_exists($class))

 				$this->tpl = new $class;

 			else

-				this->error('Template is defined but no such class exists.');

+				$this->error('Template is defined but no such class exists.');

 		}

 		else

-			this->error('No template handler is defined.');

+			$this->error('No template handler is defined.');

 		// Start getting things going.

 		$this->loadLanguage();

@@ -106,7 +110,7 @@ class pB

 		elseif (isset($_GET['lang']) && file_exists(pBS::get('languages') . '/' . strtolower(htmlspecialchars($_GET['lang'])) . '.php'))

 		{

 			if (strpos($_GET['lang'], 'http://') !== false || strpos($_GET['lang'], 'ftp://') !== false)

-				exit('Hacking attempt');

+				$this->error('Invalid string in url.');

 			$language = strtolower(htmlspecialchars($_GET['lang']));

 		}

@@ -302,7 +306,7 @@ class pB

 		);

 		// Do a test.

-		$this->db->addPasteTest(&$data);

+		$this->db->addPasteTest(&$data, &$do_create);

 		if (!$do_create)

 		{

@@ -321,8 +325,8 @@ class pB

 		// Send us there.

 		redirectexit($this->URL('view', $result['id'], array(

-			'update' => isset($data['updated']) ? 't' . time() : '',

-			'key' => !empty($data['key']) ? $data['key'] : '',

+			'update' => isset($result['updated']) ? 't' . time() : '',

+			'key' => !empty($result['key']) ? $result['key'] : '',

 		)));

 	}

@@ -5,28 +5,31 @@

 */

 class pBL

 {

+	/* Our language */

 	public static $language = 'english';

+	/* Create Paste Page */

 	public static $index_title = 'Create new';

 	public static $user_name = 'Name';

 	public static $email = 'Email';

 	public static $code = 'Code/text to paste';

+	/* Additional options */

 	public static $enable_geshi = 'Enable code highlighting';

-

 	public static $force_new_key = 'Force new key';

-

 	public static $submit = 'Submit';

+	/* Recent menu */

 	public static $recent = 'Recent';

 	public static $create_new = 'Create new';

+	/* Some language defined errors */

 	public static $error_no_access = 'Invlaid Key used';

 	public static $error_approval = 'This Paste requires approval';

+	/* Viewing a paste */

 	// %1$s = ID of the paste.

 	public static $view_title = 'Viewing Paste %1$s';

-

 	public static $formated_paste = 'Formated Paste';

 	public static $plain_paste = 'Plain Paste';

 }

@@ -119,8 +119,9 @@ class pDB_smf extends pDB

 		$data[use_geshi] Bool If we should use geshi highlighting or not.

 		$data[language] String The language of the code, default is php.

 		$data[body] String the actual contents of the paste.

+	* @param $do_create Should we create this or not?  Only set this to false when we shouldn't.

 	*/

-	public function addPasteTest($data)

+	public function addPasteTest($data, $do_create)

 	{

 	}

@@ -39,7 +39,7 @@ class pTPL_wp extends pTPL

 		global $specialPage;

 		// Lets not always show the source links.

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

+		if (defined('PB_SHOW_SOURCE'))

 			echo '

 			<br />

 			<ul>