diff --git a/module/common/lang/en.php b/module/common/lang/en.php index d4f7d65b6d..eb77725c81 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -81,7 +81,7 @@ $lang->homepage = 'Set as Home'; $lang->tutorial = 'Tutorial'; $lang->changeLog = 'Change Log'; $lang->manual = 'Manual'; -$lang->manualUrl = 'http://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; +$lang->manualUrl = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; $lang->customMenu = 'Custom Menu'; $lang->customField = 'Custom Field'; $lang->lineNumber = 'Line No.'; @@ -478,9 +478,9 @@ $lang->pager->previousPage = "Prev"; $lang->pager->nextPage = "Next"; $lang->pager->summery = "%s-%s of %s."; -$lang->proVersion = "ZenTao Pro   "; +$lang->proVersion = "ZenTao Pro   "; $lang->downNotify = "Download Desktop Notification"; -$lang->website = "http://www.zentao.net"; +$lang->website = "https://www.zentao.net"; $lang->suhosinInfo = "Warning! Data is reaching the limit. Please change sohusin.post.max_vars and sohusin.request.max_vars (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved."; $lang->maxVarsInfo = "Warning! Data is reaching the limit. Please change max_input_vars (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved."; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index ed31a23892..8ed19b6c31 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -81,7 +81,7 @@ $lang->homepage = '设为模块首页'; $lang->tutorial = '新手教程'; $lang->changeLog = '修改日志'; $lang->manual = '手册'; -$lang->manualUrl = 'http://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; +$lang->manualUrl = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; $lang->customMenu = '自定义导航'; $lang->customField = '自定义表单项'; $lang->lineNumber = '行号'; @@ -478,9 +478,9 @@ $lang->pager->previousPage = "上一页"; $lang->pager->nextPage = "下一页"; $lang->pager->summery = "第 %s-%s 项，共 %s 项"; -$lang->proVersion = "专业版   "; +$lang->proVersion = "专业版   "; $lang->downNotify = "下载桌面提醒"; -$lang->website = "http://www.zentao.net"; +$lang->website = "https://www.zentao.net"; $lang->suhosinInfo = "警告：数据太多，请在php.ini中修改sohusin.post.max_vars和sohusin.request.max_vars（大于%s的数）。 保存并重新启动apache或php-fpm，否则会造成部分数据无法保存。"; $lang->maxVarsInfo = "警告：数据太多，请在php.ini中修改max_input_vars（大于%s的数）。 保存并重新启动apache或php-fpm，否则会造成部分数据无法保存。"; diff --git a/module/entry/config.php b/module/entry/config.php index b6489cc595..2d8908135d 100644 --- a/module/entry/config.php +++ b/module/entry/config.php @@ -5,7 +5,7 @@ $config->entry->create->requiredFields = 'name, code, account, key'; $config->entry->edit = new stdclass(); $config->entry->edit->requiredFields = 'name, code, account, key'; -$config->entry->help = 'http://www.zentao.net/book/zentaopmshelp/integration-287.html'; +$config->entry->help = 'https://www.zentao.net/book/zentaopmshelp/integration-287.html'; $config->entry->errcode['PARAM_CODE_MISSING'] = 401; $config->entry->errcode['PARAM_TOKEN_MISSING'] = 401; diff --git a/module/extension/config.php b/module/extension/config.php index 5e92a4312c..8ffd0ccfcf 100644 --- a/module/extension/config.php +++ b/module/extension/config.php @@ -1,4 +1,4 @@ extension = new stdclass(); -$config->extension->apiRoot = 'http://api.zentao.net/extension-'; +$config->extension->apiRoot = 'https://api.zentao.net/extension-'; $config->extension->extPathes = array('module', 'bin', 'www', 'library', 'config'); diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php index af95cd08fd..e099087a8f 100644 --- a/module/extension/lang/en.php +++ b/module/extension/lang/en.php @@ -38,7 +38,7 @@ $lang->extension->dirs = 'Directories'; $lang->extension->files = 'Files'; $lang->extension->status = 'Status'; $lang->extension->version = 'Version'; -$lang->extension->latest = 'Latest:%s，need zentao %s'; +$lang->extension->latest = 'Latest:%s，need zentao %s'; $lang->extension->author = 'Author'; $lang->extension->license = 'License'; $lang->extension->site = 'Website'; diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php index ee38b9e1e5..b161e0bbde 100644 --- a/module/extension/lang/zh-cn.php +++ b/module/extension/lang/zh-cn.php @@ -38,7 +38,7 @@ $lang->extension->dirs = '安装目录'; $lang->extension->files = '安装文件'; $lang->extension->status = '状态'; $lang->extension->version = '版本'; -$lang->extension->latest = '最新版本%s，兼容禅道%s'; +$lang->extension->latest = '最新版本%s，兼容禅道%s'; $lang->extension->author = '作者'; $lang->extension->license = '授权'; $lang->extension->site = '官网'; diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php index 720356e0fe..38af9f77ce 100644 --- a/module/extension/lang/zh-tw.php +++ b/module/extension/lang/zh-tw.php @@ -38,7 +38,7 @@ $lang->extension->dirs = '安裝目錄'; $lang->extension->files = '安裝檔案'; $lang->extension->status = '狀態'; $lang->extension->version = '版本'; -$lang->extension->latest = '最新版本%s，兼容禪道%s'; +$lang->extension->latest = '最新版本%s，兼容禪道%s'; $lang->extension->author = '作者'; $lang->extension->license = '授權'; $lang->extension->site = '官網'; diff --git a/module/extension/model.php b/module/extension/model.php index e1917e8b6e..afb3f6f627 100644 --- a/module/extension/model.php +++ b/module/extension/model.php @@ -16,14 +16,6 @@ class extensionModel extends model */ const EXT_MANAGER_VERSION = '1.3'; - /** - * The api agent(use snoopy). - * - * @var object - * @access public - */ - public $agent; - /** * The api root. * @@ -41,22 +33,10 @@ class extensionModel extends model public function __construct() { parent::__construct(); - $this->setAgent(); $this->setApiRoot(); $this->classFile = $this->app->loadClass('zfile'); } - /** - * Set the api agent. - * - * @access public - * @return void - */ - public function setAgent() - { - $this->agent = $this->app->loadClass('snoopy'); - } - /** * Set the apiRoot. * @@ -78,8 +58,7 @@ class extensionModel extends model public function fetchAPI($url) { $url .= (strpos($url, '?') === false ? '?' : '&') . 'lang=' . str_replace('-', '_', $this->app->getClientLang()) . '&managerVersion=' . self::EXT_MANAGER_VERSION . '&zentaoVersion=' . $this->config->version; - $this->agent->fetch($url); - $result = json_decode($this->agent->results); + $result = json_decode(common::http($url)); if(!isset($result->status)) return false; if($result->status != 'success') return false; @@ -170,8 +149,7 @@ class extensionModel extends model public function downloadPackage($extension, $downLink) { $packageFile = $this->getPackageFile($extension); - $this->agent->fetch($downLink); - file_put_contents($packageFile, $this->agent->results); + file_put_contents($packageFile, common::http($downLink)); } /** diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 1bbe1c1256..3c63d29a1d 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -31,8 +31,8 @@ ZenTao PMS is built on PHP + MySQL and based on ZenTaoPHP framework, an independ EOT; $lang->install->links = <<Nature Easy Soft Co., LTD. -Official Website : http://www.zentao.pm -Technical Support : http://www.zentao.pm/forum/ +Official Website : https://www.zentao.pm +Technical Support : https://www.zentao.pm/forum/ WhatsApp Group : https://chat.whatsapp.com/B6pi6b3gv0S7x7jqMxwhbF Twitter: cneasysoft @@ -168,7 +168,7 @@ $lang->install->login = 'Login ZenTao'; $lang->install->register = 'Register in ZenTao'; $lang->install->joinZentao = <<You have installed ZenTao %s. Please delete install.php asap.

