X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FBAO%2FBlock.php;h=fcf9f3324b28301a0702a5fac466490f4505a4cf;hb=725b3de6f03330ab5e310f397fc0336fe551ec6f;hp=014298563fd34b821509dd4e5e4fe73240fd5cb9;hpb=d424ffde71135407dc6297d0d1f0c85fa6413d7d;p=civicrm-core.git diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php index 014298563f..fcf9f3324b 100644 --- a/CRM/Core/BAO/Block.php +++ b/CRM/Core/BAO/Block.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -38,7 +38,7 @@ class CRM_Core_BAO_Block { /** - * Fields that are required for a valid block + * Fields that are required for a valid block. */ static $requiredBlockFields = array( 'email' => array('email'), @@ -58,7 +58,6 @@ class CRM_Core_BAO_Block { * * @return array * Array of $block objects. - * @static */ public static function &getValues($blockName, $params) { if (empty($params)) { @@ -105,7 +104,6 @@ class CRM_Core_BAO_Block { * * @return array * Array of $block objects. - * @static */ public static function retrieveBlock(&$block, $blockName) { // we first get the primary location due to the order by clause @@ -128,16 +126,15 @@ class CRM_Core_BAO_Block { } /** - * Check if the current block object has any valid data + * Check if the current block object has any valid data. * * @param array $blockFields * Array of fields that are of interest for this object. * @param array $params * Associated array of submitted fields. * - * @return boolean + * @return bool * true if the block has data, otherwise false - * @static */ public static function dataExists($blockFields, &$params) { foreach ($blockFields as $field) { @@ -149,16 +146,15 @@ class CRM_Core_BAO_Block { } /** - * Check if the current block exits + * Check if the current block exits. * * @param string $blockName * Bloack name. * @param array $params * Associated array of submitted fields. * - * @return boolean + * @return bool * true if the block exits, otherwise false - * @static */ public static function blockExists($blockName, &$params) { // return if no data present @@ -170,7 +166,7 @@ class CRM_Core_BAO_Block { } /** - * Get all block ids for a contact + * Get all block ids for a contact. * * @param string $blockName * Block name. @@ -183,7 +179,6 @@ class CRM_Core_BAO_Block { * @return array * formatted array of block ids * - * @static */ public static function getBlockIds($blockName, $contactId = NULL, $entityElements = NULL, $updateBlankLocInfo = FALSE) { $allBlocks = array(); @@ -215,7 +210,7 @@ class CRM_Core_BAO_Block { } /** - * Takes an associative array and creates a block + * Takes an associative array and creates a block. * * @param string $blockName * Block name. @@ -226,7 +221,6 @@ class CRM_Core_BAO_Block { * * @return object * CRM_Core_BAO_Block object on success, null otherwise - * @static */ public static function create($blockName, &$params, $entity = NULL, $contactId = NULL) { if (!self::blockExists($blockName, $params)) { @@ -398,7 +392,7 @@ class CRM_Core_BAO_Block { } /** - * Delete block + * Delete block. * * @param string $blockName * Block name. @@ -406,7 +400,6 @@ class CRM_Core_BAO_Block { * Associates array. * * @return void - * @static */ public static function blockDelete($blockName, $params) { $name = ucfirst($blockName); @@ -446,7 +439,6 @@ class CRM_Core_BAO_Block { * @param $class * * @throws API_Exception - * @static */ public static function handlePrimary(&$params, $class) { $table = CRM_Core_DAO_AllCoreTables::getTableForClass($class); @@ -513,7 +505,7 @@ class CRM_Core_BAO_Block { } /** - * Sort location array so primary element is first + * Sort location array so primary element is first. * * @param array $locations */ @@ -526,7 +518,7 @@ class CRM_Core_BAO_Block { * (sort function for sortPrimaryFirst) * @param array $location1 * @param array $location2 - * @return number + * @return int */ public static function primaryComparison($location1, $location2) { $l1 = CRM_Utils_Array::value('is_primary', $location1); @@ -536,4 +528,5 @@ class CRM_Core_BAO_Block { } return ($l1 < $l2) ? -1 : 1; } + }