mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Auto-detection of {WMESSAGE}

Browse Source
This commit is contained in:
Cameron
2013-03-22 19:54:37 -07:00
parent 0b19510ad3
commit 1cbfeb96f0
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_admin/wmessage.php
View File

@@ -236,15 +236,21 @@ if ($action == "opt") {
<tr> <tr>
<td>".WMLAN_05."</td> <td>".WMLAN_05."</td>
<td>".$frm->checkbox('wm_enclose', 1, varset($pref['wm_enclose'],0))."<span class='field-help'>".WMLAN_06."</span></td> <td>".$frm->checkbox('wm_enclose', 1, varset($pref['wm_enclose'],0))."<span class='field-help'>".WMLAN_06."</span></td>
</tr> </tr>";
/* DEPRECATED - see header_default.php {WMESSAGE}
$text .= "
<tr> <tr>
<td>".WMLAN_07."</td> <td>".WMLAN_07."</td>
<td>".$frm->checkbox('wmessage_sc', 1, varset($pref['wmessage_sc'],0))."</td> <td>".$frm->checkbox('wmessage_sc', 1, varset($pref['wmessage_sc'],0))."</td>
</tr> </tr>";
*/
$text .= "
</table> </table>
<div class='buttons-bar center'> <div class='buttons-bar center'>
".$text .= $frm->admin_button('updateoptions', LAN_SAVE)." ". $frm->admin_button('updateoptions', LAN_SAVE)."
</div> </div>
</fieldset> </fieldset>
</form> </form>

5
e107_core/shortcodes/single/wmessage.php
View File

@@ -8,12 +8,13 @@ function wmessage_shortcode($parm)
$e107cache = e107::getCache(); $e107cache = e107::getCache();
$pref = e107::getPref(); $pref = e107::getPref();
/* DEPRECATED - see auto-detect in header_default.php
$prefwmsc = varset($pref['wmessage_sc'], FALSE); $prefwmsc = varset($pref['wmessage_sc'], FALSE);
if (($prefwmsc && $parm == 'header') || (!$prefwmsc && ($parm !='header')) ) if (($prefwmsc && $parm == 'header') || (!$prefwmsc && ($parm !='header')) )
{ // Two places it might be invoked - allow one or the other { // Two places it might be invoked - allow one or the other
return; // return;
} }
*/
if ($parm != 'force') if ($parm != 'force')
{ {

9
e107_core/templates/footer_default.php
View File

@@ -318,11 +318,10 @@ echo "\n<!-- ".md5($bcache)." -->\n";
unset($uclist, $bcache); unset($uclist, $bcache);
if(!deftrue('e_POWEREDBY_DISABLE')) $show = deftrue('e_POWEREDBY_DISABLE') ? "none" : "block"; // Let search engines find us to increase e107.org ranking - even if hidden.
{ //XXX Must not contain IDs or Classes
// No IDs or Classes - hinder js disable. echo "<div style='text-align:center; display:".$show."; position: absolute; width:99%; height:20px; margin-top:-30px; z-index:30000; opacity:1.0; color: silver'>Proudly powered by <a style='color:silver' href='http://e107.org/' title='e107 Content Management System'>e107</a></div>";
echo "<div style='text-align:center; display:block; position: absolute; width:100%;height:20px; margin-top:-30px; z-index:30000; opacity:1.0; color: silver'>Proudly powered by <a style='color:silver' href='http://e107.org/' title='e107 Content Management System'>e107</a></div>"; unset($show);
}
echo "\n</body>\n</html>"; echo "\n</body>\n</html>";
// //

9
e107_core/templates/header_default.php
View File

@@ -622,10 +622,11 @@ if ($e107_popup != 1) {
if(file_exists(e_BASE.'install.php')){ echo "<div class='installer'><br /><b>*** ".CORE_LAN4." ***</b><br />".CORE_LAN5."</div><br /><br />"; } if(file_exists(e_BASE.'install.php')){ echo "<div class='installer'><br /><b>*** ".CORE_LAN4." ***</b><br />".CORE_LAN5."</div><br /><br />"; }
} }
// Display Welcome Message when old method activated. // Display Welcome Message when old method activated.
if(!strstr($HEADER,"{WMESSAGE")===false && !strstr($FOOTER,"{WMESSAGE")===false) // Auto-detection to override old pref.
echo $e107->tp->parseTemplate("{WMESSAGE=header}"); {
echo e107::getParser()->parseTemplate("{WMESSAGE}");
}
if(defined("PREVIEWTHEME")) if(defined("PREVIEWTHEME"))