bugfix

huhang678 · Aug 26, 2015 · 2a3b320 · 2a3b320
1 parent 48f4186
commit 2a3b320
Show file tree

Hide file tree

Showing 8 changed files with 1,376 additions and 1,260 deletions.
diff --git a/app/publish/ajax.php b/app/publish/ajax.php
@@ -509,7 +509,7 @@ public function publish_question_action()
                 switch ($upload_error)
                 {
                     default:
-                        H::ajax_json_output(AWS_APP::RSM(null, '-1', AWS_APP::lang()->_t('保存图片失败，错误为 %s' . $upload_error)));
+                        H::ajax_json_output(AWS_APP::RSM(null, '-1', AWS_APP::lang()->_t('保存图片失败，错误为: %s', $upload_error)));
 
                         break;
 

diff --git a/install/index.php b/install/index.php
@@ -94,7 +94,12 @@
 		{
 			$system_require['zlib'] = TRUE;
 		}
-
+
+		if (function_exists('stream_socket_client'))
+		{
+			$system_require['stream_socket_client'] = TRUE;
+		}
+
 		// 检测 AWS_PATH 是否有写权限
 		if (is_really_writable(AWS_PATH) OR defined('IN_SAE'))
 		{

diff --git a/language/en_US.js b/language/en_US.js
@@ -72,4 +72,4 @@ aws_lang['赞'] = 'Like';
 aws_lang['暂无介绍'] = 'No Introduction';
 aws_lang['没有未读通知'] = 'No unread notifications';
 aws_lang['暂无评论'] = 'No comments';
-aws_lang['帮助中心'] = 'Help';
+aws_lang['帮助中心'] = 'Help center';
diff --git a/language/en_US.php b/language/en_US.php
diff --git a/system/init.php b/system/init.php
@@ -29,7 +29,8 @@
 	die('Error: WeCenter not support PHP version 6 currently');
 }
 
-define('START_TIME', microtime(TRUE));define('TIMESTAMP', time());
+define('START_TIME', microtime(TRUE));
+define('TIMESTAMP', time());
 
 if (function_exists('memory_get_usage'))
 {

diff --git a/system/system.php b/system/system.php
@@ -17,6 +17,8 @@
 	define('AWS_PATH', dirname(__FILE__) . '/');
 }
 
+require_once (AWS_PATH . 'init.php');
+
 if (defined('G_GZIP_COMPRESS') AND G_GZIP_COMPRESS === TRUE)
 {
 	if (@ini_get('zlib.output_compression') == FALSE)
@@ -31,8 +33,6 @@
 	}
 }
 
-require_once (AWS_PATH . 'init.php');
-
 require_once (AWS_PATH . 'aws_app.inc.php');
 require_once (AWS_PATH . 'aws_controller.inc.php');
 require_once (AWS_PATH . 'aws_model.inc.php');
diff --git a/views/default/global/header.tpl.htm b/views/default/global/header.tpl.htm
@@ -148,7 +148,7 @@
 	<?php if ($this->user_id AND $this->user_info['email'] AND !$this->user_info['valid_email'] AND get_setting('register_valid_type') != 'N') { ?>
 	<div class="aw-email-verify">
 		<div class="container text-center">
-			<?php _e('你的邮箱 %s 还未验证, <a onclick="AWS.ajax_request(G_BASE_URL + \'/account/ajax/send_valid_mail/\');">点击这里重新发送验证邮件</a>', $this->user_info['email']); ?>
+			<a onclick="AWS.ajax_request(G_BASE_URL + '/account/ajax/send_valid_mail/');"><?php _e('你的邮箱 %s 还未验证, 点击这里重新发送验证邮件', $this->user_info['email']); ?></a>
 		</div>
 	</div>
 	<?php } ?>

diff --git a/views/default/install/index.tpl.htm b/views/default/install/index.tpl.htm
@@ -50,6 +50,9 @@ <h3><?php _e('网络限制'); ?></h3>
 		<li>
 			<b><?php _e('编码转换'); ?></b><?php if (!$this->system_require['convert_encoding']) { ?><span class="red">× <?php _e('WeCenter 至少需要有 MB 或 ICONV 编码转换处理库才能正常运行'); ?></span><?php } else { ?><span class="green">√</span><?php } ?>
 		</li>
+		<li>
+			<b><?php _e('邮件相关'); ?></b><?php if (!$this->system_require['stream_socket_client']) { ?><span class="red">× <?php _e('WeCenter 至少需要 stream_socket_client 处理库才能发送邮件'); ?></span><?php } else { ?><span class="green">√</span><?php } ?>
+		</li>
 		<li>
 			<b><?php _e('上传限制'); ?></b><span><?php echo get_cfg_var('upload_max_filesize'); ?> (<?php _e('此处建议值'); ?> > 8M)</span>
 		</li>
@@ -60,7 +63,7 @@ <h3><?php _e('网络限制'); ?></h3>
 			<b><?php _e('目录权限'); ?></b><span><?php echo AWS_PATH; ?>config/</span><?php if (!$this->system_require['config_writable_config']) { ?><span class="red">×</span><?php } else { ?><span class="green">√</span><?php } ?>
 		</li>
 	</ul>
-	<a class="btn btn-success pull-right"<?php if (sizeof($this->system_require) != 12) { ?> onclick="alert('<?php _e('抱歉, 您的服务器需要满足系统的运行需求才能安装'); ?>');"<?php } else { ?> onclick="document.getElementById('installer').submit(); this.className='btn btn-success disabled pull-right'; this.onclick='';"<?php } ?>><?php _e('下一步'); ?></a>
+	<a class="btn btn-success pull-right<?php if (sizeof($this->system_require) != 13) { ?> disabled<?php } ?>" <?php if (sizeof($this->system_require) == 13) { ?>onclick="document.getElementById('installer').submit(); this.className='btn btn-success disabled pull-right'; this.onclick='';"<?php } ?>><?php _e('下一步'); ?></a>
 	 </form>
 </div>