projects / civicrm-core.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-09-21-44-34
[civicrm-core.git] / CRM / Member / Page / DashBoard.php
diff --git a/CRM/Member/Page/DashBoard.php b/CRM/Member/Page/DashBoard.php
index f578c4c6f98292dd16b0164938164f709a0a0497..7da628405e6e53204b5a4b949e4e6cc646cd42b6 100644 (file)
--- a/CRM/Member/Page/DashBoard.php
+++ b/CRM/Member/Page/DashBoard.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        |
  +--------------------------------------------------------------------+
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
 
 /**
  *
@@ -43,14 +43,13 @@ class CRM_Member_Page_DashBoard extends CRM_Core_Page {
    * the contact and calls the appropriate type of page to view.
    *
    * @return void
    * the contact and calls the appropriate type of page to view.
    *
    * @return void
-   *
    */
   public function preProcess() {
 
     //CRM-13901 don't show dashboard to contacts with limited view writes & it does not relect
     //what they have access to
     //@todo implement acls on dashboard querys (preferably via api to enhance that at the same time)
    */
   public function preProcess() {
 
     //CRM-13901 don't show dashboard to contacts with limited view writes & it does not relect
     //what they have access to
     //@todo implement acls on dashboard querys (preferably via api to enhance that at the same time)
-    if (!CRM_Core_Permission::check(array('view all contacts', 'edit all contacts'))) {
+    if (!CRM_Core_Permission::check('view all contacts') && !CRM_Core_Permission::check('edit all contacts')) {
       $this->showMembershipSummary = FALSE;
       $this->assign('membershipSummary', FALSE);
       return;
       $this->showMembershipSummary = FALSE;
       $this->assign('membershipSummary', FALSE);
       return;
@@ -103,52 +102,52 @@ class CRM_Member_Page_DashBoard extends CRM_Core_Page {
     foreach ($membershipTypes as $key => $value) {
 
       $membershipSummary[$key]['premonth']['new'] = array(
     foreach ($membershipTypes as $key => $value) {
 
       $membershipSummary[$key]['premonth']['new'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipJoins($key, $preMonth, $preMonthEnd),
+        'count' => CRM_Member_BAO_Membership::getMembershipJoins($key, $preMonth, $preMonthEnd),
         'name' => $value,
       );
 
       $membershipSummary[$key]['premonth']['renew'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['premonth']['renew'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipRenewals($key, $preMonth, $preMonthEnd),
+        'count' => CRM_Member_BAO_Membership::getMembershipRenewals($key, $preMonth, $preMonthEnd),
         'name' => $value,
       );
 
       $membershipSummary[$key]['premonth']['total'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['premonth']['total'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $preMonth, $preMonthEnd),
+        'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $preMonth, $preMonthEnd),
         'name' => $value,
       );
 
       $membershipSummary[$key]['month']['new'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['month']['new'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipJoins($key, $monthStart, $ymd),
+        'count' => CRM_Member_BAO_Membership::getMembershipJoins($key, $monthStart, $ymd),
         'name' => $value,
       );
 
       $membershipSummary[$key]['month']['renew'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['month']['renew'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipRenewals($key, $monthStart, $ymd),
+        'count' => CRM_Member_BAO_Membership::getMembershipRenewals($key, $monthStart, $ymd),
         'name' => $value,
       );
 
       $membershipSummary[$key]['month']['total'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['month']['total'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $monthStart, $ymd),
+        'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $monthStart, $ymd),
         'name' => $value,
       );
 
       $membershipSummary[$key]['year']['new'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['year']['new'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipJoins($key, $yearStart, $ymd),
+        'count' => CRM_Member_BAO_Membership::getMembershipJoins($key, $yearStart, $ymd),
         'name' => $value,
       );
 
       $membershipSummary[$key]['year']['renew'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['year']['renew'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipRenewals($key, $yearStart, $ymd),
+        'count' => CRM_Member_BAO_Membership::getMembershipRenewals($key, $yearStart, $ymd),
         'name' => $value,
       );
 
       $membershipSummary[$key]['year']['total'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['year']['total'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $yearStart, $ymd),
+        'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $yearStart, $ymd),
         'name' => $value,
       );
 
       $membershipSummary[$key]['current']['total'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['current']['total'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipCount($key, $current),
+        'count' => CRM_Member_BAO_Membership::getMembershipCount($key, $current),
         'name' => $value,
       );
 
         'name' => $value,
       );
 
@@ -156,22 +155,22 @@ class CRM_Member_Page_DashBoard extends CRM_Core_Page {
 
       //LCD also get summary stats for membership owners
       $membershipSummary[$key]['premonth_owner']['premonth_owner'] = array(
 
       //LCD also get summary stats for membership owners
       $membershipSummary[$key]['premonth_owner']['premonth_owner'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $preMonth, $preMonthEnd, 0, 1),
+        'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $preMonth, $preMonthEnd, 0, 1),
         'name' => $value,
       );
 
       $membershipSummary[$key]['month_owner']['month_owner'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['month_owner']['month_owner'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $monthStart, $ymd, 0, 1),
+        'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $monthStart, $ymd, 0, 1),
         'name' => $value,
       );
 
       $membershipSummary[$key]['year_owner']['year_owner'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['year_owner']['year_owner'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $yearStart, $ymd, 0, 1),
+        'count' => CRM_Member_BAO_Membership::getMembershipStarts($key, $yearStart, $ymd, 0, 1),
         'name' => $value,
       );
 
       $membershipSummary[$key]['current_owner']['current_owner'] = array(
         'name' => $value,
       );
 
       $membershipSummary[$key]['current_owner']['current_owner'] = array(
-      'count' => CRM_Member_BAO_Membership::getMembershipCount($key, $current, 0, 1),
+        'count' => CRM_Member_BAO_Membership::getMembershipCount($key, $current, 0, 1),
         'name' => $value,
       );
 
         'name' => $value,
       );
 
@@ -182,7 +181,8 @@ class CRM_Member_Page_DashBoard extends CRM_Core_Page {
     $status = CRM_Member_BAO_MembershipStatus::getMembershipStatusCurrent();
     $status = implode(',', $status);
 
     $status = CRM_Member_BAO_MembershipStatus::getMembershipStatusCurrent();
     $status = implode(',', $status);
 
-    /* Disabled for lack of appropriate search
+    /*@codingStandardsIgnoreStart
+     Disabled for lack of appropriate search
 
        The Membership search isn't able to properly filter by join or renewal events.
        Until that works properly, the subtotals shouldn't get links.
 
        The Membership search isn't able to properly filter by join or renewal events.
        Until that works properly, the subtotals shouldn't get links.
@@ -255,7 +255,7 @@ class CRM_Member_Page_DashBoard extends CRM_Core_Page {
         }
       }
     }
         }
       }
     }
-    */
+    @codingStandardsIgnoreEnd */
 
     // Temporary replacement for current totals column
 
 
     // Temporary replacement for current totals column
 
@@ -284,17 +284,17 @@ class CRM_Member_Page_DashBoard extends CRM_Core_Page {
     $totalCountPreMonth = $totalCountMonth = $totalCountYear = $totalCountCurrent = $totalCountTotal = 0;
     $totalCountPreMonth_owner = $totalCountMonth_owner = $totalCountYear_owner = $totalCountCurrent_owner = $totalCountTotal_owner = 0;
     foreach ($membershipSummary as $key => $value) {
     $totalCountPreMonth = $totalCountMonth = $totalCountYear = $totalCountCurrent = $totalCountTotal = 0;
     $totalCountPreMonth_owner = $totalCountMonth_owner = $totalCountYear_owner = $totalCountCurrent_owner = $totalCountTotal_owner = 0;
     foreach ($membershipSummary as $key => $value) {
-      $newCountPreMonth   = $newCountPreMonth + $value['premonth']['new']['count'];
+      $newCountPreMonth = $newCountPreMonth + $value['premonth']['new']['count'];
       $renewCountPreMonth = $renewCountPreMonth + $value['premonth']['renew']['count'];
       $totalCountPreMonth = $totalCountPreMonth + $value['premonth']['total']['count'];
       $renewCountPreMonth = $renewCountPreMonth + $value['premonth']['renew']['count'];
       $totalCountPreMonth = $totalCountPreMonth + $value['premonth']['total']['count'];
-      $newCountMonth      = $newCountMonth + $value['month']['new']['count'];
-      $renewCountMonth    = $renewCountMonth + $value['month']['renew']['count'];
-      $totalCountMonth    = $totalCountMonth + $value['month']['total']['count'];
-      $newCountYear       = $newCountYear + $value['year']['new']['count'];
-      $renewCountYear     = $renewCountYear + $value['year']['renew']['count'];
-      $totalCountYear     = $totalCountYear + $value['year']['total']['count'];
-      $totalCountCurrent  = $totalCountCurrent + $value['current']['total']['count'];
-      $totalCountTotal    = $totalCountTotal + $value['total']['total']['count'];
+      $newCountMonth = $newCountMonth + $value['month']['new']['count'];
+      $renewCountMonth = $renewCountMonth + $value['month']['renew']['count'];
+      $totalCountMonth = $totalCountMonth + $value['month']['total']['count'];
+      $newCountYear = $newCountYear + $value['year']['new']['count'];
+      $renewCountYear = $renewCountYear + $value['year']['renew']['count'];
+      $totalCountYear = $totalCountYear + $value['year']['total']['count'];
+      $totalCountCurrent = $totalCountCurrent + $value['current']['total']['count'];
+      $totalCountTotal = $totalCountTotal + $value['total']['total']['count'];
 
       //LCD add owner values
       $totalCountPreMonth_owner = $totalCountPreMonth_owner + $value['premonth_owner']['premonth_owner']['count'];
 
       //LCD add owner values
       $totalCountPreMonth_owner = $totalCountPreMonth_owner + $value['premonth_owner']['premonth_owner']['count'];
@@ -395,33 +395,33 @@ class CRM_Member_Page_DashBoard extends CRM_Core_Page {
     //LCD add owner values
     $totalCount['premonth_owner']['premonth_owner'] = array(
       'count' => $totalCountPreMonth_owner,
     //LCD add owner values
     $totalCount['premonth_owner']['premonth_owner'] = array(
       'count' => $totalCountPreMonth_owner,
-    //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&start=$preMonth&end=$preMonthEnd&owner=1"),
+      //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&start=$preMonth&end=$preMonthEnd&owner=1"),
     );
 
     $totalCount['month_owner']['month_owner'] = array(
       'count' => $totalCountMonth_owner,
     );
 
     $totalCount['month_owner']['month_owner'] = array(
       'count' => $totalCountMonth_owner,
-    //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&start=$monthStart&end=$ymd&owner=1"),
+      //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&start=$monthStart&end=$ymd&owner=1"),
     );
 
     $totalCount['year_owner']['year_owner'] = array(
       'count' => $totalCountYear_owner,
     );
 
     $totalCount['year_owner']['year_owner'] = array(
       'count' => $totalCountYear_owner,
-    //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&start=$yearStart&end=$ymd&owner=1"),
+      //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&start=$yearStart&end=$ymd&owner=1"),
     );
 
     $totalCount['current_owner']['current_owner'] = array(
       'count' => $totalCountCurrent_owner,
     );
 
     $totalCount['current_owner']['current_owner'] = array(
       'count' => $totalCountCurrent_owner,
-    //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&owner=1"),
+      //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&owner=1"),
     );
 
     $totalCount['total_owner']['total_owner'] = array(
       'count' => $totalCountTotal_owner,
     );
 
     $totalCount['total_owner']['total_owner'] = array(
       'count' => $totalCountTotal_owner,
-    //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&owner=1"),
+      //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&owner=1"),
     );
 
     if (!$isCurrentMonth) {
       $totalCount['total_owner']['total_owner'] = array(
         'count' => $totalCountTotal_owner,
     );
 
     if (!$isCurrentMonth) {
       $totalCount['total_owner']['total_owner'] = array(
         'count' => $totalCountTotal_owner,
-      //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&start=&end=$ymd&owner=1"),
+        //  'url' => CRM_Utils_System::url('civicrm/member/search', "reset=1&force=1&status=$status&start=&end=$ymd&owner=1"),
       );
     }
     //LCD end
       );
     }
     //LCD end
@@ -438,10 +438,10 @@ class CRM_Member_Page_DashBoard extends CRM_Core_Page {
   }
 
   /**
   }
 
   /**
-   * This function is the main function that is called when the page loads,
+   * the main function that is called when the page loads,
    * it decides the which action has to be taken for the page.
    *
    * it decides the which action has to be taken for the page.
    *
-   * return null
+   * @return null
    */
   public function run() {
     $this->preProcess();
    */
   public function run() {
     $this->preProcess();
@@ -457,4 +457,5 @@ class CRM_Member_Page_DashBoard extends CRM_Core_Page {
 
     return parent::run();
   }
 
     return parent::run();
   }
+
 }
 }