Note: In order to get the latest news of ZenTao, please register in ZenTao(www.zentao.pm).

+

You have installed ZenTao %s. Please delete install.php asap.

Note: In order to get the latest news of ZenTao, please register in ZenTao(www.zentao.pm).

EOT; $lang->install->product = array('chanzhi', 'ranzhi'); diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index c813bb19ec..2d376227d0 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -17,7 +17,7 @@ $lang->install->pre = '返回'; $lang->install->reload = '刷新'; $lang->install->error = '错误 '; -$lang->install->officeDomain = 'http://www.zentao.net'; +$lang->install->officeDomain = 'https://www.zentao.net'; $lang->install->start = '开始安装'; $lang->install->keepInstalling = '继续安装当前版本'; @@ -31,8 +31,8 @@ $lang->install->desc = <<install->links = <<青岛易软天创网络科技有限公司开发。 -官方网站：http://www.zentao.net -技术支持：http://www.zentao.net/ask/ +官方网站：https://www.zentao.net +技术支持：https://www.zentao.net/ask/ 新浪微博：http://weibo.com/easysoft @@ -168,7 +168,7 @@ $lang->install->login = '登录禅道管理系统'; $lang->install->register = '禅道社区注册'; $lang->install->joinZentao = <<您已经成功安装禅道管理系统%s，请及时删除install.php。

