diff --git a/module/block/control.php b/module/block/control.php index 977a6cbebc..6c8a84fe10 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1753,12 +1753,14 @@ class block extends control { $this->app->loadLang('meeting'); $today = helper::today(); - $now = date('H:i:s', strtotime(helper::now())); + $now = date('H:i:s', strtotime(helper::now())); + $stmt = $this->dao->select('*')->from(TABLE_MEETING) ->Where('deleted')->eq('0') ->andWhere('(date')->gt($today) - ->orWhere('begin')->gt($now) - ->markRight(1) + ->orWhere('(begin')->gt($now) + ->andWhere('date')->eq($today) + ->markRight(2) ->andwhere('(host')->eq($this->app->user->account) ->orWhere('participant')->in($this->app->user->account) ->markRight(1) diff --git a/module/my/control.php b/module/my/control.php index 605319f504..4825722ded 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -701,18 +701,14 @@ class my extends control $uri = $this->app->getURI(true); $this->session->set('meetingList', $uri, 'my'); - $meetings = $this->meeting->getListByUser($browseType, $orderBy); - - /* Pager. */ + /* Load pager. */ $this->app->loadClass('pager', $static = true); - $recTotal = count($meetings); - $pager = new pager($recTotal, $recPerPage, $pageID); - $meetings = array_chunk($meetings, $pager->recPerPage); - + if($this->app->getViewType() == 'mhtml') $recPerPage = 10; + $pager = pager::init($recTotal, $recPerPage, $pageID); $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->meeting; $this->view->browseType = $browseType; - $this->view->meetings = empty($meetings) ? $meetings : $meetings[$pageID - 1]; + $this->view->meetings = $this->meeting->getListByUser($browseType, $orderBy, 0, $pager); $this->view->orderBy = $orderBy; $this->view->pager = $pager; $this->view->depts = $this->loadModel('dept')->getOptionMenu();