From b6dac926f23f2698d0850bb36bab75d95239d901 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 23 Oct 2014 02:59:07 -0700
Subject: [PATCH] Modified cron command for compatibility with recent versions
 of cPanel/PHP (BC compatible)

---
 cron.php            | 10 +++++++++-
 e107_admin/cron.php |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cron.php b/cron.php
index cdee3bc87..aeeaa07af 100644
--- a/cron.php
+++ b/cron.php
@@ -31,6 +31,11 @@ $_E107['no_menus'] = TRUE;
 require_once(realpath(dirname(__FILE__)."/class2.php"));
 
 	$pwd = ($_E107['debug'] && $_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : trim($_SERVER['argv'][1]);
+	
+	if(empty($pwd) && !empty($_GET['token']))
+	{
+		$pwd = $_GET['token'];	
+	}
 		
 	if($pref['e_cron_pwd'] != $pwd)
 	{	
@@ -44,12 +49,15 @@ require_once(realpath(dirname(__FILE__)."/class2.php"));
 		";
 		
 		$message .= "<h4>Debug Info</h4>";
-		$message .= print_r($_SERVER,true);
+		$message .= print_a($_SERVER,true); 
+		$message .= print_a($_ENV,true); 
+		$message .= print_a($_GET,true); 
 						
 	    sendemail($pref['siteadminemail'], "e107 - Cron Schedule Misconfigured.", $message, $pref['siteadmin'],$pref['siteadminemail'], $pref['siteadmin']);
 		exit;
 	}
 
+
 e107::getCache()->CachePageMD5 = '_';
 e107::getCache()->set('cronLastLoad',time(),TRUE,FALSE,TRUE);
 
diff --git a/e107_admin/cron.php b/e107_admin/cron.php
index e6780d329..65183594e 100644
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -383,7 +383,7 @@ class cron_admin_ui extends e_admin_ui
 			elseif (!$active) // show instructions
 			{
 				$setpwd_message = $frm->open("generate")."<small>"
-				.LAN_CRON_15.":</small><br /><pre style='color:black'>".rtrim($_SERVER['DOCUMENT_ROOT'], '/').e_HTTP."cron.php ".$pref['e_cron_pwd'];
+				.LAN_CRON_15.":</small><br /><pre style='color:black'>".rtrim($_SERVER['DOCUMENT_ROOT'], '/').e_HTTP."cron.php token=".$pref['e_cron_pwd'].' >/dev/null 2>&1';
 				
 				$setpwd_message .= "</pre><small>". LAN_CRON_16."</small>";
 				if(e_DOMAIN && file_exists("/usr/local/cpanel/version"))