Browse Source

fix #732 致命错误: Undefined constant "color"

magicblack 4 years ago
parent
commit
5212687e86

+ 1 - 1
application/admin/view/actor/index.html

@@ -109,7 +109,7 @@
                 <td>{$vo.actor_height|htmlspecialchars}</td>
                 <td>{$vo.actor_weight|htmlspecialchars}</td>
                 <td><a data-href="{:url('index/select')}?tab=actor&col=actor_level&tpl=select_level&url=actor/field&ids={$vo.actor_id}" data-width="270" data-height="100" class=" j-select"><span class="layui-badge layui-bg-orange">{$vo.actor_level}</span></a></td>
-                <td>{$vo.actor_time|mac_day=color}</td>
+                <td>{$vo.actor_time|mac_day='color'}</td>
                 <td>
                     <a class="layui-badge-rim j-iframe" data-full="1" data-href="{:url('info?id='.$vo['actor_id'])}" href="javascript:;" title="{:lang('edit')}">{:lang('edit')}</a>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del?ids='.$vo['actor_id'])}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>

+ 1 - 1
application/admin/view/admin/index.html

@@ -37,7 +37,7 @@
                 <td>
                     <input type="checkbox" name="status" {if condition="$vo['admin_status'] eq 1"}checked{/if} value="{$vo['admin_status']}" lay-skin="switch" lay-filter="switchStatus" lay-text="{:lang('enable')}|{:lang('disable')}" data-href="{:url('field?col=admin_status&ids='.$vo['admin_id'])}">
                 </td>
-                <td>{$vo.admin_last_login_time|mac_day=color}</td>
+                <td>{$vo.admin_last_login_time|mac_day='color'}</td>
                 <td>{$vo.admin_last_login_ip|long2ip}</td>
                 <td>{$vo.admin_login_num}</td>
                 <td>

+ 1 - 1
application/admin/view/annex/file.html

@@ -30,7 +30,7 @@
                 {if condition="$vo.isfile eq 1"}
                 <th><input type="checkbox" name="ids[]" value=".{$vo.path}" class="layui-checkbox checkbox-ids" lay-skin="primary"> <a href="{$vo.path}" target="_blank">{$vo.name}</a></th>
                 <td>{$vo.size}</td>
-                <td>{$vo.time|mac_day=color}</td>
+                <td>{$vo.time|mac_day='color'}</td>
                 {else}
                 <th><a href="{:url('annex/file',['path'=>$vo.path])}">{$vo.name}</a></th>
                 <td></td>

+ 1 - 1
application/admin/view/annex/index.html

@@ -58,7 +58,7 @@
                 <td>{$vo.annex_id}</td>
                 <td>{:round($vo['annex_size']/1024, 2)}K</td>
                 <td>{$vo.annex_type|htmlspecialchars}</td>
-                <td>{$vo.annex_time|mac_day=color}</td>
+                <td>{$vo.annex_time|mac_day='color'}</td>
                 <td><a target="_blank" class="layui-badge-rim " href="{php}echo MAC_PATH;{/php}{$vo.annex_file}">{$vo.annex_file}</a></td>
             </tr>
             {/volist}

+ 1 - 1
application/admin/view/annex/info.html

@@ -38,7 +38,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">{:lang('time')}:</label>
                         <div class="layui-input-inline w500">
-                            <input type="text" class="layui-input" value="{$info.annex_time|mac_day=color}" readonly="readonly">
+                            <input type="text" class="layui-input" value="{$info.annex_time|mac_day}" readonly="readonly">
                         </div>
                     </div>
                     

+ 1 - 1
application/admin/view/art/index.html

@@ -124,7 +124,7 @@
                 <td><a data-href="{:url('index/select')}?tab=art&col=art_level&tpl=select_level&url=art/field&ids={$vo.art_id}" data-width="270" data-height="100" class=" j-select"><span class="layui-badge layui-bg-orange">{$vo.art_level}</span></a></td>
                 <td>{if condition="$vo.ismake eq 1"}<a target="_blank" class="layui-badge layui-bg-green " href="{:mac_url_art_detail($vo)}">Y</a>{else/}<a class="layui-badge" href="{:url('make/make?ac=info&tab=art')}?ids={$vo.art_id}&ref=1">N</a>{/if}</td>
                 <td>{$vo.art_author|htmlspecialchars}</td>
