Skip to content
Permalink
Browse files

improved https and multidomain handling; updates #798

  • Loading branch information...
following5 committed Sep 14, 2015
1 parent 1429c0d commit f995f49a1cb2b8e40edd6ca0400d5573b5b0c484
Showing with 470 additions and 305 deletions.
  1. +6 −0 doc/license.txt
  2. +5 −5 htdocs/config2/locale.inc.php
  3. +10 −15 htdocs/config2/settings-dev.inc.php
  4. +156 −0 htdocs/config2/settings-dist-common.inc.php
  5. +12 −31 htdocs/config2/settings-dist.inc.php
  6. +0 −1 htdocs/config2/settings-sample-dev.inc.php
  7. +18 −16 htdocs/config2/settings-sample.inc.php
  8. +6 −0 htdocs/config2/verify-settings.inc.php
  9. +12 −4 htdocs/imagebrowser.php
  10. +1 −1 htdocs/index.php
  11. +0 −17 htdocs/lang/de/ocstyle/login.inc.php
  12. +1 −1 htdocs/lang/de/ocstyle/login.tpl.php
  13. +1 −1 htdocs/lang/de/ocstyle/varset.inc.php
  14. +1 −1 htdocs/lib/clicompatbase.inc.php
  15. +29 −43 htdocs/lib/common.inc.php
  16. +4 −0 htdocs/lib/consts.inc.php
  17. +2 −18 htdocs/lib/settings-dev.inc.php
  18. +36 −46 htdocs/lib/settings-dist.inc.php
  19. +0 −1 htdocs/lib/settings-sample-dev.inc.php
  20. +9 −3 htdocs/lib2/OcSmarty.class.php
  21. +54 −41 htdocs/lib2/common.inc.php
  22. +4 −0 htdocs/lib2/const.inc.php
  23. +1 −1 htdocs/lib2/cookie.class.php
  24. +2 −2 htdocs/lib2/edithelper.inc.php
  25. +1 −2 htdocs/lib2/errorhandler.inc.php
  26. +3 −0 htdocs/lib2/html2text.class.php
  27. +1 −0 htdocs/lib2/logic/cache.class.php
  28. +14 −1 htdocs/lib2/logic/cachelist.class.php
  29. +2 −5 htdocs/lib2/logic/data-license.inc.php
  30. +4 −0 htdocs/lib2/logic/logpics.inc.php
  31. +1 −1 htdocs/lib2/logic/user.class.php
  32. +2 −2 htdocs/lib2/mail.class.php
  33. +2 −2 htdocs/lib2/search/search.gpx.inc.php
  34. +2 −2 htdocs/lib2/search/search.kml.inc.php
  35. +2 −2 htdocs/lib2/search/search.loc.inc.php
  36. +1 −1 htdocs/lib2/search/search.txt.inc.php
  37. +8 −2 htdocs/lib2/smarty/ocplugins/modifier.hyperlink.php
  38. +5 −2 htdocs/lib2/smarty/ocplugins/outputfilter.session.php
  39. +13 −4 htdocs/lib2/web.inc.php
  40. +1 −1 htdocs/map2.php
  41. +2 −1 htdocs/okapi_settings.php
  42. BIN htdocs/resource2/ocstyle/images/media/cc-by-nc-nd-small.png
  43. +1 −1 htdocs/templates2/ocstyle/login.tpl
  44. +2 −2 htdocs/templates2/ocstyle/mystatpic.tpl
  45. +1 −1 htdocs/templates2/ocstyle/res_cachelist_link.tpl
  46. +2 −2 htdocs/templates2/ocstyle/search.result.caches.tpl
  47. +1 −1 htdocs/templates2/ocstyle/sys_main.tpl
  48. +1 −1 htdocs/templates2/ocstyle/viewcache.tpl
  49. +1 −1 htdocs/templates2/ocstyle/viewcache_print.tpl
  50. +5 −3 htdocs/util2/cron/modules/sitemaps.class.php
  51. +3 −3 htdocs/util2/google-earth/caches.php
  52. +14 −10 htdocs/viewcache.php
  53. +3 −2 htdocs/viewprofile.php
  54. +2 −2 htdocs/xml/ocxml11.php
