Fix Reverse Proxy Support:
http://drupal.org/node/244593
http://drupal.org/files/issues/drupal_80.patch
Index: includes/bootstrap.inc
--- includes/bootstrap.inc.orig 2008-02-11 15:36:21 +0100
+++ includes/bootstrap.inc 2008-04-09 20:47:49 +0200
@@ -272,6 +272,7 @@
*/
function conf_init() {
global $base_url, $base_path, $base_root;
+ global $base_url_local;
// Export the following settings.php variables to the global namespace
global $db_url, $db_prefix, $cookie_domain, $conf, $installed_profile, $update_free_access;
@@ -723,9 +724,22 @@
* generate an equivalent using other environment variables.
*/
function request_uri() {
+ global $base_url;
+ global $base_url_local;
if (isset($_SERVER['REQUEST_URI'])) {
$uri = $_SERVER['REQUEST_URI'];
+ if (isset($base_url) && isset($base_url_local)) {
+ $parts = parse_url($base_url_local);
+ if ( strlen($uri) >= strlen($base_url_local)
+ && substr($uri, 0, strlen($base_url_local)) == $base_url_local) {
+ $uri = $base_url . substr($uri, strlen($base_url_local));
+ }
+ elseif ( strlen($uri) >= strlen($parts["path"])
+ && substr($uri, 0, strlen($parts["path"])) == $parts["path"]) {
+ $uri = $base_url . substr($uri, strlen($parts["path"]));
+ }
+ }
}
else {
if (isset($_SERVER['argv'])) {
Index: sites/default/default.settings.php
--- sites/default/default.settings.php.orig 2007-12-20 10:35:10 +0100
+++ sites/default/default.settings.php 2008-04-09 20:47:32 +0200
@@ -126,6 +126,24 @@
# $base_url = 'http://www.example.com'; // NO trailing slash!
/**
+ * Local Base URL (optional).
+ *
+ * If you are running Drupal behind a reverse proxy, $base_url (see above)
+ * usually points to the URL of the reverse proxy. Drupal uses this for
+ * all sorts of external URLs. In order to correctly calculate sub-URLs
+ * below $base_url for embedded HTML forms, Drupal also has to know the
+ * URL on the local/origin server under which Drupal is contacted by the
+ * reverse proxy. This is what $base_url_local is for.
+ *
+ * Examples:
+ * $base_url_local = 'http://www.example.com:8080/drupal';
+ *
+ * It is not allowed to have a trailing slash; Drupal will add it
+ * for you.
+ */
+# $base_url_local = 'http://www.example.com:8080/drupal'; // NO trailing slash!
+
+/**
* PHP settings:
*
* To see what PHP settings are possible, including whether they can
-----------------------------------------------------------------------------
Support HTTP Proxies (mainly for update checks, RSS fetching, etc)
http://drupal.org/node/7881
http://drupal.org/files/issues/proxy_11.patch
(post-adjusted and improved by RSE)
Index: includes/common.inc
--- includes/common.inc.orig 2008-04-09 23:11:44 +0200
+++ includes/common.inc 2008-04-24 11:41:40 +0200
@@ -439,13 +439,27 @@
case 'http':
$port = isset($uri['port']) ? $uri['port'] : 80;
$host = $uri['host'] . ($port != 80 ? ':'. $port : '');
- $fp = @fsockopen($uri['host'], $port, $errno, $errstr, 15);
+ if (variable_get('proxy_server', '') != '') {
+ $proxy_server = variable_get('proxy_server', '');
+ $proxy_port = variable_get('proxy_port', 8080);
+ $fp = @fsockopen($proxy_server, $proxy_port, $errno, $errstr, 15);
+ }
+ else {
+ $fp = @fsockopen($uri['host'], $port, $errno, $errstr, 15);
+ }
break;
case 'https':
// Note: Only works for PHP 4.3 compiled with OpenSSL.
$port = isset($uri['port']) ? $uri['port'] : 443;
$host = $uri['host'] . ($port != 443 ? ':'. $port : '');
- $fp = @fsockopen('ssl://'. $uri['host'], $port, $errno, $errstr, 20);
+ if (variable_get('proxy_server', '') != '') {
+ $proxy_server = variable_get('proxy_server', '');
+ $proxy_port = variable_get('proxy_port', 8080);
+ $fp = @fsockopen($proxy_server, $proxy_port, $errno, $errstr, 15);
+ }
+ else {
+ $fp = @fsockopen('ssl://'. $uri['host'], $port, $errno, $errstr, 20);
+ }
break;
default:
$result->error = 'invalid schema '. $uri['scheme'];
@@ -462,9 +476,14 @@
}
// Construct the path to act on.
- $path = isset($uri['path']) ? $uri['path'] : '/';
- if (isset($uri['query'])) {
- $path .= '?'. $uri['query'];
+ if (variable_get('proxy_server', '') != '') {
+ $path = $url;
+ }
+ else {
+ $path = isset($uri['path']) ? $uri['path'] : '/';
+ if (isset($uri['query'])) {
+ $path .= '?'. $uri['query'];
+ }
}
// Create HTTP request.
@@ -482,6 +501,14 @@
$defaults['Authorization'] = 'Authorization: Basic '. base64_encode($uri['user'] . (!empty($uri['pass']) ? ":". $uri['pass'] : ''));
}
+ // If the proxy server required a username then attempt to authenticate with it
+ if (variable_get('proxy_username', '') != '') {
+ $username = variable_get('proxy_username', '');
+ $password = variable_get('proxy_password', '');
+ $auth_string = base64_encode($username . ($password != '' ? ':'. $password : ''));
+ $defaults['Proxy-Authorization'] = 'Proxy-Authorization: Basic '. $auth_string ."\r\n";
+ }
+
foreach ($headers as $header => $value) {
$defaults[$header] = $header .': '. $value;
}
Index: modules/system/system.admin.inc
--- modules/system/system.admin.inc.orig 2008-03-25 12:58:16 +0100
+++ modules/system/system.admin.inc 2008-04-24 11:43:07 +0200
@@ -1363,6 +1363,65 @@
}
/**
+ * Form builder; Configure the site proxy settings.
+ *
+ * @ingroup forms
+ * @see system_settings_form()
+ */
+function system_proxy_settings() {
+
+ $form['forward_proxy'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Forward proxy settings'),
+ '#description' => t('The proxy server used when Drupal needs to connect to other sites on the Internet.'),
+ );
+ $form['forward_proxy']['proxy_server'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Proxy host name'),
+ '#default_value' => variable_get('proxy_server', ''),
+ '#description' => t('The host name of the proxy server, eg. localhost. If this is empty Drupal will connect directly to the internet.')
+ );
+ $form['forward_proxy']['proxy_port'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Proxy port number'),
+ '#default_value' => variable_get('proxy_port', 8080),
+ '#description' => t('The port number of the proxy server, eg. 8080'),
+ );
+ $form['forward_proxy']['proxy_username'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Proxy username'),
+ '#default_value' => variable_get('proxy_username', ''),
+ '#description' => t('The username used to authenticate with the proxy server.'),
+ );
+ $form['forward_proxy']['proxy_password'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Proxy password'),
+ '#default_value' => variable_get('proxy_password', ''),
+ '#description' => t('The password used to connect to the proxy server. This is kept as plain text.', '')
+ );
+ $form['#validate'][] = 'system_proxy_settings_validate';
+
+ return system_settings_form($form);
+}
+
+/**
+ * Validate the submitted proxy form.
+ */
+function system_proxy_settings_validate($form, &$form_state) {
+ // Validate the proxy settings
+ $form_state['values']['proxy_server'] = trim($form_state['values']['proxy_server']);
+ if ($form_state['values']['proxy_server'] != '') {
+ // TCP allows the port to be between 0 and 65536 inclusive
+ if (!is_numeric($form_state['values']['proxy_port'])) {
+ form_set_error('proxy_port', t('The proxy port is invalid. It must be a number between 0 and 65535.'));
+ }
+ elseif ($form_state['values']['proxy_port'] < 0 || $form_state['values']['proxy_port'] >= 65536) {
+ form_set_error('proxy_port', t('The proxy port is invalid. It must be between 0 and 65535.'));
+ }
+ }
+}
+
+/**
* Form builder; Configure the site file handling.
*
* @ingroup forms
Index: modules/system/system.module
--- modules/system/system.module.orig 2008-04-09 23:11:49 +0200
+++ modules/system/system.module 2008-04-24 11:43:47 +0200
@@ -55,7 +55,7 @@
$output .= '<li>'. t('support for enabling and disabling <a href="@themes">themes</a>, which determine the design and presentation of your site. Drupal comes packaged with several core themes and additional contributed themes are available at the <a href="@drupal-themes">Drupal.org theme page</a>.', array('@themes' => url('admin/build/themes'), '@drupal-themes' => 'http://drupal.org/project/themes')) .'</li>';
$output .= '<li>'. t('a robust <a href="@cache-settings">caching system</a> that allows the efficient re-use of previously-constructed web pages and web page components. Drupal stores the pages requested by anonymous users in a compressed format; depending on your site configuration and the amount of your web traffic tied to anonymous visitors, Drupal\'s caching system may significantly increase the speed of your site.', array('@cache-settings' => url('admin/settings/performance'))) .'</li>';
$output .= '<li>'. t('a set of routine administrative operations that rely on a correctly-configured <a href="@cron">cron maintenance task</a> to run automatically. A number of other modules, including the feed aggregator, ping module and search also rely on <a href="@cron">cron maintenance tasks</a>. For more information, see the online handbook entry for <a href="@handbook">configuring cron jobs</a>.', array('@cron' => url('admin/reports/status'), '@handbook' => 'http://drupal.org/cron')) .'</li>';
- $output .= '<li>'. t('basic configuration options for your site, including <a href="@date-settings">date and time settings</a>, <a href="@file-system">file system settings</a>, <a href="@clean-url">clean URL support</a>, <a href="@site-info">site name and other information</a>, and a <a href="@site-maintenance">site maintenance</a> function for taking your site temporarily off-line.', array('@date-settings' => url('admin/settings/date-time'), '@file-system' => url('admin/settings/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@site-maintenance' => url('admin/settings/site-maintenance'))) .'</li></ul>';
+ $output .= '<li>'. t('basic configuration options for your site, including <a href="@date-settings">date and time settings</a>, <a href="@file-system">file system settings</a>, <a href="@clean-url">clean URL support</a>, <a href="@proxy-server">proxy server settings</a>, a href="@site-info">site name and other information</a>, and a <a href="@site-maintenance">site maintenance</a> function for taking your site temporarily off-line.', array('@date-settings' => url('admin/settings/date-time'), '@file-system' => url('admin/settings/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@site-maintenance' => url('admin/settings/site-maintenance'))) .'</li></ul>';
$output .= '<p>'. t('For more information, see the online handbook entry for <a href="@system">System module</a>.', array('@system' => 'http://drupal.org/handbook/modules/system/')) .'</p>';
return $output;
case 'admin':
@@ -406,6 +406,14 @@
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
);
+ $items['admin/settings/proxy'] = array(
+ 'title' => 'Proxy server',
+ 'description' => 'Configure settings when the site is behind a proxy server.',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('system_proxy_settings'),
+ 'access arguments' => array('administer site configuration'),
+ 'file' => 'system.admin.inc',
+ );
$items['admin/settings/file-system'] = array(
'title' => 'File system',
'description' => 'Tell Drupal where to store uploaded files and how they are accessed.',
-----------------------------------------------------------------------------
Properly activate Drupal support module in TinyMCE
Index: sites/all/modules/tinymce/plugin_reg.php
--- sites/all/modules/tinymce/plugin_reg.php.orig 2008-03-27 21:11:17 +0100
+++ sites/all/modules/tinymce/plugin_reg.php 2008-05-02 20:56:56 +0200
@@ -102,5 +102,9 @@
$plugins['zoom'] = array();
$plugins['zoom']['theme_advanced_buttons2'] = array('zoom');
+$plugins['drupalimage'] = array();
+$plugins['drupalimage']['theme_advanced_buttons1'] = array('drupalimage');
+$plugins['drupalimage']['extended_valid_elements'] = array('img[class|src|border=0|alt|title|width|height|align|name]');
+
return $plugins;
}
-----------------------------------------------------------------------------
Fix SQL in "remove" functionality of "img_assist" module.
http://drupal.org/node/250128
Index: sites/all/modules/img_assist/img_assist.module
--- sites/all/modules/img_assist/img_assist.module.orig 2008-04-06 19:32:33 +0200
+++ sites/all/modules/img_assist/img_assist.module 2008-05-02 21:00:24 +0200
@@ -1239,7 +1239,7 @@
}
function _img_assist_remove($node, $size) {
- $result = db_query("SELECT * FROM {files} f INNER JOIN {image} i WHERE f.fid = i.fid AND i.nid = %d AND f.filename = '%s'", $node->nid, $size['key']);
+ $result = db_query("SELECT * FROM {files} f INNER JOIN {image} ON f.fid = i.fid WHERE i.nid = %d AND f.filename = '%s'", $node->nid, $size['key']);
while ($file = db_fetch_object($result)) {
// Never delete original image.
if ($file->filepath != $node->images[IMAGE_ORIGINAL]) {
-----------------------------------------------------------------------------
Optimize "img_assist" module by loading only when necessary.
http://drupal.org/node/55101
Index: sites/all/modules/img_assist/img_assist.js
--- sites/all/modules/img_assist/img_assist.js.orig 2008-04-06 18:43:18 +0200
+++ sites/all/modules/img_assist/img_assist.js 2008-05-02 21:05:56 +0200
@@ -130,6 +130,24 @@
var win = window.open(BASE_URL + 'index.php?q=img_assist/popup/' + nid, 'imagev', 'height='+oy+'-10,width='+ox+',top='+winy+',left='+winx+',scrollbars='+use_scrollbars+',resizable');
}
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
+ var oy = mh;
+ if((ox>=screen.width) || (oy>=screen.height)){
+ var ox = screen.width-150;
+ var oy = screen.height-150;
+ var winx = (screen.width / 2)-(ox / 2);
+ var winy = (screen.height / 2)-(oy / 2);
+ var use_scrollbars = 1;
+ }
+ else{
+ var winx = (screen.width / 2)-(ox / 2);
+ var winy = (screen.height / 2)-(oy / 2);
+ var use_scrollbars = 0;
+ }
+ var win = window.open(BASE_URL + 'index.php?q=img_assist/popup/' + nid, 'imagev', 'height='+oy+'-10,width='+ox+',top='+winy+',left='+winx+',scrollbars='+use_scrollbars+',resizable');
+}
+
function insertImage() {
if (window.opener) {
// Get variables from the fields on the properties frame
Index: sites/all/modules/img_assist/img_assist.module
--- sites/all/modules/img_assist/img_assist.module.orig 2008-05-02 21:04:49 +0200
+++ sites/all/modules/img_assist/img_assist.module 2008-05-02 21:07:24 +0200
@@ -126,7 +126,7 @@
}
// Assign base_path to insert in image source by javascript.
drupal_add_js('var BASE_URL = "'. base_path() .'";', 'inline');
- drupal_add_js($path .'/img_assist.js');
+ drupal_add_js($path .'/img_assist_popup.js');
}
/**
@@ -150,6 +150,9 @@
* Add image link underneath textareas.
*/
function img_assist_textarea($element) {
+ $path = drupal_get_path('module', 'img_assist');
+ drupal_add_js($path .'/img_assist.js');
+
$link = variable_get('img_assist_link', 'icon');
if (($link == 'icon') || ($link == 'text')) {
if (_img_assist_textarea_match($element['#id']) && _img_assist_page_match() && !strstr($_GET['q'], 'img_assist')) {
Index: sites/all/modules/img_assist/img_assist_popup.js
--- /dev/null 2008-05-02 21:08:21 +0200
+++ sites/all/modules/img_assist/img_assist_popup.js 2008-05-02 21:05:56 +0200
@@ -0,0 +1,20 @@
+/* $Id: drupal.patch,v 1.6 2008/05/02 21:16:00 rse Exp $ */
+
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
+ var oy = mh;
+ if((ox>=screen.width) || (oy>=screen.height)){
+ var ox = screen.width-150;
+ var oy = screen.height-150;
+ var winx = (screen.width / 2)-(ox / 2);
+ var winy = (screen.height / 2)-(oy / 2);
+ var use_scrollbars = 1;
+ }
+ else{
+ var winx = (screen.width / 2)-(ox / 2);
+ var winy = (screen.height / 2)-(oy / 2);
+ var use_scrollbars = 0;
+ }
+ var win = window.open(BASE_URL + 'index.php?q=img_assist/popup/' + nid, 'imagev', 'height='+oy+'-10,width='+ox+',top='+winy+',left='+winx+',scrollbars='+use_scrollbars+',resizable');
+}
+
-----------------------------------------------------------------------------
Fix file permissions.
http://drupal.org/node/247992
Index: sites/all/modules/img_assist/img_assist.module
--- sites/all/modules/img_assist/img_assist.module.orig 2008-05-02 21:11:15 +0200
+++ sites/all/modules/img_assist/img_assist.module 2008-05-02 21:11:48 +0200
@@ -1230,6 +1230,8 @@
drupal_set_message(t('Unable to create %label image', array('%label' => $size['label'])), 'error');
}
else {
+ // Set standard file permissions for webserver-generated files
+ @chmod(file_create_path($destination), 0664);
$node->images[$key] = $destination;
_image_insert($node, $key, file_create_path($destination));
}
-----------------------------------------------------------------------------
Activate the Drupal glue code for the FCKeditor filemanager.
Index: sites/all/modules/fckeditor/fckeditor/editor/filemanager/connectors/php/config.php
--- sites/all/modules/fckeditor/fckeditor/editor/filemanager/connectors/php/config.php.orig 2008-03-25 16:28:24 +0100
+++ sites/all/modules/fckeditor/fckeditor/editor/filemanager/connectors/php/config.php 2008-05-02 23:02:23 +0200
@@ -39,6 +39,9 @@
// Attention: The above 'UserFilesPath' must point to the same directory.
$Config['UserFilesAbsolutePath'] = '' ;
+// activate Drupal glue code for filemanager
+require_once "../../../../../filemanager.config.php";
+
// Due to security issues with Apache modules, it is recommended to leave the
// following setting enabled.
$Config['ForceSingleExtension'] = true ;
