From 4175ee0308c11c596e755079c1c0df6d13d91c67 Mon Sep 17 00:00:00 2001 From: sunil Date: Tue, 4 Aug 2015 11:29:49 +0530 Subject: [PATCH] corrected syntax --- CRM/Dashlet/Page/GettingStarted.php | 15 ++++++++------- CRM/Upgrade/Incremental/php/FourSeven.php | 11 ++--------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/CRM/Dashlet/Page/GettingStarted.php b/CRM/Dashlet/Page/GettingStarted.php index 8489126faa..d88eaca04a 100644 --- a/CRM/Dashlet/Page/GettingStarted.php +++ b/CRM/Dashlet/Page/GettingStarted.php @@ -48,7 +48,8 @@ class CRM_Dashlet_Page_GettingStarted extends CRM_Core_Page { static $_tokens = array( 'crmurl' => array( 'configbackend' => 'civicrm/admin/configtask', - )); + ) + ); /** * Get the final, usable URL string (after interpolating any variables) @@ -112,13 +113,13 @@ class CRM_Dashlet_Page_GettingStarted extends CRM_Core_Page { * array of gettingStarted items; or NULL if not available */ public function _getHtml($url) { - + $httpClient = new CRM_Utils_HttpClient(self::CHECK_TIMEOUT); list ($status, $html) = $httpClient->get($url); if ($status !== CRM_Utils_HttpClient::STATUS_OK) { return NULL; } - + $tokensList = CRM_Utils_Token::getTokens($html); $this->replaceLinkToken($tokensList, $html); if ($html) { @@ -130,12 +131,12 @@ class CRM_Dashlet_Page_GettingStarted extends CRM_Core_Page { /** * @param array $tokensList - * @param String $str + * @param string $str * - */ + */ public function replaceLinkToken($tokensList, &$str) { - foreach($tokensList as $categories => $tokens) { - foreach($tokens as $token){ + foreach ($tokensList as $categories => $tokens) { + foreach ($tokens as $token) { $value = ''; if (!empty(self::$_tokens[$categories][$token])) { $value = self::$_tokens[$categories][$token]; diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php index aa11796bfc..ccd4a51e04 100644 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ b/CRM/Upgrade/Incremental/php/FourSeven.php @@ -75,6 +75,7 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base */ public function upgrade_4_7_alpha1($rev) { $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); + $this->addTask(ts('Add Getting Started dashlet to %1: SQL', array(1 => $rev)), 'add_getting_started_dashlet', $rev); } /** @@ -92,15 +93,6 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base return $editorID; } - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_alpha1($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'add_getting_started_dashlet'); - } - public function add_getting_started_dashlet(CRM_Queue_TaskContext $ctx) { $sql = "SELECT count(*) FROM civicrm_dashboard WHERE name='gettingStarted'"; $res = CRM_Core_DAO::singleValueQuery($sql); @@ -116,4 +108,5 @@ FROM `civicrm_dashboard_contact` WHERE 1 GROUP BY contact_id"; CRM_Core_DAO::executeQuery($sql); } } + } -- 2.25.1