diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..ce2e3fe --- /dev/null +++ b/.htaccess @@ -0,0 +1,10 @@ +RewriteEngine On + +#remove trailing slash +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteRule ^(.*)/$ $1 [R=301,L] + +RewriteRule ^faq$ faq.php [L] +RewriteRule ^tos$ tos.php [L] +RewriteRule ^download/(.*)$ download.php?os=$1 [L] \ No newline at end of file diff --git a/css/style.css b/css/style.css index 4e8d6d4..bf708b1 100755 --- a/css/style.css +++ b/css/style.css @@ -3939,7 +3939,7 @@ span.code { position: absolute; left: -30px; } -#footer ul a.icon-facebook, #footer ul a.icon-twitter { +#footer ul a.icon-facebook, #footer ul a.icon-twitter, #footer ul a.icon-ghost { width: 30px; height: 30px; line-height: 30px; @@ -3953,7 +3953,7 @@ span.code { -moz-transition: background ease .2s; transition: background ease .2s; } -#footer ul a.icon-facebook:hover, #footer ul a.icon-twitter:hover { +#footer ul a.icon-facebook:hover, #footer ul a.icon-twitter:hover, #footer ul a.icon-ghost:hover { background: #005c98; } #footer ul a.icon-twitter { @@ -3963,6 +3963,13 @@ span.code { #footer ul a.icon-twitter:hover { background: #00a3cf; } +#footer ul a.icon-ghost { + text-indent: 7px; + background: #E5850A; +} +#footer ul a.icon-ghost:hover { + background: #E79338; +} #footer ul a.icon-facebook:before, #footer ul a.icon-twitter:before { display: block; position: absolute; @@ -4029,68 +4036,68 @@ span.code { text-align: center; } } -#page-faq #header { +.page #header { height: auto; position: static; background-image: none; } -#page-faq .container { +.page .container { top: auto; } -#page-faq .container article { +.page .container article { border-top: 1px solid #eee; padding: 10px 0 15px; } -#page-faq .container h1 { +.page .container h1 { font-size: 36px; font-weight: bold; color: #0e1226; margin-bottom: 10px; } -#page-faq .container #what { +.page .container #what { border-top: 0; padding: 0; } -#page-faq .container #what p { +.page .container #what p { font-size: 24px; line-height: 32px; margin-bottom: 20px; margin-top: 0; } -#page-faq .container article:not(#what) p { +.page .container article:not(#what) p { font-size: 18px; line-height: 22px; } -#page-faq .container h2 { +.page .container h2 { font-size: 24px; font-weight: bold; color: #0e1226; margin-bottom: 5px; } -#page-faq .container h2 + p { +.page .container h2 + p { margin-top: 0; } -#page-faq .container strong { +.page .container strong { color: #0e1226; opacity: .6; } -#page-faq .container .icon-mac, -#page-faq .container .icon-win { +.page .container .icon-mac, +.page .container .icon-win { position: relative; padding-left: 50px; } -#page-faq .container .icon-mac:before, -#page-faq .container .icon-win:before { +.page .container .icon-mac:before, +.page .container .icon-win:before { position: absolute; left: 18px; top: 0; } -#page-faq .container .warning { +.page .container .warning { padding: 10px 10px 10px 50px; border-radius: 2px; position: relative; } -#page-faq .container .warning:before { +.page .container .warning:before { position: absolute; top: 10px; left: 18px; @@ -4109,14 +4116,14 @@ span.code { font-size: 18px; color: #858230; } -#page-faq .container .warning a { +.page .container .warning a { color: #858230; font-weight: bold; } -#page-faq .container .warning a:hover { +.page .container .warning a:hover { text-decoration: none; } -#page-faq .container .step-code li { +.page .container .step-code li { list-style: none; padding: 5px 0 5px 10px; } diff --git a/download.php b/download.php index c4882f8..f27700b 100644 --- a/download.php +++ b/download.php @@ -1,13 +1,7 @@ $link_mac, - "win" => $link_win, - "linux32" => $link_linux32, - "linux64" => $link_linux64 - ); + require_once(__DIR__ . "/inc/config.php"); - if (isset($_GET['os']) && isset($releases[$_GET['os']])) { + if(isset($_GET['os']) && array_key_exists($_GET['os'], $releases)) { $download_file = $releases[$_GET['os']]; } else { header("Location: /"); @@ -16,10 +10,10 @@ - - - - + + + + - - + + - Popcorn Time - <?=$langsite["TITLE_DL"]?> - " /> - - - - + <?=$langsite["TITLE_DL"]?> - Popcorn Time + "> + - - - - - - - + + + + + + - - + @@ -342,22 +332,25 @@ - - + + + + diff --git a/faq.php b/faq.php index cc45688..3e1a3f4 100644 --- a/faq.php +++ b/faq.php @@ -1,11 +1,11 @@ - + - - - - + + + + - - - - Popcorn Time - <?=$langsite["TITLE_FAQ"]?> - " /> - - - - - - - - - - + + + + <?=$langsite["TITLE_FAQ"]?> - Popcorn Time + "> + + + + + + + - +
-


