From 707c587d136cbf556a080f4d08ab1516c4bb9a5b Mon Sep 17 00:00:00 2001
From: Alexander Raskin
Date: Wed, 8 Feb 2012 01:35:47 +0200
Subject: [PATCH 1/7] improved func_htmlSpecialChars array walker
---
engine/include/function.php | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/engine/include/function.php b/engine/include/function.php
index 8f55f224..4d8b4bb6 100644
--- a/engine/include/function.php
+++ b/engine/include/function.php
@@ -130,20 +130,20 @@ 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_array($data))
+ {
+ $data = htmlspecialchars(&$data);
+ return;
}
+
+
+ array_walk($data, __FUNCTION__);
}
/**
From ff1d7a41f6febb64047be795d3ee92716bbfde74 Mon Sep 17 00:00:00 2001
From: Sergey S Yaglov
Date: Mon, 20 Feb 2012 23:32:23 +0300
Subject: [PATCH 2/7] some fixes
---
engine/classes/Engine.class.php | 8 +-
engine/include/function.php | 4 +
engine/lib/internal/template/js/main.js | 2 +-
.../actions/ActionPage/add.tpl | 92 +++++------
.../new-jquery/actions/ActionPage/add.tpl | 92 +++++------
.../actions/ActionPhotoset/add.tpl | 148 +++++++++---------
.../actions/ActionTopic/add.tpl | 64 ++++----
.../skin/developer-jquery/comment_tree.tpl | 132 ++++++++--------
.../new-jquery/actions/ActionBlog/add.tpl | 58 +++----
.../new-jquery/actions/ActionPhotoset/add.tpl | 6 +-
.../new-jquery/actions/ActionTalk/add.tpl | 8 +-
.../new-jquery/actions/ActionTopic/add.tpl | 8 +-
templates/skin/new-jquery/comment_tree.tpl | 8 +-
13 files changed, 330 insertions(+), 300 deletions(-)
diff --git a/engine/classes/Engine.class.php b/engine/classes/Engine.class.php
index 790f51f2..9f73d1c3 100644
--- a/engine/classes/Engine.class.php
+++ b/engine/classes/Engine.class.php
@@ -941,7 +941,13 @@ class Engine extends Object {
if($aInfo[Engine::CI_INHERIT]){
$sInheritClass = $aInfo[Engine::CI_INHERIT];
$sParentClass = Engine::getInstance()->Plugin_GetParentInherit($sInheritClass);
- class_alias($sParentClass,$sClassName);
+ $aParentInfo = Engine::GetClassInfo(
+ $sParentClass,
+ Engine::CI_CLASSPATH
+ );
+ if(!class_alias($sParentClass,$sClassName)){
+ class_alias('Object',$sClassName);
+ }
}elseif($aInfo[Engine::CI_CLASSPATH]){
require_once $aInfo[Engine::CI_CLASSPATH];
}elseif(!class_exists($sClassName)){
diff --git a/engine/include/function.php b/engine/include/function.php
index 8f55f224..f1cf3d4e 100644
--- a/engine/include/function.php
+++ b/engine/include/function.php
@@ -404,7 +404,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;
}
}
diff --git a/engine/lib/internal/template/js/main.js b/engine/lib/internal/template/js/main.js
index d65eb333..9c2ce6a6 100644
--- a/engine/lib/internal/template/js/main.js
+++ b/engine/lib/internal/template/js/main.js
@@ -8,7 +8,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('/');
diff --git a/plugins/page/templates/skin/developer-jquery/actions/ActionPage/add.tpl b/plugins/page/templates/skin/developer-jquery/actions/ActionPage/add.tpl
index 89afba36..7cdd0081 100644
--- a/plugins/page/templates/skin/developer-jquery/actions/ActionPage/add.tpl
+++ b/plugins/page/templates/skin/developer-jquery/actions/ActionPage/add.tpl
@@ -7,67 +7,69 @@
{literal}
{/literal}
-
+
{else}
{include file='window_load_img.tpl' sToLoad='page_text'}
{/if}
-
-
+
+
\ No newline at end of file
diff --git a/plugins/page/templates/skin/new-jquery/actions/ActionPage/add.tpl b/plugins/page/templates/skin/new-jquery/actions/ActionPage/add.tpl
index 89afba36..7cdd0081 100644
--- a/plugins/page/templates/skin/new-jquery/actions/ActionPage/add.tpl
+++ b/plugins/page/templates/skin/new-jquery/actions/ActionPage/add.tpl
@@ -7,67 +7,69 @@
{literal}
{/literal}
-
+
{else}
{include file='window_load_img.tpl' sToLoad='page_text'}
{/if}
-
-
+
+
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl b/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl
index 5de1bba6..b7ebc235 100644
--- a/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl
+++ b/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl
@@ -6,35 +6,37 @@
@@ -44,7 +46,7 @@ tinyMCE.init({
@@ -68,38 +70,38 @@ tinyMCE.init({
{else}
{$aLang.topic_photoset_edit}
{/if}
-
-
-
-
-
-
-
-
{hook run='add_topic_photoset_begin'}