No more pussy-footin' around

Just call PHP from the command line. It's easier and cleaner.

Signed-off-by: Seth Battis <[email protected]>

Author: Seth Battis

import.php

@@ -29,6 +29,12 @@
 
 require_once(__DIR__ . '/common.inc.php');
 
+if (isset($argc)) {
+	$_REQUEST['cal'] = $argv[1];
+	$_REQUEST['canvas_url'] = $argv[2];
+	$_REQUEST['schedule'] = $argv[3];
+}
+
 /**
  * compute the calendar context for the canvas object based on its URL
  **/

sync.php

@@ -5,7 +5,6 @@
 
 require_once(APP_PATH . '/include/canvas-api.inc.php');
 require_once(APP_PATH . '/include/mysql.inc.php');
-require_once(APP_PATH . '/include/Pest.php');
 
 require_once(__DIR__ . '/common.inc.php');
 
@@ -19,7 +18,6 @@
 			`synced` ASC
 ");
 
-$import = new Pest(preg_replace('%(https?://)(.*)%', '\\1' . MYSQL_USER . ':' . MYSQL_PASSWORD . '@\\2', $argv[INDEX_WEB_PATH]));
 while($schedule = $schedulesResponse->fetch_assoc()) {
 	$calendarResponse = mysqlQuery("
 		SELECT *
@@ -28,19 +26,7 @@
 				`id` = '{$schedule['calendar']}'
 	");
 	if ($calendar = $calendarResponse->fetch_assoc()) {
-		try {
-			$import->get(
-				'import', // assumes ../.htaccess with RewriteCond
-				array(
-					'cal' => $calendar['ics_url'],
-					'canvas_url' => $calendar['canvas_url'],
-					'schedule' => $schedule['id']
-				)
-			);
-		} catch (Exception $e) {
-			debugFlag($e->getMessage());
-			exit;
-		}
+		shell_exec("php import.php {$calendar['ics_url']} {$calendar['canvas_url']} {$schedule['id']}");
 	}
 }