[eGroupWare-svn] r23356 - in /trunk/jinn: inc/class.ui_importsite.inc.php plugins/db_fields_plugins/__default_date/class.default_date.php

[<mi...@us...>]

Author: mipmip
Date: Wed Jan 31 12:18:19 2007
New Revision: 23356

URL: http://www.egroupware.org/viewvc?rev=3D3D23356&view=3D3Drev
Log:
fix def date plugin
replace referenced session var to sessionmanager var which fixes the site i=
=3D
mport functionality

Modified:
    trunk/jinn/inc/class.ui_importsite.inc.php
    trunk/jinn/plugins/db_fields_plugins/__default_date/class.default_date.=
=3D
php

Modified: trunk/jinn/inc/class.ui_importsite.inc.php
URL: http://www.egroupware.org/viewvc/trunk/jinn/inc/class.ui_importsite.in=
=3D
c=2Ephp?rev=3D3D23356&r1=3D3D23355&r2=3D3D23356&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/jinn/inc/class.ui_importsite.inc.php (original)
+++ trunk/jinn/inc/class.ui_importsite.inc.php Wed Jan 31 12:18:19 2007
@@ -42,6 +42,7 @@
 		 $this->bo =3D3D CreateObject('jinn.boadmin');
 		 parent::uijinn();
 =3D

+
 		 $this->ignorefields =3D3D array('uniqid','fields','reports','parent_sit=
e_=3D
id');
 		 $this->app_title =3D3D lang('Administrator Mode');
 =3D

@@ -60,7 +61,6 @@
 		 {
 			$import_into=3D3D$_POST['import_into'];
 		 }
-		 //	 die($import_into);
 =3D

 		 if (is_array($_FILES['importfile']) || is_file($_POST['newtemp']))
 		 {
@@ -118,7 +118,7 @@
 			   fclose($dataFile);
 			}
 		 }
-		 elseif(is_array($this->bo->session['tmp']))
+		 elseif(is_array($this->bo->sessionmanager->sessionarray['tmp']))
 		 {
 			$this->load_site_from_file();
 		 }
@@ -127,7 +127,7 @@
 			$this->import_form($import_into);
 		 }
 =3D

-		 $this->bo->sessionmanager->save();
+		 //$this->bo->sessionmanager->save();
 	  }
 =3D

 	  function import_into()
@@ -212,7 +212,6 @@
 		 $import_site_files		=3D3D $xmlarray['jinn']['site_files'];
 		 $import_site_objects	=3D3D $xmlarray['jinn']['site'][0]['objects'];
 =3D

-		 //		 if(!$_POST['objects_selected'])
 		 if(!$replace && !$_POST['objects_selected'])
 		 {
 			$this->select_objects($import_site_objects,$into_site_id);
@@ -253,7 +252,6 @@
 =3D

 		 $this->bo->addInfo(lang('%1 Site Objects have been imported.',$this->nu=
=3D
m_objects));
 		 $this->bo->addInfo(lang('%1 Site Object Fields have been imported.',$th=
=3D
is->num_fields));
-		 //		 $this->bo->addInfo(lang('%1 Site Reports have been imported.',$thi=
=3D
s->num_reports));
 =3D

 		 $this->bo->addInfo(lang('Import was succesfull'));
 		 return true;
@@ -267,10 +265,10 @@
 	  */
 	  function load_site_from_file()
 	  {
+
 		 if($_POST['incompatibility_ok'] =3D3D=3D3D '') //check if the admin has=
 spe=3D
cifically ok-ed this import. If not, unload the loaded file
 		 {
-			unset($this->bo->session['tmp']);
-
+			unset($this->bo->sessionmanager->sessionarray['tmp']);
 			$this->bo->sessionmanager->save();
 		 }
 =3D

@@ -281,15 +279,15 @@
 =3D

 		 if(!($import_site && $checkbit))
 		 {	=3D

-			if($this->bo->session['tmp']['import_site'] && $this->bo->session['tmp'=
=3D
]['checkbit'])
-			{
-			   $import_site 			=3D3D $this->bo->session['tmp']['import_site'];
-			   $import_site_objects 	=3D3D $this->bo->session['tmp']['import_site_o=
bj=3D
ects'];
-			   $import_obj_fields		=3D3D $this->bo->session['tmp']['import_obj_fiel=
ds=3D
'];
-			   $import_reports 			=3D3D $this->bo->session['tmp']['import_reports'];
-			   $checkbit    			=3D3D $this->bo->session['tmp']['checkbit'];
+			if($this->bo->sessionmanager->sessionarray['tmp']['import_site'] && $th=
=3D
is->bo->sessionmanager->sessionarray['tmp']['checkbit'])
+			{
+			   $import_site 			=3D3D $this->bo->sessionmanager->sessionarray['tmp']=
['=3D
import_site'];
+			   $import_site_objects 	=3D3D $this->bo->sessionmanager->sessionarray[=
't=3D
mp']['import_site_objects'];
+			   $import_obj_fields		=3D3D $this->bo->sessionmanager->sessionarray['t=
mp=3D
']['import_obj_fields'];
+			   $import_reports 			=3D3D $this->bo->sessionmanager->sessionarray['tm=
p'=3D
]['import_reports'];
+			   $checkbit    			=3D3D $this->bo->sessionmanager->sessionarray['tmp']=
['=3D
checkbit'];
 			   $check_versions =3D3D false;
-			   unset($this->bo->session['tmp']);
+			   unset($this->bo->sessionmanager->sessionarray['tmp']);
 			   $this->bo->sessionmanager->save();
 			}
 		 }
@@ -298,21 +296,21 @@
 		 {
 			if(!$this->check_version($import_site['jinn_version'],$check_versions))
 			{
-			   $this->bo->session['tmp']['file'] 				=3D3D $import['name']; =3D

-			   $this->bo->session['tmp']['replace']				=3D3D $_POST['replace_existi=
ng=3D
'];
-			   $this->bo->session['tmp']['import_site'] 		=3D3D $import_site; =3D

-			   $this->bo->session['tmp']['import_site_objects']	=3D3D $import_site_=
ob=3D
jects; =3D

-			   $this->bo->session['tmp']['import_obj_fields'] 	=3D3D $import_obj_fi=
el=3D
ds; =3D

-			   $this->bo->session['tmp']['import_reports'] 		=3D3D $import_reports;=
 =3D

-			   $this->bo->session['tmp']['checkbit'] 			=3D3D $checkbit; =3D

-
-			   $this->bo->exit_and_open_screen('jinn.ui_importsite.import_incompati=
=3D
ble_egw_jinn_site');
+			   $this->bo->sessionmanager->sessionarray['tmp']['file'] 				=3D3D $im=
po=3D
rt['name']; =3D

+			   $this->bo->sessionmanager->sessionarray['tmp']['replace']				=3D3D $=
_P=3D
OST['replace_existing'];
+			   $this->bo->sessionmanager->sessionarray['tmp']['import_site'] 		=3D3=
D =3D
$import_site; =3D

+			   $this->bo->sessionmanager->sessionarray['tmp']['import_site_objects'=
=3D
]	=3D3D $import_site_objects; =3D

+			   $this->bo->sessionmanager->sessionarray['tmp']['import_obj_fields'] =
=3D
	=3D3D $import_obj_fields; =3D

+			   $this->bo->sessionmanager->sessionarray['tmp']['import_reports'] 		=
=3D
=3D3D $import_reports; =3D

+			   $this->bo->sessionmanager->sessionarray['tmp']['checkbit'] 			=3D3D =
$c=3D
heckbit; =3D

+
+			   $this->import_incompatible_egw_jinn_site();
+			   exit;
 			}
 =3D

 			if($new_site_id =3D3D $this->save_site($import_site,$_POST['replace_exi=
st=3D
ing']))
 			{
 			   $proceed=3D3Dtrue;
-			   //return false;
 			}
 =3D

 			if($proceed)
@@ -336,8 +334,10 @@
 			   $this->bo->exit_and_open_screen('jinn.ui_listsites.browse_egw_jinn_s=
=3D
ites');
 			}
 		 }
-
-		 $this->bo->sessionmanager->save();
+		 else
+		 {
+			$this->bo->exit_and_open_screen('jinn.ui_listsites.browse_egw_jinn_site=
=3D
s');
+		 }
 	  }
 =3D

 	  function site_name_exist($site_name)
@@ -478,7 +478,6 @@
 			$newid=3D3D$this->bo->so->generate_unique_id();
 			$oldid=3D3D$object['object_id'];
 			$object_old2new_id_arr[$oldid]=3D3D$newid;
-			//$object_new2old_id_arr[$newid]=3D3D$oldid;
 		 }
 =3D

 		 foreach($import_site_objects as $object)
@@ -491,7 +490,6 @@
 			   continue;
 			}
 =3D

-			//while(list($key, $val) =3D3D each($object)) =3D

 			foreach($object as $key =3D3D> $val)
 			{
 			   $old_object_id=3D3D$object['object_id'];
@@ -605,16 +603,9 @@
 =3D

 			$data_objects[] =3D3D array ( 'name' =3D3D> 'parent_site_id', 'value' =
=3D3D> =3D
$parent_site_id);
 =3D

-			//			$data_objects[] =3D3D array ( 'name' =3D3D> 'object_id', 'value' =
=3D3D> =3D
$object_old2new_id_arr[$old_object_id]);
-
-			//			   $new_id =3D3D $status['where_value'];
+
 			if($status =3D3D $this->bo->so->validateAndInsert_phpgw_data('egw_jinn_=
ob=3D
jects',$data_objects))
 			{
-			   //echo $new_id .' ';
-			   //echo $status['where_value'].' <br/>';
-
-			   //			   $new_id =3D3D $status['where_value'];
-
 			   if(!$old_object_id)
 			   {
 				  $old_object_id =3D3D ($object['temp_id']?$object['temp_id']:$object[=
'u=3D
nique_id']);
@@ -635,7 +626,6 @@
 			   $this->num_objects++;
 			} =3D

 		 }
-		 //die();
 	  }
 =3D

 	  // $old_parent_id is the unique id saved in object
@@ -651,9 +641,6 @@
 			   if($old_parent_id !=3D3D $obj_field['field_parent_object'] =3D

 			   && ($obj_field['unique_id']!=3D3D$old_parent_id) =3D

 			   && ($obj_field['temp_id']!=3D3D$old_parent_id))
-			   //if(!$old_parent_id || =3D

-			   //			   ($obj_field['unique_id'] && $obj_field['unique_id']!=3D3D$ol=
d_=3D
parent_id) || =3D

-			   //			   ($obj_field['temp_id'] && $obj_field['temp_id']!=3D3D$old_pa=
re=3D
nt_id) )
 			   {
 				  continue;
 			   }
@@ -766,9 +753,9 @@
 		 $this->msg_box();
 =3D

 		 $this->tplsav2->set_var('form_action',$GLOBALS['phpgw']->link('/index.p=
=3D
hp','menuaction=3D3Djinn.ui_importsite.import_egw_jinn_site'));
-		 $this->tplsav2->set_var('loaded_file',$this->bo->session['tmp']['file']=
=3D
);
-
-		 if($this->bo->session['tmp']['replace'])
+		 $this->tplsav2->set_var('loaded_file',$this->bo->sessionmanager->sessio=
=3D
narray['tmp']['file']);
+
+		 if($this->bo->sessionmanager->sessionarray['tmp']['replace'])
 		 {
 			$this->tplsav2->set_var('checked', 'checked=3D3D"checked"');
 		 }

Modified: trunk/jinn/plugins/db_fields_plugins/__default_date/class.default=
=3D
_date.php
URL: http://www.egroupware.org/viewvc/trunk/jinn/plugins/db_fields_plugins/=
=3D
__default_date/class.default_date.php?rev=3D3D23356&r1=3D3D23355&r2=3D3D233=
56&vie=3D
w=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/jinn/plugins/db_fields_plugins/__default_date/class.default_date.=
=3D
php (original)
+++ trunk/jinn/plugins/db_fields_plugins/__default_date/class.default_date.=
=3D
php Wed Jan 31 12:18:19 2007
@@ -43,7 +43,8 @@
 		{
 		   if ($value)
 		   {
-			  $input =3D3D '<input type=3D3D"hidden" name=3D3D"'.$field_name.'" val=
ue=3D3D"=3D
'=2E$value.'">'.$this->local_bo->so->site_db->Link_ID->UserDate($value);
+			  //$input =3D3D '<input type=3D3D"hidden" name=3D3D"'.$field_name.'" v=
alue=3D
=3D3D"'.$value.'">'.$this->local_bo->so->site_db->Link_ID->UserDate($value);
+			  $input =3D3D '<input type=3D3D"hidden" name=3D3D"'.$field_name.'" val=
ue=3D3D"=3D
'=2E$value.'">'.$value;
 		   }
 		   else
 		   {