diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index eb40e1b3..f2e9f568 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -106,8 +106,8 @@ GetOptionArray(0,0,0); - echo ""; + echo ""; echo $typeOptions; echo ""; ?> diff --git a/src/admin/templets/ad_edit.htm b/src/admin/templets/ad_edit.htm index 0585fe19..1042712c 100644 --- a/src/admin/templets/ad_edit.htm +++ b/src/admin/templets/ad_edit.htm @@ -72,8 +72,8 @@ GetOptionArray($row['typeid'],0,0); - echo ""; + echo ""; echo $typeOptions; echo ""; ?> diff --git a/src/admin/templets/cards_make.htm b/src/admin/templets/cards_make.htm index 82c1f47b..4e3e0919 100644 --- a/src/admin/templets/cards_make.htm +++ b/src/admin/templets/cards_make.htm @@ -35,7 +35,7 @@ $dsql->SetQuery("Select * From #@__moneycard_type"); $dsql->Execute(); while($row=$dsql->GetArray()){ - echo " \r\n"; + echo " "; } $dsql->Close(); ?> diff --git a/src/admin/templets/diy_edit_content.htm b/src/admin/templets/diy_edit_content.htm index bb221eb5..74be2f57 100644 --- a/src/admin/templets/diy_edit_content.htm +++ b/src/admin/templets/diy_edit_content.htm @@ -28,7 +28,7 @@ if($row[$field]=='') continue; if($fielddata[1]=='img') { - $row[$field] = " 浏览原图 删除原图\r\n"; + $row[$field] = " 浏览原图 删除原图"; } else if($fielddata[1]=='addon') { diff --git a/src/admin/templets/diy_field_add.htm b/src/admin/templets/diy_field_add.htm index 15f24787..83bb0e78 100644 --- a/src/admin/templets/diy_field_add.htm +++ b/src/admin/templets/diy_field_add.htm @@ -52,7 +52,7 @@ function GetFields() } if(spage=="no") spage = ""; revalue = "\r\n"+vinnertext+"\r\n"; + revalue += " maxlength=\""+maxlength+"\" page=\""+spage+"\">"+vinnertext+""; document.form1.fieldstring.value = revalue; return true; } diff --git a/src/admin/templets/diy_field_edit.htm b/src/admin/templets/diy_field_edit.htm index 1266640f..0980702a 100644 --- a/src/admin/templets/diy_field_edit.htm +++ b/src/admin/templets/diy_field_edit.htm @@ -36,7 +36,7 @@ function GetFields() if(spage=="no") spage = ""; revalue = "\r\n"+vinnertext+"\r\n"; + revalue += " maxlength=\""+maxlength+"\" page=\""+spage+"\">"+vinnertext+""; document.form1.fieldstring.value = revalue; return true; @@ -90,10 +90,10 @@ td{ padding:6px; padding-left:6px; } $dtype = $ctag->GetAtt('type'); if($dtype!='' && isset($fieldtypes[$dtype])) { - echo "\r\n"; + echo ""; $canchange = true; } else { - echo "\r\n"; + echo ""; $canchange = false; } if($canchange) diff --git a/src/admin/templets/diy_list.htm b/src/admin/templets/diy_list.htm index 1feeb80a..bbdc7682 100644 --- a/src/admin/templets/diy_list.htm +++ b/src/admin/templets/diy_list.htm @@ -28,7 +28,7 @@ { if($fields[$field]=='') continue; if($fielddata[1]=='img'){ - $fields[$field] = "图片附件\r\n"; + $fields[$field] = "图片附件"; } else if($fielddata[1]=='addon'){ $fields[$field] = "其它附件"; diff --git a/src/admin/templets/freelist_add.htm b/src/admin/templets/freelist_add.htm index 38d5deb8..372edf5c 100644 --- a/src/admin/templets/freelist_add.htm +++ b/src/admin/templets/freelist_add.htm @@ -160,8 +160,8 @@ 限定栏目： \r\n"; - echo "\r\n"; + echo ""; ?> @@ -178,13 +178,13 @@ 限定频道： \r\n"; - echo "\r\n"; + echo ""; ?> @@ -193,13 +193,13 @@ 附加属性： \r\n"; - echo "\r\n"; + echo ""; ?> diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm index 39276777..c4096414 100644 --- a/src/admin/templets/freelist_edit.htm +++ b/src/admin/templets/freelist_edit.htm @@ -125,8 +125,8 @@ 限定栏目： GetAtt('typeid'); - echo ""; + echo ""; $dsql->SetQuery("Select id,typename, channeltype From #@__arctype"); $dsql->Execute(); while($lrow = $dsql->GetObject()){ @@ -135,8 +135,8 @@ { $disable = 'disabled'; } - if($lrow->id==$typeid) echo "\r\n"; - else echo "\r\n"; + if($lrow->id==$typeid) echo ""; + else echo ""; } echo ""; ?> @@ -145,13 +145,13 @@ 限定频道： GetAtt('channel'); - echo ""; $dsql->SetQuery("Select id,typename From #@__channeltype where id>0"); $dsql->Execute(); while($nrow = $dsql->GetObject()) { - if($nrow->id==$channel) echo "\r\n"; - else echo "\r\n"; + if($nrow->id==$channel) echo ""; + else echo ""; } echo ""; ?> @@ -161,17 +161,17 @@ 附加属性： GetAtt('att'); - echo ""; + echo ""; $dsql->SetQuery("Select * From #@__arcatt"); $dsql->Execute(); while($nrow = $dsql->GetObject()) { if($att==$nrow->att) { - echo "\r\n"; + echo ""; } else { - echo "\r\n"; + echo ""; } } echo ""; @@ -219,7 +219,7 @@ ?> diff --git a/src/admin/templets/friendlink_edit.htm b/src/admin/templets/friendlink_edit.htm index 084388e4..05b6a22b 100644 --- a/src/admin/templets/friendlink_edit.htm +++ b/src/admin/templets/friendlink_edit.htm @@ -62,11 +62,11 @@ diff --git a/src/admin/templets/friendlink_main.htm b/src/admin/templets/friendlink_main.htm index ad2467f6..e6013540 100644 --- a/src/admin/templets/friendlink_main.htm +++ b/src/admin/templets/friendlink_main.htm @@ -60,8 +60,8 @@ $v) { - if($k==$ischeck) echo "\r\n"; - else echo "\r\n"; + if($k==$ischeck) echo ""; + else echo ""; } ?> diff --git a/src/admin/templets/login.htm b/src/admin/templets/login.htm index 8759734e..42bdc023 100644 --- a/src/admin/templets/login.htm +++ b/src/admin/templets/login.htm @@ -76,7 +76,7 @@ header .logo{width:300px;padding:1rem 0} - +
diff --git a/src/admin/templets/member_type.htm b/src/admin/templets/member_type.htm index 845c3965..6f50aca2 100644 --- a/src/admin/templets/member_type.htm +++ b/src/admin/templets/member_type.htm @@ -48,8 +48,8 @@ @@ -62,8 +62,8 @@ @@ -89,7 +89,7 @@ @@ -102,7 +102,7 @@ diff --git a/src/admin/templets/mychannel_add.htm b/src/admin/templets/mychannel_add.htm index e6f815ed..42bca054 100644 --- a/src/admin/templets/mychannel_add.htm +++ b/src/admin/templets/mychannel_add.htm @@ -119,7 +119,7 @@ $dsql->Execute(); while($row2 = $dsql->GetObject()) { - echo "\r\n"; + echo ""; } ?> @@ -133,7 +133,7 @@ $dsql->Execute(); while($row3 = $dsql->GetObject()) { - echo "\r\n"; + echo ""; } ?> diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index 2326817b..7f32aa72 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -156,8 +156,8 @@ $dsql->Execute(); while($row2 = $dsql->GetObject()) { - if($row2->rank==$row['sendrank']) echo "\r\n"; - else echo "\r\n"; + if($row2->rank==$row['sendrank']) echo ""; + else echo ""; } ?> @@ -171,7 +171,7 @@ $dsql->Execute(); while($row3 = $dsql->GetObject()) { - echo " \r\n"; + echo " "; } ?> \r\n"; + echo " plusname}")."> {$row->plusname}"; $k++; $l++; if($l % 6 == 0) echo "
"; diff --git a/src/admin/templets/sys_sql_query.htm b/src/admin/templets/sys_sql_query.htm index b73e921b..9bb8bf73 100644 --- a/src/admin/templets/sys_sql_query.htm +++ b/src/admin/templets/sys_sql_query.htm @@ -53,7 +53,7 @@ while($row = $dsql->GetArray('t',MYSQL_BOTH)) $dsql->Execute('n'); $row2 = $dsql->GetArray('n',MYSQL_BOTH); $dd = $row2[0]; - echo "\r\n"; + echo ""; } ?> diff --git a/src/admin/templets/tag_test.htm b/src/admin/templets/tag_test.htm index 06984386..c720f88c 100644 --- a/src/admin/templets/tag_test.htm +++ b/src/admin/templets/tag_test.htm @@ -58,8 +58,8 @@ if(empty($cid)) $cid="0"; $tl = new TypeLink($cid); $typeOptions = $tl->GetOptionArray($cid,$admin_catalogs,0); - echo ""; + if($cid=="0") echo ""; echo $typeOptions; echo ""; ?> diff --git a/src/admin/templets/tpl_edit.htm b/src/admin/templets/tpl_edit.htm index b32f7cd1..28893e21 100644 --- a/src/admin/templets/tpl_edit.htm +++ b/src/admin/templets/tpl_edit.htm @@ -68,7 +68,7 @@ $help) { - echo '
'.$key.'
'."\r\n"; + echo '
'.$key.'
'.""; } ?> @@ -78,7 +78,7 @@ $help) { - echo '
关闭
标签名称：'.$key.'
功能说明：'.trim($help[0]).'
使用实例：

参数说明：
'."\r\n"; + echo '
关闭
标签名称：'.$key.'
功能说明：'.trim($help[0]).'
使用实例：

参数说明：
'.""; $parameters = explode("\n", $help[2]); foreach($parameters as $parameter) { @@ -86,7 +86,7 @@ if($parameter == '') continue; else echo $parameter,'
'; } - echo '
'."\r\n"; + echo '
'.""; } ?> diff --git a/src/theme/plus/flink-add.htm b/src/theme/plus/flink-add.htm index 3b03e3a3..7222e895 100644 --- a/src/theme/plus/flink-add.htm +++ b/src/theme/plus/flink-add.htm @@ -59,7 +59,7 @@ $dsql->Execute(); while($row=$dsql->GetObject()) { - echo " \r\n"; + echo " "; } ?> diff --git a/src/theme/plus/heightsearch.htm b/src/theme/plus/heightsearch.htm index 74d2bf2b..ee97c634 100644 --- a/src/theme/plus/heightsearch.htm +++ b/src/theme/plus/heightsearch.htm @@ -20,8 +20,8 @@ GetOptionArray(0,0,0); - echo ""; + echo ""; echo $typeOptions; echo ""; ?> @@ -51,7 +51,7 @@ $dsql->Execute(); while($row = $dsql->GetObject()) { - echo "\r\n"; + echo ""; } ?> diff --git a/src/theme/plus/list_diyform.htm b/src/theme/plus/list_diyform.htm index 18cccca3..1b5a6101 100644 --- a/src/theme/plus/list_diyform.htm +++ b/src/theme/plus/list_diyform.htm @@ -39,7 +39,7 @@ if($fields[$field]=='') continue; if($fielddata[1]=='img') { - $fields[$field] = " 图片附件\r\n"; + $fields[$field] = " 图片附件"; } else if($fielddata[1]=='addon') { @@ -52,7 +52,7 @@ $fields[$field] = cn_substr( $fields[$field], 250).''; } } - echo "{$fielddata[0]}{$fields[$field]}\r\n"; + echo "{$fielddata[0]}{$fields[$field]}"; } echo ''; } else { diff --git a/src/theme/plus/view_diyform.htm b/src/theme/plus/view_diyform.htm index e6adb855..f2e0921f 100644 --- a/src/theme/plus/view_diyform.htm +++ b/src/theme/plus/view_diyform.htm @@ -31,7 +31,7 @@ foreach($fieldlist as $field=>$fielddata) if($row[$field]=='') continue; if($fielddata[1]=='img') { - $row[$field] = "\r\n"; + $row[$field] = ""; } else if($fielddata[1]=='addon') { diff --git a/src/theme/templets/article_image.htm b/src/theme/templets/article_image.htm index 750f5237..f921b84a 100644 --- a/src/theme/templets/article_image.htm +++ b/src/theme/templets/article_image.htm @@ -94,10 +94,10 @@ else if(@me==2) { @me = "
- 原始图片\r\n - 上一张\r\n - 下一张\r\n - 自动 / 暂停播放\r\n + 原始图片 + 上一张 + 下一张 + 自动 / 暂停播放
"; } else { @@ -121,7 +121,7 @@ } else if(@me==2) { @me = " - \r\n"; + "; } else { @me = ''; } diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm index 7e408e42..27e8e558 100755 --- a/src/user/templets/album_add.htm +++ b/src/user/templets/album_add.htm @@ -26,7 +26,7 @@ - 返回 + 返回
@@ -57,8 +57,8 @@
\r\n"; - echo "\r\n"; + echo ""; ?> @@ -117,7 +117,7 @@

