From d1896cff8b5b3303350c968a82f713033fc594d6 Mon Sep 17 00:00:00 2001 From: Discuz! <10433182@qq.com> Date: Wed, 19 Dec 2018 17:10:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20HTTPS=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=80=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- upload/api/trade/notify_trade.php | 2 +- upload/index.php | 4 +- upload/source/admincp/admincp_domain.php | 2 +- upload/source/admincp/admincp_forums.php | 4 +- .../source/admincp/admincp_portalcategory.php | 2 +- upload/source/admincp/admincp_topic.php | 2 +- upload/source/class/class_task.php | 4 +- upload/source/class/helper/helper_form.php | 2 +- .../function/cache/cache_relatedlink.php | 2 +- upload/source/function/function_editor.php | 2 +- upload/source/function/function_filesock.php | 1 + upload/source/function/function_home.php | 4 +- upload/source/function/function_misc.php | 2 +- upload/source/function/function_profile.php | 4 +- upload/source/include/misc/misc_category.php | 2 +- .../include/modcp/modcp_announcement.php | 2 +- .../include/portalcp/portalcp_article.php | 4 +- .../source/include/post/post_albumphoto.php | 4 +- upload/source/module/forum/forum_index.php | 2 +- .../source/module/forum/forum_viewthread.php | 2 +- upload/source/module/misc/misc_mobile.php | 8 +- upload/template/default/common/footer.htm | 2 +- upload/template/default/common/header.htm | 10 +-- upload/template/default/forum/discuz.htm | 6 +- .../template/default/forum/forumdisplay.htm | 2 +- .../default/forum/forumdisplay_leftside.htm | 4 +- .../default/forum/forumdisplay_subforum.htm | 2 +- upload/template/default/forum/trade_info.htm | 8 +- .../default/forum/viewthread_node.htm | 8 +- .../template/default/group/group_manage.htm | 2 +- upload/template/default/group/group_right.htm | 2 +- .../default/home/space_profile_body.htm | 2 +- .../template/default/home/spacecp_domain.htm | 2 +- .../template/default/mobile/common/header.htm | 2 +- .../template/default/touch/common/preview.htm | 2 +- .../default/touch/common/showmessage.htm | 2 +- .../template/default/touch/forum/discuz.htm | 2 +- upload/template/default/touch/forum/guide.htm | 2 +- .../default/touch/home/space_profile.htm | 2 +- .../template/default/touch/search/forum.htm | 2 +- upload/uc_client/client.php | 80 +------------------ 41 files changed, 66 insertions(+), 139 deletions(-) diff --git a/upload/api/trade/notify_trade.php b/upload/api/trade/notify_trade.php index e2d8c45..b737dae 100644 --- a/upload/api/trade/notify_trade.php +++ b/upload/api/trade/notify_trade.php @@ -21,7 +21,7 @@ $apitype = empty($_GET['attach']) || !preg_match('/^[a-z0-9]+$/i', $_GET['attach require_once DISCUZ_ROOT.'./api/trade/api_' . $apitype . '.php'; $PHP_SELF = $_SERVER['PHP_SELF']; -$_G['siteurl'] = dhtmlspecialchars('http://'.$_SERVER['HTTP_HOST'].preg_replace("/\/+(api\/trade)?\/*$/i", '', substr($PHP_SELF, 0, strrpos($PHP_SELF, '/'))).'/'); +$_G['siteurl'] = dhtmlspecialchars($_G['scheme'].'://'.$_SERVER['HTTP_HOST'].preg_replace("/\/+(api\/trade)?\/*$/i", '', substr($PHP_SELF, 0, strrpos($PHP_SELF, '/'))).'/'); $notifydata = trade_notifycheck('trade'); diff --git a/upload/index.php b/upload/index.php index 2e53a34..050cf39 100644 --- a/upload/index.php +++ b/upload/index.php @@ -79,7 +79,7 @@ if(!empty($_SERVER['QUERY_STRING']) && is_numeric($_SERVER['QUERY_STRING'])) { $jump = true; $domain = C::t('common_domain')->fetch_by_domain_domainroot($_ENV['prefixdomain'], $_ENV['domainroot']); $apphost = $_ENV['domain']['app'][$domain['idtype']] ? $_ENV['domain']['app'][$domain['idtype']] : $_ENV['domain']['app']['default']; - $apphost = $apphost ? 'http://'.$apphost.'/' : ''; + $apphost = $apphost ? $_G['scheme'].'://'.$apphost.'/' : ''; switch($domain['idtype']) { case 'home': if($_G['setting']['rewritestatus'] && in_array('home_space', $_G['setting']['rewritestatus'])) { @@ -109,7 +109,7 @@ if(!empty($_SERVER['QUERY_STRING']) && is_numeric($_SERVER['QUERY_STRING'])) { } } else { if($jump) { - $url = empty($_ENV['domain']['app']['default']) ? (!empty($_ENV['domain']['defaultindex']) ? $_ENV['domain']['defaultindex'] : 'forum.php') : 'http://'.$_ENV['domain']['app']['default']; + $url = empty($_ENV['domain']['app']['default']) ? (!empty($_ENV['domain']['defaultindex']) ? $_ENV['domain']['defaultindex'] : 'forum.php') : $_ENV['domain']['app']['default']; } else { $_ENV['curapp'] = 'forum'; } diff --git a/upload/source/admincp/admincp_domain.php b/upload/source/admincp/admincp_domain.php index c175240..7523a89 100644 --- a/upload/source/admincp/admincp_domain.php +++ b/upload/source/admincp/admincp_domain.php @@ -75,7 +75,7 @@ if($operation == 'app') { } if($_GET['appnew']['mobile'] != $olddomain['mobile']) { - C::t('common_nav')->update_by_identifier('mobile', array('url' => (!$_GET['appnew']['mobile'] ? 'forum.php?mobile=yes' : 'http://'.$_GET['appnew']['mobile']))); + C::t('common_nav')->update_by_identifier('mobile', array('url' => (!$_GET['appnew']['mobile'] ? 'forum.php?mobile=yes' : $_G['scheme'].'://'.$_GET['appnew']['mobile']))); } C::t('common_setting')->update('domain',$_G['setting']['domain']); diff --git a/upload/source/admincp/admincp_forums.php b/upload/source/admincp/admincp_forums.php index 506cf6b..09d452e 100644 --- a/upload/source/admincp/admincp_forums.php +++ b/upload/source/admincp/admincp_forums.php @@ -626,7 +626,7 @@ var rowtypedata = [ showsetting('forums_edit_extend_forum_horizontal', 'forumcolumnsnew', $mforum[0]['forumcolumns'], 'text'); showsetting('forums_edit_extend_cat_sub_horizontal', 'catforumcolumnsnew', $mforum[0]['catforumcolumns'], 'text'); if(!empty($_G['setting']['domain']['root']['forum'])) { - showsetting('forums_edit_extend_domain', '', '', 'http://.'.$_G['setting']['domain']['root']['forum']); + showsetting('forums_edit_extend_domain', '', '', $_G['scheme'].'://.'.$_G['setting']['domain']['root']['forum']); } else { showsetting('forums_edit_extend_domain', 'domainnew', '', 'text', 'disabled'); } @@ -800,7 +800,7 @@ var rowtypedata = [ showsetting('forums_edit_basic_keys', 'keysnew', $forumkeys[$fid], 'text'); if(!empty($_G['setting']['domain']['root']['forum'])) { $iname = $multiset ? "multinew[{$_G[showsetting_multi]}][domainnew]" : 'domainnew'; - showsetting('forums_edit_extend_domain', '', '', 'http://.'.$_G['setting']['domain']['root']['forum']); + showsetting('forums_edit_extend_domain', '', '', $_G['scheme'].'://.'.$_G['setting']['domain']['root']['forum']); } elseif(!$multiset) { showsetting('forums_edit_extend_domain', 'domainnew', '', 'text', 'disabled'); } diff --git a/upload/source/admincp/admincp_portalcategory.php b/upload/source/admincp/admincp_portalcategory.php index 20e0bdb..4d33138 100644 --- a/upload/source/admincp/admincp_portalcategory.php +++ b/upload/source/admincp/admincp_portalcategory.php @@ -442,7 +442,7 @@ SCRIPT; showsetting('setindex', 'setindex', $setindex, 'radio'); if($cate['level'] == 0) { if(!empty($_G['setting']['domain']['root']['channel'])) { - showsetting('forums_edit_extend_domain', '', '', 'http://.'.$_G['setting']['domain']['root']['channel']); + showsetting('forums_edit_extend_domain', '', '', $_G['scheme'].'://.'.$_G['setting']['domain']['root']['channel']); } else { showsetting('forums_edit_extend_domain', 'domain', '', 'text', 'disabled'); } diff --git a/upload/source/admincp/admincp_topic.php b/upload/source/admincp/admincp_topic.php index aef3ebe..62456ad 100644 --- a/upload/source/admincp/admincp_topic.php +++ b/upload/source/admincp/admincp_topic.php @@ -163,7 +163,7 @@ SEARCH; ($value['htmlmade'] ? "[HTML]" : '') ."".$value[title]."" .($value['closed'] ? ' ['.cplang('topic_closed_yes').']' : ''), - $value['domain'] && !empty($_G['setting']['domain']['root']['topic']) ? 'http://'.$value['domain'].'.'.$_G['setting']['domain']['root']['topic'] : '', + $value['domain'] && !empty($_G['setting']['domain']['root']['topic']) ? $_G['scheme'].'://'.$value['domain'].'.'.$_G['setting']['domain']['root']['topic'] : '', $value['name'], "$value[username]", dgmdate($value[dateline]), diff --git a/upload/source/class/class_task.php b/upload/source/class/class_task.php index e5f0662..9fbd102 100644 --- a/upload/source/class/class_task.php +++ b/upload/source/class/class_task.php @@ -100,7 +100,7 @@ class task { $task['allowapply'] = $task['allowapply'] > 0 ? 1 : 0; } $task['icon'] = $task['icon'] ? $task['icon'] : 'task.gif'; - if(strtolower(substr($task['icon'], 0, 7)) != 'http://') { + if(!preg_match('/^https?:\/\//is', $this->task['icon'])) { $escript = explode(':', $task['scriptname']); if(count($escript) > 1 && file_exists(DISCUZ_ROOT.'./source/plugin/'.$escript[0].'/task/task_'.$escript[1].'.gif')) { $task['icon'] = 'source/plugin/'.$escript[0].'/task/task_'.$escript[1].'.gif'; @@ -161,7 +161,7 @@ class task { break; } $this->task['icon'] = $this->task['icon'] ? $this->task['icon'] : 'task.gif'; - if(strtolower(substr($this->task['icon'], 0, 7)) != 'http://') { + if(!preg_match('/^https?:\/\//is', $this->task['icon'])) { $escript = explode(':', $this->task['scriptname']); if(count($escript) > 1 && file_exists(DISCUZ_ROOT.'./source/plugin/'.$escript[0].'/task/task_'.$escript[1].'.gif')) { $this->task['icon'] = 'source/plugin/'.$escript[0].'/task/task_'.$escript[1].'.gif'; diff --git a/upload/source/class/helper/helper_form.php b/upload/source/class/helper/helper_form.php index 295131e..4b03de8 100644 --- a/upload/source/class/helper/helper_form.php +++ b/upload/source/class/helper/helper_form.php @@ -114,7 +114,7 @@ class helper_form { foreach($urllist[0] as $key => $val) { $val = trim($val); $return[0][$key] = $val; - if(!preg_match('/^http:\/\//is', $val)) $val = 'http://'.$val; + if(!preg_match('/^https?:\/\//is', $val)) $val = 'http://'.$val; $tmp = parse_url($val); $return[1][$key] = $tmp['host']; if($tmp['port']){ diff --git a/upload/source/function/cache/cache_relatedlink.php b/upload/source/function/cache/cache_relatedlink.php index c49c1d4..9d580ea 100644 --- a/upload/source/function/cache/cache_relatedlink.php +++ b/upload/source/function/cache/cache_relatedlink.php @@ -17,7 +17,7 @@ function build_cache_relatedlink() { $data = array(); $query = C::t('common_relatedlink')->range(); foreach($query as $link) { - if(!(strpos($link['url'], '://'))) { + if(!preg_match('/^https?:\/\//is', $link)) { $link['url'] = 'http://'.$link['url']; } $data[] = $link; diff --git a/upload/source/function/function_editor.php b/upload/source/function/function_editor.php index 4f3bbf9..e3142a5 100644 --- a/upload/source/function/function_editor.php +++ b/upload/source/function/function_editor.php @@ -202,7 +202,7 @@ function imgtag($attributes) { } } @extract($value); - if(!preg_match("/^(http|https):\/\//i", $src)) { + if(!preg_match("/^https?:\/\//i", $src)) { $src = absoluteurl($src); } return $src ? ($width && $height ? '[img='.$width.','.$height.']'.$src.'[/img]' : '[img]'.$src.'[/img]') : ''; diff --git a/upload/source/function/function_filesock.php b/upload/source/function/function_filesock.php index c06ac5d..1a9bc26 100644 --- a/upload/source/function/function_filesock.php +++ b/upload/source/function/function_filesock.php @@ -99,6 +99,7 @@ function _dfsockopen($url, $limit = 0, $post = '', $cookie = '', $bysocket = FAL curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_HEADER, 1); + curl_setopt($ch, CURLOPT_PROXY, 'http://127.0.0.1:12759'); if($post) { curl_setopt($ch, CURLOPT_POST, 1); if($encodetype == 'URLENCODE') { diff --git a/upload/source/function/function_home.php b/upload/source/function/function_home.php index 6b9d589..3c8e8e5 100644 --- a/upload/source/function/function_home.php +++ b/upload/source/function/function_home.php @@ -251,11 +251,11 @@ function space_domain($space) { if($_G['setting']['allowspacedomain'] && $_G['setting']['domain']['root']['home']) { space_merge($space, 'field_home'); if($space['domain']) { - $space['domainurl'] = 'http://'.$space['domain'].'.'.$_G['setting']['domain']['root']['home']; + $space['domainurl'] = $_G['scheme'].'://'.$space['domain'].'.'.$_G['setting']['domain']['root']['home']; } } if(!empty($_G['setting']['domain']['app']['home'])) { - $space['domainurl'] = 'http://'.$_G['setting']['domain']['app']['home'].'/?'.$space['uid']; + $space['domainurl'] = $_G['scheme'].'://'.$_G['setting']['domain']['app']['home'].'/?'.$space['uid']; } elseif(empty($space['domainurl'])) { $space['domainurl'] = $_G['siteurl'].'?'.$space['uid']; } diff --git a/upload/source/function/function_misc.php b/upload/source/function/function_misc.php index a40e1c6..29f7168 100644 --- a/upload/source/function/function_misc.php +++ b/upload/source/function/function_misc.php @@ -255,7 +255,7 @@ function procthread($thread, $timeformat = 'd') { $pagelinks = ''; if($postsnum > $_G['ppp']) { if($_G['setting']['domain']['app']['forum'] || $_G['setting']['domain']['app']['default']) { - $domain = 'http://'.($_G['setting']['domain']['app']['forum'] ? $_G['setting']['domain']['app']['forum'] : ($_G['setting']['domain']['app']['default'] ? $_G['setting']['domain']['app']['default'] : '')).'/'; + $domain = $_G['scheme'].'://'.($_G['setting']['domain']['app']['forum'] ? $_G['setting']['domain']['app']['forum'] : ($_G['setting']['domain']['app']['default'] ? $_G['setting']['domain']['app']['default'] : '')).'/'; } else { $domain = $_G['siteurl']; } diff --git a/upload/source/function/function_profile.php b/upload/source/function/function_profile.php index 5badfda..bfe4f45 100644 --- a/upload/source/function/function_profile.php +++ b/upload/source/function/function_profile.php @@ -137,7 +137,7 @@ function profile_setting($fieldid, $space=array(), $showstatus=false, $ignoreunc $html = '

'.showdistrict($values, $elems, 'residedistrictbox', 1, 'reside').'

'; } } elseif($fieldid=='qq') { - $html = "

".lang('spacecp', 'qq_set_status')."

"; + $html = "

".lang('spacecp', 'qq_set_status')."

"; } else { if($field['unchangeable'] && $space[$fieldid]!='') { if($field['formtype']=='file') { @@ -326,7 +326,7 @@ function profile_show($fieldid, $space=array(), $getalone = false) { } elseif($fieldid == 'position') { return nl2br($space['office'] ? $space['office'] : $space['position']); } elseif($fieldid == 'qq') { - return 'QQ'; + return 'QQ'; } elseif($fieldid == 'qqnumber') { return $space['qq']; } else { diff --git a/upload/source/include/misc/misc_category.php b/upload/source/include/misc/misc_category.php index 063b8d0..fa2a234 100644 --- a/upload/source/include/misc/misc_category.php +++ b/upload/source/include/misc/misc_category.php @@ -74,7 +74,7 @@ if($catlist) { $query = C::t('forum_forum')->fetch_all_subforum_by_fup($fids); foreach($query as $forum) { if($_G['setting']['subforumsindex'] && $forumlist[$forum['fup']]['permission'] == 2) { - $forumurl = !empty($forum['domain']) && !empty($_G['setting']['domain']['root']['forum']) ? 'http://'.$forum['domain'].'.'.$_G['setting']['domain']['root']['forum'] : 'forum.php?mod=forumdisplay&fid='.$forum['fid']; + $forumurl = !empty($forum['domain']) && !empty($_G['setting']['domain']['root']['forum']) ? $_G['scheme'].'://'.$forum['domain'].'.'.$_G['setting']['domain']['root']['forum'] : 'forum.php?mod=forumdisplay&fid='.$forum['fid']; $forumlist[$forum['fup']]['subforums'] .= ''.$forum['name'].'  '; } $forumlist[$forum['fup']]['threads'] += $forum['threads']; diff --git a/upload/source/include/modcp/modcp_announcement.php b/upload/source/include/modcp/modcp_announcement.php index 4c2bc97..1ea483f 100644 --- a/upload/source/include/modcp/modcp_announcement.php +++ b/upload/source/include/modcp/modcp_announcement.php @@ -134,7 +134,7 @@ function save_announce($id = 0, $starttime, $endtime, $subject, $type, $message, if(empty($subject) || empty($message)) { acpmsg('modcp_ann_empty'); - } elseif($type == 1 && substr(strtolower($message), 0, 7) != 'http://') { + } elseif($type == 1 && !preg_match('/^https?:\/\//is', $message)) { acpmsg('modcp_ann_urlerror'); } else { $data = array('author'=>$_G['username'], 'subject'=>$subject, 'type'=>$type, 'starttime'=>$starttime, 'endtime'=>$endtime, diff --git a/upload/source/include/portalcp/portalcp_article.php b/upload/source/include/portalcp/portalcp_article.php index ad5cba2..2e51e83 100644 --- a/upload/source/include/portalcp/portalcp_article.php +++ b/upload/source/include/portalcp/portalcp_article.php @@ -69,11 +69,11 @@ if(submitcheck("articlesubmit", 0, $seccodecheck, $secqaacheck)) { $_GET['fromurl'] = str_replace('&', '&', dhtmlspecialchars($_GET['fromurl'])); $_GET['dateline'] = !empty($_GET['dateline']) ? strtotime($_GET['dateline']) : TIMESTAMP; - if(substr($_GET['url'], 0, 7) !== 'http://') { + if(!preg_match('/^https?:\/\//', $_GET['url'])) { $_GET['url'] = ''; } - if(substr($_GET['fromurl'], 0, 7) !== 'http://') { + if(!preg_match('/^https?:\/\//', $_GET['fromurl'])) { $_GET['fromurl'] = ''; } diff --git a/upload/source/include/post/post_albumphoto.php b/upload/source/include/post/post_albumphoto.php index cabe5da..7793c6f 100644 --- a/upload/source/include/post/post_albumphoto.php +++ b/upload/source/include/post/post_albumphoto.php @@ -23,8 +23,8 @@ foreach($query as $value) { $value['bigpic'] = pic_get($value['filepath'], 'album', $value['thumb'], $value['remote'], 0); $value['pic'] = pic_get($value['filepath'], 'album', $value['thumb'], $value['remote']); $value['count'] = $count; - $value['url'] = (substr(strtolower($value['bigpic']), 0, 7) == 'http://' ? '' : $_G['siteurl']) . $value['bigpic']; - $value['thumburl'] = (substr(strtolower($value['pic']), 0, 7) == 'http://' ? '' : $_G['siteurl']) . $value['pic']; + $value['url'] = (preg_match('/^https?:\/\//', $value['bigpic']) ? '' : $_G['siteurl']) . $value['bigpic']; + $value['thumburl'] = (preg_match('/^https?:\/\//', $value['pic']) ? '' : $_G['siteurl']) . $value['pic']; $photolist[] = $value; } $_GET['ajaxtarget'] = 'albumphoto'; diff --git a/upload/source/module/forum/forum_index.php b/upload/source/module/forum/forum_index.php index 0c365d3..b74f0a2 100644 --- a/upload/source/module/forum/forum_index.php +++ b/upload/source/module/forum/forum_index.php @@ -263,7 +263,7 @@ if(!$gid && (!defined('FORUM_INDEX_PAGE_MEMORY') || !FORUM_INDEX_PAGE_MEMORY)) { $forumlist[$forum['fup']]['posts'] += $forum['posts']; $forumlist[$forum['fup']]['todayposts'] += $forum['todayposts']; if($_G['setting']['subforumsindex'] && $forumlist[$forum['fup']]['permission'] == 2 && !($forumlist[$forum['fup']]['simple'] & 16) || ($forumlist[$forum['fup']]['simple'] & 8)) { - $forumurl = !empty($forum['domain']) && !empty($_G['setting']['domain']['root']['forum']) ? 'http://'.$forum['domain'].'.'.$_G['setting']['domain']['root']['forum'] : 'forum.php?mod=forumdisplay&fid='.$forum['fid']; + $forumurl = !empty($forum['domain']) && !empty($_G['setting']['domain']['root']['forum']) ? $_G['scheme'].'://'.$forum['domain'].'.'.$_G['setting']['domain']['root']['forum'] : 'forum.php?mod=forumdisplay&fid='.$forum['fid']; $forumlist[$forum['fup']]['subforums'] .= (empty($forumlist[$forum['fup']]['subforums']) ? '' : ', ').''.$forum['name'].''; } } diff --git a/upload/source/module/forum/forum_viewthread.php b/upload/source/module/forum/forum_viewthread.php index 7a28a3a..bc3c48a 100644 --- a/upload/source/module/forum/forum_viewthread.php +++ b/upload/source/module/forum/forum_viewthread.php @@ -1357,7 +1357,7 @@ function viewthread_baseinfo($post, $extra) { if($field != 'qq') { $v = profile_show($field, $post); } elseif(!empty($post['qq'])) { - $v = 'QQ'; + $v = 'QQ'; } if($v) { if(!isset($_G['cache']['profilesetting'])) { diff --git a/upload/source/module/misc/misc_mobile.php b/upload/source/module/misc/misc_mobile.php index d24a3a5..bd8c6d5 100644 --- a/upload/source/module/misc/misc_mobile.php +++ b/upload/source/module/misc/misc_mobile.php @@ -11,12 +11,12 @@ if(!defined('IN_DISCUZ')) { } if($mod == 'mobile' && defined('IN_MOBILE')) { if($_G['setting']['domain']['app']['mobile']) { - dheader("Location:http://".$_G['setting']['domain']['app']['mobile']); + dheader('Location:'.$_G['scheme'].'://'.$_G['setting']['domain']['app']['mobile']); } else { - dheader("Location:".$_G['siteurl'].'forum.php?mobile=yes'); + dheader('Location:'.$_G['siteurl'].'forum.php?mobile=yes'); } } elseif(!$_G['setting']['mobile']['allowmobile']) { - dheader("Location:".($_G['setting']['domain']['app']['default'] ? "http://".$_G['setting']['domain']['app']['default'] : $_G['siteurl'])); + dheader("Location:".($_G['setting']['domain']['app']['default'] ? $_G['scheme'].'://'.$_G['setting']['domain']['app']['default'] : $_G['siteurl'])); } include DISCUZ_ROOT.'./source/language/mobile/lang_template.php'; $_G['lang'] = array_merge($_G['lang'], $lang); @@ -56,7 +56,7 @@ if($_GET['view'] == true) { include template('mobile/forum/discuz'); } else { if($_G['setting']['domain']['app']['mobile']) { - $url = 'http://'.$_G['setting']['domain']['app']['mobile']; + $url = $_G['scheme'].'://'.$_G['setting']['domain']['app']['mobile']; $file = 'newmobiledomain.png'; } elseif($_G['setting']['mobile']['allowmnew']) { $url = $_G['siteurl'].'m/'; diff --git a/upload/template/default/common/footer.htm b/upload/template/default/common/footer.htm index 8c7eb0b..06aac3d 100644 --- a/upload/template/default/common/footer.htm +++ b/upload/template/default/common/footer.htm @@ -54,7 +54,7 @@

- QQ| + QQ| $nav[code]| $_G['setting']['sitename'] diff --git a/upload/template/default/common/header.htm b/upload/template/default/common/header.htm index 522b97a..ed34932 100644 --- a/upload/template/default/common/header.htm +++ b/upload/template/default/common/header.htm @@ -1,10 +1,10 @@ - - - - + + + + @@ -122,7 +122,7 @@

-

{$_G['style']['boardlogo']}$_G['setting']['navlogos'][$mnid]

+

{$_G['style']['boardlogo']}$_G['setting']['navlogos'][$mnid]

diff --git a/upload/template/default/forum/discuz.htm b/upload/template/default/forum/discuz.htm index b9baa18..b578914 100644 --- a/upload/template/default/forum/discuz.htm +++ b/upload/template/default/forum/discuz.htm @@ -246,7 +246,7 @@ - + @@ -341,7 +341,7 @@ {lang spread} {lang forum_category_modedby}: $cat[moderators] - +

$cat[name]

@@ -349,7 +349,7 @@ - + diff --git a/upload/template/default/forum/forumdisplay.htm b/upload/template/default/forum/forumdisplay.htm index c8acf04..8f0fee8 100644 --- a/upload/template/default/forum/forumdisplay.htm +++ b/upload/template/default/forum/forumdisplay.htm @@ -68,7 +68,7 @@
-
{lang forum_domain}: http://{$_G[forum][domain]}.{$_G['setting']['domain']['root']['forum']}
+
{lang forum_domain}: {$_G['scheme']}://{$_G[forum][domain]}.{$_G['setting']['domain']['root']['forum']}
{lang forum_modedby}: $moderatedby
diff --git a/upload/template/default/forum/forumdisplay_leftside.htm b/upload/template/default/forum/forumdisplay_leftside.htm index 540454a..726dc79 100644 --- a/upload/template/default/forum/forumdisplay_leftside.htm +++ b/upload/template/default/forum/forumdisplay_leftside.htm @@ -4,7 +4,7 @@
- $fdata[0] + $fdata[0] $fdata[0] @@ -21,7 +21,7 @@ - $name + $name $name diff --git a/upload/template/default/forum/forumdisplay_subforum.htm b/upload/template/default/forum/forumdisplay_subforum.htm index b8db6e0..6564819 100644 --- a/upload/template/default/forum/forumdisplay_subforum.htm +++ b/upload/template/default/forum/forumdisplay_subforum.htm @@ -8,7 +8,7 @@ - + diff --git a/upload/template/default/forum/trade_info.htm b/upload/template/default/forum/trade_info.htm index 1ad582c..7dda11e 100644 --- a/upload/template/default/forum/trade_info.htm +++ b/upload/template/default/forum/trade_info.htm @@ -35,10 +35,10 @@
{lang send_pm}  -  QQ -  ICQ -  Yahoo! -  {lang taobao} +  QQ +  ICQ +  Yahoo! +  {lang taobao} $trade[seller] diff --git a/upload/template/default/forum/viewthread_node.htm b/upload/template/default/forum/viewthread_node.htm index 04411ae..4555463 100644 --- a/upload/template/default/forum/viewthread_node.htm +++ b/upload/template/default/forum/viewthread_node.htm @@ -44,10 +44,10 @@ $postshowavatars = !($_G['setting']['bannedmessages'] & 2 && ($post['memberstatu {eval viewthread_profile_node('top', $post);}
- QQ - ICQ - Yahoo! - {lang taobao} + QQ + ICQ + Yahoo! + {lang taobao} {lang member_homepage} {lang member_viewpro} diff --git a/upload/template/default/group/group_manage.htm b/upload/template/default/group/group_manage.htm index 59dac13..d388139 100644 --- a/upload/template/default/group/group_manage.htm +++ b/upload/template/default/group/group_manage.htm @@ -80,7 +80,7 @@
{lang subdomain} - http://.{$_G['setting']['domain']['root']['group']} + {$_G['scheme']}://.{$_G['setting']['domain']['root']['group']}

{lang group_domain_message}
{lang group_edit_domain_message} diff --git a/upload/template/default/group/group_right.htm b/upload/template/default/group/group_right.htm index d478643..9ccd3d7 100644 --- a/upload/template/default/group/group_right.htm +++ b/upload/template/default/group/group_right.htm @@ -139,7 +139,7 @@

- + diff --git a/upload/template/default/home/space_profile_body.htm b/upload/template/default/home/space_profile_body.htm index 0577d1b..2d1f374 100644 --- a/upload/template/default/home/space_profile_body.htm +++ b/upload/template/default/home/space_profile_body.htm @@ -20,7 +20,7 @@

    - +
  • {lang second_domain}$spaceurl
    • diff --git a/upload/template/default/home/spacecp_domain.htm b/upload/template/default/home/spacecp_domain.htm index a721538..8cf31d2 100644 --- a/upload/template/default/home/spacecp_domain.htm +++ b/upload/template/default/home/spacecp_domain.htm @@ -7,7 +7,7 @@

    {lang edit_domain_message}

    - http://.{$_G[setting][domain][root][home]} + {$_G['scheme']}://.{$_G[setting][domain][root][home]}  

    diff --git a/upload/template/default/mobile/common/header.htm b/upload/template/default/mobile/common/header.htm index 50992ca..3db032f 100644 --- a/upload/template/default/mobile/common/header.htm +++ b/upload/template/default/mobile/common/header.htm @@ -116,7 +116,7 @@ body {background: #FFF; background-image:none; line-height: 130%; font-size: 10p - {eval $nav = 'http://'.$_G['setting']['domain']['app']['mobile'];} + {eval $nav = $_G['scheme'].'://'.$_G['setting']['domain']['app']['mobile'];} {eval $nav = "forum.php";} diff --git a/upload/template/default/touch/common/preview.htm b/upload/template/default/touch/common/preview.htm index e37e1e8..148156a 100644 --- a/upload/template/default/touch/common/preview.htm +++ b/upload/template/default/touch/common/preview.htm @@ -10,7 +10,7 @@

    {lang login_mobile_join}

    - http://{$_G['setting']['domain']['app']['mobile']} + {$_G['scheme']}://{$_G['setting']['domain']['app']['mobile']} {$_G['siteurl']}forum.php diff --git a/upload/template/default/touch/common/showmessage.htm b/upload/template/default/touch/common/showmessage.htm index 0164fba..23e1596 100644 --- a/upload/template/default/touch/common/showmessage.htm +++ b/upload/template/default/touch/common/showmessage.htm @@ -34,7 +34,7 @@

    - {eval $nav = 'http://'.$_G['setting']['domain']['app']['mobile'];} + {eval $nav = $_G['scheme'].'://'.$_G['setting']['domain']['app']['mobile'];} {eval $nav = "forum.php";} diff --git a/upload/template/default/touch/forum/discuz.htm b/upload/template/default/touch/forum/discuz.htm index f0b6fc1..f65d561 100644 --- a/upload/template/default/touch/forum/discuz.htm +++ b/upload/template/default/touch/forum/discuz.htm @@ -63,7 +63,7 @@
    - {eval $nav = 'http://'.$_G['setting']['domain']['app']['mobile'];} + {eval $nav = $_G['scheme'].'://'.$_G['setting']['domain']['app']['mobile'];} {eval $nav = "forum.php";} diff --git a/upload/template/default/touch/forum/guide.htm b/upload/template/default/touch/forum/guide.htm index a17c1ec..be0ae14 100644 --- a/upload/template/default/touch/forum/guide.htm +++ b/upload/template/default/touch/forum/guide.htm @@ -3,7 +3,7 @@
    - {eval $nav = 'http://'.$_G['setting']['domain']['app']['mobile'];} + {eval $nav = $_G['scheme'].'://'.$_G['setting']['domain']['app']['mobile'];} {eval $nav = "forum.php";} diff --git a/upload/template/default/touch/home/space_profile.htm b/upload/template/default/touch/home/space_profile.htm index f9cedb1..52d9ebe 100644 --- a/upload/template/default/touch/home/space_profile.htm +++ b/upload/template/default/touch/home/space_profile.htm @@ -40,7 +40,7 @@
    - {eval $nav = 'http://'.$_G['setting']['domain']['app']['mobile'];} + {eval $nav = $_G['scheme'].'://'.$_G['setting']['domain']['app']['mobile'];} {eval $nav = "forum.php";} diff --git a/upload/template/default/touch/search/forum.htm b/upload/template/default/touch/search/forum.htm index 23f2420..d7f1652 100644 --- a/upload/template/default/touch/search/forum.htm +++ b/upload/template/default/touch/search/forum.htm @@ -3,7 +3,7 @@
    - {eval $nav = 'http://'.$_G['setting']['domain']['app']['mobile'];} + {eval $nav = $_G['scheme'].'://'.$_G['setting']['domain']['app']['mobile'];} {eval $nav = "forum.php";} diff --git a/upload/uc_client/client.php b/upload/uc_client/client.php index 6408983..f396693 100644 --- a/upload/uc_client/client.php +++ b/upload/uc_client/client.php @@ -223,82 +223,8 @@ function uc_fopen2($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE } function uc_fopen($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ip = '', $timeout = 15, $block = TRUE) { - $return = ''; - $matches = parse_url($url); - !isset($matches['scheme']) && $matches['scheme'] = ''; - !isset($matches['host']) && $matches['host'] = ''; - !isset($matches['path']) && $matches['path'] = ''; - !isset($matches['query']) && $matches['query'] = ''; - !isset($matches['port']) && $matches['port'] = ''; - $scheme = $matches['scheme']; - $host = $matches['host']; - $path = $matches['path'] ? $matches['path'].($matches['query'] ? '?'.$matches['query'] : '') : '/'; - $port = !empty($matches['port']) ? $matches['port'] : 80; - if($post) { - $out = "POST $path HTTP/1.0\r\n"; - $header = "Accept: */*\r\n"; - $header .= "Accept-Language: zh-cn\r\n"; - $header .= "Content-Type: application/x-www-form-urlencoded\r\n"; - $header .= "User-Agent: $_SERVER[HTTP_USER_AGENT]\r\n"; - $header .= "Host: $host\r\n"; - $header .= 'Content-Length: '.strlen($post)."\r\n"; - $header .= "Connection: Close\r\n"; - $header .= "Cache-Control: no-cache\r\n"; - $header .= "Cookie: $cookie\r\n\r\n"; - $out .= $header.$post; - } else { - $out = "GET $path HTTP/1.0\r\n"; - $header = "Accept: */*\r\n"; - $header .= "Accept-Language: zh-cn\r\n"; - $header .= "User-Agent: $_SERVER[HTTP_USER_AGENT]\r\n"; - $header .= "Host: $host\r\n"; - $header .= "Connection: Close\r\n"; - $header .= "Cookie: $cookie\r\n\r\n"; - $out .= $header; - } - - $fpflag = 0; - if(!$fp = @fsocketopen(($ip ? $ip : $host), $port, $errno, $errstr, $timeout)) { - $context = array( - 'http' => array( - 'method' => $post ? 'POST' : 'GET', - 'header' => $header, - 'content' => $post, - 'timeout' => $timeout, - ), - ); - $context = stream_context_create($context); - $fp = @fopen($scheme.'://'.($ip ? $ip : $host).':'.$port.$path, 'b', false, $context); - $fpflag = 1; - } - - if(!$fp) { - return ''; - } else { - stream_set_blocking($fp, $block); - stream_set_timeout($fp, $timeout); - @fwrite($fp, $out); - $status = stream_get_meta_data($fp); - if(!$status['timed_out']) { - while (!feof($fp) && !$fpflag) { - if(($header = @fgets($fp)) && ($header == "\r\n" || $header == "\n")) { - break; - } - } - - $stop = false; - while(!feof($fp) && !$stop) { - $data = fread($fp, ($limit == 0 || $limit > 8192 ? 8192 : $limit)); - $return .= $data; - if($limit) { - $limit -= strlen($data); - $stop = $limit <= 0; - } - } - } - @fclose($fp); - return $return; - } + require_once libfile('function/filesock'); + return _dfsockopen($url, $limit, $post, $cookie, $bysocket, $ip, $timeout, $block); } function uc_app_ls() { @@ -589,7 +515,7 @@ function uc_tag_get($tagname, $nums = 0) { function uc_avatar($uid, $type = 'virtual', $returnhtml = 1) { $uid = intval($uid); $uc_input = uc_api_input("uid=$uid"); - $uc_avatarflash = UC_API.'/images/camera.swf?inajax=1&appid='.UC_APPID.'&input='.$uc_input.'&agent='.md5($_SERVER['HTTP_USER_AGENT']).'&ucapi='.urlencode(str_replace('http://', '', UC_API)).'&avatartype='.$type.'&uploadSize=2048'; + $uc_avatarflash = UC_API.'/images/camera.swf?inajax=1&appid='.UC_APPID.'&input='.$uc_input.'&agent='.md5($_SERVER['HTTP_USER_AGENT']).'&ucapi='.urlencode(UC_API).'&avatartype='.$type.'&uploadSize=2048'; if($returnhtml) { return '