Index: branches/unlabeled/unlabeled-1.15.2/kernel/units/admin/admin_config.php
===================================================================
diff -u -r6103 -r6257
--- branches/unlabeled/unlabeled-1.15.2/kernel/units/admin/admin_config.php	(.../admin_config.php)	(revision 6103)
+++ branches/unlabeled/unlabeled-1.15.2/kernel/units/admin/admin_config.php	(.../admin_config.php)	(revision 6257)
@@ -124,16 +124,6 @@
 																						'type'			=>	stTREE,
 																				),
 
-													/*'in-portal:service'	=>	Array(
-																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'conf_general',
-																						'label'			=>	'la_tab_Service',
-																						'url'			=>	Array('t' => 'tools/system_tools', 'pass' => 'm'),
-																						'permissions'	=>	Array('view'),
-																						'priority'		=>	10,
-																						'type'			=>	stTREE,
-																				),*/
-
 													'in-portal:backup'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
 																						'icon'			=>	'tool_backup',
@@ -198,4 +188,18 @@
 
 				);
 
+
+	$application =& kApplication::Instance();
+	if ($application->isDebugMode()) {
+				$config['Sections']['in-portal:service'] = Array(
+																						'parent'		=>	'in-portal:tools',
+																						'icon'			=>	'conf_general',
+																						'label'			=>	'la_tab_Service',
+																						'url'			=>	Array('t' => 'tools/system_tools', 'pass' => 'm'),
+																						'permissions'	=>	Array('view'),
+																						'priority'		=>	10,
+																						'type'			=>	stTREE,
+																				);
+	}
+
 ?>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.46.2/core/kernel/startup.php
===================================================================
diff -u -r5249 -r6257
--- branches/unlabeled/unlabeled-1.46.2/core/kernel/startup.php	(.../startup.php)	(revision 5249)
+++ branches/unlabeled/unlabeled-1.46.2/core/kernel/startup.php	(.../startup.php)	(revision 6257)
@@ -18,7 +18,7 @@
 
 	# New path detection method: begin
 	safeDefine('REL_PATH', '/admin');
-	$ps = preg_replace("/".preg_quote(rtrim(REL_PATH, '/'), '/')."$/", '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])));
+	$ps = rtrim(preg_replace("/".preg_quote(rtrim(REL_PATH, '/'), '/')."$/", '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
 	safeDefine('BASE_PATH', $ps); // in case in-portal has defined it before
 	# New path detection method: end
 
Index: branches/unlabeled/unlabeled-1.60.2/core/kernel/utility/debugger.php
===================================================================
diff -u -r6138 -r6257
--- branches/unlabeled/unlabeled-1.60.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 6138)
+++ branches/unlabeled/unlabeled-1.60.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 6257)
@@ -244,14 +244,14 @@
 							$div_width['left'] = round((($total - $total_before - $runtime) / $total) * $total_width);
 
 							$ret = '<b>Name</b>: '.$Data['description'].'<br />';
-							
+
 							if (isset($Data['file'])) {
 								$ret .= '[<b>Runtime</b>: '.$runtime.'s] [<b>File</b>: '.$Data['file'].']<br />';
 							}
 							else {
 							$ret .= '<b>Runtime</b>: '.$runtime.'s<br />';
 							}
-							
+
 							$ret .= '<div class="dbg_profiler" style="width: '.$div_width['before'].'px; border-right: 0px; background-color: #298DDF;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';
 							$ret .= '<div class="dbg_profiler" style="width: '.$div_width['current'].'px; border-left: 0px; border-right: 0px; background-color: #EF4A4A;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';
 							$ret .= '<div class="dbg_profiler" style="width: '.$div_width['left'].'px; border-left: 0px; background-color: #DFDFDF;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';
@@ -310,7 +310,7 @@
 			function print_r(&$array, $return_output = false, $cut_first = -1, $cut_min_length = -1)
 			{
 				static $first_line = true, $tab_count = -1;
-				
+
 				if (is_null($array)) {
 					return 'NULL';
 				}elseif (!is_array($array)) {
@@ -319,15 +319,15 @@
 					}
 					return $array;
 				}
-				
+
 				$output = '';
-				
+
 				$tab_count++;
 				$output .= "Array\n".str_repeat('    ', $tab_count)."(\n";
-				
+
 				$tab_count++;
 				$tabsign = $tab_count ? str_repeat('    ', $tab_count) : '';
-				
+
 				$array_keys = array_keys($array);
 
 				foreach ($array_keys as $key) {
@@ -348,11 +348,11 @@
 							}
 							$output .= $tabsign.'['.$key.'] = '.$array[$key]."\n";
 							break;
-						
+
 						case 'NULL':
 							$output .= $tabsign.'['.$key."] = NULL\n";
 							break;
-									
+
 						case 'object':
 							$attribute_names = get_class_vars( get_class($array[$key]) );
 							if (!$attribute_names) {
@@ -363,7 +363,7 @@
 									$output .= $tabsign.'['.$key.'] = SKIPPED (class: '.get_class($array[$key]).")\n";
 									break;
 								}
-								
+
 								// $attribute_value - default value for this attribute, not used here
 								foreach ($attribute_names as $attribute_name => $attribute_value) {
 									if (is_object($array[$key]->$attribute_name)) {
@@ -375,7 +375,7 @@
 												$output .= $tabsign.'['.$attribute_name.'] = SKIPPED (class: '.$object_class.")\n";
 												continue;
 											}
-											
+
 											array_push($this->RecursionStack, $object_class);
 											$output .= $this->print_r($array[$key]->$attribute_name, true, 50, 200);
 											array_pop($this->RecursionStack);
@@ -391,30 +391,30 @@
 								}
 							}
 							break;
