[Logicampus-cvs] logicampus/src/logicreate/services/classdoclib addFile.lcp, 1.2, 1.3 download.lcp,

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/logicampus/logicampus/src/logicreate/services/classdoclib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18914

Modified Files:
	addFile.lcp download.lcp editFile.lcp editFolder.lcp main.lcp 
	trash.lcp wysiwygcontentlinks.lcp wysiwygimages.lcp 
	wysiwyglinks.lcp wysiwygswf.lcp 
Log Message:
Change function "next_record" to "nextRecord".

Index: wysiwygswf.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classdoclib/wysiwygswf.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wysiwygswf.lcp	21 Aug 2004 21:33:19 -0000	1.2
--- wysiwygswf.lcp	8 Oct 2007 14:19:51 -0000	1.3
***************
*** 50,54 ****
  			if ($openFolder=='') {
  				$db->queryOne("select pkey from classdoclib_Folders where order by pkey ASC");
! 				$openFolder = $db->Record[0]; 
  			}
  		}
--- 50,54 ----
  			if ($openFolder=='') {
  				$db->queryOne("select pkey from classdoclib_Folders where order by pkey ASC");
! 				$openFolder = $db->record[0]; 
  			}
  		}

Index: trash.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classdoclib/trash.lcp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** trash.lcp	21 Nov 2003 23:14:05 -0000	1.1.1.1
--- trash.lcp	8 Oct 2007 14:19:51 -0000	1.2
***************
*** 22,27 ****
  		and class_id = '.$u->activeClassTaught->id_classes);
  		$db->RESULT_TYPE = MYSQL_ASSOC;
! 		while($db->next_record()) {;
! 			$t['trash'][] =$db->Record;
  		}
  	}
--- 22,27 ----
  		and class_id = '.$u->activeClassTaught->id_classes);
  		$db->RESULT_TYPE = MYSQL_ASSOC;
! 		while($db->nextRecord()) {;
! 			$t['trash'][] =$db->record;
  		}
  	}

Index: main.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classdoclib/main.lcp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.lcp	21 Nov 2003 23:14:05 -0000	1.1.1.1
--- main.lcp	8 Oct 2007 14:19:51 -0000	1.2
***************
*** 35,39 ****
  		$thisclass = $u->activeClassTaught->id_classes;
  		$db->queryOne("select * from classdoclib_Folders where class_id=$thisclass and owner='".$u->username."' and folderType=0");
! 		if ($db->Record['pkey']==0) { 
  			$db->query("insert into classdoclib_Folders (name,parentKey,owner,class_id,folderType) values ('Trash',0,'{$u->username}','{$thisclass}',0)");
  		}
--- 35,39 ----
  		$thisclass = $u->activeClassTaught->id_classes;
  		$db->queryOne("select * from classdoclib_Folders where class_id=$thisclass and owner='".$u->username."' and folderType=0");
! 		if ($db->record['pkey']==0) { 
  			$db->query("insert into classdoclib_Folders (name,parentKey,owner,class_id,folderType) values ('Trash',0,'{$u->username}','{$thisclass}',0)");
  		}
***************
*** 52,61 ****
  		if ($openFolder) { 
  			$db->queryOne("select trashed,folderType from classdoclib_Folders where pkey=".(int)$openFolder);
! 			$folderType = $db->Record['folderType'];
  			if ($folderType==0) { $t['isTrash'] = 'y'; $isTrash = 'y';}
! 			if ($db->Record['trashed']=='') { $db->Record['trashed']='n'; }
! 			$t['isTrashed'] = $db->Record['trashed'];
! 			$t['folderType'] = $db->Record['folderType'];
! 			$isTrashed = $db->Record['trashed'];
  		}
  		if ($lcObj->getvars["order"]) { $u->sessionvars["filesorder"] = $lcObj->getvars["order"]; }
--- 52,61 ----
  		if ($openFolder) { 
  			$db->queryOne("select trashed,folderType from classdoclib_Folders where pkey=".(int)$openFolder);
! 			$folderType = $db->record['folderType'];
  			if ($folderType==0) { $t['isTrash'] = 'y'; $isTrash = 'y';}
! 			if ($db->record['trashed']=='') { $db->record['trashed']='n'; }
! 			$t['isTrashed'] = $db->record['trashed'];
! 			$t['folderType'] = $db->record['folderType'];
! 			$isTrashed = $db->record['trashed'];
  		}
  		if ($lcObj->getvars["order"]) { $u->sessionvars["filesorder"] = $lcObj->getvars["order"]; }

Index: editFolder.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classdoclib/editFolder.lcp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** editFolder.lcp	15 May 2007 17:27:47 -0000	1.3
--- editFolder.lcp	8 Oct 2007 14:19:51 -0000	1.4
***************
*** 207,212 ****
  		$query = 'insert into classdoclib_Sharing (folderKey, action, exclude, gid) VALUES (%d, %d, %d, "%s")';

! 		while ( $db->next_record() ) {
! 			$db->query( sprintf($query,$cat->pkey,$db->Record['action'],$db->Record['exclude'],$db->Record['gid']) );
  		}

