[Scummvm-git-logs] scummvm-web master -> 05c20a26dc365ee2990807c28078df735f98892c
Mataniko
mataniko at gmail.com
Sat Jul 27 21:08:55 CEST 2019
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .
Summary:
05c20a26dc WEB: Remove old cloud pages
Commit: 05c20a26dc365ee2990807c28078df735f98892c
https://github.com/scummvm/scummvm-web/commit/05c20a26dc365ee2990807c28078df735f98892c
Author: Matan Bareket (mataniko at gmail.com)
Date: 2019-07-27T15:08:36-04:00
Commit Message:
WEB: Remove old cloud pages
Changed paths:
R public_html/c/index.php
R scss/pages/_cloud-style.scss
composer.json
package-lock.json
diff --git a/composer.json b/composer.json
index 0deea67..3cab413 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,6 @@
"scripts": {
"post-install-cmd": [
"pscss -f compressed ./scss/main.scss > ./public_html/css/main.css",
- "pscss -f compressed ./scss/pages/_cloud-style.scss > ./public_html/css/cloud-style.css",
"pscss -f compressed ./scss/pages/_mirrorbrain.scss > ./public_html/css/mirrorbrain.css",
"php include/I18N.php"
],
diff --git a/package-lock.json b/package-lock.json
index 44689b5..1857e10 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1544,9 +1544,9 @@
}
},
"lodash": {
- "version": "4.17.11",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
- "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
},
"log-symbols": {
"version": "2.2.0",
@@ -1626,9 +1626,9 @@
}
},
"mixin-deep": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
- "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
"requires": {
"for-in": "^1.0.2",
"is-extendable": "^1.0.1"
@@ -2061,9 +2061,9 @@
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
},
"set-value": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
- "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
"requires": {
"extend-shallow": "^2.0.1",
"is-extendable": "^0.1.1",
@@ -2337,35 +2337,14 @@
}
},
"union-value": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
- "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
"requires": {
"arr-union": "^3.1.0",
"get-value": "^2.0.6",
"is-extendable": "^0.1.1",
- "set-value": "^0.4.3"
- },
- "dependencies": {
- "extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "requires": {
- "is-extendable": "^0.1.0"
- }
- },
- "set-value": {
- "version": "0.4.3",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
- "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
- "requires": {
- "extend-shallow": "^2.0.1",
- "is-extendable": "^0.1.1",
- "is-plain-object": "^2.0.1",
- "to-object-path": "^0.3.0"
- }
- }
+ "set-value": "^2.0.1"
}
},
"universalify": {
diff --git a/public_html/c/index.php b/public_html/c/index.php
deleted file mode 100644
index 850874c..0000000
--- a/public_html/c/index.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<!doctype html>
-<html>
- <head>
- <title>ScummVM</title>
- <meta charset="utf-8"/>
- <link rel="stylesheet" type="text/css" href="/css/cloud-style.css"/>
- </head>
- <body>
- <div class="container">
- <div class='header'>
- <center><img src="/images/scummvm_logo.png"/></center>
- </div>
- <div class="content">
- <p>Now please enter this code in ScummVM:</p>
- <?php
- function crc16($data)
- {
- //"CRC16_CCITT_FALSE"
- $crc = 0xFFFF;
- for ($i = 0; $i < strlen($data); ++$i) {
- $x = (($crc >> 8) ^ ord($data[$i])) & 0xFF;
- $x ^= $x >> 4;
- $crc = (($crc << 8) ^ ($x << 12) ^ ($x << 5) ^ $x) & 0xFFFF;
- }
- return $crc;
- }
-
- if (isset($_GET["code"])) {
- $hashchars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ?!";
-
- //remove "bad" characters from the given code:
- $code = preg_replace("/[^_\-\/\\a-z0-9]/i", "", $_GET["code"]);
-
- //append code's crc16 to the code
- $crc = crc16($code);
- $code .= $hashchars[($crc & 0x003F)];
- $code .= $hashchars[($crc & 0x0FC0) >> 6];
- $code .= $hashchars[($crc & 0xF000) >> 12];
-
- //break the code into pieces of 6 chars
- //and calculate the checksum character for each piece
- $len = strlen($code);
- $new_code = "";
- for ($i = 0; $i < $len; $i+=6) {
- $bits = 0x2A;
- for ($j = 0; $j < 6 && $i + $j < $len; ++$j) {
- $byte = ord($code[$i + $j]);
- $bits = $bits ^ $byte;
- $new_code .= $code[$i + $j];
- }
- $new_code .= $hashchars[$bits % 64]." ";
- }
-
- //show the "new code" - groups with checksums
- echo "<b class='code'>".$new_code."</b>";
- }
- ?>
- </div>
- </div>
- </body>
-</html>
diff --git a/scss/pages/_cloud-style.scss b/scss/pages/_cloud-style.scss
deleted file mode 100644
index 334cd07..0000000
--- a/scss/pages/_cloud-style.scss
+++ /dev/null
@@ -1,35 +0,0 @@
- at import '../abstracts/variables';
- at import '../theme/scummvm';
-
-html {
- background: $theme-background;
-}
-
-.container {
- width: 80%;
- margin: 0 auto;
-}
-
-.header {
- padding: 10pt;
- margin-bottom: 0;
-}
-
-.content {
- padding: 8pt;
- background: $theme-container-background;
- font-family: $theme-fonts;
- font-size: 16pt;
- p {
- margin: 0 0 6pt 0;
- }
-}
-
-.code {
- display: block;
- background: #FFFFFF;
- font-family: Consolas;
- font-size: 24pt;
- padding: 4pt;
- margin: 6pt 0;
-}
More information about the Scummvm-git-logs
mailing list