Index: trunk/admin/import/import.php =================================================================== diff -u -r24 -r27 --- trunk/admin/import/import.php (.../import.php) (revision 24) +++ trunk/admin/import/import.php (.../import.php) (revision 27) @@ -135,6 +135,7 @@ //In-Portal $portalconn = GetAdodbConnection(); + $TablePrefix = "ses_".$objSession->GetSessionKey()."_".GetTablePrefix(); $olddbname=$inlink_db; @@ -201,7 +202,7 @@ function terminator() { - global $portalconn; + global $portalconn, $TablePrefix; $query="DROP TABLE IF EXISTS ".$TablePrefix."import, ".$TablePrefix."importcat"; $portalconn->Execute($query); } @@ -231,7 +232,7 @@ function usersimport() { global $objUsers, $objSession, $linkconn, $portalconn, $olddbname, - $user_admin,$objGroups, $user_regular, $start; + $user_admin,$objGroups, $user_regular, $start, $TablePrefix; $counter = 0; $limit = 350; @@ -327,7 +328,7 @@ //Categories Import function catmanager() { - global $portalconn, $init_cat,$start; + global $portalconn, $init_cat,$start,$TablePrefix; if ($start == 0) { $counter = catimport(0,$init_cat); @@ -358,7 +359,7 @@ #pushes into the quque function pushid($op,$np) { - global $linkconn, $portalconn; + global $linkconn, $portalconn, $TablePrefix; $addnew = "INSERT INTO ".$TablePrefix."importcat (op,np,flag) VALUES ($op,$np,0)"; $portalconn->Execute($addnew); @@ -389,7 +390,8 @@ function catimport($oldparentid, $parentid) { global $objCatList, $linkconn, $objUsers, $linkconn, $portalconn, - $olddbname, $user_admin,$objGroups, $user_regular, $acl,$allgroups, $c, $start; + $olddbname, $user_admin,$objGroups, $user_regular, $acl,$allgroups, + $c, $start, $TablePrefix; $counter=0; $objCacheCount = new clsCacheCountList(); @@ -488,7 +490,7 @@ function linksimport() { global $objLinkList, $init_cat, $linkconn, $portalconn, $olddbname, - $user_admin,$objGroups, $user_regular, $start; + $user_admin,$objGroups, $user_regular, $start, $TablePrefix; $limit = 750; #need to change to a higher number like 100, forty is only for debugging $counter = 0; set_time_limit(0); @@ -522,6 +524,7 @@ $oldcatid = $row->fields["cat_id"]; $pending = $row->fields["link_pend"]; #getting a new category id + echo "HERE LOOK
"; $rs = $portalconn->Execute("SELECT nid FROM ".$TablePrefix."import WHERE ntname='Category' and oid=$oldcatid"); if ($rs && ! $rs->EOF) { @@ -652,7 +655,7 @@ #HELPER FUNCTION THAT GETS THE NEW ID of the USER function getnewid($oldid) { - global $portalconn; + global $portalconn, $TablePrefix; $query2="select * from ".$TablePrefix."import where otname='inl_users' and oid=".$oldid; $row2=$portalconn->Execute($query2); @@ -690,7 +693,7 @@ //VVVVV BELOW ARE CUSTOM FIELD IMPORT REQUIRES TO HAVE A TEMPROARY TABLE IMPORT function customimport() { - global $linkconn, $portalconn, $start; + global $linkconn, $portalconn, $start, $TablePrefix; $limit = 40; #just for debugging purposes, in real life set it to higher number $counter=0; if ($start == 0) @@ -911,7 +914,7 @@ } function newcatrid($oid) { - global $portalconn; + global $portalconn, $TablePrefix; $query2="select * from ".$TablePrefix."import where otname='inl_cats' and oid=$oid"; $row =$portalconn->Execute($query2); if ($row->fields["nrid"])