Merge branch 'master' of github.com:easysoft/zentaopms

2018-07-09 08:53:39 +08:00
parent 0fa4796de9 29371f8b70
commit 01e06b7a89
56 changed files with 429 additions and 289 deletions
@@ -618,6 +618,27 @@ class blockModel extends model
     */
    public function isLongBlock($block)
    {
+        if(empty($block)) return true;
        return $block->grid >= 6;
    }
+
+    /**
+     * Check API for ranzhi
+     * 
+     * @param  string    $hash 
+     * @access public
+     * @return bool
+     */
+    public function checkAPI($hash)
+    {
+        if(empty($hash)) return false;
+
+        $key = $this->dao->select('value')->from(TABLE_CONFIG)
+            ->where('owner')->eq('system')
+            ->andWhere('module')->eq('sso')
+            ->andWhere('`key`')->eq('key')
+            ->fetch('value');
+
+        return $key == $hash;
+    }
 }