友情提示：为了您及时获得禅道的最新动态，请在禅道社区(www.zentao.net)进行登记。

+

您已经成功安装禅道管理系统%s，请及时删除install.php。

友情提示：为了您及时获得禅道的最新动态，请在禅道社区(www.zentao.net)进行登记。

EOT; $lang->install->product = array('chanzhi', 'ranzhi', 'xuanxuan'); diff --git a/module/install/model.php b/module/install/model.php index d2ef6574b3..bb9d0b3b65 100644 --- a/module/install/model.php +++ b/module/install/model.php @@ -60,10 +60,10 @@ class installModel extends model public function getLatestRelease() { if(!function_exists('json_decode')) return false; - $snoopy = $this->app->loadClass('snoopy'); - if(@$snoopy->fetchText('http://www.zentao.net/misc-getlatestrelease.json')) + $result = common::http('http://www.zentao.net/misc-getlatestrelease.json'); + if($result) { - $result = json_decode($snoopy->results); + $result = json_decode($result); if(isset($result->release) and $this->config->version != $result->release->version) { return $result->release; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 1a858ceb0b..93c3cad352 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -12,7 +12,7 @@ $lang->misc = new stdclass(); $lang->misc->common = 'Misc'; $lang->misc->ping = 'Ping'; -$lang->misc->api = 'http://api.zentao.net'; +$lang->misc->api = 'https://api.zentao.net'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Version %s'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index bf88cffcc6..9a870cecb2 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -12,7 +12,7 @@ $lang->misc = new stdclass(); $lang->misc->common = '杂项'; $lang->misc->ping = '防超时'; -$lang->misc->api = 'http://api.zentao.net'; +$lang->misc->api = 'https://api.zentao.net'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = '版本%s'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 9f7e01d1fd..ef69befdae 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -44,7 +44,7 @@ $lang->my->home->projects = $lang->projectCommon; $lang->my->home->products = $lang->productCommon; $lang->my->home->createProject = "Create {$lang->projectCommon}"; $lang->my->home->createProduct = "Create {$lang->productCommon}"; -$lang->my->home->help = "Help"; +$lang->my->home->help = "Help"; $lang->my->home->noProductsTip = "No {$lang->productCommon} found here."; $lang->my->form = new stdclass(); diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index 3ef9c20b22..f63c895337 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -44,7 +44,7 @@ $lang->my->home->projects = $lang->projectCommon; $lang->my->home->products = $lang->productCommon; $lang->my->home->createProject = "创建一个{$lang->projectCommon}"; $lang->my->home->createProduct = "创建一个{$lang->productCommon}"; -$lang->my->home->help = "帮助文档"; +$lang->my->home->help = "帮助文档"; $lang->my->home->noProductsTip = "这里还没有{$lang->productCommon}。"; $lang->my->form = new stdclass(); diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php index fb7d9c395e..bac4cfc7da 100644 --- a/module/my/lang/zh-tw.php +++ b/module/my/lang/zh-tw.php @@ -44,7 +44,7 @@ $lang->my->home->projects = $lang->projectCommon; $lang->my->home->products = $lang->productCommon; $lang->my->home->createProject = "創建一個{$lang->projectCommon}"; $lang->my->home->createProduct = "創建一個{$lang->productCommon}"; -$lang->my->home->help = "幫助文檔"; +$lang->my->home->help = "幫助文檔"; $lang->my->home->noProductsTip = "這裡還沒有{$lang->productCommon}。"; $lang->my->form = new stdclass(); diff --git a/module/project/lang/en.php b/module/project/lang/en.php index af7c0912ef..c4329fcae7 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -205,7 +205,7 @@ $lang->project->timeSummary = '
Tasks %s ：Wait %s   Doing %s
Est. %s ：Cost %s   Left %s
"; $lang->project->wbs = "Decompose Tasks"; $lang->project->batchWBS = "Batch Decompose"; -$lang->project->howToUpdateBurn = "Help "; +$lang->project->howToUpdateBurn = "Help "; $lang->project->whyNoStories = "No Story can be linked. Please check whether there is Story in {$lang->projectCommon} linked {$lang->productCommon} and make sure it has been reviewed."; $lang->project->productStories = "{$lang->projectCommon} linked story is the subeset of {$lang->productCommon}, which can only be linked after review. Please Link Story。"; $lang->project->haveDraft = "There are %s draft stories can't be linked."; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 94ccfbab4d..de4b8db9bb 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -205,7 +205,7 @@ $lang->project->timeSummary = '
总任务 %s : 未开始 %s   进行中 %s
总预计 %s : 已消耗 %s   剩余 %s
"; $lang->project->wbs = "分解任务"; $lang->project->batchWBS = "批量分解"; -$lang->project->howToUpdateBurn = "帮助 "; +$lang->project->howToUpdateBurn = "帮助 "; $lang->project->whyNoStories = "看起来没有需求可以关联。请检查下{$lang->projectCommon}关联的{$lang->productCommon}中有没有需求，而且要确保它们已经审核通过。"; $lang->project->productStories = "{$lang->projectCommon}关联的需求是{$lang->productCommon}需求的子集，并且只有评审通过的需求才能关联。请关联需求。"; $lang->project->haveDraft = "有%s条草稿状态的需求无法关联到该{$lang->projectCommon}"; diff --git a/module/report/lang/en.php b/module/report/lang/en.php index e0528f8538..8565483277 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -99,5 +99,5 @@ $lang->report->mailTitle->task = " Task (%s),"; $lang->report->mailTitle->todo = " Todo (%s),"; $lang->report->mailTitle->testTask = " Test Task (%s),"; -$lang->report->proVersion = 'Try ZenTao Pro for more!'; +$lang->report->proVersion = 'Try ZenTao Pro for more!'; $lang->report->proVersionEn = 'Try ZenTao Pro for more!'; diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php index 2f7333d183..4ab6d666e5 100644 --- a/module/report/lang/zh-cn.php +++ b/module/report/lang/zh-cn.php @@ -99,5 +99,5 @@ $lang->report->mailTitle->task = " 任务(%s),"; $lang->report->mailTitle->todo = " 待办(%s),"; $lang->report->mailTitle->testTask = " 测试版本(%s),"; -$lang->report->proVersion = '更多精彩，尽在专业版！'; +$lang->report->proVersion = '更多精彩，尽在专业版！'; $lang->report->proVersionEn = 'Try ZenTao Pro for more!'; diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php index ca8d407f30..356ddb4c76 100644 --- a/module/testreport/lang/en.php +++ b/module/testreport/lang/en.php @@ -59,7 +59,7 @@ $lang->testreport->caseSummary = ' %s cases in Total : testreport->buildSummary = 'Tested %s build.'; $lang->testreport->confirmDelete = 'Do you want tot delete this report?'; $lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao extension mechanism, or you can contact us for customization.'; -$lang->testreport->exportNotice = "Export By ZenTaoPMS"; +$lang->testreport->exportNotice = "Export By ZenTaoPMS"; $lang->testreport->noReport = "No report has been generated. Please check it later."; $lang->testreport->foundBugTip = "Bugs created in this build and created in the test period."; $lang->testreport->legacyBugTip = "Active Bugs, or the resolved beyond the test period."; diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php index 82b8cf6d2e..57f8f1234b 100644 --- a/module/testreport/lang/zh-cn.php +++ b/module/testreport/lang/zh-cn.php @@ -59,7 +59,7 @@ $lang->testreport->caseSummary = '共有%s个用例，共执 $lang->testreport->buildSummary = '共测试了%s个版本。'; $lang->testreport->confirmDelete = '是否删除该报告？'; $lang->testreport->moreNotice = '更多功能可以参考禅道扩展机制进行扩展，也可以联系我们进行定制。'; -$lang->testreport->exportNotice = "由禅道项目管理软件导出"; +$lang->testreport->exportNotice = "由禅道项目管理软件导出"; $lang->testreport->noReport = "报表还没有生成，请稍候查看。"; $lang->testreport->foundBugTip = "影响版本在测试轮次内，并且创建时间在测试时间范围内产生的Bug数。"; $lang->testreport->legacyBugTip = "Bug状态是激活，或Bug的解决时间在测试结束时间之后。"; diff --git a/module/todo/model.php b/module/todo/model.php index 4a468d17fe..7e93163643 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -448,6 +448,7 @@ class todoModel extends model { $this->loadModel('action'); $today = helper::today(); + $now = helper::now(); $lastCycleList = $this->dao->select('*')->from(TABLE_TODO)->where('type')->eq('cycle')->andWhere('idvalue')->in(array_keys($todoList))->orderBy('date_asc')->fetchAll('idvalue'); foreach($todoList as $todoID => $todo) { @@ -459,16 +460,19 @@ class todoModel extends model if($today < $begin or (!empty($end) && $today > $end)) continue; $newTodo = new stdclass(); - $newTodo->account = $todo->account; - $newTodo->begin = $todo->begin; - $newTodo->end = $todo->end; - $newTodo->type = 'cycle'; - $newTodo->idvalue = $todoID; - $newTodo->pri = $todo->pri; - $newTodo->name = $todo->name; - $newTodo->desc = $todo->desc; - $newTodo->status = 'wait'; - $newTodo->private = $todo->private; + $newTodo->account = $todo->account; + $newTodo->begin = $todo->begin; + $newTodo->end = $todo->end; + $newTodo->type = 'cycle'; + $newTodo->idvalue = $todoID; + $newTodo->pri = $todo->pri; + $newTodo->name = $todo->name; + $newTodo->desc = $todo->desc; + $newTodo->status = 'wait'; + $newTodo->private = $todo->private; + $newTodo->assignedTo = $todo->assignedTo; + $newTodo->assignedBy = $todo->assignedBy; + if($todo->assignedTo) $newTodo->assignedDate = $now; $date = ''; $start = strtotime($begin); diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index 2d2b2e2422..f7f46d63f0 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -82,7 +82,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
checkVersion):?> - +