### Eclipse Workspace Patch 1.0 #P drupal-6-cvs Index: modules/user/user.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v retrieving revision 1.11 diff -u -r1.11 user.pages.inc --- modules/user/user.pages.inc 8 Jan 2008 10:35:43 -0000 1.11 +++ modules/user/user.pages.inc 7 Feb 2008 18:56:56 -0000 @@ -238,7 +238,7 @@ $form['_category'] = array('#type' => 'value', '#value' => $category); $form['_account'] = array('#type' => 'value', '#value' => $account); $form['submit'] = array('#type' => 'submit', '#value' => t('Save'), '#weight' => 30); - if (user_access('administer users')) { + if (user_delete_access($account)) { $form['delete'] = array( '#type' => 'submit', '#value' => t('Delete'), Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.892 diff -u -r1.892 user.module --- modules/user/user.module 3 Feb 2008 19:23:01 -0000 1.892 +++ modules/user/user.module 7 Feb 2008 18:56:56 -0000 @@ -871,6 +871,11 @@ return (($GLOBALS['user']->uid == $account->uid) || user_access('administer users')) && $account->uid > 0; } +function user_delete_access($account) { + global $user; + return user_access('administer users') && $user->uid != $account->uid; +} + function user_load_self($arg) { $arg[1] = user_load($GLOBALS['user']->uid); return $arg; @@ -1059,8 +1064,8 @@ 'title' => 'Delete', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_confirm_delete', 1), - 'access callback' => 'user_access', - 'access arguments' => array('administer users'), + 'access callback' => 'user_delete_access', + 'access arguments' => array(1), 'type' => MENU_CALLBACK, 'file' => 'user.pages.inc', ); @@ -1833,13 +1838,20 @@ } function user_multiple_delete_confirm(&$form_state) { + global $user; $edit = $form_state['post']; $form['accounts'] = array('#prefix' => '', '#tree' => TRUE); // array_filter() returns only elements with TRUE values. foreach (array_filter($edit['accounts']) as $uid => $value) { - $user = db_result(db_query('SELECT name FROM {users} WHERE uid = %d', $uid)); - $form['accounts'][$uid] = array('#type' => 'hidden', '#value' => $uid, '#prefix' => '
  • ', '#suffix' => check_plain($user) ."
    • \n"); + // Users cannot not delete themselves to prevent accidents. + if ($user->uid == $uid) { + drupal_set_message(t('You cannot delete your own account - %name was removed from the deletion list.', array('%name' => $user->name)), 'error'); + } + else { + $name = db_result(db_query('SELECT name FROM {users} WHERE uid = %d', $uid)); + $form['accounts'][$uid] = array('#type' => 'hidden', '#value' => $uid, '#prefix' => '
  • ', '#suffix' => check_plain($name) ."
    • \n"); + } } $form['operation'] = array('#type' => 'hidden', '#value' => 'delete'); Index: sites/all/modules/stringoverrides/stringoverrides.admin.inc =================================================================== RCS file: sites/all/modules/stringoverrides/stringoverrides.admin.inc diff -N sites/all/modules/stringoverrides/stringoverrides.admin.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sites/all/modules/stringoverrides/stringoverrides.admin.inc 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,185 @@ +language; + } + $form = array( + '#cache' => TRUE, + ); + $form['lang'] = array( + '#type' => 'hidden', + '#value' => $lang, + ); + $form['string'] = array( + '#theme' => 'stringoverrides_strings', + ); + // Retrieve the words to display + $delta = 0; + if ($form_state['storage']['words']) { + $words = $form_state['storage']['words']; + } + else { + $words = variable_get('locale_custom_strings_'. $lang, array()); + } + uksort($words, 'strcasecmp'); // Case insensitive sort by key + foreach($words as $original => $replacement){ + $form['string'][$delta] = stringoverrides_textbox_combo($delta, TRUE, $original, $replacement); + $delta++; + } + for ($index = 0; $index < 3; $index++) { + $form['string'][$delta] = stringoverrides_textbox_combo($delta); + $delta++; + } + + $form['more_strings'] = array( + '#type' => 'button', + '#value' => t('More strings'), + '#description' => t("If the amount of boxes above isn't enough, click here to add more choices."), + '#weight' => 2, + '#ahah' => array( + 'path' => 'admin/settings/stringoverrides/js', + 'wrapper' => 'stringoverrides-wrapper', + 'method' => 'replace', + 'effect' => 'fade', + 'progress' => 'none', + ), + ); + $form['save'] = array( + '#type' => 'submit', + '#value' => t('Save'), + '#weight' => 3, + ); + return $form; +} // function stringoverrides_admin + +/** + * Triggered when the user submits the administration page + */ +function stringoverrides_admin_submit($form, &$form_state) { + // Format the words correctly so that they're put into the database correctly + $words = array(); + foreach ($form_state['values']['string'] as $index => $value) { + if (!empty($value['original']) && $value['enabled']) { + $words[$value['original']] = $value['replacement']; + } + } + + // Save into the correct language definition + global $language; + $lang = $form['lang']['#value']; + if (empty($lang)) { + $lang = $language->language; + } + variable_set('locale_custom_strings_'. $lang, $words); + + // Output a message to the user + drupal_set_message('Your changes have been saved.'); +} // function stringoverrides_admin_submit() + +/** + * Function to return a textbox combo form + */ +function stringoverrides_textbox_combo($delta = 0, $enabled = TRUE, $original = '', $replacement = '') { + $form = array( + '#tree' => TRUE, + ); + $form['enabled'] = array( + '#type' => 'checkbox', + '#default_value' => $enabled, + '#parents' => array('string', $delta, 'enabled'), + ); + $form['original'] = array( + '#type' => 'textfield', + '#default_value' => $original, + '#size' => 30, + '#parents' => array('string', $delta, 'original'), + ); + $form['replacement'] = array( + '#type' => 'textfield', + '#default_value' => $replacement, + '#size' => 30, + '#parents' => array('string', $delta, 'replacement'), + ); + return $form; +} // function stringoverrides_textbox_combo() + +/** + * Theme the enabled box and the two text box strings + */ +function theme_stringoverrides_strings($form) { + $headers = array( + theme('table_select_header_cell'), + t('Original'), + t('Replacement'), + ); + $rows = array(); + foreach (element_children($form) as $key) { + // Build the table row. + $rows[$key] = array( + 'data' => array( + array('data' => drupal_render($form[$key]['enabled']), 'class' => 'stringoverrides-enabled'), + array('data' => drupal_render($form[$key]['original']), 'class' => 'stringoverrides-original'), + array('data' => drupal_render($form[$key]['replacement']), 'class' => 'stringoverrides-replacement'), + ), + ); + // Add any attributes on the element to the row, such as the ahah class. + if (array_key_exists('#attributes', $form[$key])) { + $rows[$key] = array_merge($rows[$key], $form[$key]['#attributes']); + } + } + + $output = ''; + $output .= '
    '; + $output .= theme('table', $headers, $rows); + $output .= '
    '; + $output .= drupal_render($form); + return $output; +} // function theme_stringoverrides_strings() + +/** + * Menu callback for the String Overrides module to display a new string override + */ +function stringoverrides_js() { + $delta = count($_POST['string']); + + // Build our new form element. + $form_element = stringoverrides_textbox_combo($delta); + drupal_alter('form', $form_element, array(), 'stringoverrides_js'); + + // Build the new form. + $form_state = array('submitted' => FALSE); + $form_build_id = $_POST['form_build_id']; + // Add the new element to the stored form. Without adding the element to the + // form, Drupal is not aware of this new elements existence and will not + // process it. We retreive the cached form, add the element, and resave. + $form = form_get_cache($form_build_id, $form_state); + $form['string'][$delta] = $form_element; + form_set_cache($form_build_id, $form, $form_state); + $form += array( + '#post' => $_POST, + '#programmed' => FALSE, + ); + + // Rebuild the form. + $form = form_builder('stringoverrides_admin', $form, $form_state); + + // Render the new output. + $string_form = $form['string']; + $string_form[$delta]['enabled']['#value'] = TRUE; + $string_form[$delta]['#attributes']['class'] = empty($string_form[$delta]['#attributes']['class']) ? 'ahah-new-content' : $string_form[$delta]['#attributes']['class'] .' ahah-new-content'; + $output = theme('status_messages') . drupal_render($string_form); + + drupal_json(array('status' => TRUE, 'data' => $output)); +} // function stringoverrides_js() Index: sites/all/modules/stringoverrides/LICENSE.txt =================================================================== RCS file: sites/all/modules/stringoverrides/LICENSE.txt diff -N sites/all/modules/stringoverrides/LICENSE.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sites/all/modules/stringoverrides/LICENSE.txt 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,274 @@ +GNU GENERAL PUBLIC LICENSE + + Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, +Cambridge, MA 02139, 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 Index: sites/all/modules/stringoverrides/stringoverrides.install =================================================================== RCS file: sites/all/modules/stringoverrides/stringoverrides.install diff -N sites/all/modules/stringoverrides/stringoverrides.install --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sites/all/modules/stringoverrides/stringoverrides.install 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,9 @@ +'. t('The String Overrides module provides a quick and easy way of replacing text.') .'

    '; + } + else if($arg[0] == 'admin' && $arg[1] == 'settings' && $arg[2] == 'stringoverrides') { + $output = '

    '. t("The following provides quick and easy way of replacing text.") .'

    '; + } + return $output; +} // function stringoverrides_help + +/** + * Implementation of hook_menu() + */ +function stringoverrides_menu() { + $items = array(); + $items['admin/settings/stringoverrides'] = array( + 'title' => 'String overrides', + 'description' => 'Provides a quick and easy way of replacing text on the site.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('stringoverrides_admin', 3), + 'access arguments' => array('administer site configuration'), + 'type' => MENU_NORMAL_ITEM, + 'file' => 'stringoverrides.admin.inc', + ); + + // Add the language tabs if there are other languages + if (module_exists('locale')) { + global $language; + $languages = locale_language_list(); + foreach($languages as $code => $name) { + $items["admin/settings/stringoverrides/$code"] = array( + 'title' => $name, + 'page arguments' => array('stringoverrides_admin', $code), + 'type' => $language->language == $code ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK, + ); + } + } + + $items['admin/settings/stringoverrides/js'] = array( + 'title' => 'String Overrides Javascript', + 'page callback' => 'stringoverrides_js', + 'type' => MENU_CALLBACK, + 'file' => 'stringoverrides.admin.inc', + ); + return $items; +} // function stringoverrides_menu + +/** + * Implementation of hook_theme() + */ +function stringoverrides_theme() { + return array( + 'stringoverrides_strings' => array( + 'arguments' => array('form' => NULL), + ), + ); +} // function stringoverrides_theme Index: sites/default/settings.php =================================================================== RCS file: sites/default/settings.php diff -N sites/default/settings.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sites/default/settings.php 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,228 @@ + 'main_', + * 'users' => 'shared_', + * 'sessions' => 'shared_', + * 'role' => 'shared_', + * 'authmap' => 'shared_', + * 'sequences' => 'shared_', + * ); + * + * Database URL format: + * $db_url = 'mysql://username:password@localhost/databasename'; + * $db_url = 'mysqli://username:password@localhost/databasename'; + * $db_url = 'pgsql://username:password@localhost/databasename'; + */ +$db_url = 'mysqli://d6cvs:p4ss@localhost/d6cvs'; +$db_prefix = ''; + +/** + * Access control for update.php script + * + * If you are updating your Drupal installation using the update.php script + * being not logged in as administrator, you will need to modify the access + * check statement below. Change the FALSE to a TRUE to disable the access + * check. After finishing the upgrade, be sure to open this file again + * and change the TRUE back to a FALSE! + */ +$update_free_access = FALSE; + +/** + * Base URL (optional). + * + * If you are experiencing issues with different site domains, + * uncomment the Base URL statement below (remove the leading hash sign) + * and fill in the URL to your Drupal installation. + * + * You might also want to force users to use a given domain. + * See the .htaccess file for more information. + * + * Examples: + * $base_url = 'http://www.example.com'; + * $base_url = 'http://www.example.com:8888'; + * $base_url = 'http://www.example.com/drupal'; + * $base_url = 'https://www.example.com:8888/drupal'; + * + * It is not allowed to have a trailing slash; Drupal will add it + * for you. + */ +# $base_url = 'http://www.example.com'; // NO trailing slash! + +/** + * PHP settings: + * + * To see what PHP settings are possible, including whether they can + * be set at runtime (ie., when ini_set() occurs), read the PHP + * documentation at http://www.php.net/manual/en/ini.php#ini.list + * and take a look at the .htaccess file to see which non-runtime + * settings are used there. Settings defined here should not be + * duplicated there so as to avoid conflict issues. + */ +ini_set('arg_separator.output', '&'); +ini_set('magic_quotes_runtime', 0); +ini_set('magic_quotes_sybase', 0); +ini_set('session.cache_expire', 200000); +ini_set('session.cache_limiter', 'none'); +ini_set('session.cookie_lifetime', 2000000); +ini_set('session.gc_maxlifetime', 200000); +ini_set('session.save_handler', 'user'); +ini_set('session.use_only_cookies', 1); +ini_set('session.use_trans_sid', 0); +ini_set('url_rewriter.tags', ''); + +/** + * Drupal automatically generates a unique session cookie name for each site + * based on on its full domain name. If you have multiple domains pointing at + * the same Drupal site, you can either redirect them all to a single domain + * (see comment in .htaccess), or uncomment the line below and specify their + * shared base domain. Doing so assures that users remain logged in as they + * cross between your various domains. + */ +# $cookie_domain = 'example.com'; + +/** + * Variable overrides: + * + * To override specific entries in the 'variable' table for this site, + * set them here. You usually don't need to use this feature. This is + * useful in a configuration file for a vhost or directory, rather than + * the default settings.php. Any configuration setting from the 'variable' + * table can be given a new value. Note that any values you provide in + * these variable overrides will not be modifiable from the Drupal + * administration interface. + * + * Remove the leading hash signs to enable. + */ +# $conf = array( +# 'site_name' => 'My Drupal site', +# 'theme_default' => 'minnelli', +# 'anonymous' => 'Visitor', +/** + * A custom theme can be set for the off-line page. This applies when the site + * is explicitly set to off-line mode through the administration page or when + * the database is inactive due to an error. It can be set through the + * 'maintenance_theme' key. The template file should also be copied into the + * theme. It is located inside 'modules/system/maintenance-page.tpl.php'. + * Note: This setting does not apply to installation and update pages. + */ +# 'maintenance_theme' => 'minnelli', +/** + * reverse_proxy accepts a boolean value. + * + * Enable this setting to determine the correct IP address of the remote + * client by examining information stored in the X-Forwarded-For headers. + * X-Forwarded-For headers are a standard mechanism for identifying client + * systems connecting through a reverse proxy server, such as Squid or + * Pound. Reverse proxy servers are often used to enhance the performance + * of heavily visited sites and may also provide other site caching, + * security or encryption benefits. If this Drupal installation operates + * behind a reverse proxy, this setting should be enabled so that correct + * IP address information is captured in Drupal's session management, + * logging, statistics and access management systems; if you are unsure + * about this setting, do not have a reverse proxy, or Drupal operates in + * a shared hosting environment, this setting should be set to disabled. + */ +# 'reverse_proxy' => TRUE, +/** + * reverse_proxy accepts an array of IP addresses. + * + * Each element of this array is the IP address of any of your reverse + * proxies. Filling this array Drupal will trust the information stored + * in the X-Forwarded-For headers only if Remote IP address is one of + * these, that is the request reaches the web server from one of your + * reverse proxies. Otherwise, the client could directly connect to + * your web server spoofing the X-Forwarded-For headers. + */ +# 'reverse_proxy_addresses' => array('a.b.c.d', ...), +# ); + +/** + * String overrides: + * + * To override specific strings on your site with or without enabling locale + * module, add an entry to this list. This functionality allows you to change + * a small number of your site's default English language interface strings. + * + * Remove the leading hash signs to enable. + */ +# $conf['locale_custom_strings_en'] = array( +# 'forum' => 'Discussion board', +# '@count min' => '@count minutes', +# ); Index: .project =================================================================== RCS file: .project diff -N .project --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .project 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,22 @@ + + + drupal-6-cvs + + + + + + org.eclipse.php.core.PhpIncrementalProjectBuilder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + + org.eclipse.php.core.PHPNature + +