From a3860ca3673da543e481c44ee88223c809c02da5 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 10 Jan 2013 07:13:51 +0000
Subject: [PATCH]  * adjust flow.

---
 module/index/control.php      | 2 +-
 module/my/js/index.js         | 1 +
 module/my/view/index.html.php | 9 +--------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/module/index/control.php b/module/index/control.php
index 6980dfb8d6..00762967bb 100644
--- a/module/index/control.php
+++ b/module/index/control.php
@@ -36,7 +36,7 @@ class index extends control
 
         if($_POST)
         {
-            $this->loadModel('setting')->setItem('system', 'common', '', 'flow', $this->post->flow);
+            $this->loadModel('setting')->setItem('system', 'common', 'global', 'flow', $this->post->flow);
             if($this->post->flow != 'full') die(js::locate($this->createLink('extension', 'install', "extension={$this->config->index->flow2Ext[$this->post->flow]}"), 'parent'));
             die(js::reload( 'parent.parent'));
         }
diff --git a/module/my/js/index.js b/module/my/js/index.js
index a2c933d982..bccf90a51d 100644
--- a/module/my/js/index.js
+++ b/module/my/js/index.js
@@ -14,4 +14,5 @@ $(function()
     {
         $(this).sparkline('html', {height:'25px'});
     })
+    if(typeof(flow) != 'undefined' && flow) $.colorbox({href:createLink('index', 'index', 'type=flow'), open:true, width:800, height:400, iframe:true});
 });
diff --git a/module/my/view/index.html.php b/module/my/view/index.html.php
index 81ab1ebd14..3faf5b4613 100644
--- a/module/my/view/index.html.php
+++ b/module/my/view/index.html.php
@@ -37,12 +37,5 @@
     <?php endif;?>
   </tr>
 </table>
-<script type='text/javascript'>
-<?php
-if(!(isset($this->app->config->flow) or strpos($this->config->version, 'pro') !== false or strpos($this->app->company->admins, ",{$this->app->user->account},") === false))
-{
-    echo "\$.colorbox({href:" . json_encode($this->createLink('index', 'index', 'type=flow')) . ", open:true, width:800, height:400, iframe:true});\n";
-}
-?>
-</script>
+<?php if(!(isset($config->global->flow) or strpos($this->config->version, 'pro') !== false or strpos($this->app->company->admins, ",{$this->app->user->account},") === false)) js::set('flow', 'true', 'number');?>
 <?php include '../../common/view/footer.html.php';?>