--- 207,212 ----
  		$query = 'insert into classdoclib_Sharing (folderKey, action, exclude, gid) VALUES (%d, %d, %d, "%s")';

! 		while ( $db->nextRecord() ) {
! 			$db->query( sprintf($query,$cat->pkey,$db->record['action'],$db->record['exclude'],$db->record['gid']) );
  		}

***************
*** 228,232 ****
  		// selecting trash can (to move the requested folder too)
  		$db->queryOne("select pkey from classdoclib_Folders where folderType=0 and class_id=".$u->activeClassTaught->id_classes);
! 		$trashFolder = $db->Record['pkey'];

  		$db->query("update classdoclib_Folders set trashed='y', origparent= parentKey, parentKey=$trashFolder where (owner='".$u->username."' and pkey=".$trash->pkey. ")");
--- 228,232 ----
  		// selecting trash can (to move the requested folder too)
  		$db->queryOne("select pkey from classdoclib_Folders where folderType=0 and class_id=".$u->activeClassTaught->id_classes);
! 		$trashFolder = $db->record['pkey'];

  		$db->query("update classdoclib_Folders set trashed='y', origparent= parentKey, parentKey=$trashFolder where (owner='".$u->username."' and pkey=".$trash->pkey. ")");
***************
*** 272,276 ****
  		// Finding our trash folder
  		$db->queryOne("select pkey from classdoclib_Folders where folderType=0 and class_id=".$u->activeClassTaught->id_classes);
! 		$trashFolder = $db->Record['pkey'];

  		if ((int)$trashFolder == 0)
--- 272,276 ----
  		// Finding our trash folder
  		$db->queryOne("select pkey from classdoclib_Folders where folderType=0 and class_id=".$u->activeClassTaught->id_classes);
! 		$trashFolder = $db->record['pkey'];

  		if ((int)$trashFolder == 0)
***************
*** 284,289 ****
  		// selecting folders that were marked for trashing at an earlier time
  		$db->query("select pkey from classdoclib_Folders where trashed='y' and folderType=2 and class_id = ".$u->activeClassTaught->id_classes);
! 		while($db->next_record()) {
! 			$folders[] = $db->Record['pkey'];
  		}

--- 284,289 ----
  		// selecting folders that were marked for trashing at an earlier time
  		$db->query("select pkey from classdoclib_Folders where trashed='y' and folderType=2 and class_id = ".$u->activeClassTaught->id_classes);
! 		while($db->nextRecord()) {
! 			$folders[] = $db->record['pkey'];
  		}

***************
*** 313,318 ****
  	$loop = array();

! 	while($db->next_record()) {
! 		$loop[] = $db->Record['pkey'];
  	}

--- 313,318 ----
  	$loop = array();

! 	while($db->nextRecord()) {
! 		$loop[] = $db->record['pkey'];
  	}

Index: wysiwygimages.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classdoclib/wysiwygimages.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wysiwygimages.lcp	21 Aug 2004 21:33:19 -0000	1.2
--- wysiwygimages.lcp	8 Oct 2007 14:19:51 -0000	1.3
***************
*** 72,76 ****
  		$db = DB::getHandle();
  		$db->queryOne("select pkey from classdoclib_Folders where (owner='$facultyId' and name like 'Web Images%') order by pkey ASC");
! 		return $db->Record['pkey'];

  	}
--- 72,76 ----
  		$db = DB::getHandle();
  		$db->queryOne("select pkey from classdoclib_Folders where (owner='$facultyId' and name like 'Web Images%') order by pkey ASC");
! 		return $db->record['pkey'];

  	}
***************
*** 91,95 ****
  			if ($openFolder=='') {
  				$db->queryOne("select pkey from classdoclib_Folders  order by pkey ASC");
! 				$openFolder = $db->Record[0]; 
  			}
  		}
--- 91,95 ----
  			if ($openFolder=='') {
  				$db->queryOne("select pkey from classdoclib_Folders  order by pkey ASC");
! 				$openFolder = $db->record[0]; 
  			}
  		}

Index: wysiwyglinks.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classdoclib/wysiwyglinks.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wysiwyglinks.lcp	21 Aug 2004 21:33:19 -0000	1.2
--- wysiwyglinks.lcp	8 Oct 2007 14:19:51 -0000	1.3
***************
*** 52,58 ****
  		$db->query($sql);

! 		while ($db->next_record())
  		{
! 			$t['links'][] = "\n\n\n\n".'<a onclick="parent.document.getElementById(\'linklabel\').value = \''.addslashes(stripslashes(htmlentities($db->Record['txTitle']))).'\'; parent.document.getElementById(\'url\').value = \''. appurl('classroom/lessons/event=viewcontent/id='.$db->Record['id_class_lesson_content']).'\'; return false;" href="#">'.htmlentities(stripslashes($db->Record['txTitle']), ENT_QUOTES).'</a>';

  		}
--- 52,58 ----
  		$db->query($sql);

