finish task #40019

module/custom/control.php

@@ -540,24 +540,27 @@ class custom extends control
      */
     public function mode()
     {
-        if($this->post->mode == 'new')
+        $mode = zget($this->config->global, 'mode', 'classic');
+        if($this->post->mode && $this->post->mode != $mode) // if mode value change
         {
             $mode = fixer::input('post')->get('mode');
             $this->loadModel('setting')->setItem('system.common.global.mode', $mode);
             if($mode == 'new') die(js::locate($this->createLink('upgrade', 'mergeTips'), 'parent'));
+            if($mode == 'classic') die(js::reload('top'));
         }
 
-        $mode = zget($this->config->global, 'mode', 'classic');
+        
         if($mode == 'new')
         {
             if(isset($this->config->global->upgradeStep) and $this->config->global->upgradeStep == 'mergeProgram') die(js::locate($this->createLink('upgrade', 'mergeProgram'), 'parent'));
 
             unset($_SESSION['upgrading']);
-            $this->locate(inlink('index'));
+            // $this->locate(inlink('index'));
         }
 
         $this->app->loadLang('upgrade');
 
+        $this->view->mode       = $mode;
         $this->view->title      = $this->lang->custom->mode;
         $this->view->position[] = $this->lang->custom->common;
         $this->view->position[] = $this->view->title;

module/custom/view/header.html.php

@@ -15,10 +15,10 @@
       if($sysObject == 'required') continue;
       common::printLink('custom', $sysObject, "", "<span class='text'>{$lang->custom->$sysObject}</span>", '', "class='btn btn-link' id='{$sysObject}Tab'");
   }
-  if((isset($config->systemMode) and $config->systemMode == 'classic') || (isset($config->global->upgradeStep) and $config->global->upgradeStep == 'mergeProgram'))
-  {
+ // if((isset($config->systemMode) and $config->systemMode == 'classic') || (isset($config->global->upgradeStep) and $config->global->upgradeStep == 'mergeProgram'))
+ // {
       common::printLink('custom', 'mode', "", "<span class='text'>{$lang->custom->mode}</span>", '', "class='btn btn-link' id='modeTab'");
-  }
+ // }
   ?>
   </div>
 </div>

module/custom/view/mode.html.php

@@ -23,8 +23,8 @@
         <th class='text-top'><?php echo $lang->custom->mode;?></th>
         <td>
           <p>
-            <label class="radio-inline"><input type="radio" name="mode" value="classic" checked='checked' id="modeclassic"><?php echo $lang->upgrade->to15Mode['classic'];?></label>
-            <label class="radio-inline"><input type="radio" name="mode" value="new" id="modenew"><?php echo $lang->upgrade->to15Mode['new'];?></label>
+            <label class="radio-inline"><input type="radio" name="mode" value="classic" <?php echo $mode == 'classic'? " checked='checked'" : ''?> id="modeclassic"><?php echo $lang->upgrade->to15Mode['classic'];?></label>
+            <label class="radio-inline"><input type="radio" name="mode" value="new" <?php echo $mode == 'new'? " checked='checked'" : ''?> id="modenew"><?php echo $lang->upgrade->to15Mode['new'];?></label>
           </p>
           <p class='text-info'><?php echo $lang->upgrade->selectedModeTips['new'];?></p>
         </td>

module/install/control.php

@@ -183,12 +183,15 @@ class install extends control
             if(dao::isError()) echo js::alert($this->lang->install->errorImportDemoData);
 
             $this->loadModel('setting')->updateVersion($this->config->version);
+            $this->loadModel('setting')->setItem('system.common.global.mode', $this->post->mode); // update mode
             $this->loadModel('setting')->setItem('system.common.global.flow', $this->post->flow);
             $this->loadModel('setting')->setItem('system.common.safe.mode', '1');
             $this->loadModel('setting')->setItem('system.common.safe.changeWeak', '1');
             $this->loadModel('setting')->setItem('system.common.global.cron', 1);
             die(js::locate(inlink('step5'), 'parent'));
         }
+        
+        $this->app->loadLang('upgrade');
 
         $this->view->title = $this->lang->install->getPriv;
         if(!isset($this->config->installed) or !$this->config->installed)

module/install/lang/de.php

@@ -128,6 +128,8 @@ $lang->install->company            = 'Firmenname';
 $lang->install->account            = 'Admin Konto';
 $lang->install->password           = 'Admin Passwort';
 $lang->install->errorEmptyPassword = 'Passwort sollte nicht leer sein.';
