diff --git a/src/admin/templets/sys_payment_install.htm b/src/admin/templets/sys_payment_install.htm index a66863ae..fb67aa49 100644 --- a/src/admin/templets/sys_payment_install.htm +++ b/src/admin/templets/sys_payment_install.htm @@ -28,7 +28,7 @@ 手续费: - value=""> 元 + 元 货到付款: diff --git a/src/system/common.func.php b/src/system/common.func.php index fa70d5ff..34396c9a 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -474,12 +474,10 @@ function GetUpdateSQL() $sqls = array(); $current_ver = $matches[1]; } - if (preg_match("#;$#", $line)) - { + if (preg_match("#;$#", $line)) { $query .= $line."\n"; $query = str_replace('#@__',$cfg_dbprefix,$query); - if ( $cfg_dbtype == 'sqlite' ) - { + if ($cfg_dbtype == 'sqlite') { $query = preg_replace('/character set (.*?) /i','',$query); $query = preg_replace('/unsigned/i','',$query); $query = str_replace('TYPE=MyISAM','',$query); @@ -493,23 +491,20 @@ function GetUpdateSQL() $query = preg_replace('/,([\t\s ]+)UNIQUE KEY(.*?);/',');',$query); $query = preg_replace('/set\(([^\)]*?)\)/','varchar',$query); $query = preg_replace('/enum\(([^\)]*?)\)/','varchar',$query); - if ( preg_match("/PRIMARY KEY AUTOINCREMENT/",$query) ) - { + if (preg_match("/PRIMARY KEY AUTOINCREMENT/",$query)) { $query = preg_replace('/,([\t\s ]+)PRIMARY KEY([\t\s ]+)\(`([0-9a-zA-Z]+)`\)/i','',$query); } $sqls[] = $query; // $db->exec($query); } else { - if (preg_match('#CREATE#i', $query)) - { + if (preg_match('#CREATE#i', $query)) { $sqls[] = preg_replace("#TYPE=MyISAM#i",$sql4tmp,$query); } else { $sqls[] = $query; } } $query=''; - } else if (!preg_match("#^(\/\/|--)#", $line)) - { + } else if (!preg_match("#^(\/\/|--)#", $line)) { $query .= $line; } } @@ -528,7 +523,7 @@ function GetMemberInfos($fields, $mid) } else { $row=$dsql->GetOne("SELECT * FROM `#@__member` WHERE mid='{$mid}'"); if (!is_array($row)) { - $revalue = "Not user"; + $revalue = "未命名"; } else { $revalue = $row[$fields]; } @@ -617,7 +612,7 @@ function AddFilter($channelid, $type=1, $fieldsnamef=array(), $defaulttid=0, $to $tid = $toptid==0 ? $tidsq["typeid"] : $tidsq["topid"]; } $nofilter = (isset($_REQUEST['TotalResult']) ? "&TotalResult=".$_REQUEST['TotalResult'] : '').(isset($_REQUEST['PageNo']) ? "&PageNo=".$_REQUEST['PageNo'] : ''); - $filterarr = string_filter(stripos($_SERVER['REQUEST_URI'], "list.php?tid=") ? str_replace($nofilter, '', $_SERVER['REQUEST_URI']) : $GLOBALS['cfg_cmsurl']."/plus/list.php?tid=".$tid); + $filterarr = string_filter(stripos($_SERVER['REQUEST_URI'], "list.php?tid=") ? str_replace($nofilter, '', $_SERVER['REQUEST_URI']) : $GLOBALS['cfg_cmsurl']."/apps/list.php?tid=".$tid); $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'"); $fieldset=$cInfos['fieldset']; $dtp = new DedeTagParse(); @@ -656,7 +651,7 @@ function AddFilter($channelid, $type=1, $fieldsnamef=array(), $defaulttid=0, $to '; break; case 3: - $dede_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? 'GetName()."=".$fields_value,"",$filterarr).'">GetName()."=".$fields_value,"",$filterarr).'" onclick="window.location=this.value">全部' : '全部'); + $dede_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? 'GetName()."=".$fields_value,"",$filterarr).'">GetName()."=".$fields_value,"",$filterarr).'" onclick="window.location=this.value">全部' : '全部'); $addonfields_items = explode(",",$ctag->GetAtt('default')); for ($i=0; $i