Permalink
Browse files

Fixed a bug in CoTemplate {FILE} and changed nemesis => cfg.defaultth…

…eme in standard tpls
  • Loading branch information...
1 parent 23b18c1 commit 28430098ec467f6e5916a251ac641f0e1665b254 @trustmaster trustmaster committed May 9, 2011
View
2 modules/install/tpl/install.install.tpl
@@ -23,7 +23,7 @@
</div>
<div id="content">
- {FILE ./themes/nemesis/warnings.tpl}
+ {FILE ./themes/{PHP.cfg.defaulttheme}/warnings.tpl}
<form action="install.php" method="post">
View
2 modules/install/tpl/install.update.tpl
@@ -24,7 +24,7 @@
<div id="content">
<h3>{UPDATE_TITLE}</h3>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<!-- BEGIN: PARSER -->
<form action="install.php" method="get">
View
2 plugins/banlist/tpl/banlist.admin.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.banlist_title}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<h3>{PHP.L.editdeleteentries}:</h3>
<table class="cells">
<tr>
View
2 plugins/bbcode/tpl/bbcode.admin.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>BBCodes</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<h3>{PHP.L.editdeleteentries}:</h3>
<table class="cells">
<tr>
View
2 plugins/comments/tpl/comments.tools.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.comments_comments}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<ul class="follow">
<li><a title="{PHP.L.Configuration}" href="{ADMIN_COMMENTS_CONFIG_URL}">{PHP.L.Configuration}</a></li>
</ul>
View
2 plugins/ipsearch/tpl/ipsearch.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.ipsearch_title}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<div class="col3-2 first">
<div class="block">
<h3>{PHP.L.ipsearch_dnsrecord}: {IPSEARCH_RES_DNS}</h3>
View
2 plugins/ratings/tpl/ratings.admin.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.Ratings}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<ul class="follow">
<li><a title="{PHP.L.Configuration}" href="{ADMIN_RATINGS_URL_CONFIG}">{PHP.L.Configuration}</a></li>
</ul>
View
2 plugins/referers/tpl/referers.admin.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.Referers}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<!-- IF {PHP.usr.isadmin} -->
<ul class="follow">
<li><a href="{ADMIN_REFERERS_URL_PRUNE}">{PHP.L.adm_purgeall}</a></li>
View
2 plugins/trashcan/tpl/trashcan.admin.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.Trashcan}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<ul class="follow">
<li><a title="{PHP.L.Configuration}" href="{ADMIN_TRASHCAN_CONF_URL}">{PHP.L.Configuration}</a></li>
<li><a title="{PHP.L.Wipeall}" href="{ADMIN_TRASHCAN_WIPEALL_URL}">{PHP.L.Wipeall}</a></li>
View
2 plugins/trashcan/tpl/trashcan.info.admin.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.Trashcan}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<ul class="follow">
<li><a title="{PHP.L.Configuration}" href="{ADMIN_TRASHCAN_CONF_URL}">{PHP.L.Configuration}</a></li>
<li><a title="{PHP.L.Wipeall}" href="{ADMIN_TRASHCAN_WIPEALL_URL}">{PHP.L.Wipeall}</a></li>
View
2 plugins/urleditor/tpl/urleditor.admin.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.adm_urls_rules}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<!-- BEGIN: HTA -->
<h3>{PHP.L.adm_urls_your} {ADMIN_URLS_CONF_NAME}</h3>
<pre class="code">{ADMIN_URLS_HTA}</pre>
View
2 system/admin/tpl/admin.cache.disk.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>Disk Cache</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<div class="block">
<ul class="follow">
<li><a href="{ADMIN_DISKCACHE_URL_REFRESH}" class="ajax">{PHP.L.Refresh}</a></li>
View
2 system/admin/tpl/admin.cache.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.adm_internalcache}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<div class="block">
<ul class="follow">
<li><a href="{ADMIN_CACHE_URL_REFRESH}" class="ajax">{PHP.L.Refresh}</a></li>
View
2 system/admin/tpl/admin.config.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.Configuration}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<div class="block">
<!-- BEGIN: EDIT -->
<form name="saveconfig" id="saveconfig" action="{ADMIN_CONFIG_FORM_URL}" method="post" class="ajax">
View
2 system/admin/tpl/admin.extensions.tpl
@@ -1,5 +1,5 @@
<!-- BEGIN: MAIN -->
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<!-- BEGIN: CONFIG_URL -->
<ul>
<li><a title="{PHP.L.Configuration}" href="{ADMIN_EXTENSIONS_CONFIG_URL}">{PHP.L.Configuration}: {PHP.R.admin_icon_config}</a></li>
View
2 system/admin/tpl/admin.extrafields.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.adm_extrafields}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<div class="block">
<form action="{ADMIN_EXTRAFIELDS_URL_FORM_EDIT}" method="post">
<table class="cells">
View
2 system/admin/tpl/admin.log.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.Log} ({ADMIN_LOG_TOTALDBLOG})</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<!-- IF {PHP.usr.isadmin} -->
<ul class="follow">
<li><a title="{PHP.L.adm_purgeall}" href="{ADMIN_LOG_URL_PRUNE}" class="ajax">{PHP.L.adm_purgeall}</a></li>
View
2 system/admin/tpl/admin.rights.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.Rights}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<form name="saverights" id="saverights" action="{ADMIN_RIGHTS_FORM_URL}" method="post" class="ajax">
<!-- IF {PHP.g} > 5 -->
<table class="cells">
View
2 system/admin/tpl/admin.rightsbyitem.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.Rights}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<div class="block">
<form name="saverightsbyitem" id="saverightsbyitem" action="{ADMIN_RIGHTSBYITEM_FORM_URL}" method="post" class="ajax">
<table class="cells">
View
2 system/admin/tpl/admin.structure.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.Structure}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<div class="block">
<ul class="follow">
<li>
View
2 system/admin/tpl/admin.users.tpl
@@ -1,6 +1,6 @@
<!-- BEGIN: MAIN -->
<h2>{PHP.L.Users}</h2>
- {FILE "{PHP.cfg.themes_dir}/nemesis/warnings.tpl"}
+ {FILE "{PHP.cfg.themes_dir}/{PHP.cfg.defaulttheme}/warnings.tpl"}
<div class="block">
<ul class="follow">
View
2 system/cotemplate.php
@@ -216,7 +216,7 @@ public function restart($path)
// Remove BOM if present
if ($code[0] == chr(0xEF) && $code[1] == chr(0xBB) && $code[2] == chr(0xBF)) $code = mb_substr($code, 0);
// FILE includes
- $code = preg_replace_callback('`\{FILE\s+("|\'|)(.+?)\1\}`', 'XTemplate::restart_include_files', $code);
+ $code = preg_replace_callback('`\{FILE\s+("|\')(.+?)\1\}`', 'XTemplate::restart_include_files', $code);
// Get root-level blocks
do
{
View
2 system/users/tpl/users.auth.tpl
@@ -26,7 +26,7 @@
</div>
<div class="col3-1">
-{FILE "./themes/nemesis/inc/contact.tpl"}
+{FILE "./themes/{PHP.cfg.defaulttheme}/inc/contact.tpl"}
</div>
<!-- BEGIN: USERS_AUTH_MAINTENANCE -->

0 comments on commit 2843009

Please sign in to comment.