Change all links to farmOS.org to https.
This commit is contained in:
parent
db4a817179
commit
823a886ea9
|
@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
|
||||||
&& docker-php-ext-install bcmath gd mbstring opcache pdo pdo_mysql pdo_pgsql zip
|
&& docker-php-ext-install bcmath gd mbstring opcache pdo pdo_mysql pdo_pgsql zip
|
||||||
|
|
||||||
# Set recommended PHP settings for farmOS.
|
# Set recommended PHP settings for farmOS.
|
||||||
# See http://farmos.org/hosting/installing/#requirements
|
# See https://farmos.org/hosting/installing/#requirements
|
||||||
RUN { \
|
RUN { \
|
||||||
echo 'memory_limit=256M'; \
|
echo 'memory_limit=256M'; \
|
||||||
echo 'max_execution_time=240'; \
|
echo 'max_execution_time=240'; \
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
farmOS
|
farmOS
|
||||||
======
|
======
|
||||||
|
|
||||||
Documentation: http://farmOS.org
|
Documentation: https://farmOS.org
|
||||||
|
|
||||||
Drupal distribution: http://drupal.org/project/farm
|
Drupal distribution: http://drupal.org/project/farm
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ INSTALLATION
|
||||||
For more information on installing farmOS, see the official documentation on
|
For more information on installing farmOS, see the official documentation on
|
||||||
farmOS.org:
|
farmOS.org:
|
||||||
|
|
||||||
http://farmOS.org/hosting/installing
|
https://farmOS.org/hosting/installing
|
||||||
|
|
||||||
MAINTAINERS
|
MAINTAINERS
|
||||||
-----------
|
-----------
|
||||||
|
|
|
@ -99,7 +99,7 @@ function farm_install_configure_form($form, &$form_state) {
|
||||||
$form['farm_map_google_api_key'] = array(
|
$form['farm_map_google_api_key'] = array(
|
||||||
'#type' => 'textfield',
|
'#type' => 'textfield',
|
||||||
'#title' => t('Google Maps API Key'),
|
'#title' => t('Google Maps API Key'),
|
||||||
'#description' => t('Google Maps layers require that you obtain an API key. Refer to the <a href="@doc">Google Maps API Key</a> documentation on farmOS.org for instructions.', array('@doc' => 'http://farmos.org/hosting/googlemaps')) . ' ' . t('This can also be done after installation. If no key is provided, OpenStreetMaps will be used as the default map base layer.'),
|
'#description' => t('Google Maps layers require that you obtain an API key. Refer to the <a href="@doc">Google Maps API Key</a> documentation on farmOS.org for instructions.', array('@doc' => 'https://farmos.org/hosting/googlemaps')) . ' ' . t('This can also be done after installation. If no key is provided, OpenStreetMaps will be used as the default map base layer.'),
|
||||||
'#default_value' => variable_get('farm_map_google_api_key', ''),
|
'#default_value' => variable_get('farm_map_google_api_key', ''),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ function hook_farm_help_page() {
|
||||||
|
|
||||||
// Add a link to farmOS.rog
|
// Add a link to farmOS.rog
|
||||||
$output = array(
|
$output = array(
|
||||||
l('farmOS.org', 'http://farmos.org'),
|
l('farmOS.org', 'https://farmos.org'),
|
||||||
);
|
);
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ function farm_help_help($path, $args) {
|
||||||
|
|
||||||
// Help for the /farm/help path.
|
// Help for the /farm/help path.
|
||||||
case 'farm/help':
|
case 'farm/help':
|
||||||
return '<p>' . t('This page contains links to helpful farmOS resources. For more information, visit <a href="http://farmOS.org">farmOS.org</a>.') . '</p>';
|
return '<p>' . t('This page contains links to helpful farmOS resources. For more information, visit <a href="https://farmOS.org">farmOS.org</a>.') . '</p>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,12 +78,12 @@ function farm_help_farm_help_page() {
|
||||||
$output = array();
|
$output = array();
|
||||||
|
|
||||||
// Add general text.
|
// Add general text.
|
||||||
$output[] = '<p>' . l('farmOS', 'http://farmos.org') . ' is built and maintained
|
$output[] = '<p>' . l('farmOS', 'https://farmos.org') . ' is built and maintained
|
||||||
by a community of volunteers. Some farmOS community resources are listed
|
by a community of volunteers. Some farmOS community resources are listed
|
||||||
below.</p>';
|
below.</p>';
|
||||||
|
|
||||||
// Add a link to the farmOS documentation.
|
// Add a link to the farmOS documentation.
|
||||||
$output[] = '<h3>Documentation</h3><p>' . l('http://farmOS.org', 'http://farmOS.org') . '</h3>';
|
$output[] = '<h3>Documentation</h3><p>' . l('https://farmOS.org', 'https://farmOS.org') . '</h3>';
|
||||||
|
|
||||||
// Add a link to the farmOS chat rooms.
|
// Add a link to the farmOS chat rooms.
|
||||||
$chat_rooms = array(
|
$chat_rooms = array(
|
||||||
|
|
|
@ -140,7 +140,7 @@ function farm_map_settings_form($form, &$form_state) {
|
||||||
$form['farm_map_google_api_key'] = array(
|
$form['farm_map_google_api_key'] = array(
|
||||||
'#type' => 'textfield',
|
'#type' => 'textfield',
|
||||||
'#title' => t('Google Maps API Key'),
|
'#title' => t('Google Maps API Key'),
|
||||||
'#description' => t('Google Maps layers require that you obtain an API key. Refer to the <a href="@doc">Google Maps API Key</a> documentation on farmOS.org for instructions.', array('@doc' => 'http://farmos.org/hosting/googlemaps')),
|
'#description' => t('Google Maps layers require that you obtain an API key. Refer to the <a href="@doc">Google Maps API Key</a> documentation on farmOS.org for instructions.', array('@doc' => 'https://farmos.org/hosting/googlemaps')),
|
||||||
'#default_value' => variable_get('farm_map_google_api_key', ''),
|
'#default_value' => variable_get('farm_map_google_api_key', ''),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -421,7 +421,7 @@ function farm_theme_preprocess_page(&$vars) {
|
||||||
$vars['page']['footer']['farmos'] = array(
|
$vars['page']['footer']['farmos'] = array(
|
||||||
'#type' => 'markup',
|
'#type' => 'markup',
|
||||||
'#prefix' => '<div style="text-align: center;"><small>',
|
'#prefix' => '<div style="text-align: center;"><small>',
|
||||||
'#markup' => t('Powered by') . ' ' . l(t('farmOS'), 'http://farmos.org'),
|
'#markup' => t('Powered by') . ' ' . l(t('farmOS'), 'https://farmos.org'),
|
||||||
'#suffix' => '</small></div>',
|
'#suffix' => '</small></div>',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue