bump version 2.4

WebOrganics · Jan 2, 2012 · bc7f17c · bc7f17c
1 parent 5af6db7
commit bc7f17c
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/app/Transformr.php b/app/Transformr.php
@@ -1,6 +1,6 @@
 <?php
 /*
-TransFormr Version: 2.2
+TransFormr Version: 2.3
 author:   Martin McEvoy
 updated:  Saturday, 3rd July 2010
 homepage: http://github.com/WebOrganics/TransFormr
@@ -23,8 +23,8 @@ function __construct()
 		!defined('_Transformr') ? define('_Transformr', true) : '' ;
 		ini_set('display_errors',  0 );
 		$this->path = $this->set_path();
-		$this->version = '2.3';
-		$this->updated = array('Saturday, 3rd July 2010', '2010-07-03T12:00:20+01:00');
+		$this->version = '2.4';
+		$this->updated = array('Monday, 2nd January 2012', '2012-01-02T12:00:20+01:00');
 		$this->check_php_version('5.2.0', 'Transformr'); 
 
 		$params = array_merge($_GET, $_POST);
@@ -117,7 +117,7 @@ private function transformr_types()
 
 		case 'hcalendar':
 			$file = $this->rand_filename('ics');
-			header("Content-type: text/x-vcalendar");
+			header("Content-type: text/calendar");
 			header('Content-Disposition: attachment; filename="'.$file.'"');
 			$xsl_filename = $this->xsl ."xhtml2vcal.xsl";
 			return $this->transform_xsl($this->url, $xsl_filename);
@@ -246,9 +246,7 @@ function get_file_contents($url)
 			}
 			$content = curl_exec($cache);
 
-			/* insert non breaking space so tidy does not clean empty span or span with just a space, 
-				XSL however is set to strip-space elements="*" so it should not appear in results */
-
+			// insert nbsp so tidy does not clean empty span or span with just a space
 			$content = trim(preg_replace('/<\s*span(.*?)>\s<\/\s*?span[^>\w]*?>/', 
 				'<span$1>&nbsp;$2</span>', $content));
 			$content = trim(preg_replace('/<\s*span(.*?)><\/\s*?span[^>\w]*?>/', 
@@ -289,7 +287,6 @@ protected function transform_xsl($url, $xsl_filename, $isstring = 0)
 			$html = method_exists('tidy','cleanRepair') ? 
 			  $this->tidy_html( urldecode($this->text), '', 'php' ) : 
 			  urldecode($this->text);
-
 		}
 		else $html = $this->get_file_contents($url);
 
@@ -303,8 +300,8 @@ protected function transform_xsl($url, $xsl_filename, $isstring = 0)
 		$dom->normalizeDocument();
 
 		$title = !isset($title) ? $dom->getElementsByTagName('title')->item(0)->nodeValue : $title;
-
-		if ($this->type == 'rdfa' && !$dom->getElementsByTagName('html')->item(0)->getAttribute('xmlns'))
+		$xmlns = $dom->getElementsByTagName('html')->item(0)->getAttribute('xmlns');
+		if ($this->type == 'rdfa' && !$xmlns)
 			$dom->getElementsByTagName('html')->item(0)->setAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
 
 		if (isset($fragment)) 
@@ -321,8 +318,8 @@ protected function transform_xsl($url, $xsl_filename, $isstring = 0)
 
 		$xslt = new xsltProcessor;
 		$xslt->setParameter('','transformr', $this->path);
-		$xslt->setParameter('','url', $url);
 		$xslt->setParameter('','request-uri', $_SERVER['REQUEST_URI']);
+		$xslt->setParameter('','url', $url);
 		$xslt->setParameter('','base-uri', $url);
 		$xslt->setParameter('','doc-title', $title);
 		$xslt->setParameter('','version', $this->version);
@@ -372,7 +369,7 @@ private function tidy_html($html, $url='', $tidy_option='', $output ='')
 					'logical-emphasis'            => true,
 					"$output"                     => true,
 					'wrap'                        => 200,
-					'clean'						  		=>true
+					'clean'						  =>true
 				);
 				$tidy = new tidy;
 				$tidy->parseString($html, $config, 'utf8');
@@ -383,12 +380,12 @@ private function tidy_html($html, $url='', $tidy_option='', $output ='')
 		elseif ($tidy_option == 'dom') 
 		{
 			$newdoc = new DOMDocument();
-			$newdoc->preserveWhiteSpace = true;
+			$newdoc->preserveWhiteSpace = false;
 			!$newdoc->loadXML($html) ? @$newdoc->loadHTML($html) : @$newdoc->loadXML($html) ;
 			$newdoc->formatOutput = true;
 			$newdoc->normalizeDocument();
 			$html = $newdoc->saveXML();
-			return str_replace(array("\r\n", "\r", "\n", "\t", "&#xD;"), '', $html);
+			return str_replace(array("\r\n", "\r", "\n", "\t", "&#xD;"), '', $result);
 		}
 		elseif ($tidy_option == 'online') 
 		{		
@@ -410,9 +407,13 @@ protected function config_ns()
 
 	if ($this->backup_type !='') 
 	{
-		if ($this->backup_type == 'rdf') $ext = 'rdf';
-		elseif ($this->backup_type == 'ntriples') $ext = 'nt';
-		else $ext = 'ttl';
+		if ($this->backup_type == 'rdf') :
+			$ext = 'rdf';
+		elseif ($this->backup_type == 'ntriples') :
+			$ext = 'nt';
+		else:
+			$ext = 'ttl';
+		endif;
 	} 
 	else $ext = 'xml';