'.
+ ''.($addonids[$id] ? "$style[tplname] " : $style['tplname']).' '.
($id > 0 ? "
{$lang['styles_default']}
@@ -227,8 +227,8 @@
".($isdefault || $isdefault1 || $isdefault2 || $isdefault3 ? '
{$lang['edit']} ".
(($isplugindeveloper && $isfounder) || !$addonids[$style['styleid']] || !cloudaddons_getmd5($addonids[$style['styleid']]) ? " {$lang['export']} {$lang['copy']} {$lang['restore']}
- ".($isfounder && $addonids[$id] ? " {$lang['plugins_visit']} " : '')."
+ "{$lang['copy']} {$lang['restore']}
+ ".($isfounder && $addonids[$id] ? " {$lang['plugins_visit']} " : '')."
"
:
"
@@ -568,7 +568,7 @@ function imgpre_switch(id) {
echo '';
showtips('styles_tips');
- showformheader("styles&operation=edit&id=$id");
+ showformheader("styles&operation=edit&id=$id", 'enctype');
showtableheader($lang['styles_edit'], 'nobottom');
showsetting('styles_edit_name', 'namenew', $style['name'], 'text');
showsetting('styles_edit_tpl', array('templateidnew', $tplselect), $style['templateid'], 'select');
@@ -579,9 +579,14 @@ function imgpre_switch(id) {
showsetting('styles_edit_smileytype', array("stylevar[{$stylestuff['stypeid']['id']}]", $smileytypes), $stylestuff['stypeid']['subst'], 'select');
showsetting('styles_edit_imgdir', '', '', ''.$lang['next'].' ' : '').
($showkbd && !$simple && $pages > $page && !$ajaxtarget && !$wml ? ''.($shownum && !$simple ? ' '.$num.' ' : '').$multipage.'
' : '';
}
$maxpage = $realpages;
diff --git a/upload/source/class/model/model_forum_post.php b/upload/source/class/model/model_forum_post.php
index c620bc22..cbbb2459 100644
--- a/upload/source/class/model/model_forum_post.php
+++ b/upload/source/class/model/model_forum_post.php
@@ -18,12 +18,6 @@ class model_forum_post extends discuz_model {
public $post;
-
-
-
-
-
-
public $pid = 0;
public $feed = array();
@@ -46,7 +40,7 @@ public function __construct($tid = null, $pid = null) {
protected function _init_parameters($parameters) {
$varname = array(
- 'member', 'group', 'forum', 'thread', 'extramessage', 'special',
+ 'member', 'group', 'forum', 'thread', 'extramessage', 'special',//'nauthorid' 'modnewreplies' 'tid'
'message','clientip', 'invisible', 'isanonymous', 'usesig',
'htmlon', 'bbcodeoff', 'smileyoff', 'parseurloff', 'pstatus',
'noticetrimstr', 'noticeauthor', 'from', 'sechash', 'geoloc',
@@ -221,7 +215,7 @@ public function newreply($parameters) {
if($this->param['modnewreplies']) {
updatemoderate('pid', $this->pid);
- unset($this->param['showmsgparam']['pid']);
+ $this->param['showmsgparam']['reply_mod'] = 1;
if($this->param['updatethreaddata']) {
C::t('forum_thread')->update($this->thread['tid'], $this->param['updatethreaddata'], false, false, 0, true);
}
@@ -412,7 +406,7 @@ public function editpost($parameters) {
$displayorder = (empty($this->param['save']) || $this->thread['displayorder'] != -4 ) ? ($this->thread['displayorder'] == -4 ? -4 : $this->thread['displayorder']) : -4;
$this->param['typeid'] = isset($this->param['typeid']) && isset($this->forum['threadtypes']['types'][$this->param['typeid']]) && (!$this->forum['threadtypes']['moderators'][$this->param['typeid']] || $this->forum['ismoderator']) ? $this->param['typeid'] : 0;
- $this->param['sortid'] = $this->param['special'] || !$this->forum['threadsorts']['types'][$this->param['sortid']] ? 0 : $this->param['sortid'];
+ $this->param['sortid'] = $this->param['special'] || !$this->forum['threadsorts']['types'][$this->param['sortid']] ? 0 : $this->param['sortid'];
$this->param['threadupdatearr']['typeid'] = $this->param['typeid'];
@@ -472,7 +466,7 @@ public function editpost($parameters) {
}
if(!$isfirstpost) {
C::t('forum_thread')->increase($this->thread['tid'], array('replies' => 1));
- }
+ }
updatemodworks('MOD', 1);
updatemodlog($this->thread['tid'], 'MOD');
}
diff --git a/upload/source/discuz_version.php b/upload/source/discuz_version.php
index 250a5d17..290450dc 100644
--- a/upload/source/discuz_version.php
+++ b/upload/source/discuz_version.php
@@ -13,9 +13,9 @@
if(!defined('DISCUZ_VERSION')) {
define('DISCUZ_VERSION', 'X3.5');
- define('DISCUZ_RELEASE', '20230520');
+ define('DISCUZ_RELEASE', '20230726');
define('DISCUZ_FIXBUG', '35000000');
- define('DISCUZ_TH_REVISION', '6'); /*jaideejung007*/
+ define('DISCUZ_TH_REVISION', '7'); /*jaideejung007*/
}
?>
\ No newline at end of file
diff --git a/upload/source/function/cache/cache_styles.php b/upload/source/function/cache/cache_styles.php
index 481e4951..cfc06803 100644
--- a/upload/source/function/cache/cache_styles.php
+++ b/upload/source/function/cache/cache_styles.php
@@ -38,12 +38,12 @@ function build_cache_styles() {
$flash[0] = preg_match('/^(https?:)?\/\//i', $flash[0]) ? $flash[0] : $data['styleimgdir'].'/'.$flash[0];
$data['boardlogo'] = "[+] ";
+ $addtomenu = " ";
$dtitle = str_replace("'", "\'", cplang('admincp_title').' - '.str_replace(' » ', ' - ', $title));
echo '';
}
diff --git a/upload/source/function/function_block.php b/upload/source/function/function_block.php
index e53100be..af335998 100644
--- a/upload/source/function/function_block.php
+++ b/upload/source/function/function_block.php
@@ -425,7 +425,7 @@ function block_template($bid) {
} else {
$image->Thumb($replacevalue, $thumbpath, $block['picwidth'], $block['picheight'], 2);
if(file_exists($_G['setting']['attachdir'].'./'.$thumbpath)) {
- if(ftpperm(fileext($thumbpath), filesize($_G['setting']['attachdir'].'./'.$thumbpath)) && $ftp->upload($_G['setting']['attachurl'].'/'.$thumbpath, $thumbpath)) {
+ if(ftpperm(fileext($thumbpath), filesize($_G['setting']['attachdir'].'./'.$thumbpath)) && $ftp->upload($_G['setting']['attachdir'].'/'.$thumbpath, $thumbpath)) {
$picflag = 1; //common_block_pic表中的picflag标识（0本地，1远程）
$_G['block_makethumb'] = true;
@unlink($_G['setting']['attachdir'].'./'.$thumbpath);
diff --git a/upload/source/function/function_core.php b/upload/source/function/function_core.php
index 31d8ab0b..b0841690 100644
--- a/upload/source/function/function_core.php
+++ b/upload/source/function/function_core.php
@@ -483,6 +483,7 @@ function avatar($uid, $size = 'middle', $returnsrc = 0, $real = FALSE, $static =
$size = in_array($size, array('big', 'middle', 'small')) ? $size : 'middle';
$uid = abs(intval($uid));
$rawuid = $uid;
+ $class = trim($class.' user_avatar');
if(!$staticavatar && !$static && $ucenterurl != '.') {
if($avatarurl != $ucenterurl.'/data/avatar') {
$ucenterurl = $avatarurl;
@@ -750,6 +751,10 @@ function template($file, $templateid = 0, $tpldir = '', $gettplfile = 0, $primal
if(strpos($tpldir, 'plugin') && (file_exists(DISCUZ_ROOT.$mobiletplfile) || file_exists(substr(DISCUZ_ROOT.$mobiletplfile, 0, -4).'.php'))) {
$tplfile = $mobiletplfile;
} elseif(!file_exists(DISCUZ_ROOT.TPLDIR.'/'.$mobiletplfile) && !file_exists(substr(DISCUZ_ROOT.TPLDIR.'/'.$mobiletplfile, 0, -4).'.php')) {
+ if(strpos($file, $_G['mobiletpl'][IN_MOBILE].'/email/') === 0) {
+ $tplfile = str_replace($_G['mobiletpl'][IN_MOBILE].'/', '', $tplfile);
+ $file = str_replace($_G['mobiletpl'][IN_MOBILE].'/', '', $file);
+ }
$mobiletplfile = './template/default/'.$file.'.htm';
if(!file_exists(DISCUZ_ROOT.$mobiletplfile) && !$_G['forcemobilemessage']) {
$tplfile = str_replace($_G['mobiletpl'][IN_MOBILE].'/', '', $tplfile);
diff --git a/upload/source/function/function_portalcp.php b/upload/source/function/function_portalcp.php
index f8b8d464..ee5e2243 100644
--- a/upload/source/function/function_portalcp.php
+++ b/upload/source/function/function_portalcp.php
@@ -1095,16 +1095,25 @@ function getprimaltplname($filename) {
if(empty($tpldirectory)) {
$tpldirectory = ($_G['cache']['style_default']['tpldir'] ? $_G['cache']['style_default']['tpldir'] : './template/default');
}
- $content = @file_get_contents(DISCUZ_ROOT.$tpldirectory.'/'.$filename);
+ if(file_exists(DISCUZ_ROOT.$tpldirectory.'/'.$filename)) {
+ $file = DISCUZ_ROOT.$tpldirectory.'/'.$filename;
+ } elseif(file_exists(DISCUZ_ROOT.$tpldirectory.'/'.substr(DISCUZ_ROOT.$filename, 0, -4).'.php')) {
+ $file = DISCUZ_ROOT.$tpldirectory.'/'.substr($filename, 0, -4).'.php';
+ } else {
+ $file = DISCUZ_ROOT.'./template/default/'.$filename;
+ }
$name = $tpldirectory.'/'.$filename;
- if($content) {
- preg_match("/\<\!\-\-\[name\](.+?)\[\/name\]\-\-\>/i", trim($content), $mathes);
- if(!empty($mathes[1])) {
- preg_match("/^\{lang (.+?)\}$/", $mathes[1], $langs);
- if(!empty($langs[1])) {
- $name = !$lang[$langs[1]] ? $langs[1] : $lang[$langs[1]];
- } else {
- $name = dhtmlspecialchars($mathes[1]);
+ if(file_exists($file)) {
+ $content = @file_get_contents($file);
+ if($content) {
+ preg_match("/\<\!\-\-\[name\](.+?)\[\/name\]\-\-\>/i", trim($content), $mathes);
+ if(!empty($mathes[1])) {
+ preg_match("/^\{lang (.+?)\}$/", $mathes[1], $langs);
+ if(!empty($langs[1])) {
+ $name = !$lang[$langs[1]] ? $langs[1] : $lang[$langs[1]];
+ } else {
+ $name = dhtmlspecialchars($mathes[1]);
+ }
}
}
}
diff --git a/upload/source/include/space/space_blog.php b/upload/source/include/space/space_blog.php
index f1252723..993dec49 100644
--- a/upload/source/include/space/space_blog.php
+++ b/upload/source/include/space/space_blog.php
@@ -353,20 +353,22 @@
}
function blog_get_stick($uid, $stickblogs, $summarylen) {
- $list = array();
+ $list = $stickids = array();
if($stickblogs) {
$data_blog = C::t('home_blog')->fetch_all_blog($stickblogs);
$data_blogfield = C::t('home_blogfield')->fetch_all($stickblogs);
foreach ($stickblogs as $blogid) {
if(!empty($data_blog[$blogid]) && !empty($data_blogfield[$blogid])) {
$value = array_merge($data_blog[$blogid], $data_blogfield[$blogid]);
- $value['message'] = getstr($value['message'], $summarylen, 0, 0, 0, -1);
- $value['message'] = preg_replace("/&[a-z]+\;/i", '', $value['message']);
- if($value['pic']) $value['pic'] = pic_cover_get($value['pic'], $value['picflag']);
- $value['dateline'] = dgmdate($value['dateline']);
- $value['stickflag'] = true;
- $list[$value['blogid']] = $value;
- $stickids[] = $value['blogid'];
+ if(ckfriend($value['uid'], $value['friend'], $value['target_ids']) && ($value['status'] == 0 || $value['uid'] == $_G['uid'] || $_G['adminid'] == 1)) {
+ $value['message'] = getstr($value['message'], $summarylen, 0, 0, 0, -1);
+ $value['message'] = preg_replace("/&[a-z]+\;/i", '', $value['message']);
+ if($value['pic']) $value['pic'] = pic_cover_get($value['pic'], $value['picflag']);
+ $value['dateline'] = dgmdate($value['dateline']);
+ $value['stickflag'] = true;
+ $list[$value['blogid']] = $value;
+ $stickids[] = $value['blogid'];
+ }
}
}
if(count($stickids) != count($stickblogs)) {
diff --git a/upload/source/include/spacecp/spacecp_album.php b/upload/source/include/spacecp/spacecp_album.php
index 882f6a30..d79b5f18 100644
--- a/upload/source/include/spacecp/spacecp_album.php
+++ b/upload/source/include/spacecp/spacecp_album.php
@@ -318,7 +318,7 @@
showmessage('parameters_error');
}
$attach = C::t('forum_attachment_n')->fetch_attachment('aid:'.$aid, $aid);
- if(empty($attach) || $attach['uid'] != $_G['uid'] || !$attach['isimage']) {
+ if(empty($attach) || !$attach['isimage']) {
showmessage('parameters_error');
}
if($albumid) {
diff --git a/upload/source/language/email/lang_template.php b/upload/source/language/email/lang_template.php
index 581e7da6..ae015760 100644
--- a/upload/source/language/email/lang_template.php
+++ b/upload/source/language/email/lang_template.php
@@ -91,7 +91,7 @@
'add_member_newpassword' => 'รหัสผ่าน: ',
'add_member_can_login' => 'จากนี้ไป คุณสามารถใช้บัญชีของคุณเพื่อเข้าสู่ระบบ {$var[\'bbname\']} ขอให้สนุกกับการใช้งานเว็บไซต์ของเรานะ',
- 'birthday_subject' => 'แฮปปี้เบิร์ทเดย์ทูยู',
+ 'birthday_subject' => 'สุขสันต์วันเกิด',
'birthday_reason' => 'อีเมลนี้ลงทะเบียนเป็นอีเมลผู้ใช้ที่ {$var[\'bbname\']}This operation requires relevant permissions to be enabled in the management group This operation can take effect for applications that support such notifications under UCenter to which the site belongs, but it will cause such notifications not to be supported and the user name will be used as the user name. The application of foreign keys is abnormal. Please note that this request will be sent to UCenter for processing after submission. Due to the time required for data interaction, this operation will generally take effect within a few minutes. If the timeout does not take effect, please update Cache or check if UCenter and site communicate properly ',
- 'members_chgusername_oldusername' => 'User\'s username in this application',
- 'members_chgusername_newusername' => 'New user name',
+ 'members_chgusername' => 'เปลี่ยนชื่อผู้ใช้',
+ 'members_chgusername_tips' => 'การดำเนินการนี้ต้องมีการเปิดใช้สิทธิที่เกี่ยวข้องในกลุ่มการจัดการก่อน การดำเนินการนี้จะมีผลต่อแอป/โปรแกรมที่รองรับการแจ้งเตือนประเภทนี้ใน UCenter ของเว็บไซต์เท่านั้น แต่อาจทำให้แอป/โปรแกรมที่ไม่รองรับประเภทนี้และใช้ชื่อผู้ใช้เป็นตัวเชื่อมกันมีปัญหาได้ กรุณาระมัดระวังถึงปัญหานี้ เมื่อคุณกดส่งคำขอนี้ไปยัง UCenter เพื่อทำการดำเนินการ จะใช้เวลาสักครู่ในการส่งข้อมูลไปมา โดยปกติแล้วการดำเนินการจะเริ่มมีผลในไม่กี่นาที ถ้าเวลาผ่านไปแล้วแต่ยังไม่มีผล กรุณาลองอัปเดตไฟล์แคชหรือตรวจสอบการเชื่อมต่อระหว่าง UCenter และเว็บไซต์ว่ามีปัญหาหรือไม่ ',
+ 'members_chgusername_oldusername' => 'ชื่อผู้ใช้งานเดิมในโปรแกรมนี้',
+ 'members_chgusername_newusername' => 'ชื่อผู้ใช้ใหม่',
'members_search' => 'ค้นหาสมาชิก',
'members_delete' => 'ลบสมาชิก',
diff --git a/upload/source/language/lang_error.php b/upload/source/language/lang_error.php
index 475297b3..56afbcc9 100644
--- a/upload/source/language/lang_error.php
+++ b/upload/source/language/lang_error.php
@@ -32,10 +32,10 @@
'db_config_db_not_found' => 'ข้อผิดพลาดในการกำหนดค่าฐานข้อมูล กรุณาตรวจสอบไฟล์ config_global.php',
'system_init_ok' => 'การเริ่มต้นระบบเว็บไซต์เสร็จสมบูรณ์ กรุณาคลิกที่นี่เพื่อเข้าสู่เว็บไซต์ ',
'backtrace' => 'ข้อมูลการดำเนินการ',
- 'error_end_message' => '{host} ข้อความแสดงข้อผิดพลาดนี้ได้ถูกบันทึกไว้ในรายละเอียด ขออภัยในความไม่สะดวกในการเข้าถึง',
- 'suggestion_user' => 'หากคุณเป็นผู้ใช้งานทั่วไป แนะนำให้ลองรีเฟรชหน้าเว็บ ปิดหน้าต่างเบราว์เซอร์ทั้งหมดแล้วลองดำเนินการอีกครั้ง หากยังไม่สามารถแก้ไขได้ แนะนำให้คุณถ่ายภาพหน้าจอของเว็บไซต์นี้ให้สมบูรณ์และบันทึกไว้ จากนั้นแจ้งปัญหานี้ให้กับผู้ดูแลเว็บไซต์',
- 'suggestion_plugin' => 'หากคุณเป็นเว็บมาสเตอร์ เราขอแนะนำให้คุณลองปิดปลั๊กอิน {guess} และลอง อัปเดตแคช หากปิดปลั๊กอินแล้วปัญหาได้รับการแก้ไข แนะนำให้คุณติดต่อผู้ผลิตปลั๊กอินโดยแนบภาพหน้าจอที่เต็มรูปแบบเพื่อขอความช่วยเหลือ',
- 'suggestion' => 'หากคุณเป็นเว็บมาสเตอร์ ขอแนะนำให้ลองอัปเดตแคช คุณยังสามารถใช้เว็บไซต์ Discuz! อย่างเป็นทางการ เพื่อขอความช่วยเหลือ หากคุณแน่ใจว่านี่เป็นข้อบกพร่องของตัวโปรแกรมเอง คุณสามารถเปิด Issue ใหม่ เพื่อแจ้งให้พวกเราได้รับทราบต่อไป',
+ 'error_end_message' => '{host} ได้บันทึกข้อมูลข้อผิดพลาดนี้อย่างละเอียดแล้ว เราขออภัยในความไม่สะดวกที่เกิดขึ้นในการเข้าชมของคุณ',
+ 'suggestion_user' => 'หากคุณเป็นผู้ใช้งาน ขอแนะนำให้คุณลองรีเฟรชหน้าเว็บ ปิดหน้าต่างเบราว์เซอร์ทั้งหมดแล้วทำการดำเนินการใหม่อีกครั้ง หากยังไม่สามารถแก้ไขได้ ขอแนะนำให้คุณถ่ายภาพหน้าจอทั้งหมดและบันทึกเก็บไว้ จากนั้นแจ้งปัญหานี้ให้ผู้ดูแลเว็บไซต์ต่อไป',
+ 'suggestion_plugin' => 'หากคุณเป็นผู้ดูแลเว็บไซต์ ขอแนะนำให้คุณลองปิดปลั๊กอิน {guess} และอัปเดตแคช ในศูนย์การจัดการ (AdminCP) เมื่อปิดปลั๊กอินแล้วปัญหาได้รับการแก้ไข ขอแนะนำให้คุณติดต่อผู้จัดจำหน่ายปลั๊กอินโดยแนบภาพหน้าจอให้ละเอียดครบถ้วนเพื่อขอความช่วยเหลือเพิ่มเติมต่อไป',
+ 'suggestion' => 'หากคุณเป็นผู้ดูแลเว็บไซต์ ขอแนะนำให้คุณลองอัปเดตแคช ในศูนย์การจัดการ (AdminCP) หรือติดต่อเราผ่านทางเว็บไซต์ Discuz! อย่างเป็นทางการ เพื่อขอความช่วยเหลือ หากคุณแน่ใจว่านี่เป็นข้อบกพร่องของตัวโปรแกรมเอง คุณยังสามารถส่งปัญหาผ่านการสร้าง Issue ใหม่ ถึงเราได้อีกด้วย',
'file_upload_error_-101' => 'อัปโหลดล้มเหลว! ไฟล์ที่จะอัปโหลดไม่อยู่ หรือไม่ถูกต้อง กรุณาย้อนกลับ',
'file_upload_error_-102' => 'อัปโหลดล้มเหลว! รูปแบบของไฟล์ไม่ถูกต้อง กรุณาย้อนกลับ',
diff --git a/upload/source/module/forum/forum_index.php b/upload/source/module/forum/forum_index.php
index 29f5a667..bfdf6410 100644
--- a/upload/source/module/forum/forum_index.php
+++ b/upload/source/module/forum/forum_index.php
@@ -195,7 +195,7 @@
}
if(!$_G['setting']['grid']['gridtype']) {
- $focuspic = $focusurl = $focustext = array();
+ $grids['slide'] = $focuspic = $focusurl = $focustext = array();
$grids['focus'] = 'config=5|0xffffff|0x0099ff|50|0xffffff|0x0099ff|0x000000';
foreach($grids['image'] as $ithread) {
if($ithread['displayorder'] < 0) {
diff --git a/upload/source/module/forum/forum_modcp.php b/upload/source/module/forum/forum_modcp.php
index 159ca30b..c569fa79 100644
--- a/upload/source/module/forum/forum_modcp.php
+++ b/upload/source/module/forum/forum_modcp.php
@@ -60,7 +60,7 @@
}
}
foreach($query as $tforum) {
- $tforum['allowview'] = !isset($tforum['allowview']) ? '' : $tforum['allowview'];
+ $tforum['allowview'] = !isset($tforum['allowview']) ? 0 : $tforum['allowview'];
if($tforum['allowview'] == 1 || ($tforum['allowview'] == 0 && ((!$tforum['viewperm'] && $_G['group']['readaccess']) || ($tforum['viewperm'] && forumperm($tforum['viewperm']))))) {
$modforums['fids'] .= $comma.$tforum['fid']; $comma = ',';
$modforums['recyclebins'][$tforum['fid']] = $tforum['recyclebin'];
diff --git a/upload/source/plugin/qqconnect/template/extend_common.css b/upload/source/plugin/qqconnect/template/extend_common.css
index cc507068..8b7f2b08 100644
--- a/upload/source/plugin/qqconnect/template/extend_common.css
+++ b/upload/source/plugin/qqconnect/template/extend_common.css
@@ -1,2 +1 @@
-.qq_bind { margin-top: -3px; }
-#toptb .qq_bind { margin-top: 2px; }
\ No newline at end of file
+.qq_bind { margin-top: -3px; }
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/access.inc.php b/upload/source/plugin/wechat/access.inc.php
deleted file mode 100644
index d0d8ef2c..00000000
--- a/upload/source/plugin/wechat/access.inc.php
+++ /dev/null
@@ -1,16 +0,0 @@
- $hooks) {
- foreach($hooks as $hook => $rows) {
- foreach($rows as $plugin => $row) {
- if(isset($_GET['order'][$page][$hook][$plugin])) {
- $apihook[$page][$hook][$plugin]['order'] = $_GET['order'][$page][$hook][$plugin];
- }
- $apihook[$page][$hook][$plugin]['allow'] = !empty($_GET['allow'][$page][$hook][$plugin]) ? 1 : 0;
- }
- uasort($apihook[$page][$hook], 'pluginapicmp');
- }
- }
- $settings = array('mobileapihook' => serialize($apihook));
- C::t('common_setting')->update_batch($settings);
- updatecache('setting');
-}
-
-showtips(lang('plugin/wechat', 'wechatapi_tips'));
-
-showformheader('plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=api_setting');
-
-$mobilewechatsetting = C::t('common_setting')->fetch_all(array('mobilewechat'));
-$mobilewechatsetting = (array)dunserialize($mobilewechatsetting['mobilewechat']);
-
-if($mobilewechatsetting['wsq_sitetoken']) {
-
- $apihook = WeChatHook::getAPIHook();
-
- $plugins = DB::fetch_all('SELECT identifier, name FROM %t', array('common_plugin'), 'identifier');
-
- showtableheader(lang('plugin/wechat', 'api_wsq'));
- echo ' '.(!$i ? $page.'_'.$hook : '').' '.
- ''.$plugins[$plugin]['name'].' '.
- ''.formathook($row).' '.lang('plugin/wechat', 'wechatapi_redirect').' '.$plugins[$redirect['plugin']]['name'].' '.formathook($redirect).' '.lang('plugin/wechat', 'api_'.$k).'('.$k.') '.$plugins[$row['plugin']]['name'].' '.formathook($row).' '.lang('plugin/wechat', 'api_'.$k).'('.$k.') '.$plugins[$row['plugin']]['name'].' '.formathook($row).' '.$k.' '.$info['appId'].' '.$info['appSecret'].' File: '.$hook['plugin'].'/'.$hook['include'].' Method: '.$hook['class'].'->'.$hook['method'];
-}
-
-function pluginapicmp($a, $b) {
- return $a['order'] > $b['order'] ? 1 : -1;
-}
-
-?>
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/bind.inc.php b/upload/source/plugin/wechat/bind.inc.php
deleted file mode 100644
index ad997042..00000000
--- a/upload/source/plugin/wechat/bind.inc.php
+++ /dev/null
@@ -1,84 +0,0 @@
-delete($_G['uid']);
- clearcookies();
- showmessage('wechat:wechat_message_unbinded', dreferer());
-}
-
-if($_G['uid'] && submitcheck('confirmsubmit')) {
- loaducenter();
- list($result) = uc_user_login($_G['uid'], $_GET['passwordconfirm'], 1, 0);
- if($result >= 0) {
- dsetcookie('qrauth', base64_encode(authcode($result, 'ENCODE', $_G['config']['security']['authkey'], 300)));
- showmessage('', dreferer());
- }
- showmessage('login_password_invalid');
-}
-
-if(isset($_GET['check'])) {
- $code = authcode(base64_decode($_GET['check']), 'DECODE', $_G['config']['security']['authkey']);
- if($code) {
- $authcode = C::t('#wechat#mobile_wechat_authcode')->fetch_by_code($code);
- if($authcode['status']) {
- require_once libfile('function/member');
- $member = getuserbyuid($authcode['uid'], 1);
- setloginstatus($member, 1296000);
- dsetcookie('wechat_ticket', '', -1);
- $echostr = 'done';
- } else {
- $echostr = '1';//json_encode($authcode);
- }
- } else {
- $echostr = '-1';
- }
-
- if(!ob_start($_G['gzipcompress'] ? 'ob_gzhandler' : null)) {
- ob_start();
- }
-
- if($echostr === 'done'){
- C::t('#wechat#mobile_wechat_authcode')->delete($authcode['sid']);
- }
-
- include template('common/header_ajax');
- echo $echostr;
- include template('common/footer_ajax');
- exit;
-}
-
-if($_G['cookie']['qrauth']) {
- $qrauth = authcode(base64_decode($_G['cookie']['qrauth']), 'DECODE', $_G['config']['security']['authkey']);
-}
-
-if(!$_G['wechat']['setting']['wechat_qrtype']) {
- require_once DISCUZ_ROOT . './source/plugin/wechat/wechat.lib.class.php';
- require_once DISCUZ_ROOT . './source/plugin/wechat/wsq.class.php';
- list($isqrapi, $qrcodeurl, $codeenc, $code) = WeChat::getqrcode();
- wsq::report('siteqrshow');
-}
-
-if($_G['uid'] && !$qrauth && in_array('qqconnect', $_G['setting']['plugins']['available'])) {
- $connect = C::t('#qqconnect#common_member_connect')->fetch($_G['uid']);
- if($connect['conisregister']) {
- if(!$_G['wechat']['setting']['wechat_qrtype']) {
- $qrauth = true;
- } else {
- showmessage('', 'plugin.php?id=wechat:login', array(), array('redirectmsg' => 1, 'location' => 1));
- }
-
- }
-}
-
-include_once template('wechat:wechat_qrcode');
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/connect.inc.php b/upload/source/plugin/wechat/connect.inc.php
deleted file mode 100644
index 18d602a8..00000000
--- a/upload/source/plugin/wechat/connect.inc.php
+++ /dev/null
@@ -1,248 +0,0 @@
-connectMergeMember();
- } else {
- showmessage('submit_invalid');
- }
- }
-
- $callback = $_G['connect']['callback_url'] . '&referer=' . urlencode($_GET['referer']);
-
- if(!$_G['setting']['connect']['oauth2']) {
- dsetcookie('con_request_token');
- dsetcookie('con_request_token_secret');
- try {
- $response = $connectOAuthClient->connectGetRequestToken($callback);
- } catch(Exception $e) {
- showmessage('qqconnect:connect_get_request_token_failed_code', $referer, array('codeMessage' => getErrorMessage($e->getmessage()), 'code' => $e->getmessage()));
- }
-
- $request_token = $response['oauth_token'];
- $request_token_secret = $response['oauth_token_secret'];
-
- dsetcookie('con_request_token', $request_token);
- dsetcookie('con_request_token_secret', $request_token_secret);
-
- $redirect = $connectOAuthClient->getOAuthAuthorizeURL($request_token);
- if(defined('IN_MOBILE') || $_GET['oauth_style'] == 'mobile') {
- $redirect .= '&oauth_style=mobile';
- }
- } else {
- try {
- dsetcookie('con_request_uri', $callback);
- $redirect = $connectOAuthClient->getOAuthAuthorizeURL_V2($callback);
- if(defined('IN_MOBILE') || $_GET['oauth_style'] == 'mobile') {
- $redirect .= '&display=mobile';
- }
- } catch(Exception $e) {
- showmessage('qqconnect:connect_get_request_token_failed_code', $referer, array('codeMessage' => getErrorMessage($e->getmessage()), 'code' => $e->getmessage()));
- }
- }
-
- dheader('Location:' . $redirect);
-
-} elseif($op == 'callback') {
-
- $params = $_GET;
-
- if(!isset($params['receive'])) {
- require_once DISCUZ_ROOT.'/source/plugin/qqconnect/lib/Util.php';
- $utilService = new Cloud_Service_Util();
- echo '';
- exit;
- }
-
- if(!$_G['setting']['connect']['oauth2']) {
- try {
- $response = $connectOAuthClient->connectGetAccessToken($params, $_G['cookie']['con_request_token_secret']);
- } catch(Exception $e) {
- showmessage('qqconnect:connect_get_access_token_failed_code', $referer, array('codeMessage' => getErrorMessage($e->getmessage()), 'code' => $e->getmessage()));
- }
-
- dsetcookie('con_request_token');
- dsetcookie('con_request_token_secret');
-
- $conuin = $response['oauth_token'];
- $conuinsecret = $response['oauth_token_secret'];
- $conopenid = strtoupper($response['openid']);
- if(!$conuin || !$conuinsecret || !$conopenid) {
- showmessage('qqconnect:connect_get_access_token_failed_code', $referer);
- }
- } else {
- if($_GET['state'] != md5(FORMHASH)){
- showmessage('qqconnect:connect_get_access_token_failed', $referer);
- }
- try {
- $response = $connectOAuthClient->connectGetOpenId_V2($_G['cookie']['con_request_uri'], $_GET['code']);
- } catch(Exception $e) {
- showmessage('qqconnect:connect_get_access_token_failed_code', $referer, array('codeMessage' => getErrorMessage($e->getmessage()), 'code' => $e->getmessage()));
- }
-
- dsetcookie('con_request_token');
- dsetcookie('con_request_token_secret');
-
- $conuintoken = $response['access_token'];
- $conopenid = strtoupper($response['openid']);
- if(!$conuintoken || !$conopenid) {
- showmessage('qqconnect:connect_get_access_token_failed', $referer);
- }
- }
-
- loadcache('connect_blacklist');
- if(in_array($conopenid, array_map('strtoupper', $_G['cache']['connect_blacklist']))) {
- $change_qq_url = $_G['connect']['discuz_change_qq_url'];
- showmessage('qqconnect:connect_uin_in_blacklist', $referer, array('changeqqurl' => $change_qq_url));
- }
-
- if($params['uin']) {
- $old_conuin = $params['uin'];
- }
-
- $is_notify = true;
-
- $conispublishfeed = 0;
- $conispublisht = 0;
-
- $is_user_info = 1;
- $is_feed = 1;
-
- $user_auth_fields = 1;
-
- $cookie_expires = 2592000;
- dsetcookie('client_created', TIMESTAMP, $cookie_expires);
- dsetcookie('client_token', $conopenid, $cookie_expires);
-
- $connect_member = array();
- $fields = array('uid', 'conuin', 'conuinsecret', 'conopenid');
- if($old_conuin) {
- $connect_member = C::t('#qqconnect#common_member_connect')->fetch_fields_by_openid($old_conuin, $fields);
- }
- if(empty($connect_member)) {
- $connect_member = C::t('#qqconnect#common_member_connect')->fetch_fields_by_openid($conopenid, $fields);
- }
- if($connect_member) {
- $member = getuserbyuid($connect_member['uid']);
- if($member) {
- if(!$member['conisbind']) {
- C::t('#qqconnect#common_member_connect')->delete($connect_member['uid']);
- unset($connect_member);
- } else {
- $connect_member['conisbind'] = $member['conisbind'];
- }
- } else {
- C::t('#qqconnect#common_member_connect')->delete($connect_member['uid']);
- unset($connect_member);
- }
-
- $connect_is_unbind = $params['is_unbind'] == 1 ? 1 : 0;
-
- require_once DISCUZ_ROOT.'./source/plugin/wechat/wsq.class.php';
- if(method_exists('wsq', 'userloginUrl')) {
- $_source = isset($refererarray['_source']) ? $refererarray['_source'] : '';
- if(!$_source && !empty($refererarray['openid']) && !empty($refererarray['openidsign'])) {
- $loginUrl = wsq::userloginUrl($connect_member['uid'], $refererarray['openid'], $refererarray['openidsign']);
- if(!C::t('#wechat#common_member_wechatmp')->fetch($connect_member['uid'])) {
- C::t('#wechat#common_member_wechatmp')->insert(array('uid' => $connect_member['uid'], 'openid' => $refererarray['openid'], 'status' => 1), false, true);
- }
- } else {
- $loginUrl = wsq::userloginUrl2($_G['uid']);
- }
- $referer .= '&loginUrl='.urlencode($loginUrl);
- }
-
- C::t('#qqconnect#common_member_connect')->update($connect_member['uid'],
- !$_G['setting']['connect']['oauth2'] ? array(
- 'conuin' => $conuin,
- 'conuinsecret' => $conuinsecret,
- 'conopenid' => $conopenid,
- 'conisfeed' => 1,
- ) : array(
- 'conuintoken' => $conuintoken,
- 'conopenid' => $conopenid,
- 'conisfeed' => 1,
- )
- );
-
- $params['mod'] = 'login';
- connect_login($connect_member);
-
- loadcache('usergroups');
- $usergroups = $_G['cache']['usergroups'][$_G['groupid']]['grouptitle'];
- $param = array('username' => $_G['member']['username'], 'usergroup' => $_G['group']['grouptitle']);
-
- C::t('common_member_status')->update($connect_member['uid'], array('lastip'=>$_G['clientip'], 'lastvisit'=>TIMESTAMP, 'lastactivity' => TIMESTAMP));
- $ucsynlogin = '';
- if($_G['setting']['allowsynlogin']) {
- loaducenter();
- $ucsynlogin = uc_user_synlogin($_G['uid']);
- }
-
- dsetcookie('stats_qc_login', 3, 86400);
- header('location: '.$referer);
- exit;
-
- } else {
-
- header('location: '.$referer.'&loginErr=1001');
- exit;
-
- }
-
-}
-
-function connect_login($connect_member) {
- global $_G;
-
- if(!($member = getuserbyuid($connect_member['uid'], 1))) {
- return false;
- } else {
- if(isset($member['_inarchive'])) {
- C::t('common_member_archive')->move_to_master($member['uid']);
- }
- }
-
- require_once libfile('function/member');
- $cookietime = 1296000;
- setloginstatus($member, $cookietime);
-
- dsetcookie('connect_login', 1, $cookietime);
- dsetcookie('connect_is_bind', '1', 31536000);
- dsetcookie('connect_uin', $connect_member['conopenid'], 31536000);
- return true;
-}
-
-function getErrorMessage($errroCode) {
- $str = sprintf('connect_error_code_%d', $errroCode);
-
- return lang('plugin/qqconnect', $str);
-}
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/discuz_plugin_wechat.xml b/upload/source/plugin/wechat/discuz_plugin_wechat.xml
deleted file mode 100644
index 76e5e51a..00000000
--- a/upload/source/plugin/wechat/discuz_plugin_wechat.xml
+++ /dev/null
@@ -1,514 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
-
-
- 选择“认证服务号”服务的站长请在“开发者中心”的 OAuth2.0 网页授权设置处设置授权回调页面域名为本网站域名
- ]]>
- - 插件开发人员在设计新的微信及 Discuz! 微社区类插件前请务必仔细阅读《
Discuz! 技术文库 》中的内容
- 开发技术交流，欢迎访问“Discuz! 开发者交流 ”论坛
- ]]>
- - 完善以下资料后，您的微社区将自动开通，开通后用户可以在微信内阅读您的论坛内容，发帖也将同步到您的论坛
-
开通完成后，请将系统提供的微社区 URL 添加到微信自定义菜单或者设为关键词触发内容以便用户快速访问
- 如果您的微社区始终无法开通，请确认您的网站处于公网环境下，并将“掌上论坛 ”插件升级到最新版本
- 如果您的微社区无法正常发帖，请确认您的论坛当前版本已升级到最新 检查版本
- ]]>
-
- - 此处可以设置微信公众号收到消息后的响应内容，默认由本插件自身控制，您可以自定义其中的内容
-
如果您的公众号没有“自定义菜单”服务，并且希望在收到信息后响应微社区的访问功能，请在“响应内容”中填写“LOGIN_WSQ”
- 我们允许其他插件接管此消息的控制权，请仔细阅读《Discuz! 技术文库 》中的内容
- ]]>
- - (如果您希望在插件后台使用微信关键词回复等功能，请把此栏中的内容填写到微信公众平台“开发者中心”设置中，不填写不会影响微社区正常使用)]]>
- - (如果您希望在插件后台设置微信自定义菜单并拥有公众号“开发者 ID”，请把该信息填写此栏目中)]]>
- - ]]>
- 来自: 微社区 ]]>- 由于微信接口限制，群发功能仅限认证服务号使用，订阅号请到微信公众平台后台使用相关功能
- ]]>
- - 通过群发素材添加的图文消息，在服务器保存时间为3天，三天后删除，所以您建立消息后应在三天内发出。
-
群发用户组是微信中的用户分组，用户组后的数字为这个组的人数。
- 群发内容:支持素材和纯文本两种格式。
- 发送素材请使用选择素材，选择的素材必须包含图片。
- 发送纯文本直接在群发素材框里选择即可。
- ]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- ]]>
- - 请点击左上角返回微信聊天]]>
- - 请确认是否本人操作]]>
- - {$_G[member][username]} 与微信绑定]]>
- - 互动赢积分]]>
- - {$post[voters]} 人点赞]]>
-
-
-
-
diff --git a/upload/source/plugin/wechat/image/discuz_qr.jpg b/upload/source/plugin/wechat/image/discuz_qr.jpg
deleted file mode 100644
index 1d1eb934..00000000
Binary files a/upload/source/plugin/wechat/image/discuz_qr.jpg and /dev/null differ
diff --git a/upload/source/plugin/wechat/image/index.htm b/upload/source/plugin/wechat/image/index.htm
deleted file mode 100644
index e69de29b..00000000
diff --git a/upload/source/plugin/wechat/image/share.png b/upload/source/plugin/wechat/image/share.png
deleted file mode 100644
index 980be927..00000000
Binary files a/upload/source/plugin/wechat/image/share.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/image/wechat_bind.png b/upload/source/plugin/wechat/image/wechat_bind.png
deleted file mode 100644
index 32451764..00000000
Binary files a/upload/source/plugin/wechat/image/wechat_bind.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/image/wechat_login.png b/upload/source/plugin/wechat/image/wechat_login.png
deleted file mode 100644
index 6bf89d5c..00000000
Binary files a/upload/source/plugin/wechat/image/wechat_login.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/image/wsq.png b/upload/source/plugin/wechat/image/wsq.png
deleted file mode 100644
index f69e5823..00000000
Binary files a/upload/source/plugin/wechat/image/wsq.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/index.htm b/upload/source/plugin/wechat/index.htm
deleted file mode 100644
index e69de29b..00000000
diff --git a/upload/source/plugin/wechat/install.php b/upload/source/plugin/wechat/install.php
deleted file mode 100644
index 630a0487..00000000
--- a/upload/source/plugin/wechat/install.php
+++ /dev/null
@@ -1,18 +0,0 @@
-
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/install/checkupdate.inc.php b/upload/source/plugin/wechat/install/checkupdate.inc.php
deleted file mode 100644
index 46e34a1c..00000000
--- a/upload/source/plugin/wechat/install/checkupdate.inc.php
+++ /dev/null
@@ -1,145 +0,0 @@
- '0',
- 'wechat_qrtype' => '3',
- 'wechat_token' => random(16),
- 'wechat_allowregister' => '1',
- 'wechat_allowfastregister' => '1',
- 'wechat_disableregrule' => '1',
- 'wechat_float_qrcode' => '1',
- 'wechat_confirmtype' => '0',
- 'wechat_newusergroupid' => $_G['setting']['newusergroupid'],
- 'wsq_wapdefault' => 1,
- 'wsq_global_banner' => 1,
- );
-
- require_once DISCUZ_ROOT.'./source/plugin/wechat/install/update.func.php';
-
- runquery($sql);
- updatetable($sql);
-
- foreach($settingdefault as $_key => $_default) {
- if(!isset($setting[$_key])) {
- $setting[$_key] = $_default;
- }
- }
- $setting['RELEASE'] = PLUGIN_RELEASE;
-
- $settings = array('mobilewechat' => serialize($setting));
- C::t('common_setting')->update_batch($settings);
-
- C::t('common_plugin')->delete_by_identifier('mobileoem');
-
- require_once DISCUZ_ROOT.'./source/plugin/wechat/wechat.lib.class.php';
-
- $hook = WeChatHook::getAPIHook('wechat');
- if(!$hook) {
- WeChatHook::updateAPIHook(array(
- array('forumdisplay_variables' => array('plugin' => 'wechat', 'include' => 'wsqapi.class.php', 'class' => 'WSQAPI', 'method' => 'forumdisplay_variables')),
- array('viewthread_variables' => array('plugin' => 'wechat', 'include' => 'wsqapi.class.php', 'class' => 'WSQAPI', 'method' => 'viewthread_variables')),
- ));
- } elseif($hook['wsqindex']) {
- WeChatHook::updateAPIHook(array(
- array('wsqindex_variables' => array('plugin' => 'wechat')),
- ));
- }
-
- DB::query("ALTER TABLE ".DB::table('forum_debatepost')." ADD INDEX `voters` (`tid`,`voters`)", 'SILENT');
-
- $pluginupdated = true;
-
-}
-
-?>
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/install/index.htm b/upload/source/plugin/wechat/install/index.htm
deleted file mode 100644
index e69de29b..00000000
diff --git a/upload/source/plugin/wechat/install/update.func.php b/upload/source/plugin/wechat/install/update.func.php
deleted file mode 100644
index 0827d76a..00000000
--- a/upload/source/plugin/wechat/install/update.func.php
+++ /dev/null
@@ -1,165 +0,0 @@
- $_G['config']['db']['1']['dbcharset'],
- 'charset' => $_G['config']['output']['charset'],
- 'tablepre' => $_G['config']['db']['1']['tablepre']
- );
-
- preg_match_all("/CREATE\s+TABLE.+?pre\_(.+?)\s*\((.+?)\)\s*(ENGINE|TYPE)\s*=\s*(\w+)/is", $sql, $matches);
- $newtables = empty($matches[1])?array():$matches[1];
- $newsqls = empty($matches[0])?array():$matches[0];
- if(empty($newtables) || empty($newsqls)) {
- return array(1);
- }
-
- foreach($newtables as $i => $newtable) {
- $newcols = updatetable_getcolumn($newsqls[$i]);
-
- if(!$query = DB::query("SHOW CREATE TABLE ".DB::table($newtable), 'SILENT')) {
- preg_match("/(CREATE TABLE .+?)\s*(ENGINE|TYPE)\s*=\s*(\w+)/is", $newsqls[$i], $maths);
-
- $maths[3] = strtoupper($maths[3]);
- if($maths[3] == 'MEMORY' || $maths[3] == 'HEAP') {
- $type = " ENGINE=MEMORY".(empty($config['dbcharset'])?'':" DEFAULT CHARSET={$config['dbcharset']}" );
- } else {
- $type = " ENGINE=INNODB".(empty($config['dbcharset'])?'':" DEFAULT CHARSET={$config['dbcharset']}" );
- }
- $usql = $maths[1].$type;
-
- $usql = str_replace("CREATE TABLE IF NOT EXISTS pre_", 'CREATE TABLE IF NOT EXISTS '.$config['tablepre'], $usql);
- $usql = str_replace("CREATE TABLE pre_", 'CREATE TABLE '.$config['tablepre'], $usql);
-
- if(!DB::query($usql, 'SILENT')) {
- return array(-1, $newtable);
- }
- } else {
- $value = DB::fetch($query);
- $oldcols = updatetable_getcolumn($value['Create Table']);
-
- $updates = array();
- $allfileds =array_keys($newcols);
- foreach ($newcols as $key => $value) {
- if($key == 'PRIMARY') {
- if($value != $oldcols[$key]) {
- if(!empty($oldcols[$key])) {
- $usql = "RENAME TABLE ".DB::table($newtable)." TO ".DB::table($newtable.'_bak');
- if(!DB::query($usql, 'SILENT')) {
- return array(-1, $newtable);
- }
- }
- $updates[] = "ADD PRIMARY KEY $value";
- }
- } elseif ($key == 'KEY') {
- foreach ($value as $subkey => $subvalue) {
- if(!empty($oldcols['KEY'][$subkey])) {
- if($subvalue != $oldcols['KEY'][$subkey]) {
- $updates[] = "DROP INDEX `$subkey`";
- $updates[] = "ADD INDEX `$subkey` $subvalue";
- }
- } else {
- $updates[] = "ADD INDEX `$subkey` $subvalue";
- }
- }
- } elseif ($key == 'UNIQUE') {
- foreach ($value as $subkey => $subvalue) {
- if(!empty($oldcols['UNIQUE'][$subkey])) {
- if($subvalue != $oldcols['UNIQUE'][$subkey]) {
- $updates[] = "DROP INDEX `$subkey`";
- $updates[] = "ADD UNIQUE INDEX `$subkey` $subvalue";
- }
- } else {
- $usql = "ALTER TABLE ".DB::table($newtable)." DROP INDEX `$subkey`";
- DB::query($usql, 'SILENT');
- $updates[] = "ADD UNIQUE INDEX `$subkey` $subvalue";
- }
- }
- } else {
- if(!empty($oldcols[$key])) {
- if(strtolower($value) != strtolower($oldcols[$key])) {
- $updates[] = "CHANGE `$key` `$key` $value";
- }
- } else {
- $i = array_search($key, $allfileds);
- $fieldposition = $i > 0 ? 'AFTER `'.$allfileds[$i-1].'`' : 'FIRST';
- $updates[] = "ADD `$key` $value $fieldposition";
- }
- }
- }
-
- if(!empty($updates)) {
- $usql = "ALTER TABLE ".DB::table($newtable)." ".implode(', ', $updates);
- if(!DB::query($usql, 'SILENT')) {
- return array(-1, $newtable);
- }
- }
- }
- }
- return array(1);
- }
-
- function updatetable_getcolumn($creatsql) {
-
- $creatsql = preg_replace("/ COMMENT '.*?'/i", '', $creatsql);
- preg_match("/\((.+)\)\s*(ENGINE|TYPE)\s*\=/is", $creatsql, $matchs);
-
- $cols = explode("\n", $matchs[1]);
- $newcols = array();
- foreach ($cols as $value) {
- $value = trim($value);
- if(empty($value)) continue;
- $value = updatetable_remakesql($value);
- if(substr($value, -1) == ',') $value = substr($value, 0, -1);
-
- $vs = explode(' ', $value);
- $cname = $vs[0];
-
- if($cname == 'KEY' || $cname == 'INDEX' || $cname == 'UNIQUE') {
-
- $name_length = strlen($cname);
- if($cname == 'UNIQUE') $name_length = $name_length + 4;
-
- $subvalue = trim(substr($value, $name_length));
- $subvs = explode(' ', $subvalue);
- $subcname = $subvs[0];
- $newcols[$cname][$subcname] = trim(substr($value, ($name_length+2+strlen($subcname))));
-
- } elseif($cname == 'PRIMARY') {
-
- $newcols[$cname] = trim(substr($value, 11));
-
- } else {
-
- $newcols[$cname] = trim(substr($value, strlen($cname)));
- }
- }
- return $newcols;
- }
-
- function updatetable_remakesql($value) {
- $value = trim(preg_replace("/\s+/", ' ', $value));
- $value = str_replace(array('`',', ', ' ,', '( ' ,' )', 'mediumtext'), array('', ',', ',','(',')','text'), $value);
- return $value;
- }
-
-}
-
-?>
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/js/highcharts.js b/upload/source/plugin/wechat/js/highcharts.js
deleted file mode 100644
index 1d69a862..00000000
--- a/upload/source/plugin/wechat/js/highcharts.js
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- Highcharts JS v3.0.2 (2013-06-05)
-
- (c) 2009-2013 Torstein H?nsi
-
- License: www.highcharts.com/license
-*/
-(function(){function v(a,b){var c;a||(a={});for(c in b)a[c]=b[c];return a}function x(){var a,b=arguments.length,c={},d=function(a,b){var c,h;for(h in b)b.hasOwnProperty(h)&&(c=b[h],typeof a!=="object"&&(a={}),a[h]=c&&typeof c==="object"&&Object.prototype.toString.call(c)!=="[object Array]"&&typeof c.nodeType!=="number"?d(a[h]||{},c):b[h]);return a};for(a=0;a3?c.length%3:0;return e+(g?c.substr(0,g)+d:"")+c.substr(g).replace(/(\d{3})(?=\d)/g,"$1"+d)+(f?b+Q(a-c).toFixed(f).slice(2):"")}function va(a,b){return Array((b||2)+1-String(a).length).join(0)+a}function zb(a,b,c){var d=a[b];a[b]=function(){var a=Array.prototype.slice.call(arguments);a.unshift(d);return c.apply(this,a)}}function wa(a,b){for(var c="{",
-d=!1,e,f,g,h,i,j=[];(c=a.indexOf(c))!==-1;){e=a.slice(0,c);if(d){f=e.split(":");g=f.shift().split(".");i=g.length;e=b;for(h=0;h-1?h.thousandsSep:"")):e=Ua(f,e)}j.push(e);a=a.slice(c+1);c=(d=!d)?"}":"{"}j.push(a);return j.join("")}function ib(a,b,c,d){var e,c=o(c,1);e=a/c;b||(b=[1,2,2.5,5,10],d&&d.allowDecimals===!1&&(c===1?b=[1,2,5,10]:c<=0.1&&(b=
-[1/c])));for(d=0;d=E[jb]&&(i.setMilliseconds(0),i.setSeconds(j>=E[Va]?0:k*T(i.getSeconds()/k)));if(j>=E[Va])i[Db](j>=E[Oa]?0:k*T(i[kb]()/k));if(j>=E[Oa])i[Eb](j>=E[oa]?0:k*T(i[lb]()/k));if(j>=E[oa])i[mb](j>=E[Pa]?1:k*T(i[Qa]()/k));j>=E[Pa]&&(i[Fb](j>=E[xa]?0:k*T(i[Xa]()/k)),h=i[Ya]());j>=E[xa]&&(h-=h%k,i[Gb](h));if(j===E[Wa])i[mb](i[Qa]()-i[nb]()+o(d,1));b=1;h=i[Ya]();for(var d=i.getTime(),m=i[Xa](),
-l=i[Qa](),p=g?0:(864E5+i.getTimezoneOffset()*6E4)%864E5;dc&&(c=a[b]);return c}function Ha(a,b){for(var c in a)a[c]&&a[c]!==b&&a[c].destroy&&a[c].destroy(),delete a[c]}function Ra(a){$a||($a=U(ya));a&&$a.appendChild(a);$a.innerHTML=""}function qa(a,b){var c="Highcharts error #"+a+": www.highcharts.com/errors/"+a;if(b)throw c;else O.console&&console.log(c)}function ia(a){return parseFloat(a.toPrecision(14))}function Ia(a,b){za=o(a,b.animation)}
-function Jb(){var a=N.global.useUTC,b=a?"getUTC":"get",c=a?"setUTC":"set";Za=a?Date.UTC:function(a,b,c,g,h,i){return(new Date(a,b,o(c,1),o(g,0),o(h,0),o(i,0))).getTime()};kb=b+"Minutes";lb=b+"Hours";nb=b+"Day";Qa=b+"Date";Xa=b+"Month";Ya=b+"FullYear";Db=c+"Minutes";Eb=c+"Hours";mb=c+"Date";Fb=c+"Month";Gb=c+"FullYear"}function ra(){}function Ja(a,b,c,d){this.axis=a;this.pos=b;this.type=c||"";this.isNew=!0;!c&&!d&&this.addLabel()}function pb(a,b){this.axis=a;if(b)this.options=b,this.id=b.id}function Kb(a,
-b,c,d,e,f){var g=a.chart.inverted;this.axis=a;this.isNegative=c;this.options=b;this.x=d;this.stack=e;this.percent=f==="percent";this.alignOptions={align:b.align||(g?c?"left":"right":"center"),verticalAlign:b.verticalAlign||(g?"middle":c?"bottom":"top"),y:o(b.y,g?4:c?14:-6),x:o(b.x,g?c?-6:6:0)};this.textAlign=b.textAlign||(g?c?"right":"left":"center")}function ab(){this.init.apply(this,arguments)}function qb(){this.init.apply(this,arguments)}function rb(a,b){this.init(a,b)}function sb(a,b){this.init(a,
-b)}function tb(){this.init.apply(this,arguments)}var y,z=document,O=window,I=Math,t=I.round,T=I.floor,ja=I.ceil,q=I.max,K=I.min,Q=I.abs,Y=I.cos,ca=I.sin,Ka=I.PI,bb=Ka*2/360,Aa=navigator.userAgent,Lb=O.opera,Fa=/msie/i.test(Aa)&&!Lb,cb=z.documentMode===8,db=/AppleWebKit/.test(Aa),eb=/Firefox/.test(Aa),Mb=/(Mobile|Android|Windows Phone)/.test(Aa),sa="http://www.w3.org/2000/svg",Z=!!z.createElementNS&&!!z.createElementNS(sa,"svg").createSVGRect,Sb=eb&&parseInt(Aa.split("Firefox/")[1],10)<4,$=!Z&&!Fa&&
-!!z.createElement("canvas").getContext,Sa,fb=z.documentElement.ontouchstart!==y,Nb={},ub=0,$a,N,Ua,za,vb,E,ta=function(){},Ba=[],ya="div",S="none",Ob="rgba(192,192,192,"+(Z?1.0E-4:0.002)+")",Bb="millisecond",jb="second",Va="minute",Oa="hour",oa="day",Wa="week",Pa="month",xa="year",Pb="stroke-width",Za,kb,lb,nb,Qa,Xa,Ya,Db,Eb,mb,Fb,Gb,aa={};O.Highcharts=O.Highcharts?qa(16,!0):{};Ua=function(a,b,c){if(!r(b)||isNaN(b))return"Invalid date";var a=o(a,"%Y-%m-%d %H:%M:%S"),d=new Date(b),e,f=d[lb](),g=d[nb](),
-h=d[Qa](),i=d[Xa](),j=d[Ya](),k=N.lang,m=k.weekdays,d=v({a:m[g].substr(0,3),A:m[g],d:va(h),e:h,b:k.shortMonths[i],B:k.months[i],m:va(i+1),y:j.toString().substr(2,2),Y:j,H:va(f),I:va(f%12||12),l:f%12||12,M:va(d[kb]()),p:f<12?"AM":"PM",P:f<12?"am":"pm",S:va(d.getSeconds()),L:va(t(b%1E3),3)},Highcharts.dateFormats);for(e in d)for(;a.indexOf("%"+e)!==-1;)a=a.replace("%"+e,typeof d[e]==="function"?d[e](b):d[e]);return c?a.substr(0,1).toUpperCase()+a.substr(1):a};Hb.prototype={wrapColor:function(a){if(this.color>=
-a)this.color=0},wrapSymbol:function(a){if(this.symbol>=a)this.symbol=0}};E=function(){for(var a=0,b=arguments,c=b.length,d={};a-1,f=e?7:3,g,b=b.split(" "),c=[].concat(c),h,i,j=function(a){for(g=a.length;g--;)a[g]==="M"&&a.splice(g+1,0,a[g+1],a[g+2],a[g+1],a[g+2])};e&&(j(b),j(c));a.isArea&&(h=b.splice(b.length-6,6),i=c.splice(c.length-
-6,6));if(d<=c.length/f)for(;d--;)c=[].concat(c).splice(0,f).concat(c);a.shift=0;if(b.length)for(a=c.length;b.length{point.key}{series.name} : {point.y} l&&/[ \-]/.test(b.textContent||b.innerText))L(b,{width:l+"px",display:"block",whiteSpace:"normal"}),k=l;l=a.fontMetrics(b.style.fontSize).b;
-B=s<0&&-k;w=p<0&&-m;xb=s*p<0;B+=p*l*(xb?1-h:h);w-=s*l*(j?xb?h:1-h:1);i&&(B-=k*h*(s<0?-1:1),j&&(w-=m*h*(p<0?-1:1)),L(b,{textAlign:g}));this.xCorr=B;this.yCorr=w}L(b,{left:e+B+"px",top:f+w+"px"});if(db)m=b.offsetHeight;this.cTT=G}}else this.alignOnAdd=!0},updateTransform:function(){var a=this.translateX||0,b=this.translateY||0,c=this.scaleX,d=this.scaleY,e=this.inverted,f=this.rotation;e&&(a+=this.attr("width"),b+=this.attr("height"));a=["translate("+a+","+b+")"];e?a.push("rotate(90) scale(-1,1)"):
-f&&a.push("rotate("+f+" "+(this.x||0)+" "+(this.y||0)+")");(r(c)||r(d))&&a.push("scale("+o(c,1)+" "+o(d,1)+")");a.length&&A(this.element,"transform",a.join(" "))},toFront:function(){var a=this.element;a.parentNode.appendChild(a);return this},align:function(a,b,c){var d,e,f,g,h={};e=this.renderer;f=e.alignedObjects;if(a){if(this.alignOptions=a,this.alignByTranslate=b,!c||fa(c))this.alignTo=d=c||"renderer",ga(f,this),f.push(this),c=null}else a=this.alignOptions,b=this.alignByTranslate,d=this.alignTo;
-c=o(c,e[d],e);d=a.align;e=a.verticalAlign;f=(c.x||0)+(a.x||0);g=(c.y||0)+(a.y||0);if(d==="right"||d==="center")f+=(c.width-(a.width||0))/{right:1,center:2}[d];h[b?"translateX":"x"]=t(f);if(e==="bottom"||e==="middle")g+=(c.height-(a.height||0))/({bottom:1,middle:2}[e]||1);h[b?"translateY":"y"]=t(g);this[this.placed?"animate":"attr"](h);this.placed=!0;this.alignAttr=h;return this},getBBox:function(){var a=this.bBox,b=this.renderer,c,d=this.rotation;c=this.element;var e=this.styles,f=d*bb;if(!a){if(c.namespaceURI===
-sa||b.forExport){try{a=c.getBBox?v({},c.getBBox()):{width:c.offsetWidth,height:c.offsetHeight}}catch(g){}if(!a||a.width<0)a={width:0,height:0}}else a=this.htmlGetBBox();if(b.isSVG){b=a.width;c=a.height;if(Fa&&e&&e.fontSize==="11px"&&c.toPrecision(3)==="22.7")a.height=c=14;if(d)a.width=Q(c*ca(f))+Q(b*Y(f)),a.height=Q(c*Y(f))+Q(b*ca(f))}this.bBox=a}return a},show:function(){return this.attr({visibility:"visible"})},hide:function(){return this.attr({visibility:"hidden"})},fadeOut:function(a){var b=this;
-b.animate({opacity:0},{duration:a||150,complete:function(){b.hide()}})},add:function(a){var b=this.renderer,c=a||b,d=c.element||b.box,e=d.childNodes,f=this.element,g=A(f,"zIndex"),h;if(a)this.parentGroup=a;this.parentInverted=a&&a.inverted;this.textStr!==void 0&&b.buildText(this);if(g)c.handleZ=!0,g=u(g);if(c.handleZ)for(c=0;cg||!r(g)&&r(b))){d.insertBefore(f,a);h=!0;break}h||d.appendChild(f);this.added=!0;D(this,"add");return this},safeRemoveChild:function(a){var b=
-a.parentNode;b&&b.removeChild(a)},destroy:function(){var a=this,b=a.element||{},c=a.shadows,d,e;b.onclick=b.onmouseout=b.onmouseover=b.onmousemove=b.point=null;Ta(a);if(a.clipPath)a.clipPath=a.clipPath.destroy();if(a.stops){for(e=0;e/g,'').replace(/<(i|em)>/g,'').replace(//g," ").split(//g),f=b.childNodes,g=/style="([^"]+)"/,h=/href="([^"]+)"/,i=A(b,"x"),j=a.styles,k=j&&j.width&&u(j.width),m=j&&j.lineHeight,
-l=f.length;l--;)b.removeChild(f[l]);k&&!a.added&&this.box.appendChild(b);e[e.length-1]===""&&e.pop();n(e,function(e,f){var l,o=0,e=e.replace(//g," |||");l=e.split("|||");n(l,function(e){if(e!==""||l.length===1){var p={},n=z.createElementNS(sa,"tspan"),q;g.test(e)&&(q=e.match(g)[1].replace(/(;| |^)color([ :])/,"$1fill$2"),A(n,"style",q));h.test(e)&&!d&&(A(n,"onclick",'location.href="'+e.match(h)[1]+'"'),L(n,{cursor:"pointer"}));e=(e.replace(/<(.|\n)*?>/g,
-"")||" ").replace(/</g,"<").replace(/>/g,">");n.appendChild(z.createTextNode(e));o?p.dx=0:p.x=i;A(n,p);!o&&f&&(!Z&&d&&L(n,{display:"block"}),A(n,"dy",m||c.fontMetrics(/px$/.test(n.style.fontSize)?n.style.fontSize:j.fontSize).h,db&&n.offsetHeight));b.appendChild(n);o++;if(k)for(var e=e.replace(/([^\^])-/g,"$1- ").split(" "),r,t=[];e.length||t.length;)delete a.bBox,r=a.getBBox().width,p=r>k,!p||e.length===1?(e=t,t=[],e.length&&(n=z.createElementNS(sa,"tspan"),A(n,{dy:m||16,x:i}),q&&A(n,"style",
-q),b.appendChild(n),r>k&&(k=r))):(n.removeChild(n.firstChild),t.unshift(e.pop())),e.length&&n.appendChild(z.createTextNode(e.join(" ").replace(/- /g,"-")))}})})},button:function(a,b,c,d,e,f,g){var h=this.label(a,b,c,null,null,null,null,null,"button"),i=0,j,k,m,l,p,a={x1:0,y1:0,x2:0,y2:1},e=x({"stroke-width":1,stroke:"#CCCCCC",fill:{linearGradient:a,stops:[[0,"#FEFEFE"],[1,"#F6F6F6"]]},r:2,padding:5,style:{color:"black"}},e);m=e.style;delete e.style;f=x(e,{stroke:"#68A",fill:{linearGradient:a,stops:[[0,
-"#FFF"],[1,"#ACF"]]}},f);l=f.style;delete f.style;g=x(e,{stroke:"#68A",fill:{linearGradient:a,stops:[[0,"#9BD"],[1,"#CDF"]]}},g);p=g.style;delete g.style;J(h.element,"mouseenter",function(){h.attr(f).css(l)});J(h.element,"mouseleave",function(){j=[e,f,g][i];k=[m,l,p][i];h.attr(j).css(k)});h.setState=function(a){(i=a)?a===2&&h.attr(g).css(p):h.attr(e).css(m)};return h.on("click",function(){d.call(h)}).attr(e).css(v({cursor:"default"},m))},crispLine:function(a,b){a[1]===a[4]&&(a[1]=a[4]=t(a[1])-b%2/
-2);a[2]===a[5]&&(a[2]=a[5]=t(a[2])+b%2/2);return a},path:function(a){var b={fill:S};Da(a)?b.d=a:V(a)&&v(b,a);return this.createElement("path").attr(b)},circle:function(a,b,c){a=V(a)?a:{x:a,y:b,r:c};return this.createElement("circle").attr(a)},arc:function(a,b,c,d,e,f){if(V(a))b=a.y,c=a.r,d=a.innerR,e=a.start,f=a.end,a=a.x;return this.symbol("arc",a||0,b||0,c||0,c||0,{innerR:d||0,start:e||0,end:f||0})},rect:function(a,b,c,d,e,f){e=V(a)?a.r:e;e=this.createElement("rect").attr({rx:e,ry:e,fill:S});return e.attr(V(a)?
-a:e.crisp(f,a,b,q(c,0),q(d,0)))},setSize:function(a,b,c){var d=this.alignedObjects,e=d.length;this.width=a;this.height=b;for(this.boxWrapper[o(c,!0)?"animate":"attr"]({width:a,height:b});e--;)d[e].align()},g:function(a){var b=this.createElement("g");return r(a)?b.attr({"class":"highcharts-"+a}):b},image:function(a,b,c,d,e){var f={preserveAspectRatio:S};arguments.length>1&&v(f,{x:b,y:c,width:d,height:e});f=this.createElement("image").attr(f);f.element.setAttributeNS?f.element.setAttributeNS("http://www.w3.org/1999/xlink",
-"href",a):f.element.setAttribute("hc-svg-href",a);return f},symbol:function(a,b,c,d,e,f){var g,h=this.symbols[a],h=h&&h(t(b),t(c),d,e,f),i=/^url\((.*?)\)$/,j,k;if(h)g=this.path(h),v(g,{symbolName:a,x:b,y:c,width:d,height:e}),f&&v(g,f);else if(i.test(a))k=function(a,b){a.element&&(a.attr({width:b[0],height:b[1]}),a.alignByTranslate||a.translate(t((d-b[0])/2),t((e-b[1])/2)))},j=a.match(i)[1],a=Nb[j],g=this.image(j).attr({x:b,y:c}),g.isImg=!0,a?k(g,a):(g.attr({width:0,height:0}),U("img",{onload:function(){k(g,
-Nb[j]=[this.width,this.height])},src:j}));return g},symbols:{circle:function(a,b,c,d){var e=0.166*c;return["M",a+c/2,b,"C",a+c+e,b,a+c+e,b+d,a+c/2,b+d,"C",a-e,b+d,a-e,b,a+c/2,b,"Z"]},square:function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c,b+d,a,b+d,"Z"]},triangle:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d,a,b+d,"Z"]},"triangle-down":function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c/2,b+d,"Z"]},diamond:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d/2,a+c/2,b+d,a,b+d/2,"Z"]},arc:function(a,b,c,d,
-e){var f=e.start,c=e.r||c||d,g=e.end-0.001,d=e.innerR,h=e.open,i=Y(f),j=ca(f),k=Y(g),g=ca(g),e=e.end-f1&&f.attr({x:b,y:c,width:d,height:e});return f},rect:function(a,b,c,d,e,f){if(V(a))b=a.y,c=a.width,d=a.height,f=a.strokeWidth,a=a.x;var g=this.symbol("rect");g.r=e;return g.attr(g.crisp(f,a,b,q(c,0),q(d,0)))},invertChild:function(a,b){var c=b.style;L(a,{flip:"x",left:u(c.width)-1,top:u(c.height)-1,rotation:-90})},symbols:{arc:function(a,b,c,d,e){var f=e.start,g=e.end,h=e.r||c||d,c=e.innerR,d=Y(f),i=ca(f),j=Y(g),
-k=ca(g);if(g-f===0)return["x"];f=["wa",a-h,b-h,a+h,b+h,a+h*d,b+h*i,a+h*j,b+h*k];e.open&&!c&&f.push("e","M",a,b);f.push("at",a-c,b-c,a+c,b+c,a+c*j,b+c*k,a+c*d,b+c*i,"x","e");f.isArc=!0;return f},circle:function(a,b,c,d,e){e&&e.isCircle&&(a-=c/2,b-=d/2);return["wa",a,b,a+c,b+d,a+c,b+d/2,a+c,b+d/2,"e"]},rect:function(a,b,c,d,e){var f=a+c,g=b+d,h;!r(e)||!e.r?f=Ca.prototype.symbols.square.apply(0,arguments):(h=K(e.r,c,d),f=["M",a+h,b,"L",f-h,b,"wa",f-2*h,b,f,b+2*h,f-h,b,f,b+h,"L",f,g-h,"wa",f-2*h,g-2*
-h,f,g,f,g-h,f-h,g,"L",a+h,g,"wa",a,g-2*h,a+2*h,g,a+h,g,a,g-h,"L",a,b+h,"wa",a,b,a+2*h,b+2*h,a,b+h,a+h,b,"x","e"]);return f}}};Highcharts.VMLRenderer=F=function(){this.init.apply(this,arguments)};F.prototype=x(Ca.prototype,na);Sa=F}var Rb;if($)Highcharts.CanVGRenderer=F=function(){sa="http://www.w3.org/1999/xhtml"},F.prototype.symbols={},Rb=function(){function a(){var a=b.length,d;for(d=0;dj&&(c=!1)):h+k>l&&(h=l-k,d&&h+m0&&b.height>0){f=x({align:c&&k&&"center",x:c?!k&&4:10,verticalAlign:!c&&k&&"middle",y:c?k?16:10:k?6:-4,rotation:c&&!k&&90},f);if(!g)a.label=g=t.text(f.text,0,0).attr({align:f.textAlign||f.align,rotation:f.rotation,zIndex:w}).css(f.style).add();b=[s[1],s[4],o(s[6],s[1])];s=[s[2],s[5],o(s[7],s[2])];c=Ga(b);k=Ga(s);g.align(f,!1,{x:c,y:k,width:pa(b)-c,height:pa(s)-k});g.show()}else g&&g.hide();
-return a},destroy:function(){ga(this.axis.plotLinesAndBands,this);Ha(this,this.axis)}};Kb.prototype={destroy:function(){Ha(this,this.axis)},setTotal:function(a){this.cum=this.total=a},render:function(a){var b=this.options,c=b.format,c=c?wa(c,this):b.formatter.call(this);this.label?this.label.attr({text:c,visibility:"hidden"}):this.label=this.axis.chart.renderer.text(c,0,0,b.useHTML).css(b.style).attr({align:this.textAlign,rotation:b.rotation,visibility:"hidden"}).add(a)},setOffset:function(a,b){var c=
-this.axis,d=c.chart,e=d.inverted,f=this.isNegative,g=c.translate(this.percent?100:this.total,0,0,0,1),c=c.translate(0),c=Q(g-c),h=d.xAxis[0].translate(this.x)+a,i=d.plotHeight,f={x:e?f?g:g-c:h,y:e?i-h-b:f?i-g-c:i-g,width:e?c:b,height:e?b:c};if(e=this.label)e.align(this.alignOptions,null,f),f=e.alignAttr,e.attr({visibility:this.options.crop===!1||d.isInsidePlot(f.x,f.y)?Z?"inherit":"visible":"hidden"})}};ab.prototype={defaultOptions:{dateTimeLabelFormats:{millisecond:"%H:%M:%S.%L",second:"%H:%M:%S",
-minute:"%H:%M",hour:"%H:%M",day:"%e. %b",week:"%e. %b",month:"%b '%y",year:"%Y"},endOnTick:!1,gridLineColor:"#C0C0C0",labels:M,lineColor:"#C0D0E0",lineWidth:1,minPadding:0.01,maxPadding:0.01,minorGridLineColor:"#E0E0E0",minorGridLineWidth:1,minorTickColor:"#A0A0A0",minorTickLength:2,minorTickPosition:"outside",startOfWeek:1,startOnTick:!1,tickColor:"#C0D0E0",tickLength:5,tickmarkPlacement:"between",tickPixelInterval:100,tickPosition:"outside",tickWidth:1,title:{align:"middle",style:{color:"#4d759e",
-fontWeight:"bold"}},type:"linear"},defaultYAxisOptions:{endOnTick:!0,gridLineWidth:1,tickPixelInterval:72,showLastLabel:!0,labels:{align:"right",x:-8,y:3},lineWidth:0,maxPadding:0.05,minPadding:0.05,startOnTick:!0,tickWidth:0,title:{rotation:270,text:"Values"},stackLabels:{enabled:!1,formatter:function(){return ua(this.total,-1)},style:M.style}},defaultLeftAxisOptions:{labels:{align:"right",x:-8,y:null},title:{rotation:270}},defaultRightAxisOptions:{labels:{align:"left",x:8,y:null},title:{rotation:90}},
-defaultBottomAxisOptions:{labels:{align:"center",x:0,y:14},title:{rotation:0}},defaultTopAxisOptions:{labels:{align:"center",x:0,y:-5},title:{rotation:0}},init:function(a,b){var c=b.isX;this.horiz=a.inverted?!c:c;this.xOrY=(this.isXAxis=c)?"x":"y";this.opposite=b.opposite;this.side=this.horiz?this.opposite?0:2:this.opposite?1:3;this.setOptions(b);var d=this.options,e=d.type;this.labelFormatter=d.labels.formatter||this.defaultLabelFormatter;this.staggerLines=this.horiz&&d.labels.staggerLines;this.userOptions=
-b;this.minPixelPadding=0;this.chart=a;this.reversed=d.reversed;this.zoomEnabled=d.zoomEnabled!==!1;this.categories=d.categories||e==="category";this.isLog=e==="logarithmic";this.isDatetimeAxis=e==="datetime";this.isLinked=r(d.linkedTo);this.tickmarkOffset=this.categories&&d.tickmarkPlacement==="between"?0.5:0;this.ticks={};this.minorTicks={};this.plotLinesAndBands=[];this.alternateBands={};this.len=0;this.minRange=this.userMinRange=d.minRange||d.maxZoom;this.range=d.range;this.offset=d.offset||0;
-this.stacks={};this._stacksTouched=0;this.min=this.max=null;var f,d=this.options.events;la(this,a.axes)===-1&&(a.axes.push(this),a[c?"xAxis":"yAxis"].push(this));this.series=this.series||[];if(a.inverted&&c&&this.reversed===y)this.reversed=!0;this.removePlotLine=this.removePlotBand=this.removePlotBandOrLine;for(f in d)J(this,f,d[f]);if(this.isLog)this.val2lin=ka,this.lin2val=da},setOptions:function(a){this.options=x(this.defaultOptions,this.isXAxis?{}:this.defaultYAxisOptions,[this.defaultTopAxisOptions,
-this.defaultRightAxisOptions,this.defaultBottomAxisOptions,this.defaultLeftAxisOptions][this.side],x(N[this.isXAxis?"xAxis":"yAxis"],a))},update:function(a,b){var c=this.chart,a=c.options[this.xOrY+"Axis"][this.options.index]=x(this.userOptions,a);this.destroy();this._addedPlotLB=!1;this.init(c,a);c.isDirtyBox=!0;o(b,!0)&&c.redraw()},remove:function(a){var b=this.chart,c=this.xOrY+"Axis";n(this.series,function(a){a.remove(!1)});ga(b.axes,this);ga(b[c],this);b.options[c].splice(this.options.index,
-1);n(b[c],function(a,b){a.options.index=b});this.destroy();b.isDirtyBox=!0;o(a,!0)&&b.redraw()},defaultLabelFormatter:function(){var a=this.axis,b=this.value,c=a.categories,d=this.dateTimeLabelFormat,e=N.lang.numericSymbols,f=e&&e.length,g,h=a.options.labels.format,a=a.isLog?b:a.tickInterval;if(h)g=wa(h,this);else if(c)g=b;else if(d)g=Ua(d,b);else if(f&&a>=1E3)for(;f--&&g===y;)c=Math.pow(1E3,f+1),a>=c&&e[f]!==null&&(g=ua(b/c,-1)+e[f]);g===y&&(g=b>=1E3?ua(b,0):ua(b,-1));return g},getSeriesExtremes:function(){var a=
-this,b=a.chart,c=a.stacks,d=[],e=[],f=a._stacksTouched+=1,g,h;a.hasVisibleSeries=!1;a.dataMin=a.dataMax=null;n(a.series,function(g){if(g.visible||!b.options.chart.ignoreHiddenSeries){var j=g.options,k,m,l,p,s,n,B,w,G,t=j.threshold,v,u=[],x=0;a.hasVisibleSeries=!0;if(a.isLog&&t<=0)t=j.threshold=null;if(a.isXAxis){if(j=g.xData,j.length)a.dataMin=K(o(a.dataMin,j[0]),Ga(j)),a.dataMax=q(o(a.dataMax,j[0]),pa(j))}else{var P,H,C,A=g.cropped,z=g.xAxis.getExtremes(),E=!!g.modifyValue;k=j.stacking;a.usePercentage=
-k==="percent";if(k)s=j.stack,p=g.type+o(s,""),n="-"+p,g.stackKey=p,m=d[p]||[],d[p]=m,l=e[n]||[],e[n]=l;if(a.usePercentage)a.dataMin=0,a.dataMax=99;j=g.processedXData;B=g.processedYData;v=B.length;for(h=0;h0))if(E&&(G=g.modifyValue(G)),g.getExtremesFromAll||
-A||(j[h+1]||w)>=z.min&&(j[h-1]||w)<=z.max)if(w=G.length)for(;w--;)G[w]!==null&&(u[x++]=G[w]);else u[x++]=G}if(!a.usePercentage&&u.length)g.dataMin=k=Ga(u),g.dataMax=g=pa(u),a.dataMin=K(o(a.dataMin,k),k),a.dataMax=q(o(a.dataMax,g),g);if(r(t))if(a.dataMin>=t)a.dataMin=t,a.ignoreMinPadding=!0;else if(a.dataMaxf+this.width)l=!0}else if(c=f,i=m-this.right,hg+this.height)l=!0;return l&&!d?null:e.renderer.crispLine(["M",c,h,"L",i,j],b||0)},getPlotBandPath:function(a,b){var c=this.getPlotLinePath(b),d=this.getPlotLinePath(a);d&&c?d.push(c[4],
-c[5],c[1],c[2]):d=null;return d},getLinearTickPositions:function(a,b,c){for(var d,b=ia(T(b/a)*a),c=ia(ja(c/a)*a),e=[];b<=c;){e.push(b);b=ia(b+a);if(b===d)break;d=b}return e},getLogTickPositions:function(a,b,c,d){var e=this.options,f=this.len,g=[];if(!d)this._minorAutoInterval=null;if(a>=0.5)a=t(a),g=this.getLinearTickPositions(a,b,c);else if(a>=0.08)for(var f=T(b),h,i,j,k,m,e=a>0.3?[1,2,4]:a>0.15?[1,2,4,6,8]:[1,2,3,4,5,6,7,8,9];fb&&(!d||
-k<=c)&&g.push(k),k>c&&(m=!0),k=j}else if(b=da(b),c=da(c),a=e[d?"minorTickInterval":"tickInterval"],a=o(a==="auto"?null:a,this._minorAutoInterval,(c-b)*(e.tickPixelInterval/(d?5:1))/((d?f/this.tickPositions.length:f)||1)),a=ib(a,null,I.pow(10,T(I.log(a)/I.LN10))),g=La(this.getLinearTickPositions(a,b,c),ka),!d)this._minorAutoInterval=a/5;if(!d)this.tickInterval=a;return g},getMinorTickPositions:function(){var a=this.options,b=this.tickPositions,c=this.minorTickInterval,d=[],e;if(this.isLog){e=b.length;
-for(a=1;a=this.minRange,f,g,h,i,j;if(this.isXAxis&&this.minRange===y&&!this.isLog)r(a.min)||r(a.max)?this.minRange=null:(n(this.series,
-function(a){i=a.xData;for(g=j=a.xIncrement?1:i.length-1;g>0;g--)if(h=i[g]-i[g-1],f===y||hb&&(g=0);c=q(c,g);e=q(e,h?0:g/2);f=q(f,h==="on"?0:g);!a.noSharedTooltip&&r(m)&&(d=r(d)?K(d,m):m)}),g=this.ordinalSlope&&d?this.ordinalSlope/d:1,this.minPointOffset=e*=g,this.pointRangePadding=f*=g,this.pointRange=K(c,b),this.closestPointRange=d;if(a)this.oldTransA=h;this.translationSlope=this.transA=h=this.len/(b+f||1);this.transB=this.horiz?this.left:this.bottom;this.minPixelPadding=
-h*e},setTickPositions:function(a){var b=this,c=b.chart,d=b.options,e=b.isLog,f=b.isDatetimeAxis,g=b.isXAxis,h=b.isLinked,i=b.options.tickPositioner,j=d.maxPadding,k=d.minPadding,m=d.tickInterval,l=d.minTickInterval,p=d.tickPixelInterval,s=b.categories;h?(b.linkedParent=c[g?"xAxis":"yAxis"][d.linkedTo],c=b.linkedParent.getExtremes(),b.min=o(c.min,c.dataMin),b.max=o(c.max,c.dataMax),d.type!==b.linkedParent.options.type&&qa(11,1)):(b.min=o(b.userMin,d.min,b.dataMin),b.max=o(b.userMax,d.max,b.dataMax));
-if(e)!a&&K(b.min,o(b.dataMin,b.min))<=0&&qa(10,1),b.min=ia(ka(b.min)),b.max=ia(ka(b.max));if(b.range&&(b.userMin=b.min=q(b.min,b.max-b.range),b.userMax=b.max,a))b.range=null;b.beforePadding&&b.beforePadding();b.adjustForMinRange();if(!s&&!b.usePercentage&&!h&&r(b.min)&&r(b.max)&&(c=b.max-b.min)){if(!r(d.min)&&!r(b.userMin)&&k&&(b.dataMin<0||!b.ignoreMinPadding))b.min-=c*k;if(!r(d.max)&&!r(b.userMax)&&j&&(b.dataMax>0||!b.ignoreMaxPadding))b.max+=c*j}b.tickInterval=b.min===b.max||b.min===void 0||b.max===
-void 0?1:h&&!m&&p===b.linkedParent.options.tickPixelInterval?b.linkedParent.tickInterval:o(m,s?1:(b.max-b.min)*p/(b.len||1));g&&!a&&n(b.series,function(a){a.processData(b.min!==b.oldMin||b.max!==b.oldMax)});b.setAxisTranslation(!0);b.beforeSetTickPositions&&b.beforeSetTickPositions();if(b.postProcessTickInterval)b.tickInterval=b.postProcessTickInterval(b.tickInterval);if(!m&&b.tickIntervale&&i.shift(),d.endOnTick?b.max=f:b.max+h(b[d]||0)&&this.options.alignTicks!==!1)b[d]=c.length;a.maxTicks=b},adjustTickAmount:function(){var a=this._maxTicksKey,b=this.tickPositions,c=this.chart.maxTicks;if(c&&c[a]&&!this.isDatetimeAxis&&
-!this.categories&&!this.isLinked&&this.options.alignTicks!==!1){var d=this.tickAmount,e=b.length;this.tickAmount=a=c[a];if(e=this.dataMax&&(b=y));this.displayBtn=a!==y||b!==y;this.setExtremes(a,b,!1,y,{trigger:"zoom"});return!0},setAxisSize:function(){var a=this.chart,b=this.options,c=b.offsetLeft||0,d=b.offsetRight||0,e=this.horiz,f,g;this.left=g=o(b.left,a.plotLeft+c);this.top=f=o(b.top,a.plotTop);this.width=c=o(b.width,a.plotWidth-c+d);this.height=b=o(b.height,a.plotHeight);
-this.bottom=a.chartHeight-b-f;this.right=a.chartWidth-c-g;this.len=q(e?c:b,0);this.pos=e?g:f},getExtremes:function(){var a=this.isLog;return{min:a?ia(da(this.min)):this.min,max:a?ia(da(this.max)):this.max,dataMin:this.dataMin,dataMax:this.dataMax,userMin:this.userMin,userMax:this.userMax}},getThreshold:function(a){var b=this.isLog,c=b?da(this.min):this.min,b=b?da(this.max):this.max;c>a||a===null?a=c:b=a.min&&b<=a.max)j[b]||(j[b]=new Ja(a,b)),w&&j[b].isNew&&j[b].render(c,!0),j[b].render(c,!1,1)}),s&&a.min===0&&(j[-1]||(j[-1]=new Ja(a,-1,null,!0)),j[-1].render(-1))),
-p&&n(g,function(b,c){if(c%2===0&&b1||Q(b-f.y)>1))clearTimeout(this.tooltipTimeout),this.tooltipTimeout=setTimeout(function(){e&&e.move(a,b,c,d)},32)},hide:function(){var a=this,b;clearTimeout(this.hideTimer);if(!this.isHidden)b=this.chart.hoverPoints,this.hideTimer=setTimeout(function(){a.label.fadeOut();a.isHidden=!0},o(this.options.hideDelay,500)),b&&n(b,function(a){a.setState()}),this.chart.hoverPoints=null},hideCrosshairs:function(){n(this.crosshairs,function(a){a&&a.hide()})},getAnchor:function(a,b){var c,d=this.chart,e=
-d.inverted,f=d.plotTop,g=0,h=0,i,a=ha(a);c=a[0].tooltipPos;this.followPointer&&b&&(b.chartX===y&&(b=d.pointer.normalize(b)),c=[b.chartX-d.plotLeft,b.chartY-f]);c||(n(a,function(a){i=a.series.yAxis;g+=a.plotX;h+=(a.plotLow?(a.plotLow+a.plotHigh)/2:a.plotY)+(!e&&i?i.top-f:0)}),g/=a.length,h/=a.length,c=[e?d.plotWidth-h:g,this.shared&&!e&&a.length>1&&b?b.chartY-f:e?d.plotHeight-g:h]);return La(c,t)},getPosition:function(a,b,c){var d=this.chart,e=d.plotLeft,f=d.plotTop,g=d.plotWidth,h=d.plotHeight,i=
-o(this.options.distance,12),j=c.plotX,c=c.plotY,d=j+e+(d.inverted?i:-a-i),k=c-b+f+15,m;d<7&&(d=e+q(j,0)+i);d+a>e+g&&(d-=d+a-(e+g),k=c-b+f-i,m=!0);k=k&&c<=k+b&&(k=c+f+i));k+b>f+h&&(k=q(f,f+h-b-i));return{x:d,y:k}},defaultFormatter:function(a){var b=this.points||ha(this),c=b[0].series,d;d=[c.tooltipHeaderFormatter(b[0])];n(b,function(a){c=a.series;d.push(c.tooltipFormatter&&c.tooltipFormatter(a)||a.point.tooltipFormatter(c.tooltipOptions.pointFormat))});d.push(a.options.footerFormat||
-"");return d.join("")},refresh:function(a,b){var c=this.chart,d=this.label,e=this.options,f,g,h,i={},j,k=[];j=e.formatter||this.defaultFormatter;var i=c.hoverPoints,m,l=e.crosshairs;h=this.shared;clearTimeout(this.hideTimer);this.followPointer=ha(a)[0].series.tooltipOptions.followPointer;g=this.getAnchor(a,b);f=g[0];g=g[1];h&&(!a.series||!a.series.noSharedTooltip)?(c.hoverPoints=a,i&&n(i,function(a){a.setState()}),n(a,function(a){a.setState("hover");k.push(a.getLabelConfig())}),i={x:a[0].category,
-y:a[0].y},i.points=k,a=a[0]):i=a.getLabelConfig();j=j.call(i,this);i=a.series;h=h||!i.isCartesian||i.tooltipOutsidePlot||c.isInsidePlot(f,g);j===!1||!h?this.hide():(this.isHidden&&(Ta(d),d.attr("opacity",1).show()),d.attr({text:j}),m=e.borderColor||a.color||i.color||"#606060",d.attr({stroke:m}),this.updatePosition({plotX:f,plotY:g}),this.isHidden=!1);if(l){l=ha(l);for(d=l.length;d--;)if(e=a.series[d?"yAxis":"xAxis"],l[d]&&e)if(h=d?o(a.stackY,a.y):a.x,e.isLog&&(h=ka(h)),e=e.getPlotLinePath(h,1),this.crosshairs[d])this.crosshairs[d].attr({d:e,
-visibility:"visible"});else{h={"stroke-width":l[d].width||1,stroke:l[d].color||"#C0C0C0",zIndex:l[d].zIndex||2};if(l[d].dashStyle)h.dashstyle=l[d].dashStyle;this.crosshairs[d]=c.renderer.path(e).attr(h).add()}}D(c,"tooltipRefresh",{text:j,x:f+c.plotLeft,y:g+c.plotTop,borderColor:m})},updatePosition:function(a){var b=this.chart,c=this.label,c=(this.options.positioner||this.getPosition).call(this,c.width,c.height,a);this.move(t(c.x),t(c.y),a.plotX+b.plotLeft,a.plotY+b.plotTop)}};rb.prototype={init:function(a,
-b){var c=$?"":b.chart.zoomType,d=a.inverted,e;this.options=b;this.chart=a;this.zoomX=e=/x/.test(c);this.zoomY=c=/y/.test(c);this.zoomHor=e&&!d||c&&d;this.zoomVert=c&&!d||e&&d;this.pinchDown=[];this.lastValidTouch={};if(b.tooltip.enabled)a.tooltip=new qb(a,b.tooltip);this.setDOMEvents()},normalize:function(a){var b,c,d,a=a||O.event;if(!a.target)a.target=a.srcElement;a=Qb(a);d=a.touches?a.touches.item(0):a;this.chartPosition=b=Ub(this.chart.container);d.pageX===y?(c=a.x,b=a.y):(c=d.pageX-b.left,b=d.pageY-
-b.top);return v(a,{chartX:t(c),chartY:t(b)})},getCoordinates:function(a){var b={xAxis:[],yAxis:[]};n(this.chart.axes,function(c){b[c.isXAxis?"xAxis":"yAxis"].push({axis:c,value:c.toValue(a[c.horiz?"chartX":"chartY"])})});return b},getIndex:function(a){var b=this.chart;return b.inverted?b.plotHeight+b.plotTop-a.chartY:a.chartX-b.plotLeft},runPointActions:function(a){var b=this.chart,c=b.series,d=b.tooltip,e,f=b.hoverPoint,g=b.hoverSeries,h,i,j=b.chartWidth,k=this.getIndex(a);if(d&&this.options.tooltip.shared&&
-(!g||!g.noSharedTooltip)){e=[];h=c.length;for(i=0;ij&&e.splice(h,1);if(e.length&&e[0].clientX!==this.hoverX)d.refresh(e,a),this.hoverX=e[0].clientX}if(g&&g.tracker){if((b=g.tooltipPoints[k])&&b!==f)b.onMouseOver(a)}else d&&d.followPointer&&!d.isHidden&&(a=d.getAnchor([{}],a),
-d.updatePosition({plotX:a[0],plotY:a[1]}))},reset:function(a){var b=this.chart,c=b.hoverSeries,d=b.hoverPoint,e=b.tooltip,b=e&&e.shared?b.hoverPoints:d;(a=a&&e&&b)&&ha(b)[0].plotX===y&&(a=!1);if(a)e.refresh(b);else{if(d)d.onMouseOut();if(c)c.onMouseOut();e&&(e.hide(),e.hideCrosshairs());this.hoverX=null}},scaleGroups:function(a,b){var c=this.chart;n(c.series,function(d){d.xAxis&&d.xAxis.zoomEnabled&&(d.group.attr(a),d.markerGroup&&(d.markerGroup.attr(a),d.markerGroup.clip(b?c.clipRect:null)),d.dataLabelsGroup&&
-d.dataLabelsGroup.attr(a))});c.clipRect.attr(b||c.clipBox)},pinchTranslateDirection:function(a,b,c,d,e,f,g){var h=this.chart,i=a?"x":"y",j=a?"X":"Y",k="chart"+j,m=a?"width":"height",l=h["plot"+(a?"Left":"Top")],p,s,o=1,n=h.inverted,w=h.bounds[a?"h":"v"],q=b.length===1,t=b[0][k],r=c[0][k],v=!q&&b[1][k],u=!q&&c[1][k],x,c=function(){!q&&Q(t-v)>20&&(o=Q(r-u)/Q(t-v));s=(l-r)/o+t;p=h["plot"+(a?"Width":"Height")]/o};c();b=s;bw.max&&(b=w.max-p,x=!0);x?(r-=0.8*(r-g[i][0]),q||(u-=
-0.8*(u-g[i][1])),c()):g[i]=[r,u];n||(f[i]=s-l,f[m]=p);f=n?1/o:o;e[m]=p;e[i]=b;d[n?a?"scaleY":"scaleX":"scale"+j]=o;d["translate"+j]=f*l+(r-f*t)},pinch:function(a){var b=this,c=b.chart,d=b.pinchDown,e=c.tooltip&&c.tooltip.options.followTouchMove,f=a.touches,g=f.length,h=b.lastValidTouch,i=b.zoomHor||b.pinchHor,j=b.zoomVert||b.pinchVert,k=i||j,m=b.selectionMarker,l={},p={};a.type==="touchstart"&&(e||k)&&a.preventDefault();La(f,function(a){return b.normalize(a)});if(a.type==="touchstart")n(f,function(a,
-b){d[b]={chartX:a.chartX,chartY:a.chartY}}),h.x=[d[0].chartX,d[1]&&d[1].chartX],h.y=[d[0].chartY,d[1]&&d[1].chartY],n(c.axes,function(a){if(a.zoomEnabled){var b=c.bounds[a.horiz?"h":"v"],d=a.minPixelPadding,e=a.toPixels(a.dataMin),f=a.toPixels(a.dataMax),g=K(e,f),e=q(e,f);b.min=K(a.pos,g-d);b.max=q(a.pos+a.len,e+d)}});else if(d.length){if(!m)b.selectionMarker=m=v({destroy:ta},c.plotBox);i&&b.pinchTranslateDirection(!0,d,f,l,m,p,h);j&&b.pinchTranslateDirection(!1,d,f,l,m,p,h);b.hasPinched=k;b.scaleGroups(l,
-p);!k&&e&&g===1&&this.runPointActions(b.normalize(a))}},dragStart:function(a){var b=this.chart;b.mouseIsDown=a.type;b.cancelClick=!1;b.mouseDownX=this.mouseDownX=a.chartX;this.mouseDownY=a.chartY},drag:function(a){var b=this.chart,c=b.options.chart,d=a.chartX,a=a.chartY,e=this.zoomHor,f=this.zoomVert,g=b.plotLeft,h=b.plotTop,i=b.plotWidth,j=b.plotHeight,k,m=this.mouseDownX,l=this.mouseDownY;dg+i&&(d=g+i);ah+j&&(a=h+j);this.hasDragged=Math.sqrt(Math.pow(m-d,2)+Math.pow(l-a,2));if(this.hasDragged>
-10){k=b.isInsidePlot(m-g,l-h);if(b.hasCartesianSeries&&(this.zoomX||this.zoomY)&&k&&!this.selectionMarker)this.selectionMarker=b.renderer.rect(g,h,e?1:i,f?1:j,0).attr({fill:c.selectionMarkerFill||"rgba(69,114,167,0.25)",zIndex:7}).add();this.selectionMarker&&e&&(e=d-m,this.selectionMarker.attr({width:Q(e),x:(e>0?0:e)+m}));this.selectionMarker&&f&&(e=a-l,this.selectionMarker.attr({height:Q(e),y:(e>0?0:e)+l}));k&&!this.selectionMarker&&c.panning&&b.pan(d)}},drop:function(a){var b=this.chart,c=this.hasPinched;
-if(this.selectionMarker){var d={xAxis:[],yAxis:[],originalEvent:a.originalEvent||a},e=this.selectionMarker,f=e.x,g=e.y,h;if(this.hasDragged||c)n(b.axes,function(a){if(a.zoomEnabled){var b=a.horiz,c=a.toValue(b?f:g),b=a.toValue(b?f+e.width:g+e.height);!isNaN(c)&&!isNaN(b)&&(d[a.xOrY+"Axis"].push({axis:a,min:K(c,b),max:q(c,b)}),h=!0)}}),h&&D(b,"selection",d,function(a){b.zoom(v(a,c?{animation:!1}:null))});this.selectionMarker=this.selectionMarker.destroy();c&&this.scaleGroups({translateX:b.plotLeft,
-translateY:b.plotTop,scaleX:1,scaleY:1})}if(b)L(b.container,{cursor:b._cursor}),b.cancelClick=this.hasDragged>10,b.mouseIsDown=this.hasDragged=this.hasPinched=!1,this.pinchDown=[]},onContainerMouseDown:function(a){a=this.normalize(a);a.preventDefault&&a.preventDefault();this.dragStart(a)},onDocumentMouseUp:function(a){this.drop(a)},onDocumentMouseMove:function(a){var b=this.chart,c=this.chartPosition,d=b.hoverSeries,a=Qb(a);c&&d&&d.isCartesian&&!b.isInsidePlot(a.pageX-c.left-b.plotLeft,a.pageY-c.top-
-b.plotTop)&&this.reset()},onContainerMouseLeave:function(){this.reset();this.chartPosition=null},onContainerMouseMove:function(a){var b=this.chart,a=this.normalize(a);a.returnValue=!1;b.mouseIsDown==="mousedown"&&this.drag(a);b.isInsidePlot(a.chartX-b.plotLeft,a.chartY-b.plotTop)&&!b.openMenu&&this.runPointActions(a)},inClass:function(a,b){for(var c;a;){if(c=A(a,"class"))if(c.indexOf(b)!==-1)return!0;else if(c.indexOf("highcharts-container")!==-1)return!1;a=a.parentNode}},onTrackerMouseOut:function(a){var b=
-this.chart.hoverSeries;if(b&&!b.options.stickyTracking&&!this.inClass(a.toElement||a.relatedTarget,"highcharts-tooltip"))b.onMouseOut()},onContainerClick:function(a){var b=this.chart,c=b.hoverPoint,d=b.plotLeft,e=b.plotTop,f=b.inverted,g,h,i,a=this.normalize(a);a.cancelBubble=!0;if(!b.cancelClick)c&&this.inClass(a.target,"highcharts-tracker")?(g=this.chartPosition,h=c.plotX,i=c.plotY,v(c,{pageX:g.left+d+(f?b.plotWidth-i:h),pageY:g.top+e+(f?b.plotHeight-h:i)}),D(c.series,"click",v(a,{point:c})),b.hoverPoint&&
-c.firePointEvent("click",a)):(v(a,this.getCoordinates(a)),b.isInsidePlot(a.chartX-d,a.chartY-e)&&D(b,"click",a))},onContainerTouchStart:function(a){var b=this.chart;a.touches.length===1?(a=this.normalize(a),b.isInsidePlot(a.chartX-b.plotLeft,a.chartY-b.plotTop)&&(this.runPointActions(a),this.pinch(a))):a.touches.length===2&&this.pinch(a)},onContainerTouchMove:function(a){(a.touches.length===1||a.touches.length===2)&&this.pinch(a)},onDocumentTouchEnd:function(a){this.drop(a)},setDOMEvents:function(){var a=
-this,b=a.chart.container,c;this._events=c=[[b,"onmousedown","onContainerMouseDown"],[b,"onmousemove","onContainerMouseMove"],[b,"onclick","onContainerClick"],[b,"mouseleave","onContainerMouseLeave"],[z,"mousemove","onDocumentMouseMove"],[z,"mouseup","onDocumentMouseUp"]];fb&&c.push([b,"ontouchstart","onContainerTouchStart"],[b,"ontouchmove","onContainerTouchMove"],[z,"touchend","onDocumentTouchEnd"]);n(c,function(b){a["_"+b[2]]=function(c){a[b[2]](c)};b[1].indexOf("on")===0?b[0][b[1]]=a["_"+b[2]]:
-J(b[0],b[1],a["_"+b[2]])})},destroy:function(){var a=this;n(a._events,function(b){b[1].indexOf("on")===0?b[0][b[1]]=null:ba(b[0],b[1],a["_"+b[2]])});delete a._events;clearInterval(a.tooltipTimeout)}};sb.prototype={init:function(a,b){var c=this,d=b.itemStyle,e=o(b.padding,8),f=b.itemMarginTop||0;this.options=b;if(b.enabled)c.baseline=u(d.fontSize)+3+f,c.itemStyle=d,c.itemHiddenStyle=x(d,b.itemHiddenStyle),c.itemMarginTop=f,c.padding=e,c.initialItemX=e,c.initialItemY=e-5,c.maxItemWidth=0,c.chart=a,
-c.itemHeight=0,c.lastLineHeight=0,c.render(),J(c.chart,"endResize",function(){c.positionCheckboxes()})},colorizeItem:function(a,b){var c=this.options,d=a.legendItem,e=a.legendLine,f=a.legendSymbol,g=this.itemHiddenStyle.color,c=b?c.itemStyle.color:g,h=b?a.color:g,g=a.options&&a.options.marker,i={stroke:h,fill:h},j;d&&d.css({fill:c,color:c});e&&e.attr({stroke:h});if(f){if(g)for(j in g=a.convertAttribs(g),g)d=g[j],d!==y&&(i[j]=d);f.attr(i)}},positionItem:function(a){var b=this.options,c=b.symbolPadding,
-b=!b.rtl,d=a._legendItemPos,e=d[0],d=d[1],f=a.checkbox;a.legendGroup&&a.legendGroup.translate(b?e:this.legendWidth-e-2*c-4,d);if(f)f.x=e,f.y=d},destroyItem:function(a){var b=a.checkbox;n(["legendItem","legendLine","legendSymbol","legendGroup"],function(b){a[b]&&a[b].destroy()});b&&Ra(a.checkbox)},destroy:function(){var a=this.group,b=this.box;if(b)this.box=b.destroy();if(a)this.group=a.destroy()},positionCheckboxes:function(a){var b=this.group.alignAttr,c,d=this.clipHeight||this.legendHeight;if(b)c=
-b.translateY,n(this.allItems,function(e){var f=e.checkbox,g;f&&(g=c+f.y+(a||0)+3,L(f,{left:b.translateX+e.legendItemWidth+f.x-20+"px",top:g+"px",display:g>c-6&&g(l||c.chartWidth-2*k-o))b.itemX=o,b.itemY+=s+b.lastLineHeight+p,b.lastLineHeight=0;b.maxItemWidth=q(b.maxItemWidth,e);b.lastItemY=s+b.itemY+p;b.lastLineHeight=q(g,b.lastLineHeight);a._legendItemPos=[b.itemX,b.itemY];f?b.itemX+=e:(b.itemY+=s+g+p,b.lastLineHeight=
-g);b.offsetWidth=l||q(f?b.itemX-o:e,b.offsetWidth)},render:function(){var a=this,b=a.chart,c=b.renderer,d=a.group,e,f,g,h,i=a.box,j=a.options,k=a.padding,m=j.borderWidth,l=j.backgroundColor;a.itemX=a.initialItemX;a.itemY=a.initialItemY;a.offsetWidth=0;a.lastItemY=0;if(!d)a.group=d=c.g("legend").attr({zIndex:7}).add(),a.contentGroup=c.g().attr({zIndex:1}).add(d),a.scrollGroup=c.g().add(a.contentGroup);a.renderTitle();e=[];n(b.series,function(a){var b=a.options;b.showInLegend&&!r(b.linkedTo)&&(e=e.concat(a.legendItems||
-(b.legendType==="point"?a.data:a)))});Ib(e,function(a,b){return(a.options&&a.options.legendIndex||0)-(b.options&&b.options.legendIndex||0)});j.reversed&&e.reverse();a.allItems=e;a.display=f=!!e.length;n(e,function(b){a.renderItem(b)});g=j.width||a.offsetWidth;h=a.lastItemY+a.lastLineHeight+a.titleHeight;h=a.handleOverflow(h);if(m||l){g+=k;h+=k;if(i){if(g>0&&h>0)i[i.isNew?"attr":"animate"](i.crisp(null,null,null,g,h)),i.isNew=!1}else a.box=i=c.rect(0,0,g,h,j.borderRadius,m||0).attr({stroke:j.borderColor,
-"stroke-width":m||0,fill:l||S}).add(d).shadow(j.shadow),i.isNew=!0;i[f?"show":"hide"]()}a.legendWidth=g;a.legendHeight=h;n(e,function(b){a.positionItem(b)});f&&d.align(v({width:g,height:h},j),!0,"spacingBox");b.isResizing||this.positionCheckboxes()},handleOverflow:function(a){var b=this,c=this.chart,d=c.renderer,e=this.options,f=e.y,f=c.spacingBox.height+(e.verticalAlign==="top"?-f:f)-this.padding,g=e.maxHeight,h=this.clipRect,i=e.navigation,j=o(i.animation,!0),k=i.arrowSize||12,m=this.nav;e.layout===
-"horizontal"&&(f/=2);g&&(f=K(f,g));if(a>f&&!e.useHTML){this.clipHeight=c=f-20-this.titleHeight;this.pageCount=ja(a/c);this.currentPage=o(this.currentPage,1);this.fullHeight=a;if(!h)h=b.clipRect=d.clipRect(0,0,9999,0),b.contentGroup.clip(h);h.attr({height:c});if(!m)this.nav=m=d.g().attr({zIndex:1}).add(this.group),this.up=d.symbol("triangle",0,0,k,k).on("click",function(){b.scroll(-1,j)}).add(m),this.pager=d.text("",15,10).css(i.style).add(m),this.down=d.symbol("triangle-down",0,0,k,k).on("click",
-function(){b.scroll(1,j)}).add(m);b.scroll(0);a=f}else if(m)h.attr({height:c.chartHeight}),m.hide(),this.scrollGroup.attr({translateY:1}),this.clipHeight=0;return a},scroll:function(a,b){var c=this.pageCount,d=this.currentPage+a,e=this.clipHeight,f=this.options.navigation,g=f.activeColor,h=f.inactiveColor,f=this.pager,i=this.padding;d>c&&(d=c);if(d>0)b!==y&&Ia(b,this.chart),this.nav.attr({translateX:i,translateY:e+7+this.titleHeight,visibility:"visible"}),this.up.attr({fill:d===1?h:g}).css({cursor:d===
-1?"default":"pointer"}),f.attr({text:d+"/"+this.pageCount}),this.down.attr({x:18+this.pager.getBBox().width,fill:d===c?h:g}).css({cursor:d===c?"default":"pointer"}),e=-K(e*(d-1),this.fullHeight-e+i)+1,this.scrollGroup.animate({translateY:e}),f.attr({text:d+"/"+c}),this.currentPage=d,this.positionCheckboxes(e)}};tb.prototype={init:function(a,b){var c,d=a.series;a.series=null;c=x(N,a);c.series=a.series=d;var d=c.chart,e=d.margin,e=V(e)?e:[e,e,e,e];this.optionsMarginTop=o(d.marginTop,e[0]);this.optionsMarginRight=
-o(d.marginRight,e[1]);this.optionsMarginBottom=o(d.marginBottom,e[2]);this.optionsMarginLeft=o(d.marginLeft,e[3]);this.runChartClick=(e=d.events)&&!!e.click;this.bounds={h:{},v:{}};this.callback=b;this.isResizing=0;this.options=c;this.axes=[];this.series=[];this.hasCartesianSeries=d.showAxes;var f=this,g;f.index=Ba.length;Ba.push(f);d.reflow!==!1&&J(f,"load",function(){f.initReflow()});if(e)for(g in e)J(f,g,e[g]);f.xAxis=[];f.yAxis=[];f.animation=$?!1:o(d.animation,!0);f.pointCount=0;f.counters=new Hb;
-f.firstRender()},initSeries:function(a){var b=this.options.chart;(b=aa[a.type||b.type||b.defaultSeriesType])||qa(17,!0);b=new b;b.init(this,a);return b},addSeries:function(a,b,c){var d,e=this;a&&(b=o(b,!0),D(e,"addSeries",{options:a},function(){d=e.initSeries(a);e.isDirtyLegend=!0;b&&e.redraw(c)}));return d},addAxis:function(a,b,c,d){var b=b?"xAxis":"yAxis",e=this.options;new ab(this,x(a,{index:this[b].length}));e[b]=ha(e[b]||{});e[b].push(a);o(c,!0)&&this.redraw(d)},isInsidePlot:function(a,b,c){var d=
-c?b:a,a=c?a:b;return d>=0&&d<=this.plotWidth&&a>=0&&a<=this.plotHeight},adjustTickAmounts:function(){this.options.chart.alignTicks!==!1&&n(this.axes,function(a){a.adjustTickAmount()});this.maxTicks=null},redraw:function(a){var b=this.axes,c=this.series,d=this.pointer,e=this.legend,f=this.isDirtyLegend,g,h=this.isDirtyBox,i=c.length,j=i,k=this.renderer,m=k.isHidden(),l=[];Ia(a,this);for(m&&this.cloneRenderTo();j--;)if(a=c[j],a.isDirty&&a.options.stacking){g=!0;break}if(g)for(j=i;j--;)if(a=c[j],a.options.stacking)a.isDirty=
-!0;n(c,function(a){a.isDirty&&a.options.legendType==="point"&&(f=!0)});if(f&&e.options.enabled)e.render(),this.isDirtyLegend=!1;if(this.hasCartesianSeries){if(!this.isResizing)this.maxTicks=null,n(b,function(a){a.setScale()});this.adjustTickAmounts();this.getMargins();n(b,function(a){if(a.isDirtyExtremes)a.isDirtyExtremes=!1,l.push(function(){D(a,"afterSetExtremes",a.getExtremes())});if(a.isDirty||h||g)a.redraw(),h=!0})}h&&this.drawChartBox();n(c,function(a){a.isDirty&&a.visible&&(!a.isCartesian||
-a.xAxis)&&a.redraw()});d&&d.reset&&d.reset(!0);k.draw();D(this,"redraw");m&&this.cloneRenderTo(!0);n(l,function(a){a.call()})},showLoading:function(a){var b=this.options,c=this.loadingDiv,d=b.loading;if(!c)this.loadingDiv=c=U(ya,{className:"highcharts-loading"},v(d.style,{zIndex:10,display:S}),this.container),this.loadingSpan=U("span",null,d.labelStyle,c);this.loadingSpan.innerHTML=a||b.lang.loading;if(!this.loadingShown)L(c,{opacity:0,display:"",left:this.plotLeft+"px",top:this.plotTop+"px",width:this.plotWidth+
-"px",height:this.plotHeight+"px"}),wb(c,{opacity:d.style.opacity},{duration:d.showDuration||0}),this.loadingShown=!0},hideLoading:function(){var a=this.options,b=this.loadingDiv;b&&wb(b,{opacity:0},{duration:a.loading.hideDuration||100,complete:function(){L(b,{display:S})}});this.loadingShown=!1},get:function(a){var b=this.axes,c=this.series,d,e;for(d=0;dK(e.dataMin,e.min)&&c19?this.containerHeight:400))},cloneRenderTo:function(a){var b=this.renderToClone,c=this.container;a?b&&(this.renderTo.appendChild(c),Ra(b),delete this.renderToClone):
-(c&&this.renderTo.removeChild(c),this.renderToClone=b=this.renderTo.cloneNode(0),L(b,{position:"absolute",top:"-9999px",display:"block"}),z.body.appendChild(b),c&&b.appendChild(c))},getContainer:function(){var a,b=this.options.chart,c,d,e;this.renderTo=a=b.renderTo;e="highcharts-"+ub++;if(fa(a))this.renderTo=a=z.getElementById(a);a||qa(13,!0);c=u(A(a,"data-highcharts-chart"));!isNaN(c)&&Ba[c]&&Ba[c].destroy();A(a,"data-highcharts-chart",this.index);a.innerHTML="";a.offsetWidth||this.cloneRenderTo();
-this.getChartSize();c=this.chartWidth;d=this.chartHeight;this.container=a=U(ya,{className:"highcharts-container"+(b.className?" "+b.className:""),id:e},v({position:"relative",overflow:"hidden",width:c+"px",height:d+"px",textAlign:"left",lineHeight:"normal",zIndex:0,"-webkit-tap-highlight-color":"rgba(0,0,0,0)"},b.style),this.renderToClone||a);this._cursor=a.style.cursor;this.renderer=b.forExport?new Ca(a,c,d,!0):new Sa(a,c,d);$&&this.renderer.create(this,a,c,d)},getMargins:function(){var a=this.options.chart,
-b=a.spacingTop,c=a.spacingRight,d=a.spacingBottom,a=a.spacingLeft,e,f=this.legend,g=this.optionsMarginTop,h=this.optionsMarginLeft,i=this.optionsMarginRight,j=this.optionsMarginBottom,k=this.options.title,m=this.options.subtitle,l=this.options.legend,p=o(l.margin,10),s=l.x,t=l.y,B=l.align,w=l.verticalAlign;this.resetMargins();e=this.axisOffset;if((this.title||this.subtitle)&&!r(this.optionsMarginTop))if(m=q(this.title&&!k.floating&&!k.verticalAlign&&k.y||0,this.subtitle&&!m.floating&&!m.verticalAlign&&
-m.y||0))this.plotTop=q(this.plotTop,m+o(k.margin,15)+b);if(f.display&&!l.floating)if(B==="right"){if(!r(i))this.marginRight=q(this.marginRight,f.legendWidth-s+p+c)}else if(B==="left"){if(!r(h))this.plotLeft=q(this.plotLeft,f.legendWidth+s+p+a)}else if(w==="top"){if(!r(g))this.plotTop=q(this.plotTop,f.legendHeight+t+p+b)}else if(w==="bottom"&&!r(j))this.marginBottom=q(this.marginBottom,f.legendHeight-t+p+d);this.extraBottomMargin&&(this.marginBottom+=this.extraBottomMargin);this.extraTopMargin&&(this.plotTop+=
-this.extraTopMargin);this.hasCartesianSeries&&n(this.axes,function(a){a.getOffset()});r(h)||(this.plotLeft+=e[3]);r(g)||(this.plotTop+=e[0]);r(j)||(this.marginBottom+=e[2]);r(i)||(this.marginRight+=e[1]);this.setChartSize()},initReflow:function(){function a(a){var g=c.width||gb(d,"width"),h=c.height||gb(d,"height"),a=a?a.target:O;if(!b.hasUserSize&&g&&h&&(a===O||a===z)){if(g!==b.containerWidth||h!==b.containerHeight)clearTimeout(e),b.reflowTimeout=e=setTimeout(function(){if(b.container)b.setSize(g,
-h,!1),b.hasUserSize=null},100);b.containerWidth=g;b.containerHeight=h}}var b=this,c=b.options.chart,d=b.renderTo,e;J(O,"resize",a);J(b,"destroy",function(){ba(O,"resize",a)})},setSize:function(a,b,c){var d=this,e,f,g;d.isResizing+=1;g=function(){d&&D(d,"endResize",null,function(){d.isResizing-=1})};Ia(c,d);d.oldChartHeight=d.chartHeight;d.oldChartWidth=d.chartWidth;if(r(a))d.chartWidth=e=q(0,t(a)),d.hasUserSize=!!e;if(r(b))d.chartHeight=f=q(0,t(b));L(d.container,{width:e+"px",height:f+"px"});d.setChartSize(!0);
-d.renderer.setSize(e,f,c);d.maxTicks=null;n(d.axes,function(a){a.isDirty=!0;a.setScale()});n(d.series,function(a){a.isDirty=!0});d.isDirtyLegend=!0;d.isDirtyBox=!0;d.getMargins();d.redraw(c);d.oldChartHeight=null;D(d,"resize");za===!1?g():setTimeout(g,za&&za.duration||500)},setChartSize:function(a){var b=this.inverted,c=this.renderer,d=this.chartWidth,e=this.chartHeight,f=this.options.chart,g=f.spacingTop,h=f.spacingRight,i=f.spacingBottom,j=f.spacingLeft,k=this.clipOffset,m,l,p,o;this.plotLeft=m=
-t(this.plotLeft);this.plotTop=l=t(this.plotTop);this.plotWidth=p=q(0,t(d-m-this.marginRight));this.plotHeight=o=q(0,t(e-l-this.marginBottom));this.plotSizeX=b?o:p;this.plotSizeY=b?p:o;this.plotBorderWidth=b=f.plotBorderWidth||0;this.spacingBox=c.spacingBox={x:j,y:g,width:d-j-h,height:e-g-i};this.plotBox=c.plotBox={x:m,y:l,width:p,height:o};c=ja(q(b,k[3])/2);d=ja(q(b,k[0])/2);this.clipBox={x:c,y:d,width:T(this.plotSizeX-q(b,k[1])/2-c),height:T(this.plotSizeY-q(b,k[2])/2-d)};a||n(this.axes,function(a){a.setAxisSize();
-a.setAxisTranslation()})},resetMargins:function(){var a=this.options.chart,b=a.spacingRight,c=a.spacingBottom,d=a.spacingLeft;this.plotTop=o(this.optionsMarginTop,a.spacingTop);this.marginRight=o(this.optionsMarginRight,b);this.marginBottom=o(this.optionsMarginBottom,c);this.plotLeft=o(this.optionsMarginLeft,d);this.axisOffset=[0,0,0,0];this.clipOffset=[0,0,0,0]},drawChartBox:function(){var a=this.options.chart,b=this.renderer,c=this.chartWidth,d=this.chartHeight,e=this.chartBackground,f=this.plotBackground,
-g=this.plotBorder,h=this.plotBGImage,i=a.borderWidth||0,j=a.backgroundColor,k=a.plotBackgroundColor,m=a.plotBackgroundImage,l=a.plotBorderWidth||0,p,o=this.plotLeft,n=this.plotTop,t=this.plotWidth,q=this.plotHeight,r=this.plotBox,v=this.clipRect,u=this.clipBox;p=i+(a.shadow?8:0);if(i||j)if(e)e.animate(e.crisp(null,null,null,c-p,d-p));else{e={fill:j||S};if(i)e.stroke=a.borderColor,e["stroke-width"]=i;this.chartBackground=b.rect(p/2,p/2,c-p,d-p,a.borderRadius,i).attr(e).add().shadow(a.shadow)}if(k)f?
-f.animate(r):this.plotBackground=b.rect(o,n,t,q,0).attr({fill:k}).add().shadow(a.plotShadow);if(m)h?h.animate(r):this.plotBGImage=b.image(m,o,n,t,q).add();v?v.animate({width:u.width,height:u.height}):this.clipRect=b.clipRect(u);if(l)g?g.animate(g.crisp(null,o,n,t,q)):this.plotBorder=b.rect(o,n,t,q,0,l).attr({stroke:a.plotBorderColor,"stroke-width":l,zIndex:1}).add();this.isDirtyBox=!1},propFromSeries:function(){var a=this,b=a.options.chart,c,d=a.options.series,e,f;n(["inverted","angular","polar"],
-function(g){c=aa[b.type||b.defaultSeriesType];f=a[g]||b[g]||c&&c.prototype[g];for(e=d&&d.length;!f&&e--;)(c=aa[d[e].type])&&c.prototype[g]&&(f=!0);a[g]=f})},render:function(){var a=this,b=a.axes,c=a.renderer,d=a.options,e=d.labels,f=d.credits,g;a.setTitle();a.legend=new sb(a,d.legend);n(b,function(a){a.setScale()});a.getMargins();a.maxTicks=null;n(b,function(a){a.setTickPositions(!0);a.setMaxTicks()});a.adjustTickAmounts();a.getMargins();a.drawChartBox();a.hasCartesianSeries&&n(b,function(a){a.render()});
-if(!a.seriesGroup)a.seriesGroup=c.g("series-group").attr({zIndex:3}).add();n(a.series,function(a){a.translate();a.setTooltipPoints();a.render()});e.items&&n(e.items,function(b){var d=v(e.style,b.style),f=u(d.left)+a.plotLeft,g=u(d.top)+a.plotTop+12;delete d.left;delete d.top;c.text(b.html,f,g).attr({zIndex:2}).css(d).add()});if(f.enabled&&!a.credits)g=f.href,a.credits=c.text(f.text,0,0).on("click",function(){if(g)location.href=g}).attr({align:f.position.align,zIndex:8}).css(f.style).add().align(f.position);
-a.hasRendered=!0},destroy:function(){var a=this,b=a.axes,c=a.series,d=a.container,e,f=d&&d.parentNode;D(a,"destroy");Ba[a.index]=y;a.renderTo.removeAttribute("data-highcharts-chart");ba(a);for(e=b.length;e--;)b[e]=b[e].destroy();for(e=c.length;e--;)c[e]=c[e].destroy();n("title,subtitle,chartBackground,plotBackground,plotBGImage,plotBorder,seriesGroup,clipRect,credits,pointer,scroller,rangeSelector,legend,resetZoomButton,tooltip,renderer".split(","),function(b){var c=a[b];c&&c.destroy&&(a[b]=c.destroy())});
-if(d)d.innerHTML="",ba(d),f&&Ra(d);for(e in a)delete a[e]},isReadyToRender:function(){var a=this;return!Z&&O==O.top&&z.readyState!=="complete"||$&&!O.canvg?($?Rb.push(function(){a.firstRender()},a.options.global.canvasToolsURL):z.attachEvent("onreadystatechange",function(){z.detachEvent("onreadystatechange",a.firstRender);z.readyState==="complete"&&a.firstRender()}),!1):!0},firstRender:function(){var a=this,b=a.options,c=a.callback;if(a.isReadyToRender())a.getContainer(),D(a,"init"),a.resetMargins(),
-a.setChartSize(),a.propFromSeries(),a.getAxes(),n(b.series||[],function(b){a.initSeries(b)}),D(a,"beforeRender"),a.pointer=new rb(a,b),a.render(),a.renderer.draw(),c&&c.apply(a,[a]),n(a.callbacks,function(b){b.apply(a,[a])}),a.cloneRenderTo(!0),D(a,"load")}};tb.prototype.callbacks=[];var Na=function(){};Na.prototype={init:function(a,b,c){this.series=a;this.applyOptions(b,c);this.pointAttr={};if(a.options.colorByPoint&&(b=a.options.colors||a.chart.options.colors,this.color=this.color||b[a.colorCounter++],
-a.colorCounter===b.length))a.colorCounter=0;a.chart.pointCount++;return this},applyOptions:function(a,b){var c=this.series,d=c.pointValKey,a=Na.prototype.optionsToObject.call(this,a);v(this,a);this.options=this.options?v(this.options,a):a;if(d)this.y=this[d];if(this.x===y&&c)this.x=b===y?c.autoIncrement():b;return this},optionsToObject:function(a){var b,c=this.series,d=c.pointArrayMap||["y"],e=d.length,f=0,g=0;if(typeof a==="number"||a===null)b={y:a};else if(Da(a)){b={};if(a.length>e){c=typeof a[0];
-if(c==="string")b.name=a[0];else if(c==="number")b.x=a[0];f++}for(;ga+1&&b.push(d.slice(a+1,g)),a=g):g===e-1&&b.push(d.slice(a+1,g+1))});this.segments=b},setOptions:function(a){var b=this.chart.options,c=b.plotOptions,
-d=c[this.type];this.userOptions=a;a=x(d,c.series,a);this.tooltipOptions=x(b.tooltip,a.tooltip);d.marker===null&&delete a.marker;return a},getColor:function(){var a=this.options,b=this.userOptions,c=this.chart.options.colors,d=this.chart.counters,e;e=a.color||X[this.type].color;if(!e&&!a.colorByPoint)r(b._colorIndex)?a=b._colorIndex:(b._colorIndex=d.color,a=d.color++),e=c[a];this.color=e;d.wrapColor(c.length)},getSymbol:function(){var a=this.userOptions,b=this.options.marker,c=this.chart,d=c.options.symbols,
-c=c.counters;this.symbol=b.symbol;if(!this.symbol)r(a._symbolIndex)?a=a._symbolIndex:(a._symbolIndex=c.symbol,a=c.symbol++),this.symbol=d[a];if(/^url/.test(this.symbol))b.radius=0;c.wrapSymbol(d.length)},drawLegendSymbol:function(a){var b=this.options,c=b.marker,d=a.options.symbolWidth,e=this.chart.renderer,f=this.legendGroup,a=a.baseline,g;if(b.lineWidth){g={"stroke-width":b.lineWidth};if(b.dashStyle)g.dashstyle=b.dashStyle;this.legendLine=e.path(["M",0,a-4,"L",d,a-4]).attr(g).add(f)}if(c&&c.enabled)b=
-c.radius,this.legendSymbol=e.symbol(this.symbol,d/2-b,a-4-b,2*b,2*b).add(f)},addPoint:function(a,b,c,d){var e=this.options,f=this.data,g=this.graph,h=this.area,i=this.chart,j=this.xData,k=this.yData,m=this.zData,l=this.names,p=g&&g.shift||0,n=e.data;Ia(d,i);if(g&&c)g.shift=p+1;if(h){if(c)h.shift=p+1;h.isArea=!0}b=o(b,!0);d={series:this};this.pointClass.prototype.applyOptions.apply(d,[a]);j.push(d.x);k.push(this.toYData?this.toYData(d):d.y);m.push(d.z);if(l)l[d.x]=d.name;n.push(a);e.legendType==="point"&&
-this.generatePoints();c&&(f[0]&&f[0].remove?f[0].remove(!1):(f.shift(),j.shift(),k.shift(),m.shift(),n.shift()));this.getAttribs();this.isDirtyData=this.isDirty=!0;b&&i.redraw()},setData:function(a,b){var c=this.points,d=this.options,e=this.chart,f=null,g=this.xAxis,h=g&&g.categories&&!g.categories.length?[]:null,i;this.xIncrement=null;this.pointRange=g&&g.categories?1:d.pointRange;this.colorCounter=0;var j=[],k=[],m=[],l=a?a.length:[],p=(i=this.pointArrayMap)&&i.length,n=!!this.toYData;if(l>(d.turboThreshold||
-1E3)){for(i=0;f===null&&i1&&j[1]k||this.forceCrop))if(a=i.getExtremes(),i=a.min,k=a.max,b[d-1]k)b=[],c=[];else if(b[0]k){for(a=0;a=i){e=q(0,a-1);break}for(;ak){f=a+1;break}b=b.slice(e,f);c=c.slice(e,f);g=!0}for(a=b.length-1;a>0;a--)if(d=b[a]-b[a-1],d>0&&(h===y||d=
-0&&c<=d;)h[c++]=f}this.tooltipPoints=h}},tooltipHeaderFormatter:function(a){var b=this.tooltipOptions,c=b.xDateFormat,d=b.dateTimeLabelFormats,e=this.xAxis,f=e&&e.options.type==="datetime",b=b.headerFormat,e=e&&e.closestPointRange,g;if(f&&!c)if(e)for(g in E){if(E[g]>=e){c=d[g];break}}else c=d.day;f&&c&&Ea(a.key)&&(b=b.replace("{point.key}","{point.key:"+c+"}"));return wa(b,{point:a,series:this})},onMouseOver:function(){var a=this.chart,b=a.hoverSeries;if(b&&b!==this)b.onMouseOut();this.options.events.mouseOver&&
-D(this,"mouseOver");this.setState("hover");a.hoverSeries=this},onMouseOut:function(){var a=this.options,b=this.chart,c=b.tooltip,d=b.hoverPoint;if(d)d.onMouseOut();this&&a.events.mouseOut&&D(this,"mouseOut");c&&!a.stickyTracking&&(!c.shared||this.noSharedTooltip)&&c.hide();this.setState();b.hoverSeries=null},animate:function(a){var b=this,c=b.chart,d=c.renderer,e;e=b.options.animation;var f=c.clipBox,g=c.inverted,h;if(e&&!V(e))e=X[b.type].animation;h="_sharedClip"+e.duration+e.easing;if(a)a=c[h],
-e=c[h+"m"],a||(c[h]=a=d.clipRect(v(f,{width:0})),c[h+"m"]=e=d.clipRect(-99,g?-c.plotLeft:-c.plotTop,99,g?c.chartWidth:c.chartHeight)),b.group.clip(a),b.markerGroup.clip(e),b.sharedClipKey=h;else{if(a=c[h])a.animate({width:c.plotSizeX},e),c[h+"m"].animate({width:c.plotSizeX+99},e);b.animate=null;b.animationTimeout=setTimeout(function(){b.afterAnimate()},e.duration)}},afterAnimate:function(){var a=this.chart,b=this.sharedClipKey,c=this.group;c&&this.options.clip!==!1&&(c.clip(a.clipRect),this.markerGroup.clip());
-setTimeout(function(){b&&a[b]&&(a[b]=a[b].destroy(),a[b+"m"]=a[b+"m"].destroy())},100)},drawPoints:function(){var a,b=this.points,c=this.chart,d,e,f,g,h,i,j,k,m=this.options.marker,l,n=this.markerGroup;if(m.enabled||this._hasPointMarkers)for(f=b.length;f--;)if(g=b[f],d=g.plotX,e=g.plotY,k=g.graphic,i=g.marker||{},a=m.enabled&&i.enabled===y||i.enabled,l=c.isInsidePlot(t(d),e,c.inverted),a&&e!==y&&!isNaN(e)&&g.y!==null)if(a=g.pointAttr[g.selected?"select":""],h=a.r,i=o(i.symbol,this.symbol),j=i.indexOf("url")===
-0,k)k.attr({visibility:l?Z?"inherit":"visible":"hidden"}).animate(v({x:d-h,y:e-h},k.symbolName?{width:2*h,height:2*h}:{}));else{if(l&&(h>0||j))g.graphic=c.renderer.symbol(i,d-h,e-h,2*h,2*h).attr(a).add(n)}else if(k)g.graphic=k.destroy()},convertAttribs:function(a,b,c,d){var e=this.pointAttrToOptions,f,g,h={},a=a||{},b=b||{},c=c||{},d=d||{};for(f in e)g=e[f],h[f]=o(a[g],b[f],c[f],d[f]);return h},getAttribs:function(){var a=this,b=a.options,c=X[a.type].marker?b.marker:b,d=c.states,e=d.hover,f,g=a.color,
-h={stroke:g,fill:g},i=a.points||[],j=[],k,m=a.pointAttrToOptions,l=b.negativeColor,p;b.marker?(e.radius=e.radius||c.radius+2,e.lineWidth=e.lineWidth||c.lineWidth+1):e.color=e.color||ma(e.color||g).brighten(e.brightness).get();j[""]=a.convertAttribs(c,h);n(["hover","select"],function(b){j[b]=a.convertAttribs(d[b],j[""])});a.pointAttr=j;for(g=i.length;g--;){h=i[g];if((c=h.options&&h.options.marker||h.options)&&c.enabled===!1)c.radius=0;if(h.negative&&l)h.color=h.fillColor=l;f=b.colorByPoint||h.color;
-if(h.options)for(p in m)r(c[m[p]])&&(f=!0);if(f){c=c||{};k=[];d=c.states||{};f=d.hover=d.hover||{};if(!b.marker)f.color=ma(f.color||h.color).brighten(f.brightness||e.brightness).get();k[""]=a.convertAttribs(v({color:h.color},c),j[""]);k.hover=a.convertAttribs(d.hover,j.hover,k[""]);k.select=a.convertAttribs(d.select,j.select,k[""]);if(h.negative&&b.marker&&l)k[""].fill=k.hover.fill=k.select.fill=a.convertAttribs({fillColor:l}).fill}else k=j;h.pointAttr=k}},update:function(a,b){var c=this.chart,d=
-this.type,a=x(this.userOptions,{animation:!1,index:this.index,pointStart:this.xData[0]},a);this.remove(!1);v(this,aa[a.type||d].prototype);this.init(c,a);o(b,!0)&&c.redraw(!1)},destroy:function(){var a=this,b=a.chart,c=/AppleWebKit\/533/.test(Aa),d,e,f=a.data||[],g,h,i;D(a,"destroy");ba(a);n(["xAxis","yAxis"],function(b){if(i=a[b])ga(i.series,a),i.isDirty=i.forceRedraw=!0});a.legendItem&&a.chart.legend.destroyItem(a);for(e=f.length;e--;)(g=f[e])&&g.destroy&&g.destroy();a.points=null;clearTimeout(a.animationTimeout);
-n("area,graph,dataLabelsGroup,group,markerGroup,tracker,graphNeg,areaNeg,posClip,negClip".split(","),function(b){a[b]&&(d=c&&b==="group"?"hide":"destroy",a[b][d]())});if(b.hoverSeries===a)b.hoverSeries=null;ga(b.series,a);for(h in a)delete a[h]},drawDataLabels:function(){var a=this,b=a.options.dataLabels,c=a.points,d,e,f,g;if(b.enabled||a._hasPointLabels)a.dlProcessOptions&&a.dlProcessOptions(b),g=a.plotGroup("dataLabelsGroup","data-labels",a.visible?"visible":"hidden",b.zIndex||6),e=b,n(c,function(c){var i,
-j=c.dataLabel,k,m,l=c.connector,n=!0;d=c.options&&c.options.dataLabels;i=e.enabled||d&&d.enabled;if(j&&!i)c.dataLabel=j.destroy();else if(i){i=b.rotation;b=x(e,d);k=c.getLabelConfig();f=b.format?wa(b.format,k):b.formatter.call(k,b);b.style.color=o(b.color,b.style.color,a.color,"black");if(j)if(r(f))j.attr({text:f}),n=!1;else{if(c.dataLabel=j=j.destroy(),l)c.connector=l.destroy()}else if(r(f)){j={fill:b.backgroundColor,stroke:b.borderColor,"stroke-width":b.borderWidth,r:b.borderRadius||0,rotation:i,
-padding:b.padding,zIndex:1};for(m in j)j[m]===y&&delete j[m];j=c.dataLabel=a.chart.renderer[i?"text":"label"](f,0,-999,null,null,null,b.useHTML).attr(j).css(b.style).add(g).shadow(b.shadow)}j&&a.alignDataLabel(c,j,b,null,n)}})},alignDataLabel:function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=o(a.plotX,-999),a=o(a.plotY,-999),i=b.getBBox(),d=v({x:g?f.plotWidth-a:h,y:t(g?f.plotHeight-h:a),width:0,height:0},d);v(c,{width:i.width,height:i.height});c.rotation?(d={align:c.align,x:d.x+c.x+d.width/2,y:d.y+
-c.y+d.height/2},b[e?"attr":"animate"](d)):b.align(c,null,d);b.attr({visibility:c.crop===!1||f.isInsidePlot(h,a,g)?f.renderer.isSVG?"inherit":"visible":"hidden"})},getSegmentPath:function(a){var b=this,c=[],d=b.options.step;n(a,function(e,f){var g=e.plotX,h=e.plotY,i;b.getPointSpline?c.push.apply(c,b.getPointSpline(a,e,f)):(c.push(f?"L":"M"),d&&f&&(i=a[f-1],d==="right"?c.push(i.plotX,h):d==="center"?c.push((i.plotX+g)/2,i.plotY,(i.plotX+g)/2,h):c.push(g,i.plotY)),c.push(e.plotX,e.plotY))});return c},
-getGraphPath:function(){var a=this,b=[],c,d=[];n(a.segments,function(e){c=a.getSegmentPath(e);e.length>1?b=b.concat(c):d.push(e[0])});a.singlePoints=d;return a.graphPath=b},drawGraph:function(){var a=this,b=this.options,c=[["graph",b.lineColor||this.color]],d=b.lineWidth,e=b.dashStyle,f=this.getGraphPath(),g=b.negativeColor;g&&c.push(["graphNeg",g]);n(c,function(c,g){var j=c[0],k=a[j];if(k)Ta(k),k.animate({d:f});else if(d&&f.length){k={stroke:c[1],"stroke-width":d,zIndex:1};if(e)k.dashstyle=e;a[j]=
-a.chart.renderer.path(f).attr(k).add(a.group).shadow(!g&&b.shadow)}})},clipNeg:function(){var a=this.options,b=this.chart,c=b.renderer,d=a.negativeColor,e,f=this.graph,g=this.area,h=this.posClip,i=this.negClip;e=b.chartWidth;var j=b.chartHeight,k=q(e,j);if(d&&(f||g))d=ja(this.yAxis.len-this.yAxis.translate(a.threshold||0)),a={x:0,y:0,width:k,height:d},k={x:0,y:d,width:k,height:k-d},b.inverted&&c.isVML&&(a={x:b.plotWidth-d-b.plotLeft,y:0,width:e,height:j},k={x:d+b.plotLeft-e,y:0,width:b.plotLeft+d,
-height:e}),this.yAxis.reversed?(b=k,e=a):(b=a,e=k),h?(h.animate(b),i.animate(e)):(this.posClip=h=c.clipRect(b),this.negClip=i=c.clipRect(e),f&&(f.clip(h),this.graphNeg.clip(i)),g&&(g.clip(h),this.areaNeg.clip(i)))},invertGroups:function(){function a(){var a={width:b.yAxis.len,height:b.xAxis.len};n(["group","markerGroup"],function(c){b[c]&&b[c].attr(a).invert()})}var b=this,c=b.chart;if(b.xAxis)J(c,"resize",a),J(b,"destroy",function(){ba(c,"resize",a)}),a(),b.invertGroups=a},plotGroup:function(a,b,
-c,d,e){var f=this[a],g=!f,h=this.chart,i=this.xAxis,j=this.yAxis;g&&(this[a]=f=h.renderer.g(b).attr({visibility:c,zIndex:d||0.1}).add(e));f[g?"attr":"animate"]({translateX:i?i.left:h.plotLeft,translateY:j?j.top:h.plotTop,scaleX:1,scaleY:1});return f},render:function(){var a=this.chart,b,c=this.options,d=c.animation&&!!this.animate&&a.renderer.isSVG,e=this.visible?"visible":"hidden",f=c.zIndex,g=this.hasRendered,h=a.seriesGroup;b=this.plotGroup("group","series",e,f,h);this.markerGroup=this.plotGroup("markerGroup",
-"markers",e,f,h);d&&this.animate(!0);this.getAttribs();b.inverted=this.isCartesian?a.inverted:!1;this.drawGraph&&(this.drawGraph(),this.clipNeg());this.drawDataLabels();this.drawPoints();this.options.enableMouseTracking!==!1&&this.drawTracker();a.inverted&&this.invertGroups();c.clip!==!1&&!this.sharedClipKey&&!g&&b.clip(a.clipRect);d?this.animate():g||this.afterAnimate();this.isDirty=this.isDirtyData=!1;this.hasRendered=!0},redraw:function(){var a=this.chart,b=this.isDirtyData,c=this.group,d=this.xAxis,
-e=this.yAxis;c&&(a.inverted&&c.attr({width:a.plotWidth,height:a.plotHeight}),c.animate({translateX:o(d&&d.left,a.plotLeft),translateY:o(e&&e.top,a.plotTop)}));this.translate();this.setTooltipPoints(!0);this.render();b&&D(this,"updatedData")},setState:function(a){var b=this.options,c=this.graph,d=this.graphNeg,e=b.states,b=b.lineWidth,a=a||"";if(this.state!==a)this.state=a,e[a]&&e[a].enabled===!1||(a&&(b=e[a].lineWidth||b+1),c&&!c.dashstyle&&(a={"stroke-width":b},c.attr(a),d&&d.attr(a)))},setVisible:function(a,
-b){var c=this,d=c.chart,e=c.legendItem,f,g=d.options.chart.ignoreHiddenSeries,h=c.visible;f=(c.visible=a=c.userOptions.visible=a===y?!h:a)?"show":"hide";n(["group","dataLabelsGroup","markerGroup","tracker"],function(a){if(c[a])c[a][f]()});if(d.hoverSeries===c)c.onMouseOut();e&&d.legend.colorizeItem(c,a);c.isDirty=!0;c.options.stacking&&n(d.series,function(a){if(a.options.stacking&&a.visible)a.isDirty=!0});n(c.linkedSeries,function(b){b.setVisible(a,!1)});if(g)d.isDirtyBox=!0;b!==!1&&d.redraw();D(c,
-f)},show:function(){this.setVisible(!0)},hide:function(){this.setVisible(!1)},select:function(a){this.selected=a=a===y?!this.selected:a;if(this.checkbox)this.checkbox.checked=a;D(this,a?"select":"unselect")},drawTracker:function(){var a=this,b=a.options,c=b.trackByArea,d=[].concat(c?a.areaPath:a.graphPath),e=d.length,f=a.chart,g=f.pointer,h=f.renderer,i=f.options.tooltip.snap,j=a.tracker,k=b.cursor,k=k&&{cursor:k},m=a.singlePoints,l,n=function(){if(f.hoverSeries!==a)a.onMouseOver()};if(e&&!c)for(l=
-e+1;l--;)d[l]==="M"&&d.splice(l+1,0,d[l+1]-i,d[l+2],"L"),(l&&d[l]==="M"||l===e)&&d.splice(l,0,"L",d[l-2]+i,d[l-1]);for(l=0;l=0;d--)da&&i>e?(i=q(a,e),k=2*e-i):ig&&k>e?(k=q(g,e),i=2*e-k):kh?n-h:g-(f.translate(c.y,0,1,0,1)<=g?h:0));c.barX=s;c.pointWidth=i;c.shapeType="rect";c.shapeArgs=c=b.renderer.Element.prototype.crisp.call(0,e,s,t,j,l);e%2&&(c.y-=1,c.height+=1)})},getSymbol:ta,drawLegendSymbol:M.prototype.drawLegendSymbol,drawGraph:ta,drawPoints:function(){var a=this,b=a.options,c=a.chart.renderer,d;n(a.points,function(e){var f=e.plotY,g=e.graphic;if(f!==y&&!isNaN(f)&&e.y!==null)d=e.shapeArgs,g?(Ta(g),g.animate(x(d))):e.graphic=
-c[e.shapeType](d).attr(e.pointAttr[e.selected?"select":""]).add(a.group).shadow(b.shadow,null,b.stacking&&!b.borderRadius);else if(g)e.graphic=g.destroy()})},drawTracker:function(){var a=this,b=a.chart.pointer,c=a.options.cursor,d=c&&{cursor:c},e=function(b){var c=b.target,d;for(a.onMouseOver();c&&!d;)d=c.point,c=c.parentNode;if(d!==y)d.onMouseOver(b)};n(a.points,function(a){if(a.graphic)a.graphic.element.point=a;if(a.dataLabel)a.dataLabel.element.point=a});a._hasTracking?a._hasTracking=!0:n(a.trackerGroups,
-function(c){if(a[c]&&(a[c].addClass("highcharts-tracker").on("mouseover",e).on("mouseout",function(a){b.onTrackerMouseOut(a)}).css(d),fb))a[c].on("touchstart",e)})},alignDataLabel:function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=a.dlBox||a.shapeArgs,i=a.below||a.plotY>o(this.translatedThreshold,f.plotSizeY),j=o(c.inside,!!this.options.stacking);if(h&&(d=x(h),g&&(d={x:f.plotWidth-d.y-d.height,y:f.plotHeight-d.x-d.width,width:d.height,height:d.width}),!j))g?(d.x+=i?0:d.width,d.width=0):(d.y+=i?d.height:
-0,d.height=0);c.align=o(c.align,!g||j?"center":i?"right":"left");c.verticalAlign=o(c.verticalAlign,g||j?"middle":i?"top":"bottom");R.prototype.alignDataLabel.call(this,a,b,c,d,e)},animate:function(a){var b=this.yAxis,c=this.options,d=this.chart.inverted,e={};if(Z)a?(e.scaleY=0.001,a=K(b.pos+b.len,q(b.pos,b.toPixels(c.threshold))),d?e.translateX=a-b.len:e.translateY=a,this.group.attr(e)):(e.scaleY=1,e[d?"translateX":"translateY"]=b.pos,this.group.animate(e,this.options.animation),this.animate=null)},
-remove:function(){var a=this,b=a.chart;b.hasRendered&&n(b.series,function(b){if(b.type===a.type)b.isDirty=!0});R.prototype.remove.apply(a,arguments)}});aa.column=F;X.bar=x(X.column);na=ea(F,{type:"bar",inverted:!0});aa.bar=na;X.scatter=x(W,{lineWidth:0,tooltip:{headerFormat:'{series.name} {point.x} {point.y} 0.75*m&&(i-=2*Ka);r.slicedTranslation={translateX:t(Y(i)*e),translateY:t(ca(i)*e)};g=Y(i)*a[2]/2;h=ca(i)*a[2]/2;r.tooltipPos=[a[0]+g*0.7,a[1]+h*0.7];r.half=i0,v,w,u,x,y=[[],[]],A,z,E,H,C,D=[0,0,0,0],
-K=function(a,b){return b.y-a.y},M=function(a,b){a.sort(function(a,c){return a.angle!==void 0&&(c.angle-a.angle)*b})};if(e.enabled||a._hasPointLabels){R.prototype.drawDataLabels.apply(a);n(b,function(a){a.dataLabel&&y[a.half].push(a)});for(H=0;!x&&b[H];)x=b[H]&&b[H].dataLabel&&(b[H].dataLabel.getBBox().height||21),H++;for(H=2;H--;){var b=[],L=[],I=y[H],J=I.length,F;M(I,H-0.5);if(m>0){for(C=s-p-m;C<=s+p+m;C+=x)b.push(C);w=b.length;if(J>w){c=[].concat(I);c.sort(K);for(C=J;C--;)c[C].rank=C;for(C=J;C--;)I[C].rank>=
-w&&I.splice(C,1);J=I.length}for(C=0;C0){if(w=L.pop(),F=w.i,z=w.y,c>z&&b[F+1]!==null||ch-f&&(D[1]=q(t(A+w-h+f),D[1])),z-x/2<0?D[0]=q(t(-z+x/2),D[0]):z+x/2>d&&(D[2]=q(t(z+x/2-d),D[2]))}}if(pa(D)===0||this.verifyDataLabelOverflow(D))this.placeDataLabels(),r&&g&&n(this.points,function(b){i=b.connector;u=b.labelPos;if((v=b.dataLabel)&&v._pos)E=v._attr.visibility,A=v.connX,z=v.connY,j=k?["M",A+(u[6]==="left"?5:-5),z,
-"C",A,z,2*u[2]-u[4],2*u[3]-u[5],u[2],u[3],"L",u[4],u[5]]:["M",A+(u[6]==="left"?5:-5),z,"L",u[2],u[3],"L",u[4],u[5]],i?(i.animate({d:j}),i.attr("visibility",E)):b.connector=i=a.chart.renderer.path(j).attr({"stroke-width":g,stroke:e.connectorColor||b.color||"#606060",visibility:E}).add(a.group);else if(i)b.connector=i.destroy()})}},verifyDataLabelOverflow:function(a){var b=this.center,c=this.options,d=c.center,e=c=c.minSize||80,f;d[0]!==null?e=q(b[2]-q(a[1],a[3]),c):(e=q(b[2]-a[1]-a[3],c),b[0]+=(a[3]-
-a[1])/2);d[1]!==null?e=q(K(e,b[2]-q(a[0],a[2])),c):(e=q(K(e,b[2]-a[0]-a[2]),c),b[1]+=(a[0]-a[2])/2);e=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.2",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return a!=null?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;ba
",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||p.guid++:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c=0)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c=0)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,d+""),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j=0:p.find(m,this,null,[f]).length),h[m]&&j.push(l);j.length&&u.push({elem:f,matches:j})}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bc(a,b,c,d){c=c||[],b=b||r;var e,f,i,j,k=b.nodeType;if(!a||typeof a!="string")return c;if(k!==1&&k!==9)return[];i=g(b);if(!i&&!d)if(e=P.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&h(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return w.apply(c,x.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&_&&b.getElementsByClassName)return w.apply(c,x.call(b.getElementsByClassName(j),0)),c}return bp(a.replace(L,"$1"),b,c,d,i)}function bd(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function be(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bf(a){return z(function(b){return b=+b,z(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function bg(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bh(a,b){var c,d,f,g,h,i,j,k=C[o][a];if(k)return b?0:k.slice(0);h=a,i=[],j=e.preFilter;while(h){if(!c||(d=M.exec(h)))d&&(h=h.slice(d[0].length)),i.push(f=[]);c=!1;if(d=N.exec(h))f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=d[0].replace(L," ");for(g in e.filter)(d=W[g].exec(h))&&(!j[g]||(d=j[g](d,r,!0)))&&(f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=g,c.matches=d);if(!c)break}return b?h.length:h?bc.error(a):C(a,i).slice(0)}function bi(a,b,d){var e=b.dir,f=d&&b.dir==="parentNode",g=u++;return b.first?function(b,c,d){while(b=b[e])if(f||b.nodeType===1)return a(b,c,d)}:function(b,d,h){if(!h){var i,j=t+" "+g+" ",k=j+c;while(b=b[e])if(f||b.nodeType===1){if((i=b[o])===k)return b.sizset;if(typeof i=="string"&&i.indexOf(j)===0){if(b.sizset)return b}else{b[o]=k;if(a(b,d,h))return b.sizset=!0,b;b.sizset=!1}}}else while(b=b[e])if(f||b.nodeType===1)if(a(b,d,h))return b}}function bj(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function bk(a,b,c,d,e){var f,g=[],h=0,i=a.length,j=b!=null;for(;h-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==l)||((b=c).nodeType?j(a,c,d):k(a,c,d))}];for(;i1&&bj(m),i>1&&a.slice(0,i-1).join("").replace(L,"$1"),c,i0,f=a.length>0,g=function(h,i,j,k,m){var n,o,p,q=[],s=0,u="0",x=h&&[],y=m!=null,z=l,A=h||f&&e.find.TAG("*",m&&i.parentNode||i),B=t+=z==null?1:Math.E;y&&(l=i!==r&&i,c=g.el);for(;(n=A[u])!=null;u++){if(f&&n){for(o=0;p=a[o];o++)if(p(n,i,j)){k.push(n);break}y&&(t=B,c=++g.el)}d&&((n=!p&&n)&&s--,h&&x.push(n))}s+=u;if(d&&u!==s){for(o=0;p=b[o];o++)p(x,q,i,j);if(h){if(s>0)while(u--)!x[u]&&!q[u]&&(q[u]=v.call(k));q=bk(q)}w.apply(k,q),y&&!h&&q.length>0&&s+b.length>1&&bc.uniqueSort(k)}return y&&(t=B,l=z),x};return g.el=0,d?z(g):g}function bo(a,b,c,d){var e=0,f=b.length;for(;e2&&(j=h[0]).type==="ID"&&b.nodeType===9&&!f&&e.relative[h[1].type]){b=e.find.ID(j.matches[0].replace(V,""),b,f)[0];if(!b)return c;a=a.slice(h.shift().length)}for(g=W.POS.test(a)?-1:h.length-1;g>=0;g--){j=h[g];if(e.relative[k=j.type])break;if(l=e.find[k])if(d=l(j.matches[0].replace(V,""),R.test(h[0].type)&&b.parentNode||b,f)){h.splice(g,1),a=d.length&&h.join("");if(!a)return w.apply(c,x.call(d,0)),c;break}}}return i(a,m)(d,b,f,c,R.test(a)),c}function bq(){}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=String,r=a.document,s=r.documentElement,t=0,u=0,v=[].pop,w=[].push,x=[].slice,y=[].indexOf||function(a){var b=0,c=this.length;for(;be.cacheLength&&delete a[b.shift()],a[c]=d},a)},B=A(),C=A(),D=A(),E="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",G=F.replace("w","w#"),H="([*^$|!~]?=)",I="\\["+E+"*("+F+")"+E+"*(?:"+H+E+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+G+")|)|)"+E+"*\\]",J=":("+F+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+I+")|[^:]|\\\\.)*|.*))\\)|)",K=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+E+"*((?:-\\d)?\\d*)"+E+"*\\)|)(?=[^-]|$)",L=new RegExp("^"+E+"+|((?:^|[^\\\\])(?:\\\\.)*)"+E+"+$","g"),M=new RegExp("^"+E+"*,"+E+"*"),N=new RegExp("^"+E+"*([\\x20\\t\\r\\n\\f>+~])"+E+"*"),O=new RegExp(J),P=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,Q=/^:not/,R=/[\x20\t\r\n\f]*[+~]/,S=/:not\($/,T=/h\d/i,U=/input|select|textarea|button/i,V=/\\(?!\\)/g,W={ID:new RegExp("^#("+F+")"),CLASS:new RegExp("^\\.("+F+")"),NAME:new RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:new RegExp("^("+F.replace("w","w*")+")"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+J),POS:new RegExp(K,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+E+"*(even|odd|(([+-]|)(\\d*)n|)"+E+"*(?:([+-]|)"+E+"*(\\d+)|))"+E+"*\\)|)","i"),needsContext:new RegExp("^"+E+"*[>+~]|"+K,"i")},X=function(a){var b=r.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},Y=X(function(a){return a.appendChild(r.createComment("")),!a.getElementsByTagName("*").length}),Z=X(function(a){return a.innerHTML="
",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),ba=X(function(a){a.id=o+0,a.innerHTML="
",s.insertBefore(a,s.firstChild);var b=r.getElementsByName&&r.getElementsByName(o).length===2+r.getElementsByName(o+0).length;return d=!r.getElementById(o),s.removeChild(a),b});try{x.call(s.childNodes,0)[0].nodeType}catch(bb){x=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}bc.matches=function(a,b){return bc(a,null,null,b)},bc.matchesSelector=function(a,b){return bc(b,null,null,[a]).length>0},f=bc.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=f(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=f(b);return c},g=bc.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},h=bc.contains=s.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:s.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc.attr=function(a,b){var c,d=g(a);return d||(b=b.toLowerCase()),(c=e.attrHandle[b])?c(a):d||$?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},e=bc.selectors={cacheLength:50,createPseudo:z,match:W,attrHandle:Z?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:d?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:Y?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:ba&&function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:_&&function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(V,""),a[3]=(a[4]||a[5]||"").replace(V,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||bc.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&bc.error(a[0]),a},PSEUDO:function(a){var b,c;if(W.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(b=a[4])O.test(b)&&(c=bh(b,!0))&&(c=b.indexOf(")",b.length-c)-b.length)&&(b=b.slice(0,c),a[0]=a[0].slice(0,c)),a[2]=b;return a.slice(0,3)}},filter:{ID:d?function(a){return a=a.replace(V,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(V,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(V,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=B[o][a];return b||(b=B(a,new RegExp("(^|"+E+")"+a+"("+E+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return function(d,e){var f=bc.attr(d,a);return f==null?b==="!=":b?(f+="",b==="="?f===c:b==="!="?f!==c:b==="^="?c&&f.indexOf(c)===0:b==="*="?c&&f.indexOf(c)>-1:b==="$="?c&&f.substr(f.length-c.length)===c:b==="~="?(" "+f+" ").indexOf(c)>-1:b==="|="?f===c||f.substr(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d){return a==="nth"?function(a){var b,e,f=a.parentNode;if(c===1&&d===0)return!0;if(f){e=0;for(b=f.firstChild;b;b=b.nextSibling)if(b.nodeType===1){e++;if(a===b)break}}return e-=d,e===c||e%c===0&&e/c>=0}:function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b){var c,d=e.pseudos[a]||e.setFilters[a.toLowerCase()]||bc.error("unsupported pseudo: "+a);return d[o]?d(b):d.length>1?(c=[a,a,"",b],e.setFilters.hasOwnProperty(a.toLowerCase())?z(function(a,c){var e,f=d(a,b),g=f.length;while(g--)e=y.call(a,f[g]),a[e]=!(c[e]=f[g])}):function(a){return d(a,0,c)}):d}},pseudos:{not:z(function(a){var b=[],c=[],d=i(a.replace(L,"$1"));return d[o]?z(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)if(f=g[h])a[h]=!(b[h]=f)}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:z(function(a){return function(b){return bc(a,b).length>0}}),contains:z(function(a){return function(b){return(b.textContent||b.innerText||f(b)).indexOf(a)>-1}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!e.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},header:function(a){return T.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:bd("radio"),checkbox:bd("checkbox"),file:bd("file"),password:bd("password"),image:bd("image"),submit:be("submit"),reset:be("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return U.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement},first:bf(function(a,b,c){return[0]}),last:bf(function(a,b,c){return[b-1]}),eq:bf(function(a,b,c){return[c<0?c+b:c]}),even:bf(function(a,b,c){for(var d=0;d=0;)a.push(d);return a}),gt:bf(function(a,b,c){for(var d=c<0?c+b:c;++d
",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+E+"*(?:\"\"|'')"),a.innerHTML="0)for(e=d;e=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/"," "],legend:[1,""," "],thead:[1,""],tr:[2,""],td:[3,""],col:[2,""],area:[1,""," "],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X","
"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]===""&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{ck=f.href}catch(cy){ck=e.createElement("a"),ck.href="",ck=ck.href}cj=ct.exec(ck.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:ck,isLocal:cn.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=(c||y)+"",k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase())||!1,l.crossDomain=i&&i.join(":")+(i[3]?"":i[1]==="http:"?80:443)!==cj.join(":")+(cj[3]?"":cj[1]==="http:"?80:443)),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e=this.createTween(a,b),f=cQ.exec(b),g=e.cur(),h=+g||0,i=1,j=20;if(f){c=+f[2],d=f[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&h){h=p.css(e.elem,a,!0)||c||1;do i=i||".5",h=h/i,p.style(e.elem,a,h+d);while(i!==(i=e.cur()/g)&&i!==1&&--j)}e.unit=d,e.start=h,e.end=f[1]?h+(f[1]+1)*c:c}return e}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d
-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/login.inc.php b/upload/source/plugin/wechat/login.inc.php
deleted file mode 100644
index f212ab7a..00000000
--- a/upload/source/plugin/wechat/login.inc.php
+++ /dev/null
@@ -1,139 +0,0 @@
-fetch($_G['uid']);
- if($connect['conisregister']) {
- $showtip = false;
- }
- }
- if($showtip) {
- dsetcookie('qrauth', '', -1);
- showmessage('wechat:wechat_member_bind_qrauth_lost');
- }
- }
- $url = wsq::qrconnectUrl($_G['uid'], dreferer());
- dheader('location: '.$url);
-} elseif($ac == 'callback') {
- if(!wsq::checksign($_GET) || $_G['uid'] && $_GET['siteuid'] != $_G['uid']) {
- showmessage('wechat:wechat_member_auth_fail');
- }
- require_once libfile('function/member');
- if($_GET['siteuid'] && ($member = getuserbyuid($_GET['siteuid'], 1))) {
- setloginstatus($member, 1296000);
- if(!C::t('#wechat#common_member_wechatmp')->fetch($member['uid'])) {
- C::t('#wechat#common_member_wechatmp')->insert(array('uid' => $_G['uid'], 'openid' => $_GET['openid'], 'status' => $_G['cookie']['qrauth'] ? 1: 0), false, true);
- }
-
- dheader('location: '.($_GET['referer'] ? $_GET['referer'] : $_G['siteurl']));
- } else {
- require_once DISCUZ_ROOT . './source/plugin/wechat/wechat.class.php';
- require_once DISCUZ_ROOT . './source/plugin/wechat/wechat.lib.class.php';
- $defaultusername = WeChatEmoji::clear($_GET['nickname']);
- if(!$_G['wechat']['setting']['wechat_allowfastregister']) {
- redirectregister($defaultusername);
- }
-
- loaducenter();
- $user = uc_get_user($defaultusername);
- if(!empty($user)) {
- $defaultusername = cutstr($defaultusername, 7, '').'_'.random(5);
- }
- $uid = WeChat::register($defaultusername, 1, 8);
- if(!$uid) {
- redirectregister($defaultusername);
- }
- C::t('#wechat#common_member_wechatmp')->insert(array('uid' => $uid, 'openid' => $_GET['openid'], 'status' => 0), false, true);
- $url = wsq::userregisterUrl($uid, $_GET['openid'], $_GET['openidsign'], $_GET['referer']);
- dheader('location: '.$url);
- }
-} elseif($ac == 'regcallback' && $_G['uid']) {
- list($openid, $openidsign, $qrreferer) = explode("\t", authcode(base64_decode($_GET['auth']), 'DECODE'));
- if(!$openid) {
- showmessage('wechat:wechat_member_auth_fail');
- }
- C::t('#wechat#common_member_wechatmp')->insert(array('uid' => $_G['uid'], 'openid' => $openid, 'status' => 1), false, true);
- $url = wsq::userregisterUrl($_G['uid'], $openid, $openidsign, $qrreferer);
- dheader('location: '.$url);
-} elseif($ac == 'regverify' && $_G['uid']) {
- if(!wsq::checksign($_GET)) {
- showmessage('wechat:wechat_member_auth_fail');
- }
- if($_GET['code']) {
- showmessage('wechat:wechat_member_register_faild');
- }
- $member = C::t('#wechat#common_member_wechatmp')->fetch($_G['uid']);
- if(!$member) {
- showmessage('wechat:wechat_member_register_faild');
- }
- $groupid = $_G['wechat']['setting']['wechat_newusergroupid'] ? $_G['wechat']['setting']['wechat_newusergroupid'] : $_G['setting']['newusergroupid'];
- C::t('common_member')->update($_G['uid'], array('groupid' => $groupid));
- dheader('location: '.($_G['referer'] ? $_GET['referer'] : $_G['siteurl']));
-} elseif($ac == 'wxlogin') {
- unset($_GET['mapifrom'], $_GET['charset']);
- if(wsq::checksign($_GET)) {
- $member = getuserbyuid($_GET['siteuid'], 1);
- if($member) {
- require_once libfile('function/member');
- setloginstatus($member, 1296000);
- }
- }
-} elseif($ac == 'wxregverify') {
- if(!wsq::checksign($_GET)) {
- showmessage('wechat:wechat_member_auth_fail');
- }
- $member = getuserbyuid($_GET['siteuid'], 1);
- if($member) {
- require_once libfile('function/member');
- setloginstatus($member, 1296000);
- }
- if($_G['cookie']['wxnewuser']) {
- $groupid = $_G['wechat']['setting']['wechat_newusergroupid'] ? $_G['wechat']['setting']['wechat_newusergroupid'] : $_G['setting']['newusergroupid'];
- C::t('common_member')->update($_G['uid'], array('groupid' => $groupid));
- dsetcookie('wxnewuser', '', -1);
- }
- dheader('location: '.($_GET['referer'] ? $_GET['referer'] : $_G['siteurl']));
-} else {
- showmessage('undefined_action');
-}
-
-function redirectregister($username) {
- global $_G;
- $defaultusername = substr($username, 0, 15);
- loaducenter();
- $user = uc_get_user($defaultusername);
- if(!empty($user)) {
- $defaultusername = cutstr($defaultusername, 7, '').'_'.random(5);
- }
- $auth = urlencode(base64_encode(authcode($_GET['openid']."\t".$_GET['openidsign']."\t".$_GET['referer'], 'ENCODE')));
- $referer = urlencode($_G['siteurl'].'plugin.php?id=wechat:login&ac=regcallback&auth='.$auth);
- dheader('location: '.$_G['siteurl'].'member.php?mod='.$_G['setting']['regname'].'&referer='.$referer.'&defaultusername='.urlencode($defaultusername));
-}
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/masssend_setting.inc.php b/upload/source/plugin/wechat/masssend_setting.inc.php
deleted file mode 100644
index 82e44e36..00000000
--- a/upload/source/plugin/wechat/masssend_setting.inc.php
+++ /dev/null
@@ -1,197 +0,0 @@
-' . lang('plugin/wechat', 'mass_create') . '';
- $ppp = 10;
- $page = max(1, intval($_GET['page']));
- $start = ($page - 1) * $ppp;
- $count = C::t('#wechat#mobile_wechat_masssend')->count();
- $msg = C::t('#wechat#mobile_wechat_masssend')->range($start, $ppp, 'DESC');
- $multi = multi($count, $ppp, $page, ADMINSCRIPT . '?' . PMODURL);
- showformheader('plugins&operation=config&identifier=wechat&pmod=masssend_setting&ac=send', 'enctype');
- showtableheader(lang('plugin/wechat', 'mass_list'), '');
- showsubtitle(array(lang('plugin/wechat', 'mass_text_oper'), lang('plugin/wechat', 'mass_text_send'), lang('plugin/wechat', 'mass_type'), lang('plugin/wechat', 'mass_created_at'), 'MSG_ID', lang('plugin/wechat', 'mass_finish_at'), lang('plugin/wechat', 'mass_status'), lang('plugin/wechat', 'mass_totalcount'), lang('plugin/wechat', 'mass_filtercount'), lang('plugin/wechat', 'mass_sendcount'), lang('plugin/wechat', 'mass_errorcount')));
- foreach ($msg as $m) {
- showtablerow('', array(), array(
- '' . lang('plugin/wechat', 'mass_delete') . ' | ' . lang('plugin/wechat', 'mass_edit') . ' ',
- "' . $multi . '
';
- showsubmit('sendsubmit', lang('plugin/wechat', 'mass_send'));
- showformfooter();
- } else if ($ac == 'add') {
- $groups = $wechat_client->getAllGroups();
- if (!$groups) {
- cpmsg_error('wechat:mass_get_group_failed');
- }
-
- if (intval($_GET['id']) > 0) {
- $mass = C::t('#wechat#mobile_wechat_masssend')->fetch(intval($_GET['id']));
- }
- $massmessage = $mass['resource_id'] ? "[resource={$mass['resource_id']}]" : $mass['text'];
- showtips(lang('plugin/wechat', 'mass_add_tips'));
- WeChatSetting::showResource();
- showformheader('plugins&operation=config&identifier=wechat&pmod=masssend_setting&ac=add', 'enctype');
- showtableheader();
- showtablerow('', '', array(lang('plugin/wechat', 'mass_type')));
- showtablerow('', array('', 'class="td23 td28"', '', 'class="td29"'), array(
- ""
- . "" . lang('plugin/wechat', 'mass_select_media') . " "
- ));
- $select = array('group_id', array());
- foreach ($groups as $g) {
- $select[1][] = array($g['id'], diconv($g['name'], 'UTF-8', CHARSET) . "[{$g['count']}]");
- }
- showsetting(lang('plugin/wechat', 'mass_group_id'), $select, '', 'select');
- showsubmit('addsubmit');
- showtablefooter();
- showformfooter();
- } else if ($ac == 'del') {
- $massid = intval($_GET['id']);
- $msg = C::t('#wechat#mobile_wechat_masssend')->fetch($massid);
- if (!$msg) {
- cpmsg_error('wechat:mass_not_exist');
- }
- if (!$msg['res_finish_at'] && $msg['msg_id']) {
- cpmsg('wechat:mass_del_tips_1', PMODURL . '&massid=' . $_GET['id'] . '&delsubmit=yes', 'form');
- }
- cpmsg('wechat:mass_del_tips_2', PMODURL . '&massid=' . $_GET['id'] . '&delsubmit=yes', 'form');
- }
-} elseif (submitcheck('addsubmit')) {
- $group_id = intval($_GET['group_id']);
- $massmessage = trim($_GET['massmessage']);
- if (empty($massmessage)) {
- cpmsg_error('wechat:mass_no_text');
- }
- if (preg_match("/^\[resource=(\d+)\]/", $massmessage, $r)) {
- $resource_id = $r[1];
-
- $res = C::t('#wechat#mobile_wechat_resource')->fetch($resource_id);
- if (!$res) {
- cpmsg('wechat:mass_no_found');
- }
- $news = array();
- if ($res['type'] == 0) {
- if ($res['data']['pic']) {
- $thumb_media_id = $wechat_client->upload('image', $_G['setting']['attachdir'] . 'common/' . $res['data']['local']);
- if (!$thumb_media_id) {
- cpmsg_error($wechat_client->error());
- }
- $res['data']['thumb_media_id'] = $thumb_media_id;
- $res['data']['author'] = '';
- } else {
- cpmsg('wechat:mass_no_pic');
- }
- array_push($news, $res['data']);
- } else if ($res['type'] == 1) {
- $news = array();
- foreach (array_keys($res['data']['mergeids']) as $resource_id) {
- $res = C::t('#wechat#mobile_wechat_resource')->fetch($resource_id);
- if (!$res) {
- cpmsg('wechat:mass_no_found');
- }
- if ($res['data']['pic']) {
- $thumb_media_id = $wechat_client->upload('image', $_G['setting']['attachdir'] . 'common/' . $res['data']['local']);
- if (!$thumb_media_id) {
- cpmsg_error($wechat_client->error());
- }
- $res['data']['thumb_media_id'] = $thumb_media_id;
- $res['data']['author'] = '';
- array_push($news, $res['data']);
- } else {
- cpmsg_error('wechat:mass_no_pic');
- }
- }
- }
- $newsRes = $wechat_client->uploadNews($news);
- if (!$newsRes) {
- cpmsg_error($wechat_client->error());
- }
- C::t('#wechat#mobile_wechat_masssend')->insert(array(
- 'type' => 'media',
- 'resource_id' => $res['id'],
- 'text' => '',
- 'group_id' => $group_id,
- 'media_id' => $newsRes['media_id'],
- 'created_at' => $newsRes['created_at']
- ));
- cpmsg('wechat:mass_created_succ', PMODURL, 'succeed');
- } else {
- $data = array(
- 'resource_id' => 0,
- 'type' => 'text',
- 'text' => $massmessage,
- 'group_id' => $group_id,
- 'created_at' => TIMESTAMP
- );
- C::t('#wechat#mobile_wechat_masssend')->insert($data);
- cpmsg('wechat:mass_created_succ', PMODURL, 'succeed');
- }
-} else if (submitcheck('sendsubmit')) {
- $massid = intval($_GET['massid']);
- if (!$massid) {
- cpmsg_error('wechat:mass_not_exist');
- }
- $msg = C::t('#wechat#mobile_wechat_masssend')->fetch($massid);
- if (!$msg) {
- cpmsg_error('wechat:mass_not_exist');
- }
-
- if ($msg['type'] == 'media' && ($msg['created_at'] + 86400 * 3) < TIMESTAMP) {
- cpmsg_error('wechat:mass_send_expire');
- }
-
- $res = $wechat_client->sendMassMsg($msg);
-
- if ($res) {
- C::t('#wechat#mobile_wechat_masssend')->update($massid, array('msg_id' => $res['msg_id'], 'sent_at' => TIMESTAMP));
- $updatedata = array('receiveEvent::masssendjobfinish' => array('plugin' => 'wechat', 'include' => 'response.class.php', 'class' => 'WSQResponse', 'method' => 'masssendFinish'));
- $responsehook = WeChatHook::updateResponse($updatedata);
- cpmsg('wechat:mass_sent_succ', PMODURL, 'succeed');
- } else {
- cpmsg_error($wechat_client->error());
- }
-} else if (submitcheck('delsubmit')) {
- $massid = intval($_GET['massid']);
- $msg = C::t('#wechat#mobile_wechat_masssend')->fetch($massid);
- if (!$msg) {
- cpmsg_error('wechat:mass_not_exist');
- }
- C::t('#wechat#mobile_wechat_masssend')->delete($massid);
- cpmsg('wechat:mass_oper_succ', PMODURL, 'succeed');
-}
-?>
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/menu_setting.inc.php b/upload/source/plugin/wechat/menu_setting.inc.php
deleted file mode 100644
index 73a34ec8..00000000
--- a/upload/source/plugin/wechat/menu_setting.inc.php
+++ /dev/null
@@ -1,201 +0,0 @@
-fetch_all_setting(array('wechatmenu'));
-$setting = (array)dunserialize($setting['wechatmenu']);
-
-require_once DISCUZ_ROOT . './source/plugin/wechat/wechat.lib.class.php';
-require_once DISCUZ_ROOT.'./source/plugin/wechat/setting.class.php';
-WeChatSetting::menu();
-
-if(!$_G['wechat']['setting']['wechat_appId'] || !$_G['wechat']['setting']['wechat_appsecret']) {
- cpmsg(lang('plugin/wechat', 'wsq_menu_at_error'), '', 'error');
-}
-
-if(!submitcheck('menusubmit') && !submitcheck('pubsubmit')) {
-
- $wechat_client = new WeChatClient($_G['wechat']['setting']['wechat_appId'], $_G['wechat']['setting']['wechat_appsecret']);
-
- if(is_array($_G['setting']['rewritestatus']) && in_array('plugin', $_G['setting']['rewritestatus'])) {
- $url = $_G['siteurl'].rewriteoutput('plugin', 1, 'wechat', 'access', '', 'op=access');
- } else {
- $url = $_G['siteurl'].'plugin.php?id=wechat:access';
- }
-
- showtips(lang('plugin/wechat', 'menu_tips', array('url' => $url)));
-
- showformheader('plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=menu_setting');
- showtableheader();
- echo '';
-
- foreach($setting['button'] as $k => $button) {
- $disabled = !empty($button['sub_button']) ? 'disabled' : '';
- showtablerow('', array('', 'class="td23 td28"', '', 'class="td29"'), array(
- "
",
- "
",
- "
-var rowtypedata = [
-[[1,''], [1,'
'], [1, '
-var cookiepre = '{$_G['config']['cookie']['cookiepre']}', cookiedomain = '{$_G['config']['cookie']['cookiedomain']}', cookiepath = '{$_G['config']['cookie']['cookiepath']}';
-function merge(id, type) {
- mids = getcookie('wechat_rids');
- var re = new RegExp('_' + id + '_', "g");
- mids = mids.replace(re, '');
- if(type) {
- mids += '_' + id + '_';
- }
- setcookie('wechat_rids', mids);
- showmerge();
-}
-function clearmerge() {
- setcookie('wechat_rids', '', -1);
- location.href = location.href;
-}
-function showmerge() {
- $('mergebtn').style.display = getcookie('wechat_rids') ? '' : 'none';
-}
-
-EOF;
-
- showtableheader();
- $wechat_rids = explode('_', $_G['cookie']['wechat_rids']);
-
- foreach($select as $k => &$row) {
- $row = ''.$row.' ';
- }
- $select = ''.implode('', $select).' ';
- foreach($resource as $row) {
- $row = dhtmlspecialchars($row);
- echo ''
- . ''
- . (!$row['type']
- ? ''.$row['data']['title'].' '.($row['data']['pic'] ? '
' : '').'
'.$row['data']['desc'].' '.lang('plugin/wechat', 'resource_type_m').' '.lang('plugin/wechat', 'resource_merge_count', array('count' => count($row['data']['mergeids']))).''.lang('plugin/wechat', 'resource_view').'
';
- }
- showtablefooter();
- echo ''.$multi.'
';
- echo $select.''.lang('plugin/wechat', 'resource_add').' '
- . ''
- . ''.lang('plugin/wechat', 'resource_type_m').' '
- . ''.lang('plugin/wechat', 'resource_cancel_merge').' '
- . ' ';
-
- } elseif($ac == 'add') {
-
- showformheader('plugins&operation=config&identifier=wechat&pmod=resource_setting&ac=add', 'enctype');
- showtableheader();
- showsetting(lang('plugin/wechat', 'resource_name'), 'name', '', 'text');
- showsetting(lang('plugin/wechat', 'resource_title'), 'data[title]', '', 'text');
- showsetting(lang('plugin/wechat', 'resource_pic'), 'pic', '', 'filetext');
- showsetting(lang('plugin/wechat', 'resource_desc'), 'data[desc]', '', 'textarea');
- showsetting(lang('plugin/wechat', 'resource_content'), 'data[content]', '', 'textarea');
- showsetting(lang('plugin/wechat', 'resource_url'), 'data[url]', '', 'text');
- showsubmit('addsubmit');
- showtablefooter();
- showformfooter();
-
- } elseif($ac == 'addmerge') {
-
- $wechat_rids = explode('_', $_G['cookie']['wechat_rids']);
- $resource = C::t('#wechat#mobile_wechat_resource')->fetch_all($wechat_rids);
-
- if($_GET['id']) {
- $aresource = C::t('#wechat#mobile_wechat_resource')->fetch($_GET['id']);
- foreach($resource as $row) {
- if(!$aresource['data']['mergeids'][$row['id']]) {
- $aresource['data']['mergeids'][$row['id']] = 0;
- }
- }
- asort($aresource['data']['mergeids']);
- $data = array(
- 'data' => $aresource['data'],
- );
- C::t('#wechat#mobile_wechat_resource')->update($_GET['id'], $data);
-
- dsetcookie('wechat_rids', '', -1);
- dheader('location: '.ADMINSCRIPT.'?'.RSELF.'edit&id='.$_GET['id']);
- }
-
- showformheader('plugins&operation=config&identifier=wechat&pmod=resource_setting&ac=add');
- showtableheader();
- showsetting(lang('plugin/wechat', 'resource_name'), 'name', '', 'text');
- showtablefooter();
- showtableheader();
- echo '';
- $i = 0;
- foreach($resource as $row) {
- echo ''.$row['name'].' '
- . ''
- . ''.$row['data']['title'].' '.($row['data']['pic'] ? '
' : '').'
'.$row['data']['desc'].'
';
- }
- showtablefooter();
- showtableheader();
- showsubmit('editmergesubmit');
- showtablefooter();
- showformfooter();
-
- }
-
- } elseif($ac == 'delete') {
- cpmsg(lang('plugin/wechat', 'resource_msg_del'), RSELF.'&id='.$_GET['id'].'&delsubmit=yes', 'form');
- } elseif($ac == 'removemerge') {
- cpmsg(lang('plugin/wechat', 'resource_msg_remove'), RSELF.'&id='.$_GET['id'].'&fromid='.$_GET['fromid'].'&removesubmit=yes', 'form');
- } elseif($ac == 'select') {
- include template('common/header_ajax');
-
- $ppp = 6;
- $page = max(1, $_GET['page']);
- $start = ($page - 1) * $ppp;
- $count = C::t('#wechat#mobile_wechat_resource')->count_by_type($filter >= 0 ? $filter : null);
- $resource = C::t('#wechat#mobile_wechat_resource')->fetch_by_type($filter >= 0 ? $filter : null, $start, $ppp);
- $multi = multi($count, $ppp, $page, ADMINSCRIPT.'?action=plugins&operation=config&identifier=wechat&pmod=resource_setting&ac=select&filter='.$filter);
- wxbox_style();
-
- foreach($select as $k => &$row) {
- $row = ''.$row.' ';
- }
- $select = ''.implode('', $select).' ';
- echo '';
-
- showtableheader();
- $wechat_rids = explode('_', $_G['cookie']['wechat_rids']);
- foreach($resource as $row) {
- $row = dhtmlspecialchars($row);
- echo ''
- . ''
- . (!$row['type']
- ? ''.$row['data']['title'].' '.($row['data']['pic'] ? '
' : '').'
'.lang('plugin/wechat', 'resource_type_m').' '.lang('plugin/wechat', 'resource_merge_count', array('count' => count($row['data']['mergeids']))).''.lang('plugin/wechat', 'resource_view').'
';
- }
- showtablefooter();
-
- include template('common/footer_ajax');
- }
-
-} elseif(submitcheck('addsubmit')) {
-
- if(dstrlen($_GET['data']['desc'], CHARSET) > 120) {
- cpmsg(lang('plugin/wechat', 'resource_msg_desc_toolong'), '', 'error');
- }
- if($_FILES['pic']['tmp_name']) {
- $upload = new discuz_upload();
- if(!getimagesize($_FILES['pic']['tmp_name']) || !$upload->init($_FILES['pic'], 'common', random(3, 1), random(8)) || !$upload->save()) {
- cpmsg($upload->errormessage(), '', 'error');
- }
- $_GET['data']['pic'] = (preg_match('/^https?:/', $_G['setting']['attachurl']) ? '' : $_G['siteurl']).$_G['setting']['attachurl'].'common/'.$upload->attach['attachment'];
- $_GET['data']['local'] = $upload->attach['attachment'];
- } else {
- $_GET['data']['pic'] = $_GET['pic'];
- }
- $data = array(
- 'name' => $_GET['name'],
- 'data' => $_GET['data'],
- );
- C::t('#wechat#mobile_wechat_resource')->insert($data);
-
- cpmsg('setting_update_succeed', RSELF, 'succeed');
-
-} elseif(submitcheck('editsubmit')) {
-
- $resource = C::t('#wechat#mobile_wechat_resource')->fetch($_GET['id']);
- if(!$resource) {
- cpmsg(lang('plugin/wechat', 'resource_msg_nofound'), '', 'error');
- }
-
- if(dstrlen($_GET['data']['desc'], CHARSET) > 120) {
- cpmsg(lang('plugin/wechat', 'resource_msg_desc_toolong'), '', 'error');
- }
- if($_FILES['pic']['tmp_name']) {
- $upload = new discuz_upload();
- if(!getimagesize($_FILES['pic']['tmp_name']) || !$upload->init($_FILES['pic'], 'common', random(3, 1), random(8)) || !$upload->save()) {
- cpmsg($upload->errormessage(), '', 'error');
- }
- $_GET['data']['pic'] = (preg_match('/^https?:/', $_G['setting']['attachurl']) ? '' : $_G['siteurl']).$_G['setting']['attachurl'].'common/'.$upload->attach['attachment'];
- $_GET['data']['local'] = $upload->attach['attachment'];
- @unlink($_G['setting']['attachdir'].'common/'.$resource['data']['local']);
- } else {
- $_GET['data']['pic'] = $_GET['pic'];
- }
- $data = array(
- 'name' => $_GET['name'],
- 'data' => $_GET['data'],
- );
- C::t('#wechat#mobile_wechat_resource')->update($_GET['id'], $data);
-
- cpmsg('setting_update_succeed', RSELF, 'succeed');
-
-} elseif(submitcheck('delsubmit')) {
-
- $resource = C::t('#wechat#mobile_wechat_resource')->fetch($_GET['id']);
- if(!$resource) {
- cpmsg(lang('plugin/wechat', 'resource_msg_nofound'), '', 'error');
- }
-
- if($resource['data']['local']) {
- @unlink($_G['setting']['attachdir'].'common/'.$resource['data']['local']);
- }
- C::t('#wechat#mobile_wechat_resource')->delete($_GET['id']);
-
- cpmsg('setting_update_succeed', RSELF, 'succeed');
-
-} elseif(submitcheck('addmergesubmit')) {
-
- asort($_GET['data']['mergeids']);
- $data = array(
- 'name' => $_GET['name'],
- 'type' => 1,
- 'data' => $_GET['data'],
- );
- C::t('#wechat#mobile_wechat_resource')->insert($data);
- dsetcookie('wechat_rids', '', -1);
-
- cpmsg('setting_update_succeed', RSELF, 'succeed');
-
-} elseif(submitcheck('editmergesubmit')) {
-
- asort($_GET['data']['mergeids']);
- $data = array(
- 'name' => $_GET['name'],
- 'data' => $_GET['data'],
- );
- C::t('#wechat#mobile_wechat_resource')->update($_GET['id'], $data);
- dsetcookie('wechat_rids', '', -1);
-
- cpmsg('setting_update_succeed', RSELF.'edit&id='.$_GET['id'], 'succeed');
-
-} elseif(submitcheck('removesubmit')) {
-
- $resource = C::t('#wechat#mobile_wechat_resource')->fetch($_GET['fromid']);
- if(!$resource) {
- cpmsg(lang('plugin/wechat', 'resource_msg_nofound'), '', 'error');
- }
-
- unset($resource['data']['mergeids'][$_GET['id']]);
- $data = array(
- 'data' => $resource['data'],
- );
- C::t('#wechat#mobile_wechat_resource')->update($_GET['fromid'], $data);
-
- cpmsg('setting_update_succeed', RSELF.'edit&id='.$_GET['fromid'], 'succeed');
-
-}
-
-function wxbox_style() {
-echo <<
-.wxbox { table-layout: fixed; margin:0 5px 10px 0;width:300px;height:300px; }
-.wxbox td { padding:0 2px;border: none; }
-.wxbox th { height: 50px; white-space: nowrap; }
-.wxbox th div { font-weight:normal; }
-.wxbox th div span { float:right; }
-.wxbox th div .txt { width: 40px; }
-.wxbox .l1 { height: 30px; line-height: 30px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap; }
-.wxbox .l2 { text-align:center; }
-.wxbox .l2 img { width: 290px; }
-.wxbox .l2 div { width: 290px;height: 160px; display:block; overflow:hidden; }
-.wxbox .l3 { height: 80px; vertical-align:top;line-height:25px; }
-.wxbox.hover { height:220px; }
-.wxbox.hover th { height:20px; }
-
-EOF;
-
-}
-
-?>
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/resourcepush.inc.php b/upload/source/plugin/wechat/resourcepush.inc.php
deleted file mode 100644
index f5733f6a..00000000
--- a/upload/source/plugin/wechat/resourcepush.inc.php
+++ /dev/null
@@ -1,50 +0,0 @@
-fetch_threadpost_by_tid_invisible($_GET['tid']);
-if($thread['cover']) {
- $picurl = getthreadcover($thread['tid'], $thread['cover']);
-} else {
- $attach = C::t('forum_attachment_n')->fetch_all_by_id('tid:'.$_GET['tid'], 'pid', array($post['pid']), '', true);
- $picurl = '';
- if($attach) {
- $attach = array_shift($attach);
- $picurl = ($attach['remote'] ? $_G['setting']['ftp']['attachurl'] : $_G['setting']['attachurl']).'forum/'.$attach['attachment'];
- }
-}
-
-$data = array(
- 'name' => lang('plugin/wechat', 'resource_thread_push').': '.$thread['subject'],
- 'data' => array(
- 'title' => $thread['subject'],
- 'pic' => $picurl ? (preg_match('/^https?:/', $picurl) ? '' : $_G['siteurl']).$picurl : '',
- 'desc' => threadmessagecutstr($thread, $post['message'], 0, 120),
- 'content' => nl2br(threadmessagecutstr($thread, $post['message'])),
- 'url' => $_G['siteurl'].'forum.php?mod=viewthread&tid='.$_GET['tid'],
- ),
-);
-C::t('#wechat#mobile_wechat_resource')->insert($data);
-
-showmessage('wechat:resource_msg_pushed', '', array(), array('alert' => 'right'));
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/response.class.php b/upload/source/plugin/wechat/response.class.php
deleted file mode 100644
index 8163496b..00000000
--- a/upload/source/plugin/wechat/response.class.php
+++ /dev/null
@@ -1,244 +0,0 @@
-fetch_by_code($data['content']);
- if(!$authcode || $authcode['status']) {
- if($isloginkeyword) {
- wsq::report('loginclick');
- self::_show('access', $data['from']);
- }
- } else {
- wsq::report('sendnum');
- self::_show('sendnum', $data['from']."\t".$authcode['sid'], 60);
- }
- }
-
- public static function click($param) {
- list($data) = $param;
- self::_init();
- global $_G;
- if(!$_G['wechat']['setting']['wsq_allow']) {
- return;
- }
- if($data['key'] == self::$keyword) {
- wsq::report('loginclick');
- self::_show('access', $data['from']);
- } else {
- self::_custom('text', $data['key']);
- }
- }
-
- public static function custom($param) {
- self::_init();
- global $_G;
- if(!$_G['wechat']['setting']['wsq_allow']) {
- return;
- }
- self::_custom('subscribe');
- }
-
- public static function subscribe($param) {
- list($data) = $param;
- self::_init();
- global $_G;
- if(!$_G['wechat']['setting']['wsq_allow']) {
- return;
- }
- if($data['key']) {
- self::scan($param);
- } else {
- self::_show('access', $data['from']);
- }
- }
-
- public static function scan($param) {
- list($data) = $param;
- self::_init();
- global $_G;
- if(!$_G['wechat']['setting']['wsq_allow']) {
- return;
- }
- $authcode = C::t('#wechat#mobile_wechat_authcode')->fetch_by_code($data['key']);
- if(!$authcode || $authcode['status']) {
- } else {
- if($authcode['uid']) {
- $member = getuserbyuid($authcode['uid'], 1);
- if(in_array($_G['adminid'], array(0, -1)) && !$_G['wechat']['setting']['wechat_confirmtype']) {
- C::t('#wechat#mobile_wechat_authcode')->update($authcode['sid'], array('uid' => $member['uid'], 'status' => 1));
- $authcode['sid'] = '';
- }
- } else {
- $wechatuser = C::t('#wechat#common_member_wechat')->fetch_by_openid($data['from']);
- if($wechatuser) {
- $member = getuserbyuid($wechatuser['uid'], 1);
- if(in_array($_G['adminid'], array(0, -1)) && !$_G['wechat']['setting']['wechat_confirmtype']) {
- C::t('#wechat#mobile_wechat_authcode')->update($authcode['sid'], array('uid' => $member['uid'], 'status' => 1));
- $authcode['sid'] = '';
- }
- } elseif($_G['wechat']['setting']['wechat_allowregister'] && $_G['wechat']['setting']['wechat_allowfastregister'] && $_G['wechat']['setting']['wechat_mtype'] == 2) {
- require_once DISCUZ_ROOT . './source/plugin/wechat/wechat.class.php';
- require_once libfile('function/member');
- $uid = WeChat::register(WeChat::getnewname($data['from']), 1);
- if($uid) {
- WeChatHook::bindOpenId($uid, $data['from'], 1);
- C::t('#wechat#mobile_wechat_authcode')->update($authcode['sid'], array('uid' => $uid, 'status' => 1));
- }
- wsq::report('register');
- $authcode['sid'] = '';
- }
- }
- wsq::report('scanqr');
- self::_show('scan', $data['from']."\t".$authcode['sid']);
- }
- }
-
- public static function redirect($type) {
- self::_init();
- global $_G;
- if(!$_G['wechat']['setting']['wsq_allow']) {
- return;
- }
- if($_G['wechat']['setting']['wsq_siteid'] && !defined('IN_MOBILE_API')) {
- $_G['wechat']['setting']['wsq_wapdefault'] = !self::_checkrobot() ? $_G['wechat']['setting']['wsq_wapdefault'] : false;
- $in_wechat = $_G['wechat']['setting']['wsq_wapdefault'] ? true : strpos($_SERVER['HTTP_USER_AGENT'], 'MicroMessenger') !== false;
- $fromwap = $_G['wechat']['setting']['wsq_wapdefault'] && strpos($_SERVER['HTTP_USER_AGENT'], 'MicroMessenger') === false;
- $url = wsq::$WSQ_DOMAIN.'siteid='.$_G['wechat']['setting']['wsq_siteid'].($fromwap ? '&source=wap' : '').'&c=index&a=';
- if($type) {
- $modid = $_G['basescript'].'::'.CURMODULE;
- if($in_wechat) {
- if(($modid == 'forum::viewthread' || $modid == 'group::viewthread') && !empty($_GET['tid'])) {
- dheader('location: '.$url.'viewthread&tid='.$_GET['tid']);
- } elseif(($modid == 'forum::forumdisplay' || $modid == 'group::forumdisplay') && !empty($_GET['fid'])) {
- dheader('location: '.$url.'index&fid='.$_GET['fid']);
- } elseif($modid == 'forum::index') {
- dheader('location: '.$url.'index');
- }
- }
- } else {
- if(isset($_GET['referer'])) {
- return $_GET['referer'];
- } elseif(isset($_GET['pluginid'])) {
- return $url.'plugin&pluginid='.urlencode($_GET['pluginid']).'¶m='.urlencode($_GET['param']);
- } else {
- return $url.'index';
- }
- }
- }
-
- }
-
- private static function _show($messagekey, $key, $expire = 0) {
- global $_G;
- if(!$_G['wechat']['setting']['wsq_allow']) {
- return;
- }
- $expire = $expire ? $expire : self::$expire;
- $key = authcode($key, 'ENCODE', $_G['config']['security']['authkey'], $expire);
- $url = $_G['siteurl'] . 'plugin.php?mobile=2&id=wechat&op='.$messagekey.'&key=' . urlencode(base64_encode($key));
- $param = array('bbname' => $_G['wechat']['setting']['wsq_sitename'], 'date' => dgmdate(TIMESTAMP + $expire, 'Y-m-d'));
- loadcache('wechat_response');
- $desc = !empty($_G['cache']['wechat_response'][$messagekey]) ? $_G['cache']['wechat_response'][$messagekey] : 'wechat_response_text_' . $messagekey;
- $list = array(array(
- 'title' => lang('plugin/wechat', 'wechat_response_text_title', $param),
- 'desc' => lang('plugin/wechat', $desc, $param),
- 'url' => $url
- ));
- echo WeChatServer::getXml4RichMsgByArray($list);
- exit;
- }
-
- private static function _custom($type, $keyword = '') {
- global $_G;
- loadcache('wechat_response');
- $response = & $_G['cache']['wechat_response'];
- $query = $type == 'text' ? $response['query']['text'][$keyword] : $response['query']['subscribe'];
- if($query) {
- if($query == self::$keyword) {
- return 1;
- }
- if(preg_match("/^\[resource=(\d+)\]/", $query, $r)) {
- $resource = C::t('#wechat#mobile_wechat_resource')->fetch($r[1]);
- if(!$resource['type']) {
- $list = array(array(
- 'title' => $resource['data']['title'],
- 'desc' => $resource['data']['desc'],
- 'pic' => $resource['data']['pic'],
- 'url' => $resource['data']['url'],
- ));
- } else {
- $mergeids = array_keys($resource['data']['mergeids']);
- $sresource = C::t('#wechat#mobile_wechat_resource')->fetch_all($mergeids);
- $list = array();
- foreach($resource['data']['mergeids'] as $id => $order) {
- $list[] = array(
- 'title' => $sresource[$id]['data']['title'],
- 'desc' => $sresource[$id]['data']['desc'],
- 'pic' => $sresource[$id]['data']['pic'],
- 'url' => $sresource[$id]['data']['url'],
- );
- }
- }
- echo WeChatServer::getXml4RichMsgByArray($list);
- exit;
- } else {
- echo WeChatServer::getXml4Txt($query);
- }
- exit;
- }
- return 0;
- }
-
- public static function masssendFinish($param) {
- list($data) = $param;
- if(!$data['msg_id']) {
- exit;
- }
- $updatedata = array(
- 'res_status' => $data['status'],
- 'res_totalcount' => $data['totalcount'],
- 'res_filtercount' => $data['filtercount'],
- 'res_sentcount' => $data['sentcount'],
- 'res_errorcount' => $data['errorcount'],
- 'res_finish_at' => $data['time']
- );
- DB::update('mobile_wechat_masssend', $updatedata, "msg_id='{$data['msg_id']}'");
- }
-
- private static function _checkrobot() {
- return IS_ROBOT || strpos($_SERVER['HTTP_USER_AGENT'], 'spi_der') !== false;
- }
-
- private static function _init() {
- global $_G;
- if(!$_G['wechat']['setting']) {
- $_G['wechat']['setting'] = dunserialize($_G['setting']['mobilewechat']);
- }
- }
-
-}
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/response_setting.inc.php b/upload/source/plugin/wechat/response_setting.inc.php
deleted file mode 100644
index 0dd8b313..00000000
--- a/upload/source/plugin/wechat/response_setting.inc.php
+++ /dev/null
@@ -1,188 +0,0 @@
- $url)));
-
- $responsehook = WeChatHook::getResponse();
-
- if($_GET['subscribe'] == 'custom') {
- $response['subscribeback'] = $responsehook['receiveEvent::subscribe'];
- $updatedata = array('receiveEvent::subscribe' => array('plugin' => 'wechat', 'include' => 'response.class.php', 'class' => 'WSQResponse', 'method' => 'custom'));
- $responsehook = WeChatHook::updateResponse($updatedata);
- savecache('wechat_response', $response);
- cpmsg(lang('plugin/wechat', 'response_subscribe_custom'), 'action=plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=response_setting', 'succeed');
- } elseif($_GET['subscribe'] == 'restore') {
- $response['subscribeback'] = $response['subscribeback'] ? $response['subscribeback'] : array('plugin' => 'wechat', 'include' => 'response.class.php', 'class' => 'WSQResponse', 'method' => 'subscribe');
- $updatedata = array('receiveEvent::subscribe' => $response['subscribeback']);
- $responsehook = WeChatHook::updateResponse($updatedata);
- savecache('wechat_response', $response);
- cpmsg(lang('plugin/wechat', 'response_subscribe_plugin'), 'action=plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=response_setting', 'succeed');
- }
-
- if($_GET['text'] == 'custom') {
- $response['textback'] = $responsehook['receiveMsg::text'];
- $updatedata = array('receiveMsg::text' => array('plugin' => 'wechat', 'include' => 'response.class.php', 'class' => 'WSQResponse', 'method' => 'text'));
- $responsehook = WeChatHook::updateResponse($updatedata);
- savecache('wechat_response', $response);
- cpmsg(lang('plugin/wechat', 'response_message_custom'), 'action=plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=response_setting', 'succeed');
- } elseif($_GET['text'] == 'restore') {
- $response['textback'] = $response['textback'] ? $response['textback'] : array('plugin' => 'wechat', 'include' => 'response.class.php', 'class' => 'WSQResponse', 'method' => 'text');
- $updatedata = array('receiveMsg::text' => $response['textback']);
- $responsehook = WeChatHook::updateResponse($updatedata);
- savecache('wechat_response', $response);
- cpmsg(lang('plugin/wechat', 'response_message_plugin'), 'action=plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=response_setting', 'succeed');
- }
-
- WeChatSetting::showResource();
-
- showformheader('plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=response_setting');
- showtableheader();
- echo ''.lang('plugin/wechat', 'response_keyword').' '.lang('plugin/wechat', 'response_content').' ".lang('plugin/wechat', 'response_custom')." ".($response['subscribeback'] ? "[".lang('plugin/wechat', 'response_switch_plugin_mode', array('plugin' => $response['subscribeback']['plugin']))."]
" : '')
- ));
- showtablerow('', array('', 'class="td23 td28"', '', 'class="td29"'), array(
- "",
- "".lang('plugin/wechat', 'subscribe')." ",
- ""
- ."".lang('plugin/wechat', 'resource_select')." "
- ));
- } else {
- showtablerow('class="header"', array('', 'class="td23 td28"', '', 'class="td29"'), array(
- "",
- lang('plugin/wechat', 'response_subscribe'),
- "".lang('plugin/wechat', 'response_plugin_mode', array('plugin' => $responsehook['receiveEvent::subscribe']['plugin']))." [".lang('plugin/wechat', 'response_switch_custom_mode')."]
"
- ));
- }
-
- showtablerow('class="header"', array('', 'class="td23 td28"', '', 'class="td29"'), array(
- "",
- lang('plugin/wechat', 'response_access'),
- "".lang('plugin/wechat', 'response_access_comment')
- ));
- showtablerow('', array('', 'class="td23 td28"', '', 'class="td29"'), array(
- "",
- "".lang('plugin/wechat', 'access')." ",
- ""
- ."".lang('plugin/wechat', 'resource_select')." "
- ));
-
- showtablerow('class="header"', array('', 'class="td23 td28"', '', 'class="td29"'), array(
- "",
- lang('plugin/wechat', 'response_scan'),
- "
".lang('plugin/wechat', 'response_scan_comment')
- ));
- showtablerow('', array('', 'class="td23 td28"', '', 'class="td29"'), array(
- "",
- "".lang('plugin/wechat', 'scan')." ",
- ""
- ."".lang('plugin/wechat', 'resource_select')." "
- ));
-
- if($responsehook['receiveMsg::text']['plugin'] == 'wechat' &&
- $responsehook['receiveMsg::text']['class'] == 'WSQResponse' &&
- $responsehook['receiveMsg::text']['method'] == 'text') {
- showtablerow('class="header"', array('', 'class="td23 td28"', '', 'class="td29"'), array(
- "",
- lang('plugin/wechat', 'response_message'),
- "
".lang('plugin/wechat', 'response_custom')." ".($response['textback'] ? "[".lang('plugin/wechat', 'response_switch_plugin_mode', array('plugin' => $response['textback']['plugin']))."]
" : '')
- ));
-
- foreach($response['text'] as $k => $text) {
- showtablerow('', array('', 'class="td23 td28"', 'class="td29"'), array(
- "
",
- ""
- ."".lang('plugin/wechat', 'resource_select')." "
- ));
- }
- echo '
-var rowtypedata = [
-[[1,''], [1, '".lang('plugin/wechat', 'response_plugin_mode', array('plugin' => $responsehook['receiveMsg::text']['plugin']))." [".lang('plugin/wechat', 'response_switch_custom_mode')."]
"
- ));
- }
-
- showsubmit('menusubmit', 'submit', 'del');
- showtablefooter();
- showformfooter();
-
-} else {
-
- if(!empty($_GET['newresponse'])) {
- foreach($_GET['newresponse']['keyword'] as $k => $keyword) {
- $item = array(
- 'keyword' => $keyword,
- 'response' => $_GET['newresponse']['response'][$k],
- );
- $response['text'][] = $item;
- }
- }
-
- foreach($_GET['response']['text'] as $k => $value) {
- if($value['delete']) {
- unset($response['text'][$k]);
- continue;
- }
- $response['text'][$k] = $value;
- }
-
- $response['subscribe'] = $_GET['response']['subscribe'];
- $response['access'] = $_GET['response']['access'];
- $response['scan'] = $_GET['response']['scan'];
-
- $query = array(
- 'subscribe' => $response['subscribe'],
- 'text' => array(),
- );
-
- foreach($response['text'] as $value) {
- $query['text'][$value['keyword']] = $value['response'];
- }
-
- $response['query'] = $query;
-
- savecache('wechat_response', $response);
-
- cpmsg('setting_update_succeed', 'action=plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=response_setting', 'succeed');
-
-}
-
-?>
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/setting.class.php b/upload/source/plugin/wechat/setting.class.php
deleted file mode 100644
index c820fec0..00000000
--- a/upload/source/plugin/wechat/setting.class.php
+++ /dev/null
@@ -1,108 +0,0 @@
-'
- . ''.lang('plugin/wechat', 'resource_select').'
-var showResourceId = null;
-function showResource(id) {
- showMenu({'ctrlid':'rsel','evt':'click','duration':3,'pos':'00'});
- showResourceId = id;
- ajaxget('$adminscript?action=plugins&operation=config&identifier=wechat&pmod=resource_setting&ac=select', 'rsel_content');
-}
-function selResource(id, text) {
- $(showResourceId).value = '[resource=' + id + '] ' + text;
- hideMenu();
-}
-
-EOF;
-
- }
-
- public static function menu() {
- global $_G;
- $_G['wechat']['setting'] = dunserialize($_G['setting']['mobilewechat']);
-
-echo <<
-.floattop { display: none; }
-.floattopempty { display: none; }
-.mymenu .floattop { display: inline; }
-.mymenu .floattopempty { display: inline; }
-
-EOF;
-
- echo '';
-
- if($_G['wechat']['setting']['wsq_siteid']) {
- $time = TIMESTAMP;
-
-echo <<
-function pubEventCallbackCommon(re) {
- if(re.errCode) {
- return;
- }
- if(typeof re.data.event.peId != 'undefined') {
- $('pubEventNum').innerHTML = 'New!';
- $('pubEventNum').style.display = '';
- }
-}
-
-
-EOF;
-
- }
- }
-
-
-}
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/showactivity_setting.inc.php b/upload/source/plugin/wechat/showactivity_setting.inc.php
deleted file mode 100644
index 62eda87e..00000000
--- a/upload/source/plugin/wechat/showactivity_setting.inc.php
+++ /dev/null
@@ -1,219 +0,0 @@
-fetch_all_setting(array('mobilewechat'));
-$setting = (array)dunserialize($setting['mobilewechat']);
-$ac = !empty($_GET['ac']) ? $_GET['ac'] : '';
-
-require_once libfile('function/forumlist');
-loadcache('forums');
-
-require_once DISCUZ_ROOT.'./source/plugin/wechat/setting.class.php';
-WeChatSetting::menu();
-
-if(!$setting['wsq_sitetoken']) {
- cpmsg(lang('plugin/wechat', 'wsq_api_register_close'), '', 'error');
-}
-
-if(!$ac) {
-
- $ppp = 20;
- if(!is_array($setting['showactivity']['tids'])) {
- $setting['showactivity']['tids'] = array();
- }
- arsort($setting['showactivity']['tids']);
- $page = max(1, $_GET['page']);
- $tids = array_slice($setting['showactivity']['tids'], ($page - 1) * $ppp, $ppp);
- $multipage = multi(count($setting['showactivity']['tids']), $ppp, $page, ADMINSCRIPT.'?action=plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=showactivity_setting', 0, 3, TRUE, TRUE);
-
- $showthreads = C::t('forum_thread')->fetch_all($tids);
- $activities = C::t('forum_activity')->fetch_all(array_keys($showthreads));
-
- arsort($showthreads);
- showformheader('plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=showactivity_setting&ac=del', 'enctype');
- showtableheader();
- echo '';
- foreach($showthreads as $tid => $thread) {
- $settingsnew[$tid] = $tid;
- echo ''.$thread['subject'].' '.
- dgmdate($activities[$thread['tid']]['starttimefrom']).($activities[$thread['tid']]['starttimeto'] ? ' - '.dgmdate($activities[$thread['tid']]['starttimeto']) : '').' '.
- dgmdate($activities[$thread['tid']]['expiration']).' '.
- $activities[$thread['tid']]['applynumber'].' '.
- $_G['cache']['forums'][$thread['fid']]['name'].' '.
- ''.lang('plugin/wechat', 'show_export').' \n > ".cplang('select')." ".str_replace('%', '%%', forumselect(FALSE, 0, 0, TRUE)).' ';
-
- showformheader('plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=showactivity_setting&ac=add', 'enctype');
- showtableheader();
- showsetting(lang('plugin/wechat', 'show_title'), 'subject', '', 'text');
- showsetting(lang('plugin/wechat', 'show_starttime'), 'starttimefrom', '', 'calendar', '', 0, '', 1);
- showsetting(lang('plugin/wechat', 'show_expiration'), 'activityexpiration', '', 'calendar', '', 0, '', 1);
- showsetting(lang('plugin/wechat', 'show_endtime'), 'starttimeto', '', 'calendar', '', 0, '', 1);
- showsetting(lang('plugin/wechat', 'show_memo'), 'message', '', 'textarea');
- showsetting(lang('plugin/wechat', 'show_forum'), '', '', $forumselect);
- showsubmit('submit');
- showtablefooter();
- showformfooter();
-
- } else {
-
- $_GET['activityclass'] = lang('plugin/wechat', 'show_thread_class');
- $_GET['activityplace'] = lang('plugin/wechat', 'show_thread_place');
- if(!$_GET['subject'] || !$_GET['starttimefrom'] || !$_GET['activityexpiration'] || !$_GET['message'] || !$_GET['fid']) {
- cpmsg(lang('plugin/wechat', 'show_input_error'), '', 'error');
- }
-
- if(@strtotime($_GET['starttimefrom']) === -1 || @strtotime($_GET['starttimefrom']) === FALSE) {
- cpmsg(lang('message', 'activity_fromtime_error'), '', 'error');
- } elseif(trim($_GET['activityexpiration']) && (@strtotime($_GET['activityexpiration']) === -1 || @strtotime($_GET['activityexpiration']) === FALSE)) {
- cpmsg(lang('message', 'activity_totime_error'), '', 'error');
- }
-
- $activity = array();
- $activity['class'] = $_GET['activityclass'];
- $activity['starttimefrom'] = @strtotime($_GET['starttimefrom']);
- $activity['starttimeto'] = $_GET['starttimeto'] ? @strtotime($_GET['starttimeto']) : 0;
- $activity['place'] = $_GET['activityplace'];
- $activity['expiration'] = @strtotime($_GET['activityexpiration']);
-
- $newthread = array(
- 'fid' => $_GET['fid'],
- 'posttableid' => 0,
- 'readperm' => 0,
- 'price' => 0,
- 'typeid' => 0,
- 'sortid' => 0,
- 'author' => $_G['username'],
- 'authorid' => $_G['uid'],
- 'subject' => $_GET['subject'],
- 'dateline' => TIMESTAMP,
- 'lastpost' => TIMESTAMP,
- 'lastposter' => $_G['username'],
- 'displayorder' => 1,
- 'digest' => 0,
- 'special' => 4,
- 'attachment' => 0,
- 'moderated' => 0,
- 'status' => 0,
- 'isgroup' => 0,
- 'replycredit' => 0,
- 'closed' => 0,
- );
- $tid = C::t('forum_thread')->insert($newthread, true);
-
- $pid = insertpost(array(
- 'fid' => $_GET['fid'],
- 'tid' => $tid,
- 'first' => '1',
- 'author' => $_G['username'],
- 'authorid' => $_G['uid'],
- 'subject' => $_GET['subject'],
- 'dateline' => TIMESTAMP,
- 'message' => $_GET['message'],
- 'useip' => '',
- 'invisible' => 0,
- 'anonymous' => 0,
- 'usesig' => 0,
- 'htmlon' => 0,
- 'bbcodeoff' => 0,
- 'smileyoff' => 0,
- 'parseurloff' => 0,
- 'attachment' => '0',
- 'tags' => '',
- 'replycredit' => 0,
- 'status' => 0
- ));
-
- $data = array(
- 'tid' => $tid,
- 'uid' => $_G['uid'],
- 'cost' => 0,
- 'starttimefrom' => $activity['starttimefrom'],
- 'starttimeto' => $activity['starttimeto'],
- 'place' => $activity['place'],
- 'class' => $activity['class'],
- 'expiration' => $activity['expiration']
- );
- C::t('forum_activity')->insert($data);
-
- $setting['showactivity']['tids'][$tid] = $tid;
- $settings = array('mobilewechat' => serialize($setting));
- C::t('common_setting')->update_batch($settings);
- updatecache(array('plugin', 'setting'));
- require_once DISCUZ_ROOT . './source/plugin/wechat/wsq.class.php';
- wsq::report('pubshowactivity');
-
- cpmsg(lang('plugin/wechat', 'show_addthread_succeed'), 'action=plugins&operation=config&do='.$pluginid.'&identifier=wechat&pmod=showactivity_setting', 'succeed');
-
- }
-} elseif($ac == 'export') {
- if(!isset($setting['showactivity']['tids'][$_GET['tid']])) {
- cpmsg(lang('plugin/wechat', 'show_thread_not_found'));
- }
- $thread = get_thread_by_tid($_GET['tid']);
- if(!$thread) {
- cpmsg(lang('plugin/wechat', 'show_thread_not_found'));
- }
- $posttableid = $thread['posttableid'];
- $posts = DB::fetch_all("SELECT * FROM %t WHERE tid=%d", array('forum_debatepost', $_GET['tid']), 'pid');
- foreach(C::t('forum_post')->fetch_all_post($posttableid, array_keys($posts), false) as $post) {
- $array[$posts[$post['pid']]['voters'].'.'.$post['position']] = $post['author'].','.$posts[$post['pid']]['voters'].','.$post['position'];
- }
- ob_end_clean();
- header('Content-Encoding: none');
- header('Content-Type: application/octet-stream');
- header('Content-Disposition: attachment; filename=showactivity_'.$_GET['tid'].'.csv');
- header('Pragma: no-cache');
- header('Expires: 0');
- krsort($array);
- $detail = lang('plugin/wechat', 'show_export_title')."\r\n".implode("\r\n", $array);
- if($_G['charset'] != 'gbk') {
- $detail = diconv($detail, $_G['charset'], 'GBK');
- }
- define('FOOTERDISABLED', true);
- echo $detail;
- exit();
-}
-
-?>
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/spacecp.inc.php b/upload/source/plugin/wechat/spacecp.inc.php
deleted file mode 100644
index e1da2151..00000000
--- a/upload/source/plugin/wechat/spacecp.inc.php
+++ /dev/null
@@ -1,72 +0,0 @@
-update($_G['uid'], array('password' => md5(random(10))));
-
- if($_G['wechat']['setting']['wechat_qrtype']) {
- C::t('#wechat#common_member_wechatmp')->update($_G['uid'], array('status' => 1));
- } else {
- C::t('#wechat#common_member_wechat')->update($_G['uid'], array('isregister' => 0));
- }
-
- showmessage('wechat:wsq_password_reset', dreferer());
-} elseif(submitcheck('unbindsubmit')) {
- require_once libfile('function/member');
- if($_G['wechat']['setting']['wechat_qrtype']) {
- require_once DISCUZ_ROOT . './source/plugin/wechat/wsq.class.php';
- $member = C::t('#wechat#common_member_wechatmp')->fetch($_G['uid']);
- if(!$member || !wsq::userunbind($_G['uid'], $member['openid'])) {
- showmessage('wechat:wechat_message_unbind_fail');
- }
- C::t('#wechat#common_member_wechatmp')->delete($_G['uid']);
- } else {
- C::t('#wechat#common_member_wechat')->delete($_G['uid']);
- require_once DISCUZ_ROOT.'./source/plugin/wechat/wsq.class.php';
- wsq::report('unbind');
- }
-
- clearcookies();
- showmessage('wechat:wechat_message_unbinded', $_G['siteurl']);
-}
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/table/index.htm b/upload/source/plugin/wechat/table/index.htm
deleted file mode 100644
index e69de29b..00000000
diff --git a/upload/source/plugin/wechat/table/table_common_member_wechat.php b/upload/source/plugin/wechat/table/table_common_member_wechat.php
deleted file mode 100644
index e236a58f..00000000
--- a/upload/source/plugin/wechat/table/table_common_member_wechat.php
+++ /dev/null
@@ -1,28 +0,0 @@
-_table = 'common_member_wechat';
- $this->_pk = 'uid';
- $this->_pre_cache_key = 'common_member_wechat_';
-
- parent::__construct();
- }
-
- public function fetch_by_openid($openid) {
- return DB::fetch_first('SELECT * FROM %t WHERE openid=%s', array($this->_table, $openid));
- }
-
-}
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/table/table_common_member_wechatmp.php b/upload/source/plugin/wechat/table/table_common_member_wechatmp.php
deleted file mode 100644
index ffc4152a..00000000
--- a/upload/source/plugin/wechat/table/table_common_member_wechatmp.php
+++ /dev/null
@@ -1,28 +0,0 @@
-_table = 'common_member_wechatmp';
- $this->_pk = 'uid';
- $this->_pre_cache_key = 'common_member_wechatmp_';
-
- parent::__construct();
- }
-
- public function fetch_by_openid($openid) {
- return DB::fetch_all('SELECT * FROM %t WHERE openid=%s', array($this->_table, $openid), 'uid');
- }
-
-}
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/table/table_mobile_wechat_authcode.php b/upload/source/plugin/wechat/table/table_mobile_wechat_authcode.php
deleted file mode 100644
index 4b6c0451..00000000
--- a/upload/source/plugin/wechat/table/table_mobile_wechat_authcode.php
+++ /dev/null
@@ -1,32 +0,0 @@
-_table = 'mobile_wechat_authcode';
- $this->_pk = 'sid';
-
- parent::__construct();
- }
-
- public function fetch_by_code($code) {
- return DB::fetch_first('SELECT * FROM %t WHERE code=%d', array($this->_table, $code));
- }
-
- public function delete_history() {
- $time = TIMESTAMP - 3600;
- return DB::delete($this->_table, "createtime<$time");
- }
-
-}
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/table/table_mobile_wechat_masssend.php b/upload/source/plugin/wechat/table/table_mobile_wechat_masssend.php
deleted file mode 100644
index 3596db32..00000000
--- a/upload/source/plugin/wechat/table/table_mobile_wechat_masssend.php
+++ /dev/null
@@ -1,23 +0,0 @@
-_table = 'mobile_wechat_masssend';
- $this->_pk = 'id';
-
- parent::__construct();
- }
-
-}
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/table/table_mobile_wechat_resource.php b/upload/source/plugin/wechat/table/table_mobile_wechat_resource.php
deleted file mode 100644
index cedf422e..00000000
--- a/upload/source/plugin/wechat/table/table_mobile_wechat_resource.php
+++ /dev/null
@@ -1,81 +0,0 @@
-_table = 'mobile_wechat_resource';
- $this->_pk = 'id';
-
- parent::__construct();
- }
-
- public function insert($data, $return_insert_id = false, $replace = false, $silent = false) {
- if(!is_array($data['data'])) {
- return;
- }
- if(!$data['dateline']) {
- $data['dateline'] = TIMESTAMP;
- }
- $data['data'] = serialize($data['data']);
- return parent::insert($data, $return_insert_id, $replace, $silent);
- }
-
- public function update($val, $data, $unbuffered = false, $low_priority = false) {
- if(isset($data['data']) && is_array($data['data'])) {
- $data['data'] = serialize($data['data']);
- }
- return parent::update($val, $data, $unbuffered , $low_priority);
- }
-
- public function fetch($id, $force_from_db = false){
- $data = parent::fetch($id, $force_from_db);
- if($data) {
- $data['data'] = dunserialize($data['data']);
- return $data;
- } else {
- return array();
- }
- }
-
- public function count_by_type($type = null) {
- $typesql = $type !== null ? "`type`=".intval($type) : 'TRUE';
- return DB::result_first("SELECT COUNT(*) FROM %t WHERE %i", array($this->_table, $typesql));
- }
-
- public function fetch_by_type($type = null, $start = 0, $limit = 20) {
- $typesql = $type !== null ? "`type`=".intval($type) : 'TRUE';
- $datas = DB::fetch_all("SELECT * FROM %t WHERE %i ORDER BY id DESC LIMIT %d,%d", array($this->_table, $typesql, $start, $limit));
- if($datas) {
- foreach($datas as &$data) {
- $data['data'] = dunserialize($data['data']);
- }
- return $datas;
- } else {
- return array();
- }
- }
-
- public function fetch_all($ids, $force_from_db = false) {
- $datas = parent::fetch_all($ids, $force_from_db);
- if($datas) {
- foreach($datas as &$data) {
- $data['data'] = dunserialize($data['data']);
- }
- return $datas;
- } else {
- return array();
- }
- }
-
-}
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/template/extend_module.css b/upload/source/plugin/wechat/template/extend_module.css
deleted file mode 100644
index 95ca3674..00000000
--- a/upload/source/plugin/wechat/template/extend_module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/** forum::forumdisplay,forum::viewthread,group::forumdisplay,group::viewthread **/
- .mobile-type-5 a { background: url(../../source/plugin/wechat/image/wsq.png) no-repeat 0 0; }
-/** end **/
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/template/index.htm b/upload/source/plugin/wechat/template/index.htm
deleted file mode 100644
index e69de29b..00000000
diff --git a/upload/source/plugin/wechat/template/mobile/arrow_top.png b/upload/source/plugin/wechat/template/mobile/arrow_top.png
deleted file mode 100644
index 98c29c78..00000000
Binary files a/upload/source/plugin/wechat/template/mobile/arrow_top.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/template/mobile/common.js b/upload/source/plugin/wechat/template/mobile/common.js
deleted file mode 100644
index 2055ea1f..00000000
--- a/upload/source/plugin/wechat/template/mobile/common.js
+++ /dev/null
@@ -1,976 +0,0 @@
-var supporttouch = "ontouchend" in document;
-!supporttouch && (window.location.href = 'forum.php?mobile=1');
-
-var platform = navigator.platform;
-var ua = navigator.userAgent;
-var ios = /iPhone|iPad|iPod/.test(platform) && ua.indexOf( "AppleWebKit" ) > -1;
-var andriod = ua.indexOf( "Android" ) > -1;
-
-
-(function($, window, document, undefined) {
- var dataPropertyName = "virtualMouseBindings",
- touchTargetPropertyName = "virtualTouchID",
- virtualEventNames = "vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split(" "),
- touchEventProps = "clientX clientY pageX pageY screenX screenY".split( " " ),
- mouseHookProps = $.event.mouseHooks ? $.event.mouseHooks.props : [],
- mouseEventProps = $.event.props.concat( mouseHookProps ),
- activeDocHandlers = {},
- resetTimerID = 0,
- startX = 0,
- startY = 0,
- didScroll = false,
- clickBlockList = [],
- blockMouseTriggers = false,
- blockTouchTriggers = false,
- eventCaptureSupported = "addEventListener" in document,
- $document = $(document),
- nextTouchID = 1,
- lastTouchID = 0, threshold;
- $.vmouse = {
- moveDistanceThreshold: 10,
- clickDistanceThreshold: 10,
- resetTimerDuration: 1500
- };
- function getNativeEvent(event) {
- while( event && typeof event.originalEvent !== "undefined" ) {
- event = event.originalEvent;
- }
- return event;
- }
- function createVirtualEvent(event, eventType) {
- var t = event.type, oe, props, ne, prop, ct, touch, i, j, len;
- event = $.Event(event);
- event.type = eventType;
- oe = event.originalEvent;
- props = $.event.props;
- if(t.search(/^(mouse|click)/) > -1 ) {
- props = mouseEventProps;
- }
- if(oe) {
- for(i = props.length, prop; i;) {
- prop = props[ --i ];
- event[ prop ] = oe[ prop ];
- }
- }
- if(t.search(/mouse(down|up)|click/) > -1 && !event.which) {
- event.which = 1;
- }
- if(t.search(/^touch/) !== -1) {
- ne = getNativeEvent(oe);
- t = ne.touches;
- ct = ne.changedTouches;
- touch = (t && t.length) ? t[0] : (( ct && ct.length) ? ct[0] : undefined);
- if(touch) {
- for(j = 0, len = touchEventProps.length; j < len; j++) {
- prop = touchEventProps[j];
- event[prop] = touch[prop];
- }
- }
- }
- return event;
- }
- function getVirtualBindingFlags(element) {
- var flags = {},
- b, k;
- while(element) {
- b = $.data(element, dataPropertyName);
- for(k in b) {
- if(b[k]) {
- flags[k] = flags.hasVirtualBinding = true;
- }
- }
- element = element.parentNode;
- }
- return flags;
- }
- function getClosestElementWithVirtualBinding(element, eventType) {
- var b;
- while(element) {
- b = $.data( element, dataPropertyName );
- if(b && (!eventType || b[eventType])) {
- return element;
- }
- element = element.parentNode;
- }
- return null;
- }
- function enableTouchBindings() {
- blockTouchTriggers = false;
- }
- function disableTouchBindings() {
- blockTouchTriggers = true;
- }
- function enableMouseBindings() {
- lastTouchID = 0;
- clickBlockList.length = 0;
- blockMouseTriggers = false;
- disableTouchBindings();
- }
- function disableMouseBindings() {
- enableTouchBindings();
- }
- function startResetTimer() {
- clearResetTimer();
- resetTimerID = setTimeout(function() {
- resetTimerID = 0;
- enableMouseBindings();
- }, $.vmouse.resetTimerDuration);
- }
- function clearResetTimer() {
- if(resetTimerID ) {
- clearTimeout(resetTimerID);
- resetTimerID = 0;
- }
- }
- function triggerVirtualEvent(eventType, event, flags) {
- var ve;
- if((flags && flags[eventType]) ||
- (!flags && getClosestElementWithVirtualBinding(event.target, eventType))) {
- ve = createVirtualEvent(event, eventType);
- $(event.target).trigger(ve);
- }
- return ve;
- }
- function mouseEventCallback(event) {
- var touchID = $.data(event.target, touchTargetPropertyName);
- if(!blockMouseTriggers && (!lastTouchID || lastTouchID !== touchID)) {
- var ve = triggerVirtualEvent("v" + event.type, event);
- if(ve) {
- if(ve.isDefaultPrevented()) {
- event.preventDefault();
- }
- if(ve.isPropagationStopped()) {
- event.stopPropagation();
- }
- if(ve.isImmediatePropagationStopped()) {
- event.stopImmediatePropagation();
- }
- }
- }
- }
- function handleTouchStart(event) {
- var touches = getNativeEvent(event).touches,
- target, flags;
- if(touches && touches.length === 1) {
- target = event.target;
- flags = getVirtualBindingFlags(target);
- if(flags.hasVirtualBinding) {
- lastTouchID = nextTouchID++;
- $.data(target, touchTargetPropertyName, lastTouchID);
- clearResetTimer();
- disableMouseBindings();
- didScroll = false;
- var t = getNativeEvent(event).touches[0];
- startX = t.pageX;
- startY = t.pageY;
- triggerVirtualEvent("vmouseover", event, flags);
- triggerVirtualEvent("vmousedown", event, flags);
- }
- }
- }
- function handleScroll(event) {
- if(blockTouchTriggers) {
- return;
- }
- if(!didScroll) {
- triggerVirtualEvent("vmousecancel", event, getVirtualBindingFlags(event.target));
- }
- didScroll = true;
- startResetTimer();
- }
- function handleTouchMove(event) {
- if(blockTouchTriggers) {
- return;
- }
- var t = getNativeEvent(event).touches[0],
- didCancel = didScroll,
- moveThreshold = $.vmouse.moveDistanceThreshold,
- flags = getVirtualBindingFlags(event.target);
- didScroll = didScroll ||
- (Math.abs(t.pageX - startX) > moveThreshold ||
- Math.abs(t.pageY - startY) > moveThreshold);
- if(didScroll && !didCancel) {
- triggerVirtualEvent("vmousecancel", event, flags);
- }
- triggerVirtualEvent("vmousemove", event, flags);
- startResetTimer();
- }
- function handleTouchEnd(event) {
- if(blockTouchTriggers) {
- return;
- }
- disableTouchBindings();
- var flags = getVirtualBindingFlags(event.target), t;
- triggerVirtualEvent("vmouseup", event, flags);
- if(!didScroll) {
- var ve = triggerVirtualEvent("vclick", event, flags);
- if(ve && ve.isDefaultPrevented()) {
- t = getNativeEvent(event).changedTouches[0];
- clickBlockList.push({
- touchID: lastTouchID,
- x: t.clientX,
- y: t.clientY
- });
- blockMouseTriggers = true;
- }
- }
- triggerVirtualEvent("vmouseout", event, flags);
- didScroll = false;
- startResetTimer();
- }
- function hasVirtualBindings(ele) {
- var bindings = $.data( ele, dataPropertyName ), k;
- if(bindings) {
- for(k in bindings) {
- if(bindings[k]) {
- return true;
- }
- }
- }
- return false;
- }
- function dummyMouseHandler() {}
-
- function getSpecialEventObject(eventType) {
- var realType = eventType.substr(1);
- return {
- setup: function(data, namespace) {
- if(!hasVirtualBindings(this)) {
- $.data(this, dataPropertyName, {});
- }
- var bindings = $.data(this, dataPropertyName);
- bindings[eventType] = true;
- activeDocHandlers[eventType] = (activeDocHandlers[eventType] || 0) + 1;
- if(activeDocHandlers[eventType] === 1) {
- $document.bind(realType, mouseEventCallback);
- }
- $(this).bind(realType, dummyMouseHandler);
- if(eventCaptureSupported) {
- activeDocHandlers["touchstart"] = (activeDocHandlers["touchstart"] || 0) + 1;
- if(activeDocHandlers["touchstart"] === 1) {
- $document.bind("touchstart", handleTouchStart)
- .bind("touchend", handleTouchEnd)
- .bind("touchmove", handleTouchMove)
- .bind("scroll", handleScroll);
- }
- }
- },
- teardown: function(data, namespace) {
- --activeDocHandlers[eventType];
- if(!activeDocHandlers[eventType]) {
- $document.unbind(realType, mouseEventCallback);
- }
- if(eventCaptureSupported) {
- --activeDocHandlers["touchstart"];
- if(!activeDocHandlers["touchstart"]) {
- $document.unbind("touchstart", handleTouchStart)
- .unbind("touchmove", handleTouchMove)
- .unbind("touchend", handleTouchEnd)
- .unbind("scroll", handleScroll);
- }
- }
- var $this = $(this),
- bindings = $.data(this, dataPropertyName);
- if(bindings) {
- bindings[eventType] = false;
- }
- $this.unbind(realType, dummyMouseHandler);
- if(!hasVirtualBindings(this)) {
- $this.removeData(dataPropertyName);
- }
- }
- };
- }
- for(var i = 0; i < virtualEventNames.length; i++) {
- $.event.special[virtualEventNames[i]] = getSpecialEventObject(virtualEventNames[i]);
- }
- if(eventCaptureSupported) {
- document.addEventListener("click", function(e) {
- var cnt = clickBlockList.length,
- target = e.target,
- x, y, ele, i, o, touchID;
- if(cnt) {
- x = e.clientX;
- y = e.clientY;
- threshold = $.vmouse.clickDistanceThreshold;
- ele = target;
- while(ele) {
- for(i = 0; i < cnt; i++) {
- o = clickBlockList[i];
- touchID = 0;
- if((ele === target && Math.abs(o.x - x) < threshold && Math.abs(o.y - y) < threshold) ||
- $.data(ele, touchTargetPropertyName) === o.touchID) {
- e.preventDefault();
- e.stopPropagation();
- return;
- }
- }
- ele = ele.parentNode;
- }
- }
- }, true);
- }
-})(jQuery, window, document);
-
-(function($, window, undefined) {
- function triggercustomevent(obj, eventtype, event) {
- var origtype = event.type;
- event.type = eventtype;
- $.event.handle.call(obj, event);
- event.type = origtype;
- }
-
- $.event.special.tap = {
- setup : function() {
- var thisobj = this;
- var obj = $(thisobj);
- obj.on('vmousedown', function(e) {
- if(e.which && e.which !== 1) {
- return false;
- }
- var origtarget = e.target;
- var origevent = e.originalEvent;
- var timer;
-
- function cleartaptimer() {
- clearTimeout(timer);
- }
- function cleartaphandlers() {
- cleartaptimer();
- obj.off('vclick', clickhandler)
- .off('vmouseup', cleartaptimer);
- $(document).off('vmousecancel', cleartaphandlers);
- }
-
- function clickhandler(e) {
- cleartaphandlers();
- if(origtarget === e.target) {
- triggercustomevent(thisobj, 'tap', e);
- }
- return false;
- }
-
- obj.on('vmouseup', cleartaptimer)
- .on('vclick', clickhandler)
- $(document).on('touchcancel', cleartaphandlers);
-
- timer = setTimeout(function() {
- triggercustomevent(thisobj, 'taphold', $.Event('taphold', {target:origtarget}));
- }, 750);
- return false;
- });
- }
- };
- $.each(('tap').split(' '), function(index, name) {
- $.fn[name] = function(fn) {
- return this.on(name, fn);
- };
- });
-
-})(jQuery, this);
-
-var page = {
- converthtml : function() {
- var prevpage = $('div.pg .prev').prop('href');
- var nextpage = $('div.pg .nxt').prop('href');
- var lastpage = $('div.pg label span').text().replace(/[^\d]/g, '') || 0;
- var curpage = $('div.pg input').val() || 1;
-
- if(!lastpage) {
- prevpage = $('div.pg .pgb a').prop('href');
- }
-
- var prevpagehref = nextpagehref = '';
- if(prevpage == undefined) {
- prevpagehref = 'javascript:;" class="grey';
- } else {
- prevpagehref = prevpage;
- }
- if(nextpage == undefined) {
- nextpagehref = 'javascript:;" class="grey';
- } else {
- nextpagehref = nextpage;
- }
-
- var selector = '';
- if(lastpage) {
- selector += '';
- selector += '';
- for(var i=1; i<=lastpage; i++) {
- selector += '第'+i+'页 ';
- }
- selector += ' ';
- selector += '第'+curpage+'页 ';
- }
-
- $('div.pg').removeClass('pg').addClass('page').html(' 上一页 '+ selector +'下一页 ');
- $('#dumppage').on('change', function() {
- var href = (prevpage || nextpage);
- window.location.href = href.replace(/page=\d+/, 'page=' + $(this).val());
- });
- },
-};
-
-var scrolltop = {
- obj : null,
- init : function(obj) {
- scrolltop.obj = obj;
- var fixed = this.isfixed();
- obj.css('opacity', '.618');
- if(fixed) {
- obj.css('bottom', '8px');
- } else {
- obj.css({'visibility':'visible', 'position':'absolute'});
- }
- $(window).on('resize', function() {
- if(fixed) {
- obj.css('bottom', '8px');
- } else {
- obj.css('top', ($(document).scrollTop() + $(window).height() - 40) + 'px');
- }
- });
- obj.on('tap', function() {
- $(document).scrollTop($(document).height());
- });
- $(document).on('scroll', function() {
- if(!fixed) {
- obj.css('top', ($(document).scrollTop() + $(window).height() - 40) + 'px');
- }
- if($(document).scrollTop() >= 400) {
- obj.removeClass('bottom')
- .off().on('tap', function() {
- window.scrollTo('0', '1');
- });
- } else {
- obj.addClass('bottom')
- .off().on('tap', function() {
- $(document).scrollTop($(document).height());
- });
- }
- });
-
- },
- isfixed : function() {
- var offset = scrolltop.obj.offset();
- var scrollTop = $(window).scrollTop();
- var screenHeight = document.documentElement.clientHeight;
- if(offset == undefined) {
- return false;
- }
- if(offset.top < scrollTop || (offset.top - scrollTop) > screenHeight) {
- return false;
- } else {
- return true;
- }
- }
-};
-
-var img = {
- init : function(is_err_t) {
- var errhandle = this.errorhandle;
- $('img').on('load', function() {
- var obj = $(this);
- obj.attr('zsrc', obj.attr('src'));
- if(obj.width() < 5 && obj.height() < 10 && obj.css('display') != 'none') {
- return errhandle(obj, is_err_t);
- }
- obj.css('display', 'inline');
- obj.css('visibility', 'visible');
- if(obj.width() > window.innerWidth) {
- obj.css('width', window.innerWidth);
- }
- obj.parent().find('.loading').remove();
- obj.parent().find('.error_text').remove();
- })
- .on('error', function() {
- var obj = $(this);
- obj.attr('zsrc', obj.attr('src'));
- errhandle(obj, is_err_t);
- });
- },
- errorhandle : function(obj, is_err_t) {
- if(obj.attr('noerror') == 'true') {
- return;
- }
- obj.css('visibility', 'hidden');
- obj.css('display', 'none');
- var parentnode = obj.parent();
- parentnode.find('.loading').remove();
- parentnode.append('
');
- var loadnums = parseInt(obj.attr('load')) || 0;
- if(loadnums < 3) {
- obj.attr('src', obj.attr('zsrc'));
- obj.attr('load', ++loadnums);
- return false;
- }
- if(is_err_t) {
- var parentnode = obj.parent();
- parentnode.find('.loading').remove();
- parentnode.append('点击重新加载
');
- parentnode.find('.error_text').one('click', function() {
- obj.attr('load', 0).find('.error_text').remove();
- parentnode.append('
');
- obj.attr('src', obj.attr('zsrc'));
- });
- }
- return false;
- }
-};
-
-var atap = {
- init : function() {
- $('.atap').on('tap', function() {
- var obj = $(this);
- obj.css({'background':'#6FACD5', 'color':'#FFFFFF', 'font-weight':'bold', 'text-decoration':'none', 'text-shadow':'0 1px 1px #3373A5'});
- return false;
- });
- $('.atap a').off('click');
- }
-};
-
-
-var POPMENU = new Object;
-var popup = {
- init : function() {
- var $this = this;
- $('.popup').each(function(index, obj) {
- obj = $(obj);
- var pop = $(obj.attr('href'));
- if(pop && pop.attr('popup')) {
- pop.css({'display':'none'});
- obj.on('click', function(e) {
- $this.open(pop);
- });
- }
- });
- this.maskinit();
- },
- maskinit : function() {
- var $this = this;
- $('#mask').off().on('tap', function() {
- $this.close();
- });
- },
-
- open : function(pop, type, url) {
- this.close();
- this.maskinit();
- if(typeof pop == 'string') {
- $('#ntcmsg').remove();
- if(type == 'alert') {
- pop = '
'+ pop +' '+ pop +'
');
- pop = $('#ntcmsg');
- }
- if(POPMENU[pop.attr('id')]) {
- $('#' + pop.attr('id') + '_popmenu').html(pop.html()).css({'height':pop.height()+'px', 'width':pop.width()+'px'});
- } else {
- pop.parent().append('');
- }
- var popupobj = $('#' + pop.attr('id') + '_popmenu');
- var left = (window.innerWidth - popupobj.width()) / 2;
- var top = (document.documentElement.clientHeight - popupobj.height()) / 2;
- popupobj.css({'display':'block','position':'fixed','left':left,'top':top,'z-index':120,'opacity':1});
- $('#mask').css({'display':'block','width':'100%','height':'100%','position':'fixed','top':'0','left':'0','background':'black','opacity':'0.2','z-index':'100'});
- POPMENU[pop.attr('id')] = pop;
- },
- close : function() {
- $('#mask').css('display', 'none');
- $.each(POPMENU, function(index, obj) {
- $('#' + index + '_popmenu').css('display','none');
- });
- }
-};
-
-var dialog = {
- init : function() {
- $(document).on('click', '.dialog', function() {
- var obj = $(this);
- popup.open('请稍后 ...');
- $.ajax({
- type : 'GET',
- url : obj.attr('href') + '&inajax=1',
- dataType : 'xml'
- })
- .success(function(s) {
- popup.open(s.lastChild.firstChild.nodeValue);
- evalscript(s.lastChild.firstChild.nodeValue);
- })
- .error(function() {
- window.location.href = obj.attr('href');
- popup.close();
- });
- return false;
- });
- },
-
-};
-
-var formdialog = {
- init : function() {
- $(document).on('click', '.formdialog', function() {
- popup.open('请稍后 ...');
- var obj = $(this);
- var formobj = $(this.form);
- $.ajax({
- type:'POST',
- url:formobj.attr('action') + '&handlekey='+ formobj.attr('id') +'&inajax=1',
- data:formobj.serialize(),
- dataType:'xml'
- })
- .success(function(s) {
- popup.open(s.lastChild.firstChild.nodeValue);
- evalscript(s.lastChild.firstChild.nodeValue);
- })
- .error(function() {
- window.location.href = obj.attr('href');
- popup.close();
- });
- return false;
- });
- }
-};
-
-var redirect = {
- init : function() {
- $(document).on('click', '.redirect', function() {
- var obj = $(this);
- popup.close();
- window.location.href = obj.attr('href');
- });
- }
-};
-
-var DISMENU = new Object;
-var display = {
- init : function() {
- var $this = this;
- $('.display').each(function(index, obj) {
- obj = $(obj);
- var dis = $(obj.attr('href'));
- if(dis && dis.attr('display')) {
- dis.css({'display':'none'});
- dis.css({'z-index':'102'});
- DISMENU[dis.attr('id')] = dis;
- obj.on('click', function(e) {
- if(in_array(e.target.tagName, ['A', 'IMG', 'INPUT'])) return;
- $this.maskinit();
- if(dis.attr('display') == 'true') {
- dis.css('display', 'block');
- dis.attr('display', 'false');
- $('#mask').css({'display':'block','width':'100%','height':'100%','position':'fixed','top':'0','left':'0','background':'transparent','z-index':'100'});
- }
- return false;
- });
- }
- });
- },
- maskinit : function() {
- var $this = this;
- $('#mask').off().on('touchstart', function() {
- $this.hide();
- });
- },
- hide : function() {
- $('#mask').css('display', 'none');
- $.each(DISMENU, function(index, obj) {
- obj.css('display', 'none');
- obj.attr('display', 'true');
- });
- }
-};
-
-var geo = {
- latitude : null,
- longitude : null,
- loc : null,
- errmsg : null,
- timeout : 5000,
- getcurrentposition : function() {
- if(!!navigator.geolocation) {
- navigator.geolocation.getCurrentPosition(this.locationsuccess, this.locationerror, {
- enableHighAcuracy : true,
- timeout : this.timeout,
- maximumAge : 3000
- });
- }
- },
- locationerror : function(error) {
- geo.errmsg = 'error';
- switch(error.code) {
- case error.TIMEOUT:
- geo.errmsg = "获取位置超时，请重试";
- break;
- case error.POSITION_UNAVAILABLE:
- geo.errmsg = '无法检测到您的当前位置';
- break;
- case error.PERMISSION_DENIED:
- geo.errmsg = '请允许能够正常访问您的当前位置';
- break;
- case error.UNKNOWN_ERROR:
- geo.errmsg = '发生未知错误';
- break;
- }
- },
- locationsuccess : function(position) {
- geo.latitude = position.coords.latitude;
- geo.longitude = position.coords.longitude;
- geo.errmsg = '';
- $.ajax({
- type:'POST',
- url:'http://maps.google.com/maps/api/geocode/json?latlng=' + geo.latitude + ',' + geo.longitude + '&language=zh-CN&sensor=true',
- dataType:'json'
- })
- .success(function(s) {
- if(s.status == 'OK') {
- geo.loc = s.results[0].formatted_address;
- }
- })
- .error(function() {
- geo.loc = null;
- });
- }
-};
-
-var pullrefresh = {
- init : function() {
- var pos = {};
- var status = false;
- var divobj = null;
- var contentobj = null;
- var reloadflag = false;
- $('body').on('touchstart', function(e) {
- e = mygetnativeevent(e);
- pos.startx = e.touches[0].pageX;
- pos.starty = e.touches[0].pageY;
- })
- .on('touchmove', function(e) {
- e = mygetnativeevent(e);
- pos.curposx = e.touches[0].pageX;
- pos.curposy = e.touches[0].pageY;
- if(pos.curposy - pos.starty < 0 && !status) {
- return;
- }
- if(!status && $(window).scrollTop() <= 0) {
- status = true;
- divobj = document.createElement('div');
- divobj = $(divobj);
- divobj.css({'position':'relative', 'margin-left':'-85px'});
- $('body').prepend(divobj);
- contentobj = document.createElement('div');
- contentobj = $(contentobj);
- contentobj.css({'position':'absolute', 'height':'30px', 'top': '-30px', 'left':'50%'});
- contentobj.html('下拉可以刷新 ');
- contentobj.find('img').css({'-webkit-transition':'all 0.5s ease-in-out'});
- divobj.prepend(contentobj);
- pos.topx = pos.curposx;
- pos.topy = pos.curposy;
- }
- if(!status) {
- return;
- }
- if(status == true) {
- var pullheight = pos.curposy - pos.topy;
- if(pullheight >= 0 && pullheight < 150) {
- divobj.css({'height': pullheight/2 + 'px'});
- contentobj.css({'top': (-30 + pullheight/2) + 'px'});
- if(reloadflag) {
- contentobj.find('img').css({'-webkit-transform':'rotate(180deg)', '-moz-transform':'rotate(180deg)', '-o-transform':'rotate(180deg)', 'transform':'rotate(180deg)'});
- contentobj.find('#refreshtxt').html('下拉可以刷新');
- }
- reloadflag = false;
- } else if(pullheight >= 150) {
- divobj.css({'height':pullheight/2 + 'px'});
- contentobj.css({'top': (-30 + pullheight/2) + 'px'});
- if(!reloadflag) {
- contentobj.find('img').css({'-webkit-transform':'rotate(360deg)', '-moz-transform':'rotate(360deg)', '-o-transform':'rotate(360deg)', 'transform':'rotate(360deg)'});
- contentobj.find('#refreshtxt').html('松开可以刷新');
- }
- reloadflag = true;
- }
- }
- e.preventDefault();
- })
- .on('touchend', function(e) {
- if(status == true) {
- if(reloadflag) {
- contentobj.html(']*?>([^\x00]*?)<\/script>/ig;
- var arr = [];
- while(arr = p.exec(s)) {
- var p1 = /]*?src=\"([^\>]*?)\"[^\>]*?(reload=\"1\")?(?:charset=\"([\w\-]+?)\")?><\/script>/i;
- var arr1 = [];
- arr1 = p1.exec(arr[0]);
- if(arr1) {
- appendscript(arr1[1], '', arr1[2], arr1[3]);
- } else {
- p1 = /([^\x00]+?)<\/script>/i;
- arr1 = p1.exec(arr[0]);
- appendscript('', arr1[2], arr1[1].indexOf('reload=') != -1);
- }
- }
- return s;
-}
-
-var safescripts = {}, evalscripts = [];
-
-function appendscript(src, text, reload, charset) {
- var id = hash(src + text);
- if(!reload && in_array(id, evalscripts)) return;
- if(reload && $('#' + id)[0]) {
- $('#' + id)[0].parentNode.removeChild($('#' + id)[0]);
- }
-
- evalscripts.push(id);
- var scriptNode = document.createElement("script");
- scriptNode.type = "text/javascript";
- scriptNode.id = id;
- scriptNode.charset = charset ? charset : (!document.charset ? document.characterSet : document.charset);
- try {
- if(src) {
- scriptNode.src = src;
- scriptNode.onloadDone = false;
- scriptNode.onload = function () {
- scriptNode.onloadDone = true;
- JSLOADED[src] = 1;
- };
- scriptNode.onreadystatechange = function () {
- if((scriptNode.readyState == 'loaded' || scriptNode.readyState == 'complete') && !scriptNode.onloadDone) {
- scriptNode.onloadDone = true;
- JSLOADED[src] = 1;
- }
- };
- } else if(text){
- scriptNode.text = text;
- }
- document.getElementsByTagName('head')[0].appendChild(scriptNode);
- } catch(e) {}
-}
-
-function hash(string, length) {
- var length = length ? length : 32;
- var start = 0;
- var i = 0;
- var result = '';
- filllen = length - string.length % length;
- for(i = 0; i < filllen; i++){
- string += "0";
- }
- while(start < string.length) {
- result = stringxor(result, string.substr(start, length));
- start += length;
- }
- return result;
-}
-
-function stringxor(s1, s2) {
- var s = '';
- var hash = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
- var max = Math.max(s1.length, s2.length);
- for(var i=0; i cookie_start ? cookie_end : document.cookie.length));
- return !nounescape ? unescape(v) : v;
- }
-}
-
-$(document).ready(function() {
-
- if($('div.pg').length > 0) {
- page.converthtml();
- }
- if($('.scrolltop').length > 0) {
- scrolltop.init($('.scrolltop'));
- }
- if($('img').length > 0) {
- img.init(1);
- }
- if($('.popup').length > 0) {
- popup.init();
- }
- if($('.display').length > 0) {
- display.init();
- }
- if($('.atap').length > 0) {
- atap.init();
- }
- if($('.pullrefresh').length > 0) {
- pullrefresh.init();
- }
- dialog.init();
- formdialog.init();
- redirect.init();
-});
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/template/mobile/icon_arrow.png b/upload/source/plugin/wechat/template/mobile/icon_arrow.png
deleted file mode 100644
index cbd26938..00000000
Binary files a/upload/source/plugin/wechat/template/mobile/icon_arrow.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/template/mobile/icon_close.png b/upload/source/plugin/wechat/template/mobile/icon_close.png
deleted file mode 100644
index 1f739104..00000000
Binary files a/upload/source/plugin/wechat/template/mobile/icon_close.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/template/mobile/index.htm b/upload/source/plugin/wechat/template/mobile/index.htm
deleted file mode 100644
index e69de29b..00000000
diff --git a/upload/source/plugin/wechat/template/mobile/jquery-1.8.3.min.js b/upload/source/plugin/wechat/template/mobile/jquery-1.8.3.min.js
deleted file mode 100644
index 83589daa..00000000
--- a/upload/source/plugin/wechat/template/mobile/jquery-1.8.3.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v1.8.3 jquery.com | jquery.org/license */
-(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write(""),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;ta
",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;ti.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="
",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="
",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r
",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="0)for(i=r;i=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/"," "],legend:[1,""," "],thead:[1,""],tr:[2,""],td:[3,""],col:[2,""],area:[1,""," "],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X","
"]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1>");try{for(;r1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]===""&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r
-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window);
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/template/mobile/login.png b/upload/source/plugin/wechat/template/mobile/login.png
deleted file mode 100644
index 62bd99f5..00000000
Binary files a/upload/source/plugin/wechat/template/mobile/login.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/template/mobile/login_on.png b/upload/source/plugin/wechat/template/mobile/login_on.png
deleted file mode 100644
index 4ad1d488..00000000
Binary files a/upload/source/plugin/wechat/template/mobile/login_on.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/template/mobile/pic_bg.jpg b/upload/source/plugin/wechat/template/mobile/pic_bg.jpg
deleted file mode 100644
index ad65c41f..00000000
Binary files a/upload/source/plugin/wechat/template/mobile/pic_bg.jpg and /dev/null differ
diff --git a/upload/source/plugin/wechat/template/mobile/qqlogin.png b/upload/source/plugin/wechat/template/mobile/qqlogin.png
deleted file mode 100644
index 6254d517..00000000
Binary files a/upload/source/plugin/wechat/template/mobile/qqlogin.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/template/mobile/qqlogin_on.png b/upload/source/plugin/wechat/template/mobile/qqlogin_on.png
deleted file mode 100644
index e9b3d64b..00000000
Binary files a/upload/source/plugin/wechat/template/mobile/qqlogin_on.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/template/mobile/qqlogintext.png b/upload/source/plugin/wechat/template/mobile/qqlogintext.png
deleted file mode 100644
index 1a8b5e91..00000000
Binary files a/upload/source/plugin/wechat/template/mobile/qqlogintext.png and /dev/null differ
diff --git a/upload/source/plugin/wechat/template/mobile/style.css b/upload/source/plugin/wechat/template/mobile/style.css
deleted file mode 100644
index f7385325..00000000
--- a/upload/source/plugin/wechat/template/mobile/style.css
+++ /dev/null
@@ -1,92 +0,0 @@
-@charset "utf-8";
-
-/* common */
- * { word-wrap: break-word; }
- ul,ol,li,span,p,form,h1,h2,h3,4,h5,h6,dl,dt,dd { margin: 0; padding: 0; border: 0; z-index:inherit; }
- img,a img { border:0; margin:0; padding:0; }
- ul,ol,li { list-style:none; }
- * { margin:0; padding:0; }
- html,body { height:100%; font:12px/1.6 Microsoft YaHei, Helvetica, sans-serif; color:#4C4C4C; }
- input,select,textarea,button { font:14px/1.5 Microsoft YaHei, Helvetica, sans-serif; }
- body, ul, ol, li, dl, dd, p, h1, h2, h3, h4, h5, h6, form, fieldset, .pr, .pc { margin: 0; padding: 0; }
- table { empty-cells: show; border-collapse: collapse; }
- caption, th { text-align: left; font-weight: 400; }
- ul li, .xl li { list-style: none; }
- h1, h2, h3, h4, h5, h6 { font-size: 1em; }
- em, cite, i { font-style: normal; }
- a img { border: none; }
- label { cursor: pointer; }
- .bg { background: url(pic_bg.jpg); }
- .rq { color: red; }
-
- a:link,a:visited,a:hover { color:#4C4C4C; text-decoration:none; }
- .blue { color: #0086CE; }
- a.blue:link, a.blue:visited, a.blue:hover { color:#0086CE; text-decoration:none; }
- .grey { color:#9C9C9C; }
- a.grey:link, a.grey:visited, a.grey:hover { color:#9C9C9C; text-decoration:none; }
- .orange { color:#F60; }
- a.orange:link,a.orange:visited,a.orange:hover{color:#F60;text-decoration:none }
-
- .z { float: left; } .y { float: right; }
- .cl:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } .cl { zoom: 1; }
- .overflow{overflow:hidden;}
- .none { display:none; }
- .vm { vertical-align: middle; }
- .vm * { vertical-align: middle; }
- .hm { text-align: center; }
-
- .bl_none { border-bottom:0 !important; }
- .bl_line { border-bottom:1px solid #DDD; }
- .b_radius {border-radius:10px;}
-
- .b_m { margin:10px;}
- .b_p { padding:10px}
-
- .mtn { margin-top: 5px !important; }
- .mbn { margin-bottom: 5px !important; }
- .mtm { margin-top: 10px !important; }
- .mbm { margin-bottom: 10px !important; }
- .mtw { margin-top: 20px !important; }
- .mbw { margin-bottom: 20px !important; }
-
- .pr, .pc { vertical-align: middle; margin: 0 5px 1px 0; padding: 0;+margin-right: 2px;_margin-right: 2px; }
-
-/*----- pop -----*/
- .dialogbox { background: url(pic_bg.jpg) }
-
-/*----- login & register -----*/
- .loginbox { padding:10px;}
- .login_from { background:#FFF; border-radius:10px; border:1px solid #DDD; margin-bottom:15px; }
- .login_from li { border-bottom:1px solid #DDD; line-height:45px; padding:0 10px; color:#AFAFAF; font-size:14px; }
- .btn_login .pn,.btn_register .pn { background: url(login.png) no-repeat; width:289px; height:45px; display:block; line-height:46px; overflow:hidden; margin:0 auto; color:#FFF; font-size:16px; font-weight:700; text-align:center;border:0; }
- .btn_login .pn:hover,.btn_register .pn:hover { background: url(login_on.png) no-repeat; color:#F0EFEF; }
- .btn_qqlogin a { background: url(qqlogin.png) no-repeat; width:300px; height:45px; display:block; line-height:2000px; overflow:hidden; margin:0 auto; }
- .btn_qqlogin a:hover { background: url(qqlogin_on.png) no-repeat; }
- .loginbox p { line-height:35px; font-size:14px; color:#AFAFAF;}
- .reg_link a { background: url(icon_arrow.png) no-repeat 100% center; padding-right:10px; color:#AFAFAF; }
- .px{ border:1px solid #ddd; padding: 2px 4px; line-height: 17px; font-size:15px; }
- .px:focus { color:#4C4C4C;}
- .p_fre { width: auto !important; }
- .sel_list { width:100%;border: 0; padding: 2px 4px; font-size:14px; font-weight:700; }
- .login_select { display: block; position: relative;}
- .login_select .login-btn-inner { display: block; font-size: 14px; font-weight:700; min-width: 0.75em; overflow: hidden; position: relative; text-overflow: ellipsis; white-space: nowrap; }
- .login_select select { position: absolute; top: 0; width: 100%; z-index: 2; cursor: pointer; height: 3em; left: 0; max-height: 100%; min-height: 100%; opacity: 0.0001;}
- .login-btn-text { float:left; }
- .login_select .icon-arrow { background: url(icon_arrow.png) no-repeat 15px 17px; width:30px; height:30px; float:right; }
-
- .login_pop { background:#F1F1F1; padding: 0 14px 20px; }
- .log_tit { text-align:center; font-size:16px; font-weight:700; line-height:45px; }
- .icon_close { background: url(icon_close.png) no-repeat 0 0; width:13px; height:11px; overflow:hidden; display:block; margin-top:17px; }
- .btn_qqlogintext { margin:10px 0; }
- .btn_qqlogintext a.text_qqlogin { background: url(qqlogintext.png) no-repeat; width:120px; height:25px; display:block; line-height:2000px; overflow:hidden; }
- .login_pop .login_from { margin-bottom: 10px; }
- .login_pop .login_check { margin:0 0 10px 0; color:#A5A5A5; }
- .q_reg a { color:#A5A5A5; font-size:14px; }
- .s_code { color:#A5A5A5; }
- .s_code .px { color:#A5A5A5; }
- .s_code .px:focus { color:#4C4C4C; }
- a.other_c { color:#A5A5A5; margin-left:5px; }
-
-/*----- footer -----*/
- .footer { text-align:center; line-height:2em; color:#A5A5A5; padding:10px 0 0 0; }
- .footer a { margin:0 6px; color:#A5A5A5; }
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/template/mobile/wechat_bind.htm b/upload/source/plugin/wechat/template/mobile/wechat_bind.htm
deleted file mode 100644
index 82c4d6f9..00000000
--- a/upload/source/plugin/wechat/template/mobile/wechat_bind.htm
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/upload/source/plugin/wechat/template/mobile/wechat_bind_confirm.htm b/upload/source/plugin/wechat/template/mobile/wechat_bind_confirm.htm
deleted file mode 100644
index d65f1b1e..00000000
--- a/upload/source/plugin/wechat/template/mobile/wechat_bind_confirm.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- {lang wechat:wechat_qrcode_input_cancel}
-
- {lang wechat:wechat_qrcode_input_confirm}
-
{lang wechat:wechat_qrcode_input_confirm_yes}
-
{lang cancel}
-
-
-
-
{$_G['Plang'][lang_wechat_logintip]}
-
|
-
-
-
{$_G[wechat][setting][wechat_float_text]}{lang wechat:wsq_indexqr}
-
{lang wechat:wechat_register}
-
-
-{eval
-}
-
-function wechatshowactivity_tpl_voters($post) {
-global $_G;
-}
-
- | {lang wechat:show_scanqr}
- {lang wechat:resource_push}
-
-
-{eval
-}
-
-}
\ No newline at end of file
diff --git a/upload/source/plugin/wechat/template/spacecp.htm b/upload/source/plugin/wechat/template/spacecp.htm
deleted file mode 100644
index bbfaf59d..00000000
--- a/upload/source/plugin/wechat/template/spacecp.htm
+++ /dev/null
@@ -1,55 +0,0 @@
-{lang wechat:wechat_spacecp_bind_title}
-
-
- {lang wechat:wechat_qrcode_input_cancel}
-
- {lang wechat:wechat_qrcode_input_confirm}
-
{lang wechat:wechat_qrcode_input_confirm_yes}
-
{lang cancel}
-
-
{title}
\r\n[/loop]\r\n
{title}({starttime})
下拉可以刷新');
- contentobj.find('img').css({'-webkit-transition':'all 0.5s ease-in-out'});
- divobj.prepend(contentobj);
- pos.topx = pos.curposx;
- pos.topy = pos.curposy;
- }
- if(!status) {
- return;
- }
- if(status == true) {
- var pullheight = pos.curposy - pos.topy;
- if(pullheight >= 0 && pullheight < 150) {
- divobj.css({'height': pullheight/2 + 'px'});
- contentobj.css({'top': (-30 + pullheight/2) + 'px'});
- if(reloadflag) {
- contentobj.find('img').css({'-webkit-transform':'rotate(180deg)', '-moz-transform':'rotate(180deg)', '-o-transform':'rotate(180deg)', 'transform':'rotate(180deg)'});
- contentobj.find('#refreshtxt').html('下拉可以刷新');
- }
- reloadflag = false;
- } else if(pullheight >= 150) {
- divobj.css({'height':pullheight/2 + 'px'});
- contentobj.css({'top': (-30 + pullheight/2) + 'px'});
- if(!reloadflag) {
- contentobj.find('img').css({'-webkit-transform':'rotate(360deg)', '-moz-transform':'rotate(360deg)', '-o-transform':'rotate(360deg)', 'transform':'rotate(360deg)'});
- contentobj.find('#refreshtxt').html('松开可以刷新');
- }
- reloadflag = true;
- }
- }
- e.preventDefault();
- })
- .on('touchend', function(e) {
- if(status == true) {
- if(reloadflag) {
- contentobj.html('
正在加载...');
- contentobj.animate({'top': (-30 + 75) + 'px'}, 618, 'linear');
- divobj.animate({'height': '75px'}, 618, 'linear', function() {
- window.location.reload();
- });
- return;
- }
- }
- divobj.remove();
- divobj = null;
- status = false;
- pos = {};
- });
- }
-};
-
-function mygetnativeevent(event) {
-
- while(event && typeof event.originalEvent !== "undefined") {
- event = event.originalEvent;
- }
- return event;
-}
-
-function evalscript(s) {
- if(s.indexOf(' ? $stylestuff['imgdir']['subst'].'/logo_m.svg' : (preg_match('/^(https?:)?\/\//i', $stylestuff['boardimg']['subst']) || file_exists($stylestuff['boardimg']['subst']) ? '' : (file_exists($stylestuff['styleimgdir']['subst'].'/'.$stylestuff['boardimg']['subst']) ? $stylestuff['styleimgdir']['subst'].'/' : $stylestuff['imgdir']['subst'].'/')).$stylestuff['boardimg']['subst']).'){kind=logo}
';
+ $searchimghtml = ' ? $stylestuff['imgdir']['subst'].'/logo_m.svg' : (preg_match('/^(https?:)?\/\//i', $stylestuff['searchimg']['subst']) || file_exists($stylestuff['searchimg']['subst']) ? '' : (file_exists($stylestuff['styleimgdir']['subst'].'/'.$stylestuff['searchimg']['subst']) ? $stylestuff['styleimgdir']['subst'].'/' : $stylestuff['imgdir']['subst'].'/')).$stylestuff['searchimg']['subst']).'){kind=logo}
';
+ $touchimghtml = ' ? $stylestuff['imgdir']['subst'].'/logo_m.svg' : (preg_match('/^(https?:)?\/\//i', $stylestuff['touchimg']['subst']) || file_exists($stylestuff['touchimg']['subst']) ? '' : (file_exists($stylestuff['styleimgdir']['subst'].'/'.$stylestuff['touchimg']['subst']) ? $stylestuff['styleimgdir']['subst'].'/' : $stylestuff['imgdir']['subst'].'/')).$stylestuff['touchimg']['subst']).'){kind=logo}
';
+ showsetting('styles_edit_logo', "stylevar[{$stylestuff['boardimg']['id']}]", $stylestuff['boardimg']['subst'], 'filetext', '', 0, cplang('styles_edit_logo_comment').$boardimghtml);
+ showsetting('styles_edit_searchlogo', "stylevar[{$stylestuff['searchimg']['id']}]", $stylestuff['searchimg']['subst'], 'filetext', '', 0, $searchimghtml);
+ showsetting('styles_edit_touchlogo', "stylevar[{$stylestuff['touchimg']['id']}]", empty($stylestuff['touchimg']['subst']) ? 'logo_m.svg' : $stylestuff['touchimg']['subst'], 'filetext', '', 0, $touchimghtml);
foreach($predefinedvars as $predefinedvar => $v) {
if($v !== array()) {
@@ -684,6 +689,29 @@ function imgpre_switch(id) {
$stylevarids = array($varid);
C::t('common_stylevar')->update_substitute_by_styleid($substitute, $id, $stylevarids);
}
+
+ if(isset($_FILES['stylevar']['name'])) {
+ foreach(C::t('common_stylevar')->fetch_all_by_styleid($id) as $stylevar) {
+ $stylesvar[$stylevar['stylevarid']] = $stylevar['variable'];
+ }
+ $upload = new discuz_upload();
+ foreach ($_FILES['stylevar']['name'] as $varid => $value) {
+ if($stylesvar[$varid]) {
+ $file = array(
+ 'name' => $_FILES['stylevar']['name'][$varid],
+ 'type' => $_FILES['stylevar']['type'][$varid],
+ 'tmp_name' => $_FILES['stylevar']['tmp_name'][$varid],
+ 'error' => $_FILES['stylevar']['error'][$varid],
+ 'size' => $_FILES['stylevar']['size'][$varid],
+ );
+ if($upload->init($file, 'common', 0, '', 'template', 0, $stylesvar[$varid].'_'.date('Ymd').strtolower(random(8))) && $upload->save()) {
+ $logonew = $_G['setting']['attachurl'].'common/'.$upload->attach['attachment'];
+ $stylevarids = array($varid);
+ C::t('common_stylevar')->update_substitute_by_styleid($logonew, $id, $stylevarids);
+ }
+ }
+ }
+ }
}
}
diff --git a/upload/source/admincp/discuzfiles.md5 b/upload/source/admincp/discuzfiles.md5
index 218c2be8..3ae799f5 100644
--- a/upload/source/admincp/discuzfiles.md5
+++ b/upload/source/admincp/discuzfiles.md5
@@ -10,7 +10,7 @@ c028c4822428e83a358c60a93ef65381 *./favicon.ico
1b812cfe92c4beb785f13e620253c2b4 *./forum.php
0ac2b76abf74ea61d30dc04073e506cc *./group.php
ca0ffc078f8e602cea2a96348b329d74 *./home.php
-de0427c6f72fba3e03ed0a2d5975bf3e *./index.php
+9d6f440376d98d5954301237d4b4b8f7 *./index.php
0d673a9b9f136a7a6b6b25d4ff4bc1fd *./install
f1e900c4bdc2488da6413144d9d95faf *./member.php
9b2c07ca5e531454aa1259611d302a76 *./misc.php
@@ -66,7 +66,7 @@ d41d8cd98f00b204e9800998ecf8427e *data/avatar/index.htm
d41d8cd98f00b204e9800998ecf8427e *data/log/index.htm
d41d8cd98f00b204e9800998ecf8427e *data/cache/index.htm
f8689e3b96ecbac8ab0b9568cb412a5e *data/ipdata/geoip2.phar
-c0b47f575630d98cf2cae1d8fcb6adc2 *data/ipdata/GeoLite2-City.mmdb
+fdb964c1150388ad4e3d13dde6acbed5 *data/ipdata/GeoLite2-City.mmdb
7215ee9c7d9dc229d2921a40e899ec5f *data/ipdata/index.htm
79da57ff3e78fd0dffa638c8144582ef *data/ipdata/ipv6wry.dat
ebff35fbfdb5759cdf60b9b79b5b0a5b *data/ipdata/tinyipdata.dat
@@ -75,7 +75,7 @@ d41d8cd98f00b204e9800998ecf8427e *data/plugindata/index.htm
d41d8cd98f00b204e9800998ecf8427e *data/threadcache/index.htm
d41d8cd98f00b204e9800998ecf8427e *data/download/index.htm
d41d8cd98f00b204e9800998ecf8427e *data/addonmd5/index.htm
-3340634fcccd43e395a66439394f808a *source/discuz_version.php
+0fd0e8683f2a0aa316f1d77f9554cf86 *source/discuz_version.php
7215ee9c7d9dc229d2921a40e899ec5f *source/index.htm
457199b5d87444d7064d50d094b1a23e *source/admincp/admincp_admingroup.php
be0ed17d7af5a8cf82a548219521f1c3 *source/admincp/admincp_adv.php
@@ -90,7 +90,7 @@ a64423a547fee8d828dd06970d660c41 *source/admincp/admincp_article.php
159b6cc148de90122e64bc9f530ab325 *source/admincp/admincp_blog.php
40d29c3b204193d0f49443f8e1644c9f *source/admincp/admincp_blogcategory.php
93b8d5589d1aff4f552ffea4e333b114 *source/admincp/admincp_blogrecyclebin.php
-e4cb345794fc217bce89956df466d32e *source/admincp/admincp_card.php
+100ec41b58b982aaf36588f599b3c7b6 *source/admincp/admincp_card.php
6d6d9b93b0802925b9c05ad3760190ec *source/admincp/admincp_checktools.php
31a9026931c6cf4c8a360176160bab3e *source/admincp/admincp_click.php
112565e34c5c6d26b31057f8a1074a9a *source/admincp/admincp_cloudaddons.php
@@ -98,21 +98,21 @@ ffcfdc5d0b27a904d1fc9f1cd51c1b18 *source/admincp/admincp_collection.php
4fac6845e10e6125a09b83a8249fce33 *source/admincp/admincp_comment.php
8c578f43cb6c30fd259d47072bb42678 *source/admincp/admincp_counter.php
754e081bf2bdd6807c8ee830b40645f2 *source/admincp/admincp_credits.php
-c69e36a91322969a640cca6e4809ea9d *source/admincp/admincp_db.php
+c244e08c94839ea9c1a44cbc10560467 *source/admincp/admincp_db.php
a0ca9da5bc59a4a8e9b7c99d37c6bb6f *source/admincp/admincp_district.php
37f45652a977ff69218a82a87b4a7850 *source/admincp/admincp_diytemplate.php
b06f8c3d7bd1ce66f0d6185a7366d054 *source/admincp/admincp_doing.php
99eb7c9b5490c9c33c77e2b1d6491a39 *source/admincp/admincp_domain.php
388907d2b88bb926fde08c98b468a7ed *source/admincp/admincp_ec.php
-0adcc88141da3ab3c97d1a825bbf32c6 *source/admincp/admincp_faq.php
+b78c3896acb1f1191cb44bebb39af2bd *source/admincp/admincp_faq.php
b1dd8823007953df695c3ea826c0f522 *source/admincp/admincp_feed.php
-293bd2625e8042b5987310bc70503a27 *source/admincp/admincp_forums.php
+ac3727d9b8be7e7cbd062543e6605485 *source/admincp/admincp_forums.php
d4c7e5c3ba8c6be51ced2b168fcc8b2a *source/admincp/admincp_founder.php
a9f04f1e9895680c7d31117e442afe5d *source/admincp/admincp_grid.php
72bf994a2a326a8ed859df343b8ae557 *source/admincp/admincp_group.php
-c5643aff2b1290b2adc2a162dd6b4593 *source/admincp/admincp_index.php
+ef6bd8b99da2812693c9e9b7e695bda7 *source/admincp/admincp_index.php
461f6a59df6839dcc2dc28336c49afb7 *source/admincp/admincp_login.php
-de3e0ffea9782da8286632994c151acb *source/admincp/admincp_logs.php
+c6d08f95d0ce18c125aeec3de03aac2e *source/admincp/admincp_logs.php
1471697ffddca1fff19dee7d0c1dccab *source/admincp/admincp_magics.php
79c14956cf6e7600386b9d1665949262 *source/admincp/admincp_main.php
cb43186efedc819934d42c3d1d5f6f69 *source/admincp/admincp_makehtml.php
@@ -120,14 +120,14 @@ cb43186efedc819934d42c3d1d5f6f69 *source/admincp/admincp_makehtml.php
72fa3705471bbd75d64edc83ed28a772 *source/admincp/admincp_members.php
65e2b3c419e53b38d216712653048504 *source/admincp/admincp_membersplit.php
d98f3e4f00d269805401838524c90cd0 *source/admincp/admincp_menu.php
-882cbb7071e858e4a533899580e578cd *source/admincp/admincp_misc.php
+bcab758dbf232aeafbc63ec16e8357f9 *source/admincp/admincp_misc.php
b42c643fd3bd876710eeed796cdf3566 *source/admincp/admincp_moderate.php
1127b22297f493b574605a847603b601 *source/admincp/admincp_nav.php
c0c1326df6510c3886ebc5c84acefc72 *source/admincp/admincp_optimizer.php
7b2e2342ada25ec87639c69789676365 *source/admincp/admincp_perm.php
10ee915453278058249108d96362c726 *source/admincp/admincp_pic.php
3db6ff77e5819088e0e1be99012b826d *source/admincp/admincp_plugins.php
-b0b7834536103fb37eca05f38d2acaee *source/admincp/admincp_portalcategory.php
+9121e1c71f8fec8e1f4bca07ec86879d *source/admincp/admincp_portalcategory.php
85dcf81fd6520d1abf0d68d69d50cbca *source/admincp/admincp_portalpermission.php
a058176f196db0afc91fcc7943be7810 *source/admincp/admincp_postcomment.php
623987000d46c95b7ff5c2e793b8220c *source/admincp/admincp_postsplit.php
@@ -139,12 +139,12 @@ a058176f196db0afc91fcc7943be7810 *source/admincp/admincp_postcomment.php
32aa66e9adaa4a5e7ebef41c94c793ba *source/admincp/admincp_report.php
8a4e0470ac38f97da3e09437cbf02fe7 *source/admincp/admincp_runtests.php
71e88bb2880c9ba3f72365ceeb2ffb6a *source/admincp/admincp_search.php
-0c85857df2adcb23430b8bb30ff818eb *source/admincp/admincp_setting.php
+a0b9d37361372927258a3bcc8effbb65 *source/admincp/admincp_setting.php
a7e3689faf2d04e840007e79f9410555 *source/admincp/admincp_share.php
23137684e4820ca59a335e7a724c2b1f *source/admincp/admincp_smilies.php
3113a577d065557949f1ac8780f8b81f *source/admincp/admincp_smsgw.php
6b2412f8b7774ae6f50cd6fa14e52bd9 *source/admincp/admincp_specialuser.php
-447cf9036daacad0c0f89b9c7750ee5c *source/admincp/admincp_styles.php
+8290d02b578867252c4147502a343943 *source/admincp/admincp_styles.php
2cb5cc918b13798ca2f944209faa1d31 *source/admincp/admincp_tag.php
e48b35dd060f51ea925a7f4d9e69fea8 *source/admincp/admincp_tasks.php
48b12378dfe5ff6384ab345f2406e53b *source/admincp/admincp_templates.php
@@ -317,10 +317,10 @@ b24440c2a360ef2fd0a2ee42d1837b2d *source/class/class_sms.php
0ab63824a0026b403eb0b8efa3fca888 *source/class/class_sphinx.php
b6b3906bc37420e700b15af398755dca *source/class/class_tag.php
d87408ec430e1a9807ff1a583dbcf295 *source/class/class_task.php
-b88503c742cd6283190a01d12280bc68 *source/class/class_template.php
+0ae805fd070b4a97cdf220b3d0480811 *source/class/class_template.php
325c5adef898d56e78e1a9187ee98751 *source/class/class_xml.php
158b88be44a90a992eae4ed2b685c803 *source/class/class_zip.php
-d9fc616062766dfc8e2a3269df3192a2 *source/class/db/db_driver_mysqli.php
+21ae8c8fb30215dccc2970353c75409a *source/class/db/db_driver_mysqli.php
ca2e45ca8f528ca595e978a546d2711d *source/class/db/db_driver_mysqli_slave.php
d41d8cd98f00b204e9800998ecf8427e *source/class/db/index.htm
2703b7d935c58e03d9970b682f819cf3 *source/class/discuz/discuz_admincp.php
@@ -333,7 +333,7 @@ b8ae80e3cc4861b1c5237c9d76e90fa5 *source/class/discuz/discuz_container.php
4beda424464c4de67cedaba60b306124 *source/class/discuz/discuz_cron.php
553d4b95748a74307aa8457127b4c150 *source/class/discuz/discuz_database.php
c0c093d7ccd5b16a6715b89b0ce6ad4c *source/class/discuz/discuz_error.php
-770b5620f235ec9e7bbd0950f524e3d9 *source/class/discuz/discuz_extend.php
+ee5b3de8077395d111cc35c02fe61eca *source/class/discuz/discuz_extend.php
65e20ff0b6a2a2946b873c4b531a924f *source/class/discuz/discuz_ftp.php
5db366ec11af20793525ee6123cf03f6 *source/class/discuz/discuz_memory.php
33fc8477244de154fa128b6b624b2d4d *source/class/discuz/discuz_model.php
@@ -345,7 +345,7 @@ c0c093d7ccd5b16a6715b89b0ce6ad4c *source/class/discuz/discuz_error.php
7f92dfc0de0cf70c65570d519fdb38c1 *source/class/discuz/discuz_table.php
c82dd42edb43efd92453f5f0e96deead *source/class/discuz/discuz_table_archive.php
4f251fee68c5a73c5c4e18c288901e9f *source/class/discuz/discuz_upgrade.php
-64b26625d12a2bef6b01e6633ea32e0c *source/class/discuz/discuz_upload.php
+782289e5e78acc91dde9ff9c7a2ffe03 *source/class/discuz/discuz_upload.php
d41d8cd98f00b204e9800998ecf8427e *source/class/discuz/index.htm
dd2a682cb80610581d50894753c78c0d *source/class/extend/extend_thread_activity.php
b01997e7f549af2d6e1168ead2ba9d3c *source/class/extend/extend_thread_allowat.php
@@ -372,15 +372,15 @@ d41d8cd98f00b204e9800998ecf8427e *source/class/forum/index.htm
43ef1a61bba663130b139781468b0494 *source/class/helper/helper_antitheft.php
59220a31da954b7d2227f336dbb6f0c3 *source/class/helper/helper_attach.php
e2effa65d1f1a3761b4956a976553dbb *source/class/helper/helper_dbtool.php
-ad130c222b71002ab957b32d607c523f *source/class/helper/helper_form.php
+bbc2661ab8f2fe370ee1f407ac75a4fb *source/class/helper/helper_form.php
5b4c3fb8541d9c97c4ceff745bf1cc24 *source/class/helper/helper_invite.php
cb470c2fc9687f577bf7158e946b6198 *source/class/helper/helper_json.php
45a56c1976d7ec0ffecefc0146796bbf *source/class/helper/helper_log.php
a16b085b9aa4c6dc8ccc4f052405d01c *source/class/helper/helper_makehtml.php
-3153f5c2deae2e4294010928c458d810 *source/class/helper/helper_mobile.php
+3b29938015b5a9c5974ca4fa8b7b6ecc *source/class/helper/helper_mobile.php
4893afd59606b77d8a26263122019415 *source/class/helper/helper_notification.php
fbecf04eacbdce0e05d105c45e66051b *source/class/helper/helper_output.php
-a2f2d9d076697b1c25eea29e8a57f36e *source/class/helper/helper_page.php
+cb4827fafb769f149bdec0fb0d924fa0 *source/class/helper/helper_page.php
7dd253716a8c640542b69bae75e16a84 *source/class/helper/helper_pm.php
c0f80c09fa102bfda6306d662ed99586 *source/class/helper/helper_seccheck.php
52ce3b5ab625067d6d24253122f7c90c *source/class/helper/helper_seo.php
@@ -437,7 +437,7 @@ dca56e678df01ba514de01980af2df0e *source/class/memory/memory_driver_redis.php
ea2066175404f7ab9d749592b5a1bb4e *source/class/memory/memory_driver_yac.php
5fb4d9b1c5cf285abd80802765852fa2 *source/class/memory/memory_setting_array.php
d41d8cd98f00b204e9800998ecf8427e *source/class/model/index.htm
-c7a1515b69a0b34c924078b5bc52b1c4 *source/class/model/model_forum_post.php
+a3a648caa7e25f5340e5e5aa39892554 *source/class/model/model_forum_post.php
a97e6e23e5dc2c7336b8205d6d8603dd *source/class/model/model_forum_thread.php
7215ee9c7d9dc229d2921a40e899ec5f *source/class/optimizer/index.htm
bbb7b9348becfc1bda0b510faf533948 *source/class/optimizer/optimizer_aggid.php
@@ -780,21 +780,21 @@ f09feb7638b8b10f557cfc77efa8a528 *source/function/cache/cache_smilies.php
2b70af37dd4e20694adc693c4dfd3719 *source/function/cache/cache_split.php
07472b4201a16c74bd2b836e7fe423a4 *source/function/cache/cache_stamps.php
5fc03eedb99553f1e3348f3310dbd94a *source/function/cache/cache_stamptypeid.php
-c103c846fb5e272400294b1db51a0b2c *source/function/cache/cache_styles.php
+7bfed0e452253f02a4f97b897e96ad0c *source/function/cache/cache_styles.php
fe617c17728d90c0b60d9a7346af4191 *source/function/cache/cache_threadsorts.php
5dfa8854085ef6e641d6c611fc8c3804 *source/function/cache/cache_updatediytemplate.php
96eb1d7fdcb1db31443040fff1556f9c *source/function/cache/cache_usergroups.php
8dffc3b7045a96be9bee7e6915769e59 *source/function/cache/cache_userstats.php
d41d8cd98f00b204e9800998ecf8427e *source/function/cache/index.htm
-20012b7e5db95fd3df0507b3a379cc28 *source/function/function_admincp.php
+273cb3ed9637453a3c8060569d0f8208 *source/function/function_admincp.php
5a5e8bc6d7a1fe47d130140872e8ce38 *source/function/function_attachment.php
-05a38974989e51f498b4b61c01232442 *source/function/function_block.php
+a160970e9689b58e720c2dfbacb45a2f *source/function/function_block.php
6a225d15274e63330383368b1b3cb35a *source/function/function_blog.php
bebf182768886ee2cf2aa320b89ca87d *source/function/function_cache.php
8eef58d41b9d1842f5566def3f97fb9e *source/function/function_cloudaddons.php
95f0fa11b876d5ebd41d1c9f3956d819 *source/function/function_collection.php
6068a9e9281677ca335394142c33ca2e *source/function/function_comment.php
-8237e1d2a8b8e17b3da1e0df971475cd *source/function/function_core.php
+161c0f80f0f0ade9a5fad683598a2ba1 *source/function/function_core.php
4ec7eb278c959ff02f0ffa570254b8aa *source/function/function_credit.php
5bb6498fef2c9089a41385dfadc2c594 *source/function/function_delete.php
353c2ba4c0d40a362073e83ea760ec57 *source/function/function_discuzcode.php
@@ -819,7 +819,7 @@ e2f9dba4503a7e56ec0b1b8372ab251f *source/function/function_magic.php
e4ca7d81cdeb88f4ad00140d5e59f94b *source/function/function_misc.php
354bad4bbf69c4b466a00800259f76ef *source/function/function_plugin.php
b551f459e38ee1a908233b10a93f07b6 *source/function/function_portal.php
-930c359d6636d5407de8c00b95157f8c *source/function/function_portalcp.php
+5851aa4cbd268d6748e036cfa591a978 *source/function/function_portalcp.php
408d50a742be70244e15d51c3b0b4eab *source/function/function_post.php
da11dcd0d3d07491aca87e16effbd524 *source/function/function_preg.php
88ea8c24766183123c3dfc1a74b55617 *source/function/function_profile.php
@@ -932,7 +932,7 @@ c5841c1b8c2d7ce308b860ef757b7caf *source/include/post/post_threadsorts.php
d41d8cd98f00b204e9800998ecf8427e *source/include/space/index.htm
16ab16ff66d49d4ada427ed94e52299f *source/include/space/space_activity.php
7202077c66b62d88aa41fb557b42c31c *source/include/space/space_album.php
-db42c2068f4a7e8fb79a659a2ecfd184 *source/include/space/space_blog.php
+f946e72e885e99c74bd9767e4a745cb2 *source/include/space/space_blog.php
df1f8123b032a73f7e30b303e0e93872 *source/include/space/space_debate.php
7d5372aecbbe4ec8979ccfffd8196444 *source/include/space/space_doing.php
ecb0abeb86d841048ae4ac7265339152 *source/include/space/space_favorite.php
@@ -950,7 +950,7 @@ df4d8ba6008067f7fb87b266043e0c20 *source/include/space/space_poll.php
86f3eaae29f06af264b4ab77b0c4041b *source/include/space/space_trade.php
57641aa952249d6d354090e3c4447794 *source/include/space/space_wall.php
d41d8cd98f00b204e9800998ecf8427e *source/include/spacecp/index.htm
-85229c89ae56e6c48f6fd1028fbaf314 *source/include/spacecp/spacecp_album.php
+7ab0dd324207006638cef7679d341288 *source/include/spacecp/spacecp_album.php
bf30e40c2708decfc1f03b19de0fd714 *source/include/spacecp/spacecp_avatar.php
e1e80f7fa9169f5ab25ed735b5643c5c *source/include/spacecp/spacecp_blog.php
a074db25b4ee9f023081a8a395c46d1e *source/include/spacecp/spacecp_class.php
@@ -1069,7 +1069,7 @@ d26b3100b94cafdb2f1d94b3e0bfbfee *source/language/block/lang_stat.php
14d76f59ab6adbcb4348c15ad88475fa *source/language/block/lang_tradelist.php
52428c7a6edea5c58dc98fcdf1df117b *source/language/block/lang_vedio.php
7215ee9c7d9dc229d2921a40e899ec5f *source/language/email/index.htm
-24e46edeb3a819154a2893737158492c *source/language/email/lang_template.php
+c4f5153471b3b02b07698cb5d5595ed8 *source/language/email/lang_template.php
7215ee9c7d9dc229d2921a40e899ec5f *source/language/forum/index.htm
0b36b86383f502da244b1083b6b28b64 *source/language/forum/lang_archiver.php
0fa32eb0ec0e6f981c7b303df1625da0 *source/language/forum/lang_dz_feed.php
@@ -1087,7 +1087,7 @@ d41d8cd98f00b204e9800998ecf8427e *source/language/group/index.htm
ff6a41e5c029626a3f3f36de81bfed41 *source/language/home/lang_template.php
d41d8cd98f00b204e9800998ecf8427e *source/language/index.htm
34f060693aa787bec924c4c45e894aff *source/language/lang_action.php
-8c4d1ebac97e36c2074d4034e9225e24 *source/language/lang_admincp.php
+29d2c61a00b4be2cad21f518696760dd *source/language/lang_admincp.php
74953ff4bbe930131802295757b810b1 *source/language/lang_admincp_login.php
3e98dfe32dc8a71d685ff6fa39b4cb07 *source/language/lang_admincp_menu.php
40e41fa9f888c5517c80624475a4d008 *source/language/lang_admincp_msg.php
@@ -1096,7 +1096,7 @@ d41d8cd98f00b204e9800998ecf8427e *source/language/index.htm
4537056a99d91d0b8a67898ba575ffcb *source/language/lang_cloud_register.php
899287493c71122546d614dfd44d8303 *source/language/lang_core.php
bff846d0fac1467f68cac2b290111f74 *source/language/lang_email.php
-3578b45400a82e7aa1bcb0fd4dcf3e0e *source/language/lang_error.php
+b4366ace71fa13b841c3dfe9eaabd9cd *source/language/lang_error.php
f734cfd728cc7dbc399916b91db8418d *source/language/lang_exif.php
80a778b7b6fa1dccf6de864a4d8cbd84 *source/language/lang_feed.php
f1e320d5eceb22226759968178a75491 *source/language/lang_friend.php
@@ -1175,9 +1175,9 @@ c7a5b5344e26ef246b44d9482e246888 *source/module/forum/forum_forumdisplay.php
03d19e08f5f688c4b2daccacd7996c39 *source/module/forum/forum_group.php
0eb6943bfcf33f91f8986d9699229ba0 *source/module/forum/forum_guide.php
7442f1f6e8908e909cd00324dc220f70 *source/module/forum/forum_image.php
-b7378e7d06f2a9bb017d301a52b71763 *source/module/forum/forum_index.php
+0b9fcb76ab6d4252d6dbaf25169f29d0 *source/module/forum/forum_index.php
5d9893aef98284b0e2a5de07968ade2b *source/module/forum/forum_misc.php
-b40c32425ddb0635943579f3e0b194ab *source/module/forum/forum_modcp.php
+663250770c85c83fd845ee1d00f009f3 *source/module/forum/forum_modcp.php
ebbf512615e1afc0aa80783cd5659bd2 *source/module/forum/forum_post.php
0be8843324ca038b77dd2946aab45e3d *source/module/forum/forum_redirect.php
8c13b03f0f2c82dfadbc6bf28908086f *source/module/forum/forum_rss.php
@@ -1277,9 +1277,9 @@ e167cf8dd7c618441075253753d00fbd *static/avatar/ui-icons_454545_256x240.png
59626b9493951a7c9e431e8ec5e4478f *static/avatar/ui-icons_cd0a0a_256x240.png
e0e91efdc678f4aa89d83a2b569a3236 *static/image/admincp/add.gif
7a17558f50fc57f2276022cd5d8b44a1 *static/image/admincp/admincp.css
-8caf97d2206934fa6affe0d9992a5374 *static/image/admincp/admincpframe.css
-3d33b7d4bd0eda6ec8643be7fb74f086 *static/image/admincp/admincplogin.css
-a42e36d074969d2b39cf713ee78df1d0 *static/image/admincp/admincppage.css
+cf8e6746225385c2b44931eca58ed7d0 *static/image/admincp/admincpframe.css
+d623b704d9306c4bae1b0aa1bd0c7069 *static/image/admincp/admincplogin.css
+9c730a26b2e6bc78aaa171173143a302 *static/image/admincp/admincppage.css
a4cc25514001c92f418cd2e7527d6325 *static/image/admincp/ajax_loader.gif
feb6ca15771ab9d5c8880f85887cedc1 *static/image/admincp/article.gif
19b0b52a1375859bc2dc83a6fa49c7a6 *static/image/admincp/articlelist.gif
@@ -1329,7 +1329,7 @@ d0d6f92811a7b2767d7694f950fc7f4b *static/image/admincp/interthread.gif
aaf8ab4fcc55183e5c16566a0c3f4761 *static/image/admincp/logo.gif
690fd708816a1091f8be299586393ec9 *static/image/admincp/logo.svg
54301f1177cf9cc668cbf1958f911689 *static/image/admincp/logo_hover.gif
-66514bb418de5701ac7103e73c376611 *static/image/admincp/minireset.css
+c7d05156436329cfb8b0b14243367975 *static/image/admincp/minireset.css
10d8f95656c86609256f9fafa68845d5 *static/image/admincp/newwin.gif
8b05d229188f217b8b07e8df415129e3 *static/image/admincp/plugin_logo.png
627132856f13480184c730e29053f779 *static/image/admincp/pm_ntc.gif
@@ -2198,7 +2198,7 @@ d41d8cd98f00b204e9800998ecf8427e *static/image/mobile/index.htm
c07a5aa6a5d22a9d7f96538c6da596c6 *static/image/mobile/input_bg.gif
b065eba9107c429ca21bfe87ae1be239 *static/image/mobile/logo.gif
d9c722f799a5d9cfb092eb516a724eb6 *static/image/mobile/preview.png
-d4743d7a54cc9a666edb5008301736e5 *static/image/mobile/style.css
+add131ef8051a4b1375d9ed12488f2f9 *static/image/mobile/style.css
9f036243f3a7a64d67321d14b0c5ad08 *static/image/mobile/touch/arrow.png
27bdf4408c0e158f262f8f49aab5c58c *static/image/mobile/touch/arrow.svg
5b49481dfe76f0e5698485239c6046de *static/image/mobile/touch/avatar_blank.gif
@@ -2559,9 +2559,9 @@ d41d8cd98f00b204e9800998ecf8427e *static/image/traderank/seller/index.htm
b953e35e9f09502ddea1c7d8b159552a *static/image/upgrade/close.gif
d41d8cd98f00b204e9800998ecf8427e *static/image/upgrade/index.htm
7215ee9c7d9dc229d2921a40e899ec5f *static/index.htm
-1b356ce7fab096944785d3fe7a4785bf *static/js/admincp.js
+86c158fed843e0865f253ee53b0fd810 *static/js/admincp.js
fd6017113d6850bf90764d72beb66cad *static/js/admincp_base.js
-dbae372c5d6ef006eb1e5e49d7bf3f8e *static/js/admincp_frame.js
+c991495e1a7ab88c07e56ee3bb9c747c *static/js/admincp_frame.js
832a653ff7325535e2f741ec93096d8e *static/js/admincp_login.js
554019a035311ef2e0f2ea18d748c375 *static/js/ajax.js
b4d18b265aa9e426b8e5d5385a450475 *static/js/at.js
@@ -2571,15 +2571,15 @@ c1f1ddfd4e953966a03e5091b7bfe339 *static/js/calendar.js
4ba34947d3c1143f2411ecbdb13b31cc *static/js/common.js
76075a8972349994f4f7179b647a47f5 *static/js/common_diy.js
ff61dec039fb13c3ec6eeb388d931da4 *static/js/common_extra.js
-08c70f0d2dd5500a6d6b4d073a213181 *static/js/echarts/echarts.common.min.js
+95081cd0e33ede64a17c6f59713db6ab *static/js/echarts/echarts.common.min.js
d41d8cd98f00b204e9800998ecf8427e *static/js/echarts/index.htm
20a566d7528b0cbf19b7e1c792709c8d *static/js/editor.js
14dec997e0d3c4508913f673826ade14 *static/js/fileprogress.js
4c0ea3d2790ec0e5a74df013c75e1c56 *static/js/forum.js
6ceed25d134a08f9be56e38ee84b776c *static/js/forum_moderate.js
81f79f440eb370b65dd54c50adbb64e5 *static/js/forum_post.js
-fd4b93c5cc5190b086fb608ee71bf4a7 *static/js/forum_slide.js
-d261e3cf4c08a219665c1d0afb035c85 *static/js/forum_viewthread.js
+332f656c3d2e5e9a5683b4e42e4dab2d *static/js/forum_slide.js
+85afb8766e8fdd61e94b18c2966d2dfb *static/js/forum_viewthread.js
20aee0898556697d56e037ba761ceb43 *static/js/google.js
e4fcaf759b4e20f5e4fd7ff14d7e85b3 *static/js/handlers.js
bca8eb2e7e64f52a3cd6339804547577 *static/js/home.js
@@ -2597,7 +2597,7 @@ d41d8cd98f00b204e9800998ecf8427e *static/js/jquery/index.htm
ef058f07a773acf03f6d2f7f6ecb68fd *static/js/md5.js
ed88708e2be8db3e81cedd63851109c1 *static/js/mobile/ajaxfileupload.js
80375c6b775cc3c9b2060b9f4bfc665b *static/js/mobile/buildfileupload.js
-e04e27d738c16d6e2bc037630687d59e *static/js/mobile/common.js
+6f8cf1b641e7556203454394f221c90f *static/js/mobile/common.js
d41d8cd98f00b204e9800998ecf8427e *static/js/mobile/index.htm
4f252523d4af0b478c810c2547a63e19 *static/js/mobile/jquery.min.js
c7a06100ded36c16acd06454e6932de0 *static/js/player/aplayer.min.css
@@ -2773,7 +2773,7 @@ d89affd505fc8becdabf24a5e51f5155 *static/topic/t2/style.css
53980742778aae28bb2ae6639c8a4c6c *template/default/common/block_thread.htm
a27bd77804940d84ab3fab01b737cd0f *template/default/common/block_userinfo.htm
52210394a8f10c4fa4609ee4c059a593 *template/default/common/buyinvitecode.htm
-a20dd93165003e0420afbfbb1b3c2031 *template/default/common/common.css
+9c0cc17c1f7fb897906dca7d84e5c3f3 *template/default/common/common.css
58525671bb708ee64218afadf334a650 *template/default/common/css_diy.css
510dbd724208a84a6af275b13a657066 *template/default/common/css_sample.htm
29bae46dbfdb7340dbfbb6f070070b2a *template/default/common/css_space.css
@@ -2800,7 +2800,7 @@ d41d8cd98f00b204e9800998ecf8427e *template/default/common/index.htm
a3fa81ef3ad7b3aa6599a423d3f68c49 *template/default/common/invite.htm
8d18332c488ef29b14efb05a9565496d *template/default/common/ipnotice.htm
7a56c9967692ff3caa3ebea2b287df19 *template/default/common/misc_imgcropper.htm
-a632fd75fb8e17f24c07b02bd8ceff08 *template/default/common/module.css
+f25f9dffaf8204fe2a22e6c48b9c94f7 *template/default/common/module.css
643621bef865ccc14f37ec0cfec84077 *template/default/common/preview.htm
5ac322e37ca6093a9740764c47ca875e *template/default/common/pubsearchform.htm
58597888b2bef9f05737e58a2b60ddd7 *template/default/common/report.htm
@@ -3220,10 +3220,10 @@ e4d4ac2bfb5b921fbc46c81758181de9 *template/default/touch/forum/collection_recomm
3a8fa83a3347b4246bd872e9ffbf2cd5 *template/default/touch/forum/comment_more.htm
8b910098e5a8c2b3ccc00cbc23b774d3 *template/default/touch/forum/debate_umpire.htm
df4f68979251909461a3ae6c24615f36 *template/default/touch/forum/discuz.htm
-d3b856482790a1ad59284e117ca7fa48 *template/default/touch/forum/discuzcode.htm
+c1aaf6897894e279beba5a86d0025355 *template/default/touch/forum/discuzcode.htm
6bce42a63d09b2ecd6a2cac0567d205e *template/default/touch/forum/find.htm
aef2e6e5f88e892c87664eb9aaeac559 *template/default/touch/forum/forumdisplay.htm
-95c6b870b6c1edf768870d03ab7811ed *template/default/touch/forum/forumdisplay_fastpost.htm
+46a39e8abe5bb8d52b49ee6e98dfc4a8 *template/default/touch/forum/forumdisplay_fastpost.htm
76358c34a969934283f9ecbaca2212fb *template/default/touch/forum/forumdisplay_passwd.htm
fee37c59c9eb7c7e54093d16e08b7a5b *template/default/touch/forum/forumdisplay_subforum.htm
051435515b62e75a1a09e70a13057de5 *template/default/touch/forum/guide.htm
@@ -3337,7 +3337,7 @@ e567dc1b2ee7e4c169d0acf339ba36d1 *template/default/touch/home/space_medal_float.
fd1f5d9a6167b72468d25f4e5f0c7bf8 *template/default/touch/home/space_notice.htm
5582ffadcedd14f39b2e1187b8eb0b98 *template/default/touch/home/space_pm.htm
74f85392cd09553d1111446b53e3434d *template/default/touch/home/space_pm_node.htm
-567278a6ff94424e7251fd0c9a93482c *template/default/touch/home/space_profile.htm
+0176141218343565dea77c2ce5c7a5eb *template/default/touch/home/space_profile.htm
6e3ba9645586bea76d92c1e1fe4fab07 *template/default/touch/home/space_share_form.htm
53462f09fde6999cda01304f18247160 *template/default/touch/home/space_share_li.htm
54877007b49108066d6dc489eefea7a9 *template/default/touch/home/space_share_list.htm
@@ -3410,7 +3410,7 @@ cffea1f41b3f26d49b3c266b0c9957ac *uc_client/model/cache.php
7215ee9c7d9dc229d2921a40e899ec5f *uc_client/model/index.htm
0aafd28160be775def515e78352bfd29 *uc_client/model/mail.php
621dc8aeee71e1bd724d791b5612ef2f *uc_client/model/misc.php
-b60a75a19f14bbfe7a0403f8a72deebf *uc_client/model/note.php
+f1dec926907416f0a6c233e23d33fe6b *uc_client/model/note.php
5479ac7219712c5aacd45514619aafba *uc_client/model/pm.php
d7b379d38fbc0e8a120454a334a54499 *uc_client/model/tag.php
77504f6188b650ff805476a22639688b *uc_client/model/user.php
@@ -3455,7 +3455,7 @@ dea62a81dcb69b255a4deaac38602e0d *uc_server/control/admin/plugin.php
8b649848712e62e46b0258ce64068eaf *uc_server/control/admin/pm.php
0e9c93d9204b5f232eea6617ca594979 *uc_server/control/admin/seccode.php
7ab559b8f307d3a6ab843b6aebb266ab *uc_server/control/admin/setting.php
-6e7425b8e84b191a9f914109c44e924b *uc_server/control/admin/ucfiles.md5
+a63b51f5a2e5bc8b73ff3d65ca8e259b *uc_server/control/admin/ucfiles.md5
b53bbda68e283d424f0df0946e18dc0e *uc_server/control/admin/user.php
cff8d2970aac4f9d1fd19109e20af6e5 *uc_server/control/app.php
5055e3cf8e772dccec030af9c8394732 *uc_server/control/credit.php
@@ -3634,7 +3634,7 @@ b1310fa913e40b5f888d14aea9b4144a *uc_server/js/calendar.js
0e8249b8c83ab93350d6864e106da182 *uc_server/js/common.js
7215ee9c7d9dc229d2921a40e899ec5f *uc_server/js/index.htm
904fbd9ee2c415bbee0fa4f9ccce4f83 *uc_server/js/pm_editor.js
-c517ab970aaff7f9131d9656f3bc9ea1 *uc_server/release/release.php
+3b92fbadd4365beb6f0762ed5b1016c1 *uc_server/release/release.php
45ceb71c18375a9b987e05a02feae578 *uc_server/view/default/admin.lang.php
5de71114c9c4e1db2a69abab5b7428b1 *uc_server/view/default/admin_admin.htm
d05e6869168a47c29e4a07226f344314 *uc_server/view/default/admin_app.htm
diff --git a/upload/source/class/class_template.php b/upload/source/class/class_template.php
index abc1b4ab..f52a3cd5 100644
--- a/upload/source/class/class_template.php
+++ b/upload/source/class/class_template.php
@@ -380,7 +380,7 @@ function loadcsstemplate() {
foreach($scripts as $css) {
$scriptcss .= '';
}
- $scriptcss .= '{if $_G[\'uid\'] && isset($_G[\'cookie\'][\'extstyle\']) && strpos($_G[\'cookie\'][\'extstyle\'], TPLDIR) !== false}{elseif $_G[\'style\'][\'defaultextstyle\']}{/if}';
+ $scriptcss .= '{if $_G[\'uid\'] && isset($_G[\'cookie\'][\'extstyle\']) && strpos($_G[\'cookie\'][\'extstyle\'], TPLDIR) !== false}{elseif $_G[\'style\'][\'defaultextstyle\']}{/if}';
if(isset($_G['config']['output']['css4legacyie']) && $_G['config']['output']['css4legacyie']) {
$scriptcss .= '';
}
diff --git a/upload/source/class/db/db_driver_mysqli.php b/upload/source/class/db/db_driver_mysqli.php
index e0d4c0c8..ce77f100 100644
--- a/upload/source/class/db/db_driver_mysqli.php
+++ b/upload/source/class/db/db_driver_mysqli.php
@@ -79,7 +79,7 @@ function connect($serverid = 1) {
function _dbconnect($dbhost, $dbuser, $dbpw, $dbcharset, $dbname, $pconnect, $halt = true) {
mysqli_report(MYSQLI_REPORT_OFF);
- if (intval($pconnect) === 1) $dbhost = 'p:' . $dbhost;
+ if (intval($pconnect) === 1) $dbhost = 'p:' . $dbhost;
$link = new mysqli();
if(!$link->real_connect($dbhost, $dbuser, $dbpw, $dbname, null, null, MYSQLI_CLIENT_COMPRESS)) {
$halt && $this->halt('notconnect', $this->errno());
@@ -141,7 +141,7 @@ public function query($sql, $silent = false, $unbuffered = false) {
if(!($query = $this->curlink->query($sql, $resultmode))) {
if(in_array($this->errno(), array(2006, 2013)) && substr($silent, 0, 5) != 'RETRY') {
$this->connect();
- return $this->curlink->query($sql, 'RETRY'.$silent);
+ return $this->query($sql, 'RETRY'.$silent);
}
if(!$silent) {
$this->halt($this->error(), $this->errno(), $sql);
diff --git a/upload/source/class/discuz/discuz_extend.php b/upload/source/class/discuz/discuz_extend.php
index b2339b91..358f11cb 100644
--- a/upload/source/class/discuz/discuz_extend.php
+++ b/upload/source/class/discuz/discuz_extend.php
@@ -27,11 +27,11 @@ public function __call($name, $p) {
if(method_exists($this->_obj, $name)) {
switch (count($p)) {
case 0: return $this->_obj->{$name}();break;
- case 1: return $this->_obj->{$name}($p[0], $p[1]);break;
- case 2: return $this->_obj->{$name}($p[0], $p[1], $p[2]);break;
- case 3: return $this->_obj->{$name}($p[0], $p[1], $p[2], $p[3]);break;
- case 4: return $this->_obj->{$name}($p[0], $p[1], $p[2], $p[3], $p[4]);break;
- case 5: return $this->_obj->{$name}($p[0], $p[1], $p[2], $p[3], $p[4], $p[5]);break;
+ case 1: return $this->_obj->{$name}($p[0]);break;
+ case 2: return $this->_obj->{$name}($p[0], $p[1]);break;
+ case 3: return $this->_obj->{$name}($p[0], $p[1], $p[2]);break;
+ case 4: return $this->_obj->{$name}($p[0], $p[1], $p[2], $p[3]);break;
+ case 5: return $this->_obj->{$name}($p[0], $p[1], $p[2], $p[3], $p[4]);break;
default: return call_user_func_array(array($this->_obj, $name), $p);break;
}
} else {
diff --git a/upload/source/class/discuz/discuz_upload.php b/upload/source/class/discuz/discuz_upload.php
index 8c606008..57c93adb 100644
--- a/upload/source/class/discuz/discuz_upload.php
+++ b/upload/source/class/discuz/discuz_upload.php
@@ -24,7 +24,7 @@ public function __construct() {
}
- function init($attach, $type = 'temp', $extid = 0, $forcename = '') {
+ function init($attach, $type = 'temp', $extid = 0, $forcename = '', $subdir = '', $dirtype = 1, $filename = '') {
if(!is_array($attach) || empty($attach) || !$this->is_upload_file($attach['tmp_name']) || trim($attach['name']) == '' || $attach['size'] == 0) {
$this->attach = array();
@@ -33,7 +33,9 @@ function init($attach, $type = 'temp', $extid = 0, $forcename = '') {
} else {
$this->type = $this->check_dir_type($type);
$this->extid = intval($extid);
- $this->forcename = $forcename;
+ $this->forcename = preg_match("/^[a-z0-9_]+$/i", $forcename) ? $forcename : '';
+ $subdir = preg_match("/^[a-z0-9_]+$/i", $subdir) ? $subdir : '';
+ $filename = preg_match("/^[a-z0-9_]+$/i", $filename) ? $filename : '';
$attach['size'] = intval($attach['size']);
$attach['name'] = trim($attach['name']);
@@ -47,8 +49,8 @@ function init($attach, $type = 'temp', $extid = 0, $forcename = '') {
$attach['isimage'] = $this->is_image_ext($attach['ext']);
$attach['extension'] = $this->get_target_extension($attach['ext']);
- $attach['attachdir'] = $this->get_target_dir($this->type, $extid);
- $attach['attachment'] = $attach['attachdir'].$this->get_target_filename($this->type, $this->extid, $this->forcename).'.'.$attach['extension'];
+ $attach['attachdir'] = $this->get_target_dir($this->type, $extid, true, $subdir, $dirtype);
+ $attach['attachment'] = $attach['attachdir'].$this->get_target_filename($this->type, $this->extid, $this->forcename, $filename).'.'.$attach['extension'];
$attach['target'] = getglobal('setting/attachdir').'./'.$this->type.'/'.$attach['attachment'];
$this->attach = & $attach;
$this->errorcode = 0;
@@ -72,7 +74,7 @@ function save($ignore = 0) {
$this->errorcode = -101;
} elseif(in_array($this->type, array('group', 'album', 'category')) && !$this->attach['isimage']) {
$this->errorcode = -102;
- } elseif(in_array($this->type, array('common')) && (!$this->attach['isimage'] && $this->attach['ext'] != 'ext')) {
+ } elseif(in_array($this->type, array('common')) && (!$this->attach['isimage'] && !in_array($this->attach['ext'], array('ext', 'svg')))) {
$this->errorcode = -102;
} elseif(!$this->save_to_local($this->attach['tmp_name'], $this->attach['target'])) {
$this->errorcode = -103;
@@ -114,7 +116,6 @@ public static function get_image_info($target, $allowswf = false) {
} elseif($imageinfo = @getimagesize($target)) {
list($width, $height, $type) = !empty($imageinfo) ? $imageinfo : array('', '', '');
$size = $width * $height;
-
if((!getglobal('setting/imagelib') && $size > (getglobal('setting/gdlimit') ? getglobal('setting/gdlimit') : 16777216)) || $size < 16 ) {
return false;
} elseif($ext == 'swf' && $type != 4 && $type != 13) {
@@ -134,38 +135,62 @@ public static function is_upload_file($source) {
return $source && ($source != 'none') && (is_uploaded_file($source) || is_uploaded_file(str_replace('\\\\', '\\', $source)));
}
- public static function get_target_filename($type, $extid = 0, $forcename = '') {
- if($type == 'group' || ($type == 'common' && $forcename != '')) {
- $filename = $type.'_'.intval($extid).($forcename != '' ? "_$forcename" : '');
- } else {
- $filename = date('His').strtolower(random(16));
+ public static function get_target_filename($type, $extid = 0, $forcename = '', $filename = '') {
+ if (empty($filename)) {
+ if($type == 'group' || ($type == 'common' && $forcename != '')) {
+ $filename = $type.'_'.intval($extid).($forcename != '' ? "_$forcename" : '');
+ } else {
+ $filename = date('His').strtolower(random(16));
+ }
}
return $filename;
}
public static function get_target_extension($ext) {
static $safeext = array('attach', 'jpg', 'jpeg', 'gif', 'png', 'webp', 'swf', 'bmp', 'txt', 'zip', 'rar', 'mp3');
+ if(defined('IN_ADMINCP')) {
+ $safeext[] = 'svg';
+ }
return strtolower(!in_array(strtolower($ext), $safeext) ? 'attach' : $ext);
}
- public static function get_target_dir($type, $extid = '', $check_exists = true) {
+ public static function get_target_dir($type, $extid = '', $check_exists = true, $subdir = '', $dirtype = 1) {
- $subdir = $subdir1 = $subdir2 = '';
- if($type == 'album' || $type == 'forum' || $type == 'portal' || $type == 'category' || $type == 'profile') {
+ $dir = $subdir1 = $subdir2 = '';
+ if($dirtype == 1) {
+ if($type == 'group' || $type == 'common') {
+ $dir = $subdir1 = substr(md5($extid), 0, 2).'/';
+ } elseif($type != 'temp') {
+ $subdir1 = date('Ym');
+ $subdir2 = date('d');
+ $dir = $subdir1.'/'.$subdir2.'/';
+ }
+ } elseif($dirtype == 2) {
$subdir1 = date('Ym');
$subdir2 = date('d');
- $subdir = $subdir1.'/'.$subdir2.'/';
- } elseif($type == 'group' || $type == 'common') {
- $subdir = $subdir1 = substr(md5($extid), 0, 2).'/';
+ $dir = $subdir1.'/'.$subdir2.'/';
+ } elseif($dirtype == 3) {
+ $dir = $subdir1 = substr(md5($extid), 0, 2).'/';
}
- $check_exists && discuz_upload::check_dir_exists($type, $subdir1, $subdir2);
+ if($subdir) {
+ $dir = $subdir.'/'.$dir;
+ }
+
+ if($check_exists) {
+ if($subdir) {
+ discuz_upload::check_dir_exists($type, $subdir, $subdir1);
+ discuz_upload::check_dir_exists($type, $subdir.'/'.$subdir1.'/'.$subdir2);
+ } else {
+ discuz_upload::check_dir_exists($type, $subdir1, $subdir2);
+ }
+ }
- return $subdir;
+ return $dir;
}
public static function check_dir_type($type) {
- return !in_array($type, array('forum', 'group', 'album', 'portal', 'common', 'temp', 'category', 'profile')) ? 'temp' : $type;
+ return preg_match("/^[a-z]+[a-z0-9_]*$/i", $type) ? $type : 'temp';
}
public static function check_dir_exists($type = '', $sub1 = '', $sub2 = '') {
diff --git a/upload/source/class/helper/helper_form.php b/upload/source/class/helper/helper_form.php
index 6b6b91d8..de6e3c7f 100644
--- a/upload/source/class/helper/helper_form.php
+++ b/upload/source/class/helper/helper_form.php
@@ -19,7 +19,6 @@ public static function submitcheck($var, $allowget = 0, $seccodecheck = 0, $secq
return FALSE;
} else {
global $_G;
-
if(($allowget && ($allowget !== 2 || (!empty($_GET['formhash']) && $_GET['formhash'] == formhash()))) || ($_SERVER['REQUEST_METHOD'] == 'POST' && !empty($_GET['formhash']) && $_GET['formhash'] == formhash() && empty($_SERVER['HTTP_X_FLASH_VERSION']) && (empty($_SERVER['HTTP_REFERER']) ||
strncmp($_SERVER['HTTP_REFERER'], 'http://wsq.discuz.com/', 22) === 0 || preg_replace("/https?:\/\/([^\:\/]+).*/i", "\\1", $_SERVER['HTTP_REFERER']) == preg_replace("/([^\:]+).*/", "\\1", $_SERVER['HTTP_HOST'])))) {
if(checkperm('seccode')) {
@@ -41,8 +40,6 @@ public static function censor($message, $modword = NULL, $return = FALSE, $modas
global $_G;
$censor = discuz_censor::instance();
$censor->check($message, $modword);
-
-
if(($censor->modbanned() && empty($_G['group']['ignorecensor'])) || (($modasban && !empty($_G['setting']['modasban'])) && $censor->modmoderated() && empty($_G['group']['ignorecensor']))) {
$wordbanned = implode(', ', $censor->words_found);
if($return) {
@@ -54,33 +51,21 @@ public static function censor($message, $modword = NULL, $return = FALSE, $modas
cpmsg(lang('message', 'word_banned'), '', 'error', array('wordbanned' => $wordbanned));
}
}
- if($_G['group']['allowposturl'] == 0 || $_G['group']['allowposturl'] == 2) {
+ if($_G['group']['allowposturl'] == 0) {
$urllist = self::get_url_list($message);
- if(is_array($urllist[1])) foreach($urllist[1] as $key => $val) {
- if(!$val = trim($val)) continue;
- if(!iswhitelist($val)) {
- if($_G['group']['allowposturl'] == 0) {
+ if(is_array($urllist[1])) {
+ foreach($urllist[1] as $key => $val) {
+ if(!$val = trim($val)) continue;
+ if(!iswhitelist($val)) {
if($return) {
return array('message' => 'post_url_nopermission');
}
showmessage('post_url_nopermission');
- } elseif($_G['group']['allowposturl'] == 2) {
- $message = str_replace('[url]'.$urllist[0][$key].'[/url]', $urllist[0][$key], $message);
- $message = preg_replace(
- array(
- "@\[url=[^\]]*?".preg_quote($urllist[0][$key],'@')."[^\]]*?\](.*?)\[/url\]@is",
- "@href=('|\")".preg_quote($urllist[0][$key],'@')."\\1@is",
- "@\[url\]([^\]]*?".preg_quote($urllist[0][$key],'@')."[^\]]*?)\[/url\]@is",
- ),
- array(
- '\\1',
- '',
- '\\1',
- ),
- $message);
}
}
}
+ } elseif($_G['group']['allowposturl'] == 2) {
+ $message = preg_replace("/\[url(=((https?|ftp|gopher|news|telnet|rtsp|mms|callto|bctp|thunder|qqdl|synacast){1}:\/\/|www\.|mailto:|tel:|magnet:)?([^\r\n\[\"']+?))?\](.+?)\[\/url\]/is", '\\5', $message);
}
return $message;
}
diff --git a/upload/source/class/helper/helper_mobile.php b/upload/source/class/helper/helper_mobile.php
index 54e49663..91b58882 100644
--- a/upload/source/class/helper/helper_mobile.php
+++ b/upload/source/class/helper/helper_mobile.php
@@ -26,12 +26,7 @@ public static function mobileoutput() {
if('utf-8' != CHARSET) {
$content = diconv($content, CHARSET, 'utf-8');
}
- if(defined('IN_MOBILE') && constant('IN_MOBILE') === '3') {
- $content = ''.$content;
- header("Content-type: text/vnd.wap.wml; charset=utf-8");
- } else {
- @header('Content-Type: text/html; charset=utf-8');
- }
+ @header('Content-Type: text/html; charset=utf-8');
echo $content;
exit();
diff --git a/upload/source/class/helper/helper_page.php b/upload/source/class/helper/helper_page.php
index 390283af..c7ddc614 100644
--- a/upload/source/class/helper/helper_page.php
+++ b/upload/source/class/helper/helper_page.php
@@ -20,7 +20,7 @@ public static function multi($num, $perpage, $curpage, $mpurl, $maxpages = 0, $p
$a_name = '';
- $mpurl = str_replace(array("'", '"', "\\"), array('%27', '%22', '%5c'), $mpurl);
+ $mpurl = str_replace(array("'", '"', "\\"), array('%27', '%22', '%5c'), $mpurl);
if(strpos($mpurl, '#') !== FALSE) {
$a_strs = explode('#', $mpurl);
@@ -115,6 +115,21 @@ public static function multi($num, $perpage, $curpage, $mpurl, $maxpages = 0, $p
($curpage < $pages && !$simple ? '
{lang wechat:wechat_share}
{lang wechat:show_recommend_number}
-
-
-{eval
-}
-
-function wechatshowactivity_tpl_share($post) {
-global $_G;
-}
-
-