Merge pull request #39 from WildcardSearch/maintenance

2.1.1 Release

Author: Mark Vincent

README.md

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

Upload/admin/jscripts/yourcode/yourcode_edit.js

@@ -20,6 +20,19 @@
 	 */
 	function init() {
 		$("#callback").change(callbackChange);
+		$("#yourcodeForm").validate({
+			rules: {
+				title: "required",
+				regex: "required",
+			},
+			errorPlacement: function(error, element) {
+				error.css({
+					color: "red",
+					paddingLeft: "5px",
+				});
+				error.insertAfter(element);
+			},
+		});
 	}
 
 	/**

Upload/admin/jscripts/yourcode/yourcode_edit.min.js

@@ -13,6 +13,7 @@
 
 $l['yourcode'] = 'YourCode';
 $l['yourcode_plugin_description'] = "Forget MyCode. Take control of YourCode's more powerful way to manage custom BB codes and even the internally cached MyCodes.";
+$l['yourcode_logo'] = 'YourCode Logo';
 
 // general
 $l['yourcode_yes'] = 'Yes';
@@ -171,4 +172,17 @@
 $l['yourcode_invalid_module'] = 'Invalid module';
 $l['yourcode_no_modules'] = 'no modules';
 
+// plugin requirements
+$l['yourcode_folders_requirement_warning'] = 'One or more folders are not writable. These folders need to be writable during installation and upgrades for themeable items to be upgraded on a per-theme basis.<br /><strong>Folder(s):</strong><br />';
+$l['yourcode_subfolders_unwritable'] = 'One or more subfolders in <span style="font-family: Courier New; font-weight: bolder; font-size: small; color: black;">{1}</span>';
+$l['yourcode_cannot_be_installed'] = 'YourCode cannot be installed!';
+
+// settings
+$l['yourcode_plugin_settings'] = 'Plugin Settings';
+$l['yourcode_settings_title'] = 'YourCode Settings';
+$l['yourcode_settingsgroup_description'] = 'further customize the plugin';
+
+$l['yourcode_minimize_js_title'] = 'Minimize JavaScript?';
+$l['yourcode_minimize_js_description'] = 'YES (default) to serve client-side scripts minified to increase performance, NO to serve beautiful, commented code ;)';
+
 ?>

Upload/admin/jscripts/yourcode/yourcode_inline.min.js

@@ -17,7 +17,11 @@
 }
 
 define('YOURCODE_MOD_URL', MYBB_ROOT. 'inc/plugins/yourcode/modules');
-define('YOURCODE_VERSION', '2.1');
+define('YOURCODE_VERSION', '2.1.1');
+
+// register custom class autoloader
+spl_autoload_register('yourCodeClassAutoLoad');
+
 require_once MYBB_ROOT . 'inc/plugins/yourcode/functions.php';
 
 // load the install/admin routines only if in ACP.
@@ -27,4 +31,17 @@
 	require_once MYBB_ROOT . 'inc/plugins/yourcode/forum.php';
 }
 
+ /**
+  * class autoloader
+  *
+  * @param string the name of the class to load
+  */
+function yourCodeClassAutoLoad($className) {
+	$path = MYBB_ROOT . "inc/plugins/yourcode/classes/{$className}.php";
+
+	if (file_exists($path)) {
+		require_once $path;
+	}
+}
+
 ?>

Upload/admin/jscripts/yourcode/yourcode_sandbox.min.js

@@ -31,18 +31,19 @@ function yourcode_admin()
 	}
 
 	// now load up, this is our time
-	global $mybb, $lang, $html;
+	global $mybb, $lang, $html, $min;
 	if (!$lang->yourcode) {
 		$lang->load('yourcode');
 	}
 
