Index: tags/2.6.0/wb/admin/login/forgot/index.php =================================================================== --- tags/2.6.0/wb/admin/login/forgot/index.php (nonexistent) +++ tags/2.6.0/wb/admin/login/forgot/index.php (revision 260) @@ -0,0 +1,161 @@ + + Copyright (C) 2004-2005, 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 the configuration file +require('../../../config.php'); +// Include the language file +require(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php'); +// Include the database class file and initiate an object +require(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Start', 'start', false, false); +$database = new database(); + +// Get the website title +$results = $database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name = 'title'"); +$results = $results->fetchRow(); +$website_title = $results['value']; + +// Check if the user has already submitted the form, otherwise show it +if(isset($_POST['email']) AND $_POST['email'] != "") { + + $email = $_POST['email']; + + // Check if the email exists in the database + $query = "SELECT user_id,username,display_name,email,last_reset FROM ".TABLE_PREFIX."users WHERE email = '".$admin->add_slashes($_POST['email'])."'"; + $results = $database->query($query); + if($results->numRows() > 0) { + + // Get the id, username, email, and last_reset from the above db query + $results_array = $results->fetchRow(); + + // Check if the password has been reset in the last 2 hours + $last_reset = $results_array['last_reset']; + $time_diff = mktime()-$last_reset; // Time since last reset in seconds + $time_diff = $time_diff/60/60; // Time since last reset in hours + if($time_diff < 2) { + + // Tell the user that their password cannot be reset more than once per hour + $message = $MESSAGE['FORGOT_PASS']['ALREADY_RESET']; + + } else { + + // Generate a random password then update the database with it + $new_pass = ''; + $salt = "abchefghjkmnpqrstuvwxyz0123456789"; + srand((double)microtime()*1000000); + $i = 0; + while ($i <= 7) { + $num = rand() % 33; + $tmp = substr($salt, $num, 1); + $new_pass = $new_pass . $tmp; + $i++; + } + + $database->query("UPDATE ".TABLE_PREFIX."users SET password = '".md5($new_pass)."', last_reset = '".mktime()."' WHERE user_id = '".$results_array['user_id']."'"); + + if($database->is_error()) { + // Error updating database + $message = $database->get_error(); + } else { + // Setup email to send + $mail_subject = 'Your login details...'; + $mail_to = $email; + $mail_message = ''. + 'Hello '.$results_array["display_name"].', + + Your '.$website_title.' administration login details are: + Username: '.$results_array["username"].' + Password: '.$new_pass.' + + Your password has been reset to the one above. + This means that your old password will no longer work. + + If you have received this message in error, please delete it immediatly.'; + // Try sending the email + if(mail($mail_to, $mail_subject, $mail_message, 'From: '.SERVER_EMAIL)) { + $message = $MESSAGE['FORGOT_PASS']['PASSWORD_RESET']; + $display_form = false; + } else { + $message = $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL']; + } + } + + } + + } else { + // Email doesn't exist, so tell the user + $message = $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND']; + } + +} else { + $email = ''; +} + +if(!isset($message)) { + $message = $MESSAGE['FORGOT_PASS']['NO_DATA']; + $message_color = '000000'; +} else { + $message_color = 'FF0000'; +} + +// Setup the template +$template = new Template(ADMIN_PATH.'/login/forgot'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); +if(defined('FRONTEND')) { + $template->set_var('ACTION_URL', 'forgot.php'); +} else { + $template->set_var('ACTION_URL', 'index.php'); +} +$template->set_var('EMAIL', $email); + +if(isset($display_form)) { + $template->set_var('DISPLAY_FORM', 'none'); +} + +$template->set_var(array( + 'SECTION_FORGOT' => $MENU['FORGOT'], + 'MESSAGE_COLOR' => $message_color, + 'MESSAGE' => $message, + 'WB_URL' => WB_URL, + 'ADMIN_URL' => ADMIN_URL, + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_SEND_DETAILS' => $TEXT['SEND_DETAILS'], + 'TEXT_HOME' => $TEXT['HOME'], + 'TEXT_NEED_TO_LOGIN' => $TEXT['NEED_TO_LOGIN'] + ) + ); + +if(defined('FRONTEND')) { + $template->set_var('LOGIN_URL', WB_URL.'/account/login.php'); +} else { + $template->set_var('LOGIN_URL', ADMIN_URL); +} +$template->set_var('INTERFACE_URL', ADMIN_URL.'/interface'); + +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/login/forgot/index.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: tags/2.6.0/wb/admin/login/forgot/template.html =================================================================== --- tags/2.6.0/wb/admin/login/forgot/template.html (nonexistent) +++ tags/2.6.0/wb/admin/login/forgot/template.html (revision 260) @@ -0,0 +1,75 @@ + + + + +Retrieve Login Details + + + + + + + + + + +
+ Logo +   + Website Baker + {SECTION_FORGOT} +
+ + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + +
{MESSAGE}
{TEXT_EMAIL}:
 
+
+ +
+ {TEXT_NEED_TO_LOGIN} +
+
+ {TEXT_HOME} +
+ +
+ + + + + +
+ + Website Baker + is released under the + GNU General Public License + +
+ + + + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/login/forgot/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/login/template.html =================================================================== --- tags/2.6.0/wb/admin/login/template.html (nonexistent) +++ tags/2.6.0/wb/admin/login/template.html (revision 260) @@ -0,0 +1,91 @@ + + + + +{TEXT_LOGIN} + + + + + + + + + + +
+ Logo +   + Website Baker + {SECTION_LOGIN} +
+ + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{MESSAGE}
{TEXT_USERNAME}:
{TEXT_PASSWORD}:
  + + +
 
+
+ +
+ {TEXT_FORGOTTEN_DETAILS} +
+
+
+ {TEXT_HOME} +
+ +
+ + + + + +
+ + Website Baker + is released under the + GNU General Public License + +
+ + + + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/login/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/login/warning.html =================================================================== --- tags/2.6.0/wb/admin/login/warning.html (nonexistent) +++ tags/2.6.0/wb/admin/login/warning.html (revision 260) @@ -0,0 +1,39 @@ + + + +Maximum Invalid Login Attemps Exceeded + + + +
+
+

Excessive Invalid Logins

+ You have attempted to login too many times +
+ + + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/login/warning.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/login/index.php =================================================================== --- tags/2.6.0/wb/admin/login/index.php (nonexistent) +++ tags/2.6.0/wb/admin/login/index.php (revision 260) @@ -0,0 +1,70 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require_once("../../config.php"); +require_once(WB_PATH."/framework/class.login.php"); + +if(defined('SMART_LOGIN') AND SMART_LOGIN == 'enabled') { + // Generate username field name + $username_fieldname = 'username_'; + $password_fieldname = 'password_'; + $salt = "abchefghjkmnpqrstuvwxyz0123456789"; + srand((double)microtime()*1000000); + $i = 0; + while ($i <= 7) { + $num = rand() % 33; + $tmp = substr($salt, $num, 1); + $username_fieldname = $username_fieldname . $tmp; + $password_fieldname = $password_fieldname . $tmp; + $i++; + } +} else { + $username_fieldname = 'username'; + $password_fieldname = 'password'; +} + +$thisApp = new Login( + array( + 'MAX_ATTEMPS' => "50", + 'WARNING_URL' => ADMIN_URL."/login/warning.html", + 'USERNAME_FIELDNAME' => $username_fieldname, + 'PASSWORD_FIELDNAME' => $password_fieldname, + 'REMEMBER_ME_OPTION' => SMART_LOGIN, + 'MIN_USERNAME_LEN' => "2", + 'MIN_PASSWORD_LEN' => "2", + 'MAX_USERNAME_LEN' => "30", + 'MAX_PASSWORD_LEN' => "30", + 'LOGIN_URL' => ADMIN_URL."/login/index.php", + 'DEFAULT_URL' => ADMIN_URL."/start/index.php", + 'TEMPLATE_DIR' => ADMIN_PATH."/login", + 'TEMPLATE_FILE' => "template.html", + 'FRONTEND' => false, + 'FORGOTTEN_DETAILS_APP' => ADMIN_URL."/login/forgot/index.php", + 'USERS_TABLE' => TABLE_PREFIX."users", + 'GROUPS_TABLE' => TABLE_PREFIX."groups", + ) + ); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/login/index.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: tags/2.6.0/wb/admin/interface/charsets.php =================================================================== --- tags/2.6.0/wb/admin/interface/charsets.php (nonexistent) +++ tags/2.6.0/wb/admin/interface/charsets.php (revision 260) @@ -0,0 +1,43 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Charset list file + +This file is used to generate a list of charsets for the user to select + +*/ + +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +// Create array +$CHARSETS = array(); +$CHARSETS['utf-8'] = 'Unicode (utf-8)'; +$CHARSETS['iso-8859-1'] = 'Latin 1 (iso-8859-1)'; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/charsets.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/admin/interface/header.html =================================================================== --- tags/2.6.0/wb/admin/interface/header.html (nonexistent) +++ tags/2.6.0/wb/admin/interface/header.html (revision 260) @@ -0,0 +1,41 @@ + + + + +{WEBSITE_TITLE} >> {TEXT_ADMINISTRATION} - {SECTION_NAME} + + + + + + + + + + + +
+ Logo +   + Website Baker + {TEXT_ADMINISTRATION} + + Version {VERSION} +
+ + + + + + + + +
+ +
+ \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/header.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/interface/footer.html =================================================================== --- tags/2.6.0/wb/admin/interface/footer.html (nonexistent) +++ tags/2.6.0/wb/admin/interface/footer.html (revision 260) @@ -0,0 +1,20 @@ + +
+ + + + + +
+ + Website Baker + is released under the + GNU General Public License + +
+ + + + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/footer.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/interface/time_formats.php =================================================================== --- tags/2.6.0/wb/admin/interface/time_formats.php (nonexistent) +++ tags/2.6.0/wb/admin/interface/time_formats.php (revision 260) @@ -0,0 +1,71 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Time format list file + +This file is used to generate a list of time formats for the user to select + +*/ + +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +// Define that this file is loaded +if(!defined('TIME_FORMATS_LOADED')) { + define('TIME_FORMATS_LOADED', true); +} + +// Create array +$TIME_FORMATS = array(); + +// Get the current time (in the users timezone if required) +if(isset($user_time) AND $user_time == true) { + $mktime = mktime()+TIMEZONE; +} else { + $mktime = mktime()+DEFAULT_TIMEZONE; +} + +// Add values to list +$TIME_FORMATS['g:i|A'] = gmdate('g:i A', $mktime); +$TIME_FORMATS['g:i|a'] = gmdate('g:i a', $mktime); +$TIME_FORMATS['H:i:s'] = gmdate('H:i:s', $mktime); +$TIME_FORMATS['H:i'] = gmdate('H:i', $mktime); + +// Add "System Default" to list (if we need to) +if(isset($user_time) AND $user_time == true) { + if(isset($TEXT['SYSTEM_DEFAULT'])) { + $TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $mktime).' ('.$TEXT['SYSTEM_DEFAULT'].')'; + } else { + $TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $mktime).' (System Default)'; + } +} + +// Reverse array so "System Default" is at the top +$TIME_FORMATS = array_reverse($TIME_FORMATS, true); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/time_formats.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: tags/2.6.0/wb/admin/interface/timezones.php =================================================================== --- tags/2.6.0/wb/admin/interface/timezones.php (nonexistent) +++ tags/2.6.0/wb/admin/interface/timezones.php (revision 260) @@ -0,0 +1,81 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Timezone list file + +This file is used to generate a list of timezones for the user to select + +*/ + +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +// Create array +$TIMEZONES = array(); + +// Add "System Default" to top of list +if(isset($TEXT['SYSTEM_DEFAULT'])) { + $TIMEZONES['-20'] = $TEXT['SYSTEM_DEFAULT']; +} else { + $TIMEZONES['-20'] = 'System Default'; +} + +$TIMEZONES['-12'] = 'GMT - 12 Hours'; +$TIMEZONES['-11'] = 'GMT -11 Hours'; +$TIMEZONES['-10'] = 'GMT -10 Hours'; +$TIMEZONES['-9'] = 'GMT -9 Hours'; +$TIMEZONES['-8'] = 'GMT -8 Hours'; +$TIMEZONES['-7'] = 'GMT -7 Hours'; +$TIMEZONES['-6'] = 'GMT -6 Hours'; +$TIMEZONES['-5'] = 'GMT -5 Hours'; +$TIMEZONES['-4'] = 'GMT -4 Hours'; +$TIMEZONES['-3.5'] = 'GMT -3.5 Hours'; +$TIMEZONES['-3'] = 'GMT -3 Hours'; +$TIMEZONES['-2'] = 'GMT -2 Hours'; +$TIMEZONES['-1'] = 'GMT -1 Hour'; +$TIMEZONES['0'] = 'GMT'; +$TIMEZONES['1'] = 'GMT +1 Hour'; +$TIMEZONES['2'] = 'GMT +2 Hours'; +$TIMEZONES['3'] = 'GMT +3 Hours'; +$TIMEZONES['3.5'] = 'GMT +3.5 Hours'; +$TIMEZONES['4'] = 'GMT +4 Hours'; +$TIMEZONES['4.5'] = 'GMT +4.5 Hours'; +$TIMEZONES['5'] = 'GMT +5 Hours'; +$TIMEZONES['5.5'] = 'GMT +5.5 Hours'; +$TIMEZONES['6'] = 'GMT +6 Hours'; +$TIMEZONES['6.5'] = 'GMT +6.5 Hours'; +$TIMEZONES['7'] = 'GMT +7 Hours'; +$TIMEZONES['8'] = 'GMT +8 Hours'; +$TIMEZONES['9'] = 'GMT +9 Hours'; +$TIMEZONES['9.5'] = 'GMT +9.5 Hours'; +$TIMEZONES['10'] = 'GMT +10 Hours'; +$TIMEZONES['11'] = 'GMT +11 Hours'; +$TIMEZONES['12'] = 'GMT +12 Hours'; +$TIMEZONES['13'] = 'GMT +13 Hours'; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/timezones.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: tags/2.6.0/wb/admin/interface/er_levels.php =================================================================== --- tags/2.6.0/wb/admin/interface/er_levels.php (nonexistent) +++ tags/2.6.0/wb/admin/interface/er_levels.php (revision 260) @@ -0,0 +1,67 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Error Reporting Level's list file + +This file is used to generate a list of PHP +Error Reporting Level's for the user to select + +*/ + +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +// Define that this file is loaded +if(!defined('ERROR_REPORTING_LEVELS_LOADED')) { + define('ERROR_REPORTING_LEVELS_LOADED', true); +} + +// Create array +$ER_LEVELS = array(); + +// Add values to list +if(isset($TEXT['SYSTEM_DEFAULT'])) { + $ER_LEVELS[''] = $TEXT['SYSTEM_DEFAULT']; +} else { + $ER_LEVELS[''] = 'System Default'; +} +$ER_LEVELS['E_ERROR'] = 'E_ERROR'; +$ER_LEVELS['E_WARNING'] = 'E_WARNING'; +$ER_LEVELS['E_PARSE'] = 'E_PARSE'; +$ER_LEVELS['E_NOTICE'] = 'E_NOTICE'; +$ER_LEVELS['E_CORE_ERROR'] = 'E_CORE_ERROR'; +$ER_LEVELS['E_CORE_WARNING'] = 'E_CORE_WARNING'; +$ER_LEVELS['E_COMPILE_ERROR'] = 'E_COMPILE_ERROR'; +$ER_LEVELS['E_COMPILE_WARNING'] = 'E_COMPILE_WARNING'; +$ER_LEVELS['E_USER_ERROR'] = 'E_USER_ERROR'; +$ER_LEVELS['E_USER_WARNING'] = 'E_USER_WARNING'; +$ER_LEVELS['E_USER_NOTICE'] = 'E_USER_NOTICE'; +$ER_LEVELS['E_ALL'] = 'E_ALL'; +$ER_LEVELS['E_STRICT'] = 'E_STRICT'; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/er_levels.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: tags/2.6.0/wb/admin/interface/version.php =================================================================== --- tags/2.6.0/wb/admin/interface/version.php (nonexistent) +++ tags/2.6.0/wb/admin/interface/version.php (revision 260) @@ -0,0 +1,40 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Version file + +This file is where the WB release version is stored. + +*/ + +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +define('VERSION', '2.6.0'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/version.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: tags/2.6.0/wb/admin/interface/date_formats.php =================================================================== --- tags/2.6.0/wb/admin/interface/date_formats.php (nonexistent) +++ tags/2.6.0/wb/admin/interface/date_formats.php (revision 260) @@ -0,0 +1,78 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Date format list file + +This file is used to generate a list of date formats for the user to select + +*/ + +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +// Define that this file is loaded +if(!defined('DATE_FORMATS_LOADED')) { + define('DATE_FORMATS_LOADED', true); +} + +// Create array +$DATE_FORMATS = array(); + +// Get the current time (in the users timezone if required) +if(isset($user_time) AND $user_time == true) { + $mktime = mktime()+TIMEZONE; +} else { + $mktime = mktime()+DEFAULT_TIMEZONE; +} + +// Add values to list +$DATE_FORMATS['l,|jS|F,|Y'] = gmdate('l, jS F, Y', $mktime); +$DATE_FORMATS['jS|F,|Y'] = gmdate('jS F, Y', $mktime); +$DATE_FORMATS['d|M|Y'] = gmdate('d M Y', $mktime); +$DATE_FORMATS['M|d|Y'] = gmdate('M d Y', $mktime); +$DATE_FORMATS['D|M|d,|Y'] = gmdate('D M d, Y', $mktime); +$DATE_FORMATS['d-m-Y'] = gmdate('d-m-Y', $mktime).' (D-M-Y)'; +$DATE_FORMATS['m-d-Y'] = gmdate('m-d-Y', $mktime).' (M-D-Y)'; +$DATE_FORMATS['d.m.Y'] = gmdate('d.m.Y', $mktime).' (D.M.Y)'; +$DATE_FORMATS['m.d.Y'] = gmdate('m.d.Y', $mktime).' (M.D.Y)'; +$DATE_FORMATS['d/m/Y'] = gmdate('d/m/Y', $mktime).' (D/M/Y)'; +$DATE_FORMATS['m/d/Y'] = gmdate('m/d/Y', $mktime).' (M/D/Y)'; + +// Add "System Default" to list (if we need to) +if(isset($user_time) AND $user_time == true) { + if(isset($TEXT['SYSTEM_DEFAULT'])) { + $DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $mktime).' ('.$TEXT['SYSTEM_DEFAULT'].')'; + } else { + $DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $mktime).' (System Default)'; + } +} + +// Reverse array so "System Default" is at the top +$DATE_FORMATS = array_reverse($DATE_FORMATS, true); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/date_formats.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: tags/2.6.0/wb/admin/interface/stylesheet.css =================================================================== --- tags/2.6.0/wb/admin/interface/stylesheet.css (nonexistent) +++ tags/2.6.0/wb/admin/interface/stylesheet.css (revision 260) @@ -0,0 +1,87 @@ +body,td,th,input,textarea { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + color: #000000; +} +body { + background-color: #557799; + background-image: url(../interface/background.png); + background-repeat: repeat-x; + margin: 0px; +} +form { + margin: 0; +} +hr { + margin: 15px 0px 15px 0px; + color: #003366; + height: 1px; +} +h1 { + text-align: center; + font-size: 20px; + color: #003366; + text-transform: uppercase; +} +h2 { + font-size: 15px; + color: #336699; + margin: 5px 0px 5px 0px; +} +a:link, a:visited, a:active { + color: #003366; + text-decoration: none; +} +a:hover { + text-decoration: none; + color: #336699; +} +.note { + color: #666666; + font-size: 10px; +} +label { + cursor: pointer; +} +.menu { + margin: 0; + padding: 0; + padding-top: 10px; + padding-bottom: 4px; + padding-left: 8px; +} +.menu li { + list-style-type: none; + display: inline; + padding-right: 1px; +} +.menu a, .menu a:link, .menu a:active, .menu a:visited { + border-bottom: 0; + padding: 4px 3px 4px 3px; + color: #003366; +} +.menu a:hover { + text-decoration: none; + color: #336699; +} +.current a, .current a:link, .current a:active, .current a:visited { + background-color: #FFFFFF; + color: #000000; +} +.content { + background-color: #FFFFFF; + padding: 20px; + height: 280px; + width: 750px; + text-align: left; + vertical-align: top; +} +.row_a { + background-color: #EEEEEE; +} +.row_b { + background-color: #DDDDDD; +} +.hide { + display: none; +} \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/stylesheet.css ___________________________________________________________________ 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: tags/2.6.0/wb/admin/interface/success.html =================================================================== --- tags/2.6.0/wb/admin/interface/success.html (nonexistent) +++ tags/2.6.0/wb/admin/interface/success.html (revision 260) @@ -0,0 +1,16 @@ + +
+ + {MESSAGE} + + + + + +
+ \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/success.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/interface/background.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/interface/background.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/interface/logo.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/interface/logo.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/interface/error.html =================================================================== --- tags/2.6.0/wb/admin/interface/error.html (nonexistent) +++ tags/2.6.0/wb/admin/interface/error.html (revision 260) @@ -0,0 +1,10 @@ + +
+ + {MESSAGE} + +

+ {BACK} + +
+ \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/error.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/interface/index.php =================================================================== --- tags/2.6.0/wb/admin/interface/index.php (nonexistent) +++ tags/2.6.0/wb/admin/interface/index.php (revision 260) @@ -0,0 +1,29 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +header('Location: '.ADMIN_URL.'/start/index.php'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/interface/index.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: tags/2.6.0/wb/admin/settings/index.php =================================================================== --- tags/2.6.0/wb/admin/settings/index.php (nonexistent) +++ tags/2.6.0/wb/admin/settings/index.php (revision 260) @@ -0,0 +1,598 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +if(isset($_GET['advanced']) AND $_GET['advanced'] == 'yes') { + $admin = new admin('Settings', 'settings_advanced'); +} else { + $admin = new admin('Settings', 'settings_basic'); +} + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Create new template object +$template = new Template(ADMIN_PATH.'/settings'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); + +// Query current settings in the db, then loop through them and print them +$query = "SELECT * FROM ".TABLE_PREFIX."settings"; +$results = $database->query($query); +while($setting = $results->fetchRow()) { + $setting_name = $setting['name']; + $setting_value = htmlspecialchars($setting['value']); + $template->set_var(strtoupper($setting_name),$setting_value); +} + +// Query current settings in the db, then loop through them and print them +$query = "SELECT * FROM ".TABLE_PREFIX."search WHERE extra = ''"; +$results = $database->query($query); +while($setting = $results->fetchRow()) { + $setting_name = $setting['name']; + $setting_value = htmlspecialchars(($setting['value'])); + switch($setting_name) { + // Search header + case 'header': + $template->set_var('SEARCH_HEADER', $setting_value); + break; + // Search results header + case 'results_header': + $template->set_var('SEARCH_RESULTS_HEADER', $setting_value); + break; + // Search results loop + case 'results_loop': + $template->set_var('SEARCH_RESULTS_LOOP', $setting_value); + break; + // Search results footer + case 'results_footer': + $template->set_var('SEARCH_RESULTS_FOOTER', $setting_value); + break; + // Search no results + case 'no_results': + $template->set_var('SEARCH_NO_RESULTS', $setting_value); + break; + // Search footer + case 'footer': + $template->set_var('SEARCH_FOOTER', $setting_value); + break; + // Search template + case 'template': + $search_template = $setting_value; + break; + } +} + +// Do the same for settings stored in config file as with ones in db +$database_type = ''; + +// Tell the browser whether or not to show advanced options +if(isset($_GET['advanced']) AND $_GET['advanced'] == 'yes') { + $template->set_var('DISPLAY_ADVANCED', ''); + $template->set_var('ADVANCED', 'yes'); + $template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']); + $template->set_var('ADVANCED_LINK', 'index.php?advanced=no'); + $template->set_var('BASIC_FILE_PERMS_ID', 'hide'); + $template->set_var('ADVANCED_FILE_PERMS_ID', 'file_perms_box'); +} else { + $template->set_var('DISPLAY_ADVANCED', 'none'); + $template->set_var('ADVANCED', 'no'); + $template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>'); + $template->set_var('ADVANCED_LINK', 'index.php?advanced=yes'); + $template->set_var('BASIC_FILE_PERMS_ID', 'file_perms_box'); + $template->set_var('ADVANCED_FILE_PERMS_ID', 'hide'); +} + +$template->set_var(array( + 'PAGES_DIRECTORY' => PAGES_DIRECTORY, + 'MEDIA_DIRECTORY' => MEDIA_DIRECTORY, + 'PAGE_EXTENSION' => PAGE_EXTENSION, + 'PAGE_SPACER' => PAGE_SPACER, + 'WB_PATH' => WB_PATH, + 'WB_URL' => WB_URL, + 'ADMIN_PATH' => ADMIN_PATH, + 'ADMIN_URL' => ADMIN_URL, + 'DATABASE_TYPE' => DB_TYPE, + 'DATABASE_HOST' => DB_HOST, + 'DATABASE_USERNAME' => DB_USERNAME, + 'DATABASE_NAME' => DB_NAME, + 'TABLE_PREFIX' => TABLE_PREFIX + ) + ); + +// Insert tools into tool list +$template->set_block('main_block', 'tool_list_block', 'tool_list'); +$results = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool'"); +if($results->numRows() > 0) { + while($tool = $results->fetchRow()) { + $template->set_var('TOOL_NAME', $tool['name']); + $template->set_var('TOOL_DIR', $tool['directory']); + $template->set_var('TOOL_DESCRIPTION', $tool['description']); + $template->parse('tool_list', 'tool_list_block', true); + } +} else { + $template->set_var('TOOL_LIST', $TEXT['NONE_FOUND']); +} + +// Insert language values +$template->set_block('main_block', 'language_list_block', 'language_list'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language'"); +if($result->numRows() > 0) { + while ($addon = $result->fetchRow()) { + // Insert code and name + $template->set_var(array( + 'CODE' => $addon['directory'], + 'NAME' => $addon['name'] + )); + // Check if it is selected + if(DEFAULT_LANGUAGE == $addon['directory']) { + $template->set_var('SELECTED', ' selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('language_list', 'language_list_block', true); + } +} + +// Insert default timezone values +require(ADMIN_PATH.'/interface/timezones.php'); +$template->set_block('main_block', 'timezone_list_block', 'timezone_list'); +foreach($TIMEZONES AS $hour_offset => $title) { + // Make sure we dont list "System Default" as we are setting this value! + if($hour_offset != '-20') { + $template->set_var('VALUE', $hour_offset); + $template->set_var('NAME', $title); + if(DEFAULT_TIMEZONE == $hour_offset*60*60) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('timezone_list', 'timezone_list_block', true); + } +} + +// Insert default charset values +require(ADMIN_PATH.'/interface/charsets.php'); +$template->set_block('main_block', 'charset_list_block', 'charset_list'); +foreach($CHARSETS AS $code => $title) { + $template->set_var('VALUE', $code); + $template->set_var('NAME', $title); + if(DEFAULT_CHARSET == $code) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('charset_list', 'charset_list_block', true); +} + +// Insert date format list +require(ADMIN_PATH.'/interface/date_formats.php'); +$template->set_block('main_block', 'date_format_list_block', 'date_format_list'); +foreach($DATE_FORMATS AS $format => $title) { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + if($format != 'system_default') { + $template->set_var('VALUE', $format); + } else { + $template->set_var('VALUE', ''); + } + $template->set_var('NAME', $title); + if(DEFAULT_DATE_FORMAT == $format) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('date_format_list', 'date_format_list_block', true); +} + +// Insert time format list +require(ADMIN_PATH.'/interface/time_formats.php'); +$template->set_block('main_block', 'time_format_list_block', 'time_format_list'); +foreach($TIME_FORMATS AS $format => $title) { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + if($format != 'system_default') { + $template->set_var('VALUE', $format); + } else { + $template->set_var('VALUE', ''); + } + $template->set_var('NAME', $title); + if(DEFAULT_TIME_FORMAT == $format) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('time_format_list', 'time_format_list_block', true); +} + +// Insert templates +$template->set_block('main_block', 'template_list_block', 'template_list'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); +if($result->numRows() > 0) { + while($addon = $result->fetchRow()) { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + if(($addon['directory'] == DEFAULT_TEMPLATE) ? $selected = ' selected' : $selected = ''); + $template->set_var('SELECTED', $selected); + $template->parse('template_list', 'template_list_block', true); + } +} + +// Insert WYSIWYG modules +$template->set_block('main_block', 'editor_list_block', 'editor_list'); +$file='none'; +$module_name=$TEXT['NONE']; +$template->set_var('FILE', $file); +$template->set_var('NAME', $module_name); +if((!defined('WYSIWYG_EDITOR') OR $file == WYSIWYG_EDITOR) ? $selected = ' selected' : $selected = ''); +$template->set_var('SELECTED', $selected); +$template->parse('editor_list', 'editor_list_block', true); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'wysiwyg'"); +if($result->numRows() > 0) { + while($addon = $result->fetchRow()) { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + if((defined('WYSIWYG_EDITOR') AND $addon['directory'] == WYSIWYG_EDITOR) ? $selected = ' selected' : $selected = ''); + $template->set_var('SELECTED', $selected); + $template->parse('editor_list', 'editor_list_block', true); + } +} + +// Insert templates for search settings +$template->set_block('main_block', 'search_template_list_block', 'search_template_list'); +if($search_template == '') { $selected = ' selected'; } else { $selected = ''; } +$template->set_var(array('FILE' => '', 'NAME' => $TEXT['SYSTEM_DEFAULT'], 'SELECTED' => $selected)); +$template->parse('search_template_list', 'search_template_list_block', true); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); +if($result->numRows() > 0) { + while($addon = $result->fetchRow()) { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + if($addon['directory'] == $search_template ? $selected = ' selected' : $selected = ''); + $template->set_var('SELECTED', $selected); + $template->parse('search_template_list', 'search_template_list_block', true); + } +} + +// Insert default error reporting values +require(ADMIN_PATH.'/interface/er_levels.php'); +$template->set_block('main_block', 'error_reporting_list_block', 'error_reporting_list'); +foreach($ER_LEVELS AS $value => $title) { + $template->set_var('VALUE', $value); + $template->set_var('NAME', $title); + if(ER_LEVEL == $value) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('error_reporting_list', 'error_reporting_list_block', true); +} + +// Insert permissions values +if($admin->get_permission('settings_advanced') != true) { + $template->set_var('DISPLAY_ADVANCED_BUTTON', 'hide'); +} + +// Insert page level limits +$template->set_block('main_block', 'page_level_limit_list_block', 'page_level_limit_list'); +for($i = 1; $i <= 10; $i++) { + $template->set_var('NUMBER', $i); + if(PAGE_LEVEL_LIMIT == $i) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('page_level_limit_list', 'page_level_limit_list_block', true); +} + +// Work-out if multiple menus feature is enabled +if(defined('MULTIPLE_MENUS') AND MULTIPLE_MENUS == true) { + $template->set_var('MULTIPLE_MENUS_ENABLED', ' checked'); +} else { + $template->set_var('MULTIPLE_MENUS_DISABLED', ' checked'); +} + +// Work-out if page languages feature is enabled +if(defined('PAGE_LANGUAGES') AND PAGE_LANGUAGES == true) { + $template->set_var('PAGE_LANGUAGES', ' true'); +} else { + $template->set_var('PAGE_LANGUAGES', ' false'); +} + +// Work-out if smart login feature is enabled +if(defined('SMART_LOGIN') AND SMART_LOGIN == true) { + $template->set_var('SMART_LOGIN_ENABLED', ' checked'); +} else { + $template->set_var('SMART_LOGIN_DISABLED', ' checked'); +} + +// Work-out if captcha verification feature is enabled +if(defined('CAPTCHA_VERIFICATION') AND CAPTCHA_VERIFICATION == true) { + $template->set_var('CAPTCHA_VERIFICATION_ENABLED', ' checked'); +} else { + $template->set_var('CAPTCHA_VERIFICATION_DISABLED', ' checked'); +} +if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { /* Make's sure GD library is installed */ + $template->set_var('GD_EXTENSION_ENABLED', ''); +} else { + $template->set_var('GD_EXTENSION_ENABLED', 'none'); +} + +// Work-out if section blocks feature is enabled +if(defined('SECTION_BLOCKS') AND SECTION_BLOCKS == true) { + $template->set_var('SECTION_BLOCKS_ENABLED', ' checked'); +} else { + $template->set_var('SECTION_BLOCKS_DISABLED', ' checked'); +} + +// Work-out if homepage redirection feature is enabled +if(defined('HOMEPAGE_REDIRECTION') AND HOMEPAGE_REDIRECTION == true) { + $template->set_var('HOMEPAGE_REDIRECTION_ENABLED', ' checked'); +} else { + $template->set_var('HOMEPAGE_REDIRECTION_DISABLED', ' checked'); +} + +// Work-out which server os should be checked +if(OPERATING_SYSTEM == 'linux') { + $template->set_var('LINUX_SELECTED', ' checked'); +} elseif(OPERATING_SYSTEM == 'windows') { + $template->set_var('WINDOWS_SELECTED', ' checked'); +} + +// Work-out if manage sections feature is enabled +if(MANAGE_SECTIONS) { + $template->set_var('MANAGE_SECTIONS_ENABLED', ' checked'); +} else { + $template->set_var('MANAGE_SECTIONS_DISABLED', ' checked'); +} + +// Work-out if intro feature is enabled +if(INTRO_PAGE) { + $template->set_var('INTRO_PAGE_ENABLED', ' checked'); +} else { + $template->set_var('INTRO_PAGE_DISABLED', ' checked'); +} + +// Work-out if frontend login feature is enabled +if(FRONTEND_LOGIN) { + $template->set_var('PRIVATE_ENABLED', ' checked'); +} else { + $template->set_var('PRIVATE_DISABLED', ' checked'); +} + +// Work-out if page trash feature is disabled, in-line, or separate +if(PAGE_TRASH == 'disabled') { + $template->set_var('PAGE_TRASH_DISABLED', ' checked'); + $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', ' display: none;'); +} elseif(PAGE_TRASH == 'inline') { + $template->set_var('PAGE_TRASH_INLINE', ' checked'); + $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', ' display: none;'); +} elseif(PAGE_TRASH == 'separate') { + $template->set_var('PAGE_TRASH_SEPARATE', ' checked'); + $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', ' display: inline;'); +} + +// Work-out if media home folde feature is enabled +if(HOME_FOLDERS) { + $template->set_var('HOME_FOLDERS_ENABLED', ' checked'); +} else { + $template->set_var('HOME_FOLDERS_DISABLED', ' checked'); +} + +// Insert search select +if(SEARCH == 'private') { + $template->set_var('PRIVATE_SEARCH', 'selected'); +} elseif(SEARCH == 'registered') { + $template->set_var('REGISTERED_SEARCH', 'selected'); +} elseif(SEARCH == 'none') { + $template->set_var('NONE_SEARCH', 'selected'); +} + +// Work-out if 777 permissions are set +if(STRING_FILE_MODE == '0777' AND STRING_DIR_MODE == '0777') { + $template->set_var('WORLD_WRITEABLE_SELECTED', ' checked'); +} + +// Work-out which file mode boxes are checked +if(extract_permission(STRING_FILE_MODE, 'u', 'r')) { + $template->set_var('FILE_U_R_CHECKED', 'checked'); +} +if(extract_permission(STRING_FILE_MODE, 'u', 'w')) { + $template->set_var('FILE_U_W_CHECKED', 'checked'); +} +if(extract_permission(STRING_FILE_MODE, 'u', 'e')) { + $template->set_var('FILE_U_E_CHECKED', 'checked'); +} +if(extract_permission(STRING_FILE_MODE, 'g', 'r')) { + $template->set_var('FILE_G_R_CHECKED', 'checked'); +} +if(extract_permission(STRING_FILE_MODE, 'g', 'w')) { + $template->set_var('FILE_G_W_CHECKED', 'checked'); +} +if(extract_permission(STRING_FILE_MODE, 'g', 'e')) { + $template->set_var('FILE_G_E_CHECKED', 'checked'); +} +if(extract_permission(STRING_FILE_MODE, 'o', 'r')) { + $template->set_var('FILE_O_R_CHECKED', 'checked'); +} +if(extract_permission(STRING_FILE_MODE, 'o', 'w')) { + $template->set_var('FILE_O_W_CHECKED', 'checked'); +} +if(extract_permission(STRING_FILE_MODE, 'o', 'e')) { + $template->set_var('FILE_O_E_CHECKED', 'checked'); +} +// Work-out which dir mode boxes are checked +if(extract_permission(STRING_DIR_MODE, 'u', 'r')) { + $template->set_var('DIR_U_R_CHECKED', 'checked'); +} +if(extract_permission(STRING_DIR_MODE, 'u', 'w')) { + $template->set_var('DIR_U_W_CHECKED', 'checked'); +} +if(extract_permission(STRING_DIR_MODE, 'u', 'e')) { + $template->set_var('DIR_U_E_CHECKED', 'checked'); +} +if(extract_permission(STRING_DIR_MODE, 'g', 'r')) { + $template->set_var('DIR_G_R_CHECKED', 'checked'); +} +if(extract_permission(STRING_DIR_MODE, 'g', 'w')) { + $template->set_var('DIR_G_W_CHECKED', 'checked'); +} +if(extract_permission(STRING_DIR_MODE, 'g', 'e')) { + $template->set_var('DIR_G_E_CHECKED', 'checked'); +} +if(extract_permission(STRING_DIR_MODE, 'o', 'r')) { + $template->set_var('DIR_O_R_CHECKED', 'checked'); +} +if(extract_permission(STRING_DIR_MODE, 'o', 'w')) { + $template->set_var('DIR_O_W_CHECKED', 'checked'); +} +if(extract_permission(STRING_DIR_MODE, 'o', 'e')) { + $template->set_var('DIR_O_E_CHECKED', 'checked'); +} + +// Insert Server Email value into template +$template->set_var('SERVER_EMAIL', SERVER_EMAIL); + +// Insert groups into signup list +$template->set_block('main_block', 'group_list_block', 'group_list'); +$results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'"); +if($results->numRows() > 0) { + while($group = $results->fetchRow()) { + $template->set_var('ID', $group['group_id']); + $template->set_var('NAME', $group['name']); + if(FRONTEND_SIGNUP == $group['group_id']) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('group_list', 'group_list_block', true); + } +} else { + $template->set_var('ID', 'disabled'); + $template->set_var('NAME', $MESSAGE['GROUPS']['NO_GROUPS_FOUND']); + $template->parse('group_list', 'group_list_block', true); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'], + 'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'], + 'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'], + 'HEADING_SERVER_SETTINGS' => $HEADING['SERVER_SETTINGS'], + 'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_WEBSITE_TITLE' => $TEXT['WEBSITE_TITLE'], + 'TEXT_WEBSITE_DESCRIPTION' => $TEXT['WEBSITE_DESCRIPTION'], + 'TEXT_WEBSITE_KEYWORDS' => $TEXT['WEBSITE_KEYWORDS'], + 'TEXT_WEBSITE_HEADER' => $TEXT['WEBSITE_HEADER'], + 'TEXT_WEBSITE_FOOTER' => $TEXT['WEBSITE_FOOTER'], + 'TEXT_HEADER' => $TEXT['HEADER'], + 'TEXT_FOOTER' => $TEXT['FOOTER'], + 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'], + 'TEXT_RESULTS_HEADER' => $TEXT['RESULTS_HEADER'], + 'TEXT_RESULTS_LOOP' => $TEXT['RESULTS_LOOP'], + 'TEXT_RESULTS_FOOTER' => $TEXT['RESULTS_FOOTER'], + 'TEXT_NO_RESULTS' => $TEXT['NO_RESULTS'], + 'TEXT_TEXT' => $TEXT['TEXT'], + 'TEXT_DEFAULT' => $TEXT['DEFAULT'], + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'TEXT_TIMEZONE' => $TEXT['TIMEZONE'], + 'TEXT_CHARSET' => $TEXT['CHARSET'], + 'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'], + 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'], + 'TEXT_TEMPLATE' => $TEXT['TEMPLATE'], + 'TEXT_WYSIWYG_EDITOR' => $TEXT['WYSIWYG_EDITOR'], + 'TEXT_PAGE_LEVEL_LIMIT' => $TEXT['PAGE_LEVEL_LIMIT'], + 'TEXT_INTRO_PAGE' => $TEXT['INTRO_PAGE'], + 'TEXT_FRONTEND' => $TEXT['FRONTEND'], + 'TEXT_LOGIN' => $TEXT['LOGIN'], + 'TEXT_SIGNUP' => $TEXT['SIGNUP'], + 'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'], + 'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'], + 'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'], + 'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'], + 'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'], + 'TEXT_RENAME_FILES_ON_UPLOAD' => $TEXT['RENAME_FILES_ON_UPLOAD'], + 'TEXT_APP_NAME' => $TEXT['APP_NAME'], + 'TEXT_SESSION_IDENTIFIER' => $TEXT['SESSION_IDENTIFIER'], + 'TEXT_SERVER_OPERATING_SYSTEM' => $TEXT['SERVER_OPERATING_SYSTEM'], + 'TEXT_LINUX_UNIX_BASED' => $TEXT['LINUX_UNIX_BASED'], + 'TEXT_WINDOWS' => $TEXT['WINDOWS'], + 'TEXT_ADMIN' => $TEXT['ADMIN'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_DATABASE' => $TEXT['DATABASE'], + 'TEXT_HOST' => $TEXT['HOST'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_NAME' => $TEXT['NAME'], + 'TEXT_TABLE_PREFIX' => $TEXT['TABLE_PREFIX'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_CHANGES' => $TEXT['CHANGES'], + 'TEXT_ENABLED' => $TEXT['ENABLED'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'], + 'TEXT_MANAGE' => $TEXT['MANAGE'], + 'TEXT_SEARCH' => $TEXT['SEARCH'], + 'TEXT_PUBLIC' => $TEXT['PUBLIC'], + 'TEXT_PRIVATE' => $TEXT['PRIVATE'], + 'TEXT_REGISTERED' => $TEXT['REGISTERED'], + 'TEXT_NONE' => $TEXT['NONE'], + 'TEXT_FILES' => strtoupper(substr($TEXT['FILES'], 0, 1)).substr($TEXT['FILES'], 1), + 'TEXT_DIRECTORIES' => $TEXT['DIRECTORIES'], + 'TEXT_FILESYSTEM_PERMISSIONS' => $TEXT['FILESYSTEM_PERMISSIONS'], + 'TEXT_USER' => $TEXT['USER'], + 'TEXT_GROUP' => $TEXT['GROUP'], + 'TEXT_OTHERS' => $TEXT['OTHERS'], + 'TEXT_READ' => $TEXT['READ'], + 'TEXT_WRITE' => $TEXT['WRITE'], + 'TEXT_EXECUTE' => $TEXT['EXECUTE'], + 'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'], + 'TEXT_CAPTCHA_VERIFICATION' => $TEXT['CAPTCHA_VERIFICATION'], + 'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'], + 'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'], + 'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_PAGE_TRASH' => $TEXT['PAGE_TRASH'], + 'TEXT_INLINE' => $TEXT['INLINE'], + 'TEXT_SEPARATE' => $TEXT['SEPARATE'], + 'TEXT_HOME_FOLDERS' => $TEXT['HOME_FOLDERS'], + 'TEXT_WYSIWYG_STYLE' => $TEXT['WYSIWYG_STYLE'], + 'TEXT_SERVER_EMAIL' => $TEXT['SERVER_EMAIL'], + 'TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS' => $TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'], + 'MODE_SWITCH_WARNING' => $MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'], + 'WORLD_WRITEABLE_WARNING' => $MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'] + ) + ); + +// Parse template objects output +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/settings/index.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: tags/2.6.0/wb/admin/settings/template.html =================================================================== --- tags/2.6.0/wb/admin/settings/template.html (nonexistent) +++ tags/2.6.0/wb/admin/settings/template.html (revision 260) @@ -0,0 +1,606 @@ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

{HEADING_GENERAL_SETTINGS}

+
{TEXT_WEBSITE_TITLE}: + +
{TEXT_WEBSITE_DESCRIPTION}: + +
{TEXT_WEBSITE_KEYWORDS}: + +
{TEXT_WEBSITE_HEADER}: + +
{TEXT_WEBSITE_FOOTER}: + +
{TEXT_PAGE_LEVEL_LIMIT}: + +
{TEXT_PAGE_TRASH}: + + + + +
+ + +
+
{TEXT_MULTIPLE_MENUS}: + + + + +
{TEXT_HOME_FOLDERS}: + + + + +
{TEXT_MANAGE_SECTIONS}: + + + + +
{TEXT_SECTION_BLOCKS}: + + + + +
{TEXT_INTRO_PAGE}: + + + + +
{TEXT_HOMEPAGE_REDIRECTION}: + + + +
{TEXT_SMART_LOGIN}: + + + + +
{TEXT_CAPTCHA_VERIFICATION}: + + + + +
{TEXT_LOGIN}: + + + + +
{TEXT_SIGNUP}: + +
{TEXT_PHP_ERROR_LEVEL}: + +
{TEXT_WYSIWYG_STYLE}: + +
{TEXT_SERVER_EMAIL}: + +
{TEXT_WYSIWYG_EDITOR}: + +
  + + + + +
+

{HEADING_DEFAULT_SETTINGS}

+
{TEXT_LANGUAGE}: + +
{TEXT_CHARSET}: + +
{TEXT_TIMEZONE}: + +
{TEXT_DATE_FORMAT}: + +
{TEXT_TIME_FORMAT}: + +
{TEXT_TEMPLATE}: + +
  + + + + +
+

{HEADING_SEARCH_SETTINGS}

+
{TEXT_VISIBILITY}: + +
{TEXT_TEMPLATE}: + +
{TEXT_HEADER}: + +
{TEXT_RESULTS_HEADER}: + +
{TEXT_RESULTS_LOOP}: + +
{TEXT_RESULTS_FOOTER}: + +
{TEXT_NO_RESULTS}: + +
{TEXT_FOOTER}: + +
  + + + + +
+

{HEADING_SERVER_SETTINGS}

+
{TEXT_SERVER_OPERATING_SYSTEM}: + + + + +
 
 +
+ + +
+ ({WORLD_WRITEABLE_WARNING}) +
+
+
{TEXT_FILESYSTEM_PERMISSIONS}:
 + + + + + + + + + + + + + + +
+ {TEXT_FILES}: +
{TEXT_USER}:{TEXT_GROUP}:{TEXT_OTHERS}:
+ + +
+ + +
+ + + 		+ + +
+ + +
+ + + 		+ + +
+ + +
+ + +
+ 		+ + + + + + + + + + + + + + +
+ {TEXT_DIRECTORIES}: +
{TEXT_USER}:{TEXT_GROUP}:{TEXT_OTHERS}:
+ + +
+ + +
+ + + 		+ + +
+ + +
+ + + 		+ + +
+ + +
+ + +
+
{TEXT_PAGES_DIRECTORY}: + +
{TEXT_MEDIA_DIRECTORY}: + +
{TEXT_PAGE_EXTENSION}: + +
{TEXT_PAGE_SPACER}: + +
{TEXT_RENAME_FILES_ON_UPLOAD}: + +
{TEXT_SESSION_IDENTIFIER}: + +
+ +

{HEADING_ADMINISTRATION_TOOLS}

+
+ + {TOOL_LIST} + +   +  
  + + + + +
+ +
+ +
+ + + + +  {MODE_SWITCH_WARNING} + + + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/settings/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/settings/save.php =================================================================== --- tags/2.6.0/wb/admin/settings/save.php (nonexistent) +++ tags/2.6.0/wb/admin/settings/save.php (revision 260) @@ -0,0 +1,163 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Find out if the user was view advanced options or not +if($_POST['advanced'] == 'yes' ? $advanced = '?advanced=yes' : $advanced = ''); + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +if($advanced == '') { + $admin = new admin('Settings', 'settings_basic'); + $_POST['database_password'] = DB_PASSWORD; +} else { + $admin = new admin('Settings', 'settings_advanced'); +} + +// Work-out file mode +if($advanced == '') { + // Check if should be set to 777 or left alone + if(isset($_POST['world_writeable']) AND $_POST['world_writeable'] == 'true') { + $file_mode = '0777'; + $dir_mode = '0777'; + } else { + $file_mode = STRING_FILE_MODE; + $dir_mode = STRING_DIR_MODE; + } +} else { + // Work-out the octal value for file mode + $u = 0; + if(isset($_POST['file_u_r']) AND $_POST['file_u_r'] == 'true') { + $u = $u+4; + } + if(isset($_POST['file_u_w']) AND $_POST['file_u_w'] == 'true') { + $u = $u+2; + } + if(isset($_POST['file_u_e']) AND $_POST['file_u_e'] == 'true') { + $u = $u+1; + } + $g = 0; + if(isset($_POST['file_g_r']) AND $_POST['file_g_r'] == 'true') { + $g = $g+4; + } + if(isset($_POST['file_g_w']) AND $_POST['file_g_w'] == 'true') { + $g = $g+2; + } + if(isset($_POST['file_g_e']) AND $_POST['file_g_e'] == 'true') { + $g = $g+1; + } + $o = 0; + if(isset($_POST['file_o_r']) AND $_POST['file_o_r'] == 'true') { + $o = $o+4; + } + if(isset($_POST['file_o_w']) AND $_POST['file_o_w'] == 'true') { + $o = $o+2; + } + if(isset($_POST['file_o_e']) AND $_POST['file_o_e'] == 'true') { + $o = $o+1; + } + $file_mode = "0".$u.$g.$o; + // Work-out the octal value for dir mode + $u = 0; + if(isset($_POST['dir_u_r']) AND $_POST['dir_u_r'] == 'true') { + $u = $u+4; + } + if(isset($_POST['dir_u_w']) AND $_POST['dir_u_w'] == 'true') { + $u = $u+2; + } + if(isset($_POST['dir_u_e']) AND $_POST['dir_u_e'] == 'true') { + $u = $u+1; + } + $g = 0; + if(isset($_POST['dir_g_r']) AND $_POST['dir_g_r'] == 'true') { + $g = $g+4; + } + if(isset($_POST['dir_g_w']) AND $_POST['dir_g_w'] == 'true') { + $g = $g+2; + } + if(isset($_POST['dir_g_e']) AND $_POST['dir_g_e'] == 'true') { + $g = $g+1; + } + $o = 0; + if(isset($_POST['dir_o_r']) AND $_POST['dir_o_r'] == 'true') { + $o = $o+4; + } + if(isset($_POST['dir_o_w']) AND $_POST['dir_o_w'] == 'true') { + $o = $o+2; + } + if(isset($_POST['dir_o_e']) AND $_POST['dir_o_e'] == 'true') { + $o = $o+1; + } + $dir_mode = "0".$u.$g.$o; +} + +// Create new database object +$database = new database(); + +// Query current settings in the db, then loop through them and update the db with the new value +$query = "SELECT name FROM ".TABLE_PREFIX."settings"; +$results = $database->query($query); +while($setting = $results->fetchRow()) { + $setting_name = $setting['name']; + $value = $admin->get_post($setting_name); + if ($value!=null || $setting_name=='default_timezone' || $setting_name=='string_dir_mode' || $setting_name=='string_file_mode') { + $value = $admin->add_slashes($value); + switch ($setting_name) { + case 'default_timezone': + $value=$value*60*60; + break; + case 'string_dir_mode': + $value=$dir_mode; + break; + case 'string_file_mode': + $value=$file_mode; + break; + } + $database->query("UPDATE ".TABLE_PREFIX."settings SET value = '$value' WHERE name = '$setting_name'"); + } +} + +// Query current search settings in the db, then loop through them and update the db with the new value +$query = "SELECT name FROM ".TABLE_PREFIX."search WHERE extra = ''"; +$results = $database->query($query); +while($search_setting = $results->fetchRow()) { + $setting_name = $search_setting['name']; + $post_name = 'search_'.$search_setting['name']; + $value = $admin->get_post($post_name); + $value = $admin->add_slashes($value); + $database->query("UPDATE ".TABLE_PREFIX."search SET value = '$value' WHERE name = '$setting_name'"); +} + +// Check if there was an error updating the db +if($database->is_error()) { + $admin->print_error($database->get_error, ADMIN_URL.'/settings/index.php'.$advanced); + $admin->print_footer(); + exit(); +} + +$admin->print_success($MESSAGE['SETTINGS']['SAVED'], ADMIN_URL.'/settings/index.php'.$advanced); +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/settings/save.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: tags/2.6.0/wb/admin/settings/tool.php =================================================================== --- tags/2.6.0/wb/admin/settings/tool.php (nonexistent) +++ tags/2.6.0/wb/admin/settings/tool.php (revision 260) @@ -0,0 +1,56 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +require_once(WB_PATH.'/framework/functions.php'); + +if(!isset($_GET['tool'])) { + header("Location: index.php?advanced=yes"); +} + +// Check if tool is installed +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' AND directory = '".$_GET['tool']."'"); +if($result->numRows() == 0) { + header("Location: index.php?advanced=yes"); +} +$tool = $result->fetchRow(); + +$admin = new admin('Settings', 'settings_advanced'); + +?> +

+ + -> + + -> + +

+print_footer(); + +?> Property changes on: tags/2.6.0/wb/admin/settings/tool.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: tags/2.6.0/wb/admin/pages/index.php =================================================================== --- tags/2.6.0/wb/admin/pages/index.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/index.php (revision 260) @@ -0,0 +1,547 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages'); +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +?> + + + + + + + + get_permission('pages_view') == true) { + ?> + + + + + +
+

+ 		+ query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE visibility = 'deleted'"); + if($query_trash->numRows() > 0) { + ?> + + <?php echo $TEXT['PAGE_TRASH']; ?> + + +
+
+ + + + + + + + +
+   + + : + + : + + : + + : +
+ +
+
+ +
+ set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); + +// Figure out if the no pages found message should be shown or not +if($editable_pages == 0) { + ?> + + + + get_group_id() == 1) { + $query = "SELECT * FROM ".TABLE_PREFIX."groups"; + } else { + $query = "SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id != '".$admin->get_group_id()."'"; + } + $get_groups = $database->query($query); + $template->set_block('main_block', 'group_list_block', 'group_list'); + // Insert admin group and current group first + $admin_group_name = $get_groups->fetchRow(); + $template->set_var(array( + 'ID' => 1, + 'TOGGLE' => '', + 'DISABLED' => ' disabled', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin_group_name['name'], + 'CHECKED' => ' checked' + ) + ); + $template->parse('group_list', 'group_list_block', true); + if($admin->get_group_id() != 1) { + $template->set_var(array( + 'ID' => $admin->get_group_id(), + 'TOGGLE' => '', + 'DISABLED' => ' disabled', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin->get_group_name(), + 'CHECKED' => ' checked' + ) + ); + $template->parse('group_list', 'group_list_block', true); + } + while($group = $get_groups->fetchRow()) { + // Check if the group is allowed to edit pages + $system_permissions = explode(',', $group['system_permissions']); + if(is_numeric(array_search('pages_modify', $system_permissions))) { + $template->set_var(array( + 'ID' => $group['group_id'], + 'TOGGLE' => $group['group_id'], + 'CHECKED' => '', + 'DISABLED' => '', + 'LINK_COLOR' => '', + 'CURSOR' => 'pointer', + 'NAME' => $group['name'], + 'CHECKED' => '' + ) + ); + $template->parse('group_list', 'group_list_block', true); + } + } +// Group list 2 + if($admin->get_group_id() == 1) { + $query = "SELECT * FROM ".TABLE_PREFIX."groups"; + } else { + $query = "SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id != '".$admin->get_group_id()."'"; + } + $get_groups = $database->query($query); + $template->set_block('main_block', 'group_list_block2', 'group_list2'); + // Insert admin group and current group first + $admin_group_name = $get_groups->fetchRow(); + $template->set_var(array( + 'ID' => 1, + 'TOGGLE' => '', + 'DISABLED' => ' disabled', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin_group_name['name'], + 'CHECKED' => ' checked' + ) + ); + $template->parse('group_list2', 'group_list_block2', true); + if($admin->get_group_id() != 1) { + $template->set_var(array( + 'ID' => $admin->get_group_id(), + 'TOGGLE' => '', + 'DISABLED' => ' disabled', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin->get_group_name(), + 'CHECKED' => ' checked' + ) + ); + $template->parse('group_list2', 'group_list_block2', true); + } + while($group = $get_groups->fetchRow()) { + $template->set_var(array( + 'ID' => $group['group_id'], + 'TOGGLE' => $group['group_id'], + 'CHECKED' => '', + 'DISABLED' => '', + 'LINK_COLOR' => '', + 'CURSOR' => 'pointer', + 'NAME' => $group['name'], + 'CHECKED' => '' + ) + ); + $template->parse('group_list2', 'group_list_block2', true); + } + +// Parent page list +$database = new database(); +function parent_list($parent) { + global $admin, $database, $template; + $query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' AND visibility!='deleted' ORDER BY position ASC"; + $get_pages = $database->query($query); + while($page = $get_pages->fetchRow()) { + // Stop users from adding pages with a level of more than the set page level limit + if($page['level']+1 < PAGE_LEVEL_LIMIT) { + // Get user perms + $admin_groups = explode(',', str_replace('_', '', $page['admin_groups'])); + $admin_users = explode(',', str_replace('_', '', $page['admin_users'])); + if(is_numeric(array_search($admin->get_group_id(), $admin_groups)) OR is_numeric(array_search($admin->get_user_id(), $admin_users))) { + $can_modify = true; + } else { + $can_modify = false; + } + // Title -'s prefix + $title_prefix = ''; + for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; } + $template->set_var(array( + 'ID' => $page['page_id'], + 'TITLE' => ($title_prefix.$page['page_title']) + ) + ); + if($can_modify == true) { + $template->set_var('DISABLED', ''); + } else { + $template->set_var('DISABLED', ' disabled'); + } + $template->parse('page_list2', 'page_list_block2', true); + } + parent_list($page['page_id']); + } +} +$template->set_block('main_block', 'page_list_block2', 'page_list2'); +if($admin->get_permission('pages_add_l0') == true) { + $template->set_var(array( + 'ID' => '0', + 'TITLE' => $TEXT['NONE'], + 'SELECTED' => ' selected', + 'DISABLED' => '' + ) + ); + $template->parse('page_list2', 'page_list_block2', true); +} +parent_list(0); + +// Explode module permissions +$module_permissions = $_SESSION['MODULE_PERMISSIONS']; +// Modules list +$template->set_block('main_block', 'module_list_block', 'module_list'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page'"); +if($result->numRows() > 0) { + while ($module = $result->fetchRow()) { + // Check if user is allowed to use this module + if(!isset($module['function'])) { $module['function'] = 'unknown'; } + if(!is_numeric(array_search($module['directory'], $module_permissions))) { + $template->set_var('VALUE', $module['directory']); + $template->set_var('NAME', $module['name']); + if($module['directory'] == 'wysiwyg') { + $template->set_var('SELECTED', ' selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('module_list', 'module_list_block', true); + } + if(isset($module_function)) { unset($module_function); } // Unset module type + } +} + +// Insert language headings +$template->set_var(array( + 'HEADING_ADD_PAGE' => $HEADING['ADD_PAGE'], + 'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_TITLE' => $TEXT['TITLE'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_PARENT' => $TEXT['PARENT'], + 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'], + 'TEXT_PUBLIC' => $TEXT['PUBLIC'], + 'TEXT_PRIVATE' => $TEXT['PRIVATE'], + 'TEXT_REGISTERED' => $TEXT['REGISTERED'], + 'TEXT_HIDDEN' => $TEXT['HIDDEN'], + 'TEXT_NONE' => $TEXT['NONE'], + 'TEXT_NONE_FOUND' => $TEXT['NONE_FOUND'], + 'TEXT_ADD' => $TEXT['ADD'], + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'], + 'TEXT_PRIVATE_VIEWERS' => $TEXT['PRIVATE_VIEWERS'], + 'TEXT_REGISTERED_VIEWERS' => $TEXT['REGISTERED_VIEWERS'], + 'INTRO_LINK' => $MESSAGE['PAGES']['INTRO_LINK'], + ) + ); + +// Insert permissions values +if($admin->get_permission('pages_add') != true) { + $template->set_var('DISPLAY_ADD', 'hide'); +} elseif($admin->get_permission('pages_add_l0') != true AND $editable_pages == 0) { + $template->set_var('DISPLAY_ADD', 'hide'); +} +if($admin->get_permission('pages_intro') != true OR INTRO_PAGE != 'enabled') { + $template->set_var('DISPLAY_INTRO', 'hide'); +} + + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/index.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: tags/2.6.0/wb/admin/pages/settings.html =================================================================== --- tags/2.6.0/wb/admin/pages/settings.html (nonexistent) +++ tags/2.6.0/wb/admin/pages/settings.html (revision 260) @@ -0,0 +1,194 @@ + + + + + + + + + +
+

{HEADING_MODIFY_PAGE_SETTINGS}

+ 		+ {TEXT_CURRENT_PAGE}: + {PAGE_TITLE} + - + {TEXT_MODIFY_PAGE} + - + {TEXT_MANAGE_SECTIONS} +
+ + {LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{TEXT_PAGE_TITLE}: + + + {TEXT_ADMINISTRATORS}: +
    + +
  • + + +
    • + +
+ 		+
+ {TEXT_PRIVATE_VIEWERS}: +
    + +
  • + + +
    • + +
+
+ 		+
+ {TEXT_REGISTERED_VIEWERS}: +
    + +
  • + + +
    • + +
+
+
{TEXT_MENU_TITLE}: + +
{TEXT_PARENT}: + +
{TEXT_VISIBILITY}: + +
{TEXT_DESCRIPTION}: + +
{TEXT_KEYWORDS}: + +
+ {TEXT_TARGET}: + + +
{TEXT_TEMPLATE}: + +
{TEXT_MENU}: + +
{TEXT_LANGUAGE}: + +
{TEXT_SEARCHING}: + +
  + + +
  
+ +
+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/settings.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/pages/template.html =================================================================== --- tags/2.6.0/wb/admin/pages/template.html (nonexistent) +++ tags/2.6.0/wb/admin/pages/template.html (revision 260) @@ -0,0 +1,116 @@ + + +
+ + +
+ +

{HEADING_ADD_PAGE}

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{TEXT_TITLE}: + + + {TEXT_ADMINISTRATORS}: +
    + +
  • + + +
    • + +
+ 		+ + + +
{TEXT_TYPE}: + +
{TEXT_PARENT}: + +
{TEXT_VISIBILITY}: + +
  + + +
  
+ +
+ +
+
+ +
+ +

{HEADING_MODIFY_INTRO_PAGE}

+ + +{INTRO_LINK} + + +
+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/pages/intro.php =================================================================== --- tags/2.6.0/wb/admin/pages/intro.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/intro.php (revision 260) @@ -0,0 +1,79 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Create new admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_intro'); + +// Get page content +$filename = WB_PATH.'/pages/intro.php'; +if(file_exists($filename)) { + $handle = fopen($filename, "r"); + $content = fread($handle, filesize($filename)); + fclose($handle); +} else { + $content = ''; +} + +if(!isset($_GET['wysiwyg']) OR $_GET['wysiwyg'] != 'no') { + if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) { + function show_wysiwyg_editor($name,$id,$content,$width,$height) { + echo ''; + } + } else { + $id_list=array('content'); + require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'); + } +} +?> + + +
+ + + + + + + + + + +
+ + + + +
+ + +print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/intro.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: tags/2.6.0/wb/admin/pages/settings.php =================================================================== --- tags/2.6.0/wb/admin/pages/settings.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/settings.php (revision 260) @@ -0,0 +1,417 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Get page id +if(!isset($_GET['page_id']) OR !is_numeric($_GET['page_id'])) { + header("Location: index.php"); +} else { + $page_id = $_GET['page_id']; +} + +// Create new admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_settings'); + +// Get perms +$database = new database(); +$results = $database->query("SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$results_array = $results->fetchRow(); +$old_admin_groups = explode(',', $results_array['admin_groups']); +$old_admin_users = explode(',', $results_array['admin_users']); +if(!is_numeric(array_search($admin->get_group_id(), $old_admin_groups)) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +} + +// Get page details +$database = new database(); +$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_header(); + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_header(); + $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); +} +$results_array = $results->fetchRow(); + +// Get display name of person who last modified the page +$query_user = "SELECT username,display_name FROM ".TABLE_PREFIX."users WHERE user_id = '".$results_array['modified_by']."'"; +$get_user = $database->query($query_user); +if($get_user->numRows() != 0) { + $user = $get_user->fetchRow(); +} else { + $user['display_name'] = 'Unknown'; + $user['username'] = 'unknown'; +} +// Convert the unix ts for modified_when to human a readable form +if($results_array['modified_when'] != 0) { + $modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE); +} else { + $modified_ts = 'Unknown'; +} + +// Setup template object, parse vars to it, then parse it +$template = new Template(ADMIN_PATH.'/pages'); +$template->set_file('page', 'settings.html'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var(array( + 'PAGE_ID' => $results_array['page_id'], + 'PAGE_TITLE' => ($results_array['page_title']), + 'MENU_TITLE' => ($results_array['menu_title']), + 'DESCRIPTION' => ($results_array['description']), + 'KEYWORDS' => ($results_array['keywords']), + 'MODIFIED_BY' => $user['display_name'], + 'MODIFIED_BY_USERNAME' => $user['username'], + 'MODIFIED_WHEN' => $modified_ts, + 'ADMIN_URL' => ADMIN_URL + ) + ); + +// Work-out if we should show the "manage sections" link +$query_sections = $database->query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'menu_link'"); +if($query_sections->numRows() > 0) { + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'none'); +} elseif(MANAGE_SECTIONS == 'enabled') { + $template->set_var('TEXT_MANAGE_SECTIONS', $HEADING['MANAGE_SECTIONS']); +} else { + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'none'); +} + +// Visibility +if($results_array['visibility'] == 'public') { + $template->set_var('PUBLIC_SELECTED', ' selected'); +} elseif($results_array['visibility'] == 'private') { + $template->set_var('PRIVATE_SELECTED', ' selected'); +} elseif($results_array['visibility'] == 'registered') { + $template->set_var('REGISTERED_SELECTED', ' selected'); +} elseif($results_array['visibility'] == 'hidden') { + $template->set_var('HIDDEN_SELECTED', ' selected'); +} elseif($results_array['visibility'] == 'none') { + $template->set_var('NO_VIS_SELECTED', ' selected'); +} +// Group list 1 (admin_groups) + $admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); + if($admin->get_group_id() == 1) { + $query = "SELECT * FROM ".TABLE_PREFIX."groups"; + } else { + $query = "SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id != '".$admin->get_group_id()."'"; + } + $get_groups = $database->query($query); + $template->set_block('main_block', 'group_list_block', 'group_list'); + // Insert admin group and current group first + $admin_group_name = $get_groups->fetchRow(); + $template->set_var(array( + 'ID' => 1, + 'TOGGLE' => '', + 'DISABLED' => ' disabled', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin_group_name['name'], + 'CHECKED' => ' checked' + ) + ); + $template->parse('group_list', 'group_list_block', true); + if($admin->get_group_id() != 1) { + $template->set_var(array( + 'ID' => $admin->get_group_id(), + 'TOGGLE' => '', + 'DISABLED' => ' disabled', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin->get_group_name(), + 'CHECKED' => ' checked' + ) + ); + $template->parse('group_list', 'group_list_block', true); + } + while($group = $get_groups->fetchRow()) { + // Check if the group is allowed to edit pages + $system_permissions = explode(',', $group['system_permissions']); + if(is_numeric(array_search('pages_modify', $system_permissions))) { + $template->set_var(array( + 'ID' => $group['group_id'], + 'TOGGLE' => $group['group_id'], + 'DISABLED' => '', + 'LINK_COLOR' => '', + 'CURSOR' => 'pointer', + 'NAME' => $group['name'], + 'CHECKED' => '' + ) + ); + if(is_numeric(array_search($group['group_id'], $admin_groups))) { + $template->set_var('CHECKED', 'checked'); + } else { + $template->set_var('CHECKED', ''); + } + $template->parse('group_list', 'group_list_block', true); + } + } +// Group list 2 (viewing_groups) + $viewing_groups = explode(',', str_replace('_', '', $results_array['viewing_groups'])); + if($admin->get_group_id() == 1) { + $query = "SELECT * FROM ".TABLE_PREFIX."groups"; + } else { + $query = "SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id != '".$admin->get_group_id()."'"; + } + $get_groups = $database->query($query); + $template->set_block('main_block', 'group_list_block2', 'group_list2'); + // Insert admin group and current group first + $admin_group_name = $get_groups->fetchRow(); + $template->set_var(array( + 'ID' => 1, + 'TOGGLE' => '', + 'DISABLED' => ' disabled', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin_group_name['name'], + 'CHECKED' => ' checked' + ) + ); + $template->parse('group_list2', 'group_list_block2', true); + if($admin->get_group_id() != 1) { + $template->set_var(array( + 'ID' => $admin->get_group_id(), + 'TOGGLE' => '', + 'DISABLED' => ' disabled', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin->get_group_name(), + 'CHECKED' => ' checked' + ) + ); + $template->parse('group_list2', 'group_list_block2', true); + } + while($group = $get_groups->fetchRow()) { + $template->set_var(array( + 'ID' => $group['group_id'], + 'TOGGLE' => $group['group_id'], + 'DISABLED' => '', + 'LINK_COLOR' => '', + 'CURSOR' => 'pointer', + 'NAME' => $group['name'], + ) + ); + if(is_numeric(array_search($group['group_id'], $viewing_groups))) { + $template->set_var('CHECKED', 'checked'); + } else { + $template->set_var('CHECKED', ''); + } + $template->parse('group_list2', 'group_list_block2', true); + } +// Show private viewers +if($results_array['visibility'] == 'private') { + $template->set_var('DISPLAY_PRIVATE', ''); +} else { + $template->set_var('DISPLAY_PRIVATE', 'none'); +} +// Parent page list +$database = new database(); +function parent_list($parent) { + global $admin, $database, $template, $results_array; + $query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' ORDER BY position ASC"; + $get_pages = $database->query($query); + while($page = $get_pages->fetchRow()) { + // If the current page cannot be parent, then its children neither + $list_next_level = true; + // Stop users from adding pages with a level of more than the set page level limit + if($page['level']+1 < PAGE_LEVEL_LIMIT) { + // Get user perms + $admin_groups = explode(',', str_replace('_', '', $page['admin_groups'])); + $admin_users = explode(',', str_replace('_', '', $page['admin_users'])); + if(is_numeric(array_search($admin->get_group_id(), $admin_groups)) OR is_numeric(array_search($admin->get_user_id(), $admin_users))) { + $can_modify = true; + } else { + $can_modify = false; + } + // Title -'s prefix + $title_prefix = ''; + for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; } + $template->set_var(array( + 'ID' => $page['page_id'], + 'TITLE' => ($title_prefix.$page['page_title']) + ) + ); + if($results_array['parent'] == $page['page_id']) { + $template->set_var('SELECTED', ' selected'); + } elseif($results_array['page_id'] == $page['page_id']) { + $template->set_var('SELECTED', ' disabled'); + $list_next_level=false; + } elseif($can_modify != true) { + $template->set_var('SELECTED', ' disabled'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('page_list2', 'page_list_block2', true); + } + if ($list_next_level) + parent_list($page['page_id']); + } +} +$template->set_block('main_block', 'page_list_block2', 'page_list2'); +if($admin->get_permission('pages_add_l0') == true OR $results_array['level'] == 0) { + if($results_array['parent'] == 0) { $selected = ' selected'; } else { $selected = ''; } + $template->set_var(array( + 'ID' => '0', + 'TITLE' => $TEXT['NONE'], + 'SELECTED' => $selected + ) + ); + $template->parse('page_list2', 'page_list_block2', true); +} +parent_list(0); + +if($modified_ts == 'Unknown') { + $template->set_var('DISPLAY_MODIFIED', 'hide'); +} else { + $template->set_var('DISPLAY_MODIFIED', ''); +} +// Templates list +$template->set_block('main_block', 'template_list_block', 'template_list'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); +if($result->numRows() > 0) { + while($addon = $result->fetchRow()) { + // Check if the user has perms to use this template + if($addon['directory'] == $results_array['template'] OR $admin->get_permission($addon['directory'], 'template') == true) { + $template->set_var('VALUE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + if($addon['directory'] == $results_array['template']) { + $template->set_var('SELECTED', ' selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('template_list', 'template_list_block', true); + } + } +} + +// Menu list +if(MULTIPLE_MENUS == false) { + $template->set_var('DISPLAY_MENU_LIST', 'none'); +} +// Include template info file (if it exists) +if($results_array['template'] != '') { + $template_location = WB_PATH.'/templates/'.$results_array['template'].'/info.php'; +} else { + $template_location = WB_PATH.'/templates/'.DEFAULT_TEMPLATE.'/info.php'; +} +if(file_exists($template_location)) { + require($template_location); +} +// Check if $menu is set +if(!isset($menu[1]) OR $menu[1] == '') { + // Make our own menu list + $menu[1] = $TEXT['MAIN']; +} +// Add menu options to the list +$template->set_block('main_block', 'menu_list_block', 'menu_list'); +foreach($menu AS $number => $name) { + $template->set_var('NAME', $name); + $template->set_var('VALUE', $number); + if($results_array['menu'] == $number) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('menu_list', 'menu_list_block', true); +} + +// Language list +if($handle = opendir(WB_PATH.'/languages/')) { + $template->set_block('main_block', 'language_list_block', 'language_list'); + while (false !== ($file = readdir($handle))) { + if($file != '.' AND $file != '..' AND $file != '.svn' AND $file != 'index.php') { + // Include the languages info file + require(WB_PATH.'/languages/'.$file); + // Work-out if this language is selected + if($language_code == $results_array['language']) { $selected = ' selected'; } else { $selected = ''; } + // Set the language info + $template->set_var(array('VALUE' => $language_code, 'SELECTED' => $selected, 'NAME' => $language_name)); + // Parse row + $template->parse('language_list', 'language_list_block', true); + } + } +} +// Restore to original language +require(WB_PATH.'/languages/'.LANGUAGE.'.php'); + +// Select disabled if searching is disabled +if($results_array['searching'] == 0) { + $template->set_var('SEARCHING_DISABLED', ' selected'); +} +// Select what the page target is +if($results_array['target'] == '_top') { + $template->set_var('TOP_SELECTED', ' selected'); +} elseif($results_array['target'] == '_blank') { + $template->set_var('BLANK_SELECTED', ' selected'); +} + +// Insert language text +$template->set_var(array( + 'HEADING_MODIFY_PAGE_SETTINGS' => $HEADING['MODIFY_PAGE_SETTINGS'], + 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'], + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], + 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], + 'TEXT_PAGE_TITLE' => $TEXT['PAGE_TITLE'], + 'TEXT_MENU_TITLE' => $TEXT['MENU_TITLE'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_MENU' => $TEXT['MENU'], + 'TEXT_PARENT' => $TEXT['PARENT'], + 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'], + 'TEXT_PUBLIC' => $TEXT['PUBLIC'], + 'TEXT_PRIVATE' => $TEXT['PRIVATE'], + 'TEXT_REGISTERED' => $TEXT['REGISTERED'], + 'TEXT_NONE' => $TEXT['NONE'], + 'TEXT_HIDDEN' => $TEXT['HIDDEN'], + 'TEXT_TEMPLATE' => $TEXT['TEMPLATE'], + 'TEXT_TARGET' => $TEXT['TARGET'], + 'TEXT_SYSTEM_DEFAULT' => $TEXT['SYSTEM_DEFAULT'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_NEW_WINDOW' => $TEXT['NEW_WINDOW'], + 'TEXT_SAME_WINDOW' => $TEXT['SAME_WINDOW'], + 'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'], + 'TEXT_PRIVATE_VIEWERS' => $TEXT['PRIVATE_VIEWERS'], + 'TEXT_REGISTERED_VIEWERS' => $TEXT['REGISTERED_VIEWERS'], + 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'], + 'TEXT_KEYWORDS' => $TEXT['KEYWORDS'], + 'TEXT_SEARCHING' => $TEXT['SEARCHING'], + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'TEXT_ENABLED' => $TEXT['ENABLED'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXT_RESET' => $TEXT['RESET'], + 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], + 'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'] + ) + ); + +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/settings.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: tags/2.6.0/wb/admin/pages/sections_save.php =================================================================== --- tags/2.6.0/wb/admin/pages/sections_save.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/sections_save.php (revision 260) @@ -0,0 +1,108 @@ + + Copyright (C) 2004-2005, 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 config file +require('../../config.php'); + +// Make sure people are allowed to access this page +if(MANAGE_SECTIONS != 'enabled') { + header('Location: '.ADMIN_URL.'/pages/index.php'); +} + +// Get page id +if(!isset($_GET['page_id']) OR !is_numeric($_GET['page_id'])) { + header("Location: index.php"); +} else { + $page_id = $_GET['page_id']; +} + +// Create new admin object +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify'); + +// Get perms +$database = new database(); +$results = $database->query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$results_array = $results->fetchRow(); +$old_admin_groups = explode(',', $results_array['admin_groups']); +$old_admin_users = explode(',', $results_array['admin_users']); +if(!is_numeric(array_search($admin->get_group_id(), $old_admin_groups)) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +} + +// Get page details +$database = new database(); +$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_header(); + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_header(); + $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); +} +$results_array = $results->fetchRow(); + +// Set module permissions +$module_permissions = $_SESSION['MODULE_PERMISSIONS']; + +// Loop through sections +$query_sections = $database->query("SELECT section_id,module,position FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' ORDER BY position ASC"); +if($query_sections->numRows() > 0) { + $num_sections = $query_sections->numRows(); + while($section = $query_sections->fetchRow()) { + // Get the modules real name + $module_path = WB_PATH.'/modules/'.$section['module'].'/info.php'; + if(file_exists($module_path)) { + require($module_path); + if(!isset($module_function)) { $module_function = 'unknown'; } + if(!is_numeric(array_search($section['module'], $module_permissions)) AND $module_function == 'page') { + // Update the section record with properties + $section_id = $section['section_id']; + $sql = ''; + if(isset($_POST['block'.$section_id]) AND $_POST['block'.$section_id] != '') { + $sql = "block = '".$admin->add_slashes($_POST['block'.$section_id])."'"; + $query = "UPDATE ".TABLE_PREFIX."sections SET $sql WHERE section_id = '$section_id' LIMIT 1"; + if($sql != '') { + $database->query($query); + } + } + } + if(isset($module_function)) { unset($module_function); } // Unset module type + } + } +} +// Check for error or print success message +if($database->is_error()) { + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/sections.php?page_id='.$page_id); +} else { + $admin->print_success($MESSAGE['PAGES']['SECTIONS_PROPERTIES_SAVED'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/sections_save.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/admin/pages/intro2.php =================================================================== --- tags/2.6.0/wb/admin/pages/intro2.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/intro2.php (revision 260) @@ -0,0 +1,62 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Get posted content +if(!isset($_POST['content'])) { + header("Location: intro.php"); +} else { + $content = $_POST['content']; +} + +// Create new admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_intro'); + +$content=htmlspecialchars($admin->strip_slashes($content)); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Write new content +$filename = WB_PATH.PAGES_DIRECTORY.'/intro.php'; +$handle = fopen($filename, 'w'); +if(is_writable($filename)) { + if(fwrite($handle, $content)) { + fclose($handle); + change_mode($filename, 'file'); + $admin->print_success($MESSAGE['PAGES']['INTRO_SAVED']); + } else { + fclose($handle); + $admin->print_error($MESSAGE['PAGES']['INTRO_NOT_WRITABLE']); + } +} else { + $admin->print_error($MESSAGE['PAGES']['INTRO_NOT_WRITABLE']); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/intro2.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: tags/2.6.0/wb/admin/pages/sections.php =================================================================== --- tags/2.6.0/wb/admin/pages/sections.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/sections.php (revision 260) @@ -0,0 +1,266 @@ + + Copyright (C) 2004-2005, 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 config file +require('../../config.php'); + +// Make sure people are allowed to access this page +if(MANAGE_SECTIONS != 'enabled') { + header('Location: '.ADMIN_URL.'/pages/index.php'); +} + +// Get page id +if(!isset($_GET['page_id']) OR !is_numeric($_GET['page_id'])) { + header("Location: index.php"); +} else { + $page_id = $_GET['page_id']; +} + +// Create new admin object +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify'); + +// Check if we are supposed to add or delete a section +if(isset($_GET['section_id']) AND is_numeric($_GET['section_id'])) { + // Get more information about this section + $section_id = $_GET['section_id']; + $query_section = $database->query("SELECT module FROM ".TABLE_PREFIX."sections WHERE section_id = '$section_id'"); + if($query_section->numRows() == 0) { + $admin->print_error('Section not found'); + } + $section = $query_section->fetchRow(); + // Include the modules delete file if it exists + if(file_exists(WB_PATH.'/modules/'.$section['module'].'/delete.php')) { + require(WB_PATH.'/modules/'.$section['module'].'/delete.php'); + } + $database->query("DELETE FROM ".TABLE_PREFIX."sections WHERE section_id = '$section_id' LIMIT 1"); + if($database->is_error()) { + $admin->print_error($database->get_error()); + } else { + require(WB_PATH.'/framework/class.order.php'); + $order = new order(TABLE_PREFIX.'sections', 'position', 'section_id', 'page_id'); + $order->clean($page_id); + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id); + $admin->print_footer(); + exit(); + } +} elseif(isset($_POST['module']) AND $_POST['module'] != '') { + // Get section info + $module = $_POST['module']; + // Include the ordering class + require(WB_PATH.'/framework/class.order.php'); + // Get new order + $order = new order(TABLE_PREFIX.'sections', 'position', 'section_id', 'page_id'); + $position = $order->get_new($page_id); + // Insert module into DB + $database->query("INSERT INTO ".TABLE_PREFIX."sections (page_id,module,position,block) VALUES ('$page_id','$module','$position','1')"); + // Get the section id + $section_id = $database->get_one("SELECT LAST_INSERT_ID()"); + // Include the selected modules add file if it exists + if(file_exists(WB_PATH.'/modules/'.$module.'/add.php')) { + require(WB_PATH.'/modules/'.$module.'/add.php'); + } +} + +// Get perms +$database = new database(); +$results = $database->query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$results_array = $results->fetchRow(); +$old_admin_groups = explode(',', $results_array['admin_groups']); +$old_admin_users = explode(',', $results_array['admin_users']); +if(!is_numeric(array_search($admin->get_group_id(), $old_admin_groups)) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +} + +// Get page details +$database = new database(); +$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_header(); + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_header(); + $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); +} +$results_array = $results->fetchRow(); + +// Set module permissions +$module_permissions = $_SESSION['MODULE_PERMISSIONS']; + +// Unset block var +unset($block); +// Include template info file (if it exists) +if($results_array['template'] != '') { + $template_location = WB_PATH.'/templates/'.$results_array['template'].'/info.php'; +} else { + $template_location = WB_PATH.'/templates/'.DEFAULT_TEMPLATE.'/info.php'; +} +if(file_exists($template_location)) { + require($template_location); +} +// Check if $menu is set +if(!isset($block[1]) OR $block[1] == '') { + // Make our own menu list + $block[1] = $TEXT['MAIN']; +} + +?> + + + + + +
+

+ 		+ : + + - + + - + +
+ +query("SELECT section_id,module,position,block FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' ORDER BY position ASC"); +if($query_sections->numRows() > 0) { +?> +
+ + + + + + + + + +numRows(); + while($section = $query_sections->fetchRow()) { + // Get the modules real name + $module_path = WB_PATH.'/modules/'.$section['module'].'/info.php'; + if(file_exists($module_path)) { + require($module_path); + if(!isset($module_function)) { $module_function = 'unknown'; } + if(!is_numeric(array_search($section['module'], $module_permissions)) AND $module_function == 'page') { + ?> + + + + + + + + + + + + + + + + + +
:::
+ + + + + ^ + + + + + + v + + + + + Del + +
  
+ +
+ +query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'menu_link'"); +if($query_sections->numRows() == 0) { + ?> +

+ +
+ + + + + + +
+ + + +
+ +
+ print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/sections.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: tags/2.6.0/wb/admin/pages/add.php =================================================================== --- tags/2.6.0/wb/admin/pages/add.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/add.php (revision 260) @@ -0,0 +1,149 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Create new admin object and print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_add'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Get values +$title = $admin->add_slashes($admin->get_post('title')); +$module = $admin->get_post('type'); +$parent = $admin->get_post('parent'); +$visibility = $admin->get_post('visibility'); +$admin_groups = $admin->get_post('admin_groups'); +$viewing_groups = $admin->get_post('viewing_groups'); + +// Validate data +if($title == '') { + $admin->print_error($MESSAGE['PAGES']['BLANK_TITLE']); +} + +// Setup admin groups +$admin_groups[] = 1; +if($admin->get_group_id() != 1) { + $admin_groups[] = $admin->get_group_id(); +} +$admin_groups = implode(',', $admin_groups); +// Setup viewing groups +$viewing_groups[] = 1; +if($admin->get_group_id() != 1) { + $viewing_groups[] = $admin->get_group_id(); +} +$viewing_groups = implode(',', $viewing_groups); + +// Work-out what the link and page filename should be +if($parent == '0') { + $link = '/'.page_filename($title); + $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($title).'.php'; +} else { + $parent_section = ''; + $parent_titles = array_reverse(get_parent_titles($parent)); + foreach($parent_titles AS $parent_title) { + $parent_section .= page_filename($parent_title).'/'; + } + if($parent_section == '/') { $parent_section = ''; } + $link = '/'.$parent_section.page_filename($title); + $filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($title).'.php'; + make_dir(WB_PATH.PAGES_DIRECTORY.'/'.$parent_section); +} + +// Check if a page with same page filename exists +$database = new database(); +$get_same_page = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE link = '$link'"); +if($get_same_page->numRows() > 0 OR file_exists(WB_PATH.PAGES_DIRECTORY.$link.'.php') OR file_exists(WB_PATH.PAGES_DIRECTORY.$link.'/')) { + $admin->print_error($MESSAGE['PAGES']['PAGE_EXISTS']); +} + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); +$order = new order(TABLE_PREFIX.'pages', 'position', 'page_id', 'parent'); +// First clean order +$order->clean($parent); +// Get new order +$position = $order->get_new($parent); + +// Work-out if the page parent (if selected) has a seperate template to the default +$query_parent = $database->query("SELECT template FROM ".TABLE_PREFIX."pages WHERE page_id = '$parent'"); +if($query_parent->numRows() > 0) { + $fetch_parent = $query_parent->fetchRow(); + $template = $fetch_parent['template']; +} else { + $template = ''; +} + +// Insert page into pages table +$query = "INSERT INTO ".TABLE_PREFIX."pages (page_title,menu_title,parent,template,target,position,visibility,searching,menu,language,admin_groups,viewing_groups,modified_when,modified_by) VALUES ('$title','$title','$parent','$template','_top','$position','$visibility','1','1','".DEFAULT_LANGUAGE."','$admin_groups','$viewing_groups','".mktime()."','".$admin->get_user_id()."')"; +$database = new database(); +$database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} + +// Get the page id +$page_id = $database->get_one("SELECT LAST_INSERT_ID()"); + +// Work out level +$level = level_count($page_id); +// Work out root parent +$root_parent = root_parent($page_id); +// Work out page trail +$page_trail = get_page_trail($page_id); + +// Update page with new level and link +$database->query("UPDATE ".TABLE_PREFIX."pages SET link = '$link', level = '$level', root_parent = '$root_parent', page_trail = '$page_trail' WHERE page_id = '$page_id'"); + +// Create a new file in the /pages dir +create_access_file($filename, $page_id, $level); + +// Get new order for section +$order = new order(TABLE_PREFIX.'sections', 'position', 'section_id', 'page_id'); +$position = $order->get_new($parent); + +// Add new record into the sections table +$database->query("INSERT INTO ".TABLE_PREFIX."sections (page_id,position,module,block) VALUES ('$page_id','$position', '$module','1')"); + +// Get the section id +$section_id = $database->get_one("SELECT LAST_INSERT_ID()"); + +// Include the selected modules add file if it exists +if(file_exists(WB_PATH.'/modules/'.$module.'/add.php')) { + require(WB_PATH.'/modules/'.$module.'/add.php'); +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($MESSAGE['PAGES']['ADDED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/add.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: tags/2.6.0/wb/admin/pages/empty_trash.php =================================================================== --- tags/2.6.0/wb/admin/pages/empty_trash.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/empty_trash.php (revision 260) @@ -0,0 +1,61 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Get page list from database +$database = new database(); +$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE visibility = 'deleted' ORDER BY level DESC"; +$get_pages = $database->query($query); + +// Insert values into main page list +if($get_pages->numRows() > 0) { + while($page = $get_pages->fetchRow()) { + // Delete page subs + $sub_pages = get_subs($page['page_id'], array()); + foreach($sub_pages AS $sub_page_id) { + delete_page($sub_page_id); + } + // Delete page + delete_page($page['page_id']); + } +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($TEXT['TRASH_EMPTIED']); +} + +// Print admin +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/empty_trash.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/admin/pages/trash.php =================================================================== --- tags/2.6.0/wb/admin/pages/trash.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/trash.php (revision 260) @@ -0,0 +1,304 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages'); + +?> + + + + + + + + get_permission('pages_view') == true) { + ?> + + + + + +
+

+ 		+ + <?php echo $TEXT['PAGE_TRASH']; ?> + +
+
+ + + + + + + + +
+   + + : + + : + + : + + : +
+ +
+
+ +
+ + + + + +
< +print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/trash.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/admin/pages/modify.php =================================================================== --- tags/2.6.0/wb/admin/pages/modify.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/modify.php (revision 260) @@ -0,0 +1,137 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Get page id +if(!isset($_GET['page_id']) OR !is_numeric($_GET['page_id'])) { + header("Location: index.php"); +} else { + $page_id = $_GET['page_id']; +} + +// Create new admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify'); + +// Get perms +$database = new database(); +$results = $database->query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$results_array = $results->fetchRow(); +$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); +$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users'])); +if(!is_numeric(array_search($admin->get_group_id(), $old_admin_groups)) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +} + +// Get page details +$database = new database(); +$query = "SELECT page_id,page_title,modified_by,modified_when FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_header(); + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_header(); + $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); +} +$results_array = $results->fetchRow(); + +// Get display name of person who last modified the page +$query_user = "SELECT username,display_name FROM ".TABLE_PREFIX."users WHERE user_id = '".$results_array['modified_by']."'"; +$get_user = $database->query($query_user); +if($get_user->numRows() != 0) { + $user = $get_user->fetchRow(); +} else { + $user['display_name'] = 'Unknown'; + $user['username'] = 'unknown'; +} +// Convert the unix ts for modified_when to human a readable form +if($results_array['modified_when'] != 0) { + $modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE); +} else { + $modified_ts = 'Unknown'; +} + +// Include page info script +$template = new Template(ADMIN_PATH.'/pages'); +$template->set_file('page', 'modify.html'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var(array( + 'PAGE_ID' => $results_array['page_id'], + 'PAGE_TITLE' => ($results_array['page_title']), + 'MODIFIED_BY' => $user['display_name'], + 'MODIFIED_BY_USERNAME' => $user['username'], + 'MODIFIED_WHEN' => $modified_ts, + 'ADMIN_URL' => ADMIN_URL + ) + ); +if($modified_ts == 'Unknown') { + $template->set_var('DISPLAY_MODIFIED', 'hide'); +} else { + $template->set_var('DISPLAY_MODIFIED', ''); +} + +// Work-out if we should show the "manage sections" link +$query_sections = $database->query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'menu_link'"); +if($query_sections->numRows() > 0) { + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'none'); +} elseif(MANAGE_SECTIONS == 'enabled') { + $template->set_var('TEXT_MANAGE_SECTIONS', $HEADING['MANAGE_SECTIONS']); +} else { + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'none'); +} + +// Insert language TEXT +$template->set_var(array( + 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'], + 'TEXT_CHANGE_SETTINGS' => $TEXT['CHANGE_SETTINGS'], + 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], + 'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'] + ) + ); + +// Parse and print header template +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Get sections for this page +$query_sections = $database->query("SELECT section_id,module FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' ORDER BY position ASC"); +if($query_sections->numRows() > 0) { + while($section = $query_sections->fetchRow()) { + $section_id = $section['section_id']; + $module = $section['module']; + // Include the modules editing script if it exists + if(file_exists(WB_PATH.'/modules/'.$module.'/modify.php')) { + echo ''; + require(WB_PATH.'/modules/'.$module.'/modify.php'); + } + } +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/modify.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: tags/2.6.0/wb/admin/pages/settings2.php =================================================================== --- tags/2.6.0/wb/admin/pages/settings2.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/settings2.php (revision 260) @@ -0,0 +1,233 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Get page id +if(!isset($_POST['page_id']) OR !is_numeric($_POST['page_id'])) { + header("Location: index.php"); +} else { + $page_id = $_POST['page_id']; +} + +// Create new admin object and print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_settings'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Get values +$page_title = $admin->add_slashes($admin->get_post('page_title')); +$menu_title = $admin->add_slashes($admin->get_post('menu_title')); +$description = $admin->add_slashes($admin->get_post('description')); +$keywords = $admin->add_slashes($admin->get_post('keywords')); +$parent = $admin->get_post('parent'); +$visibility = $admin->get_post('visibility'); +$template = $admin->get_post('template'); +$target = $admin->get_post('target'); +$admin_groups = $admin->get_post('admin_groups'); +$viewing_groups = $admin->get_post('viewing_groups'); +$searching = $admin->get_post('searching'); +$language = $admin->get_post('language'); +$menu = $admin->get_post('menu'); + +// Validate data +if($page_title == '') { + $admin->print_error($MESSAGE['PAGES']['BLANK_PAGE_TITLE']); +} +if($menu_title == '') { + $admin->print_error($MESSAGE['PAGES']['BLANK_MENU_TITLE']); +} + +// Get existing perms +$database = new database(); +$results = $database->query("SELECT parent,link,position,admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$results_array = $results->fetchRow(); +$old_parent = $results_array['parent']; +$old_link = $results_array['link']; +$old_position = $results_array['position']; +$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); +$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users'])); +if(!is_numeric(array_search($admin->get_group_id(), $old_admin_groups)) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +} + +// Setup admin groups +$admin_groups[] = 1; +if($admin->get_group_id() != 1) { + $admin_groups[] = $admin->get_group_id(); +} +$admin_groups = implode(',', $admin_groups); +// Setup viewing groups +$viewing_groups[] = 1; +if($admin->get_group_id() != 1) { + $viewing_groups[] = $admin->get_group_id(); +} +$viewing_groups = implode(',', $viewing_groups); + +// If needed, get new order +if($parent != $old_parent) { + // Include ordering class + require(WB_PATH.'/framework/class.order.php'); + $order = new order(TABLE_PREFIX.'pages', 'position', 'page_id', 'parent'); + // Get new order + $position = $order->get_new($parent); + // Clean new order + $order->clean($parent); +} else { + $position = $old_position; +} + +// Work out level and root parent +if ($parent!='0') { + $level = level_count($parent)+1; + $root_parent = root_parent($parent); +} +else { + $level = '0'; + $root_parent = '0'; +} + +// Work-out what the link should be +if($parent == '0') { + $link = '/'.page_filename($menu_title); + $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).'.php'; +} else { + $parent_section = ''; + $parent_titles = array_reverse(get_parent_titles($parent)); + foreach($parent_titles AS $parent_title) { + $parent_section .= page_filename($parent_title).'/'; + } + if($parent_section == '/') { $parent_section = ''; } + $link = '/'.$parent_section.page_filename($menu_title); + $filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).'.php'; +} + +// Check if a page with same page filename exists +$database = new database(); +$get_same_page = $database->query("SELECT page_id,page_title FROM ".TABLE_PREFIX."pages WHERE link = '$link' and page_id != '$page_id'"); +if($get_same_page->numRows() > 0) { + $admin->print_error($MESSAGE['PAGES']['PAGE_EXISTS']); +} + +// Update page with new order +$query = "UPDATE ".TABLE_PREFIX."pages SET parent = '$parent', position = '$position' WHERE page_id = '$page_id'"; +$database = new database(); +$database->query($query); + +// Get page trail +$page_trail = get_page_trail($page_id); + +// Make sure link is not overwritten if page uses the menu link module +if(strstr($old_link, '://') != '') { + $link = $old_link; +} + +// Update page settings in the pages table +$query = "UPDATE ".TABLE_PREFIX."pages SET parent = '$parent', page_title = '$page_title', menu_title = '$menu_title', menu = '$menu', level = '$level', page_trail = '$page_trail', root_parent = '$root_parent', link = '$link', template = '$template', target = '$target', description = '$description', keywords = '$keywords', position = '$position', visibility = '$visibility', searching = '$searching', language = '$language', admin_groups = '$admin_groups', viewing_groups = '$viewing_groups' WHERE page_id = '$page_id'"; +$database->query($query); + +// Clean old order if needed +if($parent != $old_parent) { + $order->clean($old_parent); +} + +/* BEGIN page "access file" code */ + +// Create a new file in the /pages dir if title changed +if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/')) { + $admin->print_error($MESSAGE['PAGES']['CANNOT_CREATE_ACCESS_FILE']); +} else { + // First check if we need to create a new file + if($old_link != $link) { + // Delete old file + unlink(WB_PATH.PAGES_DIRECTORY.$old_link.'.php'); + // Create access file + create_access_file($filename,$page_id,$level); + // Move a directory for this page + if(file_exists(WB_PATH.PAGES_DIRECTORY.$old_link.'/') AND is_dir(WB_PATH.PAGES_DIRECTORY.$old_link.'/')) { + rename(WB_PATH.PAGES_DIRECTORY.$old_link.'/', WB_PATH.PAGES_DIRECTORY.$link.'/'); + } + // Update any pages that had the old link with the new one + $old_link_len = strlen($old_link); + $query_subs = $database->query("SELECT page_id,link,level FROM ".TABLE_PREFIX."pages WHERE link LIKE '%$old_link/%' ORDER BY LEVEL ASC"); + if($query_subs->numRows() > 0) { + while($sub = $query_subs->fetchRow()) { + // Double-check to see if it contains old link + if(substr($sub['link'], 0, $old_link_len) == $old_link) { + // Get new link + $replace_this = $old_link; + $old_sub_link_len =strlen($sub['link']); + $new_sub_link = $link.'/'.substr($sub['link'],$old_link_len+1,$old_sub_link_len); + // Work out level + $new_sub_level = level_count($sub['page_id']); + // Update level and link + $database->query("UPDATE ".TABLE_PREFIX."pages SET link = '$new_sub_link', level = '$new_sub_level' WHERE page_id = '".$sub['page_id']."' LIMIT 1"); + // Re-write the access file for this page + $old_subpage_file = WB_PATH.PAGES_DIRECTORY.$new_sub_link.'.php'; + if(file_exists($old_subpage_file)) { + unlink($old_subpage_file); + } + create_access_file(WB_PATH.PAGES_DIRECTORY.$new_sub_link.'.php', $sub['page_id'], $new_sub_level); + } + } + } + } +} + +// Function to fix page trail of subs +function fix_page_trail($parent) { + // Get objects and vars from outside this function + global $admin, $template, $database, $TEXT, $MESSAGE; + // Get page list from database + $database = new database(); + $query = "SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent'"; + $get_pages = $database->query($query); + // Insert values into main page list + if($get_pages->numRows() > 0) { + while($page = $get_pages->fetchRow()) { + // Fix page trail + $database->query("UPDATE ".TABLE_PREFIX."pages SET page_trail = '".get_page_trail($page['page_id'])."' WHERE page_id = '".$page['page_id']."'"); + // Run this query on subs + fix_page_trail($page['page_id']); + } + } +} +// Fix sub-pages page trail +fix_page_trail($page_id); + +/* END page "access file" code */ + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/settings.php?page_id='.$page_id); +} else { + $admin->print_success($MESSAGE['PAGES']['SAVED_SETTINGS'], ADMIN_URL.'/pages/index.php'); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/settings2.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: tags/2.6.0/wb/admin/pages/delete.php =================================================================== --- tags/2.6.0/wb/admin/pages/delete.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/delete.php (revision 260) @@ -0,0 +1,109 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Get page id +if(!isset($_GET['page_id']) OR !is_numeric($_GET['page_id'])) { + header("Location: index.php"); +} else { + $page_id = $_GET['page_id']; +} + +// Create new admin object and print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_delete'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Get perms +$results = $database->query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$results_array = $results->fetchRow(); + +// Find out more about the page +$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); +} +$results_array = $results->fetchRow(); +$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); +$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users'])); +if(!is_numeric(array_search($admin->get_group_id(), $old_admin_groups)) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +} + +$visibility = $results_array['visibility']; + +// Check if we should delete it or just set the visibility to 'deleted' +if(PAGE_TRASH != 'disabled' AND $visibility != 'deleted') { + // Page trash is enabled and page has not yet been deleted + // Function to change all child pages visibility to deleted + function trash_subs($parent = 0) { + global $database; + // Query pages + $query_menu = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' ORDER BY position ASC"); + // Check if there are any pages to show + if($query_menu->numRows() > 0) { + // Loop through pages + while($page = $query_menu->fetchRow()) { + // Update the page visibility to 'deleted' + $database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'deleted' WHERE page_id = '".$page['page_id']."' LIMIT 1"); + // Run this function again for all sub-pages + trash_subs($page['page_id']); + } + } + } + + // Update the page visibility to 'deleted' + $database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'deleted' WHERE page_id = '$page_id.' LIMIT 1"); + + // Run trash subs for this page + trash_subs($page_id); +} else { + // Really dump the page + // Delete page subs + $sub_pages = get_subs($page_id, array()); + foreach($sub_pages AS $sub_page_id) { + delete_page($sub_page_id); + } + // Delete page + delete_page($page_id); +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($MESSAGE['PAGES']['DELETED']); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/delete.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: tags/2.6.0/wb/admin/pages/restore.php =================================================================== --- tags/2.6.0/wb/admin/pages/restore.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/restore.php (revision 260) @@ -0,0 +1,101 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Get page id +if(!isset($_GET['page_id']) OR !is_numeric($_GET['page_id'])) { + header("Location: index.php"); +} else { + $page_id = $_GET['page_id']; +} + +// Create new admin object and print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_delete'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Get perms +$results = $database->query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$results_array = $results->fetchRow(); + +// Find out more about the page +$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); +} +$results_array = $results->fetchRow(); +$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); +$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users'])); +if(!is_numeric(array_search($admin->get_group_id(), $old_admin_groups)) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +} + +$visibility = $results_array['visibility']; + +if(PAGE_TRASH) { + if($visibility == 'deleted') { + // Function to change all child pages visibility to deleted + function restore_subs($parent = 0) { + global $database; + // Query pages + $query_menu = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' ORDER BY position ASC"); + // Check if there are any pages to show + if($query_menu->numRows() > 0) { + // Loop through pages + while($page = $query_menu->fetchRow()) { + // Update the page visibility to 'deleted' + $database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'public' WHERE page_id = '".$page['page_id']."' LIMIT 1"); + // Run this function again for all sub-pages + restore_subs($page['page_id']); + } + } + } + + // Update the page visibility to 'deleted' + $database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'public' WHERE page_id = '$page_id.' LIMIT 1"); + + // Run trash subs for this page + restore_subs($page_id); + + } +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($MESSAGE['PAGES']['RESTORED']); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/restore.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/admin/pages/move_down.php =================================================================== --- tags/2.6.0/wb/admin/pages/move_down.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/move_down.php (revision 260) @@ -0,0 +1,72 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(isset($_GET['page_id']) AND is_numeric($_GET['page_id'])) { + if(isset($_GET['section_id']) AND is_numeric($_GET['section_id'])) { + $page_id = $_GET['page_id']; + $id = $_GET['section_id']; + $id_field = 'section_id'; + $common_field = 'page_id'; + $table = TABLE_PREFIX.'sections'; + } else { + $id = $_GET['page_id']; + $id_field = 'page_id'; + $common_field = 'parent'; + $table = TABLE_PREFIX.'pages'; + } +} else { + header("Location: index.php"); +} + +// Create new admin object and print admin header +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_settings'); + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); + +// Create new order object an reorder +$order = new order($table, 'position', $id_field, $common_field); +if($id_field == 'page_id') { + if($order->move_down($id)) { + $admin->print_success($MESSAGE['PAGES']['REORDERED']); + } else { + $admin->print_error($MESSAGE['PAGES']['CANNOT_REORDER']); + } +} else { + if($order->move_down($id)) { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id); + } else { + $admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id); + } +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/move_down.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: tags/2.6.0/wb/admin/pages/save.php =================================================================== --- tags/2.6.0/wb/admin/pages/save.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/save.php (revision 260) @@ -0,0 +1,86 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Get page & section id +if(!isset($_POST['page_id']) OR !is_numeric($_POST['page_id'])) { + header("Location: index.php"); +} else { + $page_id = $_POST['page_id']; +} +if(!isset($_POST['section_id']) OR !is_numeric($_POST['section_id'])) { + header("Location: index.php"); +} else { + $section_id = $_POST['section_id']; +} + +// Create new admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify'); + +// Get perms +$database = new database(); +$results = $database->query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$results_array = $results->fetchRow(); +$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); +$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users'])); +if(!is_numeric(array_search($admin->get_group_id(), $old_admin_groups)) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +} + +// Get page module +$database = new database(); +$query = "SELECT module FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); +} +$results_array = $results->fetchRow(); +$module = $results_array['module']; + +// Update the pages table +$now = mktime(); +$query = "UPDATE ".TABLE_PREFIX."pages SET modified_when = '$now', modified_by = '".$admin->get_user_id()."' WHERE page_id = '$page_id'"; +$database->query($query); + +// Include the modules saving script if it exists +if(file_exists(WB_PATH.'/modules/'.$module.'/save.php')) { + require(WB_PATH.'/modules/'.$module.'/save.php'); +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), $js_back); +} else { + $admin->print_success($MESSAGE['PAGES']['SAVED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/save.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: tags/2.6.0/wb/admin/pages/modify.html =================================================================== --- tags/2.6.0/wb/admin/pages/modify.html (nonexistent) +++ tags/2.6.0/wb/admin/pages/modify.html (revision 260) @@ -0,0 +1,22 @@ + + + + + + + +
+

{HEADING_MODIFY_PAGE}

+ 		+ {TEXT_CURRENT_PAGE}: + {PAGE_TITLE} + - + {TEXT_CHANGE_SETTINGS} + - + {TEXT_MANAGE_SECTIONS} +
+ {LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} + +
+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/modify.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/pages/move_up.php =================================================================== --- tags/2.6.0/wb/admin/pages/move_up.php (nonexistent) +++ tags/2.6.0/wb/admin/pages/move_up.php (revision 260) @@ -0,0 +1,72 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(isset($_GET['page_id']) AND is_numeric($_GET['page_id'])) { + if(isset($_GET['section_id']) AND is_numeric($_GET['section_id'])) { + $page_id = $_GET['page_id']; + $id = $_GET['section_id']; + $id_field = 'section_id'; + $common_field = 'page_id'; + $table = TABLE_PREFIX.'sections'; + } else { + $id = $_GET['page_id']; + $id_field = 'page_id'; + $common_field = 'parent'; + $table = TABLE_PREFIX.'pages'; + } +} else { + header("Location: index.php"); +} + +// Create new admin object and print admin header +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_settings'); + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); + +// Create new order object an reorder +$order = new order($table, 'position', $id_field, $common_field); +if($id_field == 'page_id') { + if($order->move_up($id)) { + $admin->print_success($MESSAGE['PAGES']['REORDERED']); + } else { + $admin->print_error($MESSAGE['PAGES']['CANNOT_REORDER']); + } +} else { + if($order->move_up($id)) { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id); + } else { + $admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id); + } +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/pages/move_up.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: tags/2.6.0/wb/admin/groups/group_form.html =================================================================== --- tags/2.6.0/wb/admin/groups/group_form.html (nonexistent) +++ tags/2.6.0/wb/admin/groups/group_form.html (revision 260) @@ -0,0 +1,282 @@ + + + + +

{HEADING_MODIFY_GROUP}

+ +
+ + + + + + + + +
{TEXT_NAME}: + +
+ + + + + +
{TEXT_SYSTEM_PERMISSIONS}: + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + +
+ +
+ + + + + +
{TEXT_SYSTEM_PERMISSIONS}: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

{SECTION_PAGES}

+
+ +   + ( + ) +
+

{SECTION_MEDIA}

+
  
+

{SECTION_MODULES}

+
  
+

{SECTION_TEMPLATES}

+
  
+

{SECTION_LANGUAGES}

+
  
+

{SECTION_SETTINGS}

+
+

{SECTION_USERS}

+
+

{SECTION_GROUPS}

+
+ + +
+ + + + + + + + +
+ {TEXT_MODULE_PERMISSIONS}: + +
    + +
  • + + +
    • + +
+ 		+ {TEXT_TEMPLATE_PERMISSIONS}: + +
    + +
  • + + +
    • + +
+
+ + + + + + + + + + + +
  + + + +
+ +
+ + Property changes on: tags/2.6.0/wb/admin/groups/group_form.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/groups/get_permissions.php =================================================================== --- tags/2.6.0/wb/admin/groups/get_permissions.php (nonexistent) +++ tags/2.6.0/wb/admin/groups/get_permissions.php (revision 260) @@ -0,0 +1,246 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(!defined('WB_PATH')) { exit('Direct access to this file is not allowed'); } + +// Get system permissions +if($admin->get_post('advanced') != 'yes') { + $system_permissions['pages'] = $admin->get_post('pages'); + $system_permissions['pages_view'] = $system_permissions['pages']; + $system_permissions['pages_add'] = $system_permissions['pages']; + $system_permissions['pages_add_l0'] = $system_permissions['pages']; + $system_permissions['pages_settings'] = $system_permissions['pages']; + $system_permissions['pages_modify'] = $system_permissions['pages']; + $system_permissions['pages_intro'] = $system_permissions['pages']; + $system_permissions['pages_delete'] = $system_permissions['pages']; + $system_permissions['media'] = $admin->get_post('media'); + $system_permissions['media_view'] = $system_permissions['media']; + $system_permissions['media_upload'] = $system_permissions['media']; + $system_permissions['media_rename'] = $system_permissions['media']; + $system_permissions['media_delete'] = $system_permissions['media']; + $system_permissions['media_create'] = $system_permissions['media']; + if($admin->get_post('modules') != '' OR $admin->get_post('templates') != '' OR $admin->get_post('languages') != '') { + $system_permissions['addons'] = 1; + } else { + $system_permissions['addons'] = 0; + } + $system_permissions['modules'] = $admin->get_post('modules'); + $system_permissions['modules_view'] = $system_permissions['modules']; + $system_permissions['modules_install'] = $system_permissions['modules']; + $system_permissions['modules_uninstall'] = $system_permissions['modules']; + $system_permissions['templates'] = $admin->get_post('templates'); + $system_permissions['templates_view'] = $system_permissions['templates']; + $system_permissions['templates_install'] = $system_permissions['templates']; + $system_permissions['templates_uninstall'] = $system_permissions['templates']; + $system_permissions['languages'] = $admin->get_post('languages'); + $system_permissions['languages_view'] = $system_permissions['languages']; + $system_permissions['languages_install'] = $system_permissions['languages']; + $system_permissions['languages_uninstall'] = $system_permissions['languages']; + $system_permissions['settings'] = $admin->get_post('settings'); + $system_permissions['settings_basic'] = $system_permissions['settings']; + $system_permissions['settings_advanced'] = $system_permissions['settings']; + if($admin->get_post('users') != '' AND $admin->get_post('groups') != '') { + $system_permissions['access'] = 1; + } else { + $system_permissions['access'] = 0; + } + $system_permissions['users'] = $admin->get_post('users'); + $system_permissions['users_view'] = $system_permissions['users']; + $system_permissions['users_add'] = $system_permissions['users']; + $system_permissions['users_modify'] = $system_permissions['users']; + $system_permissions['users_delete'] = $system_permissions['users']; + $system_permissions['groups'] = $admin->get_post('groups'); + $system_permissions['groups_view'] = $system_permissions['groups']; + $system_permissions['groups_add'] = $system_permissions['groups']; + $system_permissions['groups_modify'] = $system_permissions['groups']; + $system_permissions['groups_delete'] = $system_permissions['groups']; +} else { + // Pages + $system_permissions['pages_view'] = $admin->get_post('pages_view'); + $system_permissions['pages_add'] = $admin->get_post('pages_add'); + if($admin->get_post('pages_add') != 1 AND $admin->get_post('pages_add_l0') == 1) { + $system_permissions['pages_add'] = $admin->get_post('pages_add_l0'); + } + $system_permissions['pages_add_l0'] = $admin->get_post('pages_add_l0'); + $system_permissions['pages_settings'] = $admin->get_post('pages_settings'); + $system_permissions['pages_modify'] = $admin->get_post('pages_modify'); + $system_permissions['pages_intro'] = $admin->get_post('pages_intro'); + $system_permissions['pages_delete'] = $admin->get_post('pages_delete'); + if($system_permissions['pages_view'] == 1 OR $system_permissions['pages_add'] == 1 OR $system_permissions['pages_settings'] == 1 OR $system_permissions['pages_modify'] == 1 OR $system_permissions['pages_intro'] == 1 OR $system_permissions['pages_delete'] == 1) { + $system_permissions['pages'] = 1; + } else { + $system_permissions['pages'] = ''; + } + // Media + $system_permissions['media_view'] = $admin->get_post('media_view'); + $system_permissions['media_upload'] = $admin->get_post('media_upload'); + $system_permissions['media_rename'] = $admin->get_post('media_rename'); + $system_permissions['media_delete'] = $admin->get_post('media_delete'); + $system_permissions['media_create'] = $admin->get_post('media_create'); + if($system_permissions['media_view'] == 1 OR $system_permissions['media_upload'] == 1 OR $system_permissions['media_rename'] == 1 OR $system_permissions['media_delete'] == 1 OR $system_permissions['media_create'] == 1) { + $system_permissions['media'] = 1; + } else { + $system_permissions['media'] = ''; + } + // Add-ons + // Modules + $system_permissions['modules_view'] = $admin->get_post('modules_view'); + $system_permissions['modules_install'] = $admin->get_post('modules_install'); + $system_permissions['modules_uninstall'] = $admin->get_post('modules_uninstall'); + if($system_permissions['modules_view'] == 1 OR $system_permissions['modules_install'] == 1 OR $system_permissions['modules_uninstall'] == 1) { + $system_permissions['modules'] = 1; + } else { + $system_permissions['modules'] = ''; + } + // Templates + $system_permissions['templates_view'] = $admin->get_post('templates_view'); + $system_permissions['templates_install'] = $admin->get_post('templates_install'); + $system_permissions['templates_uninstall'] = $admin->get_post('templates_uninstall'); + if($system_permissions['templates_view'] == 1 OR $system_permissions['templates_install'] == 1 OR $system_permissions['templates_uninstall'] == 1) { + $system_permissions['templates'] = 1; + } else { + $system_permissions['templates'] = ''; + } + // Languages + $system_permissions['languages_view'] = $admin->get_post('languages_view'); + $system_permissions['languages_install'] = $admin->get_post('languages_install'); + $system_permissions['languages_uninstall'] = $admin->get_post('languages_uninstall'); + if($system_permissions['languages_install'] == 1 OR $system_permissions['languages_uninstall'] == 1) { + $system_permissions['languages'] = 1; + } else { + $system_permissions['languages'] = ''; + } + if($system_permissions['modules'] == 1 OR $system_permissions['templates'] == 1 OR $system_permissions['languages'] == 1) { + $system_permissions['addons'] = 1; + } else { + $system_permissions['addons'] = ''; + } + // Settings + $system_permissions['settings_basic'] = $admin->get_post('settings_basic'); + $system_permissions['settings_advanced'] = $admin->get_post('settings_advanced'); + if($system_permissions['settings_basic'] == 1 OR $system_permissions['settings_advanced'] == 1) { + $system_permissions['settings'] = 1; + } else { + $system_permissions['settings'] = ''; + } + // Access + // Users + $system_permissions['users_view'] = $admin->get_post('users_view'); + $system_permissions['users_add'] = $admin->get_post('users_add'); + $system_permissions['users_modify'] = $admin->get_post('users_modify'); + $system_permissions['users_delete'] = $admin->get_post('users_delete'); + if($system_permissions['users_view'] == 1 OR $system_permissions['users_add'] == 1 OR $system_permissions['users_modify'] == 1 OR $system_permissions['users_delete'] == 1) { + $system_permissions['users'] = 1; + } else { + $system_permissions['users'] = ''; + } + // Groups + $system_permissions['groups_view'] = $admin->get_post('groups_view'); + $system_permissions['groups_add'] = $admin->get_post('groups_add'); + $system_permissions['groups_modify'] = $admin->get_post('groups_modify'); + $system_permissions['groups_delete'] = $admin->get_post('groups_delete'); + if($system_permissions['groups_view'] == 1 OR $system_permissions['groups_add'] == 1 OR $system_permissions['groups_modify'] == 1 OR $system_permissions['groups_delete'] == 1) { + $system_permissions['groups'] = 1; + } else { + $system_permissions['groups'] = ''; + } + if($system_permissions['users'] == 1 OR $system_permissions['groups'] == 1) { + $system_permissions['access'] = 1; + } else { + $system_permissions['access'] = ''; + } +} + +// Implode system permissions +$imploded_system_permissions = ''; +foreach($system_permissions AS $name => $value) { + if($value == true) { + if($imploded_system_permissions == '') { + $imploded_system_permissions = $name; + } else { + $imploded_system_permissions .= ','.$name; + } + } +} + +$system_permissions = $imploded_system_permissions; + +// Get module permissions +$module_permissions = ''; +if($handle = opendir(WB_PATH.'/modules/')) { + while (false !== ($file = readdir($handle))) { + if($file != "." AND $file != ".." AND $file != ".svn" AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) { + // Include the modules info file + require(WB_PATH.'/modules/'.$file.'/info.php'); + // Check if it was selected to be used or not + $count = 0; + if(is_array($admin->get_post('module_permissions'))) { + foreach($admin->get_post('module_permissions') AS $selected_name) { + if($file == $selected_name) { + $count = $count+1; + } + } + } + if($count == 0) { + // Add unselected modules to list + if($module_permissions == '') { + $module_permissions = $file; + } else { + $module_permissions .= ','.$file; + } + } + } + } +} + +// Get template permissions +$template_permissions = ''; +if($handle = opendir(WB_PATH.'/templates/')) { + while (false !== ($file = readdir($handle))) { + if($file != "." AND $file != ".." AND $file != ".svn" AND is_dir(WB_PATH."/templates/$file") AND file_exists(WB_PATH."/templates/$file/info.php")) { + // Include the modules info file + require(WB_PATH.'/templates/'.$file.'/info.php'); + // Check if it was selected to be used or not + $count = 0; + if(is_array($admin->get_post('template_permissions'))) { + foreach($admin->get_post('template_permissions') AS $selected_name) { + if($file == $selected_name) { + $count = $count+1; + } + } + } + if($count == 0) { + // Add unselected modules to list + if($template_permissions == '') { + $template_permissions = $file; + } else { + $template_permissions .= ','.$file; + } + } + } + } +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/groups/get_permissions.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: tags/2.6.0/wb/admin/groups/groups.php =================================================================== --- tags/2.6.0/wb/admin/groups/groups.php (nonexistent) +++ tags/2.6.0/wb/admin/groups/groups.php (revision 260) @@ -0,0 +1,185 @@ + + Copyright (C) 2004-2005, 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 config file and admin class file +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); + +// Create new database object +$database = new database(); + +if(!isset($_POST['action']) OR $_POST['action'] != "modify" AND $_POST['action'] != "delete") { + header("Location: index.php"); +} + +// Check if group group_id is a valid number and doesnt equal 1 +if(!isset($_POST['group_id']) OR !is_numeric($_POST['group_id']) OR $_POST['group_id'] == 1) { + header("Location: index.php"); +} + +if($_POST['action'] == 'modify') { + // Create new admin object + $admin = new admin('Access', 'groups_modify', false); + // Print header + $admin->print_header(); + // Get existing values + $results = $database->query("SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id = '".$_POST['group_id']."'"); + $group = $results->fetchRow(); + // Setup template object + $template = new Template(ADMIN_PATH.'/groups'); + $template->set_file('page', 'group_form.html'); + $template->set_block('page', 'main_block', 'main'); + $template->set_var( array( + 'ACTION_URL' => ADMIN_URL.'/groups/save.php', + 'SUBMIT_TITLE' => $TEXT['SAVE'], + 'GROUP_ID' => $group['group_id'], + 'GROUP_NAME' => $group['name'], + 'ADVANCED_ACTION' => 'groups.php' + ) + ); + // Tell the browser whether or not to show advanced options + if(isset($_POST['advanced']) AND $_POST['advanced'] == $TEXT['SHOW_ADVANCED'].' >>') { + $template->set_var('DISPLAY_ADVANCED', ''); + $template->set_var('DISPLAY_BASIC', 'none'); + $template->set_var('ADVANCED', 'yes'); + $template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']); + } else { + $template->set_var('DISPLAY_ADVANCED', 'none'); + $template->set_var('DISPLAY_BASIC', ''); + $template->set_var('ADVANCED', 'no'); + $template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>'); + } + + // Explode system permissions + $system_permissions = explode(',', $group['system_permissions']); + // Check system permissions boxes + foreach($system_permissions AS $name) { + $template->set_var($name.'_checked', 'checked'); + } + // Explode module permissions + $module_permissions = explode(',', $group['module_permissions']); + // Explode template permissions + $template_permissions = explode(',', $group['template_permissions']); + + // Insert values into module list + $template->set_block('main_block', 'module_list_block', 'module_list'); + $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page'"); + if($result->numRows() > 0) { + while($addon = $result->fetchRow()) { + $template->set_var('VALUE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + if(!is_numeric(array_search($addon['directory'], $module_permissions))) { + $template->set_var('CHECKED', 'checked'); + } else { + $template->set_var('CHECKED', ''); + } + $template->parse('module_list', 'module_list_block', true); + } + } + + // Insert values into template list + $template->set_block('main_block', 'template_list_block', 'template_list'); + $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); + if($result->numRows() > 0) { + while($addon = $result->fetchRow()) { + $template->set_var('VALUE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + if(!is_numeric(array_search($addon['directory'], $template_permissions))) { + $template->set_var('CHECKED', 'checked'); + } else { + $template->set_var('CHECKED', ''); + } + $template->parse('template_list', 'template_list_block', true); + } + } + + // Insert language text and messages + $template->set_var(array( + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_ACTIVE' => $TEXT['ACTIVE'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'], + 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_GROUP' => $TEXT['GROUP'], + 'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'], + 'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'], + 'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'], + 'TEXT_NAME' => $TEXT['NAME'], + 'SECTION_PAGES' => $MENU['PAGES'], + 'SECTION_MEDIA' => $MENU['MEDIA'], + 'SECTION_MODULES' => $MENU['MODULES'], + 'SECTION_TEMPLATES' => $MENU['TEMPLATES'], + 'SECTION_LANGUAGES' => $MENU['LANGUAGES'], + 'SECTION_SETTINGS' => $MENU['SETTINGS'], + 'SECTION_USERS' => $MENU['USERS'], + 'SECTION_GROUPS' => $MENU['GROUPS'], + 'TEXT_VIEW' => $TEXT['VIEW'], + 'TEXT_ADD' => $TEXT['ADD'], + 'TEXT_LEVEL' => $TEXT['LEVEL'], + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_DELETE' => $TEXT['DELETE'], + 'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'], + 'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'], + 'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'], + 'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'], + 'TEXT_RENAME' => $TEXT['RENAME'], + 'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'], + 'TEXT_BASIC' => $TEXT['BASIC'], + 'TEXT_ADVANCED' => $TEXT['ADVANCED'], + 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'] + ) + ); + + // Parse template object + $template->parse('main', 'main_block', false); + $template->pparse('output', 'page'); +} elseif($_POST['action'] == 'delete') { + // Create new admin object + $admin = new admin('Access', 'groups_delete', false); + // Print header + $admin->print_header(); + // Delete the group + $database->query("DELETE FROM ".TABLE_PREFIX."groups WHERE group_id = '".$_POST['group_id']."' LIMIT 1"); + if($database->is_error()) { + $admin->print_error($database->get_error()); + } else { + // Delete users in the group + $database->query("DELETE FROM ".TABLE_PREFIX."users WHERE group_id = '".$_POST['group_id']."'"); + if($database->is_error()) { + $admin->print_error($database->get_error()); + } else { + $admin->print_success($MESSAGE['GROUPS']['DELETED']); + } + } +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/groups/groups.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: tags/2.6.0/wb/admin/groups/index.php =================================================================== --- tags/2.6.0/wb/admin/groups/index.php (nonexistent) +++ tags/2.6.0/wb/admin/groups/index.php (revision 260) @@ -0,0 +1,192 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Access', 'groups'); + +// Create new template object for the modify/remove menu +$template = new Template(ADMIN_PATH.'/groups'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('ADMIN_URL', ADMIN_URL); + +// Get existing value from database +$database = new database(); +$query = "SELECT group_id,name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error(), 'index.php'); +} + +// Insert values into the modify/remove menu +$template->set_block('main_block', 'list_block', 'list'); +if($results->numRows() > 0) { + // Insert first value to say please select + $template->set_var('VALUE', ''); + $template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...'); + $template->parse('list', 'list_block', true); + // Loop through groups + while($group = $results->fetchRow()) { + $template->set_var('VALUE', $group['group_id']); + $template->set_var('NAME', $group['name']); + $template->parse('list', 'list_block', true); + } +} else { + // Insert single value to say no groups were found + $template->set_var('NAME', $TEXT['NONE_FOUND']); + $template->parse('list', 'list_block', true); +} + +// Insert permissions values +if($admin->get_permission('groups_add') != true) { + $template->set_var('DISPLAY_ADD', 'hide'); +} +if($admin->get_permission('groups_modify') != true) { + $template->set_var('DISPLAY_MODIFY', 'hide'); +} +if($admin->get_permission('groups_delete') != true) { + $template->set_var('DISPLAY_DELETE', 'hide'); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_MODIFY_DELETE_GROUP' => $HEADING['MODIFY_DELETE_GROUP'], + 'HEADING_ADD_GROUP' => $HEADING['ADD_GROUP'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_DELETE' => $TEXT['DELETE'], + 'TEXT_MANAGE_USERS' => $TEXT['MANAGE_USERS'], + 'CONFIRM_DELETE' => $MESSAGE['GROUPS']['CONFIRM_DELETE'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Setup template for add group form +$template = new Template(ADMIN_PATH.'/groups'); +$template->set_file('page', 'group_form.html'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('DISPLAY_EXTRA', 'none'); +$template->set_var('ACTION_URL', ADMIN_URL.'/groups/add.php'); +$template->set_var('SUBMIT_TITLE', $TEXT['ADD']); +$template->set_var('ADVANCED_ACTION', 'index.php'); + +// Tell the browser whether or not to show advanced options +if(isset($_POST['advanced']) AND $_POST['advanced'] == $TEXT['SHOW_ADVANCED'].' >>') { + $template->set_var('DISPLAY_ADVANCED', ''); + $template->set_var('DISPLAY_BASIC', 'none'); + $template->set_var('ADVANCED', 'yes'); + $template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']); +} else { + $template->set_var('DISPLAY_ADVANCED', 'none'); + $template->set_var('DISPLAY_BASIC', ''); + $template->set_var('ADVANCED', 'no'); + $template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>'); +} + +// Insert permissions values +if($admin->get_permission('groups_add') != true) { + $template->set_var('DISPLAY_ADD', 'hide'); +} + +// Insert values into module list +$template->set_block('main_block', 'module_list_block', 'module_list'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page'"); +if($result->numRows() > 0) { + while($addon = $result->fetchRow()) { + $template->set_var('VALUE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $template->parse('module_list', 'module_list_block', true); + } +} + +// Insert values into template list +$template->set_block('main_block', 'template_list_block', 'template_list'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); +if($result->numRows() > 0) { + while($addon = $result->fetchRow()) { + $template->set_var('VALUE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $template->parse('template_list', 'template_list_block', true); + } +} + +// Insert language text and messages +$template->set_var(array( + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_ACTIVE' => $TEXT['ACTIVE'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'], + 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_GROUP' => $TEXT['GROUP'], + 'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'], + 'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'], + 'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'], + 'TEXT_NAME' => $TEXT['NAME'], + 'SECTION_PAGES' => $MENU['PAGES'], + 'SECTION_MEDIA' => $MENU['MEDIA'], + 'SECTION_MODULES' => $MENU['MODULES'], + 'SECTION_TEMPLATES' => $MENU['TEMPLATES'], + 'SECTION_SETTINGS' => $MENU['SETTINGS'], + 'SECTION_LANGUAGES' => $MENU['LANGUAGES'], + 'SECTION_USERS' => $MENU['USERS'], + 'SECTION_GROUPS' => $MENU['GROUPS'], + 'TEXT_VIEW' => $TEXT['VIEW'], + 'TEXT_ADD' => $TEXT['ADD'], + 'TEXT_LEVEL' => $TEXT['LEVEL'], + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_DELETE' => $TEXT['DELETE'], + 'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'], + 'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'], + 'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'], + 'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'], + 'TEXT_RENAME' => $TEXT['RENAME'], + 'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'], + 'TEXT_BASIC' => $TEXT['BASIC'], + 'TEXT_ADVANCED' => $TEXT['ADVANCED'], + 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'], + 'CHECKED' => 'checked' + ) + ); + +// Parse template for add group form +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print the admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/groups/index.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: tags/2.6.0/wb/admin/groups/add.php =================================================================== --- tags/2.6.0/wb/admin/groups/add.php (nonexistent) +++ tags/2.6.0/wb/admin/groups/add.php (revision 260) @@ -0,0 +1,65 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Access', 'groups_add'); + +// Create new database object +$database = new database(); + +// Gather details entered +$group_name = $admin->get_post('group_name'); + +// Create a javascript back link +$js_back = "javascript: history.go(-1);"; + +// Check values +if($group_name == "") { + $admin->print_error($MESSAGE['GROUPS']['GROUP_NAME_BLANK'], $js_back); +} +$results = $database->query("SELECT * FROM ".TABLE_PREFIX."groups WHERE name = '$group_name'"); +if($results->numRows()>0) { + $admin->print_error($MESSAGE['GROUPS']['GROUP_NAME_EXISTS'], $js_back); +} + +// Get system and module permissions +require(ADMIN_PATH.'/groups/get_permissions.php'); + +// Update the database +$query = "INSERT INTO ".TABLE_PREFIX."groups (name,system_permissions,module_permissions,template_permissions) VALUES ('$group_name','$system_permissions','$module_permissions','$template_permissions')"; + +$database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($MESSAGE['GROUPS']['ADDED'], ADMIN_URL.'/groups/index.php'); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/groups/add.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: tags/2.6.0/wb/admin/groups/save.php =================================================================== --- tags/2.6.0/wb/admin/groups/save.php (nonexistent) +++ tags/2.6.0/wb/admin/groups/save.php (revision 260) @@ -0,0 +1,68 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Access', 'groups_modify'); + +// Create new database object +$database = new database(); + +// Check if group group_id is a valid number and doesnt equal 1 +if(!isset($_POST['group_id']) OR !is_numeric($_POST['group_id']) OR $_POST['group_id'] == 1) { + header("Location: index.php"); +} else { + $group_id = $_POST['group_id']; +} + +// Gather details entered +$group_name = $admin->get_post('group_name'); + +// Create a javascript back link +$js_back = "javascript: history.go(-1);"; + +// Check values +if($group_name == "") { + $admin->print_error($MESSAGE['GROUPS']['GROUP_NAME_BLANK'], $js_back); +} + +// Get system permissions +require_once(ADMIN_PATH.'/groups/get_permissions.php'); + +// Update the database +$query = "UPDATE ".TABLE_PREFIX."groups SET name = '$group_name', system_permissions = '$system_permissions', module_permissions = '$module_permissions', template_permissions = '$template_permissions' WHERE group_id = '$group_id'"; + +$database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($MESSAGE['GROUPS']['SAVED'], ADMIN_URL.'/groups/index.php'); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/groups/save.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: tags/2.6.0/wb/admin/groups/template.html =================================================================== --- tags/2.6.0/wb/admin/groups/template.html (nonexistent) +++ tags/2.6.0/wb/admin/groups/template.html (revision 260) @@ -0,0 +1,35 @@ + + +
+ + + + + + + + +
+

{HEADING_MODIFY_DELETE_GROUP}

+ 		+ {TEXT_MANAGE_USERS} +
+ +
+ + + + + + +
+ +
+ +

{HEADING_ADD_GROUP}

+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/groups/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/media/rename.html =================================================================== --- tags/2.6.0/wb/admin/media/rename.html (nonexistent) +++ tags/2.6.0/wb/admin/media/rename.html (revision 260) @@ -0,0 +1,54 @@ + + + + +
+ + + + + + + + + + + + + + + + + + +
{TEXT_RENAME} '{FILENAME}' {TEXT_TO}:
+ + + + +
+ + +
+ + +
+ +
+ + + + + + + + + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/media/rename.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/media/basic_header.html =================================================================== --- tags/2.6.0/wb/admin/media/basic_header.html (nonexistent) +++ tags/2.6.0/wb/admin/media/basic_header.html (revision 260) @@ -0,0 +1,22 @@ + + + +Website Baker Administration - Media + + + + + + + + + + +query("SELECT email_to,email_from,email_subject,success_message,max_submissions,stored_submissions FROM ".TABLE_PREFIX."mod_form_settings WHERE section_id = '$section_id'"); + if($query_settings->numRows() > 0) { + $fetch_settings = $query_settings->fetchRow(); + $email_to = $fetch_settings['email_to']; + $email_from = $fetch_settings['email_from']; + if(substr($email_from, 0, 5) == 'field') { + // Set the email from field to what the user entered in the specified field + $email_from = $wb->add_slashes($_POST[$email_from]); + } + $email_subject = $fetch_settings['email_subject']; + $success_message = $fetch_settings['success_message']; + $max_submissions = $fetch_settings['max_submissions']; + $stored_submissions = $fetch_settings['stored_submissions']; + } else { + exit($TEXT['UNDER_CONSTRUCTION']); + } + $email_body = ''; + + // Create blank "required" array + $required = array(); + + // Loop through fields and add to message body + // Get list of fields + $query_fields = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id' ORDER BY position ASC"); + if($query_fields->numRows() > 0) { + while($field = $query_fields->fetchRow()) { + // Add to message body + if($field['type'] != '') { + if(!empty($_POST['field'.$field['field_id']])) { + if($field['type'] == 'email' AND $admin->validate_email($_POST['field'.$field['field_id']]) == false) { + $email_error = $MESSAGE['USERS']['INVALID_EMAIL']; + } + if($field['type'] == 'heading') { + $email_body .= $_POST['field'.$field['field_id']]."\n\n"; + } elseif (!is_array($_POST['field'.$field['field_id']])) { + $email_body .= $field['title'].': '.$_POST['field'.$field['field_id']]."\n\n"; + } else { + $email_body .= $field['title'].": \n"; + foreach ($_POST['field'.$field['field_id']] as $k=>$v) { + $email_body .= $v."\n"; + } + $email_body .= "\n"; + } + } elseif($field['required'] == 1) { + $required[] = $field['title']; + } + } + } + } + + // Captcha + if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { /* Make's sure GD library is installed */ + if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){ + // Check for a mismatch + if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) { + $captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA']; + } + } else { + $captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA']; + } + } + if(isset($_SESSION['catpcha'])) { unset($_SESSION['captcha']); } + + // Addslashes to email body - proposed by Icheb in topic=1170.0 + // $email_body = $wb->add_slashes($email_body); + + // Check if the user forgot to enter values into all the required fields + if($required != array()) { + if(!isset($MESSAGE['MOD_FORM']['REQUIRED_FIELDS'])) { + echo 'You must enter details for the following fields'; + } else { + echo $MESSAGE['MOD_FORM']['REQUIRED_FIELDS']; + } + echo ':
'.$TEXT['BACK'].''; + + } else { + + if(isset($email_error)) { + echo '
'.$TEXT['BACK'].''; + } elseif(isset($captcha_error)) { + echo '
'.$TEXT['BACK'].''; + } else { + + // Check how many times form has been submitted in last hour + $query_submissions = $database->query("SELECT submission_id FROM ".TABLE_PREFIX."mod_form_submissions WHERE submitted_when >= '3600'"); + if($query_submissions->numRows() > $max_submissions) { + // Too many submissions so far this hour + echo $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS']; + $success = false; + } else { + // Now send the email + if($email_to != '') { + if($email_from != '') { + if(mail($email_to,$email_subject,str_replace("\n", '', $email_body),"From: ".$email_from)) { $success = true; } + } else { + if(mail($email_to,$email_subject,str_replace("\n", '', $email_body))) { $success = true; } + } + } + // Write submission to database + if(isset($admin) AND $admin->get_user_id() > 0) { + $admin->get_user_id(); + } else { + $submitted_by = 0; + } + $email_body = $wb->add_slashes($email_body); + $database->query("INSERT INTO ".TABLE_PREFIX."mod_form_submissions (page_id,section_id,submitted_when,submitted_by,body) VALUES ('".PAGE_ID."','$section_id','".mktime()."','$submitted_by','$email_body')"); + // Make sure submissions table isn't too full + $query_submissions = $database->query("SELECT submission_id FROM ".TABLE_PREFIX."mod_form_submissions ORDER BY submitted_when"); + $num_submissions = $query_submissions->numRows(); + if($num_submissions > $stored_submissions) { + // Remove excess submission + $num_to_remove = $num_submissions-$stored_submissions; + while($submission = $query_submissions->fetchRow()) { + if($num_to_remove > 0) { + $submission_id = $submission['submission_id']; + $database->query("DELETE FROM ".TABLE_PREFIX."mod_form_submissions WHERE submission_id = '$submission_id'"); + $num_to_remove = $num_to_remove-1; + } + } + } + if(!$database->is_error()) { + $success = true; + } + } + + // Now check if the email was sent successfully + if(isset($success) AND $success == true) { + echo $success_message; + } else { + echo $TEXT['ERROR']; + } + + } + } + +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/view.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: tags/2.6.0/wb/modules/form/save_settings.php =================================================================== --- tags/2.6.0/wb/modules/form/save_settings.php (nonexistent) +++ tags/2.6.0/wb/modules/form/save_settings.php (revision 260) @@ -0,0 +1,84 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +require('../../config.php'); + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// This code removes any ', ''); +$header = $admin->add_slashes($_POST['header']); +$field_loop = $admin->add_slashes($_POST['field_loop']); +$footer = $admin->add_slashes($_POST['footer']); +$email_to = $admin->add_slashes($_POST['email_to']); +if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { + $use_captcha = $_POST['use_captcha']; +} else { + $use_captcha = false; +} +if($_POST['email_from_field'] == '') { + $email_from = $admin->add_slashes($_POST['email_from']); +} else { + $email_from = $admin->add_slashes($_POST['email_from_field']); +} +$email_subject = $admin->add_slashes($_POST['email_subject']); +$success_message = $admin->add_slashes($_POST['success_message']); +if(!is_numeric($_POST['max_submissions'])) { + $max_submissions = 50; +} else { + $max_submissions = $_POST['max_submissions']; +} +if(!is_numeric($_POST['stored_submissions'])) { + $stored_submissions = 100; +} else { + $stored_submissions = $_POST['stored_submissions']; +} +// Make sure max submissions is not smaller than stored submissions +if($max_submissions < $stored_submissions) { + $max_submissions = $stored_submissions; +} + +// Update settings +$database->query("UPDATE ".TABLE_PREFIX."mod_form_settings SET header = '$header', field_loop = '$field_loop', footer = '$footer', email_to = '$email_to', email_from = '$email_from', email_subject = '$email_subject', success_message = '$success_message', max_submissions = '$max_submissions', stored_submissions = '$stored_submissions', use_captcha = '$use_captcha' WHERE section_id = '$section_id'"); + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/save_settings.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: tags/2.6.0/wb/modules/form/add.php =================================================================== --- tags/2.6.0/wb/modules/form/add.php (nonexistent) +++ tags/2.6.0/wb/modules/form/add.php (revision 260) @@ -0,0 +1,49 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +// Insert an extra rows into the database +$header = '
\ No newline at end of file Property changes on: tags/2.6.0/wb/admin/media/basic_header.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/media/template.html =================================================================== --- tags/2.6.0/wb/admin/media/template.html (nonexistent) +++ tags/2.6.0/wb/admin/media/template.html (revision 260) @@ -0,0 +1,126 @@ + + + + +

{HEADING_BROWSE_MEDIA}

+ + + +
+ + + +
+ +
+ +

{HEADING_CREATE_FOLDER}

+ + + + + + +
{TEXT_TARGET_FOLDER}: + +
+ + + + + + +
{TEXT_NAME}: + + + +
+ +
+ +
+ +
+ +

{HEADING_UPLOAD_FILES}

+ + + + + + +
{TEXT_TARGET_FOLDER}: + +
+ + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ +
+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/media/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/media/rename2.php =================================================================== --- tags/2.6.0/wb/admin/media/rename2.php (nonexistent) +++ tags/2.6.0/wb/admin/media/rename2.php (revision 260) @@ -0,0 +1,166 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Create admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Media', 'media_rename', false); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Include the basic header file +require(ADMIN_PATH.'/media/basic_header.html'); + +// Get list of file types to which we're supposed to append 'txt' +$get_result=$database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name='rename_files_on_upload' LIMIT 1"); +$file_extension_string=''; +if ($get_result->numRows()>0) { + $fetch_result=$get_result->fetchRow(); + $file_extension_string=$fetch_result['value']; +} +$file_extensions=explode(",",$file_extension_string); + + +// Get the current dir +$directory = $admin->get_post('dir'); +if($directory == '/') { + $directory = ''; +} +// Check to see if it contains ../ +if(strstr($directory, '../')) { + $admin->print_header(); + $admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH']); +} + +// Get the temp id +if(!is_numeric($admin->get_post('id'))) { + header("Location: browse.php?dir=$directory"); +} else { + $file_id = $admin->get_post('id'); +} + +// Get home folder not to show +$home_folders = get_home_folders(); + +// Figure out what folder name the temp id is +if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) { + // Loop through the files and dirs an add to list + while (false !== ($file = readdir($handle))) { + if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') { + if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) { + if(!isset($home_folders[$directory.'/'.$file])) { + $DIR[] = $file; + } + } else { + $FILE[] = $file; + } + } + } + $temp_id = 0; + if(isset($DIR)) { + foreach($DIR AS $name) { + $temp_id++; + if($file_id == $temp_id) { + $rename_file = $name; + $type = 'folder'; + } + } + } + if(isset($FILE)) { + foreach($FILE AS $name) { + $temp_id++; + if($file_id == $temp_id) { + $rename_file = $name; + $type = 'file'; + } + } + } +} + +if(!isset($rename_file)) { + $admin->print_error($MESSAGE['MEDIA']['FILE_NOT_FOUND'], "browse.php?dir=$directory", false); +} + +// Check if they entered a new name +if(media_filename($admin->get_post('name')) == "") { + $admin->print_error($MESSAGE['MEDIA']['BLANK_NAME'], "rename.php?dir=$directory&id=$file_id", false); +} else { + $old_name = $admin->get_post('old_name'); + $new_name = media_filename($admin->get_post('name')); +} + +// Check if they entered an extension +if($type == 'file') { + if(media_filename($admin->get_post('extension')) == "") { + $admin->print_error($MESSAGE['MEDIA']['BLANK_EXTENSION'], "rename.php?dir=$directory&id=$file_id", false); + } else { + $extension = media_filename($admin->get_post('extension')); + } +} else { + $extension = ''; +} + +// Join new name and extension +$name = $new_name.$extension; + +// Check if the name contains .. +if(strstr($name, '..')) { + $admin->print_error($MESSAGE['MEDIA']['NAME_DOT_DOT_SLASH'], "rename.php?dir=$directory&id=$file_id", false); +} + +// Check if the name is index.php +if($name == 'index.php') { + $admin->print_error($MESSAGE['MEDIA']['NAME_INDEX_PHP'], "rename.php?dir=$directory&id=$file_id", false); +} + +// Check that the name still has a value +if($name == '') { + $admin->print_error($MESSAGE['MEDIA']['BLANK_NAME'], "rename.php?dir=$directory&id=$file_id", false); +} + +// Check for potentially malicious files and append 'txt' to their name +foreach($file_extensions as $file_ext) { + $file_ext_len=strlen($file_ext); + if (substr($name,-$file_ext_len)==$file_ext) { + $name.='.txt'; + } +} + + +// Check if we should overwrite or not +if($admin->get_post('overwrite') != 'yes' AND file_exists(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name) == true) { + if($type == 'folder') { + $admin->print_error($MESSAGE['MEDIA']['DIR_EXISTS'], "rename.php?dir=$directory&id=$file_id", false); + } else { + $admin->print_error($MESSAGE['MEDIA']['FILE_EXISTS'], "rename.php?dir=$directory&id=$file_id", false); + } +} + +// Try and rename the file/folder +if(rename(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$rename_file, WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name)) { + $admin->print_success($MESSAGE['MEDIA']['RENAMED'], "browse.php?dir=$directory"); +} else { + $admin->print_error($MESSAGE['MEDIA']['CANNOT_RENAME'], "rename.php?dir=$directory&id=$file_id", false); +} +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/media/rename2.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: tags/2.6.0/wb/admin/media/browse.php =================================================================== --- tags/2.6.0/wb/admin/media/browse.php (nonexistent) +++ tags/2.6.0/wb/admin/media/browse.php (revision 260) @@ -0,0 +1,179 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Create admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Media', 'media', false); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Setup template object +$template = new Template(ADMIN_PATH.'/media'); +$template->set_file('page', 'browse.html'); +$template->set_block('page', 'main_block', 'main'); + +// Get the current dir +$directory = $admin->get_get('dir'); +if($directory == '/') { + $directory = ''; +} + +// Check to see if it contains ../ +if(strstr($directory, '../')) { + $admin->print_header(); + $admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH']); +} + +if(!file_exists(WB_PATH.'/media'.$directory)) { + $admin->print_header(); + $admin->print_error($MESSAGE['MEDIA']['DIR_DOES_NOT_EXIST']); +} + +// Check to see if the user wanted to go up a directory into the parent folder +if($admin->get_get('up') == 1) { + $parent_directory = dirname($directory); + header("Location: browse.php?dir=$parent_directory"); +} + +// Workout the parent dir link +$parent_dir_link = ADMIN_URL.'/media/browse.php?dir='.$directory.'&up=1'; +// Workout if the up arrow should be shown +if($directory == '') { + $display_up_arrow = 'hide'; +} else { + $display_up_arrow = ''; +} + +// Insert values +$template->set_var(array( + 'CURRENT_DIR' => $directory, + 'PARENT_DIR_LINK' => $parent_dir_link, + 'DISPLAY_UP_ARROW' => $display_up_arrow + ) + ); + +// Get home folder not to show +$home_folders = get_home_folders(); + +// Generate list +$template->set_block('main_block', 'list_block', 'list'); +if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) { + // Loop through the files and dirs an add to list + while(false !== ($file = readdir($handle))) { + if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') { + if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) { + if(!isset($home_folders[$directory.'/'.$file])) { + $DIR[] = $file; + } + } else { + $FILE[] = $file; + } + } + } + // Now parse these values to the template + $temp_id = 0; + $row_bg_color = 'EEEEEE'; + if(isset($DIR)) { + foreach($DIR AS $name) { + $link_name = str_replace(' ', '%20', $name); + $temp_id++; + $template->set_var(array( + 'NAME' => $name, + 'NAME_SLASHED' => addslashes($name), + 'TEMP_ID' => $temp_id, + 'LINK' => "browse.php?dir=$directory/$link_name", + 'LINK_TARGET' => '', + 'ROW_BG_COLOR' => $row_bg_color, + 'FILETYPE_ICON' => ADMIN_URL.'/images/folder_16.png' + ) + ); + $template->parse('list', 'list_block', true); + // Code to alternate row colors + if($row_bg_color == 'DEDEDE') { + $row_bg_color = 'EEEEEE'; + } else { + $row_bg_color = 'DEDEDE'; + } + } + } + if(isset($FILE)) { + foreach($FILE AS $name) { + $temp_id++; + $template->set_var(array( + 'NAME' => $name, + 'NAME_SLASHED' => addslashes($name), + 'TEMP_ID' => $temp_id, + 'LINK' => WB_URL.MEDIA_DIRECTORY.$directory.'/'.$name, + 'LINK_TARGET' => '_blank', + 'ROW_BG_COLOR' => $row_bg_color, + 'FILETYPE_ICON' => ADMIN_URL.'/images/blank.gif' + ) + ); + $template->parse('list', 'list_block', true); + // Code to alternate row colors + if($row_bg_color == 'DEDEDE') { + $row_bg_color = 'EEEEEE'; + } else { + $row_bg_color = 'DEDEDE'; + } + } + } +} + +// If no files are in the media folder say so +if($temp_id == 0) { + $template->set_var('DISPLAY_LIST_TABLE', 'hide'); +} else { + $template->set_var('DISPLAY_NONE_FOUND', 'hide'); +} + +// Insert permissions values +if($admin->get_permission('media_rename') != true) { + $template->set_var('DISPLAY_RENAME', 'hide'); +} +if($admin->get_permission('media_delete') != true) { + $template->set_var('DISPLAY_DELETE', 'hide'); +} + +// Insert language text and messages +$template->set_var(array( + 'MEDIA_DIRECTORY' => MEDIA_DIRECTORY, + 'TEXT_CURRENT_FOLDER' => $TEXT['CURRENT_FOLDER'], + 'TEXT_RELOAD' => $TEXT['RELOAD'], + 'TEXT_RENAME' => $TEXT['RENAME'], + 'TEXT_DELETE' => $TEXT['DELETE'], + 'TEXT_UP' => $TEXT['UP'], + 'NONE_FOUND' => $MESSAGE['MEDIA']['NONE_FOUND'], + 'CONFIRM_DELETE' => $MESSAGE['MEDIA']['CONFIRM_DELETE'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/media/browse.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: tags/2.6.0/wb/admin/media/delete.php =================================================================== --- tags/2.6.0/wb/admin/media/delete.php (nonexistent) +++ tags/2.6.0/wb/admin/media/delete.php (revision 260) @@ -0,0 +1,120 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Create admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Media', 'media_delete', false); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Include the stripped-down header file +require('basic_header.html'); + +// Get the current dir +$directory = $admin->get_get('dir'); +if($directory == '/') { + $directory = ''; +} +// Check to see if it contains ../ +if(strstr($directory, '../')) { + $admin->print_header(); + $admin->print_error($MESSAGE['MEDIA']['DOT_DOT_SLASH']); +} + +// Get the temp id +if(!is_numeric($admin->get_get('id'))) { + header("Location: browse.php?dir=$directory"); +} else { + $file_id = $admin->get_get('id'); +} + +// Get home folder not to show +$home_folders = get_home_folders(); + +// Figure out what folder name the temp id is +if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) { + // Loop through the files and dirs an add to list + while (false !== ($file = readdir($handle))) { + if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') { + if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) { + if(!isset($home_folders[$directory.'/'.$file])) { + $DIR[] = $file; + } + } else { + $FILE[] = $file; + } + } + } + $temp_id = 0; + if(isset($DIR)) { + foreach($DIR AS $name) { + $temp_id++; + if(!isset($delete_file) AND $file_id == $temp_id) { + $delete_file = $name; + $type = 'folder'; + } + } + } + if(isset($FILE)) { + foreach($FILE AS $name) { + $temp_id++; + if(!isset($delete_file) AND $file_id == $temp_id) { + $delete_file = $name; + $type = 'file'; + } + } + } +} + +// Check to see if we could find an id to match +if(!isset($delete_file)) { + $admin->print_error($MESSAGE['MEDIA']['FILE_NOT_FOUND'], "browse.php?dir=$directory", false); +} +$relative_path = WB_PATH.MEDIA_DIRECTORY.'/'.$directory.'/'.$delete_file; +// Check if the file/folder exists +if(!file_exists($relative_path)) { + $admin->print_error($MESSAGE['MEDIA']['FILE_NOT_FOUND'], "browse.php?dir=$directory", false); +} + +// Find out whether its a file or folder +if($type == 'folder') { + // Try and delete the directory + if(rm_full_dir($relative_path)) { + $admin->print_success($MESSAGE['MEDIA']['DELETED_DIR'], "browse.php?dir=$directory"); + } else { + $admin->print_error($MESSAGE['MEDIA']['CANNOT_DELETE_DIR'], "browse.php?dir=$directory", false); + } +} else { + // Try and delete the file + if(unlink($relative_path)) { + $admin->print_success($MESSAGE['MEDIA']['DELETED_FILE'], "browse.php?dir=$directory"); + } else { + $admin->print_error($MESSAGE['MEDIA']['CANNOT_DELETE_FILE'], "browse.php?dir=$directory", false); + } +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/media/delete.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: tags/2.6.0/wb/admin/media/rename.php =================================================================== --- tags/2.6.0/wb/admin/media/rename.php (nonexistent) +++ tags/2.6.0/wb/admin/media/rename.php (revision 260) @@ -0,0 +1,139 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Create admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Media', 'media_rename', false); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Include the basic header file +require(ADMIN_PATH.'/media/basic_header.html'); + +// Get the current dir +$directory = $admin->get_get('dir'); +if($directory == '/') { + $directory = ''; +} +// Check to see if it contains ../ +if(strstr($directory, '../')) { + $admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH'], "rename.php?dir=$directory&id=$file_id", false); +} + +// Get the temp id +if(!is_numeric($admin->get_get('id'))) { + header("Location: browse.php?dir=$directory"); +} else { + $file_id = $admin->get_get('id'); +} + +// Get home folder not to show +$home_folders = get_home_folders(); + +// Figure out what folder name the temp id is +if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) { + // Loop through the files and dirs an add to list + while (false !== ($file = readdir($handle))) { + if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') { + if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) { + if(!isset($home_folders[$directory.'/'.$file])) { + $DIR[] = $file; + } + } else { + $FILE[] = $file; + } + } + } + $temp_id = 0; + if(isset($DIR)) { + foreach($DIR AS $name) { + $temp_id++; + if($file_id == $temp_id) { + $rename_file = $name; + $type = 'folder'; + } + } + } + if(isset($FILE)) { + foreach($FILE AS $name) { + $temp_id++; + if($file_id == $temp_id) { + $rename_file = $name; + $type = 'file'; + } + } + } +} + +if(!isset($rename_file)) { + $admin->print_error($MESSAGE['MEDIA']['FILE_NOT_FOUND'], "browse.php?dir=$directory", false); +} + +// Setup template object +$template = new Template(ADMIN_PATH.'/media'); +$template->set_file('page', 'rename.html'); +$template->set_block('page', 'main_block', 'main'); +//echo WB_PATH.'/media/'.$directory.'/'.$rename_file; +if($type == 'folder') { + $template->set_var('DISPlAY_EXTENSION', 'hide'); + $extension = ''; +} else { + $template->set_var('DISPlAY_EXTENSION', ''); + $extension = strstr($rename_file, '.'); +} + +if($type == 'folder') { + $type = $TEXT['FOLDER']; +} else { + $type = $TEXT['FILE']; +} + +$template->set_var(array( + 'FILENAME' => $rename_file, + 'DIR' => $directory, + 'FILE_ID' => $file_id, + 'TYPE' => $type, + 'EXTENSION' => $extension + ) + ); + + +// Insert language text and messages +$template->set_var(array( + 'TEXT_TO' => $TEXT['TO'], + 'TEXT_RENAME' => $TEXT['RENAME'], + 'TEXT_CANCEL' => $TEXT['CANCEL'], + 'TEXT_UP' => $TEXT['UP'], + 'TEXT_OVERWRITE_EXISTING' => $TEXT['OVERWRITE_EXISTING'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/media/rename.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: tags/2.6.0/wb/admin/media/upload.php =================================================================== --- tags/2.6.0/wb/admin/media/upload.php (nonexistent) +++ tags/2.6.0/wb/admin/media/upload.php (revision 260) @@ -0,0 +1,109 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Target location +if(!isset($_POST['target']) OR $_POST['target'] == '') { + header("Location: index.php"); +} else { + $target = $_POST['target']; +} + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Media', 'media_upload'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Check to see if target contains ../ +if(strstr($target, '../')) { + $admin->print_error($MESSAGE['MEDIA']['TARGET_DOT_DOT_SLASH']); +} + +// Create relative path of the target location for the file +$relative = WB_PATH.$target.'/'; + +// Find out whether we should replace files or give an error +if($admin->get_post('overwrite') != '') { + $overwrite = true; +} else { + $overwrite = false; +} + +// Get list of file types to which we're supposed to append 'txt' +$get_result=$database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name='rename_files_on_upload' LIMIT 1"); +$file_extension_string=''; +if ($get_result->numRows()>0) { + $fetch_result=$get_result->fetchRow(); + $file_extension_string=$fetch_result['value']; +} +$file_extensions=explode(",",$file_extension_string); + + +// Loop through the files +$good_uploads = 0; +for($count = 1; $count <= 10; $count++) { + // If file was upload to tmp + if(isset($_FILES["file$count"]['name'])) { + // Remove bad characters + $filename = media_filename($_FILES["file$count"]['name']); + // Check if there is still a filename left + if($filename != '') { + // Check for potentially malicious files and append 'txt' to their name + foreach($file_extensions as $file_ext) { + $file_ext_len=strlen($file_ext); + if (substr($filename,-$file_ext_len)==$file_ext) { + $filename.='.txt'; + } + } + // Move to relative path (in media folder) + if(file_exists($relative.$filename) AND $overwrite == true) { + if(move_uploaded_file($_FILES["file$count"]['tmp_name'], $relative.$filename)) { + $good_uploads++; + // Chmod the uploaded file + change_mode($relative.$filename, 'file'); + } + } elseif(!file_exists($relative.$filename)) { + if(move_uploaded_file($_FILES["file$count"]['tmp_name'], $relative.$filename)) { + $good_uploads++; + // Chmod the uploaded file + change_mode($relative.$filename); + } + } + } + } +} + +if($good_uploads == 1) { + $admin->print_success($good_uploads.$MESSAGE['MEDIA']['SINGLE_UPLOADED']); +} else { + $admin->print_success($good_uploads.$MESSAGE['MEDIA']['UPLOADED']); +} + +// Print admin +$admin->print_footer(); + +?> Property changes on: tags/2.6.0/wb/admin/media/upload.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: tags/2.6.0/wb/admin/media/browse.html =================================================================== --- tags/2.6.0/wb/admin/media/browse.html (nonexistent) +++ tags/2.6.0/wb/admin/media/browse.html (revision 260) @@ -0,0 +1,108 @@ + + + + +Browse Media + + + + + + + + + + + + + + + + +
+ + ^ + + + + {TEXT_UP} + + + {TEXT_CURRENT_FOLDER}: {MEDIA_DIRECTORY}{CURRENT_DIR} + + + + + + + {TEXT_RELOAD} + +
+ + + + + + + + + + +
+ + + + + + {NAME} + + + + {TEXT_RENAME} + + + + {TEXT_DELETE} + +
+ + +
+    +{NONE_FOUND} + + + + + + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/media/browse.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/media/create.php =================================================================== --- tags/2.6.0/wb/admin/media/create.php (nonexistent) +++ tags/2.6.0/wb/admin/media/create.php (revision 260) @@ -0,0 +1,86 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Get dir name and target location +if(!isset($_POST['name']) OR $_POST['name'] == '') { + header("Location: index.php"); +} else { + $name = $_POST['name']; +} +if(!isset($_POST['target']) OR $_POST['target'] == '') { + header("Location: index.php"); +} else { + $target = $_POST['target']; +} + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Media', 'media_create'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Check to see if name or target contains ../ +if(strstr($name, '../')) { + $admin->print_error($MESSAGE['MEDIA']['NAME_DOT_DOT_SLASH']); +} +if(strstr($target, '../')) { + $admin->print_error($MESSAGE['MEDIA']['TARGET_DOT_DOT_SLASH']); +} + +// Remove bad characters +$name = media_filename($name); + +// Create relative path of the new dir name +$relative = WB_PATH.$target.'/'.$name; + +// Check to see if the folder already exists +if(file_exists($relative)) { + $admin->print_error($MESSAGE['MEDIA']['DIR_EXISTS']); +} + +// Try and make the dir +if(make_dir($relative)) { + // Create index.php file + $content = ''. +""; + $handle = fopen($relative.'/index.php', 'w'); + fwrite($handle, $content); + fclose($handle); + change_mode($relative.'/index.php', 'file'); + $admin->print_success($MESSAGE['MEDIA']['DIR_MADE']); +} else { + $admin->print_error($MESSAGE['MEDIA']['DIR_NOT_MADE']); +} + +// Print admin +$admin->print_footer(); + +?> Property changes on: tags/2.6.0/wb/admin/media/create.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: tags/2.6.0/wb/admin/media/index.php =================================================================== --- tags/2.6.0/wb/admin/media/index.php (nonexistent) +++ tags/2.6.0/wb/admin/media/index.php (revision 260) @@ -0,0 +1,85 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Media', 'media'); + +// Setup template object +$template = new Template(ADMIN_PATH.'/media'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Get home folder not to show +$home_folders = get_home_folders(); + +// Insert values +$template->set_block('main_block', 'dir_list_block', 'dir_list'); +foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name) { + if(!isset($home_folders[str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)])) { + $template->set_var('NAME', str_replace(WB_PATH, '', $name)); + $template->parse('dir_list', 'dir_list_block', true); + } +} + +// Insert permissions values +if($admin->get_permission('media_create') != true) { + $template->set_var('DISPLAY_CREATE', 'hide'); +} +if($admin->get_permission('media_upload') != true) { + $template->set_var('DISPLAY_UPLOAD', 'hide'); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_BROWSE_MEDIA' => $HEADING['BROWSE_MEDIA'], + 'HEADING_CREATE_FOLDER' => $HEADING['CREATE_FOLDER'], + 'HEADING_UPLOAD_FILES' => $HEADING['UPLOAD_FILES'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'MEDIA_DIRECTORY' => MEDIA_DIRECTORY, + 'TEXT_NAME' => $TEXT['TITLE'], + 'TEXT_TARGET_FOLDER' => $TEXT['TARGET_FOLDER'], + 'TEXT_OVERWRITE_EXISTING' => $TEXT['OVERWRITE_EXISTING'], + 'TEXT_FILES' => $TEXT['FILES'], + 'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'], + 'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/media/index.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: tags/2.6.0/wb/admin/users/user_form.html =================================================================== --- tags/2.6.0/wb/admin/users/user_form.html (nonexistent) +++ tags/2.6.0/wb/admin/users/user_form.html (revision 260) @@ -0,0 +1,100 @@ + + + + + + +

{HEADING_MODIFY_USER}

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{TEXT_USERNAME}: + +
{TEXT_PASSWORD}: + +
{TEXT_RETYPE_PASSWORD}: + +
  + {CHANGING_PASSWORD} +
{TEXT_DISPLAY_NAME}: + +
{TEXT_EMAIL}: + +
{TEXT_HOME_FOLDER}: + +
{TEXT_GROUP}: + +
  + + + + +
  + + +
+ +
+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/users/user_form.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/users/add.php =================================================================== --- tags/2.6.0/wb/admin/users/add.php (nonexistent) +++ tags/2.6.0/wb/admin/users/add.php (revision 260) @@ -0,0 +1,98 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Access', 'users_add'); + +// Create new database object +$database = new database(); + +// Get details entered +$group_id = $admin->get_post('group'); +$active = $_POST['active'][0]; +$username_fieldname = $admin->get_post('username_fieldname'); +$username = strtolower($admin->get_post($username_fieldname)); +$password = $admin->get_post('password'); +$password2 = $admin->get_post('password2'); +$display_name = $admin->get_post('display_name'); +$email = $admin->get_post('email'); +$home_folder = $admin->get_post('home_folder'); + +// Create a javascript back link +$js_back = "javascript: history.go(-1);"; + +// Check values +if($group_id == "") { + $admin->print_error($MESSAGE['USERS']['NO_GROUP'], $js_back); +} +if(strlen($username) < 2) { + $admin->print_error($MESSAGE['USERS']['USERNAME_TOO_SHORT'], $js_back); +} +if(strlen($password) < 2) { + $admin->print_error($MESSAGE['USERS']['PASSWORD_TOO_SHORT'], $js_back); +} +if($password != $password2) { + $admin->print_error($MESSAGE['USERS']['PASSWORD_MISMATCH'], $js_back); +} +if($email != "") { + if($admin->validate_email($email) == false) { + $admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back); + } +} + +// Check if username already exists +$results = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE username = '$username'"); +if($results->numRows() > 0) { + $admin->print_error($MESSAGE['USERS']['USERNAME_TAKEN'], $js_back); +} + +// Check if the email already exists +$results = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE email = '".$admin->add_slashes($_POST['email'])."'"); +if($results->numRows() > 0) { + if(isset($MESSAGE['USERS']['EMAIL_TAKEN'])) { + $admin->print_error($MESSAGE['USERS']['EMAIL_TAKEN'], $js_back); + } else { + $admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back); + } +} + +// MD5 supplied password +$md5_password = md5($password); + +// Inser the user into the database +$query = "INSERT INTO ".TABLE_PREFIX."users (group_id,active,username,password,display_name,home_folder,email,timezone) VALUES ('$group_id', '$active', '$username','$md5_password','$display_name','$home_folder','$email','-72000')"; +$database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($MESSAGE['USERS']['ADDED']); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/users/add.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: tags/2.6.0/wb/admin/users/save.php =================================================================== --- tags/2.6.0/wb/admin/users/save.php (nonexistent) +++ tags/2.6.0/wb/admin/users/save.php (revision 260) @@ -0,0 +1,101 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Access', 'users_modify'); + +// Create new database object +$database = new database(); + +// Check if user id is a valid number and doesnt equal 1 +if(!isset($_POST['user_id']) OR !is_numeric($_POST['user_id']) OR $_POST['user_id'] == 1) { + header("Location: index.php"); +} else { + $user_id = $_POST['user_id']; +} + +// Gather details entered +$group_id = $admin->get_post('group'); +$active = $_POST['active'][0]; +$username_fieldname = $admin->get_post('username_fieldname'); +$username = strtolower($admin->get_post($username_fieldname)); +$password = $admin->get_post('password'); +$password2 = $admin->get_post('password2'); +$display_name = $admin->get_post('display_name'); +$email = $admin->get_post('email'); +$home_folder = $admin->get_post('home_folder'); + +// Create a javascript back link +$js_back = "javascript: history.go(-1);"; + +// Check values +if($group_id == "") { + $admin->print_error($MESSAGE['USERS']['NO_GROUP'], $js_back); +} +if(strlen($username) < 2) { + $admin->print_error($MESSAGE['USERS']['USERNAME_TOO_SHORT'], $js_back); +} +if($password != "") { + if(strlen($password) < 2) { + $admin->print_error($MESSAGE['USERS']['PASSWORD_TOO_SHORT'], $js_back); + } + if($password != $password2) { + $admin->print_error($MESSAGE['USERS']['PASSWORD_MISMATCH'], $js_back); + } +} +if($email != "") { + if($admin->validate_email($email) == false) { + $admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back); + } +} + +// Prevent from renaming user to "admin" +if($username != 'admin') { + $username_code = ", username = '$username'"; +} else { + $username_code = ''; +} + +// Update the database +if($password == "") { + $query = "UPDATE ".TABLE_PREFIX."users SET group_id = '$group_id', active = '$active'$username_code, display_name = '$display_name', home_folder = '$home_folder', email = '$email' WHERE user_id = '$user_id'"; +} else { + // MD5 supplied password + $md5_password = md5($password); + $query = "UPDATE ".TABLE_PREFIX."users SET group_id = '$group_id', active = '$active'$username_code, display_name = '$display_name', home_folder = '$home_folder', email = '$email', password = '$md5_password' WHERE user_id = '$user_id'"; +} +$database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($MESSAGE['USERS']['SAVED']); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/users/save.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: tags/2.6.0/wb/admin/users/users.php =================================================================== --- tags/2.6.0/wb/admin/users/users.php (nonexistent) +++ tags/2.6.0/wb/admin/users/users.php (revision 260) @@ -0,0 +1,175 @@ + + Copyright (C) 2004-2005, 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 config file and admin class file +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); + +// Create new database object +$database = new database(); + +if(!isset($_POST['action']) OR $_POST['action'] != "modify" AND $_POST['action'] != "delete") { + header("Location: index.php"); +} + +// Check if user id is a valid number and doesnt equal 1 +if(!isset($_POST['user_id']) OR !is_numeric($_POST['user_id']) OR $_POST['user_id'] == 1) { + header("Location: index.php"); +} + +if($_POST['action'] == 'modify') { + // Print header + $admin = new admin('Access', 'users_modify'); + // Get existing values + $results = $database->query("SELECT * FROM ".TABLE_PREFIX."users WHERE user_id = '".$_POST['user_id']."'"); + $user = $results->fetchRow(); + + // Setup template object + $template = new Template(ADMIN_PATH.'/users'); + $template->set_file('page', 'user_form.html'); + $template->set_block('page', 'main_block', 'main'); + $template->set_var( array( + 'ACTION_URL' => ADMIN_URL.'/users/save.php', + 'SUBMIT_TITLE' => $TEXT['SAVE'], + 'USER_ID' => $user['user_id'], + 'USERNAME' => $user['username'], + 'DISPLAY_NAME' => $user['display_name'], + 'EMAIL' => $user['email'] + ) + ); + if($user['active'] == 1) { + $template->set_var('ACTIVE_CHECKED', ' checked'); + } else { + $template->set_var('DISABLED_CHECKED', ' checked'); + } + // Add groups to list + $template->set_block('main_block', 'group_list_block', 'group_list'); + $results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'"); + if($results->numRows() > 0) { + $template->set_var('ID', ''); + $template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...'); + $template->set_var('SELECTED', ''); + $template->parse('group_list', 'group_list_block', true); + while($group = $results->fetchRow()) { + $template->set_var('ID', $group['group_id']); + $template->set_var('NAME', $group['name']); + if($user['group_id'] == $group['group_id']) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('group_list', 'group_list_block', true); + } + } + // Only allow the user to add a user to the Administrators group if they belong to it + if($admin->get_group_id() == 1) { + $template->set_var('ID', '1'); + $template->set_var('NAME', $admin->get_group_name()); + if($user['group_id'] == $admin->get_group_id()) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('group_list', 'group_list_block', true); + } else { + if($results->numRows() == 0) { + $template->set_var('ID', ''); + $template->set_var('NAME', $TEXT['NONE_FOUND']); + $template->set_var('SELECTED', 'selected'); + $template->parse('group_list', 'group_list_block', true); + } + } + + // Generate username field name + $username_fieldname = 'username_'; + $salt = "abchefghjkmnpqrstuvwxyz0123456789"; + srand((double)microtime()*1000000); + $i = 0; + while ($i <= 7) { + $num = rand() % 33; + $tmp = substr($salt, $num, 1); + $username_fieldname = $username_fieldname . $tmp; + $i++; + } + + // Work-out if home folder should be shown + if(!HOME_FOLDERS) { + $template->set_var('DISPLAY_HOME_FOLDERS', 'none'); + } + + // Include the WB functions file + require_once(WB_PATH.'/framework/functions.php'); + + // Add media folders to home folder list + $template->set_block('main_block', 'folder_list_block', 'folder_list'); + foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name) { + $template->set_var('NAME', str_replace(WB_PATH, '', $name)); + $template->set_var('FOLDER', str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)); + if($user['home_folder'] == str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)) { + $template->set_var('SELECTED', ' selected'); + } else { + $template->set_var('SELECTED', ' '); + } + $template->parse('folder_list', 'folder_list_block', true); + } + + // Insert language text and messages + $template->set_var(array( + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_ACTIVE' => $TEXT['ACTIVE'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'], + 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_GROUP' => $TEXT['GROUP'], + 'TEXT_NONE' => $TEXT['NONE'], + 'TEXT_HOME_FOLDER' => $TEXT['HOME_FOLDER'], + 'USERNAME_FIELDNAME' => $username_fieldname, + 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'] + ) + ); + + // Parse template object + $template->parse('main', 'main_block', false); + $template->pparse('output', 'page'); +} elseif($_POST['action'] == 'delete') { + // Print header + $admin = new admin('Access', 'users_delete'); + // Delete the user + $database->query("DELETE FROM ".TABLE_PREFIX."users WHERE user_id = '".$_POST['user_id']."' LIMIT 1"); + if($database->is_error()) { + $admin->print_error($database->get_error()); + } else { + $admin->print_success($MESSAGE['USERS']['DELETED']); + } +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/users/users.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: tags/2.6.0/wb/admin/users/index.php =================================================================== --- tags/2.6.0/wb/admin/users/index.php (nonexistent) +++ tags/2.6.0/wb/admin/users/index.php (revision 260) @@ -0,0 +1,190 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Access', 'users'); + +// Create new template object for the modify/remove menu +$template = new Template(ADMIN_PATH.'/users'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('ADMIN_URL', ADMIN_URL); + +// Get existing value from database +$database = new database(); +$query = "SELECT user_id, username, display_name FROM ".TABLE_PREFIX."users WHERE user_id != '1' ORDER BY username"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error(), 'index.php'); +} + +// Insert values into the modify/remove menu +$template->set_block('main_block', 'list_block', 'list'); +if($results->numRows() > 0) { + // Insert first value to say please select + $template->set_var('VALUE', ''); + $template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...'); + $template->parse('list', 'list_block', true); + // Loop through users + while($user = $results->fetchRow()) { + $template->set_var('VALUE', $user['user_id']); + $template->set_var('NAME', $user['display_name'].' ('.$user['username'].')'); + $template->parse('list', 'list_block', true); + } +} else { + // Insert single value to say no users were found + $template->set_var('NAME', $TEXT['NONE_FOUND']); + $template->parse('list', 'list_block', true); +} + +// Insert permissions values +if($admin->get_permission('users_add') != true) { + $template->set_var('DISPLAY_ADD', 'hide'); +} +if($admin->get_permission('users_modify') != true) { + $template->set_var('DISPLAY_MODIFY', 'hide'); +} +if($admin->get_permission('users_delete') != true) { + $template->set_var('DISPLAY_DELETE', 'hide'); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_MODIFY_DELETE_USER' => $HEADING['MODIFY_DELETE_USER'], + 'HEADING_ADD_USER' => $HEADING['ADD_USER'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_DELETE' => $TEXT['DELETE'], + 'TEXT_MANAGE_GROUPS' => $TEXT['MANAGE_GROUPS'], + 'CONFIRM_DELETE' => $MESSAGE['USERS']['CONFIRM_DELETE'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Setup template for add user form +$template = new Template(ADMIN_PATH.'/users'); +$template->set_file('page', 'user_form.html'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('DISPLAY_EXTRA', 'none'); +$template->set_var('ACTIVE_CHECKED', 'checked'); +$template->set_var('ACTION_URL', ADMIN_URL.'/users/add.php'); +$template->set_var('SUBMIT_TITLE', $TEXT['ADD']); + +// Add groups to list +$template->set_block('main_block', 'group_list_block', 'group_list'); +$results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'"); +if($results->numRows() > 0) { + $template->set_var('ID', ''); + $template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...'); + $template->set_var('SELECTED', 'selected'); + $template->parse('group_list', 'group_list_block', true); + while($group = $results->fetchRow()) { + $template->set_var('ID', $group['group_id']); + $template->set_var('NAME', $group['name']); + $template->set_var('SELECTED', ''); + $template->parse('group_list', 'group_list_block', true); + } +} +// Only allow the user to add a user to the Administrators group if they belong to it +if($admin->get_group_id() == 1) { + $template->set_var('ID', '1'); + $template->set_var('NAME', $admin->get_group_name()); + $template->set_var('SELECTED', ''); + $template->parse('group_list', 'group_list_block', true); +} else { + if($results->numRows() == 0) { + $template->set_var('ID', ''); + $template->set_var('NAME', $TEXT['NONE_FOUND']); + $template->parse('group_list', 'group_list_block', true); + } +} + +// Insert permissions values +if($admin->get_permission('users_add') != true) { + $template->set_var('DISPLAY_ADD', 'hide'); +} + +// Generate username field name +$username_fieldname = 'username_'; +$salt = "abchefghjkmnpqrstuvwxyz0123456789"; +srand((double)microtime()*1000000); +$i = 0; +while ($i <= 7) { + $num = rand() % 33; + $tmp = substr($salt, $num, 1); + $username_fieldname = $username_fieldname . $tmp; + $i++; +} + +// Work-out if home folder should be shown +if(!HOME_FOLDERS) { + $template->set_var('DISPLAY_HOME_FOLDERS', 'none'); +} + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Add media folders to home folder list +$template->set_block('main_block', 'folder_list_block', 'folder_list'); +foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name) { + $template->set_var('NAME', str_replace(WB_PATH, '', $name)); + $template->set_var('FOLDER', str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)); + $template->set_var('SELECTED', ' '); + $template->parse('folder_list', 'folder_list_block', true); +} + +// Insert language text and messages +$template->set_var(array( + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_ACTIVE' => $TEXT['ACTIVE'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'], + 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_GROUP' => $TEXT['GROUP'], + 'TEXT_NONE' => $TEXT['NONE'], + 'TEXT_HOME_FOLDER' => $TEXT['HOME_FOLDER'], + 'USERNAME_FIELDNAME' => $username_fieldname, + 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'] + ) + ); + +// Parse template for add user form +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/users/index.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: tags/2.6.0/wb/admin/users/template.html =================================================================== --- tags/2.6.0/wb/admin/users/template.html (nonexistent) +++ tags/2.6.0/wb/admin/users/template.html (revision 260) @@ -0,0 +1,35 @@ + + +
+ + + + + + + + +
+

{HEADING_MODIFY_DELETE_USER}

+ 		+ {TEXT_MANAGE_GROUPS} +
+ +
+ + + + + + +
+ +
+ +

{HEADING_ADD_USER}

+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/users/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/templates/install.php =================================================================== --- tags/2.6.0/wb/admin/templates/install.php (nonexistent) +++ tags/2.6.0/wb/admin/templates/install.php (revision 260) @@ -0,0 +1,131 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Check if user uploaded a file +if(!isset($_FILES['userfile'])) { + header("Location: index.php"); +} + +// Setup admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'templates_install'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Set temp vars +$temp_dir = WB_PATH.'/temp/'; +$temp_file = $temp_dir . $_FILES['userfile']['name']; +$temp_unzip = WB_PATH.'/temp/unzip/'; + +// Try to upload the file to the temp dir +if(!move_uploaded_file($_FILES['userfile']['tmp_name'], $temp_file)) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UPLOAD']); +} + +// Include the PclZip class file (thanks to +require_once(WB_PATH.'/include/pclzip/pclzip.lib.php'); + +// Remove any vars with name "template_directory" +unset($template_directory); + +// Setup the PclZip object +$archive = new PclZip($temp_file); +// Unzip the files to the temp unzip folder +$list = $archive->extract(PCLZIP_OPT_PATH, $temp_unzip); +// Include the templates info file +require($temp_unzip.'info.php'); +// Delete the temp unzip directory +rm_full_dir($temp_unzip); + +// Check if the file is valid +if(!isset($template_directory)) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC']['INVALID']); +} + +// Check if this module is already installed +// and compare versions if so +$new_template_version=$template_version; +if(is_dir(WB_PATH.'/templates/'.$template_directory)) { + if(file_exists(WB_PATH.'/templates/'.$template_directory.'/info.php')) { + require(WB_PATH.'/templates/'.$template_directory.'/info.php'); + // Version to be installed is older than currently installed version + if ($template_version>$new_template_version) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC']['ALREADY_INSTALLED']); + } + } + $success_message=$MESSAGE['GENERIC']['UPGRADED']; +} else { + $success_message=$MESSAGE['GENERIC']['INSTALLED']; +} + +// Check if template dir is writable +if(!is_writable(WB_PATH.'/templates/')) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['TEMPLATES']['BAD_PERMISSIONS']); +} + +// Set template dir +$template_dir = WB_PATH.'/templates/'.$template_directory; + +// Make sure the template dir exists, and chmod if needed +if(!file_exists($template_dir)) { + make_dir($template_dir); +} else { + change_mode($template_dir, 'dir'); +} + +// Unzip template to the template dir +$list = $archive->extract(PCLZIP_OPT_PATH, $template_dir); +if(!$list) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNZIP']); +} + +// Delete the temp zip file +if(file_exists($temp_file)) { unlink($temp_file); } + +// Chmod all the uploaded files +$dir = dir($template_dir); +while(false !== $entry = $dir->read()) { + // Skip pointers + if(substr($entry, 0, 1) != '.' AND $entry != '.svn' AND !is_dir($template_dir.'/'.$entry)) { + // Chmod file + change_mode($template_dir.'/'.$entry); + } +} + +// Load template info into DB +load_template($template_dir); + +// Print success message +$admin->print_success($success_message); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/templates/install.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: tags/2.6.0/wb/admin/templates/index.php =================================================================== --- tags/2.6.0/wb/admin/templates/index.php (nonexistent) +++ tags/2.6.0/wb/admin/templates/index.php (revision 260) @@ -0,0 +1,80 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'templates'); + +// Setup template object +$template = new Template(ADMIN_PATH.'/templates'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values into template list +$template->set_block('main_block', 'template_list_block', 'template_list'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); +if($result->numRows() > 0) { + while($addon = $result->fetchRow()) { + $template->set_var('VALUE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $template->parse('template_list', 'template_list_block', true); + } +} + +// Insert permissions values +if($admin->get_permission('templates_install') != true) { + $template->set_var('DISPLAY_INSTALL', 'hide'); +} +if($admin->get_permission('templates_uninstall') != true) { + $template->set_var('DISPLAY_UNINSTALL', 'hide'); +} +if($admin->get_permission('templates_view') != true) { + $template->set_var('DISPLAY_LIST', 'hide'); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_INSTALL_TEMPLATE' => $HEADING['INSTALL_TEMPLATE'], + 'HEADING_UNINSTALL_TEMPLATE' => $HEADING['UNINSTALL_TEMPLATE'], + 'HEADING_TEMPLATE_DETAILS' => $HEADING['TEMPLATE_DETAILS'] + ) + ); +// 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'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/templates/index.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: tags/2.6.0/wb/admin/templates/details.php =================================================================== --- tags/2.6.0/wb/admin/templates/details.php (nonexistent) +++ tags/2.6.0/wb/admin/templates/details.php (revision 260) @@ -0,0 +1,87 @@ + + Copyright (C) 2004-2005, 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 the config file +require('../../config.php'); + +// Get template name +if(!isset($_POST['file']) OR $_POST['file'] == "") { + header("Location: index.php"); +} else { + $file = $_POST['file']; +} + +// Check if the template exists +if(!file_exists(WB_PATH.'/templates/'.$file)) { + header("Location: index.php"); +} + +// Print admin header +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'templates_view'); + +// Setup template object +$template = new Template(ADMIN_PATH.'/templates'); +$template->set_file('page', 'details.html'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND directory = '$file'"); +if($result->numRows() > 0) { + $row = $result->fetchRow(); +} + +$template->set_var(array( + 'NAME' => $row['name'], + 'AUTHOR' => $row['author'], + 'DESCRIPTION' => $row['description'], + 'VERSION' => $row['version'], + 'DESIGNED_FOR' => $row['platform'] + ) + ); + +// Insert language headings +$template->set_var(array( + 'HEADING_TEMPLATE_DETAILS' => $HEADING['TEMPLATE_DETAILS'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_NAME' => $TEXT['NAME'], + 'TEXT_AUTHOR' => $TEXT['AUTHOR'], + 'TEXT_VERSION' => $TEXT['VERSION'], + 'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'], + 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/templates/details.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: tags/2.6.0/wb/admin/templates/uninstall.php =================================================================== --- tags/2.6.0/wb/admin/templates/uninstall.php (nonexistent) +++ tags/2.6.0/wb/admin/templates/uninstall.php (revision 260) @@ -0,0 +1,79 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Check if user selected template +if(!isset($_POST['file']) OR $_POST['file'] == "") { + header("Location: index.php"); +} else { + $file = $_POST['file']; +} + +// Setup admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'templates_uninstall'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Check if the template exists +if(!is_dir(WB_PATH.'/templates/'.$file)) { + $admin->print_error($MESSAGE['GENERIC']['NOT_INSTALLED']); +} + +// Check if the template is in use +if($_POST['file'] == DEFAULT_TEMPLATE) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE']); +} else { + $query_templates = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE template = '".$admin->add_slashes($_POST['file'])."' LIMIT 1"); + if($query_templates->numRows() > 0) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE']); + } +} + +// Check if we have permissions on the directory +if(!is_writable(WB_PATH.'/templates/'.$file)) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL'].WB_PATH.'/templates/'.$file); +} + +// Try to delete the template dir +if(!rm_full_dir(WB_PATH.'/templates/'.$file)) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL']); +} else { + // Remove entry from DB + $database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE directory = '".$file."' AND type = 'template'"); +} + +// Update pages that use this template with default template +$database = new database(); +$database->query("UPDATE ".TABLE_PREFIX."pages SET template = '".DEFAULT_TEMPLATE."' WHERE template = '$file'"); + +// Print success message +$admin->print_success($MESSAGE['GENERIC']['UNINSTALLED']); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/templates/uninstall.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: tags/2.6.0/wb/admin/templates/details.html =================================================================== --- tags/2.6.0/wb/admin/templates/details.html (nonexistent) +++ tags/2.6.0/wb/admin/templates/details.html (revision 260) @@ -0,0 +1,32 @@ + + +

{HEADING_TEMPLATE_DETAILS}

+ + + + + + + + + + + + + + + + + + + + + + +
{TEXT_NAME}:{NAME}
{TEXT_AUTHOR}:{AUTHOR}
{TEXT_VERSION}:{VERSION}
{TEXT_DESIGNED_FOR}:Website Baker {DESIGNED_FOR}
{TEXT_DESCRIPTION}:{DESCRIPTION}
+ +
+ + + + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/templates/details.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/templates/template.html =================================================================== --- tags/2.6.0/wb/admin/templates/template.html (nonexistent) +++ tags/2.6.0/wb/admin/templates/template.html (revision 260) @@ -0,0 +1,73 @@ + + +{CHANGE_TEMPLATE_NOTICE}

+ +
+ +

{HEADING_INSTALL_TEMPLATE}

+ + + + + + +
+ + + + +
+ +
+ +
+ +
+ +

{HEADING_UNINSTALL_TEMPLATE}

+ + + + + + +
+ + + +
+ +
+ +
+ +
+ +

{HEADING_TEMPLATE_DETAILS}

+ + + + + + +
+ + + +
+ +
+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/templates/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/preferences/index.php =================================================================== --- tags/2.6.0/wb/admin/preferences/index.php (nonexistent) +++ tags/2.6.0/wb/admin/preferences/index.php (revision 260) @@ -0,0 +1,152 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Preferences'); + +// Create new template object for the preferences form +$template = new Template(ADMIN_PATH.'/preferences'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); + +// Get existing value from database +$database = new database(); +$query = "SELECT display_name,email FROM ".TABLE_PREFIX."users WHERE user_id = '".$admin->get_user_id()."'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error(), 'index.php'); +} +$details = $results->fetchRow(); + +// Insert values into form +$template->set_var('DISPLAY_NAME', $details['display_name']); +$template->set_var('EMAIL', $details['email']); + +// Insert language values +$template->set_block('main_block', 'language_list_block', 'language_list'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language'"); +if($result->numRows() > 0) { + while($addon = $result->fetchRow()) { + // Insert code and name + $template->set_var(array( + 'CODE' => $addon['directory'], + 'NAME' => $addon['name'] + )); + // Check if it is selected + if(LANGUAGE == $addon['directory']) { + $template->set_var('SELECTED', ' selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('language_list', 'language_list_block', true); + } +} + +// Insert default timezone values +require(ADMIN_PATH.'/interface/timezones.php'); +$template->set_block('main_block', 'timezone_list_block', 'timezone_list'); +foreach($TIMEZONES AS $hour_offset => $title) { + $template->set_var('VALUE', $hour_offset); + $template->set_var('NAME', $title); + if($admin->get_timezone() == $hour_offset*60*60) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('timezone_list', 'timezone_list_block', true); +} + +// Insert date format list +$user_time = true; +require(ADMIN_PATH.'/interface/date_formats.php'); +$template->set_block('main_block', 'date_format_list_block', 'date_format_list'); +foreach($DATE_FORMATS AS $format => $title) { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + if($format != 'system_default') { + $template->set_var('VALUE', $format); + } else { + $template->set_var('VALUE', ''); + } + $template->set_var('NAME', $title); + if(DATE_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) { + $template->set_var('SELECTED', 'selected'); + } elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('date_format_list', 'date_format_list_block', true); +} + +// Insert time format list +require(ADMIN_PATH.'/interface/time_formats.php'); +$template->set_block('main_block', 'time_format_list_block', 'time_format_list'); +foreach($TIME_FORMATS AS $format => $title) { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + if($format != 'system_default') { + $template->set_var('VALUE', $format); + } else { + $template->set_var('VALUE', ''); + } + $template->set_var('NAME', $title); + if(TIME_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { + $template->set_var('SELECTED', 'selected'); + } elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { + $template->set_var('SELECTED', 'selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('time_format_list', 'time_format_list_block', true); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_MY_SETTINGS' => $HEADING['MY_SETTINGS'], + 'HEADING_MY_EMAIL' => $HEADING['MY_EMAIL'], + 'HEADING_MY_PASSWORD' => $HEADING['MY_PASSWORD'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'TEXT_TIMEZONE' => $TEXT['TIMEZONE'], + 'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'], + 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'], + 'TEXT_CURRENT_PASSWORD' => $TEXT['CURRENT_PASSWORD'], + 'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'], + 'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'] + ) + ); + +// Parse template for preferences form +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/preferences/index.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: tags/2.6.0/wb/admin/preferences/details.php =================================================================== --- tags/2.6.0/wb/admin/preferences/details.php (nonexistent) +++ tags/2.6.0/wb/admin/preferences/details.php (revision 260) @@ -0,0 +1,70 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Preferences'); + +// Get entered values +$display_name = $admin->add_slashes($admin->get_post('display_name')); +$language = $admin->get_post('language'); +$timezone = $admin->get_post('timezone')*60*60; +$date_format = $admin->get_post('date_format'); +$time_format = $admin->get_post('time_format'); + +// Update the database +$database = new database(); +$query = "UPDATE ".TABLE_PREFIX."users SET display_name = '$display_name', language = '$language', timezone = '$timezone', date_format = '$date_format', time_format = '$time_format' WHERE user_id = '".$admin->get_user_id()."'"; +$database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($MESSAGE['PREFERENCES']['DETAILS_SAVED']); + $_SESSION['DISPLAY_NAME'] = $display_name; + $_SESSION['LANGUAGE'] = $language; + $_SESSION['TIMEZONE'] = $timezone; + // Update date format + if($date_format != '') { + $_SESSION['DATE_FORMAT'] = $date_format; + if(isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) { unset($_SESSION['USE_DEFAULT_DATE_FORMAT']); } + } else { + $_SESSION['USE_DEFAULT_DATE_FORMAT'] = true; + if(isset($_SESSION['DATE_FORMAT'])) { unset($_SESSION['DATE_FORMAT']); } + } + // Update time format + if($time_format != '') { + $_SESSION['TIME_FORMAT'] = $time_format; + if(isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { unset($_SESSION['USE_DEFAULT_TIME_FORMAT']); } + } else { + $_SESSION['USE_DEFAULT_TIME_FORMAT'] = true; + if(isset($_SESSION['TIME_FORMAT'])) { unset($_SESSION['TIME_FORMAT']); } + } +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/preferences/details.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: tags/2.6.0/wb/admin/preferences/password.php =================================================================== --- tags/2.6.0/wb/admin/preferences/password.php (nonexistent) +++ tags/2.6.0/wb/admin/preferences/password.php (revision 260) @@ -0,0 +1,71 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Preferences'); + +// Get entered values +$current_password = $admin->get_post('current_password'); +$new_password = $admin->get_post('new_password'); +$new_password2 = $admin->get_post('new_password2'); + +// Create a javascript back link +$js_back = "javascript: history.go(-1);"; + +// Get existing password +$database = new database(); +$query = "SELECT user_id FROM ".TABLE_PREFIX."users WHERE user_id = '".$admin->get_user_id()."' AND password = '".md5($current_password)."'"; +$results = $database->query($query); + +// Validate values +if($results->numRows() == 0) { + $admin->print_error($MESSAGE['PREFERENCES']['CURRENT_PASSWORD_INCORRECT']); +} +if(strlen($new_password) < 3) { + $admin->print_error($MESSAGE['USERS']['PASSWORD_TOO_SHORT'], $js_back); +} +if($new_password != $new_password2) { + $admin->print_error($MESSAGE['USERS']['PASSWORD_MISMATCH'], $js_back); +} + +// MD5 the password +$md5_password = md5($new_password); + +// Update the database +$database = new database(); +$query = "UPDATE ".TABLE_PREFIX."users SET password = '$md5_password' WHERE user_id = '".$admin->get_user_id()."'"; +$database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error); +} else { + $admin->print_success($MESSAGE['PREFERENCES']['PASSWORD_CHANGED']); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/preferences/password.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: tags/2.6.0/wb/admin/preferences/email.php =================================================================== --- tags/2.6.0/wb/admin/preferences/email.php (nonexistent) +++ tags/2.6.0/wb/admin/preferences/email.php (revision 260) @@ -0,0 +1,65 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Preferences'); + +// Get entered values +$password = $admin->get_post('current_password'); +$email = $admin->get_post('email'); + +// Create a javascript back link +$js_back = "javascript: history.go(-1);"; + +// Get password +$database = new database(); +$query = "SELECT user_id FROM ".TABLE_PREFIX."users WHERE user_id = '".$admin->get_user_id()."' AND password = '".md5($password)."'"; +$results = $database->query($query); + +// Validate values +if($results->numRows() == 0) { + $admin->print_error($MESSAGE['PREFERENCES']['CURRENT_PASSWORD_INCORRECT']); +} +if(!$admin->validate_email($email)) { + $admin->print_error($MESSAGE['USERS']['INVALID_EMAIL']); +} + +// Update the database +$database = new database(); +$query = "UPDATE ".TABLE_PREFIX."users SET email = '$email' WHERE user_id = '".$admin->get_user_id()."'"; +$database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error); +} else { + $admin->print_success($MESSAGE['PREFERENCES']['EMAIL_UPDATED']); + $_SESSION['EMAIL'] = $email; +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/preferences/email.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: tags/2.6.0/wb/admin/preferences/template.html =================================================================== --- tags/2.6.0/wb/admin/preferences/template.html (nonexistent) +++ tags/2.6.0/wb/admin/preferences/template.html (revision 260) @@ -0,0 +1,134 @@ + + +
+ +

{HEADING_MY_SETTINGS}

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
{TEXT_DISPLAY_NAME}: + + +
{TEXT_LANGUAGE}: + +
{TEXT_TIMEZONE}: + +
{TEXT_DATE_FORMAT}: + +
{TEXT_TIME_FORMAT}: + +
  + + +
+ +
+ +
+ +

{HEADING_MY_EMAIL}

+ + + + + + + + + + + + + + +
{TEXT_CURRENT_PASSWORD}: + +
{TEXT_EMAIL}: + +
  + + +
+ +
+ +
+ +

{HEADING_MY_PASSWORD}

+ + + + + + + + + + + + + + + + + + + +
{TEXT_CURRENT_PASSWORD}: + +
{TEXT_NEW_PASSWORD}: + +
{TEXT_RETYPE_NEW_PASSWORD}: + +
  + + +
+ +
+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/preferences/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/languages/index.php =================================================================== --- tags/2.6.0/wb/admin/languages/index.php (nonexistent) +++ tags/2.6.0/wb/admin/languages/index.php (revision 260) @@ -0,0 +1,81 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'languages'); + +// Setup template object +$template = new Template(ADMIN_PATH.'/languages'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values into language list +$template->set_block('main_block', 'language_list_block', 'language_list'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language'"); +if($result->numRows() > 0) { + while($addon = $result->fetchRow()) { + $template->set_var('VALUE', $addon['directory']); + $template->set_var('NAME', $addon['name'].' ('.$addon['directory'].')'); + $template->parse('language_list', 'language_list_block', true); + } +} + +// Insert permissions values +if($admin->get_permission('languages_install') != true) { + $template->set_var('DISPLAY_INSTALL', 'hide'); +} +if($admin->get_permission('languages_uninstall') != true) { + $template->set_var('DISPLAY_UNINSTALL', 'hide'); +} +if($admin->get_permission('languages_view') != true) { + $template->set_var('DISPLAY_LIST', 'hide'); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_INSTALL_LANGUAGE' => $HEADING['INSTALL_LANGUAGE'], + 'HEADING_UNINSTALL_LANGUAGE' => $HEADING['UNINSTALL_LANGUAGE'], + 'HEADING_LANGUAGE_DETAILS' => $HEADING['LANGUAGE_DETAILS'] + ) + ); +// 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'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/languages/index.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: tags/2.6.0/wb/admin/languages/uninstall.php =================================================================== --- tags/2.6.0/wb/admin/languages/uninstall.php (nonexistent) +++ tags/2.6.0/wb/admin/languages/uninstall.php (revision 260) @@ -0,0 +1,68 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Check if user selected language +if(!isset($_POST['code']) OR $_POST['code'] == "") { + header("Location: index.php"); +} + +// Setup admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'languages_uninstall'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Check if the language exists +if(!file_exists(WB_PATH.'/languages/'.$_POST['code'].'.php')) { + $admin->print_error($MESSAGE['GENERIC']['NOT_INSTALLED']); +} + +// Check if the language is in use +if($_POST['code'] == DEFAULT_LANGUAGE OR $_POST['code'] == LANGUAGE) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE']); +} else { + $query_users = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE language = '".$admin->add_slashes($_POST['code'])."' LIMIT 1"); + if($query_users->numRows() > 0) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE']); + } +} + +// Try to delete the language code +if(!unlink(WB_PATH.'/languages/'.$_POST['code'].'.php')) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL']); +} else { + // Remove entry from DB + $database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE directory = '".$_POST['code']."' AND type = 'language'"); +} + +// Print success message +$admin->print_success($MESSAGE['GENERIC']['UNINSTALLED']); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/languages/uninstall.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: tags/2.6.0/wb/admin/languages/install.php =================================================================== --- tags/2.6.0/wb/admin/languages/install.php (nonexistent) +++ tags/2.6.0/wb/admin/languages/install.php (revision 260) @@ -0,0 +1,111 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Check if user uploaded a file +if(!isset($_FILES['userfile'])) { + header("Location: index.php"); +} + +// Setup admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'languages_install'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Create temp string +$temp_string = ''; +$salt = "abchefghjkmnpqrstuvwxyz0123456789"; +srand((double)microtime()*1000000); +$i = 0; +while ($i <= 7) { + $num = rand() % 33; + $tmp = substr($salt, $num, 1); + $temp_string = $temp_string . $tmp; + $i++; +} + +// Set temp vars +$temp_dir = WB_PATH.'/temp/'; +$temp_file = $temp_dir . 'language'.$temp_string; + +// Check if language dir is writable +if(!is_writable(WB_PATH.'/languages/')) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC']['BAD_PERMISSIONS']); +} + +// Try to upload the file to the temp dir +if(!move_uploaded_file($_FILES['userfile']['tmp_name'], $temp_file)) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UPLOAD']); +} + +// Remove any vars with name "language_code" +unset($language_code); + +// Read the temp file and look for a language code +require($temp_file); +$new_language_version=$language_version; + +// Check if the file is valid +if(!isset($language_code)) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + // Restore to correct language + require(WB_PATH.'/languages/'.LANGUAGE.'.php'); + $admin->print_error($MESSAGE['GENERIC']['INVALID']); +} + +// Set destination for language file +$language_file = WB_PATH.'/languages/'.$language_code.'.php'; + +// Move to new location +if (file_exists($language_file)) { + require($language_file); + if ($language_version>$new_language_version) { + $admin->print_error($MESSAGE['GENERIC']['ALREADY_INSTALLED']); + } + unlink($language_file); +} + +rename($temp_file, $language_file); + +// Chmod the file +change_mode($language_file, 'file'); + +// Load language info into DB +load_language($language_file); + +// Restore to correct language +require(WB_PATH.'/languages/'.LANGUAGE.'.php'); + +// Print success message +$admin->print_success($MESSAGE['GENERIC']['INSTALLED']); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/languages/install.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: tags/2.6.0/wb/admin/languages/details.html =================================================================== --- tags/2.6.0/wb/admin/languages/details.html (nonexistent) +++ tags/2.6.0/wb/admin/languages/details.html (revision 260) @@ -0,0 +1,32 @@ + + +

{HEADING_LANGUAGE_DETAILS}

+ + + + + + + + + + + + + + + + + + + + + + +
{TEXT_NAME}:{NAME}
{TEXT_CODE}:{CODE}
{TEXT_AUTHOR}:{AUTHOR}
{TEXT_VERSION}:{VERSION}
{TEXT_DESIGNED_FOR}:Website Baker {DESIGNED_FOR}
+ +
+ + + + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/languages/details.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/languages/details.php =================================================================== --- tags/2.6.0/wb/admin/languages/details.php (nonexistent) +++ tags/2.6.0/wb/admin/languages/details.php (revision 260) @@ -0,0 +1,87 @@ + + Copyright (C) 2004-2005, 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 the config code +require('../../config.php'); + +// Get language name +if(!isset($_POST['code']) OR $_POST['code'] == "") { + header("Location: index.php"); +} else { + $code = $_POST['code']; +} + +// Check if the language exists +if(!file_exists(WB_PATH.'/languages/'.$code.'.php')) { + header("Location: index.php"); +} + +// Print admin header +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'languages_view'); + +// Setup language object +$template = new Template(ADMIN_PATH.'/languages'); +$template->set_file('page', 'details.html'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values +require(WB_PATH.'/languages/'.$code.'.php'); +$template->set_var(array( + 'CODE' => $language_code, + 'NAME' => $language_name, + 'AUTHOR' => $language_author, + 'VERSION' => $language_version, + 'DESIGNED_FOR' => $language_designed_for + ) + ); + +// Restore language to original code +require(WB_PATH.'/languages/'.LANGUAGE.'.php'); + +// Insert language headings +$template->set_var(array( + 'HEADING_LANGUAGE_DETAILS' => $HEADING['LANGUAGE_DETAILS'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_CODE' => $TEXT['CODE'], + 'TEXT_NAME' => $TEXT['NAME'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_AUTHOR' => $TEXT['AUTHOR'], + 'TEXT_VERSION' => $TEXT['VERSION'], + 'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'] + ) + ); + +// Parse language object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/languages/details.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: tags/2.6.0/wb/admin/languages/template.html =================================================================== --- tags/2.6.0/wb/admin/languages/template.html (nonexistent) +++ tags/2.6.0/wb/admin/languages/template.html (revision 260) @@ -0,0 +1,71 @@ + + +
+ +

{HEADING_INSTALL_LANGUAGE}

+ + + + + + +
+ + + + +
+ +
+ +
+ +
+ +

{HEADING_UNINSTALL_LANGUAGE}

+ + + + + + +
+ + + +
+ +
+ +
+ +
+ +

{HEADING_LANGUAGE_DETAILS}

+ + + + + + +
+ + + +
+ +
+ + Property changes on: tags/2.6.0/wb/admin/languages/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/modules/index.php =================================================================== --- tags/2.6.0/wb/admin/modules/index.php (nonexistent) +++ tags/2.6.0/wb/admin/modules/index.php (revision 260) @@ -0,0 +1,81 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'modules'); + +// Setup template object +$template = new Template(ADMIN_PATH.'/modules'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values into module list +$template->set_block('main_block', 'module_list_block', 'module_list'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module'"); +if($result->numRows() > 0) { + while ($addon = $result->fetchRow()) { + $template->set_var('VALUE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $template->parse('module_list', 'module_list_block', true); + } +} + +// Insert permissions values +if($admin->get_permission('modules_install') != true) { + $template->set_var('DISPLAY_INSTALL', 'hide'); +} +if($admin->get_permission('modules_uninstall') != true) { + $template->set_var('DISPLAY_UNINSTALL', 'hide'); +} +if($admin->get_permission('modules_view') != true) { + $template->set_var('DISPLAY_LIST', 'hide'); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_INSTALL_MODULE' => $HEADING['INSTALL_MODULE'], + 'HEADING_UNINSTALL_MODULE' => $HEADING['UNINSTALL_MODULE'], + 'HEADING_MODULE_DETAILS' => $HEADING['MODULE_DETAILS'] + ) + ); +// 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'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/modules/index.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: tags/2.6.0/wb/admin/modules/details.php =================================================================== --- tags/2.6.0/wb/admin/modules/details.php (nonexistent) +++ tags/2.6.0/wb/admin/modules/details.php (revision 260) @@ -0,0 +1,111 @@ + + Copyright (C) 2004-2005, 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 the config file +require('../../config.php'); + +// Get module name +if(!isset($_POST['file']) OR $_POST['file'] == "") { + header("Location: index.php"); +} else { + $file = $_POST['file']; +} + +// Check if the module exists +if(!file_exists(WB_PATH.'/modules/'.$file)) { + header("Location: index.php"); +} + +// Print admin header +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'modules_view'); + +// Setup module object +$template = new Template(ADMIN_PATH.'/modules'); +$template->set_file('page', 'details.html'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND directory = '$file'"); +if($result->numRows() > 0) { + $module = $result->fetchRow(); +} + +$template->set_var(array( + 'NAME' => $module['name'], + 'AUTHOR' => $module['author'], + 'DESCRIPTION' => $module['description'], + 'VERSION' => $module['version'], + 'DESIGNED_FOR' => $module['platform'] + ) + ); + +switch ($module['function']) { + case NULL: + $type_name = $TEXT['UNKNOWN']; + break; + case 'page': + $type_name = $TEXT['PAGE']; + break; + case 'wysiwyg': + $type_name = $TEXT['WYSIWYG_EDITOR']; + break; + case 'tool': + $type_name = $TEXT['ADMINISTRATION_TOOL']; + break; + case 'admin': + $type_name = $TEXT['ADMIN']; + break; + case 'administration': + $type_name = $TEXT['ADMINISTRATION']; + break; + $type_name = $TEXT['unknown']; +} +$template->set_var('TYPE', $type_name); + +// Insert language headings +$template->set_var(array( + 'HEADING_MODULE_DETAILS' => $HEADING['MODULE_DETAILS'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_NAME' => $TEXT['NAME'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_AUTHOR' => $TEXT['AUTHOR'], + 'TEXT_VERSION' => $TEXT['VERSION'], + 'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'], + 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'] + ) + ); + +// Parse module object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/modules/details.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: tags/2.6.0/wb/admin/modules/uninstall.php =================================================================== --- tags/2.6.0/wb/admin/modules/uninstall.php (nonexistent) +++ tags/2.6.0/wb/admin/modules/uninstall.php (revision 260) @@ -0,0 +1,78 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Check if user selected module +if(!isset($_POST['file']) OR $_POST['file'] == "") { + header("Location: index.php"); +} else { + $file = $_POST['file']; +} + +// Setup admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'modules_uninstall'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Check if the module exists +if(!is_dir(WB_PATH.'/modules/'.$file)) { + $admin->print_error($MESSAGE['MODULES']['NOT_INSTALLED']); +} + +// Check if the module is in use +$query_modules = $database->query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE module = '".$admin->add_slashes($_POST['file'])."' LIMIT 1"); +if($query_modules->numRows() > 0) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE']); +} + +// Check if we have permissions on the directory +if(!is_writable(WB_PATH.'/modules/'.$file)) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL']); +} + +$database->query("DELETE FROM ".TABLE_PREFIX."modules WHERE directory = '$file'"); + +// Run the modules uninstall script if there is one +if(file_exists(WB_PATH.'/modules/'.$file.'/uninstall.php')) { + require(WB_PATH.'/modules/'.$file.'/uninstall.php'); +} + +// Try to delete the module dir +if(!rm_full_dir(WB_PATH.'/modules/'.$file)) { + $admin->print_error($MESSAGE['MODULES']['CANNOT_UNINSTALL']); +} else { + // Remove entry from DB + $database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE directory = '".$file."' AND type = 'module'"); +} + +// Print success message +$admin->print_success($MESSAGE['GENERIC']['UNINSTALLED']); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/modules/uninstall.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: tags/2.6.0/wb/admin/modules/install.php =================================================================== --- tags/2.6.0/wb/admin/modules/install.php (nonexistent) +++ tags/2.6.0/wb/admin/modules/install.php (revision 260) @@ -0,0 +1,134 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Check if user uploaded a file +if(!isset($_FILES['userfile'])) { + header("Location: index.php"); +} + +// Setup admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'modules_install'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Set temp vars +$temp_dir = WB_PATH.'/temp/'; +$temp_file = $temp_dir . $_FILES['userfile']['name']; +$temp_unzip = WB_PATH.'/temp/unzip/'; + +// Try to upload the file to the temp dir +if(!move_uploaded_file($_FILES['userfile']['tmp_name'], $temp_file)) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UPLOAD']); +} + +// Include the PclZip class file (thanks to +require_once(WB_PATH.'/include/pclzip/pclzip.lib.php'); + +// Remove any vars with name "module_directory" +unset($module_directory); + +// Setup the PclZip object +$archive = new PclZip($temp_file); +// Unzip the files to the temp unzip folder +$list = $archive->extract(PCLZIP_OPT_PATH, $temp_unzip); +// Include the modules info file +require($temp_unzip.'info.php'); +// Delete the temp unzip directory +rm_full_dir($temp_unzip); + +// Check if the file is valid +if(!isset($module_directory)) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC']['INVALID']); +} + +// Check if this module is already installed +// and compare versions if so +$new_module_version=$module_version; +$action="install"; +if(is_dir(WB_PATH.'/modules/'.$module_directory)) { + if(file_exists(WB_PATH.'/modules/'.$module_directory.'/info.php')) { + require(WB_PATH.'/modules/'.$module_directory.'/info.php'); + // Version to be installed is older than currently installed version + if ($module_version>$new_module_version) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC']['ALREADY_INSTALLED']); + } + $action="upgrade"; + } +} + +// Check if module dir is writable +if(!is_writable(WB_PATH.'/modules/')) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC']['BAD_PERMISSIONS']); +} + +// Set module directory +$module_dir = WB_PATH.'/modules/'.$module_directory; + +// Make sure the module dir exists, and chmod if needed +make_dir($module_dir); + +// Unzip module to the module dir +$list = $archive->extract(PCLZIP_OPT_PATH, $module_dir); +if(!$list) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNZIP']); +} + +// Delete the temp zip file +if(file_exists($temp_file)) { unlink($temp_file); } + +// Chmod all the uploaded files +$dir = dir($module_dir); +while (false !== $entry = $dir->read()) { + // Skip pointers + if(substr($entry, 0, 1) != '.' AND $entry != '.svn' AND !is_dir($module_dir.'/'.$entry)) { + // Chmod file + change_mode($module_dir.'/'.$entry, 'file'); + } +} + +// Run the modules install // upgrade script if there is one +if(file_exists(WB_PATH.'/modules/'.$module_directory.'/'.$action.'.php')) { + require(WB_PATH.'/modules/'.$module_directory.'/'.$action.'.php'); +} + +// Print success message +if ($action=="install") { + // Load module info into DB + load_module(WB_PATH.'/modules/'.$module_directory, false); + $admin->print_success($MESSAGE['GENERIC']['INSTALLED']); +} else if ($action=="upgrade") { + $admin->print_success($MESSAGE['GENERIC']['UPGRADED']); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/modules/install.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: tags/2.6.0/wb/admin/modules/details.html =================================================================== --- tags/2.6.0/wb/admin/modules/details.html (nonexistent) +++ tags/2.6.0/wb/admin/modules/details.html (revision 260) @@ -0,0 +1,36 @@ + + +

{HEADING_MODULE_DETAILS}

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
{TEXT_NAME}:{NAME}
{TEXT_TYPE}:{TYPE}
{TEXT_AUTHOR}:{AUTHOR}
{TEXT_VERSION}:{VERSION}
{TEXT_DESIGNED_FOR}:Website Baker {DESIGNED_FOR}
{TEXT_DESCRIPTION}:{DESCRIPTION}
+ +
+ + + + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/modules/details.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/modules/template.html =================================================================== --- tags/2.6.0/wb/admin/modules/template.html (nonexistent) +++ tags/2.6.0/wb/admin/modules/template.html (revision 260) @@ -0,0 +1,71 @@ + + +
+ +

{HEADING_INSTALL_MODULE}

+ + + + + + +
+ + + + +
+ +
+ +
+ +
+ +

{HEADING_UNINSTALL_MODULE}

+ + + + + + +
+ + + +
+ +
+ +
+ +
+ +

{HEADING_MODULE_DETAILS}

+ + + + + + +
+ + + +
+ +
+ + Property changes on: tags/2.6.0/wb/admin/modules/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/start/template.html =================================================================== --- tags/2.6.0/wb/admin/start/template.html (nonexistent) +++ tags/2.6.0/wb/admin/start/template.html (revision 260) @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + +
+ {WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME} +
+ {WARNING} +
+ + + + + + + + + +
+ + + + + {PAGES} +
+ {PAGES_OVERVIEW} +
+ + + + + + + + + +
+ + + + + {PREFERENCES} +
+ {PREFERENCES_OVERVIEW} +
+ + + + + + + + + +
+ + + + + {ACCESS} +
+ {ACCESS_OVERVIEW} +
+ + + + + + + + + +
+ + + + + {SETTINGS} +
+ {SETTINGS_OVERVIEW} +
+ + 		+   + + + + + + + + + + +
+ + + + + {MEDIA} +
+ {MEDIA_OVERVIEW} +
+ + + + + + + + + +
+ + + + + {HELP} +
+ {HELP_OVERVIEW} +
+ + + + + + + + + +
+ + + + + {ADDONS} +
+ {ADDONS_OVERVIEW} +
+ + + + + + + + + +
+ + + + + {VIEW} +
+ {VIEW_OVERVIEW} +
+ +
+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/start/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/start/index.php =================================================================== --- tags/2.6.0/wb/admin/start/index.php (nonexistent) +++ tags/2.6.0/wb/admin/start/index.php (revision 260) @@ -0,0 +1,134 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Start','start'); + +// Setup template object +$template = new Template(ADMIN_PATH.'/start'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values into the template object +$template->set_var(array( + 'WELCOME_MESSAGE' => $MESSAGE['START']['WELCOME_MESSAGE'], + 'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'], + 'DISPLAY_NAME' => $admin->get_display_name(), + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL + ) + ); + +// Insert permission values into the template object +if($admin->get_permission('pages') != true) { + $template->set_var('DISPLAY_PAGES', 'none'); +} +if($admin->get_permission('media') != true) { + $template->set_var('DISPLAY_MEDIA', 'none'); +} +if($admin->get_permission('addons') != true) { + $template->set_var('DISPLAY_ADDONS', 'none'); +} +if($admin->get_permission('access') != true) { + $template->set_var('DISPLAY_ACCESS', 'none'); +} +if($admin->get_permission('settings') != true) { + $template->set_var('DISPLAY_SETTINGS', 'none'); +} + +// Check if installation directory still exists +if(file_exists(WB_PATH.'/install/')) { + // Check if user is part of Adminstrators group + if($admin->get_group_id() == 1) { + $template->set_var('WARNING', $MESSAGE['START']['INSTALL_DIR_EXISTS']); + } else { + $template->set_var('DISPLAY_WARNING', 'none'); + } +} else { + $template->set_var('DISPLAY_WARNING', 'none'); +} + +// Insert "Add-ons" section overview (pretty complex compared to normal) +$addons_overview = $TEXT['MANAGE'].' '; +$addons_count = 0; +if($admin->get_permission('modules') == true) { + $addons_overview .= ''.$MENU['MODULES'].''; + $addons_count = 1; +} +if($admin->get_permission('templates') == true) { + if($addons_count == 1) { $addons_overview .= ', '; } + $addons_overview .= ''.$MENU['TEMPLATES'].''; + $addons_count = 1; +} +if($admin->get_permission('languages') == true) { + if($addons_count == 1) { $addons_overview .= ', '; } + $addons_overview .= ''.$MENU['LANGUAGES'].''; +} + +// Insert "Access" section overview (pretty complex compared to normal) +$access_overview = $TEXT['MANAGE'].' '; +$access_count = 0; +if($admin->get_permission('users') == true) { + $access_overview .= ''.$MENU['USERS'].''; + $access_count = 1; +} +if($admin->get_permission('groups') == true) { + if($access_count == 1) { $access_overview .= ', '; } + $access_overview .= ''.$MENU['GROUPS'].''; + $access_count = 1; +} + +// Insert section names and descriptions +$template->set_var(array( + 'HOME' => $MENU['START'], + 'PAGES' => $MENU['PAGES'], + 'MEDIA' => $MENU['MEDIA'], + 'ADDONS' => $MENU['ADDONS'], + 'ACCESS' => $MENU['ACCESS'], + 'PREFERENCES' => $MENU['PREFERENCES'], + 'SETTINGS' => $MENU['SETTINGS'], + 'HELP' => $MENU['HELP'], + 'VIEW' => $MENU['VIEW'], + 'HOME_OVERVIEW' => $OVERVIEW['START'], + 'PAGES_OVERVIEW' => $OVERVIEW['PAGES'], + 'MEDIA_OVERVIEW' => $OVERVIEW['MEDIA'], + 'ADDONS_OVERVIEW' => $addons_overview, + 'ACCESS_OVERVIEW' => $access_overview, + 'PREFERENCES_OVERVIEW' => $OVERVIEW['PREFERENCES'], + 'SETTINGS_OVERVIEW' => $OVERVIEW['SETTINGS'], + 'HELP_OVERVIEW' => $OVERVIEW['HELP'], + 'VIEW_OVERVIEW' => $OVERVIEW['VIEW'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/start/index.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: tags/2.6.0/wb/admin/logout/index.php =================================================================== --- tags/2.6.0/wb/admin/logout/index.php (nonexistent) +++ tags/2.6.0/wb/admin/logout/index.php (revision 260) @@ -0,0 +1,44 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require("../../config.php"); + +if(isset($_COOKIE['REMEMBER_KEY'])) { + setcookie('REMEMBER_KEY', '', time()+60*60*24*30, '/'); +} + +$_SESSION['USER_ID'] = null; +$_SESSION['GROUP_ID'] = null; +$_SESSION['USERNAME'] = null; +$_SESSION['PAGE_PERMISSIONS'] = null; +$_SESSION['SYSTEM_PERMISSIONS'] = null; +$_SESSION = array(); +session_unset(); +unset($_COOKIE[session_name()]); +session_destroy(); + +header("Location: ".ADMIN_URL."/login/index.php"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/logout/index.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: tags/2.6.0/wb/admin/index.php =================================================================== --- tags/2.6.0/wb/admin/index.php (nonexistent) +++ tags/2.6.0/wb/admin/index.php (revision 260) @@ -0,0 +1,38 @@ + + Copyright (C) 2004-2005, 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 config file +if(!defined('WB_URL')) { + require('../config.php'); +} + +// Check if the config file has been set-up +if(!defined('WB_PATH')) { + header("Location: ../install/index.php"); +} else { + header('Location: '.ADMIN_URL.'/start/index.php'); +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/index.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: tags/2.6.0/wb/admin/access/index.php =================================================================== --- tags/2.6.0/wb/admin/access/index.php (nonexistent) +++ tags/2.6.0/wb/admin/access/index.php (revision 260) @@ -0,0 +1,66 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Access', 'access'); + +// Setup template object +$template = new Template(ADMIN_PATH.'/access'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values into the template object +$template->set_var(array( + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL + ) + ); + +// Insert permission values into the template object +if($admin->get_permission('users') != true) { + $template->set_var('DISPLAY_USERS', 'none'); +} +if($admin->get_permission('groups') != true) { + $template->set_var('DISPLAY_GROUPS', 'none'); +} + +// Insert section names and descriptions +$template->set_var(array( + 'USERS' => $MENU['USERS'], + 'GROUPS' => $MENU['GROUPS'], + 'USERS_OVERVIEW' => $OVERVIEW['USERS'], + 'GROUPS_OVERVIEW' => $OVERVIEW['GROUPS'], + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/access/index.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: tags/2.6.0/wb/admin/access/template.html =================================================================== --- tags/2.6.0/wb/admin/access/template.html (nonexistent) +++ tags/2.6.0/wb/admin/access/template.html (revision 260) @@ -0,0 +1,86 @@ + + + + + + + + +
+ + + + + + + + + +
+ + + + + {USERS} +
+ {USERS_OVERVIEW} +
+ + + + + + + + + + +
+ + + + + {GROUPS} +
+ {GROUPS_OVERVIEW} +
+ +
+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/access/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/admin/images/modify_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/modify_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/hidden_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/hidden_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/minus_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/minus_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/visible_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/visible_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/none_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/none_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/blank.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/blank.gif ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/delete_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/delete_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/index.php =================================================================== --- tags/2.6.0/wb/admin/images/index.php (nonexistent) +++ tags/2.6.0/wb/admin/images/index.php (revision 260) @@ -0,0 +1,29 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +header('Location: '.ADMIN_URL.'/home/index.php'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/images/index.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: tags/2.6.0/wb/admin/images/deleted_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/deleted_16.png ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/reload_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/reload_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/down_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/down_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/view_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/view_16.png ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/private_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/private_16.png ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/folder_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/folder_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/keys_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/keys_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/up_folder_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/up_folder_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/templates.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/templates.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/groups.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/groups.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/media.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/media.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/pages.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/pages.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/settings.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/settings.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/access.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/access.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/preferences.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/preferences.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/users.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/users.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/languages.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/languages.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/addons.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/addons.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/help.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/help.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/modules.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/modules.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/icons/index.php =================================================================== --- tags/2.6.0/wb/admin/images/icons/index.php (nonexistent) +++ tags/2.6.0/wb/admin/images/icons/index.php (revision 260) @@ -0,0 +1,29 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../../config.php'); +header('Location: '.ADMIN_URL.'/home/index.php'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/images/icons/index.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: tags/2.6.0/wb/admin/images/icons/view.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/icons/view.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/restore_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/restore_16.png ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/plus_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/plus_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/images/up_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/admin/images/up_16.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/admin/addons/index.php =================================================================== --- tags/2.6.0/wb/admin/addons/index.php (nonexistent) +++ tags/2.6.0/wb/admin/addons/index.php (revision 260) @@ -0,0 +1,71 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'addons'); + +// Setup template object +$template = new Template(ADMIN_PATH.'/addons'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values into the template object +$template->set_var(array( + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL + ) + ); + +// Insert permission values into the template object +if($admin->get_permission('modules') != true) { + $template->set_var('DISPLAY_MODULES', 'none'); +} +if($admin->get_permission('templates') != true) { + $template->set_var('DISPLAY_TEMPLATES', 'none'); +} +if($admin->get_permission('languages') != true) { + $template->set_var('DISPLAY_LANGUAGES', 'none'); +} + +// Insert section names and descriptions +$template->set_var(array( + 'MODULES' => $MENU['MODULES'], + 'TEMPLATES' => $MENU['TEMPLATES'], + 'LANGUAGES' => $MENU['LANGUAGES'], + 'MODULES_OVERVIEW' => $OVERVIEW['MODULES'], + 'TEMPLATES_OVERVIEW' => $OVERVIEW['TEMPLATES'], + 'LANGUAGES_OVERVIEW' => $OVERVIEW['LANGUAGES'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/addons/index.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: tags/2.6.0/wb/admin/addons/template.html =================================================================== --- tags/2.6.0/wb/admin/addons/template.html (nonexistent) +++ tags/2.6.0/wb/admin/addons/template.html (revision 260) @@ -0,0 +1,105 @@ + + + + + + + + +
+ + + + + + + + + +
+ + + + + {MODULES} +
+ {MODULES_OVERVIEW} +
+ + + + + + + + + + +
+ + + + + {TEMPLATES} +
+ {TEMPLATES_OVERVIEW} +
+ + + + + + + + + + +
+ + + + + {LANGUAGES} +
+ {LANGUAGES_OVERVIEW} +
+ +
+ + \ No newline at end of file Property changes on: tags/2.6.0/wb/admin/addons/template.html ___________________________________________________________________ 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: tags/2.6.0/wb/install/save.php =================================================================== --- tags/2.6.0/wb/install/save.php (nonexistent) +++ tags/2.6.0/wb/install/save.php (revision 260) @@ -0,0 +1,654 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Start a session +if(!defined('SESSION_STARTED')) { + session_name('wb_session_id'); + session_start(); + define('SESSION_STARTED', true); +} + +// Function to set error +function set_error($message) { + global $_POST; + if(isset($message) AND $message != '') { + // Copy values entered into session so user doesn't have to re-enter everything + if(isset($_POST['website_title'])) { + $_SESSION['wb_url'] = $_POST['wb_url']; + $_SESSION['wb_path'] = $_POST['wb_path']; + $_SESSION['default_timezone'] = $_POST['default_timezone']; + if(!isset($_POST['operating_system'])) { + $_SESSION['operating_system'] = 'linux'; + } else { + $_SESSION['operating_system'] = $_POST['operating_system']; + } + if(!isset($_POST['world_writeable'])) { + $_SESSION['world_writeable'] = false; + } else { + $_SESSION['world_writeable'] = true; + } + $_SESSION['database_host'] = $_POST['database_host']; + $_SESSION['database_username'] = $_POST['database_username']; + $_SESSION['database_password'] = $_POST['database_password']; + $_SESSION['database_name'] = $_POST['database_name']; + $_SESSION['table_prefix'] = $_POST['table_prefix']; + if(!isset($_POST['install_tables'])) { + $_SESSION['install_tables'] = false; + } else { + $_SESSION['install_tables'] = true; + } + $_SESSION['website_title'] = $_POST['website_title']; + $_SESSION['admin_username'] = $_POST['admin_username']; + $_SESSION['admin_email'] = $_POST['admin_email']; + $_SESSION['admin_password'] = $_POST['admin_password']; + } + // Set the message + $_SESSION['message'] = $message; + // Specify that session support is enabled + $_SESSION['session_support'] = 'Enabled'; + // Redirect to first page again and exit + header('Location: index.php?sessions_checked=true'); + exit(); + } +} + +// Dummy class to allow modules' install scripts to call $admin->print_error +class admin_dummy +{ + var $error=''; + function print_error($message) + { + $this->error=$message; + } +} + +// Function to workout what the default permissions are for files created by the webserver +function default_file_mode($temp_dir) { + $v = explode(".",PHP_VERSION); + $v = $v[0].$v[1]; + if($v > 41 AND is_writable($temp_dir)) { + $filename = $temp_dir.'/test_permissions.txt'; + $handle = fopen($filename, 'w'); + fwrite($handle, 'This file is to get the default file permissions'); + fclose($handle); + $default_file_mode = '0'.substr(sprintf('%o', fileperms($filename)), -3); + unlink($filename); + } else { + $default_file_mode = '0777'; + } + return $default_file_mode; +} + +// Function to workout what the default permissions are for directories created by the webserver +function default_dir_mode($temp_dir) { + $v = explode(".",PHP_VERSION); + $v = $v[0].$v[1]; + if($v > 41 AND is_writable($temp_dir)) { + $dirname = $temp_dir.'/test_permissions/'; + mkdir($dirname); + $default_dir_mode = '0'.substr(sprintf('%o', fileperms($dirname)), -3); + rmdir($dirname); + } else { + $default_dir_mode = '0777'; + } + return $default_dir_mode; +} + +function add_slashes($input) { + if ( get_magic_quotes_gpc() || ( !is_string($input) ) ) { + return $input; + } + $output = addslashes($input); + return $output; + } + +// Begin check to see if form was even submitted +// Set error if no post vars found +if(!isset($_POST['website_title'])) { + set_error('Please fill-in the form below'); +} +// End check to see if form was even submitted + +// Begin path and timezone details code + +// Check if user has entered the installation url +if(!isset($_POST['wb_url']) OR $_POST['wb_url'] == '') { + set_error('Please enter an absolute URL'); +} else { + $wb_url = $_POST['wb_url']; +} +// Remove any slashes at the end of the URL +if(substr($wb_url, strlen($wb_url)-1, 1) == "/") { + $wb_url = substr($wb_url, 0, strlen($wb_url)-1); +} +if(substr($wb_url, strlen($wb_url)-1, 1) == "\\") { + $wb_url = substr($wb_url, 0, strlen($wb_url)-1); +} +if(substr($wb_url, strlen($wb_url)-1, 1) == "/") { + $wb_url = substr($wb_url, 0, strlen($wb_url)-1); +} +if(substr($wb_url, strlen($wb_url)-1, 1) == "\\") { + $wb_url = substr($wb_url, 0, strlen($wb_url)-1); +} +// Get the default time zone +if(!isset($_POST['default_timezone']) OR !is_numeric($_POST['default_timezone'])) { + set_error('Please select a valid default timezone'); +} else { + $default_timezone = $_POST['default_timezone']*60*60; +} +// End path and timezone details code + +// Begin operating system specific code +// Get operating system +if(!isset($_POST['operating_system']) OR $_POST['operating_system'] != 'linux' AND $_POST['operating_system'] != 'windows') { + set_error('Please select a valid operating system'); +} else { + $operating_system = $_POST['operating_system']; +} +// Work-out file permissions +if($operating_system == 'windows') { + $file_mode = '0777'; + $dir_mode = '0777'; +} elseif(isset($_POST['world_writeable']) AND $_POST['world_writeable'] == 'true') { + $file_mode = '0777'; + $dir_mode = '0777'; +} else { + $file_mode = default_file_mode('../temp'); + $dir_mode = default_dir_mode('../temp'); +} +// End operating system specific code + +// Begin database details code +// Check if user has entered a database host +if(!isset($_POST['database_host']) OR $_POST['database_host'] == '') { + set_error('Please enter a database host name'); +} else { + $database_host = $_POST['database_host']; +} +// Check if user has entered a database username +if(!isset($_POST['database_username']) OR $_POST['database_username'] == '') { + set_error('Please enter a database username'); +} else { + $database_username = $_POST['database_username']; +} +// Check if user has entered a database password +if(!isset($_POST['database_password'])) { + set_error('Please enter a database password'); +} else { + $database_password = $_POST['database_password']; +} +// Check if user has entered a database name +if(!isset($_POST['database_name']) OR $_POST['database_name'] == '') { + set_error('Please enter a database name'); +} else { + $database_name = $_POST['database_name']; +} +// Get table prefix +$table_prefix = $_POST['table_prefix']; +// Find out if the user wants to install tables and data +if(isset($_POST['install_tables']) AND $_POST['install_tables'] == 'true') { + $install_tables = true; +} else { + $install_tables = false; +} +// End database details code + +// Begin website title code +// Get website title +if(!isset($_POST['website_title']) OR $_POST['website_title'] == '') { + set_error('Please enter a website title'); +} else { + $website_title = add_slashes($_POST['website_title']); +} +// End website title code + +// Begin admin user details code +// Get admin username +if(!isset($_POST['admin_username']) OR $_POST['admin_username'] == '') { + set_error('Please enter a username for the Administrator account'); +} else { + $admin_username = $_POST['admin_username']; +} +// Get admin email and validate it +if(!isset($_POST['admin_email']) OR $_POST['admin_email'] == '') { + set_error('Please enter an email for the Administrator account'); +} else { + if(eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$", $_POST['admin_email'])) { + $admin_email = $_POST['admin_email']; + } else { + set_error('Please enter a valid email address for the Administrator account'); + } +} +// Get the two admin passwords entered, and check that they match +if(!isset($_POST['admin_password']) OR $_POST['admin_password'] == '') { + set_error('Please enter a password for the Administrator account'); +} else { + $admin_password = $_POST['admin_password']; +} +if(!isset($_POST['admin_repassword']) OR $_POST['admin_repassword'] == '') { + set_error('Please make sure you re-enter the password for the Administrator account'); +} else { + $admin_repassword = $_POST['admin_repassword']; +} +if($admin_password != $admin_repassword) { + set_error('Sorry, the two Administrator account passwords you entered do not match'); +} +// End admin user details code + +// Try and write settings to config file +$config_content = "" . +""; + +$config_filename = '../config.php'; + +// Check if the file exists and is writable first. +if(file_exists($config_filename) AND is_writable($config_filename)) { + if(!$handle = fopen($config_filename, 'w')) { + set_error("Cannot open the configuration file ($config_filename)"); + } else { + if (fwrite($handle, $config_content) === FALSE) { + set_error("Cannot write to the configuration file ($config_filename)"); + } + // Close file + fclose($handle); + } +} else { + set_error("The configuration file $config_filename is not writable. Change its permissions so it is, then re-run step 4."); +} + +// Define configuration vars +define('DB_TYPE', 'mysql'); +define('DB_HOST', $database_host); +define('DB_USERNAME', $database_username); +define('DB_PASSWORD', $database_password); +define('DB_NAME', $database_name); +define('TABLE_PREFIX', $table_prefix); +define('WB_PATH', str_replace(array('/install','\install'), '',dirname(__FILE__))); +define('WB_URL', $wb_url); +define('ADMIN_PATH', WB_PATH.'/admin'); +define('ADMIN_URL', $wb_url.'/admin'); + +// Check if the user has entered a correct path +if(!file_exists(WB_PATH.'/framework/class.admin.php')) { + set_error('It appears the Absolute path that you entered is incorrect'); +} + +// Try connecting to database +if(!mysql_connect(DB_HOST, DB_USERNAME, DB_PASSWORD)) { + set_error('Database host name, username and/or password incorrect. MySQL Error:
'.mysql_error()); +} + +// Try to create the database +mysql_query('CREATE DATABASE '.$database_name); + +// Close the mysql connection +mysql_close(); + +// Include WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Re-connect to the database, this time using in-build database class +require_once(WB_PATH.'/framework/class.login.php'); +$database=new database(); + +// Check if we should install tables +if($install_tables == true) { + + // Remove tables if they exist + + // Pages table + $pages = "DROP TABLE IF EXISTS `".TABLE_PREFIX."pages`"; + $database->query($pages); + // Sections table + $sections = "DROP TABLE IF EXISTS `".TABLE_PREFIX."sections`"; + $database->query($sections); + // Settings table + $settings = "DROP TABLE IF EXISTS `".TABLE_PREFIX."settings`"; + $database->query($settings); + // Users table + $users = "DROP TABLE IF EXISTS `".TABLE_PREFIX."users`"; + $database->query($users); + // Groups table + $groups = "DROP TABLE IF EXISTS `".TABLE_PREFIX."groups`"; + $database->query($groups); + // Search table + $search = "DROP TABLE IF EXISTS `".TABLE_PREFIX."search`"; + $database->query($search); + // Addons table + $addons = "DROP TABLE IF EXISTS `".TABLE_PREFIX."addons`"; + $database->query($addons); + + // Try installing tables + + // Pages table + $pages = 'CREATE TABLE `'.TABLE_PREFIX.'pages` ( `page_id` INT NOT NULL auto_increment,' + . ' `parent` INT NOT NULL ,' + . ' `root_parent` INT NOT NULL ,' + . ' `level` INT NOT NULL ,' + . ' `link` TEXT NOT NULL ,' + . ' `target` VARCHAR( 7 ) NOT NULL ,' + . ' `page_title` VARCHAR( 255 ) NOT NULL ,' + . ' `menu_title` VARCHAR( 255 ) NOT NULL ,' + . ' `description` TEXT NOT NULL ,' + . ' `keywords` TEXT NOT NULL ,' + . ' `page_trail` TEXT NOT NULL ,' + . ' `template` VARCHAR( 255 ) NOT NULL ,' + . ' `visibility` VARCHAR( 255 ) NOT NULL ,' + . ' `position` INT NOT NULL ,' + . ' `menu` INT NOT NULL ,' + . ' `language` VARCHAR( 5 ) NOT NULL ,' + . ' `searching` INT NOT NULL ,' + . ' `admin_groups` TEXT NOT NULL ,' + . ' `admin_users` TEXT NOT NULL ,' + . ' `viewing_groups` TEXT NOT NULL ,' + . ' `viewing_users` TEXT NOT NULL ,' + . ' `modified_when` INT NOT NULL ,' + . ' `modified_by` INT NOT NULL ,' + . ' PRIMARY KEY ( `page_id` ) )' + . ' '; + $database->query($pages); + + // Sections table + $pages = 'CREATE TABLE `'.TABLE_PREFIX.'sections` ( `section_id` INT NOT NULL auto_increment,' + . ' `page_id` INT NOT NULL ,' + . ' `position` INT NOT NULL ,' + . ' `module` VARCHAR( 255 ) NOT NULL ,' + . ' `block` VARCHAR( 255 ) NOT NULL ,' + . ' PRIMARY KEY ( `section_id` ) )' + . ' '; + $database->query($pages); + + require(WB_PATH.'/admin/interface/version.php'); + + // Settings table + $settings="CREATE TABLE `".TABLE_PREFIX."settings` ( `setting_id` INT NOT NULL auto_increment, + `name` VARCHAR( 255 ) NOT NULL , + `value` TEXT NOT NULL , + PRIMARY KEY ( `setting_id` ) )"; + $database->query($settings); + $settings_rows= "INSERT INTO `".TABLE_PREFIX."settings` VALUES " + ." ('', 'wb_version', '".VERSION."')," + ." ('', 'website_title', '$website_title')," + ." ('', 'website_description', '')," + ." ('', 'website_keywords', '')," + ." ('', 'website_header', '')," + ." ('', 'website_footer', '')," + ." ('', 'wysiwyg_style', 'font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px;')," + ." ('', 'rename_files_on_upload', 'php,asp,phpx,aspx')," + ." ('', 'er_level', '')," + ." ('', 'default_language', 'EN')," + ." ('', 'app_name', 'wb')," + ." ('', 'default_timezone', '$default_timezone')," + ." ('', 'default_date_format', 'M d Y')," + ." ('', 'default_time_format', 'g:i A')," + ." ('', 'home_folders', 'true')," + ." ('', 'default_template', 'round')," + ." ('', 'default_charset', 'utf-8')," + ." ('', 'multiple_menus', 'false')," + ." ('', 'page_level_limit', '4')," + ." ('', 'intro_page', 'false')," + ." ('', 'page_trash', 'disabled')," + ." ('', 'homepage_redirection', 'false')," + ." ('', 'page_languages', 'false')," + ." ('', 'wysiwyg_editor', 'htmlarea')," + ." ('', 'manage_sections', 'true')," + ." ('', 'section_blocks', 'false')," + ." ('', 'smart_login', 'false')," + ." ('', 'captcha_verification', 'true')," + ." ('', 'frontend_login', 'false')," + ." ('', 'frontend_signup', 'false')," + ." ('', 'server_email', '$admin_email')," + ." ('', 'search', 'public')," + ." ('', 'page_extension', '.php')," + ." ('', 'page_spacer', '-')," + ." ('', 'pages_directory', '/pages')," + ." ('', 'media_directory', '/media')," + ." ('', 'operating_system', '$operating_system')," + ." ('', 'string_file_mode', '$file_mode')," + ." ('', 'string_dir_mode', '$dir_mode');"; + $database->query($settings_rows); + + + // Users table + $users = 'CREATE TABLE `'.TABLE_PREFIX.'users` ( `user_id` INT NOT NULL auto_increment,' + . ' `group_id` INT NOT NULL ,' + . ' `active` INT NOT NULL ,' + . ' `username` VARCHAR( 255 ) NOT NULL ,' + . ' `password` VARCHAR( 255 ) NOT NULL ,' + . ' `remember_key` VARCHAR( 255 ) NOT NULL ,' + . ' `last_reset` INT NOT NULL ,' + . ' `display_name` VARCHAR( 255 ) NOT NULL ,' + . ' `email` TEXT NOT NULL ,' + . ' `timezone` INT NOT NULL ,' + . ' `date_format` VARCHAR( 255 ) NOT NULL ,' + . ' `time_format` VARCHAR( 255 ) NOT NULL ,' + . ' `language` VARCHAR( 5 ) NOT NULL ,' + . ' `home_folder` TEXT NOT NULL ,' + . ' `login_when` INT NOT NULL ,' + . ' `login_ip` VARCHAR( 15 ) NOT NULL ,' + . ' PRIMARY KEY ( `user_id` ) )' + . ' '; + $database->query($users); + + // Groups table + $groups = 'CREATE TABLE `'.TABLE_PREFIX.'groups` ( `group_id` INT NOT NULL auto_increment,' + . ' `name` VARCHAR( 255 ) NOT NULL ,' + . ' `system_permissions` TEXT NOT NULL ,' + . ' `module_permissions` TEXT NOT NULL ,' + . ' `template_permissions` TEXT NOT NULL ,' + . ' PRIMARY KEY ( `group_id` ) )' + . ' '; + $database->query($groups); + + // Search settings table + $search = 'CREATE TABLE `'.TABLE_PREFIX.'search` ( `search_id` INT NOT NULL auto_increment,' + . ' `name` VARCHAR( 255 ) NOT NULL ,' + . ' `value` TEXT NOT NULL ,' + . ' `extra` TEXT NOT NULL ,' + . ' PRIMARY KEY ( `search_id` ) )' + . ' '; + $database->query($search); + + // Addons table + $addons = 'CREATE TABLE `'.TABLE_PREFIX.'addons` ( ' + .'`addon_id` INT NOT NULL auto_increment ,' + .'`type` VARCHAR( 255 ) NOT NULL ,' + .'`directory` VARCHAR( 255 ) NOT NULL ,' + .'`name` VARCHAR( 255 ) NOT NULL ,' + .'`description` TEXT NOT NULL ,' + .'`function` VARCHAR( 255 ) NOT NULL ,' + .'`version` VARCHAR( 255 ) NOT NULL ,' + .'`platform` VARCHAR( 255 ) NOT NULL ,' + .'`author` VARCHAR( 255 ) NOT NULL ,' + .'`license` VARCHAR( 255 ) NOT NULL ,' + .' PRIMARY KEY ( `addon_id` ) ) '; + $database->query($addons); + + // Insert default data + + // Admin group + $full_system_permissions = 'pages,pages_view,pages_add,pages_add_l0,pages_settings,pages_modify,pages_intro,pages_delete,media,media_view,media_upload,media_rename,media_delete,media_create,addons,modules,modules_view,modules_install,modules_uninstall,templates,templates_view,templates_install,templates_uninstall,languages,languages_view,languages_install,languages_uninstall,settings,settings_basic,settings_advanced,access,users,users_view,users_add,users_modify,users_delete,groups,groups_view,groups_add,groups_modify,groups_delete'; + $insert_admin_group = "INSERT INTO `".TABLE_PREFIX."groups` VALUES ('1', 'Administrators', '$full_system_permissions', '', '')"; + $database->query($insert_admin_group); + // Admin user + $insert_admin_user = "INSERT INTO `".TABLE_PREFIX."users` (user_id,group_id,active,username,password,email,display_name) VALUES ('1','1','1','$admin_username','".md5($admin_password)."','$admin_email','Administrator')"; + $database->query($insert_admin_user); + + // Search header + $search_header = addslashes(' +

Search

+ +
+ + + + + + + + +
+ + + +
+ + + + + + +
+ +
+ +
+ '); + $insert_search_header = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'header', '$search_header', '')"; + $database->query($insert_search_header); + // Search footer + $search_footer = addslashes(''); + $insert_search_footer = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'footer', '$search_footer', '')"; + $database->query($insert_search_footer); + // Search results header + $search_results_header = addslashes(''. +'[TEXT_RESULTS_FOR] \'[SEARCH_STRING]\': +'); + $insert_search_results_header = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'results_header', '$search_results_header', '')"; + $database->query($insert_search_results_header); + // Search results loop + $search_results_loop = addslashes(''. +' + + + +'); + + $insert_search_results_loop = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'results_loop', '$search_results_loop', '')"; + $database->query($insert_search_results_loop); + // Search results footer + $search_results_footer = addslashes("
[TITLE][TEXT_LAST_UPDATED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [DATE]
[DESCRIPTION]
"); + $insert_search_results_footer = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'results_footer', '$search_results_footer', '')"; + $database->query($insert_search_results_footer); + // Search no results + $search_no_results = addslashes('
No results found'); + $insert_search_no_results = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'no_results', '$search_no_results', '')"; + $database->query($insert_search_no_results); + // Search template + $database->query("INSERT INTO `".TABLE_PREFIX."search` (name) VALUES ('template')"); + + require_once(WB_PATH.'/framework/initialize.php'); + + // Include the PclZip class file (thanks to + require_once(WB_PATH.'/include/pclzip/pclzip.lib.php'); + + // Install add-ons + if(file_exists(WB_PATH.'/install/modules')) { + // Unpack pre-packaged modules + + } + if(file_exists(WB_PATH.'/install/templates')) { + // Unpack pre-packaged templates + + } + if(file_exists(WB_PATH.'/install/languages')) { + // Unpack pre-packaged languages + + } + + $admin=new admin_dummy(); + // Load addons into DB + $dirs['modules'] = WB_PATH.'/modules/'; + $dirs['templates'] = WB_PATH.'/templates/'; + $dirs['languages'] = WB_PATH.'/languages/'; + foreach($dirs AS $type => $dir) { + if($handle = opendir($dir)) { + while(false !== ($file = readdir($handle))) { + if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') { + // Get addon type + if($type == 'modules') { + load_module($dir.'/'.$file, true); + // Pretty ugly hack to let modules run $admin->set_error + // See dummy class definition admin_dummy above + if ($admin->error!='') { + set_error($admin->error); + } + } elseif($type == 'templates') { + load_template($dir.'/'.$file); + } elseif($type == 'languages') { + load_language($dir.'/'.$file); + } + } + } + closedir($handle); + } + } + + // Check if there was a database error + if($database->is_error()) { + set_error($database->get_error()); + } + +} + +// Log the user in and go to Website Baker Administration +$thisApp = new Login( + array( + "MAX_ATTEMPS" => "50", + "WARNING_URL" => ADMIN_URL."/login/warning.html", + "USERNAME_FIELDNAME" => 'admin_username', + "PASSWORD_FIELDNAME" => 'admin_password', + "REMEMBER_ME_OPTION" => SMART_LOGIN, + "MIN_USERNAME_LEN" => "2", + "MIN_PASSWORD_LEN" => "2", + "MAX_USERNAME_LEN" => "30", + "MAX_PASSWORD_LEN" => "30", + 'LOGIN_URL' => ADMIN_URL."/login/index.php", + 'DEFAULT_URL' => ADMIN_URL."/start/index.php", + 'TEMPLATE_DIR' => ADMIN_PATH."/login", + 'TEMPLATE_FILE' => "template.html", + 'FRONTEND' => false, + 'FORGOTTEN_DETAILS_APP' => ADMIN_URL."/login/forgot/index.php", + 'USERS_TABLE' => TABLE_PREFIX."users", + 'GROUPS_TABLE' => TABLE_PREFIX."groups", + ) + ); +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/install/save.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/install/index.php =================================================================== --- tags/2.6.0/wb/install/index.php (nonexistent) +++ tags/2.6.0/wb/install/index.php (revision 260) @@ -0,0 +1,370 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Start a session +if(!defined('SESSION_STARTED')) { + session_name('wb_session_id'); + session_start(); + define('SESSION_STARTED', true); +} + +// Check if the page has been reloaded +if(!isset($_GET['sessions_checked']) OR $_GET['sessions_checked'] != 'true') { + // Set session variable + $_SESSION['session_support'] = 'Enabled'; + // Reload page + header('Location: index.php?sessions_checked=true'); +} else { + // Check if session variable has been saved after reload + if(isset($_SESSION['session_support'])) { + $session_support = $_SESSION['session_support']; + } else { + $session_support = 'Disabled'; + } +} + +?> + + + +Website Baker Installation Wizard + + + + + + + + + + + +
+ Logo +   + Website Baker + Installation Wizard +
+ +
+ + + + + + + + + +
+ +
+ Welcome to the Website Baker Installation Wizard. +
+ +
Error:
+ + + + + + + + + + + + +

Step 1

Please check the following requirements are met before continuing...
PHP Version > 4.1.0 + 4.1) { + ?>YesNo + PHP Session SupportPHP Safe Mode + EnabledDisabled +
+ + + + + + + + + + + + + + + + + + + + + + + + +

Step 2

Please check the following files/folders are writeable before continuing...
wb/config.phpWriteable'; } elseif(!file_exists('../config.php')) { echo 'File Not Found'; } else { echo 'Unwriteable'; } ?>wb/pages/Writeable'; } elseif(!file_exists('../pages/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/media/Writeable'; } elseif(!file_exists('../media/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/templates/Writeable'; } elseif(!file_exists('../templates/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
wb/modules/Writeable'; } elseif(!file_exists('../modules/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/languages/Writeable'; } elseif(!file_exists('../languages/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/temp/Writeable'; } elseif(!file_exists('../temp/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>  
+ + + + + + + + + + + + +

Step 3

Please check your path settings, and select your default timezone...
+ Absolute URL: + + + +
+ Default Timezone: + + +
+ + + + + + + + + +

Step 4

Please specify your operating system information below...
+ Server Operating System: + + /> + Linux/Unix based +
+ /> + Windows + 		+
+ /> + +
+ (Please note: this is only recommended for testing environments) +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Please enter your MySQL database server details below...
Host Name: + +  Username: + +
Database Name: + +  Password: + /> +
Table Prefix: + /> +   + /> + +
      + (Please note: May remove existing tables and data)

Step 5

Please enter your website title below...
Website Title: + +

Step 6

Please enter your Administrator account details below...
Username: + +  Password: + /> +
Email: + /> +  Re-Password: + /> +

 

+ + + + + +
Please note:   + Website Baker is released under the + GNU General Public License +
+ By clicking install, you are accepting the license. +
+ 		+ +
+ +
+ +
+ + + + + +
+ + Website Baker + is released under the + GNU General Public License + +
+ + + Property changes on: tags/2.6.0/wb/install/index.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: tags/2.6.0/wb/install/stylesheet.css =================================================================== --- tags/2.6.0/wb/install/stylesheet.css (nonexistent) +++ tags/2.6.0/wb/install/stylesheet.css (revision 260) @@ -0,0 +1,65 @@ +body,td,th,input,textarea { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + color: #000000; +} +body { + background-color: #557799; + background-image: url(../admin/interface/background.png); + background-repeat: repeat-x; + margin: 0px; +} +form { + margin: 0; +} +.submit { + border : solid 1px #CCCCCC; + background: #E9ECEF; + color : #003366; + font-weight : bold; + font-size : 11px; + padding: 4px; + width: 100%; +} +.content { + background-color: #FFFFFF; + padding: 15px; + height: 350px; + width: 750px; + text-align: justify; + vertical-align: top; +} +hr { + margin: 15px 0px 15px 0px; + color: #003366; + height: 1px; +} +h1 { + font-size: 15px; + color: #336699; + margin: 0px 0px 5px 0px; + border-bottom: 1px solid #CCCCCC; +} +a:link, a:visited, a:active { + color: #003366; + text-decoration: none; +} +a:hover { + text-decoration: none; + color: #336699; +} +.bad { + color: #FF0000; + font-weight: bold; +} +.good { + color: #009900; + font-weight: bold; +} +.note { + color: #666666; + font-size: 10px; +} +.hide { + display: none; +} \ No newline at end of file Property changes on: tags/2.6.0/wb/install/stylesheet.css ___________________________________________________________________ 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: tags/2.6.0/wb/languages/EN.php =================================================================== --- tags/2.6.0/wb/languages/EN.php (nonexistent) +++ tags/2.6.0/wb/languages/EN.php (revision 260) @@ -0,0 +1,531 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Define that this file is loaded +if(!defined('LANGUAGE_LOADED')) { + define('LANGUAGE_LOADED', true); +} + +// Set the language information +$language_code = 'EN'; +$language_name = 'English'; +$language_version = '2.6'; +$language_platform = '2.6.x'; +$language_author = 'Ryan Djurovich'; +$language_license = 'GNU General Public License'; + +// Menu titles +$MENU['START'] = 'Start'; +$MENU['PAGES'] = 'Pages'; +$MENU['MEDIA'] = 'Media'; +$MENU['ADDONS'] = 'Add-ons'; +$MENU['MODULES'] = 'Modules'; +$MENU['TEMPLATES'] = 'Templates'; +$MENU['LANGUAGES'] = 'Languages'; +$MENU['PREFERENCES'] = 'Preferences'; +$MENU['SETTINGS'] = 'Settings'; +$MENU['ACCESS'] = 'Access'; +$MENU['USERS'] = 'Users'; +$MENU['GROUPS'] = 'Groups'; +$MENU['HELP'] = 'Help'; +$MENU['VIEW'] = 'View'; +$MENU['LOGOUT'] = 'Log-out'; +$MENU['LOGIN'] = 'Login'; +$MENU['FORGOT'] = 'Retrieve Login Details'; + +// Section overviews +$OVERVIEW['START'] = 'Administration overview'; +$OVERVIEW['PAGES'] = 'Manage your websites pages...'; +$OVERVIEW['MEDIA'] = 'Manage files stored in the media folder...'; +$OVERVIEW['MODULES'] = 'Manage Website Baker modules...'; +$OVERVIEW['TEMPLATES'] = 'Change the look and feel of your website with templates...'; +$OVERVIEW['LANGUAGES'] = 'Manage Website Baker languages...'; +$OVERVIEW['PREFERENCES'] = 'Change preferences such as email address, password, etc... '; +$OVERVIEW['SETTINGS'] = 'Changes settings for Website Baker...'; +$OVERVIEW['USERS'] = 'Manage users who can log-in to Website Baker...'; +$OVERVIEW['GROUPS'] = 'Manage user groups and their system permissions...'; +$OVERVIEW['HELP'] = 'Got a questions? Find your answer...'; +$OVERVIEW['VIEW'] = 'Quickly view and browse your website in a new window...'; + +// Headings +$HEADING['MODIFY_DELETE_PAGE'] = 'Modify/Delete Page'; +$HEADING['DELETED_PAGES'] = 'Deleted Pages'; +$HEADING['ADD_PAGE'] = 'Add Page'; +$HEADING['ADD_HEADING'] = 'Add Heading'; +$HEADING['MODIFY_PAGE'] = 'Modify Page'; +$HEADING['MODIFY_PAGE_SETTINGS'] = 'Modify Page Settings'; +$HEADING['MODIFY_ADVANCED_PAGE_SETTINGS'] = 'Modify Advanced Page Settings'; +$HEADING['MANAGE_SECTIONS'] = 'Manage Sections'; +$HEADING['MODIFY_INTRO_PAGE'] = 'Modify Intro Page'; + +$HEADING['BROWSE_MEDIA'] = 'Browse Media'; +$HEADING['CREATE_FOLDER'] = 'Create Folder'; +$HEADING['UPLOAD_FILES'] = 'Upload File(s)'; + +$HEADING['INSTALL_MODULE'] = 'Install Module'; +$HEADING['UNINSTALL_MODULE'] = 'Uninstall Module'; +$HEADING['MODULE_DETAILS'] = 'Module Details'; + +$HEADING['INSTALL_TEMPLATE'] = 'Install Template'; +$HEADING['UNINSTALL_TEMPLATE'] = 'Uninstall Template'; +$HEADING['TEMPLATE_DETAILS'] = 'Template Details'; + +$HEADING['INSTALL_LANGUAGE'] = 'Install Language'; +$HEADING['UNINSTALL_LANGUAGE'] = 'Uninstall Language'; +$HEADING['LANGUAGE_DETAILS'] = 'Language Details'; + +$HEADING['MY_SETTINGS'] = 'My Settings'; +$HEADING['MY_EMAIL'] = 'My Email'; +$HEADING['MY_PASSWORD'] = 'My Password'; + +$HEADING['GENERAL_SETTINGS'] = 'General Settings'; +$HEADING['DEFAULT_SETTINGS'] = 'Default Settings'; +$HEADING['SEARCH_SETTINGS'] = 'Search Settings'; +$HEADING['FILESYSTEM_SETTINGS'] = 'Filesystem Settings'; +$HEADING['SERVER_SETTINGS'] = 'Server Settings'; +$HEADING['ADMINISTRATION_TOOLS'] = 'Administration Tools'; + +$HEADING['MODIFY_DELETE_USER'] = 'Modify/Delete User'; +$HEADING['ADD_USER'] = 'Add User'; +$HEADING['MODIFY_USER'] = 'Modify User'; + +$HEADING['MODIFY_DELETE_GROUP'] = 'Modify/Delete Group'; +$HEADING['ADD_GROUP'] = 'Add Group'; +$HEADING['MODIFY_GROUP'] = 'Modify Group'; + +// Other text +$TEXT['ADD'] = 'Add'; +$TEXT['MODIFY'] = 'Modify'; +$TEXT['SETTINGS'] = 'Settings'; +$TEXT['DELETE'] = 'Delete'; +$TEXT['SAVE'] = 'Save'; +$TEXT['RESET'] = 'Reset'; +$TEXT['LOGIN'] = 'Login'; +$TEXT['RELOAD'] = 'Reload'; +$TEXT['CANCEL'] = 'Cancel'; +$TEXT['NAME'] = 'Name'; +$TEXT['PLEASE_SELECT'] = 'Please select'; +$TEXT['TITLE'] = 'Title'; +$TEXT['PARENT'] = 'Parent'; +$TEXT['TYPE'] = 'Type'; +$TEXT['VISIBILITY'] = 'Visibility'; +$TEXT['PRIVATE'] = 'Private'; +$TEXT['PUBLIC'] = 'Public'; +$TEXT['NONE'] = 'None'; +$TEXT['NONE_FOUND'] = 'None Found'; +$TEXT['CURRENT'] = 'Current'; +$TEXT['CHANGE'] = 'Change'; +$TEXT['WINDOW'] = 'Window'; +$TEXT['DESCRIPTION'] = 'Description'; +$TEXT['KEYWORDS'] = 'Keywords'; +$TEXT['ADMINISTRATORS'] = 'Administrators'; +$TEXT['PRIVATE_VIEWERS'] = 'Private Viewers'; +$TEXT['EXPAND'] = 'Expand'; +$TEXT['COLLAPSE'] = 'Collapse'; +$TEXT['MOVE_UP'] = 'Move Up'; +$TEXT['MOVE_DOWN'] = 'Move Down'; +$TEXT['RENAME'] = 'Rename'; +$TEXT['MODIFY_SETTINGS'] = 'Modify Settings'; +$TEXT['MODIFY_CONTENT'] = 'Modify Content'; +$TEXT['VIEW'] = 'View'; +$TEXT['UP'] = 'Up'; +$TEXT['FORGOTTEN_DETAILS'] = 'Forgotten your details?'; +$TEXT['NEED_TO_LOGIN'] = 'Need to log-in?'; +$TEXT['SEND_DETAILS'] = 'Send Details'; +$TEXT['USERNAME'] = 'Username'; +$TEXT['PASSWORD'] = 'Password'; +$TEXT['HOME'] = 'Home'; +$TEXT['TARGET_FOLDER'] = 'Target folder'; +$TEXT['OVERWRITE_EXISTING'] = 'Overwrite existing'; +$TEXT['FILE'] = 'File'; +$TEXT['FILES'] = 'Files'; +$TEXT['FOLDER'] = 'Folder'; +$TEXT['FOLDERS'] = 'Folders'; +$TEXT['CREATE_FOLDER'] = 'Create Folder'; +$TEXT['UPLOAD_FILES'] = 'Upload File(s)'; +$TEXT['CURRENT_FOLDER'] = 'Current Folder'; +$TEXT['TO'] = 'To'; +$TEXT['FROM'] = 'From'; +$TEXT['INSTALL'] = 'Install'; +$TEXT['UNINSTALL'] = 'Uninstall'; +$TEXT['VIEW_DETAILS'] = 'View Details'; +$TEXT['DISPLAY_NAME'] = 'Display Name'; +$TEXT['AUTHOR'] = 'Author'; +$TEXT['VERSION'] = 'Version'; +$TEXT['DESIGNED_FOR'] = 'Designed For'; +$TEXT['DESCRIPTION'] = 'Description'; +$TEXT['EMAIL'] = 'Email'; +$TEXT['LANGUAGE'] = 'Language'; +$TEXT['TIMEZONE'] = 'Timezone'; +$TEXT['CURRENT_PASSWORD'] = 'Current Password'; +$TEXT['NEW_PASSWORD'] = 'New Password'; +$TEXT['RETYPE_NEW_PASSWORD'] = 'Re-type New Password'; +$TEXT['ACTIVE'] = 'Active'; +$TEXT['DISABLED'] = 'Disabled'; +$TEXT['ENABLED'] = 'Enabled'; +$TEXT['RETYPE_PASSWORD'] = 'Re-type Password'; +$TEXT['GROUP'] = 'Group'; +$TEXT['SYSTEM_PERMISSIONS'] = 'System Permissions'; +$TEXT['MODULE_PERMISSIONS'] = 'Module Permissions'; +$TEXT['SHOW_ADVANCED'] = 'Show Advanced Options'; +$TEXT['HIDE_ADVANCED'] = 'Hide Advanced Options'; +$TEXT['BASIC'] = 'Basic'; +$TEXT['ADVANCED'] = 'Advanced'; +$TEXT['WEBSITE'] = 'Website'; +$TEXT['DEFAULT'] = 'Default'; +$TEXT['KEYWORDS'] = 'Keywords'; +$TEXT['TEXT'] = 'Text'; +$TEXT['HEADER'] = 'Header'; +$TEXT['FOOTER'] = 'Footer'; +$TEXT['TEMPLATE'] = 'Template'; +$TEXT['INSTALLATION'] = 'Installation'; +$TEXT['DATABASE'] = 'Database'; +$TEXT['HOST'] = 'Host'; +$TEXT['INTRO'] = 'Intro'; +$TEXT['PAGE'] = 'Page'; +$TEXT['SIGNUP'] = 'Sign-up'; +$TEXT['PHP_ERROR_LEVEL'] = 'PHP Error Reporting Level'; +$TEXT['ADMIN'] = 'Admin'; +$TEXT['PATH'] = 'Path'; +$TEXT['URL'] = 'URL'; +$TEXT['FRONTEND'] = 'Front-end'; +$TEXT['EXTENSION'] = 'Extension'; +$TEXT['TABLE_PREFIX'] = 'Table Prefix'; +$TEXT['CHANGES'] = 'Changes'; +$TEXT['ADMINISTRATION'] = 'Administration'; +$TEXT['FORGOT_DETAILS'] = 'Forgot Details?'; +$TEXT['LOGGED_IN'] = 'Logged-In'; +$TEXT['WELCOME_BACK'] = 'Welcome back'; +$TEXT['FULL_NAME'] = 'Full Name'; +$TEXT['ACCOUNT_SIGNUP'] = 'Account Sign-Up'; +$TEXT['LINK'] = 'Link'; +$TEXT['TARGET'] = 'Target'; +$TEXT['NEW_WINDOW'] = 'New Window'; +$TEXT['SAME_WINDOW'] = 'Same Window'; +$TEXT['PAGE_LEVEL_LIMIT'] = 'Page Level Limit'; +$TEXT['SUCCESS'] = 'Success'; +$TEXT['ERROR'] = 'Error'; +$TEXT['ARE_YOU_SURE'] = 'Are you sure?'; +$TEXT['YES'] = 'Yes'; +$TEXT['NO'] = 'No'; +$TEXT['SYSTEM_DEFAULT'] = 'System Default'; +$TEXT['PAGE_TITLE'] = 'Page Title'; +$TEXT['MENU_TITLE'] = 'Menu Title'; +$TEXT['ACTIONS'] = 'Actions'; +$TEXT['UNKNOWN'] = 'Unknown'; +$TEXT['BLOCK'] = 'Block'; +$TEXT['SEARCH'] = 'Search'; +$TEXT['SEARCHING'] = 'Searching'; +$TEXT['POST'] = 'Post'; +$TEXT['COMMENT'] = 'Comment'; +$TEXT['COMMENTS'] = 'Comments'; +$TEXT['COMMENTING'] = 'Commenting'; +$TEXT['SHORT'] = 'Short'; +$TEXT['LONG'] = 'Long'; +$TEXT['LOOP'] = 'Loop'; +$TEXT['FIELD'] = 'Field'; +$TEXT['REQUIRED'] = 'Required'; +$TEXT['LENGTH'] = 'Length'; +$TEXT['MESSAGE'] = 'Message'; +$TEXT['SUBJECT'] = 'Subject'; +$TEXT['MATCH'] = 'Match'; +$TEXT['ALL_WORDS'] = 'All Words'; +$TEXT['ANY_WORDS'] = 'Any Words'; +$TEXT['EXACT_MATCH'] = 'Exact Match'; +$TEXT['SHOW'] = 'Show'; +$TEXT['HIDE'] = 'Hide'; +$TEXT['START_PUBLISHING'] = 'Start Publishing'; +$TEXT['FINISH_PUBLISHING'] = 'Finish Publishing'; +$TEXT['DATE'] = 'Date'; +$TEXT['START'] = 'Start'; +$TEXT['END'] = 'End'; +$TEXT['IMAGE'] = 'Image'; +$TEXT['ICON'] = 'Icon'; +$TEXT['SECTION'] = 'Section'; +$TEXT['DATE_FORMAT'] = 'Date Format'; +$TEXT['TIME_FORMAT'] = 'Time Format'; +$TEXT['RESULTS'] = 'Results'; +$TEXT['RESIZE'] = 'Re-size'; +$TEXT['MANAGE'] = 'Manage'; +$TEXT['CODE'] = 'Code'; +$TEXT['WIDTH'] = 'Width'; +$TEXT['HEIGHT'] = 'Height'; +$TEXT['MORE'] = 'More'; +$TEXT['READ_MORE'] = 'Read More'; +$TEXT['CHANGE_SETTINGS'] = 'Change Settings'; +$TEXT['CURRENT_PAGE'] = 'Current Page'; +$TEXT['CLOSE'] = 'Close'; +$TEXT['INTRO_PAGE'] = 'Intro Page'; +$TEXT['INSTALLATION_URL'] = 'Installation URL'; +$TEXT['INSTALLATION_PATH'] = 'Installation Path'; +$TEXT['PAGE_EXTENSION'] = 'Page Extension'; +$TEXT['NO_RESULTS'] = 'No Results'; +$TEXT['WEBSITE_TITLE'] = 'Website Title'; +$TEXT['WEBSITE_DESCRIPTION'] = 'Website Description'; +$TEXT['WEBSITE_KEYWORDS'] = 'Website Keywords'; +$TEXT['WEBSITE_HEADER'] = 'Website Header'; +$TEXT['WEBSITE_FOOTER'] = 'Website Footer'; +$TEXT['RESULTS_HEADER'] = 'Results Header'; +$TEXT['RESULTS_LOOP'] = 'Results Loop'; +$TEXT['RESULTS_FOOTER'] = 'Results Footer'; +$TEXT['LEVEL'] = 'Level'; +$TEXT['NOT_FOUND'] = 'Not Found'; +$TEXT['PAGE_SPACER'] = 'Page Spacer'; +$TEXT['MATCHING'] = 'Matching'; +$TEXT['TEMPLATE_PERMISSIONS'] = 'Template Permissions'; +$TEXT['PAGES_DIRECTORY'] = 'Pages Directory'; +$TEXT['MEDIA_DIRECTORY'] = 'Media Directory'; +$TEXT['FILE_MODE'] = 'File Mode'; +$TEXT['USER'] = 'User'; +$TEXT['OTHERS'] = 'Others'; +$TEXT['READ'] = 'Read'; +$TEXT['WRITE'] = 'Write'; +$TEXT['EXECUTE'] = 'Execute'; +$TEXT['SMART_LOGIN'] = 'Smart Login'; +$TEXT['REMEMBER_ME'] = 'Remember Me'; +$TEXT['FILESYSTEM_PERMISSIONS'] = 'Filesystem Permissions'; +$TEXT['DIRECTORIES'] = 'Directories'; +$TEXT['DIRECTORY_MODE'] = 'Directory Mode'; +$TEXT['LIST_OPTIONS'] = 'List Options'; +$TEXT['OPTION'] = 'Option'; +$TEXT['ALLOW_MULTIPLE_SELECTIONS'] = 'Allow Multiple Selections'; +$TEXT['TEXTFIELD'] = 'Textfield'; +$TEXT['TEXTAREA'] = 'Textarea'; +$TEXT['SELECT_BOX'] = 'Select Box'; +$TEXT['CHECKBOX_GROUP'] = 'Checkbox Group'; +$TEXT['RADIO_BUTTON_GROUP'] = 'Radio Button Group'; +$TEXT['SIZE'] = 'Size'; +$TEXT['DEFAULT_TEXT'] = 'Default Text'; +$TEXT['SEPERATOR'] = 'Seperator'; +$TEXT['BACK'] = 'Back'; +$TEXT['UNDER_CONSTRUCTION'] = 'Under Construction'; +$TEXT['MULTISELECT'] = 'Multi-select'; +$TEXT['SHORT_TEXT'] = 'Short Text'; +$TEXT['LONG_TEXT'] = 'Long Text'; +$TEXT['HOMEPAGE_REDIRECTION'] = 'Homepage Redirection'; +$TEXT['HEADING'] = 'Heading'; +$TEXT['MULTIPLE_MENUS'] = 'Multiple Menu\'s'; +$TEXT['REGISTERED'] = 'Registered'; +$TEXT['START'] = 'Start'; +$TEXT['SECTION_BLOCKS'] = 'Section Blocks'; +$TEXT['REGISTERED_VIEWERS'] = 'Registered Viewers'; +$TEXT['SUBMISSION_ID'] = 'Submission ID'; +$TEXT['SUBMISSIONS'] = 'Submissions'; +$TEXT['SUBMITTED'] = 'Submitted'; +$TEXT['MAX_SUBMISSIONS_PER_HOUR'] = 'Max. Submissions Per Hour'; +$TEXT['SUBMISSIONS_STORED_IN_DATABASE'] = 'Submissions Stored In Database'; +$TEXT['EMAIL_ADDRESS'] = 'Email Address'; +$TEXT['CUSTOM'] = 'Custom'; +$TEXT['ANONYMOUS'] = 'Anonymous'; +$TEXT['SERVER_OPERATING_SYSTEM'] = 'Server Operating System'; +$TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'] = 'World-writeable file permissions'; +$TEXT['LINUX_UNIX_BASED'] = 'Linux/Unix based'; +$TEXT['WINDOWS'] = 'Windows'; +$TEXT['HOME_FOLDER'] = 'Home Folder'; +$TEXT['HOME_FOLDERS'] = 'Home Folders'; +$TEXT['PAGE_TRASH'] = 'Page Trash'; +$TEXT['INLINE'] = 'In-line'; +$TEXT['SEPARATE'] = 'Separate'; +$TEXT['DELETED'] = 'Deleted'; +$TEXT['VIEW_DELETED_PAGES'] = 'View Deleted Pages'; +$TEXT['EMPTY_TRASH'] = 'Empty Trash'; +$TEXT['TRASH_EMPTIED'] = 'Trash Emptied'; +$TEXT['ADD_SECTION'] = 'Add Section'; +$TEXT['POST_HEADER'] = 'Post Header'; +$TEXT['POST_FOOTER'] = 'Post Footer'; +$TEXT['POSTS_PER_PAGE'] = 'Posts Per Page'; +$TEXT['RESIZE_IMAGE_TO'] = 'Resize Image To'; +$TEXT['UNLIMITED'] = 'Unlimited'; +$TEXT['OF'] = 'Of'; +$TEXT['OUT_OF'] = 'Out Of'; +$TEXT['NEXT'] = 'Next'; +$TEXT['PREVIOUS'] = 'Previous'; +$TEXT['NEXT_PAGE'] = 'Next Page'; +$TEXT['PREVIOUS_PAGE'] = 'Previous Page'; +$TEXT['ON'] = 'On'; +$TEXT['LAST_UPDATED_BY'] = 'Last Updated By'; +$TEXT['RESULTS_FOR'] = 'Results For'; +$TEXT['TIME'] = 'Time'; +$TEXT['WYSIWYG_STYLE'] = 'WYSIWYG Style'; +$TEXT['WYSIWYG_EDITOR'] = "WYSIWYG Editor"; +$TEXT['SERVER_EMAIL'] = 'Server Email'; +$TEXT['MENU'] = 'Menu'; +$TEXT['MANAGE_GROUPS'] = 'Manage Groups'; +$TEXT['MANAGE_USERS'] = 'Manage Users'; +$TEXT['PAGE_LANGUAGES'] = 'Page Languages'; +$TEXT['HIDDEN'] = 'Hidden'; +$TEXT['MAIN'] = 'Main'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Rename Files On Upload'; +$TEXT['APP_NAME'] = 'Application Name'; +$TEXT['SESSION_IDENTIFIER'] = 'Session Identifier'; +$TEXT['BACKUP'] = 'Backup'; +$TEXT['RESTORE'] = 'Restore'; +$TEXT['BACKUP_DATABASE'] = 'Backup Database'; +$TEXT['RESTORE_DATABASE'] = 'Restore Database'; +$TEXT['BACKUP_MEDIA'] = 'Backup Media'; +$TEXT['RESTORE_MEDIA'] = 'Restore Media'; +$TEXT['ADMINISTRATION_TOOL'] = 'Administration tool'; +$TEXT['CAPTCHA_VERIFICATION'] = 'Captcha Verification'; +$TEXT['VERIFICATION'] = 'Verification'; +$TEXT['DEFAULT_CHARSET'] = 'Default Charset'; +$TEXT['CHARSET'] = 'Charset'; + + +// Success/error messages +$MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS'] = 'Sorry, you do not have permissions to view this page'; + +$MESSAGE['ADMIN']['INSUFFICIENT_PRIVELLIGES'] = 'Insufficient privelliges to be here'; + +$MESSAGE['LOGIN']['BOTH_BLANK'] = 'Please enter you username and password below'; +$MESSAGE['LOGIN']['USERNAME_BLANK'] = 'Please enter a username'; +$MESSAGE['LOGIN']['PASSWORD_BLANK'] = 'Please enter a password'; +$MESSAGE['LOGIN']['USERNAME_TOO_SHORT'] = 'Supplied username to short'; +$MESSAGE['LOGIN']['PASSWORD_TOO_SHORT'] = 'Supplied password to short'; +$MESSAGE['LOGIN']['USERNAME_TOO_LONG'] = 'Supplied username to long'; +$MESSAGE['LOGIN']['PASSWORD_TOO_LONG'] = 'Supplied password to long'; +$MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Username or password incorrect'; + +$MESSAGE['SIGNUP']['NO_EMAIL'] = 'You must enter an email address'; + +$MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Please enter your email address below'; +$MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'The email that you entered cannot be found in the database'; +$MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Unable to email password, please contact system administrator'; +$MESSAGE['FORGOT_PASS']['PASSWORD_RESET'] = 'Your username and password have been sent to your email address'; +$MESSAGE['FORGOT_PASS']['ALREADY_RESET'] = 'Password cannot be reset more than once per hour, sorry'; + +$MESSAGE['START']['WELCOME_MESSAGE'] = 'Welcome to Website Baker Administration'; +$MESSAGE['START']['INSTALL_DIR_EXISTS'] = 'Warning, Installation Directory Still Exists!'; +$MESSAGE['START']['CURRENT_USER'] = 'You are currently logged in as:'; + +$MESSAGE['SETTINGS']['UNABLE_OPEN_CONFIG'] = 'Unable to open the configuration file'; +$MESSAGE['SETTINGS']['UNABLE_WRITE_CONFIG'] = 'Cannot write to configuration file'; +$MESSAGE['SETTINGS']['SAVED'] = 'Settings saved successfully'; +$MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'] = 'Please Note: Pressing this button resets all unsaved changes'; +$MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'] = 'Please note: this is only recommended for testing environments'; + +$MESSAGE['USERS']['ADDED'] = 'User added successfully'; +$MESSAGE['USERS']['SAVED'] = 'User saved successfully'; +$MESSAGE['USERS']['DELETED'] = 'User deleted successfully'; +$MESSAGE['USERS']['NO_GROUP'] = 'No group was selected'; +$MESSAGE['USERS']['USERNAME_TOO_SHORT'] = 'The username you entered was too short'; +$MESSAGE['USERS']['PASSWORD_TOO_SHORT'] = 'The password you entered was too short'; +$MESSAGE['USERS']['PASSWORD_MISMATCH'] = 'The passwords you entered do not match'; +$MESSAGE['USERS']['INVALID_EMAIL'] = 'The email address you entered is invalid'; +$MESSAGE['USERS']['EMAIL_TAKEN'] = 'The email you entered is already in use'; +$MESSAGE['USERS']['USERNAME_TAKEN'] = 'The username you entered is already taken'; +$MESSAGE['USERS']['CHANGING_PASSWORD'] = 'Please note: You should only enter values in the above fields if you wish to change this users password'; +$MESSAGE['USERS']['CONFIRM_DELETE'] = 'Are you sure you want to delete the selected user?'; + +$MESSAGE['GROUPS']['ADDED'] = 'Group added successfully'; +$MESSAGE['GROUPS']['SAVED'] = 'Group saved successfully'; +$MESSAGE['GROUPS']['DELETED'] = 'Group deleted successfully'; +$MESSAGE['GROUPS']['GROUP_NAME_BLANK'] = 'Group name is blank'; +$MESSAGE['GROUPS']['CONFIRM_DELETE'] = 'Are you sure you want to delete the selected group (and any users that belong to it)?'; +$MESSAGE['GROUPS']['NO_GROUPS_FOUND'] = 'No groups found'; +$MESSAGE['GROUPS']['GROUP_NAME_EXISTS'] = 'Group name already exists'; + +$MESSAGE['PREFERENCES']['DETAILS_SAVED'] = 'Details saved successfully'; +$MESSAGE['PREFERENCES']['EMAIL_UPDATED'] = 'Email updated successfully'; +$MESSAGE['PREFERENCES']['CURRENT_PASSWORD_INCORRECT'] = 'The (current) password you entered is incorrect'; +$MESSAGE['PREFERENCES']['PASSWORD_CHANGED'] = 'Password changed successfully'; + +$MESSAGE['TEMPLATES']['CHANGE_TEMPLATE_NOTICE'] = 'Please note: to change the template you must go to the Settings section'; + +$MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH'] = 'Cannot include ../ in the folder name'; +$MESSAGE['MEDIA']['DIR_DOES_NOT_EXIST'] = 'Directory does not exist'; +$MESSAGE['MEDIA']['TARGET_DOT_DOT_SLASH'] = 'Cannot have ../ in the folder target'; +$MESSAGE['MEDIA']['NAME_DOT_DOT_SLASH'] = 'Cannot include ../ in the name'; +$MESSAGE['MEDIA']['NAME_INDEX_PHP'] = 'Cannot use index.php as the name'; +$MESSAGE['MEDIA']['NONE_FOUND'] = 'No media found in the current folder'; +$MESSAGE['MEDIA']['FILE_NOT_FOUND'] = 'File not found'; +$MESSAGE['MEDIA']['DELETED_FILE'] = 'File deleted successfully'; +$MESSAGE['MEDIA']['DELETED_DIR'] = 'Folder deleted successfully'; +$MESSAGE['MEDIA']['CONFIRM_DELETE'] = 'Are you sure you want to delete the following file or folder?'; +$MESSAGE['MEDIA']['CANNOT_DELETE_FILE'] = 'Cannot delete the selected file'; +$MESSAGE['MEDIA']['CANNOT_DELETE_DIR'] = 'Cannot delete the selected folder'; +$MESSAGE['MEDIA']['BLANK_NAME'] = 'You did not enter a new name'; +$MESSAGE['MEDIA']['BLANK_EXTENSION'] = 'You did not enter a file extension'; +$MESSAGE['MEDIA']['RENAMED'] = 'Rename successful'; +$MESSAGE['MEDIA']['CANNOT_RENAME'] = 'Rename unsuccessful'; +$MESSAGE['MEDIA']['FILE_EXISTS'] = 'A file matching the name you entered already exists'; +$MESSAGE['MEDIA']['DIR_EXISTS'] = 'A folder matching the name you entered already exists'; +$MESSAGE['MEDIA']['DIR_MADE'] = 'Folder created successfully'; +$MESSAGE['MEDIA']['DIR_NOT_MADE'] = 'Unable to create folder'; +$MESSAGE['MEDIA']['SINGLE_UPLOADED'] = ' file was successfully uploaded'; +$MESSAGE['MEDIA']['UPLOADED'] = ' files were successfully uploaded'; + +$MESSAGE['PAGES']['ADDED'] = 'Page added successfully'; +$MESSAGE['PAGES']['ADDED_HEADING'] = 'Page heading added successfully'; +$MESSAGE['PAGES']['PAGE_EXISTS'] = 'A page with the same or similar title exists'; +$MESSAGE['PAGES']['CANNOT_CREATE_ACCESS_FILE'] = 'Error creating access file in the /pages directory (insufficient privileges)'; +$MESSAGE['PAGES']['CANNOT_DELETE_ACCESS_FILE'] = 'Error deleting access file in the /pages directory (insufficient privileges)'; +$MESSAGE['PAGES']['NOT_FOUND'] = 'Page not found'; +$MESSAGE['PAGES']['SAVED'] = 'Page saved successfully'; +$MESSAGE['PAGES']['SAVED_SETTINGS'] = 'Page settings saved successfully'; +$MESSAGE['PAGES']['NOT_SAVED'] = 'Error saving page'; +$MESSAGE['PAGES']['DELETE_CONFIRM'] = 'Are you sure you want to delete the selected page (and all of its sub-pages)'; +$MESSAGE['PAGES']['DELETED'] = 'Page deleted successfully'; +$MESSAGE['PAGES']['RESTORED'] = 'Page restored successfully'; +$MESSAGE['PAGES']['BLANK_PAGE_TITLE'] = 'Please enter a page title'; +$MESSAGE['PAGES']['BLANK_MENU_TITLE'] = 'Please enter a menu title'; +$MESSAGE['PAGES']['REORDERED'] = 'Page re-ordered successfully'; +$MESSAGE['PAGES']['CANNOT_REORDER'] = 'Error re-ordering page'; +$MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS'] = 'You do not have permissions to modify this page'; +$MESSAGE['PAGES']['INTRO_NOT_WRITABLE'] = 'Cannot write to file /pages/intro.php (insufficient privileges)'; +$MESSAGE['PAGES']['INTRO_SAVED'] = 'Intro page saved successfully'; +$MESSAGE['PAGES']['LAST_MODIFIED'] = 'Last modification by'; +$MESSAGE['PAGES']['INTRO_LINK'] = 'Click HERE to modify the intro page'; +$MESSAGE['PAGES']['SECTIONS_PROPERTIES_SAVED'] = 'Section properties saved successfully'; +$MESSAGE['PAGES']['RETURN_TO_PAGES'] = 'Return to pages'; + +$MESSAGE['GENERIC']['FILL_IN_ALL'] = 'Please go back and fill-in all fields'; +$MESSAGE['GENERIC']['FILE_TYPE'] = 'Please note that the file you upload must be of the following format:'; +$MESSAGE['GENERIC']['FILE_TYPES'] = 'Please note that the file you upload must be in one of the following formats:'; +$MESSAGE['GENERIC']['CANNOT_UPLOAD'] = 'Cannot upload file'; +$MESSAGE['GENERIC']['ALREADY_INSTALLED'] = 'Already installed'; +$MESSAGE['GENERIC']['NOT_INSTALLED'] = 'Not installed'; +$MESSAGE['GENERIC']['CANNOT_UNINSTALL'] = 'Cannot uninstall'; +$MESSAGE['GENERIC']['CANNOT_UNZIP'] = 'Cannot unzip file'; +$MESSAGE['GENERIC']['INSTALLED'] = 'Installed successfully'; +$MESSAGE['GENERIC']['UPGRADED'] = 'Upgraded successfully'; +$MESSAGE['GENERIC']['UNINSTALLED'] = 'Uninstalled successfully'; +$MESSAGE['GENERIC']['BAD_PERMISSIONS'] = 'Unable to write to the target directory'; +$MESSAGE['GENERIC']['INVALID'] = 'The file you uploaded is invalid'; +$MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE'] = 'Cannot Uninstall: the selected file is in use'; +$MESSAGE['GENERIC']['WEBSITE_UNDER_CONTRUCTION'] = 'Website Under Construction'; +$MESSAGE['GENERIC']['PLEASE_CHECK_BACK_SOON'] = 'Please check back soon...'; +$MESSAGE['GENERIC']['PLEASE_BE_PATIENT'] = 'Please be patient, this might take a while.'; +$MESSAGE['GENERIC']['ERROR_OPENING_FILE'] = 'Error opening file.'; + +$MESSAGE['MOD_FORM']['REQUIRED_FIELDS'] = 'You must enter details for the following fields'; +$MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.'; +$MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: '.SERVER_EMAIL; + +$MESSAGE['MOD_RELOAD']['PLEASE_SELECT'] = 'Please selected which add-ons you would like to have reloaded'; +$MESSAGE['MOD_RELOAD']['MODULES_RELOADED'] = 'Modules reloaded successfully'; +$MESSAGE['MOD_RELOAD']['TEMPLATES_RELOADED'] = 'Templates reloaded successfully'; +$MESSAGE['MOD_RELOAD']['LANGUAGES_RELOADED'] = 'Languages reloaded successfully'; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/languages/EN.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: tags/2.6.0/wb/languages/index.php =================================================================== --- tags/2.6.0/wb/languages/index.php (nonexistent) +++ tags/2.6.0/wb/languages/index.php (revision 260) @@ -0,0 +1,29 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../config.php'); +header('Location: '.WB_URL.'/'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/languages/index.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: tags/2.6.0/wb/templates/allcss/index.php =================================================================== --- tags/2.6.0/wb/templates/allcss/index.php (nonexistent) +++ tags/2.6.0/wb/templates/allcss/index.php (revision 260) @@ -0,0 +1,110 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +?> + + + +<?php page_title(); ?> + + + + + + + + +
+ + + +
+ +
+ + +
+ +
+ + +
+ [a][menu_title][/a]', '
    ', '
', '', ' style="font-weight: bold;"'); ?> + + get_session('USER_ID') == '') { + ?> + + get_session('USER_ID'))) { + ?> + + +
+ + +
+ +
+ +
+ +
+ +
+ +
+ Powered by Website Baker +
+ + + \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/allcss/index.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: tags/2.6.0/wb/templates/allcss/info.php =================================================================== --- tags/2.6.0/wb/templates/allcss/info.php (nonexistent) +++ tags/2.6.0/wb/templates/allcss/info.php (revision 260) @@ -0,0 +1,34 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +$template_directory = 'allcss'; +$template_name = 'All CSS'; +$template_version = '2.6'; +$template_platform = '2.6.x'; +$template_author = 'Ryan Djurovich'; +$template_license = 'GNU General Public License'; +$template_description = 'This template is designed with one goal in mind: to completely control lay-out with css. In case you were wondering, that is where the name came from.'; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/allcss/info.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: tags/2.6.0/wb/templates/allcss/print.css =================================================================== --- tags/2.6.0/wb/templates/allcss/print.css (nonexistent) +++ tags/2.6.0/wb/templates/allcss/print.css (revision 260) @@ -0,0 +1,71 @@ +body,td,th { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + color: #000000; +} +body { + background-color: #FFFFFF; + margin: 0px; +} +a:link, a:visited, a:active { + color: #660033; + text-decoration: none; +} +a:hover { + color: #993366; + text-decoration: none; +} +hr { + margin: 15px 0px 15px 0px; + color: #660033; + height: 1px; + width: 100%; +} +h1 { + font-size: 15px; + color: #993366; + margin: 5px 0px 5px 0px; +} +form { + margin: 0; +} +.main { + width: 100%; + margin: 0; + padding: 0; +} +.banner { + font-size: 20px; + font-weight: bold; + color: #FFFFFF; + padding-bottom: 20px; + text-align: center; +} +.search_box { + display: none; +} +.menu { + display: none; +} +.menu ul, .menu li { + display: none; +} +.login_table { + display: none; +} +.content { + margin: 0; + text-align: justify; +} +.footer { + clear: both; + height: 20px; + background: #FFFFFF; + font-size: 10px; + color: #666666; + text-align: center; + padding-top: 20px; +} +.powered_by { + display: none; +} \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/allcss/print.css ___________________________________________________________________ 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: tags/2.6.0/wb/templates/allcss/screen.css =================================================================== --- tags/2.6.0/wb/templates/allcss/screen.css (nonexistent) +++ tags/2.6.0/wb/templates/allcss/screen.css (revision 260) @@ -0,0 +1,145 @@ +body,td,th { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + color: #000000; +} +body { + background-color: #F0F0F0; + background-image: url(background.jpg); + margin: 0; +} +a:link, a:visited, a:active { + color: #660033; + text-decoration: none; +} +a:hover { + color: #993366; + text-decoration: none; +} +hr { + margin: 5px 0px 5px 0px; + color: #660033; + border: 0; + border-top: 1px solid #660033; + height: 1px; + width: 580px; +} +h1 { + font-size: 16px; + color: #993366; + text-align: left; + margin: 8px 2px 8px 2px; +} +form { + margin: 0; +} +.main { + width: 750px; + margin: auto; + padding: 0; + background-color: #FFFFFF; +} +.banner, .search_box { + height: 80px; + background-image: url(header.jpg); + background-repeat: repeat-x; + font-size: 20px; + font-weight: bold; + color: #FFFFFF; + text-align: center; + padding-top: 20px; +} +.banner { + width: 530px; + padding-left: 20px; + float: left; + text-align: left; +} +.search_box { + float: right; + clear: right; + width: 200px; +} +.search_string { + width: 100px; + height: 16px; + font-size: 10px; + vertical-align: middle; +} +.search_submit { + width: 50px; + height: 22px; + font-size: 10px; + vertical-align: middle; +} +.banner a { + color: #FFFFFF; +} +.menu { + float: left; + width: 140px; + margin: 10px; + margin-top: 3px; +} +.menu ul, .menu li { + margin: 0; + padding: 0; + list-style: none; + margin-bottom: 5px; +} +.menu ul ul { + padding-left: 8px; +} +.menu a:link, .menu a:visited, .menu a:active, .menu a:hover { + display: block; + padding: 2px; +} +.menu_main a:link, .menu_main a:visited, .menu_main a:active { + border-bottom: 1px dashed #999999; +} +.menu_main a:hover { + border-bottom: 1px dashed #333333; +} +.login_table { + border: 1px solid #D0D0D0; + margin-top: 20px; + margin-bottom: 5px; + text-align: center; + padding-bottom: 3px; +} +.login_table h1 { + color: #660033; + font-size: 12px; + text-transform: uppercase; + font-weight: bold; + text-align: center; + margin: 5px 0px 5px 0px; +} +.login_table input { + text-transform: uppercase; + font-size: 10px; + margin: 5px 0px 1px 0px; + width: 100px; +} +.content { + margin-left: 150px; + padding: 4px 10px 14px 10px; + text-align: justify; + clear: right; +} +.footer { + background-color: #FFFFFF; + clear: both; + height: 20px; + background-image: url(footer.jpg); + background-repeat: repeat-x; + font-size: 10px; + color: #666666; + text-align: center; + line-height: 18px; +} +.powered_by { + text-align: center; + font-size: 10px; + padding-top: 2px; +} \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/allcss/screen.css ___________________________________________________________________ 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: tags/2.6.0/wb/templates/allcss/header.jpg =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/templates/allcss/header.jpg ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/templates/allcss/footer.jpg =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/templates/allcss/footer.jpg ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/templates/allcss/background.jpg =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/templates/allcss/background.jpg ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/templates/round/index.php =================================================================== --- tags/2.6.0/wb/templates/round/index.php (nonexistent) +++ tags/2.6.0/wb/templates/round/index.php (revision 260) @@ -0,0 +1,227 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +?> + + + +<?php page_title(); ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ <?php page_title('', '[WEBSITE_TITLE]'); ?> +
+ + + + + + + + + + +
+ +
+ +
+ +
+ + +
+ + + + + + + + + + + + + +
+ +
+ +
+
+ + + is_authenticated()) { + ?> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ is_authenticated()) { + ?> +
+ + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ + 		+ +
+ + Powered By Website Baker + +
+ +
+ +
+ + + \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/round/index.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: tags/2.6.0/wb/templates/round/info.php =================================================================== --- tags/2.6.0/wb/templates/round/info.php (nonexistent) +++ tags/2.6.0/wb/templates/round/info.php (revision 260) @@ -0,0 +1,34 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +$template_directory = 'round'; +$template_name = 'Round'; +$template_version = '2.6'; +$template_platform = '2.6.x'; +$template_author = 'Ryan Djurovich'; +$template_license = 'GNU General Public License'; +$template_description = 'Default template for Website Baker 2.2.x. Simular to the box template, but with rounded edges.'; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/round/info.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: tags/2.6.0/wb/templates/round/footer.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/templates/round/footer.png ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/templates/round/print.css =================================================================== --- tags/2.6.0/wb/templates/round/print.css (nonexistent) +++ tags/2.6.0/wb/templates/round/print.css (revision 260) @@ -0,0 +1,23 @@ +body,td,th { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + color: #000000; +} +body { + background-color: #FFFFFF; + margin: 0px; +} +a:link, a:visited, a:active { + color: #003366; + text-decoration: none; +} +a:hover { + color: #336699; + text-decoration: none; +} +.header, .menu, .search, .powered_by, .footer { + display: none; +} +.content { + vertical-align: top; +} \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/round/print.css ___________________________________________________________________ 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: tags/2.6.0/wb/templates/round/banner.jpg =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/templates/round/banner.jpg ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/templates/round/powered.jpg =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/templates/round/powered.jpg ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/templates/round/screen.css =================================================================== --- tags/2.6.0/wb/templates/round/screen.css (nonexistent) +++ tags/2.6.0/wb/templates/round/screen.css (revision 260) @@ -0,0 +1,117 @@ +body,td,th { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + color: #000000; +} +body { + background-color: #003366; + background-image: url(background.jpg); + background-repeat: repeat-x; + margin: 10px; +} +a:link, a:visited, a:active { + color: #003366; + text-decoration: none; +} +a:hover { + color: #336699; + text-decoration: none; +} +hr { + margin: 15px 0px 15px 0px; + color: #003366; + height: 1px; + width: 100%; +} +h1 { + font-size: 18px; + color: #003366; + margin: 5px 0px 5px 0px; +} +h2 { + font-size: 15px; + color: #336699; + margin: 15px 0px 5px 0px; +} +form { + margin: 0; +} +.header { + width: 750px; + height: 80px; + background-color: #FFFFFF; + vertical-align: top; +} +.menu { + vertical-align: top; + background-color: #FFFFFF; + width: 170px; + padding: 0px; +} +.menu ul, .menu li{ + list-style-type: none; + margin: 0; + padding: 0; +} +.menu ul { + border-bottom: 0px; + background-color: #003366; +} +.menu ul ul { + padding-left: 10px; +} +.menu a:link, .menu a:visited, .menu a:active { + padding: 4px 10px 4px 10px; + color: #FFFFFF; + display: block; + background-color: #003366; + text-decoration: none; +} +.menu a:hover { + background-color: #336699; + text-decoration: none; +} +.menu_current { + font-weight: bold; +} +.border { + font-size: 1px; + height: 10px; +} +.login { + padding: 2px 10px 2px 10px; + font-size: 10px; + background-color: #003366; + color: #FFFFFF; + text-align: center; +} +.login input { + width: 95%; + font-size: 10px; +} +.login a:link, .login a:visited, .login a:active { + color: #DDDDDD; + text-decoration: none; +} +.login a:hover { + color: #FFFFFF; + text-decoration: none; +} +.powered_by { + padding: 3px 0px 0px 15px; + background-color: #FFFFFF; +} +.content { + padding: 10px; + background-color: #FFFFFF; + height: 300px; + vertical-align: top; + text-align: left; +} +.footer { + padding: 5px; + height: 20px; + color: #FFFFFF; + vertical-align: middle; + text-align: center; +} \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/round/screen.css ___________________________________________________________________ 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: tags/2.6.0/wb/templates/round/menu_top.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/templates/round/menu_top.gif ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/templates/round/menu_bottom.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/templates/round/menu_bottom.gif ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/templates/round/background.jpg =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/templates/round/background.jpg ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/templates/simple/index.php =================================================================== --- tags/2.6.0/wb/templates/simple/index.php (nonexistent) +++ tags/2.6.0/wb/templates/simple/index.php (revision 260) @@ -0,0 +1,81 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +?> + + + +<?php page_title(); ?> + + + + + + + + + + + + + + + + + + + + + + +
+ +
+   +
+ + Menu:
+ + + + +
+ Search:
+
+ + +
+ + +
+ Powered by
Website Baker + 		+ +
+ +
+ + + \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/simple/index.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +"" \ No newline at end of property Index: tags/2.6.0/wb/templates/simple/info.php =================================================================== --- tags/2.6.0/wb/templates/simple/info.php (nonexistent) +++ tags/2.6.0/wb/templates/simple/info.php (revision 260) @@ -0,0 +1,34 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +$template_directory = 'simple'; +$template_name = 'Simple'; +$template_version = '2.6'; +$template_platform = '2.6.x'; +$template_author = 'Ryan Djurovich'; +$template_license = 'GNU General Public License'; +$template_description = 'This template is designed for developers to learn how to make templates easily. Please note this template only supports 2 page levels.'; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/simple/info.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +"" \ No newline at end of property Index: tags/2.6.0/wb/templates/simple/print.css =================================================================== --- tags/2.6.0/wb/templates/simple/print.css (nonexistent) +++ tags/2.6.0/wb/templates/simple/print.css (revision 260) @@ -0,0 +1,29 @@ +body,td,th { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + color: #000000; +} +body { + background-color: #FFFFFF; + margin: 0px; +} +a:link, a:visited, a:active { + color: #003366; + text-decoration: none; +} +a:hover { + color: #336699; + text-decoration: none; +} +.header { + display: none; +} +.menu { + display: none; +} +.content { + vertical-align: top; +} +.footer { + display: none; +} \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/simple/print.css ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +"" \ No newline at end of property Index: tags/2.6.0/wb/templates/simple/screen.css =================================================================== --- tags/2.6.0/wb/templates/simple/screen.css (nonexistent) +++ tags/2.6.0/wb/templates/simple/screen.css (revision 260) @@ -0,0 +1,60 @@ +body,td,th { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + color: #000000; +} +body { + background-color: #333333; + margin: 10px; +} +a:link, a:visited, a:active { + color: #003366; + text-decoration: none; +} +a:hover { + color: #336699; + text-decoration: none; +} +form { + margin: 0; +} +h1, h2, h3, h4, h5 { + margin: 5px 0px 5px 0px; +} +.header { + background-color: #336699; + vertical-align: middle; + text-align: center; + color: #FFFFFF; + height: 50px; + font-size: 20px; + font-weight: bold; +} +.menu { + background-color: #EEEEEE; + padding: 10px; + width: 150px; + vertical-align: top; +} +.menu ul, .menu li { + list-style-type: none; + display: block; + margin: 0; + padding: 0; + padding-left: 5px; +} +.current { + font-weight: bold; +} +.content { + background-color: #FFFFFF; + padding: 20px; + height: 400px; + vertical-align: top; +} +.footer { + background-color: #DDDDDD; + text-align: center; + font-size: 10px; + height: 10px; +} \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/simple/screen.css ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +"" \ No newline at end of property Index: tags/2.6.0/wb/templates/blank/info.php =================================================================== --- tags/2.6.0/wb/templates/blank/info.php (nonexistent) +++ tags/2.6.0/wb/templates/blank/info.php (revision 260) @@ -0,0 +1,34 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +$template_directory = 'blank'; +$template_name = 'Blank Template'; +$template_version = '2.6'; +$template_platform = '2.6.x'; +$template_author = 'Ryan Djurovich'; +$template_license = 'GNU General Public License'; +$template_description = 'This template is for use on page where you do not want anything wrapping the content'; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/blank/info.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/templates/blank/index.php =================================================================== --- tags/2.6.0/wb/templates/blank/index.php (nonexistent) +++ tags/2.6.0/wb/templates/blank/index.php (revision 260) @@ -0,0 +1,28 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +page_content(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/blank/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/templates/index.php =================================================================== --- tags/2.6.0/wb/templates/index.php (nonexistent) +++ tags/2.6.0/wb/templates/index.php (revision 260) @@ -0,0 +1,28 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +header("Location: ../index.php"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/templates/index.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: tags/2.6.0/wb/modules/form/view.php =================================================================== --- tags/2.6.0/wb/modules/form/view.php (nonexistent) +++ tags/2.6.0/wb/modules/form/view.php (revision 260) @@ -0,0 +1,361 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +// Must include code to stop this file being access directly +if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } + +// Function for generating an optionsfor a select field +function make_option(&$n) { + // start option group if it exists + if (substr($n,0,2) == '[=') { + $n = ''; + } elseif ($n == ']') { + $n = ''; + } else { + $n = ''; + } +} + +// Function for generating a checkbox +function make_checkbox(&$n, $idx, $params) { + $field_id = $params[0]; + $seperator = $params[1]; + //$n = ''.''.$n.''.$seperator; + $n = ''.''.$n.''.$seperator; +} + +// Function for generating a radio button +function make_radio(&$n, $idx, $params) { + $field_id = $params[0]; + $group = $params[1]; + $seperator = $params[2]; + $n = ''.''.$n.''.$seperator; +} + +// Work-out if the form has been submitted or not +if($_POST == array()) { + +?> + +query("SELECT header,field_loop,footer,use_captcha FROM ".TABLE_PREFIX."mod_form_settings WHERE section_id = '$section_id'"); +if($query_settings->numRows() > 0) { + $fetch_settings = $query_settings->fetchRow(); + $header = str_replace('{WB_URL}',WB_URL,$fetch_settings['header']); + $field_loop = $fetch_settings['field_loop']; + $footer = str_replace('{WB_URL}',WB_URL,$fetch_settings['footer']); + $use_captcha = $fetch_settings['use_captcha']; +} else { + $header = ''; + $field_loop = ''; + $footer = ''; +} + +// Add form starter code +?> +
+query("SELECT * FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id' ORDER BY position ASC"); +if($query_fields->numRows() > 0) { + while($field = $query_fields->fetchRow()) { + // Set field values + $field_id = $field['field_id']; + $value = $field['value']; + // Print field_loop after replacing vars with values + $vars = array('{TITLE}', '{REQUIRED}'); + $values = array($field['title']); + if($field['required'] == 1) { + $values[] = '*'; + } else { + $values[] = ''; + } + if($field['type'] == 'textfield') { + $vars[] = '{FIELD}'; + $values[] = ''; + } elseif($field['type'] == 'textarea') { + $vars[] = '{FIELD}'; + $values[] = ''; + } elseif($field['type'] == 'select') { + $vars[] = '{FIELD}'; + $options = explode(',', $value); + array_walk($options, 'make_option'); + $field['extra'] = explode(',',$field['extra']); + $values[] = ''; + } elseif($field['type'] == 'heading') { + $vars[] = '{FIELD}'; + $values[] = ''; + $tmp_field_loop = $field_loop; // temporarily modify the field loop template + $field_loop = $field['extra']; + } elseif($field['type'] == 'checkbox') { + $vars[] = '{FIELD}'; + $options = explode(',', $value); + array_walk($options, 'make_checkbox',array($field_id,$field['extra'])); + $values[] = implode($options); + } elseif($field['type'] == 'radio') { + $vars[] = '{FIELD}'; + $options = explode(',', $value); + array_walk($options, 'make_radio',array($field_id,$field['title'],$field['extra'])); + $values[] = implode($options); + } elseif($field['type'] == 'email') { + $vars[] = '{FIELD}'; + $values[] = ''; + } + if($field['type'] != '') { + echo str_replace($vars, $values, $field_loop); + } + if (isset($tmp_field_loop)) $field_loop = $tmp_field_loop; + } +} + +// Captcha +if($use_captcha) { + $_SESSION['captcha'] = ''; + for($i = 0; $i < 5; $i++) { + $_SESSION['captcha'] .= rand(0,9); + } + ?>
: + + + +
Captcha
+
'; +$field_loop = ''; +$footer = ' + + +
{TITLE}{REQUIRED}:{FIELD}
  + +
'; +$email_to = $admin->get_email(); +$email_from = ''; +$email_subject = 'Results from form on website...'; +$success_message = 'Thank-you.'; +$max_submissions = 50; +$stored_submissions = 100; +$use_captcha = true; +$database->query("INSERT INTO ".TABLE_PREFIX."mod_form_settings (page_id,section_id,header,field_loop,footer,email_to,email_from,email_subject,success_message,max_submissions,stored_submissions,use_captcha) VALUES ('$page_id','$section_id','$header','$field_loop','$footer','$email_to','$email_from','$email_subject','$success_message','$max_submissions','$stored_submissions','$use_captcha')"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/add.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: tags/2.6.0/wb/modules/form/install.php =================================================================== --- tags/2.6.0/wb/modules/form/install.php (nonexistent) +++ tags/2.6.0/wb/modules/form/install.php (revision 260) @@ -0,0 +1,104 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +if(defined('WB_URL')) { + + // Create tables + $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_fields`"); + $mod_form = 'CREATE TABLE `'.TABLE_PREFIX.'mod_form_fields` ( `field_id` INT NOT NULL AUTO_INCREMENT,' + . ' `section_id` INT NOT NULL ,' + . ' `page_id` INT NOT NULL ,' + . ' `position` INT NOT NULL ,' + . ' `title` VARCHAR(255) NOT NULL ,' + . ' `type` VARCHAR(255) NOT NULL ,' + . ' `required` INT NOT NULL ,' + . ' `value` TEXT NOT NULL ,' + . ' `extra` TEXT NOT NULL ,' + . ' PRIMARY KEY ( `field_id` ) )' + . ' '; + $database->query($mod_form); + $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_settings`"); + $mod_form = 'CREATE TABLE `'.TABLE_PREFIX.'mod_form_settings` (' + . ' `section_id` INT NOT NULL,' + . ' `page_id` INT NOT NULL,' + . ' `header` TEXT NOT NULL ,' + . ' `field_loop` TEXT NOT NULL ,' + . ' `footer` TEXT NOT NULL ,' + . ' `email_to` TEXT NOT NULL ,' + . ' `email_from` VARCHAR(255) NOT NULL ,' + . ' `email_subject` VARCHAR(255) NOT NULL ,' + . ' `success_message` TEXT NOT NULL ,' + . ' `stored_submissions` INT NOT NULL,' + . ' `max_submissions` INT NOT NULL,' + . ' `use_captcha` INT NOT NULL,' + . ' PRIMARY KEY ( `section_id` ) )' + . ' '; + $database->query($mod_form); + $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_submissions`"); + $mod_form = 'CREATE TABLE `'.TABLE_PREFIX.'mod_form_submissions` ( `submission_id` INT NOT NULL AUTO_INCREMENT,' + . ' `section_id` INT NOT NULL,' + . ' `page_id` INT NOT NULL,' + . ' `submitted_when` INT NOT NULL,' + . ' `submitted_by` INT NOT NULL,' + . ' `body` TEXT NOT NULL ,' + . ' PRIMARY KEY ( `submission_id` ) )' + . ' '; + $database->query($mod_form); + + // Insert info into the search table + // Module query info + $field_info = array(); + $field_info['page_id'] = 'page_id'; + $field_info['title'] = 'page_title'; + $field_info['link'] = 'link'; + $field_info['description'] = 'description'; + $field_info['modified_when'] = 'modified_when'; + $field_info['modified_by'] = 'modified_by'; + $field_info = serialize($field_info); + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'form', '$field_info')"); + // Query start + $query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_form_fields, [TP]mod_form_settings, [TP]pages WHERE "; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'form')"); + // Query body + $query_body_code = " [TP]pages.page_id = [TP]mod_form_settings.page_id AND [TP]mod_form_settings.header [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\' + OR [TP]pages.page_id = [TP]mod_form_settings.page_id AND [TP]mod_form_settings.footer [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\' + OR [TP]pages.page_id = [TP]mod_form_fields.page_id AND [TP]mod_form_fields.title [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'"; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'form')"); + // Query end + $query_end_code = ''; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'form')"); + + // Insert blank row (there needs to be at least on row for the search to work) + $database->query("INSERT INTO ".TABLE_PREFIX."mod_form_fields (page_id,section_id) VALUES ('0','0')"); + $database->query("INSERT INTO ".TABLE_PREFIX."mod_form_settings (page_id,section_id) VALUES ('0','0')"); + +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/install.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: tags/2.6.0/wb/modules/form/modify_settings.php =================================================================== --- tags/2.6.0/wb/modules/form/modify_settings.php (nonexistent) +++ tags/2.6.0/wb/modules/form/modify_settings.php (revision 260) @@ -0,0 +1,158 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +require('../../config.php'); + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Get header and footer +$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_settings WHERE section_id = '$section_id'"); +$setting = $query_content->fetchRow(); + +// Set raw html <'s and >'s to be replace by friendly html code +$raw = array('<', '>'); +$friendly = array('<', '>'); + +?> + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: + +
: + +
: + +
: + +
: + + +
: + +
: + +
: + +
: + +
: + /> + + /> + +
+ + + + + + +
  + + + +
+ + +print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/modify_settings.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: tags/2.6.0/wb/modules/form/info.php =================================================================== --- tags/2.6.0/wb/modules/form/info.php (nonexistent) +++ tags/2.6.0/wb/modules/form/info.php (revision 260) @@ -0,0 +1,41 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +$module_directory = 'form'; +$module_name = 'Form'; +$module_function = 'page'; +$module_version = '2.6'; +$module_platform = '2.6.x'; +$module_author = 'Ryan Djurovich & Rudolph Lartey'; +$module_license = 'GNU General Public License'; +$module_description = 'This module allows you to create customised online forms, such as a feedback form. '. +'Thank-you to Rudolph Lartey who help enhance this module, providing code for extra field types, etc.'; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/info.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: tags/2.6.0/wb/modules/form/view_submission.php =================================================================== --- tags/2.6.0/wb/modules/form/view_submission.php (nonexistent) +++ tags/2.6.0/wb/modules/form/view_submission.php (revision 260) @@ -0,0 +1,92 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['submission_id']) OR !is_numeric($_GET['submission_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $submission_id = $_GET['submission_id']; +} + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Get submission details +$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_submissions WHERE submission_id = '$submission_id'"); +$submission = $query_content->fetchRow(); + +// Get the user details of whoever did this submission +$query_user = "SELECT username,display_name FROM ".TABLE_PREFIX."users WHERE user_id = '".$submission['submitted_by']."'"; +$get_user = $database->query($query_user); +if($get_user->numRows() != 0) { + $user = $get_user->fetchRow(); +} else { + $user['display_name'] = 'Unknown'; + $user['username'] = 'unknown'; +} + +?> + + + + + + + + + + + + + + + + + + + +
:
:
:
+
+
+ +
+ +
+ + + +print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/view_submission.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/modules/form/modify_field.php =================================================================== --- tags/2.6.0/wb/modules/form/modify_field.php (nonexistent) +++ tags/2.6.0/wb/modules/form/modify_field.php (revision 260) @@ -0,0 +1,218 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['field_id']) OR !is_numeric($_GET['field_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $field_id = $_GET['field_id']; +} + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Get header and footer +$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_fields WHERE field_id = '$field_id'"); +$form = $query_content->fetchRow(); +$type = $form['type']; +if($type == '') { + $type = 'none'; +} + +// Set raw html <'s and >'s to be replaced by friendly html code +$raw = array('<', '>'); +$friendly = array('<', '>'); +?> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: + +
: + +
: + +
: + +
: + +
: + +
: + + + + + + +
: + +
+ + + + + + +
: + +
+ + +
: + + +
: + /> + + + +   + /> + + + +
: + +
: + /> + + + +   + /> + + + +
+ + + + + + + +
  + + + + + +
+ +print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/modify_field.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: tags/2.6.0/wb/modules/form/add_field.php =================================================================== --- tags/2.6.0/wb/modules/form/add_field.php (nonexistent) +++ tags/2.6.0/wb/modules/form/add_field.php (revision 260) @@ -0,0 +1,58 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +require('../../config.php'); + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); +// Get new order +$order = new order(TABLE_PREFIX.'mod_form_fields', 'position', 'field_id', 'section_id'); +$position = $order->get_new($section_id); + +// Insert new row into database +$database->query("INSERT INTO ".TABLE_PREFIX."mod_form_fields (section_id,page_id,position,required) VALUES ('$section_id','$page_id','$position','0')"); + +// Get the id +$field_id = $database->get_one("SELECT LAST_INSERT_ID()"); + +// Say that a new record has been added, then redirect to modify page +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'§ion_id='.$section_id.'&field_id='.$field_id); +} else { + $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'§ion_id='.$section_id.'&field_id='.$field_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/add_field.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: tags/2.6.0/wb/modules/form/move_down.php =================================================================== --- tags/2.6.0/wb/modules/form/move_down.php (nonexistent) +++ tags/2.6.0/wb/modules/form/move_down.php (revision 260) @@ -0,0 +1,57 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['field_id']) OR !is_numeric($_GET['field_id'])) { + header("Location: index.php"); +} else { + $field_id = $_GET['field_id']; +} + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); + +// Create new order object an reorder +$order = new order(TABLE_PREFIX.'mod_form_fields', 'position', 'field_id', 'section_id'); +if($order->move_down($field_id)) { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/move_down.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: tags/2.6.0/wb/modules/form/delete.php =================================================================== --- tags/2.6.0/wb/modules/form/delete.php (nonexistent) +++ tags/2.6.0/wb/modules/form/delete.php (revision 260) @@ -0,0 +1,35 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +// Delete page from mod_wysiwyg +$database->query("DELETE FROM ".TABLE_PREFIX."mod_form_fields WHERE page_id = '$page_id'"); +$database->query("DELETE FROM ".TABLE_PREFIX."mod_form_settings WHERE page_id = '$page_id'"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/delete.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: tags/2.6.0/wb/modules/form/delete_field.php =================================================================== --- tags/2.6.0/wb/modules/form/delete_field.php (nonexistent) +++ tags/2.6.0/wb/modules/form/delete_field.php (revision 260) @@ -0,0 +1,57 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['field_id']) OR !is_numeric($_GET['field_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $field_id = $_GET['field_id']; +} + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// Delete row +$database->query("DELETE FROM ".TABLE_PREFIX."mod_form_fields WHERE field_id = '$field_id'"); + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/delete_field.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: tags/2.6.0/wb/modules/form/index.php =================================================================== --- tags/2.6.0/wb/modules/form/index.php (nonexistent) +++ tags/2.6.0/wb/modules/form/index.php (revision 260) @@ -0,0 +1,33 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +header('Location: ../index.php'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/index.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: tags/2.6.0/wb/modules/form/move_up.php =================================================================== --- tags/2.6.0/wb/modules/form/move_up.php (nonexistent) +++ tags/2.6.0/wb/modules/form/move_up.php (revision 260) @@ -0,0 +1,57 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['field_id']) OR !is_numeric($_GET['field_id'])) { + header("Location: index.php"); +} else { + $field_id = $_GET['field_id']; +} + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); + +// Create new order object an reorder +$order = new order(TABLE_PREFIX.'mod_form_fields', 'position', 'field_id', 'section_id'); +if($order->move_up($field_id)) { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/move_up.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: tags/2.6.0/wb/modules/form/delete_submission.php =================================================================== --- tags/2.6.0/wb/modules/form/delete_submission.php (nonexistent) +++ tags/2.6.0/wb/modules/form/delete_submission.php (revision 260) @@ -0,0 +1,57 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra submission types +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['submission_id']) OR !is_numeric($_GET['submission_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $submission_id = $_GET['submission_id']; +} + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// Delete row +$database->query("DELETE FROM ".TABLE_PREFIX."mod_form_submissions WHERE submission_id = '$submission_id'"); + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/delete_submission.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/modules/form/modify.php =================================================================== --- tags/2.6.0/wb/modules/form/modify.php (nonexistent) +++ tags/2.6.0/wb/modules/form/modify.php (revision 260) @@ -0,0 +1,191 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +// Must include code to stop this file being access directly +if(!defined('WB_PATH')) { exit("Cannot access this file directly"); } + +?> + + + + + +
+ + + +
+ +
+ +

+query("SELECT * FROM `".TABLE_PREFIX."mod_form_fields` WHERE section_id = '$section_id' ORDER BY position ASC"); +if($query_fields->numRows() > 0) { + $num_fields = $query_fields->numRows(); + $row = 'a'; + ?> + + fetchRow()) { + ?> + + + + + + + + + + + +
+ + ^ + + + + + + + + + + + + + + + ^ + + + + + + v + + + + + X + +
+ + +

+ +

+ +query("SELECT * FROM `".TABLE_PREFIX."mod_form_submissions` WHERE section_id = '$section_id' ORDER BY submitted_when ASC"); +if($query_submissions->numRows() > 0) { + ?> + + fetchRow()) { + ?> + + + + + + + +
+ + <?php echo $TEXT['OPEN']; ?> + + + + X + +
+ + +
\ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/modify.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: tags/2.6.0/wb/modules/form/save_field.php =================================================================== --- tags/2.6.0/wb/modules/form/save_field.php (nonexistent) +++ tags/2.6.0/wb/modules/form/save_field.php (revision 260) @@ -0,0 +1,103 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +require('../../config.php'); + +// Get id +if(!isset($_POST['field_id']) OR !is_numeric($_POST['field_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $field_id = $_POST['field_id']; + $field_id = $field_id; +} + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// Validate all fields +if($admin->get_post('title') == '' OR $admin->get_post('type') == '') { + $admin->print_error($MESSAGE['GENERIC']['FILL_IN_ALL'], WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'§ion_id='.$section_id.'&field_id='.$field_id); +} else { + $title = $admin->add_slashes($admin->get_post('title')); + $type = $admin->get_post('type'); + $required = $admin->get_post('required'); +} + +// Update row +$database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET title = '$title', type = '$type', required = '$required' WHERE field_id = '$field_id'"); + +// If field type has multiple options, get all values and implode them +$list_count = $admin->get_post('list_count'); +if(is_numeric($list_count)) { + $values = array(); + for($i = 1; $i <= $list_count; $i++) { + if($admin->get_post('value'.$i) != '') { + $values[] = $admin->get_post('value'.$i); + } + } + $value = implode(',', $values); +} + +// Get extra fields for field-type-specific settings +if($admin->get_post('type') == 'textfield') { + $length = $admin->get_post('length'); + $value = $admin->get_post('value'); + $database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET value = '$value', extra = '$length' WHERE field_id = '$field_id'"); +} elseif($admin->get_post('type') == 'textarea') { + $value = $admin->get_post('value'); + $database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET value = '$value', extra = '' WHERE field_id = '$field_id'"); +} elseif($admin->get_post('type') == 'heading') { + $extra = $admin->get_post('template'); + if(trim($extra) == '') $extra = '{TITLE}{FIELD}'; + $extra = $admin->add_slashes($extra); + $database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET value = '', extra = '$extra' WHERE field_id = '$field_id'"); +} elseif($admin->get_post('type') == 'select') { + $extra = $admin->get_post('size').','.$admin->get_post('multiselect'); + $database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET value = '$value', extra = '$extra' WHERE field_id = '$field_id'"); +} elseif($admin->get_post('type') == 'checkbox') { + $extra = $admin->get_post('seperator'); + $database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET value = '$value', extra = '$extra' WHERE field_id = '$field_id'"); +} elseif($admin->get_post('type') == 'radio') { + $extra = $admin->get_post('seperator'); + $database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET value = '$value', extra = '$extra' WHERE field_id = '$field_id'"); +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'§ion_id='.$section_id.'&field_id='.$field_id); +} else { + $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'§ion_id='.$section_id.'&field_id='.$field_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/form/save_field.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: tags/2.6.0/wb/modules/news/comment_page.php =================================================================== --- tags/2.6.0/wb/modules/news/comment_page.php (nonexistent) +++ tags/2.6.0/wb/modules/news/comment_page.php (revision 260) @@ -0,0 +1,74 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Make sure page cannot be accessed directly +if(!defined('WB_URL')) { header('Location: ../index.php'); } + +// Get comments page template details from db +$query_settings = $database->query("SELECT comments_page,use_captcha FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '".SECTION_ID."'"); +if($query_settings->numRows() == 0) { + header('Location: '.WB_URL.'/pages/'); +} else { + $settings = $query_settings->fetchRow(); + // Print comments page + echo str_replace('[POST_TITLE]', POST_TITLE, ($settings['comments_page'])); + ?> +
+ : +
+ /> +

+ : +
+ +

+ '.$_SESSION['captcha_error'].'
'; + unset($_SESSION['captcha_error']); + } + // Captcha + if($settings['use_captcha']) { + $_SESSION['captcha'] = ''; + for($i = 0; $i < 5; $i++) { + $_SESSION['captcha'] .= rand(0,9); + } + ?> + + + + + +
:Captcha
+
+ + +
+ \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/comment_page.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: tags/2.6.0/wb/modules/news/install.php =================================================================== --- tags/2.6.0/wb/modules/news/install.php (nonexistent) +++ tags/2.6.0/wb/modules/news/install.php (revision 260) @@ -0,0 +1,138 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(defined('WB_URL')) { + + $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_posts`"); + $mod_news = 'CREATE TABLE `'.TABLE_PREFIX.'mod_news_posts` ( ' + . '`post_id` INT NOT NULL AUTO_INCREMENT,' + . '`section_id` INT NOT NULL,' + . '`page_id` INT NOT NULL,' + . '`group_id` INT NOT NULL,' + . '`active` INT NOT NULL,' + . '`position` INT NOT NULL,' + . '`title` VARCHAR(255) NOT NULL,' + . '`link` TEXT NOT NULL,' + . '`content_short` TEXT NOT NULL,' + . '`content_long` TEXT NOT NULL,' + . '`commenting` VARCHAR(7) NOT NULL,' + . '`posted_when` INT NOT NULL ,' + . '`posted_by` INT NOT NULL ,' + . 'PRIMARY KEY (post_id)' + . ' )'; + $database->query($mod_news); + + $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_groups`"); + $mod_news = 'CREATE TABLE `'.TABLE_PREFIX.'mod_news_groups` ( ' + . '`group_id` INT NOT NULL AUTO_INCREMENT,' + . '`section_id` INT NOT NULL,' + . '`page_id` INT NOT NULL,' + . '`active` INT NOT NULL,' + . '`position` INT NOT NULL,' + . '`title` VARCHAR(255) NOT NULL,' + . 'PRIMARY KEY (group_id)' + . ' )'; + $database->query($mod_news); + + $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_comments`"); + $mod_news = 'CREATE TABLE `'.TABLE_PREFIX.'mod_news_comments` ( ' + . '`comment_id` INT NOT NULL AUTO_INCREMENT,' + . '`section_id` INT NOT NULL,' + . '`page_id` INT NOT NULL,' + . '`post_id` INT NOT NULL,' + . '`title` VARCHAR(255) NOT NULL,' + . '`comment` TEXT NOT NULL,' + . '`commented_when` INT NOT NULL ,' + . '`commented_by` INT NOT NULL ,' + . 'PRIMARY KEY (comment_id)' + . ' )'; + $database->query($mod_news); + + $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_settings`"); + $mod_news = 'CREATE TABLE `'.TABLE_PREFIX.'mod_news_settings` ( ' + . '`section_id` INT NOT NULL,' + . '`page_id` INT NOT NULL,' + . '`header` TEXT NOT NULL,' + . '`post_loop` TEXT NOT NULL,' + . '`footer` TEXT NOT NULL,' + . '`posts_per_page` INT NOT NULL,' + . '`post_header` TEXT NOT NULL,' + . '`post_footer` TEXT NOT NULL,' + . '`comments_header` TEXT NOT NULL,' + . '`comments_loop` TEXT NOT NULL,' + . '`comments_footer` TEXT NOT NULL,' + . '`comments_page` TEXT NOT NULL,' + . '`commenting` VARCHAR(7) NOT NULL,' + . '`resize` INT NOT NULL,' + . ' `use_captcha` INT NOT NULL,' + . 'PRIMARY KEY (section_id)' + . ' )'; + $database->query($mod_news); + + // Insert info into the search table + // Module query info + $field_info = array(); + $field_info['page_id'] = 'page_id'; + $field_info['title'] = 'page_title'; + $field_info['link'] = 'link'; + $field_info['description'] = 'description'; + $field_info['modified_when'] = 'modified_when'; + $field_info['modified_by'] = 'modified_by'; + $field_info = serialize($field_info); + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'news', '$field_info')"); + // Query start + $query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_news_posts, [TP]mod_news_groups, [TP]mod_news_comments, [TP]mod_news_settings, [TP]pages WHERE "; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'news')"); + // Query body + $query_body_code = " + [TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.title LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.content_short LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.content_long LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_news_comments.page_id AND [TP]mod_news_comments.title LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_news_comments.page_id AND [TP]mod_news_comments.comment LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.header LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.footer LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.post_header LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.post_footer LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.comments_header LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.comments_footer LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.comments_footer LIKE \'%[STRING]%\'"; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'news')"); + // Query end + $query_end_code = ""; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'news')"); + + // Insert blank row (there needs to be at least on row for the search to work) + $database->query("INSERT INTO ".TABLE_PREFIX."mod_news_posts (section_id,page_id) VALUES ('0', '0')"); + $database->query("INSERT INTO ".TABLE_PREFIX."mod_news_groups (section_id,page_id) VALUES ('0', '0')"); + $database->query("INSERT INTO ".TABLE_PREFIX."mod_news_comments (section_id,page_id) VALUES ('0', '0')"); + $database->query("INSERT INTO ".TABLE_PREFIX."mod_news_settings (section_id,page_id) VALUES ('0', '0')"); + + // Make news post access files dir + make_dir(WB_PATH.PAGES_DIRECTORY.'/posts/'); + +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/install.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: tags/2.6.0/wb/modules/news/modify_settings.php =================================================================== --- tags/2.6.0/wb/modules/news/modify_settings.php (nonexistent) +++ tags/2.6.0/wb/modules/news/modify_settings.php (revision 260) @@ -0,0 +1,182 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Get header and footer +$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); +$fetch_content = $query_content->fetchRow(); + +// Set raw html <'s and >'s to be replace by friendly html code +$raw = array('<', '>'); +$friendly = array('<', '>'); + +?> + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: + +
: + +
: + +
: + +
: + +
: + +
: + +
: + /> + + /> + +
+ : + + +
: + +
: + +
: + +
: + +
+ + + + + + +
  + + + +
+ + +print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/modify_settings.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: tags/2.6.0/wb/modules/news/save_settings.php =================================================================== --- tags/2.6.0/wb/modules/news/save_settings.php (nonexistent) +++ tags/2.6.0/wb/modules/news/save_settings.php (revision 260) @@ -0,0 +1,67 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// This code removes any ', ''); +$header = $admin->add_slashes(str_replace($friendly, $raw, $_POST['header'])); +$post_loop = $admin->add_slashes(str_replace($friendly, $raw, $_POST['post_loop'])); +$footer = $admin->add_slashes(str_replace($friendly, $raw, $_POST['footer'])); +$post_header = $admin->add_slashes(str_replace($friendly, $raw, $_POST['post_header'])); +$post_footer = $admin->add_slashes(str_replace($friendly, $raw, $_POST['post_footer'])); +$comments_header = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_header'])); +$comments_loop = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_loop'])); +$comments_footer = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_footer'])); +$comments_page = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_page'])); +$commenting = $_POST['commenting']; +$posts_per_page = $_POST['posts_per_page']; +if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { + $resize = $_POST['resize']; + $use_captcha = $_POST['use_captcha']; +} else { + $resize = ''; + $use_captcha = false; +} + +// Update settings +$database->query("UPDATE ".TABLE_PREFIX."mod_news_settings SET header = '$header', post_loop = '$post_loop', footer = '$footer', posts_per_page = '$posts_per_page', post_header = '$post_header', post_footer = '$post_footer', comments_header = '$comments_header', comments_loop = '$comments_loop', comments_footer = '$comments_footer', comments_page = '$comments_page', commenting = '$commenting', resize = '$resize', use_captcha = '$use_captcha' WHERE section_id = '$section_id'"); + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/save_settings.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: tags/2.6.0/wb/modules/news/submit_comment.php =================================================================== --- tags/2.6.0/wb/modules/news/submit_comment.php (nonexistent) +++ tags/2.6.0/wb/modules/news/submit_comment.php (revision 260) @@ -0,0 +1,76 @@ + + Copyright (C) 2004-2005, 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 config file +require('../../config.php'); + +require_once(WB_PATH.'/framework/class.wb.php'); +$wb = new wb; + +// Check if we should show the form or add a comment +if(is_numeric($_GET['page_id']) AND is_numeric($_GET['section_id']) AND isset($_GET['post_id']) AND is_numeric($_GET['post_id']) AND isset($_POST['comment']) AND $_POST['comment'] != '') { + + // Check captcha + if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { /* Make's sure GD library is installed */ + if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){ + // Check for a mismatch + if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) { + $_SESSION['captcha_error'] = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA']; + $_SESSION['comment_title'] = $_POST['title']; + $_SESSION['comment_body'] = $_POST['comment']; + exit(header('Location: '.WB_URL.'/modules/news/comment.php?id='.$_GET['post_id'])); + } + } else { + $_SESSION['captcha_error'] = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA']; + $_SESSION['comment_title'] = $_POST['title']; + $_SESSION['comment_body'] = $_POST['comment']; + exit(header('Location: '.WB_URL.'/modules/news/comment.php?id='.$_GET['post_id'])); + } + } + if(isset($_SESSION['catpcha'])) { unset($_SESSION['captcha']); } + + // Insert the comment into db + $page_id = $_GET['page_id']; + $section_id = $_GET['section_id']; + $post_id = $_GET['post_id']; + $title = $wb->add_slashes(strip_tags($_POST['title'])); + $comment = $wb->add_slashes(strip_tags($_POST['comment'])); + $commented_when = mktime(); + if($wb->is_authenticated() == true) { + $commented_by = $wb->get_user_id(); + } else { + $commented_by = ''; + } + $query = $database->query("INSERT INTO ".TABLE_PREFIX."mod_news_comments (section_id,page_id,post_id,title,comment,commented_when,commented_by) VALUES ('$section_id','$page_id','$post_id','$title','$comment','$commented_when','$commented_by')"); + // Get page link + $query_page = $database->query("SELECT link FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'"); + $page = $query_page->fetchRow(); + header('Location: '.$wb->page_link($page['link']).'?id='.$post_id); + +} else { + header('Location: '.WB_URL.'/pages/'); +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/submit_comment.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: tags/2.6.0/wb/modules/news/add.php =================================================================== --- tags/2.6.0/wb/modules/news/add.php (nonexistent) +++ tags/2.6.0/wb/modules/news/add.php (revision 260) @@ -0,0 +1,95 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Must include code to stop this file being access directly +if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } + +$header = ' +'; +$post_loop = ' + + + + + +'; +$footer = '
[TITLE][TIME], [DATE]
+[SHORT] +[TEXT_READ_MORE] +
+ + + + + + +
[PREVIOUS_PAGE_LINK][OF][NEXT_PAGE_LINK]
'; +$post_header = addslashes(' + + + + + + + + + + +

[TITLE]

[GROUP_TITLE]
Posted by [DISPLAY_NAME] ([USERNAME]) on [DATE] at [TIME]
[PAGE_TITLE] >> [GROUP_TITLE]
+

'); +$post_footer = '

+Back'; +$comments_header = addslashes('

+ +

Comments

+'); +$comments_loop = addslashes(' + + + + + +'); +$comments_footer = '
[TITLE]By [DISPLAY_NAME] on [DATE] at [TIME]
[COMMENT]
+
Add Comment'; +$comments_page = '

Comment

+

[POST_TITLE]

+
'; +$commenting = 'none'; +$use_captcha = true; +$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_settings (section_id,page_id,header,post_loop,footer,post_header,post_footer,comments_header,comments_loop,comments_footer,comments_page,commenting,use_captcha) VALUES ('$section_id','$page_id','$header','$post_loop','$footer','$post_header','$post_footer','$comments_header','$comments_loop','$comments_footer','$comments_page','$commenting','$use_captcha')"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/add.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: tags/2.6.0/wb/modules/news/view.php =================================================================== --- tags/2.6.0/wb/modules/news/view.php (nonexistent) +++ tags/2.6.0/wb/modules/news/view.php (revision 260) @@ -0,0 +1,334 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Must include code to stop this file being access directly +if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } + +// Check if there is a start point defined +if(isset($_GET['p']) AND is_numeric($_GET['p']) AND $_GET['p'] >= 0) { + $position = $_GET['p']; +} else { + $position = 0; +} + +// Get user's username, display name, email, and id - needed for insertion into post info +$users = array(); +$query_users = $database->query("SELECT user_id,username,display_name,email FROM ".TABLE_PREFIX."users"); +if($query_users->numRows() > 0) { + while($user = $query_users->fetchRow()) { + // Insert user info into users array + $user_id = $user['user_id']; + $users[$user_id]['username'] = $user['username']; + $users[$user_id]['display_name'] = $user['display_name']; + $users[$user_id]['email'] = $user['email']; + } +} + +// Get groups (title, if they are active, and their image [if one has been uploaded]) +$groups[0]['title'] = ''; +$groups[0]['active'] = true; +$groups[0]['image'] = ''; +$query_users = $database->query("SELECT group_id,title,active FROM ".TABLE_PREFIX."mod_news_groups WHERE section_id = '$section_id' ORDER BY position ASC"); +if($query_users->numRows() > 0) { + while($group = $query_users->fetchRow()) { + // Insert user info into users array + $group_id = $group['group_id']; + $groups[$group_id]['title'] = ($group['title']); + $groups[$group_id]['active'] = $group['active']; + if(file_exists(WB_PATH.MEDIA_DIRECTORY.'/.news/image'.$group_id.'.jpg')) { + $groups[$group_id]['image'] = WB_URL.MEDIA_DIRECTORY.'/.news/image'.$group_id.'.jpg'; + } else { + $groups[$group_id]['image'] = ''; + } + } +} + +// Check if we should show the main page or a post itself +if(!defined('POST_ID') OR !is_numeric(POST_ID)) { + + // Check if we should only list posts from a certain group + if(isset($_GET['g']) AND is_numeric($_GET['g'])) { + $query_extra = " AND group_id = '".$_GET['g']."'"; + ?> + + query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); + if($query_settings->numRows() > 0) { + $fetch_settings = $query_settings->fetchRow(); + $setting_header = ($fetch_settings['header']); + $setting_post_loop = ($fetch_settings['post_loop']); + $setting_footer = ($fetch_settings['footer']); + $setting_posts_per_page = $fetch_settings['posts_per_page']; + } else { + $setting_header = ''; + $setting_post_loop = ''; + $setting_footer = ''; + $setting_posts_per_page = ''; + } + + // Get total number of posts + $query_total_num = $database->query("SELECT post_id FROM ".TABLE_PREFIX."mod_news_posts WHERE section_id = '$section_id' AND active = '1' AND title != ''$query_extra"); + $total_num = $query_total_num->numRows(); + + // Work-out if we need to add limit code to sql + if($setting_posts_per_page != 0) { + $limit_sql = " LIMIT $position,$setting_posts_per_page"; + } else { + $limit_sql = ""; + } + + // Query posts (for this page) + $query_posts = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE section_id = '$section_id' AND active = '1' AND title != ''$query_extra ORDER BY position DESC".$limit_sql); + $num_posts = $query_posts->numRows(); + + // Create previous and next links + if($setting_posts_per_page != 0) { + if($position > 0) { + if(isset($_GET['g']) AND is_numeric($_GET['g'])) { + $pl_prepend = '<< '; + } else { + $pl_prepend = '<< '; + } + $pl_append = ''; + $previous_link = $pl_prepend.$TEXT['PREVIOUS'].$pl_append; + $previous_page_link = $pl_prepend.$TEXT['PREVIOUS_PAGE'].$pl_append; + } else { + $previous_link = ''; + $previous_page_link = ''; + } + if($position+$setting_posts_per_page >= $total_num) { + $next_link = ''; + $next_page_link = ''; + } else { + if(isset($_GET['g']) AND is_numeric($_GET['g'])) { + $nl_prepend = ' '; + } else { + $nl_prepend = ' '; + } + $nl_append = ' >>'; + $next_link = $nl_prepend.$TEXT['NEXT'].$nl_append; + $next_page_link = $nl_prepend.$TEXT['NEXT_PAGE'].$nl_append; + } + if($position+$setting_posts_per_page > $total_num) { + $num_of = $position+$num_posts; + } else { + $num_of = $position+$setting_posts_per_page; + } + $out_of = ($position+1).'-'.$num_of.' '.strtolower($TEXT['OUT_OF']).' '.$total_num; + $of = ($position+1).'-'.$num_of.' '.strtolower($TEXT['OF']).' '.$total_num; + $display_previous_next_links = ''; + } else { + $display_previous_next_links = 'none'; + } + + // Print header + if($display_previous_next_links == 'none') { + echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array('','','','','','', $display_previous_next_links), $setting_header); + } else { + echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array($next_page_link, $next_link, $previous_page_link, $previous_link, $out_of, $of, $display_previous_next_links), $setting_header); + } + + if($num_posts > 0) { + if($query_extra != '') { + ?> +
+ '.PAGE_TITLE.' >> '.$groups[$_GET['g']]['title']; ?> +
+ fetchRow()) { + if(isset($groups[$post['group_id']]['active']) AND $groups[$post['group_id']]['active'] != false) { // Make sure parent group is active + $uid = $post['posted_by']; // User who last modified the post + // Workout date and time of last modified post + $post_date = gmdate(DATE_FORMAT, $post['posted_when']+TIMEZONE); + $post_time = gmdate(TIME_FORMAT, $post['posted_when']+TIMEZONE); + // Work-out the post link + $post_link = page_link($post['link']); + if(isset($_GET['p']) AND $position > 0) { + $post_link .= '?p='.$position; + } + if(isset($_GET['g']) AND is_numeric($_GET['g'])) { + if(isset($_GET['p']) AND $position > 0) { $post_link .= '&'; } else { $post_link .= '?'; } + $post_link .= 'g='.$_GET['g']; + } + // Get group id, title, and image + $group_id = $post['group_id']; + $group_title = $groups[$group_id]['title']; + $group_image = $groups[$group_id]['image']; + if($group_image == '') { $display_image = 'none'; } else { $display_image = ''; } + if($group_id == 0) { $display_group = 'none'; } else { $display_group = ''; } + // Replace [wblink--PAGE_ID--] with real link + $short = ($post['content_short']); + $wb->preprocess($short); + // Replace vars with values + $post_long_len = strlen($post['content_long']); + $vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[LINK]', '[DATE]', '[TIME]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]', '[TEXT_READ_MORE]'); + if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') { + if($post_long_len < 9) { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email'], ''); + } else { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email'], $TEXT['READ_MORE']); + } + } else { + if($post_long_len < 9) { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, '', '', '', '', ''); + } else { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, '', '', '', '', $TEXT['READ_MORE']); + } + } + echo str_replace($vars, $values, $setting_post_loop); + } + } + } + + // Print footer + if($display_previous_next_links == 'none') { + echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array('','','','','','', $display_previous_next_links), $setting_footer); + } else { + echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array($next_page_link, $next_link, $previous_page_link, $previous_link, $out_of, $of, $display_previous_next_links), $setting_footer); + } + +} elseif(defined('POST_ID') AND is_numeric(POST_ID)) { + + // Get settings + $query_settings = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); + if($query_settings->numRows() > 0) { + $fetch_settings = $query_settings->fetchRow(); + $setting_post_header = ($fetch_settings['post_header']); + $setting_post_footer = ($fetch_settings['post_footer']); + $setting_comments_header = ($fetch_settings['comments_header']); + $setting_comments_loop = ($fetch_settings['comments_loop']); + $setting_comments_footer = ($fetch_settings['comments_footer']); + } else { + $setting_post_header = ''; + $setting_post_footer = ''; + $setting_comments_header = ''; + $setting_comments_loop = ''; + $setting_comments_footer = ''; + } + + // Get page info + $query_page = $database->query("SELECT link FROM ".TABLE_PREFIX."pages WHERE page_id = '".PAGE_ID."'"); + if($query_page->numRows() > 0) { + $page = $query_page->fetchRow(); + $page_link = page_link($page['link']); + if(isset($_GET['p']) AND $position > 0) { + $page_link .= '?p='.$_GET['p']; + } + if(isset($_GET['g']) AND is_numeric($_GET['g'])) { + if(isset($_GET['p']) AND $position > 0) { $page_link .= '&'; } else { $page_link .= '?'; } + $page_link .= 'g='.$_GET['g']; + } + } else { + exit('Page not found'); + } + + // Get post info + $query_post = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '".POST_ID."' AND active = '1'"); + if($query_post->numRows() > 0) { + $post = $query_post->fetchRow(); + if(isset($groups[$post['group_id']]['active']) AND $groups[$post['group_id']]['active'] != false) { // Make sure parent group is active + $uid = $post['posted_by']; // User who last modified the post + // Workout date and time of last modified post + $post_date = gmdate(DATE_FORMAT, $post['posted_when']+TIMEZONE); + $post_time = gmdate(TIME_FORMAT, $post['posted_when']+TIMEZONE); + // Get group id, title, and image + $group_id = $post['group_id']; + $group_title = $groups[$group_id]['title']; + $group_image = $groups[$group_id]['image']; + if($group_image == '') { $display_image = 'none'; } else { $display_image = ''; } + if($group_id == 0) { $display_group = 'none'; } else { $display_group = ''; } + $vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[BACK]', '[DATE]', '[TIME]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]'); + $post_short=$post['content_short']; + $wb->preprocess($post_short); + if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $post_date, $post_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email']); + } else { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $post_date, $post_time, '', '', '', ''); + } + $post_long = ($post['content_long']); + } + } else { + header('Location: '.WB_URL.'/pages/'); + } + + // Print post header + echo str_replace($vars, $values, $setting_post_header); + + // Replace [wblink--PAGE_ID--] with real link + $wb->preprocess($post_long); + // Print long + echo $post_long; + + // Print post footer + echo str_replace($vars, $values, $setting_post_footer); + + // Show comments section if we have to + if($post['commenting'] == 'private' AND isset($admin) AND $admin->is_authenticated() == true OR $post['commenting'] == 'public') { + + // Print comments header + echo str_replace('[ADD_COMMENT_URL]', WB_URL.'/modules/news/comment.php?id='.POST_ID, $setting_comments_header); + + // Query for comments + $query_comments = $database->query("SELECT title,comment,commented_when,commented_by FROM ".TABLE_PREFIX."mod_news_comments WHERE post_id = '".POST_ID."' ORDER BY commented_when ASC"); + if($query_comments->numRows() > 0) { + while($comment = $query_comments->fetchRow()) { + // Display Comments without slashes, but with new-line characters + $comment['comment'] = nl2br(($comment['comment'])); + $comment['title'] = ($comment['title']); + // Print comments loop + $commented_date = gmdate(DATE_FORMAT, $comment['commented_when']+TIMEZONE); + $commented_time = gmdate(TIME_FORMAT, $comment['commented_when']+TIMEZONE); + $uid = $comment['commented_by']; + $vars = array('[TITLE]','[COMMENT]','[DATE]','[TIME]','[USER_ID]','[USERNAME]','[DISPLAY_NAME]', '[EMAIL]'); + if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') { + $values = array(($comment['title']), ($comment['comment']), $commented_date, $commented_time, $uid, ($users[$uid]['username']), ($users[$uid]['display_name']), ($users[$uid]['email'])); + } else { + $values = array(($comment['title']), ($comment['comment']), $commented_date, $commented_time, '0', strtolower($TEXT['UNKNOWN']), $TEXT['UNKNOWN'], ''); + } + echo str_replace($vars, $values, $setting_comments_loop); + } + } else { + // Say no comments found + if(isset($TEXT['NONE_FOUND'])) { + echo $TEXT['NONE_FOUND'].'
'; + } else { + echo 'None Found
'; + } + } + + // Print comments footer + echo str_replace('[ADD_COMMENT_URL]', WB_URL.'/modules/news/comment.php?id='.POST_ID, $setting_comments_footer); + + } + +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/view.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: tags/2.6.0/wb/modules/news/modify_group.php =================================================================== --- tags/2.6.0/wb/modules/news/modify_group.php (nonexistent) +++ tags/2.6.0/wb/modules/news/modify_group.php (revision 260) @@ -0,0 +1,105 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['group_id']) OR !is_numeric($_GET['group_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $group_id = $_GET['group_id']; +} + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Get header and footer +$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_groups WHERE group_id = '$group_id'"); +$fetch_content = $query_content->fetchRow(); + +?> + +
+ + + + + + + + + + + + + + + + + + + + + + +
: + +
: + View +   + + + + +
: + /> + + + + - + /> + + + +
+ + + + + + +
+ + + +
+ + +print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/modify_group.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: tags/2.6.0/wb/modules/news/modify_post.php =================================================================== --- tags/2.6.0/wb/modules/news/modify_post.php (nonexistent) +++ tags/2.6.0/wb/modules/news/modify_post.php (revision 260) @@ -0,0 +1,197 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['post_id']) OR !is_numeric($_GET['post_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $post_id = $_GET['post_id']; +} + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Get header and footer +$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'"); +$fetch_content = $query_content->fetchRow(); + +if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) { + function show_wysiwyg_editor($name,$id,$content,$width,$height) { + echo ''; + } +} else { + $id_list=array("short","long"); + require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'); +} + +?> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: + +
: + +
: + +
: + /> + + + +   + /> + + + +
: + +
: + +
+ + + + + + + +
+   + + + + +
+ +
+ +

+ +query("SELECT * FROM `".TABLE_PREFIX."mod_news_comments` WHERE section_id = '$section_id' AND post_id = '$post_id' ORDER BY commented_when DESC"); +if($query_comments->numRows() > 0) { + $row = 'a'; + ?> + + fetchRow()) { + ?> + + + + + + +
+ + ^ + + + + + + + + X + +
+ + + + +print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/modify_post.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: tags/2.6.0/wb/modules/news/comment.php =================================================================== --- tags/2.6.0/wb/modules/news/comment.php (nonexistent) +++ tags/2.6.0/wb/modules/news/comment.php (revision 260) @@ -0,0 +1,71 @@ + + Copyright (C) 2004-2005, 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 config file +require('../../config.php'); + +// Check if there is a post id +if(!isset($_GET['id']) OR !is_numeric($_GET['id'])) { + if(!isset($_POST['post_id']) OR !is_numeric($_POST['post_id'])) { + header('Location: '.WB_URL.'/pages/'); + } else { + $post_id = $_POST['post_id']; + } +} else { + $post_id = $_GET['id']; +} + +// Include database class +require_once(WB_PATH.'/framework/class.database.php'); +$database = new database(); + +// Query post for page id +$query_post = $database->query("SELECT post_id,title,section_id,page_id FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'"); +if($query_post->numRows() == 0) { + header('Location: '.WB_URL.'/pages/'); +} else { + $fetch_post = $query_post->fetchRow(); + $page_id = $fetch_post['page_id']; + $section_id = $fetch_post['section_id']; + $post_id = $fetch_post['post_id']; + $post_title = $fetch_post['title']; + define('SECTION_ID', $section_id); + define('POST_ID', $post_id); + define('POST_TITLE', $post_title); + // Get page details + $query_page = $database->query("SELECT parent,page_title,menu_title,keywords,description,visibility FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); + if($query_page->numRows() == 0) { + header('Location: '.WB_URL.'/pages/'); + } else { + $page = $query_page->fetchRow(); + // Required page details + define('PAGE_CONTENT', WB_PATH.'/modules/news/comment_page.php'); + // Include index (wrapper) file + require(WB_PATH.'/index.php'); + } +} + + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/comment.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: tags/2.6.0/wb/modules/news/info.php =================================================================== --- tags/2.6.0/wb/modules/news/info.php (nonexistent) +++ tags/2.6.0/wb/modules/news/info.php (revision 260) @@ -0,0 +1,35 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +$module_directory = 'news'; +$module_name = 'News'; +$module_function = 'page'; +$module_version = '2.6'; +$module_platform = '2.6.x'; +$module_author = 'Ryan Djurovich'; +$module_license = 'GNU General Public License'; +$module_description = 'This page type is designed for making a news page.'; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/info.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: tags/2.6.0/wb/modules/news/modify_comment.php =================================================================== --- tags/2.6.0/wb/modules/news/modify_comment.php (nonexistent) +++ tags/2.6.0/wb/modules/news/modify_comment.php (revision 260) @@ -0,0 +1,85 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['comment_id']) OR !is_numeric($_GET['comment_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $comment_id = $_GET['comment_id']; +} + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Get header and footer +$query_content = $database->query("SELECT post_id,title,comment FROM ".TABLE_PREFIX."mod_news_comments WHERE comment_id = '$comment_id'"); +$fetch_content = $query_content->fetchRow(); + +?> + +
+ + + + + + + + + + + + + + + +
: + +
: + +
+ +
+ + + + + + +
+ + + +
+ + +print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/modify_comment.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: tags/2.6.0/wb/modules/news/modify.php =================================================================== --- tags/2.6.0/wb/modules/news/modify.php (nonexistent) +++ tags/2.6.0/wb/modules/news/modify.php (revision 260) @@ -0,0 +1,192 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Must include code to stop this file being access directly +if(!defined('WB_PATH')) { exit("Cannot access this file directly"); } + +?> + + + + + + +
+ + + + + +
+ +
+ +

+ +query("SELECT * FROM `".TABLE_PREFIX."mod_news_posts` WHERE section_id = '$section_id' ORDER BY position DESC"); +if($query_posts->numRows() > 0) { + $num_posts = $query_posts->numRows(); + $row = 'a'; + ?> + + fetchRow()) { + ?> + + + + + + + + + + + +
+ + Modify - + + + + + + + query("SELECT title FROM ".TABLE_PREFIX."mod_news_groups WHERE group_id = '".$post['group_id']."'"); + if($query_title->numRows() > 0) { + $fetch_title = $query_title->fetchRow(); + echo ($fetch_title['title']); + } else { + echo $TEXT['NONE']; + } + ?> + + query("SELECT title FROM ".TABLE_PREFIX."mod_news_comments WHERE post_id = '".$post['post_id']."'"); + echo $query_title->numRows(); + ?> + + + + + + ^ + + + + + + v + + + + + X + +
+ + +

+ +query("SELECT * FROM `".TABLE_PREFIX."mod_news_groups` WHERE section_id = '$section_id' ORDER BY position ASC"); +if($query_groups->numRows() > 0) { + $num_groups = $query_groups->numRows(); + $row = 'a'; + ?> + + fetchRow()) { + ?> + + + + + + + + + +
+ + Modify - + + + + + + + + + + + ^ + + + + + + v + + + + + X + +
+ \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/modify.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: tags/2.6.0/wb/modules/news/move_down.php =================================================================== --- tags/2.6.0/wb/modules/news/move_down.php (nonexistent) +++ tags/2.6.0/wb/modules/news/move_down.php (revision 260) @@ -0,0 +1,60 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['post_id']) OR !is_numeric($_GET['post_id'])) { + if(!isset($_GET['group_id']) OR !is_numeric($_GET['group_id'])) { + header("Location: index.php"); + } else { + $id = $_GET['group_id']; + $id_field = 'group_id'; + $table = TABLE_PREFIX.'mod_news_groups'; + } +} else { + $id = $_GET['post_id']; + $id_field = 'post_id'; + $table = TABLE_PREFIX.'mod_news_posts'; +} + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); + +// Create new order object an reorder +$order = new order($table, 'position', $id_field, 'section_id'); +if($order->move_down($id)) { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/move_down.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: tags/2.6.0/wb/modules/news/add_post.php =================================================================== --- tags/2.6.0/wb/modules/news/add_post.php (nonexistent) +++ tags/2.6.0/wb/modules/news/add_post.php (revision 260) @@ -0,0 +1,58 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); +// Get new order +$order = new order(TABLE_PREFIX.'mod_news_posts', 'position', 'post_id', 'section_id'); +$position = $order->get_new($section_id); + +// Get default commenting +$query_settings = $database->query("SELECT commenting FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); +$fetch_settings = $query_settings->fetchRow(); +$commenting = $fetch_settings['commenting']; + +// Insert new row into database +$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_posts (section_id,page_id,position,commenting,active) VALUES ('$section_id','$page_id','$position','$commenting','1')"); + +// Get the id +$post_id = $database->get_one("SELECT LAST_INSERT_ID()"); + +// Say that a new record has been added, then redirect to modify page +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id); +} else { + $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/add_post.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: tags/2.6.0/wb/modules/news/delete.php =================================================================== --- tags/2.6.0/wb/modules/news/delete.php (nonexistent) +++ tags/2.6.0/wb/modules/news/delete.php (revision 260) @@ -0,0 +1,34 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Must include code to stop this file being access directly +if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } + +$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_posts WHERE section_id = '$section_id'"); +$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_groups WHERE section_id = '$section_id'"); +$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_comments WHERE section_id = '$section_id'"); +$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/delete.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: tags/2.6.0/wb/modules/news/add_group.php =================================================================== --- tags/2.6.0/wb/modules/news/add_group.php (nonexistent) +++ tags/2.6.0/wb/modules/news/add_group.php (revision 260) @@ -0,0 +1,53 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); +// Get new order +$order = new order(TABLE_PREFIX.'mod_news_groups', 'position', 'group_id', 'section_id'); +$position = $order->get_new($section_id); + +// Insert new row into database +$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_groups (section_id,page_id,position,active) VALUES ('$section_id','$page_id','$position','1')"); + +// Get the id +$group_id = $database->get_one("SELECT LAST_INSERT_ID()"); + +// Say that a new record has been added, then redirect to modify page +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_group.php?page_id='.$page_id.'§ion_id='.$section_id.'&group_id='.$group_id); +} else { + $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_group.php?page_id='.$page_id.'§ion_id='.$section_id.'&group_id='.$group_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/add_group.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: tags/2.6.0/wb/modules/news/delete_post.php =================================================================== --- tags/2.6.0/wb/modules/news/delete_post.php (nonexistent) +++ tags/2.6.0/wb/modules/news/delete_post.php (revision 260) @@ -0,0 +1,70 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['post_id']) OR !is_numeric($_GET['post_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $post_id = $_GET['post_id']; +} + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// Get post details +$query_details = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'"); +if($query_details->numRows() > 0) { + $get_details = $query_details->fetchRow(); +} else { + $admin->print_error($TEXT['NOT_FOUND'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Unlink post access file +if(is_writable(WB_PATH.$get_details['link'].'.php')) { + unlink(WB_PATH.$get_details['link'].'.php'); +} + +// Delete post +$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id' LIMIT 1"); + +// Clean up ordering +require(WB_PATH.'/framework/class.order.php'); +$order = new order(TABLE_PREFIX.'mod_news_posts', 'position', 'post_id', 'section_id'); +$order->clean($section_id); + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/modify_post.php?page_id='.$page_id.'&post_id='.$post_id); +} else { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/delete_post.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: tags/2.6.0/wb/modules/news/uninstall.php =================================================================== --- tags/2.6.0/wb/modules/news/uninstall.php (nonexistent) +++ tags/2.6.0/wb/modules/news/uninstall.php (revision 260) @@ -0,0 +1,38 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Must include code to stop this file being access directly +if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } + +$database->query("DELETE FROM ".TABLE_PREFIX."search WHERE name = 'module' AND value = 'news'"); +$database->query("DELETE FROM ".TABLE_PREFIX."search WHERE extra = 'news'"); +$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_posts"); +$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_groups"); +$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_comments"); +$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_settings"); +require(WB_PATH.'/framework/functions.php'); +rm_full_dir(WB_PATH.PAGES_DIRECTORY.'/posts'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/uninstall.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: tags/2.6.0/wb/modules/news/move_up.php =================================================================== --- tags/2.6.0/wb/modules/news/move_up.php (nonexistent) +++ tags/2.6.0/wb/modules/news/move_up.php (revision 260) @@ -0,0 +1,60 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['post_id']) OR !is_numeric($_GET['post_id'])) { + if(!isset($_GET['group_id']) OR !is_numeric($_GET['group_id'])) { + header("Location: index.php"); + } else { + $id = $_GET['group_id']; + $id_field = 'group_id'; + $table = TABLE_PREFIX.'mod_news_groups'; + } +} else { + $id = $_GET['post_id']; + $id_field = 'post_id'; + $table = TABLE_PREFIX.'mod_news_posts'; +} + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); + +// Create new order object an reorder +$order = new order($table, 'position', $id_field, 'section_id'); +if($order->move_up($id)) { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/move_up.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: tags/2.6.0/wb/modules/news/delete_group.php =================================================================== --- tags/2.6.0/wb/modules/news/delete_group.php (nonexistent) +++ tags/2.6.0/wb/modules/news/delete_group.php (revision 260) @@ -0,0 +1,52 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['group_id']) OR !is_numeric($_GET['group_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $group_id = $_GET['group_id']; +} + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// Update row +$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_groups WHERE group_id = '$group_id'"); + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/delete_group.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: tags/2.6.0/wb/modules/news/delete_comment.php =================================================================== --- tags/2.6.0/wb/modules/news/delete_comment.php (nonexistent) +++ tags/2.6.0/wb/modules/news/delete_comment.php (revision 260) @@ -0,0 +1,59 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(!isset($_GET['comment_id']) OR !is_numeric($_GET['comment_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $comment_id = $_GET['comment_id']; +} + +// Get post id +if(!isset($_GET['post_id']) OR !is_numeric($_GET['post_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $post_id = $_GET['post_id']; +} + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// Update row +$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_comments WHERE comment_id = '$comment_id'"); + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id); +} else { + $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/delete_comment.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: tags/2.6.0/wb/modules/news/save_post.php =================================================================== --- tags/2.6.0/wb/modules/news/save_post.php (nonexistent) +++ tags/2.6.0/wb/modules/news/save_post.php (revision 260) @@ -0,0 +1,115 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(!isset($_POST['post_id']) OR !is_numeric($_POST['post_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $id = $_POST['post_id']; + $post_id = $id; +} + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// Validate all fields +if($admin->get_post('title') == '' AND $admin->get_post('url') == '') { + $admin->print_error($MESSAGE['GENERIC']['FILL_IN_ALL'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$id); +} else { + $title = $admin->add_slashes($admin->get_post('title')); + $short = $admin->add_slashes($admin->get_post('short')); + $long = $admin->add_slashes($admin->get_post('long')); + $commenting = $admin->get_post('commenting'); + $active = $admin->get_post('active'); + $old_link = $admin->get_post('link'); + $group_id = $admin->get_post('group'); +} + +// Get page link URL +$query_page = $database->query("SELECT level,link FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$page = $query_page->fetchRow(); +$page_level = $page['level']; +$page_link = $page['link']; + +// Include WB functions file +require(WB_PATH.'/framework/functions.php'); + +// Work-out what the link should be +$post_link = '/posts/'.page_filename($title).$post_id; + +// Make sure the post link is set and exists +// Make news post access files dir +make_dir(WB_PATH.PAGES_DIRECTORY.'/posts/'); +if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/posts/')) { + $admin->print_error($MESSAGE['PAGES']['CANNOT_CREATE_ACCESS_FILE']); +} elseif($old_link != $post_link OR !file_exists(WB_PATH.PAGES_DIRECTORY.$post_link.'.php')) { + // We need to create a new file + // First, delete old file if it exists + if(file_exists(WB_PATH.$old_link.'.php')) { + unlink(WB_PATH.$old_link.'.php'); + } + // Specify the filename + $filename = WB_PATH.PAGES_DIRECTORY.'/'.$post_link.'.php'; + // The depth of the page directory in the directory hierarchy + // '/pages' is at depth 1 + $pages_dir_depth=count(explode('/',PAGES_DIRECTORY))-1; + // Work-out how many ../'s we need to get to the index page + $index_location = '../'; + for($i = 0; $i < $pages_dir_depth; $i++) { + $index_location .= '../'; + } + // Write to the filename + $content = ''. +''; + $handle = fopen($filename, 'w'); + fwrite($handle, $content); + fclose($handle); + change_mode($filename); +} + +// Update row +$database->query("UPDATE ".TABLE_PREFIX."mod_news_posts SET group_id = '$group_id', title = '$title', link = '$post_link', content_short = '$short', content_long = '$long', commenting = '$commenting', active = '$active', posted_when = '".mktime()."', posted_by = '".$admin->get_user_id()."' WHERE post_id = '$post_id'"); + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$id); +} else { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/save_post.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: tags/2.6.0/wb/modules/news/rss.php =================================================================== --- tags/2.6.0/wb/modules/news/rss.php (nonexistent) +++ tags/2.6.0/wb/modules/news/rss.php (revision 260) @@ -0,0 +1,94 @@ + + Copyright (C) 2004-2005, 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 files +require_once('../../config.php'); +require_once(WB_PATH.'/framework/class.frontend.php'); +$database = new database(); +$wb = new frontend(); +$wb->get_page_details(); +$wb->get_website_settings(); + +// Check that GET values have been supplied +if(isset($_GET['page_id']) AND is_numeric($_GET['page_id'])) { + $page_id = $_GET['page_id']; +} else { + header('Location: '.WB_URL); +} +if(isset($_GET['group_id']) AND is_numeric($_GET['group_id'])) { + $group_id = $_GET['group_id']; +} + +// Sending XML header +header("Content-type: text/xml"); + +// Header info +// Required by CSS 2.0 + +echo ""; +echo ""; +echo "".PAGE_TITLE.""; +echo "".WB_URL.""; +echo "".PAGE_DESCRIPTION.""; + +// Optional header info +echo "".DEFAULT_LANGUAGE.""; +echo "".WB_URL.""; +echo "".SERVER_EMAIL.""; +echo "".SERVER_EMAIL.""; +echo "".WEBSITE_TITLE.""; +echo "Website Baker Content Management System"; + +// Get news items from database + +//Query +if(isset($group_id)) { + $query = "SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE group_id=".$group_id." AND page_id = ".$page_id." AND active=1 ORDER BY posted_when DESC"; +} else { + $query = "SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE page_id=".$page_id." AND active=1 ORDER BY posted_when DESC"; +} +$result = $database->query($query); + +//Generating the news items +while($item = $result->fetchRow($result)){ + + echo ""; + echo "".$item["title"].""; + // Stripping HTML Tags for text-only visibility + echo "".strip_tags($item["content_short"]).""; + echo "".WB_URL."/pages".$item["link"].PAGE_EXTENSION.""; + /* Add further (non required) information here like ie. + echo "".$item["posted_by"].""); + etc. + */ + echo ""; + +} + +// Writing footer information +echo ""; +echo ""; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/rss.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/modules/news/save_group.php =================================================================== --- tags/2.6.0/wb/modules/news/save_group.php (nonexistent) +++ tags/2.6.0/wb/modules/news/save_group.php (revision 260) @@ -0,0 +1,99 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(!isset($_POST['group_id']) OR !is_numeric($_POST['group_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $group_id = $_POST['group_id']; +} + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// Include WB functions file +require(WB_PATH.'/framework/functions.php'); + +// Vagroup_idate all fields +if($admin->get_post('title') == '') { + $admin->print_error($MESSAGE['GENERIC']['FILL_IN_ALL'], WB_URL.'/modules/news/modify_group.php?page_id='.$page_id.'§ion_id='.$section_id.'&group_id='.$group_id); +} else { + $title = $admin->add_slashes($admin->get_post('title')); + $active = $admin->get_post('active'); +} + +// Update row +$database->query("UPDATE ".TABLE_PREFIX."mod_news_groups SET title = '$title', active = '$active' WHERE group_id = '$group_id'"); + +// Check if the user uploaded an image or wants to delete one +if(isset($_FILES['image']['tmp_name']) AND $_FILES['image']['tmp_name'] != '') { + // Get real filename and set new filename + $filename = $_FILES['image']['name']; + $new_filename = WB_PATH.MEDIA_DIRECTORY.'/.news/image'.$group_id.'.jpg'; + // Make sure the image is a jpg file + if(substr($filename, -3, 3) != 'jpg') { + $admin->print_error($MESSAGE['GENERIC']['FILE_TYPE'].' JPG (JPEG)'); + } elseif(mime_content_type($_FILES['image']['tmp_name']) != 'image/jpeg' AND mime_content_type($_FILES['image']['tmp_name']) != 'image/jpg') { + $admin->print_error($MESSAGE['GENERIC']['FILE_TYPE'].' JPG (JPEG)'); + } + // Make sure the target directory exists + make_dir(WB_PATH.MEDIA_DIRECTORY.'/.news'); + // Upload image + move_uploaded_file($_FILES['image']['tmp_name'], $new_filename); + // Check if we need to create a thumb + $query_settings = $database->query("SELECT resize FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); + $fetch_settings = $query_settings->fetchRow(); + $resize = $fetch_settings['resize']; + if($resize != 0) { + // Resize the image + $thumb_location = WB_PATH.MEDIA_DIRECTORY.'/.news/thumb'.$group_id.'.jpg'; + if(make_thumb($new_filename, $thumb_location, $resize)) { + // Delete the actual image and replace with the resized version + unlink($new_filename); + rename($thumb_location, $new_filename); + } + } +} +if(isset($_POST['delete_image']) AND $_POST['delete_image'] != '') { + // Try unlinking image + if(file_exists(WB_PATH.MEDIA_DIRECTORY.'/.news/image'.$group_id.'.jpg')) { + unlink(WB_PATH.MEDIA_DIRECTORY.'/.news/image'.$group_id.'.jpg'); + } +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_group.php?page_id='.$page_id.'§ion_id='.$section_id.'&group_id='.$group_id); +} else { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> Property changes on: tags/2.6.0/wb/modules/news/save_group.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: tags/2.6.0/wb/modules/news/save_comment.php =================================================================== --- tags/2.6.0/wb/modules/news/save_comment.php (nonexistent) +++ tags/2.6.0/wb/modules/news/save_comment.php (revision 260) @@ -0,0 +1,61 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Get id +if(!isset($_POST['comment_id']) OR !is_numeric($_POST['comment_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); +} else { + $comment_id = $_POST['comment_id']; +} + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// Validate all fields +if($admin->get_post('title') == '' AND $admin->get_post('comment') == '') { + $admin->print_error($MESSAGE['GENERIC']['FILL_IN_ALL'], WB_URL.'/modules/modify_comment.php?page_id='.$page_id.'§ion_id='.$section_id.'comment_id='.$id); +} else { + $title = $admin->add_slashes($admin->get_post('title')); + $comment = $admin->add_slashes($admin->get_post('comment')); + $post_id = $admin->get_post('post_id'); +} + +// Update row +$database->query("UPDATE ".TABLE_PREFIX."mod_news_comments SET title = '$title', comment = '$comment' WHERE comment_id = '$comment_id'"); + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_comment.php?page_id='.$page_id.'§ion_id='.$section_id.'&comment_id='.$id); +} else { + $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/save_comment.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: tags/2.6.0/wb/modules/news/index.php =================================================================== --- tags/2.6.0/wb/modules/news/index.php (nonexistent) +++ tags/2.6.0/wb/modules/news/index.php (revision 260) @@ -0,0 +1,3 @@ + \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/news/index.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: tags/2.6.0/wb/modules/wysiwyg/view.php =================================================================== --- tags/2.6.0/wb/modules/wysiwyg/view.php (nonexistent) +++ tags/2.6.0/wb/modules/wysiwyg/view.php (revision 260) @@ -0,0 +1,35 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Get content +$get_content = $database->query("SELECT content FROM ".TABLE_PREFIX."mod_wysiwyg WHERE section_id = '$section_id'"); +$fetch_content = $get_content->fetchRow(); +$content = ($fetch_content['content']); + +$wb->preprocess($content); + +echo $content; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/wysiwyg/view.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: tags/2.6.0/wb/modules/wysiwyg/save.php =================================================================== --- tags/2.6.0/wb/modules/wysiwyg/save.php (nonexistent) +++ tags/2.6.0/wb/modules/wysiwyg/save.php (revision 260) @@ -0,0 +1,51 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../../config.php'); + +// Include WB admin wrapper script +$update_when_modified = true; // Tells script to update when this page was last updated +require(WB_PATH.'/modules/admin.php'); + +// Update the mod_wysiwygs table with the contents +if(isset($_POST['content'.$section_id])) { + $content = $admin->add_slashes($_POST['content'.$section_id]); + $text = strip_tags($content); + $database = new database(); + $query = "UPDATE ".TABLE_PREFIX."mod_wysiwyg SET content = '$content', text = '$text' WHERE section_id = '$section_id'"; + $database->query($query); +} + +// Check if there is a database error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), $js_back); +} else { + $admin->print_success($MESSAGE['PAGES']['SAVED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/wysiwyg/save.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: tags/2.6.0/wb/modules/wysiwyg/modify.php =================================================================== --- tags/2.6.0/wb/modules/wysiwyg/modify.php (nonexistent) +++ tags/2.6.0/wb/modules/wysiwyg/modify.php (revision 260) @@ -0,0 +1,79 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(!defined('WB_PATH')) exit('Direct access to this file is not allowed'); + +// Get page content +$query = "SELECT content FROM ".TABLE_PREFIX."mod_wysiwyg WHERE section_id = '$section_id'"; +$get_content = $database->query($query); +$content = $get_content->fetchRow(); +$content = (htmlspecialchars($content['content'])); + +if(!isset($wysiwyg_editor_loaded)) { + $wysiwyg_editor_loaded=true; + + if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) { + function show_wysiwyg_editor($name,$id,$content,$width,$height) { + echo ''; + } + } else { + $id_list=array(); + $query_wysiwyg = $database->query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'wysiwyg'"); + if($query_wysiwyg->numRows() > 0) { + while($wysiwyg_section = $query_wysiwyg->fetchRow()) { + $entry='content'.$wysiwyg_section['section_id']; + array_push($id_list,$entry); + } + require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'); + } + } +} + +?> + +
+ + + + + + + + + + + +
+ + + + +
+ + + +
\ No newline at end of file Property changes on: tags/2.6.0/wb/modules/wysiwyg/modify.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: tags/2.6.0/wb/modules/wysiwyg/info.php =================================================================== --- tags/2.6.0/wb/modules/wysiwyg/info.php (nonexistent) +++ tags/2.6.0/wb/modules/wysiwyg/info.php (revision 260) @@ -0,0 +1,35 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +$module_directory = 'wysiwyg'; +$module_name = 'WYSIWYG'; +$module_function = 'page'; +$module_version = '2.6'; +$module_platform = '2.6.x'; +$module_author = 'Ryan Djurovich'; +$module_license = 'GNU General Public License'; +$module_description = 'This module allows you to edit the contents of a page using the WYSIWYG htmlArea program'; + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/wysiwyg/info.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: tags/2.6.0/wb/modules/wysiwyg/delete.php =================================================================== --- tags/2.6.0/wb/modules/wysiwyg/delete.php (nonexistent) +++ tags/2.6.0/wb/modules/wysiwyg/delete.php (revision 260) @@ -0,0 +1,29 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Delete record from the database +$database->query("DELETE FROM ".TABLE_PREFIX."mod_wysiwyg WHERE section_id = '$section_id'"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/wysiwyg/delete.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: tags/2.6.0/wb/modules/wysiwyg/install.php =================================================================== --- tags/2.6.0/wb/modules/wysiwyg/install.php (nonexistent) +++ tags/2.6.0/wb/modules/wysiwyg/install.php (revision 260) @@ -0,0 +1,65 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(defined('WB_URL')) { + + // Create table + $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wysiwyg`"); + $mod_wysiwyg = 'CREATE TABLE `'.TABLE_PREFIX.'mod_wysiwyg` ( ' + . ' `section_id` INT NOT NULL,' + . ' `page_id` INT NOT NULL,' + . ' `content` TEXT NOT NULL ,' + . ' `text` TEXT NOT NULL ,' + . ' PRIMARY KEY ( `section_id` ) )' + . ' '; + $database->query($mod_wysiwyg); + + // Insert info into the search table + // Module query info + $field_info = array(); + $field_info['page_id'] = 'page_id'; + $field_info['title'] = 'page_title'; + $field_info['link'] = 'link'; + $field_info['description'] = 'description'; + $field_info['modified_when'] = 'modified_when'; + $field_info['modified_by'] = 'modified_by'; + $field_info = serialize($field_info); + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'wysiwyg', '$field_info')"); + // Query start + $query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_wysiwyg, [TP]pages WHERE "; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'wysiwyg')"); + // Query body + $query_body_code = " [TP]pages.page_id = [TP]mod_wysiwyg.page_id AND [TP]mod_wysiwyg.text [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'"; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'wysiwyg')"); + // Query end + $query_end_code = ""; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'wysiwyg')"); + + // Insert blank row (there needs to be at least on row for the search to work) + $database->query("INSERT INTO ".TABLE_PREFIX."mod_wysiwyg (page_id,section_id) VALUES ('0','0')"); + +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/wysiwyg/install.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: tags/2.6.0/wb/modules/wysiwyg/index.php =================================================================== --- tags/2.6.0/wb/modules/wysiwyg/index.php (nonexistent) +++ tags/2.6.0/wb/modules/wysiwyg/index.php (revision 260) @@ -0,0 +1,28 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +header('Location: ../index.php'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/wysiwyg/index.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: tags/2.6.0/wb/modules/wysiwyg/add.php =================================================================== --- tags/2.6.0/wb/modules/wysiwyg/add.php (nonexistent) +++ tags/2.6.0/wb/modules/wysiwyg/add.php (revision 260) @@ -0,0 +1,29 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Insert an extra row into the database +$database->query("INSERT INTO ".TABLE_PREFIX."mod_wysiwyg (page_id,section_id) VALUES ('$page_id','$section_id')"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/wysiwyg/add.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: tags/2.6.0/wb/modules/htmlarea/uninstall.php =================================================================== --- tags/2.6.0/wb/modules/htmlarea/uninstall.php (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/uninstall.php (revision 260) @@ -0,0 +1,32 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +// Must include code to stop this file being access directly +if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } + +// Delete the editor directory +rm_full_dir(WB_PATH.'/modules/htmlarea/htmlarea'); + +?> Property changes on: tags/2.6.0/wb/modules/htmlarea/uninstall.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/info.php =================================================================== --- tags/2.6.0/wb/modules/htmlarea/info.php (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/info.php (revision 260) @@ -0,0 +1,35 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +$module_directory = 'htmlarea'; +$module_name = 'HTMLArea'; +$module_function = 'wysiwyg'; +$module_version = '2.6'; +$module_platform = '2.6.x'; +$module_author = 'Ryan Djurovich, Stefan Braunewell'; +$module_license = 'GNU General Public License'; +$module_description = 'This module allows you to edit the contents of a page using HTMLArea Editor.'; + +?> Property changes on: tags/2.6.0/wb/modules/htmlarea/info.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/include.php =================================================================== --- tags/2.6.0/wb/modules/htmlarea/include.php (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/include.php (revision 260) @@ -0,0 +1,57 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +$WB_DIRECTORY = substr(WB_PATH, strlen($_SERVER['DOCUMENT_ROOT'])).'/media/'; + +?> + + + + + + +'.$content.''; + } +?> Property changes on: tags/2.6.0/wb/modules/htmlarea/include.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/install.php =================================================================== --- tags/2.6.0/wb/modules/htmlarea/install.php (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/install.php (revision 260) @@ -0,0 +1,51 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(defined('WB_URL')) { + + // Set the filename of the actual editor file + $editor_file = $module_dir.'/htmlarea.zip'; + + if(file_exists($editor_file)) { + + // Setup the PclZip object + $editor_archive = new PclZip($editor_file); + + // Unzip to module dir + $list = $editor_archive->extract(PCLZIP_OPT_PATH, $module_dir); + if(!$list) { + $admin->print_error($MESSAGE['GENERIC']['CANNOT_UNZIP']); + } + // Delete the zip file + if(file_exists($editor_file)) { unlink($editor_file); } + + // Chmod all the editors files + chmod_directory_contents($module_dir.'/htmlarea', OCTAL_FILE_MODE); + + } + +} + +?> Property changes on: tags/2.6.0/wb/modules/htmlarea/install.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/license.txt =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/license.txt (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/license.txt (revision 260) @@ -0,0 +1,30 @@ +htmlArea License (based on BSD license) +Copyright (c) 2002-2004, interactivetools.com, inc. +Copyright (c) 2003-2004 dynarch.com +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1) Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +2) Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3) Neither the name of interactivetools.com, inc. nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_image.php =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_image.php (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_image.php (revision 260) @@ -0,0 +1,77 @@ + + Copyright (C) 2004-2005, 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 the config file +require('../../../../config.php'); + +// Create new admin object +require(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify', false); + +// Setup the template +$template = new Template(WB_PATH.'/modules/htmlarea/htmlarea/popups'); +$template->set_file('page', 'insert_image.html'); +$template->set_block('page', 'main_block', 'main'); + +// Get the directory to browse +$directory = $admin->get_post('folder'); +if($directory == '') { + $directory = '/media'; +} +// If the directory contains ../ then set it to /media +if(strstr($directory, '../')) { + $directory = '/media'; +} + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Insert values into template +$template->set_var('WB_URL', WB_URL); +$template->set_var('POPUP', 'image'); +$template->set_var('DIRECTORY', str_replace(WB_URL, '', $directory)); + +// Get home folder not to show +$home_folders = get_home_folders(); + +// Insert dirs into the dir list +$template->set_block('main_block', 'dir_list_block', 'dir_list'); +foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name) { + $template->set_var('NAME', str_replace(WB_PATH, '', $name)); + if(!isset($home_folders[str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)])) { + if($directory == str_replace(WB_PATH, '', $name)) { + $template->set_var('SELECTED', ' selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('dir_list', 'dir_list_block', true); + } +} + +// Parse the template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +?> \ No newline at end of file Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/link.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/link.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/link.html (revision 260) @@ -0,0 +1,223 @@ + + + + + Insert/Modify Link + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
   + +
Select Page
+ +
+ + + +
+ + 		     + +
Insert/Modify Link
+ +
+ + + + + + + + + + + + + + +
URL:
Title (tooltip):
Target: + +
+ +
+ + +
+ +
+ + 		  
   + +
Browse Media
+ +
+ + + +
+ + + + + +
+ + 		      
+ + + + \ No newline at end of file Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_image.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_image.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_image.html (revision 260) @@ -0,0 +1,246 @@ + + + + + Insert Image + + + + + + + + + + + + + + + + + + + + + + + + +
   + +
Browse Media
+ +
+ + + +
+ + + + + +
+ + 		     + +
Insert Image
+ +
+ + + + + + + + + + + + + +
Image URL: + +
Alternate text:
+ +

+ +

+ Layout + +
+ +
Alignment:
+ + +

+ +

Border thickness:
+ + +
+ +
+ +
+ Spacing + +
+ +
Horizontal:
+ + +

+ +

Vertical:
+ + +
+ +
+
+ + + + + +
+ Image Preview:
+ + 		+
+ +
+
+ + 		  
+ + + + \ No newline at end of file Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/link.php =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/link.php (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/link.php (revision 260) @@ -0,0 +1,118 @@ + + Copyright (C) 2004-2005, 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 the config file +require('../../../../config.php'); + +// Create new admin object +require(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify', false); + +// Setup the template +$template = new Template(WB_PATH.'/modules/htmlarea/htmlarea/popups'); +$template->set_file('page', 'link.html'); +$template->set_block('page', 'main_block', 'main'); + +// Get the directory to browse +$directory = $admin->get_post('folder'); +if($directory == '') { + $directory = '/media'; +} +// If the directory contains ../ then set it to /media +if(strstr($directory, '../')) { + $directory = '/media'; +} + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Insert values into template +$template->set_var('WB_URL', WB_URL); +$template->set_var('POPUP', 'link'); +$template->set_var('DIRECTORY', $directory); + +// Get home folder not to show +$home_folders = get_home_folders(); + +// Insert dirs into the dir list +$template->set_block('main_block', 'dir_list_block', 'dir_list'); +foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name) { + $template->set_var('NAME', str_replace(WB_PATH, '', $name)); + if(!isset($home_folders[str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)])) { + if($directory == str_replace(WB_PATH, '', $name)) { + $template->set_var('SELECTED', ' selected'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('dir_list', 'dir_list_block', true); + } +} + +// Function to generate page list +function gen_page_list($parent) { + global $template, $database; + $get_pages = $database->query("SELECT page_id,menu_title,link,level FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' AND visibility!='deleted' ORDER BY position ASC"); + while($page = $get_pages->fetchRow()) { + $title = $page['menu_title']; + // Add leading -'s so we can tell what level a page is at + $leading_dashes = ''; + for($i = 0; $i < $page['level']; $i++) { + $leading_dashes .= '- '; + } + $template->set_var('TITLE', $leading_dashes.' '.$title); + $template->set_var('LINK', '[wblink'.$page['page_id'].']'); + $template->parse('page_list', 'page_list_block', true); + gen_page_list($page['page_id']); + } +} + +// Get pages and put them into the pages list +$template->set_block('main_block', 'page_list_block', 'page_list'); +$database = new database(); +$get_pages = $database->query("SELECT page_id,menu_title,link FROM ".TABLE_PREFIX."pages WHERE parent = '0' AND visibility!='deleted' ORDER BY position ASC"); +if($get_pages > 0) { + // Add 'Please select...' + $template->set_var('TITLE', 'Please select...'); + $template->set_var('LINK', ''); + $template->parse('page_list', 'page_list_block', true); + // Loop through pages + while($page = $get_pages->fetchRow()) { + $title = $page['menu_title']; + $template->set_var('TITLE', $title); + $template->set_var('LINK', '[wblink'.$page['page_id'].']'); + $template->parse('page_list', 'page_list_block', true); + gen_page_list($page['page_id']); + } +} else { + $template->set_var('TITLE', 'None found'); + $template->set_var('LINK', 'None found'); + $template->parse('page_list', 'page_list_block', false); +} + +// Parse the template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +?> Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/select_color.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/select_color.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/select_color.html (revision 260) @@ -0,0 +1,347 @@ + + +Select Color + + + + + + + +
+ + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/old-fullscreen.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/old-fullscreen.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/old-fullscreen.html (revision 260) @@ -0,0 +1,131 @@ + +Fullscreen Editor + + + + + + +
+ +
+ + \ No newline at end of file Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/blank.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/blank.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/blank.html (revision 260) @@ -0,0 +1,2 @@ + + \ No newline at end of file Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/custom2.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/custom2.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/custom2.html (revision 260) @@ -0,0 +1,35 @@ + + + Select Phrase + + + + +
+
+ + + + + +
+
+ \ No newline at end of file Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/list_media.php =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/list_media.php (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/list_media.php (revision 260) @@ -0,0 +1,114 @@ + + Copyright (C) 2004-2005, 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 the config file +require('../../../../config.php'); + +// Create new admin object +require(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify', false); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Get popup type +$popup = $admin->get_get('popup'); +if($popup == 'image') { + $popup = 'insert_image'; +} elseif($popup != 'link') { + $popup = 'link'; +} + +// Get the directory to browse +$directory = $admin->get_get('folder'); +if($directory == '') { + $directory = '/media'; +} +// If the directory contains ../ then set it to /media +if(strstr($directory, '../')) { + $directory = '/media'; +} + +// Insert files into the file list +$file_list = array(); +foreach(file_list(WB_PATH.$directory, array('index.php')) AS $name) { + $filename = str_replace(WB_PATH.$directory.'/', '', $name); + $file_list[] = array('name' => basename($name), 'url' => WB_URL.$directory.'/'.$filename); +} + +?> + + + +Browse Media + + + +'; + foreach($file_list AS $file) { + ?> +
    • + '; +} + +?> + + \ No newline at end of file Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/editor_help.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/editor_help.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/editor_help.html (revision 260) @@ -0,0 +1,16 @@ + + + Editor Help + + + + +

    Editor Help

    + +Todo... + + + + \ No newline at end of file Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_table.php =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_table.php (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_table.php (revision 260) @@ -0,0 +1,174 @@ + + + + Insert Table + + + + + + + + + + + +
    Insert Table
    + +
    + + + + + + + + + + + + + + + + + + + +
    Rows:
    Cols:Width:
    + +

    + +

    +Layout + +
    + +
    Alignment:
    + + +

    + +

    Border thickness:
    + + +
    + +
    + +
    +Spacing + +
    + +
    Cell spacing:
    + + +

    + +

    Cell padding:
    + + +
    + +
    + +
    + + +
    + +
    + + + Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/fullscreen.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/fullscreen.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/fullscreen.html (revision 260) @@ -0,0 +1,133 @@ + + + + Fullscreen HTMLArea + + + + + + + + + + + +
    + +
    + + Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/old_insert_image.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/old_insert_image.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/old_insert_image.html (revision 260) @@ -0,0 +1,206 @@ + + + + + + + +Insert Image + + + + + +
    Image URL:
    + + +
    Alternate Text:
    + + +
    +Layout +
    + +
    +Spacing +
    + +
    Alignment:
    + + +
    Horizontal:
    + + +
    Border Thickness:
    + + +
    Vertical:
    + + + + + + + \ No newline at end of file Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/about.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/about.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/about.html (revision 260) @@ -0,0 +1,378 @@ + + + + + +About HTMLArea + + + + + + + +
    + + + +
    + +
    +
    + +
    + +

    HTMLArea

    + +

    A free WYSIWYG editor replacement for <textarea> fields.
    + For Mozilla 1.3+ (any platform) or Internet Explorer 5.5+ (Windows). +

    + +

    © 2002-2004 interactivetools.com, inc.
    + © 2003-2004 dynarch.com LLC.
    + All Rights Reserved.

    + +

    Project resources

    + + + +

    + For download section please see the project page @ SourceForge. +

    + +

    Version 3.0 developed and maintained by Mihai Bazon / dynarch.com

    + +
    + +
    +

    Thank you

    + +

    + dynarch.com would like to thank the following + companies/persons for their donations to support development of HTMLArea (listed alphabetically): +

    + + + +

    Also many thanks to all people at InteractiveTools.com + HTMLArea forums for + contributing translations, feedback, bug reports and fixes.

    + +

    + Last but not least, this project wouldn't have existed without + InteractiveTools.com. +

    + +
    + +
    +

    htmlArea License (based on BSD license)

    + +

    © 2002-2004, interactivetools.com, inc.
    + © 2003-2004 dynarch.com LLC
    + All rights reserved.

    + +

    +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: +

    + +
      +
    1. +Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. +
      2. + +
    2. +Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. +
      3. + +
    3. +Neither the name of interactivetools.com, inc. nor the names of its +contributors may be used to endorse or promote products derived from this +software without specific prior written permission. +
      4. +
    + +

    +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +

    + +
    + +
    +

    Plugins

    +
    +
    +
    + +
    + + +
    + + +
    +
    About
    Thanks
    License
    Plugins
    + +
    + +
    + + + + Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_table.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_table.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/insert_table.html (revision 260) @@ -0,0 +1,174 @@ + + + + Insert Table + + + + + + + + + + + +
    Insert Table
    + +
    + + + + + + + + + + + + + + + + + + + +
    Rows:
    Cols:Width:
    + +

    + +

    +Layout + +
    + +
    Alignment:
    + + +

    + +

    Border thickness:
    + + +
    + +
    + +
    +Spacing + +
    + +
    Cell spacing:
    + + +

    + +

    Cell padding:
    + + +
    + +
    + +
    + + +
    + +
    + + + Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/popup.js =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/popup.js (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/popups/popup.js (revision 260) @@ -0,0 +1,109 @@ +// htmlArea v3.0 - Copyright (c) 2002, 2003 interactivetools.com, inc. +// This copyright notice MUST stay intact for use (see license.txt). +// +// Portions (c) dynarch.com, 2003 +// +// A free WYSIWYG editor replacement for + +
    +
    Mihai Bazon
    + + +Last modified on Sat Oct 25 01:06:59 2003 + + + + Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/plugins/FullPage/popups/docprop.html =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/plugins/FullPage/popups/docprop.html (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/plugins/FullPage/popups/docprop.html (revision 260) @@ -0,0 +1,131 @@ + + + + Document properties + + + + + + + + + + + +
    Document properties
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Document title:
    DOCTYPE:
    Primary style-sheet:
    Alternate style-sheet:
    Background color:
    Text color:
    + +
    + + +
    + + + Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/plugins/FullPage/full-page.js =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/plugins/FullPage/full-page.js (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/plugins/FullPage/full-page.js (revision 260) @@ -0,0 +1,143 @@ +// FullPage Plugin for HTMLArea-3.0 +// Implementation by Mihai Bazon. Sponsored by http://thycotic.com +// +// htmlArea v3.0 - Copyright (c) 2002 interactivetools.com, inc. +// This notice MUST stay intact for use (see license.txt). +// +// A free WYSIWYG editor replacement for + + +

    Where can I find out more info, download the latest version and talk to +other HTMLArea users?

    + +

    You can find out more about HTMLArea and download the latest version on +the HTMLArea +homepage and you can talk to other HTMLArea users and post any comments +or suggestions you have in the HTMLArea forum.

    + +

    Keyboard shortcuts

    + +

    The editor provides the following key combinations:

    + +
      +
    • CTRL-A -- select all
      • +
    • CTRL-B -- bold
      • +
    • CTRL-I -- italic
      • +
    • CTRL-U -- underline
      • +
    • CTRL-S -- strikethrough
      • +
    • CTRL-L -- justify left
      • +
    • CTRL-E -- justify center
      • +
    • CTRL-R -- justify right
      • +
    • CTRL-J -- justify full
      • +
    • CTRL-1 .. CTRL-6 -- headings (<h1> .. <h6>)
      • +
    • CTRL-0 (zero) -- clean content pasted from Word
      • +
    + +

    Installation

    + +

    How do I add HTMLArea to my web page?

    + +

    It's easy. First you need to upload HTMLArea files to your website. +Just follow these steps.

    + +
      +
    1. Download the latest version from the htmlArea + homepage.
      2. +
    2. Unzip the files onto your local computer (making sure to maintain the + directory structure contained in the zip).
      3. +
    3. Create a new folder on your website called /htmlarea/ (make sure it's + NOT inside the cgi-bin).
      4. +
    4. Transfer all the HTMLArea files from your local computer into the + /htmlarea/ folder on your website.
      5. +
    5. Open the example page /htmlarea/examples/core.html with your browser to make + sure everything works.
      6. +
    + +

    Once htmlArea is on your website all you need to do is add some +JavaScript to any pages that you want to add WYSIWYG editors to. Here's how +to do that.

    + +
      + +
    1. Define some global variables. "_editor_url" has to be the absolute + URL where HTMLArea resides within your + website; as we discussed, this would be “/htmlarea/â€. "_editor_lang" must + be the language code in which you want HTMLArea to appear. This defaults + to "en" (English); for a list of supported languages, please look into + the "lang" subdirectory in the distribution. + 
      <script type="text/javascript">
+   _editor_url = "/htmlarea/";
+   _editor_lang = "en";
+</script>
      + +
    2. Include the "htmlarea.js" script: + 
      <script type="text/javascript" src="/htmlarea/htmlarea.js"></script>
      +
      3. + +

    3. If you want to change all your <textarea>-s into + HTMLArea-s then you can use the simplest way to create HTMLArea:

      + 
      <script type="text/javascript" defer="1">
+    HTMLArea.replaceAll();
+</script>
      +

      Note: you can also add the + HTMLArea.replaceAll() code to the onload + event handler for the body element, if you find it more appropriate.

      + +

      A different approach, if you have more than one textarea and only want + to change one of them, is to use HTMLArea.replace("id") -- + pass the id of your textarea. Do not use the + name attribute anymore, it's not a standard solution!

      + +
    + +

    This section applies to HTMLArea-3.0 release candidate 1 or later; prior +to this version, one needed to include more files; however, now HTMLArea is +able to include other files too (such as stylesheet, language definition +file, etc.) so you only need to define the editor path and load +"htmlarea.js". Nice, eh? ;-)

    + +

    I want to change the editor settings, how do I do that?

    + +

    While it's true that all you need is one line of JavaScript to create an +htmlArea WYSIWYG editor, you can also specify more config settings in the +code to control how the editor works and looks. Here's an example of some of +the available settings:

    + +
    var config = new HTMLArea.Config(); // create a new configuration object
+                                    // having all the default values
+config.width = '90%';
+config.height = '200px';
+
+// the following sets a style for the page body (black text on yellow page)
+// and makes all paragraphs be bold by default
+config.pageStyle =
+  'body { background-color: yellow; color: black; font-family: verdana,sans-serif } ' +
+  'p { font-width: bold; } ';
+
+// the following replaces the textarea with the given id with a new
+// HTMLArea object having the specified configuration
+HTMLArea.replace('id', config);
    + +

    Important: It's recommended that you add +custom features and configuration to a separate file. This will ensure you +that when we release a new official version of HTMLArea you'll have less +trouble upgrading it.

    + +

    How do I customize the toolbar?

    + +

    Using the configuration object introduced above allows you to completely +control what the toolbar contains. Following is an example of a one-line, +customized toolbar, much simpler than the default one:

    + +
    var config = new HTMLArea.Config();
+config.toolbar = [
+  ['fontname', 'space',
+   'fontsize', 'space',
+   'formatblock', 'space',
+   'bold', 'italic', 'underline']
+];
+HTMLArea.replace('id', config);
    + +

    The toolbar is an Array of Array objects. Each array in the toolbar +defines a new line. The default toolbar looks like this:

    + +
    config.toolbar = [
+[ "fontname", "space",
+  "fontsize", "space",
+  "formatblock", "space",
+  "bold", "italic", "underline", "separator",
+  "strikethrough", "subscript", "superscript", "separator",
+  "copy", "cut", "paste", "space", "undo", "redo" ],
+		
+[ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
+  "insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
+  "forecolor", "hilitecolor", "textindicator", "separator",
+  "inserthorizontalrule", "createlink", "insertimage", "inserttable", "htmlmode", "separator",
+  "popupeditor", "separator", "showhelp", "about" ]
+];
    + +

    Except three strings, all others in the examples above need to be defined +in the config.btnList object (detailed a bit later in this +document). The three exceptions are: 'space', 'separator' and 'linebreak'. +These three have the following meaning, and need not be present in +btnList:

    + +
      +
    • 'space' -- Inserts a space of 5 pixels (the width is configurable by external + CSS) at the current + position in the toolbar.
      • +
    • 'separator' -- Inserts a small vertical separator, for visually grouping related + buttons.
      • +
    • 'linebreak' -- Starts a new line in the toolbar. Subsequent controls will be + inserted on the new line.
      • +
    + +

    Important: It's recommended that you add +custom features and configuration to a separate file. This will ensure you +that when we release a new official version of HTMLArea you'll have less +trouble upgrading it.

    + +

    How do I create custom buttons?

    + +

    By design, the toolbar is easily extensible. For adding a custom button +one needs to follow two steps.

    + +

    1. Register the button in config.btnList.

    + +

    For each button in the toolbar, HTMLArea needs to know the following +information:

    +
      +
    • a name for it (we call it the ID of the button);
      • +
    • the path to an image to be displayed in the toolbar;
      • +
    • a tooltip for it;
      • +
    • whether the button is enabled or not in text mode;
      • +
    • what to do when the button is clicked;
      • +
    +

    You need to provide all this information for registering a new button +too. The button ID can be any string identifier and it's used when +defining the toolbar, as you saw above. We recommend starting +it with "my-" so that it won't clash with the standard ID-s (those from +the default toolbar).

    + +

    Register button example #1

    + +
    // get a default configuration
+var config = new HTMLArea.Config();
+// register the new button using Config.registerButton.
+// parameters:        button ID,   tooltip,          image,           textMode,
+config.registerButton("my-hilite", "Highlight text", "my-hilite.gif", false,
+// function that gets called when the button is clicked
+  function(editor, id) {
+    editor.surroundHTML('<span class="hilite">', '</span>');
+  }
+);
    + +

    An alternate way of calling registerButton is exemplified above. Though +the code might be a little bit larger, using this form makes your code more +maintainable. It doesn't even needs comments as it's pretty clear.

    + +

    Register button example #2

    + +
    var config = new HTMLArea.Config();
+config.registerButton({
+  id        : "my-hilite",
+  tooltip   : "Highlight text",
+  image     : "my-hilite.gif",
+  textMode  : false,
+  action    : function(editor, id) {
+                editor.surroundHTML('<span class="hilite">', '</span>');
+              }
+});
    + +

    You might notice that the "action" function receives two parameters: +editor and id. In the examples above we only used the +editor parameter. But it could be helpful for you to understand +both:

    + +
      +
    • editor is a reference to the HTMLArea object. Since our entire + code now has an OOP-like + design, you need to have a reference to + the editor object in order to do things with it. In previous versions of + HTMLArea, in order to identify the object an ID was used -- the ID of the + HTML element. In this version ID-s are no longer necessary.
      • + +
    • id is the button ID. Wondering why is this useful? Well, you + could use the same handler function (presuming that it's not an anonymous + function like in the examples above) for more buttons. You can see an example a bit later in this document.
      • +
    + +

    2. Inserting it into the toolbar

    + +

    At this step you need to specify where in the toolbar to insert the +button, or just create the whole toolbar again as you saw in the previous +section. You use the button ID, as shown in the examples of customizing the +toolbar in the previous section.

    + +

    For the sake of completion, following there are another examples.

    + +

    Append your button to the default toolbar

    + +
    config.toolbar.push([ "my-hilite" ]);
    + +

    Customized toolbar

    + +
    config.toolbar = [
+  ['fontname', 'space',
+   'fontsize', 'space',
+   'formatblock', 'space',
+   'separator', 'my-hilite', 'separator', 'space', // here's your button
+   'bold', 'italic', 'underline', 'space']
+];
    + +

    Note: in the example above our new button is +between two vertical separators. But this is by no means required. You can +put it wherever you like. Once registered in the btnList (step 1) your custom button behaves just like a default +button.

    + +

    Important: It's recommended that you add +custom features and configuration to a separate file. This will ensure you +that when we release a new official version of HTMLArea you'll have less +trouble upgrading it.

    + +

    A complete example

    + +

    Please note that it is by no means necessary to include the following +code into the htmlarea.js file. On the contrary, it might not work there. +The configuration system is designed such that you can always customize the +editor from outside files, thus keeping the htmlarea.js file +intact. This will make it easy for you to upgrade your HTMLArea when we +release a new official version. OK, I promise it's the last time I said +this. ;)

    + +
    // All our custom buttons will call this function when clicked.
+// We use the buttonId parameter to determine what button
+// triggered the call.
+function clickHandler(editor, buttonId) {
+  switch (buttonId) {
+    case "my-toc":
+      editor.insertHTML("<h1>Table Of Contents</h1>");
+      break;
+    case "my-date":
+      editor.insertHTML((new Date()).toString());
+      break;
+    case "my-bold":
+      editor.execCommand("bold");
+      editor.execCommand("italic");
+      break;
+    case "my-hilite":
+      editor.surroundHTML("<span class=\"hilite\">", "</span>");
+      break;
+  }
+};
+
+// Create a new configuration object
+var config = new HTMLArea.Config();
+
+// Register our custom buttons
+config.registerButton("my-toc",  "Insert TOC", "my-toc.gif", false, clickHandler);
+config.registerButton("my-date", "Insert date/time", "my-date.gif", false, clickHandler);
+config.registerButton("my-bold", "Toggle bold/italic", "my-bold.gif", false, clickHandler);
+config.registerButton("my-hilite", "Hilite selection", "my-hilite.gif", false, clickHandler);
+
+// Append the buttons to the default toolbar
+config.toolbar.push(["linebreak", "my-toc", "my-date", "my-bold", "my-hilite"]);
+
+// Replace an existing textarea with an HTMLArea object having the above config.
+HTMLArea.replace("textAreaID", config);
    + + +
    +
    © InteractiveTools.com 2002-2004. +
    +© dynarch.com 2003-2004
    +HTMLArea v3.0 developed by Mihai Bazon. +
    +Documentation written by Mihai Bazon. +
    + Last modified: Wed Jan 28 12:18:23 EET 2004 + + Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/htmlarea.css =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/htmlarea.css (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/htmlarea.css (revision 260) @@ -0,0 +1,180 @@ +.htmlarea { background: #fff; } + +.htmlarea .toolbar { + cursor: default; + background: ButtonFace; + padding: 1px 1px 2px 1px; + border: 1px solid; + border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; +} +.htmlarea .toolbar table { font-family: tahoma,verdana,sans-serif; font-size: 11px; } +.htmlarea .toolbar img { border: none; } +.htmlarea .toolbar .label { padding: 0px 3px; } + +.htmlarea .toolbar .button { + background: ButtonFace; + color: ButtonText; + border: 1px solid ButtonFace; + padding: 1px; + margin: 0px; + width: 18px; + height: 18px; +} +.htmlarea .toolbar .buttonHover { + border: 1px solid; + border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; +} +.htmlarea .toolbar .buttonActive, .htmlarea .toolbar .buttonPressed { + padding: 2px 0px 0px 2px; + border: 1px solid; + border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow; +} +.htmlarea .toolbar .buttonPressed { + background: ButtonHighlight; +} +.htmlarea .toolbar .indicator { + padding: 0px 3px; + overflow: hidden; + width: 20px; + text-align: center; + cursor: default; + border: 1px solid ButtonShadow; +} + +.htmlarea .toolbar .buttonDisabled img { + filter: alpha(opacity = 25); + -moz-opacity: 0.25; +} + +.htmlarea .toolbar .separator { + position: relative; + margin: 3px; + border-left: 1px solid ButtonShadow; + border-right: 1px solid ButtonHighlight; + width: 0px; + height: 16px; + padding: 0px; +} + +.htmlarea .toolbar .space { width: 5px; } + +.htmlarea .toolbar select { font: 11px Tahoma,Verdana,sans-serif; } + +.htmlarea .toolbar select, +.htmlarea .toolbar select:hover, +.htmlarea .toolbar select:active { background: FieldFace; color: ButtonText; } + +.htmlarea .statusBar { + border: 1px solid; + border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow; + padding: 2px 4px; + background-color: ButtonFace; + color: ButtonText; + font: 11px Tahoma,Verdana,sans-serif; +} + +.htmlarea .statusBar .statusBarTree a { + padding: 2px 5px; + color: #00f; +} + +.htmlarea .statusBar .statusBarTree a:visited { color: #00f; } +.htmlarea .statusBar .statusBarTree a:hover { + background-color: Highlight; + color: HighlightText; + padding: 1px 4px; + border: 1px solid HighlightText; +} + + +/* Hidden DIV popup dialogs (PopupDiv) */ + +.dialog { + color: ButtonText; + background: ButtonFace; +} + +.dialog .content { padding: 2px; } + +.dialog, .dialog button, .dialog input, .dialog select, .dialog textarea, .dialog table { + font: 11px Tahoma,Verdana,sans-serif; +} + +.dialog table { border-collapse: collapse; } + +.dialog .title { + background: #008; + color: #ff8; + border-bottom: 1px solid #000; + padding: 1px 0px 2px 5px; + font-size: 12px; + font-weight: bold; + cursor: default; +} + +.dialog .title .button { + float: right; + border: 1px solid #66a; + padding: 0px 1px 0px 2px; + margin-right: 1px; + color: #fff; + text-align: center; +} + +.dialog .title .button-hilite { border-color: #88f; background: #44c; } + +.dialog button { + width: 5em; + padding: 0px; +} + +.dialog .buttonColor { + padding: 1px; + cursor: default; + border: 1px solid; + border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; +} + +.dialog .buttonColor-hilite { + border-color: #000; +} + +.dialog .buttonColor .chooser, .dialog .buttonColor .nocolor { + height: 0.6em; + border: 1px solid; + padding: 0px 1em; + border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow; +} + +.dialog .buttonColor .nocolor { padding: 0px; } +.dialog .buttonColor .nocolor-hilite { background-color: #fff; color: #f00; } + +.dialog .label { text-align: right; width: 6em; } +.dialog .value input { width: 100%; } +.dialog .buttons { text-align: right; padding: 2px 4px 0px 4px; } + +.dialog legend { font-weight: bold; } +.dialog fieldset table { margin: 2px 0px; } + +.popupdiv { + border: 2px solid; + border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; +} + +.popupwin { + padding: 0px; + margin: 0px; +} + +.popupwin .title { + background: #fff; + color: #000; + font-weight: bold; + font-size: 120%; + padding: 3px 10px; + margin-bottom: 10px; + border-bottom: 1px solid black; + letter-spacing: 2px; +} + +form { margin: 0px; border: none; } Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_indent_more.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_indent_more.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/insert_table.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/insert_table.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_html.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_html.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_align_left.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_align_left.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_undo.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_undo.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_indent_less.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_indent_less.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_align_justify.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_align_justify.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_hr.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_hr.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_copy.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_copy.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_show_border.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_show_border.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_sup.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_sup.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_splitcel.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_splitcel.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_list_bullet.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_list_bullet.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_color_bg.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_color_bg.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_align_right.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_align_right.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_help.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_help.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_redo.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_redo.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_color_fg.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_color_fg.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_align_center.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_align_center.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/fullscreen_minimize.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/fullscreen_minimize.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_cut.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_cut.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/fullscreen_maximize.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/fullscreen_maximize.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_link.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_link.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_delete.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_delete.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_strike.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_strike.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_custom.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_custom.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_about.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_about.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_charmap.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_charmap.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_paste.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_paste.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_italic.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_italic.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_image.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_image.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_blank.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_blank.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_bold.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_bold.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_right_to_left.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_right_to_left.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_left_to_right.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_left_to_right.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_list_num.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_list_num.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_underline.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_underline.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_save.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_save.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_sub.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: tags/2.6.0/wb/modules/htmlarea/htmlarea/images/ed_format_sub.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: tags/2.6.0/wb/modules/htmlarea/htmlarea/htmlarea.js =================================================================== --- tags/2.6.0/wb/modules/htmlarea/htmlarea/htmlarea.js (nonexistent) +++ tags/2.6.0/wb/modules/htmlarea/htmlarea/htmlarea.js (revision 260) @@ -0,0 +1,2175 @@ +// htmlArea v3.0 - Copyright (c) 2002-2004 interactivetools.com, inc. +// This copyright notice MUST stay intact for use (see license.txt). +// +// Portions (c) dynarch.com, 2003-2004 +// +// A free WYSIWYG editor replacement for + + + + + + +
    + + + + +
    + + + + \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/code/modify.html ___________________________________________________________________ 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: tags/2.6.0/wb/modules/admin.php =================================================================== --- tags/2.6.0/wb/modules/admin.php (nonexistent) +++ tags/2.6.0/wb/modules/admin.php (revision 260) @@ -0,0 +1,173 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Admin Wrapper Script + +This script allows modules to be written without the need to copy code +from Website Baker Administration to take advantage of the interface. + +*/ + +// Stop this file being access directly +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +// Get page id +if(!isset($_GET['page_id']) OR !is_numeric($_GET['page_id'])) { + if(!isset($_POST['page_id']) OR !is_numeric($_POST['page_id'])) { + if(!isset($_GET['page_id']) OR !is_numeric($_GET['page_id'])) { + if(!isset($_POST['page_id']) OR !is_numeric($_POST['page_id'])) { + header("Location: index.php"); + } else { + $page_id = $_POST['page_id']; + } + } else { + $page_id = $_GET['page_id']; + } + } else { + $page_id = $_POST['page_id']; + } +} else { + $page_id = $_GET['page_id']; +} + +// Get section id if there is one +if(isset($_GET['section_id']) AND is_numeric($_GET['section_id'])) { + $section_id = $_GET['section_id']; +} elseif(isset($_POST['section_id']) AND is_numeric($_POST['section_id'])) { + $section_id = $_POST['section_id']; +} else { + // Check if we should redirect the user if there is no section id + if(!isset($section_required)) { + $section_id = 0; + } else { + header("Location: $section_required"); + } +} + +// Create js back link +$js_back = 'javascript: history.go(-1);'; + +// Create new admin object +require(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify'); + +// Get perms +$database = new database(); +$results = $database->query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$results_array = $results->fetchRow(); +$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); +$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users'])); +if(!is_numeric(array_search($admin->get_group_id(), $old_admin_groups)) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +} + +// Workout if the developer wants to show the info banner +if(isset($print_info_banner) AND $print_info_banner == true) { + +// Get page details +$database = new database(); +$query = "SELECT page_id,page_title,modified_by,modified_when FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_header(); + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_header(); + $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); +} +$results_array = $results->fetchRow(); + +// Get display name of person who last modified the page +$query_user = "SELECT username,display_name FROM ".TABLE_PREFIX."users WHERE user_id = '".$results_array['modified_by']."'"; +$get_user = $database->query($query_user); +if($get_user->numRows() != 0) { + $user = $get_user->fetchRow(); +} else { + $user['display_name'] = 'Unknown'; + $user['username'] = 'unknown'; +} +// Convert the unix ts for modified_when to human a readable form +if($results_array['modified_when'] != 0) { + $modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE); +} else { + $modified_ts = 'Unknown'; +} + +// Include page info script +$template = new Template(ADMIN_PATH.'/pages'); +$template->set_file('page', 'modify.html'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var(array( + 'PAGE_ID' => $results_array['page_id'], + 'PAGE_TITLE' => ($results_array['page_title']), + 'MODIFIED_BY' => $user['display_name'], + 'MODIFIED_BY_USERNAME' => $user['username'], + 'MODIFIED_WHEN' => $modified_ts, + 'ADMIN_URL' => ADMIN_URL + ) + ); +if($modified_ts == 'Unknown') { + $template->set_var('DISPLAY_MODIFIED', 'hide'); +} else { + $template->set_var('DISPLAY_MODIFIED', ''); +} + +// Work-out if we should show the "manage sections" link +$query_sections = $database->query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'menu_link'"); +if($query_sections->numRows() > 0) { + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'none'); +} elseif(MANAGE_SECTIONS == 'enabled') { + $template->set_var('TEXT_MANAGE_SECTIONS', $HEADING['MANAGE_SECTIONS']); +} else { + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'none'); +} + +// Insert language TEXT +$template->set_var(array( + 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'], + 'TEXT_CHANGE' => $TEXT['CHANGE'], + 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], + 'TEXT_CHANGE_SETTINGS' => $TEXT['CHANGE_SETTINGS'], + 'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'] + ) + ); + +// Parse and print header template +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +} + +// Work-out if the developer wants us to update the timestamp for when the page was last modified +if(isset($update_when_modified) AND $update_when_modified == true) { + $database->query("UPDATE ".TABLE_PREFIX."pages SET modified_when = '".mktime()."', modified_by = '".$admin->get_user_id()."' WHERE page_id = '$page_id'"); +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/admin.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: tags/2.6.0/wb/modules/index.php =================================================================== --- tags/2.6.0/wb/modules/index.php (nonexistent) +++ tags/2.6.0/wb/modules/index.php (revision 260) @@ -0,0 +1,28 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +header("Location: ../index.php"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/modules/index.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: tags/2.6.0/wb/account/signup2.php =================================================================== --- tags/2.6.0/wb/account/signup2.php (nonexistent) +++ tags/2.6.0/wb/account/signup2.php (revision 260) @@ -0,0 +1,136 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(!defined('WB_URL')) { + header('Location: ../pages/index.php'); +} + +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Start', 'start', false, false); + +// Create new database object +$database = new database(); + +// Get details entered +$group_id = FRONTEND_SIGNUP; +$active = 1; +$username = strtolower($admin->get_post('username')); +$display_name = $admin->get_post('display_name'); +$email = $admin->get_post('email'); + +// Create a javascript back link +$js_back = "javascript: history.go(-1);"; + +// Check values +if($group_id == "") { + $admin->print_error($MESSAGE['USERS']['NO_GROUP'], $js_back); +} +if(strlen($username) < 3) { + $admin->print_error($MESSAGE['USERS']['USERNAME_TOO_SHORT'], $js_back); +} +if($email != "") { + if($admin->validate_email($email) == false) { + $admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back); + } +} else { + $admin->print_error($MESSAGE['SIGNUP']['NO_EMAIL'], $js_back); +} +// Captcha +if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { /* Make's sure GD library is installed */ + if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){ + // Check for a mismatch + if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) { + $admin->print_error($MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'], $js_back); + } + } else { + $admin->print_error($MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'], $js_back); + } +} +if(isset($_SESSION['catpcha'])) { unset($_SESSION['captcha']); } + +// Generate a random password then update the database with it +$new_pass = ''; +$salt = "abchefghjkmnpqrstuvwxyz0123456789"; +srand((double)microtime()*1000000); +$i = 0; +while ($i <= 7) { + $num = rand() % 33; + $tmp = substr($salt, $num, 1); + $new_pass = $new_pass . $tmp; + $i++; +} +$md5_password = md5($new_pass); + +// Check if username already exists +$results = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE username = '$username'"); +if($results->numRows() > 0) { + $admin->print_error($MESSAGE['USERS']['USERNAME_TAKEN'], $js_back); +} + +// Check if the email already exists +$results = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE email = '".$wb->add_slashes($_POST['email'])."'"); +if($results->numRows() > 0) { + if(isset($MESSAGE['USERS']['EMAIL_TAKEN'])) { + $admin->print_error($MESSAGE['USERS']['EMAIL_TAKEN'], $js_back); + } else { + $admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back); + } +} + +// MD5 supplied password +$md5_password = md5($new_pass); + +// Inser the user into the database +$query = "INSERT INTO ".TABLE_PREFIX."users (group_id,active,username,password,display_name,email) VALUES ('$group_id', '$active', '$username','$md5_password','$display_name','$email')"; +$database->query($query); + +if($database->is_error()) { + // Error updating database + $message = $database->get_error(); +} else { + // Setup email to send + $mail_subject = 'Your login details...'; + $mail_to = $email; + $mail_message = ''. +'Hello '.$display_name.', + +Your '.WEBSITE_TITLE.' login details are: +Username: '.$username.' +Password: '.$new_pass.' + +Your password has been set to the one above. + +If you have recieved this message in error, please delete it immediatly.'; + + // Try sending the email + if(mail($mail_to, $mail_subject, $mail_message, 'From: '.SERVER_EMAIL)) { + $admin->print_success($MESSAGE['FORGOT_PASS']['PASSWORD_RESET'], WB_URL.'/account/login'.PAGE_EXTENSION); + $display_form = false; + } else { + $admin->print_error($MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'], $js_back); + } +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/account/signup2.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: tags/2.6.0/wb/account/signup_form.php =================================================================== --- tags/2.6.0/wb/account/signup_form.php (nonexistent) +++ tags/2.6.0/wb/account/signup_form.php (revision 260) @@ -0,0 +1,91 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +?> + + + +

     

    + +
    + + + + + + + + + + + + + + + + + + + + +
    : + +
    (): + +
    : + +
    : + + + +
    Captcha
    +
      + + +
    + +
    + +
    +  \ No newline at end of file Property changes on: tags/2.6.0/wb/account/signup_form.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: tags/2.6.0/wb/account/login_form.php =================================================================== --- tags/2.6.0/wb/account/login_form.php (nonexistent) +++ tags/2.6.0/wb/account/login_form.php (revision 260) @@ -0,0 +1,106 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(!defined('WB_URL')) { + header('Location: ../pages/index.php'); +} + +if(defined('SMART_LOGIN') AND SMART_LOGIN == 'enabled') { + // Generate username field name + $username_fieldname = 'username_'; + $password_fieldname = 'password_'; + $salt = "abchefghjkmnpqrstuvwxyz0123456789"; + srand((double)microtime()*1000000); + $i = 0; + while ($i <= 7) { + $num = rand() % 33; + $tmp = substr($salt, $num, 1); + $username_fieldname = $username_fieldname . $tmp; + $password_fieldname = $password_fieldname . $tmp; + $i++; + } +} else { + $username_fieldname = 'username'; + $password_fieldname = 'password'; +} + +?> + + +

     Login

    + message; ?> +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + +
    : + + +
    : + +
      + + +
      + + +
    + +
    + +
    + + \ No newline at end of file Property changes on: tags/2.6.0/wb/account/login_form.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: tags/2.6.0/wb/account/forgot.php =================================================================== --- tags/2.6.0/wb/account/forgot.php (nonexistent) +++ tags/2.6.0/wb/account/forgot.php (revision 260) @@ -0,0 +1,57 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../config.php'); + +// Required page details +$page_id = 0; +$page_description = ''; +$page_keywords = ''; +define('PAGE_ID', 0); +define('ROOT_PARENT', 0); +define('PARENT', 0); +define('LEVEL', 0); +define('PAGE_TITLE', $MENU['FORGOT']); +define('MENU_TITLE', $MENU['FORGOT']); +define('VISIBILITY', 'public'); + +if(!FRONTEND_LOGIN) { + if(INTRO_PAGE) { + header('Location: '.WB_URL.PAGES_DIRECTORY.'/index'.PAGE_EXTENSION); + } else { + header('Location: '.WB_URL.'/index'.PAGE_EXTENSION); + } +} + +// Set the page content include file +define('PAGE_CONTENT', WB_PATH.'/account/forgot_form.php'); + +// Set auto authentication to false +$auto_auth = false; + +// Include the index (wrapper) file +require(WB_PATH.'/index.php'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/account/forgot.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: tags/2.6.0/wb/account/preferences.php =================================================================== --- tags/2.6.0/wb/account/preferences.php (nonexistent) +++ tags/2.6.0/wb/account/preferences.php (revision 260) @@ -0,0 +1,68 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../config.php'); + +if(!FRONTEND_LOGIN) { + if(INTRO_PAGE) { + header('Location: '.WB_URL.PAGES_DIRECTORY.'/index'.PAGE_EXTENSION); + } else { + header('Location: '.WB_URL.'/index'.PAGE_EXTENSION); + } +} + +require_once(WB_PATH.'/framework/class.wb.php'); +if (wb::is_authenticated()==false) { + header('Location: '.WB_URL.'/account/login.php'); +} + +// Required page details +$page_id = 0; +$page_description = ''; +$page_keywords = ''; +define('PAGE_ID', 0); +define('ROOT_PARENT', 0); +define('PARENT', 0); +define('LEVEL', 0); +define('PAGE_TITLE', $MENU['PREFERENCES']); +define('MENU_TITLE', $MENU['PREFERENCES']); +define('MODULE', ''); +define('VISIBILITY', 'public'); + +// Set the page content include file +if(isset($_POST['current_password']) AND isset($_POST['new_password'])) { + define('PAGE_CONTENT', WB_PATH.'/account/password.php'); +} elseif(isset($_POST['current_password']) AND isset($_POST['email'])) { + define('PAGE_CONTENT', WB_PATH.'/account/email.php'); +} elseif(isset($_POST['display_name'])) { + define('PAGE_CONTENT', WB_PATH.'/account/details.php'); +} else { + define('PAGE_CONTENT', WB_PATH.'/account/preferences_form.php'); +} + +// Include the index (wrapper) file +require(WB_PATH.'/index.php'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/account/preferences.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: tags/2.6.0/wb/account/forgot_form.php =================================================================== --- tags/2.6.0/wb/account/forgot_form.php (nonexistent) +++ tags/2.6.0/wb/account/forgot_form.php (revision 260) @@ -0,0 +1,141 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(!defined('WB_URL')) { + header('Location: ../pages/index.php'); +} + +// Create new database object +$database = new database(); + +// Check if the user has already submitted the form, otherwise show it +if(isset($_POST['email']) AND $_POST['email'] != "") { + + $email = $_POST['email']; + + // Check if the email exists in the database + $query = "SELECT user_id,username,display_name,email,last_reset FROM ".TABLE_PREFIX."users WHERE email = '".$wb->add_slashes($_POST['email'])."'"; + $results = $database->query($query); + if($results->numRows() > 0) { + // Get the id, username, and email from the above db query + $results_array = $results->fetchRow(); + + // Check if the password has been reset in the last 2 hours + $last_reset = $results_array['last_reset']; + $time_diff = mktime()-$last_reset; // Time since last reset in seconds + $time_diff = $time_diff/60/60; // Time since last reset in hours + if($time_diff < 2) { + + // Tell the user that their password cannot be reset more than once per hour + $message = $MESSAGE['FORGOT_PASS']['ALREADY_RESET']; + + } else { + + // Generate a random password then update the database with it + $new_pass = ''; + $salt = "abchefghjkmnpqrstuvwxyz0123456789"; + srand((double)microtime()*1000000); + $i = 0; + while ($i <= 7) { + $num = rand() % 33; + $tmp = substr($salt, $num, 1); + $new_pass = $new_pass . $tmp; + $i++; + } + + $database->query("UPDATE ".TABLE_PREFIX."users SET password = '".md5($new_pass)."' WHERE user_id = '".$results_array['user_id']."'"); + + if($database->is_error()) { + // Error updating database + $message = $database->get_error(); + } else { + // Setup email to send + $mail_subject = 'Your login details...'; + $mail_to = $email; + $mail_message = ''. +'Hello '.$results_array["display_name"].', + +Your '.WEBSITE_TITLE.' administration login details are: +Username: '.$results_array["username"].' +Password: '.$new_pass.' + +Your password has been reset to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediatly.'; + // Try sending the email + if(mail($mail_to, $mail_subject, $mail_message)) { + $message = $MESSAGE['FORGOT_PASS']['PASSWORD_RESET']; + $display_form = false; + } else { + $message = $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL']; + } + } + } + } else { + // Email doesn't exist, so tell the user + $message = $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND']; + } + +} else { + $email = ''; +} + +if(!isset($message)) { + $message = $MESSAGE['FORGOT_PASS']['NO_DATA']; + $message_color = '000000'; +} else { + $message_color = 'FF0000'; +} + +?> +

    + +
    + + + + + + + + + + + + + + + + + + + + + +
    + +
    :
     
    +
    \ No newline at end of file Property changes on: tags/2.6.0/wb/account/forgot_form.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: tags/2.6.0/wb/account/preferences_form.php =================================================================== --- tags/2.6.0/wb/account/preferences_form.php (nonexistent) +++ tags/2.6.0/wb/account/preferences_form.php (revision 260) @@ -0,0 +1,231 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +?> + +

     

    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    : + +
    : + +
    : + +
    : + +
    : + +
      + + +
    + +
    + + +

     

    + +
    + + + + + + + + + + + + + + + +
    : + +
    : + +
      + + +
    + +
    + + +

     

    + +
    + + + + + + + + + + + + + + + + + + + + +
    : + +
    : + +
    : + +
      + + +
    + +
    \ No newline at end of file Property changes on: tags/2.6.0/wb/account/preferences_form.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: tags/2.6.0/wb/account/details.php =================================================================== --- tags/2.6.0/wb/account/details.php (nonexistent) +++ tags/2.6.0/wb/account/details.php (revision 260) @@ -0,0 +1,69 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(!defined('WB_URL')) { + header('Location: ../pages/index.php'); +} + +// Get entered values +$display_name = $admin->get_post('display_name'); +$language = $admin->get_post('language'); +$timezone = $admin->get_post('timezone')*60*60; +$date_format = $admin->get_post('date_format'); +$time_format = $admin->get_post('time_format'); + +// Create a javascript back link +$js_back = "javascript: history.go(-1);"; + +// Update the database +$database = new database(); +$query = "UPDATE ".TABLE_PREFIX."users SET display_name = '$display_name', language = '$language', timezone = '$timezone', date_format = '$date_format', time_format = '$time_format' WHERE user_id = '".$admin->get_user_id()."'"; +$database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error); +} else { + $admin->print_success($MESSAGE['PREFERENCES']['DETAILS_SAVED'], WB_URL.'/account/preferences'.PAGE_EXTENSION); + $_SESSION['DISPLAY_NAME'] = $display_name; + $_SESSION['LANGUAGE'] = $language; + $_SESSION['TIMEZONE'] = $timezone; + // Update date format + if($date_format != '') { + $_SESSION['DATE_FORMAT'] = $date_format; + if(isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) { unset($_SESSION['USE_DEFAULT_DATE_FORMAT']); } + } else { + $_SESSION['USE_DEFAULT_DATE_FORMAT'] = true; + if(isset($_SESSION['DATE_FORMAT'])) { unset($_SESSION['DATE_FORMAT']); } + } + // Update time format + if($time_format != '') { + $_SESSION['TIME_FORMAT'] = $time_format; + if(isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { unset($_SESSION['USE_DEFAULT_TIME_FORMAT']); } + } else { + $_SESSION['USE_DEFAULT_TIME_FORMAT'] = true; + if(isset($_SESSION['TIME_FORMAT'])) { unset($_SESSION['TIME_FORMAT']); } + } +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/account/details.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: tags/2.6.0/wb/account/login.php =================================================================== --- tags/2.6.0/wb/account/login.php (nonexistent) +++ tags/2.6.0/wb/account/login.php (revision 260) @@ -0,0 +1,84 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require_once("../config.php"); + +// Make sure the login is enabled +if(!FRONTEND_LOGIN) { + if(INTRO_PAGE) { + header('Location: '.WB_URL.PAGES_DIRECTORY.'/index'.PAGE_EXTENSION); + } else { + header('Location: '.WB_URL.'/index'.PAGE_EXTENSION); + } +} + +// Required page details +$page_id = 0; +$page_description = ''; +$page_keywords = ''; +define('PAGE_ID', 0); +define('ROOT_PARENT', 0); +define('PARENT', 0); +define('LEVEL', 0); +define('PAGE_TITLE', 'Please login'); +define('MENU_TITLE', 'Please login'); +define('VISIBILITY', 'public'); +// Set the page content include file +define('PAGE_CONTENT', WB_PATH.'/account/login_form.php'); + +require_once(WB_PATH.'/framework/class.login.php'); + +// Create new login app +$thisApp = new Login( + array( + "MAX_ATTEMPS" => "50", + "WARNING_URL" => ADMIN_URL."/login/warning.html", + "USERNAME_FIELDNAME" => 'username', + "PASSWORD_FIELDNAME" => 'password', + "REMEMBER_ME_OPTION" => SMART_LOGIN, + "MIN_USERNAME_LEN" => "2", + "MIN_PASSWORD_LEN" => "2", + "MAX_USERNAME_LEN" => "30", + "MAX_PASSWORD_LEN" => "30", + "LOGIN_URL" => WB_URL."/account/login".PAGE_EXTENSION.'?redirect='.$_REQUEST['redirect'], + "DEFAULT_URL" => WB_URL.PAGES_DIRECTORY."/index".PAGE_EXTENSION, + "TEMPLATE_DIR" => ADMIN_PATH."/login", + "TEMPLATE_FILE" => "template.html", + "FRONTEND" => true, + "FORGOTTEN_DETAILS_APP" => WB_URL."/account/forgot.php".PAGE_EXTENSION, + "USERS_TABLE" => TABLE_PREFIX."users", + "GROUPS_TABLE" => TABLE_PREFIX."groups", + "REDIRECT_URL" => $_REQUEST['redirect'] + ) + ); + +// Set extra outsider var +$globals[] = 'thisApp'; + +// Include the index (wrapper) file +require(WB_PATH.'/index.php'); + + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/account/login.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: tags/2.6.0/wb/account/logout.php =================================================================== --- tags/2.6.0/wb/account/logout.php (nonexistent) +++ tags/2.6.0/wb/account/logout.php (revision 260) @@ -0,0 +1,44 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require("../config.php"); + +$_SESSION['USER_ID'] = null; +$_SESSION['GROUP_ID'] = null; +$_SESSION['USERNAME'] = null; +$_SESSION['PAGE_PERMISSIONS'] = null; +$_SESSION['SYSTEM_PERMISSIONS'] = null; +$_SESSION = array(); +session_unset(); +unset($_COOKIE[session_name()]); +session_destroy(); + +if(INTRO_PAGE) { + header('Location: '.WB_URL.PAGES_DIRECTORY.'/index'.PAGE_EXTENSION); +} else { + header('Location: '.WB_URL.'/index'.PAGE_EXTENSION); +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/account/logout.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: tags/2.6.0/wb/account/signup.php =================================================================== --- tags/2.6.0/wb/account/signup.php (nonexistent) +++ tags/2.6.0/wb/account/signup.php (revision 260) @@ -0,0 +1,71 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +require('../config.php'); + +if(!is_numeric(FRONTEND_SIGNUP)) { + if(INTRO_PAGE) { + header('Location: '.WB_URL.PAGES_DIRECTORY.'/index'.PAGE_EXTENSION); + } else { + header('Location: '.WB_URL.'/index'.PAGE_EXTENSION); + } +} + +// Load the language file +if(!file_exists(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php')) { + exit('Error loading language file '.DEFAULT_LANGUAGE.', please check configuration'); +} else { + require_once(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php'); + $load_language = false; +} + + +// Required page details +$page_id = 0; +$page_description = ''; +$page_keywords = ''; +define('PAGE_ID', 0); +define('ROOT_PARENT', 0); +define('PARENT', 0); +define('LEVEL', 0); +define('PAGE_TITLE', $TEXT['SIGNUP']); +define('MENU_TITLE', $TEXT['SIGNUP']); +define('MODULE', ''); +define('VISIBILITY', 'public'); + +// Set the page content include file +if(isset($_POST['username'])) { + define('PAGE_CONTENT', WB_PATH.'/account/signup2.php'); +} else { + define('PAGE_CONTENT', WB_PATH.'/account/signup_form.php'); +} + +// Set auto authentication to false +$auto_auth = false; + +// Include the index (wrapper) file +require(WB_PATH.'/index.php'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/account/signup.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: tags/2.6.0/wb/account/stylesheet.css =================================================================== --- tags/2.6.0/wb/account/stylesheet.css (nonexistent) +++ tags/2.6.0/wb/account/stylesheet.css (revision 260) @@ -0,0 +1,82 @@ +body,td,th,input,textarea { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + color: #000000; +} +body { + background-color: #FFFFFF; + margin: 0px; +} +form { + margin: 0; +} +hr { + margin: 15px 0px 15px 0px; + color: #003366; + height: 1px; +} +h1 { + text-align: center; + font-size: 20px; + color: #003366; + text-transform: uppercase; +} +h2 { + font-size: 15px; + color: #336699; + margin: 5px 0px 5px 0px; +} +a:link, a:visited, a:active { + color: #003366; + text-decoration: none; +} +a:hover { + text-decoration: none; + color: #336699; +} +.note { + color: #666666; + font-size: 10px; +} +.menu { + margin: 0; + padding: 0; + padding-top: 10px; + padding-bottom: 4px; + padding-left: 8px; +} +.menu li { + list-style-type: none; + display: inline; + padding-right: 1px; +} +.menu a, .menu a:link, .menu a:active, .menu a:visited { + border-bottom: 0; + padding: 4px 5px 4px 5px; + color: #003366; +} +.menu a:hover { + text-decoration: none; + color: #336699; +} +.current a, .current a:link, .current a:active, .current a:visited { + background-color: #FFFFFF; + color: #000000; +} +.content { + background-color: #FFFFFF; + padding: 20px; + height: 280px; + width: 750px; + text-align: left; + vertical-align: top; +} +.row_a { + background-color: #EEEEEE; +} +.row_b { + background-color: #DDDDDD; +} +.hide { + display: none; +} \ No newline at end of file Property changes on: tags/2.6.0/wb/account/stylesheet.css ___________________________________________________________________ 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: tags/2.6.0/wb/account/password.php =================================================================== --- tags/2.6.0/wb/account/password.php (nonexistent) +++ tags/2.6.0/wb/account/password.php (revision 260) @@ -0,0 +1,68 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +// Get the values entered +$current_password = $_POST['current_password']; +$new_password = $_POST['new_password']; +$new_password2 = $_POST['new_password2']; + +// Create a javascript back link +$js_back = "javascript: history.go(-1);"; + +// Get existing password +$database = new database(); +$query = "SELECT user_id FROM ".TABLE_PREFIX."users WHERE user_id = '".$admin->get_user_id()."' AND password = '".md5($current_password)."'"; +$results = $database->query($query); + +// Validate values +if($results->numRows() == 0) { + $admin->print_error($MESSAGE['PREFERENCES']['CURRENT_PASSWORD_INCORRECT'], $js_back); +} +if(strlen($new_password) < 3) { + $admin->print_error($MESSAGE['USERS']['PASSWORD_TOO_SHORT'], $js_back); +} +if($new_password != $new_password2) { + $admin->print_error($MESSAGE['USERS']['PASSWORD_MISMATCH'], $js_back); +} + +// MD5 the password +$md5_password = md5($new_password); + +// Update the database +$database = new database(); +$query = "UPDATE ".TABLE_PREFIX."users SET password = '$md5_password' WHERE user_id = '".$admin->get_user_id()."'"; +$database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error); +} else { + $admin->print_success($MESSAGE['PREFERENCES']['PASSWORD_CHANGED'], WB_URL.'/account/preferences'.PAGE_EXTENSION); +} + + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/account/password.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: tags/2.6.0/wb/account/email.php =================================================================== --- tags/2.6.0/wb/account/email.php (nonexistent) +++ tags/2.6.0/wb/account/email.php (revision 260) @@ -0,0 +1,62 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +// Get the values entered +$current_password = $admin->get_post('current_password'); +$email = $admin->get_post('email'); + +// Create a javascript back link +$js_back = "javascript: history.go(-1);"; + +// Get existing password +$database = new database(); +$query = "SELECT user_id FROM ".TABLE_PREFIX."users WHERE user_id = '".$admin->get_user_id()."' AND password = '".md5($current_password)."'"; +$results = $database->query($query); + +// Validate values +if($results->numRows() == 0) { + $admin->print_error($MESSAGE['PREFERENCES']['OLD_PASSWORD_INCORRECT'], $js_back); +} +// Validate values +if(!$admin->validate_email($email)) { + $admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back); +} + +// Update the database +$database = new database(); +$query = "UPDATE ".TABLE_PREFIX."users SET email = '$email' WHERE user_id = '".$admin->get_user_id()."' AND password = '".md5($current_password)."'"; +$database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error); +} else { + $admin->print_success($MESSAGE['PREFERENCES']['EMAIL_UPDATED'], WB_URL.'/account/preferences'.PAGE_EXTENSION); + $_SESSION['EMAIL'] = $email; +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/account/email.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: tags/2.6.0/wb/account/index.php =================================================================== --- tags/2.6.0/wb/account/index.php (nonexistent) +++ tags/2.6.0/wb/account/index.php (revision 260) @@ -0,0 +1,28 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +header("Location: ../index.php"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/account/index.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: tags/2.6.0/wb/framework/initialize.php =================================================================== --- tags/2.6.0/wb/framework/initialize.php (nonexistent) +++ tags/2.6.0/wb/framework/initialize.php (revision 260) @@ -0,0 +1,103 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if (file_exists(WB_PATH.'/framework/class.database.php')) { + + require_once(WB_PATH.'/framework/class.database.php'); + + // Create database class + $database = new database(); + + set_magic_quotes_runtime(0); + + // Get website settings (title, keywords, description, header, and footer) + $query_settings = "SELECT name,value FROM ".TABLE_PREFIX."settings"; + $get_settings = $database->query($query_settings); + if($database->is_error()) { die($database->get_error()); } + if($get_settings->numRows() == 0) { die("Settings not found"); } + while($setting = $get_settings->fetchRow()) { + $setting_name=strtoupper($setting['name']); + $setting_value=$setting['value']; + if ($setting_value=='false') + $setting_value=false; + if ($setting_value=='true') + $setting_value=true; + define($setting_name,$setting_value); + } + $string_file_mode = STRING_FILE_MODE; + define('OCTAL_FILE_MODE',(int) octdec($string_file_mode)); + $string_dir_mode = STRING_DIR_MODE; + define('OCTAL_DIR_MODE',(int) octdec($string_dir_mode)); + + // Start a session + if(!defined('SESSION_STARTED')) { + session_name(APP_NAME.'_session_id'); + session_start(); + define('SESSION_STARTED', true); + } + + // Get users language + if(isset($_GET['lang']) AND $_GET['lang'] != '' AND !is_numeric($_GET['lang']) AND strlen($_GET['lang']) == 2) { + define('LANGUAGE', strtoupper($_GET['lang'])); + $_SESSION['LANGUAGE']=LANGUAGE; + } else { + if(isset($_SESSION['LANGUAGE']) AND $_SESSION['LANGUAGE'] != '') { + define('LANGUAGE', $_SESSION['LANGUAGE']); + } else { + define('LANGUAGE', DEFAULT_LANGUAGE); + } + } + + // Load Language file + if(!defined('LANGUAGE_LOADED')) { + if(!file_exists(WB_PATH.'/languages/'.LANGUAGE.'.php')) { + exit('Error loading language file '.LANGUAGE.', please check configuration'); + } else { + require_once(WB_PATH.'/languages/'.LANGUAGE.'.php'); + } + } + + // Get users timezone + if(isset($_SESSION['TIMEZONE'])) { + define('TIMEZONE', $_SESSION['TIMEZONE']); + } else { + define('TIMEZONE', DEFAULT_TIMEZONE); + } + // Get users date format + if(isset($_SESSION['DATE_FORMAT'])) { + define('DATE_FORMAT', $_SESSION['DATE_FORMAT']); + } else { + define('DATE_FORMAT', DEFAULT_DATE_FORMAT); + } + // Get users time format + if(isset($_SESSION['TIME_FORMAT'])) { + define('TIME_FORMAT', $_SESSION['TIME_FORMAT']); + } else { + define('TIME_FORMAT', DEFAULT_TIME_FORMAT); + } + +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/framework/initialize.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: tags/2.6.0/wb/framework/functions.php =================================================================== --- tags/2.6.0/wb/framework/functions.php (nonexistent) +++ tags/2.6.0/wb/framework/functions.php (revision 260) @@ -0,0 +1,755 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Website Baker functions file +This file contains general functions used in Website Baker + +*/ + +// Stop this file from being accessed directly +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +// Define that this file has been loaded +define('FUNCTIONS_FILE_LOADED', true); + +// Function to remove a non-empty directory +function rm_full_dir($directory) +{ + // If suplied dirname is a file then unlink it + if (is_file($directory)) { + return unlink($directory); + } + + // Empty the folder + $dir = dir($directory); + while (false !== $entry = $dir->read()) { + // Skip pointers + if ($entry == '.' || $entry == '..') { + continue; + } + + // Deep delete directories + if (is_dir("$directory/$entry")) { + rm_full_dir("$directory/$entry"); + } else { + unlink("$directory/$entry"); + } + } + + // Now delete the folder + $dir->close(); + return rmdir($directory); +} + +// Function to open a directory and add to a dir list +function directory_list($directory) { + + $list = array(); + + // Open the directory then loop through its contents + $dir = dir($directory); + while (false !== $entry = $dir->read()) { + // Skip pointers + if(substr($entry, 0, 1) == '.' || $entry == '.svn') { + continue; + } + // Add dir and contents to list + if (is_dir("$directory/$entry")) { + $list = array_merge($list, directory_list("$directory/$entry")); + $list[] = "$directory/$entry"; + } + } + + // Now return the list + return $list; +} + +// Function to open a directory and add to a dir list +function chmod_directory_contents($directory, $file_mode) { + + // Set the umask to 0 + $umask = umask(0); + + // Open the directory then loop through its contents + $dir = dir($directory); + while (false !== $entry = $dir->read()) { + // Skip pointers + if(substr($entry, 0, 1) == '.' || $entry == '.svn') { + continue; + } + // Chmod the sub-dirs contents + if(is_dir("$directory/$entry")) { + chmod_directory_contents("$directory/$entry", $file_mode); + } + change_mode($directory.'/'.$entry, 'file'); + } + + // Restore the umask + umask($umask); + +} + +// Function to open a directory and add to a file list +function file_list($directory, $skip = array()) { + + $list = array(); + $skip_file = false; + + // Open the directory then loop through its contents + $dir = dir($directory); + while (false !== $entry = $dir->read()) { + // Skip pointers + if($entry == '.' || $entry == '..') { + $skip_file = true; + } + // Check if we to skip anything else + if($skip != array()) { + foreach($skip AS $skip_name) { + if($entry == $skip_name) { + $skip_file = true; + } + } + } + // Add dir and contents to list + if($skip_file != true AND is_file("$directory/$entry")) { + $list[] = "$directory/$entry"; + } + + // Reset the skip file var + $skip_file = false; + } + + // Now delete the folder + return $list; +} + +// Function to get a list of home folders not to show +function get_home_folders() { + global $database, $admin; + $home_folders = array(); + // Only return home folders is this feature is enabled + if(HOME_FOLDERS) { + $query_home_folders = $database->query("SELECT home_folder FROM ".TABLE_PREFIX."users WHERE home_folder != '".$admin->get_home_folder()."'"); + if($query_home_folders->numRows() > 0) { + while($folder = $query_home_folders->fetchRow()) { + $home_folders[$folder['home_folder']] = $folder['home_folder']; + } + } + function remove_home_subs($directory = '/', $home_folders) { + if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.$directory)) { + // Loop through the dirs to check the home folders sub-dirs are not shown + while(false !== ($file = readdir($handle))) { + if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') { + if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) { + if($directory != '/') { $file = $directory.'/'.$file; } else { $file = '/'.$file; } + foreach($home_folders AS $hf) { + $hf_length = strlen($hf); + if($hf_length > 0) { + if(substr($file, 0, $hf_length+1) == $hf) { + $home_folders[$file] = $file; + } + } + } + $home_folders = remove_home_subs($file, $home_folders); + } + } + } + } + return $home_folders; + } + $home_folders = remove_home_subs('/', $home_folders); + } + return $home_folders; +} + +// Function to create directories +function make_dir($dir_name, $dir_mode = OCTAL_DIR_MODE) { + if(!file_exists($dir_name)) { + $umask = umask(0); + mkdir($dir_name, $dir_mode); + umask($umask); + return true; + } else { + return false; + } +} + +// Function to chmod files and directories +function change_mode($name) { + if(OPERATING_SYSTEM != 'windows') { + // Only chmod if os is not windows + if(is_dir($name)) { + $mode = OCTAL_DIR_MODE; + } else { + $mode = OCTAL_FILE_MODE; + } + if(file_exists($name)) { + $umask = umask(0); + chmod($name, $mode); + umask($umask); + return true; + } else { + return false; + } + } else { + return true; + } +} + +// Function to figure out if a parent exists +function is_parent($page_id) { + global $database; + // Get parent + $query = $database->query("SELECT parent FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); + $fetch = $query->fetchRow(); + // If parent isnt 0 return its ID + if($fetch['parent'] == '0') { + return false; + } else { + return $fetch['parent']; + } +} + +// Function to work out level +function level_count($page_id) { + global $database; + // Get page parent + $query_page = $database->query("SELECT parent FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id' LIMIT 1"); + $fetch_page = $query_page->fetchRow(); + $parent = $fetch_page['parent']; + if($parent > 0) { + // Get the level of the parent + $query_parent = $database->query("SELECT level FROM ".TABLE_PREFIX."pages WHERE page_id = '$parent' LIMIT 1"); + $fetch_parent = $query_parent->fetchRow(); + $level = $fetch_parent['level']; + return $level+1; + } else { + return 0; + } +} + +// Function to work out root parent +function root_parent($page_id) { + global $database; + // Get page details + $query_page = $database->query("SELECT parent,level FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id' LIMIT 1"); + $fetch_page = $query_page->fetchRow(); + $parent = $fetch_page['parent']; + $level = $fetch_page['level']; + if($level == 1) { + return $parent; + } elseif($parent == 0) { + return 0; + } else { + // Figure out what the root parents id is + $parent_ids = array_reverse(get_parent_ids($page_id)); + return $parent_ids[0]; + } +} + +// Function to get page title +function get_page_title($id) { + global $database; + // Get title + $query = $database->query("SELECT page_title FROM ".TABLE_PREFIX."pages WHERE page_id = '$id'"); + $fetch = $query->fetchRow(); + // Return title + return $fetch['page_title']; +} + +// Function to get a pages menu title +function get_menu_title($id) { + // Connect to the database + $database = new database(); + // Get title + $query = $database->query("SELECT menu_title FROM ".TABLE_PREFIX."pages WHERE page_id = '$id'"); + $fetch = $query->fetchRow(); + // Return title + return $fetch['menu_title']; +} + +// Function to get all parent page titles +function get_parent_titles($parent_id) { + $titles[] = get_menu_title($parent_id); + if(is_parent($parent_id) != false) { + $parent_titles = get_parent_titles(is_parent($parent_id)); + $titles = array_merge($titles, $parent_titles); + } + return $titles; +} + +// Function to get all parent page id's +function get_parent_ids($parent_id) { + $ids[] = $parent_id; + if(is_parent($parent_id) != false) { + $parent_ids = get_parent_ids(is_parent($parent_id)); + $ids = array_merge($ids, $parent_ids); + } + return $ids; +} + +// Function to genereate page trail +function get_page_trail($page_id) { + return implode(',', array_reverse(get_parent_ids($page_id))); +} + +// Function to get all sub pages id's +function get_subs($parent, $subs) { + // Connect to the database + $database = new database(); + // Get id's + $query = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent'"); + if($query->numRows() > 0) { + while($fetch = $query->fetchRow()) { + $subs[] = $fetch['page_id']; + // Get subs of this sub + $subs = get_subs($fetch['page_id'], $subs); + } + } + // Return subs array + return $subs; +} + +// Function to convert a page title to a page filename +function page_filename($string) { + // First, translate any non-english characters to their english equivalents + require(WB_PATH.'/framework/convert.php'); + $string = strtr($string, $conversion_array); + // Now replace spaces with page spcacer + $string = str_replace(' ', PAGE_SPACER, $string); + // Now remove all bad characters + $bad = array( + '\'', /* / */ '"', /* " */ '<', /* < */ '>', /* > */ + '{', /* { */ '}', /* } */ '[', /* [ */ ']', /* ] */ '`', /* ` */ + '!', /* ! */ '@', /* @ */ '#', /* # */ '$', /* $ */ '%', /* % */ + '^', /* ^ */ '&', /* & */ '*', /* * */ '(', /* ( */ ')', /* ) */ + '=', /* = */ '+', /* + */ '|', /* | */ '/', /* / */ '\\', /* \ */ + ';', /* ; */ ':', /* : */ ',', /* , */ '?' /* ? */ + ); + $string = str_replace($bad, '', $string); + // Now convert to lower-case + $string = strtolower($string); + // Now remove multiple page spacers + $string = str_replace(PAGE_SPACER.PAGE_SPACER, PAGE_SPACER, $string); + // Clean any page spacers at the end of string + $string = str_replace(PAGE_SPACER, ' ', $string); + $string = trim($string); + $string = str_replace(' ', PAGE_SPACER, $string); + // If there are any weird language characters, this will protect us against possible problems they could cause + $string = str_replace(array('%2F', '%'), array('/', ''), urlencode($string)); + // Finally, return the cleaned string + return $string; +} + +// Function to convert a desired media filename to a clean filename +function media_filename($string) { + // First, translate any non-english characters to their english equivalents + require(WB_PATH.'/framework/convert.php'); + $string = strtr($string, $conversion_array); + // Now remove all bad characters + $bad = array( + '\'', // ' + '"', // " + '`', // ` + '!', // ! + '@', // @ + '#', // # + '$', // $ + '%', // % + '^', // ^ + '&', // & + '*', // * + '=', // = + '+', // + + '|', // | + '/', // / + '\\', // \ + ';', // ; + ':', // : + ',', // , + '?' // ? + ); + $string = str_replace($bad, '', $string); + // Clean any page spacers at the end of string + $string = trim($string); + // Finally, return the cleaned string + return $string; +} + +// Function to work out a page link +if(!function_exists('page_link')) { + function page_link($link) { + global $admin; + return $admin->page_link($link); + } +} + +// Create a new file in the pages directory +function create_access_file($filename,$page_id,$level) { + global $admin; + if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/')) { + $admin->print_error($MESSAGE['PAGES']['CANNOT_CREATE_ACCESS_FILE']); + } else { + // First make sure parent folder exists + $parent_folders = explode('/',str_replace(WB_PATH.PAGES_DIRECTORY, '', dirname($filename))); + $parents = ''; + foreach($parent_folders AS $parent_folder) { + if($parent_folder != '/' AND $parent_folder != '') { + $parents .= '/'.$parent_folder; + if(!file_exists(WB_PATH.PAGES_DIRECTORY.$parents)) { + make_dir(WB_PATH.PAGES_DIRECTORY.$parents); + } + } + } + // The depth of the page directory in the directory hierarchy + // '/pages' is at depth 1 + $pages_dir_depth=count(explode('/',PAGES_DIRECTORY))-1; + // Work-out how many ../'s we need to get to the index page + $index_location = ''; + for($i = 0; $i < $level + $pages_dir_depth; $i++) { + $index_location .= '../'; + } + $content = ''. +''; + $handle = fopen($filename, 'w'); + fwrite($handle, $content); + fclose($handle); + // Chmod the file + change_mode($filename, 'file'); + } +} + +// Function for working out a file mime type (if the in-built PHP one is not enabled) +if(!function_exists('mime_content_type')) { + function mime_content_type($file) { + $file = escapeshellarg($file); + return trim(`file -bi $file`); + } +} + +// Generate a thumbnail from an image +function make_thumb($source, $destination, $size) { + // Check if GD is installed + if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { + // First figure out the size of the thumbnail + list($original_x, $original_y) = getimagesize($source); + if ($original_x > $original_y) { + $thumb_w = $size; + $thumb_h = $original_y*($size/$original_x); + } + if ($original_x < $original_y) { + $thumb_w = $original_x*($size/$original_y); + $thumb_h = $size; + } + if ($original_x == $original_y) { + $thumb_w = $size; + $thumb_h = $size; + } + // Now make the thumbnail + $source = imageCreateFromJpeg($source); + $dst_img = ImageCreateTrueColor($thumb_w, $thumb_h); + imagecopyresampled($dst_img,$source,0,0,0,0,$thumb_w,$thumb_h,$original_x,$original_y); + imagejpeg($dst_img, $destination); + // Clear memory + imagedestroy($dst_img); + imagedestroy($source); + // Return true + return true; + } else { + return false; + } +} + +// Function to work-out a single part of an octal permission value +function extract_permission($octal_value, $who, $action) { + // Make sure the octal value is 4 chars long + if(strlen($octal_value) == 0) { + $octal_value = '0000'; + } elseif(strlen($octal_value) == 1) { + $octal_value = '000'.$octal_value; + } elseif(strlen($octal_value) == 2) { + $octal_value = '00'.$octal_value; + } elseif(strlen($octal_value) == 3) { + $octal_value = '0'.$octal_value; + } elseif(strlen($octal_value) == 4) { + $octal_value = ''.$octal_value; + } else { + $octal_value = '0000'; + } + // Work-out what position of the octal value to look at + switch($who) { + case 'u': + $position = '1'; + break; + case 'user': + $position = '1'; + break; + case 'g': + $position = '2'; + break; + case 'group': + $position = '2'; + break; + case 'o': + $position = '3'; + break; + case 'others': + $position = '3'; + break; + } + // Work-out how long the octal value is and ajust acording + if(strlen($octal_value) == 4) { + $position = $position+1; + } elseif(strlen($octal_value) != 3) { + exit('Error'); + } + // Now work-out what action the script is trying to look-up + switch($action) { + case 'r': + $action = 'r'; + break; + case 'read': + $action = 'r'; + break; + case 'w': + $action = 'w'; + break; + case 'write': + $action = 'w'; + break; + case 'e': + $action = 'e'; + break; + case 'execute': + $action = 'e'; + break; + } + // Get the value for "who" + $value = substr($octal_value, $position-1, 1); + // Now work-out the details of the value + switch($value) { + case '0': + $r = false; + $w = false; + $e = false; + break; + case '1': + $r = false; + $w = false; + $e = true; + break; + case '2': + $r = false; + $w = true; + $e = false; + break; + case '3': + $r = false; + $w = true; + $e = true; + break; + case '4': + $r = true; + $w = false; + $e = false; + break; + case '5': + $r = true; + $w = false; + $e = true; + break; + case '6': + $r = true; + $w = true; + $e = false; + break; + case '7': + $r = true; + $w = true; + $e = true; + break; + default: + $r = false; + $w = false; + $e = false; + } + // And finally, return either true or false + return $$action; +} + +// Function to delete a page +function delete_page($page_id) { + + global $admin, $database; + + // Find out more about the page + $database = new database(); + $query = "SELECT page_id,menu_title,page_title,level,link,parent,modified_by,modified_when FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; + $results = $database->query($query); + if($database->is_error()) { + $admin->print_error($database->get_error()); + } + if($results->numRows() == 0) { + $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); + } + $results_array = $results->fetchRow(); + $parent = $results_array['parent']; + $level = $results_array['level']; + $link = $results_array['link']; + $page_title = ($results_array['page_title']); + $menu_title = ($results_array['menu_title']); + + // Get the sections that belong to the page + $query_sections = $database->query("SELECT section_id,module FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id'"); + if($query_sections->numRows() > 0) { + while($section = $query_sections->fetchRow()) { + // Set section id + $section_id = $section['section_id']; + // Include the modules delete file if it exists + if(file_exists(WB_PATH.'/modules/'.$section['module'].'/delete.php')) { + require(WB_PATH.'/modules/'.$section['module'].'/delete.php'); + } + } + } + + // Update the pages table + $query = "DELETE FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; + $database->query($query); + if($database->is_error()) { + $admin->print_error($database->get_error()); + } + + // Update the sections table + $query = "DELETE FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id'"; + $database->query($query); + if($database->is_error()) { + $admin->print_error($database->get_error()); + } + + // Include the ordering class or clean-up ordering + require_once(WB_PATH.'/framework/class.order.php'); + $order = new order(TABLE_PREFIX.'pages', 'position', 'page_id', 'parent'); + $order->clean($parent); + + // Unlink the page access file and directory + $directory = WB_PATH.PAGES_DIRECTORY.$link; + $filename = $directory.'.php'; + $directory .= '/'; + if(file_exists($filename)) { + if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/')) { + $admin->print_error($MESSAGE['PAGES']['CANNOT_DELETE_ACCESS_FILE']); + } else { + unlink($filename); + if(file_exists($directory)) { + rm_full_dir($directory); + } + } + } + +} + +// Load module into DB +function load_module($directory, $install = false) { + global $database,$admin,$MESSAGE; + if(file_exists($directory.'/info.php')) { + require($directory.'/info.php'); + if(isset($module_name)) { + if(!isset($module_license)) { $module_license = 'GNU General Public License'; } + if(!isset($module_platform) AND isset($module_designed_for)) { $module_platform = $module_designed_for; } + if(!isset($module_function) AND isset($module_type)) { $module_function = $module_type; } + $module_function = strtolower($module_function); + // Check that it doesn't already exist + $result = $database->query("SELECT addon_id FROM ".TABLE_PREFIX."addons WHERE directory = '".$module_directory."' LIMIT 0,1"); + if($result->numRows() == 0) { + // Load into DB + $query = "INSERT INTO ".TABLE_PREFIX."addons ". + "(directory,name,description,type,function,version,platform,author,license) ". + "VALUES ('$module_directory','$module_name','".addslashes($module_description)."','module',". + "'$module_function','$module_version','$module_platform','$module_author','$module_license')"; + $database->query($query); + // Run installation script + if($install == true) { + if(file_exists($directory.'/install.php')) { + require($directory.'/install.php'); + } + } + } + } + } +} + +// Load template into DB +function load_template($directory) { + global $database; + if(file_exists($directory.'/info.php')) { + require($directory.'/info.php'); + if(isset($template_name)) { + if(!isset($template_license)) { $template_license = 'GNU General Public License'; } + if(!isset($template_platform) AND isset($template_designed_for)) { $template_platform = $template_designed_for; } + // Check that it doesn't already exist + $result = $database->query("SELECT addon_id FROM ".TABLE_PREFIX."addons WHERE directory = '".$template_directory."' LIMIT 0,1"); + if($result->numRows() == 0) { + // Load into DB + $query = "INSERT INTO ".TABLE_PREFIX."addons ". + "(directory,name,description,type,version,platform,author,license) ". + "VALUES ('$template_directory','$template_name','".addslashes($template_description)."','template',". + "'$template_version','$template_platform','$template_author','$template_license')"; + $database->query($query); + } + } + } +} + +// Load language into DB +function load_language($file) { + global $database; + if(file_exists($file)) { + require($file); + if(isset($language_name)) { + if(!isset($language_license)) { $language_license = 'GNU General Public License'; } + if(!isset($language_platform) AND isset($language_designed_for)) { $language_platform = $language_designed_for; } + // Check that it doesn't already exist + $result = $database->query("SELECT addon_id FROM ".TABLE_PREFIX."addons WHERE directory = '".$language_code."' LIMIT 0,1"); + if($result->numRows() == 0) { + // Load into DB + $query = "INSERT INTO ".TABLE_PREFIX."addons ". + "(directory,name,type,version,platform,author,license) ". + "VALUES ('$language_code','$language_name','language',". + "'$language_version','$language_platform','$language_author','$language_license')"; + $database->query($query); + } + } + } +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/framework/functions.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: tags/2.6.0/wb/framework/class.frontend.php =================================================================== --- tags/2.6.0/wb/framework/class.frontend.php (nonexistent) +++ tags/2.6.0/wb/framework/class.frontend.php (revision 260) @@ -0,0 +1,380 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Frontend class + +*/ + +if(!defined('WB_PATH')) { + header('Location: ../index.php'); +} + + +require_once(WB_PATH.'/framework/class.wb.php'); + +class frontend extends wb { + // defaults + var $default_link,$default_page_id; + // when multiple blocks are used, show home page blocks on + // pages where no content is defined (search, login, ...) + var $default_block_content=true; + + // page details + // page database row + var $page; + var $page_id,$page_title,$menu_title,$parent,$root_parent,$level,$visibility; + var $page_description,$page_keywords,$page_link; + var $page_trail=array(); + + var $page_access_denied; + + // website settings + var $website_title,$website_description,$website_keywords,$website_header,$website_footer; + + // ugly database stuff + var $extra_where_sql; + + function page_select() { + global $page_id,$no_intro; + global $database; + // We have no page id and are supposed to show the intro page + if((INTRO_PAGE AND !isset($no_intro)) AND (!isset($page_id) OR !is_numeric($page_id))) { + // Since we have no page id check if we should go to intro page or default page + // Get intro page content + $filename = WB_PATH.PAGES_DIRECTORY.'/intro.php'; + if(file_exists($filename)) { + $handle = fopen($filename, "r"); + $content = fread($handle, filesize($filename)); + fclose($handle); + $this->preprocess($content); + echo ($content); + return false; + } + } + // Check if we should add page language sql code + if(PAGE_LANGUAGES) { + $this->sql_where_language = " AND language = '".LANGUAGE."'"; + } + // Get default page + // Check for a page id + $query_default = "SELECT page_id,link FROM ".TABLE_PREFIX."pages WHERE parent = '0' AND visibility = 'public'$this->sql_where_language ORDER BY position ASC LIMIT 1"; + $get_default = $database->query($query_default); + $default_num_rows = $get_default->numRows(); + if(!isset($page_id) OR !is_numeric($page_id)){ + // Go to or show default page + if($default_num_rows > 0) { + $fetch_default = $get_default->fetchRow(); + $this->default_link = $fetch_default['link']; + $this->default_page_id = $fetch_default['page_id']; + // Check if we should redirect or include page inline + if(HOMEPAGE_REDIRECTION) { + // Redirect to page + header("Location: ".$this->page_link($this->default_link)); + exit(); + } else { + // Include page inline + $this->page_id = $this->default_page_id; + } + } else { + // No pages have been added, so print under construction page + $this->print_under_construction(); + exit(); + } + } else { + $this->page_id=$page_id; + } + // Get default page link + if(!isset($fetch_default)) { + $fetch_default = $get_default->fetchRow(); + $this->default_link = $fetch_default['link']; + $this->default_page_id = $fetch_default['page_id']; + } + return true; + } + + function get_page_details() { + global $database; + if($this->page_id != 0) { + // Query page details + $query_page = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '{$this->page_id}'"; + $get_page = $database->query($query_page); + // Make sure page was found in database + if($get_page->numRows() == 0) { + // Print page not found message + exit("Page not found"); + } + // Fetch page details + $this->page = $get_page->fetchRow(); + // Check if the page language is also the selected language. If not, send headers again. + if ($this->page['language']!=LANGUAGE) { + header('Location: '.$this->page_link($this->page['link']).'?lang='.$this->page['language']); + exit(); + } + // Begin code to set details as either variables of constants + // Page ID + define('PAGE_ID', $this->page['page_id']); + // Page Title + define('PAGE_TITLE', ($this->page['page_title'])); + $this->page_title=PAGE_TITLE; + // Menu Title + $menu_title = ($this->page['menu_title']); + if($menu_title != '') { + define('MENU_TITLE', $menu_title); + } else { + define('MENU_TITLE', PAGE_TITLE); + } + $this->menu_title=MENU_TITLE; + // Page parent + define('PARENT', $this->page['parent']); + $this->parent=$this->page['parent']; + // Page root parent + define('ROOT_PARENT', $this->page['root_parent']); + $this->root_parent=$this->page['root_parent']; + // Page level + define('LEVEL', $this->page['level']); + $this->level=$this->page['level']; + // Page visibility + define('VISIBILITY', $this->page['visibility']); + $this->visibility=$this->page['visibility']; + // Page trail + foreach(explode(',', $this->page['page_trail']) AS $pid) { + $this->page_trail[$pid]=$pid; + } + // Page description + $this->page_description=$this->page['description']; + // Page keywords + $this->page_keywords=$this->page['keywords']; + // Page link + $this->link=$this->page_link($this->page['link']); + + // End code to set details as either variables of constants + } + + // Figure out what template to use + if(!defined('TEMPLATE')) { + if(isset($this->page['template']) AND $this->page['template'] != '') { + if(file_exists(WB_PATH.'/templates/'.$this->page['template'].'/index.php')) { + define('TEMPLATE', $this->page['template']); + } else { + define('TEMPLATE', DEFAULT_TEMPLATE); + } + } else { + define('TEMPLATE', DEFAULT_TEMPLATE); + } + } + // Set the template dir + define('TEMPLATE_DIR', WB_URL.'/templates/'.TEMPLATE); + + // Check if user is allowed to view this page + if(VISIBILITY == 'private' OR VISIBILITY == 'registered') { + // Check if the user is authenticated + if($this->is_authenticated() == false) { + // User needs to login first + header("Location: ".WB_URL."/account/login".PAGE_EXTENSION.'?redirect='.$this->link); + } + // Check if we should show this page + if($this->show_page($this->page) == false) { + $this->page_access_denied=true; + } + } elseif(VISIBILITY == 'deleted' OR VISIBILITY == 'none') { + // User isnt allowed on this page so tell them + $this->page_access_denied=true; + } + } + + function get_website_settings() { + global $database; + + // set visibility SQL code + // never show no-vis, hidden or deleted pages + $this->extra_where_sql = "visibility != 'none' AND visibility != 'hidden' AND visibility != 'deleted'"; + // Set extra private sql code + if($this->is_authenticated()==false) { + // if user is not authenticated, don't show private pages either + $this->extra_where_sql .= " AND visibility != 'private'"; + // and 'registered' without frontend login doesn't make much sense! + if (FRONTEND_LOGIN==false) { + $this->extra_where_sql .= " AND visibility != 'registered'"; + } + } + $this->extra_where_sql .= $this->sql_where_language; + + // Work-out if any possible in-line search boxes should be shown + if(SEARCH == 'public') { + define('SHOW_SEARCH', true); + } elseif(SEARCH == 'private' AND VISIBILITY == 'private') { + define('SHOW_SEARCH', true); + } elseif(SEARCH == 'private' AND $wb->is_authenticated() == true) { + define('SHOW_SEARCH', true); + } else { + define('SHOW_SEARCH', false); + } + // Work-out if menu should be shown + if(!defined('SHOW_MENU')) { + define('SHOW_MENU', true); + } + // Work-out if login menu constants should be set + if(FRONTEND_LOGIN) { + // Set login menu constants + define('LOGIN_URL', WB_URL.'/account/login'.PAGE_EXTENSION); + define('LOGOUT_URL', WB_URL.'/account/logout'.PAGE_EXTENSION); + define('FORGOT_URL', WB_URL.'/account/forgot'.PAGE_EXTENSION); + define('PREFERENCES_URL', WB_URL.'/account/preferences'.PAGE_EXTENSION); + define('SIGNUP_URL', WB_URL.'/account/signup'.PAGE_EXTENSION); + } + } + + function preprocess(&$content) { + global $database; + // Replace [wblink--PAGE_ID--] with real link + $pattern = '/\[wblink(.+?)\]/s'; + preg_match_all($pattern,$content,$ids); + foreach($ids[1] AS $page_id) { + $pattern = '/\[wblink'.$page_id.'\]/s'; + // Get page link + $get_link = $database->query("SELECT link FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id' LIMIT 1"); + $fetch_link = $get_link->fetchRow(); + $link = $this->page_link($fetch_link['link']); + $content = preg_replace($pattern,$link,$content); + } + } + + function menu() { + global $wb; + if (!isset($wb->menu_number)) { + $wb->menu_number = 1; + } + if (!isset($wb->menu_start_level)) { + $wb->menu_start_level = 0; + } + if (!isset($wb->menu_recurse)) { + $wb->menu_recurse = -1; + } + if (!isset($wb->menu_collapse)) { + $wb->menu_collapse = true; + } + if (!isset($wb->menu_item_template)) { + $wb->menu_item_template = '
  • [a][menu_title][/a]'; + } + if (!isset($wb->menu_item_footer)) { + $wb->menu_item_footer = '
    • '; + } + if (!isset($wb->menu_header)) { + $wb->menu_header = '
      '; + } + if (!isset($wb->menu_footer)) { + $wb->menu_footer = '
    '; + } + if (!isset($wb->menu_default_class)) { + $wb->menu_default_class = ' class="menu_default"'; + } + if (!isset($wb->menu_current_class)) { + $wb->menu_current_class = ' class="menu_current"'; + } + if (!isset($wb->menu_parent)) { + $wb->menu_parent = 0; + } + $wb->show_menu(); + } + + function show_menu() { + global $database; + if ($this->menu_start_level>0) { + $key_array=array_keys($this->page_trail); + $real_start=$key_array[$this->menu_start_level-1]; + if (isset($real_start)) { + $this->menu_parent=$real_start; + $this->menu_start_level=0; + } else { + return; + } + } + if ($this->menu_recurse==0) + return; + // Check if we should add menu number check to query + if($this->menu_parent == 0) { + $menu_number = "menu = '$this->menu_number'"; + } else { + $menu_number = '1'; + } + // Query pages + $query_menu = $database->query("SELECT page_id,menu_title,page_title,link,target,level,visibility FROM ". + TABLE_PREFIX."pages WHERE parent = '$this->menu_parent' AND $menu_number AND $this->extra_where_sql ORDER BY position ASC"); + // Check if there are any pages to show + if($query_menu->numRows() > 0) { + // Print menu header + echo "\n".$this->menu_header; + // Loop through pages + while($page = $query_menu->fetchRow()) { + // Check if this page should be shown + // Create vars + $vars = array('[class]','[a]', '[/a]', '[menu_title]', '[page_title]'); + // Work-out class + if($page['page_id'] == PAGE_ID) { + $class = $this->menu_current_class; + } else { + $class = $this->menu_default_class; + } + // Check if link is same as first page link, and if so change to WB URL + if($page['link'] == $this->default_link AND !INTRO_PAGE) { + $link = WB_URL; + } else { + $link = $this->page_link($page['link']); + } + // Create values + $values = array($class,'', '', ($page['menu_title']), ($page['page_title'])); + // Replace vars with value and print + echo "\n".str_replace($vars, $values, $this->menu_item_template); + // Generate sub-menu + if($this->menu_collapse==false OR ($this->menu_collapse==true AND isset($this->page_trail[$page['page_id']]))) { + $this->menu_recurse--; + $this->menu_parent=$page['page_id']; + $this->show_menu(); + } + echo "\n".$this->menu_item_footer; + } + // Print menu footer + echo "\n".$this->menu_footer; + } + } + + + // Function to show the "Under Construction" page + function print_under_construction() { + global $MESSAGE; + require_once(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php'); + echo ' + '.$MESSAGE['GENERIC']['WEBSITE_UNDER_CONTRUCTION'].' + +

    '.$MESSAGE['GENERIC']['WEBSITE_UNDER_CONTRUCTION'];'.


    + '.$MESSAGE['GENERIC']['PLEASE_CHECK_BACK_SOON'].''; + } +} + +?> Property changes on: tags/2.6.0/wb/framework/class.frontend.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/framework/frontend.functions.php =================================================================== --- tags/2.6.0/wb/framework/frontend.functions.php (nonexistent) +++ tags/2.6.0/wb/framework/frontend.functions.php (revision 260) @@ -0,0 +1,277 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + This file is purely for ensuring compatibility with 3rd party + contributions made for WB version 2.5.2 or below +*/ +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +// references to objects and variables that changed their names + +$admin = &$wb; + +$default_link=&$wb->default_link; + +$page_trail=&$wb->page_trail; +$page_description=&$wb->page_description; +$page_keywords=&$wb->page_keywords; +$page_link=&$wb->link; + +// extra_sql is not used anymore - this is basically a register_globals exploit prevention... +$extra_sql=&$wb->extra_sql; +$extra_where_sql=&$wb->extra_where_sql; + +$query="SELECT directory FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'snippet'"; +$query_result=$database->query($query); +if ($query_result->numRows()>0) { + while ($row = $query_result->fetchRow()) { + $module_dir = $row['directory']; + if (file_exists(WB_PATH.'/modules/'.$module_dir.'/include.php')) { + include(WB_PATH.'/modules/'.$module_dir.'/include.php'); + } + } +} + +// Frontend functions +if (!function_exists('page_link')) { + function page_link($link) { + global $wb; + return $wb->page_link($link); + } +} + +// Old menu call invokes new menu function +if (!function_exists('page_menu')) { + function page_menu($parent = 0, $menu_number = 1, $item_template = '[a][menu_title][/a]', $menu_header = '
      ', $menu_footer = '
    ', $default_class = ' class="menu_default"', $current_class = ' class="menu_current"', $recurse = LEVEL) { + global $wb; + $wb->menu_number=$menu_number; + $wb->menu_item_template=$item_template; + $wb->menu_item_footer=''; + $wb->menu_parent = $parent; + $wb->menu_header = $menu_header; + $wb->menu_footer = $menu_footer; + $wb->menu_default_class = $default_class; + $wb->menu_current_class = $current_class; + $wb->menu_recurse = $recurse+2; + $wb->menu(); + unset($wb->menu_parent); + unset($wb->menu_number); + unset($wb->menu_item_template); + unset($wb->menu_item_footer); + unset($wb->menu_header); + unset($wb->menu_footer); + unset($wb->menu_default_class); + unset($wb->menu_current_class); + unset($wb->menu_start_level); + unset($wb->menu_collapse); + unset($wb->menu_recurse); + } +} + +if (!function_exists('show_menu')) { + function show_menu($menu_number = NULL, $start_level=NULL, $recurse = NULL, $collapse = NULL, $item_template = NULL, $item_footer = NULL, $menu_header = NULL, $menu_footer = NULL, $default_class = NULL, $current_class = NULL, $parent = NULL) { + global $wb; + if (isset($menu_number)) + $wb->menu_number=$menu_number; + if (isset($start_level)) + $wb->menu_start_level=$start_level; + if (isset($recurse)) + $wb->menu_recurse=$recurse; + if (isset($collapse)) + $wb->menu_collapse=$collapse; + if (isset($item_template)) + $wb->menu_item_template=$item_template; + if (isset($item_footer)) + $wb->menu_item_footer=$item_footer; + if (isset($menu_header)) + $wb->menu_header=$menu_header; + if (isset($menu_footer)) + $wb->menu_footer=$menu_footer; + if (isset($default_class)) + $wb->menu_default_class=$default_class; + if (isset($current_class)) + $wb->menu_current_class=$current_class; + if (isset($parent)) + $wb->menu_parent=$parent; + $wb->menu(); + unset($wb->menu_recurse); + unset($wb->menu_parent); + unset($wb->menu_start_level); + } +} + +if (!function_exists('page_content')) { + function page_content($block = 1) { + // Get outside objects + global $TEXT,$MENU,$HEADING,$MESSAGE; + global $globals; + global $database; + global $wb; + $admin = & $wb; + if ($wb->page_access_denied==true) { + echo $MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS']; + exit(); + } + if(isset($globals) AND is_array($globals)) { foreach($globals AS $global_name) { global $$global_name; } } + // Make sure block is numeric + if(!is_numeric($block)) { $block = 1; } + // Include page content + if(!defined('PAGE_CONTENT') OR $block!=1) { + $page_id=$wb->page_id; + // First get all sections for this page + $query_sections = $database->query("SELECT section_id,module FROM ".TABLE_PREFIX."sections WHERE page_id = '".$page_id."' AND block = '$block' ORDER BY position"); + // If none were found, check if default content is supposed to be shown + if($query_sections->numRows() == 0) { + if ($wb->default_block_content=='none') { + return; + } + if (is_numeric($wb->default_block_content)) { + $page_id=$wb->default_block_content; + } else { + $page_id=$wb->default_page_id; + } + $query_sections = $database->query("SELECT section_id,module FROM ".TABLE_PREFIX."sections WHERE page_id = '".$page_id."' AND block = '$block' ORDER BY position"); + // Still no cotent found? Give it up, there's just nothing to show! + if($query_sections->numRows() == 0) { + return; + } + } + // Loop through them and include their module file + while($section = $query_sections->fetchRow()) { + $section_id = $section['section_id']; + $module = $section['module']; + require(WB_PATH.'/modules/'.$module.'/view.php'); + } + } else { + require(PAGE_CONTENT); + } + } +} + +if (!function_exists('show_content')) { + function show_content($block=1) { + page_content($block); + } +} + +if (!function_exists('show_breadcrumbs')) { + function show_breadcrumbs($sep=' > ',$tier=1,$links=true) { + global $wb; + $page_id=$wb->page_id; + if ($page_id!=0) + { + global $database; + $bca=$wb->page_trail; + $counter=0; + foreach ($bca as $temp) + { + if ($counter>=($tier-1)); + { + if ($counter>=$tier) echo $sep; + $query_menu=$database->query("SELECT menu_title,link FROM ".TABLE_PREFIX."pages WHERE page_id=$temp"); + $page=$query_menu->fetchRow(); + if ($links==true AND $temp!=$page_id) + echo ''.$page['menu_title'].''; + else + echo $page['menu_title']; + } + $counter++; + } + } + } +} + +// Function for page title +if (!function_exists('page_title')) { + function page_title($spacer = ' - ', $template = '[WEBSITE_TITLE][SPACER][PAGE_TITLE]') { + $vars = array('[WEBSITE_TITLE]', '[PAGE_TITLE]', '[MENU_TITLE]', '[SPACER]'); + $values = array(WEBSITE_TITLE, PAGE_TITLE, MENU_TITLE, $spacer); + echo str_replace($vars, $values, $template); + } +} + +// Function for page description +if (!function_exists('page_description')) { + function page_description() { + global $wb; + if ($wb->page_description!='') { + echo $wb->page_description; + } else { + echo PAGE_DESCRIPTION; + } + } +} + +// Function for page keywords +if (!function_exists('page_keywords')) { + function page_keywords() { + global $wb; + if ($wb->page_keywords!='') { + echo $wb->page_keywords; + } else { + echo WEBSITE_KEYWORDS; + } + } +} +// Function for page header +if (!function_exists('page_header')) { + function page_header($date_format = 'Y') { + echo WEBSITE_HEADER; + } +} + +// Function for page footer +if (!function_exists('page_footer')) { + function page_footer($date_format = 'Y') { + global $starttime; + $vars = array('[YEAR]', '[PROCESSTIME]'); + $processtime=array_sum(explode(" ",microtime()))-$starttime; + $values = array(date($date_format),$processtime); + echo str_replace($vars, $values, WEBSITE_FOOTER); + } +} + +// Begin WB < 2.4.x template compatibility code + // Make extra_sql accessable through private_sql + $private_sql = $extra_sql; + $private_where_sql = $extra_where_sql; + // Query pages for menu + $menu1 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '0' AND $extra_where_sql ORDER BY position ASC"); + // Check if current pages is a parent page and if we need its submenu + if(PARENT == 0) { + // Get the pages submenu + $menu2 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '".PAGE_ID."' AND $extra_where_sql ORDER BY position ASC"); + } else { + // Get the pages submenu + $menu2 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '".PARENT."' AND $extra_where_sql ORDER BY position ASC"); + } +// End WB < 2.4.x template compatibility code +// Include template file + + +?> Property changes on: tags/2.6.0/wb/framework/frontend.functions.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/framework/class.wb.php =================================================================== --- tags/2.6.0/wb/framework/class.wb.php (nonexistent) +++ tags/2.6.0/wb/framework/class.wb.php (revision 260) @@ -0,0 +1,198 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +wb class + +This class is the basis for admin and frontend classes. + +*/ + +require_once(WB_PATH.'/framework/class.database.php'); + +class wb +{ + // General initialization function + // performed when frontend or backend is loaded. + function wb() { + } + + // Check whether we should show a page or not (for front-end) + function show_page($page) { + // First check if the page is set to private + if($page['visibility'] == 'private' OR $page['visibility'] == 'registered') { + // Check if the user is logged in + if($this->is_authenticated() == true) { + // Now check if the user has perms to view it + $viewing_groups = explode(',', $page['viewing_groups']); + $viewing_users = explode(',', $page['viewing_users']); + if(is_numeric(array_search($this->get_group_id(), $viewing_groups)) OR is_numeric(array_search($this->get_user_id(), $viewing_users))) { + return true; + } else { + return false; + } + } else { + return false; + } + } elseif($page['visibility'] == 'public') { + return true; + } else { + return false; + } + } + + // Check if the user is already authenticated or not + function is_authenticated() { + if(isset($_SESSION['USER_ID']) AND $_SESSION['USER_ID'] != "" AND is_numeric($_SESSION['USER_ID'])) { + return true; + } else { + return false; + } + } + // Modified addslashes function which takes into account magic_quotes + function add_slashes($input) { + if ( get_magic_quotes_gpc() || ( !is_string($input) ) ) { + return $input; + } + $output = addslashes($input); + return $output; + } + + // Ditto for stripslashes + function strip_slashes($input) { + if ( !get_magic_quotes_gpc() || ( !is_string($input) ) ) { + return $input; + } + $output = stripslashes($input); + return $output; + } + + // Escape backslashes for use with mySQL LIKE strings + function escape_backslashes($input) { + return str_replace("\\","\\\\",$input); + } + + function page_link($link){ + // Check for :// in the link (used in URL's) as well as mailto: + if(strstr($link, '://') == '' AND substr($link, 0, 7) != 'mailto:') { + return WB_URL.PAGES_DIRECTORY.$link.PAGE_EXTENSION; + } else { + return $link; + } + } + + // Get POST data + function get_post($field) { + if(isset($_POST[$field])) { + return $_POST[$field]; + } else { + return null; + } + } + + // Get GET data + function get_get($field) { + if(isset($_GET[$field])) { + return $_GET[$field]; + } else { + return null; + } + } + + // Get SESSION data + function get_session($field) { + if(isset($_SESSION[$field])) { + return $_SESSION[$field]; + } else { + return null; + } + } + + // Get SERVER data + function get_server($field) { + if(isset($_SERVER[$field])) { + return $_SERVER[$field]; + } else { + return null; + } + } + + // Get the current users id + function get_user_id() { + return $_SESSION['USER_ID']; + } + + // Get the current users group id + function get_group_id() { + return $_SESSION['GROUP_ID']; + } + + // Get the current users group name + function get_group_name() { + return $_SESSION['GROUP_NAME']; + } + + // Get the current users username + function get_username() { + return $_SESSION['USERNAME']; + } + + // Get the current users display name + function get_display_name() { + return ($_SESSION['DISPLAY_NAME']); + } + + // Get the current users email address + function get_email() { + return $_SESSION['EMAIL']; + } + + // Get the current users home folder + function get_home_folder() { + return $_SESSION['HOME_FOLDER']; + } + + // Get the current users timezone + function get_timezone() { + if(!isset($_SESSION['USE_DEFAULT_TIMEZONE'])) { + return $_SESSION['TIMEZONE']; + } else { + return '-72000'; + } + } + + // Validate supplied email address + function validate_email($email) { + if(eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$", $email)) { + return true; + } else { + return false; + } + } + + +} +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/framework/class.wb.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/framework/class.admin.php =================================================================== --- tags/2.6.0/wb/framework/class.admin.php (nonexistent) +++ tags/2.6.0/wb/framework/class.admin.php (revision 260) @@ -0,0 +1,230 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Admin class + +This class will be used for every program that will be included +in the administration section of Website Baker. + +*/ + +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +require_once(WB_PATH.'/framework/class.wb.php'); + +// Include PHPLIB template class +require_once(WB_PATH."/include/phplib/template.inc"); + + +// Get WB version +require_once(ADMIN_PATH.'/interface/version.php'); + +/* +Begin user changeable settings +*/ + + +class admin extends wb { + // Authenticate user then auto print the header + function admin($section_name, $section_permission = 'start', $auto_header = true, $auto_auth = true) { + $this->wb(); + global $MESSAGE; + // Specify the current applications name + $this->section_name = $section_name; + $this->section_permission = $section_permission; + // Authenticate the user for this application + if($auto_auth == true) { + // First check if the user is logged-in + if($this->is_authenticated() == false) { + header('Location: '.ADMIN_URL.'/login/index.php'); + } + // Now check if they are allowed in this section + if($this->get_permission($section_permission) == false) { + die($MESSAGE['ADMIN']['INSUFFICIENT_PRIVELLIGES']); + } + } + // Auto header code + if($auto_header == true) { + $this->print_header(); + } + } + + // Print the admin header + function print_header($body_tags = '') { + // Get vars from the language file + global $MENU; + global $MESSAGE; + global $TEXT; + // Connect to database and get website title + global $database; + $get_title = $database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name = 'title'"); + $title = $get_title->fetchRow(); + $header_template = new Template(ADMIN_PATH."/interface"); + $header_template->set_file('page', 'header.html'); + $header_template->set_block('page', 'header_block', 'header'); + $header_template->set_var( array( + 'SECTION_NAME' => $MENU[strtoupper($this->section_name)], + 'INTERFACE_DIR' => ADMIN_URL.'/interface', + 'BODY_TAGS' => $body_tags, + 'WEBSITE_TITLE' => ($title['value']), + 'TEXT_ADMINISTRATION' => $TEXT['ADMINISTRATION'], + 'VERSION' => VERSION + ) + ); + // Create the menu + $menu = array( + array(ADMIN_URL.'/start/index.php', '', $MENU['START'], 'start', 0), + array(ADMIN_URL.'/pages/index.php', '', $MENU['PAGES'], 'pages', 1), + array(ADMIN_URL.'/media/index.php', '', $MENU['MEDIA'], 'media', 1), + array(ADMIN_URL.'/addons/index.php', '', $MENU['ADDONS'], 'addons', 1), + array(ADMIN_URL.'/preferences/index.php', '', $MENU['PREFERENCES'], 'preferences', 0), + array(ADMIN_URL.'/settings/index.php', '', $MENU['SETTINGS'], 'settings', 1), + array(ADMIN_URL.'/access/index.php', '', $MENU['ACCESS'], 'access', 1), + array('http://www.websitebaker.org/2/help/', '_blank', $MENU['HELP'], 'help', 0), + array(WB_URL.'/', '_blank', $MENU['VIEW'], 'view', 0), + array(ADMIN_URL.'/logout/index.php', '', $MENU['LOGOUT'], 'logout', 0) + ); + $header_template->set_block('header_block', 'linkBlock', 'link'); + foreach($menu AS $menu_item) { + $link = $menu_item[0]; + $target = $menu_item[1]; + $title = $menu_item[2]; + $permission_title = $menu_item[3]; + $required = $menu_item[4]; + $replace_old = array(ADMIN_URL, WB_URL, '/', 'index.php'); + if($required == false OR $this->get_link_permission($permission_title)) { + $header_template->set_var('LINK', $link); + $header_template->set_var('TARGET', $target); + // If link is the current section apply a class name + if($permission_title == strtolower($this->section_name)) { + $header_template->set_var('CLASS', 'current'); + } else { + $header_template->set_var('CLASS', ''); + } + $header_template->set_var('TITLE', $title); + // Print link + $header_template->parse('link', 'linkBlock', true); + } + } + $header_template->parse('header', 'header_block', false); + $header_template->pparse('output', 'page'); + } + + // Print the admin footer + function print_footer() { + $footer_template = new Template(ADMIN_PATH."/interface"); + $footer_template->set_file('page', 'footer.html'); + $footer_template->set_block('page', 'footer_block', 'header'); + $footer_template->parse('header', 'footer_block', false); + $footer_template->pparse('output', 'page'); + } + + // Print a success message which then automatically redirects the user to another page + function print_success($message, $redirect = 'index.php') { + global $TEXT; + $success_template = new Template(ADMIN_PATH.'/interface'); + $success_template->set_file('page', 'success.html'); + $success_template->set_block('page', 'main_block', 'main'); + $success_template->set_var('MESSAGE', $message); + $success_template->set_var('REDIRECT', $redirect); + $success_template->set_var('NEXT', $TEXT['NEXT']); + $success_template->parse('main', 'main_block', false); + $success_template->pparse('output', 'page'); + } + + // Print a error message + function print_error($message, $link = 'index.php', $auto_footer = true) { + global $TEXT; + $success_template = new Template(ADMIN_PATH.'/interface'); + $success_template->set_file('page', 'error.html'); + $success_template->set_block('page', 'main_block', 'main'); + $success_template->set_var('MESSAGE', $message); + $success_template->set_var('LINK', $link); + $success_template->set_var('BACK', $TEXT['BACK']); + $success_template->parse('main', 'main_block', false); + $success_template->pparse('output', 'page'); + if($auto_footer == true) { + $this->print_footer(); + } + exit(); + } + + // Return a system permission + function get_permission($name, $type = 'system') { + // Append to permission type + $type .= '_permissions'; + // Check if we have a section to check for + if($name == 'start') { + return true; + } else { + // Set system permissions var + $system_permissions = $this->get_session('SYSTEM_PERMISSIONS'); + // Set module permissions var + $module_permissions = $this->get_session('MODULE_PERMISSIONS'); + // Set template permissions var + $template_permissions = $this->get_session('TEMPLATE_PERMISSIONS'); + // Return true if system perm = 1 + if(is_numeric(array_search($name, $$type))) { + if($type == 'system_permissions') { + return true; + } else { + return false; + } + } else { + if($type == 'system_permissions') { + return false; + } else { + return true; + } + } + } + } + + // Returns a system permission for a menu link + function get_link_permission($title) { + $title = str_replace('_blank', '', $title); + $title = strtolower($title); + // Set system permissions var + $system_permissions = $this->get_session('SYSTEM_PERMISSIONS'); + // Set module permissions var + $module_permissions = $this->get_session('MODULE_PERMISSIONS'); + if($title == 'start') { + return true; + } else { + // Return true if system perm = 1 + if(is_numeric(array_search($title, $system_permissions))) { + return true; + } else { + return false; + } + } + } +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/framework/class.admin.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: tags/2.6.0/wb/framework/class.login.php =================================================================== --- tags/2.6.0/wb/framework/class.login.php (nonexistent) +++ tags/2.6.0/wb/framework/class.login.php (revision 260) @@ -0,0 +1,366 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Login class + +This class will be used to with the login application + +*/ + +// Stop this file from being accessed directly +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +define('LOGIN_CLASS_LOADED', true); + +// Load the other required class files if they are not already loaded +require_once(WB_PATH."/framework/class.admin.php"); + +class login extends admin { + function login($config_array) { + // Get language vars + global $MESSAGE; + $this->wb(); + // Get configuration values + $this->USERS_TABLE = $config_array['USERS_TABLE']; + $this->GROUPS_TABLE = $config_array['GROUPS_TABLE']; + $this->username_fieldname = $config_array['USERNAME_FIELDNAME']; + $this->password_fieldname = $config_array['PASSWORD_FIELDNAME']; + $this->remember_me_option = $config_array['REMEMBER_ME_OPTION']; + $this->max_attemps = $config_array['MAX_ATTEMPS']; + $this->warning_url = $config_array['WARNING_URL']; + $this->login_url = $config_array['LOGIN_URL']; + $this->template_dir = $config_array['TEMPLATE_DIR']; + $this->template_file = $config_array['TEMPLATE_FILE']; + $this->frontend = $config_array['FRONTEND']; + $this->forgotten_details_app = $config_array['FORGOTTEN_DETAILS_APP']; + $this->max_username_len = $config_array['MAX_USERNAME_LEN']; + $this->max_password_len = $config_array['MAX_PASSWORD_LEN']; + $this->redirect_url = $config_array['REDIRECT_URL']; + // Get the supplied username and password + if ($this->get_post('username_fieldname') != ''){ + $username_fieldname = $this->get_post('username_fieldname'); + $password_fieldname = $this->get_post('password_fieldname'); + } else { + $username_fieldname = 'username'; + $password_fieldname = 'password'; + } + $this->username = strtolower($this->get_post($username_fieldname)); + $this->password = $this->get_post($password_fieldname); + // Figure out if the "remember me" option has been checked + if($this->get_post('remember') == 'true') { + $this->remember = $this->get_post('remember'); + } else { + $this->remember = false; + } + // Get the length of the supplied username and password + if($this->get_post($username_fieldname) != '') { + $this->username_len = strlen($this->username); + $this->password_len = strlen($this->password); + } + // If the url is blank, set it to the default url + $this->url = $this->get_post('url'); + if ($this->redirect_url!='') { + $this->url = $this->redirect_url; + } + if(strlen($this->url) < 2) { + $this->url = $config_array['DEFAULT_URL']; + } + if($this->is_authenticated() == true) { + // User already logged-in, so redirect to default url + header('Location: '.$this->url); + exit(); + } elseif(!isset($username_fieldname) AND $this->is_remembered() == true) { + // User has been "remembered" + // Get the users password + $database = new database(); + $query_details = $database->query("SELECT * FROM ".$this->USERS_TABLE." WHERE user_id = '".substr($_COOKIE['REMEMBER_KEY'], 0, 11)."' LIMIT 1"); + $fetch_details = $query_details->fetchRow(); + $this->username = $fetch_details['username']; + $this->password = $fetch_details['password']; + // Check if the user exists (authenticate them) + if($this->authenticate()) { + // Authentication successful + header("Location: ".$this->url); + } else { + $this->message = $MESSAGE['LOGIN']['AUTHENTICATION_FAILED']; + $this->increase_attemps(); + } + } elseif($this->username == '' AND $this->password == '') { + $this->message = $MESSAGE['LOGIN']['BOTH_BLANK']; + $this->increase_attemps(); + } elseif($this->username == '') { + $this->message = $MESSAGE['LOGIN']['USERNAME_BLANK']; + $this->increase_attemps(); + } elseif($this->password == '') { + $this->message = $MESSAGE['LOGIN']['PASSWORD_BLANK']; + $this->increase_attemps(); + } elseif($this->username_len < $config_array['MIN_USERNAME_LEN']) { + $this->message = $MESSAGE['LOGIN']['USERNAME_TOO_SHORT']; + $this->increase_attemps(); + } elseif($this->password_len < $config_array['MIN_PASSWORD_LEN']) { + $this->message = $MESSAGE['LOGIN']['PASSWORD_TOO_SHORT']; + $this->increase_attemps(); + } elseif($this->username_len > $config_array['MAX_USERNAME_LEN']) { + $this->message = $MESSAGE['LOGIN']['USERNAME_TOO_LONG']; + $this->increase_attemps(); + } elseif($this->password_len > $config_array['MAX_PASSWORD_LEN']) { + $this->message = $MESSAGE['LOGIN']['PASSWORD_TOO_LONG']; + $this->increase_attemps(); + } else { + // Check if the user exists (authenticate them) + $this->password = md5($this->password); + if($this->authenticate()) { + // Authentication successful + //echo $this->url;exit(); + header("Location: ".$this->url); + } else { + $this->message = $MESSAGE['LOGIN']['AUTHENTICATION_FAILED']; + $this->increase_attemps(); + } + } + } + + // Authenticate the user (check if they exist in the database) + function authenticate() { + // Get user information + $database = new database(); + $query = "SELECT * FROM ".$this->USERS_TABLE." WHERE username = '".$this->username."' AND password = '".$this->password."' AND active = '1'"; + $results = $database->query($query); + $results_array = $results->fetchRow(); + $num_rows = $results->numRows(); + if($num_rows) { + $user_id = $results_array['user_id']; + $this->user_id = $user_id; + $_SESSION['USER_ID'] = $user_id; + $_SESSION['GROUP_ID'] = $results_array['group_id']; + $_SESSION['USERNAME'] = $results_array['username']; + $_SESSION['DISPLAY_NAME'] = $results_array['display_name']; + $_SESSION['EMAIL'] = $results_array['email']; + $_SESSION['HOME_FOLDER'] = $results_array['home_folder']; + // Run remember function if needed + if($this->remember == true) { + $this->remember($this->user_id); + } + // Set language + if($results_array['language'] != '') { + $_SESSION['LANGUAGE'] = $results_array['language']; + } + // Set timezone + if($results_array['timezone'] != '-72000') { + $_SESSION['TIMEZONE'] = $results_array['timezone']; + } else { + // Set a session var so apps can tell user is using default tz + $_SESSION['USE_DEFAULT_TIMEZONE'] = true; + } + // Set date format + if($results_array['date_format'] != '') { + $_SESSION['DATE_FORMAT'] = $results_array['date_format']; + } else { + // Set a session var so apps can tell user is using default date format + $_SESSION['USE_DEFAULT_DATE_FORMAT'] = true; + } + // Set time format + if($results_array['time_format'] != '') { + $_SESSION['TIME_FORMAT'] = $results_array['time_format']; + } else { + // Set a session var so apps can tell user is using default time format + $_SESSION['USE_DEFAULT_TIME_FORMAT'] = true; + } + // Get group information + $query = "SELECT * FROM ".$this->GROUPS_TABLE." WHERE group_id = '".$this->get_session('GROUP_ID')."'"; + $results = $database->query($query); + $results_array = $results->fetchRow(); + $_SESSION['GROUP_NAME'] = $results_array['name']; + // Set system permissions + if($results_array['system_permissions'] != '') { + $_SESSION['SYSTEM_PERMISSIONS'] = explode(',', $results_array['system_permissions']); + } else { + $_SESSION['SYSTEM_PERMISSIONS'] = array(); + } + // Set module permissions + if($results_array['module_permissions'] != '') { + $_SESSION['MODULE_PERMISSIONS'] = explode(',', $results_array['module_permissions']); + } else { + $_SESSION['MODULE_PERMISSIONS'] = array(); + } + // Set template permissions + if($results_array['template_permissions'] != '') { + $_SESSION['TEMPLATE_PERMISSIONS'] = explode(',', $results_array['template_permissions']); + } else { + $_SESSION['TEMPLATE_PERMISSIONS'] = array(); + } + // Update the users table with current ip and timestamp + $get_ts = mktime(); + $get_ip = $_SERVER['REMOTE_ADDR']; + $query = "UPDATE ".$this->USERS_TABLE." SET login_when = '$get_ts', login_ip = '$get_ip' WHERE user_id = '$user_id'"; + $database->query($query); + } + // Return if the user exists or not + return $num_rows; + } + + // Increase the count for login attemps + function increase_attemps() { + if(!isset($_SESSION['ATTEMPS'])) { + $_SESSION['ATTEMPS'] = 0; + } else { + $_SESSION['ATTEMPS'] = $this->get_session('ATTEMPS')+1; + } + $this->display_login(); + } + + // Function to set a "remembering" cookie for the user + function remember($user_id) { + $remember_key = ''; + // Generate user id to append to the remember key + $length = 11-strlen($user_id); + if($length > 0) { + for($i = 1; $i <= $length; $i++) { + $remember_key .= '0'; + } + } + // Generate remember key + $remember_key .= $user_id.'_'; + $salt = "abchefghjkmnpqrstuvwxyz0123456789"; + srand((double)microtime()*1000000); + $i = 0; + while ($i <= 10) { + $num = rand() % 33; + $tmp = substr($salt, $num, 1); + $remember_key = $remember_key . $tmp; + $i++; + } + $remember_key = $remember_key; + // Update the remember key in the db + $database = new database(); + $database->query("UPDATE ".$this->USERS_TABLE." SET remember_key = '$remember_key' WHERE user_id = '$user_id' LIMIT 1"); + if($database->is_error()) { + return false; + } else { + // Workout options for the cookie + $cookie_name = 'REMEMBER_KEY'; + $cookie_value = $remember_key; + $cookie_expire = time()+60*60*24*30; + // Set the cookie + if(setcookie($cookie_name, $cookie_value, $cookie_expire, '/')) { + return true; + } else { + return false; + } + } + } + + // Function to check if a user has been remembered + function is_remembered() { + if(isset($_COOKIE['REMEMBER_KEY']) AND $_COOKIE['REMEMBER_KEY'] != '') { + // Check if the remember key is correct + $database = new database(); + $check_query = $database->query("SELECT user_id FROM ".$this->USERS_TABLE." WHERE remember_key = '".$_COOKIE['REMEMBER_KEY']."' LIMIT 1"); + if($check_query->numRows() > 0) { + $check_fetch = $check_query->fetchRow(); + $user_id = $check_fetch['user_id']; + // Check the remember key prefix + $remember_key_prefix = ''; + $length = 11-strlen($user_id); + if($length > 0) { + for($i = 1; $i <= $length; $i++) { + $remember_key_prefix .= '0'; + } + } + $remember_key_prefix .= $user_id.'_'; + $length = strlen($remember_key_prefix); + if(substr($_COOKIE['REMEMBER_KEY'], 0, $length) == $remember_key_prefix) { + return true; + } else { + return false; + } + } else { + return false; + } + } else { + return false; + } + } + + // Display the login screen + function display_login() { + // Get language vars + global $MESSAGE; + global $MENU; + global $TEXT; + // If attemps more than allowed, warn the user + if($this->get_session('ATTEMPS') > $this->max_attemps) { + $this->warn(); + } + // Show the login form + if($this->frontend != true) { + require_once(WB_PATH.'/include/phplib/template.inc'); + $template = new Template($this->template_dir); + $template->set_file('page', $this->template_file); + $template->set_block('page', 'mainBlock', 'main'); + if($this->remember_me_option != true) { + $template->set_var('DISPLAY_REMEMBER_ME', 'none'); + } else { + $template->set_var('DISPLAY_REMEMBER_ME', ''); + } + $template->set_var(array( + 'ACTION_URL' => $this->login_url, + 'ATTEMPS' => $this->get_session('ATTEMPS'), + 'USERNAME' => $this->username, + 'USERNAME_FIELDNAME' => $this->username_fieldname, + 'PASSWORD_FIELDNAME' => $this->password_fieldname, + 'MESSAGE' => $this->message, + 'INTERFACE_DIR_URL' => ADMIN_URL.'/interface', + 'MAX_USERNAME_LEN' => $this->max_username_len, + 'MAX_PASSWORD_LEN' => $this->max_password_len, + 'WB_URL' => WB_URL, + 'FORGOTTEN_DETAILS_APP' => $this->forgotten_details_app, + 'TEXT_FORGOTTEN_DETAILS' => $TEXT['FORGOTTEN_DETAILS'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_REMEMBER_ME' => $TEXT['REMEMBER_ME'], + 'TEXT_LOGIN' => $TEXT['LOGIN'], + 'TEXT_HOME' => $TEXT['HOME'], + 'PAGES_DIRECTORY' => PAGES_DIRECTORY, + 'SECTION_LOGIN' => $MENU['LOGIN'] + ) + ); + $template->parse('main', 'mainBlock', false); + $template->pparse('output', 'page'); + } + } + + // Warn user that they have had to many login attemps + function warn() { + header('Location: '.$this->warning_url); + } + +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/framework/class.login.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: tags/2.6.0/wb/framework/convert.php =================================================================== --- tags/2.6.0/wb/framework/convert.php (nonexistent) +++ tags/2.6.0/wb/framework/convert.php (revision 260) @@ -0,0 +1,73 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* +Character Conversion file +This file helps convert possible error-causing +characters to equivalent non-error-causing ones +*/ +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +$conversion_array = array( +'À'=>'A','�?'=>'A','Â'=>'A','Ã'=>'A','Ä'=>'Ae', 'Ä'=>'A', +'Ã…'=>'A','Ä€'=>'A','Ä„'=>'A','Ä‚'=>'A', 'Æ'=>'Ae', +'Ç'=>'C','Ć'=>'C','ÄŒ'=>'C','Ĉ'=>'C','ÄŠ'=>'C', +'ÄŽ'=>'D','�?'=>'D','�?'=>'D', +'È'=>'E','É'=>'E','Ê'=>'E','Ë'=>'E','Ä’'=>'E', +'Ę'=>'E','Äš'=>'E','Ä”'=>'E','Ä–'=>'E', +'Äœ'=>'G','Äž'=>'G','Ä '=>'G','Ä¢'=>'G', +'Ĥ'=>'H','Ħ'=>'H', +'ÃŒ'=>'I','�?'=>'I','ÃŽ'=>'I','�?'=>'I','Ī'=>'I', 'Ĩ'=>'I','Ĭ'=>'I','Ä®'=>'I','Ä°'=>'I', +'IJ'=>'IJ','Ä´'=>'J','Ķ'=>'K', +'�?'=>'K','Ľ'=>'K','Ĺ'=>'K','Ä»'=>'K','Ä¿'=>'K', +'Ñ'=>'N','Ń'=>'N','Ň'=>'N','Å…'=>'N','ÅŠ'=>'N', +'Ã’'=>'O','Ó'=>'O','Ô'=>'O','Õ'=>'O','Ö'=>'Oe', +'Ö'=>'Oe', 'Ø'=>'O','ÅŒ'=>'O','�?'=>'O','ÅŽ'=>'O', +'Å’'=>'OE', 'Å”'=>'R','Ř'=>'R','Å–'=>'R', +'Åš'=>'S','Å '=>'S','Åž'=>'S','Åœ'=>'S','Ș'=>'S', +'Ť'=>'T','Å¢'=>'T','Ŧ'=>'T','Èš'=>'T', +'Ù'=>'U','Ú'=>'U','Û'=>'U','Ãœ'=>'Ue','Ū'=>'U', +'Ü'=>'Ue', 'Å®'=>'U','Å°'=>'U','Ŭ'=>'U','Ũ'=>'U','Ų'=>'U', +'Å´'=>'W', '�?'=>'Y','Ŷ'=>'Y','Ÿ'=>'Y', 'Ź'=>'Z','Ž'=>'Z','Å»'=>'Z', +'Þ'=>'T','Þ'=>'T', 'à'=>'a','á'=>'a','â'=>'a','ã'=>'a','ä'=>'ae', +'ä'=>'ae', 'Ã¥'=>'a','�?'=>'a','Ä…'=>'a','ă'=>'a', +'æ'=>'ae', 'ç'=>'c','ć'=>'c','�?'=>'c','ĉ'=>'c','Ä‹'=>'c', +'�?'=>'d','Ä‘'=>'d','ð'=>'d', 'è'=>'e','é'=>'e','ê'=>'e','ë'=>'e','Ä“'=>'e', +'Ä™'=>'e','Ä›'=>'e','Ä•'=>'e','Ä—'=>'e', 'Æ’'=>'f', +'�?'=>'g','ÄŸ'=>'g','Ä¡'=>'g','Ä£'=>'g', 'Ä¥'=>'h','ħ'=>'h', +'ì'=>'i','í'=>'i','î'=>'i','ï'=>'i','Ä«'=>'i', 'Ä©'=>'i','Ä­'=>'i','į'=>'i','ı'=>'i', +'ij'=>'ij', 'ĵ'=>'j', 'Ä·'=>'k','ĸ'=>'k', 'Å‚'=>'l','ľ'=>'l','ĺ'=>'l','ļ'=>'l','Å€'=>'l', +'ñ'=>'n','Å„'=>'n','ň'=>'n','ņ'=>'n','ʼn'=>'n', 'Å‹'=>'n', +'ò'=>'o','ó'=>'o','ô'=>'o','õ'=>'o','ö'=>'oe', 'ö'=>'oe', +'ø'=>'o','�?'=>'o','Å‘'=>'o','�?'=>'o', 'Å“'=>'oe', 'Å•'=>'r','Å™'=>'r','Å—'=>'r', +'Å¡'=>'s', 'ù'=>'u','ú'=>'u','û'=>'u','ü'=>'ue','Å«'=>'u', 'ü'=>'ue', +'ů'=>'u','ű'=>'u','Å­'=>'u','Å©'=>'u','ų'=>'u', 'ŵ'=>'w', +'ý'=>'y','ÿ'=>'y','Å·'=>'y', 'ž'=>'z','ż'=>'z','ź'=>'z', 'þ'=>'t', 'ß'=>'ss', 'Å¿'=>'ss', +'ä'=>'ae', 'ö'=>'oe', 'ü'=>'ue', 'Ä'=>'Ae', 'Ö'=>'Oe', 'Ãœ'=>'Ue' +); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/framework/convert.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/framework/class.database.php =================================================================== --- tags/2.6.0/wb/framework/class.database.php (nonexistent) +++ tags/2.6.0/wb/framework/class.database.php (revision 260) @@ -0,0 +1,162 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Database class + +This class will be used to interface between the database +and the Website Baker code + +*/ + +// Stop this file from being accessed directly +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +if(!defined('DB_URL')) { + //define('DB_URL', DB_TYPE.'://'.DB_USERNAME.':'.DB_PASSWORD.'@'.DB_HOST.'/'.DB_NAME); +} + +define('DATABASE_CLASS_LOADED', true); + +class database { + + // Set DB_URL + function database($url = '') { + // Connect to database + $this->connect(); + // Check for database connection error + if($this->is_error()) { + die($this->get_error()); + } + } + + // Connect to the database + function connect() { + $status = $this->db_handle = mysql_connect(DB_HOST, DB_USERNAME, DB_PASSWORD); + if(mysql_error()) { + $this->connected = false; + $this->error = mysql_error(); + } else { + if(!mysql_select_db(DB_NAME)) { + $this->connected = false; + $this->error = mysql_error(); + } else { + $this->connected = true; + } + } + return $this->connected; + } + + // Disconnect from the database + function disconnect() { + if($this->connected==true) { + mysql_close(); + return true; + } else { + return false; + } + } + + // Run a query + function query($statement) { + $mysql = new mysql(); + $mysql->query($statement); + if($mysql->error()) { + $this->set_error($mysql->error()); + return null; + } else { + return $mysql; + } + } + + // Gets the first column of the first row + function get_one($statement) { + $fetch_row = mysql_fetch_row(mysql_query($statement)); + $result = $fetch_row[0]; + if(mysql_error()) { + $this->set_error(mysql_error()); + return null; + } else { + return $result; + } + } + + // Set the DB error + function set_error($message = null) { + global $TABLE_DOES_NOT_EXIST, $TABLE_UNKNOWN; + $this->error = $message; + if(strpos($message, 'no such table')) { + $this->error_type = $TABLE_DOES_NOT_EXIST; + } else { + $this->error_type = $TABLE_UNKNOWN; + } + } + + // Return true if there was an error + function is_error() { + return (!empty($this->error)) ? true : false; + } + + // Return the error + function get_error() { + return $this->error; + } + +} + +class mysql { + + // Run a query + function query($statement) { + $this->result = mysql_query($statement); + $this->error = mysql_error(); + return $this->result; + } + + // Fetch num rows + function numRows() { + return mysql_num_rows($this->result); + } + + // Fetch row + function fetchRow() { + return mysql_fetch_array($this->result); + } + + // Get error + function error() { + if(isset($this->error)) { + return $this->error; + } else { + return null; + } + } + +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/framework/class.database.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: tags/2.6.0/wb/framework/class.order.php =================================================================== --- tags/2.6.0/wb/framework/class.order.php (nonexistent) +++ tags/2.6.0/wb/framework/class.order.php (revision 260) @@ -0,0 +1,155 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Ordering class + +This class will be used to change the order of an item in a table +which contains a special order field (type must be integer) + +*/ + +// Stop this file from being accessed directly +if(!defined('WB_URL')) { + header('Location: ../index.php'); +} + +define('ORDERING_CLASS_LOADED', true); + +// Load the other required class files if they are not already loaded +require_once(WB_PATH."/framework/class.database.php"); + +class order { + + // Get the db values + function order($table, $order_field, $id_field = 'id', $common_field) { + $this->table = $table; + $this->order_field = $order_field; + $this->id_field = $id_field; + $this->common_field = $common_field; + } + + // Move a row up + function move_up($id) { + global $database; + // Get current order + $query_order = "SELECT ".$this->order_field.",".$this->common_field." FROM ".$this->table." WHERE ".$this->id_field." = '$id'"; + $get_order = $database->query($query_order); + $fetch_order = $get_order->fetchRow(); + $order = $fetch_order[$this->order_field]; + $parent = $fetch_order[$this->common_field]; + // Find out what row is before current one + $query_previous = "SELECT ".$this->id_field.",".$this->order_field." FROM ".$this->table." WHERE ".$this->order_field." < '$order' AND ".$this->common_field." = '$parent' ORDER BY ".$this->order_field." DESC LIMIT 1"; + $get_previous = $database->query($query_previous); + if($get_previous->numRows() > 0) { + // Change the previous row to the current order + $fetch_previous = $get_previous->fetchRow(); + $previous_id = $fetch_previous[$this->id_field]; + $decremented_order = $fetch_previous[$this->order_field]; + $query = "UPDATE ".$this->table." SET ".$this->order_field." = '$order' WHERE ".$this->id_field." = '$previous_id' LIMIT 1"; + $database->query($query); + // Change the row we want to the decremented order + $query = "UPDATE ".$this->table." SET ".$this->order_field." = '$decremented_order' WHERE ".$this->id_field." = '$id' LIMIT 1"; + $database->query($query); + + if($database->is_error()) { + return false; + } else { + return true; + } + } else { + return false; + } + } + // Move a row up + function move_down($id) { + global $database; + // Get current order + $query_order = "SELECT ".$this->order_field.",".$this->common_field." FROM ".$this->table." WHERE ".$this->id_field." = '$id'"; + $get_order = $database->query($query_order); + $fetch_order = $get_order->fetchRow(); + $order = $fetch_order[$this->order_field]; + $parent = $fetch_order[$this->common_field]; + // Find out what row is before current one + $query_next = "SELECT $this->id_field,".$this->order_field." FROM ".$this->table." WHERE ".$this->order_field." > '$order' AND ".$this->common_field." = '$parent' ORDER BY ".$this->order_field." ASC LIMIT 1"; + $get_next = $database->query($query_next); + if($get_next->numRows() > 0) { + // Change the previous row to the current order + $fetch_next = $get_next->fetchRow(); + $next_id = $fetch_next[$this->id_field]; + $incremented_order = $fetch_next[$this->order_field]; + $query = "UPDATE ".$this->table." SET ".$this->order_field." = '$order' WHERE ".$this->id_field." = '$next_id' LIMIT 1"; + $database->query($query); + // Change the row we want to the decremented order + $query = "UPDATE ".$this->table." SET ".$this->order_field." = '$incremented_order' WHERE ".$this->id_field." = '$id' LIMIT 1"; + $database->query($query); + if($database->is_error()) { + return false; + } else { + return true; + } + } else { + return false; + } + } + + // Get new number for order + function get_new($cf_value) { + global $database; + $database = new database(); + // Get last order + $query_last = "SELECT ".$this->order_field." FROM ".$this->table." WHERE ".$this->common_field." = '$cf_value' ORDER BY ".$this->order_field." DESC LIMIT 1"; + $get_last = $database->query($query_last); + if($get_last->numRows() > 0) { + $fetch_last = $get_last->fetchRow(); + $last_order = $fetch_last[$this->order_field]; + return $last_order+1; + } else { + return 1; + } + } + + // Clean ordering (should be called if a row in the middle has been deleted) + function clean($cf_value) { + global $database; + // Loop through all records and give new order + $query_all = "SELECT * FROM ".$this->table." WHERE ".$this->common_field." = '$cf_value' ORDER BY ".$this->order_field." ASC"; + $get_all = $database->query($query_all); + if($get_all->numRows() > 0) { + $count = 1; + while($row = $get_all->fetchRow()) { + // Update row with new order + $database->query("UPDATE ".$this->table." SET ".$this->order_field." = '$count' WHERE ".$this->id_field." = '".$row[$this->id_field]."'"); + $count = $count+1; + } + } else { + return true; + } + } + +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/framework/class.order.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: tags/2.6.0/wb/framework/index.php =================================================================== --- tags/2.6.0/wb/framework/index.php (nonexistent) +++ tags/2.6.0/wb/framework/index.php (revision 260) @@ -0,0 +1,28 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +header("Location: ../index.php"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/framework/index.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: tags/2.6.0/wb/search/search.php =================================================================== --- tags/2.6.0/wb/search/search.php (nonexistent) +++ tags/2.6.0/wb/search/search.php (revision 260) @@ -0,0 +1,253 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +if(!defined('WB_URL')) { header('Location: index.php'); } + +// Check if search is enabled +if(SHOW_SEARCH != true) { + echo $TEXT['SEARCH'].' '.$TEXT['DISABLED']; +} else { + + // Make pages_listed and items_listed blank arrays + $pages_listed = array(); + $items_listed = array(); + + // Get search string + if(isset($_REQUEST['string'])) { + if ($_REQUEST['match']!='exact') { + $string=str_replace(',', '', $_REQUEST['string']); + } else { + $string=$_REQUEST['string']; + } + // reverse potential magic_quotes action + $original_string=$wb->strip_slashes($string); + // Double backslashes (mySQL needs doubly escaped backslashes in LIKE comparisons) + $string = addslashes($wb->escape_backslashes($original_string)); + // then escape for mySQL query + $search_string = htmlspecialchars($original_string,ENT_QUOTES); + } else { + $string = ''; + $search_string = ''; + } + + // Work-out what to do (match all words, any words, or do exact match), and do relevant with query settings + $all_checked = ''; + $any_checked = ''; + $exact_checked = ''; + if($_REQUEST['match'] != 'exact') { + // Split string into array with explode() function + $exploded_string = explode(' ', $string); + // Make sure there is no blank values in the array + $string = array(); + foreach($exploded_string AS $each_exploded_string) { + if($each_exploded_string != '') { + $string[] = $each_exploded_string; + } + } + if ($_REQUEST['match'] == 'any') { + $any_checked = ' checked'; + $logical_operator = ' OR'; + } else { + $all_checked = ' checked'; + $logical_operator = ' AND'; + } + } else { + $exact_checked = ' checked'; + $exact_string=$string; + $string=array(); + $string[]=$exact_string; + } + // Get list of usernames and display names + $query_users = $database->query("SELECT user_id,username,display_name FROM ".TABLE_PREFIX."users"); + $users = array('0' => array('display_name' => $TEXT['UNKNOWN'], 'username' => strtolower($TEXT['UNKNOWN']))); + if($query_users->numRows() > 0) { + while($user = $query_users->fetchRow()) { + $users[$user['user_id']] = array('display_name' => $user['display_name'], 'username' => $user['username']); + } + } + + // Get search settings + $query_header = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'header' LIMIT 1"); + $fetch_header = $query_header->fetchRow(); + $query_footer = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'footer' LIMIT 1"); + $fetch_footer = $query_footer->fetchRow(); + $query_results_header = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'results_header' LIMIT 1"); + $fetch_results_header = $query_results_header->fetchRow(); + $query_results_footer = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'results_footer' LIMIT 1"); + $fetch_results_footer = $query_results_footer->fetchRow(); + $query_results_loop = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'results_loop' LIMIT 1"); + $fetch_results_loop = $query_results_loop->fetchRow(); + $query_no_results = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'no_results' LIMIT 1"); + $fetch_no_results = $query_no_results->fetchRow(); + + // Replace vars in search settings with values + $vars = array('[SEARCH_STRING]', '[WB_URL]', '[PAGE_EXTENSION]', '[TEXT_RESULTS_FOR]'); + $values = array($search_string, WB_URL, PAGE_EXTENSION, $TEXT['RESULTS_FOR']); + $search_footer = str_replace($vars, $values, ($fetch_footer['value'])); + $search_results_header = str_replace($vars, $values, ($fetch_results_header['value'])); + $search_results_footer = str_replace($vars, $values, ($fetch_results_footer['value'])); + // Do extra vars/values replacement + $vars = array('[SEARCH_STRING]', '[WB_URL]', '[PAGE_EXTENSION]', '[TEXT_SEARCH]', '[TEXT_ALL_WORDS]', '[TEXT_ANY_WORDS]', '[TEXT_EXACT_MATCH]', '[TEXT_MATCH]', '[TEXT_MATCHING]', '[ALL_CHECKED]', '[ANY_CHECKED]', '[EXACT_CHECKED]'); + $values = array($search_string, WB_URL, PAGE_EXTENSION, $TEXT['SEARCH'], $TEXT['ALL_WORDS'], $TEXT['ANY_WORDS'], $TEXT['EXACT_MATCH'], $TEXT['MATCH'], $TEXT['MATCHING'], $all_checked, $any_checked, $exact_checked); + $search_header = str_replace($vars, $values, ($fetch_header['value'])); + + // Show search header + echo $search_header; + + // Work-out if the user has already entered their details or not + if($string != '' AND $string != ' ' AND $string != ' ' AND $string != array()) { + + // Show search results_header + echo $search_results_header; + // Search page details only, such as description, keywords, etc. + $query_pages = "SELECT page_id, page_title, menu_title, link, description, modified_when, modified_by FROM ".TABLE_PREFIX."pages WHERE "; + $count = 0; + foreach($string AS $each_string) { + if($count != 0) { $query_pages .= $logical_operator; } + $query_pages .= " visibility != 'none' AND page_title LIKE '%$each_string%' AND searching = '1'". + " OR visibility != 'none' AND visibility != 'deleted' AND menu_title LIKE '%$each_string%' AND searching = '1'". + " OR visibility != 'none' AND visibility != 'deleted' AND description LIKE '%$each_string%' AND searching = '1'". + " OR visibility != 'none' AND visibility != 'deleted' AND keywords LIKE '%$each_string%' AND searching = '1'"; + $count = $count+1; + } + $query_pages = $database->query($query_pages); + // Loop through pages + if($query_pages->numRows() > 0) { + while($page = $query_pages->fetchRow()) { + // Get page link + $link = page_link($page['link']); + // Set vars to be replaced by values + $vars = array('[LINK]', '[TITLE]', '[DESCRIPTION]', '[USERNAME]','[DISPLAY_NAME]','[DATE]','[TIME]','[TEXT_LAST_UPDATED_BY]','[TEXT_ON]'); + if($page['modified_when'] > 0) { + $date = gmdate(DATE_FORMAT, $page['modified_when']+TIMEZONE); + $time = gmdate(TIME_FORMAT, $page['modified_when']+TIMEZONE); + } else { + $date = $TEXT['UNKNOWN'].' '.$TEXT['DATE']; + $time = $TEXT['UNKNOWN'].' '.$TEXT['TIME']; + } + $values = array($link, ($page['page_title']),($page['description']), $users[$page['modified_by']]['username'], $users[$page['modified_by']]['display_name'], $date, $time, $TEXT['LAST_UPDATED_BY'], strtolower($TEXT['ON'])); + // Show loop code with vars replaced by values + if($values != array()) { + echo str_replace($vars, $values, ($fetch_results_loop['value'])); + } + // Say that we have already listed this page id + $pages_listed[$page['page_id']] = true; + // Set values to blank + $value = array(); + } + } + // Get modules that have registered for custom query's to be conducted + $get_modules = $database->query("SELECT value,extra FROM ".TABLE_PREFIX."search WHERE name = 'module'"); + // Loop through each module + if($get_modules->numRows() > 0) { + while($module = $get_modules->fetchRow()) { + // Get module name + $module_name = $module['value']; + // Get fields to use for title, link, etc. + $fields = unserialize($module['extra']); + // Get query start + $get_query_start = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'query_start' AND extra = '$module_name' LIMIT 1"); + if($get_query_start->numRows() > 0) { + // Fetch query start + $fetch_query_start = $get_query_start->fetchRow(); + // Prepare query start for execution by replacing {TP} with the TABLE_PREFIX + $query_start = str_replace('[TP]', TABLE_PREFIX, ($fetch_query_start['value'])); + // Get query end + $get_query_end = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'query_end' AND extra = '$module_name' LIMIT 1"); + if($get_query_end->numRows() > 0) { + // Fetch query start + $fetch_query_end = $get_query_end->fetchRow(); + // Set query end + $query_end = ($fetch_query_end['value']); + // Get query body + $get_query_body = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'query_body' AND extra = '$module_name' LIMIT 1"); + if($get_query_body->numRows() > 0) { + // Fetch query start + $fetch_query_body = $get_query_body->fetchRow(); + // Prepare query body for execution by replacing {STRING} with the correct one + $query_body = str_replace(array('[TP]','[O]','[W]'), array(TABLE_PREFIX,'LIKE','%'), ($fetch_query_body['value'])); + // Loop through query body for each string, then combine with start and end + $prepared_query = $query_start; + $count = 0; + foreach($string AS $each_string) { + if($count != 0) { $prepared_query .= $logical_operator; } + $prepared_query .= str_replace('[STRING]', $each_string, $query_body); + $count = $count+1; + } + $prepared_query .= $query_end; + // Execute query + $query = $database->query($prepared_query); + // Loop though queried items + if($query->numRows() > 0) { + while($page = $query->fetchRow()) { + // Only show this page if it hasn't already been list + if(!isset($fields['page_id']) OR !isset($pages_listed[$page[$fields['page_id']]])) { + // Get page link + $link = page_link($page[$fields['link']]); + // Set vars to be replaced by values + $vars = array('[LINK]', '[TITLE]', '[DESCRIPTION]', '[USERNAME]','[DISPLAY_NAME]','[DATE]','[TIME]','[TEXT_LAST_UPDATED_BY]','[TEXT_ON]'); + if($page[$fields['modified_when']] > 0) { + $date = gmdate(DATE_FORMAT, $page[$fields['modified_when']]+TIMEZONE); + $time = gmdate(TIME_FORMAT, $page[$fields['modified_when']]+TIMEZONE); + } else { + $date = $TEXT['UNKNOWN'].' '.$TEXT['DATE']; + $time = $TEXT['UNKNOWN'].' '.$TEXT['TIME']; + } + $values = array($link, ($page[$fields['title']]), ($page[$fields['description']]), $users[$page[$fields['modified_by']]]['username'], $users[$page[$fields['modified_by']]]['display_name'], $date, $time, $TEXT['LAST_UPDATED_BY'], strtolower($TEXT['ON'])); + // Show loop code with vars replaced by values + echo str_replace($vars, $values, ($fetch_results_loop['value'])); + // Say that this page or item has been listed if we can + if(isset($fields['page_id'])) { + $pages_listed[$page[$fields['page_id']]] = true; + } elseif(isset($fields['item_id'])) { + $items_listed[$page[$fields['item_id']]] = true; + } + } + } + } + + } + } + } + } + + // Show search results_footer + echo $search_results_footer; + + } + + // Say no items found if we should + if($pages_listed == array() AND $items_listed == array()) { + echo $fetch_no_results['value']; + } + + } + + // Show search footer + echo $search_footer; + +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/search/search.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: tags/2.6.0/wb/search/index.php =================================================================== --- tags/2.6.0/wb/search/index.php (nonexistent) +++ tags/2.6.0/wb/search/index.php (revision 260) @@ -0,0 +1,56 @@ + + Copyright (C) 2004-2005, 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 the config file +require('../config.php'); + +// Required page details +$page_id = 0; +$page_description = ''; +$page_keywords = ''; +define('PAGE_ID', 0); +define('ROOT_PARENT', 0); +define('PARENT', 0); +define('LEVEL', 0); +define('PAGE_TITLE', 'Search'); +define('MENU_TITLE', 'Search'); +define('MODULE', ''); +define('VISIBILITY', 'public'); +define('PAGE_CONTENT', 'search.php'); + +// Find out what the search template is +$database = new database(); +$query_template = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'template' LIMIT 1"); +$fetch_template = $query_template->fetchRow(); +$template = $fetch_template['value']; +if($template != '') { + define('TEMPLATE', $template); +} +unset($template); + +// Include index (wrapper) file +require(WB_PATH.'/index.php'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/search/index.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: tags/2.6.0/wb/index.php =================================================================== --- tags/2.6.0/wb/index.php (nonexistent) +++ tags/2.6.0/wb/index.php (revision 260) @@ -0,0 +1,58 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +$starttime = array_sum(explode(" ",microtime())); + +// Include config file +require_once(dirname(__FILE__).'/config.php'); + +// Check if the config file has been set-up +if(!defined('WB_PATH')) { + header("Location: install/index.php"); +} + +require_once(WB_PATH.'/framework/class.frontend.php'); +// Create new frontend object +$wb = new frontend(); + +// Figure out which page to display +// Stop processing if intro page was shown +$wb->page_select() or die(); + +// Collect info about the currently viewed page +// and check permissions +$wb->get_page_details(); + +// Collect general website settings +$wb->get_website_settings(); + +// Load functions available to templates, modules and code sections +// also, set some aliases for backward compatibility +require(WB_PATH.'/framework/frontend.functions.php'); + +// Display the template +require(WB_PATH.'/templates/'.TEMPLATE.'/index.php'); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/index.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: tags/2.6.0/wb/config.php =================================================================== --- tags/2.6.0/wb/config.php (nonexistent) +++ tags/2.6.0/wb/config.php (revision 260) @@ -0,0 +1 @@ + \ No newline at end of file Property changes on: tags/2.6.0/wb/config.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: tags/2.6.0/wb/include/captcha.php =================================================================== --- tags/2.6.0/wb/include/captcha.php (nonexistent) +++ tags/2.6.0/wb/include/captcha.php (revision 260) @@ -0,0 +1,68 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +/* + +Captcha generator + +This file generates a captcha image. +Credits to http://php.webmaster-kit.com/ for the original code. + +*/ + +require_once("../config.php"); + +if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg') AND isset($_SESSION['captcha'])) { + + $image = imagecreate(120, 30); + + $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF); + $gray = imagecolorallocate($image, 0xC0, 0xC0, 0xC0); + $darkgray = imagecolorallocate($image, 0x50, 0x50, 0x50); + + srand((double)microtime()*1000000); + + for($i = 0; $i < 30; $i++) { + $x1 = rand(0,120); + $y1 = rand(0,30); + $x2 = rand(0,120); + $y2 = rand(0,30); + imageline($image, $x1, $y1, $x2, $y2 , $gray); + } + + for ($i = 0; $i < 5; $i++) { + $fnt = rand(3,5); + $x = $x + rand(12 , 20); + $y = rand(7 , 12); + imagestring($image, $fnt, $x, $y, substr($_SESSION['captcha'], $i, 1), $darkgray); + } + + header('Content-type: image/png'); + imagepng($image); + imagedestroy($image); + +} + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/include/captcha.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: tags/2.6.0/wb/include/index.php =================================================================== --- tags/2.6.0/wb/include/index.php (nonexistent) +++ tags/2.6.0/wb/include/index.php (revision 260) @@ -0,0 +1,28 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +header("Location: ../index.php"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/include/index.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: tags/2.6.0/wb/include/pclzip/gnu-lgpl.txt =================================================================== --- tags/2.6.0/wb/include/pclzip/gnu-lgpl.txt (nonexistent) +++ tags/2.6.0/wb/include/pclzip/gnu-lgpl.txt (revision 260) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + Property changes on: tags/2.6.0/wb/include/pclzip/gnu-lgpl.txt ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: tags/2.6.0/wb/include/pclzip/readme.txt =================================================================== --- tags/2.6.0/wb/include/pclzip/readme.txt (nonexistent) +++ tags/2.6.0/wb/include/pclzip/readme.txt (revision 260) @@ -0,0 +1,276 @@ +// -------------------------------------------------------------------------------- +// PclZip 2.1 - readme.txt +// -------------------------------------------------------------------------------- +// License GNU/LGPL - December 2003 +// Vincent Blavet - vincent@phpconcept.net +// http://www.phpconcept.net +// -------------------------------------------------------------------------------- +// $Id: readme.txt,v 1.1.1.1 2005/01/30 10:31:46 rdjurovich Exp $ +// -------------------------------------------------------------------------------- + + + +0 - Sommaire +============ + 1 - Introduction + 2 - What's new + 3 - Corrected bugs + 4 - Known bugs or limitations + 5 - License + 6 - Warning + 7 - Author + 8 - Contribute + +1 - Introduction +================ + + PclZip is a library that allow you to manage a Zip archive. + + Full documentation about PclZip can be found here : http://www.phpconcept.net/pclzip + +2 - What's new +============== + + Version 2.1 : + - Add the ability to abort the extraction by using a user callback function. + The user can now return the value '2' in its callback which indicates to stop the + extraction. For a pre call-back extract is stopped before the extration of the current + file. For a post call back, the extraction is stopped after. + - Add the ability to extract a file (or several files) directly in the standard output. + This is done by the new parameter PCLZIP_OPT_EXTRACT_IN_OUTPUT with method extract(). + - Add support for parameters PCLZIP_OPT_COMMENT, PCLZIP_OPT_ADD_COMMENT, + PCLZIP_OPT_PREPEND_COMMENT. This will create, replace, add, or prepend comments + in the zip archive. + - When merging two archives, the comments are not any more lost, but merged, with a + blank space separator. + - Corrected bug : Files are not deleted when all files are asked to be deleted. + - Corrected bug : Folders with name '0' made PclZip to abort the create or add feature. + + + Version 2.0 : + ***** Warning : Some new features may break the backward compatibility for your scripts. + Please carefully read the readme file. + - Add the ability to delete by Index, name and regular expression. This feature is + performed by the method delete(), which uses the optional parameters + PCLZIP_OPT_BY_INDEX, PCLZIP_OPT_BY_NAME, PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG. + - Add the ability to extract by regular expression. To extract by regexp you must use the method + extract(), with the option PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG + (depending if you want to use ereg() or preg_match() syntax) followed by the + regular expression pattern. + - Add the ability to extract by index, directly with the extract() method. This is a + code improvment of the extractByIndex() method. + - Add the ability to extract by name. To extract by name you must use the method + extract(), with the option PCLZIP_OPT_BY_NAME followed by the filename to + extract or an array of filenames to extract. To extract all a folder, use the folder + name rather than the filename with a '/' at the end. + - Add the ability to add files without compression. This is done with a new attribute + which is PCLZIP_OPT_NO_COMPRESSION. + - Add the attribute PCLZIP_OPT_EXTRACT_AS_STRING, which allow to extract a file directly + in a string without using any file (or temporary file). + - Add constant PCLZIP_SEPARATOR for static configuration of filename separators in a single string. + The default separator is now a comma (,) and not any more a blank space. + THIS BREAK THE BACKWARD COMPATIBILITY : Please check if this may have an impact with + your script. + - Improve algorythm performance by removing the use of temporary files when adding or + extracting files in an archive. + - Add (correct) detection of empty filename zipping. This can occurs when the removed + path is the same + as a zipped dir. The dir is not zipped (['status'] = filtered), only its content. + - Add better support for windows paths (thanks for help from manus@manusfreedom.com). + - Corrected bug : When the archive file already exists with size=0, the add() method + fails. Corrected in 2.0. + - Remove the use of OS_WINDOWS constant. Use php_uname() function rather. + - Control the order of index ranges in extract by index feature. + - Change the internal management of folders (better handling of internal flag). + + + Version 1.3 : + - Removing the double include check. This is now done by include_once() and require_once() + PHP directives. + - Changing the error handling mecanism : Remove the use of an external error library. + The former PclError...() functions are replaced by internal equivalent methods. + By changing the environment variable PCLZIP_ERROR_EXTERNAL you can still use the former library. + Introducing the use of constants for error codes rather than integer values. This will help + in futur improvment. + Introduction of error handling functions like errorCode(), errorName() and errorInfo(). + - Remove the deprecated use of calling function with arguments passed by reference. + - Add the calling of extract(), extractByIndex(), create() and add() functions + with variable options rather than fixed arguments. + - Add the ability to remove all the file path while extracting or adding, + without any need to specify the path to remove. + This is available for extract(), extractByIndex(), create() and add() functionS by using + the new variable options parameters : + - PCLZIP_OPT_REMOVE_ALL_PATH : by indicating this option while calling the fct. + - Ability to change the mode of a file after the extraction (chmod()). + This is available for extract() and extractByIndex() functionS by using + the new variable options parameters. + - PCLZIP_OPT_SET_CHMOD : by setting the value of this option. + - Ability to definition call-back options. These call-back will be called during the adding, + or the extracting of file (extract(), extractByIndex(), create() and add() functions) : + - PCLZIP_CB_PRE_EXTRACT : will be called before each extraction of a file. The user + can trigerred the change the filename of the extracted file. The user can triggered the + skip of the extraction. This is adding a 'skipped' status in the file list result value. + - PCLZIP_CB_POST_EXTRACT : will be called after each extraction of a file. + Nothing can be triggered from that point. + - PCLZIP_CB_PRE_ADD : will be called before each add of a file. The user + can trigerred the change the stored filename of the added file. The user can triggered the + skip of the add. This is adding a 'skipped' status in the file list result value. + - PCLZIP_CB_POST_ADD : will be called after each add of a file. + Nothing can be triggered from that point. + - Two status are added in the file list returned as function result : skipped & filename_too_long + 'skipped' is used when a call-back function ask for skipping the file. + 'filename_too_long' is used while adding a file with a too long filename to archive (the file is + not added) + - Adding the function PclZipUtilPathInclusion(), that check the inclusion of a path into + a directory. + - Add a check of the presence of the archive file before some actions (like list, ...) + - Add the initialisation of field "index" in header array. This means that by + default index will be -1 when not explicitly set by the methods. + + Version 1.2 : + - Adding a duplicate function. + - Adding a merge function. The merge function is a "quick merge" function, + it just append the content of an archive at the end of the first one. There + is no check for duplicate files or more recent files. + - Improve the search of the central directory end. + + Version 1.1.2 : + + - Changing the license of PclZip. PclZip is now released under the GNU / LGPL license + (see License section). + - Adding the optional support of a static temporary directory. You will need to configure + the constant PCLZIP_TEMPORARY_DIR if you want to use this feature. + - Improving the rename() function. In some cases rename() does not work (different + Filesystems), so it will be replaced by a copy() + unlink() functions. + + Version 1.1.1 : + + - Maintenance release, no new feature. + + Version 1.1 : + + - New method Add() : adding files in the archive + - New method ExtractByIndex() : partial extract of the archive, files are identified by + their index in the archive + - New method DeleteByIndex() : delete some files/folder entries from the archive, + files are identified by their index in the archive. + - Adding a test of the zlib extension presence. If not present abort the script. + + Version 1.0.1 : + + - No new feature + + +3 - Corrected bugs +================== + + Corrected in Version 2.0 : + - Corrected : During an extraction, if a call-back fucntion is used and try to skip + a file, all the extraction process is stopped. + + Corrected in Version 1.3 : + - Corrected : Support of static synopsis for method extract() is broken. + - Corrected : invalid size of archive content field (0xFF) should be (0xFFFF). + - Corrected : When an extract is done with a remove_path parameter, the entry for + the directory with exactly the same path is not skipped/filtered. + - Corrected : extractByIndex() and deleteByIndex() were not managing index in the + right way. For example indexes '1,3-5,11' will only extract files 1 and 11. This + is due to a sort of the index resulting table that puts 11 before 3-5 (sort on + string and not interger). The sort is temporarilly removed, this means that + you must provide a sorted list of index ranges. + + Corrected in Version 1.2 : + + - Nothing. + + Corrected in Version 1.1.2 : + + - Corrected : Winzip is unable to delete or add new files in a PclZip created archives. + + Corrected in Version 1.1.1 : + + - Corrected : When archived file is not compressed (0% compression), the + extract method fails. + + Corrected in Version 1.1 : + + - Corrected : Adding a complete tree of folder may result in a bad archive + creation. + + Corrected in Version 1.0.1 : + + - Corrected : Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024). + + +4 - Known bugs or limitations +============================= + + Please publish bugs reports in SourceForge : + http://sourceforge.net/tracker/?group_id=40254&atid=427564 + + In Version 1.2 : + + - merge() methods does not check for duplicate files or last date of modifications. + + In Version 1.1 : + + - Limitation : Using 'extract' fields in the file header in the zip archive is not supported. + - WinZip is unable to delete a single file in a PclZip created archive. It is also unable to + add a file in a PclZip created archive. (Corrected in v.1.2) + + In Version 1.0.1 : + + - Adding a complete tree of folder may result in a bad archive + creation. (Corrected in V.1.1). + - Path given to methods must be in the unix format (/) and not the Windows format (\). + Workaround : Use only / directory separators. + - PclZip is using temporary files that are sometime the name of the file with a .tmp or .gz + added suffix. Files with these names may already exist and may be overwritten. + Workaround : none. + - PclZip does not check if the zlib extension is present. If it is absent, the zip + file is not created and the lib abort without warning. + Workaround : enable the zlib extension on the php install + + In Version 1.0 : + + - Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024). + (Corrected in v.1.0.1) + - Limitation : Multi-disk zip archive are not supported. + + +5 - License +=========== + + Since version 1.1.2, PclZip Library is released under GNU/LGPL license. + This library is free, so you can use it at no cost. + + HOWEVER, if you release a script, an application, a library or any kind of + code using PclZip library (or a part of it), YOU MUST : + - Indicate in the documentation (or a readme file), that your work + uses PclZip Library, and make a reference to the author and the web site + http://www.phpconcept.net + - Gives the ability to the final user to update the PclZip libary. + + I will also appreciate that you send me a mail (vincent@phpconcept.net), just to + be aware that someone is using PclZip. + + For more information about GNU/LGPL license : http://www.gnu.org + +6 - Warning +================= + + This library and the associated files are non commercial, non professional work. + It should not have unexpected results. However if any damage is caused by this software + the author can not be responsible. + The use of this software is at the risk of the user. + +7 - Author +========== + + This software was written by Vincent Blavet (vincent@phpconcept.net) on its leasure time. + +8 - Contribute +============== + If you want to contribute to the development of PclZip, please contact vincent@phpconcept.net. + If you can help in financing PhpConcept hosting service, please go to + http://www.phpconcept.net/soutien.php \ No newline at end of file Property changes on: tags/2.6.0/wb/include/pclzip/readme.txt ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: tags/2.6.0/wb/include/pclzip/pclzip.lib.php =================================================================== --- tags/2.6.0/wb/include/pclzip/pclzip.lib.php (nonexistent) +++ tags/2.6.0/wb/include/pclzip/pclzip.lib.php (revision 260) @@ -0,0 +1,4970 @@ +zipname = $p_zipname; + $this->zip_fd = 0; + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 1); + return; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : + // create($p_filelist, $p_add_dir="", $p_remove_dir="") + // create($p_filelist, $p_option, $p_option_value, ...) + // Description : + // This method supports two different synopsis. The first one is historical. + // This method creates a Zip Archive. The Zip file is created in the + // filesystem. The files and directories indicated in $p_filelist + // are added in the archive. See the parameters description for the + // supported format of $p_filelist. + // When a directory is in the list, the directory and its content is added + // in the archive. + // In this synopsis, the function takes an optional variable list of + // options. See bellow the supported options. + // Parameters : + // $p_filelist : An array containing file or directory names, or + // a string containing one filename or one directory name, or + // a string containing a list of filenames and/or directory + // names separated by spaces. + // $p_add_dir : A path to add before the real path of the archived file, + // in order to have it memorized in the archive. + // $p_remove_dir : A path to remove from the real path of the file to archive, + // in order to have a shorter path memorized in the archive. + // When $p_add_dir and $p_remove_dir are set, $p_remove_dir + // is removed first, before $p_add_dir is added. + // Options : + // PCLZIP_OPT_ADD_PATH : + // PCLZIP_OPT_REMOVE_PATH : + // PCLZIP_OPT_REMOVE_ALL_PATH : + // PCLZIP_OPT_COMMENT : + // PCLZIP_CB_PRE_ADD : + // PCLZIP_CB_POST_ADD : + // Return Values : + // 0 on failure, + // The list of the added files, with a status of the add action. + // (see PclZip::listContent() for list entry format) + // -------------------------------------------------------------------------------- +// function create($p_filelist, $p_add_dir="", $p_remove_dir="") + function create($p_filelist /*, options */) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::create', "filelist='$p_filelist', ..."); + $v_result=1; + + // ----- Reset the error handler + $this->privErrorReset(); + + // ----- Set default values + $v_options = array(); + $v_add_path = ""; + $v_remove_path = ""; + $v_remove_all_path = false; + $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE; + + // ----- Look for variable options arguments + $v_size = func_num_args(); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method"); + + // ----- Look for arguments + if ($v_size > 1) { + // ----- Get the arguments + $v_arg_list = &func_get_args(); + + // ----- Remove form the options list the first argument + array_shift($v_arg_list); + $v_size--; + + // ----- Look for first arg + if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options detected"); + + // ----- Parse the options + $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, + array (PCLZIP_OPT_REMOVE_PATH => 'optional', + PCLZIP_OPT_REMOVE_ALL_PATH => 'optional', + PCLZIP_OPT_ADD_PATH => 'optional', + PCLZIP_CB_PRE_ADD => 'optional', + PCLZIP_CB_POST_ADD => 'optional', + PCLZIP_OPT_NO_COMPRESSION => 'optional', + PCLZIP_OPT_COMMENT => 'optional' )); + if ($v_result != 1) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return 0; + } + + // ----- Set the arguments + if (isset($v_options[PCLZIP_OPT_ADD_PATH])) { + $v_add_path = $v_options[PCLZIP_OPT_ADD_PATH]; + } + if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) { + $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH]; + } + if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) { + $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH]; + } + } + + // ----- Look for 2 args + // Here we need to support the first historic synopsis of the + // method. + else { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis"); + + // ----- Get the first argument + $v_add_path = $v_arg_list[0]; + + // ----- Look for the optional second argument + if ($v_size == 2) { + $v_remove_path = $v_arg_list[1]; + } + else if ($v_size > 2) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, + "Invalid number / type of arguments"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return 0; + } + } + } + + // ----- Trace + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "add_path='$v_add_path', remove_path='$v_remove_path', remove_all_path='".($v_remove_all_path?'true':'false')."'"); + + // ----- Look if the $p_filelist is really an array + $p_result_list = array(); + if (is_array($p_filelist)) + { + // ----- Call the create fct + $v_result = $this->privCreate($p_filelist, $p_result_list, $v_add_path, $v_remove_path, $v_remove_all_path, $v_options); + } + + // ----- Look if the $p_filelist is a string + else if (is_string($p_filelist)) + { + // ----- Create a list with the elements from the string + $v_list = explode(PCLZIP_SEPARATOR, $p_filelist); + + // ----- Call the create fct + $v_result = $this->privCreate($v_list, $p_result_list, $v_add_path, $v_remove_path, $v_remove_all_path, $v_options); + } + + // ----- Invalid variable + else + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist"); + $v_result = PCLZIP_ERR_INVALID_PARAMETER; + } + + if ($v_result != 1) + { + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return 0; + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_result_list); + return $p_result_list; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : + // add($p_filelist, $p_add_dir="", $p_remove_dir="") + // add($p_filelist, $p_option, $p_option_value, ...) + // Description : + // This method supports two synopsis. The first one is historical. + // This methods add the list of files in an existing archive. + // If a file with the same name already exists, it is added at the end of the + // archive, the first one is still present. + // If the archive does not exist, it is created. + // Parameters : + // $p_filelist : An array containing file or directory names, or + // a string containing one filename or one directory name, or + // a string containing a list of filenames and/or directory + // names separated by spaces. + // $p_add_dir : A path to add before the real path of the archived file, + // in order to have it memorized in the archive. + // $p_remove_dir : A path to remove from the real path of the file to archive, + // in order to have a shorter path memorized in the archive. + // When $p_add_dir and $p_remove_dir are set, $p_remove_dir + // is removed first, before $p_add_dir is added. + // Options : + // PCLZIP_OPT_ADD_PATH : + // PCLZIP_OPT_REMOVE_PATH : + // PCLZIP_OPT_REMOVE_ALL_PATH : + // PCLZIP_OPT_COMMENT : + // PCLZIP_OPT_ADD_COMMENT : + // PCLZIP_OPT_PREPEND_COMMENT : + // PCLZIP_CB_PRE_ADD : + // PCLZIP_CB_POST_ADD : + // Return Values : + // 0 on failure, + // The list of the added files, with a status of the add action. + // (see PclZip::listContent() for list entry format) + // -------------------------------------------------------------------------------- +// function add($p_filelist, $p_add_dir="", $p_remove_dir="") + function add($p_filelist /* options */) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::add', "filelist='$p_filelist', ..."); + $v_result=1; + + // ----- Reset the error handler + $this->privErrorReset(); + + // ----- Set default values + $v_options = array(); + $v_add_path = ""; + $v_remove_path = ""; + $v_remove_all_path = false; + $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE; + + // ----- Look for variable options arguments + $v_size = func_num_args(); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method"); + + // ----- Look for arguments + if ($v_size > 1) { + // ----- Get the arguments + $v_arg_list = &func_get_args(); + + // ----- Remove form the options list the first argument + array_shift($v_arg_list); + $v_size--; + + // ----- Look for first arg + if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options detected"); + + // ----- Parse the options + $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, + array (PCLZIP_OPT_REMOVE_PATH => 'optional', + PCLZIP_OPT_REMOVE_ALL_PATH => 'optional', + PCLZIP_OPT_ADD_PATH => 'optional', + PCLZIP_CB_PRE_ADD => 'optional', + PCLZIP_CB_POST_ADD => 'optional', + PCLZIP_OPT_NO_COMPRESSION => 'optional', + PCLZIP_OPT_COMMENT => 'optional', + PCLZIP_OPT_ADD_COMMENT => 'optional', + PCLZIP_OPT_PREPEND_COMMENT => 'optional' )); + if ($v_result != 1) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return 0; + } + + // ----- Set the arguments + if (isset($v_options[PCLZIP_OPT_ADD_PATH])) { + $v_add_path = $v_options[PCLZIP_OPT_ADD_PATH]; + } + if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) { + $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH]; + } + if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) { + $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH]; + } + } + + // ----- Look for 2 args + // Here we need to support the first historic synopsis of the + // method. + else { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis"); + + // ----- Get the first argument + $v_add_path = $v_arg_list[0]; + + // ----- Look for the optional second argument + if ($v_size == 2) { + $v_remove_path = $v_arg_list[1]; + } + else if ($v_size > 2) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return 0; + } + } + } + + // ----- Trace + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "add_path='$v_add_path', remove_path='$v_remove_path', remove_all_path='".($v_remove_all_path?'true':'false')."'"); + + // ----- Look if the $p_filelist is really an array + $p_result_list = array(); + if (is_array($p_filelist)) + { + // ----- Call the create fct + $v_result = $this->privAdd($p_filelist, $p_result_list, $v_add_path, $v_remove_path, $v_remove_all_path, $v_options); + } + + // ----- Look if the $p_filelist is a string + else if (is_string($p_filelist)) + { + // ----- Create a list with the elements from the string + $v_list = explode(PCLZIP_SEPARATOR, $p_filelist); + + // ----- Call the create fct + $v_result = $this->privAdd($v_list, $p_result_list, $v_add_path, $v_remove_path, $v_remove_all_path, $v_options); + } + + // ----- Invalid variable + else + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist"); + $v_result = PCLZIP_ERR_INVALID_PARAMETER; + } + + if ($v_result != 1) + { + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return 0; + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_result_list); + return $p_result_list; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : listContent() + // Description : + // This public method, gives the list of the files and directories, with their + // properties. + // The properties of each entries in the list are (used also in other functions) : + // filename : Name of the file. For a create or add action it is the filename + // given by the user. For an extract function it is the filename + // of the extracted file. + // stored_filename : Name of the file / directory stored in the archive. + // size : Size of the stored file. + // compressed_size : Size of the file's data compressed in the archive + // (without the headers overhead) + // mtime : Last known modification date of the file (UNIX timestamp) + // comment : Comment associated with the file + // folder : true | false + // index : index of the file in the archive + // status : status of the action (depending of the action) : + // Values are : + // ok : OK ! + // filtered : the file / dir is not extracted (filtered by user) + // already_a_directory : the file can not be extracted because a + // directory with the same name already exists + // write_protected : the file can not be extracted because a file + // with the same name already exists and is + // write protected + // newer_exist : the file was not extracted because a newer file exists + // path_creation_fail : the file is not extracted because the folder + // does not exists and can not be created + // write_error : the file was not extracted because there was a + // error while writing the file + // read_error : the file was not extracted because there was a error + // while reading the file + // invalid_header : the file was not extracted because of an archive + // format error (bad file header) + // Note that each time a method can continue operating when there + // is an action error on a file, the error is only logged in the file status. + // Return Values : + // 0 on an unrecoverable failure, + // The list of the files in the archive. + // -------------------------------------------------------------------------------- + function listContent() + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::listContent', ""); + $v_result=1; + + // ----- Reset the error handler + $this->privErrorReset(); + + // ----- Check archive + if (!$this->privCheckFormat()) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return(0); + } + + // ----- Call the extracting fct + $p_list = array(); + if (($v_result = $this->privList($p_list)) != 1) + { + unset($p_list); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo()); + return(0); + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list); + return $p_list; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : + // extract($p_path="./", $p_remove_path="") + // extract([$p_option, $p_option_value, ...]) + // Description : + // This method supports two synopsis. The first one is historical. + // This method extract all the files / directories from the archive to the + // folder indicated in $p_path. + // If you want to ignore the 'root' part of path of the memorized files + // you can indicate this in the optional $p_remove_path parameter. + // By default, if a newer file with the same name already exists, the + // file is not extracted. + // + // If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions + // are used, the path indicated in PCLZIP_OPT_ADD_PATH is append + // at the end of the path value of PCLZIP_OPT_PATH. + // Parameters : + // $p_path : Path where the files and directories are to be extracted + // $p_remove_path : First part ('root' part) of the memorized path + // (if any similar) to remove while extracting. + // Options : + // PCLZIP_OPT_PATH : + // PCLZIP_OPT_ADD_PATH : + // PCLZIP_OPT_REMOVE_PATH : + // PCLZIP_OPT_REMOVE_ALL_PATH : + // PCLZIP_CB_PRE_EXTRACT : + // PCLZIP_CB_POST_EXTRACT : + // Return Values : + // 0 or a negative value on failure, + // The list of the extracted files, with a status of the action. + // (see PclZip::listContent() for list entry format) + // -------------------------------------------------------------------------------- + //function extract($p_path="./", $p_remove_path="") + function extract(/* options */) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::extract", ""); + $v_result=1; + + // ----- Reset the error handler + $this->privErrorReset(); + + // ----- Check archive + if (!$this->privCheckFormat()) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return(0); + } + + // ----- Set default values + $v_options = array(); + $v_path = "./"; + $v_remove_path = ""; + $v_remove_all_path = false; + + // ----- Look for variable options arguments + $v_size = func_num_args(); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method"); + + // ----- Default values for option + $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE; + + // ----- Look for arguments + if ($v_size > 0) { + // ----- Get the arguments + $v_arg_list = &func_get_args(); + + // ----- Look for first arg + if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options"); + + // ----- Parse the options + $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, + array (PCLZIP_OPT_PATH => 'optional', + PCLZIP_OPT_REMOVE_PATH => 'optional', + PCLZIP_OPT_REMOVE_ALL_PATH => 'optional', + PCLZIP_OPT_ADD_PATH => 'optional', + PCLZIP_CB_PRE_EXTRACT => 'optional', + PCLZIP_CB_POST_EXTRACT => 'optional', + PCLZIP_OPT_SET_CHMOD => 'optional', + PCLZIP_OPT_BY_NAME => 'optional', + PCLZIP_OPT_BY_EREG => 'optional', + PCLZIP_OPT_BY_PREG => 'optional', + PCLZIP_OPT_BY_INDEX => 'optional', + PCLZIP_OPT_EXTRACT_AS_STRING => 'optional', + PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional' )); + if ($v_result != 1) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return 0; + } + + // ----- Set the arguments + if (isset($v_options[PCLZIP_OPT_PATH])) { + $v_path = $v_options[PCLZIP_OPT_PATH]; + } + if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) { + $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH]; + } + if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) { + $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH]; + } + if (isset($v_options[PCLZIP_OPT_ADD_PATH])) { + // ----- Check for '/' in last path char + if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) { + $v_path .= '/'; + } + $v_path .= $v_options[PCLZIP_OPT_ADD_PATH]; + } + } + + // ----- Look for 2 args + // Here we need to support the first historic synopsis of the + // method. + else { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis"); + + // ----- Get the first argument + $v_path = $v_arg_list[0]; + + // ----- Look for the optional second argument + if ($v_size == 2) { + $v_remove_path = $v_arg_list[1]; + } + else if ($v_size > 2) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo()); + return 0; + } + } + } + + // ----- Trace + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "path='$v_path', remove_path='$v_remove_path', remove_all_path='".($v_remove_path?'true':'false')."'"); + + // ----- Call the extracting fct + $p_list = array(); + $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, + $v_remove_all_path, $v_options); + if ($v_result < 1) { + unset($p_list); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo()); + return(0); + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list); + return $p_list; + } + // -------------------------------------------------------------------------------- + + + // -------------------------------------------------------------------------------- + // Function : + // extractByIndex($p_index, $p_path="./", $p_remove_path="") + // extractByIndex($p_index, [$p_option, $p_option_value, ...]) + // Description : + // This method supports two synopsis. The first one is historical. + // This method is doing a partial extract of the archive. + // The extracted files or folders are identified by their index in the + // archive (from 0 to n). + // Note that if the index identify a folder, only the folder entry is + // extracted, not all the files included in the archive. + // Parameters : + // $p_index : A single index (integer) or a string of indexes of files to + // extract. The form of the string is "0,4-6,8-12" with only numbers + // and '-' for range or ',' to separate ranges. No spaces or ';' + // are allowed. + // $p_path : Path where the files and directories are to be extracted + // $p_remove_path : First part ('root' part) of the memorized path + // (if any similar) to remove while extracting. + // Options : + // PCLZIP_OPT_PATH : + // PCLZIP_OPT_ADD_PATH : + // PCLZIP_OPT_REMOVE_PATH : + // PCLZIP_OPT_REMOVE_ALL_PATH : + // PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and + // not as files. + // The resulting content is in a new field 'content' in the file + // structure. + // This option must be used alone (any other options are ignored). + // PCLZIP_CB_PRE_EXTRACT : + // PCLZIP_CB_POST_EXTRACT : + // Return Values : + // 0 on failure, + // The list of the extracted files, with a status of the action. + // (see PclZip::listContent() for list entry format) + // -------------------------------------------------------------------------------- + function extractByIndex($p_index /* $options */) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::extractByIndex", "index='$p_index', ..."); + $v_result=1; + + // ----- Reset the error handler + $this->privErrorReset(); + + // ----- Check archive + if (!$this->privCheckFormat()) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return(0); + } + + // ----- Set default values + $v_options = array(); + $v_path = "./"; + $v_remove_path = ""; + $v_remove_all_path = false; + + // ----- Look for variable options arguments + $v_size = func_num_args(); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method"); + + // ----- Default values for option + $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE; + + // ----- Look for arguments + if ($v_size > 1) { + // ----- Get the arguments + $v_arg_list = &func_get_args(); + + // ----- Remove form the options list the first argument + array_shift($v_arg_list); + $v_size--; + + // ----- Look for first arg + if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options"); + + // ----- Parse the options + $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, + array (PCLZIP_OPT_PATH => 'optional', + PCLZIP_OPT_REMOVE_PATH => 'optional', + PCLZIP_OPT_REMOVE_ALL_PATH => 'optional', + PCLZIP_OPT_EXTRACT_AS_STRING => 'optional', + PCLZIP_OPT_ADD_PATH => 'optional', + PCLZIP_CB_PRE_EXTRACT => 'optional', + PCLZIP_CB_POST_EXTRACT => 'optional', + PCLZIP_OPT_SET_CHMOD => 'optional' )); + if ($v_result != 1) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return 0; + } + + // ----- Set the arguments + if (isset($v_options[PCLZIP_OPT_PATH])) { + $v_path = $v_options[PCLZIP_OPT_PATH]; + } + if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) { + $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH]; + } + if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) { + $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH]; + } + if (isset($v_options[PCLZIP_OPT_ADD_PATH])) { + // ----- Check for '/' in last path char + if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) { + $v_path .= '/'; + } + $v_path .= $v_options[PCLZIP_OPT_ADD_PATH]; + } + if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) { + $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Option PCLZIP_OPT_EXTRACT_AS_STRING not set."); + } + else { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Option PCLZIP_OPT_EXTRACT_AS_STRING set."); + } + } + + // ----- Look for 2 args + // Here we need to support the first historic synopsis of the + // method. + else { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis"); + + // ----- Get the first argument + $v_path = $v_arg_list[0]; + + // ----- Look for the optional second argument + if ($v_size == 2) { + $v_remove_path = $v_arg_list[1]; + } + else if ($v_size > 2) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return 0; + } + } + } + + // ----- Trace + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "index='$p_index', path='$v_path', remove_path='$v_remove_path', remove_all_path='".($v_remove_path?'true':'false')."'"); + + // ----- Trick + // Here I want to reuse extractByRule(), so I need to parse the $p_index + // with privParseOptions() + $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index); + $v_options_trick = array(); + $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, + array (PCLZIP_OPT_BY_INDEX => 'optional' )); + if ($v_result != 1) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return 0; + } + $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX]; + + // ----- Call the extracting fct + if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo()); + return(0); + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list); + return $p_list; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : + // delete([$p_option, $p_option_value, ...]) + // Description : + // Parameters : + // None + // Options : + // PCLZIP_OPT_BY_INDEX : + // Return Values : + // 0 on failure, + // The list of the files which are still present in the archive. + // (see PclZip::listContent() for list entry format) + // -------------------------------------------------------------------------------- + function delete(/* options */) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::delete", ""); + $v_result=1; + + // ----- Reset the error handler + $this->privErrorReset(); + + // ----- Check archive + if (!$this->privCheckFormat()) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return(0); + } + + // ----- Set default values + $v_options = array(); + + // ----- Look for variable options arguments + $v_size = func_num_args(); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method"); + + // ----- Look for no arguments + if ($v_size <= 0) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing arguments"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo()); + return 0; + } + + // ----- Get the arguments + $v_arg_list = &func_get_args(); + + // ----- Parse the options + $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, + array (PCLZIP_OPT_BY_NAME => 'optional', + PCLZIP_OPT_BY_EREG => 'optional', + PCLZIP_OPT_BY_PREG => 'optional', + PCLZIP_OPT_BY_INDEX => 'optional' )); + if ($v_result != 1) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return 0; + } + + // ----- Check that at least one rule is set + if ( (!isset($v_options[PCLZIP_OPT_BY_NAME])) + && (!isset($v_options[PCLZIP_OPT_BY_EREG])) + && (!isset($v_options[PCLZIP_OPT_BY_PREG])) + && (!isset($v_options[PCLZIP_OPT_BY_INDEX]))) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "At least one filtering rule must be set"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo()); + return 0; + } + + // ----- Call the delete fct + $v_list = array(); + if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) + { + unset($v_list); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo()); + return(0); + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_list); + return $v_list; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : deleteByIndex() + // Description : + // ***** Deprecated ***** + // delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered. + // -------------------------------------------------------------------------------- + function deleteByIndex($p_index) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::deleteByIndex", "index='$p_index'"); + + $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list); + return $p_list; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : properties() + // Description : + // This method gives the properties of the archive. + // The properties are : + // nb : Number of files in the archive + // comment : Comment associated with the archive file + // status : not_exist, ok + // Parameters : + // None + // Return Values : + // 0 on failure, + // An array with the archive properties. + // -------------------------------------------------------------------------------- + function properties() + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::properties", ""); + + // ----- Reset the error handler + $this->privErrorReset(); + + // ----- Check archive + if (!$this->privCheckFormat()) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return(0); + } + + // ----- Default properties + $v_prop = array(); + $v_prop['comment'] = ''; + $v_prop['nb'] = 0; + $v_prop['status'] = 'not_exist'; + + // ----- Look if file exists + if (@is_file($this->zipname)) + { + // ----- Open the zip file + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode"); + if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), 0); + return 0; + } + + // ----- Read the central directory informations + $v_central_dir = array(); + if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) + { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return 0; + } + + // ----- Close the zip file + $this->privCloseFd(); + + // ----- Set the user attributes + $v_prop['comment'] = $v_central_dir['comment']; + $v_prop['nb'] = $v_central_dir['entries']; + $v_prop['status'] = 'ok'; + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_prop); + return $v_prop; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : duplicate() + // Description : + // This method creates an archive by copying the content of an other one. If + // the archive already exist, it is replaced by the new one without any warning. + // Parameters : + // $p_archive : The filename of a valid archive, or + // a valid PclZip object. + // Return Values : + // 1 on success. + // 0 or a negative value on error (error code). + // -------------------------------------------------------------------------------- + function duplicate($p_archive) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::duplicate", ""); + $v_result = 1; + + // ----- Reset the error handler + $this->privErrorReset(); + + // ----- Look if the $p_archive is a PclZip object + if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip')) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The parameter is valid PclZip object '".$p_archive->zipname."'"); + + // ----- Duplicate the archive + $v_result = $this->privDuplicate($p_archive->zipname); + } + + // ----- Look if the $p_archive is a string (so a filename) + else if (is_string($p_archive)) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The parameter is a filename '$p_archive'"); + + // ----- Check that $p_archive is a valid zip file + // TBC : Should also check the archive format + if (!is_file($p_archive)) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'"); + $v_result = PCLZIP_ERR_MISSING_FILE; + } + else { + // ----- Duplicate the archive + $v_result = $this->privDuplicate($p_archive); + } + } + + // ----- Invalid variable + else + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add"); + $v_result = PCLZIP_ERR_INVALID_PARAMETER; + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : merge() + // Description : + // This method merge the $p_archive_to_add archive at the end of the current + // one ($this). + // If the archive ($this) does not exist, the merge becomes a duplicate. + // If the $p_archive_to_add archive does not exist, the merge is a success. + // Parameters : + // $p_archive_to_add : It can be directly the filename of a valid zip archive, + // or a PclZip object archive. + // Return Values : + // 1 on success, + // 0 or negative values on error (see below). + // -------------------------------------------------------------------------------- + function merge($p_archive_to_add) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::merge", ""); + $v_result = 1; + + // ----- Reset the error handler + $this->privErrorReset(); + + // ----- Check archive + if (!$this->privCheckFormat()) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0); + return(0); + } + + // ----- Look if the $p_archive_to_add is a PclZip object + if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip')) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The parameter is valid PclZip object"); + + // ----- Merge the archive + $v_result = $this->privMerge($p_archive_to_add); + } + + // ----- Look if the $p_archive_to_add is a string (so a filename) + else if (is_string($p_archive_to_add)) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The parameter is a filename"); + + // ----- Create a temporary archive + $v_object_archive = new PclZip($p_archive_to_add); + + // ----- Merge the archive + $v_result = $this->privMerge($v_object_archive); + } + + // ----- Invalid variable + else + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add"); + $v_result = PCLZIP_ERR_INVALID_PARAMETER; + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + + + // -------------------------------------------------------------------------------- + // Function : errorCode() + // Description : + // Parameters : + // -------------------------------------------------------------------------------- + function errorCode() + { + if (PCLZIP_ERROR_EXTERNAL == 1) { + return(PclErrorCode()); + } + else { + return($this->error_code); + } + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : errorName() + // Description : + // Parameters : + // -------------------------------------------------------------------------------- + function errorName($p_with_code=false) + { + $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR', + PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL', + PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL', + PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER', + PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE', + PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG', + PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP', + PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE', + PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL', + PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION', + PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT', + PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL', + PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL', + PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM', + PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', + PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE', + PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE' ); + + if (isset($v_name[$this->error_code])) { + $v_value = $v_name[$this->error_code]; + } + else { + $v_value = 'NoName'; + } + + if ($p_with_code) { + return($v_value.' ('.$this->error_code.')'); + } + else { + return($v_value); + } + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : errorInfo() + // Description : + // Parameters : + // -------------------------------------------------------------------------------- + function errorInfo($p_full=false) + { + if (PCLZIP_ERROR_EXTERNAL == 1) { + return(PclErrorString()); + } + else { + if ($p_full) { + return($this->errorName(true)." : ".$this->error_string); + } + else { + return($this->error_string." [code ".$this->error_code."]"); + } + } + } + // -------------------------------------------------------------------------------- + + +// -------------------------------------------------------------------------------- +// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS ***** +// ***** ***** +// ***** THESES FUNCTIONS MUST NOT BE USED DIRECTLY ***** +// -------------------------------------------------------------------------------- + + + + // -------------------------------------------------------------------------------- + // Function : privCheckFormat() + // Description : + // This method check that the archive exists and is a valid zip archive. + // Several level of check exists. (futur) + // Parameters : + // $p_level : Level of check. Default 0. + // 0 : Check the first bytes (magic codes) (default value)) + // 1 : 0 + Check the central directory (futur) + // 2 : 1 + Check each file header (futur) + // Return Values : + // true on success, + // false on error, the error code is set. + // -------------------------------------------------------------------------------- + function privCheckFormat($p_level=0) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCheckFormat", ""); + $v_result = true; + + // ----- Reset the file system cache + clearstatcache(); + + // ----- Reset the error handler + $this->privErrorReset(); + + // ----- Look if the file exits + if (!is_file($this->zipname)) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'"); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, false, PclZip::errorInfo()); + return(false); + } + + // ----- Check that the file is readeable + if (!is_readable($this->zipname)) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'"); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, false, PclZip::errorInfo()); + return(false); + } + + // ----- Check the magic code + // TBC + + // ----- Check the central header + // TBC + + // ----- Check each file header + // TBC + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privParseOptions() + // Description : + // This internal methods reads the variable list of arguments ($p_options_list, + // $p_size) and generate an array with the options and values ($v_result_list). + // $v_requested_options contains the options that can be present and those that + // must be present. + // $v_requested_options is an array, with the option value as key, and 'optional', + // or 'mandatory' as value. + // Parameters : + // See above. + // Return Values : + // 1 on success. + // 0 on failure. + // -------------------------------------------------------------------------------- + function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privParseOptions", ""); + $v_result=1; + + // ----- Read the options + $i=0; + while ($i<$p_size) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Looking for table index $i, option = '".PclZipUtilOptionText($p_options_list[$i])."(".$p_options_list[$i].")'"); + + // ----- Check if the option is requested + if (!isset($v_requested_options[$p_options_list[$i]])) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Look for next option + switch ($p_options_list[$i]) { + // ----- Look for options that request a path value + case PCLZIP_OPT_PATH : + case PCLZIP_OPT_REMOVE_PATH : + case PCLZIP_OPT_ADD_PATH : + // ----- Check the number of parameters + if (($i+1) >= $p_size) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Get the value + $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'"); + $i++; + break; + + // ----- Look for options that request an array of string for value + case PCLZIP_OPT_BY_NAME : + // ----- Check the number of parameters + if (($i+1) >= $p_size) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Get the value + if (is_string($p_options_list[$i+1])) { + $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1]; + } + else if (is_array($p_options_list[$i+1])) { + $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1]; + } + else { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'"); + $i++; + break; + + // ----- Look for options that request an EREG or PREG expression + case PCLZIP_OPT_BY_EREG : + case PCLZIP_OPT_BY_PREG : + // ----- Check the number of parameters + if (($i+1) >= $p_size) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Get the value + if (is_string($p_options_list[$i+1])) { + $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1]; + } + else { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'"); + $i++; + break; + + // ----- Look for options that takes a string + case PCLZIP_OPT_COMMENT : + case PCLZIP_OPT_ADD_COMMENT : + case PCLZIP_OPT_PREPEND_COMMENT : + // ----- Check the number of parameters + if (($i+1) >= $p_size) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, + "Missing parameter value for option '" + .PclZipUtilOptionText($p_options_list[$i]) + ."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Get the value + if (is_string($p_options_list[$i+1])) { + $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1]; + } + else { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, + "Wrong parameter value for option '" + .PclZipUtilOptionText($p_options_list[$i]) + ."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'"); + $i++; + break; + + // ----- Look for options that request an array of index + case PCLZIP_OPT_BY_INDEX : + // ----- Check the number of parameters + if (($i+1) >= $p_size) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Get the value + $v_work_list = array(); + if (is_string($p_options_list[$i+1])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Index value is a string '".$p_options_list[$i+1]."'"); + + // ----- Remove spaces + $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', ''); + + // ----- Parse items + $v_work_list = explode(",", $p_options_list[$i+1]); + } + else if (is_integer($p_options_list[$i+1])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Index value is an integer '".$p_options_list[$i+1]."'"); + $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1]; + } + else if (is_array($p_options_list[$i+1])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Index value is an array"); + $v_work_list = $p_options_list[$i+1]; + } + else { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Reduce the index list + // each index item in the list must be a couple with a start and + // an end value : [0,3], [5-5], [8-10], ... + // ----- Check the format of each item + $v_sort_flag=false; + $v_sort_value=0; + for ($j=0; $j= $p_size) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Get the value + $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1]; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'"); + $i++; + break; + + // ----- Look for options that request a call-back + case PCLZIP_CB_PRE_EXTRACT : + case PCLZIP_CB_POST_EXTRACT : + case PCLZIP_CB_PRE_ADD : + case PCLZIP_CB_POST_ADD : + /* for futur use + case PCLZIP_CB_PRE_DELETE : + case PCLZIP_CB_POST_DELETE : + case PCLZIP_CB_PRE_LIST : + case PCLZIP_CB_POST_LIST : + */ + // ----- Check the number of parameters + if (($i+1) >= $p_size) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Get the value + $v_function_name = $p_options_list[$i+1]; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "call-back ".PclZipUtilOptionText($p_options_list[$i])." = '".$v_function_name."'"); + + // ----- Check that the value is a valid existing function + if (!function_exists($v_function_name)) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Set the attribute + $v_result_list[$p_options_list[$i]] = $v_function_name; + $i++; + break; + + default : + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, + "Unknown parameter '" + .$p_options_list[$i]."'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Next options + $i++; + } + + // ----- Look for mandatory options + if ($v_requested_options !== false) { + for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) { + // ----- Look for mandatory option + if ($v_requested_options[$key] == 'mandatory') { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Detect a mandatory option : ".PclZipUtilOptionText($key)."(".$key.")"); + // ----- Look if present + if (!isset($v_result_list[$key])) { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + } + } + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privCreate() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privCreate($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCreate", "list, result_list, add_dir='$p_add_dir', remove_dir='$p_remove_dir'"); + $v_result=1; + $v_list_detail = array(); + + // ----- Open the file in write mode + if (($v_result = $this->privOpenFd('wb')) != 1) + { + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Add the list of files + $v_result = $this->privAddList($p_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_options); + + // ----- Close + $this->privCloseFd(); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privAdd() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privAdd($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAdd", "list, result_list, add_dir='$p_add_dir', remove_dir='$p_remove_dir'"); + $v_result=1; + $v_list_detail = array(); + + // ----- Look if the archive exists or is empty + if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0)) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Archive does not exist, or is empty, create it."); + + // ----- Do a create + $v_result = $this->privCreate($p_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_options); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Open the zip file + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode"); + if (($v_result=$this->privOpenFd('rb')) != 1) + { + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Read the central directory informations + $v_central_dir = array(); + if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) + { + $this->privCloseFd(); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Go to beginning of File + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in file : ".ftell($this->zip_fd)."'"); + @rewind($this->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in file : ".ftell($this->zip_fd)."'"); + + // ----- Creates a temporay file + $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp'; + + // ----- Open the temporary file in write mode + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode"); + if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) + { + $this->privCloseFd(); + + PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Copy the files from the archive to the temporary file + // TBC : Here I should better append the file and go back to erase the central dir + $v_size = $v_central_dir['offset']; + while ($v_size != 0) + { + $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes"); + $v_buffer = fread($this->zip_fd, $v_read_size); + @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size); + $v_size -= $v_read_size; + } + + // ----- Swap the file descriptor + // Here is a trick : I swap the temporary fd with the zip fd, in order to use + // the following methods on the temporary fil and not the real archive + $v_swap = $this->zip_fd; + $this->zip_fd = $v_zip_temp_fd; + $v_zip_temp_fd = $v_swap; + + // ----- Add the files + $v_header_list = array(); + if (($v_result = $this->privAddFileList($p_list, $v_header_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_options)) != 1) + { + fclose($v_zip_temp_fd); + $this->privCloseFd(); + @unlink($v_zip_temp_name); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Store the offset of the central dir + $v_offset = @ftell($this->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "New offset of central dir : $v_offset"); + + // ----- Copy the block of file headers from the old archive + $v_size = $v_central_dir['size']; + while ($v_size != 0) + { + $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes"); + $v_buffer = @fread($v_zip_temp_fd, $v_read_size); + @fwrite($this->zip_fd, $v_buffer, $v_read_size); + $v_size -= $v_read_size; + } + + // ----- Create the Central Dir files header + for ($i=0, $v_count=0; $iprivWriteCentralFileHeader($v_header_list[$i])) != 1) { + fclose($v_zip_temp_fd); + $this->privCloseFd(); + @unlink($v_zip_temp_name); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + $v_count++; + } + + // ----- Transform the header to a 'usable' info + $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]); + } + + // ----- Zip file comment + $v_comment = $v_central_dir['comment']; + if (isset($p_options[PCLZIP_OPT_COMMENT])) { + $v_comment = $p_options[PCLZIP_OPT_COMMENT]; + } + if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) { + $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT]; + } + if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) { + $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment; + } + + // ----- Calculate the size of the central header + $v_size = @ftell($this->zip_fd)-$v_offset; + + // ----- Create the central dir footer + if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1) + { + // ----- Reset the file list + unset($v_header_list); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Swap back the file descriptor + $v_swap = $this->zip_fd; + $this->zip_fd = $v_zip_temp_fd; + $v_zip_temp_fd = $v_swap; + + // ----- Close + $this->privCloseFd(); + + // ----- Close the temporary file + @fclose($v_zip_temp_fd); + + // ----- Delete the zip file + // TBC : I should test the result ... + @unlink($this->zipname); + + // ----- Rename the temporary file + // TBC : I should test the result ... + //@rename($v_zip_temp_name, $this->zipname); + PclZipUtilRename($v_zip_temp_name, $this->zipname); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privOpenFd() + // Description : + // Parameters : + // -------------------------------------------------------------------------------- + function privOpenFd($p_mode) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privOpenFd", 'mode='.$p_mode); + $v_result=1; + + // ----- Look if already open + if ($this->zip_fd != 0) + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Open the zip file + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Open file in '.$p_mode.' mode'); + if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0) + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privCloseFd() + // Description : + // Parameters : + // -------------------------------------------------------------------------------- + function privCloseFd() + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCloseFd", ""); + $v_result=1; + + if ($this->zip_fd != 0) + @fclose($this->zip_fd); + $this->zip_fd = 0; + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privAddList() + // Description : + // $p_add_dir and $p_remove_dir will give the ability to memorize a path which is + // different from the real path of the file. This is usefull if you want to have PclTar + // running in any directory, and memorize relative path from an other directory. + // Parameters : + // $p_list : An array containing the file or directory names to add in the tar + // $p_result_list : list of added files with their properties (specially the status field) + // $p_add_dir : Path to add in the filename path archived + // $p_remove_dir : Path to remove in the filename path archived + // Return Values : + // -------------------------------------------------------------------------------- + function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddList", "list, add_dir='$p_add_dir', remove_dir='$p_remove_dir'"); + $v_result=1; + + // ----- Add the files + $v_header_list = array(); + if (($v_result = $this->privAddFileList($p_list, $v_header_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_options)) != 1) + { + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Store the offset of the central dir + $v_offset = @ftell($this->zip_fd); + + // ----- Create the Central Dir files header + for ($i=0,$v_count=0; $iprivWriteCentralFileHeader($v_header_list[$i])) != 1) { + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + $v_count++; + } + + // ----- Transform the header to a 'usable' info + $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]); + } + + // ----- Zip file comment + $v_comment = ''; + if (isset($p_options[PCLZIP_OPT_COMMENT])) { + $v_comment = $p_options[PCLZIP_OPT_COMMENT]; + } + + // ----- Calculate the size of the central header + $v_size = @ftell($this->zip_fd)-$v_offset; + + // ----- Create the central dir footer + if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1) + { + // ----- Reset the file list + unset($v_header_list); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privAddFileList() + // Description : + // $p_add_dir and $p_remove_dir will give the ability to memorize a path which is + // different from the real path of the file. This is usefull if you want to + // run the lib in any directory, and memorize relative path from an other directory. + // Parameters : + // $p_list : An array containing the file or directory names to add in the tar + // $p_result_list : list of added files with their properties (specially the status field) + // $p_add_dir : Path to add in the filename path archived + // $p_remove_dir : Path to remove in the filename path archived + // Return Values : + // -------------------------------------------------------------------------------- + function privAddFileList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddFileList", "list, add_dir='$p_add_dir', remove_dir='$p_remove_dir'"); + $v_result=1; + $v_header = array(); + + // ----- Recuperate the current number of elt in list + $v_nb = sizeof($p_result_list); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Before add, list have $v_nb elements"); + + // ----- Loop on the files + for ($j=0; ($j 0xFF) + { + // ----- Error log + PclZip::privErrorLog(-5, "File name is too long (max. 255) : '$p_filename'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + */ + + // ----- Look if it is a file or a dir with no all pathnre move + if ((is_file($p_filename)) || ((is_dir($p_filename)) && !$p_remove_all_dir)) { + // ----- Add the file + if (($v_result = $this->privAddFile($p_filename, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_options)) != 1) + { + // ----- Return status + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Store the file infos + $p_result_list[$v_nb++] = $v_header; + } + + // ----- Look for directory + if (is_dir($p_filename)) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "$p_filename is a directory"); + + // ----- Look for path + if ($p_filename != ".") + $v_path = $p_filename."/"; + else + $v_path = ""; + + // ----- Read the directory for files and sub-directories + $p_hdir = opendir($p_filename); + $p_hitem = readdir($p_hdir); // '.' directory + $p_hitem = readdir($p_hdir); // '..' directory + while (($p_hitem = readdir($p_hdir)) !== false) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Looking for $p_hitem in the directory"); + + // ----- Look for a file + if (is_file($v_path.$p_hitem)) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Add the file '".$v_path.$p_hitem."'"); + + // ----- Add the file + if (($v_result = $this->privAddFile($v_path.$p_hitem, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_options)) != 1) + { + // ----- Return status + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Store the file infos + $p_result_list[$v_nb++] = $v_header; + } + + // ----- Recursive call to privAddFileList() + else + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Add the directory '".$v_path.$p_hitem."'"); + + // ----- Need an array as parameter + $p_temp_list[0] = $v_path.$p_hitem; + $v_result = $this->privAddFileList($p_temp_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_options); + + // ----- Update the number of elements of the list + $v_nb = sizeof($p_result_list); + } + } + + // ----- Free memory for the recursive loop + unset($p_temp_list); + unset($p_hdir); + unset($p_hitem); + } + } + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "After add, list have $v_nb elements"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privAddFile() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privAddFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddFile", "filename='$p_filename', add_dir='$p_add_dir', remove_dir='$p_remove_dir'"); + $v_result=1; + + if ($p_filename == "") + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Calculate the stored filename + $v_stored_filename = $p_filename; + + // ----- Look for all path to remove + if ($p_remove_all_dir) { + $v_stored_filename = basename($p_filename); + } + // ----- Look for partial path remove + else if ($p_remove_dir != "") + { + if (substr($p_remove_dir, -1) != '/') + $p_remove_dir .= "/"; + + if ((substr($p_filename, 0, 2) == "./") || (substr($p_remove_dir, 0, 2) == "./")) + { + if ((substr($p_filename, 0, 2) == "./") && (substr($p_remove_dir, 0, 2) != "./")) + $p_remove_dir = "./".$p_remove_dir; + if ((substr($p_filename, 0, 2) != "./") && (substr($p_remove_dir, 0, 2) == "./")) + $p_remove_dir = substr($p_remove_dir, 2); + } + + $v_compare = PclZipUtilPathInclusion($p_remove_dir, $p_filename); + if ($v_compare > 0) +// if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir) + { + + if ($v_compare == 2) { + $v_stored_filename = ""; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Path to remove is the current folder"); + } + else { + $v_stored_filename = substr($p_filename, strlen($p_remove_dir)); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Remove path '$p_remove_dir' in file '$p_filename' = '$v_stored_filename'"); + } + } + } + // ----- Look for path to add + if ($p_add_dir != "") + { + if (substr($p_add_dir, -1) == "/") + $v_stored_filename = $p_add_dir.$v_stored_filename; + else + $v_stored_filename = $p_add_dir."/".$v_stored_filename; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Add path '$p_add_dir' in file '$p_filename' = '$v_stored_filename'"); + } + + // ----- Filename (reduce the path of stored name) + $v_stored_filename = PclZipUtilPathReduction($v_stored_filename); + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Filename (reduced) '$v_stored_filename', strlen ".strlen($v_stored_filename)); + + /* filename length moved after call-back in release 1.3 + // ----- Check the path length + if (strlen($v_stored_filename) > 0xFF) + { + // ----- Error log + PclZip::privErrorLog(-5, "Stored file name is too long (max. 255) : '$v_stored_filename'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + */ + + // ----- Set the file properties + clearstatcache(); + $p_header['version'] = 20; + $p_header['version_extracted'] = 10; + $p_header['flag'] = 0; + $p_header['compression'] = 0; + $p_header['mtime'] = filemtime($p_filename); + $p_header['crc'] = 0; + $p_header['compressed_size'] = 0; + $p_header['size'] = filesize($p_filename); + $p_header['filename_len'] = strlen($p_filename); + $p_header['extra_len'] = 0; + $p_header['comment_len'] = 0; + $p_header['disk'] = 0; + $p_header['internal'] = 0; + $p_header['external'] = (is_file($p_filename)?0xFE49FFE0:0x41FF0010); + $p_header['offset'] = 0; + $p_header['filename'] = $p_filename; + $p_header['stored_filename'] = $v_stored_filename; + $p_header['extra'] = ''; + $p_header['comment'] = ''; + $p_header['status'] = 'ok'; + $p_header['index'] = -1; + + // ----- Look for pre-add callback + if (isset($p_options[PCLZIP_CB_PRE_ADD])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A pre-callback '".$p_options[PCLZIP_CB_PRE_ADD]."()') is defined for the extraction"); + + // ----- Generate a local information + $v_local_header = array(); + $this->privConvertHeader2FileInfo($p_header, $v_local_header); + + // ----- Call the callback + // Here I do not use call_user_func() because I need to send a reference to the + // header. + eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);'); + if ($v_result == 0) { + // ----- Change the file status + $p_header['status'] = "skipped"; + $v_result = 1; + } + + // ----- Update the informations + // Only some fields can be modified + if ($p_header['stored_filename'] != $v_local_header['stored_filename']) { + $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New stored filename is '".$p_header['stored_filename']."'"); + } + } + + // ----- Look for empty stored filename + if ($p_header['stored_filename'] == "") { + $p_header['status'] = "filtered"; + } + + // ----- Check the path length + if (strlen($p_header['stored_filename']) > 0xFF) { + $p_header['status'] = 'filename_too_long'; + } + + // ----- Look if no error, or file not skipped + if ($p_header['status'] == 'ok') { + + // ----- Look for a file + if (is_file($p_filename)) + { + // ----- Open the source file + if (($v_file = @fopen($p_filename, "rb")) == 0) { + PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode"); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) { + // ----- Read the file content + $v_content_compressed = @fread($v_file, $p_header['size']); + + // ----- Calculate the CRC + $p_header['crc'] = crc32($v_content_compressed); + } + else { + // ----- Read the file content + $v_content = @fread($v_file, $p_header['size']); + + // ----- Calculate the CRC + $p_header['crc'] = crc32($v_content); + + // ----- Compress the file + $v_content_compressed = gzdeflate($v_content); + } + + // ----- Set header parameters + $p_header['compressed_size'] = strlen($v_content_compressed); + $p_header['compression'] = 8; + + // ----- Call the header generation + if (($v_result = $this->privWriteFileHeader($p_header)) != 1) { + @fclose($v_file); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Write the compressed content + $v_binary_data = pack('a'.$p_header['compressed_size'], $v_content_compressed); + @fwrite($this->zip_fd, $v_binary_data, $p_header['compressed_size']); + + // ----- Close the file + @fclose($v_file); + } + + // ----- Look for a directory + else + { + // ----- Set the file properties + $p_header['filename'] .= '/'; + $p_header['filename_len']++; + $p_header['size'] = 0; + $p_header['external'] = 0x41FF0010; // Value for a folder : to be checked + + // ----- Call the header generation + if (($v_result = $this->privWriteFileHeader($p_header)) != 1) + { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + } + } + + // ----- Look for pre-add callback + if (isset($p_options[PCLZIP_CB_POST_ADD])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A post-callback '".$p_options[PCLZIP_CB_POST_ADD]."()') is defined for the extraction"); + + // ----- Generate a local information + $v_local_header = array(); + $this->privConvertHeader2FileInfo($p_header, $v_local_header); + + // ----- Call the callback + // Here I do not use call_user_func() because I need to send a reference to the + // header. + eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);'); + if ($v_result == 0) { + // ----- Ignored + $v_result = 1; + } + + // ----- Update the informations + // Nothing can be modified + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privWriteFileHeader() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privWriteFileHeader(&$p_header) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privWriteFileHeader", 'file="'.$p_header['filename'].'", stored as "'.$p_header['stored_filename'].'"'); + $v_result=1; + + // TBC + //for(reset($p_header); $key = key($p_header); next($p_header)) { + // //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "header[$key] = ".$p_header[$key]); + //} + + // ----- Store the offset position of the file + $p_header['offset'] = ftell($this->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 'File offset of the header :'.$p_header['offset']); + + // ----- Transform UNIX mtime to DOS format mdate/mtime + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\''); + $v_date = getdate($p_header['mtime']); + $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2; + $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday']; + + // ----- Packed data + $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50, $p_header['version'], $p_header['flag'], + $p_header['compression'], $v_mtime, $v_mdate, + $p_header['crc'], $p_header['compressed_size'], $p_header['size'], + strlen($p_header['stored_filename']), $p_header['extra_len']); + + // ----- Write the first 148 bytes of the header in the archive + fputs($this->zip_fd, $v_binary_data, 30); + + // ----- Write the variable fields + if (strlen($p_header['stored_filename']) != 0) + { + fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename'])); + } + if ($p_header['extra_len'] != 0) + { + fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']); + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privWriteCentralFileHeader() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privWriteCentralFileHeader(&$p_header) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privWriteCentralFileHeader", 'file="'.$p_header['filename'].'", stored as "'.$p_header['stored_filename'].'"'); + $v_result=1; + + // TBC + //for(reset($p_header); $key = key($p_header); next($p_header)) { + // //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "header[$key] = ".$p_header[$key]); + //} + + // ----- Transform UNIX mtime to DOS format mdate/mtime + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\''); + $v_date = getdate($p_header['mtime']); + $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2; + $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday']; + + // ----- Packed data + $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50, $p_header['version'], $p_header['version_extracted'], + $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], + $p_header['compressed_size'], $p_header['size'], + strlen($p_header['stored_filename']), $p_header['extra_len'], $p_header['comment_len'], + $p_header['disk'], $p_header['internal'], $p_header['external'], $p_header['offset']); + + // ----- Write the 42 bytes of the header in the zip file + fputs($this->zip_fd, $v_binary_data, 46); + + // ----- Write the variable fields + if (strlen($p_header['stored_filename']) != 0) + { + fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename'])); + } + if ($p_header['extra_len'] != 0) + { + fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']); + } + if ($p_header['comment_len'] != 0) + { + fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']); + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privWriteCentralHeader() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privWriteCentralHeader", 'nb_entries='.$p_nb_entries.', size='.$p_size.', offset='.$p_offset.', comment="'.$p_comment.'"'); + $v_result=1; + + // ----- Packed data + $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries, $p_nb_entries, $p_size, $p_offset, strlen($p_comment)); + + // ----- Write the 22 bytes of the header in the zip file + fputs($this->zip_fd, $v_binary_data, 22); + + // ----- Write the variable fields + if (strlen($p_comment) != 0) + { + fputs($this->zip_fd, $p_comment, strlen($p_comment)); + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privList() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privList(&$p_list) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privList", "list"); + $v_result=1; + + // ----- Open the zip file + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode"); + if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Read the central directory informations + $v_central_dir = array(); + if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) + { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Go to beginning of Central Dir + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Offset : ".$v_central_dir['offset']."'"); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position in file : ".ftell($this->zip_fd)."'"); + @rewind($this->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position in file : ".ftell($this->zip_fd)."'"); + if (@fseek($this->zip_fd, $v_central_dir['offset'])) + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position in file : ".ftell($this->zip_fd)."'"); + + // ----- Read each entry + for ($i=0; $i<$v_central_dir['entries']; $i++) + { + // ----- Read the file header + if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) + { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + $v_header['index'] = $i; + + // ----- Get the only interesting attributes + $this->privConvertHeader2FileInfo($v_header, $p_list[$i]); + unset($v_header); + } + + // ----- Close the zip file + $this->privCloseFd(); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privConvertHeader2FileInfo() + // Description : + // This function takes the file informations from the central directory + // entries and extract the interesting parameters that will be given back. + // The resulting file infos are set in the array $p_info + // $p_info['filename'] : Filename with full path. Given by user (add), + // extracted in the filesystem (extract). + // $p_info['stored_filename'] : Stored filename in the archive. + // $p_info['size'] = Size of the file. + // $p_info['compressed_size'] = Compressed size of the file. + // $p_info['mtime'] = Last modification date of the file. + // $p_info['comment'] = Comment associated with the file. + // $p_info['folder'] = true/false : indicates if the entry is a folder or not. + // $p_info['status'] = status of the action on the file. + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privConvertHeader2FileInfo($p_header, &$p_info) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privConvertHeader2FileInfo", "Filename='".$p_header['filename']."'"); + $v_result=1; + + // ----- Get the interesting attributes + $p_info['filename'] = $p_header['filename']; + $p_info['stored_filename'] = $p_header['stored_filename']; + $p_info['size'] = $p_header['size']; + $p_info['compressed_size'] = $p_header['compressed_size']; + $p_info['mtime'] = $p_header['mtime']; + $p_info['comment'] = $p_header['comment']; + $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010); + $p_info['index'] = $p_header['index']; + $p_info['status'] = $p_header['status']; + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privExtractByRule() + // Description : + // Extract a file or directory depending of rules (by index, by name, ...) + // Parameters : + // $p_file_list : An array where will be placed the properties of each + // extracted file + // $p_path : Path to add while writing the extracted files + // $p_remove_path : Path to remove (from the file memorized path) while writing the + // extracted files. If the path does not match the file path, + // the file is extracted with its memorized path. + // $p_remove_path does not apply to 'list' mode. + // $p_path and $p_remove_path are commulative. + // Return Values : + // 1 on success,0 or less on error (see error code list) + // -------------------------------------------------------------------------------- + function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privExtractByRule", "path='$p_path', remove_path='$p_remove_path', remove_all_path='".($p_remove_all_path?'true':'false')."'"); + $v_result=1; + + // ----- Check the path + if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../") && (substr($p_path,1,2)!=":/"))) + $p_path = "./".$p_path; + + // ----- Reduce the path last (and duplicated) '/' + if (($p_path != "./") && ($p_path != "/")) + { + // ----- Look for the path end '/' + while (substr($p_path, -1) == "/") + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Destination path [$p_path] ends by '/'"); + $p_path = substr($p_path, 0, strlen($p_path)-1); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Modified to [$p_path]"); + } + } + + // ----- Look for path to remove format (should end by /) + if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/')) + { + $p_remove_path .= '/'; + } + $p_remove_path_size = strlen($p_remove_path); + + // ----- Open the zip file + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode"); + if (($v_result = $this->privOpenFd('rb')) != 1) + { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Read the central directory informations + $v_central_dir = array(); + if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) + { + // ----- Close the zip file + $this->privCloseFd(); + + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Start at beginning of Central Dir + $v_pos_entry = $v_central_dir['offset']; + + // ----- Read each entry + $j_start = 0; + for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Read next file header entry : '$i'"); + + // ----- Read next Central dir entry + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Position before rewind : ".ftell($this->zip_fd)."'"); + @rewind($this->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Position after rewind : ".ftell($this->zip_fd)."'"); + if (@fseek($this->zip_fd, $v_pos_entry)) + { + // ----- Close the zip file + $this->privCloseFd(); + + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position after fseek : ".ftell($this->zip_fd)."'"); + + // ----- Read the file header + $v_header = array(); + if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) + { + // ----- Close the zip file + $this->privCloseFd(); + + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Store the index + $v_header['index'] = $i; + + // ----- Store the file position + $v_pos_entry = ftell($this->zip_fd); + + // ----- Look for the specific extract rules + $v_extract = false; + + // ----- Look for extract by name rule + if ( (isset($p_options[PCLZIP_OPT_BY_NAME])) + && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByName'"); + + // ----- Look if the filename is in the list + for ($j=0; ($j strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) + && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The directory is in the file path"); + $v_extract = true; + } + } + // ----- Look for a filename + elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The file is the right one."); + $v_extract = true; + } + } + } + + // ----- Look for extract by ereg rule + else if ( (isset($p_options[PCLZIP_OPT_BY_EREG])) + && ($p_options[PCLZIP_OPT_BY_EREG] != "")) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract by ereg '".$p_options[PCLZIP_OPT_BY_EREG]."'"); + + if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression"); + $v_extract = true; + } + } + + // ----- Look for extract by preg rule + else if ( (isset($p_options[PCLZIP_OPT_BY_PREG])) + && ($p_options[PCLZIP_OPT_BY_PREG] != "")) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByEreg'"); + + if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression"); + $v_extract = true; + } + } + + // ----- Look for extract by index rule + else if ( (isset($p_options[PCLZIP_OPT_BY_INDEX])) + && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByIndex'"); + + // ----- Look if the index is in the list + for ($j=$j_start; ($j=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Found as part of an index range"); + $v_extract = true; + } + if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Do not look this index range for next loop"); + $j_start = $j+1; + } + + if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Index range is greater than index, stop loop"); + break; + } + } + } + + // ----- Look for no rule, which means extract all the archive + else { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with no rule (extract all)"); + $v_extract = true; + } + + + // ----- Look for real extraction + if ($v_extract) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file '".$v_header['filename']."', index '$i'"); + + // ----- Go to the file position + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position before rewind : ".ftell($this->zip_fd)."'"); + @rewind($this->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after rewind : ".ftell($this->zip_fd)."'"); + if (@fseek($this->zip_fd, $v_header['offset'])) + { + // ----- Close the zip file + $this->privCloseFd(); + + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after fseek : ".ftell($this->zip_fd)."'"); + + // ----- Look for extraction as string + if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) { + + // ----- Extracting the file + $v_result1 = $this->privExtractFileAsString($v_header, $v_string); + if ($v_result1 < 1) { + $this->privCloseFd(); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result1); + return $v_result1; + } + + // ----- Get the only interesting attributes + if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) + { + // ----- Close the zip file + $this->privCloseFd(); + + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Set the file content + $p_file_list[$v_nb_extracted]['content'] = $v_string; + + // ----- Next extracted file + $v_nb_extracted++; + + // ----- Look for user callback abort + if ($v_result1 == 2) { + break; + } + } + // ----- Look for extraction in standard output + elseif ( (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) + && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) { + // ----- Extracting the file in standard output + $v_result1 = $this->privExtractFileInOutput($v_header, $p_options); + if ($v_result1 < 1) { + $this->privCloseFd(); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result1); + return $v_result1; + } + + // ----- Get the only interesting attributes + if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) { + $this->privCloseFd(); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Look for user callback abort + if ($v_result1 == 2) { + break; + } + } + // ----- Look for normal extraction + else { + // ----- Extracting the file + $v_result1 = $this->privExtractFile($v_header, + $p_path, $p_remove_path, + $p_remove_all_path, + $p_options); + if ($v_result1 < 1) { + $this->privCloseFd(); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result1); + return $v_result1; + } + + // ----- Get the only interesting attributes + if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) + { + // ----- Close the zip file + $this->privCloseFd(); + + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Look for user callback abort + if ($v_result1 == 2) { + break; + } + } + } + } + + // ----- Close the zip file + $this->privCloseFd(); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privExtractFile() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privExtractFile', "path='$p_path', remove_path='$p_remove_path', remove_all_path='".($p_remove_all_path?'true':'false')."'"); + $v_result=1; + + // ----- Read the file header + if (($v_result = $this->privReadFileHeader($v_header)) != 1) + { + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'"); + + // ----- Check that the file header is coherent with $p_entry info + // TBC + + // ----- Look for all path to remove + if ($p_remove_all_path == true) { + // ----- Get the basename of the path + $p_entry['filename'] = basename($p_entry['filename']); + } + + // ----- Look for path to remove + else if ($p_remove_path != "") + { + //if (strcmp($p_remove_path, $p_entry['filename'])==0) + if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The folder is the same as the removed path '".$p_entry['filename']."'"); + + // ----- Change the file status + $p_entry['status'] = "filtered"; + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + $p_remove_path_size = strlen($p_remove_path); + if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file '".$p_entry['filename']."'"); + + // ----- Remove the path + $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size); + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Resulting file is '".$p_entry['filename']."'"); + } + } + + // ----- Add the path + if ($p_path != '') + { + $p_entry['filename'] = $p_path."/".$p_entry['filename']; + } + + // ----- Look for pre-extract callback + if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A pre-callback '".$p_options[PCLZIP_CB_PRE_EXTRACT]."()') is defined for the extraction"); + + // ----- Generate a local information + $v_local_header = array(); + $this->privConvertHeader2FileInfo($p_entry, $v_local_header); + + // ----- Call the callback + // Here I do not use call_user_func() because I need to send a reference to the + // header. + eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);'); + if ($v_result == 0) { + // ----- Change the file status + $p_entry['status'] = "skipped"; + $v_result = 1; + } + + // ----- Look for abort result + if ($v_result == 2) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction"); + // ----- This status is internal and will be changed in 'skipped' + $p_entry['status'] = "aborted"; + $v_result = PCLZIP_ERR_USER_ABORTED; + } + + // ----- Update the informations + // Only some fields can be modified + $p_entry['filename'] = $v_local_header['filename']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New filename is '".$p_entry['filename']."'"); + } + + // ----- Trace + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file (with path) '".$p_entry['filename']."', size '$v_header[size]'"); + + // ----- Look if extraction should be done + if ($p_entry['status'] == 'ok') { + + // ----- Look for specific actions while the file exist + if (file_exists($p_entry['filename'])) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File '".$p_entry['filename']."' already exists"); + + // ----- Look if file is a directory + if (is_dir($p_entry['filename'])) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Existing file '".$p_entry['filename']."' is a directory"); + + // ----- Change the file status + $p_entry['status'] = "already_a_directory"; + + // ----- Return + ////--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + //return $v_result; + } + // ----- Look if file is write protected + else if (!is_writeable($p_entry['filename'])) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Existing file '".$p_entry['filename']."' is write protected"); + + // ----- Change the file status + $p_entry['status'] = "write_protected"; + + // ----- Return + ////--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + //return $v_result; + } + + // ----- Look if the extracted file is older + else if (filemtime($p_entry['filename']) > $p_entry['mtime']) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Existing file '".$p_entry['filename']."' is newer (".date("l dS of F Y h:i:s A", filemtime($p_entry['filename'])).") than the extracted file (".date("l dS of F Y h:i:s A", $p_entry['mtime']).")"); + + // ----- Change the file status + $p_entry['status'] = "newer_exist"; + + // ----- Return + ////--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + //return $v_result; + } + } + + // ----- Check the directory availability and create it if necessary + else { + if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/')) + $v_dir_to_check = $p_entry['filename']; + else if (!strstr($p_entry['filename'], "/")) + $v_dir_to_check = ""; + else + $v_dir_to_check = dirname($p_entry['filename']); + + if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to create path for '".$p_entry['filename']."'"); + + // ----- Change the file status + $p_entry['status'] = "path_creation_fail"; + + // ----- Return + ////--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + //return $v_result; + $v_result = 1; + } + } + } + + // ----- Look if extraction should be done + if ($p_entry['status'] == 'ok') { + + // ----- Do the extraction (if not a folder) + if (!(($p_entry['external']&0x00000010)==0x00000010)) + { + + // ----- Look for not compressed file + if ($p_entry['compressed_size'] == $p_entry['size']) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting an un-compressed file"); + + // ----- Opening destination file + if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Error while opening '".$p_entry['filename']."' in write binary mode"); + + // ----- Change the file status + $p_entry['status'] = "write_error"; + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Reading '".$p_entry['size']."' bytes"); + + // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks + $v_size = $p_entry['compressed_size']; + while ($v_size != 0) + { + $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Read $v_read_size bytes"); + $v_buffer = fread($this->zip_fd, $v_read_size); + $v_binary_data = pack('a'.$v_read_size, $v_buffer); + @fwrite($v_dest_file, $v_binary_data, $v_read_size); + $v_size -= $v_read_size; + } + + // ----- Closing the destination file + fclose($v_dest_file); + + // ----- Change the file mtime + touch($p_entry['filename'], $p_entry['mtime']); + } + else + { + // ----- Trace + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting a compressed file"); + + // ----- Opening destination file + if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Error while opening '".$p_entry['filename']."' in write binary mode"); + + // ----- Change the file status + $p_entry['status'] = "write_error"; + + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Reading '".$p_entry['size']."' bytes"); + + // ----- Read the compressed file in a buffer (one shot) + $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']); + + // ----- Decompress the file + $v_file_content = gzinflate($v_buffer); + unset($v_buffer); + + // ----- Write the uncompressed data + @fwrite($v_dest_file, $v_file_content, $p_entry['size']); + unset($v_file_content); + + // ----- Closing the destination file + @fclose($v_dest_file); + + // ----- Change the file mtime + touch($p_entry['filename'], $p_entry['mtime']); + } + + // ----- Look for chmod option + if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "chmod option activated '".$p_options[PCLZIP_OPT_SET_CHMOD]."'"); + + // ----- Change the mode of the file + chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]); + } + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extraction done"); + } + } + + // ----- Change abort status + if ($p_entry['status'] == "aborted") { + $p_entry['status'] = "skipped"; + } + + // ----- Look for post-extract callback + elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A post-callback '".$p_options[PCLZIP_CB_POST_EXTRACT]."()') is defined for the extraction"); + + // ----- Generate a local information + $v_local_header = array(); + $this->privConvertHeader2FileInfo($p_entry, $v_local_header); + + // ----- Call the callback + // Here I do not use call_user_func() because I need to send a reference to the + // header. + eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);'); + + // ----- Look for abort result + if ($v_result == 2) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction"); + $v_result = PCLZIP_ERR_USER_ABORTED; + } + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privExtractFileInOutput() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privExtractFileInOutput(&$p_entry, &$p_options) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privExtractFileInOutput', ""); + $v_result=1; + + // ----- Read the file header + if (($v_result = $this->privReadFileHeader($v_header)) != 1) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'"); + + // ----- Check that the file header is coherent with $p_entry info + // TBC + + // ----- Look for pre-extract callback + if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A pre-callback '".$p_options[PCLZIP_CB_PRE_EXTRACT]."()') is defined for the extraction"); + + // ----- Generate a local information + $v_local_header = array(); + $this->privConvertHeader2FileInfo($p_entry, $v_local_header); + + // ----- Call the callback + // Here I do not use call_user_func() because I need to send a reference to the + // header. + eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);'); + if ($v_result == 0) { + // ----- Change the file status + $p_entry['status'] = "skipped"; + $v_result = 1; + } + + // ----- Look for abort result + if ($v_result == 2) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction"); + // ----- This status is internal and will be changed in 'skipped' + $p_entry['status'] = "aborted"; + $v_result = PCLZIP_ERR_USER_ABORTED; + } + + // ----- Update the informations + // Only some fields can be modified + $p_entry['filename'] = $v_local_header['filename']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New filename is '".$p_entry['filename']."'"); + } + + // ----- Trace + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file (with path) '".$p_entry['filename']."', size '$v_header[size]'"); + + // ----- Look if extraction should be done + if ($p_entry['status'] == 'ok') { + + // ----- Do the extraction (if not a folder) + if (!(($p_entry['external']&0x00000010)==0x00000010)) { + // ----- Look for not compressed file + if ($p_entry['compressed_size'] == $p_entry['size']) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting an un-compressed file"); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Reading '".$p_entry['size']."' bytes"); + + // ----- Read the file in a buffer (one shot) + $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']); + + // ----- Send the file to the output + echo $v_buffer; + unset($v_buffer); + } + else { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting a compressed file"); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Reading '".$p_entry['size']."' bytes"); + + // ----- Read the compressed file in a buffer (one shot) + $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']); + + // ----- Decompress the file + $v_file_content = gzinflate($v_buffer); + unset($v_buffer); + + // ----- Send the file to the output + echo $v_file_content; + unset($v_file_content); + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extraction done"); + } + } + + // ----- Change abort status + if ($p_entry['status'] == "aborted") { + $p_entry['status'] = "skipped"; + } + + // ----- Look for post-extract callback + elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A post-callback '".$p_options[PCLZIP_CB_POST_EXTRACT]."()') is defined for the extraction"); + + // ----- Generate a local information + $v_local_header = array(); + $this->privConvertHeader2FileInfo($p_entry, $v_local_header); + + // ----- Call the callback + // Here I do not use call_user_func() because I need to send a reference to the + // header. + eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);'); + + // ----- Look for abort result + if ($v_result == 2) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction"); + $v_result = PCLZIP_ERR_USER_ABORTED; + } + } + + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privExtractFileAsString() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privExtractFileAsString(&$p_entry, &$p_string) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privExtractFileAsString', "p_entry['filename']='".$p_entry['filename']."'"); + $v_result=1; + + // ----- Read the file header + $v_header = array(); + if (($v_result = $this->privReadFileHeader($v_header)) != 1) + { + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'"); + + // ----- Check that the file header is coherent with $p_entry info + // TBC + + // ----- Trace + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file in string (with path) '".$p_entry['filename']."', size '$v_header[size]'"); + + // ----- Do the extraction (if not a folder) + if (!(($p_entry['external']&0x00000010)==0x00000010)) + { + // ----- Look for not compressed file + if ($p_entry['compressed_size'] == $p_entry['size']) + { + // ----- Trace + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting an un-compressed file"); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Reading '".$p_entry['size']."' bytes"); + + // ----- Reading the file + $p_string = fread($this->zip_fd, $p_entry['compressed_size']); + } + else + { + // ----- Trace + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting a compressed file"); + + // ----- Reading the file + $v_data = fread($this->zip_fd, $p_entry['compressed_size']); + + // ----- Decompress the file + $p_string = gzinflate($v_data); + } + + // ----- Trace + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extraction done"); + } + else { + // TBC : error : can not extract a folder in a string + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privReadFileHeader() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privReadFileHeader(&$p_header) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privReadFileHeader", ""); + $v_result=1; + + // ----- Read the 4 bytes signature + $v_binary_data = @fread($this->zip_fd, 4); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary data is : '".sprintf("%08x", $v_binary_data)."'"); + $v_data = unpack('Vid', $v_binary_data); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary signature is : '".sprintf("0x%08x", $v_data['id'])."'"); + + // ----- Check signature + if ($v_data['id'] != 0x04034b50) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Invalid File header"); + + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Read the first 42 bytes of the header + $v_binary_data = fread($this->zip_fd, 26); + + // ----- Look for invalid block size + if (strlen($v_binary_data) != 26) + { + $p_header['filename'] = ""; + $p_header['status'] = "invalid_header"; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Invalid block size : ".strlen($v_binary_data)); + + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data)); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Extract the values + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Header : '".$v_binary_data."'"); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Header (Hex) : '".bin2hex($v_binary_data)."'"); + $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data); + + // ----- Get filename + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "File name length : ".$v_data['filename_len']); + $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Filename : \''.$p_header['filename'].'\''); + + // ----- Get extra_fields + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extra field length : ".$v_data['extra_len']); + if ($v_data['extra_len'] != 0) { + $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']); + } + else { + $p_header['extra'] = ''; + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Extra field : \''.bin2hex($p_header['extra']).'\''); + + // ----- Extract properties + $p_header['compression'] = $v_data['compression']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Compression method : \''.bin2hex($p_header['compression']).'\''); + $p_header['size'] = $v_data['size']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Size : \''.$p_header['size'].'\''); + $p_header['compressed_size'] = $v_data['compressed_size']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Compressed Size : \''.$p_header['compressed_size'].'\''); + $p_header['crc'] = $v_data['crc']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'CRC : \''.$p_header['crc'].'\''); + $p_header['flag'] = $v_data['flag']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Flag : \''.$p_header['flag'].'\''); + + // ----- Recuperate date in UNIX format + $p_header['mdate'] = $v_data['mdate']; + $p_header['mtime'] = $v_data['mtime']; + if ($p_header['mdate'] && $p_header['mtime']) + { + // ----- Extract time + $v_hour = ($p_header['mtime'] & 0xF800) >> 11; + $v_minute = ($p_header['mtime'] & 0x07E0) >> 5; + $v_seconde = ($p_header['mtime'] & 0x001F)*2; + + // ----- Extract date + $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980; + $v_month = ($p_header['mdate'] & 0x01E0) >> 5; + $v_day = $p_header['mdate'] & 0x001F; + + // ----- Get UNIX date format + $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year); + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\''); + } + else + { + $p_header['mtime'] = time(); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date is actual : \''.date("d/m/y H:i:s", $p_header['mtime']).'\''); + } + + // ----- Other informations + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Compression type : ".$v_data['compression']); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Version : ".$v_data['version']); + + // TBC + //for(reset($v_data); $key = key($v_data); next($v_data)) { + // //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Attribut[$key] = ".$v_data[$key]); + //} + + // ----- Set the stored filename + $p_header['stored_filename'] = $p_header['filename']; + + // ----- Set the status field + $p_header['status'] = "ok"; + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privReadCentralFileHeader() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privReadCentralFileHeader(&$p_header) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privReadCentralFileHeader", ""); + $v_result=1; + + // ----- Read the 4 bytes signature + $v_binary_data = @fread($this->zip_fd, 4); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary data is : '".sprintf("%08x", $v_binary_data)."'"); + $v_data = unpack('Vid', $v_binary_data); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary signature is : '".sprintf("0x%08x", $v_data['id'])."'"); + + // ----- Check signature + if ($v_data['id'] != 0x02014b50) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Invalid Central Dir File signature"); + + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Read the first 42 bytes of the header + $v_binary_data = fread($this->zip_fd, 42); + + // ----- Look for invalid block size + if (strlen($v_binary_data) != 42) + { + $p_header['filename'] = ""; + $p_header['status'] = "invalid_header"; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Invalid block size : ".strlen($v_binary_data)); + + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data)); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Extract the values + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header : '".$v_binary_data."'"); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header (Hex) : '".bin2hex($v_binary_data)."'"); + $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data); + + // ----- Get filename + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "File name length : ".$p_header['filename_len']); + if ($p_header['filename_len'] != 0) + $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']); + else + $p_header['filename'] = ''; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Filename : \''.$p_header['filename'].'\''); + + // ----- Get extra + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Extra length : ".$p_header['extra_len']); + if ($p_header['extra_len'] != 0) + $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']); + else + $p_header['extra'] = ''; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Extra : \''.$p_header['extra'].'\''); + + // ----- Get comment + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Comment length : ".$p_header['comment_len']); + if ($p_header['comment_len'] != 0) + $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']); + else + $p_header['comment'] = ''; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Comment : \''.$p_header['comment'].'\''); + + // ----- Extract properties + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Version : \''.($p_header['version']/10).'.'.($p_header['version']%10).'\''); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Version need to extract : \''.($p_header['version_extracted']/10).'.'.($p_header['version_extracted']%10).'\''); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Size : \''.$p_header['size'].'\''); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Compressed Size : \''.$p_header['compressed_size'].'\''); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'CRC : \''.$p_header['crc'].'\''); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Flag : \''.$p_header['flag'].'\''); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Offset : \''.$p_header['offset'].'\''); + + // ----- Recuperate date in UNIX format + if ($p_header['mdate'] && $p_header['mtime']) + { + // ----- Extract time + $v_hour = ($p_header['mtime'] & 0xF800) >> 11; + $v_minute = ($p_header['mtime'] & 0x07E0) >> 5; + $v_seconde = ($p_header['mtime'] & 0x001F)*2; + + // ----- Extract date + $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980; + $v_month = ($p_header['mdate'] & 0x01E0) >> 5; + $v_day = $p_header['mdate'] & 0x001F; + + // ----- Get UNIX date format + $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year); + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\''); + } + else + { + $p_header['mtime'] = time(); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Date is actual : \''.date("d/m/y H:i:s", $p_header['mtime']).'\''); + } + + // ----- Set the stored filename + $p_header['stored_filename'] = $p_header['filename']; + + // ----- Set default status to ok + $p_header['status'] = 'ok'; + + // ----- Look if it is a directory + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Internal (Hex) : '".sprintf("Ox%04X", $p_header['internal'])."'"); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "External (Hex) : '".sprintf("Ox%04X", $p_header['external'])."' (".(($p_header['external']&0x00000010)==0x00000010?'is a folder':'is a file').')'); + if (substr($p_header['filename'], -1) == '/') + { + $p_header['external'] = 0x41FF0010; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Force folder external : \''.$p_header['external'].'\''); + } + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Header of filename : \''.$p_header['filename'].'\''); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privReadEndCentralDir() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privReadEndCentralDir(&$p_central_dir) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privReadEndCentralDir", ""); + $v_result=1; + + // ----- Go to the end of the zip file + $v_size = filesize($this->zipname); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Size of the file :$v_size"); + @fseek($this->zip_fd, $v_size); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Position at end of zip file : \''.ftell($this->zip_fd).'\''); + if (@ftell($this->zip_fd) != $v_size) + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\''); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- First try : look if this is an archive with no commentaries (most of the time) + // in this case the end of central dir is at 22 bytes of the file end + $v_found = 0; + if ($v_size > 26) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Look for central dir with no comment'); + @fseek($this->zip_fd, $v_size-22); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Position after min central position : \''.ftell($this->zip_fd).'\''); + if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22)) + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\''); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Read for bytes + $v_binary_data = @fread($this->zip_fd, 4); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Binary data is : '".sprintf("%08x", $v_binary_data)."'"); + $v_data = @unpack('Vid', $v_binary_data); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary signature is : '".sprintf("0x%08x", $v_data['id'])."'"); + + // ----- Check signature + if ($v_data['id'] == 0x06054b50) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found central dir at the default position."); + $v_found = 1; + } + + $v_pos = ftell($this->zip_fd); + } + + // ----- Go back to the maximum possible size of the Central Dir End Record + if (!$v_found) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Start extended search of end central dir'); + $v_maximum_size = 65557; // 0xFFFF + 22; + if ($v_maximum_size > $v_size) + $v_maximum_size = $v_size; + @fseek($this->zip_fd, $v_size-$v_maximum_size); + if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size)) + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\''); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Position after max central position : \''.ftell($this->zip_fd).'\''); + + // ----- Read byte per byte in order to find the signature + $v_pos = ftell($this->zip_fd); + $v_bytes = 0x00000000; + while ($v_pos < $v_size) + { + // ----- Read a byte + $v_byte = @fread($this->zip_fd, 1); + + // ----- Add the byte + $v_bytes = ($v_bytes << 8) | Ord($v_byte); + + // ----- Compare the bytes + if ($v_bytes == 0x504b0506) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Found End Central Dir signature at position : \''.ftell($this->zip_fd).'\''); + $v_pos++; + break; + } + + $v_pos++; + } + + // ----- Look if not found end of central dir + if ($v_pos == $v_size) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to find End of Central Dir Record signature"); + + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + } + + // ----- Read the first 18 bytes of the header + $v_binary_data = fread($this->zip_fd, 18); + + // ----- Look for invalid block size + if (strlen($v_binary_data) != 18) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Invalid End of Central Dir Record size : ".strlen($v_binary_data)); + + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data)); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Extract the values + ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Central Dir Record : '".$v_binary_data."'"); + ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Central Dir Record (Hex) : '".bin2hex($v_binary_data)."'"); + $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data); + + // ----- Check the global size + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Comment length : ".$v_data['comment_size']); + if (($v_pos + $v_data['comment_size'] + 18) != $v_size) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Fail to find the right signature"); + + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Fail to find the right signature"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Get comment + if ($v_data['comment_size'] != 0) + $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']); + else + $p_central_dir['comment'] = ''; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Comment : \''.$p_central_dir['comment'].'\''); + + $p_central_dir['entries'] = $v_data['entries']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Nb of entries : \''.$p_central_dir['entries'].'\''); + $p_central_dir['disk_entries'] = $v_data['disk_entries']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Nb of entries for this disk : \''.$p_central_dir['disk_entries'].'\''); + $p_central_dir['offset'] = $v_data['offset']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Offset of Central Dir : \''.$p_central_dir['offset'].'\''); + $p_central_dir['size'] = $v_data['size']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Size of Central Dir : \''.$p_central_dir['size'].'\''); + $p_central_dir['disk'] = $v_data['disk']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Disk number : \''.$p_central_dir['disk'].'\''); + $p_central_dir['disk_start'] = $v_data['disk_start']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Start disk number : \''.$p_central_dir['disk_start'].'\''); + + // TBC + //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) { + // //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "central_dir[$key] = ".$p_central_dir[$key]); + //} + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privDeleteByRule() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privDeleteByRule(&$p_result_list, &$p_options) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privDeleteByRule", ""); + $v_result=1; + $v_list_detail = array(); + + // ----- Open the zip file + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode"); + if (($v_result=$this->privOpenFd('rb')) != 1) + { + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Read the central directory informations + $v_central_dir = array(); + if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) + { + $this->privCloseFd(); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Go to beginning of File + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in file : ".ftell($this->zip_fd)."'"); + @rewind($this->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in file : ".ftell($this->zip_fd)."'"); + + // ----- Scan all the files + // ----- Start at beginning of Central Dir + $v_pos_entry = $v_central_dir['offset']; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position before rewind : ".ftell($this->zip_fd)."'"); + @rewind($this->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after rewind : ".ftell($this->zip_fd)."'"); + if (@fseek($this->zip_fd, $v_pos_entry)) + { + // ----- Close the zip file + $this->privCloseFd(); + + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after fseek : ".ftell($this->zip_fd)."'"); + + // ----- Read each entry + $v_header_list = array(); + $j_start = 0; + for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Read next file header entry (index '$i')"); + + // ----- Read the file header + $v_header_list[$v_nb_extracted] = array(); + if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1) + { + // ----- Close the zip file + $this->privCloseFd(); + + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename (index '$i') : '".$v_header_list[$v_nb_extracted]['stored_filename']."'"); + + // ----- Store the index + $v_header_list[$v_nb_extracted]['index'] = $i; + + // ----- Look for the specific extract rules + $v_found = false; + + // ----- Look for extract by name rule + if ( (isset($p_options[PCLZIP_OPT_BY_NAME])) + && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByName'"); + + // ----- Look if the filename is in the list + for ($j=0; ($j strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) + && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The directory is in the file path"); + $v_found = true; + } + elseif ( (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */ + && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The entry is the searched directory"); + $v_found = true; + } + } + // ----- Look for a filename + elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The file is the right one."); + $v_found = true; + } + } + } + + // ----- Look for extract by ereg rule + else if ( (isset($p_options[PCLZIP_OPT_BY_EREG])) + && ($p_options[PCLZIP_OPT_BY_EREG] != "")) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract by ereg '".$p_options[PCLZIP_OPT_BY_EREG]."'"); + + if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression"); + $v_found = true; + } + } + + // ----- Look for extract by preg rule + else if ( (isset($p_options[PCLZIP_OPT_BY_PREG])) + && ($p_options[PCLZIP_OPT_BY_PREG] != "")) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByEreg'"); + + if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression"); + $v_found = true; + } + } + + // ----- Look for extract by index rule + else if ( (isset($p_options[PCLZIP_OPT_BY_INDEX])) + && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByIndex'"); + + // ----- Look if the index is in the list + for ($j=$j_start; ($j=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Found as part of an index range"); + $v_found = true; + } + if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Do not look this index range for next loop"); + $j_start = $j+1; + } + + if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Index range is greater than index, stop loop"); + break; + } + } + } + + // ----- Look for deletion + if ($v_found) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File '".$v_header_list[$v_nb_extracted]['stored_filename']."', index '$i' need to be deleted"); + unset($v_header_list[$v_nb_extracted]); + } + else + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File '".$v_header_list[$v_nb_extracted]['stored_filename']."', index '$i' will not be deleted"); + $v_nb_extracted++; + } + } + + // ----- Look if something need to be deleted + if ($v_nb_extracted > 0) { + + // ----- Creates a temporay file + $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp'; + + // ----- Creates a temporary zip archive + $v_temp_zip = new PclZip($v_zip_temp_name); + + // ----- Open the temporary zip file in write mode + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary write mode"); + if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) { + $this->privCloseFd(); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Look which file need to be kept + for ($i=0; $izip_fd)."'"); + @rewind($this->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after rewind : ".ftell($this->zip_fd)."'"); + if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) { + // ----- Close the zip file + $this->privCloseFd(); + $v_temp_zip->privCloseFd(); + @unlink($v_zip_temp_name); + + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after fseek : ".ftell($this->zip_fd)."'"); + + // ----- Read the file header + if (($v_result = $this->privReadFileHeader($v_header_list[$i])) != 1) { + // ----- Close the zip file + $this->privCloseFd(); + $v_temp_zip->privCloseFd(); + @unlink($v_zip_temp_name); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Write the file header + if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) { + // ----- Close the zip file + $this->privCloseFd(); + $v_temp_zip->privCloseFd(); + @unlink($v_zip_temp_name); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Offset for this file is '".$v_header_list[$i]['offset']."'"); + + // ----- Read/write the data block + if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) { + // ----- Close the zip file + $this->privCloseFd(); + $v_temp_zip->privCloseFd(); + @unlink($v_zip_temp_name); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + } + + // ----- Store the offset of the central dir + $v_offset = @ftell($v_temp_zip->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "New offset of central dir : $v_offset"); + + // ----- Re-Create the Central Dir files header + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Creates the new central directory"); + for ($i=0; $iprivWriteCentralFileHeader($v_header_list[$i])) != 1) { + $v_temp_zip->privCloseFd(); + $this->privCloseFd(); + @unlink($v_zip_temp_name); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Transform the header to a 'usable' info + $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]); + } + + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Creates the central directory footer"); + + // ----- Zip file comment + $v_comment = ''; + if (isset($p_options[PCLZIP_OPT_COMMENT])) { + $v_comment = $p_options[PCLZIP_OPT_COMMENT]; + } + + // ----- Calculate the size of the central header + $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset; + + // ----- Create the central dir footer + if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) { + // ----- Reset the file list + unset($v_header_list); + $v_temp_zip->privCloseFd(); + $this->privCloseFd(); + @unlink($v_zip_temp_name); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Close + $v_temp_zip->privCloseFd(); + $this->privCloseFd(); + + // ----- Delete the zip file + // TBC : I should test the result ... + @unlink($this->zipname); + + // ----- Rename the temporary file + // TBC : I should test the result ... + //@rename($v_zip_temp_name, $this->zipname); + PclZipUtilRename($v_zip_temp_name, $this->zipname); + + // ----- Destroy the temporary archive + unset($v_temp_zip); + } + + // ----- Remove every files : reset the file + else if ($v_central_dir['entries'] != 0) { + $this->privCloseFd(); + + if (($v_result = $this->privOpenFd('wb')) != 1) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + $this->privCloseFd(); + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privDirCheck() + // Description : + // Check if a directory exists, if not it creates it and all the parents directory + // which may be useful. + // Parameters : + // $p_dir : Directory path to check. + // Return Values : + // 1 : OK + // -1 : Unable to create directory + // -------------------------------------------------------------------------------- + function privDirCheck($p_dir, $p_is_dir=false) + { + $v_result = 1; + + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privDirCheck", "entry='$p_dir', is_dir='".($p_is_dir?"true":"false")."'"); + + // ----- Remove the final '/' + if (($p_is_dir) && (substr($p_dir, -1)=='/')) + { + $p_dir = substr($p_dir, 0, strlen($p_dir)-1); + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Looking for entry '$p_dir'"); + + // ----- Check the directory availability + if ((is_dir($p_dir)) || ($p_dir == "")) + { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, "'$p_dir' is a directory"); + return 1; + } + + // ----- Extract parent directory + $p_parent_dir = dirname($p_dir); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Parent directory is '$p_parent_dir'"); + + // ----- Just a check + if ($p_parent_dir != $p_dir) + { + // ----- Look for parent directory + if ($p_parent_dir != "") + { + if (($v_result = $this->privDirCheck($p_parent_dir)) != 1) + { + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + } + } + + // ----- Create the directory + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Create directory '$p_dir'"); + if (!@mkdir($p_dir, 0777)) + { + // ----- Error log + PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'"); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result, "Directory '$p_dir' created"); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privMerge() + // Description : + // If $p_archive_to_add does not exist, the function exit with a success result. + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privMerge(&$p_archive_to_add) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privMerge", "archive='".$p_archive_to_add->zipname."'"); + $v_result=1; + + // ----- Look if the archive_to_add exists + if (!is_file($p_archive_to_add->zipname)) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Archive to add does not exist. End of merge."); + + // ----- Nothing to merge, so merge is a success + $v_result = 1; + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Look if the archive exists + if (!is_file($this->zipname)) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Archive does not exist, duplicate the archive_to_add."); + + // ----- Do a duplicate + $v_result = $this->privDuplicate($p_archive_to_add->zipname); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Open the zip file + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode"); + if (($v_result=$this->privOpenFd('rb')) != 1) + { + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Read the central directory informations + $v_central_dir = array(); + if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) + { + $this->privCloseFd(); + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Go to beginning of File + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in zip : ".ftell($this->zip_fd)."'"); + @rewind($this->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in zip : ".ftell($this->zip_fd)."'"); + + // ----- Open the archive_to_add file + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open archive_to_add in binary read mode"); + if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1) + { + $this->privCloseFd(); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Read the central directory informations + $v_central_dir_to_add = array(); + if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1) + { + $this->privCloseFd(); + $p_archive_to_add->privCloseFd(); + + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Go to beginning of File + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in archive_to_add : ".ftell($p_archive_to_add->zip_fd)."'"); + @rewind($p_archive_to_add->zip_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in archive_to_add : ".ftell($p_archive_to_add->zip_fd)."'"); + + // ----- Creates a temporay file + $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp'; + + // ----- Open the temporary file in write mode + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode"); + if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) + { + $this->privCloseFd(); + $p_archive_to_add->privCloseFd(); + + PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Copy the files from the archive to the temporary file + // TBC : Here I should better append the file and go back to erase the central dir + $v_size = $v_central_dir['offset']; + while ($v_size != 0) + { + $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes"); + $v_buffer = fread($this->zip_fd, $v_read_size); + @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size); + $v_size -= $v_read_size; + } + + // ----- Copy the files from the archive_to_add into the temporary file + $v_size = $v_central_dir_to_add['offset']; + while ($v_size != 0) + { + $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes"); + $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size); + @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size); + $v_size -= $v_read_size; + } + + // ----- Store the offset of the central dir + $v_offset = @ftell($v_zip_temp_fd); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "New offset of central dir : $v_offset"); + + // ----- Copy the block of file headers from the old archive + $v_size = $v_central_dir['size']; + while ($v_size != 0) + { + $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes"); + $v_buffer = @fread($this->zip_fd, $v_read_size); + @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size); + $v_size -= $v_read_size; + } + + // ----- Copy the block of file headers from the archive_to_add + $v_size = $v_central_dir_to_add['size']; + while ($v_size != 0) + { + $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes"); + $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size); + @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size); + $v_size -= $v_read_size; + } + + // ----- Merge the file comments + $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment']; + + // ----- Calculate the size of the (new) central header + $v_size = @ftell($v_zip_temp_fd)-$v_offset; + + // ----- Swap the file descriptor + // Here is a trick : I swap the temporary fd with the zip fd, in order to use + // the following methods on the temporary fil and not the real archive fd + $v_swap = $this->zip_fd; + $this->zip_fd = $v_zip_temp_fd; + $v_zip_temp_fd = $v_swap; + + // ----- Create the central dir footer + if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1) + { + $this->privCloseFd(); + $p_archive_to_add->privCloseFd(); + @fclose($v_zip_temp_fd); + $this->zip_fd = null; + + // ----- Reset the file list + unset($v_header_list); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Swap back the file descriptor + $v_swap = $this->zip_fd; + $this->zip_fd = $v_zip_temp_fd; + $v_zip_temp_fd = $v_swap; + + // ----- Close + $this->privCloseFd(); + $p_archive_to_add->privCloseFd(); + + // ----- Close the temporary file + @fclose($v_zip_temp_fd); + + // ----- Delete the zip file + // TBC : I should test the result ... + @unlink($this->zipname); + + // ----- Rename the temporary file + // TBC : I should test the result ... + //@rename($v_zip_temp_name, $this->zipname); + PclZipUtilRename($v_zip_temp_name, $this->zipname); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privDuplicate() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function privDuplicate($p_archive_filename) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privDuplicate", "archive_filename='$p_archive_filename'"); + $v_result=1; + + // ----- Look if the $p_archive_filename exists + if (!is_file($p_archive_filename)) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Archive to duplicate does not exist. End of duplicate."); + + // ----- Nothing to duplicate, so duplicate is a success. + $v_result = 1; + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Open the zip file + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode"); + if (($v_result=$this->privOpenFd('wb')) != 1) + { + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + + // ----- Open the temporary file in write mode + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode"); + if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) + { + $this->privCloseFd(); + + PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode'); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo()); + return PclZip::errorCode(); + } + + // ----- Copy the files from the archive to the temporary file + // TBC : Here I should better append the file and go back to erase the central dir + $v_size = filesize($p_archive_filename); + while ($v_size != 0) + { + $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Read $v_read_size bytes"); + $v_buffer = fread($v_zip_temp_fd, $v_read_size); + @fwrite($this->zip_fd, $v_buffer, $v_read_size); + $v_size -= $v_read_size; + } + + // ----- Close + $this->privCloseFd(); + + // ----- Close the temporary file + @fclose($v_zip_temp_fd); + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privErrorLog() + // Description : + // Parameters : + // -------------------------------------------------------------------------------- + function privErrorLog($p_error_code=0, $p_error_string='') + { + if (PCLZIP_ERROR_EXTERNAL == 1) { + PclError($p_error_code, $p_error_string); + } + else { + $this->error_code = $p_error_code; + $this->error_string = $p_error_string; + } + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : privErrorReset() + // Description : + // Parameters : + // -------------------------------------------------------------------------------- + function privErrorReset() + { + if (PCLZIP_ERROR_EXTERNAL == 1) { + PclErrorReset(); + } + else { + $this->error_code = 1; + $this->error_string = ''; + } + } + // -------------------------------------------------------------------------------- + + } + // End of class + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : PclZipUtilPathReduction() + // Description : + // Parameters : + // Return Values : + // -------------------------------------------------------------------------------- + function PclZipUtilPathReduction($p_dir) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilPathReduction", "dir='$p_dir'"); + $v_result = ""; + + // ----- Look for not empty path + if ($p_dir != "") + { + // ----- Explode path by directory names + $v_list = explode("/", $p_dir); + + // ----- Study directories from last to first + for ($i=sizeof($v_list)-1; $i>=0; $i--) + { + // ----- Look for current path + if ($v_list[$i] == ".") + { + // ----- Ignore this directory + // Should be the first $i=0, but no check is done + } + else if ($v_list[$i] == "..") + { + // ----- Ignore it and ignore the $i-1 + $i--; + } + else if (($v_list[$i] == "") && ($i!=(sizeof($v_list)-1)) && ($i!=0)) + { + // ----- Ignore only the double '//' in path, + // but not the first and last '/' + } + else + { + $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:""); + } + } + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : PclZipUtilPathInclusion() + // Description : + // This function indicates if the path $p_path is under the $p_dir tree. Or, + // said in an other way, if the file or sub-dir $p_path is inside the dir + // $p_dir. + // The function indicates also if the path is exactly the same as the dir. + // This function supports path with duplicated '/' like '//', but does not + // support '.' or '..' statements. + // Parameters : + // Return Values : + // 0 if $p_path is not inside directory $p_dir + // 1 if $p_path is inside directory $p_dir + // 2 if $p_path is exactly the same as $p_dir + // -------------------------------------------------------------------------------- + function PclZipUtilPathInclusion($p_dir, $p_path) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilPathInclusion", "dir='$p_dir', path='$p_path'"); + $v_result = 1; + + // ----- Explode dir and path by directory separator + $v_list_dir = explode("/", $p_dir); + $v_list_dir_size = sizeof($v_list_dir); + $v_list_path = explode("/", $p_path); + $v_list_path_size = sizeof($v_list_path); + + // ----- Study directories paths + $i = 0; + $j = 0; + while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Working on dir($i)='".$v_list_dir[$i]."' and path($j)='".$v_list_path[$j]."'"); + + // ----- Look for empty dir (path reduction) + if ($v_list_dir[$i] == '') { + $i++; + continue; + } + if ($v_list_path[$j] == '') { + $j++; + continue; + } + + // ----- Compare the items + if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != '')) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Items ($i,$j) are different"); + $v_result = 0; + } + + // ----- Next items + $i++; + $j++; + } + + // ----- Look if everything seems to be the same + if ($v_result) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Look for tie break"); + // ----- Skip all the empty items + while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++; + while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++; + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Looking on dir($i)='".($i < $v_list_dir_size?$v_list_dir[$i]:'')."' and path($j)='".($j < $v_list_path_size?$v_list_path[$j]:'')."'"); + + if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) { + // ----- There are exactly the same + $v_result = 2; + } + else if ($i < $v_list_dir_size) { + // ----- The path is shorter than the dir + $v_result = 0; + } + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : PclZipUtilCopyBlock() + // Description : + // Parameters : + // $p_mode : read/write compression mode + // 0 : src & dest normal + // 1 : src gzip, dest normal + // 2 : src normal, dest gzip + // 3 : src & dest gzip + // Return Values : + // -------------------------------------------------------------------------------- + function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilCopyBlock", "size=$p_size, mode=$p_mode"); + $v_result = 1; + + if ($p_mode==0) + { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Src offset before read :".(@ftell($p_src))); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Dest offset before write :".(@ftell($p_dest))); + while ($p_size != 0) + { + $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes"); + $v_buffer = @fread($p_src, $v_read_size); + @fwrite($p_dest, $v_buffer, $v_read_size); + $p_size -= $v_read_size; + } + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Src offset after read :".(@ftell($p_src))); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Dest offset after write :".(@ftell($p_dest))); + } + else if ($p_mode==1) + { + while ($p_size != 0) + { + $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes"); + $v_buffer = @gzread($p_src, $v_read_size); + @fwrite($p_dest, $v_buffer, $v_read_size); + $p_size -= $v_read_size; + } + } + else if ($p_mode==2) + { + while ($p_size != 0) + { + $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes"); + $v_buffer = @fread($p_src, $v_read_size); + @gzwrite($p_dest, $v_buffer, $v_read_size); + $p_size -= $v_read_size; + } + } + else if ($p_mode==3) + { + while ($p_size != 0) + { + $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE); + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes"); + $v_buffer = @gzread($p_src, $v_read_size); + @gzwrite($p_dest, $v_buffer, $v_read_size); + $p_size -= $v_read_size; + } + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : PclZipUtilRename() + // Description : + // This function tries to do a simple rename() function. If it fails, it + // tries to copy the $p_src file in a new $p_dest file and then unlink the + // first one. + // Parameters : + // $p_src : Old filename + // $p_dest : New filename + // Return Values : + // 1 on success, 0 on failure. + // -------------------------------------------------------------------------------- + function PclZipUtilRename($p_src, $p_dest) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilRename", "source=$p_src, destination=$p_dest"); + $v_result = 1; + + // ----- Try to rename the files + if (!@rename($p_src, $p_dest)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Fail to rename file, try copy+unlink"); + + // ----- Try to copy & unlink the src + if (!@copy($p_src, $p_dest)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Fail to copy file"); + $v_result = 0; + } + else if (!@unlink($p_src)) { + //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Fail to unlink old filename"); + $v_result = 0; + } + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : PclZipUtilOptionText() + // Description : + // Translate option value in text. Mainly for debug purpose. + // Parameters : + // $p_option : the option value. + // Return Values : + // The option text value. + // -------------------------------------------------------------------------------- + function PclZipUtilOptionText($p_option) + { + //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilOptionText", "option='".$p_option."'"); + + switch ($p_option) { + case PCLZIP_OPT_PATH : + $v_result = 'PCLZIP_OPT_PATH'; + break; + case PCLZIP_OPT_ADD_PATH : + $v_result = 'PCLZIP_OPT_ADD_PATH'; + break; + case PCLZIP_OPT_REMOVE_PATH : + $v_result = 'PCLZIP_OPT_REMOVE_PATH'; + break; + case PCLZIP_OPT_REMOVE_ALL_PATH : + $v_result = 'PCLZIP_OPT_REMOVE_ALL_PATH'; + break; + case PCLZIP_OPT_EXTRACT_AS_STRING : + $v_result = 'PCLZIP_OPT_EXTRACT_AS_STRING'; + break; + case PCLZIP_OPT_SET_CHMOD : + $v_result = 'PCLZIP_OPT_SET_CHMOD'; + break; + case PCLZIP_OPT_BY_NAME : + $v_result = 'PCLZIP_OPT_BY_NAME'; + break; + case PCLZIP_OPT_BY_INDEX : + $v_result = 'PCLZIP_OPT_BY_INDEX'; + break; + case PCLZIP_OPT_BY_EREG : + $v_result = 'PCLZIP_OPT_BY_EREG'; + break; + case PCLZIP_OPT_BY_PREG : + $v_result = 'PCLZIP_OPT_BY_PREG'; + break; + + + case PCLZIP_CB_PRE_EXTRACT : + $v_result = 'PCLZIP_CB_PRE_EXTRACT'; + break; + case PCLZIP_CB_POST_EXTRACT : + $v_result = 'PCLZIP_CB_POST_EXTRACT'; + break; + case PCLZIP_CB_PRE_ADD : + $v_result = 'PCLZIP_CB_PRE_ADD'; + break; + case PCLZIP_CB_POST_ADD : + $v_result = 'PCLZIP_CB_POST_ADD'; + break; + + default : + $v_result = 'Unknown'; + } + + // ----- Return + //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result); + return $v_result; + } + // -------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------- + // Function : PclZipUtilTranslateWinPath() + // Description : + // Translate windows path by replacing '\' by '/' and optionally removing + // drive letter. + // Parameters : + // $p_path : path to translate. + // $p_remove_disk_letter : true | false + // Return Values : + // The path translated. + // -------------------------------------------------------------------------------- + function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true) + { + if (stristr(php_uname(), 'windows')) { + // ----- Look for potential disk letter + if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) { + $p_path = substr($p_path, $v_position+1); + } + // ----- Change potential windows directory separator + if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) { + $p_path = strtr($p_path, '\\', '/'); + } + } + return $p_path; + } + // -------------------------------------------------------------------------------- + +?> Property changes on: tags/2.6.0/wb/include/pclzip/pclzip.lib.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: tags/2.6.0/wb/include/phplib/template.inc =================================================================== --- tags/2.6.0/wb/include/phplib/template.inc (nonexistent) +++ tags/2.6.0/wb/include/phplib/template.inc (revision 260) @@ -0,0 +1,965 @@ +: + * (credits given to first person to post a diff to phplib mailing list) + * + * Normalised all comments and whitespace (rha) + * replaced "$handle" with "$varname" and "$h" with "$v" throughout (from phplib-devel) + * added braces around all one-line if statements in: get_undefined, loadfile and halt (rha) + * set_var was missing two sets of braces (rha) + * added a couple of "return true" statements (rha) + * set_unknowns had "keep" as default instead of "remove" (from phplib-devel) + * set_file failed to check for empty strings if passed an array of filenames (phplib-devel) + * remove @ from call to preg_replace in subst -- report errors if there are any (NickM) + * set_block unnecessarily required a newline in the template file (Marc Tardif) + * pparse now calls this->finish to replace undefined vars (Layne Weathers) + * get_var now checks for unset varnames (NickM & rha) + * get_var when passed an array used the array key instead of the value (rha) + * get_vars now uses a call to get_var rather than this->varvals to prevent undefined var warning (rha) + * in finish, the replacement string referenced an unset variable (rha) + * loadfile would try to load a file if the varval had been set to "" (rha) + * in get_undefined, only match non-whitespace in variable tags as in finish (Layne Weathers & rha) + * more elegant fix to the problem of subst stripping '$n', '\n' and '\\' strings (rha) + * + * + * Changes in functionality which go beyond bug fixes: + * + * changed debug handling so set, get and internals can be tracked separately (rha) + * added debug statements throughout to track most function calls (rha) + * debug output contained raw HTML -- is now escaped with htmlentities (rha) + * Alter regex in set_block to remove more whitespace around BEGIN/END tags to improve HTML layout (rha) + * Add "append" option to set_var, works just like append in parse (dale at linuxwebpro.com, rha) + * Altered parse so that append is honored if passed an array (Brian) + * Converted comments and documentation to phpdoc style (rha) + * Added clear_var to set the value of variables to "" (rha) + * Added unset_var to usset variables (rha) + * + */ + +/** + * The template class allows you to keep your HTML code in some external files + * which are completely free of PHP code, but contain replacement fields. + * The class provides you with functions which can fill in the replacement fields + * with arbitrary strings. These strings can become very large, e.g. entire tables. + * + * Note: If you think that this is like FastTemplates, read carefully. It isn't. + * + */ + +class Template +{ + /** + * Serialization helper, the name of this class. + * + * @var string + * @access public + */ + var $classname = "Template"; + + /** + * Determines how much debugging output Template will produce. + * This is a bitwise mask of available debug levels: + * 0 = no debugging + * 1 = debug variable assignments + * 2 = debug calls to get variable + * 4 = debug internals (outputs all function calls with parameters). + * + * Note: setting $this->debug = true will enable debugging of variable + * assignments only which is the same behaviour as versions up to release 7.2d. + * + * @var int + * @access public + */ + var $debug = false; + + /** + * The base directory from which template files are loaded. + * + * @var string + * @access private + * @see set_root + */ + var $root = "."; + + /** + * A hash of strings forming a translation table which translates variable names + * into names of files containing the variable content. + * $file[varname] = "filename"; + * + * @var array + * @access private + * @see set_file + */ + var $file = array(); + + /** + * A hash of strings forming a translation table which translates variable names + * into regular expressions for themselves. + * $varkeys[varname] = "/varname/" + * + * @var array + * @access private + * @see set_var + */ + var $varkeys = array(); + + /** + * A hash of strings forming a translation table which translates variable names + * into values for their respective varkeys. + * $varvals[varname] = "value" + * + * @var array + * @access private + * @see set_var + */ + var $varvals = array(); + + /** + * Determines how to output variable tags with no assigned value in templates. + * + * @var string + * @access private + * @see set_unknowns + */ + var $unknowns = "remove"; + + /** + * Determines how Template handles error conditions. + * "yes" = the error is reported, then execution is halted + * "report" = the error is reported, then execution continues by returning "false" + * "no" = errors are silently ignored, and execution resumes reporting "false" + * + * @var string + * @access public + * @see halt + */ + var $halt_on_error = "yes"; + + /** + * The last error message is retained in this variable. + * + * @var string + * @access public + * @see halt + */ + var $last_error = ""; + + /****************************************************************************** + * Class constructor. May be called with two optional parameters. + * The first parameter sets the template directory the second parameter + * sets the policy regarding handling of unknown variables. + * + * usage: Template([string $root = "."], [string $unknowns = "remove"]) + * + * @param $root path to template directory + * @param $string what to do with undefined variables + * @see set_root + * @see set_unknowns + * @access public + * @return void + */ + function Template($root = ".", $unknowns = "remove") { + if ($this->debug & 4) { + echo "

    Template: root = $root, unknowns = $unknowns

    \n"; + } + $this->set_root($root); + $this->set_unknowns($unknowns); + } + + + /****************************************************************************** + * Checks that $root is a valid directory and if so sets this directory as the + * base directory from which templates are loaded by storing the value in + * $this->root. Relative filenames are prepended with the path in $this->root. + * + * Returns true on success, false on error. + * + * usage: set_root(string $root) + * + * @param $root string containing new template directory + * @see root + * @access public + * @return boolean + */ + function set_root($root) { + if ($this->debug & 4) { + echo "

    set_root: root = $root

    \n"; + } + if (!is_dir($root)) { + $this->halt("set_root: $root is not a directory."); + return false; + } + + $this->root = $root; + return true; + } + + + /****************************************************************************** + * Sets the policy for dealing with unresolved variable names. + * + * unknowns defines what to do with undefined template variables + * "remove" = remove undefined variables + * "comment" = replace undefined variables with comments + * "keep" = keep undefined variables + * + * Note: "comment" can cause unexpected results when the variable tag is embedded + * inside an HTML tag, for example a tag which is expected to be replaced with a URL. + * + * usage: set_unknowns(string $unknowns) + * + * @param $unknowns new value for unknowns + * @see unknowns + * @access public + * @return void + */ + function set_unknowns($unknowns = "remove") { + if ($this->debug & 4) { + echo "

    unknowns: unknowns = $unknowns

    \n"; + } + $this->unknowns = $unknowns; + } + + + /****************************************************************************** + * Defines a filename for the initial value of a variable. + * + * It may be passed either a varname and a file name as two strings or + * a hash of strings with the key being the varname and the value + * being the file name. + * + * The new mappings are stored in the array $this->file. + * The files are not loaded yet, but only when needed. + * + * Returns true on success, false on error. + * + * usage: set_file(array $filelist = (string $varname => string $filename)) + * or + * usage: set_file(string $varname, string $filename) + * + * @param $varname either a string containing a varname or a hash of varname/file name pairs. + * @param $filename if varname is a string this is the filename otherwise filename is not required + * @access public + * @return boolean + */ + function set_file($varname, $filename = "") { + if (!is_array($varname)) { + if ($this->debug & 4) { + echo "

    set_file: (with scalar) varname = $varname, filename = $filename

    \n"; + } + if ($filename == "") { + $this->halt("set_file: For varname $varname filename is empty."); + return false; + } + $this->file[$varname] = $this->filename($filename); + } else { + reset($varname); + while(list($v, $f) = each($varname)) { + if ($this->debug & 4) { + echo "

    set_file: (with array) varname = $v, filename = $f

    \n"; + } + if ($f == "") { + $this->halt("set_file: For varname $v filename is empty."); + return false; + } + $this->file[$v] = $this->filename($f); + } + } + return true; + } + + + /****************************************************************************** + * A variable $parent may contain a variable block defined by: + * <!-- BEGIN $varname --> content <!-- END $varname -->. This function removes + * that block from $parent and replaces it with a variable reference named $name. + * The block is inserted into the varkeys and varvals hashes. If $name is + * omitted, it is assumed to be the same as $varname. + * + * Blocks may be nested but care must be taken to extract the blocks in order + * from the innermost block to the outermost block. + * + * Returns true on success, false on error. + * + * usage: set_block(string $parent, string $varname, [string $name = ""]) + * + * @param $parent a string containing the name of the parent variable + * @param $varname a string containing the name of the block to be extracted + * @param $name the name of the variable in which to store the block + * @access public + * @return boolean + */ + function set_block($parent, $varname, $name = "") { + if ($this->debug & 4) { + echo "

    set_block: parent = $parent, varname = $varname, name = $name

    \n"; + } + if (!$this->loadfile($parent)) { + $this->halt("set_block: unable to load $parent."); + return false; + } + if ($name == "") { + $name = $varname; + } + + $str = $this->get_var($parent); + $reg = "/[ \t]*\s*?\n?(\s*.*?\n?)\s*\s*?\n?/sm"; + preg_match_all($reg, $str, $m); + $str = preg_replace($reg, "{" . "$name}", $str); + $this->set_var($varname, $m[1][0]); + $this->set_var($parent, $str); + return true; + } + + + /****************************************************************************** + * This functions sets the value of a variable. + * + * It may be called with either a varname and a value as two strings or an + * an associative array with the key being the varname and the value being + * the new variable value. + * + * The function inserts the new value of the variable into the $varkeys and + * $varvals hashes. It is not necessary for a variable to exist in these hashes + * before calling this function. + * + * An optional third parameter allows the value for each varname to be appended + * to the existing variable instead of replacing it. The default is to replace. + * This feature was introduced after the 7.2d release. + * + * + * usage: set_var(string $varname, [string $value = ""], [boolean $append = false]) + * or + * usage: set_var(array $varname = (string $varname => string $value), [mixed $dummy_var], [boolean $append = false]) + * + * @param $varname either a string containing a varname or a hash of varname/value pairs. + * @param $value if $varname is a string this contains the new value for the variable otherwise this parameter is ignored + * @param $append if true, the value is appended to the variable's existing value + * @access public + * @return void + */ + function set_var($varname, $value = "", $append = false) { + if (!is_array($varname)) { + if (!empty($varname)) { + if ($this->debug & 1) { + printf("set_var: (with scalar) %s = '%s'
    \n", $varname, htmlentities($value)); + } + $this->varkeys[$varname] = "/".$this->varname($varname)."/"; + if ($append && isset($this->varvals[$varname])) { + $this->varvals[$varname] .= $value; + } else { + $this->varvals[$varname] = $value; + } + } + } else { + reset($varname); + while(list($k, $v) = each($varname)) { + if (!empty($k)) { + if ($this->debug & 1) { + printf("set_var: (with array) %s = '%s'
    \n", $k, htmlentities($v)); + } + $this->varkeys[$k] = "/".$this->varname($k)."/"; + if ($append && isset($this->varvals[$k])) { + $this->varvals[$k] .= $v; + } else { + $this->varvals[$k] = $v; + } + } + } + } + } + + + /****************************************************************************** + * This functions clears the value of a variable. + * + * It may be called with either a varname as a string or an array with the + * values being the varnames to be cleared. + * + * The function sets the value of the variable in the $varkeys and $varvals + * hashes to "". It is not necessary for a variable to exist in these hashes + * before calling this function. + * + * + * usage: clear_var(string $varname) + * or + * usage: clear_var(array $varname = (string $varname)) + * + * @param $varname either a string containing a varname or an array of varnames. + * @access public + * @return void + */ + function clear_var($varname) { + if (!is_array($varname)) { + if (!empty($varname)) { + if ($this->debug & 1) { + printf("clear_var: (with scalar) %s
    \n", $varname); + } + $this->set_var($varname, ""); + } + } else { + reset($varname); + while(list($k, $v) = each($varname)) { + if (!empty($v)) { + if ($this->debug & 1) { + printf("clear_var: (with array) %s
    \n", $v); + } + $this->set_var($v, ""); + } + } + } + } + + + /****************************************************************************** + * This functions unsets a variable completely. + * + * It may be called with either a varname as a string or an array with the + * values being the varnames to be cleared. + * + * The function removes the variable from the $varkeys and $varvals hashes. + * It is not necessary for a variable to exist in these hashes before calling + * this function. + * + * + * usage: unset_var(string $varname) + * or + * usage: unset_var(array $varname = (string $varname)) + * + * @param $varname either a string containing a varname or an array of varnames. + * @access public + * @return void + */ + function unset_var($varname) { + if (!is_array($varname)) { + if (!empty($varname)) { + if ($this->debug & 1) { + printf("unset_var: (with scalar) %s
    \n", $varname); + } + unset($this->varkeys[$varname]); + unset($this->varvals[$varname]); + } + } else { + reset($varname); + while(list($k, $v) = each($varname)) { + if (!empty($v)) { + if ($this->debug & 1) { + printf("unset_var: (with array) %s
    \n", $v); + } + unset($this->varkeys[$v]); + unset($this->varvals[$v]); + } + } + } + } + + + /****************************************************************************** + * This function fills in all the variables contained within the variable named + * $varname. The resulting value is returned as the function result and the + * original value of the variable varname is not changed. The resulting string + * is not "finished", that is, the unresolved variable name policy has not been + * applied yet. + * + * Returns: the value of the variable $varname with all variables substituted. + * + * usage: subst(string $varname) + * + * @param $varname the name of the variable within which variables are to be substituted + * @access public + * @return string + */ + function subst($varname) { + $varvals_quoted = array(); + if ($this->debug & 4) { + echo "

    subst: varname = $varname

    \n"; + } + if (!$this->loadfile($varname)) { + $this->halt("subst: unable to load $varname."); + return false; + } + + // quote the replacement strings to prevent bogus stripping of special chars + reset($this->varvals); + while(list($k, $v) = each($this->varvals)) { + $varvals_quoted[$k] = preg_replace(array('/\\\\/', '/\$/'), array('\\\\\\\\', '\\\\$'), $v); + } + + $str = $this->get_var($varname); + $str = preg_replace($this->varkeys, $varvals_quoted, $str); + return $str; + } + + + /****************************************************************************** + * This is shorthand for print $this->subst($varname). See subst for further + * details. + * + * Returns: always returns false. + * + * usage: psubst(string $varname) + * + * @param $varname the name of the variable within which variables are to be substituted + * @access public + * @return false + * @see subst + */ + function psubst($varname) { + if ($this->debug & 4) { + echo "

    psubst: varname = $varname

    \n"; + } + print $this->subst($varname); + + return false; + } + + + /****************************************************************************** + * The function substitutes the values of all defined variables in the variable + * named $varname and stores or appends the result in the variable named $target. + * + * It may be called with either a target and a varname as two strings or a + * target as a string and an array of variable names in varname. + * + * The function inserts the new value of the variable into the $varkeys and + * $varvals hashes. It is not necessary for a variable to exist in these hashes + * before calling this function. + * + * An optional third parameter allows the value for each varname to be appended + * to the existing target variable instead of replacing it. The default is to + * replace. + * + * If $target and $varname are both strings, the substituted value of the + * variable $varname is inserted into or appended to $target. + * + * If $handle is an array of variable names the variables named by $handle are + * sequentially substituted and the result of each substitution step is + * inserted into or appended to in $target. The resulting substitution is + * available in the variable named by $target, as is each intermediate step + * for the next $varname in sequence. Note that while it is possible, it + * is only rarely desirable to call this function with an array of varnames + * and with $append = true. This append feature was introduced after the 7.2d + * release. + * + * Returns: the last value assigned to $target. + * + * usage: parse(string $target, string $varname, [boolean $append]) + * or + * usage: parse(string $target, array $varname = (string $varname), [boolean $append]) + * + * @param $target a string containing the name of the variable into which substituted $varnames are to be stored + * @param $varname if a string, the name the name of the variable to substitute or if an array a list of variables to be substituted + * @param $append if true, the substituted variables are appended to $target otherwise the existing value of $target is replaced + * @access public + * @return string + * @see subst + */ + function parse($target, $varname, $append = false) { + if (!is_array($varname)) { + if ($this->debug & 4) { + echo "

    parse: (with scalar) target = $target, varname = $varname, append = $append

    \n"; + } + $str = $this->subst($varname); + if ($append) { + $this->set_var($target, $this->get_var($target) . $str); + } else { + $this->set_var($target, $str); + } + } else { + reset($varname); + while(list($i, $v) = each($varname)) { + if ($this->debug & 4) { + echo "

    parse: (with array) target = $target, i = $i, varname = $v, append = $append

    \n"; + } + $str = $this->subst($v); + if ($append) { + $this->set_var($target, $this->get_var($target) . $str); + } else { + $this->set_var($target, $str); + } + } + } + + if ($this->debug & 4) { + echo "

    parse: completed

    \n"; + } + return $str; + } + + + /****************************************************************************** + * This is shorthand for print $this->parse(...) and is functionally identical. + * See parse for further details. + * + * Returns: always returns false. + * + * usage: pparse(string $target, string $varname, [boolean $append]) + * or + * usage: pparse(string $target, array $varname = (string $varname), [boolean $append]) + * + * @param $target a string containing the name of the variable into which substituted $varnames are to be stored + * @param $varname if a string, the name the name of the variable to substitute or if an array a list of variables to be substituted + * @param $append if true, the substituted variables are appended to $target otherwise the existing value of $target is replaced + * @access public + * @return false + * @see parse + */ + function pparse($target, $varname, $append = false) { + if ($this->debug & 4) { + echo "

    pparse: passing parameters to parse...

    \n"; + } + print $this->finish($this->parse($target, $varname, $append)); + return false; + } + + + /****************************************************************************** + * This function returns an associative array of all defined variables with the + * name as the key and the value of the variable as the value. + * + * This is mostly useful for debugging. Also note that $this->debug can be used + * to echo all variable assignments as they occur and to trace execution. + * + * Returns: a hash of all defined variable values keyed by their names. + * + * usage: get_vars() + * + * @access public + * @return array + * @see $debug + */ + function get_vars() { + if ($this->debug & 4) { + echo "

    get_vars: constructing array of vars...

    \n"; + } + reset($this->varkeys); + while(list($k, $v) = each($this->varkeys)) { + $result[$k] = $this->get_var($k); + } + return $result; + } + + + /****************************************************************************** + * This function returns the value of the variable named by $varname. + * If $varname references a file and that file has not been loaded yet, the + * variable will be reported as empty. + * + * When called with an array of variable names this function will return a a + * hash of variable values keyed by their names. + * + * Returns: a string or an array containing the value of $varname. + * + * usage: get_var(string $varname) + * or + * usage: get_var(array $varname) + * + * @param $varname if a string, the name the name of the variable to get the value of, or if an array a list of variables to return the value of + * @access public + * @return string or array + */ + function get_var($varname) { + if (!is_array($varname)) { + if (isset($this->varvals[$varname])) { + $str = $this->varvals[$varname]; + } else { + $str = ""; + } + if ($this->debug & 2) { + printf ("get_var (with scalar) %s = '%s'
    \n", $varname, htmlentities($str)); + } + return $str; + } else { + reset($varname); + while(list($k, $v) = each($varname)) { + if (isset($this->varvals[$v])) { + $str = $this->varvals[$v]; + } else { + $str = ""; + } + if ($this->debug & 2) { + printf ("get_var: (with array) %s = '%s'
    \n", $v, htmlentities($str)); + } + $result[$v] = $str; + } + return $result; + } + } + + + /****************************************************************************** + * This function returns a hash of unresolved variable names in $varname, keyed + * by their names (that is, the hash has the form $a[$name] = $name). + * + * Returns: a hash of varname/varname pairs or false on error. + * + * usage: get_undefined(string $varname) + * + * @param $varname a string containing the name the name of the variable to scan for unresolved variables + * @access public + * @return array + */ + function get_undefined($varname) { + if ($this->debug & 4) { + echo "

    get_undefined: varname = $varname

    \n"; + } + if (!$this->loadfile($varname)) { + $this->halt("get_undefined: unable to load $varname."); + return false; + } + + preg_match_all("/{([^ \t\r\n}]+)}/", $this->get_var($varname), $m); + $m = $m[1]; + if (!is_array($m)) { + return false; + } + + reset($m); + while(list($k, $v) = each($m)) { + if (!isset($this->varkeys[$v])) { + if ($this->debug & 4) { + echo "

    get_undefined: undefined: $v

    \n"; + } + $result[$v] = $v; + } + } + + if (count($result)) { + return $result; + } else { + return false; + } + } + + + /****************************************************************************** + * This function returns the finished version of $str. That is, the policy + * regarding unresolved variable names will be applied to $str. + * + * Returns: a finished string derived from $str and $this->unknowns. + * + * usage: finish(string $str) + * + * @param $str a string to which to apply the unresolved variable policy + * @access public + * @return string + * @see set_unknowns + */ + function finish($str) { + switch ($this->unknowns) { + case "keep": + break; + + case "remove": + $str = preg_replace('/{[^ \t\r\n}]+}/', "", $str); + break; + + case "comment": + $str = preg_replace('/{([^ \t\r\n}]+)}/', "", $str); + break; + } + + return $str; + } + + + /****************************************************************************** + * This function prints the finished version of the value of the variable named + * by $varname. That is, the policy regarding unresolved variable names will be + * applied to the variable $varname then it will be printed. + * + * usage: p(string $varname) + * + * @param $varname a string containing the name of the variable to finish and print + * @access public + * @return void + * @see set_unknowns + * @see finish + */ + function p($varname) { + print $this->finish($this->get_var($varname)); + } + + + /****************************************************************************** + * This function returns the finished version of the value of the variable named + * by $varname. That is, the policy regarding unresolved variable names will be + * applied to the variable $varname and the result returned. + * + * Returns: a finished string derived from the variable $varname. + * + * usage: get(string $varname) + * + * @param $varname a string containing the name of the variable to finish + * @access public + * @return void + * @see set_unknowns + * @see finish + */ + function get($varname) { + return $this->finish($this->get_var($varname)); + } + + + /****************************************************************************** + * When called with a relative pathname, this function will return the pathname + * with $this->root prepended. Absolute pathnames are returned unchanged. + * + * Returns: a string containing an absolute pathname. + * + * usage: filename(string $filename) + * + * @param $filename a string containing a filename + * @access private + * @return string + * @see set_root + */ + function filename($filename) { + if ($this->debug & 4) { + echo "

    filename: filename = $filename

    \n"; + } + if (substr($filename, 0, 1) != "/") { + $filename = $this->root."/".$filename; + } + + if (!file_exists($filename)) { + $this->halt("filename: file $filename does not exist."); + } + return $filename; + } + + + /****************************************************************************** + * This function will construct a regexp for a given variable name with any + * special chars quoted. + * + * Returns: a string containing an escaped variable name. + * + * usage: varname(string $varname) + * + * @param $varname a string containing a variable name + * @access private + * @return string + */ + function varname($varname) { + return preg_quote("{".$varname."}"); + } + + + /****************************************************************************** + * If a variable's value is undefined and the variable has a filename stored in + * $this->file[$varname] then the backing file will be loaded and the file's + * contents will be assigned as the variable's value. + * + * Note that the behaviour of this function changed slightly after the 7.2d + * release. Where previously a variable was reloaded from file if the value + * was empty, now this is not done. This allows a variable to be loaded then + * set to "", and also prevents attempts to load empty variables. Files are + * now only loaded if $this->varvals[$varname] is unset. + * + * Returns: true on success, false on error. + * + * usage: loadfile(string $varname) + * + * @param $varname a string containing the name of a variable to load + * @access private + * @return boolean + * @see set_file + */ + function loadfile($varname) { + if ($this->debug & 4) { + echo "

    loadfile: varname = $varname

    \n"; + } + + if (!isset($this->file[$varname])) { + // $varname does not reference a file so return + if ($this->debug & 4) { + echo "

    loadfile: varname $varname does not reference a file

    \n"; + } + return true; + } + + if (isset($this->varvals[$varname])) { + // will only be unset if varname was created with set_file and has never been loaded + // $varname has already been loaded so return + if ($this->debug & 4) { + echo "

    loadfile: varname $varname is already loaded

    \n"; + } + return true; + } + $filename = $this->file[$varname]; + + /* use @file here to avoid leaking filesystem information if there is an error */ + $str = implode("", @file($filename)); + if (empty($str)) { + $this->halt("loadfile: While loading $varname, $filename does not exist or is empty."); + return false; + } + + if ($this->debug & 4) { + printf("loadfile: loaded $filename into $varname
    \n"); + } + $this->set_var($varname, $str); + + return true; + } + + + /****************************************************************************** + * This function is called whenever an error occurs and will handle the error + * according to the policy defined in $this->halt_on_error. Additionally the + * error message will be saved in $this->last_error. + * + * Returns: always returns false. + * + * usage: halt(string $msg) + * + * @param $msg a string containing an error message + * @access private + * @return void + * @see $halt_on_error + */ + function halt($msg) { + $this->last_error = $msg; + + if ($this->halt_on_error != "no") { + $this->haltmsg($msg); + } + + if ($this->halt_on_error == "yes") { + die("Halted."); + } + + return false; + } + + + /****************************************************************************** + * This function prints an error message. + * It can be overridden by your subclass of Template. It will be called with an + * error message to display. + * + * usage: haltmsg(string $msg) + * + * @param $msg a string containing the error message to display + * @access public + * @return void + * @see halt + */ + function haltmsg($msg) { + printf("Template Error: %s
    \n", $msg); + } + +} +?> Property changes on: tags/2.6.0/wb/include/phplib/template.inc ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: tags/2.6.0/wb/media/index.php =================================================================== --- tags/2.6.0/wb/media/index.php (nonexistent) +++ tags/2.6.0/wb/media/index.php (revision 260) @@ -0,0 +1,5 @@ + \ No newline at end of file Property changes on: tags/2.6.0/wb/media/index.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: tags/2.6.0/wb/pages/index.php =================================================================== --- tags/2.6.0/wb/pages/index.php (nonexistent) +++ tags/2.6.0/wb/pages/index.php (revision 260) @@ -0,0 +1,5 @@ + \ No newline at end of file Property changes on: tags/2.6.0/wb/pages/index.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: tags/2.6.0/wb/temp/index.php =================================================================== --- tags/2.6.0/wb/temp/index.php (nonexistent) +++ tags/2.6.0/wb/temp/index.php (revision 260) @@ -0,0 +1,28 @@ + + Copyright (C) 2004-2005, 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 + +*/ + +header("Location: ../index.php"); + +?> \ No newline at end of file Property changes on: tags/2.6.0/wb/temp/index.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: tags/2.6.0/CHANGELOG =================================================================== --- tags/2.6.0/CHANGELOG (nonexistent) +++ tags/2.6.0/CHANGELOG (revision 260) @@ -0,0 +1,395 @@ +Change Log +=============================================================================== +Please note: This change log may not be accurate + +$Id$ + +Legend: ++ = Added +- = Removed +# = Bugfix +! = Update/Change + +------------------------------------- 2.6.0 ------------------------------------- +28-Nov-2005 Ryan Djurovich ++ Added default charset option to (advanced) settings +# Form module email fields now have email address validation +# Fixed spacing in form submissions +27-Nov-2005 Ryan Djurovich ++ Added captcha verification to sign-up form ++ Added Captcha to News module +24-Nov-2005 Stefan Braunewell +! Applied aportale's patch to use label instead of javascript toggle code +20-Nov-2005 Ryan Djurovich +! News mod now hides read more link if no need for it (see ticket #56) ++ Added support for mailto: links in the menu link mod +# Added direct-access redirection on some files (see ticket #37) ++ Added extra characters to convert.php (see ticket #64) +# Fixed ticket #65 (last_reset check in account/forgot_form.php) +29-Sep-2005 Ryan Djurovich +! Cleaned up form buttons in Settings +! Moved some options into Advanced Settings +# Semi-disabled "separate" page trash option ++ Created a backup module/tool for backing-up the database + (thanks to John (pcwacht) for the original code) ++ Created new "blank template", which can be used in case where you don't + want anything wrapping page-content. +19-Sep-2005 Ryan Djurovich ++ Added _license field for all add-ons to specify a license +! Renamed _designed_for variables (for all addons) to _platform ++ Created addons table for faster internal referencing of installed addons +! Fixed some links, including the "Help" button in Admin +# Used nl2br to display body correctly when viewing form-submissions +15-Sep-2005 Stefan Braunewell ++ Added table module with columns 'name','type' and 'directory' as an + index. ++ Added entry to settings table 'wb_version' which holds the version + number and can be utilized in future upgrade scripts. +! Added upgrade functionality also for templates and languages. +#/! Template/modules installation now respects paths. +! Moved updates from config.php to database. + Created initialize.php (required by config.php) to read settings. +11-Sep-2005 Stefan Braunewell +! HTMLArea is now a module instead of a core component. Files moved + from "include" to "modules". ++ Implemented Installation of modules on top of an older version. This is + done via checking $module_version. Instead of install.php, upgrade.php + is then called if it exists in the module package. + For module developers: $module_version and $new_module_version are + accessible in upgrade.php to find out what upgrade steps need to be taken. +! Changed column names in mod_news_posts from short,long to content_short, + content_long. +09-Sep-2005 Stefan Braunewell ++ Added new advanced setting "Rename Files On Upload". File extensions can be + given so that respective files will have a ".txt" appended on media upload. +# Fixed "None found" message bug when user has no top level page edit + rights. +# Fixed missing parent option 'none' - ticket #12 - and a minor scope bug. ++ Added breadcrumbs code. Call using $wb->breadcrumbs(). ++ Added utf-8 character encoding meta tag into all stock templates. +# Fixed bug when changing a page's parent +! Changed the way blocks are treated. Added new frontend class attribute + default_block_content that controls what is shown on pages such as + search, login, etc. (Ticket #16) ++ Added support for WYSIWYG editor modules (wysiwygmod) ++ When trying to access a registered page, user is automatically redirected + there on successful login. +# Fixed various issues with system search (mainly related to stripslashes() +# Removed stripslashes() in many places in the code. Added check for + magic_quotes_gpc to new wb class method add_slashes(). Now database contest + is independent of magic_quotes setting.. +05-Sep-2005 Stefan Braunewell +# Fixed bug concerning direct access of preferences page. +# Reworked page visibility and menu item visibility code (frontend login + problem). +# Pages in link list in htmlarea popup are now correctly ordered. +# Fixed bug where group with existing name can be added. +04-Sep-2005 Ryan Djurovich ++ Added and RSS newsfeed script to the News module +04-Sep-2005 Stefan Braunewell +! Rewrote menu function. Parameters are now given as attributes to frontend class. +# Fixed some occurrences of potential direct access path disclosure +# Added directory check to browse.php to prevent xss exploit by trusted users. +! Updated code to reflect move to Subversion repository system. +27-Aug-2005 Stefan Braunewell +# Fixed bugs 4,5,6,8,9 in bug tracker +! Removed 'USER_LANGUAGE' and 'GET_LANGUAGE' constants. + A GET['lang'] now sets the session language variable. +26-Aug-2005 Stefan Braunewell +! Moved redundant code into the new class functions. Created + 'compatibility.php' for backward compatibility with + modules and templates. Variables and functions can still be accessed + in the old way. +!/+ Reorganized core frontend files, added new base class 'wb' from + which 'admin' and the new 'frontend' class inherit. Moved all frontend + function into new class. Completely rewrote core index.php. + Now all variables and functions that are available to templates and + modules are attributes and methods of the frontend and the wb classes +------------------------------------- 2.5.2 ------------------------------------- +23-Jun-2005 Ryan Djurovich +! create_access_file now creates all parent directories if needed +# Fixed bug when moving page with subpages to another level +# Fixed bug when saving "Settings" (in Admin) on Windows/IIS +# Fixed bug where query was not setting error correctly in class.database.php +22-Jun-2005 Ryan Djurovich +# Fixed bug where template permissions were not saved when a adding group +21-Jun-2005 Ryan Djurovich +# Added htmlspecialchars for modifying WYSIWYG, news, etc. modules (Bug #78) +# Fixed language problems in some area's of Admin. (Bug #70) +# Added a space in website/page keywords (Bug #69) +# Fixed bugs on settings2.php (Bug #52) +! Links inserted with HTMLArea now use [wblink--PAGE_ID--] instead of raw URL +13-Jun-2005 Ryan Djurovich +# Fixed bug (#88) with news module +! Title of Administration login page now taken from language file (Bug #72) +# Fixed redirection admin/home to admin/start on admin/index.php +# Fixed bug with forgotten password page in admin (Bug #81) +25-Apr-2005 Ryan Djurovich +# Fixed numerous bugs with module uninstallation +# Fixed bug when uploading files in Administration -> Media +! Installer no-longer requires you to accept the GNU GPL +------------------------------------- 2.5.1 ------------------------------------- +16-Apr-2005 Ryan Djurovich +# Fixed two bugs with account login/logout +------------------------------------- 2.5.1 ------------------------------------- +15-Apr-2005 Ryan Djurovich +# Fixed bug where non-english characters can get used in page filenames. Many + measuers have been added (including a new file: wb/framework/convert.php), + to prevent any possible errors that can occur in page filenames. +# Fixed invalid meta tags in stock templates (meta tags were not closed) +# Removed lines 401, 402, and 425 of wb/index.php - not needed +# Fixed bug where search and account pages are shown in every block + that is in a template +# Fixed numerous bugs with media home directories feature +10-Apr-2005 Ryan Djurovich +# Fixed bugs in account/login.php and logout.php where users + gets redirected to /pages +------------------------------------- 2.5.0 ------------------------------------- +08-Apr-2005 Ryan Djurovich +- Removed section language feature ++ Added page language feature (replaces need for sections language feature) +# Fixed bug where pages using menu_link module can have the URL changed +- Page directory no longer stored in link field in pages table, it is now added + when the page_link function is called - this makes changing the pages + directory much easier and quicker +! Pages with visibility of "none" are now no longer directly accessable ++ Added new visibility setting "hidden", acts exactly like none did previously +! Template info file can now specify number of menu's available and relative names +! Template info file can now specify number of blocks's available and relative names +------------------------------------- 2.4.3 ------------------------------------- +07-Apr-2005 Ryan Djurovich +# page_filename function has been rewritten using str_replace + function, which should be faster and will allow characters + from other languages into filenames +! Created new media_filename function, which is now used + by all media functions (create,upload,rename) to determine + which characters should be removed from a desired filename ++ New button in Administration page list to view specific page +# Updated the page_link function to now be compatible with menu link + module when setting pages directory to root +# Fixed bugs in search when using "Any Words" option +# Fixed bug with news module when pages directory set to root +! Changed URL of documentation website on Administration Start page +------------------------------------- 2.4.2 ------------------------------------- +05-Apr-2005 Ryan Djurovich +# Fixed bug where file could be renamed to nothing in Media +! Optimised Media create folder, upload file, and rename functions +# Fixed bug where stripslashes not run on news post titles in admin +05-Apr-2005 Stefan Braunewell +# Fixed bug concerning usage of the private_sql variable +# Fixed bug conerning sub-pages being displayed in menus incorrectly +------------------------------------- 2.4.1 ------------------------------------- +04-Apr-2005 Ryan Djurovich +! Pages with visibility of "none" are again directly accessable +# Fixed bugs regarding renaming files and directories in Media section +! When home folders disabled, all folders now visible in Media section +------------------------------------- 2.4.0 ------------------------------------- +03-Apr-2005 Ryan Djurovich +- Removed recently added visibility setting of "heading", and relative config vars ++ Added new "menu" field to pages table, and new setting "multiple menus" + which replaces the need for the menu headings feature ++ Added links to top of groups and users sections, linking to each other +! Change menu width in "Round" template to 170px (was 150px) +# Change page "are you sure" deletion message to mention that it will delete + all sub-pages as well +# Fixed many bugs with news module when viewing posts by group +! Pages with visibility of "none" are now no longer directly accessable +02-Apr-2005 Ryan Djurovich +- Removed need to specify DB_URL when calling database class +# Stopped fields without a type specified from being shown in form mod +# Changed '/media' to MEDIA_DIRECTORY on HTMLArea popup windows + for insert link and insert image ++ Added setting which allows you to specify the default WYSIWYG style ++ Added "Server Email" option, to specify what is used in "From" field when + sending emails using the PHP mail function. Default is admins email address. +# Search now excludes pages which have a visibility of none or heading +! Pages are now given modified_when and modified_by when added +01-Apr-2005 Ryan Djurovich ++ Added option to News module to specify how many posts should be listed + per page (by default it is set to unlimited, which functions like previous version) +# Added stripslashes when display page titles in search ++ Page descriptions and last updated date now shown in search by default +30-Mar-2005 Ryan Djurovich ++ Added new feature for Media home folders, where a folder can be specified + for a specific user or group of users only +! Changed URL of Help button to http://www.websitebaker.org/docs/ ++ Added new feature for "Page Trash" - two modes available: inline and separate +! When pages are deleted, all sub-pages are now deleted (instead of being moved + up a level) +29-Mar-2005 Ryan Djurovich +- Removed Database Settings from Administration Settings (options will not be + available in 3.x, so trying to match interface with WB 3.x plans +! Changed the name of Path Settings to Filesystem Settings in Administration + Settings, and removed ability to change path/url options - matching interface + plans for WB 3.x ++ Added same options for OS and file permissions as installer to Settings +! Sessions now named with APP_NAME.'_session_id' (e.g. default is wb_session_id) +28-Mar-2005 Ryan Djurovich ++ New functions available to templates to simplify creation of them. This aims + to "future-proof" templates for WB 3.x plans. +! Default templates updated to support some of the new functions ++ Added field to pages table "page_trail" which stores a list of the pages + parents. This field was needed by the new page_menu function ++ Added option for page visibility "heading" to enabled support for multiple + menu's. Also, this helps to "future-proof" templates for WB 3.x plans ++ Added option for page visibility "registered", which acts a little like + private, but is still shown in the menu (although users need to log in to view + the pages content) ++ Form module submissions now saved to database, and feature now added to + limit number of submissions per hour to prevent spamming ++ New field for Form module: email. Allows you to specify their email in + "from" field on module settings. +# Fixed bug when displaying comments in News module (WB Bug #14) ++ New "under contruction" message if no pages exist +! Cleaned-up wb/index.php +27-Mar-2005 Ryan Djurovich ++ Created advanced mkdir and chmod functions +# Fixed bug in media where wrong file/folder is deleted ++ Complete overhall of installer - now only one step! It has been greatly + simplified in many ways, has much better validation, reports error much more + nicely, and automatically logs the user into the Administrations ++ Must now specify OS type - allows for customizable file permission settings ++ Sections can now have a language code assigned to them ++ Sections can now have a block name/id assigned to them +! Home section of Administration renamed to Start, to save confusion with saying + Homepage (because this term could either mean the main website or Home section + in Administration). Also, this aims to unify the interface with WB 3.x plans +! Moved Users and Groups sections under Access section. This aims to unify the + interface with WB 3.x plans, which help to unclutter the menu +! Interface for Settings section has been imporved for usability purposes +# Fixed HTMLArea where no scrollbar for "insert link" and "insert image" dialogs + by placing media list inside an iframe +# Fixed stripslashes problem for viewing news comments +! Added code from Formesque module (an advanced version of the original Form + module, modified by Rudolph Lartey from www.carbonect.com), and made further + interface improvements for select box/checkbox group/radio group options. +# Possibly fixed bugs where an S appears before file and dir modes +# Fixed bug where users can be added with same emails (in Administration) +- Removed support for PEAR, as it was deemed an unnecessary addition which only + makes code more bulky, and removing it will decrease package size a lot ++ New "homepage redirect" option so first page is included and not redirected to +# Fixed text not being shown when module uninstalled +! Imporved interface for basic group permissions +26-Mar-2005 Stefan Braunewell +# Fixed bug with front-end logins +# Fixed bug when saving intro page ++ Added check on sign-up if e-mail exists (thanks to P. Melief) +# Fixed bugs concerning moving/deleting pages +# Fixed list of parents in page settings +# Fixed mkdir without mode parameter +# Added a check on install to ensure PHP 4.1.x compatibility (thanks to Wanderer) ++ Added support for PAGES_DIRECTORY set to root ++ Search form now supports quotes (thanks to Manafta) +# Fixed page section ordering +# News items are displayed with name of poster instead of "Unknown" +# Deletion confirmation popup window in media section now shows correct file name +------------------------------------- 2.3.1 ------------------------------------- +03-Fed-2005 Ryan Djurovich ++ Now there is two types of "filesystem modes", one for directories and one + for files. Having different settings is very common for most servers, so + this addition should fix many problems people had with 2.3.0. +- Removed filesystem mode options from installation +! Removed duplicate text on installation step 3 for timezone +! All "access files" for the news module now stored in pages/posts instead + of a sub-dir relative to the page (this fixes many bugs) +# Fixed major bugs when deleting pages with sub-pages +! Removed the restrictions that prevent a user for changing a pages level +# Fixed bug with "toggle" plus/minus in IE for pages list +# Fixed some bugs where /pages was not replaced with PAGES_DIRECTORY constant +------------------------------------- 2.3.0 ------------------------------------- +26-Jan-2005 Ryan Djurovich +# Fixed bug in framework/functions.php that made root parent always equal 8 +# Added missing braces in lines 182 and 208 of admin/pages/settings2.php +# Fixed SQL-query on line 172, placing a / after $old_link +# Added eregi checks for PAGES_DIRECTORY on lines 140 and 150 of + admin/pages/settings2.php +# Added ordering cleaning to delete_post.php on line 53 for news module +! GMT option is selected for "Default Timezone" in the installer, instead + of the old "Please select" message (which had the same value as GMT) +28-Jan-2005 Ryan Djurovich +! Ability to specify the chmod number when WB uploads files, etc. +! Modified file headers (copyright/license notice) so they now look almost the + same, independant of font. Also, it now covers copyright for 2005. +30-Jan-2005 Ryan Djurovich +# Added code on wb/admin/pages/delete.php to remove sections from the sections + table when a page is deleted. ++ New 'Smart Login' prevents users from using external password managers, + and can be set to remember the users password using cookies. +! SourceForge CVS module now called websitebaker2 (instead of just + websitebaker). Also, all file versions have been reset. +01-Fed-2005 Ryan Djurovich +! Added code to prevent from changing a pages level (it simply disables + the select box), to prevent many possible bugs. +------------------------------------- 2.2.4 ------------------------------------- +23-Dec-2004 Ryan Djurovich +! Change 'EXACT_PHRASE' to 'EXACT_MATCH' on line 261 of wb/languages/EN.php +# Fixed multi-language support in search ++ Added more detailed options to list of PHP error reporting level's +- Removed ability to change language and PHP error reporting level + on installation to make things easier for newbie's ++ Ability to select custom spacer for page filename's +! Changed the way a language code is found on language installation ++ Added template permissions to groups +# Fixed bug when trying to change email from Preferences (admin and frontend) +# Fixed bug with auto-selection of "System Default" for Preferences +! News module now use's WYSIWYG for modifying news posts ++ Ability to specify both the pages and media target directories +------------------------------------ 2.2.3-c ------------------------------------ +22-Dec-2004 Ryan Djurovich +# Fixed problem with DB password being reset if Settings saved in basic mode +------------------------------------ 2.2.3-b ------------------------------------ +21-Dec-2004 Ryan Djurovich +# Fixed minor bug on admin templates section +# Fixed bug on rename.php and rename2.php in admin media section +------------------------------------- 2.2.3 ------------------------------------- +20-Dec-2004 Ryan Djurovich ++ Added WB release version in Administration (top right corner) +! New option to prevent users from adding level 0 pages +# Fixed bug when deleting post's in News module ++ Added new field in pages table for "root" parent (level 0 parent), for + extra flexability in creating templates +! Round template now supports unlimited page levels +------------------------------------- 2.2.2 ------------------------------------- +18-Dec-2004 Ryan Djurovich ++ New option under Search Settings for selecting custom template for search ++ New option when changing page settings to set the target +# Fixed error when saving a user after editing +! Users can now modify sub-page if they dont have permissions on the parent +------------------------------------- 2.2.1 ------------------------------------- +15-Dec-2004 Ryan Djurovich +# Fixed bug when changing password on preferences form (front-end) +# Fixed bug when retrieving user details (administration) +# Added check to see if module, template, or language is in use when deleting +# Fixed up email that is sent to user from a submitted form +# Fixed major problem with module permissions which stopped it from working +------------------------------------- 2.2.0 ------------------------------------- +14-Dec-2004 (Correct date[s] unkown) Ryan Djurovich ++ Multiple-level page support ++ Multiple section's for pages (including interface) +! Removed text created using two words on all areas + (e.g. {Intro} {PAGE} is now {INTRO_PAGE}) + this is for better language support ++ Added Languages section +! Moved Templates and Modules under Add-ons section +! Changed name of "Default" template to "Round" ++ Added "All CSS" template ++ Added "Jump" ++ Added +! Modified "Box" template to support multiple page levels ++ Added "Menu Link" module ++ Added "News" module ++ Added "Code" module ++ Added "Form" module ++ Added "Wrapper" module +! Changed name of "Normal Page" module to "WYSIWYG" ++ Created new admin wrapper script to ease module develpment ++ Media now automatically creates index.php file for every + sub-folder made (for security purposes) +! Change "Help" link in Administration menu so it now directs + to the the new Website Baker documentation website found at: + http://www.websitebaker.org/documentation +! Password is now required to change email in preferences ++ User can now select custom Language and Date & Time Formats ++ Added search functionality, with three different "methods": + 1. Using all words 2. Using any words 3. Exact match ++ Added native MySQL database support Property changes on: tags/2.6.0/CHANGELOG ___________________________________________________________________ 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: tags/2.6.0/INSTALL =================================================================== --- tags/2.6.0/INSTALL (nonexistent) +++ tags/2.6.0/INSTALL (revision 260) @@ -0,0 +1,26 @@ +Website Baker 2 Installation Instructions +============================================ +This will quickly explain what you will need +to install website baker. + +First of all, you must have a webserver with +PHP and MySQL installed correctly. Once you +have got that, place the "wb" folder +somewhere on your server, probably under the +document root: +e.g. /documentroot/wb + +This should be accessed by an address +something like this: +e.g. http://localhost/wb/ + +Now create a blank MySQL database +(Commonly called "wb"). + +Once that is all done simple run the +install script from your browser: +e.g. http://localhost/wb/install/index.php + +Fill-out the form and submit it, and if all +the details are correct, you should be taken +to Website Baker Administration. Property changes on: tags/2.6.0/INSTALL ___________________________________________________________________ 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: tags/2.6.0/README =================================================================== --- tags/2.6.0/README (nonexistent) +++ tags/2.6.0/README (revision 260) @@ -0,0 +1,46 @@ +General Information +=================== +Website Baker is a PHP-based content management system +which enables users to produce websites with ease. +Features include a template-based front-end, modulated +and multi-level page support, multi-user administration, +and much much more! + + +License +======= +Website Baker is released under the GNU General Public License, +Copyright (C) 2004-2005 Ryan Djurovich. +Please refer to the COPYING file for a copy of the license. + + +Installation +============ +Please refer to the INSTALL file for instructions on installation. + + +Usage +===== +Before using Website Baker please note: you must not remove/change any +copyright notices in the any code contained in this package. +Also, it is appreciated if you leave a link somewhere on your website, +which links to the Website Baker website. (http://www.websitebaker.org/) + + +Support +======= +For information about finding help: +http://www.websitebaker.org/2/help + + +Bugs +==== +To submit a bug: +http://www.websitebaker.org/2/bugs + + +Contribute +========== +For information about how to contribute (donating, etc): +http://www.websitebaker.org/2/contribute + Property changes on: tags/2.6.0/README ___________________________________________________________________ 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: tags/2.6.0/LICENSE =================================================================== --- tags/2.6.0/LICENSE (nonexistent) +++ tags/2.6.0/LICENSE (revision 260) @@ -0,0 +1,5 @@ +License +======= +Website Baker is released under the GNU General Public License, +Copyright (C) 2004-2005 Ryan Djurovich. +Please refer to the COPYING file for a copy of the license. \ No newline at end of file Property changes on: tags/2.6.0/LICENSE ___________________________________________________________________ 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: tags/2.6.0/COPYING =================================================================== --- tags/2.6.0/COPYING (nonexistent) +++ tags/2.6.0/COPYING (revision 260) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program 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. + + This program 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 this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Property changes on: tags/2.6.0/COPYING ___________________________________________________________________ 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: tags/2.6.0 =================================================================== --- tags/2.6.0 (nonexistent) +++ tags/2.6.0 (revision 260) Property changes on: tags/2.6.0 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## + +.project