-							
+
 						default:
 							$output .= $tabsign.'['.$key.'] unknown = '.gettype($array[$key])."\n";
 							break;
 					}
 				}
-				
+
 				$tab_count--;
 				$output .= str_repeat('    ', $tab_count).")\n";
-				
+
 				if ($first_line) {
 					$first_line = false;
 					$output .= "\n";
 				}
-				
+
 				$tab_count--;
-				
+
 				if ($return_output) {
 				return $output;
 				}
 				else {
 					echo $output;
 				}
-				
+
 				return true;
 			}
 
@@ -510,7 +510,7 @@
 			{
 				$trace = debug_backtrace();
 				array_shift($trace);
-				
+
 				$this->Data[] = Array('trace' => $trace, 'debug_type' => 'trace');
 			}
 
@@ -661,7 +661,7 @@
 					$this->ProfilerData[$key]['file'] = $trace_file.':'.$trace_results[$i]['line'];
 					unset($trace_results);
 				}
-				
+
 				$this->Data[] = Array('profile_key' => $key, 'debug_type' => 'profiler');
 			}
 
@@ -751,7 +751,7 @@
 					// don't print same report twice (in case if shutdown function used + compression + fatal error)
 					return '';
 				}
-				
+
 				$this->profileFinish('script_runtime');
 				$this->breakOutofBuffering();
 
@@ -766,12 +766,12 @@
 				// defined here, because user can define this contant while script is running, not event before debugger is started
 				$this->safeDefine('DBG_RAISE_ON_WARNINGS', 	0);
 				$this->safeDefine('DBG_TOOLBAR_BUTTONS', 	1);
-				
+
 				$this->appendSession(); // show php session if any
 
 				// ensure, that 1st line of debug output always is this one:
 				$top_line = '<table cellspacing="0" cellpadding="0" style="width: '.$this->getWindowWidth().'px; margin: 0px;"><tr><td align="left" width="50%">[<a href="javascript:window.location.reload();">Reload Frame</a>] [<a href="javascript:$Debugger.Toggle(27);">Hide Debugger</a>]</td><td align="right" width="50%">[Current Time: <b>'.date('H:i:s').'</b>] [File Size: <b>#DBG_FILESIZE#</b>]</td></tr></table>';
-				
+
 				$this->appendHTML($top_line);
 				$this->moveToBegin(1);
 
@@ -822,14 +822,14 @@
 						$this->appendHTML('<span class="error"><b>Grand Total:</b></span> '.' Mem: '.sprintf("%.4f Kb", ($totals['mem']+$totals_configs['mem'])/1024).' Time: '.sprintf("%.4f", $totals['time']+$totals_configs['time']));
 					}
 				}*/
-				
+
 				$is_ajax = isset($_GET['ajax']) && $_GET['ajax'] == 'yes';
 				$skip_reporting = $this->constOn('DBG_SKIP_REPORTING') || $this->constOn('DBG_ZEND_PRESENT');
-				
+
 				if ($is_ajax || !$skip_reporting) {
 					$debug_file = $this->tempFolder.'/debug_'.$this->rowSeparator.'.txt';
 					if (file_exists($debug_file)) unlink($debug_file);
-	
+
 					$i = 0;
 					$fp = fopen($debug_file, 'a');
 					$lineCount = count($this->Data);
@@ -839,13 +839,13 @@
 					}
 					fclose($fp);
 				}