-                <td>{$vo.art_time|mac_day=color}</td>
+                <td>{$vo.art_time|mac_day='color'}</td>
                 <td>
                     <a class="layui-badge-rim j-iframe" data-full="1" data-href="{:url('info?id='.$vo['art_id'])}" href="javascript:;" title="{:lang('edit')}">{:lang('edit')}</a>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del?ids='.$vo['art_id'])}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>

+ 2 - 2
application/admin/view/card/index.html

@@ -68,9 +68,9 @@
                 <td>{$vo.card_pwd|htmlspecialchars}</td>
                 <td>{$vo.card_money}</td>
                 <td>{$vo.card_points}</td>
-                <td>{$vo.card_add_time|mac_day=color}</td>
+                <td>{$vo.card_add_time|mac_day='color'}</td>
                 <td>{$vo.user_id}、{$vo.user.user_name}</td>
-                <td>{if condition="$vo.card_use_time eq 0"} {else}{$vo.card_use_time|mac_day=color}{/if}</td>
+                <td>{if condition="$vo.card_use_time eq 0"} {else}{$vo.card_use_time|mac_day='color'}{/if}</td>
                 <td>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del?ids='.$vo['card_id'])}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>
                 </td>

+ 2 - 2
application/admin/view/cash/index.html

@@ -57,8 +57,8 @@
                 <td>{$vo.cash_bank_no|htmlspecialchars}</td>
                 <td>{$vo.cash_payee_name|htmlspecialchars}</td>
                 <td>{$vo.cash_remarks|htmlspecialchars}</td>
-                <td>{$vo.cash_time|mac_day=color}</td>
-                <td>{$vo.cash_time_audit|mac_day=color}</td>
+                <td>{$vo.cash_time|mac_day='color'}</td>
+                <td>{$vo.cash_time_audit|mac_day='color'}</td>
                 <td>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del?ids='.$vo['cash_id'])}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>
                     {if condition="$vo.cash_status neq '1'"}

+ 1 - 1
application/admin/view/collect/actor.html

@@ -50,7 +50,7 @@
                 <td>{$vo.actor_name|htmlspecialchars}</td>
                 <td>{$vo.type_name|htmlspecialchars}</td>
                 <td>{$vo.actor_sex|htmlspecialchars}</td>
-                <td>{$vo.actor_time|mac_day=color}</td>
+                <td>{$vo.actor_time|mac_day='color'}</td>
             </tr>
             {/volist}
             </tbody>

+ 1 - 1
application/admin/view/collect/art.html

@@ -50,7 +50,7 @@
                 <td>{$vo.art_name|htmlspecialchars}</td>
                 <td>{$vo.type_name|htmlspecialchars}</td>
                 <td>{$vo.art_from|htmlspecialchars}</td>
-                <td>{$vo.art_time|mac_day=color}</td>
+                <td>{$vo.art_time|mac_day='color'}</td>
             </tr>
             {/volist}
             </tbody>

+ 1 - 1
application/admin/view/collect/role.html

@@ -50,7 +50,7 @@
                 <td>{$vo.role_name|htmlspecialchars}</td>
                 <td>{$vo.vod_name|htmlspecialchars}</td>
                 <td>{$vo.role_actor|htmlspecialchars}</td>
-                <td>{$vo.role_time|mac_day=color}</td>
+                <td>{$vo.role_time|mac_day='color'}</td>
             </tr>
             {/volist}
             </tbody>

+ 1 - 1
application/admin/view/collect/vod.html

@@ -50,7 +50,7 @@
                 <td>{$vo.vod_name|htmlspecialchars}</td>
                 <td>{$vo.type_name|htmlspecialchars}</td>
                 <td>{$vo.vod_play_from|htmlspecialchars}</td>
-                <td>{$vo.vod_time|mac_day=color}</td>
+                <td>{$vo.vod_time|mac_day='color'}</td>
             </tr>
             {/volist}
             </tbody>

+ 1 - 1
application/admin/view/collect/website.html

@@ -50,7 +50,7 @@
                 <td>{$vo.website_name|htmlspecialchars}</td>
                 <td>{$vo.type_name|htmlspecialchars}</td>
                 <td>{$vo.website_area|htmlspecialchars}</td>
-                <td>{$vo.website_time|mac_day=color}</td>
+                <td>{$vo.website_time|mac_day='color'}</td>
             </tr>
             {/volist}
             </tbody>

