diff --git a/src/admin/inc/inc_archives_all.php b/src/admin/inc/inc_archives_all.php index 1c071673..44d3ffce 100644 --- a/src/admin/inc/inc_archives_all.php +++ b/src/admin/inc/inc_archives_all.php @@ -18,8 +18,7 @@ function GetFormItem($ctag) { $fieldname = $ctag->GetName(); - $formitem = " - + $formitem = "
@@ -215,8 +214,7 @@ function GetFieldValue($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '') function GetFormItemValue($ctag, $fvalue) { $fieldname = $ctag->GetName(); - $formitem = " -
~name~ ~form~
+ $formitem = "
diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index 0f02de2e..e240e6fb 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/src/admin/inc/inc_archives_functions.php @@ -762,7 +762,7 @@ function GetUpdateTest() if ($cfg_make_andcat == 'Y') $dolist .= empty($dolist) ? 'makeparenttype' : ',makeparenttype'; $dolists = explode(',', $dolist); $jumpUrl = "task_do.php?typeid={$typeid}&aid={$arcID}&dopost={$dolists[0]}&nextdo=".preg_replace("#".$dolists[0]."[,]{0,1}#", '', $dolist); - $revalue = "
~name~ ~form~
\r\n"; + $revalue = "
正在进行相关内容更新，请完成前不要进行其它操作：\r\n
\r\n"; $revalue .= "\r\n"; $revalue .= "
正在进行相关内容更新，请完成前不要进行其它操作：\r\n
\r\n\r\n
"; } else { diff --git a/src/admin/inc/inc_catalog_options.php b/src/admin/inc/inc_catalog_options.php index c4ef1640..4fa564d3 100644 --- a/src/admin/inc/inc_catalog_options.php +++ b/src/admin/inc/inc_catalog_options.php @@ -67,9 +67,9 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) $OptionArrayList .= $sonCats; } else { if ($row->ispart == 0 && (!empty($channeltype) && $row->channeltype == $channeltype)) { - $OptionArrayList .= ""; + $OptionArrayList .= ""; } else if ($row->ispart == 0 && empty($channeltype)) { - $OptionArrayList .= ""; + $OptionArrayList .= ""; } } } @@ -78,16 +78,16 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) function LogicGetOptionArray($id, $step, $channeltype, &$dsql, &$sonCats) { global $OptionArrayList, $channels, $cfg_admin_channel, $admin_catalogs; - $dsql->SetQuery("Select id,typename,ispart,channeltype From `#@__arctype` where reid='".$id."' order by sortrank asc"); + $dsql->SetQuery("SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE reid='".$id."' ORDER BY sortrank ASC"); $dsql->Execute($id); while ($row = $dsql->GetObject($id)) { if ($cfg_admin_channel != 'all' && !in_array($row->id, $admin_catalogs)) { continue; } if ($row->channeltype == $channeltype && $row->ispart == 1) { - $sonCats .= ""; + $sonCats .= ""; } else if (($row->channeltype == $channeltype && $row->ispart == 0) || empty($channeltype)) { - $sonCats .= ""; + $sonCats .= ""; } LogicGetOptionArray($row->id, $step.'─', $channeltype, $dsql, $sonCats); } diff --git a/src/admin/member_do.php b/src/admin/member_do.php index 38302773..d216acd8 100644 --- a/src/admin/member_do.php +++ b/src/admin/member_do.php @@ -69,8 +69,8 @@ if ($dopost == "delmember") { $win->AddHidden("id", $id); $win->AddHidden("randcode", $randcode); $win->AddHidden("safecode", $safecode); - $win->AddTitle("您确定要删除会员ID:".$id." 吗"); - $win->AddMsgItem("验证安全码：（安全码：$safecode）", "30"); + $win->AddTitle("您确定要删除会员id:".$id." 吗"); + $win->AddMsgItem("验证安全码：（安全码：$safecode）", "30"); $winform = $win->GetWindow("ok"); $win->Display(); } else if ($dopost == "delmembers") { @@ -117,7 +117,7 @@ if ($dopost == "delmember") { $win->AddHidden("randcode", $randcode); $win->AddHidden("safecode", $safecode); $win->AddTitle("您确定要删除(ID:".$id.")这个会员?"); - $win->AddMsgItem(" 验证安全码： (安全码：$safecode)", "30"); + $win->AddMsgItem(" 验证安全码： (安全码：$safecode)", "30"); $winform = $win->GetWindow("ok"); $win->Display(); } diff --git a/src/admin/member_toadmin.php b/src/admin/member_toadmin.php index eb57d879..be6bf683 100644 --- a/src/admin/member_toadmin.php +++ b/src/admin/member_toadmin.php @@ -92,11 +92,11 @@ $typeids = explode(',', $typeid); $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=0 OR ispart=1)"); $dsql->Execute('op'); while ($nrow = $dsql->GetObject('op')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$nrow->id} AND (ispart=0 OR ispart=1)"); $dsql->Execute('s'); while ($nrow = $dsql->GetObject('s')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; } } $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE mid='$id'"); diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php index 71818814..05be8fa0 100644 --- a/src/admin/sys_admin_user_add.php +++ b/src/admin/sys_admin_user_add.php @@ -70,11 +70,11 @@ $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart= $dsql->Execute('op'); while ($row = $dsql->GetObject('op')) { $topc = $row->id; - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$row->id} AND (ispart=0 OR ispart=1) "); $dsql->Execute('s'); while ($row = $dsql->GetObject('s')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; } } make_hash(); diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index de1a7e06..078a0c97 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -68,7 +68,7 @@ if ($dopost == 'saveedit') { $win->AddHidden("id", $id); $win->AddTitle("系统提示"); $win->AddMsgItem("您确定要删除用户：$userid 吗", "50"); - $win->AddMsgItem("验证安全码：（安全码：$safecode）", "30"); + $win->AddMsgItem("验证安全码：（安全码：$safecode）", "30"); $winform = $win->GetWindow("ok"); $win->Display(); exit(); @@ -98,11 +98,11 @@ $typeids = explode(',', $row['typeid']); $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=0 OR ispart=1)"); $dsql->Execute('op'); while ($nrow = $dsql->GetObject('op')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$nrow->id} AND (ispart=0 OR ispart=1)"); $dsql->Execute('s'); while ($nrow = $dsql->GetObject('s')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; } } make_hash(); diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 9ccab3a6..cf5bd5a3 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -335,9 +335,9 @@ } else if (preg_match("#\.#", $arr['evalue'])) { - echo ""; + echo ""; } else { - echo ""; + echo ""; } } ?> diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index 2b5d5a5a..70addd2c 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -286,9 +286,9 @@ } else if (preg_match("#\.#", $arr['evalue'])) { - echo ""; + echo ""; } else { - echo ""; + echo ""; } } ?> diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index 7512d230..16c1971f 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -56,11 +56,11 @@ 用户名称： - （发布文档后显示责任编辑的名字） + （发布文档后显示责任编辑的名字） 用户密码： - （留空则不修改，只能用'0-9a-zA-Z.@_-!'以内范围的字符） + （留空则不修改，只能用[0-9a-zA-Z_@!.-]以内范围的字符） 用户类型： @@ -81,7 +81,7 @@ 负责频道： - （按Ctrl可以进行多选） @@ -89,17 +89,17 @@ 真实姓名： - + 电子邮箱： - + 验证安全码： - - （安全码：） + + （安全码：） diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm index 21b9f577..a82d6d03 100644 --- a/src/admin/templets/member_view.htm +++ b/src/admin/templets/member_view.htm @@ -77,7 +77,7 @@ 昵称： - + 性别： @@ -88,7 +88,7 @@ - 金币 ： + 金币： 积分： diff --git a/src/admin/templets/mychannel_field_edit.htm b/src/admin/templets/mychannel_field_edit.htm index ee4aae14..e272f3b4 100644 --- a/src/admin/templets/mychannel_field_edit.htm +++ b/src/admin/templets/mychannel_field_edit.htm @@ -96,14 +96,14 @@ 字段类型： - - + + 前台参数： -
- +
+ @@ -182,7 +182,7 @@ 最大长度：
- 文本数据必须填写，大于255为text类型 + 文本数据必须填写，大于255为text类型 diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm index 751d60e4..d1b094ea 100644 --- a/src/admin/templets/stepselect_main.htm +++ b/src/admin/templets/stepselect_main.htm @@ -184,7 +184,7 @@ { if (!preg_match("#\.#", $row1['evalue'])) { - $row1['ename'] = ($row1['evalue'] % 500 == 0)? $row1['ename'] : '└─'.$row1['ename']; + $row1['ename'] = ($row1['evalue'] % 500 == 0)? $row1['ename'] : '└─ '.$row1['ename']; if ($topvalue != $row1['evalue']) $options .= ""; else $options .= ""; } @@ -258,9 +258,9 @@ 500 && $fields['evalue']%500 != 0) $fields['ename'] = " └─".$fields['ename']; + if ($fields['evalue']>500 && $fields['evalue']%500 != 0) $fields['ename'] = "└─ ".$fields['ename']; } else { - $fields['ename'] = " └───".$fields['ename']; + $fields['ename'] = "└─── ".$fields['ename']; } ?> diff --git a/src/admin/templets/stepselect_showajax.htm b/src/admin/templets/stepselect_showajax.htm index 48ed767a..2403177b 100644 --- a/src/admin/templets/stepselect_showajax.htm +++ b/src/admin/templets/stepselect_showajax.htm @@ -67,7 +67,7 @@ if ($arr['issign']==0) { $options .= ""; } else { - $options .= ""; + $options .= ""; } } ?> diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm index 2b296676..4218e96b 100644 --- a/src/admin/templets/sys_admin_user_add.htm +++ b/src/admin/templets/sys_admin_user_add.htm @@ -51,15 +51,15 @@ - + - + - + @@ -80,7 +80,7 @@ diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm index 9fc4d881..d5a45f22 100644 --- a/src/admin/templets/sys_admin_user_edit.htm +++ b/src/admin/templets/sys_admin_user_edit.htm @@ -33,11 +33,11 @@ - + - + @@ -58,7 +58,7 @@ diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 6c4fec1a..6e629c59 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -455,15 +455,6 @@ body.hidemenu .body-right { border:2px solid #28a745; z-index:10005 } -option.alltype { - padding:2px 0 4px 0px -} -option.btype { - padding:2px 0 4px 10px -} -option.stype { - padding:2px 0 4px 20px -} span.page-link { color:#fff; background:#28a745 diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index a247b74d..e3623c89 100755 --- a/src/system/archive/searchview.class.php +++ b/src/system/archive/searchview.class.php @@ -62,7 +62,7 @@ class SearchView * @param string $starttime 开始时间 * @param string $upagesize 页数 * @param string $kwtype 关键词类型 - * @param string $mid 会员ID + * @param string $mid 会员id * @return string */ function __construct( diff --git a/src/system/helpers/archive.helper.php b/src/system/helpers/archive.helper.php index 783f3842..6801d52c 100755 --- a/src/system/helpers/archive.helper.php +++ b/src/system/helpers/archive.helper.php @@ -121,7 +121,7 @@ if (!function_exists('GetTags')) { * @param int $sortrank 排序ID * @param int $channelid 模型ID * @param int $senddate 发布日期 - * @param int $mid 会员ID + * @param int $mid 会员id * @return int */ if (!function_exists('GetIndexKey')) { diff --git a/src/system/typelink/typelink.class.php b/src/system/typelink/typelink.class.php index 31df2bc0..5a678e02 100755 --- a/src/system/typelink/typelink.class.php +++ b/src/system/typelink/typelink.class.php @@ -246,9 +246,9 @@ class TypeLink if (!in_array($row->id, $oper)) continue; } if ($row->ispart == 1) { - $this->OptionArrayList .= "\r\n"; + $this->OptionArrayList .= "\r\n"; } else { - $this->OptionArrayList .= "\r\n"; + $this->OptionArrayList .= "\r\n"; } $this->LogicGetOptionArray($row->id, $step."─", $oper); } diff --git a/src/user/inc/inc_catalog_options.php b/src/user/inc/inc_catalog_options.php index d750dce6..5143063f 100755 --- a/src/user/inc/inc_catalog_options.php +++ b/src/user/inc/inc_catalog_options.php @@ -80,7 +80,7 @@ function LogicGetOptionArray($id, $step, $channeltype, $selid = 0) /** * 自定义类型 * - * @param int $mid 会员ID + * @param int $mid 会员id * @param int $mtypeid 自定义类别ID * @param int $channelid 频道id * @return string diff --git a/src/user/inc/inc_pwd_functions.php b/src/user/inc/inc_pwd_functions.php index a267ee87..662401e2 100755 --- a/src/user/inc/inc_pwd_functions.php +++ b/src/user/inc/inc_pwd_functions.php @@ -65,7 +65,7 @@ function sendmail($email, $mailtitle, $mailbody, $headers) /** * 发送邮件；type为INSERT新建验证码，UPDATE修改验证码； * - * @param int $mid 会员ID + * @param int $mid 会员id * @param int $userid 用户id * @param string $mailto 发送到 * @param string $type 类型 @@ -127,7 +127,7 @@ function member($mail, $userid) /** * 查询是否发送过验证码 * - * @param string $mid 会员ID + * @param string $mid 会员id * @param string $userid 用户名称 * @param string $mailto 发送邮件地址 * @param string $send 为Y发送邮件,为N不发送邮件默认为Y
用户登录id：（只能用[0-9a-zA-Z_@!.-]以内范围的字符）（只能用[0-9a-zA-Z_@!.-]以内范围的字符）
用户名称：（发布文档后显示责任编辑的名字）（发布文档后显示责任编辑的名字）
用户密码：（只能用[0-9a-zA-Z_@!.-]以内范围的字符）（只能用[0-9a-zA-Z_@!.-]以内范围的字符）
用户组：
授权栏目： - （按Ctrl可以进行多选） @@ -98,7 +98,7 @@ 验证安全码： - （安全码：） + （安全码：）
用户名称：（发布文档后显示责任编辑的名字）（发布文档后显示责任编辑的名字）
用户密码：（留空则不修改，只能用'0-9a-zA-Z.@_-!'以内范围的字符）（留空则不修改，只能用[0-9a-zA-Z_@!.-]以内范围的字符）
用户类型：
负责频道： - （按Ctrl可以进行多选） @@ -76,7 +76,7 @@ 验证安全码： - （安全码：） + （安全码：）