logicampus-cvs — SVN Commit Logs

[Logicampus-cvs] logicampus/src/logicreate/services/administration backupclasses.lcp, 1.2, 1.3 cal.lcp, 1.3, 1.4 classes.lcp, 1.7, 1.8 classes_extra.lcp, 1.2, 1.3 classrestore.lcp, 1.2, 1.3 courses.lcp, 1.7, 1.8 enrollment.lcp, 1.12, 1.13 facultylist.lcp, 1.2, 1.3 formmgr.lcp, 1.5, 1.6 groups.lcp, 1.3, 1.4 menu.lcp, 1.2, 1.3 search.lcp, 1.2, 1.3 semesterrestore.lcp, 1.2, 1.3 semesters.lcp, 1.4, 1.5 servicePermissions.lcp, 1.3, 1.4 users.lcp, 1.13, 1.14

[Mark K <har...@us...>]

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

Modified Files:
	backupclasses.lcp cal.lcp classes.lcp classes_extra.lcp 
	classrestore.lcp courses.lcp enrollment.lcp facultylist.lcp 
	formmgr.lcp groups.lcp menu.lcp search.lcp semesterrestore.lcp 
	semesters.lcp servicePermissions.lcp users.lcp 
Log Message:
Change function "next_record" to 'nextRecord'.


Index: backupclasses.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/backupclasses.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** backupclasses.lcp	18 Nov 2006 00:09:34 -0000	1.2
--- backupclasses.lcp	8 Oct 2007 14:17:47 -0000	1.3
***************
*** 67,72 ****
  		$db->query($sql);
  		
! 		while ($db->next_record())
! 		{	$a_semester[$db->Record['id_semesters']] = $db->Record['semesterYear'].' '.$db->Record['semesterTerm'].' ( <i>'.$db->Record['class_count'].' classes</i> )';
  		}
  		
--- 67,72 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord())
[...1356 lines suppressed...]
  									);
--- 1381,1398 ----
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  		
! 		while ($db->nextRecord())
  		{
  			$xml_sub_child = null;
! 			$xml_sub_child[] = new xml_node('id_class_gradebook_entries', null, null, $db->record['id_class_gradebook_entries']);
! 			$xml_sub_child[] = new xml_node('username', array('BASE64'=>'1'), null, $db->record['username']);
! 			$xml_sub_child[] = new xml_node('score', null, null, (($db->record['score'] == null) ? 'NULL' : $db->record['score']));
  			
! 			$xml_sub_child[] = new xml_node('comments', array('BASE64'=>'1'), null, $db->record['comments']);
  			
! 			$xml_sub_child[] = new xml_node('date_created', null, null, $db->record['date_created']);
! 			$xml_sub_child[] = new xml_node('date_modified', null, null, $db->record['date_modified']);
  			
  			$xml_child_node[] =new xml_node('ITEM', 
! 									array(	'id_class_gradebook_val'=>$db->record['id_class_gradebook_val']											
  									 	 ), $xml_sub_child
  									);

Index: servicePermissions.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/servicePermissions.lcp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** servicePermissions.lcp	26 Jan 2007 02:40:46 -0000	1.3
--- servicePermissions.lcp	8 Oct 2007 14:17:48 -0000	1.4
***************
*** 104,108 ****
  	{
  		$db->query('select gid from lcGroups');
! 		while ($db->next_record()) $gids[] = $db->Record['gid'];
  
  		while (list(,$val) = @each($gids)) {
--- 104,108 ----
  	{
  		$db->query('select gid from lcGroups');
! 		while ($db->nextRecord()) $gids[] = $db->record['gid'];
  
  		while (list(,$val) = @each($gids)) {
***************
*** 128,138 ****
  			and p.groupID=g.gid
  			and p.action="'.$service.'"');
! 		while ($db->next_record())
! 			$services[] = $db->Record['groupID'];
  
  		$db->query('select gid,groupName from lcGroups');
! 		while ($db->next_record()) {
! 			if (in_array($db->Record['gid'], $services)) $check = " checked";
! 			$ret .= '<input type="checkbox" name="'.$db->Record['gid'].'"'.$check.' />&nbsp;'.$db->Record['groupName'].'<br/>';
  			unset($check);
  		}
--- 128,138 ----
  			and p.groupID=g.gid
  			and p.action="'.$service.'"');
! 		while ($db->nextRecord())
! 			$services[] = $db->record['groupID'];
  
  		$db->query('select gid,groupName from lcGroups');
! 		while ($db->nextRecord()) {
! 			if (in_array($db->record['gid'], $services)) $check = " checked";
! 			$ret .= '<input type="checkbox" name="'.$db->record['gid'].'"'.$check.' />&nbsp;'.$db->record['groupName'].'<br/>';
  			unset($check);
  		}

Index: formmgr.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/formmgr.lcp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** formmgr.lcp	18 Feb 2007 20:08:11 -0000	1.5
--- formmgr.lcp	8 Oct 2007 14:17:48 -0000	1.6
***************
*** 70,79 ****
  		$sql = "select * from lcFormInfo where type !='site' and type !='add' order by name asc";
  		$db->query($sql);
! 		while ($db->next_record())
  		{
! 			$tmp[] = "<a href=\"".$this->APP."event=addModifyFormField/type=".$db->Record['type']."/action=replace/formId=".$arg->getvars['pkey']."\">\n
  					<img src=\"".$this->PIC."filenew.gif\" border=\"0\"></a>\n
  			<br>
! 			<a href=\"".$this->APP."event=addModifyFormField/type=".$db->Record['type']."/action=replace/formId=".$arg->getvars['pkey']."\">".$db->Record['name']."</a>\n";
  		}
  		#htmlTable($array,$cols,$w="",$colorArray="",$cp="",$cs="",$brd="", $cellAlignment="left")
--- 70,79 ----
  		$sql = "select * from lcFormInfo where type !='site' and type !='add' order by name asc";
  		$db->query($sql);
! 		while ($db->nextRecord())
  		{
! 			$tmp[] = "<a href=\"".$this->APP."event=addModifyFormField/type=".$db->record['type']."/action=replace/formId=".$arg->getvars['pkey']."\">\n
  					<img src=\"".$this->PIC."filenew.gif\" border=\"0\"></a>\n
  			<br>
! 			<a href=\"".$this->APP."event=addModifyFormField/type=".$db->record['type']."/action=replace/formId=".$arg->getvars['pkey']."\">".$db->record['name']."</a>\n";
  		}
  		#htmlTable($array,$cols,$w="",$colorArray="",$cp="",$cs="",$brd="", $cellAlignment="left")
***************
*** 245,249 ****
  		# Grab the pkey of this type of form
  		$db->queryOne("select formCode from lcFormInfo where type='$type' limit 1");
! 		$lcFormPkey = $db->Record['formCode'];
  				
  		# action should be either replace or update
--- 245,249 ----
  		# Grab the pkey of this type of form
  		$db->queryOne("select formCode from lcFormInfo where type='$type' limit 1");
! 		$lcFormPkey = $db->record['formCode'];
  				
  		# action should be either replace or update
***************
*** 259,263 ****
  			$db->RESULT_TYPE = MYSQL_ASSOC;
  			$db->queryOne($sql);
! 			$values = $db->Record;
  		}
  		
--- 259,263 ----
  			$db->RESULT_TYPE = MYSQL_ASSOC;
  			$db->queryOne($sql);
! 			$values = $db->record;
  		}
  		
***************
*** 271,275 ****
  			$db->RESULT_TYPE = MYSQL_ASSOC;
  			$db->queryOne($sql);
! 			$values = $db->Record;
  	
  		}
--- 271,275 ----
  			$db->RESULT_TYPE = MYSQL_ASSOC;
  			$db->queryOne($sql);
! 			$values = $db->record;
  	
  		}
***************
*** 304,308 ****
  		# Grab the formCode of this type of form
  		$db->queryOne("select formCode from lcFormInfo where type='$type' limit 1");
! 		$formCode = $db->Record['formCode'];
  		
  		#validate form input
--- 304,308 ----
  		# Grab the formCode of this type of form
  		$db->queryOne("select formCode from lcFormInfo where type='$type' limit 1");
! 		$formCode = $db->record['formCode'];
  		
  		#validate form input
***************
*** 337,341 ****
  			$db->queryOne($getlastsortnum);
  			
! 			$sortnum = $db->Record['sort'] + 1;
  			$sql = "$sql, sort='$sortnum', row='$sortnum'";
  		}
--- 337,341 ----
  			$db->queryOne($getlastsortnum);
  			
! 			$sortnum = $db->record['sort'] + 1;
  			$sql = "$sql, sort='$sortnum', row='$sortnum'";
  		}
***************
*** 420,424 ****
  		 
  		 $db->queryOne($sql);
! 		 $oldKey = $db->Record['sort'];
  		
  		 if ($method == 'up')
--- 420,424 ----
  		 
  		 $db->queryOne($sql);
! 		 $oldKey = $db->record['sort'];
  		
  		 if ($method == 'up')
***************
*** 431,442 ****
  		 $sql = "select formId from lcForms where pkey='$pkey'";
       	 $db->queryOne($sql);
!      	 $formId = $db->Record['formId'];
  
       	 $sql = "select pkey, sort from lcForms where formId=$formId";
       	 $db->query($sql);
       	 
!      	 while($db->next_record())
       	 {
!      	  	$tmp[$db->Record['pkey']] = $db->Record['sort'];
       	 }
       	 
--- 431,442 ----
  		 $sql = "select formId from lcForms where pkey='$pkey'";
       	 $db->queryOne($sql);
!      	 $formId = $db->record['formId'];
  
       	 $sql = "select pkey, sort from lcForms where formId=$formId";
       	 $db->query($sql);
       	 
!      	 while($db->nextRecord())
       	 {
!      	  	$tmp[$db->record['pkey']] = $db->record['sort'];
       	 }
       	 
***************
*** 495,502 ****
  		$sql = "select pkey, sort from lcForms where formId='$formPkey'";
  		$db->query($sql);
! 		while($db->next_record())
  		{	$n++;
  			$db2 = DB::getHandle();
! 			$sql = "update lcForms set sort='$n', row='$n' where pkey='".$db->Record['pkey']."'";
  			$db2->query($sql);
  		}
--- 495,502 ----
  		$sql = "select pkey, sort from lcForms where formId='$formPkey'";
  		$db->query($sql);
! 		while($db->nextRecord())
  		{	$n++;
  			$db2 = DB::getHandle();
! 			$sql = "update lcForms set sort='$n', row='$n' where pkey='".$db->record['pkey']."'";
  			$db2->query($sql);
  		}
***************
*** 512,516 ****
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  		$db->queryOne($sql);
! 		$info = $db->Record;
  	
  	
--- 512,516 ----
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  		$db->queryOne($sql);
! 		$info = $db->record;
  	
  	
***************
*** 533,540 ****
  		$db->query($sql);
  	
