diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index fc390a2c..c8227283 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/src/admin/inc/inc_archives_functions.php @@ -35,7 +35,7 @@ function GetCurContentAlbum($body, $rfurl, &$firstdd) $cfg_basedir = $GLOBALS['cfg_basedir']; $basehost = IsSSL()? "https://".$_SERVER["HTTP_HOST"] : "http://".$_SERVER["HTTP_HOST"]; $img_array = array(); - preg_match_all("/(src)=[\"|'| ]{0,}(http:\/\/([^>]*)\.(gif|jpg|png))/isU", $body, $img_array); + preg_match_all("/(src)=[\"|'| ]{0,}(http:\/\/([^>]*)\.(gif|jpg|jpeg|png))/isU", $body, $img_array); $img_array = array_unique($img_array[2]); $imgUrl = $cfg_uploaddir.'/'.MyDate($cfg_addon_savetype, time()); $imgPath = $cfg_basedir.$imgUrl; @@ -53,7 +53,7 @@ function GetCurContentAlbum($body, $rfurl, &$firstdd) continue; } $itype = substr($value, -4, 4); - if (!preg_match("#\.(gif|jpg|png)#", $itype)) $itype = ".jpg"; + if (!preg_match("#\.(gif|jpg|jpeg|png)#", $itype)) $itype = ".jpg"; $rndFileName = $imgPath.'/'.$milliSecond.'-'.$key.$itype; $iurl = $imgUrl.'/'.$milliSecond.'-'.$key.$itype; //下载并保存文件 diff --git a/src/admin/sys_data_done.php b/src/admin/sys_data_done.php index 1187ee21..32b98073 100644 --- a/src/admin/sys_data_done.php +++ b/src/admin/sys_data_done.php @@ -257,7 +257,7 @@ else if ($dopost == 'redat') { function PutInfo($msg1, $msg2) { global $cfg_soft_lang; - $msginfo = "提示信息

提示信息

{$msg1}{$msg2}
"; + $msginfo = "系统提示

系统提示

{$msg1}{$msg2}
"; echo $msginfo.""; } function RpLine($str) diff --git a/src/admin/templets/article_description_main.htm b/src/admin/templets/article_description_main.htm index 689e3af0..412ceed1 100644 --- a/src/admin/templets/article_description_main.htm +++ b/src/admin/templets/article_description_main.htm @@ -43,7 +43,7 @@ 自动分页大小： K 系统参数 - + diff --git a/src/admin/templets/mytag_edit.htm b/src/admin/templets/mytag_edit.htm index 878e2084..0f8b7c0d 100644 --- a/src/admin/templets/mytag_edit.htm +++ b/src/admin/templets/mytag_edit.htm @@ -57,7 +57,7 @@ - + diff --git a/src/admin/templets/mytag_tag_guide.htm b/src/admin/templets/mytag_tag_guide.htm index 68fdb84c..893f278c 100644 --- a/src/admin/templets/mytag_tag_guide.htm +++ b/src/admin/templets/mytag_tag_guide.htm @@ -154,7 +154,7 @@ 循环内的单行记录样式(InnerText)支持字段(底层变量[field:varname/])：id,title,color,typeid,ismake,description,pubdate,senddate,arcrank,click,litpic,typedir,typename,arcurl,typeurl,stime(pubdate的"0000-00-00"格式),textlink,typelink,imglink,image普通字段直接用[field:字段名/]表示Pubdate发布时间的调用参数[field:pubdate function=MyDate('Y-m-d H:i:s',@me)/] - + diff --git a/src/admin/templets/templets_default.htm b/src/admin/templets/templets_default.htm index 7b371f20..72eb1a3c 100644 --- a/src/admin/templets/templets_default.htm +++ b/src/admin/templets/templets_default.htm @@ -56,7 +56,7 @@ - + 默认模板 插件模板 新建模板 diff --git a/src/admin/templets/templets_tagsource.htm b/src/admin/templets/templets_tagsource.htm index 4028cbc0..c5074ed1 100644 --- a/src/admin/templets/templets_tagsource.htm +++ b/src/admin/templets/templets_tagsource.htm @@ -41,7 +41,7 @@ - 增加一个新的标签 + 增加标签 diff --git a/src/apps/vdimgck.php b/src/apps/vdimgck.php index 67bfca5c..fa1d2c33 100755 --- a/src/apps/vdimgck.php +++ b/src/apps/vdimgck.php @@ -1,6 +1,6 @@ array('#d3d3d4','#bcbebf','#141619'), )); define("ALERT_TPL", '
~content~
'); -//$content:文档 $type:alert类型 +//$content:文档，$type:alert类型 function DedeAlert($content, $type = ALERT_PRIMARY) { $content = htmlspecialchars($content); @@ -313,9 +313,9 @@ function UpdateStat() $arrs1 = array(); $arrs2 = array(); /** - * 短消息函数，可以在某个动作处理后友好的提示信息 + * 短消息函数，可以在某个动作处理后友好的系统提示 * - * @param string $msg 消息提示信息 + * @param string $msg 消息系统提示 * @param string $gourl 跳转地址 * @param int $onlymsg 仅显示信息 * @param int $limittime 限制时间 @@ -332,7 +332,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0) return; } if (empty($GLOBALS['cfg_plus_dir'])) $GLOBALS['cfg_plus_dir'] = '..'; - $htmlhead = "提示信息"; $litime = ($limittime == 0 ? 1000 : $limittime); $func = ''; @@ -351,8 +351,8 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0) } $func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}"; $rmsg = $func; - $rmsg .= "document.write(\"\");"; - $rmsg .= "document.write(\"

