From: garvinhicking <garvinhicking>
Date: Tue, 28 Jun 2005 15:26:02 +0000 (+0000)
Subject: * Fix Tabs
X-Git-Tag: 0.9~375
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2a2ad3e9da72aca0c058b7e67319336328eccd9a;p=s9y.git

* Fix Tabs
* Fix indentation
* Fix some remaining hardcoded strings
* Use echo where printf is not needed
* Add missing { and } on single line statements
---

diff --git a/docs/NEWS b/docs/NEWS
index 0174afc..d14b4ca 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 0.9 ()
 ------------------------------------------------------------------------
 
+    * Added Voodoo Wiki/XML importer, hooks into static page plugin.
+      (Tim Putnam)
+
     * Make comment deletion return to the originating page, allow to
       display trackbacks and normal comments at once (new default).
       Bugs #1226440, #1226439 (garvinhicking)
diff --git a/include/admin/importers/voodoopad.inc.php b/include/admin/importers/voodoopad.inc.php
index d41ccbf..a131801 100644
--- a/include/admin/importers/voodoopad.inc.php
+++ b/include/admin/importers/voodoopad.inc.php
@@ -20,16 +20,17 @@ $count = $depth = 0;
 switch ($serendipity['lang']) {
     case 'en':
     default:
-        @define ('IMPORTER_VOODOO_FILEPROMPT', 'VoodooPad XML file');
-		@define('IMPORTER_VOODOO_CREATEINTRALINKSPROMPT', 'Recreate intra-links?');
-		@define('IMPORTER_VOODOO_WIKINAMEPROMPT','Wiki name');
-		@define('IMPORTER_VOODOO_KEYPREFIXPROMPT','Prefix for static page DB key');
-		@define('IMPORTER_VOODOO_UPDATEEXISTINGPROMPT','Update existing entries?');
-		@define('IMPORTER_VOODOO_CREATINGPAGE','Creating page');
-		@define('IMPORTER_VOODOO_UPDATINGPAGE','Updating page');
-		@define('IMPORTER_VOODOO_NOTUPDATING','Not updating');
-		@define('IMPORTER_VOODOO_RECORDURL','Recording link URL');
-		@define('IMPORTER_VOODOO_WRITEINTRALINKS','Writing intra-links..');
+        @define('IMPORTER_VOODOO_FILEPROMPT', 'VoodooPad XML file');
+        @define('IMPORTER_VOODOO_CREATEINTRALINKSPROMPT', 'Recreate intra-links?');
+        @define('IMPORTER_VOODOO_WIKINAMEPROMPT','Wiki name');
+        @define('IMPORTER_VOODOO_KEYPREFIXPROMPT','Prefix for static page DB key');
+        @define('IMPORTER_VOODOO_UPDATEEXISTINGPROMPT','Update existing entries?');
+        @define('IMPORTER_VOODOO_CREATINGPAGE','Creating page');
+        @define('IMPORTER_VOODOO_UPDATINGPAGE','Updating page');
+        @define('IMPORTER_VOODOO_NOTUPDATING','Not updating');
+        @define('IMPORTER_VOODOO_RECORDURL','Recording link URL');
+        @define('IMPORTER_VOODOO_WRITEINTRALINKS','Writing intra-links..');
+        @define('IMPORTER_VOODOO_REQUIREMENTFAIL', 'This importer requires the Static Pages plugin to be installed. All static pages are currently scanned for a match.');
         break;
 }
 
