[Fusionforge-commits] r12584 - trunk/src/plugins/projectimport/www

Olivier Berger olberger at fusionforge.org
Fri Mar 4 19:35:24 CET 2011


Author: olberger
Date: 2011-03-04 19:35:24 +0100 (Fri, 04 Mar 2011)
New Revision: 12584

Modified:
   trunk/src/plugins/projectimport/www/projectsimport.php
   trunk/src/plugins/projectimport/www/usersimport.php
Log:
cleanup


Modified: trunk/src/plugins/projectimport/www/projectsimport.php
===================================================================
--- trunk/src/plugins/projectimport/www/projectsimport.php	2011-03-04 18:35:10 UTC (rev 12583)
+++ trunk/src/plugins/projectimport/www/projectsimport.php	2011-03-04 18:35:24 UTC (rev 12584)
@@ -222,7 +222,7 @@
 				$html .= '</table>';
 			}
 			else {
-				$feedback .= 'parsing problem <br />';
+				$feedback .= 'Found no projects <br />';
 			}
 		}
 		return $html;

Modified: trunk/src/plugins/projectimport/www/usersimport.php
===================================================================
--- trunk/src/plugins/projectimport/www/usersimport.php	2011-03-04 18:35:10 UTC (rev 12583)
+++ trunk/src/plugins/projectimport/www/usersimport.php	2011-03-04 18:35:24 UTC (rev 12584)
@@ -15,7 +15,10 @@
  */
 
 // Import users from a JSON file (Site Admin tool)
+// Users are created in the pending queue, and await forge admin moderation
 
+// TODO : add confirmation pass instead of batch insertion
+
 require_once('../../../www/env.inc.php');
 require_once $gfwww.'include/pre.php';
 require_once $gfwww.'admin/admin_utils.php';
@@ -119,7 +122,7 @@
 			//			print_r($imported_file);
 			$this->importer->parse_OSLCCoreRDFJSON($json);
 
-			$debug = TRUE;
+			$debug = FALSE;
 			if($debug) {
 			 // Debug the loaded triples 
 			 $triples = $this->importer->parse_OSLCCoreRDFJSON($json);
@@ -146,6 +149,7 @@
 		// and if it has data we can work
 		// If it indeed has valid data
 		if ($this->importer->has_project_dump()) {
+			
 			$this->message .= "Here are the results from your upload :";
 				
 			// start HTML output
@@ -199,11 +203,11 @@
 				$html .= $this->html_generator->boxBottom();
 
 			}
+		
+			else {
+				$feedback .= 'Found no users<br />';
+			}
 		}
-		else {
-				$feedback .= 'parsing problem <br />';
-		}
-		
 		return $html;
 	}
 	




More information about the Fusionforge-commits mailing list