Fixed PHP depricatation errors and notices.

jkosoy · jkosoy · commit ef5adf9166c1 · 2014-10-17T14:42:40.000-07:00
diff --git a/generate/cover.php b/generate/cover.php
@@ -16,7 +16,7 @@
 //$page->set('updates', get_updates(24));
 //$page->set('happenings', get_happenings(5));
 //$page->set('courses', get_courses_short(5));
-$page->set('exhibition', get_curated_short(4));
+$page->set('exhibition', get_curated_short());
 writeFile("index.php", $page->out());
     
 $benchmark_end = microtime_float();
diff --git a/generate/domit/xml_domit_utilities.php b/generate/domit/xml_domit_utilities.php
@@ -296,7 +296,7 @@ function removeExtension($fileName) {
 	* @param string The XML text
 	* @return boolean True if the XML text is valid
 	*/
-	function validateXML($xmlText) {
+	static function validateXML($xmlText) {
 		//this does only rudimentary validation
 		//at this point in time
 		$isValid = true;
diff --git a/generate/domit/xml_saxy_parser.php b/generate/domit/xml_saxy_parser.php
@@ -723,15 +723,15 @@ function fireDTDEvent($data) {
 	* @param string The text of the comment
 	*/
 	function fireCommentEvent($data) {
-		call_user_func($this->commentHandler, &$this, $data);
+		call_user_func($this->commentHandler, array(&$this), $data);
 	} //fireCommentEvent
 	
 	/**
 	* Fires a processing instruction event
 	* @param string The processing instruction data
 	*/
 	function fireProcessingInstructionEvent($target, $data) {
-		call_user_func($this->processingInstructionHandler, &$this, $target, $data);
+		call_user_func($this->processingInstructionHandler, array(&$this), $target, $data);
 	} //fireProcessingInstructionEvent
 	
 	/**
diff --git a/generate/domit/xml_saxy_shared.php b/generate/domit/xml_saxy_shared.php
@@ -255,15 +255,15 @@ function parseBetweenTags($betweenTagText) {
 	* @param Array The start element attributes
 	*/
 	function fireStartElementEvent($tagName, $attributes) {
-		call_user_func($this->startElementHandler, &$this, $tagName, $attributes);
+		call_user_func($this->startElementHandler, array(&$this), $tagName, $attributes);
 	} //fireStartElementEvent		
 	
 	/**
 	* Fires an end element event
 	* @param string The end element tag name
 	*/
 	function fireEndElementEvent($tagName) {
-		call_user_func($this->endElementHandler, &$this, $tagName);
+		call_user_func($this->endElementHandler, array(&$this), $tagName);
 	} //fireEndElementEvent
 	
 	/**
@@ -276,15 +276,15 @@ function fireCharacterDataEvent($data) {
 			$data = strtr($data, $this->definedEntities);
 		}
 		
-		call_user_func($this->characterDataHandler, &$this, $data);
+		call_user_func($this->characterDataHandler, array(&$this), $data);
 	} //fireCharacterDataEvent	
 	
 	/**
 	* Fires a CDATA Section event
 	* @param string The CDATA Section data
 	*/
 	function fireCDataSectionEvent($data) {
-		call_user_func($this->cDataSectionHandler, &$this, $data);
+		call_user_func($this->cDataSectionHandler, array(&$this), $data);
 	} //fireCDataSectionEvent	
 } //SAXY_Parser_Base
 
diff --git a/generate/exhibition.php b/generate/exhibition.php
@@ -125,6 +125,8 @@ function get_curated_short()
     $curated = curated_xml(4);
     
     // output html
+    $html = '';
+
     foreach ($curated as $c) {
         $html .= $c->display_short_home();
     }
@@ -135,7 +137,7 @@ function get_curated_short()
 function curated_xml($num)
 {
     // open and parse curated.xml
-    $xml =& openXML('curated.xml');
+    $xml = openXML('curated.xml');
     
     // get software nodes
     $softwares = $xml->getElementsByTagName('software');
diff --git a/generate/lib/functions.inc.php b/generate/lib/functions.inc.php
@@ -281,7 +281,7 @@ function writeFile($filename, $content)
 	if ( strpos( $filename, BASEDIR ) !== 0  ) # force basedir
 		$filename = BASEDIR . $filename;
 		
-	#echo $filename . "\n";
+	echo $filename . "\n";
 	#echo $content . "\n";
 	
     make_necessary_directories($filename);