@@ -41,29 +42,29 @@ class Serendipity_Import_VoodooPad extends Serendipity_Import {
     function Serendipity_Import_VoodooPad($data) {
         $this->data = $data;
         $this->inputFields = array(
-                                array(  'text'		=> IMPORTER_VOODOO_FILEPROMPT,
-                           	            'type'		=> 'file',
-                                        'name'   	=> 'voodooPadXML'),
-                                array(  'text' 		=> IMPORTER_VOODOO_CREATEINTRALINKSPROMPT,
-                                        'type' 	    => 'bool',
-	                                     'name'		=> 'shouldWriteLinks',
-                                   		'default'	=> 'true'),
-                                array(  'text'    	=> IMPORTER_VOODOO_WIKINAMEPROMPT,
-                                   		'type'    	=> 'input',
-                                   		'name'		=> 'wikiName',
-                                   		'default' 	=> ''),
-                                array(  'text' 		=> IMPORTER_VOODOO_KEYPREFIXPROMPT,
-                                  		'type'		=> 'input',
-                                  		'name' 	    => 'keyPrefix',
-                                  		'default' 	=> '' ),
-                                array(  'text' 		=> IMPORTER_VOODOO_UPDATEEXISTINGPROMPT,
-	                                  	'type'      => 'bool',
-                                  		'name'      => 'updateExisting',
-                                  		'default'   => 'true' ) );
+                                array('text'      => IMPORTER_VOODOO_FILEPROMPT,
+                                      'type'      => 'file',
+                                      'name'      => 'voodooPadXML'),
+                                array('text'      => IMPORTER_VOODOO_CREATEINTRALINKSPROMPT,
+                                      'type'      => 'bool',
+                                      'name'      => 'shouldWriteLinks',
+                                      'default'   => 'true'),
+                                array('text'      => IMPORTER_VOODOO_WIKINAMEPROMPT,
+                                      'type'      => 'input',
+                                      'name'      => 'wikiName',
+                                      'default'   => ''),
+                                array('text'      => IMPORTER_VOODOO_KEYPREFIXPROMPT,
+                                      'type'      => 'input',
+                                      'name'      => 'keyPrefix',
+                                      'default'   => '' ),
+                                array('text'      => IMPORTER_VOODOO_UPDATEEXISTINGPROMPT,
+                                      'type'      => 'bool',
+                                      'name'      => 'updateExisting',
+                                      'default'   => 'true' ) );
     }
 
     function getImportNotes(){
-        return '<br/>Requires installation of the Static Pages plugin<br/>All static pages are currently scanned for a match';
+        return IMPORTER_VOODOO_REQUIREMENTFAIL;
     }
 
     function validateData() {
@@ -74,171 +75,179 @@ class Serendipity_Import_VoodooPad extends Serendipity_Import {
         return $this->inputFields;
     }
 
-    
-   function import() {
-    	global $serendipity;
-	  	global $elements;
-
-		// Dependency on static pages
-		if(!class_exists('serendipity_event_staticpage'))
-			die('<br/>This importer requires the Static Pages plugin to be installed');
-	  	// The selected file
-		$file =  $_FILES['serendipity']['tmp_name']['import']['voodooPadXML'];
-
-		// Create a parser and set it up with the callbacks
-		$xml_parser = xml_parser_create(''); 
-		xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 0);
-		xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler");
-		xml_set_character_data_handler($xml_parser, "character_data_handler");
-
-		// Feed the contents of the file into the parser
-		if(!file_exists($file))
-   			die("\n<p>\"$file\" does not exist.</p>\n</body>\n</html>");
-   					
-		if(!($handle = fopen($file, "r")))
-   			die("<p>Cannot open \"$file\".</p>\n</body>\n</html>");
-
-		while($contents = fread($handle, 4096))
-   			xml_parse($xml_parser, $contents, feof($handle));
-
-		fclose($handle);
-		xml_parser_free($xml_parser);
-
-		// Maintain a list of the aliases and their links
-		$aliases = array();
+    function import() {
+        global $serendipity;
+        global $elements;
+
+        // Dependency on static pages
+        if (!class_exists('serendipity_event_staticpage')) {
+            die(IMPORTER_VOODOO_REQUIREMENTFAIL . '<br/>');
+        }
+
+          // The selected file
+        $file =  $_FILES['serendipity']['tmp_name']['import']['voodooPadXML'];
+
+        // Create a parser and set it up with the callbacks
+        $xml_parser = xml_parser_create(''); 
+        xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 0);
+        xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler");
+        xml_set_character_data_handler($xml_parser, "character_data_handler");
+
+        // Feed the contents of the file into the parser
+        if (!file_exists($file)) {
+            die(sprintf(DOCUMENT_NOT_FOUND, htmlspecialchars($file)));
+        }
+                       
+        if(!($handle = fopen($file, "r"))) {
+            die(sprintf(SKIPPING_FILE_UNREADABLE, htmlspecialchars($file)));
+        }
+
+        while($contents = fread($handle, 4096)) {
+            xml_parse($xml_parser, $contents, feof($handle));
+        }
+
+        fclose($handle);
+        xml_parser_free($xml_parser);
+
+        // Maintain a list of the aliases and their links
+        $aliases = array();
 
         // Now have a list of elements referenceable by id
-	    // so loop through building and/or updating page objects
-	 	while(list($key_a) = each($elements)){
-	 		$name = $elements[$key_a]->name;
-	 					
-			switch ( $name )
-			{
-				case 'data': // <data> indicates the start of the VoodooPad entry, so create page object
-	  				$thispage = array();
-					break;
-				case 'key': // This is the unique identifier of the page
-					$mykey = serendipity_makeFilename ( $elements[$key_a]->data );
-	  				$mykey = basename($this->data['keyPrefix']) . $mykey;
-
-	  				// Pluck out the existing one if its there
-	  			  	$page = serendipity_db_query ( "SELECT * 
-            		                            	FROM {$serendipity['dbPrefix']}staticpages 
-              		                        		WHERE filename = '" . $mykey . "'
-                 			                    		LIMIT 1", true, 'assoc');
-        			if (is_array($page)) {
-            			$thispage =& $page;
-            			if (empty($thispage['timestamp']))
-              			$thispage['timestamp'] = time();           	
-        			}
+        // so loop through building and/or updating page objects
+        while(list($key_a) = each($elements)) {
+            $name = $elements[$key_a]->name;
+                         
+            switch ($name) {
+                case 'data': // <data> indicates the start of the VoodooPad entry, so create page object
+                    $thispage = array();
+                    break;
+
+                case 'key': // This is the unique identifier of the page
+                    $mykey = serendipity_makeFilename($elements[$key_a]->data);
+                    $mykey = basename($this->data['keyPrefix']) . $mykey;
+
+                    // Pluck out the existing one if its there
+                    $page = serendipity_db_query("SELECT * 
+                                                    FROM {$serendipity['dbPrefix']}staticpages 
+                                                    WHERE filename = '" . serendipity_db_escape_string($mykey) . "'
+                                                    LIMIT 1", true, 'assoc');
+                    if (is_array($page)) {
+                        $thispage =& $page;
+                        if (empty($thispage['timestamp'])) {
+                              $thispage['timestamp'] = time();
+                        }
+                    }
     
-	  				$thispage['filename'] = $mykey;
-	  				$thispage['permalink'] = $serendipity['serendipityHTTPPath'] .'pages/' . $mykey .'.htm';
-	  				break;
-	  			case 'alias': // The title and the string used to match links
-	  				$thispage['articleformattitle'] = $this->data['wikiName'];
-  	  				$thispage['pagetitle'] = $elements[$key_a]->data;
-	  				$thispage['headline'] = $elements[$key_a]->data;
-	  				break;
-	  			case 'content': // The content of a voodoopad entry
-	  			case 'path': // The path of a url string
-					$thispage['content'] = $elements[$key_a]->data;
-
-	  				// If its a content link list it for referencing with the page permalink
-	  				if ( $name == 'content' ){
-						$aliases[$thispage['headline']] = $thispage['permalink'];
-
-						// Either replace or insert depending on previous existence
-			  			if (!isset($thispage['id'])) {
-			  				printf ( '<br/>'.IMPORTER_VOODOO_CREATINGPAGE.': '. $mykey );
-            				serendipity_db_insert('staticpages', $thispage);
-            				$serendipity["POST"]["staticpage"] = serendipity_db_insert_id("staticpages", 'id'); 
-        				} 
-        				else if ( $this->data['updateExisting'] == 'true') {
-           				printf ( '<br/>'.IMPORTER_VOODOO_UPDATINGPAGE.': '. $mykey );
-	           			serendipity_db_update("staticpages", array("id" => $thispage["id"]), $thispage);     
-        				}
-	             		else
-	             			printf ( '<br/>'.IMPORTER_VOODOO_NOTUPDATING.': '. $mykey );
-	  				}
-
-					// If its a url, the content is the link instead
-					else
-					{
-						printf  ( '<br/>'.IMPORTER_VOODOO_RECORDURL.': '.$thispage['headline'] );
-						$aliases[$thispage['headline']] = $thispage['content'];
-					}
-					break;		  			
-			}
-			
-		}
-
-    	// Now rewrite the permalinks
-	printf ('<br/>' );
-	if ( $this->data['shouldWriteLinks'] == 'true')
-	    		Serendipity_Import_VoodooPad::write_links ($aliases );
-       return true;
-   }
+                    $thispage['filename']  = $mykey;
+                    // FIXME: Use real permalink specified for that file; users without mod_rewrite or not using this will get errors.
+                    // Suggestion: use index.php?serendipity[subpage]=XXX, it works on all systems.
+                    $thispage['permalink'] = $serendipity['serendipityHTTPPath'] . 'pages/' . $mykey .'.htm';
+                    break;
+
+                case 'alias': // The title and the string used to match links
+                    $thispage['articleformattitle'] = $this->data['wikiName'];
+                    $thispage['pagetitle'] = $elements[$key_a]->data;
+                    $thispage['headline'] = $elements[$key_a]->data;
+                    break;
+
+                case 'content': // The content of a voodoopad entry
+                case 'path': // The path of a url string
+                    $thispage['content'] = $elements[$key_a]->data;
+
+                    // If its a content link list it for referencing with the page permalink
+                    if ( $name == 'content' ){
+                        $aliases[$thispage['headline']] = $thispage['permalink'];
+
+                        // Either replace or insert depending on previous existence
+                        if (!isset($thispage['id'])) {
+                            echo '<br/>'.IMPORTER_VOODOO_CREATINGPAGE.': '. $mykey;
+                            serendipity_db_insert('staticpages', $thispage);
+                            $serendipity["POST"]["staticpage"] = serendipity_db_insert_id("staticpages", 'id'); 
+                        } elseif ($this->data['updateExisting'] == 'true') {
+                            echo '<br/>'.IMPORTER_VOODOO_UPDATINGPAGE.': '. $mykey;
+                            serendipity_db_update("staticpages", array("id" => $thispage["id"]), $thispage);
+                        } else {
+                            echo '<br/>'.IMPORTER_VOODOO_NOTUPDATING.': '. $mykey;
+                        }
+                    } else {
+                        // If its a url, the content is the link instead
+                        echo '<br/>'.IMPORTER_VOODOO_RECORDURL.': '.$thispage['headline'];
+                        $aliases[$thispage['headline']] = $thispage['content'];
+                    }
+                    break;                      
+            }
+        }
+
+        // Now rewrite the permalinks
+        echo '<br/>';
+        if ($this->data['shouldWriteLinks'] == 'true') {
+            Serendipity_Import_VoodooPad::write_links($aliases);
+        }
+        return true;
+    }
 
     function write_links($aliases) {
-    	// Here we run through the static pages database and put in cross links
-		// around the keywords in the text
+        // Here we run through the static pages database and put in cross links
+        // around the keywords in the text
         global $serendipity;
 
-		// **TODO** Change this to pull out only entries for the current wiki
-		printf ( '<br/><p>'.IMPORTER_VOODOO_WRITEINTRALINKS.'</p>');
-			   		
+        // **TODO** Change this to pull out only entries for the current wiki
+        echo '<br/><p>'.IMPORTER_VOODOO_WRITEINTRALINKS.'</p>';
+                       
         $pages= &serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}staticpages  ORDER BY pagetitle DESC"); 
-	      
-  		foreach( $pages as $thispage){
-	  		// Parse the content string
-         	foreach ($aliases as $alias => $permalink) {
-  	  	 		$thispage['content'] = Serendipity_Import_VoodooPad::wikify ( $alias,  $permalink , $thispage['content'] );  	  	
-        	}
-	       for ( $counter = 0; $counter <= 12; $counter+=1) 
-         		unset ($thispage[$counter]);
+          
+        foreach ($pages as $thispage) {
+            // Parse the content string
+            foreach ($aliases as $alias => $permalink) {
+                $thispage['content'] = Serendipity_Import_VoodooPad::wikify($alias, $permalink, $thispage['content']);
+            }
+
+            for ($counter = 0; $counter <= 12; $counter+=1) {
+                unset ($thispage[$counter]);
+            }
        
-	  		// Write back to the database
-     		serendipity_db_update("staticpages", array("id" => $thispage["id"]), $thispage);
- 		}
-
-       printf ( "Success!</p>");
-	} 
-
-	// Search and replace avoiding content of links
-	// **TODO** Fix this to avoid short links screwing up longer links
-	function wikify($alias, $link, $txt) {
-		$r = preg_split('((>)|(<))', $txt, -1, PREG_SPLIT_DELIM_CAPTURE);
-	   	$ns = '';
-   		for ($i = 0; $i < count($r); $i++) {
-       	if ($r[$i] == "<") {
-           	$i+=2; 
-           	continue;
-       	}
-      		$r[$i] = eregi_replace( sql_regcase($alias), '<a href='.$link.'>'.$alias.'</a>', $r[$i] );     
-      	}
-   		return join("", $r);
-   	}  
+            // Write back to the database
+            serendipity_db_update("staticpages", array("id" => $thispage["id"]), $thispage);
+        }
+        
+        echo DONE . '<br />';
+    } 
+
+    // Search and replace avoiding content of links
+    // **TODO** Fix this to avoid short links screwing up longer links
+    function wikify($alias, $link, $txt) {
+        $r = preg_split('((>)|(<))', $txt, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $ns = '';
+        for ($i = 0; $i < count($r); $i++) {
+            if ($r[$i] == "<") {
+                $i+=2; 
+                continue;
+            }
+            $r[$i] = eregi_replace(sql_regcase($alias), '<a href="'.$link.'">'.$alias.'</a>', $r[$i]);
+        }
+
+        return join("", $r);
+    }  
 }
-			
+            
 // XML Parser callbacks
 function start_element_handler($parser, $name, $attribs){
-	global $elements, $stack, $count, $depth;
+    global $elements, $stack, $count, $depth;
 
-	 
-	$id = $count;
-	$element = new element;
-   	$elements[$id] = $element;
-   	$elements[$id]->name = $name;
+    $id = $count;
+    $element = new element;
+    $elements[$id] = $element;
+    $elements[$id]->name = $name;
    
-   	while(list($key, $value) = each($attribs))
-   		$elements[$id]->attributes[$key] = $value;
+    while(list($key, $value) = each($attribs)) {
+        $elements[$id]->attributes[$key] = $value;
+    }
    
-   	$elements[$id]->depth = $depth;
-   	array_push($stack, $id);
-   	
-   	$count++;
-   	$depth++;
+   $elements[$id]->depth = $depth;
+   array_push($stack, $id);
+       
+   $count++;
+   $depth++;
 }
 
 function end_element_handler($parser, $name){
@@ -256,14 +265,4 @@ function character_data_handler($parser, $data){
 }
 
 return 'Serendipity_Import_VoodooPad';
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<html>
-<head>
-  <title></title>
-</head>
-
-<body>
-</body>
-</html>
+?>
\ No newline at end of file