[Logicampus-cvs] logicampus/src/logicreate/lib Assessment.php, 1.7, 1.8 AssessmentLog.php, 1.3, 1.4
Brought to you by:
trilexcom
Update of /cvsroot/logicampus/logicampus/src/logicreate/lib In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26290 Modified Files: Assessment.php AssessmentLog.php AssessmentQuestion.php ClassGradebook.php ClassGradebookVal.php ClassUtility.php ExamScheduleDates.php LC_CM.php LC_db.php LC_form.php LC_include.php LC_mysql.php LC_package.php LC_registry.php LC_sqlite.php LC_user.php SeminarClassesDates.php SiteForms.php TextbookClasses.php User.php _classAssignmentObj.php classAnnouncements.php classFaqs.php classLessonObj.php classLessonObjectiveObj.php classLinks.php classLinksCategories.php classObj.php courseObj.php datagrid.php doclibLibrary.php documentLibraryLib.php eventsObj.php gradeBookObj.php lc_categories.php presentationObj.php profileFacultyObj.php semesterObj.php Log Message: Change function "next_record" to "nextRecord". Index: documentLibraryLib.php =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/documentLibraryLib.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** documentLibraryLib.php 21 Apr 2007 21:02:29 -0000 1.9 --- documentLibraryLib.php 8 Oct 2007 14:35:30 -0000 1.10 *************** *** 52,57 **** $db->query('select count(class_id) from classdoclib_Trash where owner = \''.$obj->user->username.'\' and class_id = '.$obj->user->activeClassTaught->id_classes); ! $db->next_record(); ! $t['trashcount'] = sprintf('%d',$db->Record[0]); if ( in_array('manager',$obj->user->perms) ) { --- 52,57 ---- $db->query('select count(class_id) from classdoclib_Trash where owner = \''.$obj->user->username.'\' and class_id = '.$obj->user->activeClassTaught->id_classes); ! $db->nextRecord(); ! $t['trashcount'] = sprintf('%d',$db->record[0]); if ( in_array('manager',$obj->user->perms) ) { *************** *** 104,109 **** $db->RESULT_TYPE = MYSQL_ASSOC; $db->query($sql); ! while($db->next_record()) { ! $x = PersistantObject::createFromArray('LC_file',$db->Record); $ret[$x->pkey] = $x; } --- 104,109 ---- $db->RESULT_TYPE = MYSQL_ASSOC; $db->query($sql); ! while($db->nextRecord()) { ! $x = PersistantObject::createFromArray('LC_file',$db->record); $ret[$x->pkey] = $x; } *************** *** 121,126 **** $db->RESULT_TYPE = MYSQL_ASSOC; $db->query($sql); ! while($db->next_record()) { ! $x = PersistantObject::createFromArray('LC_file',$db->Record); $ret[$x->pkey] = $x; } --- 121,126 ---- $db->RESULT_TYPE = MYSQL_ASSOC; $db->query($sql); ! while($db->nextRecord()) { ! $x = PersistantObject::createFromArray('LC_file',$db->record); $ret[$x->pkey] = $x; } *************** *** 150,156 **** $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! if (is_array($db->Record)) { ! unset($db->Record['total']); ! $x = PersistantObject::createFromArray('LC_file',$db->Record); return $x; } else { --- 150,156 ---- $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! if (is_array($db->record)) { ! unset($db->record['total']); ! $x = PersistantObject::createFromArray('LC_file',$db->record); return $x; } else { *************** *** 196,200 **** $sql .= " and pkey=".$this->pkey; $db->queryOne($sql); ! $filename = $db->Record["filename"]; @unlink(FILES_PATH.$filename); $db->query("delete from classdoclib_Files where owner='".$this->owner."' and pkey=".$this->pkey); --- 196,200 ---- $sql .= " and pkey=".$this->pkey; $db->queryOne($sql); ! $filename = $db->record["filename"]; @unlink(FILES_PATH.$filename); $db->query("delete from classdoclib_Files where owner='".$this->owner."' and pkey=".$this->pkey); *************** *** 280,287 **** $db->query($sql); $db->RESULT_TYPE=MYSQL_ASSOC; ! if (!$db->next_record()) return null; ! $x = PersistantObject::createFromArray('LC_folder',$db->Record); unset($x->total); return $x; --- 280,287 ---- $db->query($sql); $db->RESULT_TYPE=MYSQL_ASSOC; ! if (!$db->nextRecord()) return null; ! $x = PersistantObject::createFromArray('LC_folder',$db->record); unset($x->total); return $x; *************** *** 312,319 **** $db->RESULT_TYPE=MYSQL_ASSOC; ! while($db->next_record()) { ! $temp = $db->Record['folderType']; if ($temp==0) { $temp=99; } ! $x[$temp][] = $db->Record; } ksort($x); --- 312,319 ---- $db->RESULT_TYPE=MYSQL_ASSOC; ! while($db->nextRecord()) { ! $temp = $db->record['folderType']; if ($temp==0) { $temp=99; } ! $x[$temp][] = $db->record; } ksort($x); *************** *** 387,392 **** $db->query("select * from classdoclib_Sharing where folderKey = ".$this->pkey); $sql = 'insert into classdoclib_Sharing (folderKey,action,exclude,gid) VALUES ('.$newFolderID.',%d,%d,\'%s\')'; ! while ( $db->next_record() ) { ! $db->query(sprintf($sql,$db->Record['action'],$db->Record['exclude'],$db->Record['gid']) ); } --- 387,392 ---- $db->query("select * from classdoclib_Sharing where folderKey = ".$this->pkey); $sql = 'insert into classdoclib_Sharing (folderKey,action,exclude,gid) VALUES ('.$newFolderID.',%d,%d,\'%s\')'; ! while ( $db->nextRecord() ) { ! $db->query(sprintf($sql,$db->record['action'],$db->record['exclude'],$db->record['gid']) ); } *************** *** 418,423 **** and action = 1'); ! while ($db->next_record() ){ ! $this->sharedGroups[$db->Record[1]] = $db->Record[0]; } --- 418,423 ---- and action = 1'); ! while ($db->nextRecord() ){ ! $this->sharedGroups[$db->record[1]] = $db->record[0]; } *************** *** 430,435 **** and action = 2'); ! while ($db->next_record() ){ ! $this->managerGroups[$db->Record[1]] = $db->Record[0]; } } --- 430,435 ---- and action = 2'); ! while ($db->nextRecord() ){ ! $this->managerGroups[$db->record[1]] = $db->record[0]; } } *************** *** 715,719 **** $db = db::getHandle(); $db->queryOne("select count(pkey) as filecount from classdoclib_Files where folder=".$this->tree->p_CurrentNode->contents['pkey']); ! $ret .= "<td>".$db->Record['filecount']."</td>"; --- 715,719 ---- $db = db::getHandle(); $db->queryOne("select count(pkey) as filecount from classdoclib_Files where folder=".$this->tree->p_CurrentNode->contents['pkey']); ! $ret .= "<td>".$db->record['filecount']."</td>"; Index: gradeBookObj.php =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/gradeBookObj.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** gradeBookObj.php 21 Nov 2003 23:14:01 -0000 1.1.1.1 --- gradeBookObj.php 8 Oct 2007 14:35:30 -0000 1.2 *************** *** 37,41 **** $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! while(list ($k, $v) = @each($db->Record)) { $this->$k = $v; --- 37,41 ---- $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! while(list ($k, $v) = @each($db->record)) { $this->$k = $v; *************** *** 53,59 **** $db->RESULT_TYPE = MYSQL_ASSOC; $db->query($sql); ! while($db->next_record() ) { ! $cats[$db->Record['id']] = GBCategory::loadFromArray($db->Record); } return $cats; --- 53,59 ---- $db->RESULT_TYPE = MYSQL_ASSOC; $db->query($sql); ! while($db->nextRecord() ) { ! $cats[$db->record['id']] = GBCategory::loadFromArray($db->record); } return $cats; *************** *** 137,141 **** $db->queryOne($sql); ! $x = GBCategory::loadFromArray($db->Record); if ($x->id_classes == $id_classes) { --- 137,141 ---- $db->queryOne($sql); ! $x = GBCategory::loadFromArray($db->record); if ($x->id_classes == $id_classes) { *************** *** 188,192 **** id_class_gradebook_categories !='".$this->id."'"; $db->queryOne($sql); ! $sum = $db->Record[0]; if ( ($sum + $this->weight) > 100) { --- 188,192 ---- id_class_gradebook_categories !='".$this->id."'"; $db->queryOne($sql); ! $sum = $db->record[0]; if ( ($sum + $this->weight) > 100) { *************** *** 222,226 **** $db->queryOne($sql); $this->calculation_type = ! $db->Record['calculation_type']; } --- 222,226 ---- $db->queryOne($sql); $this->calculation_type = ! $db->record['calculation_type']; } *************** *** 237,244 **** $db = DB::getHandle(); $db->query($sql); ! while ($db->next_record() ) { ! $tmp[$db->Record['id_class_gradebook_categories']] = ! $db->Record['label']; } return $tmp; --- 237,244 ---- $db = DB::getHandle(); $db->query($sql); ! while ($db->nextRecord() ) { ! $tmp[$db->record['id_class_gradebook_categories']] = ! $db->record['label']; } return $tmp; *************** *** 272,284 **** $db->query($sql); ! while($db->next_record() ) { $x = new GBEntry(); ! $x->id = $db->Record['id_class_gradebook_entries']; ! $x->title = $db->Record['title']; ! $x->gradebook_code = $db->Record['gradebook_code']; ! $x->total_points = $db->Record['total_points']; ! $x->id_classes = $db->Record['id_classes']; ! $temp[$db->Record['id_class_gradebook_entries']] = $x; } --- 272,284 ---- $db->query($sql); ! while($db->nextRecord() ) { $x = new GBEntry(); ! $x->id = $db->record['id_class_gradebook_entries']; ! $x->title = $db->record['title']; ! $x->gradebook_code = $db->record['gradebook_code']; ! $x->total_points = $db->record['total_points']; ! $x->id_classes = $db->record['id_classes']; ! $temp[$db->record['id_class_gradebook_entries']] = $x; } *************** *** 353,357 **** $sql = "SELECT * FROM class_gradebook_entries where id_class_gradebook_entries='$id' AND id_classes='$id_classes'"; $db->queryOne($sql); ! $x = GBEntry::loadFromArray($db->Record); if ($x->id_classes == $id_classes) { --- 353,357 ---- $sql = "SELECT * FROM class_gradebook_entries where id_class_gradebook_entries='$id' AND id_classes='$id_classes'"; $db->queryOne($sql); ! $x = GBEntry::loadFromArray($db->record); if ($x->id_classes == $id_classes) { *************** *** 373,377 **** $db->queryOne($sql); ! if ($db->Record['count'] == 1) { return true; --- 373,377 ---- $db->queryOne($sql); ! if ($db->record['count'] == 1) { return true; *************** *** 429,438 **** echo $sql; $db->query($sql); ! while($db->next_record() ) { ! $gbVal[$db->Record['id_class_gradebook_val']] = GBVal::loadFromArray($db->Record); ! $gbVal[$db->Record['id_class_gradebook_val']]->entry = GBEntry::loadFromArray($db->Record); ! $gbVal[$db->Record['id_class_gradebook_val']]->category ! = GBCategory::loadFromArray($db->Record); } return $gbVal; --- 429,438 ---- echo $sql; $db->query($sql); ! while($db->nextRecord() ) { ! $gbVal[$db->record['id_class_gradebook_val']] = GBVal::loadFromArray($db->record); ! $gbVal[$db->record['id_class_gradebook_val']]->entry = GBEntry::loadFromArray($db->record); ! $gbVal[$db->record['id_class_gradebook_val']]->category ! = GBCategory::loadFromArray($db->record); } return $gbVal; Index: LC_user.php =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/LC_user.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** LC_user.php 5 Oct 2007 19:25:40 -0000 1.32 --- LC_user.php 8 Oct 2007 14:35:28 -0000 1.33 *************** *** 198,209 **** $or = join(" or pkey = ", $keys); $db->query("select * from lcUsers where pkey = $or",false); ! while ( $db->next_record() ) { unset($temp); $temp = new lcUser(); ! $temp->username = $db->Record[username]; ! $temp->password = $db->Record[password]; ! $temp->email = $db->Record[email]; ! $temp->groups = explode('|',substr($db->Record[groups],1,-1)); ! $temp->userId = $db->Record['pkey']; if (! in_array('public',$temp->groups) ) --- 198,209 ---- $or = join(" or pkey = ", $keys); $db->query("select * from lcUsers where pkey = $or",false); ! while ( $db->nextRecord() ) { unset($temp); $temp = new lcUser(); ! $temp->username = $db->record[username]; ! $temp->password = $db->record[password]; ! $temp->email = $db->record[email]; ! $temp->groups = explode('|',substr($db->record[groups],1,-1)); ! $temp->userId = $db->record['pkey']; if (! in_array('public',$temp->groups) ) *************** *** 332,336 **** $db->queryOne($sql,false); ! if ($db->Record['user_exists']) { return -1; } --- 332,336 ---- $db->queryOne($sql,false); ! if ($db->record['user_exists']) { return -1; } *************** *** 358,363 **** $sql = "select count(username) as username, count(email) as email from lcUsers where username = '".$this->username."' or email='".$this->email."'"; $db->queryOne($sql); ! $ucount = $db->Record['username']; ! $ecount = $db->Record['email']; if ( ($ucount != 0) and ($ecount != 0) ) { return false; --- 358,363 ---- $sql = "select count(username) as username, count(email) as email from lcUsers where username = '".$this->username."' or email='".$this->email."'"; $db->queryOne($sql); ! $ucount = $db->record['username']; ! $ecount = $db->record['email']; if ( ($ucount != 0) and ($ecount != 0) ) { return false; *************** *** 804,808 **** $db->queryOne("select * from profile where username='".$prof->username."'",false); ! while ( list($k,$v) = @each($db->Record) ) { $prof->values[$k] = $v; $prof->keys[] = $k; --- 804,808 ---- $db->queryOne("select * from profile where username='".$prof->username."'",false); ! while ( list($k,$v) = @each($db->record) ) { $prof->values[$k] = $v; $prof->keys[] = $k; *************** *** 811,815 **** if ($type > 1 && strlen($prof->tableName) > 1) { $db->queryOne("select * from ".$prof->tableName." where username='".$prof->username."'",false); ! while ( list($k,$v) = @each($db->Record) ) { $prof->values[$k] = $v; $prof->keys[] = $k; --- 811,815 ---- if ($type > 1 && strlen($prof->tableName) > 1) { $db->queryOne("select * from ".$prof->tableName." where username='".$prof->username."'",false); ! while ( list($k,$v) = @each($db->record) ) { $prof->values[$k] = $v; $prof->keys[] = $k; Index: classFaqs.php =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/classFaqs.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** classFaqs.php 13 Aug 2005 20:41:05 -0000 1.2 --- classFaqs.php 8 Oct 2007 14:35:29 -0000 1.3 *************** *** 19,33 **** if ($prop=='') { $prop=$this->_pkey; } $db->query("select id_class_faqs,id_classes,category,question,answer,clicks,groups from class_faqs where $prop='$pkey' $where $orderBy"); ! if($db->next_record()) { $temp = new classFaqs(); $temp->_dsn = $dsn; $temp->__loaded = true; ! $temp->id_class_faqs = $db->Record['id_class_faqs']; ! $temp->id_classes = $db->Record['id_classes']; ! $temp->category = $db->Record['category']; ! $temp->question = $db->Record['question']; ! $temp->answer = $db->Record['answer']; ! $temp->clicks = $db->Record['clicks']; ! $temp->groups = $db->Record['groups']; } --- 19,33 ---- if ($prop=='') { $prop=$this->_pkey; } $db->query("select id_class_faqs,id_classes,category,question,answer,clicks,groups from class_faqs where $prop='$pkey' $where $orderBy"); ! if($db->nextRecord()) { $temp = new classFaqs(); $temp->_dsn = $dsn; $temp->__loaded = true; ! $temp->id_class_faqs = $db->record['id_class_faqs']; ! $temp->id_classes = $db->record['id_classes']; ! $temp->category = $db->record['category']; ! $temp->question = $db->record['question']; ! $temp->answer = $db->record['answer']; ! $temp->clicks = $db->record['clicks']; ! $temp->groups = $db->record['groups']; } *************** *** 43,57 **** if ($where) { $where = " and $where"; } $db->query("select id_class_faqs,id_classes,category,question,answer,clicks,groups from class_faqs where $prop='$key' $where $orderBy"); ! while ($db->next_record()) { $temp = new classFaqs(); $temp->_dsn = $dsn; $temp->__loaded = true; ! $temp->id_class_faqs = $db->Record['id_class_faqs']; ! $temp->id_classes = $db->Record['id_classes']; ! $temp->category = $db->Record['category']; ! $temp->question = $db->Record['question']; ! $temp->answer = $db->Record['answer']; ! $temp->clicks = $db->Record['clicks']; ! $temp->groups = $db->Record['groups']; $objects[] = $temp; } --- 43,57 ---- if ($where) { $where = " and $where"; } $db->query("select id_class_faqs,id_classes,category,question,answer,clicks,groups from class_faqs where $prop='$key' $where $orderBy"); ! while ($db->nextRecord()) { $temp = new classFaqs(); $temp->_dsn = $dsn; $temp->__loaded = true; ! $temp->id_class_faqs = $db->record['id_class_faqs']; ! $temp->id_classes = $db->record['id_classes']; ! $temp->category = $db->record['category']; ! $temp->question = $db->record['question']; ! $temp->answer = $db->record['answer']; ! $temp->clicks = $db->record['clicks']; ! $temp->groups = $db->record['groups']; $objects[] = $temp; } Index: eventsObj.php =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/eventsObj.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** eventsObj.php 24 Sep 2005 02:29:59 -0000 1.10 --- eventsObj.php 8 Oct 2007 14:35:30 -0000 1.11 *************** *** 297,302 **** $db->RESULT_TYPE = MYSQL_ASSOC; ! while($db->next_record()) { ! extract($db->Record); $exclude = explode("|",$repeatExclude); $eventPkey =$pkey; --- 297,302 ---- $db->RESULT_TYPE = MYSQL_ASSOC; ! while($db->nextRecord()) { ! extract($db->record); $exclude = explode("|",$repeatExclude); $eventPkey =$pkey; *************** *** 331,337 **** case "0": $loopVar = strtotime(date("m/d/Y 00:00:00",$eventStart)); ! $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->Record); $loopEnd = strtotime(date("m/d/Y 00:00:00",$eventEnd)); ! $edateObj->events[$loopEnd][$eventPkey] = edate::_load($db->Record); break; --- 331,337 ---- case "0": $loopVar = strtotime(date("m/d/Y 00:00:00",$eventStart)); ! $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->record); $loopEnd = strtotime(date("m/d/Y 00:00:00",$eventEnd)); ! $edateObj->events[$loopEnd][$eventPkey] = edate::_load($db->record); break; *************** *** 357,361 **** if (is_array($exclude) == false || (is_array($exclude) && in_array(date("n/d/Y",$loopVar), $exclude) == false)) ! { $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->Record); } --- 357,361 ---- if (is_array($exclude) == false || (is_array($exclude) && in_array(date("n/d/Y",$loopVar), $exclude) == false)) ! { $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->record); } *************** *** 417,426 **** { if (is_array($exclude) == false) ! { $edateObj->events[$loopVar][$eventPkey] =edate::_load($db->Record); } else { reset($exclude); if (in_array(date("n/d/Y",$loopVar), $exclude) == false) ! { $edateObj->events[$loopVar][$eventPkey] =edate::_load($db->Record);; } --- 417,426 ---- { if (is_array($exclude) == false) ! { $edateObj->events[$loopVar][$eventPkey] =edate::_load($db->record); } else { reset($exclude); if (in_array(date("n/d/Y",$loopVar), $exclude) == false) ! { $edateObj->events[$loopVar][$eventPkey] =edate::_load($db->record);; } *************** *** 481,485 **** if ( ($nexttime>=$loopVar) && ($nexttime<=$loopEnd)) { if (!in_array(date("m/d/Y",$loopVar), $exclude)) { ! $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->Record); } } --- 481,485 ---- if ( ($nexttime>=$loopVar) && ($nexttime<=$loopEnd)) { if (!in_array(date("m/d/Y",$loopVar), $exclude)) { ! $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->record); } } *************** *** 515,519 **** if ( ($nexttime>=$loopVar) && ($nexttime<=$loopEnd)) { if (!in_array(date("m/d/Y",$loopVar), $exclude)) { ! $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->Record); } } --- 515,519 ---- if ( ($nexttime>=$loopVar) && ($nexttime<=$loopEnd)) { if (!in_array(date("m/d/Y",$loopVar), $exclude)) { ! $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->record); } } *************** *** 562,569 **** if ( $j & $day) { if (!is_array($exclude)) { ! $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->Record); } if (!in_array(date("n/d/Y",$loopVar), $exclude)) { ! $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->Record); } //print_r($this->events[$loopVar]); echo "<HR>"; --- 562,569 ---- if ( $j & $day) { if (!is_array($exclude)) { ! $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->record); } if (!in_array(date("n/d/Y",$loopVar), $exclude)) { ! $edateObj->events[$loopVar][$eventPkey] = edate::_load($db->record); } //print_r($this->events[$loopVar]); echo "<HR>"; *************** *** 1308,1314 **** $db->queryOne($sql); ! if (is_array($db->Record)) { ! foreach($db->Record as $variable => $variable_value) { $this->{$variable} = $variable_value; $i++; --- 1308,1314 ---- $db->queryOne($sql); ! if (is_array($db->record)) { ! foreach($db->record as $variable => $variable_value) { $this->{$variable} = $variable_value; $i++; *************** *** 1552,1556 **** $db->queryOne($sql); ! $s = '('.$db->Record['semesterId'].') '.$db->Record['courseFamilyNumber'].' '.$s; } else { --- 1552,1556 ---- $db->queryOne($sql); ! $s = '('.$db->record['semesterId'].') '.$db->record['courseFamilyNumber'].' '.$s; } else { *************** *** 1915,1922 **** $db->queryOne($sql); ! //$s = '('.$db->Record['semesterId'].') '.$db->Record['courseFamilyNumber'].' '.$s; // I've decided to leave off the (avail./unavail) stuff when this block is hit // as this block currently is only hit when you're in the master calendar ! $s = '('.$db->Record['semesterId'].') '.$db->Record['courseFamilyNumber'].' '; } --- 1915,1922 ---- $db->queryOne($sql); ! //$s = '('.$db->record['semesterId'].') '.$db->record['courseFamilyNumber'].' '.$s; // I've decided to leave off the (avail./unavail) stuff when this block is hit // as this block currently is only hit when you're in the master calendar ! $s = '('.$db->record['semesterId'].') '.$db->record['courseFamilyNumber'].' '; } *************** *** 2005,2009 **** $db->queryOne($sql); ! return '- '. date('g:i A', $this->enddate).' <br><B>'.$db->Record['firstname']. ' '. $db->Record['lastname']. ' (DL Staff)</B>: '. $this->title. '<br><i>'.$this->description. '</i>'; } --- 2005,2009 ---- $db->queryOne($sql); ! return '- '. date('g:i A', $this->enddate).' <br><B>'.$db->record['firstname']. ' '. $db->record['lastname']. ' (DL Staff)</B>: '. $this->title. '<br><i>'.$this->description. '</i>'; } Index: LC_form.php =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/LC_form.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** LC_form.php 11 Sep 2007 03:00:25 -0000 1.15 --- LC_form.php 8 Oct 2007 14:35:28 -0000 1.16 *************** *** 1077,1081 **** $sql = "select pkey from lcFormInfo where formCode='$code'"; $db->queryOne($sql); ! $pkey = $db->Record['pkey']; $sql = "select * from lcForms where formId='$pkey'"; --- 1077,1081 ---- $sql = "select pkey from lcFormInfo where formCode='$code'"; $db->queryOne($sql); ! $pkey = $db->record['pkey']; $sql = "select * from lcForms where formId='$pkey'"; *************** *** 1083,1092 **** $db->RESULT_TYPE = MYSQL_ASSOC; $db->query($sql); ! while ($db->next_record()) { ! $tmp[$db->Record['fieldName']] = $db->Record; # take the groups and unserialize them # so we don't have to later on ! $tmp[$db->Record['fieldName']]['groups'] = unserialize($db->Record['groups']); } --- 1083,1092 ---- $db->RESULT_TYPE = MYSQL_ASSOC; $db->query($sql); ! while ($db->nextRecord()) { ! $tmp[$db->record['fieldName']] = $db->record; # take the groups and unserialize them # so we don't have to later on ! $tmp[$db->record['fieldName']]['groups'] = unserialize($db->record['groups']); } *************** *** 1425,1429 **** $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! $formInfo = $db->Record; #debug($formInfo); #Fill in all of the form properties --- 1425,1429 ---- $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! $formInfo = $db->record; #debug($formInfo); #Fill in all of the form properties *************** *** 1446,1450 **** $n = 0; ! while($db->next_record()) { ++$formRow; --- 1446,1450 ---- $n = 0; ! while($db->nextRecord()) { ++$formRow; *************** *** 1457,1470 **** # Fields such as event or submit should not be # overwritten. ! #debug($db->Record); if (is_array($vars) ) { ! #debug($db->Record['type']); ! if ( !( ($db->Record['type'] == 'hidden') || ($db->Record['type'] == 'submit') || ($db->Record['type'] == 'row') || ($db->Record['type'] == 'checkbox') || ($db->Record['type'] == 'radio'))) { ! #debug($db->Record); ! $db->Record['defaultValue'] = $vars[$db->Record['fieldName']]; } --- 1457,1470 ---- # Fields such as event or submit should not be # overwritten. ! #debug($db->record); if (is_array($vars) ) { ! #debug($db->record['type']); ! if ( !( ($db->record['type'] == 'hidden') || ($db->record['type'] == 'submit') || ($db->record['type'] == 'row') || ($db->record['type'] == 'checkbox') || ($db->record['type'] == 'radio'))) { ! #debug($db->record); ! $db->record['defaultValue'] = $vars[$db->record['fieldName']]; } *************** *** 1476,1489 **** # if it doesn't we know the person didn't check # the checkbox or unchecked it. ! if ($db->Record['type'] == 'checkbox') { ! $db->Record['checked'] = 'Y'; ! if ( !isset($vars[$db->Record['fieldName']]) ) { ! $db->Record['checked'] = 'N'; } else { ! if ( $vars[$db->Record['fieldName']] == false) { ! $db->Record['checked'] = 'N'; } } --- 1476,1489 ---- # if it doesn't we know the person didn't check # the checkbox or unchecked it. ! if ($db->record['type'] == 'checkbox') { ! $db->record['checked'] = 'Y'; ! if ( !isset($vars[$db->record['fieldName']]) ) { ! $db->record['checked'] = 'N'; } else { ! if ( $vars[$db->record['fieldName']] == false) { ! $db->record['checked'] = 'N'; } } *************** *** 1495,1504 **** # value. If we didn't do this, radio buttons # would not have anything selected by default. ! if ($db->Record['type'] == 'radio') { ! if ( $vars[$db->Record['fieldName']] != '' ) { ! $db->Record['defaultValue'] = ! $vars[$db->Record['fieldName']]; } } --- 1495,1504 ---- # value. If we didn't do this, radio buttons # would not have anything selected by default. ! if ($db->record['type'] == 'radio') { ! if ( $vars[$db->record['fieldName']] != '' ) { ! $db->record['defaultValue'] = ! $vars[$db->record['fieldName']]; } } *************** *** 1506,1517 **** ! # echo $db->Record['fieldName'] .'='.$db->Record['defaultValue'].'<br>'; # Build up the groups for each form field ! $db->Record['groups'] = unserialize($db->Record['groups']); # Figure out if the ! #$row = $db->Record['row']; ! #debug($db->Record); ! $this->data[$formRow][] = $db->Record; } --- 1506,1517 ---- ! # echo $db->record['fieldName'] .'='.$db->record['defaultValue'].'<br>'; # Build up the groups for each form field ! $db->record['groups'] = unserialize($db->record['groups']); # Figure out if the ! #$row = $db->record['row']; ! #debug($db->record); ! $this->data[$formRow][] = $db->record; } *************** *** 1530,1536 **** #$db = DB::getHandle(); #$db->query("select * from lcForms where formId='$formId'"); ! #while($db->next_record()) #{ ! # $tmp[$db->Record['fieldName']] = $db->Record; #} --- 1530,1536 ---- #$db = DB::getHandle(); #$db->query("select * from lcForms where formId='$formId'"); ! #while($db->nextRecord()) #{ ! # $tmp[$db->record['fieldName']] = $db->record; #} *************** *** 1545,1549 **** } #echo $ar[$k].'----->ar<br>'; ! #echo $db->Record['fieldName'].'------->Record<br>'; if (is_array($ar[$k])) { --- 1545,1549 ---- } #echo $ar[$k].'----->ar<br>'; ! #echo $db->record['fieldName'].'------->record<br>'; if (is_array($ar[$k])) { *************** *** 1581,1585 **** $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! $formInfo = $db->Record; #Fill in all of the form properties --- 1581,1585 ---- $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! $formInfo = $db->record; #Fill in all of the form properties *************** *** 1605,1626 **** $db->query($sql); $db->RESULT_TYPE = MYSQL_ASSOC; ! #print_r($db->Record); ! while($db->next_record()) { ! if ($req[$db->Record['fieldName']] != '') { ! $db->Record['defaultValue'] = $req[$db->Record['fieldName']]; } ! if ($opt[$db->Record['fieldName']] != '') { ! $db->Record['defaultValue'] = $opt[$db->Record['fieldName']]; } # Build up the groups for each form field ! $db->Record['groups'] = explode("|", $db->Record['groups']); ! $db->Record['notgroups'] = explode("|", $db->Record['notgroups']); ! $this->data[] = $db->Record; } --- 1605,1626 ---- $db->query($sql); $db->RESULT_TYPE = MYSQL_ASSOC; ! #print_r($db->record); ! while($db->nextRecord()) { ! if ($req[$db->record['fieldName']] != '') { ! $db->record['defaultValue'] = $req[$db->record['fieldName']]; } ! if ($opt[$db->record['fieldName']] != '') { ! $db->record['defaultValue'] = $opt[$db->record['fieldName']]; } # Build up the groups for each form field ! $db->record['groups'] = explode("|", $db->record['groups']); ! $db->record['notgroups'] = explode("|", $db->record['notgroups']); ! $this->data[] = $db->record; } *************** *** 1688,1692 **** $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! return $db->Record; } --- 1688,1692 ---- $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! return $db->record; } Index: presentationObj.php =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/presentationObj.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** presentationObj.php 13 Aug 2005 20:41:05 -0000 1.2 --- presentationObj.php 8 Oct 2007 14:35:30 -0000 1.3 *************** *** 18,33 **** if ($prop=='') { $prop=$this->_pkey; } $db->query("select id_presentations,id_classes,title,status,author,createdOn,approvedOn,content from class_presentations where $prop='$pkey' $where $orderBy"); ! while ($db->next_record()) { $temp = new presentationObj(); $temp->_dsn = $dsn; $temp->__loaded = true; ! $temp->id_presentations = $db->Record['id_presentations']; ! $temp->id_classes = $db->Record['id_classes']; ! $temp->title = $db->Record['title']; ! $temp->status = $db->Record['status']; ! $temp->author = $db->Record['author']; ! $temp->createdOn = $db->Record['createdOn']; ! $temp->approvedOn = $db->Record['approvedOn']; ! $temp->content = $db->Record['content']; $objects[] = $temp; } --- 18,33 ---- if ($prop=='') { $prop=$this->_pkey; } $db->query("select id_presentations,id_classes,title,status,author,createdOn,approvedOn,content from class_presentations where $prop='$pkey' $where $orderBy"); ! while ($db->nextRecord()) { $temp = new presentationObj(); $temp->_dsn = $dsn; $temp->__loaded = true; ! $temp->id_presentations = $db->record['id_presentations']; ! $temp->id_classes = $db->record['id_classes']; ! $temp->title = $db->record['title']; ! $temp->status = $db->record['status']; ! $temp->author = $db->record['author']; ! $temp->createdOn = $db->record['createdOn']; ! $temp->approvedOn = $db->record['approvedOn']; ! $temp->content = $db->record['content']; $objects[] = $temp; } *************** *** 43,58 **** if ($where) { $where = ' and $where'; } $db->query("select id_presentations,id_classes,title,status,author,createdOn,approvedOn,content from class_presentations $where $orderBy"); ! while ($db->next_record()) { $temp = new presentationObj(); $temp->_dsn = $dsn; $temp->__loaded = true; ! $temp->id_presentations = $db->Record['id_presentations']; ! $temp->id_classes = $db->Record['id_classes']; ! $temp->title = $db->Record['title']; ! $temp->status = $db->Record['status']; ! $temp->author = $db->Record['author']; ! $temp->createdOn = $db->Record['createdOn']; ! $temp->approvedOn = $db->Record['approvedOn']; ! $temp->content = $db->Record['content']; $objects[] = $temp; } --- 43,58 ---- if ($where) { $where = ' and $where'; } $db->query("select id_presentations,id_classes,title,status,author,createdOn,approvedOn,content from class_presentations $where $orderBy"); ! while ($db->nextRecord()) { $temp = new presentationObj(); $temp->_dsn = $dsn; $temp->__loaded = true; ! $temp->id_presentations = $db->record['id_presentations']; ! $temp->id_classes = $db->record['id_classes']; ! $temp->title = $db->record['title']; ! $temp->status = $db->record['status']; ! $temp->author = $db->record['author']; ! $temp->createdOn = $db->record['createdOn']; ! $temp->approvedOn = $db->record['approvedOn']; ! $temp->content = $db->record['content']; $objects[] = $temp; } Index: SeminarClassesDates.php =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/SeminarClassesDates.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SeminarClassesDates.php 8 Feb 2007 19:51:21 -0000 1.3 --- SeminarClassesDates.php 8 Oct 2007 14:35:29 -0000 1.4 *************** *** 350,356 **** '%|semmgr|%'"; $db->query($sql); ! while($db->next_record() ) { ! $emailTo .= $db->Record['email'].','; } --- 350,356 ---- '%|semmgr|%'"; $db->query($sql); ! while($db->nextRecord() ) { ! $emailTo .= $db->record['email'].','; } Index: SiteForms.php =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/SiteForms.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SiteForms.php 17 Nov 2006 16:39:21 -0000 1.6 --- SiteForms.php 8 Oct 2007 14:35:29 -0000 1.7 *************** *** 68,74 **** $sql = "select distinct({$this->courseFamily}) from {$this->courses_table}"; $this->db->query($sql); ! while($this->db->next_record() ) { ! $arr[$this->db->Record["{$this->courseFamily}"]] = $this->db->Record["{$this->courseFamily}"].'='.$this->db->Record["{$this->courseFamily}"]; } #debug($arr, 1); --- 68,74 ---- $sql = "select distinct({$this->courseFamily}) from {$this->courses_table}"; $this->db->query($sql); ! while($this->db->nextRecord() ) { ! $arr[$this->db->record["{$this->courseFamily}"]] = $this->db->record["{$this->courseFamily}"].'='.$this->db->record["{$this->courseFamily}"]; } #debug($arr, 1); *************** *** 86,92 **** $sql = "select distinct({$this->courseNumber}) from {$this->courses_table}"; $this->db->query($sql); ! while($this->db->next_record() ) { ! $arr[$this->db->Record["{$this->courseNumber}"]] = $this->db->Record["{$this->courseNumber}"].'='.$this->db->Record["{$this->courseNumber}"]; } --- 86,92 ---- $sql = "select distinct({$this->courseNumber}) from {$this->courses_table}"; $this->db->query($sql); ! while($this->db->nextRecord() ) { ! $arr[$this->db->record["{$this->courseNumber}"]] = $this->db->record["{$this->courseNumber}"].'='.$this->db->record["{$this->courseNumber}"]; } *************** *** 101,107 **** $sql = "select id_courses, {$this->courseNumber}, {$this->courseFamily} from {$this->courses_table}"; $this->db->query($sql); ! while($this->db->next_record() ) { ! $arr[$this->db->Record['id_courses']] = $this->db->Record['id_courses'].'='.$this->db->Record["{$this->courseFamily}"].$this->db->Record["{$this->courseNumber}"]; } --- 101,107 ---- $sql = "select id_courses, {$this->courseNumber}, {$this->courseFamily} from {$this->courses_table}"; $this->db->query($sql); ! while($this->db->nextRecord() ) { ! $arr[$this->db->record['id_courses']] = $this->db->record['id_courses'].'='.$this->db->record["{$this->courseFamily}"].$this->db->record["{$this->courseNumber}"]; } *************** *** 117,123 **** $sql = "select id_courses, courseName, courseDescription, {$this->courseNumber}, {$this->courseFamily} from {$this->courses_table} ORDER BY courseFamily ASC"; $this->db->query($sql); ! while($this->db->next_record() ) { ! $arr[$this->db->Record['id_courses']] = $this->db->Record['id_courses'].'='. $this->db->Record["{$this->courseFamily}"].$this->db->Record["{$this->courseNumber}"].' ('.$this->db->Record['courseName'].')'; } --- 117,123 ---- $sql = "select id_courses, courseName, courseDescription, {$this->courseNumber}, {$this->courseFamily} from {$this->courses_table} ORDER BY courseFamily ASC"; $this->db->query($sql); ! while($this->db->nextRecord() ) { ! $arr[$this->db->record['id_courses']] = $this->db->record['id_courses'].'='. $this->db->record["{$this->courseFamily}"].$this->db->record["{$this->courseNumber}"].' ('.$this->db->record['courseName'].')'; } *************** *** 133,139 **** $sql = "select id_courses, courseDescription, {$this->courseNumber}, {$this->courseFamily} from {$this->courses_table}"; $this->db->query($sql); ! while($this->db->next_record() ) { ! $arr[$this->db->Record['id_courses']] = $this->db->Record['id_courses'].'='.$this->db->Record['courseDescription'].' ('.$this->db->Record["{$this->courseFamily}"].$this->db->Record["{$this->courseNumber}"].')'; } --- 133,139 ---- $sql = "select id_courses, courseDescription, {$this->courseNumber}, {$this->courseFamily} from {$this->courses_table}"; $this->db->query($sql); ! while($this->db->nextRecord() ) { ! $arr[$this->db->record['id_courses']] = $this->db->record['id_courses'].'='.$this->db->record['courseDescription'].' ('.$this->db->record["{$this->courseFamily}"].$this->db->record["{$this->courseNumber}"].')'; } *************** *** 155,161 **** $this->db->RESULT_TYPE = MYSQL_ASSOC; $arr = array(); ! while($this->db->next_record() ) { ! $arr[] = $this->db->Record; } --- 155,161 ---- $this->db->RESULT_TYPE = MYSQL_ASSOC; $arr = array(); ! while($this->db->nextRecord() ) { ! $arr[] = $this->db->record; } *************** *** 202,208 **** $this->db->RESULT_TYPE = MYSQL_ASSOC; $arr = array(); ! while($this->db->next_record() ) { ! $arr[] = $this->db->Record; } --- 202,208 ---- $this->db->RESULT_TYPE = MYSQL_ASSOC; $arr = array(); ! while($this->db->nextRecord() ) { ! $arr[] = $this->db->record; } *************** *** 247,260 **** $sql = "select id_semesters, semesterTerm, semesterId, semesterYear from semesters order by semesterYear DESC"; $this->db->query($sql); ! while($this->db->next_record() ) { ! if ( in_array($this->db->Record['semesterTerm'],$a_semester) ) { ! $arr[$this->db->Record['id_semesters']] = ! $this->db->Record['id_semesters'].'='. ! $a_semester[$this->db->Record['semesterTerm']].' '. ! $this->db->Record['semesterYear']; } else { ! $arr[$this->db->Record['id_semesters']] = ! $this->db->Record['id_semesters'].'='. ! $this->db->Record['courseFamilyNumber']; } } --- 247,260 ---- $sql = "select id_semesters, semesterTerm, semesterId, semesterYear from semesters order by semesterYear DESC"; $this->db->query($sql); ! while($this->db->nextRecord() ) { ! if ( in_array($this->db->record['semesterTerm'],$a_semester) ) { ! $arr[$this->db->record['id_semesters']] = ! $this->db->record['id_semesters'].'='. ! $a_semester[$this->db->record['semesterTerm']].' '. ! $this->db->record['semesterYear']; } else { ! $arr[$this->db->record['id_semesters']] = ! $this->db->record['id_semesters'].'='. ! $this->db->record['courseFamilyNumber']; } } *************** *** 292,307 **** // @@@ Now i need to know if we are to show semesters that have been deactivated? $this->db->query($sql); ! while($this->db->next_record() ) { ! if ( in_array($this->db->Record['semesterTerm'],$a_semester) ) { ! $arr[$this->db->Record['id_semesters']] = ! $this->db->Record['id_semesters'].'='. ! '[ '. $this->db->Record['count_classes']. ' ] '. ! $a_semester[$this->db->Record['semesterTerm']].' '. ! $this->db->Record['semesterYear']; } else { ! $arr[$this->db->Record['id_semesters']] = ! $this->db->Record['id_semesters'].'='. ! '[ '. $this->db->Record['count_classes']. ' ] '. ! $this->db->Record['courseFamilyNumber']; } } --- 292,307 ---- // @@@ Now i need to know if we are to show semesters that have been deactivated? $this->db->query($sql); ! while($this->db->nextRecord() ) { ! if ( in_array($this->db->record['semesterTerm'],$a_semester) ) { ! $arr[$this->db->record['id_semesters']] = ! $this->db->record['id_semesters'].'='. ! '[ '. $this->db->record['count_classes']. ' ] '. ! $a_semester[$this->db->record['semesterTerm']].' '. ! $this->db->record['semesterYear']; } else { ! $arr[$this->db->record['id_semesters']] = ! $this->db->record['id_semesters'].'='. ! '[ '. $this->db->record['count_classes']. ' ] '. ! $this->db->record['courseFamilyNumber']; } } *************** *** 336,341 **** $this->db->query($sql); ! while ($this->db->next_record()) { ! $selected[] = $this->db->Record['id_class_objectives']; } --- 336,341 ---- $this->db->query($sql); ! while ($this->db->nextRecord()) { ! $selected[] = $this->db->record['id_class_objectives']; } *************** *** 354,359 **** $this->db->query($sql); $starred = array(); ! while ($this->db->next_record()) { ! $starred[] = $this->db->Record['id_class_objectives']; } --- 354,359 ---- $this->db->query($sql); $starred = array(); ! while ($this->db->nextRecord()) { ! $starred[] = $this->db->record['id_class_objectives']; } *************** *** 362,374 **** where id_classes='{$lcUser->activeClassTaught->id_classes}'"; $this->db->query($sql); ! while ($this->db->next_record()) { ! if (strlen($this->db->Record['objective']) > 75) { ! $this->db->Record['objective'] = htmlentities(substr($this->db->Record['objective'],0,75), ENT_QUOTES) . '...'; ! $this->db->Record[1] = htmlentities(substr($this->db->Record[1],0,75), ENT_QUOTES); } ! $arr[$this->db->Record['id_class_objectives']] = ! $this->db->Record['id_class_objectives'].'=' ! .(@in_array($this->db->Record['id_class_objectives'], $starred) ? '**' : '') ! .str_replace(',', ',', $this->db->Record['objective']); } --- 362,374 ---- where id_classes='{$lcUser->activeClassTaught->id_classes}'"; $this->db->query($sql); ! while ($this->db->nextRecord()) { ! if (strlen($this->db->record['objective']) > 75) { ! $this->db->record['objective'] = htmlentities(substr($this->db->record['objective'],0,75), ENT_QUOTES) . '...'; ! $this->db->record[1] = htmlentities(substr($this->db->record[1],0,75), ENT_QUOTES); } ! $arr[$this->db->record['id_class_objectives']] = ! $this->db->record['id_class_objectives'].'=' ! .(@in_array($this->db->record['id_class_objectives'], $starred) ? '**' : '') ! .str_replace(',', ',', $this->db->record['objective']); } *************** *** 393,398 **** and a.id_classes='{$lcUser->activeClassTaught->id_classes}'"; $this->db->query($sql); ! while ($this->db->next_record()) { ! $selected[] = $this->db->Record['id_class_assignments']; } --- 393,398 ---- and a.id_classes='{$lcUser->activeClassTaught->id_classes}'"; $this->db->query($sql); ! while ($this->db->nextRecord()) { ! $selected[] = $this->db->record['id_class_assignments']; } *************** *** 405,413 **** $this->db->query($sql); $arr[0] = '0=None'; ! while ($this->db->next_record()) { ! $arr[$this->db->Record['id_class_assignments']] = ! $this->db->Record['id_class_assignments'] ! .'='.$this->db->Record['title']; } --- 405,413 ---- $this->db->query($sql); $arr[0] = '0=None'; ! while ($this->db->nextRecord()) { ! $arr[$this->db->record['id_class_assignments']] = ! $this->db->record['id_class_assignments'] ! .'='.$this->db->record['title']; } *************** *** 429,435 **** and (id_class_lessons is null or id_class_lessons='".LESSON_ID."')"; $this->db->query($sql); ! while ($this->db->next_record()) { ! $arr[$this->db->Record['id_class_lesson_content']] = ! $this->db->Record['id_class_lesson_content'].'='.$this->db->Record['txTitle']; } $v['selectOptions'] = @implode($arr, ','); --- 429,435 ---- and (id_class_lessons is null or id_class_lessons='".LESSON_ID."')"; $this->db->query($sql); ! while ($this->db->nextRecord()) { ! $arr[$this->db->record['id_class_lesson_content']] = ! $this->db->record['id_class_lesson_content'].'='.$this->db->record['txTitle']; } $v['selectOptions'] = @implode($arr, ','); *************** *** 446,452 **** $this->db->query($sql); $arr = array(); ! while ($this->db->next_record()) { ! $arr[$this->db->Record['id_class_links']] ! = $this->db->Record['id_class_links'].'='.$this->db->Record['title']; } $v['selectOptions'] = @implode($arr, ','); --- 446,452 ---- $this->db->query($sql); $arr = array(); ! while ($this->db->nextRecord()) { ! $arr[$this->db->record['id_class_links']] ! = $this->db->record['id_class_links'].'='.$this->db->record['title']; } $v['selectOptions'] = @implode($arr, ','); *************** *** 465,469 **** $this->db->queryOne($sql); ! $CFAM = $this->db->Record['courseFamily']; if ($CFAM == '') --- 465,469 ---- $this->db->queryOne($sql); ! $CFAM = $this->db->record['courseFamily']; if ($CFAM == '') *************** *** 483,489 **** { $arr[0] = '0=No Teachers Available'; } ! while($this->db->next_record() ) { ! $arr[$this->db->Record['username']] = $this->db->Record['username']. '='.$this->db->Record['lastname']. ', '.$this->db->Record['firstname'] ; } --- 483,489 ---- { $arr[0] = '0=No Teachers Available'; } ! while($this->db->nextRecord() ) { ! $arr[$this->db->record['username']] = $this->db->record['username']. '='.$this->db->record['lastname']. ', '.$this->db->record['firstname'] ; } *************** *** 500,505 **** //groups $this->db->query("select * from lcGroups"); ! while ($this->db->next_record() ) { ! $arr .= $this->db->Record[gid].'='.$this->db->Record[groupName].','; } $v['selectOptions'] = substr($arr, 0, -1); --- 500,505 ---- //groups $this->db->query("select * from lcGroups"); ! while ($this->db->nextRecord() ) { ! $arr .= $this->db->record[gid].'='.$this->db->record[groupName].','; } $v['selectOptions'] = substr($arr, 0, -1); *************** *** 515,521 **** $this->db->query($sql); $arr = "General=General,"; ! while($this->db->next_record() ) { ! $arr .= $this->db->Record['category'].'='.$this->db->Record['category'].','; } $v['selectOptions'] = substr($arr, 0, -1); --- 515,521 ---- $this->db->query($sql); $arr = "General=General,"; ! while($this->db->nextRecord() ) { ! $arr .= $this->db->record['category'].'='.$this->db->record['category'].','; } $v['selectOptions'] = substr($arr, 0, -1); *************** *** 528,533 **** { $this->db->query("select * from helpdesk_categories ORDER BY helpdesk_category_label"); ! while($this->db->next_record()) { ! $arr .= $this->db->Record[0]."=".$this->db->Record['helpdesk_category_label'].','; } --- 528,533 ---- { $this->db->query("select * from helpdesk_categories ORDER BY helpdesk_category_label"); ! while($this->db->nextRecord()) { ! $arr .= $this->db->record[0]."=".$this->db->record['helpdesk_category_label'].','; } *************** *** 540,545 **** { $this->db->query("select * from hd_categories ORDER BY helpdesk_category_label"); ! while($this->db->next_record()) { ! $arr .= $this->db->Record[0]."=".$this->db->Record['helpdesk_category_label'].','; } --- 540,545 ---- { $this->db->query("select * from hd_categories ORDER BY helpdesk_category_label"); ! while($this->db->nextRecord()) { ! $arr .= $this->db->record[0]."=".$this->db->record['helpdesk_category_label'].','; } *************** *** 574,580 **** $this->db->query($sql); ! while($this->db->next_record() ) { ! $arr .= $this->db->Record['id_orientation_dates'].'='.date('F j Y', strtotime($this->db->Record['date'])).' ('.date('g:i A', strtotime('2003-02-03 '.$this->db->Record['time_start'])).' - '.date('g:i A', strtotime('2003-02-03 '.$this->db->Record['time_end'])).'),'; } --- 574,580 ---- $this->db->query($sql); ! while($this->db->nextRecord() ) { ! $arr .= $this->db->record['id_orientation_dates'].'='.date('F j Y', strtotime($this->db->record['date'])).' ('.date('g:i A', strtotime('2003-02-03 '.$this->db->record['time_start'])).' - '.date('g:i A', strtotime('2003-02-03 '.$this->db->record['time_end'])).'),'; } *************** *** 655,662 **** FROM textbook_estimates'; $this->db->query($sql); ! while ($this->db->next_record()) { ! $arr .= $this->db->Record['textbook_estimates_key'].'='. ! $this->db->Record['textbook_estimates_name'].','; } --- 655,662 ---- FROM textbook_estimates'; $this->db->query($sql); ! while ($this->db->nextRecord()) { ! $arr .= $this->db->record['textbook_estimates_key'].'='. ! $this->db->record['textbook_estimates_name'].','; } *************** *** 676,682 **** $this->db->query($sql); $arr = '=Select Category,'; ! while($this->db->next_record() ) { ! $arr .= $this->db->Record['id_class_gradebook_categories'].'='.$this->db->Record['label'].','; } $v['selectOptions'] = substr($arr, 0, -1); --- 676,682 ---- $this->db->query($sql); $arr = '=Select Category,'; ! while($this->db->nextRecord() ) { ! $arr .= $this->db->record['id_class_gradebook_categories'].'='.$this->db->record['label'].','; } $v['selectOptions'] = substr($arr, 0, -1); Index: doclibLibrary.php =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/doclibLibrary.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** doclibLibrary.php 16 Dec 2006 01:28:23 -0000 1.5 --- doclibLibrary.php 8 Oct 2007 14:35:30 -0000 1.6 *************** *** 96,101 **** $db->RESULT_TYPE = MYSQL_ASSOC; $db->query($sql); ! while($db->next_record()) { ! $x = PersistantObject::createFromArray('LC_file',$db->Record); $ret[$x->pkey] = $x; } --- 96,101 ---- $db->RESULT_TYPE = MYSQL_ASSOC; $db->query($sql); ! while($db->nextRecord()) { ! $x = PersistantObject::createFromArray('LC_file',$db->record); $ret[$x->pkey] = $x; } *************** *** 122,128 **** $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! if (is_array($db->Record)) { ! unset($db->Record['total']); ! $x = PersistantObject::createFromArray('LC_file',$db->Record); return $x; } else { --- 122,128 ---- $db->RESULT_TYPE = MYSQL_ASSOC; $db->queryOne($sql); ! if (is_array($db->record)) { ! unset($db->record['total']); ! $x = PersistantObject::createFromArray('LC_file',$db->record); return $x; } else { *************** *** 168,172 **** $sql .= " and pkey=".$this->pkey; $db->queryOne($sql); ! $filename = $db->Record["filename"]; @unlink(FILES_PATH.$filename); $db->query("delete from ".$this->prefix."doclib_Files where owner='".$this->owner."' and pkey=".$this->pkey); --- 168,172 ---- $sql .= " and pkey=".$this->pkey; $db->queryOne($sql); ! $filename = $db->record["filename"]; @unlink(FILES_PATH.$filename); $db->query("delete from ".$this->prefix."doclib_Files where owner='".$this->owner."' and pkey=".$this->pkey); *************** *** 237,244 **** $db->query($sql); $db->RESULT_TYPE=MYSQL_ASSOC; ! if (!$db->next_record()) return null; ! $x = PersistantObject::createFromArray('LC_folder',$db->Record); unset($x->total); return $x; --- 237,244 ---- $db->query($sql); $db->RESULT_TYPE=MYSQL_ASSOC; ! if (!$db->nextRecord()) return null; ! $x = PersistantObject::createFromArray('LC_folder',$db->record); unset($x->total); return $x; *************** *** 265,272 **** $db->RESULT_TYPE=MYSQL_ASSOC; ! while($db->next_record()) { ! $temp = $db->Record['folderType']; if ($temp==0) { $temp=99; } ! $x[$temp][] = $db->Record; } ksort($x); --- 265,272 ---- $db->RESULT_TYPE=MYSQL_ASSOC; ! while($db->nextRecord()) { ! $temp = $db->record['folderType']; if ($temp==0) { $temp=99; } ! $x[$temp][] = $db->record; } ksort($x); *************** *** 340,345 **** $db->query("select * from ".$this->prefix."doclib_Sharing where folderKey = ".$this->pkey); $sql = 'insert into ".$this->prefix."doclib_Sharing (folderKey,action,exclude,gid) VALUES ('.$newFolderID.',%d,%d,\'%s\')'; ! while ( $db->next_record() ) { ! $db->query(sprintf($sql,$db->Record['action'],$db->Record['exclude'],$db->Record['gid']) ); } --- 340,345 ---- $db->query("select * from ".$this->prefix."doclib_Sharing where folderKey = ".$this->pkey); $sql = 'insert into ".$this->prefix."doclib_Sharing (folderKey,action,exclude,gid) VALUES ('.$newFolderID.',%d,%d,\'%s\')'; ! while ( $db->nextRecord() ) { ! $db->query(sprintf($sql,$db->record['action'],$db->record['exclude'],$db->record['gid']) ); } *************** *** 369,374 **** and action = 1'); ! while ($db->next_record() ){ ! $this->sharedGroups[$db->Record[1]] = $db->Record[0]; } --- 369,374 ---- and action = 1'); ! while ($db->nextRecord() ){ ! $this->sharedGroups[$db->record[1]] = $db->record[0]; } *************** *** 381,386 **** and action = 2'); ! while ($db->next_record() ){ ! $this->managerGroups[$db->Record[1]] = $db->Record[0]; } } --- 381,386 ---- and action = 2'); ! while ($db->nextRecord() ){ ! $this->managerGroups[$db->record[1]] = $db->record[0]; } } Index: classLessonObj.php =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/classLessonObj.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** classLessonObj.php 13 Aug 2005 20:41:05 -0000 1.2 --- classLessonObj.php 8 Oct 2007 14:35:29 -0000 1.3 *************** *** 17,29 **** if ($prop=='') { $prop=$this->_pkey; } $db->query("select checkList,id_class_lessons,createdOn,title,description from class_lessons where $prop='$pkey' $where $orderBy"); ! if($db->next_record()) { $temp = new classLessonObj(); $temp->_dsn = $dsn; $temp->__loaded = true; ! $temp->id_class_lessons = $db->Record['id_class_lessons']; ! $temp->checkList = $db->Record['checkList']; ! $temp->createdOn = $db->Record['createdOn']; ! $temp->title = $db->Record['title']; ! $temp->description = $db->Record['description']; } if ( !$temp ) { trigger_error('empty persistant object'); } --- 17,29 ---- if ($prop=='') { $prop=$this->_pkey; } $db->query("select checkList,id_class_lessons,createdOn,title,description from class_lessons where $prop='$pkey' $where $orderBy"); ! if($db->nextRecord()) { $temp = new classLessonObj(); $temp->_dsn = $dsn; $temp->__loaded = true; ! $temp->id_class_lessons = $db->record['id_class_lessons']; ! $temp->checkList = $db->record['checkList']; ! $temp->createdOn = $db->record['createdOn']; ! $temp->title = $db->record['title']; ! $temp->description = $db->record['description']; } if ( !$temp ) { trigger_error('empty persistant object'); } *************** *** 38,50 **** if ($where) { $where = " and $where"; } $db->query("select checkList,id_class_lessons,createdOn,title,description from class_lessons where $prop='$key' $where $orderBy"); ! while ($db->next_record()) { $temp = new classLessonObj(); $temp->_dsn = $dsn; $temp->__loaded = true; ! $temp->id_class_lessons = $db->Record['id_class_lessons']; ! $temp->createdOn = $db->Record['createdOn']; ! $temp->checkList = $db->Record['checkList']; ! $temp->title = $db->Record['title']; ! $temp->description = $db->Record['description']; $objects[] = $temp; } --- 38,50 ---- if ($where) { $where = " and $where"; } $db->query("select checkList,id_class_lessons,createdOn,title,description from class_lessons where $prop='$key' $where $orderBy"); ! while ($db->nextRecord()) { $temp = new cla... [truncated message content] |