Compare commits

...

230 Commits

Author SHA1 Message Date
Hypolite Petovan cfff03f6e2 [v2.4.2] Bump version number for release 2024-03-07 14:18:49 -05:00
Tobias Diekershoff 4524ad166b Merge pull request 'Move Visit server link to server name' (#103) from MrPetovan/friendica-directory:enhancement/100-move-visit-server-link into stable
Reviewed-on: #103
2024-03-07 15:48:26 +01:00
Hypolite Petovan 2ffb047736 Move Visit server link to server name 2024-03-07 09:42:45 -05:00
heluecht f4bff37432 Merge pull request 'Update source code link to point to Friendica's Forgejo' (#101) from MrPetovan/friendica-directory:enhancement/97-source-code-link into stable
Reviewed-on: #101
2024-03-07 15:36:49 +01:00
heluecht 62c6c0f1cc Merge pull request 'Change icon for Approval registration policy from dungeon door to stamp' (#102) from MrPetovan/friendica-directory:enhancement/99-unstable-version-icon into stable
Reviewed-on: #102
2024-03-07 15:35:43 +01:00
Hypolite Petovan 5f79768a6b Change icon for unstable version from poop to bug 2024-03-07 09:23:51 -05:00
Hypolite Petovan 08950be588 Change icon for Approval registration policy from dungeon door to stamp 2024-03-07 09:23:36 -05:00
Hypolite Petovan 9d77067e79 Update source code link to point to Friendica's Forgejo 2024-03-07 09:21:03 -05:00
Tobias Diekershoff 13b95e22da Merge pull request '[Composer] Change gofabian/negotiation-middleware dependency requirement to support PHP 8.2' (#96) from MrPetovan/friendica-directory:bug/php-8 into stable
Reviewed-on: #96
2023-08-09 07:01:21 +02:00
Hypolite Petovan 9d296b9f5d [Composer] Change gofabian/negotiation-middleware dependency requirement to support PHP 8
- Add now-explicit laminas/laminas-zendframework-bridge dependency
- Bump PHP version requirement to 7.3.0
- Updating willdurand/negotiation (v2.3.1 => 3.1.0) (PHP 8 compatibility)
- Updating psr/http-message (1.0.1 => 1.1)
- Removing gofabian/negotiation-middleware (v0.1.3)
- Installing gofabian/negotiation-middleware (dev-master 4d3cda5)
- Updating gettext/languages (2.9.0 => 2.10.0)
- Updating gettext/gettext (v4.8.6 => v4.8.8)
- Updating guzzlehttp/psr7 (1.8.5 => 1.9.1)
- Updating guzzlehttp/promises (1.5.1 => 1.5.3)
- Updating symfony/polyfill-php72 (v1.26.0 => v1.27.0)
- Updating symfony/polyfill-intl-normalizer (v1.26.0 => v1.27.0)
- Updating symfony/polyfill-intl-idn (v1.26.0 => v1.27.0)
- Updating guzzlehttp/guzzle (6.5.6 => 6.5.8)
- Updating laminas/laminas-escaper (2.6.1 => 2.9.0)
- Updating laminas/laminas-zendframework-bridge (1.1.1 => 1.4.1)
- Updating masterminds/html5 (2.7.5 => 2.8.0)
- Updating monolog/monolog (1.26.1 => 1.27.1)
- Updating psr/container (1.0.0 => 1.1.1)
- Updating pimple/pimple (v3.2.3 => v3.5.0)
- Updating slim/slim (3.12.3 => 3.12.5)
- Updating pear/pear-core-minimal (v1.10.11 => v1.10.13)
2023-07-31 01:24:50 +02:00
Hypolite Petovan bf85c8f986 Catch rare exception receiving line folding characters in header value of redirected request 2023-07-31 01:17:33 +02:00
Hypolite Petovan 064fd922e7 Add default profile picture path dependency
- Update default profile picture
2023-07-31 01:11:33 +02:00
Hypolite Petovan 95ffadb19f Fix ternary operator ambiguity deprecation in Utils\L10n 2023-07-31 01:10:37 +02:00
Tobias Diekershoff 8bd1cb11ae Merge pull request 'Rename "forum" to "group"' (#94) from MrPetovan/friendica-directory:task/rename-forum-to-group into stable
Reviewed-on: #94
2023-06-05 06:37:27 +02:00
Hypolite Petovan aade2ec534 Rename "forum" to "group"
- This reflects a change in Friendica Core
2023-06-04 00:16:38 -04:00
Hypolite Petovan f854d7d5f7 Fix several PHP messages
- Add logging for exceptions
2023-03-12 17:49:44 -04:00
Tobias Diekershoff 230f17ef36 Merge pull request 'Normalize HTTP client user agent' (#90) from MrPetovan/friendica-directory:task/89-normalize-user-agent into stable
Reviewed-on: #90
2022-06-07 05:40:29 +00:00
Hypolite Petovan 30f6e6f5de [Composer] Remove unused dependency byjg/webrequest 2022-06-06 02:23:57 -04:00
Hypolite Petovan d1a72232b3 Replace ByJG\WebRequest by GuzzleHttp\ClientInterface 2022-06-06 02:22:56 -04:00
Hypolite Petovan 9ff681a460 Fix database error with false bolean value in profile table 2022-06-06 02:22:39 -04:00
Hypolite Petovan 0ee5bf55b1 Replace direct curl uses with Guzzle HTTP client
- Add http dependency with custom User Agent
- Simplify profile poll to remove the second profile call to check availability
- Remove obsolete Network::fetchURL and Network::testURL
2022-06-06 02:22:37 -04:00
Hypolite Petovan 5829108c0e [Composer] Require guzzlehttp/guzzle:^6.5 2022-06-06 01:32:00 -04:00
Hypolite Petovan 91aa66ed77 [v2.4.1] Bump version number for release 2022-05-12 14:18:43 -04:00
Hypolite Petovan 7fdbaa3678 Don't encode the zrl parameter in external links
- Fix a "Forbidden" issue with /remote_follow links
2022-05-12 14:18:19 -04:00
Hypolite Petovan df660b66c9 [v2.4.0] Bump version number for release 2022-05-12 09:15:19 -04:00
heluecht 3f38b3adea Merge pull request 'Remove obsolete profile.dfrn_request field' (#87) from MrPetovan/friendica-directory:task/86-remove-dfrn_request into stable
Reviewed-on: #87
2022-05-11 04:17:41 +00:00
Hypolite Petovan e65bb660ce [Database v0010] Drop unused column profile.dfrn_request 2022-05-07 16:10:43 -04:00
Hypolite Petovan a5700cb2c9 Remove references to dfrn_request 2022-05-07 16:10:43 -04:00
Hypolite Petovan 2627b54349 Replace dfrn_request by subscribe URL when available for the follow link
- Falls back to the `/remote_follow` module available since Friendica version 2020.03
- Falls back to the profile URL
- Remove unused atlas dependency in a couple API controllers
2022-05-07 16:10:42 -04:00
Hypolite Petovan 8988ad9f9d Add subscribe URL retrieval to server poll 2022-05-07 16:09:30 -04:00
Hypolite Petovan 7d5012e72e [Database v0009] Add server.subscribe_url field 2022-05-07 16:09:30 -04:00
Hypolite Petovan b0142f6ab2 Add optional version parameter to console updatedb 2022-05-07 16:09:29 -04:00
Hypolite Petovan cd809f7646 Remove mention of non-existent console parameters in Install and UpdateDb 2022-05-07 16:09:29 -04:00
Hypolite Petovan 2aba91d42c Add HTML link to profile to account name
- Normalize white space in HTML
2022-05-07 16:09:27 -04:00
Hypolite Petovan 2e84f5aa7b Merge pull request 'added DA DK translation THX atjn' (#88) from tobias/friendica-directory:20220501-daDK into stable
Reviewed-on: #88
2022-05-04 21:45:51 +00:00
Tobias Diekershoff 1ebddb042f
PL translation updated THX strebski 2022-05-03 09:17:55 +02:00
Tobias Diekershoff 0344c77336
added DA DK translation THX atjn 2022-05-01 20:17:13 +02:00
Hypolite Petovan 5a16bcb57c Merge pull request 'PL translation updated THX strebski' (#85) from tobias/friendica-directory:20220318-pl into stable
Reviewed-on: #85
2022-04-25 11:27:41 +00:00
Tobias Diekershoff 146d4e6374
PL translation updated THX strebski 2022-03-18 17:41:59 +01:00
Hypolite Petovan ef91f43be0 [v2.3.5] Bump version number for release 2022-01-23 06:13:16 -05:00
Hypolite Petovan a3a5bd8ab4 Merge pull request 'added SV translation THX Kristoffer Grundström' (#84) from tobias/friendica-directory:20220122-sv into stable
Reviewed-on: #84
2022-01-23 01:27:15 +00:00
Tobias Diekershoff c34fcd11f8 added Swedish to the languages array 2022-01-22 19:09:24 +01:00
Tobias Diekershoff 1356001334 added SV translation THX Kristoffer Grundström 2022-01-22 19:08:37 +01:00
Hypolite Petovan b344935edc [v2.3.4] Bump version number for release 2022-01-10 02:24:09 -05:00
Hypolite Petovan 5de396bc67 Add Hungarian to the available languages 2022-01-09 18:16:15 -05:00
Hypolite Petovan fe9b12164d [v2.3.3] Bump version number for release 2021-12-29 18:57:18 +01:00
Hypolite Petovan 6ccbeef59c [Composer] Updated dependencies before release
- Updating atlas/pdo (1.1.2 => 1.2.0)
  - Updating gettext/languages (2.6.0 => 2.9.0)
  - Updating gettext/gettext (v4.8.2 => v4.8.6)
  - Updating masterminds/html5 (2.7.1 => 2.7.5)
  - Updating psr/log (1.1.3 => 1.1.4)
  - Updating monolog/monolog (1.25.4 => 1.26.1)
  - Updating sarahman/simple-filesystem-cache (1.0.1 => 1.0.2)
  - Updating seld/cli-prompt (1.0.3 => 1.0.4)
  - Updating bower-asset/fontawesome (5.13.1 => 5.15.4)
  - Updating laminas/laminas-zendframework-bridge (1.0.4 => 1.1.1)
  - Updating pear/pear_exception (v1.0.1 => v1.0.2)
  - Updating pear/pear-core-minimal (v1.10.10 => v1.10.11)
2021-12-29 17:24:24 +01:00
Hypolite Petovan 4e3dcaf331 Merge pull request 'added HU translation' (#82) from tobias/friendica-directory:20211206-hu into stable
Reviewed-on: #82
2021-12-06 19:41:57 +00:00
Tobias Diekershoff ca605b8f23 added HU translation
fixes #73
2021-12-06 20:29:32 +01:00
Hypolite Petovan 13733e2f6c Merge pull request 'AR translation update THX abidin toumi' (#81) from tobias/friendica-directory:20211030-ar into stable
Reviewed-on: #81
2021-10-30 12:37:07 +00:00
Tobias Diekershoff d22b656a46 AR translation update THX abidin toumi 2021-10-30 08:27:49 +02:00
Tobias Diekershoff b3a8ea85f1 Merge pull request '[Composer] Update mrpetovan/net_ping to version 1.2.1' (#80) from MrPetovan/friendica-directory:task/79-composer-dependencies into stable
Reviewed-on: #80
2021-09-16 05:15:07 +00:00
Hypolite Petovan 2a747cbb06 [Composer] Update mrpetovan/net_ping to version 1.2.1
- Suppresses a couple of Deprecation Notices when running Composer
2021-09-15 21:56:00 -04:00
Hypolite Petovan ffea0fcbdb Add Composer 1.* binary to project
- It is required to keep the fxp/composer-asset-plugin support
2021-09-15 21:16:38 -04:00
Hypolite Petovan 1507bfdcf8
Merge pull request #78 from tobiasd/20210715-gd
add translation for Gaelic, Scottish
2021-07-15 15:40:26 -04:00
Tobias Diekershoff b8332ac785 added Gaelic, Scottish to the language array 2021-07-15 15:10:57 +02:00
Tobias Diekershoff f707df488b added Gaelic, Scottish translation THX GunChleoc 2021-07-15 15:05:44 +02:00
Michael Vogel 750e369f57
Merge pull request #77 from MrPetovan/bug/76-remove-at-sign-fulltext-search
Remove at sign (@) from fulltext query string
2021-06-22 16:05:21 +02:00
Hypolite Petovan 4d7067b381 Remove at sign (@) from fulltext query string
- InnoDB uses it as a special character and it can't be escaped
2021-06-21 11:15:57 -04:00
Hypolite Petovan 7112c65166
Merge pull request #71 from Quix0r/fixes/timeout-class-reference
Fixes:
2020-10-25 22:52:29 -04:00
Roland Häder 193b01cccd
Used \Some\Foo::class instead of '\Some\Foo' which type-safe and easier to find by your editor/IDE
Signed-off-by: Roland Häder <roland@mxchange.org>
2020-10-26 01:19:41 +01:00
Tobias Diekershoff 9b4961e2cc
Merge pull request #68 from MrPetovan/task/3-add-server-language-filter
Add language filter to server list
2020-09-27 21:45:41 +02:00
Hypolite Petovan cb0bfae1ab [Composer] Add expected ext-pdo dependency 2020-09-27 15:39:09 -04:00
Hypolite Petovan 16d1962324 Add language filter to server list 2020-09-27 15:39:09 -04:00
Hypolite Petovan e68b68110b Create new popular server languages widget
- Rename popular profile widget class and template
2020-09-27 15:39:08 -04:00
Tobias Diekershoff a1921c999d
Merge pull request #67 from MrPetovan/task/31-add-limit-to-search
Add page size parameter to search
2020-09-27 20:05:17 +02:00
Hypolite Petovan 959f526cb4 Add page size parameter to search
- Update API call documentation
2020-09-27 13:41:40 -04:00
Tobias Diekershoff 72d5e68c96
Merge pull request #66 from MrPetovan/task/34-no-desc-health-cap
Cap health score if server doesn't have a description
2020-09-27 19:16:49 +02:00
Hypolite Petovan aa83091458 Cap health if server doesn't have a description 2020-09-27 12:51:34 -04:00
Michael Vogel 4205323d31
Merge pull request #65 from MrPetovan/task/36-display-registration-policy
Display registration policy in server panel
2020-09-27 18:03:12 +02:00
Hypolite Petovan 7b906d5e33 Updated base translation file after adding new translation strings 2020-09-27 11:58:07 -04:00
Hypolite Petovan 35194f8110 Display registration policy in server panel
- Add title to health score badge
- Add translation for users badge
2020-09-27 11:58:06 -04:00
Tobias Diekershoff 520ddf5a8c
Merge pull request #63 from MrPetovan/task/54-no-ping-penalty
Factor in the unavailability of ping in the health score
2020-09-27 17:56:49 +02:00
Tobias Diekershoff a24a7d866c
Merge pull request #64 from MrPetovan/task/40-add-account-types
Add additional account types to the profile filter
2020-09-27 17:43:18 +02:00
Hypolite Petovan f1b960c4eb Add additional account types to the profile filter 2020-09-27 11:31:18 -04:00
Hypolite Petovan 0ce9dda5f6 Factor in the unavailability of ping in the health score
- No available ping limits the maximum health score a server can have
2020-09-27 11:08:39 -04:00
Tobias Diekershoff 360c421796
Merge pull request #62 from MrPetovan/task/39-search-match-username
Add missing column in profile fulltext index
2020-09-27 14:46:56 +02:00
Hypolite Petovan b7eab197b5 Update API profile search request to match updated fulltext index definition 2020-09-27 08:39:31 -04:00
Hypolite Petovan 3939800068 [Database v0008b] Add missing column in fulltext index
- Add minimal SQL query to downgrade SQL script to avoid empty query errors
2020-09-27 08:39:18 -04:00
Michael Vogel 96dec7c4df
Merge pull request #60 from MrPetovan/task/39-search-match-username
Profile search now matches username, not full profile URL
2020-09-27 00:47:15 +02:00
Hypolite Petovan d6bf75ae04 Update profile search request to match updated fulltext index definition 2020-09-26 18:32:43 -04:00
Hypolite Petovan 4621ae2001 [Database v0008] Replace profile_url with username in profile full-text index
- Prevents search matches on node domain name
2020-09-26 18:32:21 -04:00
Michael Vogel 7780d3af09
Merge pull request #59 from MrPetovan/bug/38-unique-server-alias
Add unique key on server_alias.alias
2020-09-27 00:28:19 +02:00
Hypolite Petovan e873d62e2c Expand ON DUPLICATE KEY statement to match the new unique key 2020-09-26 18:09:21 -04:00
Hypolite Petovan 8e6aa14704 [Database v0007] Add unique key on server_alias.alias
- Fix inconsistent behaviors with aliases referring to multiple servers
2020-09-26 18:09:08 -04:00
Michael Vogel 751a45fd3c
Merge pull request #58 from MrPetovan/bug/47-drop-server-path-field
[Database v0006] Drop unused server.path field
2020-09-26 23:11:16 +02:00
Michael Vogel b48c436141
Merge pull request #57 from MrPetovan/bug/45-drop-key-validation
Remove validity check on profile key parameter
2020-09-26 23:07:49 +02:00
Hypolite Petovan ca0bb09f81 [Database v0006] Drop unused server.path field
- Fix "Field 'path' doesn't have a default value" errors
2020-09-26 17:06:40 -04:00
Hypolite Petovan c21642d705 Improve logging for invalid parameters during profile polling 2020-09-26 16:33:55 -04:00
Hypolite Petovan c8fa6ef3dc Remove validity check on profile key parameter 2020-09-26 16:33:29 -04:00
Hypolite Petovan ffa16d1935
Merge pull request #55 from realkinetix/server-max-health-fix
Fix $server_max_health value being overwritten while calculating
2020-09-13 22:26:42 -04:00
Adam Clark 69b2356a1b Fix $server_max_health value being overwritten while calculating 2020-09-13 23:12:48 +00:00
Michael Vogel 1ca13876fb
Merge pull request #52 from tobiasd/20200901-it
IT translation update THX Sylke Vicious
2020-09-01 15:11:23 +02:00
Tobias Diekershoff fad8939cb4 IT translation update THX Sylke Vicious 2020-09-01 15:02:27 +02:00
Hypolite Petovan 896a07f9cb
Merge pull request #51 from tobiasd/20200818-lng
EN GB and PL translation updates
2020-08-18 11:54:12 -04:00
Tobias Diekershoff 1451b18460 PL translation updated THX Waldis 2020-08-18 17:51:53 +02:00
Tobias Diekershoff d04b50d2b9 EN GB translation updated THX AndyH3 2020-08-18 17:51:27 +02:00
Hypolite Petovan c41ce95f4e
Merge pull request #50 from annando/user-agent
User agent added
2020-07-17 19:47:34 -04:00
Michael 776851b84f User agent added 2020-07-17 20:41:02 +00:00
Michael Vogel 937fedc2c7
Merge pull request #46 from MrPetovan/release/2.3.1
Release 2.3.1
2020-06-20 22:54:07 +02:00
Hypolite Petovan 0c203131b9 Increase specificity of checks of $param
- Avoids warnings and notices
2020-06-20 12:47:17 -04:00
Hypolite Petovan 7799fb99ed [Composer] Update dependency mrpetovan/Net_Ping to version 1.2 2020-06-20 12:45:18 -04:00
Hypolite Petovan b6933785dd [Composer] Update lock file hash 2020-06-17 15:16:39 -04:00
Tobias Diekershoff 83aa5152aa
Merge pull request #44 from MrPetovan/release/2.3.0
Release 2.3.0
2020-06-17 19:50:29 +02:00
Hypolite Petovan 9ee72bb382 Update container namespace after dependency replacement
- container-interop has been replaced with psr/container
2020-06-17 09:27:20 -04:00
Hypolite Petovan ad6db150c5 Update references to friendica/friendica-directory stable branch 2020-06-15 14:05:26 -04:00
Hypolite Petovan 30bdf306ba Bump version number for 2.3.0 release 2020-06-15 14:05:26 -04:00
Hypolite Petovan 5c9432dd57 [Composer] Replace abandoned leafo/scssphp with scssphp/scssphp 2020-06-15 14:05:21 -04:00
Hypolite Petovan 19631ef206 [Composer] Update dependencies
- Removing sebastian/resource-operations (1.0.0)
  - Removing sebastian/code-unit-reverse-lookup (1.0.1)
  - Removing myclabs/deep-copy (1.8.1)
  - Removing container-interop/container-interop (1.2.0)
  - Removing sebastian/object-enumerator (2.0.1)
  - Updating fxp/composer-asset-plugin (v1.4.4 => v1.4.6)
  - Updating atlas/pdo (1.1.1 => 1.1.2)
  - Updating boronczyk/localization-middleware (1.4 => 1.4.1)
  - Updating byjg/anydataset (4.0.0 => 4.0.1)
  - Updating byjg/anydataset-db (4.0.0 => 4.0.1)
  - Updating byjg/migration (4.0.2 => 4.0.3)
  - Updating gettext/languages (2.5.0 => 2.6.0)
  - Updating gettext/gettext (v4.6.2 => v4.8.2)
  - Updating masterminds/html5 (2.5.0 => 2.7.1)
  - Updating psr/log (1.1.0 => 1.1.3)
  - Updating monolog/monolog (1.24.0 => 1.25.4)
  - Downgrading sebastian/version (2.0.1 => 1.0.6)
  - Downgrading sebastian/recursion-context (2.0.0 => 1.0.5)
  - Downgrading sebastian/exporter (2.0.0 => 1.2.2)
  - Downgrading sebastian/environment (2.0.0 => 1.3.8)
  - Updating symfony/polyfill-ctype (v1.10.0 => v1.17.0)
  - Updating webmozart/assert (1.4.0 => 1.5.0)
  - Updating phpdocumentor/reflection-common (1.0.1 => 2.1.0)
  - Updating phpdocumentor/type-resolver (0.4.0 => 1.0.1)
  - Updating phpdocumentor/reflection-docblock (4.3.0 => 4.3.4)
  - Updating doctrine/instantiator (1.1.0 => 1.3.1)
  - Updating phpspec/prophecy (1.8.0 => v1.10.3)
  - Downgrading phpunit/phpunit-mock-objects (3.4.4 => 2.3.8)
  - Downgrading phpunit/php-token-stream (2.0.2 => 1.4.12)
  - Downgrading phpunit/php-code-coverage (4.0.8 => 2.2.4)
  - Downgrading phpunit/phpunit (5.7.27 => 4.8.36)
  - Updating sarahman/simple-filesystem-cache (1.0.0 => 1.0.1)
  - Updating slim/slim (3.12.0 => 3.12.3)
  - Updating slim/php-view (2.2.0 => 2.2.1)
  - Updating bower-asset/bootstrap.native (2.0.25 => 2.0.27)
  - Updating bower-asset/fontawesome (5.7.2 => 5.13.0)
  - Updating bower-asset/bootstrap (v4.3.1 => v4.5.0)
  - Updating leafo/scssphp (v0.7.7 => v0.7.8)
  - Updating pear/pear_exception (v1.0.0 => v1.0.1)
  - Updating composer/xdebug-handler (1.3.2 => 1.4.2)
  - Updating netresearch/jsonmapper (v1.4.0 => v1.6.0)
  - Updating felixfbecker/advanced-json-rpc (v3.0.3 => v3.1.1)
  - Updating felixfbecker/language-server-protocol (v1.2.0 => v1.4.0)
  - Updating nikic/php-parser (v4.2.1 => v4.5.0)
  - Updating sabre/event (5.0.3 => 5.1.0)
  - Updating sabre/uri (2.1.1 => 2.2.0)
2020-06-15 09:43:08 -04:00
Hypolite Petovan 685772e24e [Composer] Replace abandoned zendframefork/zend-escape with suggested laminas/laminas-escape 2020-06-15 09:43:07 -04:00
Hypolite Petovan deabe4da49 [Composer] Enforce minimum PHP version during composer update
- Downgrade symfony/yaml to version v3.4.42 to satisfy the enforced minimum PHP version
2020-06-15 09:43:07 -04:00
Michael Vogel d509dfbbfd
Merge pull request #43 from tobiasd/master
updated CS, DE, FR and added ar  ca  cs  de  en  en_GB  et  fr  it  ja  nl  pl  ru  th  zh_CN translation
2020-06-15 10:38:29 +02:00
Tobias Diekershoff aeb0a67b12 updated CS, DE, FR and added ar ca cs de en en_GB et fr it ja nl pl ru th zh_CN translation 2020-06-15 09:54:58 +02:00
Michael Vogel 2eca458ec1
Merge pull request #42 from MrPetovan/master
Use byjg/uri dependency instead of adding new URL-handling library
2020-06-14 21:31:21 +02:00
Hypolite Petovan b0a258cd0e Use byjg/uri dependency instead of adding new URL-handling library in PHPRenderer 2020-06-14 15:13:18 -04:00
Hypolite Petovan e082c0535d [Composer] Added core dependency byjg/uri 2020-06-14 15:13:17 -04:00
Michael Vogel b030cfd4e3
Merge pull request #41 from friendica/task/24-add-zrl-parameter-support
Add zrl parameter support
2020-06-14 09:37:05 +02:00
Hypolite Petovan 6cdbcbddb1 [translation] Update translation files after string update 2020-06-13 13:25:05 -04:00
Hypolite Petovan 476f7ae832 Add ZRL parameter support sitewide in templates 2020-06-13 13:21:18 -04:00
Hypolite Petovan 57dd610e73 Add u() and r() method to PhpRenderer
- Add Router dependency
2020-06-13 13:20:49 -04:00
Hypolite Petovan 0cdbd3af2d Add ZrlMiddleware to the stack 2020-06-13 13:17:40 -04:00
Hypolite Petovan 230ceeab29 Add names to routes we need to get URLs for 2020-06-13 13:17:19 -04:00
Hypolite Petovan f47f263fc3 Add ZrlMiddleware class 2020-06-13 13:16:35 -04:00
Hypolite Petovan a402fbdf5d Add Utils\Url class 2020-06-13 13:16:25 -04:00
Hypolite Petovan 10edbea99e Update author email address in file headers 2020-06-13 13:15:53 -04:00
Hypolite Petovan c18551c44c
Merge pull request #35 from AlfredSK/AlfredSK-change-queries-from-open-to-not-closed
Show and count also servers with policy 'approve'
2019-11-01 13:05:27 -04:00
Steffen K9 dfd1a14300
Change the statistics query as well 2019-11-01 17:18:15 +01:00
Steffen K9 778168e0c4
Show also servers with policy 'approve'
Changed the queries to show also servers with register policy 'approval'.
2019-11-01 17:15:26 +01:00
Hypolite Petovan 1e3dab7c10
Merge pull request #32 from tobiasd/20190930-lng
Updated translations of directory from Transifex sources
2019-10-01 07:58:30 -04:00
Tobias Diekershoff 8c602d3566 updated CS, DE, FR and added AR, en_GB, ET, IT, JA, NL, PL, TH, zh_CN translation 2019-09-30 20:38:28 +02:00
Tobias Diekershoff 2e1812a369 added language codes to the settings.php file 2019-09-30 20:35:41 +02:00
Hypolite Petovan a0cfd33521 Fix queries to work with sql_mode=only_full_group_by 2019-05-12 14:00:44 -04:00
Hypolite Petovan 942de39e6d Release 2.2.1 2019-03-04 22:21:00 -05:00
Hypolite Petovan 6ada08b8f7 [Composer] Update dependencies
- Update atlas/pdo (1.1.0 => 1.1.1)
- Update bower-asset/fontawesome (5.7.1 => 5.7.2)
2019-03-04 22:21:00 -05:00
Hypolite Petovan a7a9001f5e [Database v0005] Change server.ssl_state column type to tinyint
- Fix "Data truncated" SQL error with server.ssl_state column type
2019-03-04 22:11:38 -05:00
Hypolite Petovan c0ff5c1cba [Composer] Use stable release for sarahman/simple-filesystem-cache 2019-03-04 22:07:27 -05:00
Hypolite Petovan 2324c4836f Remove unused use statement in Controllers\Console\ExtractStrings 2019-03-04 22:05:23 -05:00
Hypolite Petovan 45fc6315b3 Release 2.2.0 2019-02-03 09:54:31 -05:00
Hypolite Petovan eb8ea589bc [Composer] Updating dependencies
- Updating gettext/gettext (v4.6.1 => v4.6.2)
- Updating masterminds/html5 (2.4.0 => 2.5.0)
- Updating slim/slim (3.11.0 => 3.12.0)
- Updating bower-asset/bootstrap.native (2.0.24 => 2.0.25)
- Updating bower-asset/fontawesome (5.6.1 => 5.7.1)
- Updating bower-asset/bootstrap (v4.1.3 => v4.2.1)
- Updating symfony/yaml (v4.2.1 => v4.2.3)
- Updating composer/xdebug-handler (1.3.1 => 1.3.2)
- Updating nikic/php-parser (v4.1.0 => v4.2.0)
- Updating webmozart/assert (1.3.0 => 1.4.0)
2019-02-03 09:54:23 -05:00
Hypolite Petovan 1bbe4d3289 Add SSL and availability condition in /servers/surprise (#15) 2019-02-03 09:36:53 -05:00
Hypolite Petovan d0102327c0 Add /servers/surprise endpoint 2019-02-03 09:30:31 -05:00
Hypolite Petovan 0e4d5a035f Fix search parameter handling (#23)
- Add default value for search parameter
- Fix filter_var flags for language parameter
2019-02-03 09:20:58 -05:00
Hypolite Petovan b6aaa246f6
Merge pull request #22 from Aditoo17/master
L10n: Update Czech translation
2019-01-27 04:50:15 -05:00
Aditoo17 d45651328e L10n: Update Czech translation 2019-01-27 08:53:00 +01:00
Hypolite Petovan 4da3acb52a Align `/msearch` output to legacy format 2018-12-24 09:45:47 -05:00
Hypolite Petovan 2fcd282e83 Add documentation for /msearch endpoint 2018-12-23 21:23:08 -05:00
Hypolite Petovan 8db05cfa7c Add new POST route /msearch with associated controller 2018-12-23 21:22:52 -05:00
Hypolite Petovan dc67cff8ef [Database v0004] Add fulltext index to profile for interest match 2018-12-23 21:18:09 -05:00
Hypolite Petovan fc447f07c4 Clean code of Api\Search 2018-12-23 21:15:50 -05:00
Hypolite Petovan 31feea1b7a Updated font awesome paths for version 5.6 2018-12-19 05:52:50 -05:00
Hypolite Petovan 8ca7dfb455 Release 2.1.1 2018-12-19 05:40:48 -05:00
Hypolite Petovan d33fb62e35 Add support for RC version (#19) 2018-12-19 04:09:23 -05:00
Hypolite Petovan 503c134df6 [Composer] Updated font-awesome to version 5.6.1 2018-12-19 03:59:45 -05:00
Hypolite Petovan 6c01f2d3e5 [Composer] Update byjg/migration to version 4.0.2 2018-12-19 03:55:30 -05:00
Hypolite Petovan b561a1a49d Updated README about custom pages 2018-11-19 22:47:39 -05:00
Hypolite Petovan b61afa9502 Add support for multi-word custom HTML page name 2018-11-19 22:43:34 -05:00
Hypolite Petovan 6d4354c97f Update composer.lock 2018-11-19 22:42:17 -05:00
Hypolite Petovan 80e9283c41 Release 2.1.0 2018-11-19 22:32:47 -05:00
Hypolite Petovan c2de5cf80a Add de_DE to available locales 2018-11-19 22:32:20 -05:00
Hypolite Petovan aa25c475dc Update translations before release
- Add partial de translations
- Update fr translations
2018-11-19 22:20:56 -05:00
Hypolite Petovan e30065657d Fix missing argument in servers controller 2018-11-19 22:13:47 -05:00
Hypolite Petovan e36805c206 Add Custom Pages feature
- Add config/pages directory
- Add new custom pages controller and route
- Add generated links in the footer
2018-11-19 22:12:09 -05:00
Hypolite Petovan 8c1d4404c7 Add new expected abstract method to Web\BaseController
- Cleanup obsolete use statements
2018-11-19 22:11:22 -05:00
Hypolite Petovan 9f80a14565 Add footer with current version
- Move stats links from header to footer
2018-11-19 08:32:58 -05:00
Hypolite Petovan c0a56882bc Fix FR translation 2018-11-18 11:46:22 -05:00
Hypolite Petovan 2505436796 Add missing translation string in Layout 2018-11-18 11:40:05 -05:00
Hypolite Petovan d2a9099391 Update translation strings
- Update FR translations
2018-11-18 11:35:42 -05:00
Hypolite Petovan 2591f05fb5 Add translation strings to statistics page 2018-11-18 11:35:23 -05:00
Hypolite Petovan 0c3013adeb Add locale support to extract-strings console
- Remove reliance on available locales setting
- Add reliance on translation path setting
- Only create a new translation when a single language is provided
- Remove debug comments
2018-11-18 11:35:04 -05:00
Hypolite Petovan ce075c80e6 Add statistics page
- Closes https://github.com/friendica/friendica-directory/issues/2
2018-11-18 10:38:43 -05:00
Hypolite Petovan e8752c7631 Restore full local name in settings
- Fallback to two-letter language code for translation if locale isn't found
- Rename L10n::langToString to L10n::localeToLanguageString
- Use setlocale() with the selected locale
2018-11-18 10:38:17 -05:00
Hypolite Petovan 012a3f9f8d Add poco retrieval during server poll
- Closes https://github.com/friendica/friendica-directory/issues/7
2018-11-18 10:36:03 -05:00
Hypolite Petovan 26b4299b68 [Composer] Add byjg/webrequest direct dependency 2018-11-18 10:32:42 -05:00
Hypolite Petovan a828e712a3 Fix SQL error in search 2018-11-17 23:48:08 -05:00
Hypolite Petovan 4790067527 Fix SQL error when there's no condition in AccountTypeTabs 2018-11-17 14:15:25 -05:00
Hypolite Petovan b4f7957f1c Add database structure update known issue in doc 2018-11-17 09:47:11 -05:00
Hypolite Petovan dd60b60e99 Pre-release 2.1-rc2 2018-11-17 09:35:07 -05:00
Hypolite Petovan d66b9aa673 Add new translation strings to PO files
- Add FR translations to latest strings
2018-11-17 08:54:28 -05:00
Hypolite Petovan 94fe8cf397 Add Transifex mention to docs/Translation 2018-11-17 08:52:47 -05:00
Hypolite Petovan 4dad98fa04 Add count display for account type tabs
- Add translations strings to AccountTypeTabs
2018-11-17 08:52:23 -05:00
Hypolite Petovan 651849b18e Update type-hint/PHPDoc in PhpRenderer 2018-11-17 08:51:13 -05:00
Hypolite Petovan 3669e69241 Add PHPRenderer->np__() translation function 2018-11-17 08:50:51 -05:00
Hypolite Petovan b3e0a349c9 Fix overriding headers in extract-strings console 2018-11-17 08:28:04 -05:00
Hypolite Petovan 4ca3fd5a32 Add CS translations, thanks Aditoo 2018-11-17 08:21:37 -05:00
Hypolite Petovan 01d476f542 Use only language part of locale for popular languages
- Fixes https://github.com/friendica/friendica-directory/issues/13
2018-11-17 08:02:09 -05:00
Hypolite Petovan b29aafc2d9 Set Composer to --no-dev on install in doc 2018-11-17 07:51:11 -05:00
Hypolite Petovan 1960634797 Remove SET autocommit=0 in base.sql
- Fixes https://github.com/friendica/friendica-directory/issues/12
- Add transactions in SQL migration scripts
2018-11-17 07:50:42 -05:00
Hypolite Petovan b74921b5d8 Pre-release 2.1-rc1 2018-11-16 00:15:17 -05:00
Hypolite Petovan f2f647c6d7 Add documentation about translation 2018-11-16 00:14:03 -05:00
Hypolite Petovan c437eee38e Add base en strings
- Add translated fr strings
2018-11-16 00:01:48 -05:00
Hypolite Petovan fc434f4506 Add extract-strings console 2018-11-16 00:00:19 -05:00
Hypolite Petovan ff9eab39a7 Add translation string to templates
- Lower popular widget lists to 10 elements
- Add language to profile and server display
2018-11-16 00:00:03 -05:00
Hypolite Petovan 5b7bb030de Add Internationalization
- Add Utils/L10n class
- Add translator functions to PHP Renderer
- Refactor web controllers to prevent duplicated code
- Add locale middleware
- Add translation file loading
- Add i18n settings
2018-11-15 23:59:00 -05:00
Hypolite Petovan 13a2068a8b Move Photo Controller to Api 2018-11-15 23:41:32 -05:00
Hypolite Petovan f6426c1e8a [Composer] Add gettext/gettext and boronczyk/localization-middleware dependencies 2018-11-15 23:40:07 -05:00
Hypolite Petovan bc5a0fb590 Add language storage during server and profile polling
- Add index on language field in profile and server tables
2018-11-15 23:39:32 -05:00
Hypolite Petovan 650f0b4009 Remove unused /tag route 2018-11-15 23:32:07 -05:00
Hypolite Petovan 93c2536f18 Add deep merge between default and local settings 2018-11-15 23:30:25 -05:00
Hypolite Petovan 88fcd9610c Remove trailing slashes in path settings 2018-11-15 23:29:52 -05:00
Hypolite Petovan fadb733527 Fix server polling error when body was unexpected JSON 2018-11-15 23:29:17 -05:00
Hypolite Petovan 31156b8643 Increase verbosity of cron queue counts 2018-11-15 23:28:36 -05:00
Hypolite Petovan 4c85d86b7f
Merge pull request #10 from AndyHee/master
Update INSTALL.md
2018-11-14 10:08:46 -05:00
Andy H f6769a6c2a
Update INSTALL.md 2018-11-14 21:57:20 +07:00
Andy H ea3657d15b
Update INSTALL.md 2018-11-14 21:39:47 +07:00
Hypolite Petovan 5f7930c54f Release 2.0.6 2018-11-13 22:02:13 -05:00
Hypolite Petovan 63b10c37f5 Add ProfileAdd subconsole 2018-11-13 22:01:52 -05:00
Hypolite Petovan f9b9557415 Add queue size info logging in Controllers/Cron 2018-11-13 22:01:34 -05:00
Hypolite Petovan 641dc9b8eb Improve DirectoryAdd console output 2018-11-13 22:01:12 -05:00
Hypolite Petovan bbff23caa5 Add debug logging of ProfilePollQueue::add calls 2018-11-13 22:00:50 -05:00
Hypolite Petovan 27c5c14ed7 Fix critical mistake preventing profile to be added to queue 2018-11-13 22:00:29 -05:00
Hypolite Petovan 2cabe10fa3 Add return codes to ProfilePollQueue->add 2018-11-13 22:00:07 -05:00
Hypolite Petovan d231a9bc80 Improve Network::isPublicHost 2018-11-13 21:51:58 -05:00
Andy H c22ce2292d
Merge branch 'master' into master 2018-11-13 20:18:03 +07:00
Andy H 247e444885
Update INSTALL.md
Resolved conflict
2018-11-13 20:13:50 +07:00
Hypolite Petovan 8d702801a5 Release v2.0.5 2018-11-12 21:51:23 -05:00
Hypolite Petovan 7616249610 Add profile URL test on profile poll 2018-11-12 21:50:50 -05:00
Hypolite Petovan 6797eb72cb Add new Network::testURL method
- Remove obsolete intval() call in Network::fetchURL
2018-11-12 21:50:31 -05:00
Hypolite Petovan 93e0153112 Add test for public host in profile poll queue add 2018-11-12 21:49:49 -05:00
Hypolite Petovan 5207196e1a Fix wrong Network::fetchUrl call in Utils\Scrape 2018-11-12 21:49:06 -05:00
Hypolite Petovan dadcf3239f Fix empty admin profile in server poller 2018-11-12 21:48:40 -05:00
Hypolite Petovan a319f9991c Remove WIP 2018-11-12 21:48:13 -05:00
Hypolite Petovan 63886737a6 Release 2.0.4 2018-11-12 14:51:37 -05:00
Hypolite Petovan 66dca727a6 Add missing column in profile fulltext index 2018-11-12 14:51:37 -05:00
Hypolite Petovan e03e10e032 Update install/update documentation 2018-11-12 14:51:36 -05:00
Andy H ad8a2b80e0
Update INSTALL.md
Add Nginx configuration line
2018-11-12 21:36:55 +07:00
Hypolite Petovan 714c37f811 Remove unused Open Iconic assets 2018-11-12 07:44:36 -05:00
Hypolite Petovan 57a33a3c75 Release 2.0.3 2018-11-12 07:04:06 -05:00
Hypolite Petovan 46db64872a Fix wrong column name in Controllers\Web\Servers 2018-11-12 07:03:24 -05:00
Hypolite Petovan 726f016a5b
Fix another typo in INSTALL.md 2018-11-12 00:11:03 -05:00
Hypolite Petovan 48a522c0bb
Fix typo in INSTALL.md 2018-11-12 00:09:36 -05:00
180 changed files with 10971 additions and 14852 deletions

View File

@ -4,7 +4,7 @@
1. Fork the repository
2. Create a new branch for each feature or improvement
3. Send a pull request from each feature branch to the master branch
3. Send a pull request from each feature branch to the stable branch
It is very important to separate new features or improvements into separate feature branches, and to send a
pull request for each branch. This allows us to review and pull in new features or improvements individually.

View File

@ -1,36 +1,30 @@
# Friendica Directory Install
# Friendica Directory Install Instructions
## Get the source code
## 1. Get the source code
If you want to install Friendica Directory in `/path/to/friendica-directory`
For a planned install of Friendica Directory in the `/path/to/friendica-directory` folder.
### Using Composer
### Using Git and Composer
Composer is a popular dependency management tool for PHP projects. [Getting Started with Composer](https://getcomposer.org/doc/00-intro.md).
```
cd /path/to
composer create-project friendica/friendica-directory --no-dev
```
### Using Git
Git is a popular version control management tool. [Getting Started with Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
Git is a popular version control management tool.
[Getting Started with Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
You'll also need Composer to grab the project dependencies.
Composer is a popular dependency management tool for PHP projects.
[Getting Started with Composer](https://getcomposer.org/doc/00-intro.md).
```
cd /path/to
git clone https://github.com/friendica/friendica-directory
git clone https://github.com/friendica/friendica-directory friendica-directory
cd friendica-directory
composer install
composer install --no-dev
```
### Using an archive
### Using a stable release archive
On the []Friendica Directory Github Releases page](https://github.com/friendica/friendica-directory/releases), you can find the latest source archive named `friendica-directory-<version>.zip`.
On the [Friendica Directory Github Releases page](https://github.com/friendica/friendica-directory/releases), you can find the latest source archive named `friendica-directory-<version>.zip`.
Simply unpack the archive in `/path/to/friendica-directory`.
Simply unpack the archive in `/path/to/friendica-directory`, the dependencies are already included.
## Set up a database and a user
@ -45,7 +39,7 @@ Sample commands from the MariaDB console for a local install:
> GRANT ALL ON `friendica-directory`.* TO 'friendica-directory'@'localhost' IDENTIFIED BY "password";
```
## Initialize database schema
## 2. Initialize database schema
Using the details gathered from the previous step, follow the instructions in the Friendica Directory Install Wizard.
@ -54,7 +48,7 @@ cd /path/to/friendica-directory
bin/console install
```
## Configure your web server
## 3. Configure your web server
The document root of Friendica Directory is `/public`.
@ -68,7 +62,23 @@ In your Virtual Host file, set your document root as follow:
DocumentRoot /path/to/friendica-directory/public/
```
## Set up the background task
### Nginx
Add these lines to your nginx config file.
```
root /path/to/friendica-directory/public;
location / {
rewrite ^/(.*) /index.php?$args last;
}
location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|woff|svg)$ {
expires 30d;
try_files $uri /index.php?$args;
}
```
## 4. Set up the background task
Friendica Directory relies on a background task running every minute to keep the directory up to date.
@ -79,8 +89,8 @@ Add this line to your crontab:
* * * * * cd /path/to/friendica-directory && php bin/cron.php
```
## Seed your directory
## 5. Seed your directory
Your directory is ready, but empty. To start filling it, you can:
- Set your hostname as the main directory in [Friendica][https://github.com/friendica/friendica]'s admin settings
- Add existing directories in your polling queue: `bin/console directory-add https://dir.friendica.social`
- Set your host name as the main directory in [Friendica](https://github.com/friendica/friendica)'s admin settings.
- Add existing directories in your polling queue: `bin/console directory-add https://dir.friendica.social`.

View File

@ -21,12 +21,27 @@ This is an opt-in directory, meaning that each node can choose not to submit its
Please refer to the provided [installation instructions](INSTALL.md).
## Update from a previous version
Please refer to the provided [update instructions](UPDATE.md).
## Custom pages
If you need to add custom HTML pages as required by law to publish any website processing data in some countries, simply add your HTML files in the `config/pages` folder, they will be automatically linked from the footer.
Tips:
- The expected extension is `.html`.
- Underscores in the page file name are replaced by spaces in the page link label.
- Accents aren't supported.
## See also
- [Project Concepts](docs/Concepts.md)
- [Directory Protocol](docs/Protocol.md)
- [Translation](docs/Translation.md)
## Special thanks
- [Beanow](https://github.com/Beanow) for his efforts to spearhead the previous version of the Friendica Directory software.
- [Scott Arciszewski](https://github.com/paragonie-scott) for his inspiration to use Slim and his invaluable Slim app example.
- [Saša Stamenković](https://github.com/umpirsky) for his useful list packages like [umpirsky/language-list](https://github.com/umpirsky/language-list).

45
UPDATE.md Normal file
View File

@ -0,0 +1,45 @@
# Friendica Directory Update Instructions
## 1. Update the source code
If you installed Friendica Directory in `/path/to/friendica-directory`.
### Using Git
```
cd /path/to/friendica-directory
git pull
composer install
```
### Using an archive
1. Create a temporary folder to unpack the new archive.
2. Copy your old `config/local.json` to the new folder.
3. Swap the folder names.
4. Remove the temporary folder.
Sample Linux commands:
```
cd /path/to
mkdir friendica-directory-new
unzip friendica-<version>.zip friendica-directory-new
cp friendica-directory/config/local.json friendica-directory-new/config
mv friendica-directory friendica-directory-old
mv friendica-directory-new friendica-directory
rm -r friendica-directory-old
```
## 2. Update the database structure
The database structure may have changed since the last update, fortunately a console command allows to run the migration scripts up to the latest version:
```
cd /path/to/friendica-directory
bin/console dbupdate
```
### Known issues
Before version 2.1, updating the database schema was impossible because the `status` column value of the `migration_version` table was incorrectly set to `partial up` instead of `complete`.
Updating from 2.0.x, changing the value allows to update the database schema.

View File

@ -1 +1 @@
2.0.2
2.4.2

BIN
bin/composer.phar Normal file

Binary file not shown.

View File

@ -15,9 +15,9 @@ require __DIR__ . '/../src/dependencies.php';
(new \Friendica\Directory\Controllers\Cron(
$container->get('atlas'),
$container->get('\Friendica\Directory\Pollers\Profile'),
$container->get('\Friendica\Directory\Pollers\Server'),
$container->get('\Friendica\Directory\Pollers\Directory'),
$container->get(\Friendica\Directory\Pollers\Profile::class),
$container->get(\Friendica\Directory\Pollers\Server::class),
$container->get(\Friendica\Directory\Pollers\Directory::class),
$container->get('logger')
))->execute();

View File

@ -16,27 +16,33 @@
"ext-curl": "*",
"ext-gd": "*",
"ext-json": "*",
"ext-pdo": "*",
"asika/simple-console": "^1.0",
"atlas/pdo": "^1.1",
"byjg/migration": "^2.1",
"fxp/composer-asset-plugin": "^1.4",
"boronczyk/localization-middleware": "^1.4",
"byjg/migration": "^4.0",
"byjg/uri": "^1.0.4",
"gettext/gettext": "^4.6",
"gofabian/negotiation-middleware": "dev-master",
"guzzlehttp/guzzle": "^6.5",
"laminas/laminas-escaper": "^2.6",
"laminas/laminas-zendframework-bridge": "^1.4",
"masterminds/html5": "^2.3",
"monolog/monolog": "^1.17",
"mrpetovan/net_ping": "^1.0",
"sarahman/simple-filesystem-cache": "dev-master",
"mrpetovan/net_ping": "^1.2",
"sarahman/simple-filesystem-cache": "^1.0",
"seld/cli-prompt": "^1.0",
"slim/slim": "^3.1",
"slim/php-view": "^2.0",
"zendframework/zend-escaper": "^2.6",
"fxp/composer-asset-plugin": "^1.4",
"bower-asset/bootstrap.native": "^2.0",
"bower-asset/fontawesome": "^5.5",
"gofabian/negotiation-middleware": "^0.1.3"
"bower-asset/fontawesome": "^5.5"
},
"require-dev": {
"bower-asset/bootstrap": "^4.1",
"phpunit/phpunit": ">=4.8 < 6.0",
"vimeo/psalm": "^2.0",
"leafo/scssphp": "^0.7.7"
"scssphp/scssphp": "^1.1",
"vimeo/psalm": "^2.0"
},
"autoload": {
"psr-4": {
@ -49,6 +55,9 @@
}
},
"config": {
"platform": {
"php": "7.3.0"
},
"process-timeout" : 0,
"autoloader-suffix": "FriendicaDirectory",
"optimize-autoloader": true,
@ -70,7 +79,8 @@
"/composer.*",
"!/vendor",
"public/assets/vendor",
"!public/assets/vendor/fontawesome/web-fonts-with-css",
"!public/assets/vendor/fontawesome/css",
"!public/assets/vendor/fontawesome/webfonts",
"!public/assets/vendor/bootstrap.native/dist"
]
}

2338
composer.lock generated

File diff suppressed because it is too large Load Diff

4
config/.gitignore vendored
View File

@ -1,4 +1,6 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore
!.gitignore
# And the pages subdirectory
!pages

4
config/pages/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore

View File

@ -1,15 +1,26 @@
# Friendica Directory Protocol
## Surprise
```
GET /servers/surprise
```
Redirects to the base URL of a random server with open registration policy and above 75 health.
## Search
```
GET /search[/account_type]?q=...
GET /search[/account_type]?q=...[&page=...][&limit=...]
Accept: application/json
```
Parameters:
- `account_type`: An arbitrary account type string. Currently supported are `all`, `people` and `forum`. Default is `all`.
URI Parameter:
- `account_type` (optional): An arbitrary account type string. Expected values are `all`, `people`, `news`, `organization` and `group`. Default is `all`.
Query parameters:
- `q`: The search query.
- `page` (optional): The page number, default is 1.
- `limit` (optional): The page size, default is 20, max is 100.
Returns a JSON structure containing a paginated list profiles matching the search query and the optional account type.
@ -33,10 +44,46 @@ Example:
"region": "New York",
"country": "USA",
"profile_url": "https://friendica.mrpetovan.com/profile/hypolite",
"dfrn_request": "https://friendica.mrpetovan.com/dfrn_request/hypolite",
"photo": "https://friendica.mrpetovan.com/photo/27330388315ae4ed2b03e3c116980490-4.jpg?ts=1541567135",
"tags": "videogame gaming boardgame politics philosophy development programming php",
"last_activity": "2018-45"
"last_activity": "2018-45",
"remote_follow": "https://friendica.mrpetovan.com/remote_follow/hypolite",
"subscribe": null
},
...
]
}
```
### Legacy interest match search
```
POST /msearch
Content-Type: application/x-www-form-urlencoded
Accept: application/json
```
Parameters:
- `s`: The search query, a list of tags separated by spaces or commas is expected.
- `p` (optional): The page number, default is 1.
- `n` (optional): The number of items per page, default is 80.
Returns a JSON structure containing a paginated list profiles matching the search query and the optional account type.
Example:
```json
{
"query": "videogame gaming boardgame politics philosophy development programming php",
"page": 1,
"items_page": 100,
"total": 32,
"results": [
{
"name": "Hyp🌧lite Pe☂ov🍃n (he/him)",
"url": "https://friendica.mrpetovan.com/profile/hypolite",
"photo": "https://friendica.mrpetovan.com/photo/27330388315ae4ed2b03e3c116980490-4.jpg?ts=1545521478",
"tags": "videogame gaming boardgame politics philosophy development programming php"
},
...
]

71
docs/Translation.md Normal file
View File

@ -0,0 +1,71 @@
# Friendica Directory Localization
## Overview
The Friendica Directory interface is available in multiple languages.
We are using a gettext-like process to generate and parse translations files, which enables translators to use their usual software to translate strings.
The translations files are located in `src/lang/<locale>/LC_MESSAGES/`:
- The compiled MO file can be generated from a translation software and will be loaded by default.
- The PO file is the main translation interface and can be loaded if the MO file doesn't exist.
## Main scenarios
Thanks for your interest in translating the Friendica Directory interface!
### On Transifex
Please head over to [the Friendica Directory Transifex page](https://www.transifex.com/Friendica/friendica/directory/) where you will need an account to start translating the existing strings.
The translations will be included in the next release.
### Manually
#### Add a new locale
Adding a new locale requires to edit `src/settings.php` to add it to the `$settings['i18n']['locales']` array.
The base translation file can then be generated with `bin/console extract-string <locale>`.
#### Translate existing strings
PO files can be edited with translation software like [Poedit](https://poedit.net).
Please make sure your software is able to compile MO files to update the existing one.
Both PO and MO files should be committed with Git before being submitted in a GitHub pull request.
Please refer to the [GitHub flow documentation](https://help.github.com/articles/github-flow/) if you're unfamiliar with it.
#### Add new translation strings
Once templates/controllers files have been edited with new translation strings, you can run `bin/console extract-strings --all` to update the PO files of all available languages at once.
## Translation functions usage
### In templates
Basic usage:
- `$this->__('Label')` => `Label`
- `$this->__('Label %s', 'test')` => `Label test`
With context, if a base english term can have multiple meanings:
- `$this->p__('noun', 'Search')` => `Recherche`
- `$this->p__('verb', 'Search')` => `Rechercher`
- `$this->p__('noun', 'Search %s', 'test')` => `Recherche test`
- `$this->p__('verb', 'Search %s', 'test')` => `Rechercher test`
With plurals:
- `$this->p__('Label', 'Labels', 1)` => `Label`
- `$this->p__('Label', 'Labels', 3)` => `Labels`
- `$this->p__('%d Label', '%d Labels', 1)` => `1 Label`
- `$this->p__('%d Label', '%d Labels', 3)` => `3 Labels`
- `$this->p__('%d Label', 'Labels %2%s %3%s', 1, 'test', 'test2')` => `Label test test2`
- `$this->p__('%d Label', 'Labels %2%s %3%s', 3, 'test', 'test2')` => `Labels test test2`
### In classes
You will need to add the `l10n` dependency to your class before you can use it (see [Pager](src/classes/Content/Pager.php)).
- `$this->l10n->gettext('Label')`
- `$this->l10n->pgettext('context', 'Label')`
- `$this->l10n->ngettext('Label', 'Labels', 3)`
- `$this->l10n->npgettext('context', 'Label', 'Labels', 3)`

View File

@ -1,952 +0,0 @@
/* Bootstrap */
@font-face {
font-family: 'Icons';
src: url('../fonts/open-iconic.eot');
src: url('../fonts/open-iconic.eot?#iconic-sm') format('embedded-opentype'), url('../fonts/open-iconic.woff') format('woff'), url('../fonts/open-iconic.ttf') format('truetype'), url('../fonts/open-iconic.otf') format('opentype'), url('../fonts/open-iconic.svg#iconic-sm') format('svg');
font-weight: normal;
font-style: normal;
}
.oi {
position: relative;
top: 1px;
display: inline-block;
speak:none;
font-family: 'Icons';
font-style: normal;
font-weight: normal;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.oi:empty:before {
width: 1em;
text-align: center;
box-sizing: content-box;
}
.oi.oi-align-center:before {
text-align: center;
}
.oi.oi-align-left:before {
text-align: left;
}
.oi.oi-align-right:before {
text-align: right;
}
.oi.oi-flip-horizontal:before {
-webkit-transform: scale(-1, 1);
-ms-transform: scale(-1, 1);
transform: scale(-1, 1);
}
.oi.oi-flip-vertical:before {
-webkit-transform: scale(1, -1);
-ms-transform: scale(-1, 1);
transform: scale(1, -1);
}
.oi.oi-flip-horizontal-vertical:before {
-webkit-transform: scale(-1, -1);
-ms-transform: scale(-1, 1);
transform: scale(-1, -1);
}
.oi-account-login:before {
content:'\e000';
}
.oi-account-logout:before {
content:'\e001';
}
.oi-action-redo:before {
content:'\e002';
}
.oi-action-undo:before {
content:'\e003';
}
.oi-align-center:before {
content:'\e004';
}
.oi-align-left:before {
content:'\e005';
}
.oi-align-right:before {
content:'\e006';
}
.oi-aperture:before {
content:'\e007';
}
.oi-arrow-bottom:before {
content:'\e008';
}
.oi-arrow-circle-bottom:before {
content:'\e009';
}
.oi-arrow-circle-left:before {
content:'\e00a';
}
.oi-arrow-circle-right:before {
content:'\e00b';
}
.oi-arrow-circle-top:before {
content:'\e00c';
}
.oi-arrow-left:before {
content:'\e00d';
}
.oi-arrow-right:before {
content:'\e00e';
}
.oi-arrow-thick-bottom:before {
content:'\e00f';
}
.oi-arrow-thick-left:before {
content:'\e010';
}
.oi-arrow-thick-right:before {
content:'\e011';
}
.oi-arrow-thick-top:before {
content:'\e012';
}
.oi-arrow-top:before {
content:'\e013';
}
.oi-audio-spectrum:before {
content:'\e014';
}
.oi-audio:before {
content:'\e015';
}
.oi-badge:before {
content:'\e016';
}
.oi-ban:before {
content:'\e017';
}
.oi-bar-chart:before {
content:'\e018';
}
.oi-basket:before {
content:'\e019';
}
.oi-battery-empty:before {
content:'\e01a';
}
.oi-battery-full:before {
content:'\e01b';
}
.oi-beaker:before {
content:'\e01c';
}
.oi-bell:before {
content:'\e01d';
}
.oi-bluetooth:before {
content:'\e01e';
}
.oi-bold:before {
content:'\e01f';
}
.oi-bolt:before {
content:'\e020';
}
.oi-book:before {
content:'\e021';
}
.oi-bookmark:before {
content:'\e022';
}
.oi-box:before {
content:'\e023';
}
.oi-briefcase:before {
content:'\e024';
}
.oi-british-pound:before {
content:'\e025';
}
.oi-browser:before {
content:'\e026';
}
.oi-brush:before {
content:'\e027';
}
.oi-bug:before {
content:'\e028';
}
.oi-bullhorn:before {
content:'\e029';
}
.oi-calculator:before {
content:'\e02a';
}
.oi-calendar:before {
content:'\e02b';
}
.oi-camera-slr:before {
content:'\e02c';
}
.oi-caret-bottom:before {
content:'\e02d';
}
.oi-caret-left:before {
content:'\e02e';
}
.oi-caret-right:before {
content:'\e02f';
}
.oi-caret-top:before {
content:'\e030';
}
.oi-cart:before {
content:'\e031';
}
.oi-chat:before {
content:'\e032';
}
.oi-check:before {
content:'\e033';
}
.oi-chevron-bottom:before {
content:'\e034';
}
.oi-chevron-left:before {
content:'\e035';
}
.oi-chevron-right:before {
content:'\e036';
}
.oi-chevron-top:before {
content:'\e037';
}
.oi-circle-check:before {
content:'\e038';
}
.oi-circle-x:before {
content:'\e039';
}
.oi-clipboard:before {
content:'\e03a';
}
.oi-clock:before {
content:'\e03b';
}
.oi-cloud-download:before {
content:'\e03c';
}
.oi-cloud-upload:before {
content:'\e03d';
}
.oi-cloud:before {
content:'\e03e';
}
.oi-cloudy:before {
content:'\e03f';
}
.oi-code:before {
content:'\e040';
}
.oi-cog:before {
content:'\e041';
}
.oi-collapse-down:before {
content:'\e042';
}
.oi-collapse-left:before {
content:'\e043';
}
.oi-collapse-right:before {
content:'\e044';
}
.oi-collapse-up:before {
content:'\e045';
}
.oi-command:before {
content:'\e046';
}
.oi-comment-square:before {
content:'\e047';
}
.oi-compass:before {
content:'\e048';
}
.oi-contrast:before {
content:'\e049';
}
.oi-copywriting:before {
content:'\e04a';
}
.oi-credit-card:before {
content:'\e04b';
}
.oi-crop:before {
content:'\e04c';
}
.oi-dashboard:before {
content:'\e04d';
}
.oi-data-transfer-download:before {
content:'\e04e';
}
.oi-data-transfer-upload:before {
content:'\e04f';
}
.oi-delete:before {
content:'\e050';
}
.oi-dial:before {
content:'\e051';
}
.oi-document:before {
content:'\e052';
}
.oi-dollar:before {
content:'\e053';
}
.oi-double-quote-sans-left:before {
content:'\e054';
}
.oi-double-quote-sans-right:before {
content:'\e055';
}
.oi-double-quote-serif-left:before {
content:'\e056';
}
.oi-double-quote-serif-right:before {
content:'\e057';
}
.oi-droplet:before {
content:'\e058';
}
.oi-eject:before {
content:'\e059';
}
.oi-elevator:before {
content:'\e05a';
}
.oi-ellipses:before {
content:'\e05b';
}
.oi-envelope-closed:before {
content:'\e05c';
}
.oi-envelope-open:before {
content:'\e05d';
}
.oi-euro:before {
content:'\e05e';
}
.oi-excerpt:before {
content:'\e05f';
}
.oi-expand-down:before {
content:'\e060';
}
.oi-expand-left:before {
content:'\e061';
}
.oi-expand-right:before {
content:'\e062';
}
.oi-expand-up:before {
content:'\e063';
}
.oi-external-link:before {
content:'\e064';
}
.oi-eye:before {
content:'\e065';
}
.oi-eyedropper:before {
content:'\e066';
}
.oi-file:before {
content:'\e067';
}
.oi-fire:before {
content:'\e068';
}
.oi-flag:before {
content:'\e069';
}
.oi-flash:before {
content:'\e06a';
}
.oi-folder:before {
content:'\e06b';
}
.oi-fork:before {
content:'\e06c';
}
.oi-fullscreen-enter:before {
content:'\e06d';
}
.oi-fullscreen-exit:before {
content:'\e06e';
}
.oi-globe:before {
content:'\e06f';
}
.oi-graph:before {
content:'\e070';
}
.oi-grid-four-up:before {
content:'\e071';
}
.oi-grid-three-up:before {
content:'\e072';
}
.oi-grid-two-up:before {
content:'\e073';
}
.oi-hard-drive:before {
content:'\e074';
}
.oi-header:before {
content:'\e075';
}
.oi-headphones:before {
content:'\e076';
}
.oi-heart:before {
content:'\e077';
}
.oi-home:before {
content:'\e078';
}
.oi-image:before {
content:'\e079';
}
.oi-inbox:before {
content:'\e07a';
}
.oi-infinity:before {
content:'\e07b';
}
.oi-info:before {
content:'\e07c';
}
.oi-italic:before {
content:'\e07d';
}
.oi-justify-center:before {
content:'\e07e';
}
.oi-justify-left:before {
content:'\e07f';
}
.oi-justify-right:before {
content:'\e080';
}
.oi-key:before {
content:'\e081';
}
.oi-laptop:before {
content:'\e082';
}
.oi-layers:before {
content:'\e083';
}
.oi-lightbulb:before {
content:'\e084';
}
.oi-link-broken:before {
content:'\e085';
}
.oi-link-intact:before {
content:'\e086';
}
.oi-list-rich:before {
content:'\e087';
}
.oi-list:before {
content:'\e088';
}
.oi-location:before {
content:'\e089';
}
.oi-lock-locked:before {
content:'\e08a';
}
.oi-lock-unlocked:before {
content:'\e08b';
}
.oi-loop-circular:before {
content:'\e08c';
}
.oi-loop-square:before {
content:'\e08d';
}
.oi-loop:before {
content:'\e08e';
}
.oi-magnifying-glass:before {
content:'\e08f';
}
.oi-map-marker:before {
content:'\e090';
}
.oi-map:before {
content:'\e091';
}
.oi-media-pause:before {
content:'\e092';
}
.oi-media-play:before {
content:'\e093';
}
.oi-media-record:before {
content:'\e094';
}
.oi-media-skip-backward:before {
content:'\e095';
}
.oi-media-skip-forward:before {
content:'\e096';
}
.oi-media-step-backward:before {
content:'\e097';
}
.oi-media-step-forward:before {
content:'\e098';
}
.oi-media-stop:before {
content:'\e099';
}
.oi-medical-cross:before {
content:'\e09a';
}
.oi-menu:before {
content:'\e09b';
}
.oi-microphone:before {
content:'\e09c';
}
.oi-minus:before {
content:'\e09d';
}
.oi-monitor:before {
content:'\e09e';
}
.oi-moon:before {
content:'\e09f';
}
.oi-move:before {
content:'\e0a0';
}
.oi-musical-note:before {
content:'\e0a1';
}
.oi-paperclip:before {
content:'\e0a2';
}
.oi-pencil:before {
content:'\e0a3';
}
.oi-people:before {
content:'\e0a4';
}
.oi-person:before {
content:'\e0a5';
}
.oi-phone:before {
content:'\e0a6';
}
.oi-pie-chart:before {
content:'\e0a7';
}
.oi-pin:before {
content:'\e0a8';
}
.oi-play-circle:before {
content:'\e0a9';
}
.oi-plus:before {
content:'\e0aa';
}
.oi-power-standby:before {
content:'\e0ab';
}
.oi-print:before {
content:'\e0ac';
}
.oi-project:before {
content:'\e0ad';
}
.oi-pulse:before {
content:'\e0ae';
}
.oi-puzzle-piece:before {
content:'\e0af';
}
.oi-question-mark:before {
content:'\e0b0';
}
.oi-rain:before {
content:'\e0b1';
}
.oi-random:before {
content:'\e0b2';
}
.oi-reload:before {
content:'\e0b3';
}
.oi-resize-both:before {
content:'\e0b4';
}
.oi-resize-height:before {
content:'\e0b5';
}
.oi-resize-width:before {
content:'\e0b6';
}
.oi-rss-alt:before {
content:'\e0b7';
}
.oi-rss:before {
content:'\e0b8';
}
.oi-script:before {
content:'\e0b9';
}
.oi-share-boxed:before {
content:'\e0ba';
}
.oi-share:before {
content:'\e0bb';
}
.oi-shield:before {
content:'\e0bc';
}
.oi-signal:before {
content:'\e0bd';
}
.oi-signpost:before {
content:'\e0be';
}
.oi-sort-ascending:before {
content:'\e0bf';
}
.oi-sort-descending:before {
content:'\e0c0';
}
.oi-spreadsheet:before {
content:'\e0c1';
}
.oi-star:before {
content:'\e0c2';
}
.oi-sun:before {
content:'\e0c3';
}
.oi-tablet:before {
content:'\e0c4';
}
.oi-tag:before {
content:'\e0c5';
}
.oi-tags:before {
content:'\e0c6';
}
.oi-target:before {
content:'\e0c7';
}
.oi-task:before {
content:'\e0c8';
}
.oi-terminal:before {
content:'\e0c9';
}
.oi-text:before {
content:'\e0ca';
}
.oi-thumb-down:before {
content:'\e0cb';
}
.oi-thumb-up:before {
content:'\e0cc';
}
.oi-timer:before {
content:'\e0cd';
}
.oi-transfer:before {
content:'\e0ce';
}
.oi-trash:before {
content:'\e0cf';
}
.oi-underline:before {
content:'\e0d0';
}
.oi-vertical-align-bottom:before {
content:'\e0d1';
}
.oi-vertical-align-center:before {
content:'\e0d2';
}
.oi-vertical-align-top:before {
content:'\e0d3';
}
.oi-video:before {
content:'\e0d4';
}
.oi-volume-high:before {
content:'\e0d5';
}
.oi-volume-low:before {
content:'\e0d6';
}
.oi-volume-off:before {
content:'\e0d7';
}
.oi-warning:before {
content:'\e0d8';
}
.oi-wifi:before {
content:'\e0d9';
}
.oi-wrench:before {
content:'\e0da';
}
.oi-x:before {
content:'\e0db';
}
.oi-yen:before {
content:'\e0dc';
}
.oi-zoom-in:before {
content:'\e0dd';
}
.oi-zoom-out:before {
content:'\e0de';
}

View File

@ -1,960 +0,0 @@
/* Bootstrap */
/* Override Bootstrap default variable */
//@icon-font-path: "../fonts/";
@font-face {
font-family: 'Icons';
src: ~"url('@{icon-font-path}open-iconic.eot')";
src: ~"url('@{icon-font-path}open-iconic.eot?#iconic-sm') format('embedded-opentype')",
~"url('@{icon-font-path}open-iconic.woff') format('woff')",
~"url('@{icon-font-path}open-iconic.ttf') format('truetype')",
~"url('@{icon-font-path}open-iconic.svg#iconic-sm') format('svg')";
font-weight: normal;
font-style: normal;
}
// Catchall baseclass
.oi {
position: relative;
top: 1px;
display: inline-block;
font-family: 'Icons';
font-style: normal;
font-weight: normal;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
&:empty:before {
width: 1em;
text-align: center;
box-sizing: content-box;
}
&.oi-align-center:before {
text-align: center;
}
&.oi-align-left:before {
text-align: left;
}
&.oi-align-right:before {
text-align: right;
}
&.oi-flip-horizontal:before {
-webkit-transform: scale(-1, 1);
-ms-transform: scale(-1, 1);
transform: scale(-1, 1);
}
&.oi-flip-vertical:before {
-webkit-transform: scale(1, -1);
-ms-transform: scale(-1, 1);
transform: scale(1, -1);
}
&.oi-flip-horizontal-vertical:before {
-webkit-transform: scale(-1, -1);
-ms-transform: scale(-1, 1);
transform: scale(-1, -1);
}
}
.oi-account-login:before {
content:"\e000";
}
.oi-account-logout:before {
content:"\e001";
}
.oi-action-redo:before {
content:"\e002";
}
.oi-action-undo:before {
content:"\e003";
}
.oi-align-center:before {
content:"\e004";
}
.oi-align-left:before {
content:"\e005";
}
.oi-align-right:before {
content:"\e006";
}
.oi-aperture:before {
content:"\e007";
}
.oi-arrow-bottom:before {
content:"\e008";
}
.oi-arrow-circle-bottom:before {
content:"\e009";
}
.oi-arrow-circle-left:before {
content:"\e00a";
}
.oi-arrow-circle-right:before {
content:"\e00b";
}
.oi-arrow-circle-top:before {
content:"\e00c";
}
.oi-arrow-left:before {
content:"\e00d";
}
.oi-arrow-right:before {
content:"\e00e";
}
.oi-arrow-thick-bottom:before {
content:"\e00f";
}
.oi-arrow-thick-left:before {
content:"\e010";
}
.oi-arrow-thick-right:before {
content:"\e011";
}
.oi-arrow-thick-top:before {
content:"\e012";
}
.oi-arrow-top:before {
content:"\e013";
}
.oi-audio-spectrum:before {
content:"\e014";
}
.oi-audio:before {
content:"\e015";
}
.oi-badge:before {
content:"\e016";
}
.oi-ban:before {
content:"\e017";
}
.oi-bar-chart:before {
content:"\e018";
}
.oi-basket:before {
content:"\e019";
}
.oi-battery-empty:before {
content:"\e01a";
}
.oi-battery-full:before {
content:"\e01b";
}
.oi-beaker:before {
content:"\e01c";
}
.oi-bell:before {
content:"\e01d";
}
.oi-bluetooth:before {
content:"\e01e";
}
.oi-bold:before {
content:"\e01f";
}
.oi-bolt:before {
content:"\e020";
}
.oi-book:before {
content:"\e021";
}
.oi-bookmark:before {
content:"\e022";
}
.oi-box:before {
content:"\e023";
}
.oi-briefcase:before {
content:"\e024";
}
.oi-british-pound:before {
content:"\e025";
}
.oi-browser:before {
content:"\e026";
}
.oi-brush:before {
content:"\e027";
}
.oi-bug:before {
content:"\e028";
}
.oi-bullhorn:before {
content:"\e029";
}
.oi-calculator:before {
content:"\e02a";
}
.oi-calendar:before {
content:"\e02b";
}
.oi-camera-slr:before {
content:"\e02c";
}
.oi-caret-bottom:before {
content:"\e02d";
}
.oi-caret-left:before {
content:"\e02e";
}
.oi-caret-right:before {
content:"\e02f";
}
.oi-caret-top:before {
content:"\e030";
}
.oi-cart:before {
content:"\e031";
}
.oi-chat:before {
content:"\e032";
}
.oi-check:before {
content:"\e033";
}
.oi-chevron-bottom:before {
content:"\e034";
}
.oi-chevron-left:before {
content:"\e035";
}
.oi-chevron-right:before {
content:"\e036";
}
.oi-chevron-top:before {
content:"\e037";
}
.oi-circle-check:before {
content:"\e038";
}
.oi-circle-x:before {
content:"\e039";
}
.oi-clipboard:before {
content:"\e03a";
}
.oi-clock:before {
content:"\e03b";
}
.oi-cloud-download:before {
content:"\e03c";
}
.oi-cloud-upload:before {
content:"\e03d";
}
.oi-cloud:before {
content:"\e03e";
}
.oi-cloudy:before {
content:"\e03f";
}
.oi-code:before {
content:"\e040";
}
.oi-cog:before {
content:"\e041";
}
.oi-collapse-down:before {
content:"\e042";
}
.oi-collapse-left:before {
content:"\e043";
}
.oi-collapse-right:before {
content:"\e044";
}
.oi-collapse-up:before {
content:"\e045";
}
.oi-command:before {
content:"\e046";
}
.oi-comment-square:before {
content:"\e047";
}
.oi-compass:before {
content:"\e048";
}
.oi-contrast:before {
content:"\e049";
}
.oi-copywriting:before {
content:"\e04a";
}
.oi-credit-card:before {
content:"\e04b";
}
.oi-crop:before {
content:"\e04c";
}
.oi-dashboard:before {
content:"\e04d";
}
.oi-data-transfer-download:before {
content:"\e04e";
}
.oi-data-transfer-upload:before {
content:"\e04f";
}
.oi-delete:before {
content:"\e050";
}
.oi-dial:before {
content:"\e051";
}
.oi-document:before {
content:"\e052";
}
.oi-dollar:before {
content:"\e053";
}
.oi-double-quote-sans-left:before {
content:"\e054";
}
.oi-double-quote-sans-right:before {
content:"\e055";
}
.oi-double-quote-serif-left:before {
content:"\e056";
}
.oi-double-quote-serif-right:before {
content:"\e057";
}
.oi-droplet:before {
content:"\e058";
}
.oi-eject:before {
content:"\e059";
}
.oi-elevator:before {
content:"\e05a";
}
.oi-ellipses:before {
content:"\e05b";
}
.oi-envelope-closed:before {
content:"\e05c";
}
.oi-envelope-open:before {
content:"\e05d";
}
.oi-euro:before {
content:"\e05e";
}
.oi-excerpt:before {
content:"\e05f";
}
.oi-expand-down:before {
content:"\e060";
}
.oi-expand-left:before {
content:"\e061";
}
.oi-expand-right:before {
content:"\e062";
}
.oi-expand-up:before {
content:"\e063";
}
.oi-external-link:before {
content:"\e064";
}
.oi-eye:before {
content:"\e065";
}
.oi-eyedropper:before {
content:"\e066";
}
.oi-file:before {
content:"\e067";
}
.oi-fire:before {
content:"\e068";
}
.oi-flag:before {
content:"\e069";
}
.oi-flash:before {
content:"\e06a";
}
.oi-folder:before {
content:"\e06b";
}
.oi-fork:before {
content:"\e06c";
}
.oi-fullscreen-enter:before {
content:"\e06d";
}
.oi-fullscreen-exit:before {
content:"\e06e";
}
.oi-globe:before {
content:"\e06f";
}
.oi-graph:before {
content:"\e070";
}
.oi-grid-four-up:before {
content:"\e071";
}
.oi-grid-three-up:before {
content:"\e072";
}
.oi-grid-two-up:before {
content:"\e073";
}
.oi-hard-drive:before {
content:"\e074";
}
.oi-header:before {
content:"\e075";
}
.oi-headphones:before {
content:"\e076";
}
.oi-heart:before {
content:"\e077";
}
.oi-home:before {
content:"\e078";
}
.oi-image:before {
content:"\e079";
}
.oi-inbox:before {
content:"\e07a";
}
.oi-infinity:before {
content:"\e07b";
}
.oi-info:before {
content:"\e07c";
}
.oi-italic:before {
content:"\e07d";
}
.oi-justify-center:before {
content:"\e07e";
}
.oi-justify-left:before {
content:"\e07f";
}
.oi-justify-right:before {
content:"\e080";
}
.oi-key:before {
content:"\e081";
}
.oi-laptop:before {
content:"\e082";
}
.oi-layers:before {
content:"\e083";
}
.oi-lightbulb:before {
content:"\e084";
}
.oi-link-broken:before {
content:"\e085";
}
.oi-link-intact:before {
content:"\e086";
}
.oi-list-rich:before {
content:"\e087";
}
.oi-list:before {
content:"\e088";
}
.oi-location:before {
content:"\e089";
}
.oi-lock-locked:before {
content:"\e08a";
}
.oi-lock-unlocked:before {
content:"\e08b";
}
.oi-loop-circular:before {
content:"\e08c";
}
.oi-loop-square:before {
content:"\e08d";
}
.oi-loop:before {
content:"\e08e";
}
.oi-magnifying-glass:before {
content:"\e08f";
}
.oi-map-marker:before {
content:"\e090";
}
.oi-map:before {
content:"\e091";
}
.oi-media-pause:before {
content:"\e092";
}
.oi-media-play:before {
content:"\e093";
}
.oi-media-record:before {
content:"\e094";
}
.oi-media-skip-backward:before {
content:"\e095";
}
.oi-media-skip-forward:before {
content:"\e096";
}
.oi-media-step-backward:before {
content:"\e097";
}
.oi-media-step-forward:before {
content:"\e098";
}
.oi-media-stop:before {
content:"\e099";
}
.oi-medical-cross:before {
content:"\e09a";
}
.oi-menu:before {
content:"\e09b";
}
.oi-microphone:before {
content:"\e09c";
}
.oi-minus:before {
content:"\e09d";
}
.oi-monitor:before {
content:"\e09e";
}
.oi-moon:before {
content:"\e09f";
}
.oi-move:before {
content:"\e0a0";
}
.oi-musical-note:before {
content:"\e0a1";
}
.oi-paperclip:before {
content:"\e0a2";
}
.oi-pencil:before {
content:"\e0a3";
}
.oi-people:before {
content:"\e0a4";
}
.oi-person:before {
content:"\e0a5";
}
.oi-phone:before {
content:"\e0a6";
}
.oi-pie-chart:before {
content:"\e0a7";
}
.oi-pin:before {
content:"\e0a8";
}
.oi-play-circle:before {
content:"\e0a9";
}
.oi-plus:before {
content:"\e0aa";
}
.oi-power-standby:before {
content:"\e0ab";
}
.oi-print:before {
content:"\e0ac";
}
.oi-project:before {
content:"\e0ad";
}
.oi-pulse:before {
content:"\e0ae";
}
.oi-puzzle-piece:before {
content:"\e0af";
}
.oi-question-mark:before {
content:"\e0b0";
}
.oi-rain:before {
content:"\e0b1";
}
.oi-random:before {
content:"\e0b2";
}
.oi-reload:before {
content:"\e0b3";
}
.oi-resize-both:before {
content:"\e0b4";
}
.oi-resize-height:before {
content:"\e0b5";
}
.oi-resize-width:before {
content:"\e0b6";
}
.oi-rss-alt:before {
content:"\e0b7";
}
.oi-rss:before {
content:"\e0b8";
}
.oi-script:before {
content:"\e0b9";
}
.oi-share-boxed:before {
content:"\e0ba";
}
.oi-share:before {
content:"\e0bb";
}
.oi-shield:before {
content:"\e0bc";
}
.oi-signal:before {
content:"\e0bd";
}
.oi-signpost:before {
content:"\e0be";
}
.oi-sort-ascending:before {
content:"\e0bf";
}
.oi-sort-descending:before {
content:"\e0c0";
}
.oi-spreadsheet:before {
content:"\e0c1";
}
.oi-star:before {
content:"\e0c2";
}
.oi-sun:before {
content:"\e0c3";
}
.oi-tablet:before {
content:"\e0c4";
}
.oi-tag:before {
content:"\e0c5";
}
.oi-tags:before {
content:"\e0c6";
}
.oi-target:before {
content:"\e0c7";
}
.oi-task:before {
content:"\e0c8";
}
.oi-terminal:before {
content:"\e0c9";
}
.oi-text:before {
content:"\e0ca";
}
.oi-thumb-down:before {
content:"\e0cb";
}
.oi-thumb-up:before {
content:"\e0cc";
}
.oi-timer:before {
content:"\e0cd";
}
.oi-transfer:before {
content:"\e0ce";
}
.oi-trash:before {
content:"\e0cf";
}
.oi-underline:before {
content:"\e0d0";
}
.oi-vertical-align-bottom:before {
content:"\e0d1";
}
.oi-vertical-align-center:before {
content:"\e0d2";
}
.oi-vertical-align-top:before {
content:"\e0d3";
}
.oi-video:before {
content:"\e0d4";
}
.oi-volume-high:before {
content:"\e0d5";
}
.oi-volume-low:before {
content:"\e0d6";
}
.oi-volume-off:before {
content:"\e0d7";
}
.oi-warning:before {
content:"\e0d8";
}
.oi-wifi:before {
content:"\e0d9";
}
.oi-wrench:before {
content:"\e0da";
}
.oi-x:before {
content:"\e0db";
}
.oi-yen:before {
content:"\e0dc";
}
.oi-zoom-in:before {
content:"\e0dd";
}
.oi-zoom-out:before {
content:"\e0de";
}

File diff suppressed because one or more lines are too long

View File

@ -1,958 +0,0 @@
/* Bootstrap */
/* Override Bootstrap default variable */
$icon-font-path: '../fonts/' !default;
@font-face {
font-family: 'Icons';
src: url('#{$icon-font-path}open-iconic.eot');
src: url('#{$icon-font-path}open-iconic.eot?#iconic-sm') format('embedded-opentype'), url('#{$icon-font-path}open-iconic.woff') format('woff'), url('#{$icon-font-path}open-iconic.ttf') format('truetype'), url('#{$icon-font-path}open-iconic.svg#iconic-sm') format('svg');
font-weight: normal;
font-style: normal;
}
// Catchall baseclass
.oi {
position: relative;
top: 1px;
display: inline-block;
font-family: 'Icons';
font-style: normal;
font-weight: normal;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
&:empty:before {
width: 1em;
text-align: center;
box-sizing: content-box;
}
&.oi-align-center:before {
text-align: center;
}
&.oi-align-left:before {
text-align: left;
}
&.oi-align-right:before {
text-align: right;
}
&.oi-flip-horizontal:before {
-webkit-transform: scale(-1, 1);
-ms-transform: scale(-1, 1);
transform: scale(-1, 1);
}
&.oi-flip-vertical:before {
-webkit-transform: scale(1, -1);
-ms-transform: scale(-1, 1);
transform: scale(1, -1);
}
&.oi-flip-horizontal-vertical:before {
-webkit-transform: scale(-1, -1);
-ms-transform: scale(-1, 1);
transform: scale(-1, -1);
}
}
.oi-account-login:before {
content:'\e000';
}
.oi-account-logout:before {
content:'\e001';
}
.oi-action-redo:before {
content:'\e002';
}
.oi-action-undo:before {
content:'\e003';
}
.oi-align-center:before {
content:'\e004';
}
.oi-align-left:before {
content:'\e005';
}
.oi-align-right:before {
content:'\e006';
}
.oi-aperture:before {
content:'\e007';
}
.oi-arrow-bottom:before {
content:'\e008';
}
.oi-arrow-circle-bottom:before {
content:'\e009';
}
.oi-arrow-circle-left:before {
content:'\e00a';
}
.oi-arrow-circle-right:before {
content:'\e00b';
}
.oi-arrow-circle-top:before {
content:'\e00c';
}
.oi-arrow-left:before {
content:'\e00d';
}
.oi-arrow-right:before {
content:'\e00e';
}
.oi-arrow-thick-bottom:before {
content:'\e00f';
}
.oi-arrow-thick-left:before {
content:'\e010';
}
.oi-arrow-thick-right:before {
content:'\e011';
}
.oi-arrow-thick-top:before {
content:'\e012';
}
.oi-arrow-top:before {
content:'\e013';
}
.oi-audio-spectrum:before {
content:'\e014';
}
.oi-audio:before {
content:'\e015';
}
.oi-badge:before {
content:'\e016';
}
.oi-ban:before {
content:'\e017';
}
.oi-bar-chart:before {
content:'\e018';
}
.oi-basket:before {
content:'\e019';
}
.oi-battery-empty:before {
content:'\e01a';
}
.oi-battery-full:before {
content:'\e01b';
}
.oi-beaker:before {
content:'\e01c';
}
.oi-bell:before {
content:'\e01d';
}
.oi-bluetooth:before {
content:'\e01e';
}
.oi-bold:before {
content:'\e01f';
}
.oi-bolt:before {
content:'\e020';
}
.oi-book:before {
content:'\e021';
}
.oi-bookmark:before {
content:'\e022';
}
.oi-box:before {
content:'\e023';
}
.oi-briefcase:before {
content:'\e024';
}
.oi-british-pound:before {
content:'\e025';
}
.oi-browser:before {
content:'\e026';
}
.oi-brush:before {
content:'\e027';
}
.oi-bug:before {
content:'\e028';
}
.oi-bullhorn:before {
content:'\e029';
}
.oi-calculator:before {
content:'\e02a';
}
.oi-calendar:before {
content:'\e02b';
}
.oi-camera-slr:before {
content:'\e02c';
}
.oi-caret-bottom:before {
content:'\e02d';
}
.oi-caret-left:before {
content:'\e02e';
}
.oi-caret-right:before {
content:'\e02f';
}
.oi-caret-top:before {
content:'\e030';
}
.oi-cart:before {
content:'\e031';
}
.oi-chat:before {
content:'\e032';
}
.oi-check:before {
content:'\e033';
}
.oi-chevron-bottom:before {
content:'\e034';
}
.oi-chevron-left:before {
content:'\e035';
}
.oi-chevron-right:before {
content:'\e036';
}
.oi-chevron-top:before {
content:'\e037';
}
.oi-circle-check:before {
content:'\e038';
}
.oi-circle-x:before {
content:'\e039';
}
.oi-clipboard:before {
content:'\e03a';
}
.oi-clock:before {
content:'\e03b';
}
.oi-cloud-download:before {
content:'\e03c';
}
.oi-cloud-upload:before {
content:'\e03d';
}
.oi-cloud:before {
content:'\e03e';
}
.oi-cloudy:before {
content:'\e03f';
}
.oi-code:before {
content:'\e040';
}
.oi-cog:before {
content:'\e041';
}
.oi-collapse-down:before {
content:'\e042';
}
.oi-collapse-left:before {
content:'\e043';
}
.oi-collapse-right:before {
content:'\e044';
}
.oi-collapse-up:before {
content:'\e045';
}
.oi-command:before {
content:'\e046';
}
.oi-comment-square:before {
content:'\e047';
}
.oi-compass:before {
content:'\e048';
}
.oi-contrast:before {
content:'\e049';
}
.oi-copywriting:before {
content:'\e04a';
}
.oi-credit-card:before {
content:'\e04b';
}
.oi-crop:before {
content:'\e04c';
}
.oi-dashboard:before {
content:'\e04d';
}
.oi-data-transfer-download:before {
content:'\e04e';
}
.oi-data-transfer-upload:before {
content:'\e04f';
}
.oi-delete:before {
content:'\e050';
}
.oi-dial:before {
content:'\e051';
}
.oi-document:before {
content:'\e052';
}
.oi-dollar:before {
content:'\e053';
}
.oi-double-quote-sans-left:before {
content:'\e054';
}
.oi-double-quote-sans-right:before {
content:'\e055';
}
.oi-double-quote-serif-left:before {
content:'\e056';
}
.oi-double-quote-serif-right:before {
content:'\e057';
}
.oi-droplet:before {
content:'\e058';
}
.oi-eject:before {
content:'\e059';
}
.oi-elevator:before {
content:'\e05a';
}
.oi-ellipses:before {
content:'\e05b';
}
.oi-envelope-closed:before {
content:'\e05c';
}
.oi-envelope-open:before {
content:'\e05d';
}
.oi-euro:before {
content:'\e05e';
}
.oi-excerpt:before {
content:'\e05f';
}
.oi-expand-down:before {
content:'\e060';
}
.oi-expand-left:before {
content:'\e061';
}
.oi-expand-right:before {
content:'\e062';
}
.oi-expand-up:before {
content:'\e063';
}
.oi-external-link:before {
content:'\e064';
}
.oi-eye:before {
content:'\e065';
}
.oi-eyedropper:before {
content:'\e066';
}
.oi-file:before {
content:'\e067';
}
.oi-fire:before {
content:'\e068';
}
.oi-flag:before {
content:'\e069';
}
.oi-flash:before {
content:'\e06a';
}
.oi-folder:before {
content:'\e06b';
}
.oi-fork:before {
content:'\e06c';
}
.oi-fullscreen-enter:before {
content:'\e06d';
}
.oi-fullscreen-exit:before {
content:'\e06e';
}
.oi-globe:before {
content:'\e06f';
}
.oi-graph:before {
content:'\e070';
}
.oi-grid-four-up:before {
content:'\e071';
}
.oi-grid-three-up:before {
content:'\e072';
}
.oi-grid-two-up:before {
content:'\e073';
}
.oi-hard-drive:before {
content:'\e074';
}
.oi-header:before {
content:'\e075';
}
.oi-headphones:before {
content:'\e076';
}
.oi-heart:before {
content:'\e077';
}
.oi-home:before {
content:'\e078';
}
.oi-image:before {
content:'\e079';
}
.oi-inbox:before {
content:'\e07a';
}
.oi-infinity:before {
content:'\e07b';
}
.oi-info:before {
content:'\e07c';
}
.oi-italic:before {
content:'\e07d';
}
.oi-justify-center:before {
content:'\e07e';
}
.oi-justify-left:before {
content:'\e07f';
}
.oi-justify-right:before {
content:'\e080';
}
.oi-key:before {
content:'\e081';
}
.oi-laptop:before {
content:'\e082';
}
.oi-layers:before {
content:'\e083';
}
.oi-lightbulb:before {
content:'\e084';
}
.oi-link-broken:before {
content:'\e085';
}
.oi-link-intact:before {
content:'\e086';
}
.oi-list-rich:before {
content:'\e087';
}
.oi-list:before {
content:'\e088';
}
.oi-location:before {
content:'\e089';
}
.oi-lock-locked:before {
content:'\e08a';
}
.oi-lock-unlocked:before {
content:'\e08b';
}
.oi-loop-circular:before {
content:'\e08c';
}
.oi-loop-square:before {
content:'\e08d';
}
.oi-loop:before {
content:'\e08e';
}
.oi-magnifying-glass:before {
content:'\e08f';
}
.oi-map-marker:before {
content:'\e090';
}
.oi-map:before {
content:'\e091';
}
.oi-media-pause:before {
content:'\e092';
}
.oi-media-play:before {
content:'\e093';
}
.oi-media-record:before {
content:'\e094';
}
.oi-media-skip-backward:before {
content:'\e095';
}
.oi-media-skip-forward:before {
content:'\e096';
}
.oi-media-step-backward:before {
content:'\e097';
}
.oi-media-step-forward:before {
content:'\e098';
}
.oi-media-stop:before {
content:'\e099';
}
.oi-medical-cross:before {
content:'\e09a';
}
.oi-menu:before {
content:'\e09b';
}
.oi-microphone:before {
content:'\e09c';
}
.oi-minus:before {
content:'\e09d';
}
.oi-monitor:before {
content:'\e09e';
}
.oi-moon:before {
content:'\e09f';
}
.oi-move:before {
content:'\e0a0';
}
.oi-musical-note:before {
content:'\e0a1';
}
.oi-paperclip:before {
content:'\e0a2';
}
.oi-pencil:before {
content:'\e0a3';
}
.oi-people:before {
content:'\e0a4';
}
.oi-person:before {
content:'\e0a5';
}
.oi-phone:before {
content:'\e0a6';
}
.oi-pie-chart:before {
content:'\e0a7';
}
.oi-pin:before {
content:'\e0a8';
}
.oi-play-circle:before {
content:'\e0a9';
}
.oi-plus:before {
content:'\e0aa';
}
.oi-power-standby:before {
content:'\e0ab';
}
.oi-print:before {
content:'\e0ac';
}
.oi-project:before {
content:'\e0ad';
}
.oi-pulse:before {
content:'\e0ae';
}
.oi-puzzle-piece:before {
content:'\e0af';
}
.oi-question-mark:before {
content:'\e0b0';
}
.oi-rain:before {
content:'\e0b1';
}
.oi-random:before {
content:'\e0b2';
}
.oi-reload:before {
content:'\e0b3';
}
.oi-resize-both:before {
content:'\e0b4';
}
.oi-resize-height:before {
content:'\e0b5';
}
.oi-resize-width:before {
content:'\e0b6';
}
.oi-rss-alt:before {
content:'\e0b7';
}
.oi-rss:before {
content:'\e0b8';
}
.oi-script:before {
content:'\e0b9';
}
.oi-share-boxed:before {
content:'\e0ba';
}
.oi-share:before {
content:'\e0bb';
}
.oi-shield:before {
content:'\e0bc';
}
.oi-signal:before {
content:'\e0bd';
}
.oi-signpost:before {
content:'\e0be';
}
.oi-sort-ascending:before {
content:'\e0bf';
}
.oi-sort-descending:before {
content:'\e0c0';
}
.oi-spreadsheet:before {
content:'\e0c1';
}
.oi-star:before {
content:'\e0c2';
}
.oi-sun:before {
content:'\e0c3';
}
.oi-tablet:before {
content:'\e0c4';
}
.oi-tag:before {
content:'\e0c5';
}
.oi-tags:before {
content:'\e0c6';
}
.oi-target:before {
content:'\e0c7';
}
.oi-task:before {
content:'\e0c8';
}
.oi-terminal:before {
content:'\e0c9';
}
.oi-text:before {
content:'\e0ca';
}
.oi-thumb-down:before {
content:'\e0cb';
}
.oi-thumb-up:before {
content:'\e0cc';
}
.oi-timer:before {
content:'\e0cd';
}
.oi-transfer:before {
content:'\e0ce';
}
.oi-trash:before {
content:'\e0cf';
}
.oi-underline:before {
content:'\e0d0';
}
.oi-vertical-align-bottom:before {
content:'\e0d1';
}
.oi-vertical-align-center:before {
content:'\e0d2';
}
.oi-vertical-align-top:before {
content:'\e0d3';
}
.oi-video:before {
content:'\e0d4';
}
.oi-volume-high:before {
content:'\e0d5';
}
.oi-volume-low:before {
content:'\e0d6';
}
.oi-volume-off:before {
content:'\e0d7';
}
.oi-warning:before {
content:'\e0d8';
}
.oi-wifi:before {
content:'\e0d9';
}
.oi-wrench:before {
content:'\e0da';
}
.oi-x:before {
content:'\e0db';
}
.oi-yen:before {
content:'\e0dc';
}
.oi-zoom-in:before {
content:'\e0dd';
}
.oi-zoom-out:before {
content:'\e0de';
}

View File

@ -1,954 +0,0 @@
/* Bootstrap */
@font-face
font-family 'Icons'
src url('../fonts/open-iconic.eot')
src url('../fonts/open-iconic.eot?#iconic-sm') format('embedded-opentype'), url('../fonts/open-iconic.woff') format('woff'), url('../fonts/open-iconic.ttf') format('truetype'), url('../fonts/open-iconic.svg#iconic-sm') format('svg')
font-weight normal
font-style normal
// Catchall baseclass
.oi
position relative
top 1px
display inline-block
font-family 'Icons'
font-style normal
font-weight normal
line-height 1
-webkit-font-smoothing antialiased
-moz-osx-font-smoothing grayscale
&:empty:before
width 1em
text-align center
box-sizing content-box
&.oi-align-center:before
text-align center
&.oi-align-left:before
text-align left
&.oi-align-right:before
text-align right
&.oi-flip-horizontal:before
-webkit-transform scale(-1, 1)
-ms-transform scale(-1, 1)
transform scale(-1, 1)
&.oi-flip-vertical:before
-webkit-transform scale(1, -1)
-ms-transform scale(-1, 1)
transform scale(1, -1)
&.oi-flip-horizontal-vertical:before
-webkit-transform scale(-1, -1)
-ms-transform scale(-1, 1)
transform scale(-1, -1)
.oi-account-login:before {
content'\e000'
}
.oi-account-logout:before {
content'\e001'
}
.oi-action-redo:before {
content'\e002'
}
.oi-action-undo:before {
content'\e003'
}
.oi-align-center:before {
content'\e004'
}
.oi-align-left:before {
content'\e005'
}
.oi-align-right:before {
content'\e006'
}
.oi-aperture:before {
content'\e007'
}
.oi-arrow-bottom:before {
content'\e008'
}
.oi-arrow-circle-bottom:before {
content'\e009'
}
.oi-arrow-circle-left:before {
content'\e00a'
}
.oi-arrow-circle-right:before {
content'\e00b'
}
.oi-arrow-circle-top:before {
content'\e00c'
}
.oi-arrow-left:before {
content'\e00d'
}
.oi-arrow-right:before {
content'\e00e'
}
.oi-arrow-thick-bottom:before {
content'\e00f'
}
.oi-arrow-thick-left:before {
content'\e010'
}
.oi-arrow-thick-right:before {
content'\e011'
}
.oi-arrow-thick-top:before {
content'\e012'
}
.oi-arrow-top:before {
content'\e013'
}
.oi-audio-spectrum:before {
content'\e014'
}
.oi-audio:before {
content'\e015'
}
.oi-badge:before {
content'\e016'
}
.oi-ban:before {
content'\e017'
}
.oi-bar-chart:before {
content'\e018'
}
.oi-basket:before {
content'\e019'
}
.oi-battery-empty:before {
content'\e01a'
}
.oi-battery-full:before {
content'\e01b'
}
.oi-beaker:before {
content'\e01c'
}
.oi-bell:before {
content'\e01d'
}
.oi-bluetooth:before {
content'\e01e'
}
.oi-bold:before {
content'\e01f'
}
.oi-bolt:before {
content'\e020'
}
.oi-book:before {
content'\e021'
}
.oi-bookmark:before {
content'\e022'
}
.oi-box:before {
content'\e023'
}
.oi-briefcase:before {
content'\e024'
}
.oi-british-pound:before {
content'\e025'
}
.oi-browser:before {
content'\e026'
}
.oi-brush:before {
content'\e027'
}
.oi-bug:before {
content'\e028'
}
.oi-bullhorn:before {
content'\e029'
}
.oi-calculator:before {
content'\e02a'
}
.oi-calendar:before {
content'\e02b'
}
.oi-camera-slr:before {
content'\e02c'
}
.oi-caret-bottom:before {
content'\e02d'
}
.oi-caret-left:before {
content'\e02e'
}
.oi-caret-right:before {
content'\e02f'
}
.oi-caret-top:before {
content'\e030'
}
.oi-cart:before {
content'\e031'
}
.oi-chat:before {
content'\e032'
}
.oi-check:before {
content'\e033'
}
.oi-chevron-bottom:before {
content'\e034'
}
.oi-chevron-left:before {
content'\e035'
}
.oi-chevron-right:before {
content'\e036'
}
.oi-chevron-top:before {
content'\e037'
}
.oi-circle-check:before {
content'\e038'
}
.oi-circle-x:before {
content'\e039'
}
.oi-clipboard:before {
content'\e03a'
}
.oi-clock:before {
content'\e03b'
}
.oi-cloud-download:before {
content'\e03c'
}
.oi-cloud-upload:before {
content'\e03d'
}
.oi-cloud:before {
content'\e03e'
}
.oi-cloudy:before {
content'\e03f'
}
.oi-code:before {
content'\e040'
}
.oi-cog:before {
content'\e041'
}
.oi-collapse-down:before {
content'\e042'
}
.oi-collapse-left:before {
content'\e043'
}
.oi-collapse-right:before {
content'\e044'
}
.oi-collapse-up:before {
content'\e045'
}
.oi-command:before {
content'\e046'
}
.oi-comment-square:before {
content'\e047'
}
.oi-compass:before {
content'\e048'
}
.oi-contrast:before {
content'\e049'
}
.oi-copywriting:before {
content'\e04a'
}
.oi-credit-card:before {
content'\e04b'
}
.oi-crop:before {
content'\e04c'
}
.oi-dashboard:before {
content'\e04d'
}
.oi-data-transfer-download:before {
content'\e04e'
}
.oi-data-transfer-upload:before {
content'\e04f'
}
.oi-delete:before {
content'\e050'
}
.oi-dial:before {
content'\e051'
}
.oi-document:before {
content'\e052'
}
.oi-dollar:before {
content'\e053'
}
.oi-double-quote-sans-left:before {
content'\e054'
}
.oi-double-quote-sans-right:before {
content'\e055'
}
.oi-double-quote-serif-left:before {
content'\e056'
}
.oi-double-quote-serif-right:before {
content'\e057'
}
.oi-droplet:before {
content'\e058'
}
.oi-eject:before {
content'\e059'
}
.oi-elevator:before {
content'\e05a'
}
.oi-ellipses:before {
content'\e05b'
}
.oi-envelope-closed:before {
content'\e05c'
}
.oi-envelope-open:before {
content'\e05d'
}
.oi-euro:before {
content'\e05e'
}
.oi-excerpt:before {
content'\e05f'
}
.oi-expand-down:before {
content'\e060'
}
.oi-expand-left:before {
content'\e061'
}
.oi-expand-right:before {
content'\e062'
}
.oi-expand-up:before {
content'\e063'
}
.oi-external-link:before {
content'\e064'
}
.oi-eye:before {
content'\e065'
}
.oi-eyedropper:before {
content'\e066'
}
.oi-file:before {
content'\e067'
}
.oi-fire:before {
content'\e068'
}
.oi-flag:before {
content'\e069'
}
.oi-flash:before {
content'\e06a'
}
.oi-folder:before {
content'\e06b'
}
.oi-fork:before {
content'\e06c'
}
.oi-fullscreen-enter:before {
content'\e06d'
}
.oi-fullscreen-exit:before {
content'\e06e'
}
.oi-globe:before {
content'\e06f'
}
.oi-graph:before {
content'\e070'
}
.oi-grid-four-up:before {
content'\e071'
}
.oi-grid-three-up:before {
content'\e072'
}
.oi-grid-two-up:before {
content'\e073'
}
.oi-hard-drive:before {
content'\e074'
}
.oi-header:before {
content'\e075'
}
.oi-headphones:before {
content'\e076'
}
.oi-heart:before {
content'\e077'
}
.oi-home:before {
content'\e078'
}
.oi-image:before {
content'\e079'
}
.oi-inbox:before {
content'\e07a'
}
.oi-infinity:before {
content'\e07b'
}
.oi-info:before {
content'\e07c'
}
.oi-italic:before {
content'\e07d'
}
.oi-justify-center:before {
content'\e07e'
}
.oi-justify-left:before {
content'\e07f'
}
.oi-justify-right:before {
content'\e080'
}
.oi-key:before {
content'\e081'
}
.oi-laptop:before {
content'\e082'
}
.oi-layers:before {
content'\e083'
}
.oi-lightbulb:before {
content'\e084'
}
.oi-link-broken:before {
content'\e085'
}
.oi-link-intact:before {
content'\e086'
}
.oi-list-rich:before {
content'\e087'
}
.oi-list:before {
content'\e088'
}
.oi-location:before {
content'\e089'
}
.oi-lock-locked:before {
content'\e08a'
}
.oi-lock-unlocked:before {
content'\e08b'
}
.oi-loop-circular:before {
content'\e08c'
}
.oi-loop-square:before {
content'\e08d'
}
.oi-loop:before {
content'\e08e'
}
.oi-magnifying-glass:before {
content'\e08f'
}
.oi-map-marker:before {
content'\e090'
}
.oi-map:before {
content'\e091'
}
.oi-media-pause:before {
content'\e092'
}
.oi-media-play:before {
content'\e093'
}
.oi-media-record:before {
content'\e094'
}
.oi-media-skip-backward:before {
content'\e095'
}
.oi-media-skip-forward:before {
content'\e096'
}
.oi-media-step-backward:before {
content'\e097'
}
.oi-media-step-forward:before {
content'\e098'
}
.oi-media-stop:before {
content'\e099'
}
.oi-medical-cross:before {
content'\e09a'
}
.oi-menu:before {
content'\e09b'
}
.oi-microphone:before {
content'\e09c'
}
.oi-minus:before {
content'\e09d'
}
.oi-monitor:before {
content'\e09e'
}
.oi-moon:before {
content'\e09f'
}
.oi-move:before {
content'\e0a0'
}
.oi-musical-note:before {
content'\e0a1'
}
.oi-paperclip:before {
content'\e0a2'
}
.oi-pencil:before {
content'\e0a3'
}
.oi-people:before {
content'\e0a4'
}
.oi-person:before {
content'\e0a5'
}
.oi-phone:before {
content'\e0a6'
}
.oi-pie-chart:before {
content'\e0a7'
}
.oi-pin:before {
content'\e0a8'
}
.oi-play-circle:before {
content'\e0a9'
}
.oi-plus:before {
content'\e0aa'
}
.oi-power-standby:before {
content'\e0ab'
}
.oi-print:before {
content'\e0ac'
}
.oi-project:before {
content'\e0ad'
}
.oi-pulse:before {
content'\e0ae'
}
.oi-puzzle-piece:before {
content'\e0af'
}
.oi-question-mark:before {
content'\e0b0'
}
.oi-rain:before {
content'\e0b1'
}
.oi-random:before {
content'\e0b2'
}
.oi-reload:before {
content'\e0b3'
}
.oi-resize-both:before {
content'\e0b4'
}
.oi-resize-height:before {
content'\e0b5'
}
.oi-resize-width:before {
content'\e0b6'
}
.oi-rss-alt:before {
content'\e0b7'
}
.oi-rss:before {
content'\e0b8'
}
.oi-script:before {
content'\e0b9'
}
.oi-share-boxed:before {
content'\e0ba'
}
.oi-share:before {
content'\e0bb'
}
.oi-shield:before {
content'\e0bc'
}
.oi-signal:before {
content'\e0bd'
}
.oi-signpost:before {
content'\e0be'
}
.oi-sort-ascending:before {
content'\e0bf'
}
.oi-sort-descending:before {
content'\e0c0'
}
.oi-spreadsheet:before {
content'\e0c1'
}
.oi-star:before {
content'\e0c2'
}
.oi-sun:before {
content'\e0c3'
}
.oi-tablet:before {
content'\e0c4'
}
.oi-tag:before {
content'\e0c5'
}
.oi-tags:before {
content'\e0c6'
}
.oi-target:before {
content'\e0c7'
}
.oi-task:before {
content'\e0c8'
}
.oi-terminal:before {
content'\e0c9'
}
.oi-text:before {
content'\e0ca'
}
.oi-thumb-down:before {
content'\e0cb'
}
.oi-thumb-up:before {
content'\e0cc'
}
.oi-timer:before {
content'\e0cd'
}
.oi-transfer:before {
content'\e0ce'
}
.oi-trash:before {
content'\e0cf'
}
.oi-underline:before {
content'\e0d0'
}
.oi-vertical-align-bottom:before {
content'\e0d1'
}
.oi-vertical-align-center:before {
content'\e0d2'
}
.oi-vertical-align-top:before {
content'\e0d3'
}
.oi-video:before {
content'\e0d4'
}
.oi-volume-high:before {
content'\e0d5'
}
.oi-volume-low:before {
content'\e0d6'
}
.oi-volume-off:before {
content'\e0d7'
}
.oi-warning:before {
content'\e0d8'
}
.oi-wifi:before {
content'\e0d9'
}
.oi-wrench:before {
content'\e0da'
}
.oi-x:before {
content'\e0db'
}
.oi-yen:before {
content'\e0dc'
}
.oi-zoom-in:before {
content'\e0dd'
}
.oi-zoom-out:before {
content'\e0de'
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,511 +0,0 @@
@font-face {
font-family: 'Icons';
src: url('../fonts/open-iconic.eot');
src: url('../fonts/open-iconic.eot?#iconic-sm') format('embedded-opentype'), url('../fonts/open-iconic.woff') format('woff'), url('../fonts/open-iconic.ttf') format('truetype'), url('../fonts/open-iconic.otf') format('opentype'), url('../fonts/open-iconic.svg#iconic-sm') format('svg');
font-weight: normal;
font-style: normal;
}
.oi[data-glyph].oi-text-replace {
font-size: 0;
line-height: 0;
}
.oi[data-glyph].oi-text-replace:before {
width: 1em;
text-align: center;
}
.oi[data-glyph]:before {
font-family: 'Icons';
display: inline-block;
speak: none;
line-height: 1;
vertical-align: baseline;
font-weight: normal;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.oi[data-glyph]:empty:before {
width: 1em;
text-align: center;
box-sizing: content-box;
}
.oi[data-glyph].oi-align-left:before {
text-align: left;
}
.oi[data-glyph].oi-align-right:before {
text-align: right;
}
.oi[data-glyph].oi-align-center:before {
text-align: center;
}
.oi[data-glyph].oi-flip-horizontal:before {
-webkit-transform: scale(-1, 1);
-ms-transform: scale(-1, 1);
transform: scale(-1, 1);
}
.oi[data-glyph].oi-flip-vertical:before {
-webkit-transform: scale(1, -1);
-ms-transform: scale(-1, 1);
transform: scale(1, -1);
}
.oi[data-glyph].oi-flip-horizontal-vertical:before {
-webkit-transform: scale(-1, -1);
-ms-transform: scale(-1, 1);
transform: scale(-1, -1);
}
.oi[data-glyph=account-login]:before { content:'\e000'; }
.oi[data-glyph=account-logout]:before { content:'\e001'; }
.oi[data-glyph=action-redo]:before { content:'\e002'; }
.oi[data-glyph=action-undo]:before { content:'\e003'; }
.oi[data-glyph=align-center]:before { content:'\e004'; }
.oi[data-glyph=align-left]:before { content:'\e005'; }
.oi[data-glyph=align-right]:before { content:'\e006'; }
.oi[data-glyph=aperture]:before { content:'\e007'; }
.oi[data-glyph=arrow-bottom]:before { content:'\e008'; }
.oi[data-glyph=arrow-circle-bottom]:before { content:'\e009'; }
.oi[data-glyph=arrow-circle-left]:before { content:'\e00a'; }
.oi[data-glyph=arrow-circle-right]:before { content:'\e00b'; }
.oi[data-glyph=arrow-circle-top]:before { content:'\e00c'; }
.oi[data-glyph=arrow-left]:before { content:'\e00d'; }
.oi[data-glyph=arrow-right]:before { content:'\e00e'; }
.oi[data-glyph=arrow-thick-bottom]:before { content:'\e00f'; }
.oi[data-glyph=arrow-thick-left]:before { content:'\e010'; }
.oi[data-glyph=arrow-thick-right]:before { content:'\e011'; }
.oi[data-glyph=arrow-thick-top]:before { content:'\e012'; }
.oi[data-glyph=arrow-top]:before { content:'\e013'; }
.oi[data-glyph=audio-spectrum]:before { content:'\e014'; }
.oi[data-glyph=audio]:before { content:'\e015'; }
.oi[data-glyph=badge]:before { content:'\e016'; }
.oi[data-glyph=ban]:before { content:'\e017'; }
.oi[data-glyph=bar-chart]:before { content:'\e018'; }
.oi[data-glyph=basket]:before { content:'\e019'; }
.oi[data-glyph=battery-empty]:before { content:'\e01a'; }
.oi[data-glyph=battery-full]:before { content:'\e01b'; }
.oi[data-glyph=beaker]:before { content:'\e01c'; }
.oi[data-glyph=bell]:before { content:'\e01d'; }
.oi[data-glyph=bluetooth]:before { content:'\e01e'; }
.oi[data-glyph=bold]:before { content:'\e01f'; }
.oi[data-glyph=bolt]:before { content:'\e020'; }
.oi[data-glyph=book]:before { content:'\e021'; }
.oi[data-glyph=bookmark]:before { content:'\e022'; }
.oi[data-glyph=box]:before { content:'\e023'; }
.oi[data-glyph=briefcase]:before { content:'\e024'; }
.oi[data-glyph=british-pound]:before { content:'\e025'; }
.oi[data-glyph=browser]:before { content:'\e026'; }
.oi[data-glyph=brush]:before { content:'\e027'; }
.oi[data-glyph=bug]:before { content:'\e028'; }
.oi[data-glyph=bullhorn]:before { content:'\e029'; }
.oi[data-glyph=calculator]:before { content:'\e02a'; }
.oi[data-glyph=calendar]:before { content:'\e02b'; }
.oi[data-glyph=camera-slr]:before { content:'\e02c'; }
.oi[data-glyph=caret-bottom]:before { content:'\e02d'; }
.oi[data-glyph=caret-left]:before { content:'\e02e'; }
.oi[data-glyph=caret-right]:before { content:'\e02f'; }
.oi[data-glyph=caret-top]:before { content:'\e030'; }
.oi[data-glyph=cart]:before { content:'\e031'; }
.oi[data-glyph=chat]:before { content:'\e032'; }
.oi[data-glyph=check]:before { content:'\e033'; }
.oi[data-glyph=chevron-bottom]:before { content:'\e034'; }
.oi[data-glyph=chevron-left]:before { content:'\e035'; }
.oi[data-glyph=chevron-right]:before { content:'\e036'; }
.oi[data-glyph=chevron-top]:before { content:'\e037'; }
.oi[data-glyph=circle-check]:before { content:'\e038'; }
.oi[data-glyph=circle-x]:before { content:'\e039'; }
.oi[data-glyph=clipboard]:before { content:'\e03a'; }
.oi[data-glyph=clock]:before { content:'\e03b'; }
.oi[data-glyph=cloud-download]:before { content:'\e03c'; }
.oi[data-glyph=cloud-upload]:before { content:'\e03d'; }
.oi[data-glyph=cloud]:before { content:'\e03e'; }
.oi[data-glyph=cloudy]:before { content:'\e03f'; }
.oi[data-glyph=code]:before { content:'\e040'; }
.oi[data-glyph=cog]:before { content:'\e041'; }
.oi[data-glyph=collapse-down]:before { content:'\e042'; }
.oi[data-glyph=collapse-left]:before { content:'\e043'; }
.oi[data-glyph=collapse-right]:before { content:'\e044'; }
.oi[data-glyph=collapse-up]:before { content:'\e045'; }
.oi[data-glyph=command]:before { content:'\e046'; }
.oi[data-glyph=comment-square]:before { content:'\e047'; }
.oi[data-glyph=compass]:before { content:'\e048'; }
.oi[data-glyph=contrast]:before { content:'\e049'; }
.oi[data-glyph=copywriting]:before { content:'\e04a'; }
.oi[data-glyph=credit-card]:before { content:'\e04b'; }
.oi[data-glyph=crop]:before { content:'\e04c'; }
.oi[data-glyph=dashboard]:before { content:'\e04d'; }
.oi[data-glyph=data-transfer-download]:before { content:'\e04e'; }
.oi[data-glyph=data-transfer-upload]:before { content:'\e04f'; }
.oi[data-glyph=delete]:before { content:'\e050'; }
.oi[data-glyph=dial]:before { content:'\e051'; }
.oi[data-glyph=document]:before { content:'\e052'; }
.oi[data-glyph=dollar]:before { content:'\e053'; }
.oi[data-glyph=double-quote-sans-left]:before { content:'\e054'; }
.oi[data-glyph=double-quote-sans-right]:before { content:'\e055'; }
.oi[data-glyph=double-quote-serif-left]:before { content:'\e056'; }
.oi[data-glyph=double-quote-serif-right]:before { content:'\e057'; }
.oi[data-glyph=droplet]:before { content:'\e058'; }
.oi[data-glyph=eject]:before { content:'\e059'; }
.oi[data-glyph=elevator]:before { content:'\e05a'; }
.oi[data-glyph=ellipses]:before { content:'\e05b'; }
.oi[data-glyph=envelope-closed]:before { content:'\e05c'; }
.oi[data-glyph=envelope-open]:before { content:'\e05d'; }
.oi[data-glyph=euro]:before { content:'\e05e'; }
.oi[data-glyph=excerpt]:before { content:'\e05f'; }
.oi[data-glyph=expand-down]:before { content:'\e060'; }
.oi[data-glyph=expand-left]:before { content:'\e061'; }
.oi[data-glyph=expand-right]:before { content:'\e062'; }
.oi[data-glyph=expand-up]:before { content:'\e063'; }
.oi[data-glyph=external-link]:before { content:'\e064'; }
.oi[data-glyph=eye]:before { content:'\e065'; }
.oi[data-glyph=eyedropper]:before { content:'\e066'; }
.oi[data-glyph=file]:before { content:'\e067'; }
.oi[data-glyph=fire]:before { content:'\e068'; }
.oi[data-glyph=flag]:before { content:'\e069'; }
.oi[data-glyph=flash]:before { content:'\e06a'; }
.oi[data-glyph=folder]:before { content:'\e06b'; }
.oi[data-glyph=fork]:before { content:'\e06c'; }
.oi[data-glyph=fullscreen-enter]:before { content:'\e06d'; }
.oi[data-glyph=fullscreen-exit]:before { content:'\e06e'; }
.oi[data-glyph=globe]:before { content:'\e06f'; }
.oi[data-glyph=graph]:before { content:'\e070'; }
.oi[data-glyph=grid-four-up]:before { content:'\e071'; }
.oi[data-glyph=grid-three-up]:before { content:'\e072'; }
.oi[data-glyph=grid-two-up]:before { content:'\e073'; }
.oi[data-glyph=hard-drive]:before { content:'\e074'; }
.oi[data-glyph=header]:before { content:'\e075'; }
.oi[data-glyph=headphones]:before { content:'\e076'; }
.oi[data-glyph=heart]:before { content:'\e077'; }
.oi[data-glyph=home]:before { content:'\e078'; }
.oi[data-glyph=image]:before { content:'\e079'; }
.oi[data-glyph=inbox]:before { content:'\e07a'; }
.oi[data-glyph=infinity]:before { content:'\e07b'; }
.oi[data-glyph=info]:before { content:'\e07c'; }
.oi[data-glyph=italic]:before { content:'\e07d'; }
.oi[data-glyph=justify-center]:before { content:'\e07e'; }
.oi[data-glyph=justify-left]:before { content:'\e07f'; }
.oi[data-glyph=justify-right]:before { content:'\e080'; }
.oi[data-glyph=key]:before { content:'\e081'; }
.oi[data-glyph=laptop]:before { content:'\e082'; }
.oi[data-glyph=layers]:before { content:'\e083'; }
.oi[data-glyph=lightbulb]:before { content:'\e084'; }
.oi[data-glyph=link-broken]:before { content:'\e085'; }
.oi[data-glyph=link-intact]:before { content:'\e086'; }
.oi[data-glyph=list-rich]:before { content:'\e087'; }
.oi[data-glyph=list]:before { content:'\e088'; }
.oi[data-glyph=location]:before { content:'\e089'; }
.oi[data-glyph=lock-locked]:before { content:'\e08a'; }
.oi[data-glyph=lock-unlocked]:before { content:'\e08b'; }
.oi[data-glyph=loop-circular]:before { content:'\e08c'; }
.oi[data-glyph=loop-square]:before { content:'\e08d'; }
.oi[data-glyph=loop]:before { content:'\e08e'; }
.oi[data-glyph=magnifying-glass]:before { content:'\e08f'; }
.oi[data-glyph=map-marker]:before { content:'\e090'; }
.oi[data-glyph=map]:before { content:'\e091'; }
.oi[data-glyph=media-pause]:before { content:'\e092'; }
.oi[data-glyph=media-play]:before { content:'\e093'; }
.oi[data-glyph=media-record]:before { content:'\e094'; }
.oi[data-glyph=media-skip-backward]:before { content:'\e095'; }
.oi[data-glyph=media-skip-forward]:before { content:'\e096'; }
.oi[data-glyph=media-step-backward]:before { content:'\e097'; }
.oi[data-glyph=media-step-forward]:before { content:'\e098'; }
.oi[data-glyph=media-stop]:before { content:'\e099'; }
.oi[data-glyph=medical-cross]:before { content:'\e09a'; }
.oi[data-glyph=menu]:before { content:'\e09b'; }
.oi[data-glyph=microphone]:before { content:'\e09c'; }
.oi[data-glyph=minus]:before { content:'\e09d'; }
.oi[data-glyph=monitor]:before { content:'\e09e'; }
.oi[data-glyph=moon]:before { content:'\e09f'; }
.oi[data-glyph=move]:before { content:'\e0a0'; }
.oi[data-glyph=musical-note]:before { content:'\e0a1'; }
.oi[data-glyph=paperclip]:before { content:'\e0a2'; }
.oi[data-glyph=pencil]:before { content:'\e0a3'; }
.oi[data-glyph=people]:before { content:'\e0a4'; }
.oi[data-glyph=person]:before { content:'\e0a5'; }
.oi[data-glyph=phone]:before { content:'\e0a6'; }
.oi[data-glyph=pie-chart]:before { content:'\e0a7'; }
.oi[data-glyph=pin]:before { content:'\e0a8'; }
.oi[data-glyph=play-circle]:before { content:'\e0a9'; }
.oi[data-glyph=plus]:before { content:'\e0aa'; }
.oi[data-glyph=power-standby]:before { content:'\e0ab'; }
.oi[data-glyph=print]:before { content:'\e0ac'; }
.oi[data-glyph=project]:before { content:'\e0ad'; }
.oi[data-glyph=pulse]:before { content:'\e0ae'; }
.oi[data-glyph=puzzle-piece]:before { content:'\e0af'; }
.oi[data-glyph=question-mark]:before { content:'\e0b0'; }
.oi[data-glyph=rain]:before { content:'\e0b1'; }
.oi[data-glyph=random]:before { content:'\e0b2'; }
.oi[data-glyph=reload]:before { content:'\e0b3'; }
.oi[data-glyph=resize-both]:before { content:'\e0b4'; }
.oi[data-glyph=resize-height]:before { content:'\e0b5'; }
.oi[data-glyph=resize-width]:before { content:'\e0b6'; }
.oi[data-glyph=rss-alt]:before { content:'\e0b7'; }
.oi[data-glyph=rss]:before { content:'\e0b8'; }
.oi[data-glyph=script]:before { content:'\e0b9'; }
.oi[data-glyph=share-boxed]:before { content:'\e0ba'; }
.oi[data-glyph=share]:before { content:'\e0bb'; }
.oi[data-glyph=shield]:before { content:'\e0bc'; }
.oi[data-glyph=signal]:before { content:'\e0bd'; }
.oi[data-glyph=signpost]:before { content:'\e0be'; }
.oi[data-glyph=sort-ascending]:before { content:'\e0bf'; }
.oi[data-glyph=sort-descending]:before { content:'\e0c0'; }
.oi[data-glyph=spreadsheet]:before { content:'\e0c1'; }
.oi[data-glyph=star]:before { content:'\e0c2'; }
.oi[data-glyph=sun]:before { content:'\e0c3'; }
.oi[data-glyph=tablet]:before { content:'\e0c4'; }
.oi[data-glyph=tag]:before { content:'\e0c5'; }
.oi[data-glyph=tags]:before { content:'\e0c6'; }
.oi[data-glyph=target]:before { content:'\e0c7'; }
.oi[data-glyph=task]:before { content:'\e0c8'; }
.oi[data-glyph=terminal]:before { content:'\e0c9'; }
.oi[data-glyph=text]:before { content:'\e0ca'; }
.oi[data-glyph=thumb-down]:before { content:'\e0cb'; }
.oi[data-glyph=thumb-up]:before { content:'\e0cc'; }
.oi[data-glyph=timer]:before { content:'\e0cd'; }
.oi[data-glyph=transfer]:before { content:'\e0ce'; }
.oi[data-glyph=trash]:before { content:'\e0cf'; }
.oi[data-glyph=underline]:before { content:'\e0d0'; }
.oi[data-glyph=vertical-align-bottom]:before { content:'\e0d1'; }
.oi[data-glyph=vertical-align-center]:before { content:'\e0d2'; }
.oi[data-glyph=vertical-align-top]:before { content:'\e0d3'; }
.oi[data-glyph=video]:before { content:'\e0d4'; }
.oi[data-glyph=volume-high]:before { content:'\e0d5'; }
.oi[data-glyph=volume-low]:before { content:'\e0d6'; }
.oi[data-glyph=volume-off]:before { content:'\e0d7'; }
.oi[data-glyph=warning]:before { content:'\e0d8'; }
.oi[data-glyph=wifi]:before { content:'\e0d9'; }
.oi[data-glyph=wrench]:before { content:'\e0da'; }
.oi[data-glyph=x]:before { content:'\e0db'; }
.oi[data-glyph=yen]:before { content:'\e0dc'; }
.oi[data-glyph=zoom-in]:before { content:'\e0dd'; }
.oi[data-glyph=zoom-out]:before { content:'\e0de'; }

View File

@ -1,962 +0,0 @@
@iconic-font-path: '../fonts/';
@font-face {
font-family: 'Icons';
src: url('@{iconic-font-path}open-iconic.eot');
src: url('@{iconic-font-path}open-iconic.eot?#iconic-sm') format('embedded-opentype'), url('@{iconic-font-path}open-iconic.woff') format('woff'), url('@{iconic-font-path}open-iconic.ttf') format('truetype'), url('@{iconic-font-path}open-iconic.otf') format('opentype'), url('@{iconic-font-path}open-iconic.svg#iconic-sm') format('svg');
font-weight: normal;
font-style: normal;
}
.oi[data-glyph].oi-text-replace {
font-size: 0;
line-height: 0;
}
.oi[data-glyph].oi-text-replace:before {
width: 1em;
text-align: center;
}
.oi[data-glyph] {
&:before {
position: relative;
top: 1px;
font-family: 'Icons';
display: inline-block;
speak: none;
line-height: 1;
vertical-align: baseline;
font-weight: normal;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
&:empty:before {
width: 1em;
text-align: center;
box-sizing: content-box;
}
&.oi-align-left:before {
text-align: left;
}
&.oi-align-right:before {
text-align: right;
}
&.oi-align-center:before {
text-align: center;
}
&.oi-flip-horizontal:before {
-webkit-transform: scale(-1, 1);
-ms-transform: scale(-1, 1);
transform: scale(-1, 1);
}
&.oi-flip-vertical:before {
-webkit-transform: scale(1, -1);
-ms-transform: scale(-1, 1);
transform: scale(1, -1);
}
&.oi-flip-horizontal-vertical:before {
-webkit-transform: scale(-1, -1);
-ms-transform: scale(-1, 1);
transform: scale(-1, -1);
}
}
.oi[data-glyph=account-login]:before {
content: '\e000';
}
.oi[data-glyph=account-logout]:before {
content: '\e001';
}
.oi[data-glyph=action-redo]:before {
content: '\e002';
}
.oi[data-glyph=action-undo]:before {
content: '\e003';
}
.oi[data-glyph=align-center]:before {
content: '\e004';
}
.oi[data-glyph=align-left]:before {
content: '\e005';
}
.oi[data-glyph=align-right]:before {
content: '\e006';
}
.oi[data-glyph=aperture]:before {
content: '\e007';
}
.oi[data-glyph=arrow-bottom]:before {
content: '\e008';
}
.oi[data-glyph=arrow-circle-bottom]:before {
content: '\e009';
}
.oi[data-glyph=arrow-circle-left]:before {
content: '\e00a';
}
.oi[data-glyph=arrow-circle-right]:before {
content: '\e00b';
}
.oi[data-glyph=arrow-circle-top]:before {
content: '\e00c';
}
.oi[data-glyph=arrow-left]:before {
content: '\e00d';
}
.oi[data-glyph=arrow-right]:before {
content: '\e00e';
}
.oi[data-glyph=arrow-thick-bottom]:before {
content: '\e00f';
}
.oi[data-glyph=arrow-thick-left]:before {
content: '\e010';
}
.oi[data-glyph=arrow-thick-right]:before {
content: '\e011';
}
.oi[data-glyph=arrow-thick-top]:before {
content: '\e012';
}
.oi[data-glyph=arrow-top]:before {
content: '\e013';
}
.oi[data-glyph=audio-spectrum]:before {
content: '\e014';
}
.oi[data-glyph=audio]:before {
content: '\e015';
}
.oi[data-glyph=badge]:before {
content: '\e016';
}
.oi[data-glyph=ban]:before {
content: '\e017';
}
.oi[data-glyph=bar-chart]:before {
content: '\e018';
}
.oi[data-glyph=basket]:before {
content: '\e019';
}
.oi[data-glyph=battery-empty]:before {
content: '\e01a';
}
.oi[data-glyph=battery-full]:before {
content: '\e01b';
}
.oi[data-glyph=beaker]:before {
content: '\e01c';
}
.oi[data-glyph=bell]:before {
content: '\e01d';
}
.oi[data-glyph=bluetooth]:before {
content: '\e01e';
}
.oi[data-glyph=bold]:before {
content: '\e01f';
}
.oi[data-glyph=bolt]:before {
content: '\e020';
}
.oi[data-glyph=book]:before {
content: '\e021';
}
.oi[data-glyph=bookmark]:before {
content: '\e022';
}
.oi[data-glyph=box]:before {
content: '\e023';
}
.oi[data-glyph=briefcase]:before {
content: '\e024';
}
.oi[data-glyph=british-pound]:before {
content: '\e025';
}
.oi[data-glyph=browser]:before {
content: '\e026';
}
.oi[data-glyph=brush]:before {
content: '\e027';
}
.oi[data-glyph=bug]:before {
content: '\e028';
}
.oi[data-glyph=bullhorn]:before {
content: '\e029';
}
.oi[data-glyph=calculator]:before {
content: '\e02a';
}
.oi[data-glyph=calendar]:before {
content: '\e02b';
}
.oi[data-glyph=camera-slr]:before {
content: '\e02c';
}
.oi[data-glyph=caret-bottom]:before {
content: '\e02d';
}
.oi[data-glyph=caret-left]:before {
content: '\e02e';
}
.oi[data-glyph=caret-right]:before {
content: '\e02f';
}
.oi[data-glyph=caret-top]:before {
content: '\e030';
}
.oi[data-glyph=cart]:before {
content: '\e031';
}
.oi[data-glyph=chat]:before {
content: '\e032';
}
.oi[data-glyph=check]:before {
content: '\e033';
}
.oi[data-glyph=chevron-bottom]:before {
content: '\e034';
}
.oi[data-glyph=chevron-left]:before {
content: '\e035';
}
.oi[data-glyph=chevron-right]:before {
content: '\e036';
}
.oi[data-glyph=chevron-top]:before {
content: '\e037';
}
.oi[data-glyph=circle-check]:before {
content: '\e038';
}
.oi[data-glyph=circle-x]:before {
content: '\e039';
}
.oi[data-glyph=clipboard]:before {
content: '\e03a';
}
.oi[data-glyph=clock]:before {
content: '\e03b';
}
.oi[data-glyph=cloud-download]:before {
content: '\e03c';
}
.oi[data-glyph=cloud-upload]:before {
content: '\e03d';
}
.oi[data-glyph=cloud]:before {
content: '\e03e';
}
.oi[data-glyph=cloudy]:before {
content: '\e03f';
}
.oi[data-glyph=code]:before {
content: '\e040';
}
.oi[data-glyph=cog]:before {
content: '\e041';
}
.oi[data-glyph=collapse-down]:before {
content: '\e042';
}
.oi[data-glyph=collapse-left]:before {
content: '\e043';
}
.oi[data-glyph=collapse-right]:before {
content: '\e044';
}
.oi[data-glyph=collapse-up]:before {
content: '\e045';
}
.oi[data-glyph=command]:before {
content: '\e046';
}
.oi[data-glyph=comment-square]:before {
content: '\e047';
}
.oi[data-glyph=compass]:before {
content: '\e048';
}
.oi[data-glyph=contrast]:before {
content: '\e049';
}
.oi[data-glyph=copywriting]:before {
content: '\e04a';
}
.oi[data-glyph=credit-card]:before {
content: '\e04b';
}
.oi[data-glyph=crop]:before {
content: '\e04c';
}
.oi[data-glyph=dashboard]:before {
content: '\e04d';
}
.oi[data-glyph=data-transfer-download]:before {
content: '\e04e';
}
.oi[data-glyph=data-transfer-upload]:before {
content: '\e04f';
}
.oi[data-glyph=delete]:before {
content: '\e050';
}
.oi[data-glyph=dial]:before {
content: '\e051';
}
.oi[data-glyph=document]:before {
content: '\e052';
}
.oi[data-glyph=dollar]:before {
content: '\e053';
}
.oi[data-glyph=double-quote-sans-left]:before {
content: '\e054';
}
.oi[data-glyph=double-quote-sans-right]:before {
content: '\e055';
}
.oi[data-glyph=double-quote-serif-left]:before {
content: '\e056';
}
.oi[data-glyph=double-quote-serif-right]:before {
content: '\e057';
}
.oi[data-glyph=droplet]:before {
content: '\e058';
}
.oi[data-glyph=eject]:before {
content: '\e059';
}
.oi[data-glyph=elevator]:before {
content: '\e05a';
}
.oi[data-glyph=ellipses]:before {
content: '\e05b';
}
.oi[data-glyph=envelope-closed]:before {
content: '\e05c';
}
.oi[data-glyph=envelope-open]:before {
content: '\e05d';
}
.oi[data-glyph=euro]:before {
content: '\e05e';
}
.oi[data-glyph=excerpt]:before {
content: '\e05f';
}
.oi[data-glyph=expand-down]:before {
content: '\e060';
}
.oi[data-glyph=expand-left]:before {
content: '\e061';
}
.oi[data-glyph=expand-right]:before {
content: '\e062';
}
.oi[data-glyph=expand-up]:before {
content: '\e063';
}
.oi[data-glyph=external-link]:before {
content: '\e064';
}
.oi[data-glyph=eye]:before {
content: '\e065';
}
.oi[data-glyph=eyedropper]:before {
content: '\e066';
}
.oi[data-glyph=file]:before {
content: '\e067';
}
.oi[data-glyph=fire]:before {
content: '\e068';
}
.oi[data-glyph=flag]:before {
content: '\e069';
}
.oi[data-glyph=flash]:before {
content: '\e06a';
}
.oi[data-glyph=folder]:before {
content: '\e06b';
}
.oi[data-glyph=fork]:before {
content: '\e06c';
}
.oi[data-glyph=fullscreen-enter]:before {
content: '\e06d';
}
.oi[data-glyph=fullscreen-exit]:before {
content: '\e06e';
}
.oi[data-glyph=globe]:before {
content: '\e06f';
}
.oi[data-glyph=graph]:before {
content: '\e070';
}
.oi[data-glyph=grid-four-up]:before {
content: '\e071';
}
.oi[data-glyph=grid-three-up]:before {
content: '\e072';
}
.oi[data-glyph=grid-two-up]:before {
content: '\e073';
}
.oi[data-glyph=hard-drive]:before {
content: '\e074';
}
.oi[data-glyph=header]:before {
content: '\e075';
}
.oi[data-glyph=headphones]:before {
content: '\e076';
}
.oi[data-glyph=heart]:before {
content: '\e077';
}
.oi[data-glyph=home]:before {
content: '\e078';
}
.oi[data-glyph=image]:before {
content: '\e079';
}
.oi[data-glyph=inbox]:before {
content: '\e07a';
}
.oi[data-glyph=infinity]:before {
content: '\e07b';
}
.oi[data-glyph=info]:before {
content: '\e07c';
}
.oi[data-glyph=italic]:before {
content: '\e07d';
}
.oi[data-glyph=justify-center]:before {
content: '\e07e';
}
.oi[data-glyph=justify-left]:before {
content: '\e07f';
}
.oi[data-glyph=justify-right]:before {
content: '\e080';
}
.oi[data-glyph=key]:before {
content: '\e081';
}
.oi[data-glyph=laptop]:before {
content: '\e082';
}
.oi[data-glyph=layers]:before {
content: '\e083';
}
.oi[data-glyph=lightbulb]:before {
content: '\e084';
}
.oi[data-glyph=link-broken]:before {
content: '\e085';
}
.oi[data-glyph=link-intact]:before {
content: '\e086';
}
.oi[data-glyph=list-rich]:before {
content: '\e087';
}
.oi[data-glyph=list]:before {
content: '\e088';
}
.oi[data-glyph=location]:before {
content: '\e089';
}
.oi[data-glyph=lock-locked]:before {
content: '\e08a';
}
.oi[data-glyph=lock-unlocked]:before {
content: '\e08b';
}
.oi[data-glyph=loop-circular]:before {
content: '\e08c';
}
.oi[data-glyph=loop-square]:before {
content: '\e08d';
}
.oi[data-glyph=loop]:before {
content: '\e08e';
}
.oi[data-glyph=magnifying-glass]:before {
content: '\e08f';
}
.oi[data-glyph=map-marker]:before {
content: '\e090';
}
.oi[data-glyph=map]:before {
content: '\e091';
}
.oi[data-glyph=media-pause]:before {
content: '\e092';
}
.oi[data-glyph=media-play]:before {
content: '\e093';
}
.oi[data-glyph=media-record]:before {
content: '\e094';
}
.oi[data-glyph=media-skip-backward]:before {
content: '\e095';
}
.oi[data-glyph=media-skip-forward]:before {
content: '\e096';
}
.oi[data-glyph=media-step-backward]:before {
content: '\e097';
}
.oi[data-glyph=media-step-forward]:before {
content: '\e098';
}
.oi[data-glyph=media-stop]:before {
content: '\e099';
}
.oi[data-glyph=medical-cross]:before {
content: '\e09a';
}
.oi[data-glyph=menu]:before {
content: '\e09b';
}
.oi[data-glyph=microphone]:before {
content: '\e09c';
}
.oi[data-glyph=minus]:before {
content: '\e09d';
}
.oi[data-glyph=monitor]:before {
content: '\e09e';
}
.oi[data-glyph=moon]:before {
content: '\e09f';
}
.oi[data-glyph=move]:before {
content: '\e0a0';
}
.oi[data-glyph=musical-note]:before {
content: '\e0a1';
}
.oi[data-glyph=paperclip]:before {
content: '\e0a2';
}
.oi[data-glyph=pencil]:before {
content: '\e0a3';
}
.oi[data-glyph=people]:before {
content: '\e0a4';
}
.oi[data-glyph=person]:before {
content: '\e0a5';
}
.oi[data-glyph=phone]:before {
content: '\e0a6';
}
.oi[data-glyph=pie-chart]:before {
content: '\e0a7';
}
.oi[data-glyph=pin]:before {
content: '\e0a8';
}
.oi[data-glyph=play-circle]:before {
content: '\e0a9';
}
.oi[data-glyph=plus]:before {
content: '\e0aa';
}
.oi[data-glyph=power-standby]:before {
content: '\e0ab';
}
.oi[data-glyph=print]:before {
content: '\e0ac';
}
.oi[data-glyph=project]:before {
content: '\e0ad';
}
.oi[data-glyph=pulse]:before {
content: '\e0ae';
}
.oi[data-glyph=puzzle-piece]:before {
content: '\e0af';
}
.oi[data-glyph=question-mark]:before {
content: '\e0b0';
}
.oi[data-glyph=rain]:before {
content: '\e0b1';
}
.oi[data-glyph=random]:before {
content: '\e0b2';
}
.oi[data-glyph=reload]:before {
content: '\e0b3';
}
.oi[data-glyph=resize-both]:before {
content: '\e0b4';
}
.oi[data-glyph=resize-height]:before {
content: '\e0b5';
}
.oi[data-glyph=resize-width]:before {
content: '\e0b6';
}
.oi[data-glyph=rss-alt]:before {
content: '\e0b7';
}
.oi[data-glyph=rss]:before {
content: '\e0b8';
}
.oi[data-glyph=script]:before {
content: '\e0b9';
}
.oi[data-glyph=share-boxed]:before {
content: '\e0ba';
}
.oi[data-glyph=share]:before {
content: '\e0bb';
}
.oi[data-glyph=shield]:before {
content: '\e0bc';
}
.oi[data-glyph=signal]:before {
content: '\e0bd';
}
.oi[data-glyph=signpost]:before {
content: '\e0be';
}
.oi[data-glyph=sort-ascending]:before {
content: '\e0bf';
}
.oi[data-glyph=sort-descending]:before {
content: '\e0c0';
}
.oi[data-glyph=spreadsheet]:before {
content: '\e0c1';
}
.oi[data-glyph=star]:before {
content: '\e0c2';
}
.oi[data-glyph=sun]:before {
content: '\e0c3';
}
.oi[data-glyph=tablet]:before {
content: '\e0c4';
}
.oi[data-glyph=tag]:before {
content: '\e0c5';
}
.oi[data-glyph=tags]:before {
content: '\e0c6';
}
.oi[data-glyph=target]:before {
content: '\e0c7';
}
.oi[data-glyph=task]:before {
content: '\e0c8';
}
.oi[data-glyph=terminal]:before {
content: '\e0c9';
}
.oi[data-glyph=text]:before {
content: '\e0ca';
}
.oi[data-glyph=thumb-down]:before {
content: '\e0cb';
}
.oi[data-glyph=thumb-up]:before {
content: '\e0cc';
}
.oi[data-glyph=timer]:before {
content: '\e0cd';
}
.oi[data-glyph=transfer]:before {
content: '\e0ce';
}
.oi[data-glyph=trash]:before {
content: '\e0cf';
}
.oi[data-glyph=underline]:before {
content: '\e0d0';
}
.oi[data-glyph=vertical-align-bottom]:before {
content: '\e0d1';
}
.oi[data-glyph=vertical-align-center]:before {
content: '\e0d2';
}
.oi[data-glyph=vertical-align-top]:before {
content: '\e0d3';
}
.oi[data-glyph=video]:before {
content: '\e0d4';
}
.oi[data-glyph=volume-high]:before {
content: '\e0d5';
}
.oi[data-glyph=volume-low]:before {
content: '\e0d6';
}
.oi[data-glyph=volume-off]:before {
content: '\e0d7';
}
.oi[data-glyph=warning]:before {
content: '\e0d8';
}
.oi[data-glyph=wifi]:before {
content: '\e0d9';
}
.oi[data-glyph=wrench]:before {
content: '\e0da';
}
.oi[data-glyph=x]:before {
content: '\e0db';
}
.oi[data-glyph=yen]:before {
content: '\e0dc';
}
.oi[data-glyph=zoom-in]:before {
content: '\e0dd';
}
.oi[data-glyph=zoom-out]:before {
content: '\e0de';
}

File diff suppressed because one or more lines are too long

View File

@ -1,963 +0,0 @@
$iconic-font-path: '../fonts/' !default;
@font-face {
font-family: 'Icons';
src: url('#{$iconic-font-path}open-iconic.eot');
src: url('#{$iconic-font-path}open-iconic.eot?#iconic-sm') format('embedded-opentype'), url('#{$iconic-font-path}open-iconic.woff') format('woff'), url('#{$iconic-font-path}open-iconic.ttf') format('truetype'), url('#{$iconic-font-path}open-iconic.otf') format('opentype'), url('#{$iconic-font-path}open-iconic.svg#iconic-sm') format('svg');
font-weight: normal;
font-style: normal;
}
.oi[data-glyph].oi-text-replace {
font-size: 0;
line-height: 0;
}
.oi[data-glyph].oi-text-replace:before {
width: 1em;
text-align: center;
}
.oi[data-glyph] {
&:before {
position: relative;
top: 1px;
font-family: 'Icons';
display: inline-block;
speak: none;
line-height: 1;
vertical-align: baseline;
font-weight: normal;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
&:empty:before {
width: 1em;
text-align: center;
box-sizing: content-box;
}
&.oi-align-left:before {
text-align: left;
}
&.oi-align-right:before {
text-align: right;
}
&.oi-align-center:before {
text-align: center;
}
&.oi-flip-horizontal:before {
-webkit-transform: scale(-1, 1);
-ms-transform: scale(-1, 1);
transform: scale(-1, 1);
}
&.oi-flip-vertical:before {
-webkit-transform: scale(1, -1);
-ms-transform: scale(-1, 1);
transform: scale(1, -1);
}
&.oi-flip-horizontal-vertical:before {
-webkit-transform: scale(-1, -1);
-ms-transform: scale(-1, 1);
transform: scale(-1, -1);
}
}
.oi[data-glyph=account-login]:before {
content: '\e000';
}
.oi[data-glyph=account-logout]:before {
content: '\e001';
}
.oi[data-glyph=action-redo]:before {
content: '\e002';
}
.oi[data-glyph=action-undo]:before {
content: '\e003';
}
.oi[data-glyph=align-center]:before {
content: '\e004';
}
.oi[data-glyph=align-left]:before {
content: '\e005';
}
.oi[data-glyph=align-right]:before {
content: '\e006';
}
.oi[data-glyph=aperture]:before {
content: '\e007';
}
.oi[data-glyph=arrow-bottom]:before {
content: '\e008';
}
.oi[data-glyph=arrow-circle-bottom]:before {
content: '\e009';
}
.oi[data-glyph=arrow-circle-left]:before {
content: '\e00a';
}
.oi[data-glyph=arrow-circle-right]:before {
content: '\e00b';
}
.oi[data-glyph=arrow-circle-top]:before {
content: '\e00c';
}
.oi[data-glyph=arrow-left]:before {
content: '\e00d';
}
.oi[data-glyph=arrow-right]:before {
content: '\e00e';
}
.oi[data-glyph=arrow-thick-bottom]:before {
content: '\e00f';
}
.oi[data-glyph=arrow-thick-left]:before {
content: '\e010';
}
.oi[data-glyph=arrow-thick-right]:before {
content: '\e011';
}
.oi[data-glyph=arrow-thick-top]:before {
content: '\e012';
}
.oi[data-glyph=arrow-top]:before {
content: '\e013';
}
.oi[data-glyph=audio-spectrum]:before {
content: '\e014';
}
.oi[data-glyph=audio]:before {
content: '\e015';
}
.oi[data-glyph=badge]:before {
content: '\e016';
}
.oi[data-glyph=ban]:before {
content: '\e017';
}
.oi[data-glyph=bar-chart]:before {
content: '\e018';
}
.oi[data-glyph=basket]:before {
content: '\e019';
}
.oi[data-glyph=battery-empty]:before {
content: '\e01a';
}
.oi[data-glyph=battery-full]:before {
content: '\e01b';
}
.oi[data-glyph=beaker]:before {
content: '\e01c';
}
.oi[data-glyph=bell]:before {
content: '\e01d';
}
.oi[data-glyph=bluetooth]:before {
content: '\e01e';
}
.oi[data-glyph=bold]:before {
content: '\e01f';
}
.oi[data-glyph=bolt]:before {
content: '\e020';
}
.oi[data-glyph=book]:before {
content: '\e021';
}
.oi[data-glyph=bookmark]:before {
content: '\e022';
}
.oi[data-glyph=box]:before {
content: '\e023';
}
.oi[data-glyph=briefcase]:before {
content: '\e024';
}
.oi[data-glyph=british-pound]:before {
content: '\e025';
}
.oi[data-glyph=browser]:before {
content: '\e026';
}
.oi[data-glyph=brush]:before {
content: '\e027';
}
.oi[data-glyph=bug]:before {
content: '\e028';
}
.oi[data-glyph=bullhorn]:before {
content: '\e029';
}
.oi[data-glyph=calculator]:before {
content: '\e02a';
}
.oi[data-glyph=calendar]:before {
content: '\e02b';
}
.oi[data-glyph=camera-slr]:before {
content: '\e02c';
}
.oi[data-glyph=caret-bottom]:before {
content: '\e02d';
}
.oi[data-glyph=caret-left]:before {
content: '\e02e';
}
.oi[data-glyph=caret-right]:before {
content: '\e02f';
}
.oi[data-glyph=caret-top]:before {
content: '\e030';
}
.oi[data-glyph=cart]:before {
content: '\e031';
}
.oi[data-glyph=chat]:before {
content: '\e032';
}
.oi[data-glyph=check]:before {
content: '\e033';
}
.oi[data-glyph=chevron-bottom]:before {
content: '\e034';
}
.oi[data-glyph=chevron-left]:before {
content: '\e035';
}
.oi[data-glyph=chevron-right]:before {
content: '\e036';
}
.oi[data-glyph=chevron-top]:before {
content: '\e037';
}
.oi[data-glyph=circle-check]:before {
content: '\e038';
}
.oi[data-glyph=circle-x]:before {
content: '\e039';
}
.oi[data-glyph=clipboard]:before {
content: '\e03a';
}
.oi[data-glyph=clock]:before {
content: '\e03b';
}
.oi[data-glyph=cloud-download]:before {
content: '\e03c';
}
.oi[data-glyph=cloud-upload]:before {
content: '\e03d';
}
.oi[data-glyph=cloud]:before {
content: '\e03e';
}
.oi[data-glyph=cloudy]:before {
content: '\e03f';
}
.oi[data-glyph=code]:before {
content: '\e040';
}
.oi[data-glyph=cog]:before {
content: '\e041';
}
.oi[data-glyph=collapse-down]:before {
content: '\e042';
}
.oi[data-glyph=collapse-left]:before {
content: '\e043';
}
.oi[data-glyph=collapse-right]:before {
content: '\e044';
}
.oi[data-glyph=collapse-up]:before {
content: '\e045';
}
.oi[data-glyph=command]:before {
content: '\e046';
}
.oi[data-glyph=comment-square]:before {
content: '\e047';
}
.oi[data-glyph=compass]:before {
content: '\e048';
}
.oi[data-glyph=contrast]:before {
content: '\e049';
}
.oi[data-glyph=copywriting]:before {
content: '\e04a';
}
.oi[data-glyph=credit-card]:before {
content: '\e04b';
}
.oi[data-glyph=crop]:before {
content: '\e04c';
}
.oi[data-glyph=dashboard]:before {
content: '\e04d';
}
.oi[data-glyph=data-transfer-download]:before {
content: '\e04e';
}
.oi[data-glyph=data-transfer-upload]:before {
content: '\e04f';
}
.oi[data-glyph=delete]:before {
content: '\e050';
}
.oi[data-glyph=dial]:before {
content: '\e051';
}
.oi[data-glyph=document]:before {
content: '\e052';
}
.oi[data-glyph=dollar]:before {
content: '\e053';
}
.oi[data-glyph=double-quote-sans-left]:before {
content: '\e054';
}
.oi[data-glyph=double-quote-sans-right]:before {
content: '\e055';
}
.oi[data-glyph=double-quote-serif-left]:before {
content: '\e056';
}
.oi[data-glyph=double-quote-serif-right]:before {
content: '\e057';
}
.oi[data-glyph=droplet]:before {
content: '\e058';
}
.oi[data-glyph=eject]:before {
content: '\e059';
}
.oi[data-glyph=elevator]:before {
content: '\e05a';
}
.oi[data-glyph=ellipses]:before {
content: '\e05b';
}
.oi[data-glyph=envelope-closed]:before {
content: '\e05c';
}
.oi[data-glyph=envelope-open]:before {
content: '\e05d';
}
.oi[data-glyph=euro]:before {
content: '\e05e';
}
.oi[data-glyph=excerpt]:before {
content: '\e05f';
}
.oi[data-glyph=expand-down]:before {
content: '\e060';
}
.oi[data-glyph=expand-left]:before {
content: '\e061';
}
.oi[data-glyph=expand-right]:before {
content: '\e062';
}
.oi[data-glyph=expand-up]:before {
content: '\e063';
}
.oi[data-glyph=external-link]:before {
content: '\e064';
}
.oi[data-glyph=eye]:before {
content: '\e065';
}
.oi[data-glyph=eyedropper]:before {
content: '\e066';
}
.oi[data-glyph=file]:before {
content: '\e067';
}
.oi[data-glyph=fire]:before {
content: '\e068';
}
.oi[data-glyph=flag]:before {
content: '\e069';
}
.oi[data-glyph=flash]:before {
content: '\e06a';
}
.oi[data-glyph=folder]:before {
content: '\e06b';
}
.oi[data-glyph=fork]:before {
content: '\e06c';
}
.oi[data-glyph=fullscreen-enter]:before {
content: '\e06d';
}
.oi[data-glyph=fullscreen-exit]:before {
content: '\e06e';
}
.oi[data-glyph=globe]:before {
content: '\e06f';
}
.oi[data-glyph=graph]:before {
content: '\e070';
}
.oi[data-glyph=grid-four-up]:before {
content: '\e071';
}
.oi[data-glyph=grid-three-up]:before {
content: '\e072';
}
.oi[data-glyph=grid-two-up]:before {
content: '\e073';
}
.oi[data-glyph=hard-drive]:before {
content: '\e074';
}
.oi[data-glyph=header]:before {
content: '\e075';
}
.oi[data-glyph=headphones]:before {
content: '\e076';
}
.oi[data-glyph=heart]:before {
content: '\e077';
}
.oi[data-glyph=home]:before {
content: '\e078';
}
.oi[data-glyph=image]:before {
content: '\e079';
}
.oi[data-glyph=inbox]:before {
content: '\e07a';
}
.oi[data-glyph=infinity]:before {
content: '\e07b';
}
.oi[data-glyph=info]:before {
content: '\e07c';
}
.oi[data-glyph=italic]:before {
content: '\e07d';
}
.oi[data-glyph=justify-center]:before {
content: '\e07e';
}
.oi[data-glyph=justify-left]:before {
content: '\e07f';
}
.oi[data-glyph=justify-right]:before {
content: '\e080';
}
.oi[data-glyph=key]:before {
content: '\e081';
}
.oi[data-glyph=laptop]:before {
content: '\e082';
}
.oi[data-glyph=layers]:before {
content: '\e083';
}
.oi[data-glyph=lightbulb]:before {
content: '\e084';
}
.oi[data-glyph=link-broken]:before {
content: '\e085';
}
.oi[data-glyph=link-intact]:before {
content: '\e086';
}
.oi[data-glyph=list-rich]:before {
content: '\e087';
}
.oi[data-glyph=list]:before {
content: '\e088';
}
.oi[data-glyph=location]:before {
content: '\e089';
}
.oi[data-glyph=lock-locked]:before {
content: '\e08a';
}
.oi[data-glyph=lock-unlocked]:before {
content: '\e08b';
}
.oi[data-glyph=loop-circular]:before {
content: '\e08c';
}
.oi[data-glyph=loop-square]:before {
content: '\e08d';
}
.oi[data-glyph=loop]:before {
content: '\e08e';
}
.oi[data-glyph=magnifying-glass]:before {
content: '\e08f';
}
.oi[data-glyph=map-marker]:before {
content: '\e090';
}
.oi[data-glyph=map]:before {
content: '\e091';
}
.oi[data-glyph=media-pause]:before {
content: '\e092';
}
.oi[data-glyph=media-play]:before {
content: '\e093';
}
.oi[data-glyph=media-record]:before {
content: '\e094';
}
.oi[data-glyph=media-skip-backward]:before {
content: '\e095';
}
.oi[data-glyph=media-skip-forward]:before {
content: '\e096';
}
.oi[data-glyph=media-step-backward]:before {
content: '\e097';
}
.oi[data-glyph=media-step-forward]:before {
content: '\e098';
}
.oi[data-glyph=media-stop]:before {
content: '\e099';
}
.oi[data-glyph=medical-cross]:before {
content: '\e09a';
}
.oi[data-glyph=menu]:before {
content: '\e09b';
}
.oi[data-glyph=microphone]:before {
content: '\e09c';
}
.oi[data-glyph=minus]:before {
content: '\e09d';
}
.oi[data-glyph=monitor]:before {
content: '\e09e';
}
.oi[data-glyph=moon]:before {
content: '\e09f';
}
.oi[data-glyph=move]:before {
content: '\e0a0';
}
.oi[data-glyph=musical-note]:before {
content: '\e0a1';
}
.oi[data-glyph=paperclip]:before {
content: '\e0a2';
}
.oi[data-glyph=pencil]:before {
content: '\e0a3';
}
.oi[data-glyph=people]:before {
content: '\e0a4';
}
.oi[data-glyph=person]:before {
content: '\e0a5';
}
.oi[data-glyph=phone]:before {
content: '\e0a6';
}
.oi[data-glyph=pie-chart]:before {
content: '\e0a7';
}
.oi[data-glyph=pin]:before {
content: '\e0a8';
}
.oi[data-glyph=play-circle]:before {
content: '\e0a9';
}
.oi[data-glyph=plus]:before {
content: '\e0aa';
}
.oi[data-glyph=power-standby]:before {
content: '\e0ab';
}
.oi[data-glyph=print]:before {
content: '\e0ac';
}
.oi[data-glyph=project]:before {
content: '\e0ad';
}
.oi[data-glyph=pulse]:before {
content: '\e0ae';
}
.oi[data-glyph=puzzle-piece]:before {
content: '\e0af';
}
.oi[data-glyph=question-mark]:before {
content: '\e0b0';
}
.oi[data-glyph=rain]:before {
content: '\e0b1';
}
.oi[data-glyph=random]:before {
content: '\e0b2';
}
.oi[data-glyph=reload]:before {
content: '\e0b3';
}
.oi[data-glyph=resize-both]:before {
content: '\e0b4';
}
.oi[data-glyph=resize-height]:before {
content: '\e0b5';
}
.oi[data-glyph=resize-width]:before {
content: '\e0b6';
}
.oi[data-glyph=rss-alt]:before {
content: '\e0b7';
}
.oi[data-glyph=rss]:before {
content: '\e0b8';
}
.oi[data-glyph=script]:before {
content: '\e0b9';
}
.oi[data-glyph=share-boxed]:before {
content: '\e0ba';
}
.oi[data-glyph=share]:before {
content: '\e0bb';
}
.oi[data-glyph=shield]:before {
content: '\e0bc';
}
.oi[data-glyph=signal]:before {
content: '\e0bd';
}
.oi[data-glyph=signpost]:before {
content: '\e0be';
}
.oi[data-glyph=sort-ascending]:before {
content: '\e0bf';
}
.oi[data-glyph=sort-descending]:before {
content: '\e0c0';
}
.oi[data-glyph=spreadsheet]:before {
content: '\e0c1';
}
.oi[data-glyph=star]:before {
content: '\e0c2';
}
.oi[data-glyph=sun]:before {
content: '\e0c3';
}
.oi[data-glyph=tablet]:before {
content: '\e0c4';
}
.oi[data-glyph=tag]:before {
content: '\e0c5';
}
.oi[data-glyph=tags]:before {
content: '\e0c6';
}
.oi[data-glyph=target]:before {
content: '\e0c7';
}
.oi[data-glyph=task]:before {
content: '\e0c8';
}
.oi[data-glyph=terminal]:before {
content: '\e0c9';
}
.oi[data-glyph=text]:before {
content: '\e0ca';
}
.oi[data-glyph=thumb-down]:before {
content: '\e0cb';
}
.oi[data-glyph=thumb-up]:before {
content: '\e0cc';
}
.oi[data-glyph=timer]:before {
content: '\e0cd';
}
.oi[data-glyph=transfer]:before {
content: '\e0ce';
}
.oi[data-glyph=trash]:before {
content: '\e0cf';
}
.oi[data-glyph=underline]:before {
content: '\e0d0';
}
.oi[data-glyph=vertical-align-bottom]:before {
content: '\e0d1';
}
.oi[data-glyph=vertical-align-center]:before {
content: '\e0d2';
}
.oi[data-glyph=vertical-align-top]:before {
content: '\e0d3';
}
.oi[data-glyph=video]:before {
content: '\e0d4';
}
.oi[data-glyph=volume-high]:before {
content: '\e0d5';
}
.oi[data-glyph=volume-low]:before {
content: '\e0d6';
}
.oi[data-glyph=volume-off]:before {
content: '\e0d7';
}
.oi[data-glyph=warning]:before {
content: '\e0d8';
}
.oi[data-glyph=wifi]:before {
content: '\e0d9';
}
.oi[data-glyph=wrench]:before {
content: '\e0da';
}
.oi[data-glyph=x]:before {
content: '\e0db';
}
.oi[data-glyph=yen]:before {
content: '\e0dc';
}
.oi[data-glyph=zoom-in]:before {
content: '\e0dd';
}
.oi[data-glyph=zoom-out]:before {
content: '\e0de';
}

View File

@ -1,733 +0,0 @@
@font-face
font-family 'Icons'
src url('../fonts/open-iconic.eot')
src url('../fonts/open-iconic.eot?#iconic-sm') format('embedded-opentype'), url('../fonts/open-iconic.woff') format('woff'), url('../fonts/open-iconic.ttf') format('truetype'), url('../fonts/open-iconic.otf') format('opentype'), url('../fonts/open-iconic.svg#iconic-sm') format('svg')
font-weight normal
font-style normal
.oi[data-glyph].oi-text-replace
font-size 0
line-height 0
.oi[data-glyph].oi-text-replace:before
width 1em
text-align center
.oi[data-glyph]
&:before
position relative
top 1px
font-family 'Icons'
display inline-block
speak none
line-height 1
vertical-align baseline
font-weight normal
font-style normal
-webkit-font-smoothing antialiased
-moz-osx-font-smoothing grayscale
&:empty:before
width 1em
text-align center
box-sizing content-box
&.oi-align-left:before
text-align left
&.oi-align-right:before
text-align right
&.oi-align-center:before
text-align center
&.oi-flip-horizontal:before
-webkit-transform scale(-1, 1)
-ms-transform scale(-1, 1)
transform scale(-1, 1)
&.oi-flip-vertical:before
-webkit-transform scale(1, -1)
-ms-transform scale(-1, 1)
transform scale(1, -1)
&.oi-flip-horizontal-vertical:before
-webkit-transform scale(-1, -1)
-ms-transform scale(-1, 1)
transform scale(-1, -1)
.oi[data-glyph=account-login]:before
content '\e000'
.oi[data-glyph=account-logout]:before
content '\e001'
.oi[data-glyph=action-redo]:before
content '\e002'
.oi[data-glyph=action-undo]:before
content '\e003'
.oi[data-glyph=align-center]:before
content '\e004'
.oi[data-glyph=align-left]:before
content '\e005'
.oi[data-glyph=align-right]:before
content '\e006'
.oi[data-glyph=aperture]:before
content '\e007'
.oi[data-glyph=arrow-bottom]:before
content '\e008'
.oi[data-glyph=arrow-circle-bottom]:before
content '\e009'
.oi[data-glyph=arrow-circle-left]:before
content '\e00a'
.oi[data-glyph=arrow-circle-right]:before
content '\e00b'
.oi[data-glyph=arrow-circle-top]:before
content '\e00c'
.oi[data-glyph=arrow-left]:before
content '\e00d'
.oi[data-glyph=arrow-right]:before
content '\e00e'
.oi[data-glyph=arrow-thick-bottom]:before
content '\e00f'
.oi[data-glyph=arrow-thick-left]:before
content '\e010'
.oi[data-glyph=arrow-thick-right]:before
content '\e011'
.oi[data-glyph=arrow-thick-top]:before
content '\e012'
.oi[data-glyph=arrow-top]:before
content '\e013'
.oi[data-glyph=audio-spectrum]:before
content '\e014'
.oi[data-glyph=audio]:before
content '\e015'
.oi[data-glyph=badge]:before
content '\e016'
.oi[data-glyph=ban]:before
content '\e017'
.oi[data-glyph=bar-chart]:before
content '\e018'
.oi[data-glyph=basket]:before
content '\e019'
.oi[data-glyph=battery-empty]:before
content '\e01a'
.oi[data-glyph=battery-full]:before
content '\e01b'
.oi[data-glyph=beaker]:before
content '\e01c'
.oi[data-glyph=bell]:before
content '\e01d'
.oi[data-glyph=bluetooth]:before
content '\e01e'
.oi[data-glyph=bold]:before
content '\e01f'
.oi[data-glyph=bolt]:before
content '\e020'
.oi[data-glyph=book]:before
content '\e021'
.oi[data-glyph=bookmark]:before
content '\e022'
.oi[data-glyph=box]:before
content '\e023'
.oi[data-glyph=briefcase]:before
content '\e024'
.oi[data-glyph=british-pound]:before
content '\e025'
.oi[data-glyph=browser]:before
content '\e026'
.oi[data-glyph=brush]:before
content '\e027'
.oi[data-glyph=bug]:before
content '\e028'
.oi[data-glyph=bullhorn]:before
content '\e029'
.oi[data-glyph=calculator]:before
content '\e02a'
.oi[data-glyph=calendar]:before
content '\e02b'
.oi[data-glyph=camera-slr]:before
content '\e02c'
.oi[data-glyph=caret-bottom]:before
content '\e02d'
.oi[data-glyph=caret-left]:before
content '\e02e'
.oi[data-glyph=caret-right]:before
content '\e02f'
.oi[data-glyph=caret-top]:before
content '\e030'
.oi[data-glyph=cart]:before
content '\e031'
.oi[data-glyph=chat]:before
content '\e032'
.oi[data-glyph=check]:before
content '\e033'
.oi[data-glyph=chevron-bottom]:before
content '\e034'
.oi[data-glyph=chevron-left]:before
content '\e035'
.oi[data-glyph=chevron-right]:before
content '\e036'
.oi[data-glyph=chevron-top]:before
content '\e037'
.oi[data-glyph=circle-check]:before
content '\e038'
.oi[data-glyph=circle-x]:before
content '\e039'
.oi[data-glyph=clipboard]:before
content '\e03a'
.oi[data-glyph=clock]:before
content '\e03b'
.oi[data-glyph=cloud-download]:before
content '\e03c'
.oi[data-glyph=cloud-upload]:before
content '\e03d'
.oi[data-glyph=cloud]:before
content '\e03e'
.oi[data-glyph=cloudy]:before
content '\e03f'
.oi[data-glyph=code]:before
content '\e040'
.oi[data-glyph=cog]:before
content '\e041'
.oi[data-glyph=collapse-down]:before
content '\e042'
.oi[data-glyph=collapse-left]:before
content '\e043'
.oi[data-glyph=collapse-right]:before
content '\e044'
.oi[data-glyph=collapse-up]:before
content '\e045'
.oi[data-glyph=command]:before
content '\e046'
.oi[data-glyph=comment-square]:before
content '\e047'
.oi[data-glyph=compass]:before
content '\e048'
.oi[data-glyph=contrast]:before
content '\e049'
.oi[data-glyph=copywriting]:before
content '\e04a'
.oi[data-glyph=credit-card]:before
content '\e04b'
.oi[data-glyph=crop]:before
content '\e04c'
.oi[data-glyph=dashboard]:before
content '\e04d'
.oi[data-glyph=data-transfer-download]:before
content '\e04e'
.oi[data-glyph=data-transfer-upload]:before
content '\e04f'
.oi[data-glyph=delete]:before
content '\e050'
.oi[data-glyph=dial]:before
content '\e051'
.oi[data-glyph=document]:before
content '\e052'
.oi[data-glyph=dollar]:before
content '\e053'
.oi[data-glyph=double-quote-sans-left]:before
content '\e054'
.oi[data-glyph=double-quote-sans-right]:before
content '\e055'
.oi[data-glyph=double-quote-serif-left]:before
content '\e056'
.oi[data-glyph=double-quote-serif-right]:before
content '\e057'
.oi[data-glyph=droplet]:before
content '\e058'
.oi[data-glyph=eject]:before
content '\e059'
.oi[data-glyph=elevator]:before
content '\e05a'
.oi[data-glyph=ellipses]:before
content '\e05b'
.oi[data-glyph=envelope-closed]:before
content '\e05c'
.oi[data-glyph=envelope-open]:before
content '\e05d'
.oi[data-glyph=euro]:before
content '\e05e'
.oi[data-glyph=excerpt]:before
content '\e05f'
.oi[data-glyph=expand-down]:before
content '\e060'
.oi[data-glyph=expand-left]:before
content '\e061'
.oi[data-glyph=expand-right]:before
content '\e062'
.oi[data-glyph=expand-up]:before
content '\e063'
.oi[data-glyph=external-link]:before
content '\e064'
.oi[data-glyph=eye]:before
content '\e065'
.oi[data-glyph=eyedropper]:before
content '\e066'
.oi[data-glyph=file]:before
content '\e067'
.oi[data-glyph=fire]:before
content '\e068'
.oi[data-glyph=flag]:before
content '\e069'
.oi[data-glyph=flash]:before
content '\e06a'
.oi[data-glyph=folder]:before
content '\e06b'
.oi[data-glyph=fork]:before
content '\e06c'
.oi[data-glyph=fullscreen-enter]:before
content '\e06d'
.oi[data-glyph=fullscreen-exit]:before
content '\e06e'
.oi[data-glyph=globe]:before
content '\e06f'
.oi[data-glyph=graph]:before
content '\e070'
.oi[data-glyph=grid-four-up]:before
content '\e071'
.oi[data-glyph=grid-three-up]:before
content '\e072'
.oi[data-glyph=grid-two-up]:before
content '\e073'
.oi[data-glyph=hard-drive]:before
content '\e074'
.oi[data-glyph=header]:before
content '\e075'
.oi[data-glyph=headphones]:before
content '\e076'
.oi[data-glyph=heart]:before
content '\e077'
.oi[data-glyph=home]:before
content '\e078'
.oi[data-glyph=image]:before
content '\e079'
.oi[data-glyph=inbox]:before
content '\e07a'
.oi[data-glyph=infinity]:before
content '\e07b'
.oi[data-glyph=info]:before
content '\e07c'
.oi[data-glyph=italic]:before
content '\e07d'
.oi[data-glyph=justify-center]:before
content '\e07e'
.oi[data-glyph=justify-left]:before
content '\e07f'
.oi[data-glyph=justify-right]:before
content '\e080'
.oi[data-glyph=key]:before
content '\e081'
.oi[data-glyph=laptop]:before
content '\e082'
.oi[data-glyph=layers]:before
content '\e083'
.oi[data-glyph=lightbulb]:before
content '\e084'
.oi[data-glyph=link-broken]:before
content '\e085'
.oi[data-glyph=link-intact]:before
content '\e086'
.oi[data-glyph=list-rich]:before
content '\e087'
.oi[data-glyph=list]:before
content '\e088'
.oi[data-glyph=location]:before
content '\e089'
.oi[data-glyph=lock-locked]:before
content '\e08a'
.oi[data-glyph=lock-unlocked]:before
content '\e08b'
.oi[data-glyph=loop-circular]:before
content '\e08c'
.oi[data-glyph=loop-square]:before
content '\e08d'
.oi[data-glyph=loop]:before
content '\e08e'
.oi[data-glyph=magnifying-glass]:before
content '\e08f'
.oi[data-glyph=map-marker]:before
content '\e090'
.oi[data-glyph=map]:before
content '\e091'
.oi[data-glyph=media-pause]:before
content '\e092'
.oi[data-glyph=media-play]:before
content '\e093'
.oi[data-glyph=media-record]:before
content '\e094'
.oi[data-glyph=media-skip-backward]:before
content '\e095'
.oi[data-glyph=media-skip-forward]:before
content '\e096'
.oi[data-glyph=media-step-backward]:before
content '\e097'
.oi[data-glyph=media-step-forward]:before
content '\e098'
.oi[data-glyph=media-stop]:before
content '\e099'
.oi[data-glyph=medical-cross]:before
content '\e09a'
.oi[data-glyph=menu]:before
content '\e09b'
.oi[data-glyph=microphone]:before
content '\e09c'
.oi[data-glyph=minus]:before
content '\e09d'
.oi[data-glyph=monitor]:before
content '\e09e'
.oi[data-glyph=moon]:before
content '\e09f'
.oi[data-glyph=move]:before
content '\e0a0'
.oi[data-glyph=musical-note]:before
content '\e0a1'
.oi[data-glyph=paperclip]:before
content '\e0a2'
.oi[data-glyph=pencil]:before
content '\e0a3'
.oi[data-glyph=people]:before
content '\e0a4'
.oi[data-glyph=person]:before
content '\e0a5'
.oi[data-glyph=phone]:before
content '\e0a6'
.oi[data-glyph=pie-chart]:before
content '\e0a7'
.oi[data-glyph=pin]:before
content '\e0a8'
.oi[data-glyph=play-circle]:before
content '\e0a9'
.oi[data-glyph=plus]:before
content '\e0aa'
.oi[data-glyph=power-standby]:before
content '\e0ab'
.oi[data-glyph=print]:before
content '\e0ac'
.oi[data-glyph=project]:before
content '\e0ad'
.oi[data-glyph=pulse]:before
content '\e0ae'
.oi[data-glyph=puzzle-piece]:before
content '\e0af'
.oi[data-glyph=question-mark]:before
content '\e0b0'
.oi[data-glyph=rain]:before
content '\e0b1'
.oi[data-glyph=random]:before
content '\e0b2'
.oi[data-glyph=reload]:before
content '\e0b3'
.oi[data-glyph=resize-both]:before
content '\e0b4'
.oi[data-glyph=resize-height]:before
content '\e0b5'
.oi[data-glyph=resize-width]:before
content '\e0b6'
.oi[data-glyph=rss-alt]:before
content '\e0b7'
.oi[data-glyph=rss]:before
content '\e0b8'
.oi[data-glyph=script]:before
content '\e0b9'
.oi[data-glyph=share-boxed]:before
content '\e0ba'
.oi[data-glyph=share]:before
content '\e0bb'
.oi[data-glyph=shield]:before
content '\e0bc'
.oi[data-glyph=signal]:before
content '\e0bd'
.oi[data-glyph=signpost]:before
content '\e0be'
.oi[data-glyph=sort-ascending]:before
content '\e0bf'
.oi[data-glyph=sort-descending]:before
content '\e0c0'
.oi[data-glyph=spreadsheet]:before
content '\e0c1'
.oi[data-glyph=star]:before
content '\e0c2'
.oi[data-glyph=sun]:before
content '\e0c3'
.oi[data-glyph=tablet]:before
content '\e0c4'
.oi[data-glyph=tag]:before
content '\e0c5'
.oi[data-glyph=tags]:before
content '\e0c6'
.oi[data-glyph=target]:before
content '\e0c7'
.oi[data-glyph=task]:before
content '\e0c8'
.oi[data-glyph=terminal]:before
content '\e0c9'
.oi[data-glyph=text]:before
content '\e0ca'
.oi[data-glyph=thumb-down]:before
content '\e0cb'
.oi[data-glyph=thumb-up]:before
content '\e0cc'
.oi[data-glyph=timer]:before
content '\e0cd'
.oi[data-glyph=transfer]:before
content '\e0ce'
.oi[data-glyph=trash]:before
content '\e0cf'
.oi[data-glyph=underline]:before
content '\e0d0'
.oi[data-glyph=vertical-align-bottom]:before
content '\e0d1'
.oi[data-glyph=vertical-align-center]:before
content '\e0d2'
.oi[data-glyph=vertical-align-top]:before
content '\e0d3'
.oi[data-glyph=video]:before
content '\e0d4'
.oi[data-glyph=volume-high]:before
content '\e0d5'
.oi[data-glyph=volume-low]:before
content '\e0d6'
.oi[data-glyph=volume-off]:before
content '\e0d7'
.oi[data-glyph=warning]:before
content '\e0d8'
.oi[data-glyph=wifi]:before
content '\e0d9'
.oi[data-glyph=wrench]:before
content '\e0da'
.oi[data-glyph=x]:before
content '\e0db'
.oi[data-glyph=yen]:before
content '\e0dc'
.oi[data-glyph=zoom-in]:before
content '\e0dd'
.oi[data-glyph=zoom-out]:before
content '\e0de'

View File

@ -1,543 +0,0 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<!--
2014-7-1: Created.
-->
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
Created by FontForge 20120731 at Tue Jul 1 20:39:22 2014
By P.J. Onori
Created by P.J. Onori with FontForge 2.0 (http://fontforge.sf.net)
</metadata>
<defs>
<font id="open-iconic" horiz-adv-x="800" >
<font-face
font-family="Icons"
font-weight="400"
font-stretch="normal"
units-per-em="800"
panose-1="2 0 5 3 0 0 0 0 0 0"
ascent="800"
descent="0"
bbox="-0.5 -101 802 800.126"
underline-thickness="50"
underline-position="-100"
unicode-range="U+E000-E0DE"
/>
<missing-glyph />
<glyph glyph-name="" unicode="&#xe000;"
d="M300 700h500v-700h-500v100h400v500h-400v100zM400 500l200 -150l-200 -150v100h-400v100h400v100z" />
<glyph glyph-name="1" unicode="&#xe001;"
d="M300 700h500v-700h-500v100h400v500h-400v100zM200 500v-100h400v-100h-400v-100l-200 150z" />
<glyph glyph-name="2" unicode="&#xe002;"
d="M350 700c193 0 350 -157 350 -350v-50h100l-200 -200l-200 200h100v50c0 138 -112 250 -250 250s-250 -112 -250 -250c0 193 157 350 350 350z" />
<glyph glyph-name="3" unicode="&#xe003;"
d="M450 700c193 0 350 -157 350 -350c0 138 -112 250 -250 250s-250 -112 -250 -250v-50h100l-200 -200l-200 200h100v50c0 193 157 350 350 350z" />
<glyph glyph-name="4" unicode="&#xe004;"
d="M0 700h800v-100h-800v100zM100 500h600v-100h-600v100zM0 300h800v-100h-800v100zM100 100h600v-100h-600v100z" />
<glyph glyph-name="5" unicode="&#xe005;"
d="M0 700h800v-100h-800v100zM0 500h600v-100h-600v100zM0 300h800v-100h-800v100zM0 100h600v-100h-600v100z" />
<glyph glyph-name="6" unicode="&#xe006;"
d="M0 700h800v-100h-800v100zM200 500h600v-100h-600v100zM0 300h800v-100h-800v100zM200 100h600v-100h-600v100z" />
<glyph glyph-name="7" unicode="&#xe007;"
d="M400 700c75 0 146 -23 206 -59l-75 -225l-322 234c57 31 122 50 191 50zM125 588l191 -138l-310 -222c-4 24 -6 47 -6 72c0 114 49 215 125 288zM688 575c69 -72 112 -168 112 -275c0 -35 -8 -68 -16 -100h-218zM216 253l112 -347c-128 23 -232 109 -287 222zM372 100
h372c-64 -109 -177 -185 -310 -197z" />
<glyph glyph-name="8" unicode="&#xe008;" horiz-adv-x="600"
d="M200 800h100v-500h200l-247 -300l-253 300h200v500z" />
<glyph glyph-name="9" unicode="&#xe009;"
d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM300 700v-300h-200l300 -300l300 300h-200v300h-200z" />
<glyph glyph-name="a" unicode="&#xe00a;"
d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700l-300 -300l300 -300v200h300v200h-300v200z" />
<glyph glyph-name="b" unicode="&#xe00b;"
d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700v-200h-300v-200h300v-200l300 300z" />
<glyph glyph-name="c" unicode="&#xe00c;"
d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700l-300 -300h200v-300h200v300h200z" />
<glyph glyph-name="d" unicode="&#xe00d;"
d="M300 600v-200h500v-100h-500v-200l-300 247z" />
<glyph glyph-name="e" unicode="&#xe00e;"
d="M500 600l300 -247l-300 -253v200h-500v100h500v200z" />
<glyph glyph-name="f" unicode="&#xe00f;" horiz-adv-x="600"
d="M200 800h200v-500h200l-297 -300l-303 300h200v500z" />
<glyph glyph-name="10" unicode="&#xe010;"
d="M300 700v-200h500v-200h-500v-200l-300 297z" />
<glyph glyph-name="11" unicode="&#xe011;"
d="M500 700l300 -297l-300 -303v200h-500v200h500v200z" />
<glyph glyph-name="12" unicode="&#xe012;" horiz-adv-x="600"
d="M297 800l303 -300h-200v-500h-200v500h-200z" />
<glyph glyph-name="13" unicode="&#xe013;" horiz-adv-x="600"
d="M247 800l253 -300h-200v-500h-100v500h-200z" />
<glyph glyph-name="14" unicode="&#xe014;"
d="M400 800h100v-800h-100v800zM200 700h100v-600h-100v600zM600 600h100v-400h-100v400zM0 500h100v-200h-100v200z" />
<glyph glyph-name="15" unicode="&#xe015;"
d="M116 600l72 -72c-54 -54 -88 -126 -88 -209s34 -159 88 -213l-72 -72c-72 72 -116 175 -116 285s44 209 116 281zM684 600c72 -72 116 -171 116 -281s-44 -213 -116 -285l-72 72c54 54 88 130 88 213s-34 155 -88 209zM259 460l69 -72c-18 -18 -28 -41 -28 -69
s10 -54 28 -72l-69 -72c-36 36 -59 89 -59 144s23 105 59 141zM541 459c36 -36 59 -85 59 -140s-23 -108 -59 -144l-69 72c18 18 28 44 28 72s-10 51 -28 69z" />
<glyph glyph-name="16" unicode="&#xe016;" horiz-adv-x="400"
d="M200 800c110 0 200 -90 200 -200s-90 -200 -200 -200s-200 90 -200 200s90 200 200 200zM100 319c31 -11 65 -19 100 -19s68 8 100 19v-319l-100 100l-100 -100v319z" />
<glyph glyph-name="17" unicode="&#xe017;"
d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300c0 -66 21 -126 56 -175l419 419c-49 35 -109 56 -175 56zM644 575l-419 -419c49 -35 109 -56 175 -56c166 0 300 134 300 300
c0 66 -21 126 -56 175z" />
<glyph glyph-name="18" unicode="&#xe018;"
d="M0 700h100v-600h700v-100h-800v700zM500 700h200v-500h-200v500zM200 500h200v-300h-200v300z" />
<glyph glyph-name="19" unicode="&#xe019;"
d="M397 800c13 1 23 -4 34 -13c2 -2 214 -254 241 -287h128v-100h-100v-366c0 -18 -16 -34 -34 -34h-532c-18 0 -34 16 -34 34v366h-100v100h128l234 281c9 11 22 18 35 19zM400 672l-144 -172h288zM250 300c-28 0 -50 -22 -50 -50v-100c0 -28 22 -50 50 -50s50 22 50 50
v100c0 28 -22 50 -50 50zM550 300c-28 0 -50 -22 -50 -50v-100c0 -28 22 -50 50 -50s50 22 50 50v100c0 28 -22 50 -50 50z" />
<glyph glyph-name="1a" unicode="&#xe01a;"
d="M9 700h682c6 0 9 -4 9 -10v-190h100v-200h-100v-191c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v582c0 6 3 9 9 9zM100 600v-400h500v400h-500z" />
<glyph glyph-name="1b" unicode="&#xe01b;"
d="M9 700h682c6 0 9 -4 9 -10v-190h100v-200h-100v-191c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v582c0 6 3 9 9 9z" />
<glyph glyph-name="1c" unicode="&#xe01c;"
d="M92 650c0 23 19 50 45 50h3h5h5h500c28 0 50 -22 50 -50s-22 -50 -50 -50h-50v-141c9 -17 120 -231 166 -309c16 -26 34 -61 34 -106c0 -39 -15 -77 -41 -103h-3c-26 -25 -62 -41 -100 -41h-512c-39 0 -77 15 -103 41s-41 64 -41 103c0 46 18 80 34 106
c46 78 157 292 166 309v141h-50c-2 0 -6 -1 -8 -1c-28 0 -50 23 -50 51zM500 600h-200v-162l-6 -10s-63 -123 -119 -228h450c-56 105 -119 228 -119 228l-6 10v162z" />
<glyph glyph-name="1d" unicode="&#xe01d;"
d="M400 800c110 0 200 -90 200 -200c0 -104 52 -198 134 -266c41 -34 66 -82 66 -134h-800c0 52 25 100 66 134c82 68 134 162 134 266c0 110 90 200 200 200zM300 100h200c0 -55 -45 -100 -100 -100s-100 45 -100 100z" />
<glyph glyph-name="1e" unicode="&#xe01e;" horiz-adv-x="600"
d="M150 800h50l350 -250l-225 -147l225 -153l-350 -250h-50v250l-75 -75l-75 75l150 150l-150 150l75 75l75 -75v250zM250 650v-200l150 100zM250 350v-200l150 100z" />
<glyph glyph-name="1f" unicode="&#xe01f;"
d="M0 800h500c110 0 200 -90 200 -200c0 -47 -17 -91 -44 -125c85 -40 144 -125 144 -225c0 -138 -112 -250 -250 -250h-550v100c55 0 100 45 100 100v400c0 55 -45 100 -100 100v100zM300 700v-200h100c55 0 100 45 100 100s-45 100 -100 100h-100zM300 400v-300h150
c83 0 150 67 150 150s-67 150 -150 150h-150z" />
<glyph glyph-name="20" unicode="&#xe020;" horiz-adv-x="600"
d="M300 800v-300h200l-300 -500v300h-200z" />
<glyph glyph-name="21" unicode="&#xe021;"
d="M100 800h300v-300l100 100l100 -100v300h50c28 0 50 -22 50 -50v-550h-550c-28 0 -50 -22 -50 -50s22 -50 50 -50h550v-100h-550c-83 0 -150 67 -150 150v550l3 19c8 39 39 70 78 78z" />
<glyph glyph-name="22" unicode="&#xe022;" horiz-adv-x="400"
d="M0 800h400v-800l-200 200l-200 -200v800z" />
<glyph glyph-name="23" unicode="&#xe023;"
d="M0 800h800v-100h-800v100zM0 600h300v-103h203v103h297v-591c0 -6 -3 -9 -9 -9h-782c-6 0 -9 3 -9 9v591z" />
<glyph glyph-name="24" unicode="&#xe024;"
d="M300 800h200c55 0 100 -45 100 -100v-100h191c6 0 9 -3 9 -9v-241c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v241c0 6 3 9 9 9h191v100c0 55 45 100 100 100zM300 700v-100h200v100h-200zM0 209c16 -6 32 -9 50 -9h700c18 0 34 3 50 9v-200c0 -6 -3 -9 -9 -9h-782
c-6 0 -9 3 -9 9v200z" />
<glyph glyph-name="25" unicode="&#xe025;" horiz-adv-x="600"
d="M300 800c58 0 110 -16 147 -53s53 -89 53 -147h-100c0 39 -11 61 -25 75s-36 25 -75 25c-35 0 -55 -10 -72 -31s-28 -55 -28 -94c0 -51 20 -107 28 -175h172v-100h-178c-14 -60 -49 -127 -113 -200h491v-100h-600v122l16 12c69 69 95 121 106 166h-122v100h125
c-8 50 -25 106 -25 175c0 58 16 114 50 156c34 43 88 69 150 69z" />
<glyph glyph-name="26" unicode="&#xe026;"
d="M34 700h4h3h4h5h700c28 0 50 -22 50 -50v-700c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v700v2c0 20 15 42 34 48zM150 600c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50zM350 600c-28 0 -50 -22 -50 -50s22 -50 50 -50h300c28 0 50 22 50 50
s-22 50 -50 50h-300zM100 400v-400h600v400h-600z" />
<glyph glyph-name="27" unicode="&#xe027;"
d="M744 797l6 -3l44 -44c4 -4 3 -8 0 -12l-266 -375l-15 -13l-25 -12c-23 72 -78 127 -150 150l12 25l13 15l375 266zM266 400c74 0 134 -60 134 -134c0 -147 -119 -266 -266 -266c-48 0 -95 12 -134 34c80 46 134 133 134 232c0 74 58 134 132 134z" />
<glyph glyph-name="28" unicode="&#xe028;"
d="M9 451c0 23 19 50 46 50c8 0 19 -3 26 -7l131 -66l29 22c-79 81 -1 250 118 250s197 -167 119 -250l28 -22l131 66c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-115 -56c9 -16 19 -33 25 -50h68c28 0 50 -22 50 -50s-22 -50 -50 -50h-50
c0 -23 -2 -45 -6 -66l78 -40c21 -5 37 -28 37 -49c0 -28 -22 -50 -50 -50c-10 0 -23 5 -31 11l-65 35c-24 -46 -62 -86 -103 -110c-35 19 -60 45 -60 72v135v4v5v6v5v5v87c0 28 -22 50 -50 50c-24 0 -45 -17 -50 -40c1 -3 1 -8 1 -11s0 -8 -1 -11v-82v-4v-5v-144
c0 -28 -24 -53 -59 -72c-41 25 -79 64 -103 110l-66 -35c-8 -6 -21 -11 -31 -11c-28 0 -50 22 -50 50c0 21 16 44 37 49l78 40c-4 21 -6 43 -6 66h-50h-5c-28 0 -50 22 -50 50c0 26 22 50 50 50h5h69c6 17 16 34 25 50l-116 56c-16 7 -28 27 -28 45z" />
<glyph glyph-name="29" unicode="&#xe029;"
d="M600 700h91c6 0 9 -3 9 -9v-582c0 -6 -3 -9 -9 -9h-91v600zM210 503l290 147v-500l-250 125v-3c-15 0 -25 -8 -28 -22l75 -178c11 -25 0 -58 -25 -69s-58 0 -69 25l-103 272h-91c-6 0 -9 3 -9 9v182c0 6 3 9 9 9h182z" />
<glyph glyph-name="2a" unicode="&#xe02a;"
d="M9 800h682c6 0 9 -3 9 -9v-782c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v782c0 6 3 9 9 9zM100 700v-200h500v200h-500zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400v-300h100v300h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100z" />
<glyph glyph-name="2b" unicode="&#xe02b;"
d="M0 800h700v-200h-700v200zM0 500h700v-491c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v491zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100z" />
<glyph glyph-name="2c" unicode="&#xe02c;"
d="M409 800h182c6 0 10 -4 12 -9l94 -182c2 -5 6 -9 12 -9h82c6 0 9 -3 9 -9v-582c0 -6 -3 -9 -9 -9h-782c-6 0 -9 3 -9 9v441c0 83 67 150 150 150h141c6 0 10 4 12 9l94 182c2 5 6 9 12 9zM150 500c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z
M500 500c-110 0 -200 -90 -200 -200s90 -200 200 -200s200 90 200 200s-90 200 -200 200zM500 400c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100s45 100 100 100z" />
<glyph glyph-name="2d" unicode="&#xe02d;"
d="M0 600h800l-400 -400z" />
<glyph glyph-name="2e" unicode="&#xe02e;" horiz-adv-x="400"
d="M400 800v-800l-400 400z" />
<glyph glyph-name="2f" unicode="&#xe02f;" horiz-adv-x="400"
d="M0 800l400 -400l-400 -400v800z" />
<glyph glyph-name="30" unicode="&#xe030;"
d="M400 600l400 -400h-800z" />
<glyph glyph-name="31" unicode="&#xe031;"
d="M0 550c0 23 20 50 46 50h3h5h4h200c17 0 37 -13 44 -28l38 -72h444c14 0 19 -12 15 -25l-81 -250c-4 -13 -21 -25 -35 -25h-350c-14 0 -30 12 -34 25c-27 83 -54 167 -81 250l-10 25h-150c-2 0 -5 -1 -7 -1c-28 0 -51 23 -51 51zM358 100c28 0 50 -22 50 -50
s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM658 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
<glyph glyph-name="32" unicode="&#xe032;"
d="M0 700h500v-100h-300v-300h-100l-100 -100v500zM300 500h500v-500l-100 100h-400v400z" />
<glyph glyph-name="33" unicode="&#xe033;"
d="M641 700l143 -141l-493 -493c-71 76 -146 148 -219 222l-72 71l141 141c50 -51 101 -101 153 -150c116 117 234 231 347 350z" />
<glyph glyph-name="34" unicode="&#xe034;"
d="M150 600l250 -250l250 250l150 -150l-400 -400l-400 400z" />
<glyph glyph-name="35" unicode="&#xe035;" horiz-adv-x="600"
d="M400 800l150 -150l-250 -250l250 -250l-150 -150l-400 400z" />
<glyph glyph-name="36" unicode="&#xe036;" horiz-adv-x="600"
d="M150 800l400 -400l-400 -400l-150 150l250 250l-250 250z" />
<glyph glyph-name="37" unicode="&#xe037;"
d="M400 600l400 -400l-150 -150l-250 250l-250 -250l-150 150z" />
<glyph glyph-name="38" unicode="&#xe038;"
d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM600 622l-250 -250l-100 100l-72 -72l172 -172l322 322z" />
<glyph glyph-name="39" unicode="&#xe039;"
d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM250 622l-72 -72l150 -150l-150 -150l72 -72l150 150l150 -150l72 72l-150 150l150 150l-72 72l-150 -150z" />
<glyph glyph-name="3a" unicode="&#xe03a;"
d="M350 800c28 0 50 -22 50 -50v-50h75c14 0 25 -11 25 -25v-75h-300v75c0 14 11 25 25 25h75v50c0 28 22 50 50 50zM25 700h75v-200h500v200h75c14 0 25 -11 25 -25v-650c0 -14 -11 -25 -25 -25h-650c-14 0 -25 11 -25 25v650c0 14 11 25 25 25z" />
<glyph glyph-name="3b" unicode="&#xe03b;"
d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM350 600h100v-181c23 -24 47 -47 72 -69l-72 -72c-27 30 -55 59 -84 88l-16 12
v222z" />
<glyph glyph-name="3c" unicode="&#xe03c;"
d="M450 800c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -18 -3 -34 -9 -50h-191v50c0 83 -67 150 -150 150s-150 -67 -150 -150v-50h-272c-17 30 -28 63 -28 100c0 110 90 200 200 200c23 114 129 200 250 200zM434 400h3h4c3 0 6 1 9 1c28 0 50 -22 50 -50v-1
v-150h150l-200 -200l-200 200h150v150v2c0 20 15 42 34 48z" />
<glyph glyph-name="3d" unicode="&#xe03d;"
d="M450 800c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -18 -3 -34 -9 -50h-141l-200 200l-200 -200h-222c-17 30 -28 63 -28 100c0 110 90 200 200 200c23 114 129 200 250 200zM450 350l250 -250h-200v-50c0 -28 -22 -50 -50 -50s-50 22 -50 50v50h-200z" />
<glyph glyph-name="3e" unicode="&#xe03e;"
d="M450 700c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -83 -67 -150 -150 -150h-450c-110 0 -200 90 -200 200s90 200 200 200c23 114 129 200 250 200z" />
<glyph glyph-name="3f" unicode="&#xe03f;"
d="M250 800c82 0 154 -40 200 -100c-143 0 -270 -85 -325 -209c-36 -10 -70 -25 -100 -47c-16 33 -25 67 -25 106c0 138 112 250 250 250zM450 600c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -83 -67 -150 -150 -150h-450c-110 0 -200 90 -200 200
s90 200 200 200c23 114 129 200 250 200z" />
<glyph glyph-name="40" unicode="&#xe040;"
d="M500 700h100l-300 -600h-100zM100 600h100l-100 -200l100 -200h-100l-100 200zM600 600h100l100 -200l-100 -200h-100l100 200z" />
<glyph glyph-name="41" unicode="&#xe041;"
d="M350 800h100l50 -119l28 -12l119 50l72 -72l-50 -119l12 -28l119 -50v-100l-119 -50l-12 -28l50 -119l-72 -72l-119 50l-28 -12l-50 -119h-100l-50 119l-28 12l-119 -50l-72 72l50 119l-12 28l-119 50v100l119 50l12 28l-50 119l72 72l119 -50l28 12zM400 550
c-83 0 -150 -67 -150 -150s67 -150 150 -150s150 67 150 150s-67 150 -150 150z" />
<glyph glyph-name="42" unicode="&#xe042;"
d="M0 800h800v-200h-800v200zM200 500h400l-200 -200zM0 100h800v-100h-800v100z" />
<glyph glyph-name="43" unicode="&#xe043;"
d="M0 800h100v-800h-100v800zM600 800h200v-800h-200v800zM500 600v-400l-200 200z" />
<glyph glyph-name="44" unicode="&#xe044;"
d="M0 800h200v-800h-200v800zM700 800h100v-800h-100v800zM300 600l200 -200l-200 -200v400z" />
<glyph glyph-name="45" unicode="&#xe045;"
d="M0 800h800v-100h-800v100zM400 500l200 -200h-400zM0 200h800v-200h-800v200z" />
<glyph glyph-name="46" unicode="&#xe046;"
d="M150 700c83 0 150 -67 150 -150v-50h100v50c0 83 67 150 150 150s150 -67 150 -150s-67 -150 -150 -150h-50v-100h50c83 0 150 -67 150 -150s-67 -150 -150 -150s-150 67 -150 150v50h-100v-50c0 -83 -67 -150 -150 -150s-150 67 -150 150s67 150 150 150h50v100h-50
c-83 0 -150 67 -150 150s67 150 150 150zM150 600c-28 0 -50 -22 -50 -50s22 -50 50 -50h50v50c0 28 -22 50 -50 50zM550 600c-28 0 -50 -22 -50 -50v-50h50c28 0 50 22 50 50s-22 50 -50 50zM300 400v-100h100v100h-100zM150 200c-28 0 -50 -22 -50 -50s22 -50 50 -50
s50 22 50 50v50h-50zM500 200v-50c0 -28 22 -50 50 -50s50 22 50 50s-22 50 -50 50h-50z" />
<glyph glyph-name="47" unicode="&#xe047;"
d="M0 791c0 5 4 9 9 9h782c6 0 9 -4 9 -10v-790l-200 200h-591c-6 0 -9 3 -9 9v582z" />
<glyph glyph-name="48" unicode="&#xe048;"
d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM600 600l-100 -300l-300 -100l100 300zM400 450c-28 0 -50 -22 -50 -50
s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
<glyph glyph-name="49" unicode="&#xe049;"
d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700v-600c166 0 300 134 300 300s-134 300 -300 300z" />
<glyph glyph-name="4a" unicode="&#xe04a;"
d="M0 800h800v-100h-800v100zM0 600h500v-100h-500v100zM0 300h800v-100h-800v100zM0 100h600v-100h-600v100zM750 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
<glyph glyph-name="4b" unicode="&#xe04b;"
d="M25 700h750c14 0 25 -11 25 -25v-75h-800v75c0 14 11 25 25 25zM0 500h800v-375c0 -14 -11 -25 -25 -25h-750c-14 0 -25 11 -25 25v375zM100 300v-100h100v100h-100zM300 300v-100h100v100h-100z" />
<glyph glyph-name="4c" unicode="&#xe04c;"
d="M100 800h100v-100h450l100 100l50 -50l-100 -100v-450h100v-100h-100v-100h-100v100h-500v500h-100v100h100v100zM200 600v-350l350 350h-350zM600 550l-350 -350h350v350z" />
<glyph glyph-name="4d" unicode="&#xe04d;"
d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM400 600c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z
M200 452c0 20 15 42 34 48h3h3h8c12 0 28 -7 36 -16l91 -90l25 6c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100l6 25l-90 91c-9 8 -16 24 -16 36zM550 500c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
<glyph glyph-name="4e" unicode="&#xe04e;"
d="M300 800h200v-300h200l-300 -300l-300 300h200v300zM0 100h800v-100h-800v100z" />
<glyph glyph-name="4f" unicode="&#xe04f;"
d="M0 800h800v-100h-800v100zM400 600l300 -300h-200v-300h-200v300h-200z" />
<glyph glyph-name="50" unicode="&#xe050;"
d="M200 700h600v-600h-600l-200 300zM350 622l-72 -72l150 -150l-150 -150l72 -72l150 150l150 -150l72 72l-150 150l150 150l-72 72l-150 -150z" />
<glyph glyph-name="51" unicode="&#xe051;"
d="M400 700c220 0 400 -180 400 -400h-100c0 166 -134 300 -300 300s-300 -134 -300 -300h-100c0 220 180 400 400 400zM341 491l59 -88l59 88c81 -25 141 -101 141 -191c0 -110 -90 -200 -200 -200s-200 90 -200 200c0 90 60 166 141 191z" />
<glyph glyph-name="52" unicode="&#xe052;"
d="M0 800h300v-400h400v-400h-700v800zM400 800l300 -300h-300v300zM100 600v-100h100v100h-100zM100 400v-100h100v100h-100zM100 200v-100h400v100h-400z" />
<glyph glyph-name="53" unicode="&#xe053;" horiz-adv-x="600"
d="M200 700h100v-100h75c30 0 58 -6 81 -22s44 -44 44 -78v-100h-100v94c-4 3 -13 6 -25 6h-250c-14 0 -25 -11 -25 -25v-50c0 -15 20 -40 34 -44l257 -65c66 -16 109 -73 109 -141v-50c0 -68 -57 -125 -125 -125h-75v-100h-100v100h-75c-30 0 -58 6 -81 22s-44 44 -44 78
v100h100v-94c4 -3 13 -6 25 -6h250c14 0 25 11 25 25v50c0 15 -20 40 -34 44l-257 65c-66 16 -109 73 -109 141v50c0 68 57 125 125 125h75v100z" />
<glyph glyph-name="54" unicode="&#xe054;"
d="M0 700h300v-300l-300 -300v600zM500 700h300v-300l-300 -300v600z" />
<glyph glyph-name="55" unicode="&#xe055;"
d="M300 700v-600h-300v300zM800 700v-600h-300v300z" />
<glyph glyph-name="56" unicode="&#xe056;"
d="M300 700v-100c-111 0 -200 -89 -200 -200h200v-300h-300v300c0 165 135 300 300 300zM800 700v-100c-111 0 -200 -89 -200 -200h200v-300h-300v300c0 165 135 300 300 300z" />
<glyph glyph-name="57" unicode="&#xe057;"
d="M0 700h300v-300c0 -165 -135 -300 -300 -300v100c111 0 200 89 200 200h-200v300zM500 700h300v-300c0 -165 -135 -300 -300 -300v100c111 0 200 89 200 200h-200v300z" />
<glyph glyph-name="58" unicode="&#xe058;" horiz-adv-x="600"
d="M300 800l34 -34c11 -11 266 -270 266 -488c0 -165 -135 -300 -300 -300s-300 135 -300 300c0 218 255 477 266 488zM150 328c-28 0 -50 -22 -50 -50c0 -110 90 -200 200 -200c28 0 50 22 50 50s-22 50 -50 50c-55 0 -100 45 -100 100c0 28 -22 50 -50 50z" />
<glyph glyph-name="59" unicode="&#xe059;"
d="M400 800l400 -500h-800zM0 200h800v-200h-800v200z" />
<glyph glyph-name="5a" unicode="&#xe05a;" horiz-adv-x="600"
d="M300 800l300 -300h-600zM0 300h600l-300 -300z" />
<glyph glyph-name="5b" unicode="&#xe05b;"
d="M0 500h200v-200h-200v200zM300 500h200v-200h-200v200zM600 500h200v-200h-200v200z" />
<glyph glyph-name="5c" unicode="&#xe05c;"
d="M0 700h800v-100l-400 -200l-400 200v100zM0 500l400 -200l400 200v-400h-800v400z" />
<glyph glyph-name="5d" unicode="&#xe05d;"
d="M400 800l400 -200v-600h-800v600zM400 688l-300 -150v-188l300 -150l300 150v188zM200 500h400v-100l-200 -100l-200 100v100z" />
<glyph glyph-name="5e" unicode="&#xe05e;"
d="M600 700c69 0 134 -19 191 -50l-16 -106c-49 35 -109 56 -175 56c-131 0 -240 -84 -281 -200h331l-16 -100h-334c0 -36 8 -68 19 -100h297l-16 -100h-222c55 -61 133 -100 222 -100c78 0 147 30 200 78v-122c-59 -35 -127 -56 -200 -56c-147 0 -274 82 -344 200h-256
l19 100h197c-8 32 -16 66 -16 100h-200l25 100h191c45 172 198 300 384 300z" />
<glyph glyph-name="5f" unicode="&#xe05f;"
d="M0 700h700v-100h-700v100zM0 500h500v-100h-500v100zM0 300h800v-100h-800v100zM0 100h100v-100h-100v100zM200 100h100v-100h-100v100zM400 100h100v-100h-100v100z" />
<glyph glyph-name="60" unicode="&#xe060;"
d="M0 800h800v-100h-800v100zM200 600h400l-200 -200zM0 200h800v-200h-800v200z" />
<glyph glyph-name="61" unicode="&#xe061;"
d="M0 800h100v-800h-100v800zM600 800h200v-800h-200v800zM200 600l200 -200l-200 -200v400z" />
<glyph glyph-name="62" unicode="&#xe062;"
d="M0 800h200v-800h-200v800zM700 800h100v-800h-100v800zM600 600v-400l-200 200z" />
<glyph glyph-name="63" unicode="&#xe063;"
d="M0 800h800v-200h-800v200zM400 400l200 -200h-400zM0 100h800v-100h-800v100z" />
<glyph glyph-name="64" unicode="&#xe064;"
d="M0 800h200v-100h-100v-600h600v100h100v-200h-800v800zM400 800h400v-400l-150 150l-250 -250l-100 100l250 250z" />
<glyph glyph-name="65" unicode="&#xe065;"
d="M403 700c247 0 397 -300 397 -300s-150 -300 -397 -300c-253 0 -403 300 -403 300s150 300 403 300zM400 600c-110 0 -200 -90 -200 -200s90 -200 200 -200s200 90 200 200s-90 200 -200 200zM400 500c10 0 19 -3 28 -6c-16 -8 -28 -24 -28 -44c0 -28 22 -50 50 -50
c20 0 36 12 44 28c3 -9 6 -18 6 -28c0 -55 -45 -100 -100 -100s-100 45 -100 100s45 100 100 100z" />
<glyph glyph-name="66" unicode="&#xe066;" horiz-adv-x="900"
d="M331 700h3h3c3 1 7 1 10 1c12 0 29 -8 37 -17l94 -93l66 65c57 57 155 57 212 0c58 -58 58 -154 0 -212l-65 -66l93 -94c10 -8 18 -25 18 -38c0 -28 -22 -50 -50 -50c-13 0 -32 9 -40 20l-62 65l-381 -381h-269v272l375 381l-63 63c-9 8 -16 24 -16 36c0 20 16 42 35 48z
M447 481l-313 -315l128 -132l316 316z" />
<glyph glyph-name="67" unicode="&#xe067;"
d="M0 800h300v-400h400v-400h-700v800zM400 800l300 -300h-300v300z" />
<glyph glyph-name="68" unicode="&#xe068;"
d="M200 800c0 0 200 -100 200 -300s-298 -302 -200 -500c0 0 -200 100 -200 300s300 300 200 500zM500 500c0 0 200 -100 200 -300c0 -150 -60 -200 -100 -200h-300c0 200 300 300 200 500z" />
<glyph glyph-name="69" unicode="&#xe069;"
d="M0 800h100v-800h-100v800zM200 800h300v-100h300l-200 -203l200 -197h-400v100h-200v400z" />
<glyph glyph-name="6a" unicode="&#xe06a;" horiz-adv-x="400"
d="M150 800h150l-100 -200h200l-150 -300h150l-300 -300l-100 300h134l66 200h-200z" />
<glyph glyph-name="6b" unicode="&#xe06b;"
d="M0 800h300v-100h500v-100h-800v200zM0 500h800v-450c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v450z" />
<glyph glyph-name="6c" unicode="&#xe06c;"
d="M150 800c83 0 150 -67 150 -150c0 -66 -41 -121 -100 -141v-118c15 5 33 9 50 9h200c28 0 50 22 50 50v59c-59 20 -100 75 -100 141c0 83 67 150 150 150s150 -67 150 -150c0 -66 -41 -121 -100 -141v-59c0 -82 -68 -150 -150 -150h-200c-14 0 -25 -7 -34 -16
c50 -24 84 -74 84 -134c0 -83 -67 -150 -150 -150s-150 67 -150 150c0 66 41 121 100 141v218c-59 20 -100 75 -100 141c0 83 67 150 150 150z" />
<glyph glyph-name="6d" unicode="&#xe06d;"
d="M0 800h400l-150 -150l150 -150l-100 -100l-150 150l-150 -150v400zM500 400l150 -150l150 150v-400h-400l150 150l-150 150z" />
<glyph glyph-name="6e" unicode="&#xe06e;"
d="M100 800l150 -150l150 150v-400h-400l150 150l-150 150zM400 400h400l-150 -150l150 -150l-100 -100l-150 150l-150 -150v400z" />
<glyph glyph-name="6f" unicode="&#xe06f;"
d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700c-56 0 -108 -17 -153 -44l22 -19c33 -18 13 -48 -13 -59c-30 -13 -77 10 -65 -41c13 -55 -27 -3 -47 -15c-42 -26 49 -152 31 -156l-59 34c-8 0 -13 -5 -16 -10
c1 -30 10 -57 19 -84c28 -11 77 -2 100 -25c47 -28 97 -115 75 -159c34 -13 68 -22 106 -22c101 0 193 48 247 125c3 24 -8 44 -50 44c-69 0 -156 13 -153 97c2 46 101 108 66 143c-30 30 12 39 12 66c0 37 -65 32 -69 50s20 36 41 56c-30 10 -60 19 -94 19zM631 591
c-38 -11 -94 -35 -87 -53c6 -15 52 -1 65 -13c11 -10 16 -59 44 -31l22 22v3c-11 26 -26 50 -44 72z" />
<glyph glyph-name="70" unicode="&#xe070;"
d="M703 800l97 -100l-400 -400l-100 100l-200 -203l-100 100l300 303l100 -100zM0 100h800v-100h-800v100z" />
<glyph glyph-name="71" unicode="&#xe071;"
d="M0 700h100v-100h-100v100zM200 700h100v-100h-100v100zM400 700h100v-100h-100v100zM600 700h100v-100h-100v100zM0 500h100v-100h-100v100zM200 500h100v-100h-100v100zM400 500h100v-100h-100v100zM600 500h100v-100h-100v100zM0 300h100v-100h-100v100zM200 300h100
v-100h-100v100zM400 300h100v-100h-100v100zM600 300h100v-100h-100v100zM0 100h100v-100h-100v100zM200 100h100v-100h-100v100zM400 100h100v-100h-100v100zM600 100h100v-100h-100v100z" />
<glyph glyph-name="72" unicode="&#xe072;"
d="M0 800h200v-200h-200v200zM300 800h200v-200h-200v200zM600 800h200v-200h-200v200zM0 500h200v-200h-200v200zM300 500h200v-200h-200v200zM600 500h200v-200h-200v200zM0 200h200v-200h-200v200zM300 200h200v-200h-200v200zM600 200h200v-200h-200v200z" />
<glyph glyph-name="73" unicode="&#xe073;"
d="M0 800h300v-300h-300v300zM500 800h300v-300h-300v300zM0 300h300v-300h-300v300zM500 300h300v-300h-300v300z" />
<glyph glyph-name="74" unicode="&#xe074;"
d="M19 800h662c11 0 19 -8 19 -19v-331c0 -28 -22 -50 -50 -50h-600c-28 0 -50 22 -50 50v331c0 11 8 19 19 19zM0 309c16 -6 32 -9 50 -9h600c18 0 34 3 50 9v-290c0 -11 -8 -19 -19 -19h-662c-11 0 -19 8 -19 19v290zM550 200c-28 0 -50 -22 -50 -50s22 -50 50 -50
s50 22 50 50s-22 50 -50 50z" />
<glyph glyph-name="75" unicode="&#xe075;"
d="M0 700h300v-100h-50c-28 0 -50 -22 -50 -50v-150h300v150c0 28 -22 50 -50 50h-50v100h300v-100h-50c-28 0 -50 -22 -50 -50v-400c0 -28 22 -50 50 -50h50v-100h-300v100h50c28 0 50 22 50 50v150h-300v-150c0 -28 22 -50 50 -50h50v-100h-300v100h50c28 0 50 22 50 50
v400c0 28 -22 50 -50 50h-50v100z" />
<glyph glyph-name="76" unicode="&#xe076;"
d="M400 700c165 0 300 -135 300 -300v-100h50c28 0 50 -22 50 -50v-200c0 -28 -22 -50 -50 -50h-100c-28 0 -50 22 -50 50v350c0 111 -89 200 -200 200s-200 -89 -200 -200v-350c0 -28 -22 -50 -50 -50h-100c-28 0 -50 22 -50 50v200c0 28 22 50 50 50h50v100
c0 165 135 300 300 300z" />
<glyph glyph-name="77" unicode="&#xe077;"
d="M0 500c0 109 91 200 200 200s200 -91 200 -200c0 109 91 200 200 200s200 -91 200 -200c0 -55 -23 -105 -59 -141l-341 -340l-341 340c-36 36 -59 86 -59 141z" />
<glyph glyph-name="78" unicode="&#xe078;"
d="M400 700l400 -300l-100 3v-403h-200v200h-200v-200h-200v400h-100z" />
<glyph glyph-name="79" unicode="&#xe079;"
d="M0 800h800v-800h-800v800zM100 700v-300l100 100l400 -400h100v100l-200 200l100 100l100 -100v300h-600z" />
<glyph glyph-name="7a" unicode="&#xe07a;"
d="M19 800h762c11 0 19 -8 19 -19v-762c0 -11 -8 -19 -19 -19h-762c-11 0 -19 8 -19 19v762c0 11 8 19 19 19zM100 600v-300h100l100 -100h200l100 100h100v300h-600z" />
<glyph glyph-name="7b" unicode="&#xe07b;"
d="M200 600c80 0 142 -56 200 -122c58 66 119 122 200 122c131 0 200 -101 200 -200s-69 -200 -200 -200c-81 0 -142 56 -200 122c-58 -66 -121 -122 -200 -122c-131 0 -200 101 -200 200s69 200 200 200zM200 500c-74 0 -100 -54 -100 -100s26 -100 100 -100
c42 0 88 47 134 100c-46 53 -92 100 -134 100zM600 500c-43 0 -88 -47 -134 -100c46 -53 91 -100 134 -100c74 0 100 54 100 100s-26 100 -100 100z" />
<glyph glyph-name="7c" unicode="&#xe07c;" horiz-adv-x="400"
d="M300 800c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100s45 100 100 100zM150 550c83 0 150 -69 150 -150c0 -66 -100 -214 -100 -250c0 -28 22 -50 50 -50s50 22 50 50h100c0 -83 -67 -150 -150 -150s-150 64 -150 150s100 222 100 250s-22 50 -50 50
s-50 -22 -50 -50h-100c0 83 67 150 150 150z" />
<glyph glyph-name="7d" unicode="&#xe07d;"
d="M200 800h500v-100h-122c-77 -197 -156 -392 -234 -588l-6 -12h162v-100h-500v100h122c77 197 156 392 234 588l7 12h-163v100z" />
<glyph glyph-name="7e" unicode="&#xe07e;"
d="M0 700h800v-100h-800v100zM0 500h800v-100h-800v100zM0 300h800v-100h-800v100zM100 100h600v-100h-600v100z" />
<glyph glyph-name="7f" unicode="&#xe07f;"
d="M0 700h800v-100h-800v100zM0 500h800v-100h-800v100zM0 300h800v-100h-800v100zM0 100h600v-100h-600v100z" />
<glyph glyph-name="80" unicode="&#xe080;"
d="M0 700h800v-100h-800v100zM0 500h800v-100h-800v100zM0 300h800v-100h-800v100zM200 100h600v-100h-600v100z" />
<glyph glyph-name="81" unicode="&#xe081;"
d="M550 800c138 0 250 -112 250 -250s-112 -250 -250 -250c-16 0 -32 0 -47 3l-3 -3v-100h-200v-200h-300v200l303 303c-3 15 -3 31 -3 47c0 138 112 250 250 250zM600 700c-55 0 -100 -45 -100 -100s45 -100 100 -100s100 45 100 100s-45 100 -100 100z" />
<glyph glyph-name="82" unicode="&#xe082;"
d="M134 600h3h4h4h5h500c28 0 50 -22 50 -50v-350h100v-150c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v150h100v350v2c0 20 15 42 34 48zM200 500v-300h100v-100h200v100h100v300h-400z" />
<glyph glyph-name="83" unicode="&#xe083;"
d="M0 800h400v-400h-400v400zM500 600h100v-400h-400v100h300v300zM700 400h100v-400h-400v100h300v300z" />
<glyph glyph-name="84" unicode="&#xe084;" horiz-adv-x="600"
d="M337 694c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-300 -150c-8 -6 -21 -11 -31 -11c-28 0 -50 22 -50 50c0 21 16 44 37 49zM437 544c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-400 -200c-8 -6 -21 -11 -31 -11c-28 0 -50 22 -50 50
c0 21 16 44 37 49zM437 344c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-106 -56c24 -4 43 -26 43 -50c0 -28 -23 -51 -51 -51c-2 0 -6 1 -8 1h-200c-26 1 -48 24 -48 50c0 16 12 36 26 44zM151 -50c0 23 20 50 46 50h3h4h5h100c28 0 50 -22 50 -50
s-22 -50 -50 -50h-100c-2 0 -6 -1 -8 -1c-28 0 -50 23 -50 51z" />
<glyph glyph-name="85" unicode="&#xe085;"
d="M199 800h100v-200h-200v100h100v100zM586 797h1c18 1 38 1 56 -3c36 -8 69 -26 97 -54c78 -78 78 -203 0 -281l-150 -150c-8 -13 -28 -24 -43 -24c-28 0 -50 22 -50 50c0 15 11 35 24 43l150 150c40 40 39 105 0 144c-41 41 -110 34 -144 0l-44 -44
c-8 -13 -27 -24 -42 -24c-28 0 -50 22 -50 50c0 15 11 35 24 43l43 44c32 33 72 53 128 56zM208 490c4 5 14 16 22 16h3c2 0 6 1 8 1c28 0 50 -22 50 -50c0 -11 -6 -27 -14 -35l-150 -150c-40 -40 -39 -105 0 -144c41 -41 110 -34 144 0l44 44c8 13 27 24 42 24
c28 0 50 -22 50 -50c0 -15 -11 -35 -24 -43l-43 -44c-22 -22 -48 -37 -75 -47c-70 -25 -151 -9 -207 47c-78 78 -78 203 0 281zM499 200h200v-100h-100v-100h-100v200z" />
<glyph glyph-name="86" unicode="&#xe086;"
d="M586 797c18 1 39 1 57 -3c36 -8 69 -26 97 -54c78 -78 78 -203 0 -281l-150 -150c-62 -62 -132 -81 -182 -78s-69 17 -84 25s-26 27 -26 44c0 28 22 51 50 51c8 0 19 -3 26 -7c0 0 15 -11 41 -13s62 3 106 47l150 150c40 40 39 105 0 144c-41 41 -110 34 -144 0
c-8 -13 -28 -24 -43 -24c-28 0 -50 22 -50 50c0 15 11 35 24 43c32 33 72 53 128 56zM386 566c50 -2 64 -17 85 -22s37 -28 37 -49c0 -28 -22 -50 -50 -50c-10 0 -23 5 -31 11c0 0 -19 9 -47 10s-63 -4 -103 -44l-150 -150c-40 -40 -39 -105 0 -144c41 -41 110 -34 144 0
c8 13 27 24 42 24c28 0 50 -22 50 -50c0 -15 -10 -35 -23 -43c-22 -22 -48 -37 -75 -47c-70 -25 -151 -9 -207 47c-78 78 -78 203 0 281l150 150c60 60 128 78 178 76z" />
<glyph glyph-name="87" unicode="&#xe087;"
d="M0 700h300v-300h-300v300zM400 700h400v-100h-400v100zM400 500h300v-100h-300v100zM0 300h300v-300h-300v300zM400 300h400v-100h-400v100zM400 100h300v-100h-300v100z" />
<glyph glyph-name="88" unicode="&#xe088;"
d="M50 700c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM200 700h600v-100h-600v100zM50 500c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM200 500h600v-100h-600v100zM50 300c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50
s22 50 50 50zM200 300h600v-100h-600v100zM50 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM200 100h600v-100h-600v100z" />
<glyph glyph-name="89" unicode="&#xe089;"
d="M800 800l-400 -800l-100 300l-300 100z" />
<glyph glyph-name="8a" unicode="&#xe08a;" horiz-adv-x="600"
d="M300 700c110 0 200 -90 200 -200v-100h100v-400h-600v400h100v100c0 110 90 200 200 200zM300 600c-56 0 -100 -44 -100 -100v-100h200v100c0 56 -44 100 -100 100z" />
<glyph glyph-name="8b" unicode="&#xe08b;" horiz-adv-x="600"
d="M300 800c110 0 200 -90 200 -200v-200h100v-400h-600v400h400v200c0 56 -44 100 -100 100s-100 -44 -100 -100h-100c0 110 90 200 200 200z" />
<glyph glyph-name="8c" unicode="&#xe08c;"
d="M400 700v-100c-111 0 -200 -89 -200 -200h100l-150 -200l-150 200h100c0 165 135 300 300 300zM650 600l150 -200h-100c0 -165 -135 -300 -300 -300v100c111 0 200 89 200 200h-100z" />
<glyph glyph-name="8d" unicode="&#xe08d;"
d="M100 800h600v-300h100l-150 -250l-150 250h100v200h-400v-100h-100v200zM150 550l150 -250h-100v-200h400v100h100v-200h-600v300h-100z" />
<glyph glyph-name="8e" unicode="&#xe08e;"
d="M600 700l200 -150l-200 -150v100h-500v-100h-100v100c0 55 45 100 100 100h500v100zM200 300v-100h500v100h100v-100c0 -55 -45 -100 -100 -100h-500v-100l-200 150z" />
<glyph glyph-name="8f" unicode="&#xe08f;" horiz-adv-x="900"
d="M350 800c193 0 350 -157 350 -350c0 -60 -17 -117 -44 -166c5 -3 12 -8 16 -12l100 -100c16 -16 30 -49 30 -72c0 -56 -46 -102 -102 -102c-23 0 -56 14 -72 30l-100 100c-4 3 -9 9 -12 13c-49 -26 -107 -41 -166 -41c-193 0 -350 157 -350 350s157 350 350 350zM350 200
c142 0 250 108 250 250c0 139 -111 250 -250 250s-250 -111 -250 -250s111 -250 250 -250z" />
<glyph glyph-name="90" unicode="&#xe090;" horiz-adv-x="600"
d="M300 800c166 0 300 -134 300 -300c0 -200 -300 -500 -300 -500s-300 300 -300 500c0 166 134 300 300 300zM300 700c-110 0 -200 -90 -200 -200s90 -200 200 -200s200 90 200 200s-90 200 -200 200z" />
<glyph glyph-name="91" unicode="&#xe091;" horiz-adv-x="900"
d="M0 800h800v-541c1 -3 1 -8 1 -11s0 -7 -1 -10v-238h-800v800zM495 250c0 26 22 50 50 50h5h150v400h-600v-600h600v100h-150h-5c-28 0 -50 22 -50 50zM350 600c83 0 150 -67 150 -150c0 -100 -150 -250 -150 -250s-150 150 -150 250c0 83 67 150 150 150zM350 500
c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
<glyph glyph-name="92" unicode="&#xe092;" horiz-adv-x="600"
d="M0 700h200v-600h-200v600zM400 700h200v-600h-200v600z" />
<glyph glyph-name="93" unicode="&#xe093;" horiz-adv-x="600"
d="M0 700l600 -300l-600 -300v600z" />
<glyph glyph-name="94" unicode="&#xe094;" horiz-adv-x="600"
d="M300 700c166 0 300 -134 300 -300s-134 -300 -300 -300s-300 134 -300 300s134 300 300 300z" />
<glyph glyph-name="95" unicode="&#xe095;"
d="M400 700v-600l-400 300zM400 400l400 300v-600z" />
<glyph glyph-name="96" unicode="&#xe096;"
d="M0 700l400 -300l-400 -300v600zM400 100v600l400 -300z" />
<glyph glyph-name="97" unicode="&#xe097;"
d="M0 700h200v-600h-200v600zM200 400l500 300v-600z" />
<glyph glyph-name="98" unicode="&#xe098;"
d="M0 700l500 -300l-500 -300v600zM500 100v600h200v-600h-200z" />
<glyph glyph-name="99" unicode="&#xe099;" horiz-adv-x="600"
d="M0 700h600v-600h-600v600z" />
<glyph glyph-name="9a" unicode="&#xe09a;"
d="M200 800h400v-200h200v-400h-200v-200h-400v200h-200v400h200v200z" />
<glyph glyph-name="9b" unicode="&#xe09b;"
d="M0 700h800v-100h-800v100zM0 403h800v-100h-800v100zM0 103h800v-100h-800v100z" />
<glyph glyph-name="9c" unicode="&#xe09c;" horiz-adv-x="600"
d="M278 700c7 2 13 4 22 4c55 0 100 -45 100 -100v-4v-200c0 -55 -45 -100 -100 -100s-100 45 -100 100v200v2c0 44 35 88 78 98zM34 500h4h3c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-50c0 -111 89 -200 200 -200s200 89 200 200v50c0 28 22 50 50 50s50 -22 50 -50v-50
c0 -148 -109 -270 -250 -294v-106h50c55 0 100 -45 100 -100h-400c0 55 45 100 100 100h50v106c-141 24 -250 146 -250 294v50v2c0 20 15 42 34 48z" />
<glyph glyph-name="9d" unicode="&#xe09d;"
d="M0 500h800v-200h-800v200z" />
<glyph glyph-name="9e" unicode="&#xe09e;"
d="M34 700h4h3h4h5h700c28 0 50 -22 50 -50v-500c0 -28 -22 -50 -50 -50h-250v-100h100c55 0 100 -45 100 -100h-600c0 55 45 100 100 100h100v100h-250c-28 0 -50 22 -50 50v500v2c0 20 15 42 34 48zM100 600v-400h600v400h-600z" />
<glyph glyph-name="9f" unicode="&#xe09f;"
d="M272 700c-14 -40 -22 -83 -22 -128c0 -221 179 -400 400 -400c45 0 88 8 128 22c-53 -158 -202 -272 -378 -272c-221 0 -400 179 -400 400c0 176 114 325 272 378z" />
<glyph glyph-name="a0" unicode="&#xe0a0;"
d="M350 700l150 -150h-100v-150h150v100l150 -150l-150 -150v100h-150v-150h100l-150 -150l-150 150h100v150h-150v-100l-150 150l150 150v-100h150v150h-100z" />
<glyph glyph-name="a1" unicode="&#xe0a1;"
d="M800 800v-550c0 -83 -67 -150 -150 -150s-150 67 -150 150s67 150 150 150c17 0 35 -4 50 -9v206c-201 -6 -327 -27 -400 -50v-397c0 -83 -67 -150 -150 -150s-150 67 -150 150s67 150 150 150c17 0 35 -4 50 -9v409s100 100 600 100z" />
<glyph glyph-name="a2" unicode="&#xe0a2;" horiz-adv-x="700"
d="M499 700c51 0 102 -20 141 -59c78 -78 78 -203 0 -281l-250 -244c-48 -48 -127 -48 -175 0s-48 127 0 175l96 97l69 -69l-90 -94l-7 -3c-10 -10 -10 -28 0 -38s28 -10 38 0l250 247c37 40 39 102 0 141s-104 40 -144 0l-278 -275c-66 -69 -68 -179 0 -247
c69 -69 181 -69 250 0l9 12l116 113l69 -69l-125 -125c-107 -107 -281 -107 -388 0s-107 281 0 388l278 272c39 39 90 59 141 59z" />
<glyph glyph-name="a3" unicode="&#xe0a3;"
d="M600 800l200 -200l-100 -100l-200 200zM400 600l200 -200l-400 -400h-200v200z" />
<glyph glyph-name="a4" unicode="&#xe0a4;"
d="M550 800c83 0 150 -90 150 -200s-67 -200 -150 -200c-22 0 -40 8 -59 19c6 26 9 52 9 81c0 84 -27 158 -72 212c27 52 71 88 122 88zM250 700c83 0 150 -90 150 -200s-67 -200 -150 -200s-150 90 -150 200s67 200 150 200zM725 384c44 -22 75 -66 75 -118v-166h-200v66
c0 50 -17 96 -44 134c66 2 126 33 169 84zM75 284c45 -53 106 -84 175 -84s130 31 175 84c44 -22 75 -66 75 -118v-166h-500v166c0 52 31 96 75 118z" />
<glyph glyph-name="a5" unicode="&#xe0a5;"
d="M400 800c110 0 200 -112 200 -250s-90 -250 -200 -250s-200 112 -200 250s90 250 200 250zM191 300c54 -61 128 -100 209 -100s155 39 209 100c106 -5 191 -92 191 -200v-100h-800v100c0 108 85 195 191 200z" />
<glyph glyph-name="a6" unicode="&#xe0a6;" horiz-adv-x="600"
d="M19 800h462c11 0 19 -8 19 -19v-762c0 -11 -8 -19 -19 -19h-462c-11 0 -19 8 -19 19v762c0 11 8 19 19 19zM100 700v-500h300v500h-300zM250 150c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
<glyph glyph-name="a7" unicode="&#xe0a7;"
d="M350 800c17 0 34 -1 50 -3v-397l-297 297c63 64 150 103 247 103zM500 694c169 -25 300 -168 300 -344c0 -193 -157 -350 -350 -350c-85 0 -161 31 -222 81l272 272v341zM91 562l237 -234l-212 -212c-70 55 -116 138 -116 234c0 84 35 158 91 212z" />
<glyph glyph-name="a8" unicode="&#xe0a8;"
d="M92 650c0 23 20 50 46 50h3h4h5h400c28 0 50 -22 50 -50s-22 -50 -50 -50h-50v-200h100c55 0 100 -45 100 -100h-300v-300l-56 -100l-44 100v300h-300c0 55 45 100 100 100h100v200h-50c-2 0 -6 -1 -8 -1c-28 0 -50 23 -50 51z" />
<glyph glyph-name="a9" unicode="&#xe0a9;"
d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM300 600v-400l300 200z" />
<glyph glyph-name="aa" unicode="&#xe0aa;"
d="M300 800h200v-300h300v-200h-300v-300h-200v300h-300v200h300v300z" />
<glyph glyph-name="ab" unicode="&#xe0ab;"
d="M300 800h100v-400h-100v400zM172 656l62 -78l-40 -31c-58 -46 -94 -117 -94 -197c0 -139 111 -250 250 -250s250 111 250 250c0 80 -39 151 -97 197l-37 31l62 78l38 -31c82 -64 134 -164 134 -275c0 -193 -157 -350 -350 -350s-350 157 -350 350c0 111 53 211 134 275z
" />
<glyph glyph-name="ac" unicode="&#xe0ac;"
d="M200 800h400v-200h-400v200zM9 500h782c6 0 9 -3 9 -9v-282c0 -6 -3 -9 -9 -9h-91v200h-600v-200h-91c-6 0 -9 3 -9 9v282c0 6 3 9 9 9zM200 300h400v-300h-400v300z" />
<glyph glyph-name="ad" unicode="&#xe0ad;"
d="M0 700h100v-700h-100v700zM700 700h100v-700h-100v700zM200 600h200v-100h-200v100zM300 400h200v-100h-200v100zM400 200h200v-100h-200v100z" />
<glyph glyph-name="ae" unicode="&#xe0ae;"
d="M325 700c42 -141 87 -280 131 -419c29 74 59 148 88 222c30 -57 58 -114 87 -172h169v-100h-231l-13 28c-37 -92 -74 -184 -112 -275c-38 129 -79 257 -119 385c-42 -133 -83 -267 -125 -400c-28 88 -56 175 -84 262h-116v100h188l9 -34l3 -6c42 137 83 273 125 409z" />
<glyph glyph-name="af" unicode="&#xe0af;"
d="M200 600c0 57 43 100 100 100s100 -43 100 -100c0 -28 -18 -48 -28 -72c-3 -6 -3 -16 -3 -28h231v-231c12 0 22 0 28 3c24 10 44 28 72 28c57 0 100 -43 100 -100s-43 -100 -100 -100c-28 0 -48 18 -72 28c-6 3 -16 3 -28 3v-231h-231c0 12 0 22 3 28c10 24 28 44 28 72
c0 57 -43 100 -100 100s-100 -43 -100 -100c0 -28 18 -48 28 -72c3 -6 3 -16 3 -28h-231v600h231c0 12 0 22 -3 28c-10 24 -28 44 -28 72z" />
<glyph glyph-name="b0" unicode="&#xe0b0;" horiz-adv-x="500"
d="M247 700c84 0 148 -20 191 -59s59 -93 59 -141c0 -117 -69 -181 -119 -225s-81 -67 -81 -150v-25h-100v25c0 117 65 181 115 225s85 67 85 150c0 25 -8 48 -28 66s-56 34 -122 34s-97 -18 -116 -37s-27 -43 -31 -69l-100 12c5 38 19 88 59 128s103 66 188 66zM197 0h100
v-100h-100v100z" />
<glyph glyph-name="b1" unicode="&#xe0b1;"
d="M450 800c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -69 -48 -127 -112 -144c-22 55 -75 94 -138 94c-20 0 -39 -5 -56 -12c-17 64 -75 112 -144 112s-127 -48 -144 -112c-17 7 -36 12 -56 12c-37 0 -71 -12 -97 -34c-33 36 -53 82 -53 134
c0 110 90 200 200 200c23 114 129 200 250 200zM334 300h4h3c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-200c0 -28 -22 -50 -50 -50s-50 22 -50 50v200v2c0 20 15 42 34 48zM134 200h4h3c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-100c0 -28 -22 -50 -50 -50s-50 22 -50 50v100v2
c0 20 15 42 34 48zM534 200h3h4c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-100c0 -28 -22 -50 -50 -50s-50 22 -50 50v100v2c0 20 15 42 34 48z" />
<glyph glyph-name="b2" unicode="&#xe0b2;"
d="M600 800l200 -150l-200 -150v100h-50l-153 -191l175 -206l6 -3h22v100l200 -150l-200 -150v100h-25c-35 0 -56 12 -78 38l-166 190l-153 -190c-22 -27 -43 -38 -78 -38h-100v100h100l166 206l-163 191l-3 3h-100v100h100c34 0 56 -12 78 -38l153 -178l141 178
c22 27 43 38 78 38h50v100z" />
<glyph glyph-name="b3" unicode="&#xe0b3;"
d="M400 800c110 0 209 -47 281 -119l119 119v-300h-300l109 109c-54 55 -126 91 -209 91c-166 0 -300 -134 -300 -300s134 -300 300 -300c83 0 158 34 212 88l72 -72c-72 -72 -174 -116 -284 -116c-220 0 -400 180 -400 400s180 400 400 400z" />
<glyph glyph-name="b4" unicode="&#xe0b4;"
d="M400 800h400v-400l-166 166l-400 -400l166 -166h-400v400l166 -166l400 400z" />
<glyph glyph-name="b5" unicode="&#xe0b5;" horiz-adv-x="600"
d="M250 800l250 -300h-200v-200h200l-250 -300l-250 300h200v200h-200z" />
<glyph glyph-name="b6" unicode="&#xe0b6;"
d="M300 600v-200h200v200l300 -250l-300 -250v200h-200v-200l-300 250z" />
<glyph glyph-name="b7" unicode="&#xe0b7;"
d="M0 800c441 0 800 -359 800 -800h-200c0 333 -267 600 -600 600v200zM0 500c275 0 500 -225 500 -500h-200c0 167 -133 300 -300 300v200zM0 200c110 0 200 -90 200 -200h-200v200z" />
<glyph glyph-name="b8" unicode="&#xe0b8;"
d="M100 800c386 0 700 -314 700 -700h-100c0 332 -268 600 -600 600v100zM100 600c276 0 500 -224 500 -500h-100c0 222 -178 400 -400 400v100zM100 400c165 0 300 -135 300 -300h-100c0 111 -89 200 -200 200v100zM100 200c55 0 100 -45 100 -100s-45 -100 -100 -100
s-100 45 -100 100s45 100 100 100z" />
<glyph glyph-name="b9" unicode="&#xe0b9;"
d="M300 800h400c55 0 100 -45 100 -100v-200h-400v150c0 28 -22 50 -50 50s-50 -22 -50 -50v-250h400v-300c0 -55 -45 -100 -100 -100h-500c-55 0 -100 45 -100 100v200h100v-150c0 -28 22 -50 50 -50s50 22 50 50v550c0 55 45 100 100 100z" />
<glyph glyph-name="ba" unicode="&#xe0ba;"
d="M75 700h225v-100h-200v-500h400v100h100v-125c0 -41 -34 -75 -75 -75h-450c-41 0 -75 34 -75 75v550c0 41 34 75 75 75zM600 700l200 -200l-200 -200v100h-200c-94 0 -173 -65 -194 -153c23 199 189 353 394 353v100z" />
<glyph glyph-name="bb" unicode="&#xe0bb;"
d="M500 700l300 -284l-300 -316v200h-100c-200 0 -348 -102 -400 -300c0 295 100 500 500 500v200z" />
<glyph glyph-name="bc" unicode="&#xe0bc;"
d="M381 791l19 9l19 -9c127 -53 253 -108 381 -160v-31c0 -166 -67 -313 -147 -419c-40 -53 -83 -97 -125 -128s-82 -53 -128 -53s-86 22 -128 53s-85 75 -125 128c-80 107 -147 253 -147 419v31c128 52 254 107 381 160zM400 100v591l-294 -122c8 -126 58 -243 122 -328
c35 -46 73 -86 106 -110s62 -31 66 -31z" />
<glyph glyph-name="bd" unicode="&#xe0bd;"
d="M600 800h100v-800h-100v800zM400 700h100v-700h-100v700zM200 500h100v-500h-100v500zM0 300h100v-300h-100v300z" />
<glyph glyph-name="be" unicode="&#xe0be;"
d="M300 800h100v-200h200l100 -100l-100 -100h-200v-400h-100v500h-200l-100 100l100 100h200v100z" />
<glyph glyph-name="bf" unicode="&#xe0bf;"
d="M200 800h100v-600h200l-250 -200l-250 200h200v600zM400 800h200v-100h-200v100zM400 600h300v-100h-300v100zM400 400h400v-100h-400v100z" />
<glyph glyph-name="c0" unicode="&#xe0c0;"
d="M200 800h100v-600h200l-250 -200l-250 200h200v600zM400 800h400v-100h-400v100zM400 600h300v-100h-300v100zM400 400h200v-100h-200v100z" />
<glyph glyph-name="c1" unicode="&#xe0c1;"
d="M75 700h650c41 0 75 -34 75 -75v-550c0 -41 -34 -75 -75 -75h-650c-41 0 -75 34 -75 75v550c0 41 34 75 75 75zM100 600v-100h100v100h-100zM300 600v-100h400v100h-400zM100 400v-100h100v100h-100zM300 400v-100h400v100h-400zM100 200v-100h100v100h-100zM300 200
v-100h400v100h-400z" />
<glyph glyph-name="c2" unicode="&#xe0c2;"
d="M400 800l100 -300h300l-250 -200l100 -300l-250 200l-250 -200l100 300l-250 200h300z" />
<glyph glyph-name="c3" unicode="&#xe0c3;"
d="M400 800c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM150 700c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM650 700c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM400 600c110 0 200 -90 200 -200
s-90 -200 -200 -200s-200 90 -200 200s90 200 200 200zM50 450c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM750 450c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM150 200c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50
s22 50 50 50zM650 200c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM400 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
<glyph glyph-name="c4" unicode="&#xe0c4;"
d="M34 800h632c18 0 34 -16 34 -34v-732c0 -18 -16 -34 -34 -34h-632c-18 0 -34 16 -34 34v732c0 18 16 34 34 34zM100 700v-500h500v500h-500zM350 150c-38 0 -63 -42 -44 -75s69 -33 88 0s-6 75 -44 75z" />
<glyph glyph-name="c5" unicode="&#xe0c5;"
d="M0 800h300l500 -500l-300 -300l-500 500v300zM200 700c-55 0 -100 -45 -100 -100s45 -100 100 -100s100 45 100 100s-45 100 -100 100z" />
<glyph glyph-name="c6" unicode="&#xe0c6;"
d="M0 600h200l300 -300l-200 -200l-300 300v200zM340 600h160l300 -300l-200 -200l-78 78l119 122zM150 500c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
<glyph glyph-name="c7" unicode="&#xe0c7;"
d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM400 600c110 0 200 -90 200 -200s-90 -200 -200 -200s-200 90 -200 200
s90 200 200 200zM400 500c-56 0 -100 -44 -100 -100s44 -100 100 -100s100 44 100 100s-44 100 -100 100z" />
<glyph glyph-name="c8" unicode="&#xe0c8;"
d="M0 700h559l-100 -100h-359v-500h500v159l100 100v-359h-700v700zM700 700l100 -100l-400 -400l-200 200l100 100l100 -100z" />
<glyph glyph-name="c9" unicode="&#xe0c9;"
d="M9 800h782c6 0 9 -3 9 -9v-782c0 -6 -3 -9 -9 -9h-782c-6 0 -9 3 -9 9v782c0 6 3 9 9 9zM150 722l-72 -72l100 -100l-100 -100l72 -72l172 172zM400 500v-100h300v100h-300z" />
<glyph glyph-name="ca" unicode="&#xe0ca;"
d="M0 800h800v-200h-50c0 55 -45 100 -100 100h-150v-550c0 -28 22 -50 50 -50h50v-100h-400v100h50c28 0 50 22 50 50v550h-150c-55 0 -100 -45 -100 -100h-50v200z" />
<glyph glyph-name="cb" unicode="&#xe0cb;"
d="M0 700h100v-400h-100v400zM200 700h350c21 0 39 -13 47 -31c0 0 103 -291 103 -319s-22 -50 -50 -50h-150c-28 0 -50 -25 -50 -50s39 -158 47 -184s-5 -55 -31 -63s-52 5 -66 31s-109 219 -128 238s-44 28 -72 28v400z" />
<glyph glyph-name="cc" unicode="&#xe0cc;"
d="M400 666c10 19 28 32 47 34l19 -3c26 -8 39 -37 31 -63s-47 -159 -47 -184s22 -50 50 -50h150c28 0 50 -22 50 -50s-103 -319 -103 -319c-8 -18 -26 -31 -47 -31h-350v400c28 0 53 9 72 28s114 212 128 238zM0 400h100v-400h-100v400z" />
<glyph glyph-name="cd" unicode="&#xe0cd;"
d="M200 700h300v-100h-100v-6c25 -4 50 -8 72 -16l-34 -94c-28 11 -58 16 -88 16c-139 0 -250 -111 -250 -250s111 -250 250 -250s250 111 250 250c0 31 -5 60 -16 88l91 37c14 -38 25 -81 25 -125c0 -193 -157 -350 -350 -350s-350 157 -350 350c0 176 130 323 300 347v3
h-100v100zM700 584c0 0 -296 -348 -316 -368s-48 -20 -68 0s-20 48 0 68s384 300 384 300z" />
<glyph glyph-name="ce" unicode="&#xe0ce;"
d="M600 700l200 -150l-200 -150v100h-600v100h600v100zM200 300v-100h600v-100h-600v-100l-200 150z" />
<glyph glyph-name="cf" unicode="&#xe0cf;"
d="M300 800h100c55 0 100 -45 100 -100h100c55 0 100 -45 100 -100h-700c0 55 45 100 100 100h100c0 55 45 100 100 100zM100 500h100v-350c0 -28 22 -50 50 -50s50 22 50 50v350h100v-350c0 -28 22 -50 50 -50s50 22 50 50v350h100v-481c0 -11 -8 -19 -19 -19h-462
c-11 0 -19 8 -19 19v481z" />
<glyph glyph-name="d0" unicode="&#xe0d0;"
d="M100 800h200v-400c0 -55 45 -100 100 -100s100 45 100 100v400h100v-400c0 -110 -90 -200 -200 -200h-50c-138 0 -250 90 -250 200v400zM0 100h700v-100h-700v100z" />
<glyph glyph-name="d1" unicode="&#xe0d1;"
d="M9 700h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v482c0 6 3 9 9 9zM609 700h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v482c0 6 3 9 9 9zM309 500h182c6 0 9 -3 9 -9v-282c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v282
c0 6 3 9 9 9zM0 100h800v-100h-800v100z" />
<glyph glyph-name="d2" unicode="&#xe0d2;"
d="M10 700h181c6 0 9 -3 9 -9v-191h-200v191c0 6 4 9 10 9zM610 700h181c6 0 9 -3 9 -9v-191h-200v191c0 6 5 9 10 9zM310 600h181c6 0 9 -3 9 -9v-91h-200v91c0 6 4 9 10 9zM0 400h800v-100h-800v100zM0 200h200v-191c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v191zM300 200
h200v-91c0 -6 -3 -9 -9 -9h-181c-6 0 -10 3 -10 9v91zM600 200h200v-191c0 -6 -3 -9 -9 -9h-181c-6 0 -10 3 -10 9v191z" />
<glyph glyph-name="d3" unicode="&#xe0d3;"
d="M0 700h800v-100h-800v100zM9 500h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v482c0 6 3 9 9 9zM309 500h182c6 0 9 -3 9 -9v-282c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v282c0 6 3 9 9 9zM609 500h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182
c-6 0 -9 3 -9 9v482c0 6 3 9 9 9z" />
<glyph glyph-name="d4" unicode="&#xe0d4;"
d="M50 600h500c28 0 50 -22 50 -50v-150l100 100h100v-300h-100l-100 100v-150c0 -28 -22 -50 -50 -50h-500c-28 0 -50 22 -50 50v400c0 28 22 50 50 50z" />
<glyph glyph-name="d5" unicode="&#xe0d5;"
d="M334 800h66v-800h-66l-134 200h-200v400h200zM500 600v100c26 0 52 -4 75 -10c130 -33 225 -150 225 -290s-95 -258 -225 -291h-3c-23 -6 -47 -9 -72 -9v100c17 0 34 2 50 6c86 22 150 100 150 194s-64 172 -150 194c-16 4 -33 6 -50 6zM500 500l25 -3
c44 -11 75 -51 75 -97s-32 -86 -75 -97l-25 -3v200z" />
<glyph glyph-name="d6" unicode="&#xe0d6;" horiz-adv-x="600"
d="M334 800h66v-800h-66l-134 200h-200v400h200zM500 500l25 -3c44 -11 75 -51 75 -97s-32 -86 -75 -97l-25 -3v200z" />
<glyph glyph-name="d7" unicode="&#xe0d7;" horiz-adv-x="400"
d="M334 800h66v-800h-66l-134 200h-200v400h200z" />
<glyph glyph-name="d8" unicode="&#xe0d8;"
d="M309 800h82c6 0 10 -4 12 -9l294 -682l3 -19v-81c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v81l3 19l294 682c2 5 6 9 12 9zM300 500v-200h100v200h-100zM300 200v-100h100v100h-100z" />
<glyph glyph-name="d9" unicode="&#xe0d9;"
d="M375 800c138 0 269 -39 378 -109l-53 -82c-93 60 -205 91 -325 91c-119 0 -229 -32 -322 -91l-53 82c109 70 237 109 375 109zM375 500c78 0 154 -23 216 -62l-53 -85c-46 30 -104 47 -163 47c-60 0 -112 -17 -159 -47l-54 85c62 40 134 62 213 62zM375 200
c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100s45 100 100 100z" />
<glyph glyph-name="da" unicode="&#xe0da;" horiz-adv-x="900"
d="M551 800c16 0 32 0 47 -3l-97 -97v-200h200l97 97c3 -15 3 -31 3 -47c0 -138 -112 -250 -250 -250c-32 0 -62 8 -90 19l-288 -291c-20 -20 -46 -28 -72 -28s-52 8 -72 28c-39 39 -39 105 0 144l291 287c-11 28 -19 59 -19 91c0 138 112 250 250 250zM101 150
c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
<glyph glyph-name="db" unicode="&#xe0db;"
d="M141 700c84 -84 169 -167 253 -250c82 83 167 165 247 250l143 -141l-253 -253c84 -82 167 -166 253 -247l-143 -143c-81 86 -165 169 -247 253l-253 -253l-141 143c85 80 167 164 250 247c-83 84 -166 169 -250 253z" />
<glyph glyph-name="dc" unicode="&#xe0dc;"
d="M0 800h100l231 -300h38l231 300h100l-225 -300h225v-100h-300v-100h300v-100h-300v-200h-100v200h-300v100h300v100h-300v100h225z" />
<glyph glyph-name="dd" unicode="&#xe0dd;" horiz-adv-x="900"
d="M350 800c193 0 350 -157 350 -350c0 -61 -17 -119 -44 -169c4 -2 10 -6 13 -9l103 -100c16 -16 30 -49 30 -72c0 -56 -46 -102 -102 -102c-23 0 -56 14 -72 30l-100 103c-3 3 -7 9 -9 13c-50 -28 -108 -44 -169 -44c-193 0 -350 157 -350 350s157 350 350 350zM350 700
c-139 0 -250 -111 -250 -250s111 -250 250 -250c62 0 119 23 163 60c7 11 19 25 31 31l3 3c34 43 53 97 53 156c0 139 -111 250 -250 250zM300 600h100v-100h100v-100h-100v-100h-100v100h-100v100h100v100z" />
<glyph glyph-name="de" unicode="&#xe0de;" horiz-adv-x="900"
d="M350 800c193 0 350 -157 350 -350c0 -61 -17 -119 -44 -169c4 -2 10 -6 13 -9l103 -100c16 -16 30 -49 30 -72c0 -56 -46 -102 -102 -102c-23 0 -56 14 -72 30l-100 103c-3 3 -7 9 -9 13c-50 -28 -108 -44 -169 -44c-193 0 -350 157 -350 350s157 350 350 350zM350 700
c-139 0 -250 -111 -250 -250s111 -250 250 -250c62 0 119 23 163 60c7 11 19 25 31 31l3 3c34 43 53 97 53 156c0 139 -111 250 -250 250zM200 500h300v-100h-300v100z" />
</font>
</defs></svg>

Before

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -1,141 +0,0 @@
<?php
namespace Friendica\Directory\Content;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
*/
class L10n
{
/**
* @var string
*/
private $lang;
/**
* @var array
*/
private $strings;
/**
* @var string
*/
private $lang_path;
public function __construct(string $language = 'en', string $lang_path = '')
{
$this->lang = $language;
$this->lang_path = $lang_path;
$this->loadTranslationTable();
}
/**
* Loads string translation table
*
* First addon strings are loaded, then globals
*
* Uses an App object shim since all the strings files refer to $a->strings
*
* @param string $lang language code to load
*/
private function loadTranslationTable(): void
{
if (file_exists($this->lang_path . '/' . $this->lang . '/strings.php')) {
$this->strings = include $this->lang_path . '/' . $this->lang . '/strings.php';
}
}
/**
* @brief Return the localized version of a singular/plural string with optional string interpolation
*
* This function takes two english strings as parameters, singular and plural, as
* well as a count. If a localized version exists for the current language, they
* are used instead. Discrimination between singular and plural is done using the
* localized function if any or the default one. Finally, a string interpolation
* is performed using the count as parameter.
*
* Usages:
* - L10n::tt('Like', 'Likes', $count)
* - L10n::tt("%s user deleted", "%s users deleted", count($users))
*
* @param string $singular
* @param string $plural
* @param int $count
* @return string
*/
public function tt(string $singular, string $plural, int $count): string
{
if (!empty($this->strings[$singular])) {
$t = $this->strings[$singular];
if (is_array($t)) {
$plural_function = 'string_plural_select_' . str_replace('-', '_', $this->lang);
if (function_exists($plural_function)) {
$i = $plural_function($count);
} else {
$i = $this->stringPluralSelectDefault($count);
}
// for some languages there is only a single array item
if (!isset($t[$i])) {
$s = $t[0];
} else {
$s = $t[$i];
}
} else {
$s = $t;
}
} elseif ($this->stringPluralSelectDefault($count)) {
$s = $plural;
} else {
$s = $singular;
}
$s = @sprintf($s, $count);
return $s;
}
/**
* @brief Return the localized version of the provided string with optional string interpolation
*
* This function takes a english string as parameter, and if a localized version
* exists for the current language, substitutes it before performing an eventual
* string interpolation (sprintf) with additional optional arguments.
*
* Usages:
* - L10n::t('This is an example')
* - L10n::t('URL %s returned no result', $url)
* - L10n::t('Current version: %s, new version: %s', $current_version, $new_version)
*
* @param string $s
* @param array $vars Variables to interpolate in the translation string
* @return string
*/
public function t($s, ...$vars): string
{
if (empty($s)) {
return '';
}
if (!empty($this->strings[$s])) {
$t = $this->strings[$s];
$s = is_array($t) ? $t[0] : $t;
}
if (count($vars) > 0) {
$s = sprintf($s, ...$vars);
}
return $s;
}
/**
* Provide a fallback which will not collide with a function defined in any language file
*/
private function stringPluralSelectDefault(int $n): bool
{
return $n != 1;
}
}

View File

@ -5,7 +5,7 @@ namespace Friendica\Directory\Content;
/**
* The Pager has two very different output, Minimal and Full, see renderMinimal() and renderFull() for more details.
*
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Pager
{
@ -24,7 +24,7 @@ class Pager
private $baseQueryString = '';
/**
* @var \Friendica\Directory\Content\L10n
* @var \Gettext\TranslatorInterface
*/
private $l10n;
@ -33,11 +33,11 @@ class Pager
*
* Guesses the page number from the GET parameter 'page'.
*
* @param \Friendica\Directory\Content\L10n $l10n
* @param \Gettext\TranslatorInterface $l10n
* @param \Psr\Http\Message\ServerRequestInterface $request
* @param integer $itemsPerPage An optional number of items per page to override the default value
*/
public function __construct(L10n $l10n, \Psr\Http\Message\ServerRequestInterface $request, int $itemsPerPage = 50)
public function __construct(\Gettext\TranslatorInterface $l10n, \Psr\Http\Message\ServerRequestInterface $request, int $itemsPerPage = 50)
{
$this->l10n = $l10n;
$this->setQueryString($request);
@ -157,7 +157,7 @@ class Pager
* @param integer $itemCount The number of displayed items on the page
* @return array of links
*/
public function renderMinimal(int $itemCount, string $previous_label = 'Previous', string $next_label = 'Next')
public function renderMinimal(int $itemCount)
{
$displayedItemCount = max(0, $itemCount);
@ -165,12 +165,12 @@ class Pager
'class' => 'pager',
'prev' => [
'url' => $this->ensureQueryParameter($this->baseQueryString . '&page=' . ($this->getPage() - 1)),
'text' => $this->l10n->t($previous_label),
'text' => $this->l10n->gettext('Previous'),
'class' => 'previous' . ($this->getPage() == 1 ? ' disabled' : '')
],
'next' => [
'url' => $this->ensureQueryParameter($this->baseQueryString . '&page=' . ($this->getPage() + 1)),
'text' => $this->l10n->t($next_label),
'text' => $this->l10n->gettext('Next'),
'class' => 'next' . ($displayedItemCount <= 0 ? ' disabled' : '')
]
];
@ -208,12 +208,12 @@ class Pager
if ($totalItemCount > $this->getItemsPerPage()) {
$data['first'] = [
'url' => $this->ensureQueryParameter($this->baseQueryString . '&page=1'),
'text' => $this->l10n->t('First'),
'text' => $this->l10n->gettext('First'),
'class' => $this->getPage() == 1 ? 'disabled' : ''
];
$data['prev'] = [
'url' => $this->ensureQueryParameter($this->baseQueryString . '&page=' . ($this->getPage() - 1)),
'text' => $this->l10n->t('Previous'),
'text' => $this->l10n->gettext('Previous'),
'class' => $this->getPage() == 1 ? 'disabled' : ''
];
@ -270,12 +270,12 @@ class Pager
$data['next'] = [
'url' => $this->ensureQueryParameter($this->baseQueryString . '&page=' . ($this->getPage() + 1)),
'text' => $this->l10n->t('Next'),
'text' => $this->l10n->gettext('Next'),
'class' => $this->getPage() == $lastpage ? 'disabled' : ''
];
$data['last'] = [
'url' => $this->ensureQueryParameter($this->baseQueryString . '&page=' . $lastpage),
'text' => $this->l10n->t('Last'),
'text' => $this->l10n->gettext('Last'),
'class' => $this->getPage() == $lastpage ? 'disabled' : ''
];
}

View File

@ -0,0 +1,80 @@
<?php
namespace Friendica\Directory\Controllers\Api;
use Friendica\Directory\Content\Pager;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class MatchSearch
{
/**
* @var \Friendica\Directory\Models\Profile
*/
private $profileModel;
/**
* @var \Gettext\TranslatorInterface
*/
private $l10n;
public function __construct(
\Friendica\Directory\Models\Profile $profileModel,
\Gettext\TranslatorInterface $l10n
)
{
$this->profileModel = $profileModel;
$this->l10n = $l10n;
}
public function render(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
{
$perpage = filter_input(INPUT_POST, 'n', FILTER_SANITIZE_NUMBER_INT);
$query = filter_input(INPUT_POST, 's', FILTER_SANITIZE_STRING);
if (!$perpage) {
$perpage = 80;
}
$pager = new Pager($this->l10n, $request, $perpage);
$pager->setPage(filter_input(INPUT_POST, 'p', FILTER_SANITIZE_NUMBER_INT));
$sql_where = "MATCH (p.`tags`) AGAINST (:query)";
// At sign (@) is a reserved symbol in InnoDB full-text search, it can't be escaped
$query = str_replace('@', ' ', $query);
$values = ['query' => $query];
$profiles = $this->profileModel->getListForDisplay(
null,
$pager->getItemsPerPage(),
$pager->getStart(),
$sql_where,
$values,
);
$results = [];
foreach ($profiles as $profile) {
$results[] = [
'name' => $profile['name'],
'url' => $profile['profile_url'],
'photo' => $profile['photo'],
'tags' => $profile['tags'],
];
}
$count = $this->profileModel->getCountForDisplay($sql_where, $values);
$vars = [
'query' => $query,
'page' => $pager->getPage(),
'items_page' => $pager->getItemsPerPage(),
'total' => $count,
'results' => $results
];
return $response->withJson($vars);
}
}

View File

@ -1,12 +1,12 @@
<?php
namespace Friendica\Directory\Controllers\Web;
namespace Friendica\Directory\Controllers\Api;
use Slim\Http\Request;
use Slim\Http\Response;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Photo
{
@ -14,12 +14,18 @@ class Photo
* @var \Atlas\Pdo\Connection
*/
private $atlas;
/**
* @var string
*/
private $defaultProfilePictureSmallPath;
public function __construct(
\Atlas\Pdo\Connection $atlas
\Atlas\Pdo\Connection $atlas,
string $defaultProfilePictureSmallPath
)
{
$this->atlas = $atlas;
$this->defaultProfilePictureSmallPath = $defaultProfilePictureSmallPath;
}
public function render(Request $request, Response $response, array $args): Response
@ -30,7 +36,7 @@ class Photo
);
if (!$data) {
$data = file_get_contents('public/images/default-profile-sm.jpg');
$data = file_get_contents($this->defaultProfilePictureSmallPath);
}
//Try and cache our result.

View File

@ -2,43 +2,38 @@
namespace Friendica\Directory\Controllers\Api;
use \Friendica\Directory\Content\Pager;
use PDO;
use Friendica\Directory\Content\Pager;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Search
{
/**
* @var \Atlas\Pdo\Connection
*/
private $atlas;
/**
* @var \Friendica\Directory\Models\Profile
*/
private $profileModel;
/**
* @var \Friendica\Directory\Content\L10n
* @var \Gettext\TranslatorInterface
*/
private $l10n;
public function __construct(
\Atlas\Pdo\Connection $atlas,
\Friendica\Directory\Models\Profile $profileModel,
\Friendica\Directory\Content\L10n $l10n
\Gettext\TranslatorInterface $l10n
)
{
$this->atlas = $atlas;
$this->profileModel = $profileModel;
$this->l10n = $l10n;
}
public function render(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
{
$pager = new Pager($this->l10n, $request, 20);
$limit = min(100, filter_input(INPUT_GET, 'limit', FILTER_SANITIZE_NUMBER_INT) ?: 20);
$pager = new Pager($this->l10n, $request, $limit);
$originalQuery = $query = filter_input(INPUT_GET, 'q');
@ -48,8 +43,10 @@ class Search
$query .= '%';
$sql_where = '`' . $field . '` LIKE :query';
} else {
$sql_where = "MATCH (p.`name`, p.`pdesc`, p.`profile_url`, p.`locality`, p.`region`, p.`country`, p.`tags` )
$sql_where = "MATCH (p.`name`, p.`pdesc`, p.`username`, p.`locality`, p.`region`, p.`country`, p.`tags` )
AGAINST (:query IN BOOLEAN MODE)";
// At sign (@) is a reserved symbol in InnoDB full-text search, it can't be escaped
$query = str_replace('@', ' ', $query);
}
$values = ['query' => $query];
@ -61,19 +58,25 @@ AND `account_type` = :account_type';
$values['account_type'] = $account_type;
}
$profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values);
$profiles = $this->profileModel->getListForDisplay(
null,
$pager->getItemsPerPage(),
$pager->getStart(),
$sql_where,
$values,
);
$count = $this->profileModel->getCountForDisplay($sql_where, $values);
$vars = [
'query' => $originalQuery,
'page' => $pager->getPage(),
'query' => $originalQuery,
'field' => $field,
'page' => $pager->getPage(),
'itemsperpage' => $pager->getItemsPerPage(),
'count' => $count,
'profiles' => $profiles
'count' => $count,
'profiles' => $profiles
];
// Render index view
return $response->withJson($vars);
}
}

View File

@ -6,7 +6,7 @@ use Slim\Http\Request;
use Slim\Http\Response;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Submit
{
@ -68,7 +68,8 @@ class Submit
['base_url' => $profileUriInfo['server_uri']]
);
$this->profilePollQueueModel->add($url);
$result = $this->profilePollQueueModel->add($url);
$this->logger->debug('Profile queue add URL: ' . $url . ' - ' . $result);
$this->logger->info('Successfully received profile URL');
} catch (\Exception $ex) {

View File

@ -0,0 +1,45 @@
<?php
namespace Friendica\Directory\Controllers\Api;
use Friendica\Directory\Content\Pager;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Surprise
{
/**
* @var \Atlas\Pdo\Connection
*/
private $atlas;
public function __construct(
\Atlas\Pdo\Connection $atlas
)
{
$this->atlas = $atlas;
}
public function render(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
{
$redirectUrl = '';
$sql = 'SELECT `base_url`, server.*
FROM `server`
WHERE `reg_policy` = "REGISTER_OPEN"
AND `health_score` > 75
AND `ssl_state`
AND `available`
ORDER BY `health_score` DESC, RAND()';
$server = $this->atlas->fetchOne($sql);
if ($server) {
$redirectUrl = $server['base_url'];
}
return $response->withRedirect($redirectUrl);
}
}

View File

@ -6,7 +6,7 @@ use Slim\Http\Request;
use Slim\Http\Response;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class SyncPull
{

View File

@ -7,7 +7,7 @@ use Monolog\Logger;
/**
* Description of Console
*
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Console extends \Asika\SimpleConsole\Console
{
@ -23,6 +23,7 @@ class Console extends \Asika\SimpleConsole\Console
protected $routes = [
'directory-add' => \Friendica\Directory\Routes\Console\DirectoryAdd::class,
'directory-poll' => \Friendica\Directory\Routes\Console\DirectoryPoll::class,
'profile-add' => \Friendica\Directory\Routes\Console\ProfileAdd::class,
'profile-hide' => \Friendica\Directory\Routes\Console\ProfileHide::class,
'profile-poll' => \Friendica\Directory\Routes\Console\ProfilePoll::class,
'server-hide' => \Friendica\Directory\Routes\Console\ServerHide::class,
@ -30,6 +31,7 @@ class Console extends \Asika\SimpleConsole\Console
'install' => \Friendica\Directory\Routes\Console\Install::class,
'updatedb' => \Friendica\Directory\Routes\Console\UpdateDb::class,
'dbupdate' => \Friendica\Directory\Routes\Console\UpdateDb::class,
'extract-strings' => \Friendica\Directory\Routes\Console\ExtractStrings::class,
];
public function __construct(\Slim\Container $container, ?array $argv = null)
@ -43,9 +45,7 @@ class Console extends \Asika\SimpleConsole\Console
{
$commandList = '';
foreach ($this->routes as $command => $class) {
$this->out($class);
$commandList .= ' ' . $command . ' ' . $class::description . "\n";
$commandList .= ' ' . $command . "\n";
}
$help = <<<HELP

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Controllers\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class DirectoryAdd extends \Asika\SimpleConsole\Console
{
@ -54,17 +54,17 @@ HELP;
$directory_url = $this->getArgument(0);
$result = $this->atlas->perform('INSERT IGNORE INTO `directory_poll_queue` SET
$affected = $this->atlas->fetchAffected('INSERT IGNORE INTO `directory_poll_queue` SET
`directory_url` = :directory_url',
['directory_url' => $directory_url]
);
if (!$result) {
throw new \RuntimeException('Unable to add repository with URL: ' . $directory_url);
if (!$affected) {
$this->out('Directory already exists in the queue.');
} else {
$this->out('Successfully added the directory to the queue.');
}
$this->out('Successfully added the repository to the queue.');
return 0;
}
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Controllers\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class DirectoryPoll extends \Asika\SimpleConsole\Console
{

View File

@ -0,0 +1,121 @@
<?php
namespace Friendica\Directory\Controllers\Console;
use Gettext\Merge;
use Gettext\Translations;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ExtractStrings extends \Asika\SimpleConsole\Console
{
/**
* @var string
*/
protected $translationPath;
protected $helpOptions = ['h', 'help', '?'];
public function __construct(
string $translationPath,
?array $argv = null
)
{
$this->translationPath = $translationPath;
parent::__construct($argv);
}
protected function getHelp()
{
$help = <<<HELP
console extract-strings - Extract translation strings
Usage
bin/console extract-strings [language] [--all] [--force] [-h|--help|-?] [-v]
Description
Extract translation strings
Options
--all Update PO files for all existing languages
--force Generate po file from scratch, discarding existing translations
-h|--help|-? Show help information
-v Show more debug information.
HELP;
return $help;
}
protected function doExecute()
{
if (count($this->args) > 1) {
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
if ($this->getOption('all')) {
$langs = array_map('basename', glob(realpath($this->translationPath) . '/*', GLOB_ONLYDIR));
} else {
$lang = $this->getArgument(0);
if (!$lang) {
throw new \RuntimeException('Missing language argument and --all isn\'t provided');
}
$langs = [$lang];
}
$dir_iterator = new \RecursiveDirectoryIterator(realpath(__DIR__ . '/../../../'), \FilesystemIterator::SKIP_DOTS);
$iterator = new \RecursiveIteratorIterator($dir_iterator, \RecursiveIteratorIterator::SELF_FIRST);
$updatedTranslations = new Translations();
foreach ($iterator as $file) {
/**
* @var \SplFileInfo $file
*/
$extension = $file->getExtension();
if ($extension == 'php' || $extension == 'phtml') {
$translations = Translations::fromPhpCodeFile($file->getPathname());
if (count($translations)) {
$updatedTranslations->mergeWith($translations);
}
}
}
$this->out('Compiled up-to-date translations');
foreach ($langs as $locale) {
$existingTranslations = new Translations();
$stringsPoFile = $this->translationPath . '/' . $locale . '/LC_MESSAGES/strings.po';
if (is_file($stringsPoFile)) {
if (!$this->getOption('force')) {
$this->out('Loading existing ' . $locale . ' translations');
$existingTranslations->addFromPoFile($stringsPoFile);
}
} else {
$this->out('Creating directory ' . dirname($stringsPoFile));
mkdir(dirname($stringsPoFile), 0755, true);
}
$updatedTranslations->setLanguage($locale);
if ($this->getOption('force') || !is_file($stringsPoFile)) {
$existingTranslations = $updatedTranslations;
} else {
$this->out('Merging with existing translations');
$existingTranslations->mergeWith($updatedTranslations, Merge::ADD | Merge::REMOVE | Merge::REFERENCES_THEIRS | Merge::HEADERS_ADD);
}
$poString = $existingTranslations->toPoString();
// Strip absolute path to files
$poString = str_replace(realpath(__DIR__ . '/../../../../') . DIRECTORY_SEPARATOR, '', $poString);
$this->out('Writing ' . realpath($stringsPoFile));
file_put_contents($stringsPoFile, $poString);
}
return 0;
}
}

View File

@ -7,7 +7,7 @@ use Monolog\Logger;
use Seld\CliPrompt\CliPrompt;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Install extends \Asika\SimpleConsole\Console
{
@ -31,9 +31,9 @@ class Install extends \Asika\SimpleConsole\Console
protected function getHelp()
{
$help = <<<HELP
console install - Install directory
console install - Install wizard
Usage
bin/console install <server_url> [-h|--help|-?] [-v]
bin/console install [-h|--help|-?] [-v]
Description
Install directory

View File

@ -0,0 +1,86 @@
<?php
namespace Friendica\Directory\Controllers\Console;
use Friendica\Directory\Models\ProfilePollQueue;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ProfileAdd extends \Asika\SimpleConsole\Console
{
/**
* @var ProfilePollQueue
*/
protected $profilePollQueueModel;
protected $helpOptions = ['h', 'help', '?'];
public function __construct(
ProfilePollQueue $profilePollQueueModel,
?array $argv = null
)
{
parent::__construct($argv);
$this->profilePollQueueModel = $profilePollQueueModel;
}
protected function getHelp()
{
$help = <<<HELP
console profile-add - Adds provided profile to queue
Usage
bin/console profile-add <profile_url> [-h|--help|-?] [-v]
Description
Adds provided profile to queue
Options
-h|--help|-? Show help information
-v Show more debug information.
HELP;
return $help;
}
protected function doExecute()
{
if (count($this->args) == 0) {
$this->out($this->getHelp());
return 0;
}
if (count($this->args) > 1) {
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
$profile_url = $this->getArgument(0);
$result = $this->profilePollQueueModel->add($profile_url);
switch($result) {
case 0: {
$this->out('Successfully added the profile to the queue.');
return 0;
break;
}
case ProfilePollQueue::EMPTY_URL: {
throw new \RuntimeException('Unable to add profile with empty URL');
}
case ProfilePollQueue::MISSING_HOST: {
throw new \RuntimeException('Unable to add profile URL with a missing host');
}
case ProfilePollQueue::PRIVATE_HOST: {
throw new \RuntimeException('Unable to add profile with a private URL');
}
case ProfilePollQueue::ALREADY_EXISTS: {
$this->out('Profile already existing in the queue.');
return 0;
}
default: {
throw new \RuntimeException('Unable to add profile to the queue');
}
}
}
}

View File

@ -5,7 +5,7 @@ namespace Friendica\Directory\Controllers\Console;
use Friendica\Directory\Models\Profile;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ProfileHide extends \Asika\SimpleConsole\Console
{

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Controllers\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ProfilePoll extends \Asika\SimpleConsole\Console
{

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Controllers\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ServerHide extends \Asika\SimpleConsole\Console
{

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Controllers\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ServerPoll extends \Asika\SimpleConsole\Console
{

View File

@ -5,7 +5,7 @@ namespace Friendica\Directory\Controllers\Console;
use Monolog\Logger;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class UpdateDb extends \Asika\SimpleConsole\Console
{
@ -37,12 +37,14 @@ class UpdateDb extends \Asika\SimpleConsole\Console
$help = <<<HELP
console updatedb - Update database schema
Usage
bin/console updatedb <server_url> [-h|--help|-?] [-v]
bin/console updatedb [<version>] [-h|--help|-?] [-v]
Description
Update database schema
Options
<version> Optional target version number, default is the latest version.
Do not use this parameter if you're not sure what you're doing, it will result in data loss!
-h|--help|-? Show help information
-v Show more debug information.
HELP;
@ -56,16 +58,38 @@ HELP;
return 0;
}
if (count($this->args) > 1) {
if (count($this->args) > 2) {
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
$this->out('Updating database schema to latest version...');
$currentVersion = $this->migration->getCurrentVersion()['version'];
$this->migration->up();
$this->out('Database schema currently in version ' . $currentVersion);
$this->out('Database schema migrated to version ' . $this->migration->getCurrentVersion()['version']);
if (count($this->args) == 1) {
$this->out('Updating database schema to latest version...');
$this->migration->up();
$this->out('Database schema migrated to version ' . $this->migration->getCurrentVersion()['version']);
return 0;
}
$target = $this->getArgument(1);
if ($target > $currentVersion) {
$this->out('Updating database schema to version ' . $target);
$this->migration->up($target);
$this->out('Database schema migrated up to version ' . $this->migration->getCurrentVersion()['version']);
return 0;
}
if ($target < $currentVersion) {
$this->out('Downgrading database schema to version ' . $target);
$this->migration->down($target);
$this->out('Database schema migrated down to version ' . $this->migration->getCurrentVersion()['version']);
return 0;
}
$this->out('Target version equal to current version, exiting.');
return 0;
}
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Controllers;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Cron
{
@ -93,6 +93,8 @@ class Cron
ORDER BY ISNULL(`last_polled`) DESC'
);
$this->logger->notice('Directories polling queue size: ' . count($directories));
foreach ($directories as $directory) {
if ($time_limit && microtime(true) - $this->startTime > $time_limit) {
break;
@ -133,6 +135,8 @@ class Cron
ORDER BY ISNULL(`last_polled`) DESC, `request_count` DESC'
);
$this->logger->notice('Servers polling queue size: ' . count($servers));
foreach ($servers as $server_queue_item) {
if ($time_limit && microtime(true) - $this->startTime > $time_limit) {
break;
@ -188,6 +192,8 @@ class Cron
ORDER BY RAND() ASC'
);
$this->logger->notice('Profiles polling queue size: ' . count($profiles));
foreach ($profiles as $profile) {
if ($time_limit && microtime(true) - $this->startTime > $time_limit) {
break;

View File

@ -0,0 +1,9 @@
<?php
namespace Friendica\Directory\Controllers\Web;
abstract class BaseController
{
abstract function render(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): array;
}

View File

@ -2,22 +2,26 @@
namespace Friendica\Directory\Controllers\Web;
use \Friendica\Directory\Content\Pager;
use \Friendica\Directory\Views\Widget\PopularCountries;
use \Friendica\Directory\Views\Widget\PopularTags;
use PDO;
use Friendica\Directory\Content\Pager;
use Friendica\Directory\Views\Widget\PopularCountries;
use Friendica\Directory\Views\Widget\PopularProfileLanguages;
use Friendica\Directory\Views\Widget\PopularTags;
use Slim\Http\Request;
use Slim\Http\Response;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Directory
class Directory extends BaseController
{
/**
* @var \Atlas\Pdo\Connection
*/
private $atlas;
/**
* @var \Friendica\Directory\Models\Server
*/
private $serverModel;
/**
* @var \Friendica\Directory\Models\Profile
*/
@ -31,56 +35,65 @@ class Directory
*/
private $renderer;
/**
* @var \Friendica\Directory\Content\L10n
* @var \Gettext\TranslatorInterface
*/
private $l10n;
public function __construct(
\Atlas\Pdo\Connection $atlas,
\Friendica\Directory\Models\Server $serverModel,
\Friendica\Directory\Models\Profile $profileModel,
\Friendica\Directory\Views\Widget\AccountTypeTabs $accountTypeTabs,
\Friendica\Directory\Views\PhpRenderer $renderer,
\Friendica\Directory\Content\L10n $l10n
\Gettext\TranslatorInterface $l10n
)
{
$this->atlas = $atlas;
$this->serverModel = $serverModel;
$this->profileModel = $profileModel;
$this->accountTypeTabs = $accountTypeTabs;
$this->renderer = $renderer;
$this->l10n = $l10n;
}
public function render(Request $request, Response $response, array $args): Response
public function render(Request $request, Response $response, array $args): array
{
$popularTags = new PopularTags($this->atlas, $this->renderer);
$popularCountries = new PopularCountries($this->atlas, $this->renderer);
$popularLanguages = new PopularProfileLanguages($this->atlas, $this->renderer);
$pager = new Pager($this->l10n, $request, 20);
$condition = '';
$sql_where = '';
$values = [];
if (!empty($args['account_type'])) {
$condition = '`account_type` = :account_type';
$sql_where = '`account_type` = :account_type';
$values = ['account_type' => $args['account_type']];
}
$profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $condition, $values);
$profiles = $this->profileModel->getListForDisplay(
$this->serverModel->getSubscribeUrlByProfile($request->getQueryParam('zrl', '')),
$pager->getItemsPerPage(),
$pager->getStart(),
$sql_where,
$values,
);
$count = $this->profileModel->getCountForDisplay($condition, $values);
$count = $this->profileModel->getCountForDisplay($sql_where, $values);
$vars = [
'title' => $this->l10n->t('People'),
'title' => $this->l10n->gettext('People'),
'profiles' => $profiles,
'pager_full' => $pager->renderFull($count),
'pager_minimal' => $pager->renderMinimal($count),
'accountTypeTabs' => $this->accountTypeTabs->render('directory', $args['account_type'] ?? ''),
'popularTags' => $popularTags->render(),
'popularCountries' => $popularCountries->render(),
'popularLanguages' => $popularLanguages->render(),
];
$content = $this->renderer->fetch('directory.phtml', $vars);
// Render index view
return $this->renderer->render($response, 'layout.phtml', ['baseUrl' => $request->getUri()->getBaseUrl(), 'content' => $content]);
return ['content' => $content];
}
}

View File

@ -0,0 +1,28 @@
<?php
namespace Friendica\Directory\Controllers\Web;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Page extends BaseController
{
/**
* @var string
*/
private $pageFile;
public function __construct(
string $pageFile
)
{
$this->pageFile = $pageFile;
}
public function render(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): array
{
$content = file_get_contents($this->pageFile);
return ['content' => $content];
}
}

View File

@ -3,19 +3,20 @@
namespace Friendica\Directory\Controllers\Web;
use \Friendica\Directory\Content\Pager;
use PDO;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Search
class Search extends BaseController
{
/**
* @var \Atlas\Pdo\Connection
*/
private $atlas;
/**
* @var \Friendica\Directory\Models\Server
*/
private $serverModel;
/**
* @var \Friendica\Directory\Models\Profile
*/
@ -29,66 +30,94 @@ class Search
*/
private $accountTypeTabs;
/**
* @var \Friendica\Directory\Content\L10n
* @var \Gettext\TranslatorInterface
*/
private $l10n;
public function __construct(
\Atlas\Pdo\Connection $atlas,
\Friendica\Directory\Models\Server $serverModel,
\Friendica\Directory\Models\Profile $profileModel,
\Friendica\Directory\Views\Widget\AccountTypeTabs $accountTypeTabs,
\Friendica\Directory\Views\PhpRenderer $renderer,
\Friendica\Directory\Content\L10n $l10n
\Gettext\TranslatorInterface $l10n
)
{
$this->atlas = $atlas;
$this->serverModel = $serverModel;
$this->profileModel = $profileModel;
$this->accountTypeTabs = $accountTypeTabs;
$this->renderer = $renderer;
$this->l10n = $l10n;
}
public function render(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
public function render(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): array
{
$pager = new Pager($this->l10n, $request, 20);
$limit = min(100, filter_input(INPUT_GET, 'limit', FILTER_SANITIZE_NUMBER_INT) ?: 20);
$originalQuery = $query = filter_input(INPUT_GET, 'q');
$pager = new Pager($this->l10n, $request, $limit);
$field = filter_input(INPUT_GET, 'field', FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW & FILTER_FLAG_STRIP_HIGH);
$originalQuery = $query = $request->getParam('q', '');
$field = $request->getParam('field', '');
$field = filter_var($field, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH | FILTER_FLAG_STRIP_BACKTICK);
$fieldName = '';
if ($field) {
$query .= '%';
$sql_where = '`' . $field . '` LIKE :query';
$sql_where = 'p.`' . $field . '` LIKE :query';
switch($field) {
case 'language': $fieldName = $this->l10n->pgettext('field', 'Language'); break;
case 'locality': $fieldName = $this->l10n->pgettext('field', 'Locality'); break;
case 'region' : $fieldName = $this->l10n->pgettext('field', 'Region') ; break;
case 'country' : $fieldName = $this->l10n->pgettext('field', 'Country') ; break;
default: $fieldName = ucfirst($field);
}
} else {
$sql_where = "MATCH (p.`name`, p.`pdesc`, p.`profile_url`, p.`locality`, p.`region`, p.`country`, p.`tags` )
$sql_where = "MATCH (p.`name`, p.`pdesc`, p.`username`, p.`locality`, p.`region`, p.`country`, p.`tags` )
AGAINST (:query IN BOOLEAN MODE)";
// At sign (@) is a reserved symbol in InnoDB full-text search, it can't be escaped
$query = str_replace('@', ' ', $query);
}
$values = ['query' => $query];
$account_type = $args['account_type'] ?? '';
$accountTypeTabs = $this->accountTypeTabs->render('search', $account_type, $sql_where, $values, ['q' => $originalQuery, 'field' => $field]);
if ($account_type) {
$sql_where .= '
AND `account_type` = :account_type';
$values['account_type'] = $account_type;
}
$profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values);
$profiles = $this->profileModel->getListForDisplay(
$this->serverModel->getSubscribeUrlByProfile($request->getQueryParam('zrl', '')),
$pager->getItemsPerPage(),
$pager->getStart(),
$sql_where,
$values,
);
$count = $this->profileModel->getCountForDisplay($sql_where, $values);
$vars = [
'query' => $originalQuery,
'count' => $count,
'accountTypeTabs' => $this->accountTypeTabs->render('search', $account_type, ['q' => $originalQuery]),
'profiles' => $profiles,
'query' => $originalQuery,
'field' => $field,
'fieldName' => $fieldName,
'count' => $count,
'accountTypeTabs' => $accountTypeTabs,
'profiles' => $profiles,
'pager_full' => $pager->renderFull($count),
'pager_minimal' => $pager->renderMinimal($count),
];
$content = $this->renderer->fetch('search.phtml', $vars);
// Render index view
return $this->renderer->render($response, 'layout.phtml', ['baseUrl' => $request->getUri()->getBaseUrl(), 'content' => $content, 'noNavSearch' => true]);
return ['content' => $content, 'noNavSearch' => true];
}
}

View File

@ -2,15 +2,16 @@
namespace Friendica\Directory\Controllers\Web;
use \Friendica\Directory\Content\Pager;
use Friendica\Directory\Content\Pager;
use Friendica\Directory\Views\Widget\PopularServerLanguages;
use PDO;
use Slim\Http\Request;
use Slim\Http\Response;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Servers
class Servers extends BaseController
{
/**
* @var \Atlas\Pdo\Connection
@ -21,7 +22,7 @@ class Servers
*/
private $renderer;
/**
* @var \Friendica\Directory\Content\L10n
* @var \Gettext\TranslatorInterface
*/
private $l10n;
/**
@ -32,7 +33,7 @@ class Servers
public function __construct(
\Atlas\Pdo\Connection $atlas,
\Friendica\Directory\Views\PhpRenderer $renderer,
\Friendica\Directory\Content\L10n $l10n,
\Gettext\TranslatorInterface $l10n,
\Psr\SimpleCache\CacheInterface $simplecache
)
{
@ -42,11 +43,11 @@ class Servers
$this->simplecache = $simplecache;
}
public function render(Request $request, Response $response): Response
public function render(Request $request, Response $response, array $args): array
{
$stable_version = $this->simplecache->get('stable_version');
if (!$stable_version) {
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/master/VERSION'));
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION'));
$this->simplecache->set('stable_version', $stable_version);
}
@ -56,45 +57,65 @@ class Servers
$this->simplecache->set('dev_version', $dev_version);
}
$rc_version = str_replace('-dev', '-rc', $dev_version);
$popularLanguages = new PopularServerLanguages($this->atlas, $this->renderer);
$pager = new Pager($this->l10n, $request, 20);
$sql_where = '';
$values = [];
if (!empty($args['language'])) {
$sql_where .= '
AND LEFT(`language`, 2) = LEFT(:language, 2)';
$values['language'] = $args['language'];
}
$stmt = 'SELECT *
FROM `server` s
WHERE `reg_policy` = "REGISTER_OPEN"
WHERE `reg_policy` != "REGISTER_CLOSED"
AND `available`
AND NOT `hidden`
ORDER BY `health_score` DESC, `ssl_state` DESC, `info` != "" DESC, `dt_last_probed` DESC
' . $sql_where . '
ORDER BY `health_score` DESC, `ssl_state` DESC, `info` != "" DESC, `last_seen` DESC
LIMIT :start, :limit';
$servers = $this->atlas->fetchAll($stmt, [
$listValues = array_merge($values, [
'start' => [$pager->getStart(), PDO::PARAM_INT],
'limit' => [$pager->getItemsPerPage(), PDO::PARAM_INT]
]);
$servers = $this->atlas->fetchAll($stmt, $listValues);
foreach ($servers as $key => $server) {
$servers[$key]['user_count'] = $this->atlas->fetchValue(
'SELECT COUNT(*) FROM `profile` WHERE `available` AND `server_id` = :server_id',
'SELECT COUNT(*) FROM `profile` WHERE `available` AND NOT `hidden` AND `server_id` = :server_id',
['server_id' => [$server['id'], PDO::PARAM_INT]]
);
}
$stmt = 'SELECT COUNT(*)
FROM `server` s
WHERE `reg_policy` = "REGISTER_OPEN"
WHERE `reg_policy` != "REGISTER_CLOSED"
AND `available`
AND NOT `hidden`';
$count = $this->atlas->fetchValue($stmt);
AND NOT `hidden`
' . $sql_where;
$count = $this->atlas->fetchValue($stmt, $values);
$vars = [
'title' => $this->l10n->t('Public Servers'),
'title' => $this->l10n->gettext('Public Servers'),
'total' => $count,
'language' => $args['language'] ?? null,
'servers' => $servers,
'pager' => $pager->renderFull($count),
'stable_version' => $stable_version,
'rc_version' => $rc_version,
'dev_version' => $dev_version,
'popularLanguages' => $popularLanguages->render(),
];
$content = $this->renderer->fetch('servers.phtml', $vars);
// Render index view
return $this->renderer->render($response, 'layout.phtml', ['baseUrl' => $request->getUri()->getBaseUrl(), 'content' => $content]);
return ['content' => $content];
}
}

View File

@ -0,0 +1,159 @@
<?php
namespace Friendica\Directory\Controllers\Web;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Statistics extends BaseController
{
/**
* @var \Atlas\Pdo\Connection
*/
private $connection;
/**
* @var \Psr\SimpleCache\CacheInterface
*/
private $simplecache;
/**
* @var \Friendica\Directory\Views\PhpRenderer
*/
private $renderer;
public function __construct(
\Atlas\Pdo\Connection $atlas,
\Psr\SimpleCache\CacheInterface $simplecache,
\Friendica\Directory\Views\PhpRenderer $renderer
)
{
$this->connection = $atlas;
$this->simplecache = $simplecache;
$this->renderer = $renderer;
}
public function render(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): array
{
$profilePollQueueCount = $this->connection->fetchValue('SELECT COUNT(*) FROM `profile_poll_queue`');
$profileCounts = $this->connection->fetchOne(
'SELECT
COUNT(*) AS `total`,
SUM(CASE WHEN `available` THEN 1 ELSE 0 END) AS `available`,
SUM(CASE WHEN `language` IS NOT NULL THEN 1 ELSE 0 END) AS `language`
FROM `profile`
WHERE NOT `hidden`');
$stmt = 'SELECT `language`, COUNT(*) AS `total`, COUNT(*) / :total AS `ratio`
FROM `profile`
WHERE `language` IS NOT NULL
AND `available`
AND NOT `hidden`
GROUP BY `language`
ORDER BY `total` DESC';
$profileLanguages = $this->connection->fetchAll($stmt, ['total' => $profileCounts['language']]);
$stable_version = $this->simplecache->get('stable_version');
if (!$stable_version) {
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION'));
$this->simplecache->set('stable_version', $stable_version);
}
$dev_version = $this->simplecache->get('dev_version');
if (!$dev_version) {
$dev_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/develop/VERSION'));
$this->simplecache->set('dev_version', $dev_version);
}
$rc_version = str_replace('-dev', '-rc', $dev_version);
$serverPollQueueCount = $this->connection->fetchValue('SELECT COUNT(*) FROM `server_poll_queue`');
$serverCounts = $this->connection->fetchOne(
'SELECT
COUNT(*) AS `total`,
SUM(CASE WHEN `available` THEN 1 ELSE 0 END) AS `available`,
SUM(CASE WHEN `available` AND `language` IS NOT NULL THEN 1 ELSE 0 END) AS `language`,
SUM(CASE WHEN `available` AND `reg_policy` != "REGISTER_CLOSED" THEN 1 ELSE 0 END) AS `open`,
SUM(CASE WHEN `available` AND `version` IS NOT NULL THEN 1 ELSE 0 END) AS `version`,
SUM(CASE WHEN `available` AND (`version` = :dev_version OR `version` = :rc_version) THEN 1 ELSE 0 END) AS `dev_version`,
SUM(CASE WHEN `available` AND `version` = :stable_version THEN 1 ELSE 0 END) AS `stable_version`,
SUM(CASE WHEN `available` AND `version` != :dev_version AND `version` != :stable_version AND `version` != :rc_version THEN 1 ELSE 0 END) AS `outdated_version`
FROM `server`
WHERE NOT `hidden`', ['dev_version' => $dev_version, 'rc_version' => $rc_version, 'stable_version' => $stable_version]);
$stmt = 'SELECT LEFT(`language`, 2) AS `language`, COUNT(*) AS `total`, COUNT(*) / :total AS `ratio`
FROM `server`
WHERE `language` IS NOT NULL
AND `available`
AND NOT `hidden`
GROUP BY LEFT(`language`, 2)
ORDER BY `total` DESC';
$serverLanguages = $this->connection->fetchAll($stmt, ['total' => $serverCounts['language']]);
$stmt = 'SELECT `version`, COUNT(*) AS `total`, COUNT(*) / :total AS `ratio`
FROM `server`
WHERE `version` IS NOT NULL
AND `available`
AND NOT `hidden`
GROUP BY `version`
ORDER BY `total` DESC';
$serverVersions = $this->connection->fetchAll($stmt, ['total' => $serverCounts['version']]);
$vars = [
'stats' => [
'profile_queue' => [
'total' => $profilePollQueueCount
],
'profile' => [
'total' => $profileCounts['total'],
'ratio' => $profileCounts['total'] / $profilePollQueueCount,
'available' => [
'total' => $profileCounts['available'],
'ratio' => $profileCounts['available'] / $profileCounts['total']
],
'language' => [
'total' => $profileCounts['language'],
'ratio' => $profileCounts['language'] / $profileCounts['available']
],
'languages' => $profileLanguages,
],
'server_queue' => [
'total' => $serverPollQueueCount
],
'server' => [
'total' => $serverCounts['total'],
'ratio' => $serverCounts['total'] / $serverPollQueueCount,
'available' => [
'total' => $serverCounts['available'],
'ratio' => $serverCounts['available'] / $serverCounts['total']
],
'language' => [
'total' => $serverCounts['language'],
'ratio' => $serverCounts['language'] / $serverCounts['available']
],
'open' => [
'total' => $serverCounts['open'],
'ratio' => $serverCounts['open'] / $serverCounts['available']
],
'version' => [
'total' => $serverCounts['version'],
'ratio' => $serverCounts['version'] / $serverCounts['available']
],
'languages' => $serverLanguages,
'versions' => $serverVersions,
],
],
'dev_version' => $dev_version,
'rc_version' => $rc_version,
'stable_version' => $stable_version,
];
$content = $this->renderer->fetch('statistics.phtml', $vars);
// Render index view
return ['content' => $content, 'noNavSearch' => true];
}
}

View File

@ -0,0 +1,40 @@
<?php
namespace Friendica\Directory\Middleware;
use Friendica\Directory\Views\PhpRenderer;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
/**
* The ZRL middleware ensures the Renderer ZRL attribute is set if the query string parameter is present
*
* @author Hypolite Petovan <hypolite@mrpetovan.com>
* @package Friendica\Directory\Middleware
*/
class ZrlMiddleware
{
/**
* @var PhpRenderer
*/
private $phpRenderer;
public function __construct(PhpRenderer $phpRenderer)
{
$this->phpRenderer = $phpRenderer;
}
/**
* @param ServerRequestInterface $request PSR7 request
* @param ResponseInterface $response PSR7 response
* @param callable $next Next middleware
*
* @return ResponseInterface
*/
public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next)
{
$this->phpRenderer->addAttribute('zrl', $request->getQueryParams()['zrl'] ?? null);
return $next($request, $response);
}
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Model
{

View File

@ -3,10 +3,17 @@
namespace Friendica\Directory\Models;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Profile extends \Friendica\Directory\Model
{
const ACCOUNT_TYPE_PERSON = 0;
const ACCOUNT_TYPE_ORGANISATION = 1;
const ACCOUNT_TYPE_NEWS = 2;
const ACCOUNT_TYPE_COMMUNITY = 3;
const ACCOUNT_TYPE_RELAY = 4;
const ACCOUNT_TYPE_DELETED = 127;
public function deleteById(int $profile_id): bool
{
$this->atlas->perform('DELETE FROM `photo` WHERE `profile_id` = :profile_id',
@ -74,7 +81,7 @@ class Profile extends \Friendica\Directory\Model
];
}
public function getListForDisplay(int $limit = 30, int $start = 0, string $condition = '', array $values = []): array
public function getListForDisplay(string $subscribeUrl = null, int $limit = 30, int $start = 0, string $condition = '', array $values = []): array
{
if ($condition) {
$condition = 'AND ' . $condition;
@ -85,19 +92,25 @@ class Profile extends \Friendica\Directory\Model
'limit' => [$limit, \PDO::PARAM_INT]
]);
$stmt = 'SELECT p.`id`, p.`name`, p.`username`, p.`addr`, p.`account_type`, p.`pdesc`,
p.`locality`, p.`region`, p.`country`, p.`profile_url`, p.`dfrn_request`, p.`photo`,
p.`tags`, p.`last_activity`
$stmt = 'SELECT p.`id`, p.`name`, p.`username`, p.`addr`, p.`account_type`, p.`language`,
p.`pdesc`, p.`locality`, p.`region`, p.`country`, p.`profile_url`,
p.`photo`, p.`tags`, p.`last_activity`, s.`version`
FROM `profile` p
JOIN `server` s ON s.`id` = p.`server_id` AND s.`available` AND NOT s.`hidden`
WHERE p.`available`
AND NOT p.`hidden`
' . $condition . '
GROUP BY p.`id`
GROUP BY p.`id`, `filled_fields`, `last_activity`, `updated`
ORDER BY `filled_fields` DESC, `last_activity` DESC, `updated` DESC
LIMIT :start, :limit';
$profiles = $this->atlas->fetchAll($stmt, $values);
array_walk($profiles, function (array &$profile) use ($subscribeUrl) {
$profile['remote_follow'] = version_compare($profile['version'], '2020.03', '>=') ? str_replace('/profile/', '/remote_follow/', $profile['profile_url']) : null;
$profile['subscribe'] = $subscribeUrl ? str_replace('{uri}', urlencode($profile['profile_url']), $subscribeUrl): null;
unset($profile['version']);
});
return $profiles;
}

View File

@ -2,24 +2,44 @@
namespace Friendica\Directory\Models;
use Friendica\Directory\Utils\Network;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ProfilePollQueue extends \Friendica\Directory\Model
{
public function add(string $profile_url): bool
const EMPTY_URL = 1;
const MISSING_HOST = 2;
const PRIVATE_HOST = 3;
const ALREADY_EXISTS = 4;
/**
* @param string $profile_url
* @return int 0 on success or error code
*/
public function add(string $profile_url): int
{
$url = trim($profile_url);
if (!$url) {
return false;
return self::EMPTY_URL;
}
$this->atlas->perform(
$host = parse_url($url, PHP_URL_HOST);
if (!$host) {
return self::MISSING_HOST;
}
if (!Network::isPublicHost($host)) {
return self::PRIVATE_HOST;
}
$affected = $this->atlas->fetchAffected(
'INSERT IGNORE INTO `profile_poll_queue` SET `profile_url` = :profile_url',
['profile_url' => $url]
);
return true;
return ($affected == 1 ? 0 : self::ALREADY_EXISTS);
}
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Models;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Server extends \Friendica\Directory\Model
{
@ -33,10 +33,28 @@ class Server extends \Friendica\Directory\Model
SET `server_id` = :server_id,
`alias` = :alias,
`timestamp` = NOW()
ON DUPLICATE KEY UPDATE `timestamp` = NOW()',
ON DUPLICATE KEY UPDATE
`server_id` = :server_id,
`timestamp` = NOW()',
[
'server_id' => $server_id,
'alias' => strtolower($server_alias)
]);
}
/**
* Returns the complete subscribe URL of the given profile URL if we have it for the related server
*
* @param string $profile_url
* @return mixed|null
*/
public function getSubscribeUrlByProfile(string $profile_url)
{
if (preg_match('#^(.+)/profile/#', $profile_url, $matches)) {
$server = $this->getByUrlAlias($matches[1]);
return $server['subscribe_url'] ?? null;
}
return null;
}
}

View File

@ -2,15 +2,17 @@
namespace Friendica\Directory\Pollers;
use Friendica\Directory\Utils\Network;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Directory
{
/**
* @var \Atlas\Pdo\Connection
* @var \GuzzleHttp\ClientInterface
*/
private $atlas;
private $http;
/**
* @var \Friendica\Directory\Models\ProfilePollQueue
*/
@ -28,12 +30,12 @@ class Directory
];
public function __construct(
\Atlas\Pdo\Connection $atlas,
\GuzzleHttp\ClientInterface $http,
\Friendica\Directory\Models\ProfilePollQueue $profilePollQueueModel,
\Psr\Log\LoggerInterface $logger,
array $settings)
{
$this->atlas = $atlas;
$this->http = $http;
$this->profilePollQueueModel = $profilePollQueueModel;
$this->logger = $logger;
$this->settings = array_merge($this->settings, $settings);
@ -60,7 +62,8 @@ class Directory
$profiles = $this->getPullResult($directory_url, $last_polled);
foreach ($profiles as $profile_url) {
$this->profilePollQueueModel->add($profile_url);
$result = $this->profilePollQueueModel->add($profile_url);
$this->logger->debug('Profile queue add URL: ' . $profile_url . ' - ' . $result);
}
$this->logger->info('Successfully pulled ' . count($profiles) . ' profiles');
@ -79,35 +82,7 @@ class Directory
$path = '/sync/pull/since/' . $last_polled;
}
//Prepare the CURL call.
$handle = curl_init();
$options = array(
//Timeouts
CURLOPT_TIMEOUT => max($this->settings['probe_timeout'], 1), //Minimum of 1 second timeout.
CURLOPT_CONNECTTIMEOUT => 1,
//Redirecting
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_MAXREDIRS => 8,
//SSL
CURLOPT_SSL_VERIFYPEER => true,
// CURLOPT_VERBOSE => true,
// CURLOPT_CERTINFO => true,
CURLOPT_SSL_VERIFYHOST => 2,
CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
//Basic request
CURLOPT_USERAGENT => 'friendica-directory-probe-1.0',
CURLOPT_RETURNTRANSFER => true,
CURLOPT_URL => $directory_url . $path
);
curl_setopt_array($handle, $options);
$this->logger->info('Pulling profiles from directory URL: ' . $directory_url . $path);
//Probe the site.
$pull_data = curl_exec($handle);
//Done with CURL now.
curl_close($handle);
$pull_data = $this->http->get($directory_url . $path, ['timeout' => max($this->settings['probe_timeout'], 1)])->getBody()->getContents();
$data = json_decode($pull_data, true);

View File

@ -2,11 +2,18 @@
namespace Friendica\Directory\Pollers;
use Friendica\Directory\Models;
use Friendica\Directory\Utils;
use GuzzleHttp\Exception\RequestException;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Profile
{
const PROFILE_MISSING_CONFIRM = 2;
const PROFILE_MISSING_NOTIFY = 4;
const PROFILE_MISSING_POLL = 8;
/**
* @var \Atlas\Pdo\Connection
@ -14,12 +21,17 @@ class Profile
private $atlas;
/**
* @var \Friendica\Directory\Models\Server
* @var \GuzzleHttp\ClientInterface
*/
private $http;
/**
* @var Models\Server
*/
private $serverModel;
/**
* @var \Friendica\Directory\Models\Profile
* @var Models\Profile
*/
private $profileModel;
@ -38,13 +50,15 @@ class Profile
public function __construct(
\Atlas\Pdo\Connection $atlas,
\Friendica\Directory\Models\Server $serverModel,
\Friendica\Directory\Models\Profile $profileModel,
\GuzzleHttp\ClientInterface $http,
Models\Server $serverModel,
Models\Profile $profileModel,
\Psr\Log\LoggerInterface $logger,
array $settings
)
{
$this->atlas = $atlas;
$this->http = $http;
$this->serverModel = $serverModel;
$this->profileModel = $profileModel;
$this->logger = $logger;
@ -69,12 +83,12 @@ class Profile
return false;
}
if (!\Friendica\Directory\Utils\Network::isPublicHost($host)) {
if (!Utils\Network::isPublicHost($host)) {
$this->logger->warning('Private/reserved IP in polled profile URL: ' . $profile_uri);
return false;
}
$profileUriInfo = \Friendica\Directory\Models\Profile::extractInfoFromProfileUrl($profile_uri);
$profileUriInfo = Models\Profile::extractInfoFromProfileUrl($profile_uri);
if (!$profileUriInfo) {
$this->logger->warning('Profile URI invalid');
return false;
@ -117,23 +131,42 @@ class Profile
);
}
//Skip the profile scrape?
$noscrape = $server['noscrape_url'];
$available = false;
$params = [];
if ($noscrape) {
//Skip the profile scrape?
if ($server['noscrape_url']) {
$this->logger->debug('Calling ' . $server['noscrape_url'] . '/' . $username);
$params = \Friendica\Directory\Utils\Scrape::retrieveNoScrapeData($server['noscrape_url'] . '/' . $username);
$noscrape = !!$params; //If the result was false, do a scrape after all.
try {
$params = Utils\Scrape::retrieveNoScrapeData($this->http, $server['noscrape_url'] . '/' . $username);
} catch (RequestException $e) {
$this->logger->info('Request failed with error code ' . $e->getCode());
} catch (\Throwable $e) {
$this->logger->warning('Request failed with exception ' . get_class($e));
$this->logger->warning(var_export($e, true));
}
$available = !!$params; //If the result was false, do a scrape after all.
}
if (!$noscrape) {
$this->logger->notice('Parsing profile page ' . $profile_uri);
$params = \Friendica\Directory\Utils\Scrape::retrieveProfileData($profile_uri);
if (!$available) {
$this->logger->info('Parsing profile page ' . $profile_uri);
try {
$params = Utils\Scrape::retrieveProfileData($this->http, $profile_uri);
} catch (RequestException $e) {
$this->logger->info('Request failed with error code ' . $e->getCode());
} catch (\Throwable $e) {
$this->logger->warning('Request failed with exception ' . get_class($e));
$this->logger->warning(var_export($e, true));
}
$params['language'] = $server['language'];
$available = !empty($params['fn']);
}
// Empty result is due to an offline site.
if (count($params) < 2) {
if (empty($params) || count($params) < 2) {
//But for sites that are already in bad status. Do a cleanup now.
if ($profile_id && $server['health_score'] < $this->settings['remove_profile_health_threshold']) {
$this->profileModel->deleteById($profile_id);
@ -163,14 +196,37 @@ class Profile
}
// This is most likely a problem with the site configuration. Ignore.
if (self::validateParams($params)) {
if ($error = self::validateParams($params)) {
$this->logger->warning('Poll aborted, parameters invalid.', ['params' => $params]);
if ($error & Profile::PROFILE_MISSING_CONFIRM) {
$this->logger->notice('dfrn-confirm parameter is empty.');
}
if ($error & Profile::PROFILE_MISSING_NOTIFY) {
$this->logger->notice('dfrn-notify parameter is empty.');
}
if ($error & Profile::PROFILE_MISSING_POLL) {
$this->logger->notice('dfrn-poll parameter is empty.');
}
return false;
}
$account_type = 'People';
if (!empty($params['comm'])) {
$account_type = 'Forum';
switch ($params['account-type'] ?? Models\Profile::ACCOUNT_TYPE_PERSON) {
case Models\Profile::ACCOUNT_TYPE_ORGANISATION: $account_type = 'Organization'; break;
case Models\Profile::ACCOUNT_TYPE_NEWS : $account_type = 'News'; break;
case Models\Profile::ACCOUNT_TYPE_COMMUNITY : $account_type = 'Group'; break;
case Models\Profile::ACCOUNT_TYPE_RELAY : $account_type = 'Relay'; break;
case Models\Profile::ACCOUNT_TYPE_DELETED : $account_type = 'Deleted'; break;
case Models\Profile::ACCOUNT_TYPE_PERSON: {
$account_type = 'People';
if (!empty($params['comm'])) {
$account_type = 'Group';
}
break;
}
default: $account_type = 'Unknown'; break;
}
$tags = [];
@ -188,61 +244,68 @@ class Profile
$filled_fields = intval(!empty($params['pdesc'])) * 4 + intval(!empty($params['tags'])) * 2 + intval(!empty($params['locality']) || !empty($params['region']) || !empty($params['country-name']));
$this->logger->debug(var_export($params, true));
$values = [
'profile_id' => $profile_id,
'server_id' => $server['id'],
'username' => $username,
'name' => $params['fn'],
'pdesc' => $params['pdesc'] ?? '',
'locality' => $params['locality'] ?? '',
'region' => $params['region'] ?? '',
'country' => $params['country-name'] ?? '',
'profile_url' => $profile_uri,
'photo' => $params['photo'],
'tags' => implode(' ', $tags),
'addr' => $addr,
'account_type' => $account_type,
'language' => $params['language'] ?? null,
'filled_fields'=> $filled_fields,
'last_activity'=> $params['last-activity'] ?? null,
'available' => [$available, \PDO::PARAM_BOOL],
];
$this->logger->debug(var_export($values, true));
$this->atlas->perform('INSERT INTO `profile` SET
`id` = :profile_id,
`server_id` = :server_id,
`username` = :username,
`name` = :name,
`pdesc` = :pdesc,
`locality` = :locality,
`region` = :region,
`country` = :country,
`profile_url` = :profile_url,
`dfrn_request` = :dfrn_request,
`tags` = :tags,
`addr` = :addr,
`account_type` = :account_type,
`server_id` = :server_id,
`username` = :username,
`name` = :name,
`pdesc` = :pdesc,
`locality` = :locality,
`region` = :region,
`country` = :country,
`profile_url` = :profile_url,
`photo` = :photo,
`tags` = :tags,
`addr` = :addr,
`account_type` = :account_type,
`language` = :language,
`filled_fields` = :filled_fields,
`last_activity` = :last_activity,
`available` = 1,
`available` = :available,
`created` = NOW(),
`updated` = NOW()
ON DUPLICATE KEY UPDATE
`server_id` = :server_id,
`username` = :username,
`name` = :name,
`pdesc` = :pdesc,
`locality` = :locality,
`region` = :region,
`country` = :country,
`profile_url` = :profile_url,
`dfrn_request` = :dfrn_request,
`photo` = :photo,
`tags` = :tags,
`addr` = :addr,
`account_type` = :account_type,
`server_id` = :server_id,
`username` = :username,
`name` = :name,
`pdesc` = :pdesc,
`locality` = :locality,
`region` = :region,
`country` = :country,
`profile_url` = :profile_url,
`photo` = :photo,
`tags` = :tags,
`addr` = :addr,
`account_type` = :account_type,
`language` = :language,
`filled_fields` = :filled_fields,
`last_activity` = :last_activity,
`available` = 1,
`updated` = NOW()',
[
'profile_id' => $profile_id,
'server_id' => $server['id'],
'username' => $username,
'name' => $params['fn'],
'pdesc' => $params['pdesc'] ?? '',
'locality' => $params['locality'] ?? '',
'region' => $params['region'] ?? '',
'country' => $params['country-name'] ?? '',
'profile_url' => $profile_uri,
'dfrn_request' => $params['dfrn-request'] ?? null,
'photo' => $params['photo'],
'tags' => implode(' ', $tags),
'addr' => $addr,
'account_type' => $account_type,
'filled_fields' => $filled_fields,
'last_activity' => $params['last-activity'] ?? null,
]
`available` = :available,
`updated` = NOW()',
$values
);
if (!$profile_id) {
@ -266,23 +329,27 @@ class Profile
$status = false;
if ($profile_id) {
$img_str = \Friendica\Directory\Utils\Network::fetchURL($params['photo'], true);
$img = new \Friendica\Directory\Utils\Photo($img_str);
if ($img->getImage()) {
$img->scaleImageSquare(80);
try {
$img_str = $this->http->get($params['photo'])->getBody()->getContents();
$img = new Utils\Photo($img_str);
if ($img->getImage()) {
$img->scaleImageSquare(80);
$this->atlas->perform('INSERT INTO `photo` SET
`profile_id` = :profile_id,
`data` = :data
ON DUPLICATE KEY UPDATE
`data` = :data',
[
'profile_id' => $profile_id,
'data' => $img->imageString()
]
);
$this->atlas->perform('INSERT INTO `photo` SET
`profile_id` = :profile_id,
`data` = :data
ON DUPLICATE KEY UPDATE
`data` = :data',
[
'profile_id' => $profile_id,
'data' => $img->imageString()
]
);
}
$status = true;
} catch (RequestException $e) {
$this->logger->info('Photo retrieval unsuccessful', ['url' => $params['photo'], 'code' => $e->getCode()]);
}
$status = true;
}
$submit_end = microtime(true);
@ -312,23 +379,21 @@ class Profile
return true;
}
/**
* @param array $params
* @return int
*/
private static function validateParams(array $params): int
{
$errors = 0;
if (empty($params['key'])) {
$errors++;
}
if (empty($params['dfrn-request'])) {
$errors++;
}
if (empty($params['dfrn-confirm'])) {
$errors++;
$errors &= self::PROFILE_MISSING_CONFIRM;
}
if (empty($params['dfrn-notify'])) {
$errors++;
$errors &= self::PROFILE_MISSING_NOTIFY;
}
if (empty($params['dfrn-poll'])) {
$errors++;
$errors &= self::PROFILE_MISSING_POLL;
}
return $errors;

View File

@ -2,8 +2,12 @@
namespace Friendica\Directory\Pollers;
use GuzzleHttp\Psr7\Uri;
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\TransferStats;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Server
{
@ -11,6 +15,10 @@ class Server
* @var \Atlas\Pdo\Connection
*/
private $atlas;
/**
* @var \GuzzleHttp\ClientInterface
*/
private $http;
/**
* @var \Friendica\Directory\Models\ProfilePollQueue
*/
@ -38,6 +46,7 @@ class Server
public function __construct(
\Atlas\Pdo\Connection $atlas,
\GuzzleHttp\ClientInterface $http,
\Friendica\Directory\Models\ProfilePollQueue $profilePollQueueModel,
\Friendica\Directory\Models\Server $serverModel,
\Psr\SimpleCache\CacheInterface $simplecache,
@ -45,6 +54,7 @@ class Server
array $settings)
{
$this->atlas = $atlas;
$this->http = $http;
$this->profilePollQueueModel = $profilePollQueueModel;
$this->serverModel = $serverModel;
$this->simplecache = $simplecache;
@ -85,7 +95,9 @@ class Server
$probe_result = $this->getProbeResult($polled_url);
$parse_success = !empty($probe_result['data']);
$parse_success = !empty($probe_result['data']['url']);
$avg_ping = null;
if ($parse_success) {
$base_url = $probe_result['data']['url'];
@ -142,12 +154,17 @@ class Server
$addons = $probe_result['data']['plugins'];
}
if (!empty($probe_result['data']['admin']['profile'])) {
$subscribe = $this->getSubscribeUrl($probe_result['data']['url'], $probe_result['data']['admin']['profile']);
}
$this->atlas->perform(
'UPDATE `server`
SET `available` = 1,
`last_seen` = NOW(),
`base_url` = :base_url,
`name` = :name,
`language` = :language,
`version` = :version,
`addons` = :addons,
`reg_policy` = :reg_policy,
@ -155,31 +172,49 @@ class Server
`admin_name` = :admin_name,
`admin_profile` = :admin_profile,
`noscrape_url` = :noscrape_url,
`subscribe_url` = :subscribe_url,
`ssl_state` = :ssl_state
WHERE `id` = :server_id',
[
'server_id' => $server['id'],
'base_url' => strtolower($probe_result['data']['url']),
'name' => $probe_result['data']['site_name'],
'version' => $probe_result['data']['version'],
'addons' => implode(',', $addons),
'reg_policy' => $probe_result['data']['register_policy'],
'info' => $probe_result['data']['info'],
'admin_name' => $probe_result['data']['admin']['name'],
'admin_profile' => $probe_result['data']['admin']['profile'],
'noscrape_url' => $probe_result['data']['no_scrape_url'] ?? null,
'ssl_state' => $probe_result['ssl_state']
'server_id' => $server['id'],
'base_url' => strtolower($probe_result['data']['url']),
'name' => substr($probe_result['data']['site_name'], 0, 255),
'language' => $probe_result['data']['language'] ?? null,
'version' => $probe_result['data']['version'],
'addons' => implode(',', $addons),
'reg_policy' => $probe_result['data']['register_policy'],
'info' => $probe_result['data']['info'],
'admin_name' => $probe_result['data']['admin']['name'] ?? null,
'admin_profile' => $probe_result['data']['admin']['profile'] ?? null,
'noscrape_url' => $probe_result['data']['no_scrape_url'] ?? null,
'subscribe_url' => $subscribe ?? null,
'ssl_state' => $probe_result['ssl_state']
]
);
//Add the admin to the directory
$this->profilePollQueueModel->add($probe_result['data']['admin']['profile']);
if (!empty($probe_result['data']['admin']['profile'])) {
$result = $this->profilePollQueueModel->add($probe_result['data']['admin']['profile']);
$this->logger->debug('Profile queue add URL: ' . $probe_result['data']['admin']['profile'] . ' - ' . $result);
}
$this->discoverPoco($base_url);
} else {
$this->logger->debug('Parse unsuccessful', ['$polled_url' => $polled_url, '$probe_result' => $probe_result]);
}
if ($server) {
//Get the new health.
$version = $parse_success ? $probe_result['data']['version'] : '';
$health_score = $this->computeHealthScore($server['health_score'], $parse_success, $probe_result['time'], $version, $probe_result['ssl_state']);
$health_score = $this->computeHealthScore(
$server['health_score'],
$parse_success,
$probe_result['time'],
$version,
$probe_result['ssl_state'],
$avg_ping,
$probe_result['data']['info'] ?? null
);
$this->atlas->perform(
'UPDATE `server` SET `health_score` = :health_score WHERE `id` = :server_id',
@ -219,65 +254,50 @@ class Server
private function getProbeResult(string $base_url): array
{
//Prepare the CURL call.
$handle = curl_init();
$options = array(
//Timeouts
CURLOPT_TIMEOUT => max($this->settings['probe_timeout'], 1), //Minimum of 1 second timeout.
CURLOPT_CONNECTTIMEOUT => 1,
//Redirecting
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_MAXREDIRS => 8,
//SSL
CURLOPT_SSL_VERIFYPEER => true,
// CURLOPT_VERBOSE => true,
// CURLOPT_CERTINFO => true,
CURLOPT_SSL_VERIFYHOST => 2,
CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
//Basic request
CURLOPT_USERAGENT => 'friendica-directory-probe-1.0',
CURLOPT_RETURNTRANSFER => true,
CURLOPT_URL => $base_url . '/friendica/json'
);
curl_setopt_array($handle, $options);
$curl_info = null;
$options = [
'timeout' => max($this->settings['probe_timeout'], 1),
'on_stats' => function (TransferStats $transferStats) use (&$curl_info) {
$curl_info = $transferStats->getHandlerStats();
}
];
$sslcert_issues = false;
//Probe the site.
$probe_start = microtime(true);
$probe_data = curl_exec($handle);
$probe_end = microtime(true);
$probe_data = null;
try {
//Probe the site.
$probe_data = $this->http->get($base_url . '/friendica/json', $options)->getBody()->getContents();
} catch (RequestException $e) {
if (in_array($e->getHandlerContext()['errno'] ?? 0, [
60, //Could not authenticate certificate with known CA's
83 //Issuer check failed
])) {
$sslcert_issues = true;
//Check for SSL problems.
$curl_statuscode = curl_errno($handle);
$sslcert_issues = in_array($curl_statuscode, array(
60, //Could not authenticate certificate with known CA's
83 //Issuer check failed
));
//When it's the certificate that doesn't work, we probe again without strict SSL.
$options['verify'] = false;
//When it's the certificate that doesn't work.
if ($sslcert_issues) {
//Probe again, without strict SSL.
$options[CURLOPT_SSL_VERIFYPEER] = false;
//Replace the handle.
curl_close($handle);
$handle = curl_init();
curl_setopt_array($handle, $options);
//Probe.
$probe_start = microtime(true);
$probe_data = curl_exec($handle);
$probe_end = microtime(true);
//Store new status.
$curl_statuscode = curl_errno($handle);
$probe_start = microtime(true);
try {
$probe_data = $this->http->get($base_url . '/friendica/json', $options)->getBody()->getContents();
} catch(RequestException $e) {
// Collects 404, 500 errors
$this->logger->info('SSL-non-verified URL probe failed with error code: ' . $e->getCode());
}
} else {
$this->logger->info('SSL-verified URL probe failed with error code: ' . $e->getCode());
}
} catch (\InvalidArgumentException $e) {
$this->logger->error('Invalid argument provided to HTTP client', ['base_url' => $base_url, 'exception' => $e]);
return ['data' => false, 'time' => 0, 'curl_info' => [], 'ssl_state' => null];
}
//Gather more meta.
$time = round(($probe_end - $probe_start) * 1000);
$curl_info = curl_getinfo($handle);
$probe_end = microtime(true);
//Done with CURL now.
curl_close($handle);
$time = round(($probe_end - $probe_start) * 1000);
try {
$data = json_decode($probe_data, true);
@ -297,7 +317,15 @@ class Server
return ['data' => $data, 'time' => $time, 'curl_info' => $curl_info, 'ssl_state' => $ssl_state];
}
private function computeHealthScore(int $original_health, bool $probe_success, int $time = null, string $version = null, int $ssl_state = null): int
private function computeHealthScore(
int $original_health,
bool $probe_success,
?int $time,
?string $version,
?int $ssl_state,
?float $avg_ping,
?string $description
): int
{
//Probe failed, costs you 30 points.
if (!$probe_success) {
@ -346,7 +374,7 @@ class Server
} else {
$stable_version = $this->simplecache->get('stable_version');
if (!$stable_version) {
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/master/VERSION'));
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION'));
$this->simplecache->set('stable_version', $stable_version);
}
@ -356,14 +384,108 @@ class Server
$this->simplecache->set('dev_version', $dev_version);
}
if ($version == $dev_version) {
$max_health = 95; //Develop can be unstable
$rc_version = str_replace('-dev', '-rc', $dev_version);
if ($version == $dev_version || $version == $rc_version) {
$old_max_health = $max_health;
$new_max_health = 95; //Develop/RC can be unstable
$max_health = min($old_max_health, $new_max_health);
} elseif ($version !== $stable_version) {
$delta = min($delta, 0) - 10; // Losing score as time passes if node isn't updated
}
}
}
// No description available penalty
if (!$description) {
$max_health = min(75, $max_health);
}
// No ping penalty
if (!$avg_ping) {
$max_health -= 5;
}
return max(min($max_health, $original_health + $delta), -100);
}
function discoverPoco($base_url): void
{
$uri = Uri::withQueryValues(new Uri($base_url . '/poco'), ['fields' => 'urls', 'count' => 1000]);
try {
$response = $this->http->request('GET', $uri);
} catch (RequestException $e) {
$this->logger->info('Unsuccessful poco request: ' . $uri);
return;
}
try {
$pocoFetchData = json_decode($response->getBody()->getContents());
} catch (\Throwable $e) {
$this->logger->notice('Invalid JSON string for PoCo URL: ' . $uri);
return;
}
if (!isset($pocoFetchData->entry)) {
$this->logger->notice('Invalid JSON structure for PoCo URL: ' . $uri);
return;
}
foreach($pocoFetchData->entry as $entry) {
if (empty($entry->urls)) {
continue;
}
foreach ($entry->urls as $url) {
if (!empty($url->type) && !empty($url->value) && $url->type == 'profile') {
$result = $this->profilePollQueueModel->add($url->value);
if ($result === 0) {
$this->logger->info('Discovered profile URL ' . $url->value);
}
}
}
}
}
public function getSubscribeUrl($base_url, $profile)
{
$uri = Uri::withQueryValues(new Uri($base_url . '/xrd'), ['uri' => $profile]);
try {
$response = $this->http->request('GET', $uri, ['headers' => ['Accept' => 'application/jrd+json']]);
} catch (RequestException $e) {
$this->logger->info('Unsuccessful xrd request: ' . $uri);
return null;
}
$xrdJsonData = $response->getBody()->getContents();
$this->logger->debug('WebRequest: ' . $uri . ' Status: ' . $response->getStatusCode());
if ($response->getStatusCode() != 200) {
$this->logger->info('Unsuccessful XRD request: ' . $uri);
return null;
}
try {
$xrdData = json_decode($xrdJsonData);
} catch (\Throwable $e) {
$this->logger->notice('Invalid JSON string for XRD URL: ' . $uri);
return null;
}
if (!isset($xrdData->links)) {
$this->logger->notice('Invalid JSON structure for XRD URL: ' . $uri);
return null;
}
foreach ($xrdData->links as $link) {
if ($link->rel == 'http://ostatus.org/schema/1.0/subscribe') {
return $link->template ?? null;
}
}
return null;
}
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Routes\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
abstract class BaseRoute
{

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Routes\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class DirectoryAdd extends BaseRoute
{

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Routes\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class DirectoryPoll extends BaseRoute
{
@ -11,7 +11,7 @@ class DirectoryPoll extends BaseRoute
{
return (new \Friendica\Directory\Controllers\Console\DirectoryPoll(
$this->container->get('atlas'),
$this->container->get('\Friendica\Directory\Pollers\Directory'),
$this->container->get(\Friendica\Directory\Pollers\Directory::class),
$args
));
}

View File

@ -0,0 +1,17 @@
<?php
namespace Friendica\Directory\Routes\Console;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ExtractStrings extends BaseRoute
{
public function __invoke(array $args)
{
return (new \Friendica\Directory\Controllers\Console\ExtractStrings(
$this->container->get('settings')['i18n']['path'],
$args
));
}
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Routes\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Install extends BaseRoute
{

View File

@ -0,0 +1,17 @@
<?php
namespace Friendica\Directory\Routes\Console;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ProfileAdd extends BaseRoute
{
public function __invoke(array $args)
{
return (new \Friendica\Directory\Controllers\Console\ProfileAdd(
$this->container->get(\Friendica\Directory\Models\ProfilePollQueue::class),
$args
));
}
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Routes\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ProfileHide extends BaseRoute
{

View File

@ -3,14 +3,14 @@
namespace Friendica\Directory\Routes\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ProfilePoll extends BaseRoute
{
public function __invoke(array $args)
{
return (new \Friendica\Directory\Controllers\Console\ProfilePoll(
$this->container->get('\Friendica\Directory\Pollers\Profile'),
$this->container->get(\Friendica\Directory\Pollers\Profile::class),
$args
));
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Routes\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ServerHide extends BaseRoute
{
@ -11,7 +11,7 @@ class ServerHide extends BaseRoute
{
return (new \Friendica\Directory\Controllers\Console\ServerHide(
$this->container->get('atlas'),
$this->container->get('\Friendica\Directory\Models\Server'),
$this->container->get(\Friendica\Directory\Models\Server::class),
$args
));
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Routes\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class ServerPoll extends BaseRoute
{
@ -11,7 +11,7 @@ class ServerPoll extends BaseRoute
{
return (new \Friendica\Directory\Controllers\Console\ServerPoll(
$this->container->get('atlas'),
$this->container->get('\Friendica\Directory\Pollers\Server'),
$this->container->get(\Friendica\Directory\Pollers\Server::class),
$args
));
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Routes\Console;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class UpdateDb extends BaseRoute
{

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Routes\Http;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
abstract class BaseRoute
{

View File

@ -1,20 +0,0 @@
<?php
namespace Friendica\Directory\Routes\Http;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
*/
class Directory extends BaseRoute
{
public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
{
return (new \Friendica\Directory\Controllers\Web\Directory(
$this->container->atlas,
$this->container->get('\Friendica\Directory\Models\Profile'),
$this->container->get('\Friendica\Directory\Views\Widget\AccountTypeTabs'),
$this->container->renderer,
$this->container->l10n)
)->render($request, $response, $args);
}
}

View File

@ -0,0 +1,17 @@
<?php
namespace Friendica\Directory\Routes\Http;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class MatchSearch extends BaseRoute
{
public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
{
return (new \Friendica\Directory\Controllers\Api\MatchSearch(
$this->container->get(\Friendica\Directory\Models\Profile::class),
$this->container->l10n
))->render($request, $response, $args);
}
}

View File

@ -3,14 +3,15 @@
namespace Friendica\Directory\Routes\Http;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Photo extends BaseRoute
{
public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
{
return (new \Friendica\Directory\Controllers\Web\Photo(
$this->container->atlas
return (new \Friendica\Directory\Controllers\Api\Photo(
$this->container->atlas,
$this->container->get('defaultProfilePictureSmallPath')
))->render($request, $response, $args);
}
}

View File

@ -3,28 +3,15 @@
namespace Friendica\Directory\Routes\Http;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Search extends BaseRoute
{
public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
{
if ($request->getAttribute('negotiation')->getMediaType() == 'application/json') {
$controller = new \Friendica\Directory\Controllers\Api\Search(
$this->container->atlas,
$this->container->get('\Friendica\Directory\Models\Profile'),
$this->container->l10n
);
} else {
$controller = new \Friendica\Directory\Controllers\Web\Search(
$this->container->atlas,
$this->container->get('\Friendica\Directory\Models\Profile'),
$this->container->get('\Friendica\Directory\Views\Widget\AccountTypeTabs'),
$this->container->renderer,
$this->container->l10n
);
}
return $controller->render($request, $response, $args);
return (new \Friendica\Directory\Controllers\Api\Search(
$this->container->get(\Friendica\Directory\Models\Profile::class),
$this->container->l10n
))->render($request, $response, $args);
}
}

View File

@ -1,19 +0,0 @@
<?php
namespace Friendica\Directory\Routes\Http;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
*/
class Servers extends BaseRoute
{
public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
{
return (new \Friendica\Directory\Controllers\Web\Servers(
$this->container->atlas,
$this->container->renderer,
$this->container->l10n,
$this->container->simplecache)
)->render($request, $response);
}
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Routes\Http;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Submit extends BaseRoute
{
@ -11,7 +11,7 @@ class Submit extends BaseRoute
{
return (new \Friendica\Directory\Controllers\Api\Submit(
$this->container->atlas,
$this->container->get('\Friendica\Directory\Models\ProfilePollQueue'),
$this->container->get(\Friendica\Directory\Models\ProfilePollQueue::class),
$this->container->logger
))->execute($request, $response);
}

View File

@ -0,0 +1,16 @@
<?php
namespace Friendica\Directory\Routes\Http;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Surprise extends BaseRoute
{
public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
{
return (new \Friendica\Directory\Controllers\Api\Surprise(
$this->container->atlas
))->render($request, $response, $args);
}
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Routes\Http;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class SyncPull extends BaseRoute
{

View File

@ -0,0 +1,46 @@
<?php
namespace Friendica\Directory\Routes\Web;
use Friendica\Directory\Controllers\Web\BaseController;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
abstract class BaseRoute
{
/**
* @var \Slim\Container
*/
protected $container;
/**
* @var BaseController
*/
protected $controller;
public function __construct(\Slim\Container $container)
{
$this->container = $container;
}
public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
{
$defaults = [
'pages' => glob(__DIR__ . '/../../../../config/pages/*.html'),
'version' => file_get_contents(__DIR__ . '/../../../../VERSION'),
'languages' => $this->container->settings['i18n']['locales'],
'lang' => $request->getAttribute('locale'),
'baseUrl' => $request->getUri()->getBaseUrl(),
'content' => '',
'noNavSearch' => false
];
$values = $this->controller->render($request, $response, $args);
$values = $values + $defaults;
// Render index view
return $this->container->renderer->render($response, 'layout.phtml', $values);
}
}

View File

@ -0,0 +1,23 @@
<?php
namespace Friendica\Directory\Routes\Web;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Directory extends BaseRoute
{
public function __construct(\Slim\Container $container)
{
parent::__construct($container);
$this->controller = new \Friendica\Directory\Controllers\Web\Directory(
$this->container->atlas,
$this->container->get(\Friendica\Directory\Models\Server::class),
$this->container->get(\Friendica\Directory\Models\Profile::class),
$this->container->get(\Friendica\Directory\Views\Widget\AccountTypeTabs::class),
$this->container->renderer,
$this->container->l10n
);
}
}

View File

@ -0,0 +1,18 @@
<?php
namespace Friendica\Directory\Routes\Web;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Pages extends BaseRoute
{
public function __construct(\Slim\Container $container, $pageFile)
{
parent::__construct($container);
$this->controller = new \Friendica\Directory\Controllers\Web\Page(
$pageFile
);
}
}

View File

@ -0,0 +1,23 @@
<?php
namespace Friendica\Directory\Routes\Web;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Search extends BaseRoute
{
public function __construct(\Slim\Container $container)
{
parent::__construct($container);
$this->controller = new \Friendica\Directory\Controllers\Web\Search(
$this->container->atlas,
$this->container->get(\Friendica\Directory\Models\Server::class),
$this->container->get(\Friendica\Directory\Models\Profile::class),
$this->container->get(\Friendica\Directory\Views\Widget\AccountTypeTabs::class),
$this->container->renderer,
$this->container->l10n
);
}
}

View File

@ -0,0 +1,21 @@
<?php
namespace Friendica\Directory\Routes\Web;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Servers extends BaseRoute
{
public function __construct(\Slim\Container $container)
{
parent::__construct($container);
$this->controller = new \Friendica\Directory\Controllers\Web\Servers(
$this->container->atlas,
$this->container->renderer,
$this->container->l10n,
$this->container->simplecache
);
}
}

View File

@ -0,0 +1,20 @@
<?php
namespace Friendica\Directory\Routes\Web;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Statistics extends BaseRoute
{
public function __construct(\Slim\Container $container)
{
parent::__construct($container);
$this->controller = new \Friendica\Directory\Controllers\Web\Statistics(
$this->container->atlas,
$this->container->simplecache,
$this->container->renderer
);
}
}

215
src/classes/Utils/L10n.php Normal file
View File

@ -0,0 +1,215 @@
<?php
namespace Friendica\Directory\Utils;
use Gettext\Languages\Language;
use Gettext\Translator;
/**
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class L10n
{
const DECIMAL = 1;
const PERCENT = 2;
public static $languages = [
'af' => 'Afrikaans',
'ak' => 'Akan',
'am' => 'አማርኛ',
'ar' => 'العربية',
'as' => 'অসমীয়া',
'az' => 'Azərbaycan',
'be' => 'Беларуская',
'bg' => 'Български',
'bm' => 'Bamanakan',
'bn' => 'বাংলা',
'bo' => 'བོད་སྐད་',
'br' => 'Brezhoneg',
'bs' => 'Bosanski',
'ca' => 'Català',
'cs' => 'Čeština',
'cy' => 'Cymraeg',
'da' => 'Dansk',
'de' => 'Deutsch',
'de_AT' => 'Österreichisches Deutsch',
'de_CH' => 'Schweizer Hochdeutsch',
'dz' => 'རྫོང་ཁ',
'ee' => 'Eʋegbe',
'el' => 'Ελληνικά',
'en' => 'English',
'en_AU' => 'Australian English',
'en_CA' => 'Canadian English',
'en_GB' => 'British English',
'en_US' => 'American English',
'eo' => 'Esperanto',
'es' => 'Español',
'es_ES' => 'Español De España',
'es_MX' => 'Español De México',
'et' => 'Eesti',
'eu' => 'Euskara',
'fa' => 'فارسی',
'ff' => 'Pulaar',
'fi' => 'Suomi',
'fo' => 'Føroyskt',
'fr' => 'Français',
'fr_CA' => 'Français Canadien',
'fr_CH' => 'Français Suisse',
'fy' => 'West-Frysk',
'ga' => 'Gaeilge',
'gd' => 'Gàidhlig',
'gl' => 'Galego',
'gu' => 'ગુજરાતી',
'gv' => 'Gaelg',
'ha' => 'Hausa',
'he' => 'עברית',
'hi' => 'हिन्दी',
'hr' => 'Hrvatski',
'hu' => 'Magyar',
'hy' => 'Հայերեն',
'id' => 'Bahasa Indonesia',
'ig' => 'Igbo',
'ii' => 'ꆈꌠꉙ',
'is' => 'Íslenska',
'it' => 'Italiano',
'ja' => '日本語',
'ka' => 'ქართული',
'ki' => 'Gikuyu',
'kk' => 'Қазақ Тілі',
'kl' => 'Kalaallisut',
'km' => 'ខ្មែរ',
'kn' => 'ಕನ್ನಡ',
'ko' => '한국어',
'ks' => 'کٲشُر',
'kw' => 'Kernewek',
'ky' => 'Кыргызча',
'la' => 'Lingua Latina',
'lb' => 'Lëtzebuergesch',
'lg' => 'Luganda',
'ln' => 'Lingála',
'lo' => 'ລາວ',
'lt' => 'Lietuvių',
'lu' => 'Tshiluba',
'lv' => 'Latviešu',
'mg' => 'Malagasy',
'mk' => 'Македонски',
'ml' => 'മലയാളം',
'mn' => 'Монгол',
'mr' => 'मराठी',
'ms' => 'Bahasa Melayu',
'mt' => 'Malti',
'my' => 'ဗမာ',
'nb' => 'Norsk Bokmål',
'nd' => 'Isindebele',
'ne' => 'नेपाली',
'nl' => 'Nederlands',
'nl_BE' => 'Vlaams',
'nn' => 'Nynorsk',
'no' => 'Norsk',
'om' => 'Oromoo',
'or' => 'ଓଡ଼ିଆ',
'os' => 'Ирон',
'pa' => 'ਪੰਜਾਬੀ',
'pl' => 'Polski',
'ps' => 'پښتو',
'pt' => 'Português',
'pt_BR' => 'Português Do Brasil',
'pt_PT' => 'Português Europeu',
'qu' => 'Runasimi',
'rm' => 'Rumantsch',
'rn' => 'Ikirundi',
'ro' => 'Română',
'ro_MD' => 'Moldovenească',
'ru' => 'Русский',
'rw' => 'Kinyarwanda',
'se' => 'Davvisámegiella',
'sg' => 'Sängö',
'sh' => 'Srpskohrvatski',
'si' => 'සිංහල',
'sk' => 'Slovenčina',
'sl' => 'Slovenščina',
'sn' => 'Chishona',
'so' => 'Soomaali',
'sq' => 'Shqip',
'sr' => 'Српски',
'sv' => 'Svenska',
'sw' => 'Kiswahili',
'ta' => 'தமிழ்',
'te' => 'తెలుగు',
'th' => 'ไทย',
'ti' => 'ትግርኛ',
'tl' => 'Tagalog',
'to' => 'Lea Fakatonga',
'tr' => 'Türkçe',
'ug' => 'ئۇيغۇرچە',
'uk' => 'Українська',
'ur' => 'اردو',
'uz' => 'Oʻzbekcha',
'vi' => 'Tiếng Việt',
'yi' => 'ייִדיש',
'yo' => 'Èdè Yorùbá',
'zh' => '中文',
'zh_Hans' => '简体中文',
'zh_Hant' => '繁體中文',
'zu' => 'Isizulu',
];
public static function localeToLanguageString($locale)
{
$lang = substr($locale, 0, 2);
$foundLocale = false;
$foundLang = false;
foreach(self::$languages as $key => $language) {
if (strtolower($key) == strtolower($lang)) {
$foundLang = $language;
}
if (strtolower($key) == strtolower(str_replace('-', '_', $locale))) {
$foundLocale = $language;
break;
}
}
return $foundLocale ?: $foundLang ?: $locale;
}
/**
* @param float|int $number
* @param int $style
* @return string
*/
public static function formatNumber($number, $style = self::DECIMAL)
{
$locale = localeconv();
switch($style) {
case self::PERCENT:
$number *= 100;
if (\intval($number) == $number) {
$decimals = 0;
} else {
$decimals = 2;
}
$return = number_format($number, $decimals,
$locale['decimal_point'],
$locale['thousands_sep']) . '%';
break;
case self::DECIMAL:
default:
if (\intval($number) == $number) {
$decimals = 0;
} else {
$decimals = 2;
}
$return = number_format($number, $decimals,
$locale['decimal_point'],
$locale['thousands_sep']);
break;
}
return $return;
}
}

View File

@ -11,31 +11,10 @@ namespace Friendica\Directory\Utils;
/**
* Description of Network
*
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Network
{
public static function fetchURL(string $url, bool $binary = false, int $timeout = 20): string
{
$ch = curl_init($url);
if (!$ch) {
return false;
}
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_TIMEOUT, max(intval($timeout), 1)); //Minimum of 1 second timeout.
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch, CURLOPT_MAXREDIRS, 8);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
if ($binary) {
curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1);
}
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
$s = curl_exec($ch);
curl_close($ch);
return $s;
}
/**
* Check if a hostname is public and non-reserved
*
@ -57,6 +36,13 @@ class Network
return false;
}
// RFC 2606 -continued
$tld = substr($host, strrpos($host, '.'));
if ($tld === '.test' || $tld === '.example' || $tld === '.invalid' || $tld === '.localhost') {
return false;
}
// Private/Reserved IP ranges
if (filter_var($host, FILTER_VALIDATE_IP) && !filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
return false;
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Utils;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Photo
{

View File

@ -2,8 +2,10 @@
namespace Friendica\Directory\Utils;
use GuzzleHttp\ClientInterface;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class Scrape
{
@ -12,10 +14,10 @@ class Scrape
* @param string $url
* @return array|false
*/
public static function retrieveNoScrapeData(string $url)
public static function retrieveNoScrapeData(ClientInterface $http, string $url)
{
$submit_noscrape_start = microtime(true);
$data = Network::fetchURL($url);
$data = $http->get($url)->getBody()->getContents();
$submit_noscrape_request_end = microtime(true);
if (empty($data)) {
@ -23,7 +25,7 @@ class Scrape
}
$params = json_decode($data, true);
if (!$params || !count($params)) {
if (empty($params) || !is_array($params)) {
return false;
}
@ -42,7 +44,7 @@ class Scrape
return $params;
}
public static function retrieveProfileData(string $url, int $max_nodes = 3500): array
public static function retrieveProfileData(ClientInterface $http, string $url, int $max_nodes = 3500): array
{
$minNodes = 100; //Lets do at least 100 nodes per type.
@ -56,7 +58,7 @@ class Scrape
$scrape_start = microtime(true);
$params = [];
$html = Network::fetchURL($url, $timeout);
$html = $http->get($url, ['timeout' => $timeout])->getBody()->getContents();;
$scrape_fetch_end = microtime(true);
@ -129,7 +131,7 @@ class Scrape
$nodes_left = max(intval($max_nodes), $minNodes);
$items = $dom->getElementsByTagName('*');
$targets = array('fn', 'pdesc', 'photo', 'key', 'locality', 'region', 'postal-code', 'country-name');
$targets = array('fn', 'pdesc', 'photo', 'locality', 'region', 'postal-code', 'country-name');
$targets_left = count($targets);
foreach ($items as $item) {
if (self::attributeContains($item->getAttribute('class'), 'vcard')) {
@ -147,10 +149,6 @@ class Scrape
$params['photo'] = $vcard_element->getAttribute('src');
$targets_left = self::popScrapeTarget($targets, 'photo');
}
if (self::attributeContains($vcard_element->getAttribute('class'), 'key')) {
$params['key'] = $vcard_element->textContent;
$targets_left = self::popScrapeTarget($targets, 'key');
}
if (self::attributeContains($vcard_element->getAttribute('class'), 'locality')) {
$params['locality'] = $vcard_element->textContent;
$targets_left = self::popScrapeTarget($targets, 'locality');

View File

@ -2,10 +2,27 @@
namespace Friendica\Directory\Views;
use Slim\Router;
/**
* Zend-Escaper wrapper for Slim PHP Renderer
*
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*
* @method string escapeHtml(string $value)
* @method string escapeHtmlAttr(string $value)
* @method string escapeCss(string $value)
* @method string escapeJs(string $value)
* @method string escapeUrl(string $value)
* @method string noop(string $original)
* @method string gettext(string $original)
* @method string ngettext(string $original, string $plural, string $value)
* @method string dngettext(string $domain, string $original, string $plural, string $value)
* @method string npgettext(string $context, string $original, string $plural, string $value)
* @method string pgettext(string $context, string $original)
* @method string dgettext(string $domain, string $original)
* @method string dpgettext(string $domain, string $context, string $original)
* @method string dnpgettext(string $domain, string $context, string $original, string $plural, string $value)
*/
class PhpRenderer extends \Slim\Views\PhpRenderer
{
@ -14,13 +31,18 @@ class PhpRenderer extends \Slim\Views\PhpRenderer
*/
private $escaper;
/**
* @var \Friendica\Directory\Content\L10n
* @var \Gettext\TranslatorInterface
*/
private $l10n;
/**
* @var Router
*/
private $router;
public function __construct(
\Zend\Escaper\Escaper $escaper,
\Friendica\Directory\Content\L10n $l10n,
\Gettext\TranslatorInterface $l10n,
Router $router,
string $templatePath = "",
array $attributes = array()
)
@ -29,6 +51,7 @@ class PhpRenderer extends \Slim\Views\PhpRenderer
$this->escaper = $escaper;
$this->l10n = $l10n;
$this->router = $router;
}
public function e(string $value): string
@ -36,28 +59,157 @@ class PhpRenderer extends \Slim\Views\PhpRenderer
return $this->escapeHtml($value);
}
public function escapeHtml(string $value): string
public function __call($name, $arguments)
{
return $this->escaper->escapeHtml($value);
if (method_exists($this->escaper, $name)) {
return $this->escaper->$name(...$arguments);
} elseif (method_exists($this->l10n, $name)) {
return $this->l10n->$name(...$arguments);
} else {
throw new \Exception('Unknown PhpRenderer magic method: ' . $name);
}
}
public function escapeCss(string $value): string
/**
* Returns the translation of a string.
*
* Loose copy of Gettext/gettext global __() function
*
* Usages:
* - $this->__('Label')
* - $this->__('Label %s', $value)
*
* @param $original
* @param array $args
* @return string
*/
public function __(string $original, ...$args)
{
return $this->escaper->escapeCss($value);
$text = $this->l10n->gettext($original);
if (!count($args)) {
return $text;
}
return is_array($args[0]) ? strtr($text, $args[0]) : vsprintf($text, $args);
}
public function escapeJs(string $value): string
/**
* Returns the translation of a string in a specific context.
*
* @param string $context
* @param string $original
* @param array $args
* @return string
*/
function p__(string $context, string $original, ...$args)
{
return $this->escaper->escapeJs($value);
$text = $this->l10n->pgettext($context, $original);
if (!count($args)) {
return $text;
}
return is_array($args[0]) ? strtr($text, $args[0]) : vsprintf($text, $args);
}
public function escapeHtmlAttr(string $value): string
/**
* Returns the translation of a string in a specific domain.
*
* @param string $domain
* @param string $original
* @param array $args
* @return string
*/
function d__(string $domain, string $original, ...$args)
{
return $this->escaper->escapeHtmlAttr($value);
$text = $this->l10n->dgettext($domain, $original);
if (!count($args)) {
return $text;
}
return is_array($args[0]) ? strtr($text, $args[0]) : vsprintf($text, $args);
}
public function escapeUrl(string $value): string
/**
* Returns the singular/plural translation of a string.
*
* Loose copy of Gettext/gettext global n__() function
*
* Usages:
* - $this->n__('Label', 'Labels', 3)
* - $this->n__('%d Label for %s', '%d Labels for %s', 3, $value)
*
* @param string $original
* @param string $plural
* @param int $count
* @param array $args
*
* @return string
*/
function n__(string $original, string $plural, int $count, ...$args)
{
return $this->escaper->escapeUrl($value);
$text = $this->l10n->ngettext($original, $plural, $count);
array_unshift($args, $count);
return !empty($args[1]) && is_array($args[1]) ? strtr($text, $args[1]) : vsprintf($text, $args);
}
/**
* Returns the singular/plural translation of a string in a specific context
*
* Usages:
* - $this->n__('search', 'Label', 'Labels', 3)
* - $this->n__('search', '%d Label for %s', '%d Labels for %s', 3, $value)
*
* @param string $context
* @param string $original
* @param string $plural
* @param int $count
* @param array ...$args
* @return string
*/
function np__(string $context, string $original, string $plural, int $count, array ...$args)
{
$text = $this->l10n->npgettext($context, $original, $plural, $count);
array_unshift($args, $count);
return !empty($args[1]) && is_array($args[1]) ? strtr($text, $args[1]) : vsprintf($text, $args);
}
/**
* Return the URL of the provided route and parameters
*
* @param string $name
* @param array $data
* @param array $queryParams
* @return string
*/
function r(string $name, array $data = [], array $queryParams = [])
{
if ($this->getAttribute('zrl')) {
$queryParams['zrl'] = $this->getAttribute('zrl');
}
return $this->router->pathFor($name, $data, $queryParams);
}
/**
* Add sitewide ZRL support for external URLs
*
* @param string $url
*/
function u(string $url)
{
if ($this->getAttribute('zrl')) {
$uri = new \ByJG\Util\Uri($url);
$uri->withQueryKeyValue('zrl', $this->getAttribute('zrl'), false);
$url = $uri->__toString();
}
return $url;
}
}

View File

@ -3,7 +3,7 @@
namespace Friendica\Directory\Views\Widget;
/**
* @author Hypolite Petovan <mrpetovan@gmail.com>
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class AccountTypeTabs
{
@ -27,28 +27,46 @@ class AccountTypeTabs
$this->router = $router;
}
public function render(string $route_name, string $current_type = '', array $queryParams = []): string
public function render(string $route_name, string $current_type = '', $condition = '', $values = [], array $queryParams = []): string
{
$stmt = '
SELECT DISTINCT(`account_type`) AS `account_type`
FROM `profile`
WHERE `available`
AND NOT `hidden`';
$account_types = $this->connection->fetchAll($stmt);
if ($condition) {
$condition = 'AND ' . $condition;
}
$stmt = 'SELECT `account_type`, COUNT(*) AS `count`
FROM `profile` p
JOIN `server` s ON s.`id` = p.`server_id` AND s.`available` AND NOT s.`hidden`
WHERE p.`available`
AND NOT p.`hidden`
' . $condition . '
GROUP BY p.`account_type`
ORDER BY `count` DESC';
$account_types = $this->connection->fetchAll($stmt, $values);
$tabs = [
[
'title' => 'All',
'title' => $this->renderer->p__('account-type', 'All'),
'link' => $this->router->pathFor($route_name, [], $queryParams),
'active' => empty($current_type)
]
];
foreach ($account_types as $account_type) {
switch ($account_type['account_type']) {
case 'People' : $title = $this->renderer->np__('account-type', 'People (%d)' , 'People (%d)' , $account_type['count']); break;
case 'News' : $title = $this->renderer->np__('account-type', 'News (%d)' , 'News (%d)' , $account_type['count']); break;
case 'Organization': $title = $this->renderer->np__('account-type', 'Organization (%d)', 'Organizations (%d)', $account_type['count']); break;
// Kept for backward compatibility
case 'Forum' :
case 'Group' : $title = $this->renderer->np__('account-type', 'Group (%d)' , 'Groups (%d)' , $account_type['count']); break;
default: $title = $this->renderer->np__('account-type', $account_type['account_type']. ' (%d)', $account_type['account_type']. ' (%d)', $account_type['count']);
}
$tabs[] = [
'title' => $account_type['account_type'],
'title' => $title,
'link' => $this->router->pathFor($route_name, ['account_type' => strtolower($account_type['account_type'])], $queryParams),
'active' => strtolower($account_type['account_type']) == strtolower($current_type)
'active' => strtolower($account_type['account_type']) == strtolower($current_type),
'disabled' => $account_type['count'] == 0
];
}

Some files were not shown because too many files have changed in this diff Show More