+ 1 - 1
application/admin/view/comment/index.html

@@ -66,7 +66,7 @@
                 <td>
                     <div class="c-999 f-12">
                         <u style="cursor:pointer" class="text-primary">{$vo.comment_name|htmlspecialchars}:</u>
-                        <time>【{$vo.comment_time|mac_day=color}】</time>
+                        <time>【{$vo.comment_time|mac_day='color'}】</time>
                         <span class="ml-20">ip:【{$vo.comment_ip|long2ip}】</span>
                         <span class="ml-20">{:lang('up')}:【{$vo.comment_up}】</span>
                         <span class="ml-20">{:lang('hate')}:【{$vo.comment_down}】</span>

+ 2 - 2
application/admin/view/gbook/index.html

@@ -62,7 +62,7 @@
                 <td>
                     <div class="c-999 f-12">
                         <u style="cursor:pointer" class="text-primary">{$vo.gbook_name|htmlspecialchars}:</u>
-                        <time>【{$vo.gbook_time|mac_day=color}】</time>
+                        <time>【{$vo.gbook_time|mac_day='color'}】</time>
                         <span class="ml-20">ip:【{$vo.gbook_ip|long2ip}】</span>
                     </div>
                     <div class="f-12 c-999">
@@ -72,7 +72,7 @@
                 </td>
                 <td>
                     <div class="c-999 f-12">
-                        {:lang('reply_time')}:{$vo.gbook_reply_time|mac_day=color}
+                        {:lang('reply_time')}:{$vo.gbook_reply_time|mac_day='color'}
                     </div>
                     <div class="f-12 c-999">
                         {:lang('reply')}:{$vo.gbook_reply|htmlspecialchars}

+ 2 - 2
application/admin/view/order/index.html

@@ -49,9 +49,9 @@
                 <td>{$vo.order_code}</td>
                 <td>{$vo.order_price}</td>
                 <td>{$vo.order_status|mac_get_order_status_text}</td>
-                <td>{$vo.order_time|mac_day=color}</td>
+                <td>{$vo.order_time|mac_day='color'}</td>
                 <td>{$vo.order_type}</td>
-                <td>{$vo.order_paytime|mac_day=color}</td>
+                <td>{$vo.order_paytime|mac_day='color'}</td>
                 <td>{$vo.user_id}、{$vo.user_name}</td>
                 <td>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del?ids='.$vo['order_id'])}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>

+ 1 - 1
application/admin/view/plog/index.html

@@ -54,7 +54,7 @@
                 <td>{$vo.plog_type|mac_get_plog_type_text}</td>
                 <td>{if condition="in_array($vo.plog_type,[1,2,3,4,5,6])"}+{else/}-{/if}{$vo.plog_points}</td>
                 <td>{$vo.plog_remarks}</td>
-                <td>{$vo.plog_time|mac_day=color}</td>
+                <td>{$vo.plog_time|mac_day='color'}</td>
                 <td>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del?ids='.$vo['plog_id'])}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>
                 </td>

+ 1 - 1
application/admin/view/role/index.html

@@ -97,7 +97,7 @@
                 <td>{$vo.role_sort}</td>
                 <td>{$vo.role_hits}</td>
                 <td><a data-href="{:url('index/select')}?tab=role&col=role_level&tpl=select_level&url=role/field&ids={$vo.role_id}" data-width="270" data-height="100" class=" j-select"><span class="layui-badge layui-bg-orange">{$vo.role_level}</span></a></td>
-                <td>{$vo.role_time|mac_day=color}</td>
+                <td>{$vo.role_time|mac_day='color'}</td>
                 <td>
                     <a class="layui-badge-rim j-iframe" data-full="1" data-href="{:url('info?id='.$vo['role_id'])}" href="javascript:;" title="{:lang('edit')}">{:lang('edit')}</a>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del?ids='.$vo['role_id'])}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>

+ 1 - 1
application/admin/view/template/ads.html

@@ -27,7 +27,7 @@
                 <th>{$vo.name}</a></th>
                 <td>{$vo.note}</td>
                 <td>{$vo.size}</td>
-                <td>{$vo.time|mac_day=color}</td>
+                <td>{$vo.time|mac_day='color'}</td>
                 <td>
                     <input id="txt{$key}" type="text" value='<script src="{literal}{$maccms.path_ads}{/literal}{$vo.name}"></script>' size="60">
                 </td>

