Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 927) +++ trunk/CHANGELOG (revision 928) @@ -11,6 +11,9 @@ ! = Update/Change ------------------------------------- 2.8.0 ------------------------------------- +15-Feb-2009 Christian Sommer +- removed reload admin tool ++ added possibility to reload Add-ons via the Add-on section 14-Feb-2009 Christian Sommer ! added option to display current user name in backend template # fixed wrong redirect path and added SVN Id Index: trunk/wb/admin/templates/reload.php =================================================================== --- trunk/wb/admin/templates/reload.php (nonexistent) +++ trunk/wb/admin/templates/reload.php (revision 928) @@ -0,0 +1,84 @@ + + * Copyright (C) 2004-2009, Ryan Djurovich + * + * Website Baker is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Website Baker is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Website Baker; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +// include WB configuration file and WB admin class +require_once('../../config.php'); +require_once('../../framework/class.admin.php'); + +// check user permissions for admintools (redirect users with wrong permissions) +$admin = new admin('Admintools', 'admintools', false, false); +if ($admin->get_permission('admintools') == false) die(header('Location: ../../index.php')); + +// check if the referer URL if available +$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : + (isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : ''); + +// if referer is set, check if script was invoked from "admin/modules/index.php" +$required_url = '/admin/templates/index.php'; +if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false))) + die(header('Location: ../../index.php')); + +// include WB functions file +require_once(WB_PATH . '/framework/functions.php'); + +// load WB language file +require_once(WB_PATH . '/languages/' . LANGUAGE .'.php'); + +// create Admin object with admin header +$admin = new admin('Addons', '', true, false); +$js_back = ADMIN_URL . '/templates/index.php'; + +// reload template information from template "info.php" files +if ($handle = opendir(WB_PATH . '/templates/')) { + // remove all templates from database + $table = TABLE_PREFIX . 'addons'; + $sql = "DELETE FROM $table WHERE `type` = 'template'"; + $database->query($sql); + + // loop over all templates + while(false !== ($file = readdir($handle))) { + if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') { + load_template(WB_PATH . '/templates/' . $file); + } + } + closedir($handle); + // output success message + $admin->print_success($MESSAGE['ADDON']['TEMPLATES_RELOADED'], $js_back); + +} else { + // output error message + $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); +} + +?> \ No newline at end of file Property changes on: trunk/wb/admin/templates/reload.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: trunk/wb/admin/templates/index.php =================================================================== --- trunk/wb/admin/templates/index.php (revision 927) +++ trunk/wb/admin/templates/index.php (revision 928) @@ -54,6 +54,9 @@ if($admin->get_permission('templates_view') != true) { $template->set_var('DISPLAY_LIST', 'hide'); } +if($admin->get_permission('admintools') != true) { + $template->set_var('DISPLAY_RELOAD', 'hide'); +} // Insert language headings $template->set_var(array( @@ -64,13 +67,20 @@ ); // Insert language text and messages $template->set_var(array( - 'TEXT_INSTALL' => $TEXT['INSTALL'], - 'TEXT_UNINSTALL' => $TEXT['UNINSTALL'], - 'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'], - 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], - 'CHANGE_TEMPLATE_NOTICE' => $MESSAGE['TEMPLATES']['CHANGE_TEMPLATE_NOTICE'] - ) - ); + 'URL_MODULES' => $admin->get_permission('modules') ? + '' . $MENU['MODULES'] . '' : '', + 'URL_LANGUAGES' => $admin->get_permission('languages') ? + '' . $MENU['LANGUAGES'] . '' : '', + 'TEXT_INSTALL' => $TEXT['INSTALL'], + 'TEXT_UNINSTALL' => $TEXT['UNINSTALL'], + 'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'CHANGE_TEMPLATE_NOTICE' => $MESSAGE['TEMPLATES']['CHANGE_TEMPLATE_NOTICE'], + 'TXT_ADMIN_SETTINGS' => $TEXT['ADMIN'] . '-' . $TEXT['SETTINGS'], + 'TEXT_RELOAD_ADDON' => $MESSAGE['ADDON']['RELOAD'], + 'TEXT_RELOAD' => $TEXT['RELOAD'] + ) +); // Parse template object $template->parse('main', 'main_block', false); Index: trunk/wb/admin/templates/template.html =================================================================== --- trunk/wb/admin/templates/template.html (revision 927) +++ trunk/wb/admin/templates/template.html (revision 928) @@ -1,5 +1,10 @@ +
+ {URL_MODULES}  {URL_LANGUAGES} +
+ +
{CHANGE_TEMPLATE_NOTICE}

@@ -68,6 +73,17 @@ +
+
+
+ +

{TXT_ADMIN_SETTINGS}

+

{TEXT_RELOAD_ADDON}

+ + +
+
+ \ No newline at end of file Index: trunk/wb/admin/interface/stylesheet.css =================================================================== --- trunk/wb/admin/interface/stylesheet.css (revision 927) +++ trunk/wb/admin/interface/stylesheet.css (revision 928) @@ -94,4 +94,11 @@ input:focus, select:focus, textarea:focus { background: #F1F8FD; +} + +div.box { + font-size: small; + width: 100%; + text-align: right; + margin: -10px 0 0 0; } \ No newline at end of file Index: trunk/wb/admin/interface/success.html =================================================================== --- trunk/wb/admin/interface/success.html (revision 927) +++ trunk/wb/admin/interface/success.html (revision 928) @@ -4,7 +4,7 @@ {MESSAGE}