[Logicampus-cvs] logicampus/src/logicreate/services/classroom content.lcp, 1.15, 1.16 viewer.lcp, 1.17, 1.18

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

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

Modified Files:
	content.lcp viewer.lcp 
Log Message:
show plain text files as embedded content, not with the viewer.

Index: viewer.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/viewer.lcp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** viewer.lcp	1 Mar 2008 23:43:19 -0000	1.17
--- viewer.lcp	3 Mar 2008 00:12:14 -0000	1.18
***************
*** 34,38 ****
  
  		$ut = time();						
- 		//print_r($lc->getvars);
  		$uniqCode = $lc->getvars[1];
  		$filename = addslashes(trim(urldecode($lc->getvars[2])));
--- 34,37 ----

Index: content.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/content.lcp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** content.lcp	5 Jan 2008 19:53:28 -0000	1.15
--- content.lcp	3 Mar 2008 00:12:14 -0000	1.16
***************
*** 99,106 ****
  		//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);
  		}
  		}
--- 99,106 ----
  		//choose a start URL, viewer or content
  		if ( is_object($t['seqItems'][$nextIdx]) ) {
! 		if ($t['seqItems'][$nextIdx]->lobMime == 'text/html' || $t['seqItems'][$nextIdx]->lobMime == 'text/plain' ) {
! 			$t['nextUrl'] = appurl('classroom/content/'.$uniqCode.'/'.urlencode($t['seqItems'][$nextIdx]->linkText));
  		} else {
! 			$t['nextUrl'] = appurl('classroom/viewer/'.$uniqCode.'/'.urlencode($t['seqItems'][$nextIdx]->linkText));
  		}
  		}
***************
*** 133,137 ****
  			$t['file']['title'] = $db->record['lob_title'];
  			$t['file']['content'] = $db->record['lob_text'];
! 			$t['file']['mime'] = 'text/html';
  		}
  
--- 133,137 ----
  			$t['file']['title'] = $db->record['lob_title'];
  			$t['file']['content'] = $db->record['lob_text'];
! 			$t['file']['mime'] = $db->record['lob_mime'];
  		}