提示信息

\");"; + $rmsg .= "document.write(\"\");"; + $rmsg .= "document.write(\"

系统提示

\");"; $rmsg .= "document.write(\"
\");"; $rmsg .= "document.write(\"".str_replace("\"", "“", $msg)."\");"; $rmsg .= "document.write(\""; diff --git a/src/system/customfields.func.php b/src/system/customfields.func.php index be1ac650..3622e622 100755 --- a/src/system/customfields.func.php +++ b/src/system/customfields.func.php @@ -1,7 +1,7 @@ IsSendLimited()) { - ShowMsg("文档发布失败，投稿已经超出投稿限制次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); + ShowMsg("投稿失败，剩余次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } /*------------- diff --git a/src/user/album_edit.php b/src/user/album_edit.php index 4a432ad2..345777a8 100755 --- a/src/user/album_edit.php +++ b/src/user/album_edit.php @@ -27,7 +27,7 @@ $aid = isset($aid) && is_numeric($aid) ? $aid : 0; $menutype = 'content'; if (empty($formhtml)) $formhtml = 0; if ($cfg_ml->IsSendLimited()) { - ShowMsg("文档发布失败，投稿已经超出投稿限制次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); + ShowMsg("投稿失败，剩余次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } /*------------- diff --git a/src/user/archives_add.php b/src/user/archives_add.php index 0f01523d..609bb00e 100755 --- a/src/user/archives_add.php +++ b/src/user/archives_add.php @@ -19,7 +19,7 @@ $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0; $mtypesid = isset($mtypesid) && is_numeric($mtypesid) ? $mtypesid : 0; $menutype = 'content'; if ($cfg_ml->IsSendLimited()) { - ShowMsg("文档发布失败，投稿已经超出投稿限制次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); + ShowMsg("投稿失败，剩余次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } /*------------- diff --git a/src/user/archives_edit.php b/src/user/archives_edit.php index 56124058..f39d87ea 100755 --- a/src/user/archives_edit.php +++ b/src/user/archives_edit.php @@ -19,7 +19,7 @@ $aid = isset($aid) && is_numeric($aid) ? $aid : 0; $mtypesid = isset($mtypesid) && is_numeric($mtypesid) ? $mtypesid : 0; $menutype = 'content'; if ($cfg_ml->IsSendLimited()) { - ShowMsg("文档发布失败，投稿已经超出投稿限制次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); + ShowMsg("投稿失败，剩余次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } /*------------- diff --git a/src/user/archives_sg_add.php b/src/user/archives_sg_add.php index 891d43a5..d3a2a6dc 100755 --- a/src/user/archives_sg_add.php +++ b/src/user/archives_sg_add.php @@ -19,7 +19,7 @@ $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0; $mtypesid = isset($mtypesid) && is_numeric($mtypesid) ? $mtypesid : 0; $menutype = 'content'; if ($cfg_ml->IsSendLimited()) { - ShowMsg("文档发布失败，投稿已经超出投稿限制次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); + ShowMsg("投稿失败，剩余次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } /*------------- diff --git a/src/user/archives_sg_edit.php b/src/user/archives_sg_edit.php index 5941e81e..ece4dd0e 100755 --- a/src/user/archives_sg_edit.php +++ b/src/user/archives_sg_edit.php @@ -19,7 +19,7 @@ $aid = isset($aid) && is_numeric($aid) ? $aid : 0; $mtypesid = isset($mtypesid) && is_numeric($mtypesid) ? $mtypesid : 0; $menutype = 'content'; if ($cfg_ml->IsSendLimited()) { - ShowMsg("文档发布失败，投稿已经超出投稿限制次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); + ShowMsg("投稿失败，剩余次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } /*------------- diff --git a/src/user/article_add.php b/src/user/article_add.php index 9871a87c..c89c7301 100755 --- a/src/user/article_add.php +++ b/src/user/article_add.php @@ -19,7 +19,7 @@ $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0; $mtypesid = isset($mtypesid) && is_numeric($mtypesid) ? $mtypesid : 0; $menutype = 'content'; if ($cfg_ml->IsSendLimited()) { - ShowMsg("文档发布失败，投稿已经超出投稿限制次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); + ShowMsg("投稿失败，剩余次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } /*------------- diff --git a/src/user/article_edit.php b/src/user/article_edit.php index 6a565204..1f00c7c1 100755 --- a/src/user/article_edit.php +++ b/src/user/article_edit.php @@ -19,7 +19,7 @@ $aid = isset($aid) && is_numeric($aid) ? $aid : 0; $mtypesid = isset($mtypesid) && is_numeric($mtypesid) ? $mtypesid : 0; $menutype = 'content'; if ($cfg_ml->IsSendLimited()) { - ShowMsg("文档发布失败，投稿已经超出投稿限制次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); + ShowMsg("投稿失败，剩余次数：{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } /*------------- diff --git a/src/user/inc/inc_batchup.php b/src/user/inc/inc_batchup.php index a4341fd8..87b3b584 100755 --- a/src/user/inc/inc_batchup.php +++ b/src/user/inc/inc_batchup.php @@ -1,7 +1,7 @@