diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 5f273a84d..6de9ea090 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -2,7 +2,7 @@ * [ ] Can you reproduce the problem in a fresh installation of the "develop" branch? * [ ] Do you have any errors in the PHP error log, or javascript console? -* [ ] Did you check the [osTicket forums](http://osticket.com/forum/categories)? +* [ ] Did you check the [osTicket forums](https://forum.osticket.com/)? * [ ] Did you [perform a cursory search](https://github.com/osTicket/osTicket/issues) to see if your bug or enhancement is already reported? For more information on how to write a good [bug report](https://github.com/osTicket/osTicket/wiki/Github-Issues-Guidelines) diff --git a/README.md b/README.md index ee35ebd74..f842870d7 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ osTicket codebase before embarking on an upgrade. To trigger the update process, fetch the osTicket tarball from either the osTicket [github](http://github.com/osTicket/osTicket/releases) page -or from the [osTicket website](http://osticket.com). Extract the tarball +or from the [osTicket website](https://osticket.com). Extract the tarball into the folder of your osTicket codebase. This can also be accomplished with the zip file, and a FTP client can of course be used to upload the new source code to your server. @@ -88,10 +88,10 @@ View the UPGRADING.txt file for other todo items to complete your upgrade. Help ---- -Visit the [wiki](http://osticket.com/wiki/Home) or the -[forum](http://osticket.com/forums/). And if you'd like professional help +Visit the [Documentation](https://docs.osticket.com/) or the +[forum](https://forum.osticket.com/). And if you'd like professional help managing your osTicket installation, -[commercial support](http://osticket.com/support/) is available. +[commercial support](https://osticket.com/support/) is available. Contributing ------------ @@ -104,7 +104,7 @@ conversation of integrating your new feature into osTicket. [![Crowdin](https://d322cqt584bo4o.cloudfront.net/osticket-official/localized.png)](http://i18n.osticket.com/project/osticket-official) The interface for osTicket is now completely translatable. Language packs -are available on the [download page](http://osticket.com/download). If you +are available on the [download page](https://osticket.com/download). If you do not see your language there, join the [Crowdin](http://i18n.osticket.com) project and request to have your language added. Languages which reach 100% translated are are significantly reviewed will be made available on the diff --git a/include/client/footer.inc.php b/include/client/footer.inc.php index 6ff20f28a..85d778bb7 100644 --- a/include/client/footer.inc.php +++ b/include/client/footer.inc.php @@ -3,7 +3,7 @@
diff --git a/include/i18n/en_US/help/tips/emails.template.yaml b/include/i18n/en_US/help/tips/emails.template.yaml index 43458156b..db5bdabe4 100644 --- a/include/i18n/en_US/help/tips/emails.template.yaml +++ b/include/i18n/en_US/help/tips/emails.template.yaml @@ -34,7 +34,7 @@ language: Template Set. Language packs are available on osTicket.com. links: - title: osTicket Language Packs - href: http://osticket.com/download + href: https://osticket.com/download status: title: Status diff --git a/include/i18n/en_US/help/tips/install.yaml b/include/i18n/en_US/help/tips/install.yaml index b65340da0..00cc1fd96 100644 --- a/include/i18n/en_US/help/tips/install.yaml +++ b/include/i18n/en_US/help/tips/install.yaml @@ -28,7 +28,7 @@ default_lang: be installed for this language.

links: - title: osTicket Language Packs - href: http://osticket.com/download?product=langs + href: https://osticket.com/download/#ostLang first_name: title: First Name diff --git a/include/i18n/en_US/organization.yaml b/include/i18n/en_US/organization.yaml index dd5081b11..6f7d4b6cc 100644 --- a/include/i18n/en_US/organization.yaml +++ b/include/i18n/en_US/organization.yaml @@ -9,10 +9,10 @@ - name: osTicket fields: address:| - 420 Desoto Street + 1120 5th Street Alexandria, LA 71301 phone: (318) 290-3674 - website: http://osticket.com + website: https://osticket.com notes: > Not only do we develop the software, we also use it to manage support for osTicket. Let us help you quickly implement and leverage diff --git a/include/i18n/en_US/templates/email/task.alert.yaml b/include/i18n/en_US/templates/email/task.alert.yaml index ee6760803..c04e3a429 100644 --- a/include/i18n/en_US/templates/email/task.alert.yaml +++ b/include/i18n/en_US/templates/email/task.alert.yaml @@ -36,6 +36,6 @@ body: | href="%{task.staff_link}">login to the support system
Your friendly Customer Support System
- Powered By osTicket diff --git a/include/i18n/en_US/templates/email/task.transfer.alert.yaml b/include/i18n/en_US/templates/email/task.transfer.alert.yaml index 6e2d26a26..3f3cdfe5f 100644 --- a/include/i18n/en_US/templates/email/task.transfer.alert.yaml +++ b/include/i18n/en_US/templates/email/task.transfer.alert.yaml @@ -26,6 +26,6 @@ body: | Your friendly Customer Support System
- Powered By osTicket diff --git a/include/i18n/en_US/templates/email/ticket.alert.yaml b/include/i18n/en_US/templates/email/ticket.alert.yaml index 764a27bea..fbefd720d 100644 --- a/include/i18n/en_US/templates/email/ticket.alert.yaml +++ b/include/i18n/en_US/templates/email/ticket.alert.yaml @@ -45,6 +45,6 @@ body: | href="%{ticket.staff_link}">login to the support ticket system Your friendly Customer Support System
- Powered By osTicket diff --git a/include/i18n/en_US/templates/email/transfer.alert.yaml b/include/i18n/en_US/templates/email/transfer.alert.yaml index d195dc91c..8e508fd70 100644 --- a/include/i18n/en_US/templates/email/transfer.alert.yaml +++ b/include/i18n/en_US/templates/email/transfer.alert.yaml @@ -28,6 +28,6 @@ body: | Your friendly Customer Support System
- Powered By osTicket diff --git a/include/i18n/en_US/templates/ticket/installed.yaml b/include/i18n/en_US/templates/ticket/installed.yaml index 9dab69f2d..5eba3beaa 100644 --- a/include/i18n/en_US/templates/ticket/installed.yaml +++ b/include/i18n/en_US/templates/ticket/installed.yaml @@ -17,8 +17,8 @@ message: | Thank you for choosing osTicket.

Please make sure you join the osTicket forums and our mailing list to stay up to date + href="https://forum.osticket.com">osTicket forums and our mailing list to stay up to date on the latest news, security alerts and updates. The osTicket forums are also a great place to get assistance, guidance, tips, and help from other osTicket users. In addition to the forums, the osTicket wiki @@ -34,7 +34,7 @@ message: |

If the idea of managing and upgrading this osTicket installation is daunting, you can try osTicket as a hosted service at http://www.supportsystem.com/ -- + href="https://supportsystem.com">https://supportsystem.com/ -- no installation required and we can import your data! With SupportSystem's turnkey infrastructure, you get osTicket at its best, leaving you free to focus on your customers without the burden of making @@ -43,7 +43,7 @@ message: | Cheers,

-
- osTicket Team http://osticket.com/ + osTicket Team https://osticket.com/

PS. Don't just make customers happy, make happy customers! diff --git a/include/i18n/en_US/templates/ticket/upgraded.yaml b/include/i18n/en_US/templates/ticket/upgraded.yaml index 1ff02c052..3b71246c8 100644 --- a/include/i18n/en_US/templates/ticket/upgraded.yaml +++ b/include/i18n/en_US/templates/ticket/upgraded.yaml @@ -16,19 +16,19 @@ message: | (https://docs.osticket.com/en/latest/Developer%20Documentation/Changelog.html?highlight=notes) for more information about changes and new features.

- Be sure to join the osTicket - forums and our mailing + Be sure to join the osTicket + forums and our mailing list to stay up to date on announcements, security updates and alerts! Your contribution to osTicket community will be appreciated!

The osTicket team is committed to providing support to all users through our free online resources and a full range of commercial support packages and services. For more information, or to discuss your needs, - please contact us today at http://osticket.com/support/. Any feedback + please contact us today at https://osticket.com/support/. Any feedback will be appreciated!

If managing and upgrading this osTicket installation is daunting, you - can try osTicket as a hosted service at http://www.supportsystem.com/ -- + can try osTicket as a hosted service at https://supportsystem.com/ -- no upgrading ever, and we can import your data! With SupportSystem's turnkey infrastructure, you get osTicket at its best, leaving you free to focus on your customers without the burden of making sure the @@ -36,5 +36,5 @@ message: |

-
osTicket Team
- http://osticket.com/ + https://osticket.com/

diff --git a/include/staff/system.inc.php b/include/staff/system.inc.php index ecbbe9aa7..71486c233 100644 --- a/include/staff/system.inc.php +++ b/include/staff/system.inc.php @@ -74,7 +74,7 @@ else { $cv = $tv[0] == 'v' ? $tv : $gv; ?> + href="https://osticket.com/download?cv="> — isAdmin()) die('Access D

-

','');?>

+

','');?>

getErrors())) { if($errors['err']) @@ -23,13 +23,13 @@ if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access D

%s', __('System Logs')));?>


-

', '');?>

+

', '');?>

-

',''); echo sprintf(__('%1$s Contact us %2$s today for expedited help.'), '','');?>

+

',''); echo sprintf(__('%1$s Contact us %2$s today for expedited help.'), '','');?>

-

','');?>

+

','');?>

diff --git a/include/upgrader/prereq.inc.php b/include/upgrader/prereq.inc.php index 6925e3510..6d3686681 100644 --- a/include/upgrader/prereq.inc.php +++ b/include/upgrader/prereq.inc.php @@ -41,7 +41,7 @@ if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access D

1.

2. ', '');?>

3.

-

4. ', '');?>

+

4. ', '');?>

diff --git a/include/upgrader/rename.inc.php b/include/upgrader/rename.inc.php index c553f173f..ba9a548c6 100644 --- a/include/upgrader/rename.inc.php +++ b/include/upgrader/rename.inc.php @@ -15,7 +15,7 @@ if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access D
  • :
  • :
    • -

    ', '');?>

    +

    ', '');?>

    @@ -27,7 +27,7 @@ if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access D

    - professional upgrade and commercial support with guaranteed response times and access to the core development team. We can also help customize osTicket or even add new features to the system to meet your unique needs. Learn More!'); ?> + professional upgrade and commercial support with guaranteed response times and access to the core development team. We can also help customize osTicket or even add new features to the system to meet your unique needs. Learn More!'); ?>

    diff --git a/include/upgrader/upgrade.inc.php b/include/upgrader/upgrade.inc.php index 302688689..2fe3e2796 100644 --- a/include/upgrader/upgrade.inc.php +++ b/include/upgrader/upgrade.inc.php @@ -43,7 +43,7 @@ $action=$upgrader->getNextAction();

    1.

    2.

    -

    3. ', '');?>

    +

    3. ', '');?>

    diff --git a/setup/inc/file-missing.inc.php b/setup/inc/file-missing.inc.php index a60aaade9..0a25a182d 100644 --- a/setup/inc/file-missing.inc.php +++ b/setup/inc/file-missing.inc.php @@ -15,7 +15,7 @@ if(!defined('SETUPINC')) die('Kwaheri!');
  • :
  • :
    • -

    ','');?>

    +

    ','');?>

    @@ -26,6 +26,6 @@ if(!defined('SETUPINC')) die('Kwaheri!'); diff --git a/setup/inc/file-perm.inc.php b/setup/inc/file-perm.inc.php index 0640bd547..bd7922ddd 100644 --- a/setup/inc/file-perm.inc.php +++ b/setup/inc/file-perm.inc.php @@ -31,6 +31,6 @@ if(!defined('SETUPINC')) die('Kwaheri!'); diff --git a/setup/inc/file-unclean.inc.php b/setup/inc/file-unclean.inc.php index d9992f7f8..533bb8f11 100644 --- a/setup/inc/file-unclean.inc.php +++ b/setup/inc/file-unclean.inc.php @@ -7,12 +7,12 @@ if(!defined('SETUPINC')) die('Kwaheri!');

    ', '');?>

    -

    ', '');?>

    +

    ', '');?>

    diff --git a/setup/inc/footer.inc.php b/setup/inc/footer.inc.php index 7bb8ad861..01cddd790 100644 --- a/setup/inc/footer.inc.php +++ b/setup/inc/footer.inc.php @@ -2,7 +2,7 @@
    - + diff --git a/setup/inc/header.inc.php b/setup/inc/header.inc.php index fcb69d3ff..d6c980729 100644 --- a/setup/inc/header.inc.php +++ b/setup/inc/header.inc.php @@ -28,7 +28,7 @@ if (($lang = Internationalization::getCurrentLanguage()) foreach($wizard['menu'] as $k=>$v) echo sprintf('%s — ',$v,$k); ?> - +
    diff --git a/setup/inc/install-done.inc.php b/setup/inc/install-done.inc.php index 29ea15c0f..1b860b4ed 100644 --- a/setup/inc/install-done.inc.php +++ b/setup/inc/install-done.inc.php @@ -31,11 +31,11 @@ $url=URL; :
    - http://osticket.com/forum/ + https://forum.osticket.com/ - :
    - http://osticket.com/wiki/ + :
    + https://docs.osticket.com/ @@ -43,7 +43,7 @@ $url=URL;
    diff --git a/setup/inc/install-prereq.inc.php b/setup/inc/install-prereq.inc.php index 97d7a13c4..90dd6abfc 100644 --- a/setup/inc/install-prereq.inc.php +++ b/setup/inc/install-prereq.inc.php @@ -53,6 +53,6 @@ if(!defined('SETUPINC')) die('Kwaheri!'); diff --git a/setup/inc/install.inc.php b/setup/inc/install.inc.php index 15efe6061..ccf93bdce 100644 --- a/setup/inc/install.inc.php +++ b/setup/inc/install.inc.php @@ -120,7 +120,7 @@ $info=($_POST && $errors)?Format::htmlchars($_POST):array('prefix'=>'ost_','dbho
    -

    professional installation services and commercial support.');?>

    +

    professional installation services and commercial support.');?>

    diff --git a/setup/inc/subscribe.inc.php b/setup/inc/subscribe.inc.php index 961ce7ba2..0b427143e 100644 --- a/setup/inc/subscribe.inc.php +++ b/setup/inc/subscribe.inc.php @@ -43,6 +43,6 @@ $info=($_POST && $errors)?Format::htmlchars($_POST):$_SESSION['info'];

    - +

    diff --git a/setup/install.php b/setup/install.php index b093ba105..da08f20a6 100644 --- a/setup/install.php +++ b/setup/install.php @@ -27,8 +27,8 @@ $wizard=array(); $wizard['title']=__('osTicket Installer'); $wizard['tagline']=sprintf(__('Installing osTicket %s'),$installer->getVersionVerbose()); $wizard['logo']='logo.png'; -$wizard['menu']=array(__('Installation Guide')=>'http://osticket.com/wiki/Installation', - __('Get Professional Help')=>'http://osticket.com/support'); +$wizard['menu']=array(__('Installation Guide')=>'https://docs.osticket.com/en/latest/Getting%20Started/Installation.html', + __('Get Professional Help')=>'https://osticket.com/support'); if($_POST && $_POST['s']) { $errors = array();