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

module/user/control.php

@@ -819,13 +819,13 @@ class user extends control
             }
 
             $this->loadModel('misc');
-            $this->view->noGDLib   = sprintf($this->lang->misc->noGDLib, common::getSysURL() . $this->config->webRoot, '', false, true);
-            $this->view->title     = $this->lang->user->login;
-            $this->view->referer   = $this->referer;
-            $this->view->s         = zget($this->config->global, 'sn', '');
-            $this->view->keepLogin = $this->cookie->keepLogin ? $this->cookie->keepLogin : 'off';
-            $this->view->rand      = $this->user->updateSessionRandom();
-            $this->view->weakSites = $this->misc->checkOneClickPackage();
+            $this->view->noGDLib     = sprintf($this->lang->misc->noGDLib, common::getSysURL() . $this->config->webRoot, '', false, true);
+            $this->view->title       = $this->lang->user->login;
+            $this->view->referer     = $this->referer;
+            $this->view->s           = zget($this->config->global, 'sn', '');
+            $this->view->keepLogin   = $this->cookie->keepLogin ? $this->cookie->keepLogin : 'off';
+            $this->view->rand        = $this->user->updateSessionRandom();
+            $this->view->unsafeSites = $this->misc->checkOneClickPackage();
             $this->display();
         }
     }

module/user/js/login.js

@@ -66,6 +66,12 @@ $(document).ready(function()
     });
 });
 
+/**
+ * Show notice for one click package use weak password.
+ * 
+ * @access public
+ * @return void
+ */
 function showNotice()
 {
     if(typeof(process4Safe) == 'string') bootbox.alert(process4Safe)

module/user/view/login.html.php

@@ -81,7 +81,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
     <div id="info" class="table-row">
       <div class="table-col text-middle text-center">
         <div id="poweredby">
-          <?php if($weakSites):?>
+          <?php if($unsafeSites):?>
           <div><a class='showNotice' href='javascript:showNotice()',><?php echo $lang->user->notice4Safe;?></a></div>
           <?php endif;?>
           <?php if($config->checkVersion):?>
@@ -93,12 +93,12 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
   </div>
 </main>
 <?php
-if($weakSites)
+if($unsafeSites)
 {
     $paths     = array();
     $databases = array();
     $isXampp   = false;
-    foreach($weakSites as $webRoot => $site)
+    foreach($unsafeSites as $webRoot => $site)
     {
         $path = $site['path'];
         if(strpos($path, 'xampp') !== false) $isXampp = true;