-				
+
 				if ($skip_reporting) {
 					// let debugger write report and then don't output anything
 					$this->reportDone = true;
 					return '';
 				}
-				
+
 				ob_start();
 			?>
 					<html><body></body></html>
@@ -946,7 +946,7 @@
 							break;
 					}
 				}
-				
+
 				return '<br /><table class="dbg_stats_table"><tr><td style="border-color: #FFFFFF;"><table class="dbg_stats_table" align="left">'.$ret.'</table></td></tr></table>';
 			}
 
@@ -996,7 +996,7 @@
 					die( $this->breakOutofBuffering(false) . $this->printReport(true) );
 				}
 			}
-			
+
 			function breakOutofBuffering($flush = true)
 			{
 				$buffer_content = Array();
Index: branches/unlabeled/unlabeled-1.5.2/core/units/general/helpers/mod_rewrite_helper.php
===================================================================
diff -u -r6239 -r6257
--- branches/unlabeled/unlabeled-1.5.2/core/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 6239)
+++ branches/unlabeled/unlabeled-1.5.2/core/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 6257)
@@ -426,9 +426,9 @@
 				return $vars;
 			}
 
-			if ( $this->isModuleEnabled('In-Edit') && $this->Application->GetVar('admin') == 1) {
+			if ( $this->Application->isModuleEnabled('In-Edit') && $this->Application->GetVar('admin') == 1) {
 				$adm_ses =& $this->Application->recallObject('Session.admin');
-				$user = $admin_ses->RecallVar('user_id');
+				$user = $adm_ses->RecallVar('user_id');
 				$perm_helper =& $this->Application->recallObject('PermissionsHelper');
 				if ($perm_helper->CheckUserPermission($user, 'PAGE.ADD', 0)) {
 					$vars['t'] = implode('/', $url_parts);
Index: branches/unlabeled/unlabeled-1.21.2/index.php
===================================================================
diff -u -r6114 -r6257
--- branches/unlabeled/unlabeled-1.21.2/index.php	(.../index.php)	(revision 6114)
+++ branches/unlabeled/unlabeled-1.21.2/index.php	(.../index.php)	(revision 6257)
@@ -15,9 +15,9 @@
 
 //print_pre(get_included_files());
 
-function getmicrotime() 
-{ 
-    list($usec, $sec) = explode(" ", microtime()); 
-    return ((float)$usec + (float)$sec); 
-} 
+function getmicrotime()
+{
+    list($usec, $sec) = explode(" ", microtime());
+    return ((float)$usec + (float)$sec);
+}
 ?>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.18.2/core/units/general/helpers/permissions_helper.php
===================================================================
diff -u -r6235 -r6257
--- branches/unlabeled/unlabeled-1.18.2/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 6235)
+++ branches/unlabeled/unlabeled-1.18.2/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 6257)
@@ -305,6 +305,7 @@
 
 			if (!$this->Application->LoggedIn()) {
 				$redirect_template = $params['login_template'];
+				if (!$redirect_template && $this->Application->IsAdmin()) $redirect_template = 'login';
 				$redirect_params = Array('next_template' => $t);
 			}
 			else {
Index: branches/unlabeled/unlabeled-1.5.2/kernel/units/general/helpers/mod_rewrite_helper.php
===================================================================
diff -u -r6239 -r6257
--- branches/unlabeled/unlabeled-1.5.2/kernel/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 6239)
+++ branches/unlabeled/unlabeled-1.5.2/kernel/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 6257)
@@ -426,9 +426,9 @@
 				return $vars;
 			}
 
-			if ( $this->isModuleEnabled('In-Edit') && $this->Application->GetVar('admin') == 1) {
+			if ( $this->Application->isModuleEnabled('In-Edit') && $this->Application->GetVar('admin') == 1) {
 				$adm_ses =& $this->Application->recallObject('Session.admin');
-				$user = $admin_ses->RecallVar('user_id');
+				$user = $adm_ses->RecallVar('user_id');
 				$perm_helper =& $this->Application->recallObject('PermissionsHelper');
 				if ($perm_helper->CheckUserPermission($user, 'PAGE.ADD', 0)) {
 					$vars['t'] = implode('/', $url_parts);
Index: branches/unlabeled/unlabeled-1.18.2/kernel/units/general/helpers/permissions_helper.php
===================================================================
diff -u -r6235 -r6257
--- branches/unlabeled/unlabeled-1.18.2/kernel/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 6235)
+++ branches/unlabeled/unlabeled-1.18.2/kernel/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 6257)
@@ -305,6 +305,7 @@
 
 			if (!$this->Application->LoggedIn()) {
 				$redirect_template = $params['login_template'];
+				if (!$redirect_template && $this->Application->IsAdmin()) $redirect_template = 'login';
 				$redirect_params = Array('next_template' => $t);
 			}
 			else {
Index: branches/unlabeled/unlabeled-1.71.2/admin/install/inportal_data.sql
===================================================================
diff -u -r6143 -r6257
--- branches/unlabeled/unlabeled-1.71.2/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 6143)
+++ branches/unlabeled/unlabeled-1.71.2/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 6257)
@@ -239,7 +239,7 @@
 INSERT INTO ItemTypes VALUES (1, 'In-Portal', 'c', 'Category', 'Name', 'CreatedById', NULL, NULL, 'la_ItemTab_Categories', 1, 'admin/category/addcategory.php', 'clsCategory', 'Category');
 INSERT INTO ItemTypes VALUES (6, 'In-Portal', 'u', 'PortalUser', 'Login', 'PortalUserId', NULL, NULL, '', 0, '', 'clsPortalUser', 'User');
 
-INSERT INTO Modules (Name, Path, Var, Version, Loaded, LoadOrder, TemplatePath, RootCat, BuildDate) VALUES ('In-Portal', 'kernel/', 'm', '1.2.1', 1, 0, '', 0, '1054738405');
+INSERT INTO Modules (Name, Path, Var, Version, Loaded, LoadOrder, TemplatePath, RootCat, BuildDate) VALUES ('In-Portal', 'kernel/', 'm', '1.3.0', 1, 0, '', 0, '1054738405');
 
 INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.VIEW', 'lu_PermName_Category.View_desc', 'lu_PermName_Category.View_error', 'In-Portal');
 INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.ADD', 'lu_PermName_Category.Add_desc', 'lu_PermName_Category.Add_error', 'In-Portal');
Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt
===================================================================
diff -u
--- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt	(revision 0)
+++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt	(revision 6257)
@@ -0,0 +1,64 @@
+File in-portal/index.php changed
+File in-portal/admin/advanced_view.php is removed; release_1_2_1 revision 1.25
+File in-portal/admin/browse.php is removed; release_1_2_1 revision 1.35
+File in-portal/admin/install.php changed
+File in-portal/admin/category/addcategory.php is removed; release_1_2_1 revision 1.20
+File in-portal/admin/category/addcategory_custom.php is removed; release_1_2_1 revision 1.14
+File in-portal/admin/category/addcategory_customfields.php is removed; release_1_2_1 revision 1.5
+File in-portal/admin/category/addcategory_images.php is removed; release_1_2_1 revision 1.9
+File in-portal/admin/category/addcategory_permissions.php is removed; release_1_2_1 revision 1.11
+File in-portal/admin/category/addcategory_relations.php is removed; release_1_2_1 revision 1.8
+File in-portal/admin/category/addimage.php is removed; release_1_2_1 revision 1.9
+File in-portal/admin/category/addpermission.php is removed; release_1_2_1 revision 1.9
+File in-portal/admin/category/addpermission_modules.php is removed; release_1_2_1 revision 1.10
+File in-portal/admin/category/addrelation.php is removed; release_1_2_1 revision 1.8
+File in-portal/admin/category/category_items.php is removed; release_1_2_1 revision 1.4
+File in-portal/admin/category/category_maint.php is removed; release_1_2_1 revision 1.23.32.1
+File in-portal/admin/category/permcacheupdate.php is removed; release_1_2_1 revision 1.10
+File in-portal/admin/category/images/ddarrow.gif is removed; release_1_2_1 revision 1.1
+File in-portal/admin/category/images/ddarrow_active.gif is removed; release_1_2_1 revision 1.1
+File in-portal/admin/category/images/ddarrow_over.gif is removed; release_1_2_1 revision 1.1
+File in-portal/admin/category/js/core.js is removed; release_1_2_1 revision 1.1
+File in-portal/admin/category/js/lang.js is removed; release_1_2_1 revision 1.1
+File in-portal/admin/category/js/main.js is removed; release_1_2_1 revision 1.1
+File in-portal/admin/install/inportal_data.sql changed
+File in-portal/admin/install/install_lib.php changed
+File in-portal/admin/install/upgrades/inportal_upgrade_v1.3.0.sql is new; release_1_3_0 revision 1.1.2.1
+File in-portal/kernel/admin/advanced_view.php is removed; release_1_2_1 revision 1.4
+File in-portal/kernel/admin/include/toolbar/advanced_view.php is removed; release_1_2_1 revision 1.11.2.1
+File in-portal/kernel/admin/include/toolbar/browse.php is removed; release_1_2_1 revision 1.17.2.1
+File in-portal/kernel/admin/include/toolbar/editcategory_permissions.php is removed; release_1_2_1 revision 1.1
+File in-portal/kernel/admin/include/toolbar/editcategory_relations.php is removed; release_1_2_1 revision 1.2
+File in-portal/kernel/admin/include/toolbar/editcategory_relationselect.php is removed; release_1_2_1 revision 1.6.2.1
+File in-portal/kernel/admin/include/toolbar/editgroup_permissions.php is removed; release_1_2_1 revision 1.1
+File in-portal/kernel/admin/include/toolbar/editgroup_users.php is removed; release_1_2_1 revision 1.1
+File in-portal/kernel/admin_templates/incs/config_blocks.tpl changed
+File in-portal/kernel/admin_templates/regional/phrases_edit.tpl changed
+File in-portal/kernel/admin_templates/tools/system_tools.tpl changed
+File in-portal/kernel/include/image.php changed
+File in-portal/kernel/include/modules.php changed
+File in-portal/kernel/units/admin/admin_config.php changed
+File in-portal/kernel/units/configuration/configuration_event_handler.php changed
+File in-portal/kernel/units/email_events/email_events_event_handler.php changed
+File in-portal/kernel/units/general/cat_event_handler.php changed
+File in-portal/kernel/units/general/cat_tag_processor.php changed
+File in-portal/kernel/units/general/inp_ses_storage.php changed
+File in-portal/kernel/units/general/helpers/mod_rewrite_helper.php changed
+File in-portal/kernel/units/general/helpers/permissions_helper.php changed
+File in-portal/kernel/units/users/users_event_handler.php changed
+File kernel4_dev/kernel4/application.php changed
+File kernel4_dev/kernel4/event_manager.php changed
+File kernel4_dev/kernel4/startup.php changed
+File kernel4_dev/kernel4/db/db_event_handler.php changed
+File kernel4_dev/kernel4/db/db_tag_processor.php changed
+File kernel4_dev/kernel4/processors/main_processor.php changed
+File kernel4_dev/kernel4/session/session.php changed
+File kernel4_dev/kernel4/utility/debugger.php changed
+File kernel4_dev/kernel4/utility/formatters/password_formatter.php changed
+File cmseditor/fckeditor.js changed
+File cmseditor/editor/filemanager/browser/default/connectors/php/commands.php changed
+
+
+Changes in phrases and events:
+
+
Index: branches/unlabeled/unlabeled-1.15.2/core/units/admin/admin_config.php
===================================================================
diff -u -r6103 -r6257
--- branches/unlabeled/unlabeled-1.15.2/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 6103)
+++ branches/unlabeled/unlabeled-1.15.2/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 6257)
@@ -124,16 +124,6 @@
 																						'type'			=>	stTREE,
 																				),
 
-													/*'in-portal:service'	=>	Array(
-																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'conf_general',
-																						'label'			=>	'la_tab_Service',
-																						'url'			=>	Array('t' => 'tools/system_tools', 'pass' => 'm'),
-																						'permissions'	=>	Array('view'),
-																						'priority'		=>	10,
-																						'type'			=>	stTREE,
-																				),*/
-
 													'in-portal:backup'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
 																						'icon'			=>	'tool_backup',
@@ -198,4 +188,18 @@
 
 				);
 
+
+	$application =& kApplication::Instance();
+	if ($application->isDebugMode()) {
+				$config['Sections']['in-portal:service'] = Array(
+																						'parent'		=>	'in-portal:tools',
+																						'icon'			=>	'conf_general',
+																						'label'			=>	'la_tab_Service',
+																						'url'			=>	Array('t' => 'tools/system_tools', 'pass' => 'm'),
+																						'permissions'	=>	Array('view'),
+																						'priority'		=>	10,
+																						'type'			=>	stTREE,
+																				);
+	}
+
 ?>
\ No newline at end of file