Fisheye: Tag 4065 refers to a dead (removed) revision in file `trunk/admin/config/edit_customfields.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4065 refers to a dead (removed) revision in file `trunk/admin/config/addlang_labels.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/admin/editor/FCKeditor/filemanager/upload/php/upload.php
===================================================================
diff -u -r2569 -r4065
--- trunk/admin/editor/FCKeditor/filemanager/upload/php/upload.php	(.../upload.php)	(revision 2569)
+++ trunk/admin/editor/FCKeditor/filemanager/upload/php/upload.php	(.../upload.php)	(revision 4065)
@@ -20,6 +20,7 @@
 
 // Init var :
 
+// OLD STARTUP
 if( !(isset($pathtoroot) && $pathtoroot) )
 
 {
Fisheye: Tag 4065 refers to a dead (removed) revision in file `trunk/admin/config/importlang.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/core/units/users/users_item.php
===================================================================
diff -u -r3907 -r4065
--- trunk/core/units/users/users_item.php	(.../users_item.php)	(revision 3907)
+++ trunk/core/units/users/users_item.php	(.../users_item.php)	(revision 4065)
@@ -1,62 +1,8 @@
 <?php
 	class UsersItem extends kDBItem {
-		
-		var $CustomFields = Array();
+
 		var $persistantVars = Array();
 		
-		function Init($prefix, $special, $event_params = null)
-		{
-			parent::Init($prefix, $special, $event_params);
-			
-			$item_type = $this->Application->getUnitOption($this->Prefix, 'ItemType');
-			$sql = 'SELECT CustomFieldId, FieldName FROM '.TABLE_PREFIX.'CustomField WHERE Type = %s';
-			$this->CustomFields = $this->Conn->GetCol( sprintf($sql, $item_type), 'FieldName' );
-		}
-		
-		
-		function defineFields()
-		{
-			parent::defineFields();
-			
-			// add custom fields definitions (as virtual fields)
-			$add_fields = Array();
-			$custom_field_options = Array('default' => '', 'not_null' => 1);
-			foreach ($this->CustomFields as $custom_field => $custom_id)
-			{
-				$add_fields[$custom_field] = $custom_field_options;
-			}
-			
-			if($add_fields)
-			{
-				$add_fields = array_merge_recursive2($add_fields, $this->VirtualFields);
-				$this->setVirtualFields($add_fields);
-			}
-		}
-	
-		/**
-		 * Load custom fields values as virtual fields for dbitem
-		 *
-		 * @return bool
-		 */
-		function LoadCustomFields()
-		{
-			if (!$this->CustomFields) return false;
-			
-			$custom_ids = implode(',', $this->CustomFields);
-			$sql = 'SELECT Value, CustomFieldId
-					FROM '.TABLE_PREFIX.'CustomMetaData 
-					WHERE ResourceId = '.$this->GetDBField('ResourceId').' AND CustomFieldId IN ('.$custom_ids.')';
-			$custom_values = $this->Conn->GetCol($sql, 'CustomFieldId');
-			if (!$custom_values) return false;
-			
-			$custom_fields = array_flip($this->CustomFields);
-			foreach ($custom_values as $custom_id => $custom_value)
-			{
-				$this->SetDBField($custom_fields[$custom_id], $custom_value);
-			}
-			return true;
-		}
-		
 		function LoadPersistantVars()
 		{
 			$sql = 'SELECT VariableValue, VariableName
@@ -81,41 +27,10 @@
 			return getArrayValue($this->persistantVars, $var_name);
 		}
 		
-		function UpdateCustomFields()
-		{
-			$data_table = TABLE_PREFIX.'CustomMetaData';
-			
-			// get values already written, to find their ids
-			$sql = 'SELECT CustomDataId, CustomFieldId
-					FROM '.$data_table.'
-					WHERE ResourceId = '.$this->GetDBField('ResourceId');
-			$custom_value_ids = $this->Conn->GetCol($sql, 'CustomFieldId');
-			$sql = 'REPLACE INTO '.$data_table.'(CustomDataId,ResourceId,CustomFieldId,Value) VALUES (%1$s,%2$s,%3$s,%4$s)';
-			
-			foreach ($this->CustomFields as $custom_field => $custom_id)
-			{
-				$data_id =  isset($custom_value_ids[$custom_id]) ? $custom_value_ids[$custom_id] : 0;
-				$custom_value = $this->GetDBField($custom_field);
-				
-				if (!$custom_value && $data_id)
-				{
-					$temp_sql = 'DELETE FROM '.$data_table.' WHERE CustomDataId = '.$data_id;
-					$this->Conn->Query($temp_sql);	
-				}
-				elseif($custom_value)
-				{
-					$temp_sql = sprintf($sql, $data_id, $this->GetDBField('ResourceId'), $custom_id, $this->Conn->qstr( $this->GetDBField($custom_field) ) );
-					$this->Conn->Query($temp_sql);	
-				}
-			}
-		}
-		
 		function Load($id, $id_field_name = null)
 		{
 			$ret = parent::Load($id, $id_field_name);
-			if($ret)
-			{
-				$this->LoadCustomFields();
+			if ($ret) {
 				$this->LoadPersistantVars();
 			}
 			return $ret;
@@ -184,10 +99,7 @@
 		function Create($force_id=false, $system_create=false)
 		{
 			$ret = parent::Create($force_id, $system_create);
-			if ($ret)
-			{
-				$this->UpdateCustomFields();
-				
+			if ($ret) {
 				// find out how to syncronize user only when it's copied to live table
 				$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize');
 				$sync_manager->performAction('createUser', $this->FieldValues);
@@ -199,10 +111,7 @@
 		function Update($id=null, $system_update=false)
 		{
 			$ret = parent::Update($id, $system_update);
-			if ($ret)
-			{
-				$this->UpdateCustomFields();
-				
+			if ($ret) {
 				// find out how to syncronize user only when it's copied to live table
 				$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize');
 				$sync_manager->performAction('updateUser', $this->FieldValues);
@@ -219,9 +128,7 @@
 		function Delete($id = null)
 		{
 			$ret = parent::Delete($id);
-			
-			if ($ret)
-			{
+			if ($ret) {
 				$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize');
 				$sync_manager->performAction('deleteUser', $this->FieldValues);
 			}
Fisheye: Tag 4065 refers to a dead (removed) revision in file `trunk/admin/config/config_search.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/units/users/users_item.php
===================================================================
diff -u -r3907 -r4065
--- trunk/kernel/units/users/users_item.php	(.../users_item.php)	(revision 3907)
+++ trunk/kernel/units/users/users_item.php	(.../users_item.php)	(revision 4065)
@@ -1,62 +1,8 @@
 <?php
 	class UsersItem extends kDBItem {
-		
-		var $CustomFields = Array();
+
 		var $persistantVars = Array();
 		
-		function Init($prefix, $special, $event_params = null)
-		{
-			parent::Init($prefix, $special, $event_params);
-			
-			$item_type = $this->Application->getUnitOption($this->Prefix, 'ItemType');
-			$sql = 'SELECT CustomFieldId, FieldName FROM '.TABLE_PREFIX.'CustomField WHERE Type = %s';
-			$this->CustomFields = $this->Conn->GetCol( sprintf($sql, $item_type), 'FieldName' );
-		}
-		
-		
-		function defineFields()
-		{
-			parent::defineFields();
-			
-			// add custom fields definitions (as virtual fields)
-			$add_fields = Array();
-			$custom_field_options = Array('default' => '', 'not_null' => 1);
-			foreach ($this->CustomFields as $custom_field => $custom_id)
-			{
-				$add_fields[$custom_field] = $custom_field_options;
-			}
-			
-			if($add_fields)
-			{
-				$add_fields = array_merge_recursive2($add_fields, $this->VirtualFields);
-				$this->setVirtualFields($add_fields);
-			}
-		}
-	
-		/**
-		 * Load custom fields values as virtual fields for dbitem
-		 *
-		 * @return bool
-		 */
-		function LoadCustomFields()
-		{
-			if (!$this->CustomFields) return false;
-			
-			$custom_ids = implode(',', $this->CustomFields);
-			$sql = 'SELECT Value, CustomFieldId
-					FROM '.TABLE_PREFIX.'CustomMetaData 
-					WHERE ResourceId = '.$this->GetDBField('ResourceId').' AND CustomFieldId IN ('.$custom_ids.')';
-			$custom_values = $this->Conn->GetCol($sql, 'CustomFieldId');
-			if (!$custom_values) return false;
-			
-			$custom_fields = array_flip($this->CustomFields);
-			foreach ($custom_values as $custom_id => $custom_value)
-			{
-				$this->SetDBField($custom_fields[$custom_id], $custom_value);
-			}
-			return true;
-		}
-		
 		function LoadPersistantVars()
 		{
 			$sql = 'SELECT VariableValue, VariableName
@@ -81,41 +27,10 @@
 			return getArrayValue($this->persistantVars, $var_name);
 		}
 		
-		function UpdateCustomFields()
-		{
-			$data_table = TABLE_PREFIX.'CustomMetaData';
-			
-			// get values already written, to find their ids
-			$sql = 'SELECT CustomDataId, CustomFieldId
-					FROM '.$data_table.'
-					WHERE ResourceId = '.$this->GetDBField('ResourceId');
-			$custom_value_ids = $this->Conn->GetCol($sql, 'CustomFieldId');
-			$sql = 'REPLACE INTO '.$data_table.'(CustomDataId,ResourceId,CustomFieldId,Value) VALUES (%1$s,%2$s,%3$s,%4$s)';
-			
-			foreach ($this->CustomFields as $custom_field => $custom_id)
-			{
-				$data_id =  isset($custom_value_ids[$custom_id]) ? $custom_value_ids[$custom_id] : 0;
-				$custom_value = $this->GetDBField($custom_field);
-				
-				if (!$custom_value && $data_id)
-				{
-					$temp_sql = 'DELETE FROM '.$data_table.' WHERE CustomDataId = '.$data_id;
-					$this->Conn->Query($temp_sql);	
-				}
-				elseif($custom_value)
-				{
-					$temp_sql = sprintf($sql, $data_id, $this->GetDBField('ResourceId'), $custom_id, $this->Conn->qstr( $this->GetDBField($custom_field) ) );
-					$this->Conn->Query($temp_sql);	
-				}
-			}
-		}
-		
 		function Load($id, $id_field_name = null)
 		{
 			$ret = parent::Load($id, $id_field_name);
-			if($ret)
-			{
-				$this->LoadCustomFields();
+			if ($ret) {
 				$this->LoadPersistantVars();
 			}
 			return $ret;
@@ -184,10 +99,7 @@
 		function Create($force_id=false, $system_create=false)
 		{
 			$ret = parent::Create($force_id, $system_create);
-			if ($ret)
-			{
-				$this->UpdateCustomFields();
-				
+			if ($ret) {
 				// find out how to syncronize user only when it's copied to live table
 				$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize');
 				$sync_manager->performAction('createUser', $this->FieldValues);
@@ -199,10 +111,7 @@
 		function Update($id=null, $system_update=false)
 		{
 			$ret = parent::Update($id, $system_update);
-			if ($ret)
-			{
-				$this->UpdateCustomFields();
-				
+			if ($ret) {
 				// find out how to syncronize user only when it's copied to live table
 				$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize');
 				$sync_manager->performAction('updateUser', $this->FieldValues);
@@ -219,9 +128,7 @@
 		function Delete($id = null)
 		{
 			$ret = parent::Delete($id);
-			
-			if ($ret)
-			{
+			if ($ret) {
 				$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize');
 				$sync_manager->performAction('deleteUser', $this->FieldValues);
 			}
Fisheye: Tag 4065 refers to a dead (removed) revision in file `trunk/admin/config/config_lang.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4065 refers to a dead (removed) revision in file `trunk/admin/config/addlang_email.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/admin/subitems.php
===================================================================
diff -u -r3021 -r4065
--- trunk/admin/subitems.php	(.../subitems.php)	(revision 3021)
+++ trunk/admin/subitems.php	(.../subitems.php)	(revision 4065)
@@ -1,29 +1,11 @@
 <?php
 	
-	// KENEL4 INIT: BEGIN
-	define('ADMIN', 1);
-	define('FULL_PATH', realpath(dirname(__FILE__).'/..') );
-	define('APPLICATION_CLASS', 'MyApplication');
-	include_once(FULL_PATH.'/kernel/kernel4/startup.php');
-	$application =& kApplication::Instance();
-	$application->Init();
-	// KERNEL4 INI: END
-
-	// IN-PORTAL INIT: BEGIN
-	$g_TablePrefix = TABLE_PREFIX;
-	$pathtoroot = FULL_PATH.'/';
+	// new startup: begin
+	define('REL_PATH', 'admin');
+	$relation_level = count( explode('/', REL_PATH) );
+	define('FULL_PATH', realpath(dirname(__FILE__) . str_repeat('/..', $relation_level) ) );
 	require_once FULL_PATH.'/kernel/startup.php';
-	// IN-PORTAL INIT: END
-
-	$rootURL = $application->BaseURL();
-	$admin = ADMIN_DIR;
-
-	$localURL = $rootURL.'kernel/';
-	$adminURL = $rootURL.$admin;
-	$imagesURL = $adminURL.'/images';
-
-	$cssURL = $adminURL.'/include';
-	$jsURL = $adminURL.'/include/subitems';
+	// new startup: end
 	
 	//admin only util
 	$pathtolocal = $pathtoroot.'kernel/';
Index: trunk/compat.php
===================================================================
diff -u -r13 -r4065
--- trunk/compat.php	(.../compat.php)	(revision 13)
+++ trunk/compat.php	(.../compat.php)	(revision 4065)
@@ -1,5 +1,5 @@
 <?php
-  $dir = $pathtoroot."/compat/";
+  $dir = FULL_PATH.'/compat/';
 
   if (is_dir($dir)) 
   {
Fisheye: Tag 4065 refers to a dead (removed) revision in file `trunk/admin/config/addlang.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/admin/editor/FCKeditor/css/fck_editorarea.php
===================================================================
diff -u -r2569 -r4065
--- trunk/admin/editor/FCKeditor/css/fck_editorarea.php	(.../fck_editorarea.php)	(revision 2569)
+++ trunk/admin/editor/FCKeditor/css/fck_editorarea.php	(.../fck_editorarea.php)	(revision 4065)
@@ -12,6 +12,8 @@
 ##	   result in revocation of the license and support		##
 ##	 privileges along maximum prosecution allowed by law.	##
 ##############################################################
+
+// OLD STARTUP
 if( !(isset($pathtoroot) && $pathtoroot) )
 {
   $path=dirname(realpath(__FILE__));
Index: trunk/admin/listview/listview.php
===================================================================
diff -u -r3471 -r4065
--- trunk/admin/listview/listview.php	(.../listview.php)	(revision 3471)
+++ trunk/admin/listview/listview.php	(.../listview.php)	(revision 4065)
@@ -1,7 +1,8 @@
 <?php
-require($pathtoroot.$admin."/listview/columnheader.php");
-require($pathtoroot.$admin."/listview/viewmenu.php");
 
+require_once FULL_PATH.'/admin/listview/columnheader.php';
+require_once FULL_PATH.'/admin/listview/viewmenu.php';
+
 class clsListView 
 {
     var $Formatters = Array(); // formatters to apply while printing list
Fisheye: Tag 4065 refers to a dead (removed) revision in file `trunk/admin/config/addlang_export.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/admin/include/navmenu.php
===================================================================
diff -u -r4052 -r4065
--- trunk/kernel/admin/include/navmenu.php	(.../navmenu.php)	(revision 4052)
+++ trunk/kernel/admin/include/navmenu.php	(.../navmenu.php)	(revision 4065)
@@ -144,13 +144,6 @@
                          NULL, "in-portal:system", "in-portal:configure_themes", 'in-portal:configure_lang',0,"",1,
 						NULL,NULL,NULL,$module_images.'/icons/icon46_list_style.gif');
 
-/*
-$objSections->AddSection("in-portal:configure_lang", "la_tab_Regional", "la_tab_Regional", $admin."/config/","config_lang.php",
-                         $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif",
-                         NULL, "in-portal:system", "in-portal:configure_themes", "in-portal:configure_lang_new", 0,"",1,
-						NULL,NULL,NULL,$admin."/icons/icon46_list_conf_regional.gif");
-*/
-
 $objSections->AddSection("in-portal:configure_lang", "la_tab_Regional", "la_tab_Regional",
 						$admin.'/index4.php','kernel4:regional/languages_list.tpl',
                          $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif",
@@ -169,34 +162,6 @@
                          $admin."/icons/icon46_conf_themes.gif", $admin."/icons/icon24_conf_themes.gif",
                          NULL, "in-portal:configure_themes", "in-portal:theme_general",NULL,-1);
 
-/*language tabs */
-$objSections->AddSection("in-portal:lang_general", "la_tab_General", NULL, $admin."/config/",
-                         "javascript:edit_submit('language','LangEditStatus','".$admin."/config/addlang.php',0);",
-                         $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif",
-                         NULL, "in-portal:configure_lang", NULL, "in-portal:lang_labels",-1);
-
-$objSections->AddSection("in-portal:lang_labels", "la_tab_Labels", NULL, $admin."/config/",
-                         "javascript:edit_submit('language','LangEditStatus','".$admin."/config/addlang_labels.php',0);",
-                         $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif",
-                         NULL, "in-portal:configure_lang", "in-portal:lang_general", "in-portal:lang_email",-1);
-
-$objSections->AddSection("in-portal:lang_email", "la_tab_EmailEvents", NULL, $admin."/config/",
-                         "javascript:edit_submit('language','LangEditStatus','".$admin."/config/addlang_email.php',0);",
-                         $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif",
-                         NULL, "in-portal:configure_lang", "in-portal:lang_labels", NULL,-1);
-
-
-$objSections->AddSection("in-portal:lang_import", "la_tab_ImportLang",  "la_tab_ImportLang", $admin."/config/",
-                         "javascript:edit_submit('language','LangEditStatus','".$admin."/config/addlang.php',0);",
-                         $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif",
-                         NULL, NULL, NULL, NULL,-1);
-
-$objSections->AddSection("in-portal:lang_export", "la_tab_ExportLang",  "la_tab_ExportLang", $admin."/config/",
-                         "javascript:edit_submit('language','LangEditStatus','".$admin."/config/addlang.php',0);",
-                         $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif",
-                         NULL, NULL, NULL, NULL,-1, "", 1);
-
-
 /*Community Section tree items */
 $objSections->AddSection("in-portal:user_list","la_tab_User_List","la_tab_User_List",$admin."/users/","user_list.php?resetpage=1",
                          $admin."/icons/icon46_users.gif",$admin."/icons/icon24_users.gif",
Index: trunk/kernel/startup.php
===================================================================
diff -u -r3830 -r4065
--- trunk/kernel/startup.php	(.../startup.php)	(revision 3830)
+++ trunk/kernel/startup.php	(.../startup.php)	(revision 4065)
@@ -46,7 +46,11 @@
 		$pathchar	=	'/';
 		// KERNEL4 INIT: END
 		$k4_path_detection = true;
+		define('OLD_STARTUP', 0);
 	}
+	else {
+		define('OLD_STARTUP', 1);
+	}
 
 if(!get_magic_quotes_gpc())
 {
Fisheye: Tag 4065 refers to a dead (removed) revision in file `trunk/admin/config/addcustomfield.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4065 refers to a dead (removed) revision in file `trunk/admin/config/addlang_export_result.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4065 refers to a dead (removed) revision in file `trunk/admin/config/importlang_progress.php'.
Fisheye: No comparison available.  Pass `N' to diff?