- get-popcorn.com

+


+

- - + + + + diff --git a/favicon.ico b/images/favicon.ico similarity index 100% rename from favicon.ico rename to images/favicon.ico diff --git a/images/header-ui.png b/images/header-ui.png deleted file mode 100644 index 5e43bcb..0000000 Binary files a/images/header-ui.png and /dev/null differ diff --git a/images/how-ui.jpg b/images/how-ui.jpg new file mode 100644 index 0000000..1a30fe1 Binary files /dev/null and b/images/how-ui.jpg differ diff --git a/images/how-ui.png b/images/how-ui.png deleted file mode 100644 index 35a1f9e..0000000 Binary files a/images/how-ui.png and /dev/null differ diff --git a/inc/config.php b/inc/config.php index b830588..145b107 100644 --- a/inc/config.php +++ b/inc/config.php @@ -1,41 +1,50 @@ "http://cdn.get-popcorn.com/build/Popcorn-Time-0.2.9-Mac.tar.gz", + "win" => "http://cdn.get-popcorn.com/build/Popcorn-Time-0.2.9-Win-32.zip", + "linux32" => "http://cdn.get-popcorn.com/build/Popcorn-Time-0.2.9-Linux-32.tar.gz", + "linux64" => "http://cdn.get-popcorn.com/build/Popcorn-Time-0.2.9-Linux-64.tar.gz" + ); + + /* language manager */ + $langlist = array(); + foreach(scandir("inc/lang") as $value) { + if(preg_match("/^([a-z-]{2,5}).php$/i", $value, $langname)){ + $langlist[]=$langname[1]; + } } -} -$lang = "en"; -if (!empty($_GET["lang"])) { - $newlang = $_GET["lang"]; -} else if (!empty($_COOKIE["lang"])) { - $newlang = $_COOKIE["lang"]; -} -if (isset($newlang) && preg_match("/^[a-z-]{2,5}$/i", $newlang) && in_array($newlang, $langlist)) { - $lang = $newlang; - setcookie("lang", $lang,time()+31536000); -} -if(!empty($_GET["lang"])) header("Location: ".strtok($_SERVER['REQUEST_URI'], '?')); -include("inc/lang/$lang.php"); - -function printlangs(){ - global $langlist,$lang; - foreach($langlist as $langname){ - echo "\n"; + $lang = "en"; + if (!empty($_GET["lang"])) { + $newlang = $_GET["lang"]; + } else if (!empty($_COOKIE["lang"])) { + $newlang = $_COOKIE["lang"]; + } + if (isset($newlang) && preg_match("/^[a-z-]{2,5}$/i", $newlang) && in_array($newlang, $langlist)) { + $lang = $newlang; + setcookie("lang", $lang,time()+31536000); } -} + if(!empty($_GET["lang"])) header("Location: ".strtok($_SERVER['REQUEST_URI'], '?')); + include("inc/lang/$lang.php"); -?> \ No newline at end of file + function printlangs(){ + global $langlist,$lang; + foreach($langlist as $langname){ + echo "\n"; + } + } \ No newline at end of file diff --git a/index.php b/index.php index 84274f4..f57abe9 100644 --- a/index.php +++ b/index.php @@ -1,11 +1,11 @@ - + - - - - + + + + - - + + Popcorn Time - <?=$langsite["TITLE_INDEX"]?> - " /> - - - - + "> + - - - - - + + + + +
@@ -132,49 +129,49 @@
- +

- +

- +

- +

- Pochoclin -
+ Pochoclin +

-
+
- +
- +
- +
- +
@@ -190,7 +187,7 @@
    • - Popcorn Time UI + Popcorn Time UI
    @@ -200,19 +197,19 @@ @@ -221,21 +218,24 @@ - - + + + + \ No newline at end of file diff --git a/tos.php b/tos.php index 030d910..7e36ae1 100644 --- a/tos.php +++ b/tos.php @@ -1,11 +1,11 @@ - + - - - - + + + + - - + + - Popcorn Time - <?=$langsite["TITLE_TOS"]?> - " /> - + <?=$langsite["TITLE_TOS"]?> - Popcorn Time + "> + - - - - - + + + + + - -
    + + + +
    +
    +
    +
    +

    Terms of service

    +
    + +

    Your Acceptance

    +

    By using the "POPCORN TIME" app you signify your agreement to (1) these terms and conditions (the "Terms of Service").

    -

    Privacy Policy.

    -

    You understand that by using "POPCORN TIME" you may encounter material that you may deem to be offensive, indecent, or objectionable, and that such content may or may not be identified as having explicit material. "POPCORN TIME" will have no liability to you for such material – you agree that your use of "POPCORN TIME" is at your sole risk.

    +

    Privacy Policy.

    +

    You understand that by using "POPCORN TIME" you may encounter material that you may deem to be offensive, indecent, or objectionable, and that such content may or may not be identified as having explicit material. "POPCORN TIME" will have no liability to you for such material – you agree that your use of "POPCORN TIME" is at your sole risk.

    -

    DISCLAIMERS

    -

    YOU EXPRESSLY AGREE THAT YOUR USE OF "POPCORN TIME" IS AT YOUR SOLE RISK. "POPCORN TIME" AND ALL PRODUCTS ARE PROVIDED TO YOU β€œAS IS” WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. "POPCORN TIME" MAKES ABSOLUTELY NO WARRANTIES WHATSOEVER, EXPRESS OR IMPLIED. TO THE FULLEST EXTENT POSSIBLE UNDER APPLICABLE LAWS, YIFY DISCLAIMS ALL WARRANTIES, EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR OTHER VIOLATIONS OF RIGHTS.

    +

    DISCLAIMERS

    +

    YOU EXPRESSLY AGREE THAT YOUR USE OF "POPCORN TIME" IS AT YOUR SOLE RISK. "POPCORN TIME" AND ALL PRODUCTS ARE PROVIDED TO YOU β€œAS IS” WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. "POPCORN TIME" MAKES ABSOLUTELY NO WARRANTIES WHATSOEVER, EXPRESS OR IMPLIED. TO THE FULLEST EXTENT POSSIBLE UNDER APPLICABLE LAWS, YIFY DISCLAIMS ALL WARRANTIES, EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR OTHER VIOLATIONS OF RIGHTS.

    -

    LIMITATION OF LIABILITY

    -

    "POPCORN TIME" IS NOT RESPONSIBLE FOR ANY PROBLEMS OR TECHNICAL MALFUNCTION OF ANY WEBSITE, NETWORK, COMPUTER SYSTEMS, SERVERS, PROVIDERS, COMPUTER EQUIPMENT, OR SOFTWARE, OR FOR ANY FAILURE DUE TO TECHNICAL PROBLEMS OR TRAFFIC CONGESTION ON THE INTERNET OR "POPCORN TIME" OR COMBINATION THEREOF, INCLUDING ANY INJURY OR DAMAGE TO USERS OR TO ANY COMPUTER OR OTHER DEVICE ON OR THROUGH WHICH "POPCORN TIME" IS PROVIDED. UNDER NO CIRCUMSTANCES WILL "POPCORN TIME" BE LIABLE FOR ANY LOSS OR DAMAGE, INCLUDING PERSONAL INJURY OR DEATH, RESULTING FROM YOUR USE OF "POPCORN TIME".

    +

    LIMITATION OF LIABILITY

    +

    "POPCORN TIME" IS NOT RESPONSIBLE FOR ANY PROBLEMS OR TECHNICAL MALFUNCTION OF ANY WEBSITE, NETWORK, COMPUTER SYSTEMS, SERVERS, PROVIDERS, COMPUTER EQUIPMENT, OR SOFTWARE, OR FOR ANY FAILURE DUE TO TECHNICAL PROBLEMS OR TRAFFIC CONGESTION ON THE INTERNET OR "POPCORN TIME" OR COMBINATION THEREOF, INCLUDING ANY INJURY OR DAMAGE TO USERS OR TO ANY COMPUTER OR OTHER DEVICE ON OR THROUGH WHICH "POPCORN TIME" IS PROVIDED. UNDER NO CIRCUMSTANCES WILL "POPCORN TIME" BE LIABLE FOR ANY LOSS OR DAMAGE, INCLUDING PERSONAL INJURY OR DEATH, RESULTING FROM YOUR USE OF "POPCORN TIME".

    -

    SOURCE MATERIAL

    -

    ALL MOVIES ARE NOT HOSTED IN ANY SERVER AND ARE STREAMED USING THE P2P BIT TORRENT PROTOCOL. ALL MOVIES ARE PULLED IN FROM THE YIFY MOVIE DATABASE. BY WATCHING A MOVIE WITH THIS APPLICATION YOU MIGHT BE COMMITING COPYRIGHT VIOLATIONS DEPENDING ON YOUR COUNTRY'S LAWS. WE DO NOT TAKE ANY RESPONSABILITIES.

    +

    SOURCE MATERIAL

    +

    ALL MOVIES ARE NOT HOSTED IN ANY SERVER AND ARE STREAMED USING THE P2P BIT TORRENT PROTOCOL. ALL MOVIES ARE PULLED IN FROM THE YIFY MOVIE DATABASE. BY WATCHING A MOVIE WITH THIS APPLICATION YOU MIGHT BE COMMITING COPYRIGHT VIOLATIONS DEPENDING ON YOUR COUNTRY'S LAWS. WE DO NOT TAKE ANY RESPONSABILITIES.

    -

    Ability to Accept Terms of Service

    -

    By using "POPCORN TIME" or accessing this site you affirm that you are either more than 18 years of age, or an emancipated minor, or possess legal parental or guardian consent, and are fully able and competent to enter into the terms, conditions, obligations, affirmations, representations, and warranties set forth in these Terms of Service, and to abide by and comply with these Terms of Service. In any case, you affirm that you are over the age of 13, as the Service is not intended for children under 13. If you are under 13 years of age, then please do not use the Service. There are lots of other great web sites for you. Talk to your parents about what sites are appropriate for you.

    -
    +

    Ability to Accept Terms of Service

    +

    By using "POPCORN TIME" or accessing this site you affirm that you are either more than 18 years of age, or an emancipated minor, or possess legal parental or guardian consent, and are fully able and competent to enter into the terms, conditions, obligations, affirmations, representations, and warranties set forth in these Terms of Service, and to abide by and comply with these Terms of Service. In any case, you affirm that you are over the age of 13, as the Service is not intended for children under 13. If you are under 13 years of age, then please do not use the Service. There are lots of other great web sites for you. Talk to your parents about what sites are appropriate for you.

    +
    +
    + + - - + + + +