Index: trunk/core/kernel/processors/tag_processor.php
===================================================================
diff -u -r3723 -r4199
--- trunk/core/kernel/processors/tag_processor.php (.../tag_processor.php) (revision 3723)
+++ trunk/core/kernel/processors/tag_processor.php (.../tag_processor.php) (revision 4199)
@@ -40,21 +40,21 @@
}*/
}
- function ProcessParsedTag($tag, $params, $prefix)
+ function ProcessParsedTag($tag, $params, $prefix)
{
- $Method=$tag;
+ $Method = $tag;
if(method_exists($this, $Method))
{
if( $this->Application->isDebugMode() && dbg_ConstOn('DBG_SHOW_TAGS') )
{
global $debugger;
$debugger->appendHTML('Processing PreParsed Tag '.$Method.' in '.$this->Prefix);
}
-
+
//echo htmlspecialchars($tag->GetFullTag()).'
';
return $this->$Method($params);
}
- else
+ else
{
if ($this->Application->hasObject('TagsAggregator')) {
$aggregator =& $this->Application->recallObject('TagsAggregator');
@@ -69,25 +69,13 @@
$params['PrefixSpecial'] = $prefix;
return $processor->ProcessParsedTag($tag_mapping[1], $params, $prefix);
}
- trigger_error('Tag '.$Method.' Undefined in '.get_class($this).'[Agregated Tag]:
'.$tag.'', E_USER_WARNING);
+ trigger_error('Tag '.$Method.' Undefined in '.get_class($this).'[Agregated Tag]:
'.$tag.'', E_USER_WARNING);
}
trigger_error('Tag Undefined:
'.$tag.'',E_USER_WARNING);
return false;
}
}
- /**
- * Checks if object propery value matches value passed
- *
- * @param Array $params
- * @return bool
- */
- function PropertyEquals($params)
- {
- $object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params );
- $property_name = $params['property'];
- return $object->$property_name == $params['value'];
- }
/**
* Not tag, method for parameter
Index: trunk/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r4043 -r4199
--- trunk/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 4043)
+++ trunk/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 4199)
@@ -1473,6 +1473,19 @@
}
/**
+ * Checks if object propery value matches value passed
+ *
+ * @param Array $params
+ * @return bool
+ */
+ function PropertyEquals($params)
+ {
+ $object =& $this->getObject($params);
+ $property_name = $this->SelectParam($params, 'name,var,property');
+ return $object->$property_name == $params['value'];
+ }
+
+ /**
* Group list records by header, saves internal order in group
*
* @param Array $records
Index: trunk/admin/include/sections.php
===================================================================
diff -u -r4112 -r4199
--- trunk/admin/include/sections.php (.../sections.php) (revision 4112)
+++ trunk/admin/include/sections.php (.../sections.php) (revision 4199)
@@ -93,16 +93,15 @@
{
global $rootURL, $m_var_list_update;
- if(!$this->IsJavaScriptLink())
- {
- $m_var_list_update['opener']='r';
- if ( $this->IsKernel4Link() ) {
+ if (!$this->IsJavaScriptLink()) {
+ $m_var_list_update['opener'] = 'r';
+ if ($this->IsKernel4Link()) {
global $var_list_update;
$stack_t = isset($var_list_update['t']) ? $var_list_update['t'] : null;
$var_list_update['t'] = $this->Get('file');
$env = BuildEnv();
- $url = $rootURL.$this->Get("path");
- $url .= strstr($url,"?") ? '&env='.$env : '?env='.$env;
+ $url = $rootURL.$this->Get('path');
+ $url .= (strstr($url, '?') ? '&' : '?').'env='.$env;
if ($stack_t == null) {
unset($var_list_update['t']);
}
@@ -115,16 +114,13 @@
$env = BuildEnv();
}
- $url = $rootURL.$this->Get("path").$this->Get("file");
- if(strstr($url,"?"))
- {
- $url .= "&env=".$env;
- }
- else
- $url .= "?env=".$env;
+ $url = $rootURL.$this->Get('path').$this->Get('file');
+ $url .= (strstr($url, '?') ? '&' : '?').'env='.$env;
}
- else
- $url = $this->Get("file");
+ else {
+ // never called (tested with all modules installed)
+ $url = $this->Get('file');
+ }
return $url;
}
@@ -361,7 +357,7 @@
$notree = $this->sections[$child]->Get("notree");
if (($child == NULL) or ($notree==-1))
{
- print "var item = insDoc($j_par, gLnk(0, \"".$caption."\", \"".$this->SectionURL($element)."\"));\n";
+ print 'var item = insDoc('.$j_par.', gLnk(0, "'.$caption.'", "'.$this->SectionURL($element).'", "return checkEditMode();"));'."\n";
print "item.iconSrc = '".$this->SectionIconURL($element,0)."';\n";
if($this->sections[$element]->Get("right")!=NULL)
$this->BuildTree($this->sections[$element]->Get("right"), $parent);
@@ -371,7 +367,7 @@
if ($child != NULL && $notree !=-1)
{ //print "$j_el = insFld($j_par, gFld(\"".$sections[$element]['name']."\"));\n";
- print "var $j_el = insFld($j_par, gFld(\"".$caption."\",\"".$this->SectionURL($element)."\"));\n";
+ print 'var '.$j_el.' = insFld('.$j_par.', gFld("'.$caption.'","'.$this->SectionURL($element).'", "return checkEditMode();"));'."\n";
print $j_el . ".iconSrc='".$this->SectionIconURL($element,0)."';\n";
if($this->sections[$element]->Get("right")!=NULL)
$this->BuildTree($this->sections[$element]->Get("right"), $parent);
Index: trunk/admin/tree/tree.php
===================================================================
diff -u -r3145 -r4199
--- trunk/admin/tree/tree.php (.../tree.php) (revision 3145)
+++ trunk/admin/tree/tree.php (.../tree.php) (revision 4199)
@@ -17,22 +17,44 @@
$ServerName = $objConfig->Get('Site_Name');
$rootLink = $adminURL."/subitems.php?env=".BuildEnv()."§ion=in-portal:root";
$charset = GetRegionalOption('Charset');
+
+ $main_tag_processor =& $application->recallTagProcessor('m');
+ $phrase_EditingInProgress = $main_tag_processor->Phrase( Array('name' => 'la_EditingInProgress', 'escape' => 1) );
+
+ $phrase_EditingInProgress = str_replace(Array('<', '>', 'br/', 'br /', "\n", "\r"), Array('<', '>', 'br', 'br', '', ''), $phrase_EditingInProgress);
?>
">
-
Index: trunk/globals.php
===================================================================
diff -u -r4120 -r4199
--- trunk/globals.php (.../globals.php) (revision 4120)
+++ trunk/globals.php (.../globals.php) (revision 4199)
@@ -1358,14 +1358,6 @@
return $x;
}
-if (!function_exists('print_pre')) {
- function print_pre($str)
- {
- // no comments here :)
- echo ''.print_r($str, true).'
';
- }
-}
-
function GetOptions($field) // by Alex
{
// get dropdown values from custom field
Index: trunk/kernel/admin_templates/incs/script.js
===================================================================
diff -u -r4169 -r4199
--- trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 4169)
+++ trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 4199)
@@ -9,6 +9,7 @@
var $env = '';
var submitted = false;
+ var $edit_mode = false;
var $init_made = true; // in case of double inclusion of script.js :)
}
Index: trunk/admin/index.php
===================================================================
diff -u -r3884 -r4199
--- trunk/admin/index.php (.../index.php) (revision 3884)
+++ trunk/admin/index.php (.../index.php) (revision 4199)
@@ -51,20 +51,28 @@
-