+ 2 - 2
application/admin/view/template/index.html

@@ -31,7 +31,7 @@
                 <th>{$vo.name}</a></th>
                 <td>{$vo.note}</td>
                 <td>{$vo.size}</td>
-                <td>{$vo.time|mac_day=color}</td>
+                <td>{$vo.time|mac_day='color'}</td>
                 <td>
                     <a class="layui-badge-rim j-iframe" data-full="1" data-href="{:url('info')}?fpath={$vo.path}&fname={$vo.name}" href="javascript:;" title="{:lang('edit')}">{:lang('edit')}</a>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del')}?fname={$vo.fullname}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>
@@ -40,7 +40,7 @@
                 <th><a href="{:url('template/index',['path'=>$vo.path])}">{$vo.name}</a></th>
                 <td>{$vo.note}</td>
                 <td></td>
-                <td>{$vo.time|mac_day=color}</td>
+                <td>{$vo.time|mac_day='color'}</td>
                 <td></td>
                 {/if}
             </tr>

+ 1 - 1
application/admin/view/topic/index.html

@@ -52,7 +52,7 @@
                 <td>{$vo.topic_score}</td>
                 <td><a data-href="{:url('index/select')}?tab=topic&col=topic_level&tpl=select_level&url=topic/field&ids={$vo.topic_id}" data-width="270" data-height="100" class=" j-select"><span class="layui-badge layui-bg-orange">{$vo.topic_level}</span></a></td>
                 <td>{if condition="$vo.ismake eq 1"}<a target="_blank" class="layui-badge layui-bg-green " href="{:mac_url_topic_detail($vo)}">Y</a>{else/}<a class="layui-badge" href="{:url('make/make?ac=topic_info')}?topic={$vo.topic_id}&ref=1">N</a>{/if}</td>
-                <td>{$vo.topic_time|mac_day=color}</td>
+                <td>{$vo.topic_time|mac_day='color'}</td>
                 <td>
                     <a class="layui-badge-rim j-iframe" data-full="1" data-href="{:url('info?id='.$vo['topic_id'])}" href="javascript:;" title="{:lang('edit')}">{:lang('edit')}</a>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del?ids='.$vo['topic_id'])}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>

+ 1 - 1
application/admin/view/ulog/index.html

@@ -63,7 +63,7 @@
                 <td>{$vo.ulog_points}</td>
                 <td>{$vo.ulog_rid} {if condition="$vo.ulog_sid gt 0"}-{$vo.ulog_sid}{/if}{if condition="$vo.ulog_nid gt 0"}-{$vo.ulog_nid}{/if}</td>
                 <td>[{$vo.data.name}]</td>
-                <td>{$vo.ulog_time|mac_day=color}</td>
+                <td>{$vo.ulog_time|mac_day='color'}</td>
                 <td>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del?ids='.$vo['ulog_id'])}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>
                 </td>

+ 1 - 1
application/admin/view/user/index.html

@@ -62,7 +62,7 @@
                     <input type="checkbox" name="status" {if condition="$vo['user_status'] eq 1"}checked{/if} value="{$vo['user_status']}" lay-skin="switch" lay-filter="switchStatus" lay-text="{:lang('open')}|{:lang('close')}" data-href="{:url('field?col=user_status&ids='.$vo['user_id'])}">
                 </td>
                 <td>{$vo.user_points}</td>
-                <td>{$vo.user_login_time|mac_day=color}</td>
+                <td>{$vo.user_login_time|mac_day='color'}</td>
                 <td>{$vo.user_login_ip|long2ip}</td>
                 <td>{$vo.user_login_num}</td>
                 <td>

+ 1 - 1
application/admin/view/user/reward.html

@@ -50,7 +50,7 @@
                 <td>{$vo.group_name}</td>
                 <td>{if condition="$vo['user_status'] eq 1"}<span class="layui-badge layui-bg-green">{:lang('open')}</span>{else/}<span class="layui-badge">{:lang('close')}</span>{/if}</td>
                 <td>{if condition="$vo['user_pid'] eq $param['uid']"}{:lang('admin/user/reward/one_distribution')}{elseif condition="$vo['user_pid_2'] eq $param['uid']"}{:lang('admin/user/reward/two_distribution')}{else/}{:lang('admin/user/reward/three_distribution')}{/if}</td>