! 		while ($db->nextRecord())
  		{
! 			$t['links'][] = "\n\n\n\n".'<a onclick="parent.document.getElementById(\'linklabel\').value = \''.addslashes(stripslashes(htmlentities($db->record['txTitle']))).'\'; parent.document.getElementById(\'url\').value = \''. appurl('classroom/lessons/event=viewcontent/id='.$db->record['id_class_lesson_content']).'\'; return false;" href="#">'.htmlentities(stripslashes($db->record['txTitle']), ENT_QUOTES).'</a>';

  		}

Index: wysiwygcontentlinks.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classdoclib/wysiwygcontentlinks.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wysiwygcontentlinks.lcp	21 Aug 2004 21:33:19 -0000	1.2
--- wysiwygcontentlinks.lcp	8 Oct 2007 14:19:51 -0000	1.3
***************
*** 50,54 ****
  			if ($openFolder=='') {
  				$db->queryOne("select pkey from classdoclib_Folders order by pkey ASC");
! 				$openFolder = $db->Record[0]; 
  			}
  		}
--- 50,54 ----
  			if ($openFolder=='') {
  				$db->queryOne("select pkey from classdoclib_Folders order by pkey ASC");
! 				$openFolder = $db->record[0]; 
  			}
  		}

Index: addFile.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classdoclib/addFile.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** addFile.lcp	27 Aug 2005 01:10:09 -0000	1.2
--- addFile.lcp	8 Oct 2007 14:19:51 -0000	1.3
***************
*** 28,35 ****
  		}
  		$db->query('select name from classdoclib_Folders where pkey = '.$lcObj->getvars['fid']);
! 		$db->next_record();

  		$t['max_file_size'] = sprintf("%.2f",ini_get('upload_max_filesize'));
! 		$t['folderName' ] = $db->Record['name'];
  		$t['folderID' ] = $lcObj->getvars['fid'];

--- 28,35 ----
  		}
  		$db->query('select name from classdoclib_Folders where pkey = '.$lcObj->getvars['fid']);
! 		$db->nextRecord();

  		$t['max_file_size'] = sprintf("%.2f",ini_get('upload_max_filesize'));
! 		$t['folderName' ] = $db->record['name'];
  		$t['folderID' ] = $lcObj->getvars['fid'];

Index: editFile.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classdoclib/editFile.lcp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** editFile.lcp	21 Nov 2003 23:14:05 -0000	1.1.1.1
--- editFile.lcp	8 Oct 2007 14:19:51 -0000	1.2
***************
*** 140,146 ****
  			$db->query("update classdoclib_Files set folder=origfolder, trashed='n' where pkey=".(int)$lc->getvars['file']);
  			$db->queryOne("select folder from classdoclib_Files where pkey=".(int)$lc->getvars['file']);
! 			$folder = $db->Record['folder'];
  			$db->queryOne("select trashed from classdoclib_Folders where pkey=$folder");
! 			if ($db->Record['trashed']=='y') { 
  			$db->query("update classdoclib_Files set folder=0, trashed='n' where pkey=".(int)$lc->getvars['file']);
  			}
--- 140,146 ----
  			$db->query("update classdoclib_Files set folder=origfolder, trashed='n' where pkey=".(int)$lc->getvars['file']);
  			$db->queryOne("select folder from classdoclib_Files where pkey=".(int)$lc->getvars['file']);
! 			$folder = $db->record['folder'];
  			$db->queryOne("select trashed from classdoclib_Folders where pkey=$folder");
! 			if ($db->record['trashed']=='y') { 
  			$db->query("update classdoclib_Files set folder=0, trashed='n' where pkey=".(int)$lc->getvars['file']);
  			}
***************
*** 160,164 ****
  		$class_id = $u->activeClassTaught->id_classes;
  		$db->queryOne("select pkey from classdoclib_Folders where class_id='$class_id' and folderType=0");
! 		$trashPkey = $db->Record['pkey'];

  		$trash = LC_file::getSingle($lc->getvars['file'],$u->activeClassTaught->id_classes,FOLDER_EDIT);
--- 160,164 ----
  		$class_id = $u->activeClassTaught->id_classes;
  		$db->queryOne("select pkey from classdoclib_Folders where class_id='$class_id' and folderType=0");
! 		$trashPkey = $db->record['pkey'];

  		$trash = LC_file::getSingle($lc->getvars['file'],$u->activeClassTaught->id_classes,FOLDER_EDIT);

Index: download.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classdoclib/download.lcp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** download.lcp	21 Aug 2004 22:22:12 -0000	1.3
--- download.lcp	8 Oct 2007 14:19:51 -0000	1.4
***************
*** 78,82 ****
  			';
  			$db->queryOne($sql);
! 			if ($db->Record == false) {
  				//no permission to view this file
  				$this->presentor = 'errorMessage';
--- 78,82 ----
  			';
  			$db->queryOne($sql);
! 			if ($db->record == false) {
  				//no permission to view this file
  				$this->presentor = 'errorMessage';
***************
*** 86,90 ****
  			}

! 		$pkey = $db->Record['pkey'];			
  		}
  		// END FHASH
--- 86,90 ----
  			}

! 		$pkey = $db->record['pkey'];			
  		}
  		// END FHASH