| + |
| + |
|
+
+
+
+
+
+
+ |
+
Re-introducing Superman, from the original 1940s serial cartoons.
** + + + +>A total of seventeen shorts were produced. They were originally produced by [Fleischer Studios](https://en.wikipedia.org/wiki/Fleischer_Studios), releasing the pilot and eight cartoons in 1941 and 1942 before being taken over in May by [Famous Studios](https://en.wikipedia.org/wiki/Famous_Studios), a successor company, who produced eight more in 1942 and 1943. - [Wikipedia](https://en.wikipedia.org/wiki/Superman_(1940s_cartoons)) + +These are true gems in the hall of film history. Check out the first nine episodes today: + +- [*Superman* (a.k.a. *The Mad Scientist*)](lbry://superman1940-e1) +- [*The Mechanical Monsters*](lbry://superman1940-e2) +- [*Billion Dollar Limited*](lbry://superman1940-e3) +- [*The Arctic Giant*](lbry://superman1940-e4) +- [*The Bulleteers*](lbry://superman1940-e5) +- [*The Magnetic Telescope*](lbry://superman1940-e6) +- [*Electric Earthquake*](lbry://superman1940-e7) +- [*Volcano*](lbry://superman1940-e8) +- [*Terror on the Midway*](lbry://superman1940-e9) + +**Not on LBRY yet?** [Get an invite here](https://lbry.io/get). Know some great public domain content to share? Have high quality scans? Email reilly@lbry.io for a trip to the front of the line. diff --git a/content/news/71-credit-policy-third-quarter-report.md b/content/news/71-credit-policy-third-quarter-report.md new file mode 100644 index 00000000..6002baff --- /dev/null +++ b/content/news/71-credit-policy-third-quarter-report.md @@ -0,0 +1,31 @@ +--- +author: lbry +title: 'Credit Policy and 3rd Quarter Credit Report' +date: '2016-10-05 00:06:18' +cover: 'lbry-3d-1000.png' +--- +As Mike Vine explained in [our recent FAQ](https://lbry.io/news/reddit-ama-answers#whatis), LBRY-the-protocol is quite different from LBRY-the-company. With the launch of LBRY’s live blockchain, the company created three reserve pools of credits to serve specific purposes. LBRY, Inc. will administer these reserves to promote the use and growth of the protocol. + +**The three reserve funds:** + +- **Community Fund:** (200M credits) Reward early adopters, new users, and community contributions. +- **Institutional Fund:** (100M credits) For strategic partnerships or assistance with charities, non-profits, and other institutions. +- **Operational Fund:** (100M credits) To allow LBRY, Inc. to function and profit. + +**LBRY, Inc. is committed to transparency in our use of these funds.** You can learn more about the purposes of these funds and track the public wallets associated with them on our Credit Policy page: + +[**LBRY Credit Policy**](https://lbry.io/faq/credit-policy) + +LBRY, Inc. publishes a Quarterly Credit Report that details all expenditures from these three funds and forecasts anticipated expenditures over the following quarter. + +The [Third Quarter 2016 Report](https://lbry.io/faq/quarterly-report-3q-2016) is now available to review. + +**Highlights:** + +- All fund expenditures were substantially below estimates. +- 276,778 LBC were distributed from the [Community Fund](https://docs.google.com/spreadsheets/d/1zPG58YuLPqpB3yzypntRWouoEVc4saDOifpnvnwS8Rc/edit?ts=57f28d0e#gid=0) to alpha testers, beta testers, community managers, and [bounty hunters](https://lbry.io/bounty). +- 100,000 LBC were distributed from the Operational Fund to ShapeShift to provide liquidity on their platform. +- No institutional credits were moved or spent. +- No anticipated sales from operational reserve until at least the Second Quarter 2017. + +**Not on LBRY yet?** [Get an invite here](https://lbry.io/get). Know some great public domain content to share? Have high quality scans? Email reilly@lbry.io for a trip to the front of the line. diff --git a/content/news/72-sporthocking.md b/content/news/72-sporthocking.md new file mode 100644 index 00000000..8ded45be --- /dev/null +++ b/content/news/72-sporthocking.md @@ -0,0 +1,28 @@ +--- +author: reilly +title: 'Will the Real Slim Shady Please Sit Down' +date: '2016-10-06 00:06:00' +cover: 'sporthock-banner.jpg' +--- +One of the great things about working at LBRY is discovering entire worlds and niches that defy categorization. + +Have you heard of Sporthocking? Me neither. Resident LBRY superfan and sporthocker Trenton Rawdon introduced us to the sport. And we haven’t stood up since. + +Hocker is the German word for stool. So Sporthocker literally means SportStool. + + + +In his first video, [TJ in Berlin](lbry://sporthock-berlin), Trenton “TJ” Rawdon shows us various tricks and moves taken from disciplines such as juggling, breakdancing, board sports and acrobatics. + + + +Inspired by guys freestyling tricks with homemade stools in the German city of Kiel, the Landschutz brothers designed the first Sporthocker prototype in 2006. Today, they own a Sporthocker brand and product design company called [Salzig in Berlin, Germany](http://www.sporthocker.com/en/). They’ve travelled two European tours and hold annual events for the budding sport. + +This is a sport worth checking out. See the tour of Europe today: + +- [*Hock Tour Madrid*](lbry://sporthock-madrid) +- [*Hock Tour Rome*](lbry://sporthock-rome) +- [*Hock Tour Paris*](lbry://sporthock-paris) +- [*Hock Tour Rotterdam*](lbry://sporthock-rotterdam) + +**Not on LBRY yet?** [Get an invite here](https://lbry.io/get). Want to share your niche with the world? Email reilly@lbry.io for a trip to the front of the line. diff --git a/posts/press-kit.md b/content/press-kit.md similarity index 84% rename from posts/press-kit.md rename to content/press-kit.md index 17328dbc..87f6449a 100644 --- a/posts/press-kit.md +++ b/content/press-kit.md @@ -14,14 +14,19 @@ LBRY uses blockchain technology to provide a new way for people to publish and s - [LBRY in 100 Seconds (Video)](https://www.youtube.com/watch?v=qkUA0vTWM7g) - [How Does LBRY Work, Exactly?](https://lbry.io/news/introducing-lbry-the-bitcoin-of-content) - [Why Doesn't LBRY Just Use Bitcoin?](https://lbry.io/news/why-doesnt-lbry-just-use-bitcoin) + +###Official Press Releases + +- [LBRY Announces $500K Raise to Build the First Community-Controlled YouTube Alternative](https://lbry.io/press/500k-fundraising-round-pillar-vc.md), **September 7, 2016** ### Media Mentions +- [Blockchain content sharing app LBRY declares independent from Google, Apple and Amazon](http://www.ibtimes.co.uk/blockchain-content-sharing-app-lbry-declares-independent-google-apple-amazon-1568755), **International Business Times, July 2016** - [LBRY and decentralised apps - an interview with Jeremy Kauffman](http://goodtechnologyproject.org/blog/2016/02/07/lbry-and-decentralised-apps-an-interview-with-jeremy-kauffman/), **Good Technology Project, February 2016** - [The Appcoin Revolution: Interview with Mike Vine of LBRY](http://cointelegraph.com/news/the-appcoin-revolution-interview-with-mike-vine-of-lbry), **CoinTelegraph, February 2016** - [Alexandria vs LBRY - Which will be the file sharing application of the next generation?](http://bravenewcoin.com/news/alexandria-vs-lbry-which-will-be-the-file-sharing-application-of-the-next-generation/), **BraveNewCoin, December 2015** - [LBRY: The Lovechild of Bitcoin, BitTorrent & Storj](http://cointelegraph.com/news/lbry-the-lovechild-of-bitcoin-bittorrent-storj), **CoinTelegraph, October 2015** -- [This New Hampshire Startup's Plan to Fight Netflix is Equal Parts BitTorrent and Bitcoin](http://bostinno.streetwise.co/2015/09/18/bitcoin-startups-lbry-combines-bittorrent-and-bitcoin-to-fight-netflix/), **Bostinno, September 2015** +- [This New Hampshire Startup's Plan to Fight Netflix is Equal Parts BitTorrent and Bitcoin](http://bostinno.streetwise.co/2015/09/18/bitcoin-startups-lbry-combines-bittorrent-and-bitcoin-to-fight-netflix/), **BostInno, September 2015** ### Contact & Social Media diff --git a/content/press/500k-fundraising-round-pillar-vc.md b/content/press/500k-fundraising-round-pillar-vc.md new file mode 100644 index 00000000..b2e282c3 --- /dev/null +++ b/content/press/500k-fundraising-round-pillar-vc.md @@ -0,0 +1,27 @@ +--- +title: LBRY Announces $500K Raise to Build the First Community-Controlled YouTube Alternative +--- +September 7, 2016 + +MANCHESTER, NH – LBRY, a community-controlled content marketplace, today announced a $500K fundraising round. The round is led by Pillar, a Boston-based venture capital firm that focuses on transformative technologies. The company will use this capital primarily to expand its staff and fund development toward a full public release of its consumer app. LBRY’s ultimate goal is for users to have access to every film, song, book, and app ever made – on any device. + +LBRY’s marketplace was science-fiction material just a few short years ago. It was the emergence of Bitcoin and its blockchain technology that laid the groundwork for LBRY’s platform. Using this technology, LBRY enables fans to pay creators directly without relying on an intermediary like Apple, Amazon, or Google. People across the world are all able to use the same system to store and view content, without a single central point of control. + +In the wake of the [recent controversy](http://observer.com/2016/09/youtube-phillyd-eric-schiffer/) around YouTube censoring its content creators for ad dollars, LBRY offers to fill the void with a service that, by design, responds to standards set by the community – not advertisers. With over 125,000 people on the company’s beta waitlist, there is clearly strong demand for an alternative. + +LBRY was founded in 2015 by repeat entrepreneur Jeremy Kauffman, CEO. The company’s management team includes Michael Zargham, CTO, Mike Vine, Head of Marketing, and Josh Finer, COO/CFO, an MBA with deep roots in the cryptocurrency community. There are a total of 11 people on the LBRY team, and the company is headquartered in New Hampshire, with additional team members located in Philadelphia, Connecticut, New Orleans, Massachusetts, and California. + +“We have always said that LBRY will be built no matter the financial situation,” explained co-founder Mike Vine. “This funding allows us to accelerate our efforts. The ambitions behind LBRY are grand. Any company now serving you media – whether that is a streaming subscription or pay-per-download – is vulnerable to a market that connects creators to fans without taking a cut. The essence of entrepreneurship is finding a way to deliver greater quality at a lower price than anything that exists. We’ve found a way.” + +**About LBRY** + +LBRY is a content-sharing and publishing platform that is decentralized and controlled by its users. It allows content creators to post their works to the hosting network, set their price per view/download, and collect payment. LBRY is an open-source protocol, as opposed to a centralized service, so there is no entity to take a “cut” of transactions or change the terms in an attempt to monetize the product. It’s like a new extension of the internet for delivering all media – films, ebooks, songs, and apps – from creators directly to consumers with radical efficiency. + +**About Pillar** + +Pillar invests in exceptional entrepreneurs pursuing transformative technologies that leverage machine intelligence. Founded in 2016, the firm partners with entrepreneurs by providing access to critical resources companies need to scale, including enterprise relationships, PR/marketing, talent and leadership development. Pillar is headquartered in Boston. For more information, please visit [www.pillar.vc](http://pillar.vc/). + +**Contact:** +Mike Vine, Evangelist, [mike@lbry.io](mailto:mike@lbry.io), 888-723-7679 + +**Press Kit:** [http://www.lbry.io/press-kit](http://www.lbry.io/press-kit) diff --git a/controller/Actions.class.php b/controller/Actions.class.php index 7f54a6fa..44959bd6 100644 --- a/controller/Actions.class.php +++ b/controller/Actions.class.php @@ -1,39 +1,5 @@ "frame-ancestors 'none'", - 'X-Frame-Options' => 'DENY', - 'X-XSS-Protection'=> '1', - ]; - - if (IS_PRODUCTION) + if (IS_PRODUCTION && function_exists('newrelic_name_transaction')) { - $defaultHeaders['Strict-Transport-Security'] = 'max-age=31536000'; + newrelic_name_transaction(Request::getMethod() . ' ' . strtolower($uri)); } - static::sendHeaders(array_merge($defaultHeaders, $headers)); + $viewAndParams = static::execute(Request::getMethod(), $uri); + $viewTemplate = $viewAndParams[0]; + $viewParameters = $viewAndParams[1] ?? []; + if (!IS_PRODUCTION && isset($viewAndParams[2])) + { + throw new Exception('use response::setheader instead of returning headers'); + } if ($viewTemplate === null) { - return ''; + return; } if (!$viewTemplate) { - throw new LogicException('All execute methods must return a template.'); + throw new LogicException('All execute methods must return a template or NULL.'); } $layout = !(isset($viewParameters['_no_layout']) && $viewParameters['_no_layout']); unset($viewParameters['_no_layout']); - $layoutParams = isset($viewParameters[View::LAYOUT_PARAMS]) ? $viewParameters[View::LAYOUT_PARAMS] : []; + $layoutParams = $viewParameters[View::LAYOUT_PARAMS] ?? []; unset($viewParameters[View::LAYOUT_PARAMS]); $content = View::render($viewTemplate, $viewParameters + ['fullPage' => true]); - echo $layout ? View::render('layout/basic', ['content' => $content] + $layoutParams) : $content; + Response::setContent($layout ? View::render('layout/basic', ['content' => $content] + $layoutParams) : $content); + Response::setDefaultSecurityHeaders(); + if (Request::isGzipAccepted()) + { + Response::gzipContentIfNotDisabled(); + } + Response::send(); } catch (StopException $e) { @@ -52,93 +53,101 @@ class Controller } } - public static function execute($uri) + public static function execute($method, $uri) { - switch($uri) + $router = static::getRouterWithRoutes(); + try { - case '/': - return ContentActions::executeHome(); - case '/get': - case '/windows': - case '/ios': - case '/android': - case '/linux': - case '/osx': - return DownloadActions::executeGet(); - case '/postcommit': - return OpsActions::executePostCommit(); - case '/log-upload': - return OpsActions::executeLogUpload(); - case '/list-subscribe': - return MailActions::executeListSubscribe(); - case '/press-kit.zip': - return ContentActions::executePressKit(); - case '/roadmap': - return ContentActions::executeRoadmap(); - case '/LBRY-deck.pdf': - case '/deck.pdf': - return static::redirect('https://www.dropbox.com/s/0xj4vgucsbi8rtv/lbry-deck.pdf?dl=1'); - case '/pln.pdf': - case '/plan.pdf': - return static::redirect('https://www.dropbox.com/s/uevjrwnyr672clj/lbry-pln.pdf?dl=1'); - case '/lbry-osx-latest.dmg': - case '/lbry-linux-latest.deb': - case '/dl/lbry_setup.sh': - return static::redirect('/get', 301); - case '/get/lbry.dmg': - return static::redirect(Github::getDownloadUrl(Os::OS_OSX) ?: '/get'); - case '/get/lbry.deb': - return static::redirect(Github::getDownloadUrl(Os::OS_LINUX) ?: '/get'); - case '/art': - return static::redirect('/what', 301); - case '/why': - case '/feedback': - return static::redirect('/learn', 301); - case '/faq/when-referral-payouts': - return static::redirect('/faq/referrals', 301); + $dispatcher = new Routing\Dispatcher($router->getData()); + return $dispatcher->dispatch($method, $uri); } - - $newsPattern = '#^' . ContentActions::URL_NEWS . '(/|$)#'; - if (preg_match($newsPattern, $uri)) + catch (\Routing\HttpRouteNotFoundException $e) { - $slug = preg_replace($newsPattern, '', $uri); - if ($slug == ContentActions::RSS_SLUG) + return NavActions::execute404(); + } + catch (\Routing\HttpMethodNotAllowedException $e) + { + Response::setStatus(405); + Response::setHeader('Allow', implode(', ', $e->getAllowedMethods())); + return ['page/405']; + } + } + + protected static function getRouterWithRoutes(): \Routing\RouteCollector + { + $router = new Routing\RouteCollector(); + + $router->get(['/', 'home'], 'ContentActions::executeHome'); + + $router->get(['/get', 'get'], 'DownloadActions::executeGet'); + $router->get(['/windows', 'get-windows'], 'DownloadActions::executeGet'); + $router->get(['/linux', 'get-linux'], 'DownloadActions::executeGet'); + $router->get(['/osx', 'get-osx'], 'DownloadActions::executeGet'); + $router->get(['/android', 'get-android'], 'DownloadActions::executeGet'); + $router->get(['/ios', 'get-ios'], 'DownloadActions::executeGet'); + $router->get('/roadmap', 'ContentActions::executeRoadmap'); + + $router->get(['/press-kit.zip', 'press-kit'], 'ContentActions::executePressKit'); + + $router->post('/postcommit', 'OpsActions::executePostCommit'); + $router->post('/log-upload', 'OpsActions::executeLogUpload'); + + $router->any('/list/subscribe', 'MailActions::executeSubscribe'); + $router->get('/list/confirm/{hash}', 'MailActions::executeConfirm'); + + $router->post('/set-culture', 'i18nActions::setCulture'); + + $permanentRedirects = [ + '/lbry-osx-latest.dmg' => '/get', + '/lbry-linux-latest.deb' => '/get', + '/dl/lbry_setup.sh' => '/get', + '/art' => '/what', + '/why' => '/learn', + '/feedback' => '/learn', + '/faq/when-referral-payouts' => '/faq/referrals', + '/news/meet-the-lbry-founders' => '/team', + '/join-list' => '/list/subscribe', + ]; + + $tempRedirects = [ + '/LBRY-deck.pdf' => 'https://www.dropbox.com/s/0xj4vgucsbi8rtv/lbry-deck.pdf?dl=1', + '/deck.pdf' => 'https://www.dropbox.com/s/0xj4vgucsbi8rtv/lbry-deck.pdf?dl=1', + '/pln.pdf' => 'https://www.dropbox.com/s/uevjrwnyr672clj/lbry-pln.pdf?dl=1', + '/plan.pdf' => 'https://www.dropbox.com/s/uevjrwnyr672clj/lbry-pln.pdf?dl=1', + '/get/lbry.dmg' => GitHub::getDownloadUrl(Os::OS_OSX) ?: '/get', + '/get/lbry.deb' => GitHub::getDownloadUrl(Os::OS_LINUX) ?: '/get', + '/get/lbry.msi' => GitHub::getDownloadUrl(Os::OS_WINDOWS) ?: '/get', + ]; + + foreach ([302 => $tempRedirects, 301 => $permanentRedirects] as $code => $redirects) + { + foreach ($redirects as $src => $target) { - return ContentActions::executeRss(); + $router->any($src, function () use ($target, $code) { return static::redirect($target, $code); }); } - return $slug ? ContentActions::executeNewsPost($uri) : ContentActions::executeNews(); } - $faqPattern = '#^' . ContentActions::URL_FAQ . '(/|$)#'; - if (preg_match($faqPattern, $uri)) - { - $slug = preg_replace($faqPattern, '', $uri); - return $slug ? ContentActions::executeFaqPost($uri) : ContentActions::executeFaq(); - } + $router->get([ContentActions::URL_NEWS . '/{slug:c}?', 'news'], 'ContentActions::executeNews'); + $router->get([ContentActions::URL_FAQ . '/{slug:c}?', 'faq'], 'ContentActions::executeFaq'); + $router->get([ContentActions::URL_BOUNTY . '/{slug:c}?', 'bounty'], 'ContentActions::executeBounty'); + $router->get([ContentActions::URL_PRESS . '/{slug:c}', 'press'], 'ContentActions::executePress'); - $bountyPattern = '#^' . BountyActions::URL_BOUNTY_LIST . '(/|$)#'; - if (preg_match($bountyPattern, $uri)) - { - $slug = preg_replace($bountyPattern, '', $uri); - return $slug ? BountyActions::executeShow($uri) : BountyActions::executeList($uri); - } + $router->any(['/signup{whatever}?', 'signup'], 'DownloadActions::executeSignup'); - $accessPattern = '#^/signup#'; - if (preg_match($accessPattern, $uri)) + $router->get('/{slug}', function (string $slug) { - return DownloadActions::executeSignup(); - } + if (View::exists('page/' . $slug)) + { + Response::enableHttpCache(); + return ['page/' . $slug, []]; + } + else + { + return NavActions::execute404(); + } + }); - - $noSlashUri = ltrim($uri, '/'); - if (View::exists('page/' . $noSlashUri)) - { - return ['page/' . $noSlashUri, []]; - } - else - { - return ['page/404', [], [static::HEADER_STATUS => 404]]; - } + return $router; } public static function redirect($url, $statusCode = 302) @@ -150,88 +159,26 @@ class Controller $url = str_replace('&', '&', $url); - $headers = [static::HEADER_STATUS => $statusCode]; - + Response::setStatus($statusCode); if ($statusCode == 201 || ($statusCode >= 300 && $statusCode < 400)) { - $headers['Location'] = $url; + Response::setHeader(Response::HEADER_LOCATION, $url); } - return ['internal/redirect', ['url' => $url], $headers]; + return ['internal/redirect', ['url' => $url]]; } - protected static function sendHeaders(array $headers) + public static function queueToRunAfterResponse(callable $fn) { - if (isset($headers[static::HEADER_STATUS])) - { - $status = 'HTTP/1.0 ' . $headers[static::HEADER_STATUS] . ' ' . static::getStatusTextForCode($headers[static::HEADER_STATUS]); - header($status); - - if (substr(php_sapi_name(), 0, 3) == 'cgi') - { - // fastcgi servers cannot send this status information because it was sent by them already due to the HTT/1.0 line - // so we can safely unset them. see ticket #3191 - unset($headers[static::HEADER_STATUS]); - } - } - - foreach($headers as $name => $value) - { - header($name . ': ' . $value); - } + static::$queuedFunctions[] = $fn; } - public static function getStatusTextForCode($code) + public static function shutdown() { - $statusTexts = [ - '100' => 'Continue', - '101' => 'Switching Protocols', - '200' => 'OK', - '201' => 'Created', - '202' => 'Accepted', - '203' => 'Non-Authoritative Information', - '204' => 'No Content', - '205' => 'Reset Content', - '206' => 'Partial Content', - '300' => 'Multiple Choices', - '301' => 'Moved Permanently', - '302' => 'Found', - '303' => 'See Other', - '304' => 'Not Modified', - '305' => 'Use Proxy', - '306' => '(Unused)', - '307' => 'Temporary Redirect', - '400' => 'Bad Request', - '401' => 'Unauthorized', - '402' => 'Payment Required', - '403' => 'Forbidden', - '404' => 'Not Found', - '405' => 'Method Not Allowed', - '406' => 'Not Acceptable', - '407' => 'Proxy Authentication Required', - '408' => 'Request Timeout', - '409' => 'Conflict', - '410' => 'Gone', - '411' => 'Length Required', - '412' => 'Precondition Failed', - '413' => 'Request Entity Too Large', - '414' => 'Request-URI Too Long', - '415' => 'Unsupported Media Type', - '416' => 'Requested Range Not Satisfiable', - '417' => 'Expectation Failed', - '419' => 'Authentication Timeout', - '422' => 'Unprocessable Entity', - '426' => 'Upgrade Required', - '429' => 'Too Many Requests', - '500' => 'Internal Server Error', - '501' => 'Not Implemented', - '502' => 'Bad Gateway', - '503' => 'Service Unavailable', - '504' => 'Gateway Timeout', - '505' => 'HTTP Version Not Supported', - ]; - - return isset($statusTexts[$code]) ? $statusTexts[$code] : null; + while ($fn = array_shift(static::$queuedFunctions)) + { + call_user_func($fn); + } } } diff --git a/controller/Request.class.php b/controller/Request.class.php new file mode 100644 index 00000000..ab4b1091 --- /dev/null +++ b/controller/Request.class.php @@ -0,0 +1,108 @@ + ''] + Post::collectMetadata($allBounties, 'category'); - $allStatuses = ['' => ''] + array_merge(Post::collectMetadata($allBounties, 'status'), ['complete' => 'unavailable']); - - $selectedStatus = static::param('status', 'available'); - $selectedCategory = static::param('category'); - - $filters = array_filter([ - 'category' => $selectedCategory && isset($allCategories[$selectedCategory]) ? $selectedCategory : null, - 'status' => $selectedStatus && isset($allStatuses[$selectedStatus]) ? $selectedStatus : null - ]); - - $bounties = $filters ? Post::filter($allBounties, $filters) : $allBounties; - - uasort($bounties, function($postA, $postB) { - $metadataA = $postA->getMetadata(); - $metadataB = $postB->getMetadata(); - $awardA = strpos('-', $metadataA['award']) !== false ? rtrim(explode('-', $metadataA['award'])[0], '+') : $metadataA['award']; - $awardB = strpos('-', $metadataB['award']) !== false ? rtrim(explode('-', $metadataB['award'])[0], '+') : $metadataB['award']; - if ($awardA != $awardB) - { - return $awardA > $awardB ? -1 : 1; - } - return $metadataA['title'] < $metadataB['title'] ? -1 : 1; - }); - - return ['bounty/list', [ - 'bounties' => $bounties, - 'categories' => $allCategories, - 'statuses' => $allStatuses, - 'selectedCategory' => $selectedCategory, - 'selectedStatus' => $selectedStatus - ]]; - } - - public static function executeShow($relativeUri) - { - list($metadata, $postHtml) = View::parseMarkdown(ROOT_DIR . '/posts/' . $relativeUri . '.md'); - if (!$postHtml) - { - return ['page/404', []]; - } - return ['bounty/show', [ - 'postHtml' => $postHtml, - 'metadata' => $metadata - ]]; - } -} \ No newline at end of file diff --git a/controller/action/ContentActions.class.php b/controller/action/ContentActions.class.php index 48b865f6..65966291 100644 --- a/controller/action/ContentActions.class.php +++ b/controller/action/ContentActions.class.php @@ -1,119 +1,196 @@ $posts, + View::LAYOUT_PARAMS => [ + 'showRssLink' => true + ] + ]]; + } + + if ($slug == static::SLUG_RSS) + { + $posts = Post::find(static::VIEW_FOLDER_NEWS, Post::SORT_DATE_DESC); + Response::setHeader(Response::HEADER_CONTENT_TYPE, 'text/xml; charset=utf-8'); + return ['content/rss', [ + 'posts' => array_slice($posts, 0, 10), + '_no_layout' => true + ]]; + } + + try + { + $post = Post::load(static::SLUG_NEWS . '/' . ltrim($slug, '/')); + } + catch (PostNotFoundException $e) + { + return NavActions::execute404(); + } + + return ['content/news-post', [ + 'post' => $post, + View::LAYOUT_PARAMS => [ + 'showRssLink' => true + ] + ]]; + } + + public static function executeFaq(string $slug = null): array + { + Response::enableHttpCache(); + + if (!$slug) + { + $allPosts = Post::find(static::VIEW_FOLDER_FAQ); + + $allCategories = array_merge(['' => ''] + Post::collectMetadata($allPosts, 'category'), [ + 'getstarted' => 'Getting Started', + 'install' => 'Installing LBRY', + 'running' => 'Running LBRY', + 'wallet' => 'The LBRY Wallet', + 'hosting' => 'Hosting Content', + 'mining' => 'Mining LBC', + 'policy' => 'Policies', + 'developer' => 'Developers', + 'other' => 'Other Questions', + ]); + $selectedCategory = Request::getParam('category'); + $filters = array_filter([ + 'category' => $selectedCategory && isset($allCategories[$selectedCategory]) ? $selectedCategory : null, + ]); + + asort($allCategories); + + $posts = $filters ? Post::filter($allPosts, $filters) : $allPosts; + + + $groups = array_fill_keys(array_keys($allCategories), []); + + foreach ($posts as $post) + { + $groups[$post->getCategory()][] = $post; + } + + return ['content/faq', [ + 'categories' => $allCategories, + 'selectedCategory' => $selectedCategory, + 'postGroups' => $groups + ]]; + } + + try + { + $post = Post::load(static::SLUG_FAQ . '/' . ltrim($slug, '/')); + } + catch (PostNotFoundException $e) + { + return NavActions::execute404(); + } + return ['content/faq-post', ['post' => $post]]; + } + + public static function executePress(string $slug = null): array + { + Response::enableHttpCache(); + try + { + $post = Post::load(static::SLUG_PRESS . '/' . ltrim($slug, '/')); + } + catch (PostNotFoundException $e) + { + return NavActions::execute404(); + } + return ['content/press-post', ['post' => $post]]; + } + + public static function executeBounty(string $slug = null): array + { + Response::enableHttpCache(); + + if ($slug) + { + list($metadata, $postHtml) = View::parseMarkdown(ContentActions::VIEW_FOLDER_BOUNTY . '/' . $slug . '.md'); + if (!$postHtml) + { + return NavActions::execute404(); + } + + return ['bounty/show', [ + 'postHtml' => $postHtml, + 'metadata' => $metadata + ]]; + } + + $allBounties = Post::find(static::CONTENT_DIR . '/bounty'); + + $allCategories = ['' => ''] + Post::collectMetadata($allBounties, 'category'); + $allStatuses = ['' => ''] + array_merge(Post::collectMetadata($allBounties, 'status'), ['complete' => 'unavailable']); + + $selectedStatus = Request::getParam('status', 'available'); + $selectedCategory = Request::getParam('category'); - $allCategories = array_merge(['' => ''] + Post::collectMetadata($allPosts, 'category'), [ - 'getstarted' => 'Getting Started', - 'install' => 'Installing LBRY', - 'running' => 'Running LBRY', - 'wallet' => 'The LBRY Wallet', - 'hosting' => 'Hosting Content', - 'mining' => 'Mining LBC', - 'policy' => 'Policies', - 'developer' => 'Developers', - 'other' => 'Other Questions', - ]); - $selectedCategory = static::param('category'); $filters = array_filter([ 'category' => $selectedCategory && isset($allCategories[$selectedCategory]) ? $selectedCategory : null, + 'status' => $selectedStatus && isset($allStatuses[$selectedStatus]) ? $selectedStatus : null ]); - asort($allCategories); + $bounties = $filters ? Post::filter($allBounties, $filters) : $allBounties; - $posts = $filters ? Post::filter($allPosts, $filters) : $allPosts ; + uasort($bounties, function($postA, $postB) { + $metadataA = $postA->getMetadata(); + $metadataB = $postB->getMetadata(); + $awardA = strpos('-', $metadataA['award']) !== false ? rtrim(explode('-', $metadataA['award'])[0], '+') : $metadataA['award']; + $awardB = strpos('-', $metadataB['award']) !== false ? rtrim(explode('-', $metadataB['award'])[0], '+') : $metadataB['award']; + if ($awardA != $awardB) + { + return $awardA > $awardB ? -1 : 1; + } + return $metadataA['title'] < $metadataB['title'] ? -1 : 1; + }); - - $groups = array_fill_keys(array_keys($allCategories), []); - - foreach($posts as $post) - { - $groups[$post->getCategory()][] = $post; - } - - return ['content/faq', [ + return ['bounty/list', [ + 'bounties' => $bounties, 'categories' => $allCategories, + 'statuses' => $allStatuses, 'selectedCategory' => $selectedCategory, - 'postGroups' => $groups + 'selectedStatus' => $selectedStatus ]]; } - public static function executeNews() - { - $posts = Post::find(static::VIEW_FOLDER_NEWS, Post::SORT_DATE_DESC); - return ['content/news', [ - 'posts' => $posts, - View::LAYOUT_PARAMS => [ - 'showRssLink' => true - ] - ]]; - } - - - public static function executeRss() - { - $posts = Post::find(static::VIEW_FOLDER_NEWS, Post::SORT_DATE_DESC); - return ['content/rss', [ - 'posts' => array_slice($posts, 0, 10), - '_no_layout' => true - ], [ - 'Content-Type' => 'text/xml; charset=utf-8' - ]]; - } - - public static function executeNewsPost($relativeUri) - { - try - { - $post = Post::load(ltrim($relativeUri, '/')); - } - catch (PostNotFoundException $e) - { - return ['page/404', []]; - } - return ['content/news-post', [ - 'post' => $post, - View::LAYOUT_PARAMS => [ - 'showRssLink' => true - ] - ]]; - } - - public static function executeFaqPost($relativeUri) - { - try - { - $post = Post::load(ltrim($relativeUri, '/')); - } - catch (PostNotFoundException $e) - { - return ['page/404', []]; - } - return ['content/faq-post', [ - 'post' => $post, - ]]; - } - - public static function executeRoadmap() { $cache = !isset($_GET['nocache']); @@ -141,10 +218,10 @@ class ContentActions extends Actions ]]; } - public static function executePressKit() + public static function executePressKit(): array { $zipFileName = 'lbry-press-kit-' . date('Y-m-d') . '.zip'; - $zipPath = tempnam('/tmp', $zipFileName); + $zipPath = tempnam('/tmp', $zipFileName); $zip = new ZipArchive(); $zip->open($zipPath, ZipArchive::OVERWRITE); @@ -166,63 +243,70 @@ class ContentActions extends Actions // // $zip->addFromString('press.html', $html); - foreach(glob(ROOT_DIR . '/web/img/press/*') as $productImgPath) + foreach (glob(ROOT_DIR . '/web/img/press/*') as $productImgPath) { $imgPathTokens = explode('/', $productImgPath); - $imgName = $imgPathTokens[count($imgPathTokens) - 1]; + $imgName = $imgPathTokens[count($imgPathTokens) - 1]; $zip->addFile($productImgPath, '/logo_and_product/' . $imgName); } - foreach(glob(ROOT_DIR . '/posts/bio/*.md') as $bioPath) + foreach (glob(ContentActions::CONTENT_DIR . '/bio/*.md') as $bioPath) { list($metadata, $bioHtml) = View::parseMarkdown($bioPath); $zip->addFile($bioPath, '/team_bios/' . $metadata['name'] . ' - ' . $metadata['role'] . '.txt'); } - foreach(array_filter(glob(ROOT_DIR . '/web/img/team/*.jpg'), function($path) { + foreach (array_filter(glob(ROOT_DIR . '/web/img/team/*.jpg'), function ($path) + { return strpos($path, 'spooner') === false; }) as $bioImgPath) { $imgPathTokens = explode('/', $bioImgPath); - $imgName = str_replace('644x450', 'lbry', $imgPathTokens[count($imgPathTokens) - 1]); + $imgName = str_replace('644x450', 'lbry', $imgPathTokens[count($imgPathTokens) - 1]); $zip->addFile($bioImgPath, '/team_photos/' . $imgName); } $zip->close(); + Response::enableHttpCache(); + Response::setDownloadHttpHeaders($zipFileName, 'application/zip', filesize($zipPath)); + return ['internal/zip', [ '_no_layout' => true, - 'zipPath' => $zipPath - ], [ - 'Content-Disposition' => 'attachment;filename=' . $zipFileName, - 'X-Content-Type-Options' => 'nosniff', - 'Content-Type' => 'application/zip', - 'Content-Length' => filesize($zipPath), + 'zipPath' => $zipPath ]]; } - public static function prepareBioPartial(array $vars) + public static function prepareBioPartial(array $vars): array { $person = $vars['person']; - $path = 'bio/' . $person . '.md'; + $path = 'bio/' . $person . '.md'; list($metadata, $bioHtml) = View::parseMarkdown($path); $relativeImgSrc = '/img/team/' . $person . '-644x450.jpg'; - $imgSrc = file_exists(ROOT_DIR . '/web' . $relativeImgSrc) ? $relativeImgSrc : '/img/team/spooner-644x450.jpg'; + $imgSrc = file_exists(ROOT_DIR . '/web' . $relativeImgSrc) ? $relativeImgSrc : '/img/team/spooner-644x450.jpg'; return $vars + $metadata + [ - 'imgSrc' => $imgSrc, - 'bioHtml' => $bioHtml, + 'imgSrc' => $imgSrc, + 'bioHtml' => $bioHtml, 'orientation' => 'vertical' ]; } - public static function preparePostAuthorPartial(array $vars) + public static function preparePostAuthorPartial(array $vars): array { $post = $vars['post']; return [ - 'authorName' => $post->getAuthorName(), - 'photoImgSrc' => $post->getAuthorPhoto(), + 'authorName' => $post->getAuthorName(), + 'photoImgSrc' => $post->getAuthorPhoto(), 'authorBioHtml' => $post->getAuthorBioHtml() ]; } + + public static function preparePostListPartial(array $vars): array + { + $count = $vars['count'] ?? 3; + return [ + 'posts' => array_slice(Post::find(static::VIEW_FOLDER_NEWS, Post::SORT_DATE_DESC), 0, $count) + ]; + } } diff --git a/controller/action/DownloadActions.class.php b/controller/action/DownloadActions.class.php index f74fffa3..e432f76d 100644 --- a/controller/action/DownloadActions.class.php +++ b/controller/action/DownloadActions.class.php @@ -4,7 +4,7 @@ class DownloadActions extends Actions { public static function executeGet() { - $email = static::param('e'); + $email = Request::getParam('e'); $user = []; if ($email) @@ -32,7 +32,7 @@ class DownloadActions extends Actions if (!Session::get(Session::KEY_DOWNLOAD_ALLOWED)) { - return ['download/get', ['os' => static::guessOs()]]; + return ['download/get']; } $osChoices = Os::getAll(); @@ -58,8 +58,8 @@ class DownloadActions extends Actions public static function executeSignup() { - $email = static::param('email'); - $code = static::param('code'); + $email = Request::getParam('email'); + $code = Request::getParam('code'); if (!$email || !filter_var($email, FILTER_VALIDATE_EMAIL)) { @@ -67,15 +67,9 @@ class DownloadActions extends Actions } else { - $referrerId = static::param('referrer_id'); + $referrerId = Request::getParam('referrer_id'); $failure = false; - try - { - MailActions::subscribeToMailchimp($email, Mailchimp::LIST_GENERAL_ID); - } - catch (MailchimpSubscribeException $e) - { - } + Mailgun::sendSubscriptionConfirmation($email); try { @@ -119,9 +113,9 @@ class DownloadActions extends Actions public static function prepareSignupPartial(array $vars) { return $vars + [ - 'defaultEmail' => static::param('e'), + 'defaultEmail' => Request::getParam('e'), 'allowInviteCode' => true, - 'referralCode' => static::param('r', '') + 'referralCode' => Request::getParam('r', '') ]; } @@ -152,7 +146,7 @@ class DownloadActions extends Actions protected static function guessOs() { //if exact OS is requested, use that - $uri = strtok($_SERVER['REQUEST_URI'], '?'); + $uri = Request::getRelativeUri(); foreach (Os::getAll() as $os => $osChoice) { if ($osChoice[0] == $uri) @@ -161,13 +155,13 @@ class DownloadActions extends Actions } } - if (static::isForRobot()) + if (Request::isRobot()) { return null; } //otherwise guess from UA - $ua = $_SERVER['HTTP_USER_AGENT']; + $ua = Request::getUserAgent(); if (stripos($ua, 'OS X') !== false) { return strpos($ua, 'iPhone') !== false || stripos($ua, 'iPad') !== false ? Os::OS_IOS : Os::OS_OSX; @@ -180,6 +174,5 @@ class DownloadActions extends Actions { return Os::OS_WINDOWS; } - return null; } } diff --git a/controller/action/MailActions.class.php b/controller/action/MailActions.class.php index 6897eea9..b8ac3b2c 100644 --- a/controller/action/MailActions.class.php +++ b/controller/action/MailActions.class.php @@ -1,84 +1,63 @@ __('email.subscribe_send_failed')]]; + } + + return ['mail/subscribe', ['subscribeSuccess' => true, 'nextUrl' => $nextUrl]]; } - public static function subscribeToMailchimp($email, $listId, array $mergeFields = []) + public static function executeConfirm(string $hash) { - $mcApi = new Mailchimp(); - $success = $mcApi->listSubscribe($listId, $email, $mergeFields, 'html', false); - if (!$success) + $email = Mailgun::checkConfirmHashAndGetEmail($hash); + if ($email === null) { - throw new MailchimpSubscribeException($mcApi->errorMessage ?: __('Something went wrong adding you to the list.')); + return ['mail/subscribe', ['error' => __('email.invalid_confirm_hash')]]; } - return true; + + $outcome = Mailgun::addToMailingList(Mailgun::LIST_GENERAL, $email); + if ($outcome !== true) + { + return ['mail/subscribe', ['error' => $outcome]]; + } + + return ['mail/subscribe', ['confirmSuccess' => true, 'learnFooter' => true]]; } - public static function prepareJoinListPartial(array $vars) + + + public static function prepareSubscribeFormPartial(array $vars) { - $vars['listSig'] = md5(serialize($vars)); - $vars += ['btnClass' => 'btn-primary', 'returnUrl' => $_SERVER['REQUEST_URI']]; + $vars += ['btnClass' => 'btn-primary', 'returnUrl' => Request::getRelativeUri()]; - if (Session::get(Session::KEY_LIST_SUB_SIGNATURE) == $vars['listSig']) - { - $vars['error'] = Session::get(Session::KEY_LIST_SUB_ERROR); - Session::unsetKey(Session::KEY_LIST_SUB_ERROR); - - $vars['success'] = Session::get(Session::KEY_LIST_SUB_SUCCESS) ? __('Great success! Welcome to LBRY.') : false; - $vars['fbEvent'] = Session::get(Session::KEY_LIST_SUB_FB_EVENT) ?: 'Lead'; - Session::unsetKey(Session::KEY_LIST_SUB_SUCCESS); - Session::unsetKey(Session::KEY_LIST_SUB_FB_EVENT); - Session::unsetKey(Session::KEY_LIST_SUB_SIGNATURE); - } - else - { - $vars['success'] = false; - } + $vars['error'] = Session::get(Session::KEY_LIST_SUB_ERROR); + Session::unsetKey(Session::KEY_LIST_SUB_ERROR); return $vars; } diff --git a/controller/action/NavActions.class.php b/controller/action/NavActions.class.php index 7e84b5e0..8f91f5d1 100644 --- a/controller/action/NavActions.class.php +++ b/controller/action/NavActions.class.php @@ -1,10 +1,5 @@ false, 'showLearnFooter' => false ]; } public static function prepareGlobalItemsPartial(array $vars) { - $vars += ['selectedItem' => static::getNavUri()]; - return $vars; - } - - public static function prepareLearnFooterPartial(array $vars) - { - return $vars + [ - 'isDark' => true + return $vars += [ + 'selectedItem' => static::getNavUri(), + 'selectedCulture' => i18n::getLanguage() . '_' . i18n::getCountry(), + 'cultures' => i18n::getAllCultures() ]; } -} \ No newline at end of file + + public static function execute400(array $vars) + { + Response::setStatus(400); + return ['page/400', ['error' => $vars['error'] ?? null]]; + } + + public static function execute404() + { +// $uri = Request::getRelativeUri(); +// Controller::queueToRunAfterResponse(function() use($uri) { +// Slack::sendErrorIfProd('404 for url ' . $uri, false); +// }); + Response::setStatus(404); + return ['page/404']; + } +} diff --git a/controller/action/OpsActions.class.php b/controller/action/OpsActions.class.php index 22ab35af..b3508bbf 100644 --- a/controller/action/OpsActions.class.php +++ b/controller/action/OpsActions.class.php @@ -1,25 +1,36 @@ 'No payload']); + } + + $payload = json_decode($payload, true); if ($payload['ref'] === 'refs/heads/master') { - Actions::returnErrorIf(!isset($_SERVER['HTTP_X_HUB_SIGNATURE']), "HTTP header 'X-Hub-Signature' is missing."); + $sig = Request::getHttpHeader('X-Hub-Signature'); + if (!$sig) + { + return NavActions::execute400(['error' => "HTTP header 'X-Hub-Signature' is missing."]); + } - list($algo, $hash) = explode('=', $_SERVER['HTTP_X_HUB_SIGNATURE'], 2) + array('', ''); - Actions::returnErrorIf(!in_array($algo, hash_algos(), TRUE), 'Invalid hash algorithm "' . $algo . '"'); + list($algo, $hash) = explode('=', Request::getHttpHeader('X-Hub-Signature'), 2) + ['', '']; + if (!in_array($algo, hash_algos(), true)) + { + return NavActions::execute400(['error' => 'Invalid hash algorithm "' . htmlspecialchars($algo) . '"']); + } $rawPost = file_get_contents('php://input'); - $secret = Config::get('github_key'); - Actions::returnErrorIf($hash !== hash_hmac($algo, $rawPost, $secret), 'Hash does not match. "' . $secret . '"' . ' algo: ' . $algo . '$'); + $secret = Config::get('github_key'); + if ($hash !== hash_hmac($algo, $rawPost, $secret)) + { + return NavActions::execute400(['error' => 'Hash does not match.']); + } file_put_contents(ROOT_DIR . '/data/writeable/NEEDS_UPDATE', ''); } @@ -27,19 +38,19 @@ class OpsActions extends Actions return [null, []]; } - public static function executeLogUpload() + public static function executeLogUpload(): array { - $log = isset($_POST['log']) ? urldecode($_POST['log']) : null; - if (isset($_POST['name'])) + $log = Request::getPostParam('log') ? urldecode(Request::getPostParam('log')) : null; + if (Request::getPostParam('name')) { - $name = substr(trim(urldecode($_POST['name'])),0,50); + $name = substr(trim(urldecode(Request::getPostParam('name'))), 0, 50); } - elseif (isset($_POST['date'])) + elseif (Request::getPostParam('date')) { - $name = substr(trim(urldecode($_POST['date'])),0,20) . '_' . - substr(trim(urldecode($_POST['hash'])),0,20) . '_' . - substr(trim(urldecode($_POST['sys'])),0,50) . '_' . - substr(trim(urldecode($_POST['type'])),0,20); + $name = substr(trim(urldecode(Request::getPostParam('date'))), 0, 20) . '_' . + substr(trim(urldecode(Request::getPostParam('hash'))), 0, 20) . '_' . + substr(trim(urldecode(Request::getPostParam('sys'))), 0, 50) . '_' . + substr(trim(urldecode(Request::getPostParam('type'))), 0, 20); } else { @@ -48,17 +59,26 @@ class OpsActions extends Actions $name = preg_replace('/[^A-Za-z0-9_-]+/', '', $name); - Actions::returnErrorIf(!$log || !$name, "Required params: log, name"); + if (!$log || !$name) + { + return NavActions::execute400(['error' => "Required params: log, name"]); + } - $awsKey = Config::get('aws_log_access_key'); + $awsKey = Config::get('aws_log_access_key'); $awsSecret = Config::get('aws_log_secret_key'); - Actions::returnErrorIf(!$awsKey || !$awsSecret, "Missing AWS credentials"); + if (!$log || !$name) + { + throw new RuntimeException('Missing AWS credentials'); + } $tmpFile = tempnam(sys_get_temp_dir(), 'lbryinstalllog'); file_put_contents($tmpFile, $log); - Actions::returnErrorIf(filesize($tmpFile) > 1024*1024*2, "File is too large"); + if (filesize($tmpFile) > 1024 * 1024 * 2) + { + return NavActions::execute400(['error' => 'Log file is too large']); + } S3::$useExceptions = true; S3::setAuth($awsKey, $awsSecret); diff --git a/controller/action/i18nActions.class.php b/controller/action/i18nActions.class.php new file mode 100644 index 00000000..014fea47 --- /dev/null +++ b/controller/action/i18nActions.class.php @@ -0,0 +1,29 @@ +apt ordpkg."
email:
address: Email
code: Invite Code
- disclaimer: You will receive 1-2 messages a month, only from LBRY, Inc. and only about LBRY. You can easily unsubscribe at any time.
+ confirm_email_body: Please confirm your subscription to LBRY updates by clicking the link below.
+ confirm_email_button: Confirm Subscription
+ confirm_email_subject: Confirm Your Subscription to LBRY
+ confirm_success: Great success! Welcome to LBRY.
+ disclaimer: You will receive 1-2 messages a month, only from LBRY Inc. and only about LBRY. You can easily unsubscribe at any time.
go: Go
+ invalid_confirm_hash: This link is expired or invalid. Please enter your email address again.
nocode: None, but I want in as soon as possible!
placeholder: someone@somewhere.com
+ return: Return to LBRY
subs: Subscribe
subscribe: Subscribe to our email list
+ subscribe_needs_confirm: We sent you an email with a confirmation link. Click the link to complete your subscription.
+ subscribe_send_failed: Something went wrong. Please enter your email address again.
+ unsubs: unsubscribe
+ unsubscribe: Don't want to stay on the bleeding edge of a content distribution revolution?
updates: Get Updates
yescode: "Yes"
global:
@@ -72,8 +82,7 @@ learn:
100: LBRY in 100 Seconds
art: Art in the Internet Age
essay: Read the Essay
- exchange: Bittrex Exchange
- exchange2: Poloniex Exchange
+ exchange_faq: Buy/Sell LBRY Credits
explore: Explore
explorer: Block Explorer
how: Learn how LBRY will forever improve how we create and share with one another.
@@ -94,6 +103,11 @@ news:
next: Next
prev: Previous
page:
+ badmethod: HTTP Method Not Allowed
+ badmethod_details: Did you GET when you should have POSTed? Or vice versa?
+ badrequest: Bad Request - Your browser sent a request that this server could not understand
+ badrequest_details: The client should not repeat the request without modifications.
+ error_contact_us: If this problem persists or requires immediate attention, please contact %email%.
faq:
back: Back to FAQ
header: Frequently Asked Questions
diff --git a/dev.sh b/dev.sh
index 415ebe73..318acd8a 100755
--- a/dev.sh
+++ b/dev.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-php --server localhost:8000 --docroot web/ web/index.php
\ No newline at end of file
+php7.0 --server localhost:8000 --docroot web/ web/index.php
diff --git a/lib/exception/StopException.class.php b/lib/exception/StopException.class.php
index 81e2d9d1..ad3dc43d 100644
--- a/lib/exception/StopException.class.php
+++ b/lib/exception/StopException.class.php
@@ -1,10 +1,5 @@
' . money_format('%.2n', $amount) . '';
@@ -61,7 +49,7 @@ class i18n
public static function formatCredits($amount)
{
- return '' . (is_numeric($amount) ? number_format($amount, 1) : $amount) . ' LBC';
+ return '' . (is_numeric($amount) ? number_format($amount, 1) : $amount) . ' LBC';
}
public static function translate($token, $language = null)
@@ -70,10 +58,11 @@ class i18n
if (!isset(static::$translations[$language]))
{
$path = ROOT_DIR . '/data/i18n/' . $language . '.yaml';
+
static::$translations[$language] = file_exists($path) ? Spyc::YAMLLoadString(file_get_contents($path)) : [];
}
$scope = static::$translations[$language];
- foreach(explode('.', $token) as $level)
+ foreach (explode('.', $token) as $level)
{
if (isset($scope[$level]))
{
@@ -90,4 +79,60 @@ class i18n
}
return $scope ?: $token;
}
+
+ protected static function deduceCulture()
+ {
+ $candidates = [];
+
+ //url trumps everything
+ $urlTokens = Request::getHost() ? explode('.', Request::getHost()) : [];
+ $code = $urlTokens ? reset($urlTokens) : null;
+ if ($code !== 'www')
+ {
+ $candidates[] = $code;
+ }
+
+ //then session
+ $candidates[] = Session::get(Session::KEY_USER_CULTURE);
+
+ // then headers
+ // http://www.thefutureoftheweb.com/blog/use-accept-language-header
+ if (Request::getHttpHeader('Accept-Language'))
+ {
+ // break up string into pieces (languages and q factors)
+ preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', Request::getHttpHeader('Accept-Language'), $languages);
+
+ if (isset($languages[1]) && count($languages[1]))
+ {
+ // create a list like "en" => 0.8
+ $langs = array_combine($languages[1], $languages[4]);
+
+ // set default to 1 for any without q factor
+ foreach ($langs as $lang => $val)
+ {
+ if ($val === '')
+ {
+ $langs[$lang] = 1;
+ }
+ }
+
+ arsort($langs, SORT_NUMERIC);
+
+ $candidates = array_merge($candidates, array_keys($langs));
+ }
+ }
+
+ foreach ($candidates as $candidate)
+ {
+ foreach (static::getAllCultures() as $culture)
+ {
+ if ($candidate === $culture || substr($culture, 0, 2) === $candidate)
+ {
+ return $culture;
+ }
+ }
+ }
+
+ return 'en_US';
+ }
}
diff --git a/lib/routing/BadRouteException.class.php b/lib/routing/BadRouteException.class.php
new file mode 100644
index 00000000..33d07f1e
--- /dev/null
+++ b/lib/routing/BadRouteException.class.php
@@ -0,0 +1,5 @@
+staticRouteMap = $data->getStaticRoutes();
+
+ $this->variableRouteData = $data->getVariableRoutes();
+
+ $this->filters = $data->getFilters();
+
+ if ($resolver === null)
+ {
+ $this->handlerResolver = new HandlerResolver();
+ }
+ else
+ {
+ $this->handlerResolver = $resolver;
+ }
+ }
+
+ /**
+ * Dispatch a route for the given HTTP Method / URI.
+ *
+ * @param $httpMethod
+ * @param $uri
+ *
+ * @return mixed|null
+ */
+ public function dispatch($httpMethod, $uri)
+ {
+ list($handler, $filters, $vars) = $this->dispatchRoute($httpMethod, trim($uri, '/'));
+
+ list($beforeFilter, $afterFilter) = $this->parseFilters($filters);
+
+ if (($response = $this->dispatchFilters($beforeFilter)) !== null)
+ {
+ return $response;
+ }
+
+ $resolvedHandler = $this->handlerResolver->resolve($handler);
+
+ $response = call_user_func_array($resolvedHandler, $vars);
+
+ return $this->dispatchFilters($afterFilter, $response);
+ }
+
+ /**
+ * Dispatch a route filter.
+ *
+ * @param $filters
+ * @param null $response
+ *
+ * @return mixed|null
+ */
+ private function dispatchFilters($filters, $response = null)
+ {
+ while ($filter = array_shift($filters))
+ {
+ $handler = $this->handlerResolver->resolve($filter);
+
+ if (($filteredResponse = call_user_func($handler, $response)) !== null)
+ {
+ return $filteredResponse;
+ }
+ }
+
+ return $response;
+ }
+
+ /**
+ * Normalise the array filters attached to the route and merge with any global filters.
+ *
+ * @param $filters
+ *
+ * @return array
+ */
+ private function parseFilters($filters)
+ {
+ $beforeFilter = [];
+ $afterFilter = [];
+
+ if (isset($filters[Route::BEFORE]))
+ {
+ $beforeFilter = array_intersect_key($this->filters, array_flip((array)$filters[Route::BEFORE]));
+ }
+
+ if (isset($filters[Route::AFTER]))
+ {
+ $afterFilter = array_intersect_key($this->filters, array_flip((array)$filters[Route::AFTER]));
+ }
+
+ return [$beforeFilter, $afterFilter];
+ }
+
+ /**
+ * Perform the route dispatching. Check static routes first followed by variable routes.
+ *
+ * @param $httpMethod
+ * @param $uri
+ *
+ * @throws Exception\HttpRouteNotFoundException
+ */
+ private function dispatchRoute($httpMethod, $uri)
+ {
+ if (isset($this->staticRouteMap[$uri]))
+ {
+ return $this->dispatchStaticRoute($httpMethod, $uri);
+ }
+
+ return $this->dispatchVariableRoute($httpMethod, $uri);
+ }
+
+ /**
+ * Handle the dispatching of static routes.
+ *
+ * @param $httpMethod
+ * @param $uri
+ *
+ * @return mixed
+ * @throws Exception\HttpMethodNotAllowedException
+ */
+ private function dispatchStaticRoute($httpMethod, $uri)
+ {
+ $routes = $this->staticRouteMap[$uri];
+
+ if (!isset($routes[$httpMethod]))
+ {
+ $httpMethod = $this->checkFallbacks($routes, $httpMethod);
+ }
+
+ return $routes[$httpMethod];
+ }
+
+ /**
+ * Check fallback routes: HEAD for GET requests followed by the ANY attachment.
+ *
+ * @param $routes
+ * @param $httpMethod
+ *
+ * @throws Exception\HttpMethodNotAllowedException
+ */
+ private function checkFallbacks($routes, $httpMethod)
+ {
+ $additional = [Route::ANY];
+
+ if ($httpMethod === Route::HEAD)
+ {
+ $additional[] = Route::GET;
+ }
+
+ foreach ($additional as $method)
+ {
+ if (isset($routes[$method]))
+ {
+ return $method;
+ }
+ }
+
+ $this->matchedRoute = $routes;
+
+ throw new HttpMethodNotAllowedException(array_keys($routes), 'Method not allowed');
+ }
+
+ /**
+ * Handle the dispatching of variable routes.
+ *
+ * @param $httpMethod
+ * @param $uri
+ *
+ * @throws Exception\HttpMethodNotAllowedException
+ * @throws Exception\HttpRouteNotFoundException
+ */
+ private function dispatchVariableRoute($httpMethod, $uri)
+ {
+ foreach ($this->variableRouteData as $data)
+ {
+ if (!preg_match($data['regex'], $uri, $matches))
+ {
+ continue;
+ }
+
+ $count = count($matches);
+
+ while (!isset($data['routeMap'][$count++]))
+ {
+ ;
+ }
+
+ $routes = $data['routeMap'][$count - 1];
+
+ if (!isset($routes[$httpMethod]))
+ {
+ $httpMethod = $this->checkFallbacks($routes, $httpMethod);
+ }
+
+ foreach (array_values($routes[$httpMethod][2]) as $i => $varName)
+ {
+ if (!isset($matches[$i + 1]) || $matches[$i + 1] === '')
+ {
+ unset($routes[$httpMethod][2][$varName]);
+ }
+ else
+ {
+ $routes[$httpMethod][2][$varName] = $matches[$i + 1];
+ }
+ }
+
+ return $routes[$httpMethod];
+ }
+
+ throw new HttpRouteNotFoundException('Route ' . $uri . ' does not exist');
+ }
+}
diff --git a/lib/routing/HandlerResolver.class.php b/lib/routing/HandlerResolver.class.php
new file mode 100644
index 00000000..9918d2f7
--- /dev/null
+++ b/lib/routing/HandlerResolver.class.php
@@ -0,0 +1,16 @@
+allowedMethods = $allowedMethods;
+ parent::__construct($message, $code, $previous);
+ }
+
+ public function getAllowedMethods()
+ {
+ return $this->allowedMethods;
+ }
+}
diff --git a/lib/routing/HttpRouteNotFoundException.class.php b/lib/routing/HttpRouteNotFoundException.class.php
new file mode 100644
index 00000000..b7dc994a
--- /dev/null
+++ b/lib/routing/HttpRouteNotFoundException.class.php
@@ -0,0 +1,6 @@
+routeParser = $routeParser ?: new RouteParser();
+ }
+
+ public function hasRoute(string $name): bool
+ {
+ return isset($this->reverse[$name]);
+ }
+
+ public function route(string $name, array $args = null): string
+ {
+ $url = [];
+
+ $replacements = is_null($args) ? [] : array_values($args);
+
+ $variable = 0;
+
+ foreach ($this->reverse[$name] as $part)
+ {
+ if (!$part['variable'])
+ {
+ $url[] = $part['value'];
+ }
+ elseif (isset($replacements[$variable]))
+ {
+ if ($part['optional'])
+ {
+ $url[] = '/';
+ }
+
+ $url[] = $replacements[$variable++];
+ }
+ elseif (!$part['optional'])
+ {
+ throw new BadRouteException("Expecting route variable '{$part['name']}'");
+ }
+ }
+
+ return implode('', $url);
+ }
+
+ public function addRoute(string $httpMethod, $route, $handler, array $filters = []): RouteCollector
+ {
+
+ if (is_array($route))
+ {
+ list($route, $name) = $route;
+ }
+
+ $route = $this->addPrefix($this->trim($route));
+
+ list($routeData, $reverseData) = $this->routeParser->parse($route);
+
+ if (isset($name))
+ {
+ $this->reverse[$name] = $reverseData;
+ }
+
+ $filters = array_merge_recursive($this->globalFilters, $filters);
+
+ isset($routeData[1]) ?
+ $this->addVariableRoute($httpMethod, $routeData, $handler, $filters) :
+ $this->addStaticRoute($httpMethod, $routeData, $handler, $filters);
+
+ return $this;
+ }
+
+ private function addStaticRoute(string $httpMethod, $routeData, $handler, $filters)
+ {
+ $routeStr = $routeData[0];
+
+ if (isset($this->staticRoutes[$routeStr][$httpMethod]))
+ {
+ throw new BadRouteException("Cannot register two routes matching '$routeStr' for method '$httpMethod'");
+ }
+
+ foreach ($this->regexToRoutesMap as $regex => $routes)
+ {
+ if (isset($routes[$httpMethod]) && preg_match('~^' . $regex . '$~', $routeStr))
+ {
+ throw new BadRouteException("Static route '$routeStr' is shadowed by previously defined variable route '$regex' for method '$httpMethod'");
+ }
+ }
+
+ $this->staticRoutes[$routeStr][$httpMethod] = [$handler, $filters, []];
+ }
+
+ private function addVariableRoute(string $httpMethod, $routeData, $handler, $filters)
+ {
+ list($regex, $variables) = $routeData;
+
+ if (isset($this->regexToRoutesMap[$regex][$httpMethod]))
+ {
+ throw new BadRouteException("Cannot register two routes matching '$regex' for method '$httpMethod'");
+ }
+
+ $this->regexToRoutesMap[$regex][$httpMethod] = [$handler, $filters, $variables];
+ }
+
+ public function group(array $filters, \Closure $callback)
+ {
+ $oldGlobalFilters = $this->globalFilters;
+
+ $oldGlobalPrefix = $this->globalRoutePrefix;
+
+ $this->globalFilters =
+ array_merge_recursive($this->globalFilters, array_intersect_key($filters, [Route::AFTER => 1, Route::BEFORE => 1]));
+
+ $newPrefix = isset($filters[Route::PREFIX]) ? $this->trim($filters[Route::PREFIX]) : null;
+
+ $this->globalRoutePrefix = $this->addPrefix($newPrefix);
+
+ $callback($this);
+
+ $this->globalFilters = $oldGlobalFilters;
+
+ $this->globalRoutePrefix = $oldGlobalPrefix;
+ }
+
+ private function addPrefix(string $route)
+ {
+ return $this->trim($this->trim($this->globalRoutePrefix) . '/' . $route);
+ }
+
+ public function filter(string $name, $handler)
+ {
+ $this->filters[$name] = $handler;
+ }
+
+
+ public function get($route, $handler, array $filters = [])
+ {
+ return $this->addRoute(Route::GET, $route, $handler, $filters);
+ }
+
+ public function head($route, $handler, array $filters = [])
+ {
+ return $this->addRoute(Route::HEAD, $route, $handler, $filters);
+ }
+
+ public function post($route, $handler, array $filters = [])
+ {
+ return $this->addRoute(Route::POST, $route, $handler, $filters);
+ }
+
+ public function put($route, $handler, array $filters = [])
+ {
+ return $this->addRoute(Route::PUT, $route, $handler, $filters);
+ }
+
+ public function patch($route, $handler, array $filters = [])
+ {
+ return $this->addRoute(Route::PATCH, $route, $handler, $filters);
+ }
+
+ public function delete($route, $handler, array $filters = [])
+ {
+ return $this->addRoute(Route::DELETE, $route, $handler, $filters);
+ }
+
+ public function options($route, $handler, array $filters = [])
+ {
+ return $this->addRoute(Route::OPTIONS, $route, $handler, $filters);
+ }
+
+ public function any($route, $handler, array $filters = [])
+ {
+ return $this->addRoute(Route::ANY, $route, $handler, $filters);
+ }
+
+
+ public function controller(string $route, string $classname, array $filters = []): RouteCollector
+ {
+ $reflection = new ReflectionClass($classname);
+
+ $validMethods = $this->getValidMethods();
+
+ $sep = $route === '/' ? '' : '/';
+
+ foreach ($reflection->getMethods(ReflectionMethod::IS_PUBLIC) as $method)
+ {
+ foreach ($validMethods as $valid)
+ {
+ if (stripos($method->name, $valid) === 0)
+ {
+ $methodName = $this->camelCaseToDashed(substr($method->name, strlen($valid)));
+
+ $params = $this->buildControllerParameters($method);
+
+ if ($methodName === self::DEFAULT_CONTROLLER_ROUTE)
+ {
+ $this->addRoute($valid, $route . $params, [$classname, $method->name], $filters);
+ }
+
+ $this->addRoute($valid, $route . $sep . $methodName . $params, [$classname, $method->name], $filters);
+
+ break;
+ }
+ }
+ }
+
+ return $this;
+ }
+
+ private function buildControllerParameters(ReflectionMethod $method): string
+ {
+ $params = '';
+
+ foreach ($method->getParameters() as $param)
+ {
+ $params .= "/{" . $param->getName() . "}" . ($param->isOptional() ? '?' : '');
+ }
+
+ return $params;
+ }
+
+ private function camelCaseToDashed(string $string): string
+ {
+ return strtolower(preg_replace('/([A-Z])/', '-$1', lcfirst($string)));
+ }
+
+ public function getValidMethods(): array
+ {
+ return [
+ Route::ANY,
+ Route::GET,
+ Route::POST,
+ Route::PUT,
+ Route::PATCH,
+ Route::DELETE,
+ Route::HEAD,
+ Route::OPTIONS,
+ ];
+ }
+
+ public function getData(): RouteData
+ {
+ return new RouteData($this->staticRoutes, $this->regexToRoutesMap ? $this->generateVariableRouteData() : [], $this->filters);
+ }
+
+ private function trim(string $route): string
+ {
+ return trim($route, '/');
+ }
+
+ private function generateVariableRouteData(): array
+ {
+ $chunkSize = $this->computeChunkSize(count($this->regexToRoutesMap));
+ $chunks = array_chunk($this->regexToRoutesMap, $chunkSize, true);
+ return array_map([$this, 'processChunk'], $chunks);
+ }
+
+ private function computeChunkSize(int $count): float
+ {
+ $numParts = max(1, round($count / self::APPROX_CHUNK_SIZE));
+ return ceil($count / $numParts);
+ }
+
+ private function processChunk($regexToRoutesMap): array
+ {
+ $routeMap = [];
+ $regexes = [];
+ $numGroups = 0;
+ foreach ($regexToRoutesMap as $regex => $routes)
+ {
+ $firstRoute = reset($routes);
+ $numVariables = count($firstRoute[2]);
+ $numGroups = max($numGroups, $numVariables);
+
+ $regexes[] = $regex . str_repeat('()', $numGroups - $numVariables);
+
+ foreach ($routes as $httpMethod => $route)
+ {
+ $routeMap[$numGroups + 1][$httpMethod] = $route;
+ }
+
+ $numGroups++;
+ }
+
+ $regex = '~^(?|' . implode('|', $regexes) . ')$~';
+ return ['regex' => $regex, 'routeMap' => $routeMap];
+ }
+}
diff --git a/lib/routing/RouteData.class.php b/lib/routing/RouteData.class.php
new file mode 100644
index 00000000..1a53709f
--- /dev/null
+++ b/lib/routing/RouteData.class.php
@@ -0,0 +1,59 @@
+staticRoutes = $staticRoutes;
+
+ $this->variableRoutes = $variableRoutes;
+
+ $this->filters = $filters;
+ }
+
+ /**
+ * @return array
+ */
+ public function getStaticRoutes()
+ {
+ return $this->staticRoutes;
+ }
+
+ /**
+ * @return array
+ */
+ public function getVariableRoutes()
+ {
+ return $this->variableRoutes;
+ }
+
+ /**
+ * @return mixed
+ */
+ public function getFilters()
+ {
+ return $this->filters;
+ }
+}
diff --git a/lib/routing/RouteParser.class.php b/lib/routing/RouteParser.class.php
new file mode 100644
index 00000000..c6d9ad17
--- /dev/null
+++ b/lib/routing/RouteParser.class.php
@@ -0,0 +1,214 @@
+ ':[0-9]+}',
+ ':a}' => ':[0-9A-Za-z]+}',
+ ':h}' => ':[0-9A-Fa-f]+}',
+ ':c}' => ':[a-zA-Z0-9+_\-\.]+}'
+ ];
+
+ /**
+ * Parse a route returning the correct data format to pass to the dispatch engine.
+ *
+ * @param $route
+ *
+ * @return array
+ */
+ public function parse($route)
+ {
+ $this->reset();
+
+ $route = strtr($route, $this->regexShortcuts);
+
+ if (!$matches = $this->extractVariableRouteParts($route))
+ {
+ $reverse = [
+ 'variable' => false,
+ 'value' => $route
+ ];
+
+ return [[$route], [$reverse]];
+ }
+
+ foreach ($matches as $set)
+ {
+
+ $this->staticParts($route, $set[0][1]);
+
+ $this->validateVariable($set[1][0]);
+
+ $regexPart = (isset($set[2]) ? trim($set[2][0]) : self::DEFAULT_DISPATCH_REGEX);
+
+ $this->regexOffset = $set[0][1] + strlen($set[0][0]);
+
+ $match = '(' . $regexPart . ')';
+
+ $isOptional = substr($set[0][0], -1) === '?';
+
+ if ($isOptional)
+ {
+ $match = $this->makeOptional($match);
+ }
+
+ $this->reverseParts[$this->partsCounter] = [
+ 'variable' => true,
+ 'optional' => $isOptional,
+ 'name' => $set[1][0]
+ ];
+
+ $this->parts[$this->partsCounter++] = $match;
+ }
+
+ $this->staticParts($route, strlen($route));
+
+ return [[implode('', $this->parts), $this->variables], array_values($this->reverseParts)];
+ }
+
+ /**
+ * Reset the parser ready for the next route.
+ */
+ private function reset()
+ {
+ $this->parts = [];
+
+ $this->reverseParts = [];
+
+ $this->partsCounter = 0;
+
+ $this->variables = [];
+
+ $this->regexOffset = 0;
+ }
+
+ /**
+ * Return any variable route portions from the given route.
+ *
+ * @param $route
+ *
+ * @return mixed
+ */
+ private function extractVariableRouteParts($route)
+ {
+ if (preg_match_all(self::VARIABLE_REGEX, $route, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER))
+ {
+ return $matches;
+ }
+ }
+
+ /**
+ * @param $route
+ * @param $nextOffset
+ */
+ private function staticParts($route, $nextOffset)
+ {
+ $static = preg_split('~(/)~u', substr($route, $this->regexOffset, $nextOffset - $this->regexOffset), 0, PREG_SPLIT_DELIM_CAPTURE);
+
+ foreach ($static as $staticPart)
+ {
+ if ($staticPart)
+ {
+ $quotedPart = $this->quote($staticPart);
+
+ $this->parts[$this->partsCounter] = $quotedPart;
+
+ $this->reverseParts[$this->partsCounter] = [
+ 'variable' => false,
+ 'value' => $staticPart
+ ];
+
+ $this->partsCounter++;
+ }
+ }
+ }
+
+ /**
+ * @param $varName
+ */
+ private function validateVariable($varName)
+ {
+ if (isset($this->variables[$varName]))
+ {
+ throw new BadRouteException("Cannot use the same placeholder '$varName' twice");
+ }
+
+ $this->variables[$varName] = $varName;
+ }
+
+ /**
+ * @param $match
+ *
+ * @return string
+ */
+ private function makeOptional($match)
+ {
+ $previous = $this->partsCounter - 1;
+
+ if (isset($this->parts[$previous]) && $this->parts[$previous] === '/')
+ {
+ $this->partsCounter--;
+ $match = '(?:/' . $match . ')';
+ }
+
+ return $match . '?';
+ }
+
+ /**
+ * @param $part
+ *
+ * @return string
+ */
+ private function quote($part)
+ {
+ return preg_quote($part, '~');
+ }
+}
diff --git a/model/api/Asana.class.php b/lib/thirdparty/Asana.class.php
similarity index 100%
rename from model/api/Asana.class.php
rename to lib/thirdparty/Asana.class.php
diff --git a/model/api/Github.class.php b/lib/thirdparty/Github.class.php
similarity index 96%
rename from model/api/Github.class.php
rename to lib/thirdparty/Github.class.php
index 1ff2da84..76a35cb4 100644
--- a/model/api/Github.class.php
+++ b/lib/thirdparty/Github.class.php
@@ -16,7 +16,8 @@ class Github
{
if (
($os == Os::OS_LINUX && in_array($asset['content_type'], ['application/x-debian-package', 'application/x-deb'])) ||
- ($os == Os::OS_OSX && in_array($asset['content_type'], ['application/x-diskcopy', 'application/x-apple-diskimage']))
+ ($os == Os::OS_OSX && in_array($asset['content_type'], ['application/x-diskcopy', 'application/x-apple-diskimage'])) ||
+ ($os == Os::OS_WINDOWS && substr($asset['name'], -4) == '.msi')
)
{
return $asset['browser_download_url'];
diff --git a/lib/thirdparty/Mailgun.class.php b/lib/thirdparty/Mailgun.class.php
new file mode 100644
index 00000000..6f6a5a19
--- /dev/null
+++ b/lib/thirdparty/Mailgun.class.php
@@ -0,0 +1,91 @@
+ 'LBRY | + |
+
+
+
|
+