Support {} parameter. RE: #4

symphonists · Jun 8, 2012 · 87f433c · 87f433c
1 parent 0fe3c6b
commit 87f433c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/content/content.importers.php b/content/content.importers.php
@@ -272,8 +272,12 @@ public function __actionEditNormal() {
 				$this->_errors['source'] = __('Source must not be empty.');
 			}
 
-			else if(!filter_var($fields['source'], FILTER_VALIDATE_URL)) {
-				$this->_errors['source'] = __('Source is not a valid URL.');
+			else {
+				// Support {$root}
+				$evaluated_source = str_replace('{$root}', URL, $fields['source']);
+				if(!filter_var($evaluated_source, FILTER_VALIDATE_URL)) {
+					$this->_errors['source'] = __('Source is not a valid URL.');
+				}
 			}
 
 		// Namespaces ---------------------------------------------------------
@@ -285,7 +289,7 @@ public function __actionEditNormal() {
 			) {
 				$gateway = new Gateway();
 				$gateway->init();
-				$gateway->setopt('URL', $fields['source']);
+				$gateway->setopt('URL', $evaluated_source);
 				$gateway->setopt('TIMEOUT', 60);
 				$data = $gateway->exec();
 

diff --git a/lib/class.xmlimporter.php b/lib/class.xmlimporter.php
@@ -77,15 +77,19 @@ function handleXMLError($errno, $errstr, $errfile, $errline, $context) {
 					$options['source'] = $source;
 				}
 
+				// Support {$root}
+				$options['source'] = str_replace('{$root}', URL, $options['source']);
+
 				// Fetch document:
 				$gateway = new Gateway();
 				$gateway->init();
 				$gateway->setopt('URL', $options['source']);
 				$gateway->setopt('TIMEOUT', 60);
 				$data = $gateway->exec();
 
-				if (empty($data)) {
-					$this->_errors[] = __('No data to import.');
+				$info = $gateway->getInfoLast();
+				if (empty($data) || $info['http_code'] >= 400) {
+					$this->_errors[] = __('No data to import. URL returned HTTP code %d', array($info['http_code']));
 					$passed = false;
 				}
 			}
@@ -379,5 +383,3 @@ public function commit() {
 			}
 		}
 	}
-
-?>