|
@@ -1,33 +1,31 @@
|
|
|
<?php
|
|
|
|
|
|
-namespace Push\Lib;
|
|
|
+namespace Page\Lib;
|
|
|
|
|
|
use Dever;
|
|
|
|
|
|
class Data
|
|
|
{
|
|
|
|
|
|
- public function getPage($path = 'module', $cdate = 'Y-m-d H:i')
|
|
|
+ public function getPage($path = 'module', $cdate = 'Y-m-d H:i', $config = array())
|
|
|
{
|
|
|
$page = Dever::input('page');
|
|
|
if ($page) {
|
|
|
$uri = $page;
|
|
|
} else {
|
|
|
$uri = Dever::uri();
|
|
|
-
|
|
|
- if (!$uri) {
|
|
|
- $uri = 'home';
|
|
|
- }
|
|
|
+ }
|
|
|
+ if (!$uri) {
|
|
|
+ $uri = 'home';
|
|
|
}
|
|
|
|
|
|
$data = $this->getPageData($uri, $cdate);
|
|
|
|
|
|
$result = array();
|
|
|
- if ($data && $data['info']) {
|
|
|
- foreach ($data['info'] as $k => $v) {
|
|
|
- if ($v['template_id'] > 0 && isset($v['template'])) {
|
|
|
- $result[] = Dever::render($path . '/' . $v['template']['key'], $v);
|
|
|
- }
|
|
|
+ if ($data && $data['module']) {
|
|
|
+ foreach ($data['module'] as $k => $v) {
|
|
|
+ $v['config'] = $config;
|
|
|
+ $result[] = Dever::render($path . '/' . $v['key'], $v);
|
|
|
}
|
|
|
}
|
|
|
return implode("\r\n", $result);
|
|
@@ -42,21 +40,20 @@ class Data
|
|
|
} else {
|
|
|
$where['key'] = $page_id;
|
|
|
}
|
|
|
- $data = Dever::db('push/page')->find($where);
|
|
|
+ $data = Dever::db('page/page')->find($where);
|
|
|
if ($data) {
|
|
|
- $data['info'] = Dever::db('push/info')->select(array('page_id' => $data['id']));
|
|
|
- if ($data['info']) {
|
|
|
- foreach ($data['info'] as $k => $v) {
|
|
|
+ $data['module'] = Dever::db('page/page_module')->getData(array('page_id' => $data['id']));
|
|
|
+ if ($data['module']) {
|
|
|
+ foreach ($data['module'] as $k => $v) {
|
|
|
$where = array();
|
|
|
- $where['info_id'] = $v['id'];
|
|
|
+ $where['module_id'] = $v['id'];
|
|
|
$where['limit'] = '0,' . $v['num'];
|
|
|
- $data['info'][$k]['data'] = Dever::db('push/data')->getAll($where);
|
|
|
- if ($data['info'][$k]['data']) {
|
|
|
- foreach ($data['info'][$k]['data'] as $k1 => $v1) {
|
|
|
- $data['info'][$k]['data'][$k1] = $this->getOne($v1, 2, $cdate);
|
|
|
+ $data['module'][$k]['data'] = Dever::db('page/data')->getAll($where);
|
|
|
+ if ($data['module'][$k]['data']) {
|
|
|
+ foreach ($data['module'][$k]['data'] as $k1 => $v1) {
|
|
|
+ $data['module'][$k]['data'][$k1] = $this->getOne($v1, 2, $cdate);
|
|
|
}
|
|
|
}
|
|
|
- $data['info'][$k]['template'] = Dever::db('push/template')->find($v['template_id']);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -67,36 +64,36 @@ class Data
|
|
|
|
|
|
public function get($key, $name, $total = 10, $col = '1,2,3', $func = '-1', $page = false, $limit = false, $cdate = 'Y-m-d H:i')
|
|
|
{
|
|
|
- $info = Dever::db('push/info')->one(array('key' => $key));
|
|
|
+ $module = Dever::db('page/module')->one(array('key' => $key));
|
|
|
|
|
|
- if (!$info) {
|
|
|
+ if (!$module) {
|
|
|
$insert['key'] = $key;
|
|
|
$insert['name'] = $name;
|
|
|
$insert['num'] = $total;
|
|
|
$insert['col'] = $col;
|
|
|
$insert['func'] = $func;
|
|
|
- $info['id'] = Dever::db('push/info')->insert($insert);
|
|
|
- $info['num'] = $insert['num'];
|
|
|
+ $module['id'] = Dever::db('page/module')->insert($insert);
|
|
|
+ $module['num'] = $insert['num'];
|
|
|
}
|
|
|
|
|
|
$data = array();
|
|
|
- if ($info) {
|
|
|
- if (!$info['num']) {
|
|
|
- $info['num'] = 20;
|
|
|
+ if ($module) {
|
|
|
+ if (!$module['num']) {
|
|
|
+ $module['num'] = 20;
|
|
|
}
|
|
|
if ($limit > 0) {
|
|
|
- $info['num'] = $limit;
|
|
|
+ $module['num'] = $limit;
|
|
|
}
|
|
|
|
|
|
$where = array();
|
|
|
- $where['info_id'] = $info['id'];
|
|
|
+ $where['module_id'] = $module['id'];
|
|
|
|
|
|
if ($page) {
|
|
|
- $where['page'] = array($info['num'], 'list');
|
|
|
- $data = Dever::db('push/data')->getAllPage($where);
|
|
|
+ $where['page'] = array($module['num'], 'list');
|
|
|
+ $data = Dever::db('page/data')->getAllPage($where);
|
|
|
} else {
|
|
|
- $where['limit'] = '0,' . $info['num'];
|
|
|
- $data = Dever::db('push/data')->getAll($where);
|
|
|
+ $where['limit'] = '0,' . $module['num'];
|
|
|
+ $data = Dever::db('page/data')->getAll($where);
|
|
|
}
|
|
|
|
|
|
if ($data) {
|
|
@@ -110,15 +107,15 @@ class Data
|
|
|
}
|
|
|
|
|
|
|
|
|
- public function getOne($info, $state = 2, $cdate = 'Y-m-d H:i')
|
|
|
+ public function getOne($module, $state = 2, $cdate = 'Y-m-d H:i')
|
|
|
{
|
|
|
- $data = is_array($info) ? $info : Dever::db('push/data')->one($info);
|
|
|
+ $data = is_array($module) ? $module : Dever::db('page/data')->one($module);
|
|
|
|
|
|
$source = array();
|
|
|
- $info = array();
|
|
|
+ $module = array();
|
|
|
$col = array();
|
|
|
if ($data['type'] > 0) {
|
|
|
- $func = Dever::db('push/func')->one($data['type']);
|
|
|
+ $func = Dever::db('page/func')->one($data['type']);
|
|
|
if ($func) {
|
|
|
if ($func['type'] == 1) {
|
|
|
$method = $func['api'];
|
|
@@ -151,9 +148,9 @@ class Data
|
|
|
}
|
|
|
if ($s) {
|
|
|
$id = str_replace($key, '', $k);
|
|
|
- $col_info = Dever::db('push/col')->one($id);
|
|
|
+ $col_module = Dever::db('page/col')->one($id);
|
|
|
|
|
|
- if (!$col_info) {
|
|
|
+ if (!$col_module) {
|
|
|
continue;
|
|
|
}
|
|
|
if (!$v && $source && $col) {
|
|
@@ -172,9 +169,9 @@ class Data
|
|
|
$result[$k] = array();
|
|
|
}
|
|
|
|
|
|
- $result[$k][$col_info['name']] = $v;
|
|
|
+ $result[$k][$col_module['name']] = $v;
|
|
|
} else {
|
|
|
- $result[$col_info['key']] = $v;
|
|
|
+ $result[$col_module['key']] = $v;
|
|
|
}
|
|
|
}
|
|
|
}
|