From 2c11535eb0031e970fb006f47e62130dc7c6ce6d Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Sun, 8 Jan 2017 15:48:52 +0100 Subject: [PATCH] use secure URIs where possible --- INSTALL | 8 ++++---- README | 6 +++--- config/example-config.php | 2 +- dba/create-database.sh | 8 ++++---- dba/windows/create-database.bat | 2 +- debian/README.Debian | 2 +- debian/control | 2 +- debian/copyright | 2 +- docs/translation.rst | 4 ++-- htdocs/help.php | 14 ++++++-------- htdocs/iSchedule.php | 2 +- htdocs/index.php | 4 ++-- htdocs/setup.php | 8 ++++---- htdocs/upgrade.php | 2 +- inc/AtomFeed.php | 2 +- inc/davical_configuration_missing.php | 4 ++-- inc/interactive-page.php | 6 +++--- scripts/davical-cli | 2 +- 18 files changed, 39 insertions(+), 41 deletions(-) diff --git a/INSTALL b/INSTALL index f40f43c8..cd8fdf64 100644 --- a/INSTALL +++ b/INSTALL @@ -18,7 +18,7 @@ Gentoo Users ------------ DAVical is in the Sunrise overlay. You will have to add this overlay, -following the instructions on http://overlays.gentoo.org/proj/sunrise. +following the instructions on https://overlays.gentoo.org/proj/sunrise. You can then use emerge to install DAVical and its dependencies. @@ -29,7 +29,7 @@ Other Linux Users ----------------- You will need to download the latest versions of the davical and awl packages -from the DAViCal site. See http://www.davical.org/ for more information. +from the DAViCal site. See https://www.davical.org/ for more information. You will need to untar these. Preferably you will untar them from within the "/usr/share" directory and everything will be in it's expected location @@ -63,7 +63,7 @@ The best place to get help is on IRC. The official DAViCal IRC channel is #davical on irc.oftc.net The starting point for further help should be the DAViCal website -at http://www.davical.org/ and from there you might visit the wiki +at https://www.davical.org/ and from there you might visit the wiki which contains a fair amount of information about configuring DAViCal in a variety of different circumstances. @@ -224,7 +224,7 @@ to use this, and the docs for that are elsewhere. See: -http://wiki.davical.org/ +https://wiki.davical.org/ Which is the place where documentation will generally be kept up to date the most. diff --git a/README b/README index f74a061c..c47e220f 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ DAViCal CalDAV Server by Andrew McMillan. For documentation you are best advised to visit the DAViCal -website at http://davical.org/ or search our general mailing +website at https://www.davical.org/ or search our general mailing list at https://lists.sourceforge.net/mailman/listinfo/davical-general -There's lots of useful information at http://wiki.davical.org/ as well, +There's lots of useful information at https://wiki.davical.org/ as well, and if you want access to update that contact us on IRC (#davical on OFTC, be patient and stick around for a while) or send an e-mail to . @@ -29,4 +29,4 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301, USA \ No newline at end of file +02110-1301, USA diff --git a/config/example-config.php b/config/example-config.php index 27a24c03..713dce1b 100644 --- a/config/example-config.php +++ b/config/example-config.php @@ -194,7 +194,7 @@ $c->admin_email ='calendar-admin@example.com'; * are supported on your system. * * People interested in providing new translations are directed to the Wiki: -* http://wiki.davical.org/w/Translating_DAViCal +* https://wiki.davical.org/w/Translating_DAViCal */ // $c->default_locale = "en_NZ"; diff --git a/dba/create-database.sh b/dba/create-database.sh index 9a6c4f9e..879fc0aa 100755 --- a/dba/create-database.sh +++ b/dba/create-database.sh @@ -111,7 +111,7 @@ as a user with full permissions to access the local PostgreSQL database. If your PostgreSQL database is non-standard then you will need to set the PGHOST, PGPORT and/or PGCLUSTER environment variables before running this script again. -See: http://wiki.davical.org/w/Install_Errors/No_Database_Rights +See: https://wiki.davical.org/index.php/Problems_and_Solutions#No_Database_Rights EOFAILURE exit 1 @@ -143,7 +143,7 @@ libraries are not available. Check that your pg_hba.conf allows the davical_dba user to connect to the database (and make sure you've reloaded PostgreSQL since changing that). -Also see: http://wiki.davical.org/w/Install_Errors/No_Perl_YAML +Also see: https://wiki.davical.org/index.php/Problems_and_Solutions EOFAILURE exit 1 @@ -184,7 +184,7 @@ rm "${INSTALL_NOTE_FN}" cat <= 9), rst2pdf Vcs-git: https://gitlab.com/davical-project/davical.git Vcs-browser: https://gitlab.com/davical-project/davical -Homepage: http://www.davical.org/ +Homepage: https://www.davical.org/ Package: davical Architecture: all diff --git a/debian/copyright b/debian/copyright index d3d7ad67..9f56b0b3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: https://gitlab.com/davical-project/davical Upstream-Name: davical Upstream-Contact: davical-devel@lists.sourceforge.net diff --git a/docs/translation.rst b/docs/translation.rst index e0355aac..e2582155 100644 --- a/docs/translation.rst +++ b/docs/translation.rst @@ -3,7 +3,7 @@ Translation *********** DAViCAL uses the standard translation infrastructure of many projects. -It is based on ``gettext`` (http://www.gnu.org/software/gettext/). +It is based on ``gettext`` (https://www.gnu.org/software/gettext/). Translators =========== @@ -89,7 +89,7 @@ They have created a command line client namend ``tx``:: Creating skeleton... Creating config file... Done. - $ tx set --auto-remote http://www.transifex.net/projects/p/davical/ + $ tx set --auto-remote https://www.transifex.net/projects/p/davical/ Auto configuring local project from remote URL... Getting details for project davical 1 resources found. Configuring... diff --git a/htdocs/help.php b/htdocs/help.php index 1eaa591f..9eac724e 100644 --- a/htdocs/help.php +++ b/htdocs/help.php @@ -16,16 +16,14 @@ if ( isset($_SERVER['HTTP_REFERER']) ) { } $content = sprintf(translate('

