Merge pull request #85 from 1d10t/master

some fixes

engine/classes/Engine.class.php

@@ -947,7 +947,9 @@ class Engine extends Object {
 		if($aInfo[Engine::CI_INHERIT]){
 			$sInheritClass = $aInfo[Engine::CI_INHERIT];
 			$sParentClass = Engine::getInstance()->Plugin_GetParentInherit($sInheritClass);
-			class_alias($sParentClass,$sClassName);
+			if(!class_alias($sParentClass,$sClassName)){
+				dump("(autoload $sParentClass) Can not load CLASS-file");
+			}
 		}elseif($aInfo[Engine::CI_CLASSPATH]){
 			require_once $aInfo[Engine::CI_CLASSPATH];
 		}elseif(!class_exists($sClassName)){

engine/include/function.php

@@ -128,19 +128,16 @@ function func_generator($iLength=10) {
 /**
  * htmlspecialchars умеющая обрабатывать массивы
  *
- * @param unknown_type $data
+ * @param mixed $data
+ * @param int %walkIndex - represents the key/index of the array being recursively htmlspecialchars'ed
+ * @return void
  */
-function func_htmlspecialchars(&$data) {
-	if (is_array($data)) {
-		foreach ($data as $sKey => $value) {
-			if (is_array($value)) {
-				func_htmlspecialchars($data[$sKey]);
-			} else {
-				$data[$sKey]=htmlspecialchars($value);
-			}
-		}
-	} else {
-		$data=htmlspecialchars($data);
+function func_htmlspecialchars(&$data, $walkIndex = null) 
+{
+	if(is_string($data)){
+		$data = htmlspecialchars($data);
+	}elseif(is_array($data)){
+		array_walk($data, __FUNCTION__);
 	}
 }
 
@@ -402,7 +399,11 @@ if (!function_exists('array_intersect_key')) {
 
 if (!function_exists('class_alias')) {
     function class_alias($original, $alias) {
+    	if(!class_exists($original)){
+    		return false;
+    	}
         eval('abstract class ' . $alias . ' extends ' . $original . ' {}');
+        return true;
     }
 }
 

engine/lib/external/jquery/markitup/skins/simple/style.css

@@ -42,7 +42,12 @@
 	border-left: 1px solid #c0cad5; 
 	border-right: 1px solid #c0cad5; 
 }
-.markItUpHeader ul	{ overflow: visible; zoom: 1; }
+.markItUpHeader ul	{
+	overflow: visible;
+	zoom: 1;
+	display: inline-block;
+	*display: inline; /* ie <= 7 */
+}
 .markItUpHeader ul li	{ list-style: none; float: left; position: relative; margin-right: 6px; }
 .markItUpHeader ul li: hover > ul{ display: block; }
 .markItUpHeader ul .markItUpDropMenu {

engine/lib/internal/template/js/main.js

@@ -1,5 +1,11 @@
 Function.prototype.bind = function(context) {
 	var fn = this;
+	if(jQuery.type(fn) != 'function'){
+		throw new TypeError('Function.prototype.bind: call on non-function');
+	};
+	if(jQuery.type(context) == 'null'){
+		throw new TypeError('Function.prototype.bind: cant be bound to null');
+	};
 	return function() {
 		return fn.apply(context, arguments);
 	};
@@ -8,7 +14,7 @@ String.prototype.tr = function(a,p) {
 	var k;
 	var p = typeof(p)=='string' ? p : '';
 	var s = this;
-	$.each(a,function(k){
+	jQuery.each(a,function(k){
 		var tk = p?p.split('/'):[];
 		tk[tk.length] = k;
 		var tp = tk.join('/');
@@ -25,8 +31,8 @@ String.prototype.tr = function(a,p) {
 var ls = ls || {};
 
 /**
-* Управление всплывающими сообщениями
-*/
+ * Управление всплывающими сообщениями
+ */
 ls.msg = (function ($) {
 	/**
 	* Опции
@@ -425,7 +431,7 @@ ls = (function ($) {
 	* Лог сообщений
 	*/
 	this.log = function() {
-		if (window.console && window.console.log) {
+		if (!$.browser.msie && window.console && window.console.log) {
 			Function.prototype.bind.call(console.log, console).apply(console, arguments);
 		} else {
 			//alert(msg);

plugins/page/templates/skin/developer-jquery/actions/ActionPage/add.tpl

@@ -7,6 +7,7 @@
 	<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
 	{literal}
 		<script type="text/javascript">
+		jQuery(function($){
 			tinyMCE.init({
 				mode : "textareas",
 				theme : "advanced",
@@ -29,6 +30,7 @@
 				extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
 				language : TINYMCE_LANG
 			});
+		});
 		</script>
 	{/literal}
 

plugins/page/templates/skin/new-jquery/actions/ActionPage/add.tpl

@@ -7,6 +7,7 @@
 	<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
 	{literal}
 		<script type="text/javascript">
+		jQuery(function($){
 			tinyMCE.init({
 				mode : "textareas",
 				theme : "advanced",
@@ -29,6 +30,7 @@
 				extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
 				language : TINYMCE_LANG
 			});
+		});
 		</script>
 	{/literal}
 

templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl

@@ -6,7 +6,8 @@
 
 <script type="text/javascript">
 {literal}
-tinyMCE.init({
+jQuery(function($){
+	tinyMCE.init({
 		mode : "specific_textareas",
 		editor_selector : "mceEditor",
 		theme : "advanced",
@@ -35,6 +36,7 @@ tinyMCE.init({
 		pagebreak_separator :"<cut>",
 		media_strict : false,
 		language : TINYMCE_LANG
+	});
 });
 {/literal}
 </script>

templates/skin/developer-jquery/actions/ActionTopic/add.tpl

@@ -5,7 +5,8 @@
 
 <script type="text/javascript">
 {literal}
-tinyMCE.init({
+jQuery(function($){
+	tinyMCE.init({
 		mode : "textareas",
 		theme : "advanced",
 		theme_advanced_toolbar_location : "top",
@@ -33,6 +34,7 @@ tinyMCE.init({
 			underline : {inline : 'u', exact : true},
 			strikethrough : {inline : 's', exact : true}
 		}
+	});
 });
 {/literal}
 </script>

templates/skin/developer-jquery/comment_tree.tpl

@@ -52,6 +52,7 @@
 							{literal}
 
 							<script type="text/javascript">
+							jQuery(function($){
 								tinyMCE.init({
 									mode : "textareas",
 									theme : "advanced",
@@ -91,6 +92,7 @@
 										});
 									}
 								});
+							});
 							</script>
 							{/literal}
 						{/if}

templates/skin/developer-jquery/css/forms.css

@@ -9,4 +9,4 @@
 
 .markItUp { width: 100%; }
 .markItUpEditor { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; }
-.markItUpHeader { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; height: 28px; }
+.markItUpHeader { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; }

templates/skin/new-jquery/actions/ActionBlog/add.tpl

@@ -17,6 +17,7 @@
 
 	<script type="text/javascript">
 		{literal}
+		jQuery(function($){
 			tinyMCE.init({
 				mode : "textareas",
 				theme : "advanced",
@@ -46,6 +47,7 @@
 					strikethrough : {inline : 's', exact : true}
 				}
 			});
+		});
 		{/literal}
 	</script>
 {else}

templates/skin/new-jquery/actions/ActionPhotoset/add.tpl

@@ -5,7 +5,8 @@
 <script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
 
 <script type="text/javascript">
-	{literal}
+{literal}
+jQuery(function($){
 	tinyMCE.init({
 		mode : "textareas",
 		theme : "advanced",
@@ -35,7 +36,8 @@
 		media_strict : false,
 		language : TINYMCE_LANG
 	});
-	{/literal}
+});
+{/literal}
 </script>
 
 {else}

templates/skin/new-jquery/actions/ActionTalk/add.tpl

@@ -5,6 +5,7 @@
 
 	<script type="text/javascript">
 	{literal}
+	jQuery(function($){
 		tinyMCE.init({
 			mode : "textareas",
 			theme : "advanced",
@@ -34,6 +35,7 @@
 				strikethrough : {inline : 's', exact : true}
 			}
 		});
+	});
 	{/literal}
 	</script>
 {else}

templates/skin/new-jquery/actions/ActionTopic/add.tpl

@@ -6,6 +6,7 @@
 
 	<script type="text/javascript">
 	{literal}
+	jQuery(function($){
 		tinyMCE.init({
 			mode : "textareas",
 			theme : "advanced",
@@ -35,6 +36,7 @@
 				strikethrough : {inline : 's', exact : true}
 			}
 		});
+	});
 	{/literal}
 	</script>
 {else}

templates/skin/new-jquery/comment_tree.tpl

@@ -57,6 +57,7 @@
 					{literal}
 
 					<script type="text/javascript">
+					jQuery(function($){
 						tinyMCE.init({
 							mode : "textareas",
 							theme : "advanced",
@@ -96,6 +97,7 @@
 								});
 							}
 						});
+					});
 					</script>
 					{/literal}
 				{else}

templates/skin/new-jquery/css/forms.css

@@ -11,7 +11,7 @@
 
 .markItUp { width: 100%; }
 .markItUpEditor { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; }
-.markItUpHeader { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; height: 28px; }
+.markItUpHeader { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; }
 
 .button {
 	background: rgb(254,254,254);