+$lang->install->selectedMode       = 'Selection mode';
+$lang->install->selectedModeTips   = 'Later, you can go to the background - Custom - mode to adjust';
 
 $lang->install->groupList['ADMIN']['name']   = 'Admin';
 $lang->install->groupList['ADMIN']['desc']   = 'System Administrator';

module/install/lang/en.php

@@ -128,6 +128,8 @@ $lang->install->company            = 'Company Name';
 $lang->install->account            = 'Admin Account';
 $lang->install->password           = 'Admin Password';
 $lang->install->errorEmptyPassword = 'Password should not be blank.';
+$lang->install->selectedMode       = 'Selection mode';
+$lang->install->selectedModeTips   = 'Later, you can go to the background - Custom - mode to adjust';
 
 $lang->install->groupList['ADMIN']['name']   = 'Admin';
 $lang->install->groupList['ADMIN']['desc']   = 'System Admin';

module/install/lang/fr.php

@@ -128,6 +128,8 @@ $lang->install->company            = 'Nom Entreprise';
 $lang->install->account            = 'Compte Admin';
 $lang->install->password           = 'Mot de Passe Admin';
 $lang->install->errorEmptyPassword = 'Password ne doit pas être vide.';
+$lang->install->selectedMode       = 'Selection mode';
+$lang->install->selectedModeTips   = 'Later, you can go to the background - Custom - mode to adjust';
 
 $lang->install->groupList['ADMIN']['name']   = 'Admin';
 $lang->install->groupList['ADMIN']['desc']   = 'Administrateur';

module/install/lang/vi.php

@@ -128,6 +128,8 @@ $lang->install->company            = 'Tên doanh nghiệp';
 $lang->install->account            = 'Tài khoản quản trị';
 $lang->install->password           = 'Mật khẩu quản trị';
 $lang->install->errorEmptyPassword = 'Mật khẩu không nên là blank.';
+$lang->install->selectedMode       = 'Selection mode';
+$lang->install->selectedModeTips   = 'Later, you can go to the background - Custom - mode to adjust';
 
 $lang->install->groupList['ADMIN']['name']   = 'Quản trị';
 $lang->install->groupList['ADMIN']['desc']   = 'Quản trị hệ thống';

module/install/lang/zh-cn.php

@@ -128,6 +128,8 @@ $lang->install->company  = '公司名称';
 $lang->install->account  = '管理员帐号';
 $lang->install->password = '管理员密码';
 $lang->install->errorEmptyPassword = '密码不能为空';
+$lang->install->selectedMode       = '选择模式';
+$lang->install->selectedModeTips   = '后续您还可以去后台-自定义-模式中进行调整';
 
 $lang->install->groupList['ADMIN']['name']   = '管理员';
 $lang->install->groupList['ADMIN']['desc']   = '系统管理员';

module/install/lang/zh-tw.php

@@ -128,6 +128,8 @@ $lang->install->company  = '公司名稱';
 $lang->install->account  = '管理員帳號';
 $lang->install->password = '管理員密碼';
 $lang->install->errorEmptyPassword = '密碼不能為空';
+$lang->install->selectedMode       = '選擇模式';
+$lang->install->selectedModeTips   = '後續您還可以去後臺-自定義-模式中進行調整';
 
 $lang->install->groupList['ADMIN']['name']   = '管理員';
 $lang->install->groupList['ADMIN']['desc']   = '系統管理員';

module/install/view/step4.html.php

@@ -62,6 +62,18 @@
             <th><?php echo $lang->install->password;?></th>
             <td><?php echo html::input('password', '', "class='form-control'");?></td>
           </tr>
+          <tr>
+            <th><?php echo $lang->install->selectedMode;?></th>
+            <td><?php $systemMode = isset($lang->upgrade->to15Mode['classic']) ? 'classic' : 'new';?>
+                <?php echo html::radio('mode', $lang->upgrade->to15Mode, $systemMode);?>
+            </td>     
+          </tr>
+          <tr>
+            <th></th>
+            <td>
+              <div class='text-info'><?php echo $lang->install->selectedModeTips;?></div>
+            </td>     
+          </tr>
           <tr>
             <th></th><td><?php echo html::checkBox('importDemoData', $lang->install->importDemoData);?></td>
           </tr>