Help

-

For initial help you should visit the DAViCal Home Page or take -a look at the DAViCal Wiki.

-

If you can\'t find the answers there, visit us on IRC in -the #davical channel on irc.oftc.net, -or send a question to the DAViCal Users mailing list.

-

The mailing list +

For initial help you should visit the DAViCal Home Page or take +a look at the DAViCal Wiki.

+

If you can\'t find the answers there, visit us on IRC in +the #davical channel on irc.oftc.net, +or send a question to the DAViCal Users mailing list.

+

The mailing list archives can be helpful too.

'), $wiki_help); -$content = preg_replace('#forum_id=8348#', 'forum_name=davical-general', $content); - echo $content; include("page-footer.php"); diff --git a/htdocs/iSchedule.php b/htdocs/iSchedule.php index 1ee9dfc7..76b8815b 100644 --- a/htdocs/iSchedule.php +++ b/htdocs/iSchedule.php @@ -20,7 +20,7 @@ require_once('iSchedule.php'); $heading_schedule = translate('iSchedule Configuration'); $content_sched1 = translate('iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send invitations via email, for scheduled events where attendees are using different servers or providers. Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule will show up in the users scheduling inbox.'); -$content_sched2 = translate('The iSchedule configuration requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to accept requests for, these are the domain portion of email address on Principal records in DAViCal examples are listed below for domains found in your database. At least 1 public key must also be published if you wish to send requests from this server.'); +$content_sched2 = translate('The iSchedule configuration requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to accept requests for, these are the domain portion of email address on Principal records in DAViCal examples are listed below for domains found in your database. At least 1 public key must also be published if you wish to send requests from this server.'); $page_elements = array(); diff --git a/htdocs/index.php b/htdocs/index.php index 4c36beaf..7f08685d 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -44,13 +44,13 @@ $content_grp3 = translate('Groups may be members of other groups, but complex ne // Translations shared with setup.php $heading_clients = translate('Configuring Calendar Clients for DAViCal'); -$content_cli1 = translate('The client setup page on the DAViCal website has information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted calendars.'); +$content_cli1 = translate('The client setup page on the DAViCal website has information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted calendars.'); $content_cli2 = translate('The administrative interface has no facility for viewing or modifying calendar data.'); // Translations shared with setup.php $heading_configure = translate('Configuring DAViCal'); $content_config1 = translate('If you can read this then things must be mostly working already.'); -$content_config3 = translate('The DAViCal installation page on the DAViCal website has some further information on how to install and configure this application.'); +$content_config3 = translate('The DAViCal installation page on the DAViCal website has some further information on how to install and configure this application.'); echo <<allow_url_fopen” to “FALSE”."), 'dep_warning' ); + return new CheckResult( false, translate("Cannot determine upstream version, because PHP has set “allow_url_fopen” to “FALSE”."), 'dep_warning' ); $url = 'https://www.davical.org/current_davical_version?v='.$c->version_string; $version_file = @fopen($url, 'r'); if ( ! $version_file ) return new CheckResult( false, translate("Could not retrieve") . " '$url'", 'dep_warning' ); @@ -342,7 +342,7 @@ function build_dependencies_table( ) { $dependencies[translate('PHP LDAP module available')] = 'check_ldap'; } - $translated_failure_code = translate('Explanation on DAViCal Wiki'); + $translated_failure_code = translate('Explanation on DAViCal Wiki'); $dependencies_table = ''; $dep_tpl = ' @@ -402,7 +402,7 @@ $heading_php_info = translate('PHP Information'); // Translations shared with index.php $heading_clients = translate('Configuring Calendar Clients for DAViCal'); -$content_cli1 = translate('The client setup page on the DAViCal website has information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted calendars.'); +$content_cli1 = translate('The client setup page on the DAViCal website has information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted calendars.'); $content_cli2 = translate('The administrative interface has no facility for viewing or modifying calendar data.'); // Translations shared with index.php @@ -412,7 +412,7 @@ $content_config2 = ( $config_warnings == '' ? '' : '

