From: Dan Untenzu Date: Tue, 17 Jan 2017 11:42:04 +0000 (+0100) Subject: [!!][FEATURE] Let admin overwrite the ToS page X-Git-Tag: 2.0.0~7 X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/commitdiff_plain/4a53554259c43793bb7035489da0e6bd79993b6e?ds=inline [!!][FEATURE] Let admin overwrite the ToS page Let the admin overwrite the content of the "Terms of Service" page by copying the original ToS template and creating a local file (same procedure as for the configuration). This file is not versionized. Note: This is a breaking change, since the existing tos textfile is moved. This should be mentioned in the update comments. * ToS text file changed → move file from "/tos_text.php" to "/lib/tos.local.txt" and remove all HTML und PHP Tags, leaving a regular text file. Refs #95 --- diff --git a/.gitignore b/.gitignore index bfa50cd..00bbc72 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ lib/config.local.php +lib/tos.local.txt var-* diff --git a/lib/tos.original.txt b/lib/tos.original.txt new file mode 100644 index 0000000..1e3e01e --- /dev/null +++ b/lib/tos.original.txt @@ -0,0 +1,61 @@ +TERMS OF SERVICE + +1. ACCEPTANCE OF TERMS +###ORGANISATION### provides the information on this Web site as provided in these Terms of Service ("TOS"). ###ORGANISATION### may update the TOS at any time and without prior notice by posting a new version at ###WEBROOT###. The information on this site and your use of it is subject to the most recent version of the TOS posted. + +2. DESCRIPTION OF SERVICE +###ORGANISATION### provides you an upload service and a variety of other services. ("###ORGANISATION### Service"). Unless explicitly stated otherwise, any new features that augment or enhance the current ###ORGANISATION### Service shall be subject to the TOS. + +3. CONDUCT +You understand that all information, data, text, software, graphics or other materials ("Content"), whether publicly posted or privately transmitted, are the sole responsibility of the person from whom such Content originated. This means that you, and not ###ORGANISATION###, are entirely responsible for all Content that you upload, post, email, transmit or otherwise make available via the ###ORGANISATION### Service. ###ORGANISATION### does not control the Content posted via the ###ORGANISATION### Service and, as such, does not guarantee the accuracy, integrity or quality of such Content. Under no circumstances will ###ORGANISATION### be liable in any way for any Content, including, but not limited to, any errors or omissions in any Content, or any loss or damage of any kind incurred as a result of the use of any Content posted, emailed, transmitted or otherwise made available via the ###ORGANISATION### Service. You agree to not use the ###ORGANISATION### Service to: + 1) upload, post, email, transmit or otherwise make available any Content that is unlawful, harmful, threatening, abusive, harassing, tortuous, defamatory, vulgar, obscene, libelous, invasive of another's privacy, hateful, or racially, ethnically or otherwise objectionable or harm minors; + 2) impersonate any person or entity or falsely state or otherwise misrepresent your affiliation with a person or entity; + 3) forge headers or otherwise manipulate identifiers in order to disguise the origin of any Content transmitted through the ###ORGANISATION### Service; + 4) upload, post, email, transmit or otherwise make available any Content that you do not have a right to make available under any law or under contractual or other relationships; + 5) upload, post, email, transmit or otherwise make available any Content that infringes any patent, trademark, trade secret, copyright or other proprietary rights of any party; + 6) upload, post, email, transmit or otherwise make available any unsolicited or unauthorized advertising, promotional materials, "junk mail," "spam," or any other form of solicitation; + 7) upload, post, email, transmit or otherwise make available any material that contains software viruses or any other computer code, files or programs designed to interrupt, destroy or limit the functionality of any computer software or hardware or telecommunications equipment; + 8) disrupt the normal flow of dialogue, or otherwise act in a manner that negatively affects other users' ability to engage in discussions or exchanges; + 9) interfere with or disrupt the ###ORGANISATION### Service or servers or networks connected to the ###ORGANISATION### Service, or disobey any requirements, procedures, policies or regulations of networks connected to the ###ORGANISATION### Service; + 10) intentionally or unintentionally violate any applicable local, state, national or international law, + 11) "stalk" or otherwise harass another; and/or + 12) collect or store personal data about other users in connection with the prohibited conduct and activities set forth in paragraphs above. You acknowledge that ###ORGANISATION### may or may not pre-screen Content, but that ###ORGANISATION### and its designees shall have the right (but not the obligation) in their sole discretion to pre-screen, refuse, move, or remove any Content that is available via the ###ORGANISATION### Service and which violates the TOS. You agree that you must evaluate, and bear all risks associated with, the use of any Content, including any reliance on the accuracy, completeness, or usefulness of such Content. You acknowledge, consent and agree that ###ORGANISATION### may access, preserve and disclose your account information and Content if required to do so by law or in a good faith belief that such access preservation or disclosure is reasonably necessary to: + (a) comply with legal process; + (b) enforce the TOS; + (c) respond to claims that any Content violates the rights of third parties; + (d) respond to your requests for customer service; or (e) protect the rights, property or personal safety of ###ORGANISATION### its users and the public. + +4. CONTENT MADE AVAILABLE FOR INCLUSION ON THE ###ORGANISATION### SERVICE +###ORGANISATION### does not claim ownership of Content you submit or make available for inclusion via the ###ORGANISATION### Service. However, with respect to Content you submit or make available for inclusion on the publicly available ###ORGANISATION### Service, you irrevocably grant ###ORGANISATION### the perpetual, worldwide, royalty-free and non-exclusive license, with the right to sublicense through multiple tiers of sublicensees, to use, distribute, reproduce, modify, adapt, publicly perform and publicly display such Content, in whole or in part, on the ###ORGANISATION### Service or other publications by ###ORGANISATION### in any media whether now existing or which come into the existence into the future and to provide that information under the license set forth on the initial page of the $url Web site. And for Content you submit for private discussions, you grant ###ORGANISATION### the worldwide, royalty-free and non-exclusive license to use, distribute, reproduce, modify, adapt, publicly perform and publicly display such Content on the associated private discussion group. + +5. INDEMNITY +You agree to indemnify and hold ###ORGANISATION### and its subsidiaries, affiliates, officers, agents, employees, partners and licensors harmless from any claim or demand, including but not limited to reasonable attorneys' fees, made by any third party due to or arising out of Content you submit, post, transmit or otherwise make available through the Service, your use of the ###ORGANISATION### Service, your connection to the Service, your violation of the TOS, or your violation of any rights of another. + +6. MODIFICATIONS TO ###ORGANISATION### SERVICE You acknowledge that ###ORGANISATION### may establish general practices and limits concerning use of the ###ORGANISATION### Service, including without limitation the maximum number of days that email messages, message board postings or other uploaded Content will be retained by the ###ORGANISATION### Service.. You further acknowledge that ###ORGANISATION### reserves the right to modify these general practices and limits from time to time. ###ORGANISATION### reserves the right at any time and from time to time to modify or discontinue, temporarily or permanently, the ###ORGANISATION### Service (or any part thereof) with or without notice. You agree that ###ORGANISATION### shall not be liable to you or to any third party for any modification, suspension or discontinuance of the ###ORGANISATION### Service. + +7. TERMINATION +You agree that ###ORGANISATION### may terminate your access to the ###ORGANISATION### Service for violations of the TOS and/or requests by authorized law enforcement or other government agencies. + +8. LINKS +The ###ORGANISATION### Service may provide, or third parties may provide, links to other World Wide Web sites or resources. Because ###ORGANISATION### has no control over such sites and resources, you acknowledge and agree that ###ORGANISATION### is not responsible for the availability of such external sites or resources, and does not endorse and is not responsible or liable for any Content, advertising, products or other materials on or available from such sites or resources. You further acknowledge and agree that ###ORGANISATION### shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such Content, goods or services available on or through any such site or resource. + +9. DISCLAIMER OF WARRANTIES +You expressly understand and agree that: Your use of the ###ORGANISATION### service is at your sole risk. ###ORGANISATION### service is provided on an "as is" and "as available" basis. ###ORGANISATION### and its subsidiaries, affiliates, officers, employees and licensors expressly disclaim all warranties of any kind, whether express or implied, including, but not limited to the implied warranties of merchantability, fitness for a particular purpose and non-infringement. ###ORGANISATION### and its subsidiaries, affiliates, officers, employees and licensors make no warranty that +(i) The ###ORGANISATION### service will meet your requirements; +(ii) The ###ORGANISATION### service will be uninterrupted, timely, secure or error-free and +(iii) The results that may be obtained from the use of the ###ORGANISATION### service will be accurate or reliable. No advice or information, whether oral or written, obtained by you from ###ORGANISATION### or through or from the service shall create any warranty not expressly stated in the TOS. + +10. LIMITATION OF LIABILITY +You expressly understand and agree that ###ORGANISATION### and its subsidiaries, affiliates, officers, employees, agents, partners and licensors shall not be liable to you for any direct, indirect, incidental, special, consequential or exemplary damages, including, but not limited to, damages for loss of profits, goodwill, use, data or other intangible losses (even if ###ORGANISATION### has been advised of the possibility of such damages), resulting from the use or the inability to use the ###ORGANISATION### service. + +11. NOTICE AND PROCEDURE FOR MAKING CLAIMS OF COPYRIGHT INFRINGEMENT +###ORGANISATION### respects the copyright of others, and we ask our users to do the same. ###ORGANISATION### may, in appropriate circumstances and at its discretion, disable and/or terminate the access of users who may be repeat infringers. If you believe that your work has been copied in a way that constitutes copyright infringement, please provide ###ORGANISATION###'s Copyright Agent the following information: an electronic or physical signature of the person authorized to act on behalf of the owner of the copyright; a description of the copyrighted work that you claim has been infringed; a description of where the material that you claim is infringing is located on the site; your address, telephone number, and email address; a statement by you that you have a good faith belief that the disputed use is not authorized by the copyright owner, its agent, or the law; a statement by you, made under penalty of perjury, that the above information in your Notice is accurate and that you are the copyright owner or authorized to act on the copyright owner's behalf. + +###ORGANISATION###'s Agent for Notice of claims of copyright infringement can be reached as follows: + +###CONTACTPERSON### + + + +This license text is under »Creative Commons - Attribution 3.0 Unported« (https://creativecommons.org/licenses/by/3.0). +It is based on the »Open Source Initiative Terms of Service« (https://opensource.org/ToS). diff --git a/tos.php b/tos.php index c5e4307..44fc86c 100644 --- a/tos.php +++ b/tos.php @@ -1,45 +1,40 @@ -. - */ - -define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); -require (JIRAFEAU_ROOT . 'lib/settings.php'); -require (JIRAFEAU_ROOT . 'lib/functions.php'); -require (JIRAFEAU_ROOT . 'lib/lang.php'); - -require (JIRAFEAU_ROOT . 'lib/template/header.php'); - -$url = $cfg['web_root'] . 'tos.php'; -$org = "[THIS WEBSITE]"; -$contact = " -By email: - contact@[THIS WEBSITE] -"; - -include (JIRAFEAU_ROOT . 'tos_text.php'); - -echo '