! 		while ($db->next_record() )
  		{
! 			#debug($db->Record);
! 			while (list ($k, $v) = @each($db->Record))
  			{
  				if ($k == 'pkey')
--- 533,540 ----
  		$db->query($sql);
  	
! 		while ($db->nextRecord() )
  		{
! 			#debug($db->record);
! 			while (list ($k, $v) = @each($db->record))
  			{
  				if ($k == 'pkey')

Index: classes.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/classes.lcp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** classes.lcp	30 Aug 2007 17:54:12 -0000	1.7
--- classes.lcp	8 Oct 2007 14:17:47 -0000	1.8
***************
*** 67,77 ****
  		$db->query($sql);
  		
! 		while ($db->next_record()) {
  			$ast_calendar = new assessmentscheduling();
! 			$ast_calendar->set_id_item($db->Record['assessment_id']);
! 			$ast_calendar->set_id_class($db->Record['class_id']);
! 			$ast_calendar->set_date_start($db->Record['date_available']);
! 			$ast_calendar->set_date_end($db->Record['date_unavailable']);
! 			$ast_calendar->set_title($db->Record['display_name']);
  			$ast_calendar->set_allday(true);
  			
--- 67,77 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord()) {
  			$ast_calendar = new assessmentscheduling();
! 			$ast_calendar->set_id_item($db->record['assessment_id']);
! 			$ast_calendar->set_id_class($db->record['class_id']);
! 			$ast_calendar->set_date_start($db->record['date_available']);
! 			$ast_calendar->set_date_end($db->record['date_unavailable']);
! 			$ast_calendar->set_title($db->record['display_name']);
  			$ast_calendar->set_allday(true);
  			
***************
*** 110,123 ****
  		$db->query($sql);
  		
! 		while ($db->next_record()) {
  			$exam_calendar = new examscheduling();
  			
! 			$exam_calendar->set_id_class($db->Record['id_classes']);
! 			$exam_calendar->set_id_item($db->Record['id_exam_schedule_classes_dates']);
! 			$exam_calendar->set_owner($db->Record['facultyId']);
! 			$exam_calendar->set_title('['.$db->Record['courseFamily'].$db->Record['courseNumber'].'] '.addslashes(stripslashes($db->Record['title'])));
! 			$exam_calendar->set_description(addslashes(stripslashes($db->Record['instructions'])));
! 			$exam_calendar->set_date_start($db->Record['date_start']);
! 			$exam_calendar->set_date_end($db->Record['date_end']);
  			
  			$exam_calendar->save();
--- 110,123 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord()) {
  			$exam_calendar = new examscheduling();
  			
! 			$exam_calendar->set_id_class($db->record['id_classes']);
! 			$exam_calendar->set_id_item($db->record['id_exam_schedule_classes_dates']);
! 			$exam_calendar->set_owner($db->record['facultyId']);
! 			$exam_calendar->set_title('['.$db->record['courseFamily'].$db->record['courseNumber'].'] '.addslashes(stripslashes($db->record['title'])));
! 			$exam_calendar->set_description(addslashes(stripslashes($db->record['instructions'])));
! 			$exam_calendar->set_date_start($db->record['date_start']);
! 			$exam_calendar->set_date_end($db->record['date_end']);
  			
  			$exam_calendar->save();
***************
*** 151,160 ****
  		$db->query($sql);
  		
! 		while ($db->next_record()) {
  			// roll throw and create new gradebook entries for all these friggin classes
  			
  			$esc = new ExamScheduleClasses();
! 			$esc->idClasses = $db->Record['id_classes'];
! 			$esc->idSemester = $db->Record['id_semesters'];
  			$esc->status = 0;
  			$esc->southCampus = 0;
--- 151,160 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord()) {
  			// roll throw and create new gradebook entries for all these friggin classes
  			
  			$esc = new ExamScheduleClasses();
! 			$esc->idClasses = $db->record['id_classes'];
! 			$esc->idSemester = $db->record['id_semesters'];
  			$esc->status = 0;
  			$esc->southCampus = 0;
***************
*** 167,171 ****
  			
          	if ($esc->idExamScheduleClasses == false) {
! 			echo '*** ALERT:: ExamClass::Entry failed to added for you while building examdates:: *id_classes='.$db->Record['id_classes'].'"*';
          		break;
          	}
--- 167,171 ----
  			
          	if ($esc->idExamScheduleClasses == false) {
! 			echo '*** ALERT:: ExamClass::Entry failed to added for you while building examdates:: *id_classes='.$db->record['id_classes'].'"*';
          		break;
          	}
***************
*** 194,205 ****
  		$db->query($sql);
  		
! 		while ($db->next_record()) {
  			// roll throw and create new gradebook entries for all these friggin classes
  			
          	$gradebookObj = new ClassGradebookBase();
!         	$gradebookObj->set('idClasses', $db->Record['id_classes']);
          	$gradebookObj->save();
          	if ($gradebookObj->idClassGradebook == false) {
! 			echo '*** ALERT:: Gradebook::Entry failed to added for you while building class gradebooks:: *id_classes='.$db->Record['id_classes'].'"*';
          		break;
          	}
--- 194,205 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord()) {
  			// roll throw and create new gradebook entries for all these friggin classes
  			
          	$gradebookObj = new ClassGradebookBase();
!         	$gradebookObj->set('idClasses', $db->record['id_classes']);
          	$gradebookObj->save();
          	if ($gradebookObj->idClassGradebook == false) {
! 			echo '*** ALERT:: Gradebook::Entry failed to added for you while building class gradebooks:: *id_classes='.$db->record['id_classes'].'"*';
          		break;
          	}
***************
*** 222,228 ****
  		$db->query($sql);
  
! 		while ($db->next_record()) {
! 			$new_id_class = $db->Record['id_classes'];
! 			$facultyId = trim($db->Record['facultyId']);
  			echo $new_id_class . '|'. $facultyId. '<br>';
  		/*	
--- 222,228 ----
  		$db->query($sql);
  
! 		while ($db->nextRecord()) {
! 			$new_id_class = $db->record['id_classes'];
! 			$facultyId = trim($db->record['facultyId']);
  			echo $new_id_class . '|'. $facultyId. '<br>';
  		/*	
***************
*** 405,409 ****
  				
  				$db->queryOne($sql);
! 				if ($db->Record['SECTION_exists']) {
  					// deny the adding of the class, inform them that section number exists already
  					$t['error'] .= 'Section #'. (int)$snum. ' exists<br>';
--- 405,409 ----
  				
  				$db->queryOne($sql);
! 				if ($db->record['SECTION_exists']) {
  					// deny the adding of the class, inform them that section number exists already
  					$t['error'] .= 'Section #'. (int)$snum. ' exists<br>';
***************
*** 568,582 ****
  		SELECT count(DISTINCT (A.username) ) AS f_count FROM profile as A';
  		$db->queryOne($sql);
! 		$rec_f_count = $db->Record['f_count'];
  		
  		$sql = '
  		SELECT count(DISTINCT (B.id_semesters) ) AS s_count FROM semesters as B';
  		$db->queryOne($sql);
! 		$rec_s_count = $db->Record['s_count'];
  		
  		$sql = '
  		SELECT count(DISTINCT (C.id_courses) ) AS c_count FROM  courses AS C';
  		$db->queryOne($sql);
! 		$rec_c_count = $db->Record['c_count'];
  		
  		if ( $rec_f_count ==false ) {
--- 568,582 ----
  		SELECT count(DISTINCT (A.username) ) AS f_count FROM profile as A';
  		$db->queryOne($sql);
! 		$rec_f_count = $db->record['f_count'];
  		
  		$sql = '
  		SELECT count(DISTINCT (B.id_semesters) ) AS s_count FROM semesters as B';
  		$db->queryOne($sql);
! 		$rec_s_count = $db->record['s_count'];
  		
  		$sql = '
  		SELECT count(DISTINCT (C.id_courses) ) AS c_count FROM  courses AS C';
  		$db->queryOne($sql);
! 		$rec_c_count = $db->record['c_count'];
  		
  		if ( $rec_f_count ==false ) {
***************
*** 597,605 ****
  		$db->queryOne($sql);
  
! 		if ( $db->Record['f_count'] ==false ) {
  			$t['error'] = "You must have at least one faculty member in the database to add a class.";
! 		} else if ( $db->Record['s_count'] == false ) {
  			$t['error'] = "You must have at least one semester in the database to add a class.";
! 		} else if ( $db->Record['c_count'] == false) {
  			$t['error'] = "you must have at least one course in the database to add a class.";
  		}
--- 597,605 ----
  		$db->queryOne($sql);
  
! 		if ( $db->record['f_count'] ==false ) {
  			$t['error'] = "You must have at least one faculty member in the database to add a class.";
! 		} else if ( $db->record['s_count'] == false ) {
  			$t['error'] = "You must have at least one semester in the database to add a class.";
! 		} else if ( $db->record['c_count'] == false) {
  			$t['error'] = "you must have at least one course in the database to add a class.";
  		}
***************
*** 665,670 ****
  				$a_db_sec_numbers = array();
  				$db->query($sql);
! 				while ($db->next_record()) {
! 					$a_db_sec_numbers[] = $db->Record['sectionNumber'];
  					
  				}
--- 665,670 ----
  				$a_db_sec_numbers = array();
  				$db->query($sql);
! 				while ($db->nextRecord()) {
! 					$a_db_sec_numbers[] = $db->record['sectionNumber'];
  					
  				}
***************
*** 701,705 ****
  
  						$db->queryOne($sql);
! 						if ($db->Record['SECTION_exists']) {
  							// deny the adding of the class, inform them that section number exists already
  							$t['error'] .= 'Section #'. (int)$number. ' exists<br>';
--- 701,705 ----
  
  						$db->queryOne($sql);
! 						if ($db->record['SECTION_exists']) {
  							// deny the adding of the class, inform them that section number exists already
  							$t['error'] .= 'Section #'. (int)$number. ' exists<br>';
***************
*** 808,815 ****
  			$sql_string = 'SELECT id_class_assignments FROM class_assignments WHERE id_classes='.$id_classes;
  			$db->query($sql_string);
! 			while ($db->next_record()) {
! 				$sql[] = 'DELETE FROM class_assignments_grades WHERE id_class_assignments='.$db->Record['id_class_assignments'];
! 				$sql[] = 'DELETE FROM class_assignments_turnin WHERE id_class_assignments='.$db->Record['id_class_assignments'];
! 				$sql[] = 'DELETE FROM class_assignments_link WHERE id_class_assignments='.$db->Record['id_class_assignments'];
  			}
  			$sql[] = 'DELETE FROM class_assignments WHERE id_classes='.$id_classes;
--- 808,815 ----
  			$sql_string = 'SELECT id_class_assignments FROM class_assignments WHERE id_classes='.$id_classes;
  			$db->query($sql_string);
! 			while ($db->nextRecord()) {
! 				$sql[] = 'DELETE FROM class_assignments_grades WHERE id_class_assignments='.$db->record['id_class_assignments'];
! 				$sql[] = 'DELETE FROM class_assignments_turnin WHERE id_class_assignments='.$db->record['id_class_assignments'];
! 				$sql[] = 'DELETE FROM class_assignments_link WHERE id_class_assignments='.$db->record['id_class_assignments'];
  			}
  			$sql[] = 'DELETE FROM class_assignments WHERE id_classes='.$id_classes;
***************
*** 824,830 ****
  			$sql_string = 'SELECT id_class_lessons FROM class_lessons WHERE id_classes='.$id_classes;
  			$db->query($sql_string);
! 			while ($db->next_record()) {
! 				$sql[] = 'DELETE FROM class_lesson_links WHERE id_class_lessons='.$db->Record['id_class_lessons'];
! 				$sql[] = 'DELETE FROM class_lesson_objectives WHERE id_class_lesson='.$db->Record['id_class_lessons'];
  			}
  			$sql[] = 'DELETE FROM class_lessons WHERE id_classes='.$id_classes;
--- 824,830 ----
  			$sql_string = 'SELECT id_class_lessons FROM class_lessons WHERE id_classes='.$id_classes;
  			$db->query($sql_string);
! 			while ($db->nextRecord()) {
! 				$sql[] = 'DELETE FROM class_lesson_links WHERE id_class_lessons='.$db->record['id_class_lessons'];
! 				$sql[] = 'DELETE FROM class_lesson_objectives WHERE id_class_lesson='.$db->record['id_class_lessons'];
  			}
  			$sql[] = 'DELETE FROM class_lessons WHERE id_classes='.$id_classes;
***************
*** 857,862 ****
  			$sql_string = 'SELECT assessment_id FROM assessment WHERE class_id='.$id_classes;
  			$db->query($sql_string);
! 			while ($db->next_record()) {
! 				$sql[] = 'DELETE FROM assessment_question WHERE assessment_id='.$db->Record['assessment_id'];
  			}
  			
--- 857,862 ----
  			$sql_string = 'SELECT assessment_id FROM assessment WHERE class_id='.$id_classes;
  			$db->query($sql_string);
! 			while ($db->nextRecord()) {
! 				$sql[] = 'DELETE FROM assessment_question WHERE assessment_id='.$db->record['assessment_id'];
  			}
  			
***************
*** 869,874 ****
  			$db->query($sql_string);
  			
! 			while ($db->next_record()) {
! 				$sql[] = 'DELETE FROM classdoclib_Files WHERE folder='.$db->Record['pkey'];
  			}
  			
--- 869,874 ----
  			$db->query($sql_string);
  			
! 			while ($db->nextRecord()) {
! 				$sql[] = 'DELETE FROM classdoclib_Files WHERE folder='.$db->record['pkey'];
  			}
  			
***************
*** 974,979 ****
  	if ($childcolumn=='') { $childcolumn=$parentcolumn; }
  	$db->query("select * from $parent where $keycolumn=$key");
! 	while($db->next_record()) {
! 		$list[] = $db->Record[$parentcolumn];
  	}
  	if (is_array($list)) { 
--- 974,979 ----
  	if ($childcolumn=='') { $childcolumn=$parentcolumn; }
  	$db->query("select * from $parent where $keycolumn=$key");
! 	while($db->nextRecord()) {
! 		$list[] = $db->record[$parentcolumn];
  	}
  	if (is_array($list)) { 

Index: users.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/users.lcp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** users.lcp	22 May 2007 03:25:12 -0000	1.13
--- users.lcp	8 Oct 2007 14:17:48 -0000	1.14
***************
*** 81,96 ****
  			$db->query("select *, lc.username as lc_username from lcUsers as lc LEFT JOIN profile on lc.username = profile.username where $where order by $order LIMIT ".$t[start].",".$this->PAGE_SIZE);
  		}
! 		while ($db->next_record() ) {
! 			if ( ($db->Record['firstname']== '') and 
!            ($db->Record['lastname'] == '') ) {
  
! 				$db->Record['profiledata'] = "<i>Incomplete profile data</i>";
  
  			} else {
  
! 				$db->Record['profiledata'] = "<a href=\"".modurl("users/username=".$db->Record['lc_username']."/event=showUser")."\">".$db->Record['lastname'].", ".$db->Record['firstname']."</a>";
  
  			}
! 			$t['users'][] = $db->Record;
  		}
  
--- 81,96 ----
  			$db->query("select *, lc.username as lc_username from lcUsers as lc LEFT JOIN profile on lc.username = profile.username where $where order by $order LIMIT ".$t[start].",".$this->PAGE_SIZE);
  		}
! 		while ($db->nextRecord() ) {
! 			if ( ($db->record['firstname']== '') and 
!            ($db->record['lastname'] == '') ) {
  
! 				$db->record['profiledata'] = "<i>Incomplete profile data</i>";
  
  			} else {
  
! 				$db->record['profiledata'] = "<a href=\"".modurl("users/username=".$db->record['lc_username']."/event=showUser")."\">".$db->record['lastname'].", ".$db->record['firstname']."</a>";
  
  			}
! 			$t['users'][] = $db->record;
  		}
  
***************
*** 103,132 ****
  		}
  
! 		$db->next_record();
! 		$t['result_pages'] = ceil( $db->Record[0] / $this->PAGE_SIZE);
  		$t['current_page'] = ceil( $t[start] / $this->PAGE_SIZE) + 1;
! 		$t['max_results'] = $db->Record[0];
  		$t['PAGE_SIZE'] = $this->PAGE_SIZE;
  
  		//groups
  		$db->query("select * from lcGroups");
! 		while ($db->next_record() ) {
! 			$t["group_opt"] .= "<option value=\"".$db->Record[gid]."\">".$db->Record[groupName]." (".$db->Record[gid].") </option>\n";
  		}
  
  		//profile
  		$db->query("describe profile");	//get profile meta data
! 		$db->next_record(); 		//drop off pkey
  		$t['profile_opt'] .= "<option value='_email'>Email</option>\n";
  		$t['profile_opt'] .= "<option value='_username'>Username</option>\n";
! 		while ($db->next_record() ) {
! 			$t['profile_opt'] .= "<option value=\"".$db->Record[0]."\">".$db->Record[0]."</option>\n";
  		}
  
  		$db->query("select * from courses order by courseFamily, courseNumber, courseName");
  
! 		while($db->next_record()) {
  
! 			$x[$db->Record['id_courses']] = substr($db->Record['courseFamily']." ".$db->Record['courseNumber']." - ".$db->Record['courseName'], 0, 40);
  
  		}
--- 103,132 ----
  		}
  
! 		$db->nextRecord();
! 		$t['result_pages'] = ceil( $db->record[0] / $this->PAGE_SIZE);
  		$t['current_page'] = ceil( $t[start] / $this->PAGE_SIZE) + 1;
! 		$t['max_results'] = $db->record[0];
  		$t['PAGE_SIZE'] = $this->PAGE_SIZE;
  
  		//groups
  		$db->query("select * from lcGroups");
! 		while ($db->nextRecord() ) {
! 			$t["group_opt"] .= "<option value=\"".$db->record[gid]."\">".$db->record[groupName]." (".$db->record[gid].") </option>\n";
  		}
  
  		//profile
  		$db->query("describe profile");	//get profile meta data
! 		$db->nextRecord(); 		//drop off pkey
  		$t['profile_opt'] .= "<option value='_email'>Email</option>\n";
  		$t['profile_opt'] .= "<option value='_username'>Username</option>\n";
! 		while ($db->nextRecord() ) {
! 			$t['profile_opt'] .= "<option value=\"".$db->record[0]."\">".$db->record[0]."</option>\n";
  		}
  
  		$db->query("select * from courses order by courseFamily, courseNumber, courseName");
  
! 		while($db->nextRecord()) {
  
! 			$x[$db->record['id_courses']] = substr($db->record['courseFamily']." ".$db->record['courseNumber']." - ".$db->record['courseName'], 0, 40);
  
  		}
***************
*** 134,139 ****
  		$t['courses'] = makeOptions($x, (int)$this->course);
  		$db->query("select * from semesters");
! 		while($db->next_record()) {
! 			$s[$db->Record['id_semesters']] = $db->Record['semesterId'];
  		}
  		$t['semesters'] = makeOptions($s, (int)$this->semester);
--- 134,139 ----
  		$t['courses'] = makeOptions($x, (int)$this->course);
  		$db->query("select * from semesters");
! 		while($db->nextRecord()) {
! 			$s[$db->record['id_semesters']] = $db->record['semesterId'];
  		}
  		$t['semesters'] = makeOptions($s, (int)$this->semester);
***************
*** 405,412 ****
  
  		$db->query($sql);
! 		while($db->next_record() )
  		{
! 			$data['courseFamily'][$db->Record['id_profile_faculty_coursefamily']] =
! 			$db->Record['id_profile_faculty_coursefamily'];
  
  		}
--- 405,412 ----
  
  		$db->query($sql);
! 		while($db->nextRecord() )
  		{
! 			$data['courseFamily'][$db->record['id_profile_faculty_coursefamily']] =
! 			$db->record['id_profile_faculty_coursefamily'];
  
  		}
***************
*** 473,480 ****
  		// Grab the GROUPS
  		$db->query("select * from lcGroups order by groupName");
! 		while ($db->next_record() ) {
! 			$t[group_opt] .= "<option value=\"".$db->Record[gid]."\"";
! 			if ( @ in_array ($db->Record[gid],$user->groups) ) { $t[group_opt] .= " SELECTED "; }
! 			$t[group_opt] .= ">".$db->Record[groupName]." (".$db->Record[gid].") </option>\n";
  		}
  
--- 473,480 ----
  		// Grab the GROUPS
  		$db->query("select * from lcGroups order by groupName");
! 		while ($db->nextRecord() ) {
! 			$t[group_opt] .= "<option value=\"".$db->record[gid]."\"";
! 			if ( @ in_array ($db->record[gid],$user->groups) ) { $t[group_opt] .= " SELECTED "; }
! 			$t[group_opt] .= ">".$db->record[groupName]." (".$db->record[gid].") </option>\n";
  		}
  
***************
*** 532,537 ****
  			$arg->templateName ="users_showDelete";
  			$db->query("select username from lcUsers where username = '".$arg->getvars['username']."'");
! 			$db->next_record();
! 			$t['username'] = $db->Record['username'];
  	}
  
--- 532,537 ----
  			$arg->templateName ="users_showDelete";
  			$db->query("select username from lcUsers where username = '".$arg->getvars['username']."'");
! 			$db->nextRecord();
! 			$t['username'] = $db->record['username'];
  	}
  
***************
*** 563,569 ****
  		$username = $arg->getvars[1];
  		$db->query("select sessKey from lcSessions where username = '$username'");
! 		if ($db->next_record() ) {
  			//set cookie
! 			setcookie("LOGINAS",$db->Record[0],0,$tail,COOKIE_HOST);
  			header("Cache-Control: no-cache");
  			header("Location: ".DEFAULT_URL);
--- 563,569 ----
  		$username = $arg->getvars[1];
  		$db->query("select sessKey from lcSessions where username = '$username'");
! 		if ($db->nextRecord() ) {
  			//set cookie
! 			setcookie("LOGINAS",$db->record[0],0,$tail,COOKIE_HOST);
  			header("Cache-Control: no-cache");
  			header("Location: ".DEFAULT_URL);
***************
*** 601,606 ****
  			$orclause = @join(" or pkey = ",$arg->postvars['users']);
  			$db->query("select pkey,username from lcUsers where pkey = $orclause");
! 			while ($db->next_record() ) {
! 				$u->sessionvars['user_collection'][$db->Record[0]] = $db->Record[1];
  			}
  			$u->saveSession();
--- 601,606 ----
  			$orclause = @join(" or pkey = ",$arg->postvars['users']);
  			$db->query("select pkey,username from lcUsers where pkey = $orclause");
! 			while ($db->nextRecord() ) {
! 				$u->sessionvars['user_collection'][$db->record[0]] = $db->record[1];
  			}
  			$u->saveSession();
***************
*** 707,712 ****
  
  		$db->query('select semesterId, semesterTerm, semesterYear, id_semesters from semesters');
! 		while ($db->next_record() ) { 
! 			$t['sems'][$db->Record['id_semesters']] = $db->Record['semesterTerm']. ' ' .$db->Record['semesterYear'];
  		}
  		$lc->templateName = 'users_syncStudents';
--- 707,712 ----
  
  		$db->query('select semesterId, semesterTerm, semesterYear, id_semesters from semesters');
! 		while ($db->nextRecord() ) { 
! 			$t['sems'][$db->record['id_semesters']] = $db->record['semesterTerm']. ' ' .$db->record['semesterYear'];
  		}
  		$lc->templateName = 'users_syncStudents';
***************
*** 716,720 ****
  	function syncStudentsIndividualRun(&$db, &$u, &$lc, &$t ) {
  		$db->queryOne('select id_semesters from semesters where dateStart <= '.DB::getFuncName("NOW()").' AND dateEnd >= '.DB::getFuncName("NOW()"));
! 		$semester_id = sprintf('%d',$db->Record[0]);
  		$button = $lc->postvars['button'];
  		$line = str_replace('"','',$lc->postvars['line']);
--- 716,720 ----
  	function syncStudentsIndividualRun(&$db, &$u, &$lc, &$t ) {
  		$db->queryOne('select id_semesters from semesters where dateStart <= '.DB::getFuncName("NOW()").' AND dateEnd >= '.DB::getFuncName("NOW()"));
! 		$semester_id = sprintf('%d',$db->record[0]);
  		$button = $lc->postvars['button'];
  		$line = str_replace('"','',$lc->postvars['line']);
***************
*** 849,854 ****
  		if ( ! $lc->postvars['semester_id'] ) {
  			$db->query('select id_semesters from semesters where dateStart <= '.DB::getFuncName('NOW()').' AND dateEnd >= '.DB::getFuncName('NOW()'));
! 			$db->next_record();
! 			$semester_id = sprintf('%d',$db->Record[0]);
  		} else {
  			$semester_id = sprintf('%d',$lc->postvars['semester_id']);
--- 849,854 ----
  		if ( ! $lc->postvars['semester_id'] ) {
  			$db->query('select id_semesters from semesters where dateStart <= '.DB::getFuncName('NOW()').' AND dateEnd >= '.DB::getFuncName('NOW()'));
! 			$db->nextRecord();
! 			$semester_id = sprintf('%d',$db->record[0]);
  		} else {
  			$semester_id = sprintf('%d',$lc->postvars['semester_id']);
***************
*** 956,963 ****
  				$dbmail = DB::getHandle('mail');
  				$db->query('select * from class_student_sections where active = 0 and semester_id='.$semester_id);
! 				while ( $db->next_record() ) {
  					$dbmail->query(
  					sprintf( $mailSQL,
! 						$db->Record['id_student'],
  						rand(10000),
  						0),false
--- 956,963 ----
  				$dbmail = DB::getHandle('mail');
  				$db->query('select * from class_student_sections where active = 0 and semester_id='.$semester_id);
! 				while ( $db->nextRecord() ) {
  					$dbmail->query(
  					sprintf( $mailSQL,
! 						$db->record['id_student'],
  						rand(10000),
  						0),false
***************
*** 967,971 ****
  					(username,password,action)
  					VALUES
! 					('".','".$db->Record['username']."','".rand(10000)."',0)";
  		*/
  				}
--- 967,971 ----
  					(username,password,action)
  					VALUES
! 					('".','".$db->record['username']."','".rand(10000)."',0)";
  		*/
  				}

Index: search.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/search.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** search.lcp	18 Nov 2006 00:09:34 -0000	1.2
--- search.lcp	8 Oct 2007 14:17:48 -0000	1.3
***************
*** 66,74 ****
  		$db->query($sql);
  		
! 		while ($db->next_record())
  		{	$fl_teacher = true;
  			
! 			$op_taught[$db->Record['id_classes']] = '['.$db->Record['semesterId'].'] '.$db->Record['courseFamily'].$db->Record['courseNumber']. ' '.$db->Record['courseName']. ' ('.$db->Record['facultyId'].') ';
! 			$a_full_class_id_list[] = $db->Record['id_classes'];
  		}
  	
--- 66,74 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord())
  		{	$fl_teacher = true;
  			
! 			$op_taught[$db->record['id_classes']] = '['.$db->record['semesterId'].'] '.$db->record['courseFamily'].$db->record['courseNumber']. ' '.$db->record['courseName']. ' ('.$db->record['facultyId'].') ';
! 			$a_full_class_id_list[] = $db->record['id_classes'];
  		}
  	
***************
*** 251,260 ****
  			
  			$t['output'] == array();
! 			while ($db->next_record())
  			{
! 				if ($db->Record['calendarType'])
  				{	
! 					$tmp = new $db->Record['calendarType'];
! 					$val = $this->array2object($db->Record);
  					//debug($val);
  					if ($tmp->autoLoad($val) && $tmp->cansee(time(), false, true))
--- 251,260 ----
  			
  			$t['output'] == array();
! 			while ($db->nextRecord())
  			{
! 				if ($db->record['calendarType'])
  				{	
! 					$tmp = new $db->record['calendarType'];
! 					$val = $this->array2object($db->record);
  					//debug($val);
  					if ($tmp->autoLoad($val) && $tmp->cansee(time(), false, true))
***************
*** 276,287 ****
  				} else
  				{	
! 					$output = '<b>'.date('F jS Y', $db->Record['startdate']).'</b><br>'.
! 								$db->Record['title'];
  					
! 					if ($db->Record['description'])
! 					{	$output .= '<br><i>Description</i>: '. $db->Record['description'];
  					}
! 					if ($db->Record['location'])
! 					{	$output .= '<br><i>Location</i>: '. $db->Record['location'];
  					}
  						
--- 276,287 ----
  				} else
  				{	
! 					$output = '<b>'.date('F jS Y', $db->record['startdate']).'</b><br>'.
! 								$db->record['title'];
  					
! 					if ($db->record['description'])
! 					{	$output .= '<br><i>Description</i>: '. $db->record['description'];
  					}
! 					if ($db->record['location'])
! 					{	$output .= '<br><i>Location</i>: '. $db->record['location'];
  					}
  						

Index: enrollment.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/enrollment.lcp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** enrollment.lcp	21 Apr 2007 19:28:59 -0000	1.12
--- enrollment.lcp	8 Oct 2007 14:17:47 -0000	1.13
***************
*** 261,265 ****
  // 
  		$db->queryOne("select id_semesters from semesters where dateStart<=now()  and dateDeactivation>=now()");
! //		$semesterId = (int)$db->Record['id_semesters'];
  
  		$name = addslashes(stripslashes($lc->getvars['username']));
--- 261,265 ----
  // 
  		$db->queryOne("select id_semesters from semesters where dateStart<=now()  and dateDeactivation>=now()");
! //		$semesterId = (int)$db->record['id_semesters'];
  
  		$name = addslashes(stripslashes($lc->getvars['username']));

Index: cal.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/cal.lcp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cal.lcp	11 Feb 2007 05:31:20 -0000	1.3
--- cal.lcp	8 Oct 2007 14:17:47 -0000	1.4
***************
*** 278,282 ****
  	function viewRun($db,&$u,&$lc,&$t) {
  		$db->queryOne("select * from _activities where pkey='".addslashes($lc->getvars['pkey'])."'");
! 		$t = array_merge($t,$db->Record);
  		$this->activityRun($db,$u,$lc,$t);
  	}
--- 278,282 ----
  	function viewRun($db,&$u,&$lc,&$t) {
  		$db->queryOne("select * from _activities where pkey='".addslashes($lc->getvars['pkey'])."'");
! 		$t = array_merge($t,$db->record);
  		$this->activityRun($db,$u,$lc,$t);
  	}

Index: classes_extra.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/classes_extra.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** classes_extra.lcp	18 Nov 2006 00:09:34 -0000	1.2
--- classes_extra.lcp	8 Oct 2007 14:17:47 -0000	1.3
***************
*** 56,62 ****
  			$db->RESULT_TYPE= MYSQL_ASSOC;
  			$db->query($sql);
! 			while($db->next_record()) {
! 				#debug($db->Record);
! 				$x[$db->Record['id_classes']] = $db->Record['courseFamily'].$db->Record['courseNumber']." - ".$db->Record['courseName'].' ('.$db->Record['faculty'].')';
  			}
  
--- 56,62 ----
  			$db->RESULT_TYPE= MYSQL_ASSOC;
  			$db->query($sql);
! 			while($db->nextRecord()) {
! 				#debug($db->record);
! 				$x[$db->record['id_classes']] = $db->record['courseFamily'].$db->record['courseNumber']." - ".$db->record['courseName'].' ('.$db->record['faculty'].')';
  			}
  
***************
*** 108,117 ****
  			$db->queryOne($sql);
  			
! 			$t['classInfo'] = $db->Record;
  			$this->sectionTitle .= ' - '.$t['classInfo']['courseName'];
  			$sql = "select * from class_extra_faculty where id_classes = $class";
  			$db->query($sql);
! 			while($db->next_record()) {
! 				$t['list'][] = $db->Record;
  			}
  			
--- 108,117 ----
  			$db->queryOne($sql);
  			
! 			$t['classInfo'] = $db->record;
  			$this->sectionTitle .= ' - '.$t['classInfo']['courseName'];
  			$sql = "select * from class_extra_faculty where id_classes = $class";
  			$db->query($sql);
! 			while($db->nextRecord()) {
! 				$t['list'][] = $db->record;
  			}
  			

Index: semesterrestore.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/semesterrestore.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** semesterrestore.lcp	18 Nov 2006 00:09:34 -0000	1.2
--- semesterrestore.lcp	8 Oct 2007 14:17:48 -0000	1.3
***************
*** 87,93 ****
  		$db->query($sql);
  		
! 		while ($db->next_record())
! 		{	if ($db->Record['class_count'] == 0)
! 				$a_import_enabled[] = $db->Record;
  		}
  		
--- 87,93 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord())
! 		{	if ($db->record['class_count'] == 0)
! 				$a_import_enabled[] = $db->record;
  		}
  		
***************
*** 116,122 ****
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  		
! 		while ($db->next_record())
! 		{	$db->Record['stat'] = $a_backup_file[$db->Record['id_semesters']];
! 			$a_semester[$db->Record['id_semesters']] = $db->Record;
  		}
  		
--- 116,122 ----
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  		
! 		while ($db->nextRecord())
! 		{	$db->record['stat'] = $a_backup_file[$db->record['id_semesters']];
! 			$a_semester[$db->record['id_semesters']] = $db->record;
  		}
  		
***************
*** 1736,1745 ****
  		$db->query($sql);
  		
! 		while ($db->next_record())
  		{	
  			$i_replaced = false;
  			$a_replacable_items = array(); //clobbering array (refreshing)
  			
! 			$a_replacable_items = $this->find_all_items_and_id($db->Record['txText'], array('classroom/lessons/event=viewcontent/'));
  			
  			if (count($a_replacable_items) > 0)
--- 1736,1745 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord())
  		{	
  			$i_replaced = false;
  			$a_replacable_items = array(); //clobbering array (refreshing)
  			
! 			$a_replacable_items = $this->find_all_items_and_id($db->record['txText'], array('classroom/lessons/event=viewcontent/'));
  			
  			if (count($a_replacable_items) > 0)
***************
*** 1747,1751 ****
  				foreach($a_replacable_items as $item)
  				{
! 					$db->Record['txText'] = str_replace($item['fullstring'], $item['originalstring'].'id='.$this->map_content[$item['id']], $db->Record['txText']);
  					$i_replaced = true;
  				}
--- 1747,1751 ----
  				foreach($a_replacable_items as $item)
  				{
! 					$db->record['txText'] = str_replace($item['fullstring'], $item['originalstring'].'id='.$this->map_content[$item['id']], $db->record['txText']);
  					$i_replaced = true;
  				}
***************
*** 1753,1762 ****
  				
  					
! 					//echo 'Replacing text on (Content): '. $db->Record['id_class_lesson_content']. '<br>';
  					
  					$sql = '
  					UPDATE class_lesson_content
! 					SET txText=\''.str_replace('\'', '\'\'', stripslashes($db->Record['txText'])).'\'
! 					WHERE id_class_lesson_content='. $db->Record['id_class_lesson_content'];
  					
  					$db_saver->query($sql);
--- 1753,1762 ----
  				
  					
! 					//echo 'Replacing text on (Content): '. $db->record['id_class_lesson_content']. '<br>';
  					
  					$sql = '
  					UPDATE class_lesson_content
! 					SET txText=\''.str_replace('\'', '\'\'', stripslashes($db->record['txText'])).'\'
! 					WHERE id_class_lesson_content='. $db->record['id_class_lesson_content'];
  					
  					$db_saver->query($sql);

Index: classrestore.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/classrestore.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** classrestore.lcp	18 Nov 2006 00:09:34 -0000	1.2
--- classrestore.lcp	8 Oct 2007 14:17:47 -0000	1.3
***************
*** 73,79 ****
  		$db->query($sql);
  		
! 		while ($db->next_record())
  		{
! 			$t['optionSemester'][$db->Record['id_semesters']] = $a_semester[$db->Record['semesterTerm']].' '.$db->Record['semesterYear'];
  		}
  	
--- 73,79 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord())
  		{
! 			$t['optionSemester'][$db->record['id_semesters']] = $a_semester[$db->record['semesterTerm']].' '.$db->record['semesterYear'];
  		}
  	
***************
*** 1515,1524 ****
  		$db->query($sql);
  		
! 		while ($db->next_record())
  		{	
  			$i_replaced = false;
  			$a_replacable_items = array(); //clobbering array (refreshing)
  			
! 			$a_replacable_items = $this->find_all_items_and_id($db->Record['txText'], array('classroom/lessons/event=viewcontent/'));
  			
  			if (count($a_replacable_items) > 0)
--- 1515,1524 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord())
  		{	
  			$i_replaced = false;
  			$a_replacable_items = array(); //clobbering array (refreshing)
  			
! 			$a_replacable_items = $this->find_all_items_and_id($db->record['txText'], array('classroom/lessons/event=viewcontent/'));
  			
  			if (count($a_replacable_items) > 0)
***************
*** 1526,1530 ****
  				foreach($a_replacable_items as $item)
  				{
! 					$db->Record['txText'] = str_replace($item['fullstring'], $item['originalstring'].'id='.$this->map_content[$item['id']], $db->Record['txText']);
  					$i_replaced = true;
  				}
--- 1526,1530 ----
  				foreach($a_replacable_items as $item)
  				{
! 					$db->record['txText'] = str_replace($item['fullstring'], $item['originalstring'].'id='.$this->map_content[$item['id']], $db->record['txText']);
  					$i_replaced = true;
  				}
***************
*** 1532,1541 ****
  				
  					
! 					//echo 'Replacing text on (Content): '. $db->Record['id_class_lesson_content']. '<br>';
  					
  					$sql = '
  					UPDATE class_lesson_content
! 					SET txText=\''.str_replace('\'', '\'\'', stripslashes($db->Record['txText'])).'\'
! 					WHERE id_class_lesson_content='. $db->Record['id_class_lesson_content'];
  					
  					$db_saver->query($sql);
--- 1532,1541 ----
  				
  					
! 					//echo 'Replacing text on (Content): '. $db->record['id_class_lesson_content']. '<br>';
  					
  					$sql = '
  					UPDATE class_lesson_content
! 					SET txText=\''.str_replace('\'', '\'\'', stripslashes($db->record['txText'])).'\'
! 					WHERE id_class_lesson_content='. $db->record['id_class_lesson_content'];
  					
  					$db_saver->query($sql);

Index: groups.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/groups.lcp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** groups.lcp	11 Feb 2007 05:31:20 -0000	1.3
--- groups.lcp	8 Oct 2007 14:17:48 -0000	1.4
***************
*** 30,38 ****
  		
  		$db->query("select * from lcGroups");
! 		while ($db->next_record() ) {
! 			if ( in_array($db->Record[gid],$this->dontdelete) ) {
! 				$db->Record[groupName] = '*'.$db->Record[groupName];
  			}
! 			$t["group_opt"] .= "<option value=\"".$db->Record[gid]."\">".$db->Record[groupName]." (".$db->Record[gid].") </option>\n";
  		}
          }
--- 30,38 ----
  		
  		$db->query("select * from lcGroups");
! 		while ($db->nextRecord() ) {
! 			if ( in_array($db->record[gid],$this->dontdelete) ) {
! 				$db->record[groupName] = '*'.$db->record[groupName];
  			}
! 			$t["group_opt"] .= "<option value=\"".$db->record[gid]."\">".$db->record[groupName]." (".$db->record[gid].") </option>\n";
  		}
          }
***************
*** 64,70 ****
  		//grab the permissions that they have
  		$db->query("select displayName, lcPerms.action, mid from lcRegistry left join lcPerms on lcRegistry.mid = lcPerms.moduleID and lcPerms.groupID = '".$arg->getvars[1]."' order by displayName");
! 		while ($db->next_record() ) {
! 			$t[modNames][$db->Record['displayName']][id] = $db->Record['mid'];
! 			$temp[$db->Record['displayName']][] = $db->Record['action'];
  		}
  
--- 64,70 ----
  		//grab the permissions that they have
  		$db->query("select displayName, lcPerms.action, mid from lcRegistry left join lcPerms on lcRegistry.mid = lcPerms.moduleID and lcPerms.groupID = '".$arg->getvars[1]."' order by displayName");
! 		while ($db->nextRecord() ) {
! 			$t[modNames][$db->record['displayName']][id] = $db->record['mid'];
! 			$temp[$db->record['displayName']][] = $db->record['action'];
  		}
  
***************
*** 75,79 ****
  		while (list ($modName,$mid) = @each($t[modNames]) ) {
  			$db->queryOne("select perms from lcRegistry where mid = '".$mid[id]."'");
! 			$permsPairs = explode('|',substr($db->Record[perms],1,-1) );
  				while (list ($k,$v) = @each($permsPairs) ) {
  					list ($permk,$permname) = split(';',$v);
--- 75,79 ----
  		while (list ($modName,$mid) = @each($t[modNames]) ) {
  			$db->queryOne("select perms from lcRegistry where mid = '".$mid[id]."'");
! 			$permsPairs = explode('|',substr($db->record[perms],1,-1) );
  				while (list ($k,$v) = @each($permsPairs) ) {
  					list ($permk,$permname) = split(';',$v);
***************
*** 88,92 ****
  		//a few other UI things
  		$db->queryOne("Select groupName from lcGroups where  gid = '".$arg->getvars[1]."'");
! 		$t[gName] = $db->Record['groupName'];
  		$t[gid] = $arg->getvars[1];
  		$arg->templateName = "groups_show";
--- 88,92 ----
  		//a few other UI things
  		$db->queryOne("Select groupName from lcGroups where  gid = '".$arg->getvars[1]."'");
! 		$t[gName] = $db->record['groupName'];
  		$t[gid] = $arg->getvars[1];
  		$arg->templateName = "groups_show";
***************
*** 108,113 ****
  		$sql = "select * from lcGroups where gid = '".$arg->postvars[group_opt]."'";
  		$db->query($sql);
! 		$db->next_record();
! 		$oldGroup = $db->Record;
  
  				//get full name from gid
--- 108,113 ----
  		$sql = "select * from lcGroups where gid = '".$arg->postvars[group_opt]."'";
  		$db->query($sql);
! 		$db->nextRecord();
! 		$oldGroup = $db->record;
  
  				//get full name from gid
***************
*** 142,146 ****
  		$sql = "select * from lcGroups where gid = '".$arg->postvars['gid']."' or groupName = '".$arg->postvars['groupName']."'";
  		$db->query($sql);
! 		if ($db->next_record()) {
  			$t[message] = "Duplicate Groups (".$arg->postvars['groupName'].",".$arg->postvars['gid'].").  Either the gid or groupName chosen is already in use.";
  			$this->run($db,$u,$arg,$t);
--- 142,146 ----
  		$sql = "select * from lcGroups where gid = '".$arg->postvars['gid']."' or groupName = '".$arg->postvars['groupName']."'";
  		$db->query($sql);
! 		if ($db->nextRecord()) {
  			$t[message] = "Duplicate Groups (".$arg->postvars['groupName'].",".$arg->postvars['gid'].").  Either the gid or groupName chosen is already in use.";
  			$this->run($db,$u,$arg,$t);
***************
*** 173,178 ****
  //exit();
  		$db->query("select displayName from lcRegistry where mid = '".$mid."'");
! 		$db->next_record();
! 	$t[message] = "Group permissions updated for module : ".$db->Record['displayName'];
  	$this->showRun($db,$u,$arg,$t);
  	}
--- 173,178 ----
  //exit();
  		$db->query("select displayName from lcRegistry where mid = '".$mid."'");
! 		$db->nextRecord();
! 	$t[message] = "Group permissions updated for module : ".$db->record['displayName'];
  	$this->showRun($db,$u,$arg,$t);
  	}

Index: facultylist.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/facultylist.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** facultylist.lcp	18 Nov 2006 00:09:34 -0000	1.2
--- facultylist.lcp	8 Oct 2007 14:17:48 -0000	1.3
***************
*** 50,55 ****
  		$db->query($sql);
  		
! 		while ($db->next_record())
! 		{	$a_faculty_list[] = $db->Record;
  		}	
  		
--- 50,55 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord())
! 		{	$a_faculty_list[] = $db->record;
  		}	
  		

Index: courses.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/courses.lcp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** courses.lcp	7 Apr 2007 22:59:17 -0000	1.7
--- courses.lcp	8 Oct 2007 14:17:47 -0000	1.8
***************
*** 76,80 ****
  		$db->queryOne("select count(*) from courses");
  		$maxcourses = (int)base64_decode(MAX_COURSES);
! 		if ($db->Record[0] >= $maxcourses) { 
  			$t['msg'] = 'You are at the course maximum of '.$maxcourses.' for this installation.  Please contact your server administrator for details.';
  			$this->run($db,$u,$lc,$t);
--- 76,80 ----
  		$db->queryOne("select count(*) from courses");
  		$maxcourses = (int)base64_decode(MAX_COURSES);
! 		if ($db->record[0] >= $maxcourses) { 
  			$t['msg'] = 'You are at the course maximum of '.$maxcourses.' for this installation.  Please contact your server administrator for details.';
  			$this->run($db,$u,$lc,$t);
***************
*** 168,179 ****
  	{
  		$db->queryOne('select * from courses where id_courses='.$lc->getvars['id']);
! 		$t['courseData'] = $db->Record;
! 		$t['courseFamilyNumber'] = $db->Record['courseFamily'].$db->Record['courseNumber'];
  
  		$t['preReqs'] = implode('<br>',array(
! 			$db->Record['preReq1'],
! 			$db->Record['preReq2'],
! 			$db->Record['preReq3'],
! 			$db->Record['preReq4']
  		));
  		$t['preReqs'] = preg_replace('/^(<br>)+/','',$t['preReqs']);
--- 168,179 ----
  	{
  		$db->queryOne('select * from courses where id_courses='.$lc->getvars['id']);
! 		$t['courseData'] = $db->record;
! 		$t['courseFamilyNumber'] = $db->record['courseFamily'].$db->record['courseNumber'];
  
  		$t['preReqs'] = implode('<br>',array(
! 			$db->record['preReq1'],
! 			$db->record['preReq2'],
! 			$db->record['preReq3'],
! 			$db->record['preReq4']
  		));
  		$t['preReqs'] = preg_replace('/^(<br>)+/','',$t['preReqs']);
***************
*** 181,188 ****
  
  		$t['coReqs'] = implode('<br>',array(
! 			$db->Record['coReq1'],
! 			$db->Record['coReq2'],
! 			$db->Record['coReq3'],
! 			$db->Record['coReq4']
  		));
  		$t['coReqs'] = preg_replace('/^(<br>)+/','',$t['coReqs']);
--- 181,188 ----
  
  		$t['coReqs'] = implode('<br>',array(
! 			$db->record['coReq1'],
! 			$db->record['coReq2'],
! 			$db->record['coReq3'],
! 			$db->record['coReq4']
  		));
  		$t['coReqs'] = preg_replace('/^(<br>)+/','',$t['coReqs']);
***************
*** 191,195 ****
  		$sql = 'select username,firstname,lastname from profile left join classes on username=facultyId where courseFamilyNumber="'.$t['courseFamilyNumber'].'"';
  		$db->query($sql);
! 		while ($db->next_record()) $t['faculty'][] = $db->Record;
  
  		$sql = 'select c.sectionNumbers,c.classType,f.firstname,f.lastname
--- 191,195 ----
  		$sql = 'select username,firstname,lastname from profile left join classes on username=facultyId where courseFamilyNumber="'.$t['courseFamilyNumber'].'"';
  		$db->query($sql);
! 		while ($db->nextRecord()) $t['faculty'][] = $db->record;
  
  		$sql = 'select c.sectionNumbers,c.classType,f.firstname,f.lastname
***************
*** 197,201 ****
  			where f.username=c.facultyId and id_courses='.$lc->getvars['id'];
  		$db->query($sql);
! 		while ($db->next_record()) $t['classes'][] = $db->Record;
  
  		$t['editlink'] = APP_URL.'administration/courses/event=editCourse/id='.$lc->getvars['id'];
--- 197,201 ----
  			where f.username=c.facultyId and id_courses='.$lc->getvars['id'];
  		$db->query($sql);
! 		while ($db->nextRecord()) $t['classes'][] = $db->record;
  
  		$t['editlink'] = APP_URL.'administration/courses/event=editCourse/id='.$lc->getvars['id'];
***************
*** 365,371 ****
  		$db->query($sql);
  		
! 		while ($db->next_record())
  		{ 
! 			$a_semesterlist[$db->Record['id_semesters']] = $db->Record['semesterTerm']. ' '. $db->Record['semesterYear'];
  		}
  		
--- 365,371 ----
  		$db->query($sql);
  		
! 		while ($db->nextRecord())
  		{ 
! 			$a_semesterlist[$db->record['id_semesters']] = $db->record['semesterTerm']. ' '. $db->record['semesterYear'];
  		}
  		

Index: menu.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/administration/menu.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** menu.lcp	16 Dec 2006 01:28:23 -0000	1.2
--- menu.lcp	8 Oct 2007 14:17:48 -0000	1.3
***************
*** 53,57 ****
  
  		$db->queryOne("select * from menuCache where pkey=$menuID");
! 		$cachedMenu = unserialize($db->Record['menuObj']);
  		
  		$arg->templateName = 'menu_details';
--- 53,57 ----
  
  		$db->queryOne("select * from menuCache where pkey=$menuID");
! 		$cachedMenu = unserialize($db->record['menuObj']);
  		
  		$arg->templateName = 'menu_details';
***************
*** 71,76 ****
  				$arg->templateName="menu_item_html";
  				$db->query("select filename, title from lcHtml");
! 				while($db->next_record()) {
! 					$t['html'][$db->Record[0]] = $db->Record[1];
  				}
  				$t['html'] = makeOptions($t['html']);
--- 71,76 ----
  				$arg->templateName="menu_item_html";
  				$db->query("select filename, title from lcHtml");
! 				while($db->nextRecord()) {
! 					$t['html'][$db->record[0]] = $db->record[1];
  				}
  				$t['html'] = makeOptions($t['html']);
***************
*** 80,85 ****
  				$arg->templateName="menu_item_app";
  				$db->query("select mid, moduleName from lcRegistry");
! 				while($db->next_record()) {
! 					$t['apps'][$db->Record[0]] = $db->Record[1];
  				}
  				$t['apps'] = makeOptions($t['apps']);
--- 80,85 ----
  				$arg->templateName="menu_item_app";
  				$db->query("select mid, moduleName from lcRegistry");
! 				while($db->nextRecord()) {
! 					$t['apps'][$db->record[0]] = $db->record[1];
  				}
  				$t['apps'] = makeOptions($t['apps']);
***************
*** 97,102 ****
  		//parent menus
  		$db->query("select pkey, title from menu order by title");
! 		while($db->next_record()) {
! 			$t['menuOpts'] .= '<option value="'.$db->Record[0].'">'.$db->Record[1].'</option>';
  		}
  		$t['event'] = "itemInsert";
--- 97,102 ----
  		//parent menus
  		$db->query("select pkey, title from menu order by title");
! 		while($db->nextRecord()) {
! 			$t['menuOpts'] .= '<option value="'.$db->record[0].'">'.$db->record[1].'</option>';
  		}
  		$t['event'] = "itemInsert";
***************
*** 175,181 ****
  			case "htm":
  				$db->query("select filename, title from lcHtml");
! 				while($db->next_record()) {
! 					$t[html][$db->Record[0]] = $db->Record[1];
! 					if ( $link->location == $db->Record[0] ) { $sel = $db->Record[0]; }
  				}
  				$t[html] = makeOptions($t[html],$sel);
--- 175,181 ----
  			case "htm":
  				$db->query("select filename, title from lcHtml");
! 				while($db->nextRecord()) {
! 					$t[html][$db->record[0]] = $db->record[1];
! 					if ( $link->location == $db->record[0] ) { $sel = $db->record[0]; }
  				}
  				$t[html] = makeOptions($t[html],$sel);
***************
*** 185,191 ****
  				include_once(LIB_PATH."LC_html.php");
  				$db->query("select mid, moduleName from lcRegistry");
! 				while($db->next_record()) {
! 					$t['apps'][$db->Record[0]] = $db->Record[1];
! 					if ( $link->location == $db->Record[0] ) { $sel = $db->Record[1]; }
  
  				}
--- 185,191 ----
  				include_once(LIB_PATH."LC_html.php");
  				$db->query("select mid, moduleName from lcRegistry");
! 				while($db->nextRecord()) {
! 					$t['apps'][$db->record[0]] = $db->record[1];
! 					if ( $link->location == $db->record[0] ) { $sel = $db->record[1]; }
  
  				}
***************
*** 197,204 ****
  		// parent menus
  		$db->query("select pkey, title from menu order by title");
! 		while($db->next_record()) {
! 			$t['menuOpts'] .= '<option value="'.$db->Record[0].'" ';
! 			if ( $db->Record[0] == $t['menuItem']->menuID) {$t[menuOpts] .= 'SELECTED';}
! 			$t['menuOpts'] .= '>'.$db->Record[1].'</option>';
  		}
  
--- 197,204 ----
  		// parent menus
  		$db->query("select pkey, title from menu order by title");
! 		while($db->nextRecord()) {
! 			$t['menuOpts'] .= '<option value="'.$db->record[0].'" ';
! 			if ( $db->record[0] == $t['menuItem']->menuID) {$t[menuOpts] .= 'SELECTED';}
! 			$t['menuOpts'] .= '>'.$db->record[1].'</option>';
  		}
  
***************
*** 286,291 ****
  		$db->query("select pkey,parentID,linkText,type from menuItems where menuID = ".$link->menuID." order by parentID, rank");
  		$db->RESULT_TYPE = MYSQL_ASSOC;
! 		while ( $db->next_record() ) {
! 			$data[] = new menuItem($db->Record);
  		
  		}
--- 286,291 ----
  		$db->query("select pkey,parentID,linkText,type from menuItems where menuID = ".$link->menuID." order by parentID, rank");
  		$db->RESULT_TYPE = MYSQL_ASSOC;
! 		while ( $db->nextRecord() ) {
! 			$data[] = new menuItem($db->record);
  		
  		}
***************
*** 370,378 ****
  		$this->applinks = array('View menus'=>'menu/');
  		$db->query("select gid,groupName from lcGroups order by groupName");
! 		while($db->next_record()) {
! 			$t[groups] .= '<option value="'.$db->Record[0].'" ';
! 			$t[notgroups] .= '<option value="'.$db->Record[0].'" ';
! 			$t[groups] .= '>'.$db->Record[1].'</option>';
! 			$t[notgroups] .= '>'.$db->Record[1].'</option>';
  
  		}
--- 370,378 ----
  		$this->applinks = array('View menus'=>'menu/');
  		$db->query("select gid,groupName from lcGroups order by groupName");
! 		while($db->nextRecord()) {
! 			$t[groups] .= '<option value="'.$db->record[0].'" ';
! 			$t[notgroups] .= '<option value="'.$db->record[0].'" ';
! 			$t[groups] .= '>'.$db->record[1].'</option>';
! 			$t[notgroups] .= '>'.$db->record[1].'</option>';
  
  		}
***************
*** 425,439 ****
  
  		$db->query("select gid,groupName from lcGroups order by groupName");
! 		while($db->next_record()) {
! 			$t[groups] .= '<option value="'.$db->Record[0].'" ';
! 			$t[notgroups] .= '<option value="'.$db->Record[0].'" ';
! 			if ( in_array($db->Record[0]...
 
[truncated message content]

[Logicampus-cvs] logicampus/src/logicreate/services/classroom content.lcp, 1.13, 1.14

[Mark K <har...@us...>]

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

Modified Files:
	content.lcp 
Log Message:
Fix query for linked images in the content viewer.


Index: content.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/content.lcp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** content.lcp	5 Oct 2007 22:37:38 -0000	1.13
--- content.lcp	8 Oct 2007 14:11:46 -0000	1.14
***************
*** 117,125 ****
  		// try to find it just linked up to this class
  		if ($curIdx == -1) {
! 			$db->query("SELECT * FROM lob_content as A 
! 				LEFT JOIN lob_class_repo AS B on A.lob_content_id = B.lob_class_repo_id
  				WHERE B.lob_urltitle = '".$filename."'
  				AND B.class_id = ".$classId);
- 
  		} else {
  			$db->query("SELECT A.*, B.lob_mime, B.lob_sub_type 
--- 117,124 ----
  		// try to find it just linked up to this class
  		if ($curIdx == -1) {
! 			$db->query("SELECT * FROM lob_class_content as A 
! 				LEFT JOIN lob_class_repo AS B on A.lob_class_repo_id = B.lob_class_repo_id
  				WHERE B.lob_urltitle = '".$filename."'
  				AND B.class_id = ".$classId);
  		} else {
  			$db->query("SELECT A.*, B.lob_mime, B.lob_sub_type 

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr/templates lessonManager_show.html, 1.1, 1.2

[Mark K <har...@us...>]

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

Modified Files:
	lessonManager_show.html 
Log Message:
Add in a form to change the start and end dates for LOBs right into the lesson show page.


Index: lessonManager_show.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/templates/lessonManager_show.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lessonManager_show.html	4 Oct 2007 17:50:58 -0000	1.1
--- lessonManager_show.html	8 Oct 2007 00:34:04 -0000	1.2
***************
*** 34,41 ****
--- 34,45 ----
  </table>
  
+ 
+ <form name="seq_form" id="seq_form" action="<?=appurl('classmgr');?>/lessonSequence/event=save/id=<?=$t['lessonId'];?>" method="POST">
  <?php
  echo $t['table']->toHtml();
  ?>
  
+ <input type="submit" name="save_btn" id="save_btn" value="Save Changes"/>
+ </form>
  
  	<div style="float:right;padding-top:.5em;width:48%;align:right;">

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr lessonSequence.lcp, 1.9, 1.10

[Mark K <har...@us...>]

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

Modified Files:
	lessonSequence.lcp 
Log Message:
Add in a form to change the start and end dates for LOBs right into the lesson show page.


Index: lessonSequence.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonSequence.lcp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** lessonSequence.lcp	4 Oct 2007 17:50:58 -0000	1.9
--- lessonSequence.lcp	8 Oct 2007 00:34:04 -0000	1.10
***************
*** 281,285 ****
  
  		$this->presentor = 'redirectPresentation';
! 		$t['url'] = appurl('classmgr/lessonSequence/id='.$lesson_id);
  
  	}
--- 281,285 ----
  
  		$this->presentor = 'redirectPresentation';
! 		$t['url'] = appurl('classmgr/lessonManager/event=show/id='.$lesson_id);
  
  	}
***************
*** 294,298 ****
  			where l.id_classes='{$u->activeClassTaught->id_classes}'
  			and l.id_class_lessons='{$lessonid}'");
! 		if (!$db->Record['cnt'] || intval($lessonid) == 0 ) {
  			$this->presentor = 'errorMessage';
  			$t['message'] = "You don't have permission to modify that lesson.";
--- 294,298 ----
  			where l.id_classes='{$u->activeClassTaught->id_classes}'
  			and l.id_class_lessons='{$lessonid}'");
! 		if (!$db->record['cnt'] || intval($lessonid) == 0 ) {
  			$this->presentor = 'errorMessage';
  			$t['message'] = "You don't have permission to modify that lesson.";

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr/META-INFO setup.sql, 1.13, 1.14

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/META-INFO
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5411/classmgr/META-INFO

Modified Files:
	setup.sql 
Log Message:
Fix sql syntax bugs.


Index: setup.sql
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/META-INFO/setup.sql,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** setup.sql	4 Oct 2007 02:53:45 -0000	1.13
--- setup.sql	8 Oct 2007 00:33:39 -0000	1.14
***************
*** 19,24 ****
    comments text NOT NULL,
    grade float(10,2) default NULL,
!   PRIMARY KEY  (id_class_assignments_grades)
!   KEY `id_class_assignments` (`id_class_assignments_idx`)
  ) TYPE=MyISAM;
  
--- 19,24 ----
    comments text NOT NULL,
    grade float(10,2) default NULL,
!   PRIMARY KEY  (id_class_assignments_grades),
!   KEY `id_class_assignments_idx` (`id_class_assignments`)
  ) TYPE=MyISAM;
  
***************
*** 35,39 ****
    assign_file_blob longblob NOT NULL,
    PRIMARY KEY  (id_class_assignments_turnin),
!   KEY `id_class_assignments` (`id_class_assignments_idx`)
  ) TYPE=MyISAM;
  
--- 35,39 ----
    assign_file_blob longblob NOT NULL,
    PRIMARY KEY  (id_class_assignments_turnin),
!   KEY `id_class_assignments_idx` (`id_class_assignments`)
  ) TYPE=MyISAM;
  

[Logicampus-cvs] logicampus/src/logicreate/services/lobrepo import.lcp, 1.8, 1.9

[Mark K <har...@us...>]

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

Modified Files:
	import.lcp 
Log Message:
Use proper function to encode URL titles so that every non-safe character is turned
 into a single underscore _.


Index: import.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/lobrepo/import.lcp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** import.lcp	7 Oct 2007 16:02:04 -0000	1.8
--- import.lcp	8 Oct 2007 00:13:35 -0000	1.9
***************
*** 10,13 ****
--- 10,15 ----
  include_once(LIB_PATH.'PBDO/LobTest.php');
  
+ include_once(LIB_PATH.'lc_lob.php');
+ 
  /**
   * Learning Object Repository
***************
*** 187,197 ****
  			$children = $node->childNodes;
  			$lob->set('lobFilename', trim($children->item(0)->nodeValue) );
! 			$lob->set('lobUrltitle', urlencode(trim($children->item(0)->nodeValue)) );
  			$lob->set('lobBinary', file_get_contents($this->tempdir.'/content/'.trim($children->item(0)->nodeValue)) );
  		} else {
! 			$urltitle = $lob->get('lobTitle');
! 			$urltitle = str_replace(' ', '_', $urltitle);
! 			$urltitle = urlencode($urltitle);
! 			$lob->set('lobUrltitle', $urltitle );
  		}
  
--- 189,199 ----
  			$children = $node->childNodes;
  			$lob->set('lobFilename', trim($children->item(0)->nodeValue) );
! 
! 			$urlTitle = Lc_Lob_Util::createLinkText(trim($children->item(0)->nodeValue));
! 			$lob->set('lobUrltitle', $urlTitle );
  			$lob->set('lobBinary', file_get_contents($this->tempdir.'/content/'.trim($children->item(0)->nodeValue)) );
  		} else {
! 			$urlTitle = Lc_Lob_Util::createLinkText(trim( $lob->get('lobTitle')) );
! 			$lob->set('lobUrltitle', $urlTitle );
  		}
  

[Logicampus-cvs] logicampus/src/logicreate/services/lobrepo import.lcp, 1.7, 1.8

[Mark K <har...@us...>]

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

Modified Files:
	import.lcp 
Log Message:
Create subLobs for content nodes.


Index: import.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/lobrepo/import.lcp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** import.lcp	7 Oct 2007 00:10:59 -0000	1.7
--- import.lcp	7 Oct 2007 16:02:04 -0000	1.8
***************
*** 62,66 ****
  		$collectionNode = $root->item(0);
  
! 		$lobNodes = $collectionNode->childNodes;
  		for ($xidx = 0; $xidx < $lobNodes->length; $xidx++) {
  			$node = $lobNodes->item($xidx);
--- 62,66 ----
  		$collectionNode = $root->item(0);
  
! 		$lobNodes = $collectionNode->getElementsByTagnameNS('http://logicampus.sourceforge.net/2006/learning_object','obj');
  		for ($xidx = 0; $xidx < $lobNodes->length; $xidx++) {
  			$node = $lobNodes->item($xidx);
***************
*** 68,81 ****
  				continue;
  			}
! 			if ($node->tagName == 'lesson:lesson') { continue; }
! 			$lobObj = $this->processLobNode($node);
  			$lobMetaObj = $this->processLobMeta($node);
  			$lobUserObj = new LobUserLink();
  
! 			if ($lobObj === null) { continue; /*die('null object'); continue;*/ }
! 			echo "saving 1 lob ... <br/>\n";
! 			debug($lobObj->lobTitle);
  			$lobObj->save();
  
  			$lobMetaObj->set('lobRepoEntryId',$lobObj->getPrimaryKey());
  			$lobMetaObj->save();
--- 68,95 ----
  				continue;
  			}
! 			$lobSub = null;
! 			$lobObj = $this->makeRepoNode($node);
  			$lobMetaObj = $this->processLobMeta($node);
  			$lobUserObj = new LobUserLink();
  
! 			if ($lobObj === null) { 
! echo "skipping node .. ".$node->tagName."...<br/>\n";
! 				continue; /*die('null object'); continue;*/ 
! 			}
! 			if ($lobObj->lobType == 'content') {
! 				$lobSub = $this->makeContentNode($node);
! 			}
! 
! 			echo "saving ".$xidx." lob ... <br/>\n";
! 		//	debug($lobObj->lobTitle);
  			$lobObj->save();
  
+ 			if ( is_object($lobSub) ) {
+ 				$lobSub->set('lobRepoEntryId',$lobObj->getPrimaryKey());
+ 				$lobSub->save();
+ 				echo $xidx." is a *CONTENT* lob ... <br/>\n";
+ //				echo substr($lobSub->lobText,0,1000)."<br/>\n";
+ 			}
+ //*
  			$lobMetaObj->set('lobRepoEntryId',$lobObj->getPrimaryKey());
  			$lobMetaObj->save();
***************
*** 85,90 ****
  			$lobUserObj->set('isOwner','1');
  			$lobUserObj->save();
  
- //			debug($lobObj);
  		}
  
--- 99,104 ----
  			$lobUserObj->set('isOwner','1');
  			$lobUserObj->save();
+ //*/
  
  		}
  
***************
*** 95,109 ****
  
  
! 		//unlink($tempdir.'/learningobjects.xml');
! 		//rmdir($tempdir.'/interactions');
! 		//rmdir($tempdir.'/tests');
! 		//rmdir($tempdir);
  	}
  
  
  	/**
  	 * return a lob object
  	 */
! 	function processLobNode($n) {
  		$result = $n->getElementsByTagname('type');
  		$type = $result->item(0);
--- 109,134 ----
  
  
! 		unlink($tempdir.'/learningobjects.xml');
! 		rmdir($tempdir.'/interactions');
! 		rmdir($tempdir.'/tests');
! 		rmdir($tempdir);
  	}
  
+ 	/**
+ 	 * return a lob content sub-object
+ 	 */
+ 	function makeContentNode($n) {
+ 		$result = $n->getElementsByTagname('content');
+ 		$textContent = $result->item(0);
+ 		$lobSub = new LobContent();
+ 		$lobSub->lobText = $textContent->nodeValue;
+ 		return $lobSub;
+ 	}
  
+ 	
  	/**
  	 * return a lob object
  	 */
! 	function makeRepoNode($n) {
  		$result = $n->getElementsByTagname('type');
  		$type = $result->item(0);
***************
*** 132,150 ****
  
  		$lob = null;
  		switch ($content) {
  			case 'content':
- 				$lobSub = new LobContent();
- 				$lob    = new LobRepoEntry();
  				$lob->set('lobType','content');
- 				$lob->set('lobGuid',$guid);
  				break;
  			case 'interaction':
! 				$lobSub = new LobActivity();
! 				$lob    = new LobRepoEntry();
! 				$lob->set('lobType','content');
! 				$lob->set('lobGuid',$guid);
  				break;
  		}
! 		if ($lob === null) { return null; die ('unknown type '. $content); }
  
  
--- 157,171 ----
  
  		$lob = null;
+ 		$lob    = new LobRepoEntry();
+ 		$lob->set('lobGuid',$guid);
  		switch ($content) {
  			case 'content':
  				$lob->set('lobType','content');
  				break;
  			case 'interaction':
! 				$lob->set('lobType','interaction');
  				break;
  		}
! 		if ($lob->lobType == '') { return null; die ('unknown type '. $content); }
  
  

[Logicampus-cvs] logicampus/src/logicreate/services/classforums forumAdmin.lcp, 1.18, 1.19

[Mark K <har...@us...>]

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

Modified Files:
	forumAdmin.lcp 
Log Message:
Fix a bug when making forums for a class that you're taking, not teaching.


Index: forumAdmin.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classforums/forumAdmin.lcp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** forumAdmin.lcp	30 Sep 2007 21:32:06 -0000	1.18
--- forumAdmin.lcp	7 Oct 2007 04:08:56 -0000	1.19
***************
*** 222,226 ****
  		} else { 
  			$x = new ClassForum_Forums();
! 			$x->setClassId( $u->activeClassTaken->id_classes );
  			//visible by default
  			$x->setVisible( true );
--- 222,226 ----
  		} else { 
  			$x = new ClassForum_Forums();
! 			$x->setClassId( $u->activeClassTaught->id_classes );
  			//visible by default
  			$x->setVisible( true );

[Logicampus-cvs] logicampus/src/logicreate/services/lobrepo edit.lcp, 1.19, 1.20 import.lcp, 1.6, 1.7

[Mark K <har...@us...>]

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

Modified Files:
	edit.lcp import.lcp 
Log Message:
Working on import routine to work with converted moodle XML files.


Index: import.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/lobrepo/import.lcp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** import.lcp	6 Oct 2007 21:59:51 -0000	1.6
--- import.lcp	7 Oct 2007 00:10:59 -0000	1.7
***************
*** 60,64 ****
  		$root = $doc->childNodes;
  		//get the "lobcol" node
! 		$collectionNode = $root->item(1);
  
  		$lobNodes = $collectionNode->childNodes;
--- 60,64 ----
  		$root = $doc->childNodes;
  		//get the "lobcol" node
! 		$collectionNode = $root->item(0);
  
  		$lobNodes = $collectionNode->childNodes;
***************
*** 73,77 ****
  			$lobUserObj = new LobUserLink();
  
! 			if ($lobObj === null) { die('null object'); continue; }
  			$lobObj->save();
  
--- 73,79 ----
  			$lobUserObj = new LobUserLink();
  
! 			if ($lobObj === null) { continue; /*die('null object'); continue;*/ }
! 			echo "saving 1 lob ... <br/>\n";
! 			debug($lobObj->lobTitle);
  			$lobObj->save();
  
***************
*** 93,100 ****
  
  
! 		unlink($tempdir.'/learningobjects.xml');
! 		rmdir($tempdir.'/interactions');
! 		rmdir($tempdir.'/tests');
! 		rmdir($tempdir);
  	}
  
--- 95,102 ----
  
  
! 		//unlink($tempdir.'/learningobjects.xml');
! 		//rmdir($tempdir.'/interactions');
! 		//rmdir($tempdir.'/tests');
! 		//rmdir($tempdir);
  	}
  
***************
*** 118,121 ****
--- 120,124 ----
  
  		$children = $type->childNodes;
+ 		$content = '';
  		if ($children->length) {
  			$content = trim($children->item(0)->nodeValue);
***************
*** 124,128 ****
  		}
  		else {
! 			die ('unknown type: '. get_class($type)); 
  			return null;
  		}
--- 127,131 ----
  		}
  		else {
! 			die ('unknown class: '. get_class($type)); 
  			return null;
  		}
***************
*** 143,147 ****
  				break;
  		}
! 		if ($lob === null) { die ('unknown type '. $content); }
  
  
--- 146,150 ----
  				break;
  		}
! 		if ($lob === null) { return null; die ('unknown type '. $content); }
  
  

Index: edit.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/lobrepo/edit.lcp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** edit.lcp	5 Oct 2007 21:35:48 -0000	1.19
--- edit.lcp	7 Oct 2007 00:10:59 -0000	1.20
***************
*** 27,30 ****
--- 27,31 ----
  	function run(&$db,&$u,&$lc,&$t) {
  		$lobId = addslashes(trim($lc->getvars['c']));
+ 		$lc->templateName = 'edit_main';
  
  		$lob = new Lc_Lob_Content($lobId);

[Logicampus-cvs] logicampus/src/logicreate/services/lobrepo import.lcp, 1.5, 1.6

[Mark K <har...@us...>]

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

Modified Files:
	import.lcp 
Log Message:
learning object import now works with new XML.
export saves mime to XML.


Index: import.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/lobrepo/import.lcp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** import.lcp	15 May 2007 22:16:12 -0000	1.5
--- import.lcp	6 Oct 2007 21:59:51 -0000	1.6
***************
*** 1,8 ****
  <?
  
! include_once(LIB_PATH.'PBDO/LobContent.php');
  include_once(LIB_PATH.'PBDO/LobMetadata.php');
  include_once(LIB_PATH.'PBDO/LobUserLink.php');
  
  /**
   * Learning Object Repository
--- 1,13 ----
  <?
  
! 
! include_once(LIB_PATH.'PBDO/LobRepoEntry.php');
  include_once(LIB_PATH.'PBDO/LobMetadata.php');
  include_once(LIB_PATH.'PBDO/LobUserLink.php');
  
+ include_once(LIB_PATH.'PBDO/LobContent.php');
+ include_once(LIB_PATH.'PBDO/LobActivity.php');
+ include_once(LIB_PATH.'PBDO/LobTest.php');
+ 
  /**
   * Learning Object Repository
***************
*** 43,67 ****
  //		exit();
  
! 		$doc = domxml_open_file($tempdir.'/learningobjects.xml');
  
! 		$root = $doc->child_nodes();
! 		$collectionNode = $root[0];
! 		$lobNodes = $collectionNode->child_nodes();
! 		foreach ($lobNodes as $node) {
! 			if ($node->node_type() == XML_TEXT_NODE) {
  				continue;
  			}
  			$lobObj = $this->processLobNode($node);
  			$lobMetaObj = $this->processLobMeta($node);
  			$lobUserObj = new LobUserLink();
  
  			$lobObj->save();
  
! 			$lobMetaObj->set('lobKind','content');
! 			$lobMetaObj->set('lobId',$lobObj->getPrimaryKey());
  			$lobMetaObj->save();
  
! 			$lobUserObj->set('lobId',$lobObj->getPrimaryKey());
  			$lobUserObj->set('userId',$u->userId);
  			$lobUserObj->save();
  
--- 48,85 ----
  //		exit();
  
! 		$doc = new DomDocument('1.0', 'UTF-8');
! 		$doc->substituteEntities=false;
! 		$doc->resolveExternals=false;
! 		$doc->preserveWhiteSpace=true;
! 		$doc->validateOnParse=false;
! 		if (!$doc->load( $tempdir."/learningobjects.xml") ) {
! 			echo "can't open xml file.";
! 			return false;
! 		}
  
! 		$root = $doc->childNodes;
! 		//get the "lobcol" node
! 		$collectionNode = $root->item(1);
! 
! 		$lobNodes = $collectionNode->childNodes;
! 		for ($xidx = 0; $xidx < $lobNodes->length; $xidx++) {
! 			$node = $lobNodes->item($xidx);
! 			if ($node->nodeType == XML_TEXT_NODE) {
  				continue;
  			}
+ 			if ($node->tagName == 'lesson:lesson') { continue; }
  			$lobObj = $this->processLobNode($node);
  			$lobMetaObj = $this->processLobMeta($node);
  			$lobUserObj = new LobUserLink();
  
+ 			if ($lobObj === null) { die('null object'); continue; }
  			$lobObj->save();
  
! 			$lobMetaObj->set('lobRepoEntryId',$lobObj->getPrimaryKey());
  			$lobMetaObj->save();
  
! 			$lobUserObj->set('lobRepoEntryId',$lobObj->getPrimaryKey());
  			$lobUserObj->set('userId',$u->userId);
+ 			$lobUserObj->set('isOwner','1');
  			$lobUserObj->save();
  
***************
*** 86,135 ****
  	 */
  	function processLobNode($n) {
! 		$result = $n->get_elements_by_tagname('type');
! 		$type = $result[0];
  		/*
  		print_r($type);
  		echo "new lob: <br/>";
  //		debug($type);
! 		echo $type->node_value();
  		echo "name lob: <br/>";
! 		echo $type->tagname;
  		echo "<br/>";
! 		 */
! 		$children = $type->child_nodes();
! 		$content = trim($children[0]->node_value());
! 		$guid = $n->get_attribute('guid');
! 		$dbid = $n->get_attribute('dbid');
  
  		$lob = null;
  		switch ($content) {
  			case 'content':
! 				$lob = new LobContent();
  				$lob->set('lobType','content');
  				$lob->set('lobGuid',$guid);
  				break;
- 
  		}
  
  
! 		$result = $n->get_elements_by_tagname('lobtitle');
! 		$node = $result[0];
! 		$children = $node->child_nodes();
! 		$lob->set('lobTitle', trim($children[0]->node_value()) );
  
! 		$result = $n->get_elements_by_tagname('lobcontent');
! 		$node = $result[0];
  		if (is_object($node) ){
! 			$children = $node->child_nodes();
! 			$lob->set('lobContent', trim($children[0]->node_value()) );
  		}
  
! 		$result = $n->get_elements_by_tagname('lobfilename');
! 		$node = $result[0];
  		if (is_object($node) ){
! 			$children = $node->child_nodes();
! 			$lob->set('lobFilename', trim($children[0]->node_value()) );
! 			$lob->set('lobUrltitle', urlencode(trim($children[0]->node_value())) );
! 			$lob->set('lobBinary', file_get_contents($this->tempdir.'/content/'.trim($children[0]->node_value())) );
  		} else {
  			$urltitle = $lob->get('lobTitle');
--- 104,168 ----
  	 */
  	function processLobNode($n) {
! 		$result = $n->getElementsByTagname('type');
! 		$type = $result->item(0);
  		/*
  		print_r($type);
  		echo "new lob: <br/>";
  //		debug($type);
! 		echo $type->nodeValue;
! 		echo "\n<br/>";
  		echo "name lob: <br/>";
! 		echo $type->tagName;
  		echo "<br/>";
! 		// */
! 
! 		$children = $type->childNodes;
! 		if ($children->length) {
! 			$content = trim($children->item(0)->nodeValue);
! 			$guid = $n->getAttribute('guid');
! 			$dbid = $n->getAttribute('dbid');
! 		}
! 		else {
! 			die ('unknown type: '. get_class($type)); 
! 			return null;
! 		}
  
  		$lob = null;
  		switch ($content) {
  			case 'content':
! 				$lobSub = new LobContent();
! 				$lob    = new LobRepoEntry();
! 				$lob->set('lobType','content');
! 				$lob->set('lobGuid',$guid);
! 				break;
! 			case 'interaction':
! 				$lobSub = new LobActivity();
! 				$lob    = new LobRepoEntry();
  				$lob->set('lobType','content');
  				$lob->set('lobGuid',$guid);
  				break;
  		}
+ 		if ($lob === null) { die ('unknown type '. $content); }
  
  
! 		$result = $n->getElementsByTagname('title');
! 		$node = $result->item(0);
! 		$children = $node->childNodes;
! 		$lob->set('lobTitle', trim($children->item(0)->nodeValue) );
  
! 		$result = $n->getElementsByTagname('content');
! 		$node = $result->item(0);
  		if (is_object($node) ){
! 			$children = $node->childNodes;
! 			$lob->set('lobContent', trim($children->item(0)->nodeValue) );
  		}
  
! 		$result = $n->getElementsByTagname('filename');
! 		$node = $result->item(0);
  		if (is_object($node) ){
! 			$children = $node->childNodes;
! 			$lob->set('lobFilename', trim($children->item(0)->nodeValue) );
! 			$lob->set('lobUrltitle', urlencode(trim($children->item(0)->nodeValue)) );
! 			$lob->set('lobBinary', file_get_contents($this->tempdir.'/content/'.trim($children->item(0)->nodeValue)) );
  		} else {
  			$urltitle = $lob->get('lobTitle');
***************
*** 139,157 ****
  		}
  
! 		$result = $n->get_elements_by_tagname('lobdescription');
! 		$node = $result[0];
  		if (is_object($node) ){
! 			$children = $node->child_nodes();
! 			$lob->set('lobDescription', trim($children[0]->node_value()) );
  		}
  
  
! 		$result = $n->get_elements_by_tagname('subtype');
! 		$node = $result[0];
  		if (is_object($node) ){
! 			$children = $node->child_nodes();
! 			$lob->set('lobSubType', trim($children[0]->node_value()) );
  		}
  
  
  		return $lob;
--- 172,196 ----
  		}
  
! 		$result = $n->getElementsByTagname('description');
! 		$node = $result->item(0);
  		if (is_object($node) ){
! 			$children = $node->childNodes;
! 			$lob->set('lobDescription', trim($children->item(0)->nodeValue) );
  		}
  
  
! 		$result = $n->getElementsByTagname('subtype');
! 		$node = $result->item(0);
  		if (is_object($node) ){
! 			$children = $node->childNodes;
! 			$lob->set('lobSubType', trim($children->item(0)->nodeValue) );
  		}
  
+ 		$result = $n->getElementsByTagname('mime');
+ 		$node = $result->item(0);
+ 		if (is_object($node) ){
+ 			$children = $node->childNodes;
+ 			$lob->set('lobMime', trim($children->item(0)->nodeValue) );
+ 		}
  
  		return $lob;
***************
*** 164,170 ****
  	 */
  	function processLobMeta($n) {
! 		$result = $n->get_elements_by_tagname('metadata');
! 		$meta = $result[0];
! 		$children = $meta->child_nodes();
  
  
--- 203,209 ----
  	 */
  	function processLobMeta($n) {
! 		$result = $n->getElementsByTagname('metadata');
! 		$meta = $result->item(0);
! 		$children = $meta->childNodes;
  
  
***************
*** 173,204 ****
  
  		foreach($children as $childNode) {
! 			if ($childNode->node_type() == XML_TEXT_NODE) {
  				continue;
  			}
  
! 			$tag = $childNode->tagName();
! 			$subchild = $childNode->child_nodes();
! 			$lob->set($tag, trim($subchild[0]->node_value()) );
  		}
  /*
  
! 		$result = $n->get_elements_by_tagname('lobtitle');
! 		$node = $result[0];
! 		$children = $node->child_nodes();
! 		$lob->set('lobTitle', trim($children[0]->node_value()) );
  
! 		$result = $n->get_elements_by_tagname('lobcontent');
! 		$node = $result[0];
  		if (is_object($node) ){
! 			$children = $node->child_nodes();
! 			$lob->set('lobContent', trim($children[0]->node_value()) );
  		}
  
! 		$result = $n->get_elements_by_tagname('lobfilename');
! 		$node = $result[0];
  		if (is_object($node) ){
! 			$children = $node->child_nodes();
! 			$lob->set('lobFilename', trim($children[0]->node_value()) );
! 			$lob->set('lobUrltitle', urlencode(trim($children[0]->node_value())) );
  		} else {
  			$urltitle = $lob->get('lobTitle');
--- 212,243 ----
  
  		foreach($children as $childNode) {
! 			if ($childNode->nodeType == XML_TEXT_NODE) {
  				continue;
  			}
  
! 			$tag = $childNode->tagName;
! 			$subchild = $childNode->childNodes;
! 			$lob->set($tag, trim($subchild->item(0)->nodeValue) );
  		}
  /*
  
! 		$result = $n->getElementsByTagname('lobtitle');
! 		$node = $result->item(0);
! 		$children = $node->childNodes;
! 		$lob->set('lobTitle', trim($children->item(0)->nodeValue) );
  
! 		$result = $n->getElementsByTagname('lobcontent');
! 		$node = $result->item(0);
  		if (is_object($node) ){
! 			$children = $node->childNodes;
! 			$lob->set('lobContent', trim($children->item(0)->nodeValue) );
  		}
  
! 		$result = $n->getElementsByTagname('lobfilename');
! 		$node = $result->item(0);
  		if (is_object($node) ){
! 			$children = $node->childNodes;
! 			$lob->set('lobFilename', trim($children->item(0)->nodeValue) );
! 			$lob->set('lobUrltitle', urlencode(trim($children->item(0)->nodeValue)) );
  		} else {
  			$urltitle = $lob->get('lobTitle');
***************
*** 208,224 ****
  		}
  
! 		$result = $n->get_elements_by_tagname('lobdescription');
! 		$node = $result[0];
  		if (is_object($node) ){
! 			$children = $node->child_nodes();
! 			$lob->set('lobDescription', trim($children[0]->node_value()) );
  		}
  
  
! 		$result = $n->get_elements_by_tagname('subtype');
! 		$node = $result[0];
  		if (is_object($node) ){
! 			$children = $node->child_nodes();
! 			$lob->set('lobSubType', trim($children[0]->node_value()) );
  		}
  
--- 247,263 ----
  		}
  
! 		$result = $n->getElementsByTagname('lobdescription');
! 		$node = $result->item(0);
  		if (is_object($node) ){
! 			$children = $node->childNodes;
! 			$lob->set('lobDescription', trim($children->item(0)->nodeValue) );
  		}
  
  
! 		$result = $n->getElementsByTagname('subtype');
! 		$node = $result->item(0);
  		if (is_object($node) ){
! 			$children = $node->childNodes;
! 			$lob->set('lobSubType', trim($children->item(0)->nodeValue) );
  		}
  

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr exportContent.lcp, 1.18, 1.19

[Mark K <har...@us...>]

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

Modified Files:
	exportContent.lcp 
Log Message:
learning object import now works with new XML.
export saves mime to XML.


Index: exportContent.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/exportContent.lcp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** exportContent.lcp	4 Oct 2007 16:40:34 -0000	1.18
--- exportContent.lcp	6 Oct 2007 21:59:50 -0000	1.19
***************
*** 91,102 ****
  		$db->queryOne($sql);
  		
! 		$filename = 'classroom_'.$db->Record['courseFamily']. $db->Record['courseNumber'].'_'.$db->Record['semesterId'].'.zip';
  
! 		$this->courseFamily = $db->Record['courseFamily'];
  
  		$xml_raw_save = '';
  		
  		
! 		$xmlObj = new xmlparser('<lobcol xmlns:logicampus="http://logicampus.sourceforge.net/2006/lob_collection.dtd" xmlns:lob="http://logicampus.sourceforge.net/2006/learning_object.dtd"></lobcol>');
  		$xmlObj->doctype = '<!DOCTYPE lobcol PUBLIC "-//LOBCOL//DTD LOBCOL//EN" "http://logicampus.sf.net/learning-objects/lobcol-1.0.dtd">';
  		$root =& $xmlObj->getRoot();
--- 91,106 ----
  		$db->queryOne($sql);
  		
! 		$filename = 'classroom_'.$db->record['courseFamily']. $db->record['courseNumber'].'_'.$db->record['semesterId'].'.zip';
  
! 		$this->courseFamily = $db->record['courseFamily'];
  
  		$xml_raw_save = '';
  		
  		
! 		$xmlObj = new xmlparser('<lobcol 
! xmlns:logicampus="http://logicampus.sourceforge.net/2006/lob_collection" 
! xmlns:lob="http://logicampus.sourceforge.net/2006/learning_object"
! xmlns:class="http://logicampus.sourceforge.net/2006/classroom"
! xmlns:lesson="http://logicampus.sourceforge.net/2006/lesson"></lobcol>');
  		$xmlObj->doctype = '<!DOCTYPE lobcol PUBLIC "-//LOBCOL//DTD LOBCOL//EN" "http://logicampus.sf.net/learning-objects/lobcol-1.0.dtd">';
  		$root =& $xmlObj->getRoot();
***************
*** 181,184 ****
--- 185,190 ----
  		$xmlchars = fread($fh, $file_size);
  		fclose($fh);
+ //		header ('Content-Type: application/xml');
+ //		echo $xmlchars;exit();
  //		echo "<pre>\n".htmlspecialchars($xmlchars, ENT_QUOTES, 'UTF-8')."\n</pre>\n";exit();
         
***************
*** 216,220 ****
  		$lob_nodes = array();
  		$sql = '
! 		SELECT B.*,C.*
  		FROM lob_class_repo as A
  		LEFT JOIN lob_class_content AS B ON A.lob_class_repo_id = B.lob_class_repo_id
--- 222,226 ----
  		$lob_nodes = array();
  		$sql = '
! 		SELECT A.*,B.*,C.*
  		FROM lob_class_repo as A
  		LEFT JOIN lob_class_content AS B ON A.lob_class_repo_id = B.lob_class_repo_id
***************
*** 250,253 ****
--- 256,261 ----
  			list($type,$submime) = explode('/', $db->record['lob_mime']);
  			$sub_type_node = new xml_node('lob:subtype',array('mime'=>$db->record['lob_mime']),null);
+ 			$mim_type_node = new xml_node('lob:mime',null,null, $db->record['lob_mime']);
+ 
  			if ($type == 'image') {
  				$sub_type_node->value = 'image';
***************
*** 268,271 ****
--- 276,280 ----
  			$xml_child_nodes[] = $type_node;
  			$xml_child_nodes[] = $sub_type_node;
+ 			$xml_child_nodes[] = $mim_type_node;
  			$xml_child_nodes[] = $lob_title_node;
  			$xml_child_nodes[] = $lob_file_node;
***************
*** 302,307 ****
  			$this->contentGuid[ $db->record['lob_content_id'] ] = $guid;
  
! 			$lob_nodes[] = new xml_node('lob', 
! 				array('guid'=>$guid, 'dbid'=>$db->record['lob_content_id']), 
  				$xml_child_nodes
  			);
--- 311,316 ----
  			$this->contentGuid[ $db->record['lob_content_id'] ] = $guid;
  
! 			$lob_nodes[] = new xml_node('lob:obj', 
! 				array('guid'=>$guid, 'dbid'=>$db->record['lob_class_repo_id']), 
  				$xml_child_nodes
  			);
***************
*** 334,337 ****
--- 343,347 ----
  			$type_node = new xml_node('lob:type',null,null,'content');
  			$sub_type_node = new xml_node('lob:subtype',null,null,$db->record['lob_sub_type']);
+ 			$mim_type_node = new xml_node('lob:mime',null,null, $db->record['lob_mime']);
  			$lob_title_node = new xml_node('lob:title',null,null,$db->record['lob_title']);
  			$lob_title_node->cdata = true;
***************
*** 342,345 ****
--- 352,356 ----
  			$xml_child_nodes[] = $type_node;
  			$xml_child_nodes[] = $sub_type_node;
+ 			$xml_child_nodes[] = $mim_type_node;
  			$xml_child_nodes[] = $lob_title_node;
  			$xml_child_nodes[] = $lob_content_node;
***************
*** 374,378 ****
  			$this->contentGuid[$db->record['lob_content_id']] = $guid;
  			$lob_nodes[] = new xml_node('lob:obj', 
! 				array('guid'=>$guid, 'dbid'=>$db->record['lob_content_id']), 
  				$xml_child_nodes
  			);
--- 385,389 ----
  			$this->contentGuid[$db->record['lob_content_id']] = $guid;
  			$lob_nodes[] = new xml_node('lob:obj', 
! 				array('guid'=>$guid, 'dbid'=>$db->record['lob_class_repo_id']), 
  				$xml_child_nodes
  			);
***************
*** 387,392 ****
  	function get_homework_nodes() {
  		$lob_nodes = array();
  		$sql = '
! 		SELECT A.*, B.*, C.*
  		FROM lob_class_repo as A
  		LEFT JOIN lob_class_activity AS B 
--- 398,407 ----
  	function get_homework_nodes() {
  		$lob_nodes = array();
+ 		//if you select C.* and there's no record for the metadata
+ 		// the lob_repo_id will be overwritten with a blank,
+ 		// Same thing can happen for table B.
  		$sql = '
! 		SELECT A.*, B.*, C.subject, C.subdisc, C.author, C.copyright, C.license, C.user_version
! 		,C.status, C.updated_on, C.created_on
  		FROM lob_class_repo as A
  		LEFT JOIN lob_class_activity AS B 
***************
*** 395,399 ****
  			ON A.lob_class_repo_id = C.lob_class_repo_id
  		WHERE A.class_id='.$this->classId.'
! 		AND lob_type ="activity"';
  
  		$db = DB::getHandle();
--- 410,414 ----
  			ON A.lob_class_repo_id = C.lob_class_repo_id
  		WHERE A.class_id='.$this->classId.'
! 		AND A.lob_type ="activity"';
  
  		$db = DB::getHandle();
***************
*** 403,411 ****
  		/*
  		while ($db->nextRecord()) {
! 			echo "debug offset = ". (( $db->record['dueDate'] - $this->semStart ) / 60 / 60/ 24);
  			debug($db->record);
  		}
  		exit();
! 		 */
  		while ($db->nextRecord()) {
  			$type_node = new xml_node('lob:type',null,null,'interaction');
--- 418,426 ----
  		/*
  		while ($db->nextRecord()) {
! 		//	echo "debug offset = ". (( $db->record['dueDate'] - $this->semStart ) / 60 / 60/ 24);
  			debug($db->record);
  		}
  		exit();
! 		// */
  		while ($db->nextRecord()) {
  			$type_node = new xml_node('lob:type',null,null,'interaction');
***************
*** 413,416 ****
--- 428,432 ----
  			list($type,$submime) = explode('/', $db->record['lob_mime']);
  			$sub_type_node = new xml_node('lob:subtype',null,null);
+ 			$mim_type_node = new xml_node('lob:mime',null,null, $db->record['lob_mime']);
  			$resp_node = new xml_node('logicampus:response',null,null);
  
***************
*** 471,474 ****
--- 487,491 ----
  			$xml_child_nodes[] = $type_node;
  			$xml_child_nodes[] = $sub_type_node;
+ 			$xml_child_nodes[] = $mim_type_node;
  			$xml_child_nodes[] = $resp_node;
  			$xml_child_nodes[] = $lob_title_node;

[Logicampus-cvs] logicampus/src/logicreate/services/lobrepo/templates exam_main.html, 1.1, 1.2 exam_question_mchoice.html, 1.1, 1.2

[Mark K <har...@us...>]

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

Modified Files:
	exam_main.html exam_question_mchoice.html 
Log Message:
Fixes to copy a test down to your classroom and see it in the classroom viewer.


Index: exam_question_mchoice.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/lobrepo/templates/exam_question_mchoice.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** exam_question_mchoice.html	5 Oct 2007 21:35:48 -0000	1.1
--- exam_question_mchoice.html	5 Oct 2007 22:37:38 -0000	1.2
***************
*** 22,27 ****
  			<td NOWRAP>
  				<? $x <= 1 ? '*' : ''; ?>
! 				<input name="labels[<?=$x;?>]" type="text" value="<?=$qc->label;?>" size="50" <?= $t['disableFlag'];?>>
! 				<input name="correct" value="<?=$x;?>" type="radio" <?= $qc->correct ? 'CHECKED':'';?>>
  			</td>
  		</tr>
--- 22,27 ----
  			<td NOWRAP>
  				<? $x <= 1 ? '*' : ''; ?>
! 				<input name="labels[<?=$x;?>]" type="text" value="<?=$qc['label'];?>" size="50" <?= $t['disableFlag'];?>>
! 				<input name="correct" value="<?=$x;?>" type="radio" <?= $qc['correct'] ? 'CHECKED':'';?>>
  			</td>
  		</tr>

Index: exam_main.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/lobrepo/templates/exam_main.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** exam_main.html	5 Oct 2007 21:35:48 -0000	1.1
--- exam_main.html	5 Oct 2007 22:37:38 -0000	1.2
***************
*** 36,40 ****
  <p>&nbsp;</p>
  
! <form method="POST">
  <table width="100%" border="0">
  	<tr>
--- 36,40 ----
  <p>&nbsp;</p>
  
! <form method="POST" action=<?=modurl('exam/');?>">
  <table width="100%" border="0">
  	<tr>
***************
*** 216,222 ****
  
  	<p align="right">
! 			<input type="hidden" name="event" value="updatePoints">
! 			<input type="submit" name="submit" value="Update Points"  onClick="return checkPoints();">
! 			<input type="hidden" name="assessmentId" value="<?=$t['assessment']->assessmentId?>">
  	</p>
  
--- 216,221 ----
  
  	<p align="right">
! 			<input type="hidden" name="event" value="saveTest">
! 			<input type="submit" name="submit" value="Save Test"/>
  	</p>
  

[Logicampus-cvs] logicampus/src/logicreate/services/lobrepo exam.lcp, 1.1, 1.2

[Mark K <har...@us...>]

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

Modified Files:
	exam.lcp 
Log Message:
Fixes to copy a test down to your classroom and see it in the classroom viewer.


Index: exam.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/lobrepo/exam.lcp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** exam.lcp	5 Oct 2007 21:35:48 -0000	1.1
--- exam.lcp	5 Oct 2007 22:37:38 -0000	1.2
***************
*** 64,67 ****
--- 64,68 ----
  			$t['qidx'] = -1;
  		}
+ 		$t['q'] = $t['questionObj'];
  
  //debug($test,1);
***************
*** 89,93 ****
  		$u->sessionvars['test_obj']->setQuestion($qidx,$lc->postvars['questionText'], $type);
  		foreach ($lc->postvars['labels'] as $lidx => $label) {
! 			$isCorrect = $lc->postvars['correct'] === $lidx;
  			if (!$u->sessionvars['test_obj']->addLabel($label, $isCorrect, $qidx)) {
  				die('failed label.  label = '.$label);
--- 90,95 ----
  		$u->sessionvars['test_obj']->setQuestion($qidx,$lc->postvars['questionText'], $type);
  		foreach ($lc->postvars['labels'] as $lidx => $label) {
! 			if ($label == '') { continue; }
! 			$isCorrect = $lc->postvars['correct'] == $lidx;
  			if (!$u->sessionvars['test_obj']->addLabel($label, $isCorrect, $qidx)) {
  				die('failed label.  label = '.$label);
***************
*** 95,99 ****
  		}
  
- 
  		$this->presentor = 'redirectPresentation';
  		$t['url'] = appurl('lobrepo/exam/');
--- 97,100 ----
***************
*** 114,117 ****
--- 115,137 ----
  	}
  
+ 
+ 	/**
+ 	 * Commit the test in the session to the database
+ 	 */
+ 	function saveTestRun(&$db, &$u, &$lc, &$t) {
+ //		debug($u->sessionvars['test_obj'],1);
+ 		$u->sessionvars['test_obj']->save();
+ 
+ 		$lobUserObj = new LobUserLink();
+ 		$lobUserObj->set('lobRepoEntryId',$u->sessionvars['test_obj']->repoObj->getPrimaryKey());
+ 		$lobUserObj->set('userId',$u->userId);
+ 		$lobUserObj->set('lobKind','content');
+ 		$lobUserObj->save();
+ 
+ 		unset($u->sessionvars['test_obj']);
+ 
+ 		$this->presentor = 'redirectPresentation';
+ 		$t['url'] = appurl('lobrepo/myobj/');
+ 	}
  }
  

[Logicampus-cvs] logicampus/src/logicreate/services/classroom content.lcp, 1.12, 1.13 lessons.lcp, 1.21, 1.22 viewer.lcp, 1.15, 1.16

[Mark K <har...@us...>]

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

Modified Files:
	content.lcp lessons.lcp viewer.lcp 
Log Message:
Fixes to copy a test down to your classroom and see it in the classroom viewer.


Index: viewer.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/viewer.lcp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** viewer.lcp	4 Oct 2007 02:53:46 -0000	1.15
--- viewer.lcp	5 Oct 2007 22:37:38 -0000	1.16
***************
*** 86,92 ****
  		}
  
! 		if ($t['lob']['lob_type'] == 'assessment') {
! 			$db->query("SELECT * FROM assessment as A 
! 				WHERE assessment_id ='".$t['lob']['lob_class_repo_id']."'");
  			$db->nextRecord();
  			$t['activity'] = $db->record;
--- 86,92 ----
  		}
  
! 		if ($t['lob']['lob_type'] == 'test') {
! 			$db->query("SELECT * FROM lob_class_test as A 
! 				WHERE lob_class_repo_id ='".$t['lob']['lob_class_repo_id']."'");
  			$db->nextRecord();
  			$t['activity'] = $db->record;

Index: content.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/content.lcp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** content.lcp	3 Oct 2007 22:00:34 -0000	1.12
--- content.lcp	5 Oct 2007 22:37:38 -0000	1.13
***************
*** 79,83 ****
  
  		//SEQUENCE ITEMS
! 		$uniqcode = lcClass::makeUniqueCode($u->activeClassTaken);
  
  		$t['seqItems'] = ClassLessonSequencePeer::doSelect(' class_id = '.$classId. ' AND lesson_id = '.$lesson_id . ' ORDER BY rank');
--- 79,83 ----
  
  		//SEQUENCE ITEMS
! 		$uniqCode = lcClass::makeUniqueCode($u->activeClassTaken);
  
  		$t['seqItems'] = ClassLessonSequencePeer::doSelect(' class_id = '.$classId. ' AND lesson_id = '.$lesson_id . ' ORDER BY rank');
***************
*** 95,105 ****
  		if ($prevIdx < 0 ) { $prevIdx = 0; }
  
  		//choose a start URL, viewer or content
  		if ($t['seqItems'][$nextIdx]->lobMime == 'text/html') {
! 			$t['nextUrl'] = appurl('classroom/content/'.$uniqcode.'/'.$t['seqItems'][$nextIdx]->linkText);
  		} else {
! 			$t['nextUrl'] = appurl('classroom/viewer/'.$uniqcode.'/'.$t['seqItems'][$nextIdx]->linkText);
  		}
- 
  
  
--- 95,115 ----
  		if ($prevIdx < 0 ) { $prevIdx = 0; }
  
+ 
  		//choose a start URL, viewer or content
+ 		if ( is_object($t['seqItems'][$nextIdx]) ) {
  		if ($t['seqItems'][$nextIdx]->lobMime == 'text/html') {
! 			$t['nextUrl'] = appurl('classroom/content/'.$uniqCode.'/'.$t['seqItems'][$nextIdx]->linkText);
  		} else {
! 			$t['nextUrl'] = appurl('classroom/viewer/'.$uniqCode.'/'.$t['seqItems'][$nextIdx]->linkText);
! 		}
! 		}
! 		//choose a previous URL, viewer or content
! 		if ($prevIdx > -1) {
! 		if ($t['seqItems'][$prevIdx]->lobMime == 'text/html') {
! 			$t['prevUrl'] = appurl('classroom/content/'.$uniqCode.'/'.$t['seqItems'][$prevIdx]->linkText);
! 		} else {
! 			$t['prevUrl'] = appurl('classroom/viewer/'.$uniqCode.'/'.$t['seqItems'][$prevIdx]->linkText);
! 		}
  		}
  
  

Index: lessons.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/lessons.lcp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** lessons.lcp	3 Oct 2007 02:09:01 -0000	1.21
--- lessons.lcp	5 Oct 2007 22:37:38 -0000	1.22
***************
*** 43,47 ****
  
  		$db->query($sql);
! 		while ($db->next_record()) $lessons[] = $db->Record;
  
  
--- 43,47 ----
  
  		$db->query($sql);
! 		while ($db->next_record()){ $lessons[] = $db->Record; }
  
  
***************
*** 132,136 ****
  			WHERE class_lesson_objectives.id_class_lesson='".$lesson_id."' 
  			AND f_hide=0 ORDER BY i_sort ASC");
! 		while ($db->next_record()) $t['objectives'][] = $db->Record;
  
  
--- 132,138 ----
  			WHERE class_lesson_objectives.id_class_lesson='".$lesson_id."' 
  			AND f_hide=0 ORDER BY i_sort ASC");
! 		while ($db->next_record()) {
! 			$t['objectives'][] = $db->Record;
! 		}
  
  
***************
*** 298,302 ****
  				$tablePkeyLabel ='$contentPkey'";
  		$db->queryOne($sql);
! 		if ($activeClassTaken == $db->Record[$contentLabel])
  		{
  			return true;
--- 300,304 ----
  				$tablePkeyLabel ='$contentPkey'";
  		$db->queryOne($sql);
! 		if ($activeClassTaken == $db->record[$contentLabel])
  		{
  			return true;

[Logicampus-cvs] logicampus/src/logicreate/services/classroom/templates viewer_main.html, 1.18, 1.19

[Mark K <har...@us...>]

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

Modified Files:
	viewer_main.html 
Log Message:
Fixes to copy a test down to your classroom and see it in the classroom viewer.


Index: viewer_main.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/templates/viewer_main.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** viewer_main.html	4 Oct 2007 02:53:46 -0000	1.18
--- viewer_main.html	5 Oct 2007 22:37:38 -0000	1.19
***************
*** 76,80 ****
  }
  
! if ($t['lob']['lob_mime'] == 'X-LMS/assessment') {
  ?>
  <div align="left" style="margin:auto;width:50%;">
--- 76,80 ----
  }
  
! if ($t['lob']['lob_mime'] == 'X-LMS/test') {
  ?>
  <div align="left" style="margin:auto;width:50%;">
***************
*** 82,86 ****
  	<img align="right" height="64" width="64" src="<?=$t['iconUrl'];?>"/>
  <?php
! 	echo '<h3>Test:&nbsp; '.$t['activity']['display_name'].'</h3>';
  	echo 'Time limit: '. $t['activity']['minute_limit'].' minutes';
  	echo "<br/>\n";
--- 82,86 ----
  	<img align="right" height="64" width="64" src="<?=$t['iconUrl'];?>"/>
  <?php
! 	echo '<h3>Test:&nbsp; '.$t['lob']['lob_title'].'</h3>';
  	echo 'Time limit: '. $t['activity']['minute_limit'].' minutes';
  	echo "<br/>\n";

[Logicampus-cvs] logicampus/src/logicreate/lib lc_lob.php, 1.28, 1.29 lc_lob_class.php, 1.5, 1.6 lc_lob_test.php, 1.2, 1.3

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9236/lib

Modified Files:
	lc_lob.php lc_lob_class.php lc_lob_test.php 
Log Message:
Fixes to copy a test down to your classroom and see it in the classroom viewer.


Index: lc_lob_test.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_lob_test.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lc_lob_test.php	5 Oct 2007 21:35:48 -0000	1.2
--- lc_lob_test.php	5 Oct 2007 22:37:38 -0000	1.3
***************
*** 15,18 ****
--- 15,21 ----
  		if ($id < 1) {
  			$this->repoObj    = new LobRepoEntry();
+ 			$this->repoObj->lobMime = $this->mime;
+ 			$this->repoObj->lobType = $this->type;
+ 			$this->repoObj->lobSubType = $this->type;
  			$this->lobSub     = new LobTest();
  			$this->lobMetaObj = new LobMetadata();

Index: lc_lob_class.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_lob_class.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lc_lob_class.php	2 Oct 2007 17:06:36 -0000	1.5
--- lc_lob_class.php	5 Oct 2007 22:37:38 -0000	1.6
***************
*** 62,65 ****
--- 62,73 ----
  
  			case 'test':
+ 				if ($this->repoObj->getPrimaryKey() > 0) {
+ 					$results = $this->repoObj->getLobClassTestsByLobClassRepoId();
+ 					$this->lobSub = $results[0];
+ 				}
+ 				if (! is_object($this->lobSub)) {
+ 					$this->lobSub = new LobClassTest();
+ 				}
+ 
  				/*
  				$results  = $this->getLobTestsByLobRepoEntryId();
***************
*** 71,77 ****
  				include_once(LIB_PATH.'lc_lob_class.php');
  				$classLob = new Lc_Lob_ClassTest();
- 				*/
- 
  				trigger_error('un-implemented');
  				break;
  		}
--- 79,84 ----
  				include_once(LIB_PATH.'lc_lob_class.php');
  				$classLob = new Lc_Lob_ClassTest();
  				trigger_error('un-implemented');
+ 				*/
  				break;
  		}

Index: lc_lob.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_lob.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** lc_lob.php	5 Oct 2007 19:27:37 -0000	1.28
--- lc_lob.php	5 Oct 2007 22:37:38 -0000	1.29
***************
*** 4,7 ****
--- 4,9 ----
  include_once(LIB_PATH.'PBDO/LobMetadata.php');
  include_once(LIB_PATH.'PBDO/LobContent.php');
+ //sub types
+ include_once(LIB_PATH.'PBDO/LobTest.php');
  include_once(LIB_PATH.'PBDO/LobActivity.php');
  
***************
*** 298,302 ****
  
  			case 'test':
! 				$results  = $rep->getLobTestsByLobRepoEntryId();
  				if (! count($results) ) {
  					trigger_error('learning object missing internal data.');
--- 300,305 ----
  
  			case 'test':
! 				include_once(LIB_PATH.'lc_lob_test.php');
! 				$results  = $repo->getLobTestsByLobRepoEntryId();
  				if (! count($results) ) {
  					trigger_error('learning object missing internal data.');
***************
*** 305,308 ****
--- 308,312 ----
  				$subLob  = $results[0];
  				include_once(LIB_PATH.'lc_lob_class.php');
+ 				include_once(LIB_PATH.'lc_lob_class_test.php');
  				$classLob = new Lc_Lob_ClassTest();
  				break;

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr lessonManager.lcp, 1.39, 1.40

[Mark K <har...@us...>]

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

Modified Files:
	lessonManager.lcp 
Log Message:
Fixes to copy a test down to your classroom and see it in the classroom viewer.


Index: lessonManager.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonManager.lcp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** lessonManager.lcp	4 Oct 2007 17:50:57 -0000	1.39
--- lessonManager.lcp	5 Oct 2007 22:37:38 -0000	1.40
***************
*** 441,448 ****
  		$t['title'] = $lesson->get('title');
  
! 		$sql = "SELECT A.assessment_id, A.display_name
! 			FROM assessment AS A
  			WHERE A.class_id = ".$class_id."
! 			ORDER BY A.display_name";
  
  		$dm = new LinkedItemsModel($sql,$db);
--- 441,451 ----
  		$t['title'] = $lesson->get('title');
  
! 
! 		$sql = "SELECT A.lob_class_repo_id, A.lob_title
! 			FROM lob_class_test AS B
! 			LEFT JOIN lob_class_repo AS A
! 				ON B.lob_class_repo_id = A.lob_class_repo_id
  			WHERE A.class_id = ".$class_id."
! 			ORDER BY A.lob_title";
  
  		$dm = new LinkedItemsModel($sql,$db);
***************
*** 455,468 ****
  		// also, correct the checkbox selection state with a one to
  		// many lookup
! 		$sql = "SELECT A.assessment_id, A.lesson_id, B.title
! 			FROM assessment_lesson_link AS A
  			LEFT JOIN class_lessons AS B
  			  ON A.lesson_id = B.id_class_lessons
! 			WHERE B.id_classes = ".$class_id."
  			ORDER BY B.title";
  		$db->query($sql);
! 		while ($db->next_record()) {
! 			$itemsToTitles[$db->Record['assessment_id']][] = $db->Record['title'];
! 			$itemsToLessons[$db->Record['assessment_id']][] = $db->Record['lesson_id'];
  		}
  
--- 458,472 ----
  		// also, correct the checkbox selection state with a one to
  		// many lookup
! 		$sql = "SELECT A.lob_class_repo_id, A.class_id, B.title, A.lesson_id
! 			FROM class_lesson_sequence AS A
  			LEFT JOIN class_lessons AS B
  			  ON A.lesson_id = B.id_class_lessons
! 			WHERE A.class_id = ".$class_id."
! 			AND A.lob_type = 'activity'
  			ORDER BY B.title";
  		$db->query($sql);
! 		while ($db->nextRecord()) {
! 			$itemsToTitles[$db->record['lob_class_repo_id']][] = $db->record['title'];
! 			$itemsToLessons[$db->record['lob_class_repo_id']][] = $db->record['lesson_id'];
  		}
  
***************
*** 475,479 ****
  		$col->cellRenderer->selectedVal = $lesson_id;
  		$col->cellRenderer->selectedKey = 'id_class_lessons';
! 		$col->cellRenderer->idName = 'assessment_id';
  		$col->cellRenderer->itemsToLessons = $itemsToLessons;
  
--- 479,483 ----
  		$col->cellRenderer->selectedVal = $lesson_id;
  		$col->cellRenderer->selectedKey = 'id_class_lessons';
! 		$col->cellRenderer->idName = 'lob_class_repo_id';
  		$col->cellRenderer->itemsToLessons = $itemsToLessons;
  
***************
*** 680,684 ****
  				'lob_urltitle' => $linkText,
  				'lob_mime' => 'X-LMS/assignment'
! 			);
  		}
  
--- 684,688 ----
  				'lob_urltitle' => $linkText,
  				'lob_mime' => 'X-LMS/assignment'
! 				);
  		}
  
***************
*** 1134,1151 ****
  
  		//get all lesson items for security
! 		$sql = "SELECT A.assessment_id, display_name
! 			FROM assessment AS A
  			WHERE A.class_id = ".$class_id;
  		$db->query($sql);
  		$lobRecord = array();
  		while ($db->nextRecord()) {
! 			$linkText = LC_Lob::createLinkText($db->record['display_name']);
! 			$allowableItems[] = $db->record['assessment_id'];
! 			$db->record['display_name'];
! 			$lobRecord[$db->record['assessment_id']] = 
! 				array('lob_title' => $db->record['display_name'],
  					'lob_urltitle' => $linkText,
! 					'lob_mime' => 'X-LMS/assessment'
! 					);
  		}
  
--- 1138,1156 ----
  
  		//get all lesson items for security
! 		$sql = 
! 			"SELECT A.lob_class_repo_id, lob_title
! 			FROM lob_class_repo AS A
  			WHERE A.class_id = ".$class_id;
+ 
  		$db->query($sql);
  		$lobRecord = array();
  		while ($db->nextRecord()) {
! 			$linkText = LC_Lob_Util::createLinkText($db->record['lob_title']);
! 			$allowableItems[] = $db->record['lob_class_repo_id'];
! 			$lobRecord[$db->record['lob_class_repo_id']] = 
! 				array('lob_title' => $db->record['lob_title'],
  					'lob_urltitle' => $linkText,
! 					'lob_mime' => 'X-LMS/test'
! 				);
  		}
  
***************
*** 1161,1187 ****
  		}
  
- 		/* don't need to enforce one assessment per lesson
- 		if (!$validEntry) {
- 			$this->linkAssessmentsRun($db,$u,$lc,$t);
- 			$t['message'] = "You need to choose at least one assessment.";
- 			return false;
- 		}
- 		*/
- 
- 
- 		//wipe all previous assessments links for this lesson
- 		$db->query('DELETE from assessment_lesson_link 
- 			WHERE lesson_id = '.$lesson_id);
- 
- 		//insert each new link
- 		$insert = 'INSERT INTO assessment_lesson_link
- 		(assessment_id,lesson_id)
- 		VALUES (%d, %d)';
- 
- 		foreach($itemArray as $k=>$v) {
- 			if ($v < 1 ) continue;
- 
- 			$db->query( sprintf($insert, $v, $lesson_id));
- 		}
  
  		$lessonSequence = new LC_LessonSequence($lesson_id, $class_id);
--- 1166,1169 ----
***************
*** 1205,1209 ****
  			where l.id_classes='{$u->activeClassTaught->id_classes}'
  			and l.id_class_lessons='{$lessonid}'");
! 		if (!$db->Record['cnt'] || intval($lessonid) == 0 ) {
  			$this->presentor = 'errorMessage';
  			$t['message'] = "You don't have permission to modify that lesson.";
--- 1187,1191 ----
  			where l.id_classes='{$u->activeClassTaught->id_classes}'
  			and l.id_class_lessons='{$lessonid}'");
! 		if (!$db->record['cnt'] || intval($lessonid) == 0 ) {
  			$this->presentor = 'errorMessage';
  			$t['message'] = "You don't have permission to modify that lesson.";

[Logicampus-cvs] logicampus/src/logicreate/services/lobrepo exam.lcp, NONE, 1.1 add.lcp, 1.15, 1.16 edit.lcp, 1.18, 1.19

[Mark K <har...@us...>]

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

Modified Files:
	add.lcp edit.lcp 
Added Files:
	exam.lcp 
Log Message:
Adding support to make a test with multiple choice questions.


Index: add.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/lobrepo/add.lcp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** add.lcp	29 Sep 2007 21:37:21 -0000	1.15
--- add.lcp	5 Oct 2007 21:35:48 -0000	1.16
***************
*** 59,62 ****
--- 59,67 ----
  				$lc->templateName = 'add_activity';
  				break;
+ 
+ 			case 'test':
+ 				$lc->templateName = 'add_test';
+ 				break;
+ 
  		}
  		$t['mimetype'] = $mimetype;
***************
*** 90,93 ****
--- 95,99 ----
  
  
+ /*
  	function textToLob(&$lob,&$lc) {
  		$lob->set('lobContent', $lc->postvars['txText']);
***************
*** 103,106 ****
--- 109,114 ----
  
  	}
+ */
+ 
  }
  

--- NEW FILE: exam.lcp ---
<?

include_once(LIB_PATH.'PBDO/LobContent.php');
include_once(LIB_PATH.'PBDO/LobMetadata.php');
include_once(LIB_PATH.'PBDO/LobUserLink.php');
include_once(LIB_PATH.'AssessmentQuestion.php');
include_once(LIB_PATH.'AssessmentLib.php');

include_once(LIB_PATH.'lc_lob.php');
include_once(LIB_PATH.'lc_lob_test.php');
include_once(LIB_PATH.'lc_table.php');
include_once(LIB_PATH.'lc_table_renderer.php');

/**
 * Learning Object Repository
 */
class Exam extends FacultyService {

	var $presentor='htmlPresentation';
	var $sectionTitle = 'Classroom Manager';
	var $navlinks = array (
		''=>''
		);


	/**
	 *
	 */
	function run(&$db,&$u,&$lc,&$t) {
		$lc->templateName = 'exam_main';
		$testId = intval($lc->postvars['id']);

		if (! is_object($u->sessionvars['test_obj']) ) {
			$test = new Lc_Lob_Test($testId);
			$test->setTitle( $lc->postvars['title']);
			$test->setInstructions( $lc->postvars['instructions']);
			$test->setNotes( $lc->postvars['notes']);
			$t['testId'] = $test->get('lobRepoEntryId');
			$u->sessionvars['test_obj'] = $test;
		}

		$t['questionList'] = $u->sessionvars['test_obj']->questionObjs;


		$t['questions_total_points'] = sprintf('%d', 0);
		$t['questions_count'] = sprintf('%d', $u->sessionvars['test_obj']->getQuestionCount());
//debug($test,1);
	}


	/**
	 */
	function editQuestionRun(&$db, &$u, &$lc, &$t) {
		$lc->templateName='exam_question_mchoice';
		$t['questionType'] = 'mchoice';
//		$testId = intval($lc->postvars['id']);

		//load this question from the question array
		if (isset($lc->getvars['qidx'])) {
			$t['questionObj'] = $u->sessionvars['test_obj']->questionObjs[$lc->getvars['qidx']];
			$t['qidx'] = intval($lc->getvars['qidx']);
		} else {
			$t['questionObj'] = new LobTestQst();
			$t['qidx'] = -1;
		}

//debug($test,1);
	}


	function saveQuestionRun(&$db, &$u, &$lc, &$t) {
		if (! is_object($u->sessionvars['test_obj']) ) {
			$u->sessionvars['test_obj'] = new Lc_Lob_Test();
		}

		$type = 'unknown';
		switch($lc->postvars['questionType']) {
			case 'mchoice':
				$type = 'QUESTION_MCHOICE';
				break;
		}
		if ($type == 'unknown') {
			$u->addSessionMessage('Unknown question type.','e');
			$this->presentor = 'redirectPresentation';
			$t['url'] = appurl('lobrepo/exam/');
			return;
		}
		$qidx = intval($lc->postvars['qidx']);
		$u->sessionvars['test_obj']->setQuestion($qidx,$lc->postvars['questionText'], $type);
		foreach ($lc->postvars['labels'] as $lidx => $label) {
			$isCorrect = $lc->postvars['correct'] === $lidx;
			if (!$u->sessionvars['test_obj']->addLabel($label, $isCorrect, $qidx)) {
				die('failed label.  label = '.$label);
			}
		}


		$this->presentor = 'redirectPresentation';
		$t['url'] = appurl('lobrepo/exam/');
	}


	/**
	 */
	function deleteQuestionRun(&$db, &$u, &$lc, &$t) {

		//load this question from the question array
		if (isset($lc->getvars['qidx'])) {
			unset($u->sessionvars['test_obj']->questionObjs[$lc->getvars['qidx']]);
		}

		$this->presentor = 'redirectPresentation';
		$t['url'] = appurl('lobrepo/exam/');
	}

}

?>

Index: edit.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/lobrepo/edit.lcp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** edit.lcp	3 Oct 2007 21:55:27 -0000	1.18
--- edit.lcp	5 Oct 2007 21:35:48 -0000	1.19
***************
*** 6,9 ****
--- 6,10 ----
  
  include_once(LIB_PATH.'lc_lob.php');
+ include_once(LIB_PATH.'lc_lob_test.php');
  include_once(LIB_PATH.'lc_table.php');
  include_once(LIB_PATH.'lc_table_renderer.php');
***************
*** 25,30 ****
  	 */
  	function run(&$db,&$u,&$lc,&$t) {
- 		$lc->templateName='edit_main';
- 
  		$lobId = addslashes(trim($lc->getvars['c']));
  
--- 26,29 ----

[Logicampus-cvs] logicampus/src/logicreate/services/lobrepo/templates add_test.html, NONE, 1.1 exam_main.html, NONE, 1.1 exam_question_mchoice.html, NONE, 1.1 add_activity.html, 1.2, 1.3

[Mark K <har...@us...>]

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

Modified Files:
	add_activity.html 
Added Files:
	add_test.html exam_main.html exam_question_mchoice.html 
Log Message:
Adding support to make a test with multiple choice questions.


--- NEW FILE: add_test.html ---
<h4>Student Test</h4>
<a href="<?=appurl('lobrepo/');?>">Learning Objects Home</a>
&bull;  
<a href="<?=appurl('lobrepo/myobj');?>">My Learning Objects</a>
&bull;  
<a href="<?=appurl('lobrepo/import');?>">Import Learning Objects</a>
&bull;  
<a href="<?=appurl('lobrepo/add');?>">Add Learning Objects</a>

<hr/>



<form action="<?=appurl('lobrepo').'/exam/';?>" method="POST" enctype="application/x-www-form-urlencoded">

<table width="100%" border="0" cellspacing="0" cellpadding="2">
	<tr>
		<td valign="top" class="row1">*Title</td>
		<td valign="top" class=""><input type="text" id="title" name="title" value="" size="40" maxlength="50"></td>
	</tr>

	<tr>
		<td valign="top" class="row1" valign="top">*Instructions for students</td>
		<td valign="top" class="">
			<textarea name="instructions" cols="40" rows="5" id="instructions"></textarea>
		</td>
	</tr>

	<tr>
		<td valign="top" class="row1" valign="top">Notes (only for faculty)</td>
		<td valign="top" class="">
			<textarea name="notes" cols="40" rows="5" id="notes"></textarea>
		</td>
	</tr>

	<tr>
		<td colspan="2" valign="top" class="">&nbsp;</td>
	</tr>
	<tr>
		<td valign="top" class="row1">
			<input type="hidden" name="lob_id" value="<?=$t['lob']->get('lobRepoEntryId');?>">
		</td>
		<td valign="top" class=""><input type="submit" id="sbmt_button" name="sbmt_button" value="Add Questions"></td>
	</tr>
</table>

</form>
<div style="font-size: 85%">*denotes a required field</div>


Index: add_activity.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/lobrepo/templates/add_activity.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** add_activity.html	4 Oct 2007 18:54:48 -0000	1.2
--- add_activity.html	5 Oct 2007 21:35:48 -0000	1.3
***************
*** 51,55 ****
  	</tr>
  	<tr>
! 		<td valign="top" class="row1"></td>
  		<td valign="top" class=""><input type="submit" id="sbmt_button" name="sbmt_button" value="Add Activity"></td>
  	</tr>
--- 51,57 ----
  	</tr>
  	<tr>
! 		<td valign="top" class="row1">
! 			<input type="hidden" name="lob_id" value="<?=$t['lob']->get('lobRepoEntryId');?>">
! 		</td>
  		<td valign="top" class=""><input type="submit" id="sbmt_button" name="sbmt_button" value="Add Activity"></td>
  	</tr>

--- NEW FILE: exam_question_mchoice.html ---
<h3><?= lct('Multiple Choice Question');?></h3>
<form method="POST" action="<?=modurl('exam/');?>">
	<table border="0" width="600">
		<tr>
			<td valign="top">*<b><?= lct('Question');?></b></td>
			<td>
				<textarea rows="5" cols="50" name="questionText" <?= $t['disableFlag'];?>><?=$t['questionObj']->qstText;?></textarea>
			</td>
		</tr>
		<tr>
			<td><b><?= lct('Answers');?></b></td>
			<td><?=lct('(check boxes to indicate the correct responses)');?></td>
		</tr>
		<? for ($x=0;$x<10;++$x) { ?>
		<? $qc = $t['q']->qstChoices[$x]; ?>
		
		<tr>
			<td align="right">
				<? if ($x <= 1) {echo '*';} else { echo '&nbsp;&nbsp;'; } ?>
				<? printf('%d',$x+1);?>.
			</td>
			<td NOWRAP>
				<? $x <= 1 ? '*' : ''; ?>
				<input name="labels[<?=$x;?>]" type="text" value="<?=$qc->label;?>" size="50" <?= $t['disableFlag'];?>>
				<input name="correct" value="<?=$x;?>" type="radio" <?= $qc->correct ? 'CHECKED':'';?>>
			</td>
		</tr>
		<? } ?>

		<tr>
			<td>&nbsp;</td>
			<td>
		</td>
		</tr>

		<tr>
			<td>&nbsp;</td>
			<td>
				<input type="submit" name="sbmt_button" value="<?=lct('Continue -&gt;');?>"/>
				<input type="hidden" name="event" value="saveQuestion"/>
				<input type="hidden" name="qidx" value="<?=$t['qidx'];?>"/>
				<input type="hidden" name="questionType" value="<?= $t['questionType'];?>"/>
</form>
			</td>
		</tr>

	</table>

<p>* denotes a required field.</p>

--- NEW FILE: exam_main.html ---
<? 
if ($t['message']) { ?>
<div style="color: blue;"><?=$t['message'];?></div>
<br>
<? } ?>

<form method="GET" action="<?=modurl('exam/event=editQuestion/id='.$t['testId']);?>">
<FIELDSET>
<LEGEND>ADD a question</LEGEND>
<table width="100%" border="0">
<tr>
        <td align="center">
                <input type="submit" name="type" id="mc_submit" value="Multiple Choice" style="width:130px;">
        </td>
        <td align="center">
                <input type="submit" name="type" id="ma_submit" value="Multiple Answer" style="width:130px;">
        </td>
        <td align="center">
                <input type="submit" name="type" id="mq_submit" value="Matching Question" style="width:130px;">
        </td>
        <td align="center">
                <input type="submit" name="type" id="tf_submit" value="True/False" style="width:130px;">
        </td>
        <td align="center">
                <input type="submit" name="type" id="fb_submit" value="Fill in the Blank" style="width:130px;">
        </td>
        <td align="center">
                <input type="submit" name="type" id="es_submit" value="Essay" style="width:130px;">
        </td>
</tr>
</table>
</FIELDSET>
</form>


<p>&nbsp;</p>

<form method="POST">
<table width="100%" border="0">
	<tr>
		<td>
			<span style="color: green;">Green Text</span> = Correct Answers
		</td>
		<td align="right">
			<?=lct('Points');?>: <?= $t['questions_total_points'];?>
		</td>
	</tr>
	<tr>
		<td>
			<span style="color: #000000;background: #FFFF00">Yellow Text</span> = Possible mis-spelled word
		</td>
		<td align="right">
			<?=lct('Question');?>: <?= $t['questions_count'];?>
		</td>
	</tr>
	<tr>
		<td>
			&nbsp;	
		</td>
		<td align="right">
		<!--
			<a href="<?=modurl('main/event=spellcheck/id='.$t['assessment']->assessmentId);?>">SPELL CHECK</a>
			-->
		</td>
	</tr>
</table>

	<?php
	$a_jscript = array();

		foreach($t['questionList'] as $k=>$v) { 
		
		$a_jscript[] = 'points'.$v->lobTestQstId;
		?>
<FIELDSET>
<LEGEND><a href="<?=APP_URL?>lobrepo/exam/event=editQuestion/qidx=<?=$k;?>">EDIT</a> &mdash; <a href="<?=APP_URL?>lobrepo/exam/event=deleteQuestion/qidx=<?=$k;?>" onclick="return confirm('Are you sure?');">DELETE</a></LEGEND>
<table width="100%" border="0">
	<tr>
		<td>
			<?= ($k+1);?>)
		</td>
		<td width="15%">
			<i><?= $v->qstText; ?></i>
		</td>
		<td width="90%" align="right" colspan="1">
			Points <input type="text" size="3" name="points[<?=$v->assessmentQuestionId?>]" value="<?=$v->questionPoints?>" id="points<?=$v->assessmentQuestionId?>">

		</td>
	</tr>
	<tr>
		<td colspan="1" valign="bottom">
			&nbsp;
		</td>
		<td colspan="2">
			<b><?= $v->questionText; ?></b>
		</td>
	</tr>
	<? //show choices
	$count = $v->qstChoices;  // neeed to know total
	while (list ($cc,$c) = @each($v->qstChoices) ) {

	// mgk 10/19/03 - FIXME - put this in to help display issue, but it might
	// be a bigger issue.  every mchoice question has 10 answers, with most blank
	// AIMed mark - no answer yet
	if (trim($c['label'])!='') { 

		// matching questions have this data in here.
		if ( $cc === 'randomAnswers' ) continue;
	?>
	<tr>
		<td colspan="1" valign="bottom">
			&nbsp;
		</td>
		<td colspan="1" align="right">
			<?=chr($cc+65);?>.
		</td>
		<td colspan="1" align="left">
			<?
			# ALL FIB answers are considered to be good answers
			# but we need to print them a little different and print
			# the alternate answers separate
			if ($v->questionTypeId == QUESTION_FILLINBLANK)
			{
					if ($cc == 0)
					{
					?>
						<div style="color: green; font-size: 105%">
							<?= $c['label'];?>
						</div>
					<?
					if ($count >= 2)
						{
							echo '</td></tr><tr><td colspan="2"><b>Alternate Answers</b></td></tr>';
						}
					continue;

					} else {
					echo $c->label;
					continue;
					}
			} 			
			
			if ($v->questionTypeId == QUESTION_MATCHING)
			{ 
				if ($c['label'] == '')
				{ 
					echo '<i>no question entered</i>';
				}
				?>
				<?= $c['label'];?> (
				<span style="color: green; font-size: 105%">
					<?=$c['correct'];?>
				</span>)
<?			continue;
			}  // end MATCHING IF 

			if ($c['correct'] === true) { ?>
			<div style="color: green; font-size: 105%">
			<?= $c['label'];?>
			</div>
			<? } else { ?>
				<?=$c['label'];?>
		<?	}  ?>
		</td>
	</tr>
<? } // end if label!=''?> 
<? } ?> 
	<tr>
	<td colspan='3' align="right">

			Change Position:
			<select name="order[<?=$k?>]" onChange="document.q<?=$v->assessmentQuestionId;?>.submit();">
			<?=makeOptions($t['dropDownData'], $k+1);?>
			</select>
			<input type="submit" name="sort" value="go"/>
	</td></tr>
</table>
</FIELDSET>

<br>
<? } ?>
<script>
	var pointsarray = new Object();
<?php

	foreach($a_jscript as $myId)
	{	
		echo '	
	pointsarray["'.$myId.'"] = true;';		
	}

	
?>

function checkPoints()
{
	var tmp_element; 
	
	for (field in pointsarray) 
	{	
		tmp_element = document.getElementById(field);
		
		if (tmp_element.value == "" || tmp_element.value == 0 || tmp_element.value == "0")
		{
			alert('You must apply at least 1 point per question');
			return false;
		}
		
	}
	
return true;	
}


</script>

	<p align="right">
			<input type="hidden" name="event" value="updatePoints">
			<input type="submit" name="submit" value="Update Points"  onClick="return checkPoints();">
			<input type="hidden" name="assessmentId" value="<?=$t['assessment']->assessmentId?>">
	</p>

</form>

[Logicampus-cvs] logicampus/src/logicreate/lib lc_lob_test.php, 1.1, 1.2

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16642/lib

Modified Files:
	lc_lob_test.php 
Log Message:
Adding support to make a test with multiple choice questions.


Index: lc_lob_test.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_lob_test.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lc_lob_test.php	5 Oct 2007 19:27:37 -0000	1.1
--- lc_lob_test.php	5 Oct 2007 21:35:48 -0000	1.2
***************
*** 37,51 ****
  	}
  
  	function addQuestion($qtext, $type = 'QUESTION_ESSAY', $choices = '', $answers = '') {
  
  		$q = new LobTestQst();
  		$q->qstText =  $qtext;
  		if ( is_array($choices) ) {
  		}
! 		$this->questionObjs[] = $q;
  	}
  
! 	function getQuestionCount() {
! 		return count($this->questionObjs);
  	}
  }
--- 37,88 ----
  	}
  
+ 	function setQuestion($qidx, $qtext, $type = 'QUESTION_ESSAY', $choices = '', $answers = '') {
+ 		$q = $this->_makeQuestion($qtext, $type, $choices, $answers);
+ 		if ($qidx > -1) {
+ 			$this->questionObjs[$qidx] = $q;
+ 		} else {
+ 			$this->questionObjs[] = $q;
+ 		}
+ 	}
+ 
  	function addQuestion($qtext, $type = 'QUESTION_ESSAY', $choices = '', $answers = '') {
+ 		$q = $this->_makeQuestion($qtext, $type, $choices, $answers);
+ 		$this->questionObjs[] = $q;
+ 	}
+ 
+ 	function getQuestionCount() {
+ 		return count($this->questionObjs);
+ 	}
  
+ 	function _makeQuestion($qtext, $type, $choices, $answers='') {
  		$q = new LobTestQst();
+ 		$q->qstChoices = array();
  		$q->qstText =  $qtext;
+ 		$q->questionTypeId = constant($type);
  		if ( is_array($choices) ) {
  		}
! 		return $q;
  	}
  
! 
! 	/**
! 	 *
! 	 * @return bool successfully added the choice
! 	 */
! 	function addLabel($l, $correct, $qidx=-1) {
! 		if ($qidx == -1) {
! 			$qidx = $this->getQuestionCount()-1;
! 		}
! 		if ($qidx == -1) {
! 			return false;
! 		}
! 		$lidx = count($this->questionObjs[$qidx]->qstChoices);
! 		if ($lidx == -1) {
! 			$lidx = 0;
! 		}
! 	
! 		$this->questionObjs[$qidx]->qstChoices[$lidx]['label'] = $l;
! 		$this->questionObjs[$qidx]->qstChoices[$lidx]['correct'] = $correct;
! 		return true;
  	}
  }

[Logicampus-cvs] logicampus/src/logicreate/lib LC_db.php,1.7,1.8

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16588/lib

Modified Files:
	LC_db.php 
Log Message:
Adding php clone support for PHP >= 5 and db record handles.


Index: LC_db.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/LC_db.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LC_db.php	8 Feb 2007 19:23:24 -0000	1.7
--- LC_db.php	5 Oct 2007 21:35:25 -0000	1.8
***************
*** 94,97 ****
--- 94,101 ----
  		// nothing has access to old query results
  		// keeps the same connection ID though
+ 		if (version_compare(phpversion(), "5.0.0", ">=")) {
+ 			$copy = clone($x);
+ 			return $copy;
+ 		}
  		return $x;
  	}

[Logicampus-cvs] logicampus/src/public_html/templates/sinorca header.html.php, 1.18, 1.19

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/public_html/templates/sinorca
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28056/templates/sinorca

Modified Files:
	header.html.php 
Log Message:
These links were causing firefox to blow up and do multiple concurrent requests... bad for session data.


Index: header.html.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/public_html/templates/sinorca/header.html.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** header.html.php	2 Oct 2007 20:47:50 -0000	1.18
--- header.html.php	5 Oct 2007 19:28:57 -0000	1.19
***************
*** 10,21 ****
  
      <!-- Navigational metadata for large websites (an accessibility feature): -->
!     <link rel="top"      href="./index.html" title="Homepage" />
!     <link rel="up"       href="./index.html" title="Up" />
!     <link rel="first"    href="./index.html" title="First page" />
!     <link rel="previous" href="./index.html" title="Previous page" />
!     <link rel="next"     href="./index.html" title="Next page" />
!     <link rel="last"     href="./index.html" title="Last page" />
!     <link rel="toc"      href="./index.html" title="Table of contents" />
      <link rel="index"    href="./index.html" title="Site map" />
  
      <link rel="stylesheet" type="text/css" href="<?=TEMPLATE_URL;?>sinorca-screen.css" media="screen" title="Sinorca (screen)" />
--- 10,23 ----
  
      <!-- Navigational metadata for large websites (an accessibility feature): -->
! <!--
!     <link rel="top"      href="./top.html" title="Homepage" />
!     <link rel="up"       href="./up.html" title="Up" />
!     <link rel="first"    href="./first.html" title="First page" />
!     <link rel="previous" href="./previous.html" title="Previous page" />
!     <link rel="next"     href="./next.html" title="Next page" />
!     <link rel="last"     href="./last.html" title="Last page" />
!     <link rel="toc"      href="./toc.html" title="Table of contents" />
      <link rel="index"    href="./index.html" title="Site map" />
+ -->
  
      <link rel="stylesheet" type="text/css" href="<?=TEMPLATE_URL;?>sinorca-screen.css" media="screen" title="Sinorca (screen)" />

[Logicampus-cvs] logicampus/src/logicreate/services/menu menuObj.php, 1.12, 1.13

[Mark K <har...@us...>]

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

Modified Files:
	menuObj.php 
Log Message:
Cleanup after single queries in menu object.


Index: menuObj.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/menu/menuObj.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** menuObj.php	2 Oct 2007 20:43:51 -0000	1.12
--- menuObj.php	5 Oct 2007 19:27:59 -0000	1.13
***************
*** 98,102 ****
  		while ($db->nextRecord() ) {
  			$menuItems[] = MenuItem::create($db->record);
! 			$lastrec = $db->Record;
  		}
  		$tree->loadObjects($menuItems);
--- 98,102 ----
  		while ($db->nextRecord() ) {
  			$menuItems[] = MenuItem::create($db->record);
! 			$lastrec = $db->record;
  		}
  		$tree->loadObjects($menuItems);
***************
*** 128,133 ****
  		$sql = "select menuObj from menuCache where pkey = $key";
  		$db->query($sql,false);
! 		$db->next_record();
! 		$menu = unserialize($db->Record[0]);
  	return $menu;
  	}
--- 128,133 ----
  		$sql = "select menuObj from menuCache where pkey = $key";
  		$db->query($sql,false);
! 		$db->nextRecord();
! 		$menu = unserialize($db->record[0]);
  	return $menu;
  	}
***************
*** 138,143 ****
          $db = DB::getHandle();
          $sql = "select menuObj from menuCache where (menuid= '$key' and (($groups) and not ($notgroups)))"; 
! 		$db->query($sql,false);
!         $db->nextRecord();
          $menu = unserialize($db->record['menuObj']);
          if (is_object($menu) )
--- 138,142 ----
          $db = DB::getHandle();
          $sql = "select menuObj from menuCache where (menuid= '$key' and (($groups) and not ($notgroups)))"; 
! 		$db->queryOne($sql,false);
          $menu = unserialize($db->record['menuObj']);
          if (is_object($menu) )
***************
*** 176,181 ****
  		$db->query($sql,false);
  		$db->RESULT_TYPE= MYSQL_BOTH;
! 		while ($db->next_record()) {
! 			$ids[] = $db->Record[0];
  		}
  		$db = null;
--- 175,180 ----
  		$db->query($sql,false);
  		$db->RESULT_TYPE= MYSQL_BOTH;
! 		while ($db->nextRecord()) {
! 			$ids[] = $db->record[0];
  		}
  		$db = null;
***************
*** 407,413 ****
  		$db->query("select * from menuItems where pkey = $id",false);
  		$db->RESULT_TYPE = MYSQL_ASSOC;
! 		$db->next_record();
  
! 		switch ($db->Record[type]) {
  			case "htm": $name = "HTMLMenuItem";break;
  			case "app": $name = "APPMenuItem";break;
--- 406,412 ----
  		$db->query("select * from menuItems where pkey = $id",false);
  		$db->RESULT_TYPE = MYSQL_ASSOC;
! 		$db->nextRecord();
  
! 		switch ($db->record['type']) {
  			case "htm": $name = "HTMLMenuItem";break;
  			case "app": $name = "APPMenuItem";break;
***************
*** 416,420 ****
  		}
  
! 		$x = PersistantObject::createFromArray($name,$db->Record);
  //print_r($x);exit();
  		$x->groups = substr($x->groups,1,-1);
--- 415,419 ----
  		}
  
! 		$x = PersistantObject::createFromArray($name,$db->record);
  //print_r($x);exit();
  		$x->groups = substr($x->groups,1,-1);

[Logicampus-cvs] logicampus/src/logicreate/lib lc_lob_test.php, NONE, 1.1 lc_lob.php, 1.27, 1.28

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27554

Modified Files:
	lc_lob.php 
Added Files:
	lc_lob_test.php 
Log Message:
Moving test LOB into its own file.


--- NEW FILE: lc_lob_test.php ---
<?php
include_once(LIB_PATH.'PBDO/LobTest.php');
include_once(LIB_PATH.'PBDO/LobTestQst.php');

/**
 * Hold lob repo entries and lob test entries
 */
class Lc_Lob_Test extends Lc_Lob {

	var $type = 'test';
	var $questionObjs = array();
	var $mime = 'X-LMS/test';

	function Lc_Lob_Test($id = 0) {
		if ($id < 1) {
			$this->repoObj    = new LobRepoEntry();
			$this->lobSub     = new LobTest();
			$this->lobMetaObj = new LobMetadata();
			$this->lobMetaObj->createdOn = time();
		} else {
			$this->repoObj   = LobRepoEntry::load($id);
			$tests           = $this->repoObj->getLobTestsByLobRepoEntryId();
			$this->lobSub    = $tests[0];
		}
	}

	function setTitle($t) {
		$this->repoObj->set('lobTitle', $t);
	}

	function setInstructions($i) {
		$this->repoObj->set('lobDescription', $i);
	}

	function setNotes($n) {
		$this->repoObj->set('lobNotes', $n);
	}

	function addQuestion($qtext, $type = 'QUESTION_ESSAY', $choices = '', $answers = '') {

		$q = new LobTestQst();
		$q->qstText =  $qtext;
		if ( is_array($choices) ) {
		}
		$this->questionObjs[] = $q;
	}

	function getQuestionCount() {
		return count($this->questionObjs);
	}
}
?>

Index: lc_lob.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_lob.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** lc_lob.php	2 Oct 2007 17:06:36 -0000	1.27
--- lc_lob.php	5 Oct 2007 19:27:37 -0000	1.28
***************
*** 4,9 ****
  include_once(LIB_PATH.'PBDO/LobMetadata.php');
  include_once(LIB_PATH.'PBDO/LobContent.php');
- include_once(LIB_PATH.'PBDO/LobTest.php');
- include_once(LIB_PATH.'PBDO/LobTestQst.php');
  include_once(LIB_PATH.'PBDO/LobActivity.php');
  
--- 4,7 ----
***************
*** 459,500 ****
  
  /**
-  * Hold lob repo entries and lob test entries
-  */
- class Lc_Lob_Test extends Lc_Lob {
- 
- 	var $type = 'test';
- 	var $questionObjs = array();
- 	var $mime = 'X-LMS/test';
- 
- 	function Lc_Lob_Test($id = -1) {
- 		if ($id == -1) {
- 			$this->repoObj    = new LobRepoEntry();
- 			$this->lobSub     = new LobTest();
- 			$this->lobMetaObj = new LobMetadata();
- 			$this->lobMetaObj->createdOn = time();
- 		} else {
- 			$this->repoObj   = LobRepoEntry::load($id);
- 			$tests           = $this->repoObj->getLobTestsByLobRepoEntryId();
- 			$this->lobSub    = $tests[0];
- 		}
- 	}
- 
- 	function addQuestion($qtext, $type = 'QUESTION_ESSAY', $choices = '', $answers = '') {
- 
- 		$q = new LobTestQst();
- 		$q->qstText =  $qtext;
- 		if ( is_array($choices) ) {
- 		}
- 		$this->questionObjs[] = $q;
- 	}
- 
- 	function getQuestionCount() {
- 		return count($this->questionObjs);
- 	}
- }
- 
- 
- 
- /**
   * Hold lob repo entries and lob activity entries
   */
--- 457,460 ----

[Logicampus-cvs] logicampus/src/logicreate/lib xmlparser.php, 1.6, 1.7

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27125

Modified Files:
	xmlparser.php 
Log Message:
Fix for utf8 data in xml library.


Index: xmlparser.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/xmlparser.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** xmlparser.php	26 Sep 2007 16:41:34 -0000	1.6
--- xmlparser.php	5 Oct 2007 19:26:53 -0000	1.7
***************
*** 119,125 ****
  		{	
  			if ($base64_check && @$nAttrs['BASE64']) {
! 				$this->value = utf8_decode(html_entity_decode(base64_decode($nValue))); // i'm not sure i need to do this.. (html_entity_decode())
  			} else {
! 				$this->value = utf8_decode(html_entity_decode($nValue));
  			}
  			
--- 119,125 ----
  		{	
  			if ($base64_check && @$nAttrs['BASE64']) {
! 				$this->value = base64_decode($nValue);
  			} else {
! 				$this->value = $nValue;
  			}
  			
***************
*** 135,139 ****
  		if (is_array($this->attrs))
  		foreach($this->attrs as $key => $val)
! 		{	$attrs[] = $key . '="'. utf8_encode(htmlspecialchars($val)). '"'; // encode this
  		}
  		
--- 135,139 ----
  		if (is_array($this->attrs))
  		foreach($this->attrs as $key => $val)
! 		{	$attrs[] = $key . '="'. htmlspecialchars($val, ENT_QUOTES, 'UTF-8'). '"'; // encode this
  		}