换行提示调整

src/admin/ad_edit.php

@@ -25,7 +25,7 @@ if ($dopost == 'delete') {
     $showhtml .= "预览：<iframe name='testfrm' frameborder='0' src='ad_edit.php?aid={$aid}&dopost=testjs' id='testfrm' width='100%' height='200'></iframe>";
     $row = $dsql->GetOne("SELECT tagname from `#@__myad` WHERE aid='$aid' ");
     $showtag = '{'."dede:myad name='{$row['tagname']}'/".'}';
-    $info = "广告标签会解析成标签中文档到页面，广告修改后需要重新生成<br>如果不希望重新生成所有页面，则直接js调用代码即可";
+    $info = "广告标签会解析成标签中文档到页面，广告修改后需要重新生成，如果不希望重新生成所有页面，则直接js调用代码即可";
     $wintitle = "广告管理-获取广告标签";
     $wecome_info = "<a href='ad_main.php'>广告管理</a>::获取js";
     $win = new OxWindow();

src/admin/diy_edit.php

@@ -35,7 +35,7 @@ if ($dopost == "save") {
         $win->AddHidden("job", "yes");
         $win->AddHidden("dopost", $dopost);
         $win->AddHidden("diyid", $diyid);
-        $win->AddTitle("删除所有自定义表单相关的文件和数据<br>您确定要删除<span class='text-primary'>\"".$row['name']."\"</span>自定义表单吗");
+        $win->AddTitle("删除所有自定义表单相关的文件和数据，您确定要删除<span class='text-primary'>\"".$row['name']."\"</span>自定义表单吗");
         $winform = $win->GetWindow("ok");
         $win->Display();
         exit();

src/admin/member_do.php

@@ -48,7 +48,7 @@ if ($dopost == "delmember") {
                 $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE mid='$id' ");
                 $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET mid='0' WHERE mid='$id'");
             } else {
-                ShowMsg("无法删除此会员，如果这个会员是管理员，<br>必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 5000);
+                ShowMsg("无法删除此会员，如果这个会员是管理员，必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 5000);
                 exit();
             }
         }
@@ -95,7 +95,7 @@ if ($dopost == "delmember") {
                 $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE mid IN (".str_replace("`", ",", $id).") ");
                 $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET mid='0' WHERE mid IN (".str_replace("`", ",", $id).")");
             } else {
-                ShowMsg("无法删除此会员，如果这个会员是管理员关连的id，<br>必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 3000);
+                ShowMsg("无法删除此会员，如果这个会员是管理员关连的id，必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 3000);
                 exit();
             }
         }

src/admin/module_make.php

@@ -78,7 +78,7 @@ else if ($action == 'make') {
     $dm = new DedeModule($mdir);
     if ($dm->HasModule($hashcode)) {
         $dm->Clear();
-        ShowMsg("您指定同名模块已经存在，因此不能创建项目<br>如果您要更新这个模块，请先删除：module/{$hashcode}.xml", "-1");
+        ShowMsg("您指定同名模块已经存在，因此不能创建项目，如果您要更新这个模块，请先删除：module/{$hashcode}.xml", "-1");
         exit();
     }
     $readmef = $setupf = $uninstallf = '';

src/admin/mychannel_edit.php

@@ -231,7 +231,7 @@ if ($dopost == "show") {
         exit();
     } else {
         $errv = $dsql->GetError();
-        ShowMsg("系统出错，请检查原因<br>错误提示：mychannel_edit.php?dopost=savecopy $errv", "javascript:;");
+        ShowMsg("系统出错，请检查原因，错误提示：mychannel_edit.php?dopost=savecopy $errv", "javascript:;");
         exit();
     }
 } else if ($dopost == "save") {

src/admin/sys_repair.php

@@ -166,7 +166,7 @@ else if ($dopost == 3) {
     <tr>
         <td>
             完成所有修复操作，移除错误记录{$errnum}条<br>
-            <br><a href='index_body.php' class='btn btn-success btn-sm'>完成修正</a>
+            <a href='index_body.php' class='btn btn-success btn-sm'>完成修正</a>
         </td>
     </tr>
     </table>";

src/admin/templets/action_search.htm

@@ -19,7 +19,7 @@
 				</tr>
 				<?php foreach ($row['soniterm'] as $rows) {?>
 				<tr>
-					<td><a href="<?php echo $rows['linkurl'] ?>" target="main"><?php echo $rows['title'] ?></a><br><?php echo $rows['description'] ?></td>
+					<td><a href="<?php echo $rows['linkurl'] ?>" target="main"><?php echo $rows['title'] ?></a><?php echo $rows['description'] ?></td>
 				</tr>
 				<?php }?>
 			<?php }?>

src/admin/templets/freelist_add.htm

@@ -244,7 +244,7 @@
 				else if (myems[1].checked) editor.setValue(document.getElementById("list2").innerHTML);
 				else if (myems[2].checked) editor.setValue(document.getElementById("list3").innerHTML);
 				else if (myems[3].checked) editor.setValue(document.getElementById("list4").innerHTML);
-				editor.setValue(editor.getValue().replace("<BR>", "<br>"));
+				editor.setValue(editor.getValue().replace("<br>", "<br>"));
 				editor.setValue(editor.getValue().toLowerCase());
 			}
 			function ShowHide(objname) {

src/admin/templets/mytag_tag_guide.htm

@@ -182,7 +182,7 @@
 				else if (myems[1].checked) editor.setValue(document.getElementById("list2").innerHTML);
 				else if (myems[2].checked) editor.setValue(document.getElementById("list3").innerHTML);
 				else if (myems[3].checked) editor.setValue(document.getElementById("list4").innerHTML);
-				itxt.value = itxt.value.replace("<BR>", "<br>");
+				itxt.value = itxt.value.replace("<br>", "<br>");
 				itxt.value = itxt.value.toLowerCase();
 			}
 			function DoSubmit(j) {

src/admin/templets/search_keywords_main.htm

@@ -21,7 +21,7 @@
 		function ReloadPage(ordertype) {
 			orderby = ordertype;
 			var listArea = $Obj('rslist');
-			var errMsg = "网络通信出错<br><a href=\"javascript:ReloadPage('" + ordertype + "')\">重新加载列表</a>";
+			var errMsg = "网络通信出错，<a href=\"javascript:ReloadPage('" + ordertype + "')\">重新加载列表</a>";
 			fetch("search_keywords_main.php?dopost=getlist&pageno=" + pageno + "&orderby=" + ordertype).then(resp=>{
 				if (resp.ok) {
 					return resp.text()
@@ -45,7 +45,7 @@
 			var kw = $Obj('keyword' + nid).value;
 			var kws = $Obj('spwords' + nid).value;
 			var ct = $Obj('count' + nid).value;
-			var errMsg = "网络通信出错<br><a href=\"javascript:LoadPage('" + pageno + "')\">重新加载列表</a>";
+			var errMsg = "网络通信出错，<a href=\"javascript:LoadPage('" + pageno + "')\">重新加载列表</a>";
 			<?php
 			if (strtolower(substr($cfg_soft_lang, 0, 3)) == 'utf') {
 			?>
@@ -82,7 +82,7 @@
 			totalrow = totalrow - 1;
 			var pagenum = Math.ceil(totalrow / pagesize);
 			if (pagenum <= pageno) pageno = pagenum;
-			var errMsg = "网络通信出错<br>[<a href=\"javascript:LoadPage('" + pageno + "')\">点击此重新加载列表</a>]";
+			var errMsg = "网络通信出错，<a href=\"javascript:LoadPage('" + pageno + "')\">重新加载列表</a>";
 			fetch("search_keywords_main.php?dopost=del&aid=" + nid + "&pageno=" + pageno + "&orderby=" + orderby).then(resp=>{
 				if (resp.ok) {
 					return resp.text()

src/apps/view.php

@@ -55,7 +55,7 @@ if ($needMoney > 0 || $needRank > 1) {
         if (!is_array($row)) {
             if ($cfg_ml->M_Money == '' || $needMoney > $cfg_ml->M_Money) {
                 $msgtitle = "您没有权限浏览文档：{$arctitle} ";
-                $moremsg = "该文档需要<span class='text-primary'>".$needMoney."</span>金币才能浏览，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span><br><a class='btn btn-success btn-sm' href='{$GLOBALS['cfg_cmsurl']}/user/buy.php' target='_blank'>前去充值</a>";
+                $moremsg = "该文档需要<span class='text-primary'>".$needMoney."</span>金币才能浏览，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span>，<a class='btn btn-success btn-sm' href='{$GLOBALS['cfg_cmsurl']}/user/buy.php' target='_blank'>前去充值</a>";
                 include_once(DEDETEMPLATE.'/plus/view_msg.htm');
                 $arc->Close();
                 exit();
@@ -76,7 +76,7 @@ if ($needMoney > 0 || $needRank > 1) {
                     }
                 }
                 $msgtitle = "扣金币购买阅读";
-                $moremsg = "该文档需要付费<span class='text-primary'>".$needMoney."</span>金币，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span><br><a class='btn btn-success btn-sm' href='{$GLOBALS['cfg_cmsurl']}/apps/view.php?aid=".$aid."&dopost=buy' target='_blank'>确认付点阅读</a>";
+                $moremsg = "该文档需要付费<span class='text-primary'>".$needMoney."</span>金币，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span>，<a class='btn btn-success btn-sm' href='{$GLOBALS['cfg_cmsurl']}/apps/view.php?aid=".$aid."&dopost=buy' target='_blank'>确认付点阅读</a>";
                 include_once($cfg_basedir.$cfg_templets_dir."/plus/view_msg.htm");
                 $arc->Close();
                 exit();

src/apps/vote.php

@@ -35,9 +35,9 @@ if ($row['isallow'] == 1) {
 }
 if ($dopost == 'send') {
     if (!empty($voteitem)) {
-        $rsmsg = "<br>您方才的投票状态：".$vo->SaveVote($voteitem)."<br>";
+        $rsmsg = "您方才的投票状态：".$vo->SaveVote($voteitem)."<br>";
     } else {
-        $rsmsg = "<br>您刚才没选择任何投票项目<br>";
+        $rsmsg = "您刚才没选择任何投票项目<br>";
     }
     if ($row['isenable'] == 1) {
         ShowMsg('此投票项未启用,暂时不能进行投票', $ENV_GOBACK_URL);

src/system/database/dedesqlite.class.php

@@ -267,7 +267,7 @@ class DedeSqlite
             //echo $this->queryString."--{$queryTime}<hr/>\r\n";
         }
         if ($this->result[$id] === FALSE) {
-            $this->DisplayError($this->linkID->lastErrorMsg()." <br>Error sql:<span class='text-primary'>".$this->queryString."</span>");
+            $this->DisplayError($this->linkID->lastErrorMsg()."<br>Error sql:<span class='text-primary'>".$this->queryString."</span>");
         }
     }
     function Query($id = "me", $sql = '')

src/system/inc/inc_fun_funAdmin.php

@@ -104,7 +104,7 @@ function SpCreateDir($spath)
                 $isok = ChmodAll($truepath, $cfg_dir_purview);
             }
             if (!$isok) {
-                echo "创建或修改目录<span class='text-primary'>".$truepath."</span>失败<br>";
+                echo "创建或修改目录<span class='text-primary'>".$truepath."</span>失败";
                 CloseFtp();
                 return false;
             }

src/theme/system/channel_article_image.htm

@@ -1,5 +1,4 @@
 <li>
-  	<a href="[field:linkurl/]" target="_blank"><img src="[field:imgsrc/]" [field:imgwidth/]></a>
-  	<br>
+  	<a href="[field:linkurl/]" target="_blank"><img src="[field:imgsrc/]" [field:imgwidth/]></a><br>
   	<a href="[field:linkurl/]" target="_blank">[field:text/]</a>
 </li>

src/user/archives_add.php

@@ -110,7 +110,7 @@ if (empty($dopost)) {
             $gerr = $dsql->GetError();
             $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='$arcID'");
             $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'");
-            ShowMsg("数据保存到数据库附加表时出错，请联系管理员<br>error:{$gerr}", "javascript:;");
+            ShowMsg("数据保存到数据库附加表时出错，请联系管理员，错误：{$gerr}", "javascript:;");
             exit();
         }
     }

src/user/config.php

@@ -197,10 +197,10 @@ function CheckRank($rank = 0, $money = 0)
                     $myname = "注册会员";
                 }
             }
-            ShowMsg("需要<span class='text-primary'>$needname</span>才能浏览本页面<br>您目前等级是<span class='text-primary'>$myname</span>", "-1", 0, 5000);
+            ShowMsg("需要<span class='text-primary'>$needname</span>才能浏览本页面，您目前等级是<span class='text-primary'>$myname</span>", "-1", 0, 5000);
             exit();
         } else if ($cfg_ml->M_Money < $money) {
-            ShowMsg("需要<span class='text-primary'>$money</span>金币才能浏览本页面<br>您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span>个", "-1", 0, 5000);
+            ShowMsg("需要<span class='text-primary'>$money</span>金币才能浏览本页面，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span>个", "-1", 0, 5000);
             exit();
         }
     }