+	if ($mybb->settings['yourcode_minimize_js']) {
+		$min = '.min';
+	}
+
 	// no need for all the classes and functions if it is just AJAX test
 	if ($mybb->input['mode'] != 'xmlhttp') {
-		require_once MYBB_ROOT . 'inc/plugins/yourcode/classes/YourCode.php';
-		require_once MYBB_ROOT . 'inc/plugins/yourcode/classes/HTMLGenerator.php';
-
 		// URL, link and image markup generator
-		$html = new HTMLGenerator(YOURCODE_URL, array('script', 'style', 'type', 'name'));
+		$html = new HTMLGenerator010000(YOURCODE_URL, array('script', 'style', 'type', 'name'));
 
 		$page->extra_header .= <<<EOF
 
@@ -73,7 +74,7 @@ function yourcode_admin()
  */
 function yourcode_admin_view()
 {
-	global $page, $mybb, $lang, $db, $html;
+	global $page, $mybb, $lang, $db, $html, $min;
 
 	if ($mybb->request_method == 'post') {
 		if ($mybb->input['mode'] == 'inline') {
@@ -105,7 +106,7 @@ function yourcode_admin_view()
 					break;
 				default:
 					$value = ($mybb->input['inline_action'] == 'activate');
-					$action = $lang->yourcode_activated;
+					$action = $value ? $lang->yourcode_activated : $lang->yourcode_deactivated;
 
 					if (($this_code->get('active') &&
 							$value) ||
@@ -207,7 +208,7 @@ function yourcode_admin_view()
 
 	$page->extra_header .= <<<EOF
 
-	<script type="text/javascript" src="jscripts/yourcode/yourcode_inline.js"></script>
+	<script type="text/javascript" src="jscripts/yourcode/yourcode_inline{$min}.js"></script>
 	<script type="text/javascript">
 	<!--
 	YourCode.inline.setup({
@@ -346,7 +347,7 @@ function yourcode_admin_view()
  */
 function yourcode_admin_edit()
 {
-	global $page, $mybb, $lang, $db, $html;
+	global $page, $mybb, $lang, $db, $html, $min;
 
 	// verify incoming POST request
 	if (!verify_post_check($mybb->input['my_post_key'])) {
@@ -407,7 +408,11 @@ function yourcode_admin_edit()
 	// start page output
 	$page->add_breadcrumb_item($lang->yourcode);
 	$page->add_breadcrumb_item($lang->yourcode_admin_edit);
-	$page->extra_header .= '<script type="text/javascript" src="jscripts/yourcode/yourcode_edit.js"></script>';
+	$page->extra_header .= <<<EOF
+	<script type="text/javascript" src="{$mybb->asset_url}/jscripts/validate/jquery.validate.min.js?ver=1804"></script>
+<script type="text/javascript" src="jscripts/yourcode/yourcode_edit{$min}.js"></script>
+
+EOF;
 	$page->output_header("{$lang->yourcode} - {$lang->yourcode_admin_edit}");
 	yourcode_output_tabs('yourcode_edit');
 
@@ -446,7 +451,7 @@ function yourcode_admin_edit()
 	$em = ' <em>*</em>';
 
 	// hmm could this be the form?
-	$form = new Form($html->url(array("action" => 'edit')), 'post');
+	$form = new Form($html->url(array("action" => 'edit')), 'post', 'yourcodeForm');
 
 	$tabs = array(
 		"general" => $lang->yourcode_tab_general,
@@ -509,7 +514,7 @@ function yourcode_admin_edit()
 
 	// do our sandbox magic from admin/modules/config/mycode.php but use our own regex tester that supports moar cool stuff. Also had to add some options
 	echo <<<EOF
-<script type="text/javascript" src="./jscripts/yourcode/yourcode_sandbox.js"></script>
+<script type="text/javascript" src="./jscripts/yourcode/yourcode_sandbox{$min}.js"></script>
 <script type="text/javascript">
 $(function() {
 <!--
@@ -546,8 +551,6 @@ function yourcode_admin_module()
 {
 	global $page, $mybb, $lang, $db, $cache, $html;
 
-	require_once MYBB_ROOT . "inc/plugins/yourcode/classes/YourCodeModule.php";
-
 	// load our cache right away
 	$yourcode = $cache->read('yourcode');
 	$activeModules = $yourcode['active']['modules'];
@@ -706,7 +709,7 @@ function yourcode_admin_module()
 	$page->add_breadcrumb_item($lang->yourcode_admin_module);
 	$page->extra_header .= <<<EOF
 
-	<script type="text/javascript" src="jscripts/yourcode/yourcode_inline.js"></script>
+	<script type="text/javascript" src="jscripts/yourcode/yourcode_inline{$min}.js"></script>
 	<script type="text/javascript">
 	<!--
 	YourCode.inline.setup({
@@ -771,7 +774,7 @@ function yourcode_admin_module()
 			}
 
 			$title = "{$module->get('title')} ({$module->get('version')})";
-			$name = $module->get('base_name');
+			$name = $module->get('baseName');
 			$isActive = in_array($name, $activeModules);
 			if ($isActive) {
 				$activeText = $lang->yourcode_deactivate;