Index: branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r5727 -r5770
--- branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 5727)
+++ branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 5770)
@@ -314,7 +314,7 @@
$block_params['name']=$this->SelectParam($params, 'render_as,block');
$block_params['pass_params']='true';
$block_params['column_width'] = 100 / $columns;
- $block_start_row_params=$this->prepareTagParams($params);
+ $block_start_row_params = $this->prepareTagParams($params);
$block_start_row_params['name'] = $this->SelectParam($params, 'row_start_render_as,block_row_start,row_start_block');
$block_end_row_params=$this->prepareTagParams($params);
@@ -344,19 +344,23 @@
if ($i % $columns == 0) {
// record in this iteration is first in row, then open row
$column_number = 1;
- $o.= $block_start_row_params['name'] ? $this->Application->ParseBlock($block_start_row_params, 1) : '
';
+ $o.= $block_start_row_params['name'] ?
+ $this->Application->ParseBlock($block_start_row_params, 1) :
+ (!isset($params['no_table']) ? '
' : '');
}
else {
$column_number++;
}
- $block_params['column_number'] = $column_number;
- $o.= $this->Application->ParseBlock($block_params, 1);
- array_push($displayed, $list->GetDBField($id_field));
+ $block_params['column_number'] = $column_number;
+ $o.= $this->Application->ParseBlock($block_params, 1);
+ array_push($displayed, $list->GetDBField($id_field));
if (($i+1) % $columns == 0) {
// record in next iteration is first in row too, then close this row
- $o.= $block_end_row_params['name'] ? $this->Application->ParseBlock($block_end_row_params, 1) : '
';
+ $o.= $block_end_row_params['name'] ?
+ $this->Application->ParseBlock($block_end_row_params, 1) :
+ (!isset($params['no_table']) ? '' : '');
}
$list->GoNext();
Index: branches/unlabeled/unlabeled-1.14.2/kernel/units/admin/admin_config.php
===================================================================
diff -u -r5434 -r5770
--- branches/unlabeled/unlabeled-1.14.2/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 5434)
+++ branches/unlabeled/unlabeled-1.14.2/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 5770)
@@ -1,23 +1,25 @@
'adm',
- 'EventHandlerClass' => Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
+ 'EventHandlerClass' => Array('class' => 'AdminEventsHandler', 'file' => 'admin_events_handler.php', 'build_event' => 'OnBuild'),
'TagProcessorClass' => Array('class' => 'AdminTagProcessor', 'file' => 'admin_tag_processor.php', 'build_event' => 'OnBuild'),
-
-
+
+
'TitlePresets' => Array(
'tree_root' => Array('format' => '!la_section_overview!'),
-
+
'tree_reports' => Array('format' => '!la_section_overview!'),
-
+
'tree_system' => Array('format' => '!la_section_overview!'),
-
+
'tree_tools' => Array('format' => '!la_section_overview!'),
-
+
+ 'system_tools' => Array('format' => '!la_section_system!'),
+
'no_permissions' => Array('format' => '!la_title_NoPermissions!'),
),
-
+
'Sections' => Array(
'in-portal:root' => Array(
'parent' => null,
@@ -28,8 +30,8 @@
'priority' => 0,
'type' => stTREE,
),
-
- // "Summary & Logs" section
+
+ // "Summary & Logs" section
'in-portal:reports' => Array(
'parent' => 'in-portal:root',
'icon' => 'summary_logs',
@@ -39,7 +41,7 @@
'priority' => 4,
'type' => stTREE,
),
-
+
'in-portal:log_summary' => Array(
'parent' => 'in-portal:reports',
'icon' => 'summary',
@@ -49,7 +51,7 @@
'priority' => 1,
'type' => stTREE,
),
-
+
'in-portal:searchlog' => Array(
'parent' => 'in-portal:reports',
'icon' => 'search_log',
@@ -59,7 +61,7 @@
'priority' => 2,
'type' => stTREE,
),
-
+
'in-portal:sessionlog' => Array(
'parent' => 'in-portal:reports',
'icon' => 'sessions_log',
@@ -69,7 +71,7 @@
'priority' => 3,
'type' => stTREE,
),
-
+
'in-portal:emaillog' => Array(
'parent' => 'in-portal:reports',
'icon' => 'email_log',
@@ -79,7 +81,7 @@
'priority' => 4,
'type' => stTREE,
),
-
+
'in-portal:visits' => Array(
'parent' => 'in-portal:reports',
'icon' => 'visits',
@@ -89,7 +91,7 @@
'priority' => 5,
'type' => stTREE,
),
-
+
// "Configuration" section
'in-portal:system' => Array(
'parent' => 'in-portal:root',
@@ -100,7 +102,7 @@
'priority' => 5,
'type' => stTREE,
),
-
+
'in-portal:configure_general' => Array(
'parent' => 'in-portal:system',
'icon' => 'conf_general',
@@ -110,7 +112,7 @@
'priority' => 1,
'type' => stTREE,
),
-
+
// "Tools" section
'in-portal:tools' => Array(
'parent' => 'in-portal:root',
@@ -121,57 +123,67 @@
'priority' => 6,
'type' => stTREE,
),
-
+
+ 'in-portal:service' => Array(
+ 'parent' => 'in-portal:tools',
+ 'icon' => 'tool_service',
+ 'label' => 'la_tab_Service',
+ 'url' => Array('t' => 'tools/system_tools', 'pass' => 'm'),
+ 'permissions' => Array('view'),
+ 'priority' => 1,
+ 'type' => stTREE,
+ ),
+
'in-portal:backup' => Array(
'parent' => 'in-portal:tools',
'icon' => 'tool_backup',
'label' => 'la_tab_Backup',
'url' => Array('index_file' => 'backup/backup1.php', 'pass' => 'm'),
'permissions' => Array('view'),
- 'priority' => 1,
+ 'priority' => 2,
'type' => stTREE,
),
-
+
'in-portal:restore' => Array(
'parent' => 'in-portal:tools',
'icon' => 'tool_restore',
'label' => 'la_tab_Restore',
'url' => Array('index_file' => 'backup/restore1.php', 'pass' => 'm'),
'permissions' => Array('view'),
- 'priority' => 2,
+ 'priority' => 3,
'type' => stTREE,
),
-
+
'in-portal:main_import' => Array(
'parent' => 'in-portal:tools',
'icon' => 'tool_import',
'label' => 'la_tab_ImportData',
'url' => Array('index_file' => 'import/step1.php', 'pass' => 'm'),
'permissions' => Array('view'),
- 'priority' => 3,
+ 'priority' => 4,
'type' => stTREE,
),
-
+
'in-portal:sql_query' => Array(
'parent' => 'in-portal:tools',
'icon' => 'tool_import',
'label' => 'la_tab_QueryDB',
'url' => Array('index_file' => 'tools/sql_query.php', 'pass' => 'm'),
'permissions' => Array('view', 'edit'),
- 'priority' => 4,
+ 'priority' => 5,
'type' => stTREE,
),
-
+
'in-portal:server_info' => Array(
'parent' => 'in-portal:tools',
'icon' => 'server_info',
'label' => 'la_tab_ServerInfo',
'url' => Array('index_file' => 'tools/server_info.php', 'pass' => 'm'),
'permissions' => Array('view'),
- 'priority' => 5,
+ 'priority' => 6,
'type' => stTREE,
),
-
+
// "Help" section
'in-portal:help' => Array(
'parent' => 'in-portal:root',
@@ -183,7 +195,7 @@
'type' => stTREE,
),
),
-
+
);
?>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.9.2/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -r5450 -r5770
--- branches/unlabeled/unlabeled-1.9.2/core/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 5450)
+++ branches/unlabeled/unlabeled-1.9.2/core/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 5770)
@@ -1,7 +1,18 @@
Application->IsAdmin() && $event->Name == 'OnCreate' && $this->Application->isDebugMode() && constOn('DBG_PHRASES')) {
+ if ($event->Name == 'OnCreate') {
+ // allow create phrases from front end in debug mode with DBG_PHRASES
+ return true;
+ }
+ }
+ }
+
/**
* Forces new label in case if issued from get link
*
@@ -11,31 +22,31 @@
{
parent::OnNew($event);
$label = $this->Application->GetVar('phrases_label');
-
+
$object =& $event->getObject( $label ? Array('live_table'=>true, 'skip_autoload' => true) : Array('skip_autoload' => true) );
if ($label) {
$object->SetDBField('Phrase',$label);
$object->SetDBField('LanguageId', $this->Application->GetVar('m_lang') );
$object->SetDBField('PhraseType',1);
-
+
$primary_language = $this->Application->GetDefaultLanguageId();
$live_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
$sql = 'SELECT Translation FROM %s WHERE Phrase = %s';
$primary_value = $this->Conn->GetOne( sprintf($sql, $live_table, $this->Conn->qstr($label) ) );
$object->SetDBField('PrimaryTranslation', $primary_value);
}
-
+
$last_module = $this->Application->GetVar('last_module');
if($last_module) $object->SetDBField('Module', $last_module);
-
+
if($event->Special == 'export' || $event->Special == 'import')
{
$object->SetDBField('PhraseType', '|0|1|2|');
$modules = $this->Conn->GetCol('SELECT Name FROM '.TABLE_PREFIX.'Modules');
$object->SetDBField('Module', '|'.implode('|', $modules).'|' );
}
}
-
+
/**
* Forces create to use live table
*
@@ -51,7 +62,7 @@
}
}
}
-
+
/**
* Save phrase change date & ip translation was made from
*
@@ -68,7 +79,7 @@
$object->SetDBField('LastChanged_time', adodb_mktime() );
$object->SetDBField('LastChangeIP', $ip_address);
}
-
+
$cookie_path = $this->Application->IsAdmin() ? BASE_PATH.'/admin' : BASE_PATH;
setcookie('last_module', $object->GetDBField('Module'), $cookie_path, '.'.SERVER_NAME);
}
Index: branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php
===================================================================
diff -u -r5763 -r5770
--- branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php (.../application.php) (revision 5763)
+++ branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php (.../application.php) (revision 5770)
@@ -686,11 +686,11 @@
}
//eval("?".">".$this->HTML);
-
+
if ($this->isDebugMode()) {
$this->EventManager->RunRegularEvents(reAFTER);
$this->Session->SaveData();
-
+
$this->HTML = ob_get_clean() . $this->HTML . $this->Debugger->printReport(true);
}
else {
@@ -1172,7 +1172,7 @@
foreach($pass_info as $pass_index => $pass_element)
{
list($prefix) = explode('.', $pass_element);
- $require_rewrite = $this->findModule('Var', $prefix);
+ $require_rewrite = $this->findModule('Var', $prefix) && $this->getUnitOption($prefix, 'CatalogItem');
if ($require_rewrite) {
// if next prefix is same as current, but with special => exclude current prefix from url
$next_prefix = getArrayValue($pass_info, $pass_index + 1);
@@ -1440,7 +1440,7 @@
}
}
}
-
+
ob_end_flush();
$this->Session->SaveData();
exit;
Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/tools/system_tools.tpl
===================================================================
diff -u
--- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/tools/system_tools.tpl (revision 0)
+++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/tools/system_tools.tpl (revision 5770)
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.14.2/core/units/admin/admin_config.php
===================================================================
diff -u -r5434 -r5770
--- branches/unlabeled/unlabeled-1.14.2/core/units/admin/admin_config.php (.../admin_config.php) (revision 5434)
+++ branches/unlabeled/unlabeled-1.14.2/core/units/admin/admin_config.php (.../admin_config.php) (revision 5770)
@@ -1,23 +1,25 @@
'adm',
- 'EventHandlerClass' => Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
+ 'EventHandlerClass' => Array('class' => 'AdminEventsHandler', 'file' => 'admin_events_handler.php', 'build_event' => 'OnBuild'),
'TagProcessorClass' => Array('class' => 'AdminTagProcessor', 'file' => 'admin_tag_processor.php', 'build_event' => 'OnBuild'),
-
-
+
+
'TitlePresets' => Array(
'tree_root' => Array('format' => '!la_section_overview!'),
-
+
'tree_reports' => Array('format' => '!la_section_overview!'),
-
+
'tree_system' => Array('format' => '!la_section_overview!'),
-
+
'tree_tools' => Array('format' => '!la_section_overview!'),
-
+
+ 'system_tools' => Array('format' => '!la_section_system!'),
+
'no_permissions' => Array('format' => '!la_title_NoPermissions!'),
),
-
+
'Sections' => Array(
'in-portal:root' => Array(
'parent' => null,
@@ -28,8 +30,8 @@
'priority' => 0,
'type' => stTREE,
),
-
- // "Summary & Logs" section
+
+ // "Summary & Logs" section
'in-portal:reports' => Array(
'parent' => 'in-portal:root',
'icon' => 'summary_logs',
@@ -39,7 +41,7 @@
'priority' => 4,
'type' => stTREE,
),
-
+
'in-portal:log_summary' => Array(
'parent' => 'in-portal:reports',
'icon' => 'summary',
@@ -49,7 +51,7 @@
'priority' => 1,
'type' => stTREE,
),
-
+
'in-portal:searchlog' => Array(
'parent' => 'in-portal:reports',
'icon' => 'search_log',
@@ -59,7 +61,7 @@
'priority' => 2,
'type' => stTREE,
),
-
+
'in-portal:sessionlog' => Array(
'parent' => 'in-portal:reports',
'icon' => 'sessions_log',
@@ -69,7 +71,7 @@
'priority' => 3,
'type' => stTREE,
),
-
+
'in-portal:emaillog' => Array(
'parent' => 'in-portal:reports',
'icon' => 'email_log',
@@ -79,7 +81,7 @@
'priority' => 4,
'type' => stTREE,
),
-
+
'in-portal:visits' => Array(
'parent' => 'in-portal:reports',
'icon' => 'visits',
@@ -89,7 +91,7 @@
'priority' => 5,
'type' => stTREE,
),
-
+
// "Configuration" section
'in-portal:system' => Array(
'parent' => 'in-portal:root',
@@ -100,7 +102,7 @@
'priority' => 5,
'type' => stTREE,
),
-
+
'in-portal:configure_general' => Array(
'parent' => 'in-portal:system',
'icon' => 'conf_general',
@@ -110,7 +112,7 @@
'priority' => 1,
'type' => stTREE,
),
-
+
// "Tools" section
'in-portal:tools' => Array(
'parent' => 'in-portal:root',
@@ -121,57 +123,67 @@
'priority' => 6,
'type' => stTREE,
),
-
+
+ 'in-portal:service' => Array(
+ 'parent' => 'in-portal:tools',
+ 'icon' => 'tool_service',
+ 'label' => 'la_tab_Service',
+ 'url' => Array('t' => 'tools/system_tools', 'pass' => 'm'),
+ 'permissions' => Array('view'),
+ 'priority' => 1,
+ 'type' => stTREE,
+ ),
+
'in-portal:backup' => Array(
'parent' => 'in-portal:tools',
'icon' => 'tool_backup',
'label' => 'la_tab_Backup',
'url' => Array('index_file' => 'backup/backup1.php', 'pass' => 'm'),
'permissions' => Array('view'),
- 'priority' => 1,
+ 'priority' => 2,
'type' => stTREE,
),
-
+
'in-portal:restore' => Array(
'parent' => 'in-portal:tools',
'icon' => 'tool_restore',
'label' => 'la_tab_Restore',
'url' => Array('index_file' => 'backup/restore1.php', 'pass' => 'm'),
'permissions' => Array('view'),
- 'priority' => 2,
+ 'priority' => 3,
'type' => stTREE,
),
-
+
'in-portal:main_import' => Array(
'parent' => 'in-portal:tools',
'icon' => 'tool_import',
'label' => 'la_tab_ImportData',
'url' => Array('index_file' => 'import/step1.php', 'pass' => 'm'),
'permissions' => Array('view'),
- 'priority' => 3,
+ 'priority' => 4,
'type' => stTREE,
),
-
+
'in-portal:sql_query' => Array(
'parent' => 'in-portal:tools',
'icon' => 'tool_import',
'label' => 'la_tab_QueryDB',
'url' => Array('index_file' => 'tools/sql_query.php', 'pass' => 'm'),
'permissions' => Array('view', 'edit'),
- 'priority' => 4,
+ 'priority' => 5,
'type' => stTREE,
),
-
+
'in-portal:server_info' => Array(
'parent' => 'in-portal:tools',
'icon' => 'server_info',
'label' => 'la_tab_ServerInfo',
'url' => Array('index_file' => 'tools/server_info.php', 'pass' => 'm'),
'permissions' => Array('view'),
- 'priority' => 5,
+ 'priority' => 6,
'type' => stTREE,
),
-
+
// "Help" section
'in-portal:help' => Array(
'parent' => 'in-portal:root',
@@ -183,7 +195,7 @@
'type' => stTREE,
),
),
-
+
);
?>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.9.2/kernel/units/phrases/phrases_event_handler.php
===================================================================
diff -u -r5450 -r5770
--- branches/unlabeled/unlabeled-1.9.2/kernel/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 5450)
+++ branches/unlabeled/unlabeled-1.9.2/kernel/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 5770)
@@ -1,7 +1,18 @@
Application->IsAdmin() && $event->Name == 'OnCreate' && $this->Application->isDebugMode() && constOn('DBG_PHRASES')) {
+ if ($event->Name == 'OnCreate') {
+ // allow create phrases from front end in debug mode with DBG_PHRASES
+ return true;
+ }
+ }
+ }
+
/**
* Forces new label in case if issued from get link
*
@@ -11,31 +22,31 @@
{
parent::OnNew($event);
$label = $this->Application->GetVar('phrases_label');
-
+
$object =& $event->getObject( $label ? Array('live_table'=>true, 'skip_autoload' => true) : Array('skip_autoload' => true) );
if ($label) {
$object->SetDBField('Phrase',$label);
$object->SetDBField('LanguageId', $this->Application->GetVar('m_lang') );
$object->SetDBField('PhraseType',1);
-
+
$primary_language = $this->Application->GetDefaultLanguageId();
$live_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
$sql = 'SELECT Translation FROM %s WHERE Phrase = %s';
$primary_value = $this->Conn->GetOne( sprintf($sql, $live_table, $this->Conn->qstr($label) ) );
$object->SetDBField('PrimaryTranslation', $primary_value);
}
-
+
$last_module = $this->Application->GetVar('last_module');
if($last_module) $object->SetDBField('Module', $last_module);
-
+
if($event->Special == 'export' || $event->Special == 'import')
{
$object->SetDBField('PhraseType', '|0|1|2|');
$modules = $this->Conn->GetCol('SELECT Name FROM '.TABLE_PREFIX.'Modules');
$object->SetDBField('Module', '|'.implode('|', $modules).'|' );
}
}
-
+
/**
* Forces create to use live table
*
@@ -51,7 +62,7 @@
}
}
}
-
+
/**
* Save phrase change date & ip translation was made from
*
@@ -68,7 +79,7 @@
$object->SetDBField('LastChanged_time', adodb_mktime() );
$object->SetDBField('LastChangeIP', $ip_address);
}
-
+
$cookie_path = $this->Application->IsAdmin() ? BASE_PATH.'/admin' : BASE_PATH;
setcookie('last_module', $object->GetDBField('Module'), $cookie_path, '.'.SERVER_NAME);
}