edit

lib/Data.php

@@ -11,7 +11,7 @@ class Data
         $cache = 'ad_' . md5($key);
         $data = $cache ? Dever::cache($cache) : $cache;
         if ($data) {
-            return $data;
+            return $this->getData($data);
         } elseif (!$data) {
             $page = Dever::db('ad/page')->one(array('key' => $key));
             if ($page) {
@@ -22,11 +22,26 @@ class Data
                     }
 
                     Dever::cache($cache, $info);
-                    return $info;
+                    return $this->getData($info);
                 }
             }
         }
 
         return false;
     }
+
+    private function getData($data)
+    {
+        if ($data) {
+            $time = time();
+            foreach ($data as $k => $v) {
+                foreach ($v['data'] as $k1 => $v1) {
+                    if ($v1['type'] == 2 && ($time < $v1['sdate'] || $time > $v1['edate'])) {
+                        unset($data[$k]['data'][$k1]);
+                    }
+                }
+            }
+        }
+        return $data;
+    }
 }