Merge pull request #22 from WildcardSearch/maintenance

2.0.4 Release

Author: Mark Vincent

README.md

@@ -1,4 +1,4 @@
-## YourCode 2.0.3
+## YourCode 2.0.4
 for MyBB 1.8.x
 
 *Forget MyCode. Take control of YourCode-- a much better way of handling BB Code for MyBB forums*

Upload/inc/plugins/yourcode/forum.php

@@ -24,55 +24,61 @@ function yourcode_run($message)
 	global $parser;
 	static $yourcode;
 
-	// if the parser's MyCode cache is anything other than the default value then we have already been here
-	if($parser->mycode_cache == 0)
+	/*
+	 * if the parser isn't valid or its MyCode cache is
+	 * anything other than the default value then there is
+	 * nothing to do
+	 */
+	if ($parser instanceof postParser != true ||
+		$parser->mycode_cache !== 0) {
+		return $message;
+	}
+
+	// we have to consider several sequential iterations calling the method we have hooked into
+	if(!isset($yourcode) || !is_array($yourcode) || empty($yourcode))
 	{
-		// we have to consider several sequential iterations calling the method we have hooked into
-		if(!isset($yourcode) || !is_array($yourcode) || empty($yourcode))
-		{
-			// load the cache if this is the first run
-			global $cache;
-			$yourcode = $cache->read('yourcode');
-		}
+		// load the cache if this is the first run
+		global $cache;
+		$yourcode = $cache->read('yourcode');
+	}
 
-		if(is_array($yourcode['active']['restricted_view']['standard']) && !empty($yourcode['active']['restricted_view']['standard']))
+	if(is_array($yourcode['active']['restricted_view']['standard']) && !empty($yourcode['active']['restricted_view']['standard']))
+	{
+		foreach($yourcode['active']['restricted_view']['standard'] as $code)
 		{
-			foreach($yourcode['active']['restricted_view']['standard'] as $code)
+			if($code['can_view'])
 			{
-				if($code['can_view'])
+				if(!yourcode_check_user_permissions($code['can_view']))
 				{
-					if(!yourcode_check_user_permissions($code['can_view']))
-					{
-						$code['replacement'] = $code['alt_replacement'];
-					}
+					$code['replacement'] = $code['alt_replacement'];
 				}
-				$yourcode['active']['simple']['standard']['find'][] = $code['find'];
-				$yourcode['active']['simple']['standard']['replacement'][] = $code['replacement'];
 			}
+			$yourcode['active']['simple']['standard']['find'][] = $code['find'];
+			$yourcode['active']['simple']['standard']['replacement'][] = $code['replacement'];
 		}
+	}
 
-		$yourcode['active']['simple']['standard_count'] = count($yourcode['active']['simple']['standard']);
+	$yourcode['active']['simple']['standard_count'] = count($yourcode['active']['simple']['standard']);
 
-		if(is_array($yourcode['active']['restricted_view']['nestable']) && !empty($yourcode['active']['restricted_view']['nestable']))
+	if(is_array($yourcode['active']['restricted_view']['nestable']) && !empty($yourcode['active']['restricted_view']['nestable']))
+	{
+		foreach($yourcode['active']['restricted_view']['nestable'] as $code)
 		{
-			foreach($yourcode['active']['restricted_view']['nestable'] as $code)
+			if($code['can_view'])
 			{
-				if($code['can_view'])
+				if(!yourcode_check_user_permissions($code['can_view']))
 				{
-					if(!yourcode_check_user_permissions($code['can_view']))
-					{
-						$code['replacement'] = $code['alt_replacement'];
-					}
+					$code['replacement'] = $code['alt_replacement'];
 				}
-				$yourcode['active']['simple']['nestable'][] = array('find' => $code['find'], 'replacement' => $code['replacement']);
 			}
+			$yourcode['active']['simple']['nestable'][] = array('find' => $code['find'], 'replacement' => $code['replacement']);
 		}
+	}
 
-		$yourcode['active']['simple']['nestable_count'] = count($yourcode['active']['simple']['nestable']);
-		$yourcode['active']['simple']['callback_count'] = count($yourcode['active']['simple']['callback']);
+	$yourcode['active']['simple']['nestable_count'] = count($yourcode['active']['simple']['nestable']);
+	$yourcode['active']['simple']['callback_count'] = count($yourcode['active']['simple']['callback']);
 
-		$parser->mycode_cache = $yourcode['active']['simple'];
-	}
+	$parser->mycode_cache = $yourcode['active']['simple'];
 
 	// give back what was freely given to us
 	return $message;

Upload/inc/plugins/yourcode/install.php

@@ -28,15 +28,10 @@ function yourcode_info()
 	if(yourcode_is_installed())
 	{
 		$extra_links = "<ul><li style=\"list-style-image: url(styles/{$cp_style}/images/yourcode/manage.gif)\"><a href=\"" . YOURCODE_URL . "\" title=\"{$lang->yourcode_admin_view}\">{$lang->yourcode_admin_view}</a></li></ul>";
-	}
-	else
-	{
-		$extra_links = '<br />';
-	}
 
-	$button_pic = "styles/{$cp_style}/images/yourcode/donate.gif";
-	$border_pic = "styles/{$cp_style}/images/yourcode/pixel.gif";
-	$yourcode_description = <<<EOF
+		$button_pic = "styles/{$cp_style}/images/yourcode/donate.gif";
+		$border_pic = "styles/{$cp_style}/images/yourcode/pixel.gif";
+		$yourcode_description = <<<EOF
 <table width="100%">
 	<tbody>
 		<tr>
@@ -54,6 +49,12 @@ function yourcode_info()
 	</tbody>
 </table>
 EOF;
+	}
+	else
+	{
+		$extra_links = '<br />';
+		$yourcode_description = $lang->yourcode_plugin_description;
+	}
 
 	$name = <<<EOF
 <span style="font-familiy: arial; font-size: 1.5em; color: #BB0000; text-shadow: 2px 2px 2px #880000;">{$lang->yourcode}</span>
@@ -69,7 +70,7 @@ function yourcode_info()
 		"website" => 'https://github.com/WildcardSearch/YourCode',
 		"author" => $author,
 		"authorsite" => 'http://www.rantcentralforums.com',
-		"version" => '2.0.3',
+		"version" => '2.0.4',
 		"compatibility" => '18*',
 		"guid" => '36a18ebc285a181a42561141adfd1d7f',
 	);