'
              . $config_warnings.'

' ); -$content_config3 = translate('The DAViCal installation page on the DAViCal website has some further information on how to install and configure this application.'); +$content_config3 = translate('The DAViCal installation page on the DAViCal website has some further information on how to install and configure this application.'); echo <<update-davical-database should be run manually after upgrading the software to a new version of DAViCal.'); + $content_pagelem21 = translate('The update-davical-database should be run manually after upgrading the software to a new version of DAViCal.'); $content_pagelem22 = translate("In due course this program will implement the functionality which is currently contained in that script, but until then I'm afraid you do need to run it."); $page_elements = array(); diff --git a/inc/AtomFeed.php b/inc/AtomFeed.php index d677626a..6ca5117f 100644 --- a/inc/AtomFeed.php +++ b/inc/AtomFeed.php @@ -156,7 +156,7 @@ class AtomFeed extends XMLDocument { parent::__construct( array( ATOM_XMLNS => null, XHTML_XMLNS => 'xhtml' ) ); $this->title = 'DAViCal Atom Feed'; $this->nodes = array( 'id', 'title', 'updated', // placeholders - new XMLElement('generator', 'DAViCal', array('uri' => 'http://www.davical.org/', 'version' => $c->version_string ) ) + new XMLElement('generator', 'DAViCal', array('uri' => 'https://www.davical.org/', 'version' => $c->version_string ) ) ); } diff --git a/inc/davical_configuration_missing.php b/inc/davical_configuration_missing.php index 9c422719..cc117605 100644 --- a/inc/davical_configuration_missing.php +++ b/inc/davical_configuration_missing.php @@ -11,8 +11,8 @@ include("page-header.php"); and so really you are well on the road to success!

The Dubious News

You could try and click here and see if that enlightens you at all. - Or rather have a look at the Installation - guide and the wiki. Or make some guesses. + Or rather have a look at the Installation + guide and the wiki. Or make some guesses. Or bug us on IRC or the mailing lists :-)

The Really Basic Help

The configuration file should look something like this:

diff --git a/inc/interactive-page.php b/inc/interactive-page.php index 2122358e..86c88898 100644 --- a/inc/interactive-page.php +++ b/inc/interactive-page.php @@ -25,9 +25,9 @@ if ( isset($_SERVER['SCRIPT_NAME']) ) { $help_menu = new MenuSet('submenu', 'submenu', 'submenu_active'); -$help_menu->AddOption(translate('DAViCal Homepage'),'http://www.davical.org/',translate('The DAViCal Home Page'), false, 6000, true ); -$help_menu->AddOption(translate('DAViCal Wiki'),'http://wiki.davical.org/'.$wiki_help,translate('Visit the DAViCal Wiki'), false, 7000, true ); -$help_menu->AddOption(translate('Request Feature'),'http://davical.uservoice.com/',translate('Go to the DAViCal Feature Requests'), false, 8000, true ); +$help_menu->AddOption(translate('DAViCal Homepage'),'https://www.davical.org/',translate('The DAViCal Home Page'), false, 6000, true ); +$help_menu->AddOption(translate('DAViCal Wiki'),'https://wiki.davical.org/'.$wiki_help,translate('Visit the DAViCal Wiki'), false, 7000, true ); +$help_menu->AddOption(translate('Request Feature'),'https://davical.uservoice.com/',translate('Go to the DAViCal Feature Requests'), false, 8000, true ); $help_menu->AddOption(translate('Report Bug'),'https://gitlab.com/davical-project/davical/issues',translate('Report a bug in the system'), false, 9000, true ); $user_menu = new MenuSet('submenu', 'submenu', 'submenu_active'); diff --git a/scripts/davical-cli b/scripts/davical-cli index 022bd586..8c60bf21 100755 --- a/scripts/davical-cli +++ b/scripts/davical-cli @@ -51,7 +51,7 @@ # ######################### IMPORTANT NOTES ######################### # -# SEE ALSO: http://wiki.davical.org/index.php/DAViCal-cli +# SEE ALSO: https://wiki.davical.org/index.php/DAViCal-cli # # This code has been created for and used in a FreeBSD machine with Davical # installed from the own ports (at the beginning). This means that in this