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

Makefile

@@ -78,6 +78,15 @@ rpm:
 	rpmbuild -ba ~/rpmbuild/SPECS/zentaopms.spec
 	cp ~/rpmbuild/RPMS/noarch/zentaopms-${VERSION}-1.noarch.rpm ./
 	rm -rf ~/rpmbuild
+en:
+	unzip ZenTaoPMS.${VERSION}.zip
+	cd zentaopms/; grep -rl 'zentao.net'|xargs sed -i 's/zentao.net/zentao.pm/g';
+	zip -r -9 ZenTaoPMS.$(VERSION).int.zip zentaopms
+	rm -fr zentaopms
+	echo $(VERSION).int > VERSION 
+	make deb
+	make rpm
+	echo $(VERSION) > VERSION
 patchphpdoc:
 	sudo cp misc/doc/phpdoc/*.tpl /usr/share/php/data/PhpDocumentor/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/
 phpdoc:

module/common/model.php

@@ -437,6 +437,7 @@ class commonModel extends model
     {
         global $lang, $app;
 
+        if(isset($lang->menugroup->$moduleName)) $moduleName = $lang->menugroup->$moduleName;
         if(!isset($lang->$moduleName->menu))
         {
             echo "<ul></ul>";

module/common/view/footer.html.php

@@ -55,14 +55,6 @@ $(function()
     }, 60 * 1000);
 })
 
-<?php if(!isset($config->global->novice) and $this->loadModel('tutorial')->checkNovice() and $config->global->flow == 'full'):?>
-novice = confirm('<?php echo $lang->tutorial->novice?>');
-$.get(createLink('tutorial', 'ajaxSaveNovice', 'novice=' + (novice ? 'true' : 'false')), function()
-{
-    if(novice) location.href=createLink('tutorial', 'index');
-});
-<?php endif;?>
-
 <?php if(!empty($this->config->sso->redirect)):?>
 <?php
 $ranzhiAddr = $this->config->sso->addr;

module/user/view/login.html.php

@@ -81,7 +81,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
       <div class="table-col text-middle text-center">
         <div id="poweredby">
           <?php if($config->checkVersion):?>
-          <?php $siteURL = $this->app->getClientLang() == 'en' ? 'http://api.zentao.pm' : 'http://api.zentao.net';?>
+          <?php $siteURL = 'http://api.zentao.net';?>
           <iframe id='updater' class='hidden' frameborder='0' width='100%' scrolling='no' allowtransparency='true' src="<?php echo $siteURL;?>/updater-isLatest-<?php echo $config->version;?>-<?php echo $s;?>.html?lang=<?php echo str_replace('-', '_', $this->app->getClientLang())?>"></iframe>
           <?php endif;?>
           <?php echo html::hidden('verifyRand', $rand);?>