Terms of Service

'; -echo '
'; -echo ''; -echo '

This license text is under Creative Commons - Attribution 3.0 Unported.

It has been based on this work: http://opensource.org/ToS

'; -echo '
'; - -require (JIRAFEAU_ROOT . 'lib/template/footer.php'); - +. + */ + +define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); + +require (JIRAFEAU_ROOT . 'lib/settings.php'); +require (JIRAFEAU_ROOT . 'lib/functions.php'); +require (JIRAFEAU_ROOT . 'lib/lang.php'); + +// Read ToS template +if (is_readable(JIRAFEAU_ROOT . 'lib/tos.local.txt')) { + $content = file_get_contents(JIRAFEAU_ROOT . 'lib/tos.local.txt'); +} else { + $content = file_get_contents(JIRAFEAU_ROOT . 'lib/tos.original.txt'); +} + +// Replace markers and print ToS +require (JIRAFEAU_ROOT . 'lib/template/header.php'); + +echo '

Terms of Service

'; +echo '
' . jirafeau_replace_markers($content, true) . '
'; + +require (JIRAFEAU_ROOT . 'lib/template/footer.php'); + ?> \ No newline at end of file diff --git a/tos_text.php b/tos_text.php deleted file mode 100644 index c19c243..0000000 --- a/tos_text.php +++ /dev/null @@ -1,63 +0,0 @@ -http://opensource.org/ToS - */ -$tos=" -TERMS OF SERVICE - -1. ACCEPTANCE OF TERMS -$org provides the information on this Web site as provided in these Terms of Service (\"TOS\"). $org may update the TOS at any time and without prior notice by posting a new version at $url. The information on this site and your use of it is subject to the most recent version of the TOS posted. - -2. DESCRIPTION OF SERVICE -$org provides you an upload service and a variety of other services. (\"$org Service\"). Unless explicitly stated otherwise, any new features that augment or enhance the current $org Service shall be subject to the TOS. - -3. CONDUCT -You understand that all information, data, text, software, graphics or other materials (\"Content\"), whether publicly posted or privately transmitted, are the sole responsibility of the person from whom such Content originated. This means that you, and not $org, are entirely responsible for all Content that you upload, post, email, transmit or otherwise make available via the $org Service. $org does not control the Content posted via the $org Service and, as such, does not guarantee the accuracy, integrity or quality of such Content. Under no circumstances will $org be liable in any way for any Content, including, but not limited to, any errors or omissions in any Content, or any loss or damage of any kind incurred as a result of the use of any Content posted, emailed, transmitted or otherwise made available via the $org Service. You agree to not use the $org Service to: - 1) upload, post, email, transmit or otherwise make available any Content that is unlawful, harmful, threatening, abusive, harassing, tortuous, defamatory, vulgar, obscene, libelous, invasive of another's privacy, hateful, or racially, ethnically or otherwise objectionable or harm minors; - 2) impersonate any person or entity or falsely state or otherwise misrepresent your affiliation with a person or entity; - 3) forge headers or otherwise manipulate identifiers in order to disguise the origin of any Content transmitted through the $org Service; - 4) upload, post, email, transmit or otherwise make available any Content that you do not have a right to make available under any law or under contractual or other relationships; - 5) upload, post, email, transmit or otherwise make available any Content that infringes any patent, trademark, trade secret, copyright or other proprietary rights of any party; - 6) upload, post, email, transmit or otherwise make available any unsolicited or unauthorized advertising, promotional materials, \"junk mail,\" \"spam,\" or any other form of solicitation; - 7) upload, post, email, transmit or otherwise make available any material that contains software viruses or any other computer code, files or programs designed to interrupt, destroy or limit the functionality of any computer software or hardware or telecommunications equipment; - 8) disrupt the normal flow of dialogue, or otherwise act in a manner that negatively affects other users' ability to engage in discussions or exchanges; - 9) interfere with or disrupt the $org Service or servers or networks connected to the $org Service, or disobey any requirements, procedures, policies or regulations of networks connected to the $org Service; - 10) intentionally or unintentionally violate any applicable local, state, national or international law, - 11) \"stalk\" or otherwise harass another; and/or - 12) collect or store personal data about other users in connection with the prohibited conduct and activities set forth in paragraphs above. You acknowledge that $org may or may not pre-screen Content, but that $org and its designees shall have the right (but not the obligation) in their sole discretion to pre-screen, refuse, move, or remove any Content that is available via the $org Service and which violates the TOS. You agree that you must evaluate, and bear all risks associated with, the use of any Content, including any reliance on the accuracy, completeness, or usefulness of such Content. You acknowledge, consent and agree that $org may access, preserve and disclose your account information and Content if required to do so by law or in a good faith belief that such access preservation or disclosure is reasonably necessary to: - (a) comply with legal process; - (b) enforce the TOS; - (c) respond to claims that any Content violates the rights of third parties; - (d) respond to your requests for customer service; or (e) protect the rights, property or personal safety of $org its users and the public. - -4. CONTENT MADE AVAILABLE FOR INCLUSION ON THE $org SERVICE -$org does not claim ownership of Content you submit or make available for inclusion via the $org Service. However, with respect to Content you submit or make available for inclusion on the publicly available $org Service, you irrevocably grant $org the perpetual, worldwide, royalty-free and non-exclusive license, with the right to sublicense through multiple tiers of sublicensees, to use, distribute, reproduce, modify, adapt, publicly perform and publicly display such Content, in whole or in part, on the $org Service or other publications by $org in any media whether now existing or which come into the existence into the future and to provide that information under the license set forth on the initial page of the $url Web site. And for Content you submit for private discussions, you grant $org the worldwide, royalty-free and non-exclusive license to use, distribute, reproduce, modify, adapt, publicly perform and publicly display such Content on the associated private discussion group. - -5. INDEMNITY -You agree to indemnify and hold $org and its subsidiaries, affiliates, officers, agents, employees, partners and licensors harmless from any claim or demand, including but not limited to reasonable attorneys' fees, made by any third party due to or arising out of Content you submit, post, transmit or otherwise make available through the Service, your use of the $org Service, your connection to the Service, your violation of the TOS, or your violation of any rights of another. - -6. MODIFICATIONS TO $org SERVICE You acknowledge that $org may establish general practices and limits concerning use of the $org Service, including without limitation the maximum number of days that email messages, message board postings or other uploaded Content will be retained by the $org Service.. You further acknowledge that $org reserves the right to modify these general practices and limits from time to time. $org reserves the right at any time and from time to time to modify or discontinue, temporarily or permanently, the $org Service (or any part thereof) with or without notice. You agree that $org shall not be liable to you or to any third party for any modification, suspension or discontinuance of the $org Service. - -7. TERMINATION -You agree that $org may terminate your access to the $org Service for violations of the TOS and/or requests by authorized law enforcement or other government agencies. - -8. LINKS -The $org Service may provide, or third parties may provide, links to other World Wide Web sites or resources. Because $org has no control over such sites and resources, you acknowledge and agree that $org is not responsible for the availability of such external sites or resources, and does not endorse and is not responsible or liable for any Content, advertising, products or other materials on or available from such sites or resources. You further acknowledge and agree that $org shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such Content, goods or services available on or through any such site or resource. - -9. DISCLAIMER OF WARRANTIES -You expressly understand and agree that: Your use of the $org service is at your sole risk. $org service is provided on an \"as is\" and \"as available\" basis. $org and its subsidiaries, affiliates, officers, employees and licensors expressly disclaim all warranties of any kind, whether express or implied, including, but not limited to the implied warranties of merchantability, fitness for a particular purpose and non-infringement. $org and its subsidiaries, affiliates, officers, employees and licensors make no warranty that -(i) The $org service will meet your requirements; -(ii) The $org service will be uninterrupted, timely, secure or error-free and -(iii) The results that may be obtained from the use of the $org service will be accurate or reliable. No advice or information, whether oral or written, obtained by you from $org or through or from the service shall create any warranty not expressly stated in the TOS. - -10. LIMITATION OF LIABILITY -You expressly understand and agree that $org and its subsidiaries, affiliates, officers, employees, agents, partners and licensors shall not be liable to you for any direct, indirect, incidental, special, consequential or exemplary damages, including, but not limited to, damages for loss of profits, goodwill, use, data or other intangible losses (even if $org has been advised of the possibility of such damages), resulting from the use or the inability to use the $org service. - -11. NOTICE AND PROCEDURE FOR MAKING CLAIMS OF COPYRIGHT INFRINGEMENT -$org respects the copyright of others, and we ask our users to do the same. $org may, in appropriate circumstances and at its discretion, disable and/or terminate the access of users who may be repeat infringers. If you believe that your work has been copied in a way that constitutes copyright infringement, please provide $org's Copyright Agent the following information: an electronic or physical signature of the person authorized to act on behalf of the owner of the copyright; a description of the copyrighted work that you claim has been infringed; a description of where the material that you claim is infringing is located on the site; your address, telephone number, and email address; a statement by you that you have a good faith belief that the disputed use is not authorized by the copyright owner, its agent, or the law; a statement by you, made under penalty of perjury, that the above information in your Notice is accurate and that you are the copyright owner or authorized to act on the copyright owner's behalf. - -$org's Agent for Notice of claims of copyright infringement can be reached as follows: - -$contact -"; -?>