From ced6585aecee65de440af2b40282fbfd67d3af04 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 9 Nov 2017 14:08:57 +0800
Subject: [PATCH]  * finish task #3339.

---
 module/company/lang/en.php        |   4 +-
 module/company/lang/zh-cn.php     |   4 +-
 module/company/lang/zh-tw.php     |   4 +-
 module/company/view/edit.html.php |   2 +-
 module/company/view/view.html.php | 110 +++++++++++++++---------------
 5 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index 2404d5a94e..94d6b0e864 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -31,5 +31,5 @@ $lang->company->product = $lang->productCommon;
 $lang->company->project = $lang->projectCommon;
 $lang->company->user    = 'User';
 
-$lang->company->guestList[0] = 'Off';
-$lang->company->guestList[1] = 'On';
+$lang->company->guestOptions[0] = 'Off';
+$lang->company->guestOptions[1] = 'On';
diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php
index 1d4ece70f4..ac07cfa23a 100644
--- a/module/company/lang/zh-cn.php
+++ b/module/company/lang/zh-cn.php
@@ -31,5 +31,5 @@ $lang->company->product = $lang->productCommon;
 $lang->company->project = $lang->projectCommon;
 $lang->company->user    = '用户';
 
-$lang->company->guestList[0] = '不允许';
-$lang->company->guestList[1] = '允许';
+$lang->company->guestOptions[0] = '不允许';
+$lang->company->guestOptions[1] = '允许';
diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php
index 5b1f8f4891..4c028ad72d 100644
--- a/module/company/lang/zh-tw.php
+++ b/module/company/lang/zh-tw.php
@@ -31,5 +31,5 @@ $lang->company->product = $lang->productCommon;
 $lang->company->project = $lang->projectCommon;
 $lang->company->user    = '用戶';
 
-$lang->company->guestList[0] = '不允許';
-$lang->company->guestList[1] = '允許';
+$lang->company->guestOptions[0] = '不允許';
+$lang->company->guestOptions[1] = '允許';
diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php
index 5379132928..9984d80b42 100644
--- a/module/company/view/edit.html.php
+++ b/module/company/view/edit.html.php
@@ -49,7 +49,7 @@
     </tr>  
     <tr>
       <th><?php echo $lang->company->guest;?></th>
-      <td><?php echo html::radio('guest', $lang->company->guestList, $company->guest);?></td>
+      <td><?php echo html::radio('guest', $lang->company->guestOptions, $company->guest);?></td>
     </tr>  
     <tr><td></td><td><?php echo html::submitButton();?></td></tr>
   </table>
diff --git a/module/company/view/view.html.php b/module/company/view/view.html.php
index 822f7cc89e..cad834d888 100644
--- a/module/company/view/view.html.php
+++ b/module/company/view/view.html.php
@@ -1,57 +1,57 @@
-<?php
-/**
- * The view view of company module of ZenTaoPMS.
- *
+<?php
+/**
+ * The view view of company module of ZenTaoPMS.
+ *
  * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Congzhi Chen <congzhi@cnezsoft.com>
- * @package     company
- * @version     $Id: edit.html.php 4488 2013-02-27 02:54:49Z chencongzhi520@gmail.com $
- * @link        http://www.zentao.net
- */
-?>
-<?php include '../../common/view/header.html.php';?>
-<div class='container mw-600px'>
-  <div id='titlebar'>
-    <div class='heading'><?php echo html::icon($lang->icons['company']);?> <?php echo $lang->company->view;?></div>
-    <div class='actions'>
-      <?php common::printLink('company', 'edit', '', $lang->edit, '', 'id="editCompany" class="btn btn-primary iframe" data-width="580"', true, true);?>
-    </div>
-  </div>
-  <table class='table table-borderless table-data'> 
-    <tr>
-      <th class='w-100px'><?php echo $lang->company->name;?></th>
-      <td><?php echo $company->name;?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->company->phone;?></th>
-      <td><?php echo $company->phone;?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->company->fax;?></th>
-      <td><?php echo $company->fax;?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->company->address;?></th>
-      <td><?php echo $company->address;?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->company->zipcode;?></th>
-      <td><?php echo $company->zipcode;?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->company->website;?></th>
-      <td><?php echo $company->website;?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->company->backyard;?></th>
-      <td><?php echo $company->backyard;?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->company->guest;?></th>
-      <td><?php echo $lang->company->guestList[$company->guest];?></td>
-    </tr>  
-    <tr><td colspan='2' class='text-center'></td></tr>
-  </table>
-</div>
-<?php include '../../common/view/footer.html.php';?>
+ * @author      Congzhi Chen <congzhi@cnezsoft.com>
+ * @package     company
+ * @version     $Id: edit.html.php 4488 2013-02-27 02:54:49Z chencongzhi520@gmail.com $
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<div class='container mw-600px'>
+  <div id='titlebar'>
+    <div class='heading'><?php echo html::icon($lang->icons['company']);?> <?php echo $lang->company->view;?></div>
+    <div class='actions'>
+      <?php common::printLink('company', 'edit', '', $lang->edit, '', 'id="editCompany" class="btn btn-primary iframe" data-width="580"', true, true);?>
+    </div>
+  </div>
+  <table class='table table-borderless table-data'>
+    <tr>
+      <th class='w-100px'><?php echo $lang->company->name;?></th>
+      <td><?php echo $company->name;?></td>
+    </tr>
+    <tr>
+      <th><?php echo $lang->company->phone;?></th>
+      <td><?php echo $company->phone;?></td>
+    </tr>
+    <tr>
+      <th><?php echo $lang->company->fax;?></th>
+      <td><?php echo $company->fax;?></td>
+    </tr>
+    <tr>
+      <th><?php echo $lang->company->address;?></th>
+      <td><?php echo $company->address;?></td>
+    </tr>
+    <tr>
+      <th><?php echo $lang->company->zipcode;?></th>
+      <td><?php echo $company->zipcode;?></td>
+    </tr>
+    <tr>
+      <th><?php echo $lang->company->website;?></th>
+      <td><?php echo $company->website;?></td>
+    </tr>
+    <tr>
+      <th><?php echo $lang->company->backyard;?></th>
+      <td><?php echo $company->backyard;?></td>
+    </tr>
+    <tr>
+      <th><?php echo $lang->company->guest;?></th>
+      <td><?php echo $lang->company->guestOptions[$company->guest];?></td>
+    </tr>
+    <tr><td colspan='2' class='text-center'></td></tr>
+  </table>
+</div>
+<?php include '../../common/view/footer.html.php';?>