- +

diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm index 28fcd8ea..359ff198 100755 --- a/src/user/templets/album_edit.htm +++ b/src/user/templets/album_edit.htm @@ -26,7 +26,7 @@ - 返回 + 返回 @@ -61,7 +61,7 @@
\r\n"; + echo ""; ?> @@ -161,7 +161,7 @@

- +

diff --git a/src/user/templets/archives_add.htm b/src/user/templets/archives_add.htm index 728d89e6..b91077ad 100755 --- a/src/user/templets/archives_add.htm +++ b/src/user/templets/archives_add.htm @@ -25,7 +25,7 @@ - 返回 + 返回 @@ -55,8 +55,8 @@
\r\n"; - echo "\r\n"; + echo ""; ?> @@ -89,7 +89,7 @@

- +

diff --git a/src/user/templets/archives_edit.htm b/src/user/templets/archives_edit.htm index f8fbfcf3..e55cccf1 100755 --- a/src/user/templets/archives_edit.htm +++ b/src/user/templets/archives_edit.htm @@ -25,7 +25,7 @@ - 返回 + 返回 @@ -55,7 +55,7 @@
\r\n"; + echo ""; ?> @@ -88,7 +88,7 @@

- +

diff --git a/src/user/templets/archives_sg_add.htm b/src/user/templets/archives_sg_add.htm index 2574f1e3..bc07122d 100755 --- a/src/user/templets/archives_sg_add.htm +++ b/src/user/templets/archives_sg_add.htm @@ -25,7 +25,7 @@ - 返回 + 返回 \r\n"; - echo "\r\n"; + echo ""; ?> @@ -90,7 +90,7 @@