-                <td>{$vo.user_reg_time|mac_day=color}</td>
+                <td>{$vo.user_reg_time|mac_day='color'}</td>
             </tr>
             {/volist}
             </tbody>

+ 1 - 1
application/admin/view/visit/index.html

@@ -53,7 +53,7 @@
                 <td>[{$vo.user_id}]{$vo.user_name}</td>
                 <td>{$vo.visit_mid|mac_get_mid_text}</td>
                 <td>{$vo.visit_ly}</td>
-                <td>{$vo.visit_time|mac_day=color}</td>
+                <td>{$vo.visit_time|mac_day='color'}</td>
                 <td>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del?ids='.$vo['visit_id'])}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>
                 </td>

+ 1 - 1
application/admin/view/vod/index.html

@@ -228,7 +228,7 @@
                 <td><a data-href="{:url('index/select')}?tab=vod&col=vod_level&tpl=select_level&url=vod/field&ids={$vo.vod_id}" data-width="270" data-height="100" class=" j-select"><span class="layui-badge layui-bg-orange">{$vo.vod_level}</span></a></td>
                 <td>{if condition="$vo.ismake eq 1"}<a target="_blank" class="layui-badge layui-bg-green " href="{:mac_url_vod_detail($vo)}">Y</a>{else/}<a class="layui-badge" href="{:url('make/make?ac=info&tab=vod')}?ids={$vo.vod_id}&ref=1">N</a>{/if}</td>
                 <td><span title="{$vo.vod_play_from|str_replace='$$$',',',###}-{$vo.vod_down_from|str_replace='$$$',',',###}">{$vo.vod_play_from|str_replace='$$$',',',###}-{$vo.vod_down_from|str_replace='$$$',',',###}</span></td>
-                <td>{$vo.vod_time|mac_day=color}</td>
+                <td>{$vo.vod_time|mac_day='color'}</td>
                 <td>
                     <a class="layui-badge-rim j-iframe" data-full="1" data-href="{:url('info?id='.$vo['vod_id'])}" href="javascript:;" title="{:lang('edit')}">{:lang('edit')}</a>
                     <a class="layui-badge-rim j-tr-del" data-href="{:url('del?ids='.$vo['vod_id'])}" href="javascript:;" title="{:lang('del')}">{:lang('del')}</a>

+ 1 - 1
application/admin/view/website/index.html

@@ -124,7 +124,7 @@
                 <td>{$vo.website_referer}</td>
                 <td><a data-href="{:url('index/select')}?tab=website&col=website_level&tpl=select_level&url=website/field&ids={$vo.website_id}" data-width="270" data-height="100" class=" j-select"><span class="layui-badge layui-bg-orange">{$vo.website_level}</span></a></td>
                 <td>{if condition="$vo.ismake eq 1"}<a target="_blank" class="layui-badge layui-bg-green " href="{:mac_url_website_detail($vo)}">Y</a>{else/}<a class="layui-badge" href="{:url('make/make?ac=info&tab=website')}?ids={$vo.website_id}&ref=1">N</a>{/if}</td>
-                <td>{$vo.website_time|mac_day=color}</td>
+                <td>{$vo.website_time|mac_day='color'}</td>
                 <td>
                     <a class="layui-badge-rim j-iframe" data-full="1" data-href="{:url('visit/index?mid=11').'?wd='.parse_url($vo['website_jumpurl'])['host']}" href="javascript:;" title="">{:lang('referer')}</a>
                     <a class="layui-badge-rim j-ajax" data-href="{:url('index/check_back_link')}?url={$vo['website_jumpurl']}" refresh="no" href="javascript:;" title="{:lang('detect')}">{:lang('detect')}</a>

+ 1 - 1
application/common.php

@@ -658,7 +658,7 @@ function mac_array2xml($arr,$level=1)
         if(!is_array($value)) {
             $s .= "<{$tagname}>".(!is_numeric($value) ? '<![CDATA[' : '').$value.(!is_numeric($value) ? ']]>' : '')."</{$tagname}>";
         } else {
-            $s .= "<{$tagname}>" . $this->array2xml($value, $level + 1)."</{$tagname}>";
+            $s .= "<{$tagname}>" . mac_array2xml($value, $level + 1)."</{$tagname}>";
         }
     }
     $s = preg_replace("/([\x01-\x08\x0b-\x0c\x0e-\x1f])+/", ' ', $s);