@@ -228,6 +228,12 @@ Icons
License : Creative Commons BY-SA 3.0
Autor : Paul Robert Lloyd (and other contributors)

10. Creative Commons Button
Path : htdocs/resource2/ocstyle/images/media/
URI : https://creativecommons.org/about/downloads
License : Creative Commons BY 3.0
Autor : Creative Commons


Other resources
---------------
@@ -117,7 +117,7 @@
$opt['locale']['EN']['page']['subtitle1'] = 'Geocaching with Opencaching';
$opt['locale']['EN']['page']['subtitle2'] = '';
$opt['locale']['EN']['page']['license_url'] = 'http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.en';
$opt['locale']['EN']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons License Terms" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">The Opencaching.de <a href="articles.php?page=impressum#datalicense">content</a> is licensed under Creative Commons <a rel="license" href="%1" target="_blank">BY-BC-ND 3.0 DE</a>.</div>';
$opt['locale']['EN']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons License Terms" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">The Opencaching.de <a href="articles.php?page=impressum#datalicense">content</a> is licensed under Creative Commons <a rel="license" href="%1" target="_blank">BY-BC-ND 3.0 DE</a>.</div>';
$opt['locale']['EN']['helpwiki'] = "http://wiki.opencaching.de/index.php/";
$opt['locale']['EN']['mostly_translated'] = true;
$opt['locale']['EN']['what3words'] = true;
@@ -138,7 +138,7 @@
$opt['locale']['DE']['page']['subtitle1'] = 'Geocaching mit Opencaching';
$opt['locale']['DE']['page']['subtitle2'] = '';
$opt['locale']['DE']['page']['license_url'] = 'http://creativecommons.org/licenses/by-nc-nd/3.0/de/';
$opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von Opencaching.de stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>';
$opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von Opencaching.de stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>';
$opt['locale']['DE']['helpwiki'] = "http://wiki.opencaching.de/index.php/";
$opt['locale']['DE']['mostly_translated'] = true;
$opt['locale']['DE']['what3words'] = true; // "beta"
@@ -159,7 +159,7 @@
$opt['locale']['IT']['page']['subtitle1'] = 'Geocaching con Opencaching';
$opt['locale']['IT']['page']['subtitle2'] = '';
$opt['locale']['IT']['page']['license_url'] = 'http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.it';
$opt['locale']['IT']['page']['license'] = '<a rel="license" href="%1" target="_blank"><img alt="Creative Commons License Terms" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Il <a href="articles.php?page=impressum#datalicense">contenuto</a> di Opencaching.de è rilasciato sotto licenza Creative Commons <a rel="license" href="%1" target="_blank">BY-NC-ND 3.0 DE</a>.</div>';
$opt['locale']['IT']['page']['license'] = '<a rel="license" href="%1" target="_blank"><img alt="Creative Commons License Terms" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Il <a href="articles.php?page=impressum#datalicense">contenuto</a> di Opencaching.de è rilasciato sotto licenza Creative Commons <a rel="license" href="%1" target="_blank">BY-NC-ND 3.0 DE</a>.</div>';
$opt['locale']['IT']['mostly_translated'] = true;
$opt['locale']['IT']['what3words'] = false;
@@ -179,7 +179,7 @@
$opt['locale']['ES']['page']['subtitle1'] = 'Geocaching con Opencaching';
$opt['locale']['ES']['page']['subtitle2'] = '';
$opt['locale']['ES']['page']['license_url'] = 'http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.es_ES';
$opt['locale']['ES']['page']['license'] = '<a rel="license" href="%1" target="_blank"><img alt="Creative Commons License Terms" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">El <a href="articles.php?page=impressum#datalicense">contenido</a> está disponible bajo Creative Commons <a rel="license" href="%1" target="_blank">BY-NC-ND 3.0 DE</a> licencia.</div>';
$opt['locale']['ES']['page']['license'] = '<a rel="license" href="%1" target="_blank"><img alt="Creative Commons License Terms" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">El <a href="articles.php?page=impressum#datalicense">contenido</a> está disponible bajo Creative Commons <a rel="license" href="%1" target="_blank">BY-NC-ND 3.0 DE</a> licencia.</div>';
$opt['locale']['ES']['mostly_translated'] = true;
$opt['locale']['ES']['what3words'] = true;
@@ -199,7 +199,7 @@
$opt['locale']['FR']['page']['subtitle1'] = 'Geocaching avec Opencaching';
$opt['locale']['FR']['page']['subtitle2'] = '';
$opt['locale']['FR']['page']['license_url'] = 'http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.fr';
$opt['locale']['FR']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons License Terms" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Le<a href="articles.php?page=impressum#datalicense">contenu</a> de Opencaching.de sont sous licence Creative Commons <a rel="license" href="%1" target="_blank">BY-BC-ND 3.0 DE</a>.</div>';
$opt['locale']['FR']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons License Terms" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Le<a href="articles.php?page=impressum#datalicense">contenu</a> de Opencaching.de sont sous licence Creative Commons <a rel="license" href="%1" target="_blank">BY-BC-ND 3.0 DE</a>.</div>';
$opt['locale']['FR']['helpwiki'] = "http://wiki.opencaching.de/index.php/";
$opt['locale']['FR']['mostly_translated'] = true;
$opt['locale']['FR']['what3words'] = true;
@@ -66,26 +66,21 @@
// see settings-dist.inc.php for known node IDs
$opt['logic']['node']['id'] = 4;
$opt['logic']['waypoint_pool']['prefix'] = 'OC';
$opt['logic']['shortlink_domain'] = 'opencaching.de';
/* cachemaps
*/
$opt['logic']['cachemaps']['url'] = 'http://maps.google.com/maps/api/staticmap?center={latitude},{longitude}&zoom={userzoom}&size=200x200&maptype=hybrid&markers=color:blue|label:|{latitude},{longitude}&sensor=false';
/* other template options
if (!$opt['page']['shortlink_domain'])
$opt['page']['shortlink_domain'] = 'opencaching.de';
/* server options
*
*/
$opt['page']['absolute_url'] = $dev_baseurl . "/";
set_absolute_urls($opt, $dev_baseurl, 2);
$opt['page']['develsystem'] = true;
$opt['page']['max_logins_per_hour'] = 1000; // for development ...
$opt['mail']['from'] = 'root';
$opt['mail']['subject'] = '[local.opencaching.de] ';
/* location of uploaded images
*/
$opt['logic']['pictures']['dir'] = $dev_basepath . $dev_codepath . 'htdocs/images/uploads';
$opt['logic']['pictures']['url'] = $opt['page']['absolute_url'] . 'images/uploads';
$opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'] . '/thumbs';
/* disable cronjobs which are not needed on devel site
*/
@@ -110,8 +105,8 @@
$opt['lib']['garmin']['url'] = 'http://local.opencaching.de/';
$opt['lib']['garmin']['page_url'] = $opt['lib']['garmin']['url'] . $dev_codepath . 'htdocs/';
// developer.what3words.com API Key
$opt['lib']['w3w']['apikey'] = 'YOURAPIKEY';
// developer.what3words.com API Key
$opt['lib']['w3w']['apikey'] = 'YOURAPIKEY';
// other settings
$opt['page']['showdonations'] = true;
@@ -96,4 +96,160 @@
// explanation of nature protection areas
$opt['cms']['npa'] = 'http://wiki.opencaching.de/index.php/Schutzgebiete';
/* HTTPS settings
*
* mode: HTTPS_DISABLED: https requests will be redirected to http
* HTTPS_ENABLED: all requests will stay within the same protocol
* HTTPS_ENFORCED: http requests will be redirected to https
*
* is_default: true: links in exported data will point to https:
* false: links in exported data will point to http:
*
* force_login: true: login forms submit to https:
* false login forms submit to the current protocol
*/
if (!isset($opt['page']['https']['mode'])) $opt['page']['https']['mode'] = HTTPS_DISABLED;
if (!isset($opt['page']['https']['is_default'])) $opt['page']['https']['is_default'] = false;
if (!isset($opt['page']['https']['force_login'])) $opt['page']['https']['force_login'] = false;
/* The following additional variables are generated:
*
* $opt['page']['absolute_url'] the base URL of the current request, http or https + current domain
* $absolute_server_URI ... the same, only in lib1
* $opt['page']['absolute_http_url'] the http:// base URL of the current domain
* $opt['page']['absolute_https_url'] the https:// base URL of the currenbt domain
* $opt['page']['default_absolute_url'] the default-protocol base URL of the current domain (used in exported data)
* $opt['page']['default_primary_url'] the default-protocol base URL of the primary domain of this site
* $opt['page']['shortlink_url'] shortlink URL of the current protocol or false
* $opt['page']['default_shortlink_url'] default-protocol shortlink URL or false
* $opt['page']['https']['active'] true if the current request is https, else false
* $opt['page']['protocol'] the protocol of the current request, 'http' or 'https'
*
* These settings allow to run a consistently multi-protocol and multi-domain OC site.
* All generated URls end on '/'.
*/
function set_absolute_urls(&$opt, $primary_site_url, $lib)
{
// $opt is passed as parameter because it is *local* in okapi_settings.php.
global $absolute_server_URI, $rootpath;
// 1. create settings for the primary domain, which was passed in $site_url
$primary_domain = parse_url($primary_site_url, PHP_URL_HOST);
if (isset($opt['domain'][$primary_domain]['url']))
$primary_site_url = $opt['domain'][$primary_domain]['url'];
if (substr($primary_site_url, -1, 1) != '/')
$primary_site_url .= '/';
if (isset($opt['domain'][$primary_domain]['https']['is_default']))
$httpsdefault = $opt['domain'][$primary_domain]['https']['is_default'];
else
$httpsdefault = $opt['page']['https']['is_default'];
if ($httpsdefault)
$opt['page']['default_primary_url'] = 'https' . strstr($primary_site_url, '://');
else
$opt['page']['default_primary_url'] = 'http' . strstr($primary_site_url, '://');
// 2. create settings for the current domain
$current_domain = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $primary_domain;
$opt['page']['domain'] = $current_domain;
if (isset($opt['domain'][$current_domain]['url']))
$current_site_url = $opt['domain'][$current_domain]['url'];
else
$current_site_url = 'x://' . $current_domain . parse_url($primary_site_url, PHP_URL_PATH);
if (substr($current_site_url, -1, 1) != '/')
$current_site_url .= '/';
if (isset($opt['domain'][$current_domain]['https']))
{
// This overwrites *all* https settings.
$opt['page']['https'] = $opt['domain'][$current_domain]['https'];
}
$adr = strstr($current_site_url, '://');
$opt['page']['absolute_http_url'] = 'http' . $adr;
$opt['page']['absolute_https_url'] = 'https' . $adr;
$opt['page']['https']['active'] = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off');
if ($opt['page']['https']['active'])
{
$opt['page']['absolute_url'] = $opt['page']['absolute_https_url'];
$opt['page']['protocol'] = 'https';
}
else
{
$opt['page']['absolute_url'] = $opt['page']['absolute_http_url'];
$opt['page']['protocol'] = 'http';
}
if ($lib == 1)
$absolute_server_URI = $opt['page']['absolute_url'];
if ($opt['page']['https']['is_default'])
$opt['page']['default_absolute_url'] = $opt['page']['absolute_https_url'];
else
$opt['page']['default_absolute_url'] = $opt['page']['absolute_http_url'];
// 3. create shortlink URLs
if (isset($opt['domain'][$current_domain]['shortlink_domain']))
$opt['page']['shortlink_domain'] = $opt['domain'][$current_domain]['shortlink_domain'];
if (!isset($opt['page']['shortlink_domain']) || !$opt['page']['shortlink_domain'])
{
$opt['page']['shortlink_url'] = false;
$opt['page']['default_shortlink_url'] = false;
}
else
{
if (strpos($opt['page']['shortlink_domain'], '://') !== false)
$opt['page']['shortlink_domain'] = parse_url($opt['page']['shortlink_domain'], PHP_URL_HOST);
$opt['page']['shortlink_url'] = $opt['page']['protocol'] . '://' . $opt['page']['shortlink_domain'] . '/';
if ($opt['page']['https']['is_default'])
$opt['page']['default_shortlink_url'] = 'https://' . $opt['page']['shortlink_domain'] . '/';
else
$opt['page']['default_shortlink_url'] = 'http://' . $opt['page']['shortlink_domain'] . '/';
}
// 4. set location of uploaded images
$rp = isset($opt['rootpath']) ? $opt['rootpath'] : $rootpath;
if (!isset($opt['logic']['pictures']['dir'])) $opt['logic']['pictures']['dir'] = $rp . 'images/uploads'; // Ocprop !
if (!isset($opt['logic']['pictures']['url'])) $opt['logic']['pictures']['url'] = $opt['page']['default_primary_url'] . 'images/uploads';
if (!isset($opt['logic']['pictures']['thumb_dir'])) $opt['logic']['pictures']['thumb_dir'] = $opt['logic']['pictures']['dir'] . '/thumbs';
if (!isset($opt['logic']['pictures']['thumb_url'])) $opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'] . '/thumbs';
}
function set_common_domain_config(&$opt)
{
// $opt is passed as parameter because it is *local* in okapi_settings.php.
$domain = $opt['page']['domain'];
if (isset($opt['domain'][$domain]))
{
if (isset($opt['domain'][$domain]['locale']))
$opt['template']['default']['locale'] = $opt['domain'][$domain]['locale'];
if (isset($opt['domain'][$domain]['fallback_locale']))
$opt['template']['default']['fallback_locale'] = $opt['domain'][$domain]['fallback_locale'];
if (isset($opt['domain'][$domain]['country']))
$opt['template']['default']['country'] = $opt['domain'][$domain]['country'];
if (isset($opt['domain'][$domain]['keywords']))
$opt['page']['meta']['keywords'] = $opt['domain'][$domain]['keywords'];
if (isset($opt['domain'][$domain]['description']))
$opt['page']['meta']['description'] = $opt['domain'][$domain]['description'];
if (isset($opt['domain'][$domain]['headoverlay']))
$opt['page']['headoverlay'] = $opt['domain'][$domain]['headoverlay'];
}
}
?>
@@ -183,18 +183,9 @@
/* other template options
*
*/
$opt['page']['absolute_url'] = 'http://devel.opencaching.de/'; // may be overwritten by $opt['domain'][...]['uri']
$opt['page']['origin_url'] = 'http://www.opencaching.de/'; // production installation for this OC site
$opt['page']['develsystem'] = false;
$opt['page']['origin_url'] = 'http://www.opencaching.de/'; // reference productive installation for this OC code fork
/* disable or enable https access to the main site
* if false and connection is https, redirect to $opt['page']['absolute_url']
* access to /xml/ocapi10 (SOAP interface) is allowed nevertheless
*/
$opt['page']['allowhttps'] = false;
// require SSL for SOAP access
$opt['page']['nusoap_require_https'] = false;
$opt['page']['shortlink_domain'] = false;
/*
* configure infos on 404.php
@@ -260,21 +251,17 @@
/* location of uploaded images
*/
$opt['logic']['pictures']['dir'] = $opt['rootpath'] . 'images/uploads'; // Ocprop
$opt['logic']['pictures']['url'] = 'http://devel.opencaching.de/images/uploads';
$opt['logic']['pictures']['maxsize'] = 6000*1024;
$opt['logic']['pictures']['unchg_size'] = 250*1024;
if (extension_loaded('imagick'))
$opt['logic']['pictures']['extensions'] = 'jpg;jpeg;gif;png;bmp;tif;psd;pcx;svg;xpm';
else
$opt['logic']['pictures']['extensions'] = 'jpg;jpeg;gif;png';
if (extension_loaded('imagick'))
$opt['logic']['pictures']['extensions'] = 'jpg;jpeg;gif;png;bmp;tif;psd;pcx;svg;xpm';
else
$opt['logic']['pictures']['extensions'] = 'jpg;jpeg;gif;png';
/* Thumbnail sizes
*/
$opt['logic']['pictures']['thumb_max_width'] = 175;
$opt['logic']['pictures']['thumb_max_height'] = 175;
$opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'] . '/thumbs';
$opt['logic']['pictures']['thumb_dir'] = $opt['rootpath'] . 'images/uploads/thumbs';
/* Defaults for picture replacement on declined license
*
@@ -285,22 +272,17 @@
$opt['logic']['pictures']['dummy']['textcolor'] = array(0,0,0);
$opt['logic']['pictures']['dummy']['replacepic'] = $opt['rootpath'] . 'images/';
/* location of uploaded podcasts
*/
$opt['logic']['podcasts']['dir'] = $opt['rootpath'] . 'podcasts/uploads';
$opt['logic']['podcasts']['url'] = 'http://devel.opencaching.de/podcasts/uploads';
$opt['logic']['podcasts']['maxsize'] = 1536000;
$opt['logic']['podcasts']['extensions'] = 'mp3';
/* cachemaps (old, see cachemaps.php)
/* cachemaps (obsolete)
*/
/*
$opt['logic']['cachemaps']['url'] = 'images/cachemaps/';
$opt['logic']['cachemaps']['dir'] = $opt['rootpath'] . $opt['logic']['cachemaps']['url'];
$opt['logic']['cachemaps']['wmsurl'] = 'http://www.opencaching.de/cachemaps.php?wp={wp_oc}';
$opt['logic']['cachemaps']['wmsurl'] = 'cachemaps.php?wp={wp_oc}';
$opt['logic']['cachemaps']['size']['lat'] = 0.2;
$opt['logic']['cachemaps']['size']['lon'] = 0.2;
$opt['logic']['cachemaps']['pixel']['y'] = 200;
$opt['logic']['cachemaps']['pixel']['x'] = 200;
*/
/* cachemaps (new)
* how to display the cache map on viewcache.php (200x200 pixel)
@@ -365,7 +347,6 @@
/* opencaching prefixes in database available to search for
*/
$opt['logic']['ocprefixes'] = 'oc';
$opt['logic']['shortlink_domain'] = false;
/* Username for cronjobs or CLI tools
* is used e.g. for cache auto-archiving and auto-publishing
@@ -504,8 +485,8 @@
// (e.g. domain called without www. prefix) - must match domain of $opt['lib']['garmin']['url']
$opt['lib']['garmin']['redirect'] = 'http://www.site.org/garmin.php?redirect=1&cacheid={cacheid}';
// developer.what3words.com API key
$opt['lib']['w3w']['apikey'] = 'YOURAPIKEY';
// developer.what3words.com API key
$opt['lib']['w3w']['apikey'] = 'YOURAPIKEY';
// Google Maps API key
// http://code.google.com/intl/de/apis/maps/signup.html
@@ -8,7 +8,6 @@
// installation paths
$dev_basepath = '/var/www/html/';
$dev_codepath = 'oc-server/server-3.0/';
$dev_domain = 'local.opencaching.de';
$dev_baseurl = 'http://local.opencaching.de/oc-server/server-3.0/htdocs';
// common developer system settings
Oops, something went wrong.

0 comments on commit f995f49

Please sign in to comment.
You can’t perform that action at this time.