- +

diff --git a/src/user/templets/archives_sg_edit.htm b/src/user/templets/archives_sg_edit.htm index b927b91c..1aeced19 100755 --- a/src/user/templets/archives_sg_edit.htm +++ b/src/user/templets/archives_sg_edit.htm @@ -25,7 +25,7 @@ - 返回 + 返回 @@ -49,7 +49,7 @@
\r\n"; + echo ""; ?> @@ -76,7 +76,7 @@

- +

diff --git a/src/user/templets/article_add.htm b/src/user/templets/article_add.htm index 5e87e859..a20373fd 100755 --- a/src/user/templets/article_add.htm +++ b/src/user/templets/article_add.htm @@ -25,7 +25,7 @@ - 返回 + 返回 @@ -55,8 +55,8 @@
\r\n"; - echo "\r\n"; + echo ""; ?> @@ -93,7 +93,7 @@

- +

diff --git a/src/user/templets/article_edit.htm b/src/user/templets/article_edit.htm index eb85147a..b6cf4a15 100755 --- a/src/user/templets/article_edit.htm +++ b/src/user/templets/article_edit.htm @@ -25,7 +25,7 @@ - 返回 + 返回 @@ -59,7 +59,7 @@
\r\n"; + echo ""; ?> @@ -96,7 +96,7 @@

- +

diff --git a/src/user/templets/buy.htm b/src/user/templets/buy.htm index cd594ebd..355e40ed 100755 --- a/src/user/templets/buy.htm +++ b/src/user/templets/buy.htm @@ -25,7 +25,7 @@ - 返回 + 返回
diff --git a/src/user/templets/buy_action_payment.htm b/src/user/templets/buy_action_payment.htm index 1ca1c595..944c1981 100755 --- a/src/user/templets/buy_action_payment.htm +++ b/src/user/templets/buy_action_payment.htm @@ -26,7 +26,7 @@ - 返回 + 返回
@@ -74,7 +74,7 @@ - + diff --git a/src/user/templets/edit_face.htm b/src/user/templets/edit_face.htm index 07067704..02197cba 100755 --- a/src/user/templets/edit_face.htm +++ b/src/user/templets/edit_face.htm @@ -47,7 +47,7 @@
\r\n"; + if($face!='') echo " "; ?>
diff --git a/src/user/templets/index-notlogin.htm b/src/user/templets/index-notlogin.htm index 8edbb73d..29ef308f 100755 --- a/src/user/templets/index-notlogin.htm +++ b/src/user/templets/index-notlogin.htm @@ -36,7 +36,7 @@ 点击我更换图片
- + 注 册 忘记密码
diff --git a/src/user/templets/login.htm b/src/user/templets/login.htm index 68362d09..9877e1a5 100755 --- a/src/user/templets/login.htm +++ b/src/user/templets/login.htm @@ -36,7 +36,7 @@ 点击我更换图片 - + 注 册 忘记密码 diff --git a/src/user/templets/reg-new.htm b/src/user/templets/reg-new.htm index de5ce170..22d37b62 100755 --- a/src/user/templets/reg-new.htm +++ b/src/user/templets/reg-new.htm @@ -44,7 +44,7 @@ - + 登 录 diff --git a/src/user/templets/resetpassword.htm b/src/user/templets/resetpassword.htm index bf44d206..41a939d9 100755 --- a/src/user/templets/resetpassword.htm +++ b/src/user/templets/resetpassword.htm @@ -76,7 +76,7 @@ - + diff --git a/src/user/templets/resetpassword2.htm b/src/user/templets/resetpassword2.htm index 0dc859e5..d9414130 100755 --- a/src/user/templets/resetpassword2.htm +++ b/src/user/templets/resetpassword2.htm @@ -45,7 +45,7 @@ - + diff --git a/src/user/templets/resetpassword3.htm b/src/user/templets/resetpassword3.htm index bbba1aa7..22dc086a 100755 --- a/src/user/templets/resetpassword3.htm +++ b/src/user/templets/resetpassword3.htm @@ -38,7 +38,7 @@ 点击我更换图片 - + diff --git a/src/user/templets/soft_add.htm b/src/user/templets/soft_add.htm index 2d7aa5d2..d74b9704 100755 --- a/src/user/templets/soft_add.htm +++ b/src/user/templets/soft_add.htm @@ -21,7 +21,7 @@ upfield.innerHTML += " "; upfield.innerHTML += " "; - upfield.innerHTML += "服务器名称：\r\n"; + upfield.innerHTML += "服务器名称："; } } @@ -47,7 +47,7 @@ - 返回 + 返回
@@ -77,8 +77,8 @@
\r\n"; - echo "\r\n"; + echo ""; ?> @@ -217,7 +217,7 @@

- +

diff --git a/src/user/templets/soft_edit.htm b/src/user/templets/soft_edit.htm index 7a8ebb67..23fef1a2 100755 --- a/src/user/templets/soft_edit.htm +++ b/src/user/templets/soft_edit.htm @@ -20,7 +20,7 @@ for (startNum; startNum <= endNum; startNum++) { upfield.innerHTML += " "; upfield.innerHTML += " "; - upfield.innerHTML += "服务器名称：\r\n"; + upfield.innerHTML += "服务器名称："; } } function ShowHideAddr() { @@ -44,7 +44,7 @@ - 返回 + 返回 @@ -77,7 +77,7 @@
\r\n"; + echo ""; ?> @@ -89,7 +89,7 @@ ".$addRow["language"]."\r\n"; + if($addRow["language"]!="") echo ""; ?> @@ -117,7 +117,7 @@ ".$addRow["accredit"]."\r\n"; + if($addRow["accredit"]!="") echo ""; ?> @@ -149,7 +149,7 @@