diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 0000000..7f6b222 --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "web/components/" +} diff --git a/.gitignore b/.gitignore index 6d98c4e..28eb5fc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,13 +2,12 @@ /.mage/logs/*.log /composer.lock /vendor/ -/propel.yaml +/propel.yml /src/Gist/Model/Base/ /src/Gist/Model/Map/ +/web/components/ /app/propel/ -/node_modules/ /app/config/config.yml /app/config/propel/ /data/ /trans/ -/cache/ diff --git a/.mage/config/environment/.gitignore b/.mage/config/environment/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/.mage/config/environment/prod.yml.dist b/.mage/config/environment/prod.yml.dist new file mode 100644 index 0000000..a5bcb3b --- /dev/null +++ b/.mage/config/environment/prod.yml.dist @@ -0,0 +1,28 @@ +# prod +# Rename this file to "prod.yml" +deployment: + user: gist + from: ./ + to: /var/www/gist/ + excludes: + - "*.svn" + - "*.git" + - "*.swp" + - "app/config/config.yml" + - "app/config/propel/" + - "app/propel/" + - "data/git" + - "deploy" + - "tags" + - "propel.yaml" + - "composer.lock" + - "composer.json" + - "bower.json" + - ".bowerrc" +hosts: + - gist.mycompany.com +tasks: + pre-deploy: + on-deploy: + post-deploy: +verbose_logging: true diff --git a/.mage/config/general.yml b/.mage/config/general.yml new file mode 100644 index 0000000..cff23fa --- /dev/null +++ b/.mage/config/general.yml @@ -0,0 +1,7 @@ +# global settings +name: Gist +email: +notifications: false +logging: true +maxlogs: 30 +ssh_needs_tty: false diff --git a/.mage/logs/.gitignore b/.mage/logs/.gitignore new file mode 100644 index 0000000..c96a04f --- /dev/null +++ b/.mage/logs/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/.mage/tasks/.gitignore b/.mage/tasks/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md deleted file mode 100644 index 8d29688..0000000 --- a/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,26 +0,0 @@ -## Environment - -* GIST version or GIT commit: ... -* PHP Version: ... -* GIT version. ... -* HTTPD (Nginx, Apache2): ... -* DBMS (MySQL, SQLite, PostgreSQL): ... - - -## Description - -... - -### Steps to reproduce - -1. ... -2. ... -3. ... - -#### Observed Results - -... - -#### Expected Results - -... diff --git a/Makefile b/Makefile index 6b5a389..599de5e 100644 --- a/Makefile +++ b/Makefile @@ -1,58 +1,54 @@ COMPOSER ?= composer -NPM ?= npm +BOWER ?= bower GIT ?= git MKDIR ?= mkdir PHP ?= php -RM ?= rm -all: update clean-cache +all: update composer: - @echo "Installing PHP dependencies" - @echo "---------------------------" - @echo + @echo "Installing application's dependencies" + @echo "-------------------------------------" + @echo - ${COMPOSER} install + $(COMPOSER) install $(COMPOSER_INSTALL_FLAGS) +bower: + @echo "Installing application's dependencies" + @echo "-------------------------------------" + @echo -npm: - @echo "Installing CSS/JS dependencies" - @echo "------------------------------" - @echo + $(BOWER) install - ${NPM} install - ${NPM} update +optimize: + @echo "Optimizing Composer's autoloader, can take some time" + @echo "----------------------------------------------------" + @echo + + $(COMPOSER) dump-autoload --optimize update: @echo "Updating application's dependencies" @echo "-----------------------------------" - @echo + @echo - ${GIT} pull origin master + sh -c 'test -d app && $(GIT) add app && $(GIT) commit -m "Configuration"' + $(GIT) pull origin master ${MKDIR} -p data/git - ${MKDIR} -p data/cache - ${COMPOSER} update - ${NPM} install - ${NPM} update - -clean-cache: - @echo "Removing cache" - @echo "--------------" - @echo - - ${RM} -fr cache/* + $(COMPOSER) update + $(BOWER) install run: @echo "Run development server" @echo "----------------------" - @echo + @echo - ${PHP} -S 127.0.0.1:8080 -t web + $(PHP) -S 127.0.0.1:8080 -t web propel: @echo "Propel migration" @echo "----------------" - @echo - + @echo + ./vendor/propel/propel/bin/propel config:convert ./vendor/propel/propel/bin/propel model:build --recursive ./vendor/propel/propel/bin/propel migration:diff --recursive diff --git a/README.md b/README.md index ccbff71..5da7741 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,293 @@ +Table of Contents +================= + + * [GIST](#gist) + * [Requirements](#requirements) + * [Git](#git) + * [Composer](#composer) + * [Bower](#bower) + * [Installation](#installation) + * [Upgrade](#upgrade) + * [Configuration](#configuration) + * [Makefile](#makefile) + * [API](#api) + * [Console](#console) + * [Deployment](#deployment) + * [Contributors](#contributors) + + GIST ==== GIST is an open-source application to share code. https://www.deblan.io/post/517/gist-est-dans-la-place -**[Read the wiki for more information](https://gitnet.fr/deblan/gist/wiki/_pages).** +![Gist](https://upload.deblan.org/u/2015-11/565b93a5.png "Gist") -### Editor +![Gist](https://upload.deblan.org/u/2016-06/57655dec.png "Gist") -![Gist](https://upload.deblan.org/u/2018-08/5b7ab7a6.png "Gist editor") -### Result +Requirements +------------ -![Gist](https://upload.deblan.org/u/2018-08/5b7ab7d4.png "Gist result") +* PHP >= 5.4 +* GIT +* MySQL, PostgreSQL or SQLite +* Composer (php) +* Bower (node) -### Account +### Git -![Gist](https://upload.deblan.org/u/2018-08/5b7aba2d.png "Gist account") +Git can maybe be downloaded from your system's repositories. -### Embeded Gist + $ git config --global user.email "you@example.com" + $ git config --global user.name "Your Name" -![Gist](https://upload.deblan.org/u/2018-08/5b7ab81c.png "Embeded Gist") +### Composer + +Composer can maybe be downloaded from your system's repositories. +Else, follow the next instructions: + + # With cURL + $ curl -sS https://getcomposer.org/installer | php + + # With Wget + $ wget -O - -q https://getcomposer.org/installer | php + + $ chmod +x composer.phar + + # For a local installation and if the envvar PATH contains "$HOME/bin/" + $ mv composer.phar ~/bin/composer + + # For a global installation + $ sudo mv composer.phar /usr/local/bin/composer + +### Bower + + $ sudo apt-get install npm + $ sudo npm install -g bower + +Installation +------------ + + $ cd /path/to/www/ + $ git clone https://gitnet.fr/deblan/gist + $ cd gist + $ make + $ cp propel-dist.yaml propel.yaml + +Edit `propel.yaml`. **Use spaces instead of tabulations**. + +**MySQL** + + propel: + database: + connections: + default: + adapter: mysql + # http://www.php.net/manual/en/ref.pdo-mysql.connection.php + dsn: "mysql:host=DATABASE_SERVER;dbname=DATABASE_NAME" + user: DATEBASE_USER + password: DATEBASE_PASSWORD + settings: + charset: utf8 + queries: + utf8: "SET NAMES utf8 COLLATE utf8_unicode_ci, COLLATION_CONNECTION = utf8_unicode_ci, COLLATION_DATABASE = utf8_unicode_ci, COLLATION_SERVER = utf8_unicode_ci" + + [...] + +**SQLITE** + + propel: + database: + connections: + default: + adapter: sqlite + # http://www.php.net/manual/en/ref.pdo-sqlite.connection.php + dsn: "sqlite:/PATH/TO/gist.sqlite" + user: ~ + password: ~ + + [...] + +Then `$ make propel`. + +**Versions >= 1.4.4 only**: `$ cp app/config/config.yml.dist app/config/config.yml` + +See the [configuration section](#configuration) for more information about configuration. + +--- + +The web server must have permission to write into `data`. + + $ sudo chown -R www-data:www-data data + +Your webserver must be configured to serve `web/` as document root. If you use nginx, all virtual paths must be rooted with `web/index.php` or `web/app_dev.php` ([documentation](https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/)). If you use apache, you must enable the `rewrite` module and restart: + + $ sudo a2enmod rewrite + $ sudo service apache2 restart + +`app_dev.php` is the development router. Access is granted for an IP range defined in the same file. + +Upgrade +------- + +If your version is less than v1.4.2, run: `test -d app && git add app && git commit -m "Configuration"`. + + $ make update + $ make propel + +If you upgrade to v1.4.1, run: `app/console migrate:to:v1.4.1`. + +If you upgrade to v1.4.4 or more, the configuration is moved to a `app/config/config.yml`: `$ cp app/config/config.yml.dist app/config/config.yml` and see the [configuration section](#configuration) for more information. + +Configuration +------------- + +### Version < 1.4.4 + +Edit `app/bootstrap.php.d/70-security.php`. + +* `$app['token']`: the securty token (a strong passphrase). +* `$app['enable_registration']`: defines if the registration is allowed (`true` or `false`) +* `$app['enable_login']`: defines if the login is allowed (`true` or `false`) +* `$app['login_required_to_edit_gist']`: defines if the user must be logged to create or clone a Gist (`true` or `false`) +* `$app['login_required_to_view_gist']`: defines if the user must be logged to view a Gist (`true` or `false`) +* `$app['login_required_to_view_gist']`: defines if the user must be logged to view an embeded Gist (`true` or `false`) + +If you install Gist on your server, you have to modify the `base_uri` of the API. +Edit `app/bootstrap.php.d/60-api.php` and replace `https://gist.deblan.org/`. + +### Version >= 1.4.4 + +Edit `app/config/config.yml`. + +* `security.token`: the securty token (a strong passphrase) +* `security.enable_registration`: defines if the registration is allowed (`true` or `false`) +* `security.enable_login`: defines if the login is allowed (`true` or `false`) +* `security.login_required_to_edit_gist`: defines if the user must be logged to create or clone a Gist (`true` or `false`) +* `security.login_required_to_view_gist`: defines if the user must be logged to view a Gist (`true` or `false`) +* `security.login_required_to_view_gist`: defines if the user must be logged to view an embeded Gist (`true` or `false`) +* `api.base_uri`: The url of your instance. +* `data.path`: the path where the files are saved. +* `git.path`: The path of `git`. +* `theme.name`: the name of the theme (`dark` or `light`) + +Makefile +-------- + +A Makefile is provided to automate some tasks. + +* `make` will install application's dependencies via Composer and Bower, +* `make optimize` will run Composer's autoloader dump script with classmap +* `make update` will update the application +* `make propel` will generate propel's files +* `make run` will run development server on http://127.0.0.1:8080/ + +API +--- + +### Create a new gist + +**POST** /{locale}/api/create +Params: + +* `form[title]`: String (required, can be empty) +* `form[type]`: String (required) + Values: html, css, javascript, php, sql, xml, yaml, perl, c, asp, python, bash, actionscript3, text +* `form[content]`: String (required) + +**Responses:** + +* Code `405`: Method Not Allowed +* Code `400`: Bad Request +* Code `200`: A json which contains gist's information. Example: + +```javascript +{ + "url": "https:\/\/gist.deblan.org\/en\/view\/55abcfa7771e0\/f4afbf72967dd95e3461490dcaa310d728d6a97d", + "gist": { + "Id": 66, + "Title": "test prod", + "Cipher": false, + "Type": "javascript", + "File": "55abcfa7771e0", + "CreatedAt": "2015-07-19T16:26:15Z", + "UpdatedAt": "2015-07-19T16:26:15Z" + } +} +``` + +### Update an existing gist + +**POST** /{locale}/api/update/{id} +Params: + +* `{id}`: Gist Id (required) +* `form[content]`: String (required) + +**Responses:** + +* Code `405`: Method Not Allowed +* Code `400`: Bad Request +* Code `200`: A json which contains gist's information. Example: + +```javascript +{ + "url": "https:\/\/gist.deblan.org\/en\/view\/55abcfa7771e0\/abcgi72967dd95e3461490dcaa310d728d6adef", + "gist": { + "Id": 66, + "Title": "test prod", + "Cipher": false, + "Type": "javascript", + "File": "55abcfa7771e0", + "CreatedAt": "2015-07-19T16:26:15Z", + "UpdatedAt": "2015-07-19T16:30:15Z" + } +} +``` + +Console +------- + +* **Create a gist**: `$ app/console --help create` +* **Update a gist**: `$ app/console --help update` +* **Create user**: `app/console --help user:create` +* **Show stats**: `$ app/console --help stats` + +Deployment +---------- + +Gist uses [Magallanes](http://magephp.com/) to manage deployment. + +**Global installation** + + $ composer global require andres-montanez/magallanes + # if the envvar PATH contains "$HOME/bin/" + $ ln -s ~/.composer/vendor/bin/mage ~/bin/mage + +**Local installation** + + $ composer require andres-montanez/magallanes + +There is an example of the configuration of an environment in `.mage/config/environment/prod.yml.dist`. + + # global installation + $ mage deploy to:prod + + # local installation + $ ./vendor/andres-montanez/magallanes/bin/mage deploy to:prod + +Contributors +------------ + +**Developers** + +* Simon Vieille + +**Translators** + +* Simon Vieille +* Marion Sanchez +* Marjorie Da Silva +* Mélanie Chanat diff --git a/app/bootstrap.php.d/20-twig.php b/app/bootstrap.php.d/20-twig.php index e69e1c6..54fc2ab 100644 --- a/app/bootstrap.php.d/20-twig.php +++ b/app/bootstrap.php.d/20-twig.php @@ -9,6 +9,14 @@ $app->register(new TwigServiceProvider(), array( $app->extend('twig', function ($twig, $app) { $base = str_replace($app['request']->server->get('SCRIPT_NAME'), '', $app['request']->getBaseUrl()); $twig->addGlobal('web_path', $base.'/'); - + return $twig; }); + +$app['geshi'] = $app->share(function ($app) { + $geshi = new GeSHi(); + $geshi->enable_classes(); + $geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS); + + return $geshi; +}); diff --git a/app/bootstrap.php.d/30-trans.php b/app/bootstrap.php.d/30-trans.php index d65aa5d..527de85 100644 --- a/app/bootstrap.php.d/30-trans.php +++ b/app/bootstrap.php.d/30-trans.php @@ -11,7 +11,7 @@ use Symfony\Component\HttpFoundation\Cookie; $app->register(new TranslationServiceProvider(), array( 'locale' => 'en', 'locale_fallback' => 'en', - 'locales' => array('en', 'fr', 'es', 'de', 'cn', 'pl'), + 'locales' => array('en', 'fr', 'es', 'de'), )); $app['translator'] = $app->extend('translator', function ($translator, $app) { @@ -50,7 +50,7 @@ $app->get('/', function (Request $request) use ($app) { $foundLocale = $app['translator']->getLocale(); foreach ($app['locales'] as $locale) { - if ($cookieValue === $locale || $accept->has($locale)) { + if ($cookie === $locale || $accept->has($locale)) { $foundLocale = $locale; break; } diff --git a/app/bootstrap.php.d/50-git.php b/app/bootstrap.php.d/50-git.php index 7afa121..9511253 100644 --- a/app/bootstrap.php.d/50-git.php +++ b/app/bootstrap.php.d/50-git.php @@ -6,7 +6,7 @@ use Gist\Service\Gist; $dataPath = $app['settings']['data']['path']; if ($dataPath[0] !== '/') { - $app['gist_path'] = $app['root_path'].'/'.$dataPath; + $app['gist_path'] = $app['root_path'].$dataPath; } else { $app['gist_path'] = $dataPath; } @@ -20,5 +20,5 @@ $app['git_working_copy'] = $app->share(function ($app) { }); $app['gist'] = $app->share(function ($app) { - return new Gist($app['gist_path'], $app['git_wrapper'], $app['git_working_copy']); + return new Gist($app['gist_path'], $app['git_wrapper'], $app['git_working_copy'], $app['geshi']); }); diff --git a/app/bootstrap.php.d/60-api.php b/app/bootstrap.php.d/60-api.php index d630058..c66683b 100644 --- a/app/bootstrap.php.d/60-api.php +++ b/app/bootstrap.php.d/60-api.php @@ -3,11 +3,5 @@ use Gist\Api\Client; $app['api_client'] = $app->share(function ($app) { - $client = new Client(['base_uri' => rtrim($app['settings']['api']['base_url'], '/')]); - - if (!empty($app['settings']['api']['client']['api_key'])) { - $client->setApiKey($app['settings']['api']['client']['api_key']); - } - - return $client; + return new Client(['base_uri' => $app['settings']['api']['base_uri']]); }); diff --git a/app/bootstrap.php.d/80-cache.php b/app/bootstrap.php.d/80-cache.php deleted file mode 100644 index 3a28362..0000000 --- a/app/bootstrap.php.d/80-cache.php +++ /dev/null @@ -1,8 +0,0 @@ -register(new HttpCacheServiceProvider(), array( - 'http_cache.cache_dir' => $app['root_path'].'/cache/', - 'http_cache.esi' => null, -)); diff --git a/app/config/config.yml.dist b/app/config/config.yml.dist index c9845ec..b8af280 100644 --- a/app/config/config.yml.dist +++ b/app/config/config.yml.dist @@ -6,11 +6,7 @@ security: login_required_to_view_gist: false login_required_to_view_embeded_gist: false api: - enabled: true - api_key_required: false base_url: 'https://gist.deblan.org/' - client: - api_key: data: path: data/git git: diff --git a/app/config/propel.yaml.dist-sqlite b/app/config/propel.yaml.dist-sqlite deleted file mode 100644 index b11f6c7..0000000 --- a/app/config/propel.yaml.dist-sqlite +++ /dev/null @@ -1,31 +0,0 @@ -propel: - database: - connections: - default: - adapter: sqlite - classname: Propel\Runtime\Connection\ConnectionWrapper - dsn: "sqlite:DATABASE_PATH" - user: ~ - password: ~ - settings: - charset: utf8 - queries: - - paths: - projectDir: src/ - schemaDir: src/ - outputDir: src/ - phpDir: src/ - phpConfDir: app/config/propel - sqlDir: app/propel/sql - migrationDir: app/propel/migration - - runtime: - defaultConnection: default - connections: [default] - - generator: - defaultConnection: default - connections: [default] - objectModel: - addClassLevelComment: false diff --git a/app/config/routing.yml b/app/config/routing.yml index 49ad3f4..666ca81 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -57,18 +57,10 @@ revisions: path: /revs/{gist} defaults: {_controller: Gist\Controller\ViewController::revisionsAction, _locale: en} -api_list: - path: /api/list/{apiKey} - defaults: {_controller: Gist\Controller\ApiController::listAction, _locale: en, apiKey: null} - api_create: - path: /api/create/{apiKey} - defaults: {_controller: Gist\Controller\ApiController::createAction, _locale: en, apiKey: null} + path: /api/create + defaults: {_controller: Gist\Controller\ApiController::createAction, _locale: en} api_update: - path: /api/update/{gist}/{apiKey} - defaults: {_controller: Gist\Controller\ApiController::updateAction, _locale: en, apiKey: null} - -api_delete: - path: /api/delete/{gist}/{apiKey} - defaults: {_controller: Gist\Controller\ApiController::deleteAction, _locale: en, apiKey: null} + path: /api/update/{gist} + defaults: {_controller: Gist\Controller\ApiController::updateAction, _locale: en} diff --git a/app/console b/app/console index b1e12fb..eef6670 100755 --- a/app/console +++ b/app/console @@ -2,19 +2,15 @@ add(new CreateCommand()); -$app['console']->add(new ListCommand()); $app['console']->add(new UpdateCommand()); -$app['console']->add(new DeleteCommand()); $app['console']->add(new StatsCommand()); $app['console']->add(new UserCreateCommand()); $app['console']->add(new UpgradeTo1p4p1Command()); diff --git a/app/locales/cn.yml b/app/locales/cn.yml index c2adf88..30c5aa7 100644 --- a/app/locales/cn.yml +++ b/app/locales/cn.yml @@ -20,11 +20,6 @@ app: my: title: '我的 Gist' nothing: '这家伙很懒，暂时没有内容' - api: - title: 'API' - warning: 'Keep it secret!' - form: - generate: 'Regenerate' gist: untitled: '未命名' @@ -37,14 +32,14 @@ gist: raw: '源文件' download: '下载' clone: '克隆' - embed: '引用' + embed: '引用:' add: '新建' date: format: 'Y-m-d h:i:s' footer: - text: '

Powered by GIST, it''s open source :) - API

' + text: '

Powered by GIST, it''s open source :) - API

' login: login: @@ -98,7 +93,6 @@ form: php: 'PHP' sql: 'SQL' yaml: 'YAML' - markdown: 'MARKDOWN' perl: 'PERL' c: 'C/C++' asp: 'ASP' diff --git a/app/locales/de.yml b/app/locales/de.yml index 656f71f..42cc012 100644 --- a/app/locales/de.yml +++ b/app/locales/de.yml @@ -20,11 +20,6 @@ app: my: title: 'Meine Gists' nothing: 'Nichts zu finden (momentan)!' - api: - title: 'API' - warning: 'Keep it secret!' - form: - generate: 'Regenerate' gist: untitled: 'Ohne Titel' @@ -37,14 +32,14 @@ gist: raw: 'RAW' download: 'Herunterladen' clone: 'Klonen' - embed: 'Einfügen' + embed: 'Einfügen:' add: 'Hinzufügen' date: format: 'Y-m-d h:i:s' footer: - text: '

Powered by GIST, it''s open source :) - API

' + text: '

Powered by GIST, it''s open source :) - API

' login: login: @@ -98,7 +93,6 @@ form: php: 'PHP' sql: 'SQL' yaml: 'YAML' - markdown: 'MARKDOWN' perl: 'PERL' c: 'C/C++' asp: 'ASP' diff --git a/app/locales/en.yml b/app/locales/en.yml index 40e7454..51630d3 100644 --- a/app/locales/en.yml +++ b/app/locales/en.yml @@ -20,12 +20,6 @@ app: my: title: 'My gists' nothing: 'Nothing yet!' - api: - title: 'API' - warning: 'Keep it secret!' - form: - generate: 'Regenerate' - gist: untitled: 'Untitled' @@ -38,14 +32,14 @@ gist: raw: 'RAW' download: 'Download' clone: 'Clone' - embed: 'Embed' + embed: 'Embed:' add: 'New' date: format: 'Y-m-d h:i:s' footer: - text: '

Powered by GIST, it''s open source :) - API

' + text: '

Powered by GIST, it''s open source :) - API

' login: login: @@ -99,7 +93,6 @@ form: php: 'PHP' sql: 'SQL' yaml: 'YAML' - markdown: 'MARKDOWN' perl: 'PERL' c: 'C/C++' asp: 'ASP' diff --git a/app/locales/es.yml b/app/locales/es.yml index 83c0078..75cfe90 100644 --- a/app/locales/es.yml +++ b/app/locales/es.yml @@ -20,11 +20,6 @@ app: my: title: 'Mis Gists' nothing: 'Nada por ahora.' - api: - title: 'API' - warning: 'Keep it secret!' - form: - generate: 'Regenerate' gist: untitled: 'Sin título' @@ -37,14 +32,14 @@ gist: raw: 'RAW' download: 'Descargar' clone: 'Clonar' - embed: 'Insertar' + embed: 'Insertar : ' add: 'Añadir' date: format: 'd/m/Y H\hi s\s' footer: - text: '

Impulsado por GIST, es libre :) - API

' + text: '

Impulsado por GIST, es libre :) - API

' login: login: @@ -98,7 +93,6 @@ form: php: 'PHP' sql: 'SQL' yaml: 'YAML' - markdown: 'MARKDOWN' perl: 'PERL' c: 'C/C++' asp: 'ASP' diff --git a/app/locales/fr.yml b/app/locales/fr.yml index 63c79ac..7674d1b 100644 --- a/app/locales/fr.yml +++ b/app/locales/fr.yml @@ -20,11 +20,6 @@ app: my: title: 'Mes Gists' nothing: 'Rien pour le moment !' - api: - title: 'API' - warning: 'Gardez-la secrète !' - form: - generate: 'Regénérer' gist: untitled: 'Sans titre' @@ -37,14 +32,14 @@ gist: raw: 'RAW' download: 'Télécharger' clone: 'Clôner' - embed: 'Insérer' + embed: 'Insérer : ' add: 'Ajouter' date: format: 'd/m/Y H\hi s\s' footer: - text: '

Propulsé par GIST, c''est libre :) - API

' + text: '

Propulsé par GIST, c''est libre :) - API

' login: login: @@ -98,7 +93,6 @@ form: php: 'PHP' sql: 'SQL' yaml: 'YAML' - markdown: 'MARKDOWN' perl: 'PERL' c: 'C/C++' asp: 'ASP' diff --git a/app/locales/pl.yml b/app/locales/pl.yml deleted file mode 100644 index 4eaf452..0000000 --- a/app/locales/pl.yml +++ /dev/null @@ -1,109 +0,0 @@ -app: - title: '#!GIST' - title_prefix: '#!GIST - ' - - menu: - home: - title: 'Home' - about: - title: 'O projekcie' - my: - login: - title: 'Logowanie' - logout: - title: 'Wylogowanie' - register: - title: 'Rejestracja' - my: - title: 'Konta' - -my: - title: 'Moje wklejki' - nothing: 'Nie ma jeszcze nic!' - api: - title: 'API' - warning: 'Trzymaj to w sekrecie!' - form: - generate: 'Wygeneruj nowy' - - -gist: - untitled: 'Bez tytułu' - 404: - title: 'Oops!' - message: 'Wklejka nie została znaleziona...' - action: - view: 'Podgląd' - history: 'Commit(s)' - raw: 'RAW' - download: 'Pobierz' - clone: 'Sklonuj' - embed: 'Embed' - add: 'Nowa' - -date: - format: 'Y-m-d h:i:s' - -footer: - text: '

Napędzane przez GIST, to jest open source :) - API

' - -login: - login: - title: 'Logowanie' - invalid: 'Nie prawidłowy login lub hasło.' - form: - username: - placeholder: 'Login' - password: - placeholder: 'Hasło' - remember_me: - label: 'Pamiętaj' - register: - title: 'Nowe konto' - already_exists: 'Ta nazwa użytkownika jest już zarejestrowana!' - registred: 'Gratulacje, twoje konto zostało utworzone!' - form: - username: - placeholder: 'Login' - current_password: - placeholder: 'Obecne hasło' - password: - placeholder: 'Hasło' - -form: - error: - password: 'Nie prawidłowe hasło.' - not_blank: 'To pole nie powinno być puste!' - title: - placeholder: 'Tytuł' - cipher: - label: 'Szyfrowanie: %value%' - choice: - anyway: 'Tak czy inaczej' - yes: 'Tak' - no: 'Nie' - submit: 'Wyślij' - filter: 'Filtr' - confirm: 'Potwierdzasz?' - success: - password: 'Hasło zostało zaktualizowane.' - gist: 'Wklejka została usunięta.' - type: - label: 'Język: %value%' - choice: - all: 'All' - html: 'HTML' - xml: 'XML' - css: 'CSS' - javascript: 'JAVASCRIPT' - php: 'PHP' - sql: 'SQL' - yaml: 'YAML' - markdown: 'MARKDOWN' - perl: 'PERL' - c: 'C/C++' - asp: 'ASP' - python: 'PYTHON' - bash: 'BASH' - actionscript3: 'ACTION SCRIPT' - text: 'TEXT' diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..201d38d --- /dev/null +++ b/bower.json @@ -0,0 +1,22 @@ +{ + "name": "gist", + "version": "0.0.3", + "authors": [ + "Simon Vieille " + ], + "description": "GIST is an open-source application to share code.", + "main": "web/index.php", + "keywords": [ + "Gist", + "GIT" + ], + "license": "LGPL", + "homepage": "https://gitnet.fr/deblan/gist", + "dependencies": { + "bootstrap": "3.3.4", + "flag-icon-css": "0.7.1", + "SyntaxHighlighter": "3.0.83", + "iframe-resizer": "2.8.6", + "jsdiff": "~2.2.2" + } +} diff --git a/composer.json b/composer.json index 14cd8e1..2f25fac 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,6 @@ { - "name": "deblan/gist", - "license": "GPL-3.0-only", - "type": "project", "require": { + "geshi/geshi": "dev-master", "silex/silex": "1.3.x-dev", "symfony/yaml": "~2.6", "symfony/twig-bridge": "~2.6", @@ -15,17 +13,6 @@ "guzzlehttp/guzzle": "~6.0", "symfony/security": "^2.7" }, - "scripts": { - "gist-scripts": [ - "Gist\\Composer\\PostInstallHandler::execute" - ], - "post-install-cmd": [ - "@gist-scripts" - ], - "post-update-cmd": [ - "@gist-scripts" - ] - }, "autoload": { "psr-0": { "": "src/" diff --git a/package.json b/package.json deleted file mode 100644 index c637d1f..0000000 --- a/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "bootstrap": "^3.4.1", - "diff": "^3.5.0", - "flag-icon-css": "^0.8.6", - "iframe-resizer": "^2.8.10", - "jquery": ">=3.4.0" - } -} diff --git a/app/config/propel.yaml.dist-mysql b/propel-dist.yaml similarity index 84% rename from app/config/propel.yaml.dist-mysql rename to propel-dist.yaml index fa13d75..dd6f836 100644 --- a/app/config/propel.yaml.dist-mysql +++ b/propel-dist.yaml @@ -4,9 +4,9 @@ propel: default: adapter: mysql classname: Propel\Runtime\Connection\ConnectionWrapper - dsn: "mysql:host=DATABASE_HOST;dbname=DATABASE_NAME" - user: "DATABASE_USERNAME" - password: "DATABASE_PASSWORD" + dsn: "mysql:host=localhost;dbname=gist" + user: root + password: root settings: charset: utf8 queries: diff --git a/src/Gist/Api/Client.php b/src/Gist/Api/Client.php index ca17817..29c26a0 100644 --- a/src/Gist/Api/Client.php +++ b/src/Gist/Api/Client.php @@ -12,53 +12,31 @@ use GuzzleHttp\Client as BaseClient; class Client extends BaseClient { /** - * URI of creation. - * + * URI of creation + * * @const string */ const CREATE = '/en/api/create'; /** - * URI of update. + * URI of updating * * @const string */ const UPDATE = '/en/api/update/{gist}'; /** - * URI of delete. + * Creates a gist * - * @const string - */ - const DELETE = '/en/api/delete/{gist}'; - - /** - * URI of list. - * - * @const string - */ - const LIST = '/en/api/list'; - - /** - * The API key. - * - * @var string|null - */ - protected $apiKey; - - /** - * Creates a gist. - * - * @param string $title The title - * @param string $type The type + * @param string $title The title + * @param string $type The type * @param string $content The content - * * @return array */ public function create($title, $type, $content) { $response = $this->post( - $this->mergeApiKey(self::CREATE), + self::CREATE, array( 'form_params' => array( 'form' => array( @@ -78,9 +56,9 @@ class Client extends BaseClient } /** - * Clones and update a gist. + * Clones and update a gist * - * @param string $gist Gist's ID + * @param string $gist Gist's ID * @param string $content The content * * @return array @@ -88,7 +66,7 @@ class Client extends BaseClient public function update($gist, $content) { $response = $this->post( - str_replace('{gist}', $gist, $this->mergeApiKey(self::UPDATE)), + str_replace('{gist}', $gist, self::UPDATE), array( 'form_params' => array( 'form' => array( @@ -104,81 +82,4 @@ class Client extends BaseClient return []; } - - /** - * Deletes a gist. - * - * @param string $gist Gist's ID - * - * @return array - */ - public function delete($gist) - { - $response = $this->post(str_replace('{gist}', $gist, $this->mergeApiKey(self::DELETE))); - - if ($response->getStatusCode() === 200) { - return json_decode($response->getBody()->getContents(), true); - } - - return []; - } - - /** - * Lists the user's gists. - * - * @param string $gist Gist's ID - * @param string $content The content - * - * @return array - */ - public function list() - { - $response = $this->get($this->mergeApiKey(self::LIST)); - - if ($response->getStatusCode() === 200) { - return json_decode($response->getBody()->getContents(), true); - } - - return []; - } - - /* - * Merges the API key with the given url. - * - * @param string $url - * - * @return string - */ - public function mergeApiKey($url) - { - if (empty($this->apiKey)) { - return $url; - } - - return rtrim($url, '/').'/'.$this->apiKey; - } - - /* - * Set the value of "apiKey". - * - * @param string|null $apiKey - * - * @return Client - */ - public function setApiKey($apiKey) - { - $this->apiKey = $apiKey; - - return $this; - } - - /* - * Get the value of "apiKey". - * - * @return string|null - */ - public function getApiKey() - { - return $this->apiKey; - } } diff --git a/src/Gist/Command/CreateCommand.php b/src/Gist/Command/CreateCommand.php index 14fdd46..7aa7027 100644 --- a/src/Gist/Command/CreateCommand.php +++ b/src/Gist/Command/CreateCommand.php @@ -7,8 +7,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; -use Propel\Runtime\Parser\YamlParser; -use Symfony\Component\Yaml\Yaml; /** * class CreateCommand. @@ -29,9 +27,8 @@ class CreateCommand extends Command ->addArgument('input', InputArgument::REQUIRED, 'Input') ->addArgument('type', InputArgument::OPTIONAL, 'Type', 'text') ->addOption('title', 't', InputOption::VALUE_REQUIRED, 'Title of the gist') - ->addOption('all', 'a', InputOption::VALUE_NONE, 'Display all the response') - ->addOption('id', 'i', InputOption::VALUE_NONE, 'Display only the id of the gist') - ->addOption('json', 'j', InputOption::VALUE_NONE, 'Format the response to json') + ->addOption('show-url', 'u', InputOption::VALUE_NONE, 'Display only the gist url') + ->addOption('show-id', 'i', InputOption::VALUE_NONE, 'Display only the gist Id') ->setHelp(<<--title, -t Defines a title + + --show-id, -i + Display only the Id of the gist - --id, -i - Display only the id of the gist - - --all, -a - Display all the response - - --json, -j - Format the response to json + --show-url, -u + Display only the url of the gist EOF ); } @@ -64,10 +58,11 @@ EOF */ protected function execute(InputInterface $input, OutputInterface $output) { + //$output->writeln(sprintf('%s bar.', 'test')); + $file = $input->getArgument('input'); $type = $input->getArgument('type'); $title = $input->getOption('title'); - $json = $input->getOption('json'); if ($file === '-') { $content = file_get_contents('php://stdin'); @@ -99,17 +94,19 @@ EOF $gist = $this->getSilexApplication()['api_client']->create($title, $type, $content); - if ($input->getOption('id')) { - $id = isset($gist['gist']['id']) ? $gist['gist']['id'] : $gist['gist']['Id']; - $result = $json ? json_encode(array('id' => $id)) : $id; - } elseif ($input->getOption('all')) { - $result = $json ? json_encode($gist) : Yaml::dump($gist); - } else { - $url = $gist['url']; - $result = $json ? json_encode(array('url' => $url)) : $url; + if ($input->getOption('show-url')) { + $output->writeln($gist['url']); + + return true; } - $output->writeln($result); + if ($input->getOption('show-id')) { + $output->writeln($gist['gist']['Id']); + + return true; + } + + $output->writeln(json_encode($gist)); } /** diff --git a/src/Gist/Command/DeleteCommand.php b/src/Gist/Command/DeleteCommand.php deleted file mode 100644 index ec0ca31..0000000 --- a/src/Gist/Command/DeleteCommand.php +++ /dev/null @@ -1,48 +0,0 @@ - - */ -class DeleteCommand extends Command -{ - /** - * {@inheritdoc} - */ - protected function configure() - { - $this - ->setName('delete') - ->setDescription('Delete a gist using the API') - ->addOption('gist', null, InputOption::VALUE_REQUIRED, 'Id or File of the gist') - ->setHelp(<<<'EOF' -Provides a client to delete a gist using the API. - -Arguments: - none. - -Options: - --gist - Defines the Gist to delete by using its Id or its File -EOF - ); - } - - /** - * {@inheritdoc} - */ - protected function execute(InputInterface $input, OutputInterface $output) - { - $result = $this->getSilexApplication()['api_client']->delete($input->getOption('gist')); - - $output->writeln(empty($result['error']) ? 'OK' : 'An error occured.'); - } -} diff --git a/src/Gist/Command/ListCommand.php b/src/Gist/Command/ListCommand.php deleted file mode 100644 index 878b443..0000000 --- a/src/Gist/Command/ListCommand.php +++ /dev/null @@ -1,59 +0,0 @@ - - */ -class ListCommand extends Command -{ - /** - * {@inheritdoc} - */ - protected function configure() - { - $this - ->setName('gists') - ->setDescription('List gists using the API'); - } - - /** - * {@inheritdoc} - */ - protected function execute(InputInterface $input, OutputInterface $output) - { - $gists = $this->getSilexApplication()['api_client']->list(); - $rows = []; - - foreach ($gists as $gist) { - $rows[] = array( - $gist['id'], - $gist['title'], - $gist['cipher'] ? 'y' : 'n', - $gist['type'], - (new DateTime($gist['createdAt']))->format('Y-m-d H:i:s'), - (new DateTime($gist['updatedAt']))->format('Y-m-d H:i:s'), - $gist['url'], - ); - } - - $table = new Table($output); - $table - ->setHeaders(array('ID', 'Title', 'Cipher', 'Type', 'Created At', 'Updated At', 'url')) - ->setRows($rows); - - $table->render(); - } -} diff --git a/src/Gist/Command/UpdateCommand.php b/src/Gist/Command/UpdateCommand.php index a48ec14..ef09a00 100644 --- a/src/Gist/Command/UpdateCommand.php +++ b/src/Gist/Command/UpdateCommand.php @@ -7,7 +7,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Yaml\Yaml; /** * class UpdateCommand. @@ -27,9 +26,8 @@ class UpdateCommand extends Command ->setDescription('Update a gist using the API') ->addArgument('input', InputArgument::REQUIRED, 'Input') ->addOption('gist', null, InputOption::VALUE_REQUIRED, 'Id or File of the gist') - ->addOption('all', 'a', InputOption::VALUE_NONE, 'Display all the response') - ->addOption('id', 'i', InputOption::VALUE_NONE, 'Display only the id of the gist') - ->addOption('json', 'j', InputOption::VALUE_NONE, 'Format the response to json') + ->addOption('show-url', 'u', InputOption::VALUE_NONE, 'Display only the gist url') + ->addOption('show-id', 'i', InputOption::VALUE_NONE, 'Display only the gist Id') ->setHelp(<<--gist Defines the Gist to update by using its Id or its File - --id, -i - Display only the id of the gist + --show-id, -i + Display only the Id of the gist - --all, -a - Display all the response - - --json, -j - Format the response to json + --show-url, -u + Display only the url of the gist EOF ); } @@ -62,9 +57,10 @@ EOF */ protected function execute(InputInterface $input, OutputInterface $output) { + //$output->writeln(sprintf('%s bar.', 'test')); + $file = $input->getArgument('input'); $gist = $input->getOption('gist'); - $json = $input->getOption('json'); if ($file === '-') { $content = file_get_contents('php://stdin'); @@ -90,17 +86,19 @@ EOF $gist = $this->getSilexApplication()['api_client']->update($gist, $content); - if ($input->getOption('id')) { - $id = isset($gist['gist']['id']) ? $gist['gist']['id'] : $gist['gist']['Id']; - $result = $json ? json_encode(array('id' => $id)) : $id; - } elseif ($input->getOption('all')) { - $result = $json ? json_encode($gist) : Yaml::dump($gist); - } else { - $url = $gist['url']; - $result = $json ? json_encode(array('url' => $url)) : $url; + if ($input->getOption('show-url')) { + $output->writeln($gist['url']); + + return true; } - $output->writeln($result); + if ($input->getOption('show-id')) { + $output->writeln($gist['gist']['Id']); + + return true; + } + + $output->writeln(json_encode($gist)); } /** diff --git a/src/Gist/Composer/PostInstallHandler.php b/src/Gist/Composer/PostInstallHandler.php deleted file mode 100644 index 366cc24..0000000 --- a/src/Gist/Composer/PostInstallHandler.php +++ /dev/null @@ -1,211 +0,0 @@ - - */ -class PostInstallHandler -{ - public static function execute(Event $event) - { - $helper = new QuestionHelper(); - $input = new ArgvInput(); - $output = new ConsoleOutput(); - $filesystem = new Filesystem(); - - $output->writeln('+==============================+'); - $output->writeln('| GIST Setup |'); - $output->writeln('+==============================+'); - $output->writeln(''); - $output->writeln('1. Database'); - $output->writeln('==========='); - - $configure = true; - if ($filesystem->exists('propel.yaml')) { - $output->writeln('The configuration file exists.'); - $question = new ConfirmationQuestion('Your current configuration will not be merged. Do you want to override it? [y/N] ', false); - $configure = $helper->ask($input, $output, $question); - } else { - $configure = true; - } - - if ($configure) { - $choices = ['MySQL/MariaDB', 'SQLite', 'other']; - $question = new ChoiceQuestion('Which DBMS? ', $choices, 0); - $dbms = $helper->ask($input, $output, $question); - $substitutions = []; - - if ($dbms === 'MySQL/MariaDB') { - $templateName = 'propel.yaml.dist-mysql'; - - $question = new Question('Host: [127.0.0.1] ', '127.0.0.1'); - $substitutions['DATABASE_HOST'] = $helper->ask($input, $output, $question); - - $question = new Question('Database (it must exists!): [gist] ', 'gist'); - $substitutions['DATABASE_NAME'] = $helper->ask($input, $output, $question); - - $question = new Question('Username: [root] ', 'root'); - $substitutions['DATABASE_USERNAME'] = $helper->ask($input, $output, $question); - - $question = new Question('Password: [] ', ''); - $substitutions['DATABASE_PASSWORD'] = $helper->ask($input, $output, $question); - } elseif ($dbms === 'SQLite') { - $defaultPath = getcwd().'/data/gist.sqlite'; - $question = new Question("Ok! Where do you want me to save datas? [$defaultPath] ", $defaultPath); - $substitutions['DATABASE_PATH'] = $helper->ask($input, $output, $question); - $templateName = 'propel.yaml.dist-sqlite'; - } else { - $output->writeln('See README.md to perform the configuration.'); - - return; - } - - $template = file_get_contents('app/config/'.$templateName); - $content = str_replace( - array_keys($substitutions), - array_values($substitutions), - $template - ); - - $done = file_put_contents('propel.yaml', $content) !== false; - - if ($done) { - $output->writeln('Running migration...'); - - foreach (['config:convert', 'model:build --recursive', 'migration:diff --recursive', 'migration:migrate --recursive'] as $arg) { - $command = self::getPhp(true).' ./vendor/propel/propel/bin/propel '.$arg; - $process = new Process($command); - $process->run(); - - if (!$process->isSuccessful()) { - $output->writeln('An error occured while executing:'); - $output->writeln($command); - $output->writeln('To perform the configuration. See README.md.'); - - return; - } - } - - $output->writeln('Done!'); - } else { - $output->writeln('An error occured. See README.md to perform the configuration.'); - } - } - - $output->writeln(''); - $output->writeln('2. Application'); - $output->writeln('=============='); - - $configure = true; - if ($filesystem->exists('app/config/config.yml')) { - $output->writeln('The configuration file exists.'); - $question = new ConfirmationQuestion('Your current configuration will not be merged. Do you want to override it? [y/N] ', false); - $configure = $helper->ask($input, $output, $question); - } else { - $configure = true; - } - - if ($configure) { - $output->writeln(''); - $output->writeln(' 2.1 Security'); - $output->writeln('-------------'); - - $token = str_shuffle(sha1(microtime().uniqid())); - - $question = new ConfirmationQuestion('Registration enabled: [Y/n] ', true); - $enableRegistration = $helper->ask($input, $output, $question); - - $question = new ConfirmationQuestion('Login enabled: [Y/n] ', true); - $enableLogin = $helper->ask($input, $output, $question); - - $question = new ConfirmationQuestion('Login required to edit a gist: [y/N] ', false); - $loginRequiredToEditGist = $helper->ask($input, $output, $question); - - $question = new ConfirmationQuestion('Login required to view a gist: [y/N] ', false); - $loginRequiredToViewGist = $helper->ask($input, $output, $question); - - $question = new ConfirmationQuestion('Login required to view an embeded gist: [y/N] ', false); - $loginRequiredToViewEmbededGist = $helper->ask($input, $output, $question); - - $output->writeln(''); - $output->writeln(' 2.2 API'); - $output->writeln('--------'); - - $question = new ConfirmationQuestion('API enabled: [Y/n] ', true); - $apiEnabled = $helper->ask($input, $output, $question); - - if ($apiEnabled) { - $question = new ConfirmationQuestion('API key required: [y/N] ', false); - $apikeyRequired = $helper->ask($input, $output, $question); - } else { - $apikeyRequired = false; - } - - $question = new Question('[Client] API base URL: [https://gist.deblan.org/] ', 'https://gist.deblan.org/'); - $apiBaseUrl = $helper->ask($input, $output, $question); - - $question = new Question('[Client] API key: [] ', ''); - $apiClientApiKey = $helper->ask($input, $output, $question); - - $configuration = [ - 'security' => [ - 'token' => $token, - 'enable_registration' => $enableRegistration, - 'enable_login' => $enableLogin, - 'login_required_to_edit_gist' => $loginRequiredToEditGist, - 'login_required_to_view_gist' => $loginRequiredToViewGist, - 'login_required_to_view_embeded_gist' => $loginRequiredToViewEmbededGist, - ], - 'api' => [ - 'enabled' => $apiEnabled, - 'api_key_required' => $apikeyRequired, - 'base_url' => $apiBaseUrl, - 'client' => [ - 'api_key' => $apiClientApiKey, - ], - ], - 'data' => [ - 'path' => 'data/git', - ], - 'git' => [ - 'path' => '/usr/bin/git', - ], - 'theme' => [ - 'name' => 'dark', - ], - ]; - - $content = (new Yaml())->dump($configuration); - - $done = file_put_contents('app/config/config.yml', $content); - } - - $output->writeln(''); - $output->writeln('Configuration finished!'); - } - - protected static function getPhp($includeArgs = true) - { - $phpFinder = new PhpExecutableFinder(); - if (!$phpPath = $phpFinder->find($includeArgs)) { - throw new \RuntimeException('The php executable could not be found, add it to your PATH environment variable and try again'); - } - - return $phpPath; - } -} diff --git a/src/Gist/Controller/ApiController.php b/src/Gist/Controller/ApiController.php index 283a616..5b86bbe 100644 --- a/src/Gist/Controller/ApiController.php +++ b/src/Gist/Controller/ApiController.php @@ -8,9 +8,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Gist\Form\ApiCreateGistForm; use Gist\Model\GistQuery; use Gist\Form\ApiUpdateGistForm; -use GitWrapper\GitException; -use Gist\Model\UserQuery; -use Propel\Runtime\ActiveQuery\Criteria; /** * Class ApiController. @@ -19,80 +16,10 @@ use Propel\Runtime\ActiveQuery\Criteria; */ class ApiController extends Controller { - /** - * Lists gists. - * - * @param Request $request - * @param string $apiKey - * - * @return JsonResponse - */ - public function listAction(Request $request, $apiKey) + public function createAction(Request $request) { $app = $this->getApp(); - if (false === $app['settings']['api']['enabled']) { - return new Response('', 403); - } - - if (false === $this->isValidApiKey($apiKey, true)) { - return $this->invalidApiKeyResponse(); - } - - if (false === $request->isMethod('get')) { - return $this->invalidMethodResponse('GET method is required.'); - } - - $user = $app['user.provider']->loadUserByApiKey($apiKey); - - $criteria = GistQuery::create() - ->limit(15) - ->orderById(Criteria::DESC); - - $gists = $user->getGists($criteria); - $data = array(); - - foreach ($gists as $gist) { - try { - $history = $app['gist']->getHistory($gist); - - $value = $gist->toArray(); - $value['url'] = $request->getSchemeAndHttpHost().$app['url_generator']->generate( - 'view', - array( - 'gist' => $gist->getFile(), - 'commit' => array_pop($history)['commit'], - ) - ); - - $data[] = $value; - } catch (GitException $e) { - } - } - - return new JsonResponse($data); - } - - /** - * Creates a gist. - * - * @param Request $request - * @param string $apiKey - * - * @return JsonResponse - */ - public function createAction(Request $request, $apiKey) - { - $app = $this->getApp(); - - if (false === $app['settings']['api']['enabled']) { - return new Response('', 403); - } - - if (false === $this->isValidApiKey($apiKey, (bool) $app['settings']['api']['api_key_required'])) { - return $this->invalidApiKeyResponse(); - } - if (false === $request->isMethod('post')) { return $this->invalidMethodResponse('POST method is required.'); } @@ -109,65 +36,40 @@ class ApiController extends Controller $form->submit($request); if ($form->isValid()) { - $user = !empty($apiKey) ? $app['user.provider']->loadUserByApiKey($apiKey) : null; $gist = $app['gist']->create(new Gist(), $form->getData()); - $gist - ->setCipher(false) - ->setUser($user) - ->save(); + $gist->setCipher(false)->save(); $history = $app['gist']->getHistory($gist); - $data = $gist->toArray(); - $data['url'] = $request->getSchemeAndHttpHost().$app['url_generator']->generate( - 'view', - array( - 'gist' => $gist->getFile(), - 'commit' => array_pop($history)['commit'], - ) - ); - - return new JsonResponse($data); + return new JsonResponse(array( + 'url' => $request->getSchemeAndHttpHost().$app['url_generator']->generate( + 'view', + array( + 'gist' => $gist->getFile(), + 'commit' => array_pop($history)['commit'], + ) + ), + 'gist' => $gist->toArray(), + )); } return $this->invalidRequestResponse('Invalid field(s)'); } - /** - * Updates a gist. - * - * @param Request $request - * @param string $gist - * @param string $apiKey - * - * @return JsonResponse - */ - public function updateAction(Request $request, $gist, $apiKey) + public function updateAction(Request $request, $gist) { $app = $this->getApp(); - if (false === $app['settings']['api']['enabled']) { - return new Response('', 403); - } - - if (false === $this->isValidApiKey($apiKey, (bool) $app['settings']['api']['api_key_required'])) { - return $this->invalidApiKeyResponse(); - } - if (false === $request->isMethod('post')) { return $this->invalidMethodResponse('POST method is required.'); } - $query = GistQuery::create() - ->filterByCipher(false); - - if (ctype_digit($gist)) { - $query->filterById((int) $gist); - } else { - $query->filterByFile($gist); - } - - $gist = $query->findOne(); + $gist = GistQuery::create() + ->filterByCipher(false) + ->filterById((int) $gist) + ->_or() + ->filterByFile($gist) + ->findOne(); if (!$gist) { return $this->invalidRequestResponse('Invalid Gist'); @@ -189,88 +91,21 @@ class ApiController extends Controller $history = $app['gist']->getHistory($gist); - $data = $gist->toArray(); - $data['url'] = $request->getSchemeAndHttpHost().$app['url_generator']->generate( - 'view', - array( - 'gist' => $gist->getFile(), - 'commit' => array_pop($history)['commit'], - ) - ); - - return new JsonResponse($data); + return new JsonResponse(array( + 'url' => $request->getSchemeAndHttpHost().$app['url_generator']->generate( + 'view', + array( + 'gist' => $gist->getFile(), + 'commit' => array_pop($history)['commit'], + ) + ), + 'gist' => $gist->toArray(), + )); } return $this->invalidRequestResponse('Invalid field(s)'); } - /** - * Deletes a gist. - * - * @param Request $request - * @param string $gist - * @param string $apiKey - * - * @return JsonResponse - */ - public function deleteAction(Request $request, $gist, $apiKey) - { - $app = $this->getApp(); - - if (false === $app['settings']['api']['enabled']) { - return new Response('', 403); - } - - if (false === $this->isValidApiKey($apiKey, true)) { - return $this->invalidApiKeyResponse(); - } - - if (false === $request->isMethod('post')) { - return $this->invalidMethodResponse('POST method is required.'); - } - - $user = $app['user.provider']->loadUserByApiKey($apiKey); - - $gist = GistQuery::create() - ->filterById((int) $gist) - ->_or() - ->filterByFile($gist) - ->filterByUser($user) - ->findOne(); - - if (!$gist) { - return $this->invalidRequestResponse('Invalid Gist'); - } - - $gist->delete(); - - return new JsonResponse(['error' => false]); - } - - /** - * Builds an invalid api key response. - * - * @param mixed $message - * - * @return JsonResponse - */ - protected function invalidApiKeyResponse() - { - $data = [ - 'error' => ' Unauthorized', - 'message' => 'Invalid API KEY', - ]; - - return new JsonResponse($data, 401); - } - - /** - * Builds an invalid method response. - * - * @param mixed $message - * - * @return JsonResponse - */ protected function invalidMethodResponse($message = null) { $data = [ @@ -281,13 +116,6 @@ class ApiController extends Controller return new JsonResponse($data, 405); } - /** - * Builds an invalid request response. - * - * @param mixed $message - * - * @return JsonResponse - */ protected function invalidRequestResponse($message = null) { $data = [ @@ -297,24 +125,4 @@ class ApiController extends Controller return new JsonResponse($data, 400); } - - /** - * Checks if the given api key is valid - * depending of the requirement. - * - * @param mixed $apiKey - * @param mixed $required - * - * @return bool - */ - protected function isValidApiKey($apiKey, $required = false) - { - if (empty($apiKey)) { - return !$required; - } - - return UserQuery::create() - ->filterByApiKey($apiKey) - ->count() === 1; - } } diff --git a/src/Gist/Controller/Controller.php b/src/Gist/Controller/Controller.php index c13fd38..c96d8d0 100644 --- a/src/Gist/Controller/Controller.php +++ b/src/Gist/Controller/Controller.php @@ -13,34 +13,13 @@ use Symfony\Component\HttpFoundation\Response; * * @author Simon Vieille */ -abstract class Controller +class Controller { /** * @var Application */ protected $app; - /** - * @var array - */ - protected $types = [ - 'html', - 'css', - 'javascript', - 'php', - 'sql', - 'xml', - 'yaml', - 'markdown', - 'perl', - 'c', - 'asp', - 'python', - 'bash', - 'actionscript3', - 'text', - ]; - /** * __construct. * @@ -109,10 +88,10 @@ abstract class Controller return array( 'gist' => $gist, 'type' => $gist->getType(), - 'types' => $this->types, 'history' => $history, 'commit' => $commit, 'raw_content' => $content, + 'content' => $app['gist']->highlight($gist->getGeshiType(), $content), ); } @@ -149,17 +128,12 @@ abstract class Controller /** * Returns the connected user. * - * @param Request $request An API request - * * @return mixed */ - public function getUser(Request $request = null) + public function getUser() { $app = $this->getApp(); - if (!empty($request)) { - } - $securityContext = $app['security.token_storage']; $securityToken = $securityContext->getToken(); @@ -201,32 +175,4 @@ abstract class Controller $params ); } - - /** - * Creates a Response. - * - * @param string $template - * @param array $params - * - * @return Response - */ - public function createResponse($template, array $params = null) - { - $body = $this->render($template, $params); - - $response = new Response($body); - - if (empty($params['no_cache'])) { - $ttl = 3600 * 24 * 7; - $etag = sha1($response->getContent()); - - $response->setTtl($ttl); - $response->setClientTtl($ttl); - $response->setExpires(new \DateTime('now +7 days')); - $response->setLastModified(new \DateTime('now')); - $response->setEtag($etag, true); - } - - return $response; - } } diff --git a/src/Gist/Controller/EditController.php b/src/Gist/Controller/EditController.php index bafdf49..348e989 100644 --- a/src/Gist/Controller/EditController.php +++ b/src/Gist/Controller/EditController.php @@ -8,8 +8,6 @@ use Gist\Form\CloneGistForm; use Gist\Model\Gist; use GitWrapper\GitException; use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Component\Form\FormError; -use Symfony\Component\HttpFoundation\Response; /** * Class EditController. @@ -23,7 +21,7 @@ class EditController extends Controller * * @param Request $request * - * @return Response + * @return string */ public function createAction(Request $request) { @@ -39,28 +37,17 @@ class EditController extends Controller if ($request->isMethod('post')) { $form->submit($request); - $data = $form->getData(); - - if (empty($form->getData()['content']) && $form->get('file')->getData()) { - $data['content'] = file_get_contents($form->get('file')->getData()->getPathName()); - unset($data['file']); - } - - if (empty($data['content'])) { - $form->get('content')->addError(new FormError($app['translator']->trans('form.error.not_blank'))); - } if ($form->isValid()) { - $gist = $app['gist']->create(new Gist(), $data, $this->getUser()); + $gist = $app['gist']->create(new Gist(), $form->getData(), $this->getUser()); } } - return $this->createResponse( + return $this->render( 'Edit/index.html.twig', array( 'gist' => isset($gist) ? $gist : null, 'form' => $form->createView(), - 'no_cache' => true, ) ); } @@ -70,7 +57,7 @@ class EditController extends Controller * * @param Request $request * - * @return Response + * @return string */ public function cloneAction(Request $request, $gist, $commit) { @@ -110,8 +97,7 @@ class EditController extends Controller } $viewOptions['form'] = $form->createView(); - $viewOptions['no_cache'] = true; - return $this->createResponse('Edit/clone.html.twig', $viewOptions); + return $this->render('Edit/clone.html.twig', $viewOptions); } } diff --git a/src/Gist/Controller/LoginController.php b/src/Gist/Controller/LoginController.php index eecff06..a45d1a3 100644 --- a/src/Gist/Controller/LoginController.php +++ b/src/Gist/Controller/LoginController.php @@ -20,13 +20,13 @@ class LoginController extends Controller * * @param Request $request * - * @return Response + * @return string */ public function registerAction(Request $request) { $app = $this->getApp(); - if (false === $app['settings']['security']['enable_registration']) { + if (false === $app['settings']['enable_registration']) { return new Response('', 403); } @@ -57,13 +57,12 @@ class LoginController extends Controller } } - return $this->createResponse( + return $this->render( 'Login/register.html.twig', [ 'form' => $form->createView(), 'error' => isset($error) ? $error : '', 'success' => isset($success) ? $success : '', - 'no_cache' => true, ] ); } @@ -73,13 +72,13 @@ class LoginController extends Controller * * @param Request $request * - * @return Response + * @return string */ public function loginAction(Request $request) { $app = $this->getApp(); - if (false === $app['settings']['security']['enable_login']) { + if (false === $app['settings']['enable_login']) { return new Response('', 403); } @@ -98,12 +97,11 @@ class LoginController extends Controller $error = $app['translator']->trans('login.login.invalid'); } - return $this->createResponse( + return $this->render( 'Login/login.html.twig', [ 'form' => $form->createView(), 'error' => isset($error) ? $error : '', - 'no_cache' => true, ] ); } diff --git a/src/Gist/Controller/MyController.php b/src/Gist/Controller/MyController.php index b3224a5..aa113c8 100644 --- a/src/Gist/Controller/MyController.php +++ b/src/Gist/Controller/MyController.php @@ -7,7 +7,6 @@ use Gist\Form\DeleteGistForm; use Gist\Form\FilterGistForm; use Gist\Form\UserPasswordForm; use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Component\HttpFoundation\Response; /** * Class MyController. @@ -22,7 +21,7 @@ class MyController extends Controller * @param Request $request * @param int $page * - * @return Response + * @return string */ public function myAction(Request $request, $page) { @@ -59,26 +58,6 @@ class MyController extends Controller $gists = $this->getUser()->getGistsPager($page, $options); - $apiKey = $this->getUser()->getApiKey(); - - if (empty($apiKey)) { - $regenerateApiKey = true; - } - // FIXME: CSRF issue! - elseif ($request->request->get('apiKey') === $apiKey && $request->request->has('generateApiKey')) { - $regenerateApiKey = true; - } else { - $regenerateApiKey = false; - } - - if ($regenerateApiKey) { - $apiKey = $app['salt_generator']->generate(32, true); - - $this->getUser() - ->setApiKey($apiKey) - ->save(); - } - if ($request->isMethod('post')) { $deleteForm->handleRequest($request); $passwordForm->handleRequest($request); @@ -120,17 +99,15 @@ class MyController extends Controller } } - return $this->createResponse( + return $this->render( 'My/my.html.twig', array( 'gists' => $gists, 'page' => $page, - 'apiKey' => $apiKey, 'deleteForm' => $deleteForm->createView(), 'filterForm' => $filterForm->createView(), 'passwordForm' => $passwordForm->createView(), 'deleted' => !empty($deleted), - 'no_cache' => true, ) ); } diff --git a/src/Gist/Controller/ViewController.php b/src/Gist/Controller/ViewController.php index 8ea5002..fd9f262 100644 --- a/src/Gist/Controller/ViewController.php +++ b/src/Gist/Controller/ViewController.php @@ -31,18 +31,7 @@ class ViewController extends Controller $viewOptions = $this->getViewOptions($request, $gist, $commit); if (is_array($viewOptions)) { - if ($request->query->has('type')) { - $type = $request->query->get('type'); - - if (in_array($type, $this->types)) { - $viewOptions['gist']->setType($type); - $viewOptions['type_overrided'] = true; - } - } - - $viewOptions['no_cache'] = true; - - return $this->createResponse('View/view.html.twig', $viewOptions); + return $this->render('View/view.html.twig', $viewOptions); } else { return $this->notFoundResponse(); } @@ -64,16 +53,7 @@ class ViewController extends Controller $viewOptions = $this->getViewOptions($request, $gist, $commit); if (is_array($viewOptions)) { - if ($request->query->has('type')) { - $type = $request->query->get('type'); - - if (in_array($type, $this->types)) { - $viewOptions['gist']->setType($type); - $viewOptions['type_overrided'] = true; - } - } - - return $this->createResponse('View/embed.html.twig', $viewOptions); + return $app['twig']->render('View/embed.html.twig', $viewOptions); } else { return $this->notFoundResponse(); } @@ -86,25 +66,19 @@ class ViewController extends Controller * @param string $gist Gist's ID * @param string $commit The commit * - * @return Response + * @return string|Response */ public function embedJsAction(Request $request, $gist, $commit) { $viewOptions = $this->getViewOptions($request, $gist, $commit); - if ($request->query->has('type')) { - $type = $request->query->get('type'); - - if (in_array($type, $this->types)) { - $viewOptions['gist']->setType($type); - $viewOptions['type_overrided'] = true; - } - } - - $response = $this->createResponse('View/embedJs.html.twig', $viewOptions); - $response->headers->set('Content-Type', 'text/javascript'); - - return $response; + return new Response( + $this->render('View/embedJs.html.twig', $viewOptions), + 200, + array( + 'Content-Type' => 'text/javascript', + ) + ); } /** @@ -114,7 +88,7 @@ class ViewController extends Controller * @param string $gist Gist's ID * @param string $commit The commit * - * @return Response + * @return string|Response */ public function rawAction(Request $request, $gist, $commit) { @@ -140,7 +114,7 @@ class ViewController extends Controller * @param string $gist Gist's ID * @param string $commit The commit * - * @return Response + * @return string|Response */ public function downloadAction(Request $request, $gist, $commit) { @@ -157,10 +131,9 @@ class ViewController extends Controller 200, array( 'Content-Disposition' => sprintf('filename=%s.%s', $gist->getFile(), $gist->getTypeAsExtension()), - 'Content-Length' => mb_strlen($viewOptions['raw_content']), + 'Content-Length' => filesize($file), 'Content-Type' => 'application/force-download', - ), - false + ) ); } else { return $this->notFoundResponse($app); @@ -173,7 +146,7 @@ class ViewController extends Controller * @param Request $request * @param string $gist Gist's ID * - * @return Response + * @return string|Response */ public function revisionsAction(Request $request, $gist) { @@ -191,7 +164,7 @@ class ViewController extends Controller return $this->notFoundResponse(); } - return $this->createResponse( + return $this->render( 'View/revisions.html.twig', array( 'gist' => $gist, diff --git a/src/Gist/Form/ApiCreateGistForm.php b/src/Gist/Form/ApiCreateGistForm.php index 436f78a..27f3e4b 100644 --- a/src/Gist/Form/ApiCreateGistForm.php +++ b/src/Gist/Form/ApiCreateGistForm.php @@ -16,9 +16,7 @@ class ApiCreateGistForm extends CreateGistForm { parent::build($options); - $this->builder - ->remove('cipher') - ->remove('file'); + $this->builder->remove('cipher'); return $this->builder; } diff --git a/src/Gist/Form/ApiUpdateGistForm.php b/src/Gist/Form/ApiUpdateGistForm.php index bc058e3..2594d59 100644 --- a/src/Gist/Form/ApiUpdateGistForm.php +++ b/src/Gist/Form/ApiUpdateGistForm.php @@ -18,7 +18,6 @@ class ApiUpdateGistForm extends ApiCreateGistForm $this->builder ->remove('title') - ->remove('file') ->remove('type'); return $this->builder; diff --git a/src/Gist/Form/CreateGistForm.php b/src/Gist/Form/CreateGistForm.php index 3972796..a30e4f8 100644 --- a/src/Gist/Form/CreateGistForm.php +++ b/src/Gist/Form/CreateGistForm.php @@ -32,25 +32,16 @@ class CreateGistForm extends AbstractForm 'content', 'textarea', array( - 'required' => false, + 'required' => true, 'attr' => array( 'class' => 'form-control', 'rows' => 10, ), 'trim' => false, 'constraints' => array( - ), - ) - ); - - $this->builder->add( - 'file', - 'file', - array( - 'required' => false, - 'attr' => array( - ), - 'constraints' => array( + new NotBlank(array( + 'message' => $this->translator->trans('form.error.not_blank'), + )), ), ) ); @@ -97,7 +88,6 @@ class CreateGistForm extends AbstractForm 'sql' => '', 'xml' => '', 'yaml' => '', - 'markdown' => '', 'perl' => '', 'c' => '', 'asp' => '', diff --git a/src/Gist/Model/Gist.php b/src/Gist/Model/Gist.php index 90d8259..23a4809 100644 --- a/src/Gist/Model/Gist.php +++ b/src/Gist/Model/Gist.php @@ -3,7 +3,6 @@ namespace Gist\Model; use Gist\Model\Base\Gist as BaseGist; -use Propel\Runtime\Map\TableMap; /** * Class Gist. @@ -45,16 +44,14 @@ class Gist extends BaseGist } /** - * Returns the type for highlighting. + * Returns the type for Geshi. * * @return string */ - public function getHighlightType() + public function getGeshiType() { $data = array( 'html' => 'xml', - 'asp' => 'aspnet', - 'actionscript3' => 'actionscript', ); return str_replace(array_keys($data), array_values($data), $this->getType()); @@ -75,7 +72,6 @@ class Gist extends BaseGist 'bash' => 'sh', 'actionscript3' => 'as', 'text' => 'txt', - 'markdown' => 'md', ); return str_replace(array_keys($data), array_values($data), $this->getType()); @@ -90,25 +86,4 @@ class Gist extends BaseGist return $this; } - - /** - * {@inheritdoc} - */ - public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) - { - $data = parent::toArray( - $keyType, - $includeLazyLoadColumns, - $alreadyDumpedObjects, - $includeForeignObjects - ); - - foreach ($data as $key => $value) { - $newKey = lcfirst($key); - unset($data[$key]); - $data[$newKey] = $value; - } - - return $data; - } } diff --git a/src/Gist/Model/User.php b/src/Gist/Model/User.php index b57d03e..e5d483b 100644 --- a/src/Gist/Model/User.php +++ b/src/Gist/Model/User.php @@ -54,7 +54,7 @@ class User extends BaseUser implements UserInterface * * @return Propel\Runtime\Util\PropelModelPager */ - public function getGistsPager($page, $options = array(), $maxPerPage = 10) + public function getGistsPager($page, $options = array(), $maxPerPage = 10) { $query = GistQuery::create() ->filterByUser($this) @@ -63,11 +63,11 @@ class User extends BaseUser implements UserInterface if (!empty($options['type']) && $options['type'] !== 'all') { $query->filterByType($options['type']); } - + if (!empty($options['title'])) { $query->filterByTitle('%'.$options['title'].'%', Criteria::LIKE); } - + if (!empty($options['cipher']) && $options['cipher'] !== 'anyway') { $bools = array( 'yes' => true, diff --git a/src/Gist/Resources/config/propel/schema.xml b/src/Gist/Resources/config/propel/schema.xml index 8caac4e..ce79ebb 100644 --- a/src/Gist/Resources/config/propel/schema.xml +++ b/src/Gist/Resources/config/propel/schema.xml @@ -22,7 +22,6 @@ - diff --git a/src/Gist/Resources/public b/src/Gist/Resources/public deleted file mode 120000 index 55a9cd7..0000000 --- a/src/Gist/Resources/public +++ /dev/null @@ -1 +0,0 @@ -../../../web/app/ \ No newline at end of file diff --git a/src/Gist/Resources/views/Edit/index.html.twig b/src/Gist/Resources/views/Edit/index.html.twig index eb06868..e557467 100644 --- a/src/Gist/Resources/views/Edit/index.html.twig +++ b/src/Gist/Resources/views/Edit/index.html.twig @@ -4,7 +4,7 @@ {% block body %}
-
+
@@ -71,10 +71,6 @@ {{ form_errors(form.content) }} {{ form_widget(form.content) }}

-

- {{ form_errors(form.file) }} - {{ form_widget(form.file) }} -

diff --git a/src/Gist/Resources/views/My/my.html.twig b/src/Gist/Resources/views/My/my.html.twig index 9ccbbc7..2e65a3b 100644 --- a/src/Gist/Resources/views/My/my.html.twig +++ b/src/Gist/Resources/views/My/my.html.twig @@ -205,61 +205,30 @@
- {% set apiEnabled = app.settings.api.enabled %} +
+
+ {{ 'login.login.form.password.placeholder'|trans }} +
+
+
+ +

+ {{ form_errors(passwordForm.currentPassword) }} + {{ form_widget(passwordForm.currentPassword) }} +

-
-
-
-
- {{ 'login.login.form.password.placeholder'|trans }} -
-
-
- -

- {{ form_errors(passwordForm.currentPassword) }} - {{ form_widget(passwordForm.currentPassword) }} -

+

+ {{ form_errors(passwordForm.newPassword) }} + {{ form_widget(passwordForm.newPassword) }} +

-

- {{ form_errors(passwordForm.newPassword) }} - {{ form_widget(passwordForm.newPassword) }} -

- -

- {{ form_rest(passwordForm) }} - -

- -
-
+

+ {{ form_rest(passwordForm) }} + +

+
- {% if apiEnabled %} -
-
-
- {{ 'my.api.title'|trans }} -
-
-
-

{{ 'my.api.warning'|trans|raw }}

- -
-
-

- -

-

- -

-
-
-
-
-
-
- {% endif %}
diff --git a/src/Gist/Resources/views/View/embed.html.twig b/src/Gist/Resources/views/View/embed.html.twig index d1ee417..4dd7ad1 100644 --- a/src/Gist/Resources/views/View/embed.html.twig +++ b/src/Gist/Resources/views/View/embed.html.twig @@ -1,17 +1,31 @@ {% extends 'base.html.twig' %} {% block css %} - {{ parent() }} - - - - {% if theme_settings.name == 'dark' %} - + {% if gist.cipher %} + + {% else %} - + {% endif %} + {{ parent() }} + {% endblock %} @@ -31,83 +46,45 @@ {% block nav %}{% endblock %} {% block body %} - {% set routeParams = app.request.attributes.get('_route_params') %} - - {% if type_overrided is defined %} - {% set routeParams = routeParams|merge({type: gist.type}) %} - {% endif %} -
-
-
- {{ gist.title ? gist.title : 'gist.untitled'|trans }} -
-
-
-
- - -
-
-
-
- {{ commit|slice(0, 10) }} +
+ + + {{ commit|slice(0, 10) }} + + - {% if not gist.cipher %} - - - {{ 'gist.action.raw'|trans }} - - - - {{ 'gist.action.download'|trans }} - - {% endif %} + {% if not gist.cipher %} + + + {{ 'gist.action.raw'|trans }} + + + + {{ 'gist.action.download'|trans }} + + {% endif %} - - - {{ 'gist.action.clone'|trans }} - -
-
-
+ + + {{ 'gist.action.clone'|trans }} +
+ + {{ gist.title ? gist.title : 'gist.untitled'|trans }}
- 
{{ raw_content }}
+ {% if gist.cipher %} + 
{{ raw_content|raw }}
+ {% else %} + {{ content|raw }} + {% endif %}
@@ -123,5 +100,37 @@ {{ parent() }} - + + {% if gist.cipher %} + + + + + {% endif %} {% endblock %} diff --git a/src/Gist/Resources/views/View/embedJs.html.twig b/src/Gist/Resources/views/View/embedJs.html.twig index 8e55f0b..af08fd9 100644 --- a/src/Gist/Resources/views/View/embedJs.html.twig +++ b/src/Gist/Resources/views/View/embedJs.html.twig @@ -1,16 +1,10 @@ -{% set routeParams = app.request.attributes.get('_route_params') %} - -{% if type_overrided is defined %} - {% set routeParams = routeParams|merge({type: gist.type}) %} -{% endif %} - (function() { var iFrameResizeLoaded = function() { var div = document.getElementById('gist-{{ gist.file }}-{{ commit }}'); var iframeId = 'gist-' + (Math.floor(Math.random() * (10000 - 1)) + 1).toString(); var iframe = document.createElement('iframe'); - var url = '{{ app.request.getSchemeAndHttpHost() ~ path('embed', routeParams) }}'; - + var url = '{{ app.request.getSchemeAndHttpHost() ~ path('embed', app.request.attributes.get('_route_params')) }}'; + if (div.getAttribute('data-key')) { url = [url, div.getAttribute('data-key')].join(''); } diff --git a/src/Gist/Resources/views/View/revisions.html.twig b/src/Gist/Resources/views/View/revisions.html.twig index 3b8c2b4..bcf205f 100644 --- a/src/Gist/Resources/views/View/revisions.html.twig +++ b/src/Gist/Resources/views/View/revisions.html.twig @@ -1,15 +1,9 @@ {% extends 'base.html.twig' %} {% block css %} + + {{ parent() }} - - - - {% if theme_settings.name == 'dark' %} - - {% else %} - - {% endif %} {% endblock %} {% block title %}{{ gist.title ? gist.title : 'gist.untitled'|trans }} - {{ 'gist.action.history'|trans }}{% endblock %} @@ -29,7 +23,7 @@ {{ history|length }} - +
@@ -46,7 +40,7 @@ {% if loop.first %}init{% endif %} - + {% if not loop.first %} diff @@ -58,14 +52,17 @@

{% if not loop.first %} - 
{% if not gist.cipher %}{{ commit.diff }}{% endif %}
- +
+ {% if not gist.cipher %} + {{ commit.diff|raw }} + {% endif %} +
{% endif %}
{% if not loop.last %} -
+
{% endif %} {% endfor %}
@@ -79,10 +76,10 @@ {% block js %} {{ parent() }} - - {% if gist.cipher %} - + {{ include('View/cipherJs.html.twig') }} + + {% endif %} {% endblock %} diff --git a/src/Gist/Resources/views/View/view.html.twig b/src/Gist/Resources/views/View/view.html.twig index 0aed8e4..97db4ca 100644 --- a/src/Gist/Resources/views/View/view.html.twig +++ b/src/Gist/Resources/views/View/view.html.twig @@ -1,26 +1,19 @@ {% extends 'base.html.twig' %} {% block css %} - {{ parent() }} - - - - {% if theme_settings.name == 'dark' %} - + {% if gist.cipher %} + + {% else %} - + {% endif %} + + {{ parent() }} {% endblock %} {% block title %}{{ gist.title ? gist.title : 'gist.untitled'|trans }} - {{ commit|slice(0, 10) }}{% endblock %} {% block body %} - {% set routeParams = app.request.attributes.get('_route_params') %} - - {% if type_overrided is defined %} - {% set routeParams = routeParams|merge({type: gist.type}) %} - {% endif %} -
{% block langs %}

- {% for locale, flag in {'en': 'gb', 'fr': 'fr', 'es': 'es', 'de': 'de', 'cn': 'cn', 'pl': 'pl'} %} + {% for locale, flag in {'en': 'gb', 'fr': 'fr', 'es': 'es', 'de': 'de'} %} diff --git a/src/Gist/Service/Gist.php b/src/Gist/Service/Gist.php index db9b96c..7877164 100644 --- a/src/Gist/Service/Gist.php +++ b/src/Gist/Service/Gist.php @@ -32,18 +32,25 @@ class Gist */ protected $gitWorkingCopy; + /** + * @var GeSHi + */ + protected $geshi; + /** * __construct. * * @param mixed $gistPath * @param GitWrapper $gitWrapper * @param GitWorkingCopy $gitWorkingCopy + * @param GeSHi $geshi */ - public function __construct($gistPath, GitWrapper $gitWrapper, GitWorkingCopy $gitWorkingCopy) + public function __construct($gistPath, GitWrapper $gitWrapper, GitWorkingCopy $gitWorkingCopy, GeSHi $geshi) { $this->gistPath = $gistPath; $this->gitWrapper = $gitWrapper; $this->gitWorkingCopy = $gitWorkingCopy; + $this->geshi = $geshi; } /** @@ -88,7 +95,7 @@ class Gist $data = array( 'commit' => trim($commits[$i][1]), 'date' => new \DateTime(trim($dates[$i][1])), - 'diff' => str_replace('\ No newline at end of file', '', $diff), + 'diff' => $this->highlight('diff', $diff), ); if ($gist->isCipher()) { @@ -186,4 +193,20 @@ class Gist return count(explode("\n", $content)); } + + /** + * Highlight the content. + * + * @param string $type + * @param string $content + * + * @return string + */ + public function highlight($type, $content) + { + $this->geshi->set_source($content); + $this->geshi->set_language($type); + + return $this->geshi->parse_code(); + } } diff --git a/src/Gist/Service/SaltGenerator.php b/src/Gist/Service/SaltGenerator.php index a3143c2..f86a0e0 100644 --- a/src/Gist/Service/SaltGenerator.php +++ b/src/Gist/Service/SaltGenerator.php @@ -18,30 +18,18 @@ class SaltGenerator * * @return string */ - public function generate($length = 32, $isApiKey = false) + public function generate($length = 32) { if (!is_numeric($length)) { throw new InvalidArgumentException('Paramter length must be a valid integer.'); } if (function_exists('openssl_random_pseudo_bytes')) { - $string = base64_encode(openssl_random_pseudo_bytes(256)); + return substr(base64_encode(openssl_random_pseudo_bytes($length)), 0, $length); } if (function_exists('mcrypt_create_iv')) { - $string = base64_encode(mcrypt_create_iv(256, MCRYPT_DEV_URANDOM)); - } - - if (!empty($string)) { - if (true === $isApiKey) { - $string = str_replace( - array('+', '%', '/', '#', '&'), - '', - $string - ); - } - - return substr($string, 0, $length); + return substr(base64_encode(mcrypt_create_iv($length, MCRYPT_DEV_URANDOM)), 0, $length); } throw new RuntimeException('You must enable openssl or mcrypt modules.'); diff --git a/src/Gist/Service/UserProvider.php b/src/Gist/Service/UserProvider.php index e887b50..beab8e1 100644 --- a/src/Gist/Service/UserProvider.php +++ b/src/Gist/Service/UserProvider.php @@ -126,7 +126,6 @@ class UserProvider implements UserProviderInterface $user ->setRoles('ROLE_USER') ->setPassword($this->encoder->encodePassword($password, $user->getSalt())) - ->setApiKey($this->saltGenerator->generate(32, true)) ->save(); return $user; @@ -167,20 +166,6 @@ class UserProvider implements UserProviderInterface return $user; } - /** - * Loads a user by his api key. - * - * @param string $apiKey - * - * @return User - */ - public function loadUserByApiKey($apiKey) - { - $user = UserQuery::create()->findOneByApiKey($apiKey); - - return $user; - } - /* * Checks if the given password is the current user password. * diff --git a/web/app/css/geshi/dawn.css b/web/app/css/geshi/dawn.css new file mode 100644 index 0000000..d1e6fc4 --- /dev/null +++ b/web/app/css/geshi/dawn.css @@ -0,0 +1,146 @@ +/* @override http://localhost/mark_story2/site/css/geshi.css */ +/** + * GeSHi CSS Inspired by + * TextMate Theme Dawn + * + * Copyright 2008 Mark Story + * + * This work is licensed under the Creative Commons Attribution-Share Alike 2.5 Canada License. + * To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.5/ca/ + * or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA. + * + * @copyright Copyright 2008, Mark Story. + * @link http://mark-story.com + * @license http://creativecommons.org/licenses/by-sa/2.5/ca/ + */ + +/* +* Global geshi styles +**********************/ +#main pre { + line-height: 1.5em; + font-size: 10px; + white-space: normal; + padding: 0; + background: #E8EDF4; + border: 1px solid #222; +} +pre ol { + list-style: decimal; + list-style-position: outside; + padding: 0; + margin: 0; +} +#main pre ol li { + margin: 0 0 0 35px; + padding: 0; + color: #333; + clear: none; +} +pre ol li div { + color:#000; +} + +/* Line highlights */ +.li1 { + background: #E4E8EF; +} + + +/* comments */ +.co1, +.coMULTI { + color:#5A526E; +} +/* methods */ +.me1{ + color:#000; +} +.me0 { + +} +.me2 { + color:#000; +} + +/* brackets */ +.br0 { + color:#000; +} + +/* strings */ +.st0 { + color:#0B6125; +} + +/* keywords */ +.kw1 { + color: #794938; +} +.kw2 { + color:#A71D5D; + font-style: italic; +} + +.kw3 { + color:#693A17; +} + +/* numbers */ +.nu0 { + color:#811F24; +} + +/* vars */ +.re0 { + color:#434A97; +} + + +/* +* CSS selectors +*****************/ +/* classnames */ + +[lang=css] .kw2, +.css .kw2 { + color:#C24F24; +} +[lang=css] .kw1, +.css .kw1 { + color:#691C97; +} +[lang=css] .re0, +.css .re0 { + color: #C24F24; +} +.re1 { + color: #C24F24; +} +/* px values */ +[lang=css] .re3, +.css .re3 { + color:#84252A; +} + +/* +* Python +****************/ +[lang=python] ol li div, +.python ol li div { + color: #000; +} +[lang=python] .kw2, +.python .kw2 { + font-style: normal; +} +[lang=python] .kw1 { + color: #A91D5D; +} +/* +* Javascript +****************/ +[lang=javascript] .me1, +.javascript .me1 { + color: #794938; +} diff --git a/web/app/css/geshi/mac-classic.css b/web/app/css/geshi/mac-classic.css new file mode 100644 index 0000000..ae152f3 --- /dev/null +++ b/web/app/css/geshi/mac-classic.css @@ -0,0 +1,131 @@ +/** + * GeSHi CSS Inspired by TextMate + * Theme Mac Classic + * + * Copyright 2008 Mark Story + * + * This work is licensed under the Creative Commons Attribution-Share Alike 2.5 Canada License. + * To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.5/ca/ + * or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA. + * + * @copyright Copyright 2008, Mark Story. + * @link http://mark-story.com + * @license http://creativecommons.org/licenses/by-sa/2.5/ca/ + */ + +/* +* Global geshi styles +**********************/ +#main pre { + line-height: 1.5em; + font-size: 10px; + white-space: normal; + padding: 0; + background: #eae9e5; + border: 1px solid #c0c0c0; +} +pre ol { + list-style: decimal; + list-style-position: outside; + padding: 0; + margin: 0; +} +#main pre ol li { + margin: 0 0 0 35px; + padding: 0; + color: #000; + clear: none; +} +pre ol li div { + color:#000; +} + + +/* php */ +pre[lang=php] ol div, +pre.php ol div { + color:#fd1435; +} +/* Line highlights */ +.li1 { + background: #f2f2f2; +} +/* Line highlights */ +.li1 { + background: #f2f2f2; +} + +/* comments */ +.co1, +.coMULTI { + color:#5c9dff; +} +/* methods */ +.me1{ + color:#000; +} +.me0 { + +} +.me2 { + color:#000; +} + +/* brackets */ +.br0 { + color:#222; +} + +/* strings */ +.st0 { + color:#b701bb; +} + +/* keywords */ +.kw1 { + color: #fd1435; +} +.kw2 { + color:#6266f5; +} + +.kw3 { + color:#505e80; +} + +/* numbers */ +.nu0 { + color:#0a0aa5; +} + +/* vars */ +.re0 { + color:#059532; +} + + +/* +* CSS selectors +*****************/ +/* classnames */ + +[lang=css] .kw2, +.css .kw2 { + color:#0a0aa5; +} +.re1 { + color: #b701bb; +} +/* px values */ +[lang=css] .re3, +.css .re3 { + color:#059532; +} + +/* +* Javascript +****************/ +[lang=javascript] .me1, +.javascript .me1 { + color:#505e80; +} diff --git a/web/app/css/geshi/twilight.css b/web/app/css/geshi/twilight.css new file mode 100644 index 0000000..9e2c15c --- /dev/null +++ b/web/app/css/geshi/twilight.css @@ -0,0 +1,123 @@ +/* @override http://localhost/mark_story2/site/css/geshi.css */ +/** + * GeSHi CSS Inspired by TextMate + * Theme Twilight + * + * Copyright 2008 Mark Story + * + * This work is licensed under the Creative Commons Attribution-Share Alike 2.5 Canada License. + * To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.5/ca/ + * or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA. + * + * @filesource + * @copyright Copyright 2008, Mark Story. + * @link http://mark-story.com + * @license http://creativecommons.org/licenses/by-sa/2.5/ca/ + */ +/* +* Global geshi styles +**********************/ +#main pre { + line-height: 1.5em; + font-size: 10px; + white-space: normal; + padding: 0; + background: #222223; + border: 1px solid #222; +} +pre ol { + list-style: decimal; + list-style-position: outside; + padding: 0; + margin: 0; +} +#main pre ol li { + margin: 0 0 0 35px; + padding: 0; + color: #000; + clear: none; +} +pre ol li div { + color:#f8f8f8; +} + +/* Line highlights */ +.li1 { + background: #202021; +} + + +/* comments */ +.co1, +.coMULTI { + color:#5F5A60; +} +/* methods */ +.me1{ + color:#fff; +} +.me0 { + +} +.me2 { + color:#000; +} + +/* brackets */ +.br0 { + color:#fff; +} + +/* strings */ +.st0 { + color:#8F9657; +} + +/* keywords */ +.kw1 { + color: #CDA869; +} +.kw2 { + color:#F9EE98; +} + +.kw3 { + color:#505e80; +} + +/* numbers */ +.nu0 { + color:#CF6745; +} + +/* vars */ +.re0 { + color:#7587A6; +} + + +/* +* CSS selectors +*****************/ +/* classnames */ + +[lang=css] .kw2, +.css .kw2 { + color:#F9EE7E; +} +.re1 { + color: #96703D; +} +/* px values */ +[lang=css] .re3, +.css .re3 { + color:#CA7840; +} + +/* +* Javascript +****************/ +[lang=javascript] .me1, +.javascript .me1 { + color:#505e80; +} diff --git a/web/app/css/geshi/vibrant-ink.css b/web/app/css/geshi/vibrant-ink.css new file mode 100644 index 0000000..3c920e3 --- /dev/null +++ b/web/app/css/geshi/vibrant-ink.css @@ -0,0 +1,148 @@ +/* @override http://localhost/mark_story2/site/css/geshi.css */ +/** + * GeSHi CSS Inspired by TextMate + * Theme Vibrant Ink + * + * Copyright 2008 Mark Story + * + * This work is licensed under the Creative Commons Attribution-Share Alike 2.5 Canada License. + * To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.5/ca/ + * or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA. + * + * @copyright Copyright 2008, Mark Story. + * @link http://mark-story.com + * @license http://creativecommons.org/licenses/by-sa/2.5/ca/ + */ + +/* +* Global geshi styles +**********************/ +#main pre { + line-height: 1.5em; + font-size: 10px; + white-space: normal; + padding: 0; + background: #000; + border: 1px solid #222; +} +pre ol { + list-style: decimal; + list-style-position: outside; + padding: 0; + margin: 0; +} +#main pre ol li { + margin: 0 0 0 35px; + padding: 0; + color: #fff; + clear: none; +} +pre ol li div { + /*color: #F26100;*/ + color: #D2C0B4; +} + +/* Line highlights */ +.li1 { + background: #030303; +} + + +/* comments */ +.co1, +.coMULTI { + color:#7830CC; +} +/* methods */ +.me1{ + color:#fff; +} +.me0 { + +} +.me2 { + color:#000; +} + +/* brackets */ +.br0 { + color:#fff; +} + +/* strings */ +.st0 { + color:#52F700; +} + +/* keywords */ +.kw1 { + color: #C6C765; +} +.kw2 { + color:#FFC500; +} + +.kw3 { + color:#505e80; +} + +/* numbers */ +.nu0 { + color:#319994; +} + +/* vars */ +.re0 { + color:#fff; +} + + +/* +* CSS selectors +*****************/ +/* classnames */ + +[lang=css] .kw2, +.css .kw2 { + color:#fff; +} +[lang=css] .kw1, +.css .kw1 { + color:#999966; +} +[lang=css] .re0, +.css .re0 { + color: #F26100; +} +.re1 { + color: #96703D; +} +/* px values */ +[lang=css] .re3, +.css .re3 { + color:#fff; +} + +/* +* Python +****************/ +[lang=python] ol li div, +.python ol li div { + color: #fff; +} +[lang=python] .kw1, +.python .kw1 { + color:#F26100; +} + +/* +* Javascript +****************/ +[lang=javascript] .me1, +.javascript .me1 { + color:#fff; +} +pre[lang=javascript] ol li div, +.javascript ol li div { + color: #fff; +} diff --git a/web/app/css/prism-okaidia.css b/web/app/css/prism-okaidia.css deleted file mode 100644 index 3e0da35..0000000 --- a/web/app/css/prism-okaidia.css +++ /dev/null @@ -1,121 +0,0 @@ -/** - * okaidia theme for JavaScript, CSS and HTML - * Loosely based on Monokai textmate theme by http://www.monokai.nl/ - * @author ocodia - */ - -code[class*="language-"], -pre[class*="language-"] { - color: #f8f8f2; - background: none; - text-shadow: 0 1px rgba(0, 0, 0, 0.3); - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; - text-align: left; - white-space: pre; - word-spacing: normal; - word-break: normal; - word-wrap: normal; - line-height: 1.5; - - -moz-tab-size: 4; - -o-tab-size: 4; - tab-size: 4; - - -webkit-hyphens: none; - -moz-hyphens: none; - -ms-hyphens: none; - hyphens: none; -} - -/* Code blocks */ -pre[class*="language-"] { - padding: 1em; - margin: .5em 0; - overflow: auto; - border-radius: 0.3em; -} - -:not(pre) > code[class*="language-"], -pre[class*="language-"] { - background: #272822; -} - -/* Inline code */ -:not(pre) > code[class*="language-"] { - padding: .1em; - border-radius: .3em; - white-space: normal; -} - -.token.comment, -.token.prolog, -.token.doctype, -.token.cdata { - color: slategray; -} - -.token.punctuation { - color: #f8f8f2; -} - -.namespace { - opacity: .7; -} - -.token.property, -.token.tag, -.token.constant, -.token.symbol, -.token.deleted { - color: #f92672; -} - -.token.boolean, -.token.number { - color: #ae81ff; -} - -.token.selector, -.token.attr-name, -.token.string, -.token.char, -.token.builtin, -.token.inserted { - color: #a6e22e; -} - -.token.operator, -.token.entity, -.token.url, -.language-css .token.string, -.style .token.string, -.token.variable { - color: #f8f8f2; -} - -.token.atrule, -.token.attr-value, -.token.function { - color: #e6db74; -} - -.token.keyword { - color: #66d9ef; -} - -.token.regex, -.token.important { - color: #fd971f; -} - -.token.important, -.token.bold { - font-weight: bold; -} -.token.italic { - font-style: italic; -} - -.token.entity { - cursor: help; -} diff --git a/web/app/css/prism-solarizedlight.css b/web/app/css/prism-solarizedlight.css deleted file mode 100644 index bad7703..0000000 --- a/web/app/css/prism-solarizedlight.css +++ /dev/null @@ -1,148 +0,0 @@ -/* - Solarized Color Schemes originally by Ethan Schoonover - http://ethanschoonover.com/solarized - - Ported for PrismJS by Hector Matos - Website: https://krakendev.io - Twitter Handle: https://twitter.com/allonsykraken) -*/ - -/* -SOLARIZED HEX ---------- ------- -base03 #002b36 -base02 #073642 -base01 #586e75 -base00 #657b83 -base0 #839496 -base1 #93a1a1 -base2 #eee8d5 -base3 #fdf6e3 -yellow #b58900 -orange #cb4b16 -red #dc322f -magenta #d33682 -violet #6c71c4 -blue #268bd2 -cyan #2aa198 -green #859900 -*/ - -code[class*="language-"], -pre[class*="language-"] { - color: #657b83; /* base00 */ - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; - text-align: left; - white-space: pre; - word-spacing: normal; - word-break: normal; - word-wrap: normal; - - line-height: 1.5; - - -moz-tab-size: 4; - -o-tab-size: 4; - tab-size: 4; - - -webkit-hyphens: none; - -moz-hyphens: none; - -ms-hyphens: none; - hyphens: none; -} - -pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection, -code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection { - background: #073642; /* base02 */ -} - -pre[class*="language-"]::selection, pre[class*="language-"] ::selection, -code[class*="language-"]::selection, code[class*="language-"] ::selection { - background: #073642; /* base02 */ -} - -/* Code blocks */ -pre[class*="language-"] { - padding: 1em; - margin: .5em 0; - overflow: auto; - border-radius: 0.3em; -} - -:not(pre) > code[class*="language-"], -pre[class*="language-"] { - background-color: #fdf6e3; /* base3 */ -} - -/* Inline code */ -:not(pre) > code[class*="language-"] { - padding: .1em; - border-radius: .3em; -} - -.token.comment, -.token.prolog, -.token.doctype, -.token.cdata { - color: #93a1a1; /* base1 */ -} - -.token.punctuation { - color: #586e75; /* base01 */ -} - -.namespace { - opacity: .7; -} - -.token.property, -.token.tag, -.token.boolean, -.token.number, -.token.constant, -.token.symbol, -.token.deleted { - color: #268bd2; /* blue */ -} - -.token.selector, -.token.attr-name, -.token.string, -.token.char, -.token.builtin, -.token.url, -.token.inserted { - color: #2aa198; /* cyan */ -} - -.token.entity { - color: #657b83; /* base00 */ - background: #eee8d5; /* base2 */ -} - -.token.atrule, -.token.attr-value, -.token.keyword { - color: #859900; /* green */ -} - -.token.function { - color: #b58900; /* yellow */ -} - -.token.regex, -.token.important, -.token.variable { - color: #cb4b16; /* orange */ -} - -.token.important, -.token.bold { - font-weight: bold; -} -.token.italic { - font-style: italic; -} - -.token.entity { - cursor: help; -} \ No newline at end of file diff --git a/web/app/css/prism.css b/web/app/css/prism.css deleted file mode 100644 index 330bdc9..0000000 --- a/web/app/css/prism.css +++ /dev/null @@ -1,233 +0,0 @@ -/* PrismJS 1.15.0 -https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+actionscript+c+csharp+bash+cpp+aspnet+css-extras+diff+markup-templating+markdown+perl+php+php-extras+sql+python+yaml&plugins=line-highlight+line-numbers */ -/** - * prism.js default theme for JavaScript, CSS and HTML - * Based on dabblet (http://dabblet.com) - * @author Lea Verou - */ - -code[class*="language-"], -pre[class*="language-"] { - color: black; - background: none; - text-shadow: 0 1px white; - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; - text-align: left; - white-space: pre; - word-spacing: normal; - word-break: normal; - word-wrap: normal; - line-height: 1.5; - - -moz-tab-size: 4; - -o-tab-size: 4; - tab-size: 4; - - -webkit-hyphens: none; - -moz-hyphens: none; - -ms-hyphens: none; - hyphens: none; -} - -pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection, -code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection { - text-shadow: none; - background: #b3d4fc; -} - -pre[class*="language-"]::selection, pre[class*="language-"] ::selection, -code[class*="language-"]::selection, code[class*="language-"] ::selection { - text-shadow: none; - background: #b3d4fc; -} - -@media print { - code[class*="language-"], - pre[class*="language-"] { - text-shadow: none; - } -} - -/* Code blocks */ -pre[class*="language-"] { - padding: 1em; - margin: .5em 0; - overflow: auto; -} - -:not(pre) > code[class*="language-"], -pre[class*="language-"] { - background: #f5f2f0; -} - -/* Inline code */ -:not(pre) > code[class*="language-"] { - padding: .1em; - border-radius: .3em; - white-space: normal; -} - -.token.comment, -.token.prolog, -.token.doctype, -.token.cdata { - color: slategray; -} - -.token.punctuation { - color: #999; -} - -.namespace { - opacity: .7; -} - -.token.property, -.token.tag, -.token.boolean, -.token.number, -.token.constant, -.token.symbol, -.token.deleted { - color: #905; -} - -.token.selector, -.token.attr-name, -.token.string, -.token.char, -.token.builtin, -.token.inserted { - color: #690; -} - -.token.operator, -.token.entity, -.token.url, -.language-css .token.string, -.style .token.string { - color: #9a6e3a; - background: hsla(0, 0%, 100%, .5); -} - -.token.atrule, -.token.attr-value, -.token.keyword { - color: #07a; -} - -.token.function, -.token.class-name { - color: #DD4A68; -} - -.token.regex, -.token.important, -.token.variable { - color: #e90; -} - -.token.important, -.token.bold { - font-weight: bold; -} -.token.italic { - font-style: italic; -} - -.token.entity { - cursor: help; -} - -pre[data-line] { - position: relative; - padding: 1em 0 1em 3em; -} - -.line-highlight { - position: absolute; - left: 0; - right: 0; - padding: inherit 0; - margin-top: 1em; /* Same as .prism’s padding-top */ - - background: hsla(24, 20%, 50%,.08); - background: linear-gradient(to right, hsla(24, 20%, 50%,.1) 70%, hsla(24, 20%, 50%,0)); - - pointer-events: none; - - line-height: inherit; - white-space: pre; -} - - .line-highlight:before, - .line-highlight[data-end]:after { - content: attr(data-start); - position: absolute; - top: .4em; - left: .6em; - min-width: 1em; - padding: 0 .5em; - background-color: hsla(24, 20%, 50%,.4); - color: hsl(24, 20%, 95%); - font: bold 65%/1.5 sans-serif; - text-align: center; - vertical-align: .3em; - border-radius: 999px; - text-shadow: none; - box-shadow: 0 1px white; - } - - .line-highlight[data-end]:after { - content: attr(data-end); - top: auto; - bottom: .4em; - } - -.line-numbers .line-highlight:before, -.line-numbers .line-highlight:after { - content: none; -} - -pre[class*="language-"].line-numbers { - position: relative; - padding-left: 3.8em; - counter-reset: linenumber; -} - -pre[class*="language-"].line-numbers > code { - position: relative; - white-space: inherit; -} - -.line-numbers .line-numbers-rows { - position: absolute; - pointer-events: none; - top: 0; - font-size: 100%; - left: -3.8em; - width: 3em; /* works for line-numbers below 1000 lines */ - letter-spacing: -1px; - border-right: 1px solid #999; - - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - -} - - .line-numbers-rows > span { - pointer-events: none; - display: block; - counter-increment: linenumber; - } - - .line-numbers-rows > span:before { - content: counter(linenumber); - color: #999; - display: block; - padding-right: 0.8em; - text-align: right; - } - diff --git a/web/app/css/themes/dark.css b/web/app/css/themes/dark.css index 22c0060..1d4ab1c 100644 --- a/web/app/css/themes/dark.css +++ b/web/app/css/themes/dark.css @@ -26,24 +26,54 @@ body { margin-right: 4px; } -#viewer pre, #viewer code, #revisions pre, #revisions code, #embed pre, #embed code { - background: none !important; +pre { + background: #222; + border: #222; + color: #ddd; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word; - border: 0; +} + +pre ol { + padding-left: 50px !important; +} + +pre li:hover { + background: #444; } .panel-heading .actions { margin-top: -5px; } -.diff { +div.diff { display: none; } +.de1 { + padding-left: 5px; + padding-right: 5px; +} + +.li1 { + background: #333; +} + +.re8 { + color: #52F700; +} + +.kw3 { + color: #C6C765; +} + +#viewer .syntaxhighlighter td { + vertical-align: top !important; +} + #options { margin-bottom: 17px; } @@ -56,11 +86,3 @@ body { .btn-error:active, .btn-error:hover, .btn-error:focus { color: #000; } - -pre.line-numbers { - padding-left: 50px !important; -} - -.line-numbers-rows { - top: -4px !important; -} diff --git a/web/app/css/themes/light.css b/web/app/css/themes/light.css index 71bcfc7..372b65f 100644 --- a/web/app/css/themes/light.css +++ b/web/app/css/themes/light.css @@ -16,24 +16,54 @@ margin-right: 4px; } -pre, code { - background: none !important; - white-space: pre-wrap !important; - white-space: -moz-pre-wrap !important; - white-space: -pre-wrap !important; - white-space: -o-pre-wrap !important; - word-wrap: break-word !important; - border: 0; +pre { + background: #222; + border: #222; + color: #ddd; + white-space: pre-wrap; + white-space: -moz-pre-wrap; + white-space: -pre-wrap; + white-space: -o-pre-wrap; + word-wrap: break-word; +} + +pre ol { + padding-left: 50px !important; +} + +pre li:hover { + background: #444; } .panel-heading .actions { margin-top: -5px; } -.diff { +div.diff { display: none; } +.de1 { + padding-left: 5px; + padding-right: 5px; +} + +.li1 { + background: #333; +} + +.re8 { + color: #52F700; +} + +.kw3 { + color: #C6C765; +} + +#viewer .syntaxhighlighter td { + vertical-align: top !important; +} + #options { margin-bottom: 17px; } @@ -46,11 +76,3 @@ pre, code { .btn-error:active, .btn-error:hover, .btn-error:focus { color: #000; } - -pre.line-numbers { - padding-left: 50px !important; -} - -.line-numbers-rows { - top: -4px !important; -} diff --git a/web/app/js/app.js b/web/app/js/app.js index 4c4d09e..a4d64d4 100644 --- a/web/app/js/app.js +++ b/web/app/js/app.js @@ -98,10 +98,6 @@ var myEvents = function() { $('#form-deletion form').submit(); } }); - - $(document).on('change keyup keydown', '#form-api-key', function() { - $(this).val($(this).data('key')); - }); } var mainEditorEvents = function() { @@ -138,13 +134,13 @@ var getKey = function() { } var viewerEvents = function() { - var $render = $('#viewer code[data-cipher]'); + var $render = $('.syntaxhighlighter'); $(document).ready(function() { var key = getKey(); var $cipherEditor = $('.cipher-editor'); - var $embedCode = $('#embed code'); + var $embedInput = $('#embed-input'); var to = ' '; @@ -163,8 +159,7 @@ var viewerEvents = function() { }); $render.text(decrypted.toString(CryptoJS.enc.Utf8)); - $render.attr('class', $render.data('class')); - Prism.highlightAll(); + SyntaxHighlighter.all(); to = ' data-key="#key=' + key + '" '; } else { @@ -177,9 +172,8 @@ var viewerEvents = function() { } } - if ($embedCode.length) { - $embedCode.html($embedCode.html().replace('%key%', to)); - Prism.highlightAll(); + if ($embedInput.length) { + $embedInput.val($embedInput.val().replace('%key%', to)); } }); } diff --git a/web/app/js/prism.js b/web/app/js/prism.js deleted file mode 100644 index c8c20ca..0000000 --- a/web/app/js/prism.js +++ /dev/null @@ -1,25 +0,0 @@ -/* PrismJS 1.15.0 -https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+actionscript+c+csharp+bash+cpp+aspnet+css-extras+diff+markup-templating+markdown+perl+php+php-extras+sql+python+yaml&plugins=line-highlight+line-numbers */ -var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-([\w-]+)\b/i,t=0,n=_self.Prism={manual:_self.Prism&&_self.Prism.manual,disableWorkerMessageHandler:_self.Prism&&_self.Prism.disableWorkerMessageHandler,util:{encode:function(e){return e instanceof a?new a(e.type,n.util.encode(e.content),e.alias):"Array"===n.util.type(e)?e.map(n.util.encode):e.replace(/&/g,"&").replace(/e.length)return;if(!(w instanceof s)){if(m&&b!=t.length-1){h.lastIndex=k;var _=h.exec(e);if(!_)break;for(var j=_.index+(d?_[1].length:0),P=_.index+_[0].length,A=b,x=k,O=t.length;O>A&&(P>x||!t[A].type&&!t[A-1].greedy);++A)x+=t[A].length,j>=x&&(++b,k=x);if(t[b]instanceof s)continue;I=A-b,w=e.slice(k,x),_.index-=k}else{h.lastIndex=0;var _=h.exec(w),I=1}if(_){d&&(p=_[1]?_[1].length:0);var j=_.index+p,_=_[0].slice(p),P=j+_.length,N=w.slice(0,j),S=w.slice(P),C=[b,I];N&&(++b,k+=N.length,C.push(N));var E=new s(u,f?n.tokenize(_,f):_,y,_,m);if(C.push(E),S&&C.push(S),Array.prototype.splice.apply(t,C),1!=I&&n.matchGrammar(e,t,a,b,k,!0,u),i)break}else if(i)break}}}}},tokenize:function(e,t){var a=[e],r=t.rest;if(r){for(var l in r)t[l]=r[l];delete t.rest}return n.matchGrammar(e,a,t,0,0,!1),a},hooks:{all:{},add:function(e,t){var a=n.hooks.all;a[e]=a[e]||[],a[e].push(t)},run:function(e,t){var a=n.hooks.all[e];if(a&&a.length)for(var r,l=0;r=a[l++];)r(t)}}},a=n.Token=function(e,t,n,a,r){this.type=e,this.content=t,this.alias=n,this.length=0|(a||"").length,this.greedy=!!r};if(a.stringify=function(e,t,r){if("string"==typeof e)return e;if("Array"===n.util.type(e))return e.map(function(n){return a.stringify(n,t,e)}).join("");var l={type:e.type,content:a.stringify(e.content,t,r),tag:"span",classes:["token",e.type],attributes:{},language:t,parent:r};if(e.alias){var i="Array"===n.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(l.classes,i)}n.hooks.run("wrap",l);var o=Object.keys(l.attributes).map(function(e){return e+'="'+(l.attributes[e]||"").replace(/"/g,""")+'"'}).join(" ");return"<"+l.tag+' class="'+l.classes.join(" ")+'"'+(o?" "+o:"")+">"+l.content+""},!_self.document)return _self.addEventListener?(n.disableWorkerMessageHandler||_self.addEventListener("message",function(e){var t=JSON.parse(e.data),a=t.language,r=t.code,l=t.immediateClose;_self.postMessage(n.highlight(r,n.languages[a],a)),l&&_self.close()},!1),_self.Prism):_self.Prism;var r=document.currentScript||[].slice.call(document.getElementsByTagName("script")).pop();return r&&(n.filename=r.src,n.manual||r.hasAttribute("data-manual")||("loading"!==document.readyState?window.requestAnimationFrame?window.requestAnimationFrame(n.highlightAll):window.setTimeout(n.highlightAll,16):document.addEventListener("DOMContentLoaded",n.highlightAll))),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism); -Prism.languages.markup={comment://,prolog:/<\?[\s\S]+?\?>/,doctype://i,cdata://i,tag:{pattern:/<\/?(?!\d)[^\s>\/=$<%]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/i,greedy:!0,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+)/i,inside:{punctuation:[/^=/,{pattern:/(^|[^\\])["']/,lookbehind:!0}]}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.languages.markup.tag.inside["attr-value"].inside.entity=Prism.languages.markup.entity,Prism.hooks.add("wrap",function(a){"entity"===a.type&&(a.attributes.title=a.content.replace(/&/,"&"))}),Prism.languages.xml=Prism.languages.markup,Prism.languages.html=Prism.languages.markup,Prism.languages.mathml=Prism.languages.markup,Prism.languages.svg=Prism.languages.markup; -Prism.languages.css={comment:/\/\*[\s\S]*?\*\//,atrule:{pattern:/@[\w-]+?[\s\S]*?(?:;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,selector:/[^{}\s][^{};]*?(?=\s*\{)/,string:{pattern:/("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,greedy:!0},property:/[-_a-z\xA0-\uFFFF][-\w\xA0-\uFFFF]*(?=\s*:)/i,important:/!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:,]/},Prism.languages.css.atrule.inside.rest=Prism.languages.css,Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/()[\s\S]*?(?=<\/style>)/i,lookbehind:!0,inside:Prism.languages.css,alias:"language-css",greedy:!0}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag)); -Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0,greedy:!0}],string:{pattern:/(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,greedy:!0},"class-name":{pattern:/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[\w.\\]+/i,lookbehind:!0,inside:{punctuation:/[.\\]/}},keyword:/\b(?:if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(?:true|false)\b/,"function":/\w+(?=\()/,number:/\b0x[\da-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i,operator:/--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/}; -Prism.languages.javascript=Prism.languages.extend("clike",{"class-name":[Prism.languages.clike["class-name"],{pattern:/(^|[^$\w\xA0-\uFFFF])[_$A-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\.(?:prototype|constructor))/,lookbehind:!0}],keyword:[{pattern:/((?:^|})\s*)(?:catch|finally)\b/,lookbehind:!0},/\b(?:as|async|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/],number:/\b(?:(?:0[xX][\dA-Fa-f]+|0[bB][01]+|0[oO][0-7]+)n?|\d+n|NaN|Infinity)\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee][+-]?\d+)?/,"function":/[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*\(|\.(?:apply|bind|call)\()/,operator:/-[-=]?|\+[+=]?|!=?=?|<>?>?=?|=(?:==?|>)?|&[&=]?|\|[|=]?|\*\*?=?|\/=?|~|\^=?|%=?|\?|\.{3}/}),Prism.languages.javascript["class-name"][0].pattern=/(\b(?:class|interface|extends|implements|instanceof|new)\s+)[\w.\\]+/,Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^\/\\\[\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})\]]))/,lookbehind:!0,greedy:!0},"function-variable":{pattern:/[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*[=:]\s*(?:async\s*)?(?:\bfunction\b|(?:\([^()]*\)|[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)\s*=>))/i,alias:"function"},parameter:[{pattern:/(function(?:\s+[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)?\s*\(\s*)[^\s()][^()]*?(?=\s*\))/,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*=>)/,inside:Prism.languages.javascript},{pattern:/(\(\s*)[^\s()][^()]*?(?=\s*\)\s*=>)/,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/((?:\b|\s|^)(?!(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)(?![$\w\xA0-\uFFFF]))(?:[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*\s*)\(\s*)[^\s()][^()]*?(?=\s*\)\s*\{)/,lookbehind:!0,inside:Prism.languages.javascript}],constant:/\b[A-Z][A-Z\d_]*\b/}),Prism.languages.insertBefore("javascript","string",{"template-string":{pattern:/`(?:\\[\s\S]|\${[^}]+}|[^\\`])*`/,greedy:!0,inside:{interpolation:{pattern:/\${[^}]+}/,inside:{"interpolation-punctuation":{pattern:/^\${|}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/()[\s\S]*?(?=<\/script>)/i,lookbehind:!0,inside:Prism.languages.javascript,alias:"language-javascript",greedy:!0}}),Prism.languages.js=Prism.languages.javascript; -Prism.languages.actionscript=Prism.languages.extend("javascript",{keyword:/\b(?:as|break|case|catch|class|const|default|delete|do|else|extends|finally|for|function|if|implements|import|in|instanceof|interface|internal|is|native|new|null|package|private|protected|public|return|super|switch|this|throw|try|typeof|use|var|void|while|with|dynamic|each|final|get|include|namespace|native|override|set|static)\b/,operator:/\+\+|--|(?:[+\-*\/%^]|&&?|\|\|?|<>?>?|[!=]=?)=?|[~?@]/}),Prism.languages.actionscript["class-name"].alias="function",Prism.languages.markup&&Prism.languages.insertBefore("actionscript","string",{xml:{pattern:/(^|[^.])<\/?\w+(?:\s+[^\s>\/=]+=("|')(?:\\[\s\S]|(?!\2)[^\\])*\2)*\s*\/?>/,lookbehind:!0,inside:{rest:Prism.languages.markup}}}); -Prism.languages.c=Prism.languages.extend("clike",{keyword:/\b(?:_Alignas|_Alignof|_Atomic|_Bool|_Complex|_Generic|_Imaginary|_Noreturn|_Static_assert|_Thread_local|asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,operator:/>>=?|<<=?|->|([-+&|:])\1|[?:~]|[-+*\/%&|^!=<>]=?/,number:/(?:\b0x[\da-f]+|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?)[ful]*/i}),Prism.languages.insertBefore("c","string",{macro:{pattern:/(^\s*)#\s*[a-z]+(?:[^\r\n\\]|\\(?:\r\n|[\s\S]))*/im,lookbehind:!0,alias:"property",inside:{string:{pattern:/(#\s*include\s*)(?:<.+?>|("|')(?:\\?.)+?\2)/,lookbehind:!0},directive:{pattern:/(#\s*)\b(?:define|defined|elif|else|endif|error|ifdef|ifndef|if|import|include|line|pragma|undef|using)\b/,lookbehind:!0,alias:"keyword"}}},constant:/\b(?:__FILE__|__LINE__|__DATE__|__TIME__|__TIMESTAMP__|__func__|EOF|NULL|SEEK_CUR|SEEK_END|SEEK_SET|stdin|stdout|stderr)\b/}),delete Prism.languages.c["class-name"],delete Prism.languages.c["boolean"]; -Prism.languages.csharp=Prism.languages.extend("clike",{keyword:/\b(?:abstract|add|alias|as|ascending|async|await|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|descending|do|double|dynamic|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|from|get|global|goto|group|if|implicit|in|int|interface|internal|into|is|join|let|lock|long|namespace|new|null|object|operator|orderby|out|override|params|partial|private|protected|public|readonly|ref|remove|return|sbyte|sealed|select|set|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|value|var|virtual|void|volatile|where|while|yield)\b/,string:[{pattern:/@("|')(?:\1\1|\\[\s\S]|(?!\1)[^\\])*\1/,greedy:!0},{pattern:/("|')(?:\\.|(?!\1)[^\\\r\n])*?\1/,greedy:!0}],"class-name":[{pattern:/\b[A-Z]\w*(?:\.\w+)*\b(?=\s+\w+)/,inside:{punctuation:/\./}},{pattern:/(\[)[A-Z]\w*(?:\.\w+)*\b/,lookbehind:!0,inside:{punctuation:/\./}},{pattern:/(\b(?:class|interface)\s+[A-Z]\w*(?:\.\w+)*\s*:\s*)[A-Z]\w*(?:\.\w+)*\b/,lookbehind:!0,inside:{punctuation:/\./}},{pattern:/((?:\b(?:class|interface|new)\s+)|(?:catch\s+\())[A-Z]\w*(?:\.\w+)*\b/,lookbehind:!0,inside:{punctuation:/\./}}],number:/\b0x[\da-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)f?/i,operator:/>>=?|<<=?|[-=]>|([-+&|?])\1|~|[-+*\/%&|^!=<>]=?/,punctuation:/\?\.?|::|[{}[\];(),.:]/}),Prism.languages.insertBefore("csharp","class-name",{"generic-method":{pattern:/\w+\s*<[^>\r\n]+?>\s*(?=\()/,inside:{"function":/^\w+/,"class-name":{pattern:/\b[A-Z]\w*(?:\.\w+)*\b/,inside:{punctuation:/\./}},keyword:Prism.languages.csharp.keyword,punctuation:/[<>(),.:]/}},preprocessor:{pattern:/(^\s*)#.*/m,lookbehind:!0,alias:"property",inside:{directive:{pattern:/(\s*#)\b(?:define|elif|else|endif|endregion|error|if|line|pragma|region|undef|warning)\b/,lookbehind:!0,alias:"keyword"}}}}),Prism.languages.dotnet=Prism.languages.csharp; -!function(e){var t={variable:[{pattern:/\$?\(\([\s\S]+?\)\)/,inside:{variable:[{pattern:/(^\$\(\([\s\S]+)\)\)/,lookbehind:!0},/^\$\(\(/],number:/\b0x[\dA-Fa-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee]-?\d+)?/,operator:/--?|-=|\+\+?|\+=|!=?|~|\*\*?|\*=|\/=?|%=?|<<=?|>>=?|<=?|>=?|==?|&&?|&=|\^=?|\|\|?|\|=|\?|:/,punctuation:/\(\(?|\)\)?|,|;/}},{pattern:/\$\([^)]+\)|`[^`]+`/,greedy:!0,inside:{variable:/^\$\(|^`|\)$|`$/}},/\$(?:[\w#?*!@]+|\{[^}]+\})/i]};e.languages.bash={shebang:{pattern:/^#!\s*\/bin\/bash|^#!\s*\/bin\/sh/,alias:"important"},comment:{pattern:/(^|[^"{\\])#.*/,lookbehind:!0},string:[{pattern:/((?:^|[^<])<<\s*)["']?(\w+?)["']?\s*\r?\n(?:[\s\S])*?\r?\n\2/,lookbehind:!0,greedy:!0,inside:t},{pattern:/(["'])(?:\\[\s\S]|\$\([^)]+\)|`[^`]+`|(?!\1)[^\\])*\1/,greedy:!0,inside:t}],variable:t.variable,"function":{pattern:/(^|[\s;|&])(?:alias|apropos|apt|apt-cache|apt-get|aptitude|aspell|automysqlbackup|awk|basename|bash|bc|bconsole|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chkconfig|chmod|chown|chroot|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|curl|cut|date|dc|dd|ddrescue|debootstrap|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|egrep|eject|enable|env|ethtool|eval|exec|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|gparted|grep|groupadd|groupdel|groupmod|groups|grub-mkconfig|gzip|halt|hash|head|help|hg|history|host|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|ip|jobs|join|kill|killall|less|link|ln|locate|logname|logout|logrotate|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|lynx|make|man|mc|mdadm|mkconfig|mkdir|mke2fs|mkfifo|mkfs|mkisofs|mknod|mkswap|mmv|more|most|mount|mtools|mtr|mutt|mv|nano|nc|netstat|nice|nl|nohup|notify-send|npm|nslookup|op|open|parted|passwd|paste|pathchk|ping|pkill|popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|remsync|rename|renice|rev|rm|rmdir|rpm|rsync|scp|screen|sdiff|sed|sendmail|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|swapon|sync|tail|tar|tee|test|time|timeout|times|top|touch|tr|traceroute|trap|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|unzip|update-grub|uptime|useradd|userdel|usermod|users|uudecode|uuencode|vdir|vi|vim|virsh|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip|zypper)(?=$|[\s;|&])/,lookbehind:!0},keyword:{pattern:/(^|[\s;|&])(?:let|:|\.|if|then|else|elif|fi|for|break|continue|while|in|case|function|select|do|done|until|echo|exit|return|set|declare)(?=$|[\s;|&])/,lookbehind:!0},"boolean":{pattern:/(^|[\s;|&])(?:true|false)(?=$|[\s;|&])/,lookbehind:!0},operator:/&&?|\|\|?|==?|!=?|<<>|<=?|>=?|=~/,punctuation:/\$?\(\(?|\)\)?|\.\.|[{}[\];]/};var a=t.variable[1].inside;a.string=e.languages.bash.string,a["function"]=e.languages.bash["function"],a.keyword=e.languages.bash.keyword,a["boolean"]=e.languages.bash["boolean"],a.operator=e.languages.bash.operator,a.punctuation=e.languages.bash.punctuation,e.languages.shell=e.languages.bash}(Prism); -Prism.languages.cpp=Prism.languages.extend("c",{keyword:/\b(?:alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|class|compl|const|constexpr|const_cast|continue|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|float|for|friend|goto|if|inline|int|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|long|mutable|namespace|new|noexcept|nullptr|operator|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,"boolean":/\b(?:true|false)\b/,operator:/>>=?|<<=?|->|([-+&|:])\1|[?:~]|[-+*\/%&|^!=<>]=?|\b(?:and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/}),Prism.languages.insertBefore("cpp","keyword",{"class-name":{pattern:/(class\s+)\w+/i,lookbehind:!0}}),Prism.languages.insertBefore("cpp","string",{"raw-string":{pattern:/R"([^()\\ ]{0,16})\([\s\S]*?\)\1"/,alias:"string",greedy:!0}}); -Prism.languages.aspnet=Prism.languages.extend("markup",{"page-directive tag":{pattern:/<%\s*@.*%>/i,inside:{"page-directive tag":/<%\s*@\s*(?:Assembly|Control|Implements|Import|Master(?:Type)?|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,rest:Prism.languages.markup.tag.inside}},"directive tag":{pattern:/<%.*%>/i,inside:{"directive tag":/<%\s*?[$=%#:]{0,2}|%>/i,rest:Prism.languages.csharp}}}),Prism.languages.aspnet.tag.pattern=/<(?!%)\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/i,Prism.languages.insertBefore("inside","punctuation",{"directive tag":Prism.languages.aspnet["directive tag"]},Prism.languages.aspnet.tag.inside["attr-value"]),Prism.languages.insertBefore("aspnet","comment",{"asp comment":/<%--[\s\S]*?--%>/}),Prism.languages.insertBefore("aspnet",Prism.languages.javascript?"script":"tag",{"asp script":{pattern:/()[\s\S]*?(?=<\/script>)/i,lookbehind:!0,inside:Prism.languages.csharp||{}}}); -Prism.languages.css.selector={pattern:Prism.languages.css.selector,inside:{"pseudo-element":/:(?:after|before|first-letter|first-line|selection)|::[-\w]+/,"pseudo-class":/:[-\w]+(?:\(.*\))?/,"class":/\.[-:.\w]+/,id:/#[-:.\w]+/,attribute:/\[[^\]]+\]/}},Prism.languages.insertBefore("css","property",{variable:{pattern:/(^|[^-\w\xA0-\uFFFF])--[-_a-z\xA0-\uFFFF][-\w\xA0-\uFFFF]*/i,lookbehind:!0}}),Prism.languages.insertBefore("css","function",{operator:{pattern:/(\s)[+\-*\/](?=\s)/,lookbehind:!0},hexcode:/#[\da-f]{3,8}/i,entity:/\\[\da-f]{1,8}/i,unit:{pattern:/(\d)(?:%|[a-z]+)/,lookbehind:!0},number:/-?[\d.]+/}); -Prism.languages.diff={coord:[/^(?:\*{3}|-{3}|\+{3}).*$/m,/^@@.*@@$/m,/^\d+.*$/m],deleted:/^[-<].*$/m,inserted:/^[+>].*$/m,diff:{pattern:/^!(?!!).+$/m,alias:"important"}}; -Prism.languages["markup-templating"]={},Object.defineProperties(Prism.languages["markup-templating"],{buildPlaceholders:{value:function(e,t,n,a){e.language===t&&(e.tokenStack=[],e.code=e.code.replace(n,function(n){if("function"==typeof a&&!a(n))return n;for(var r=e.tokenStack.length;-1!==e.code.indexOf("___"+t.toUpperCase()+r+"___");)++r;return e.tokenStack[r]=n,"___"+t.toUpperCase()+r+"___"}),e.grammar=Prism.languages.markup)}},tokenizePlaceholders:{value:function(e,t){if(e.language===t&&e.tokenStack){e.grammar=Prism.languages[t];var n=0,a=Object.keys(e.tokenStack),r=function(o){if(!(n>=a.length))for(var i=0;i-1){++n;var f,u=l.substring(0,p),_=new Prism.Token(t,Prism.tokenize(s,e.grammar,t),"language-"+t,s),k=l.substring(p+("___"+t.toUpperCase()+c+"___").length);if(u||k?(f=[u,_,k].filter(function(e){return!!e}),r(f)):f=_,"string"==typeof g?Array.prototype.splice.apply(o,[i,1].concat(f)):g.content=f,n>=a.length)break}}else g.content&&"string"!=typeof g.content&&r(g.content)}};r(e.tokens)}}}}); -Prism.languages.markdown=Prism.languages.extend("markup",{}),Prism.languages.insertBefore("markdown","prolog",{blockquote:{pattern:/^>(?:[\t ]*>)*/m,alias:"punctuation"},code:[{pattern:/^(?: {4}|\t).+/m,alias:"keyword"},{pattern:/``.+?``|`[^`\n]+`/,alias:"keyword"},{pattern:/^```[\s\S]*?^```$/m,greedy:!0,inside:{"code-block":{pattern:/^(```.*(?:\r?\n|\r))[\s\S]+?(?=(?:\r?\n|\r)^```$)/m,lookbehind:!0},"code-language":{pattern:/^(```).+/,lookbehind:!0},punctuation:/```/}}],title:[{pattern:/\S.*(?:\r?\n|\r)(?:==+|--+)/,alias:"important",inside:{punctuation:/==+$|--+$/}},{pattern:/(^\s*)#+.+/m,lookbehind:!0,alias:"important",inside:{punctuation:/^#+|#+$/}}],hr:{pattern:/(^\s*)([*-])(?:[\t ]*\2){2,}(?=\s*$)/m,lookbehind:!0,alias:"punctuation"},list:{pattern:/(^\s*)(?:[*+-]|\d+\.)(?=[\t ].)/m,lookbehind:!0,alias:"punctuation"},"url-reference":{pattern:/!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:\\.|[^>\\])+>)(?:[\t ]+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\)))?/,inside:{variable:{pattern:/^(!?\[)[^\]]+/,lookbehind:!0},string:/(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\))$/,punctuation:/^[\[\]!:]|[<>]/},alias:"url"},bold:{pattern:/(^|[^\\])(\*\*|__)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,greedy:!0,inside:{punctuation:/^\*\*|^__|\*\*$|__$/}},italic:{pattern:/(^|[^\\])([*_])(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,greedy:!0,inside:{punctuation:/^[*_]|[*_]$/}},strike:{pattern:/(^|[^\\])(~~?)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,greedy:!0,inside:{punctuation:/^~~?|~~?$/}},url:{pattern:/!?\[[^\]]+\](?:\([^\s)]+(?:[\t ]+"(?:\\.|[^"\\])*")?\)| ?\[[^\]\n]*\])/,inside:{variable:{pattern:/(!?\[)[^\]]+(?=\]$)/,lookbehind:!0},string:{pattern:/"(?:\\.|[^"\\])*"(?=\)$)/}}}}),Prism.languages.markdown.bold.inside.url=Prism.languages.markdown.url,Prism.languages.markdown.italic.inside.url=Prism.languages.markdown.url,Prism.languages.markdown.strike.inside.url=Prism.languages.markdown.url,Prism.languages.markdown.bold.inside.italic=Prism.languages.markdown.italic,Prism.languages.markdown.bold.inside.strike=Prism.languages.markdown.strike,Prism.languages.markdown.italic.inside.bold=Prism.languages.markdown.bold,Prism.languages.markdown.italic.inside.strike=Prism.languages.markdown.strike,Prism.languages.markdown.strike.inside.bold=Prism.languages.markdown.bold,Prism.languages.markdown.strike.inside.italic=Prism.languages.markdown.italic,Prism.hooks.add("after-tokenize",function(a){function n(a){if(a&&"string"!=typeof a)for(var e=0,i=a.length;i>e;e++){var r=a[e];if("code"===r.type){var t=r.content[1],s=r.content[3];if(t&&s&&"code-language"===t.type&&"code-block"===s.type&&"string"==typeof t.content){var o="language-"+t.content.trim().split(/\s+/)[0].toLowerCase();s.alias?"string"==typeof s.alias?s.alias=[s.alias,o]:s.alias.push(o):s.alias=[o]}}else n(r.content)}}"markdown"===a.language&&n(a.tokens)}),Prism.hooks.add("wrap",function(a){if("code-block"===a.type){for(var n="",e=0,i=a.classes.length;i>e;e++){var r=a.classes[e],t=/language-(\w+)/.exec(r);if(t){n=t[1];break}}var s=Prism.languages[n];if(s){var o=a.content.replace(/</g,"<").replace(/&/g,"&");a.content=Prism.highlight(o,s,n)}}}),Prism.languages.md=Prism.languages.markdown; -Prism.languages.perl={comment:[{pattern:/(^\s*)=\w+[\s\S]*?=cut.*/m,lookbehind:!0},{pattern:/(^|[^\\$])#.*/,lookbehind:!0}],string:[{pattern:/\b(?:q|qq|qx|qw)\s*([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1/,greedy:!0},{pattern:/\b(?:q|qq|qx|qw)\s+([a-zA-Z0-9])(?:(?!\1)[^\\]|\\[\s\S])*\1/,greedy:!0},{pattern:/\b(?:q|qq|qx|qw)\s*\((?:[^()\\]|\\[\s\S])*\)/,greedy:!0},{pattern:/\b(?:q|qq|qx|qw)\s*\{(?:[^{}\\]|\\[\s\S])*\}/,greedy:!0},{pattern:/\b(?:q|qq|qx|qw)\s*\[(?:[^[\]\\]|\\[\s\S])*\]/,greedy:!0},{pattern:/\b(?:q|qq|qx|qw)\s*<(?:[^<>\\]|\\[\s\S])*>/,greedy:!0},{pattern:/("|`)(?:(?!\1)[^\\]|\\[\s\S])*\1/,greedy:!0},{pattern:/'(?:[^'\\\r\n]|\\.)*'/,greedy:!0}],regex:[{pattern:/\b(?:m|qr)\s*([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1[msixpodualngc]*/,greedy:!0},{pattern:/\b(?:m|qr)\s+([a-zA-Z0-9])(?:(?!\1)[^\\]|\\[\s\S])*\1[msixpodualngc]*/,greedy:!0},{pattern:/\b(?:m|qr)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngc]*/,greedy:!0},{pattern:/\b(?:m|qr)\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngc]*/,greedy:!0},{pattern:/\b(?:m|qr)\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngc]*/,greedy:!0},{pattern:/\b(?:m|qr)\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngc]*/,greedy:!0},{pattern:/(^|[^-]\b)(?:s|tr|y)\s*([^a-zA-Z0-9\s{(\[<])(?:(?!\2)[^\\]|\\[\s\S])*\2(?:(?!\2)[^\\]|\\[\s\S])*\2[msixpodualngcer]*/,lookbehind:!0,greedy:!0},{pattern:/(^|[^-]\b)(?:s|tr|y)\s+([a-zA-Z0-9])(?:(?!\2)[^\\]|\\[\s\S])*\2(?:(?!\2)[^\\]|\\[\s\S])*\2[msixpodualngcer]*/,lookbehind:!0,greedy:!0},{pattern:/(^|[^-]\b)(?:s|tr|y)\s*\((?:[^()\\]|\\[\s\S])*\)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngcer]*/,lookbehind:!0,greedy:!0},{pattern:/(^|[^-]\b)(?:s|tr|y)\s*\{(?:[^{}\\]|\\[\s\S])*\}\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngcer]*/,lookbehind:!0,greedy:!0},{pattern:/(^|[^-]\b)(?:s|tr|y)\s*\[(?:[^[\]\\]|\\[\s\S])*\]\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngcer]*/,lookbehind:!0,greedy:!0},{pattern:/(^|[^-]\b)(?:s|tr|y)\s*<(?:[^<>\\]|\\[\s\S])*>\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngcer]*/,lookbehind:!0,greedy:!0},{pattern:/\/(?:[^\/\\\r\n]|\\.)*\/[msixpodualngc]*(?=\s*(?:$|[\r\n,.;})&|\-+*~<>!?^]|(lt|gt|le|ge|eq|ne|cmp|not|and|or|xor|x)\b))/,greedy:!0}],variable:[/[&*$@%]\{\^[A-Z]+\}/,/[&*$@%]\^[A-Z_]/,/[&*$@%]#?(?=\{)/,/[&*$@%]#?(?:(?:::)*'?(?!\d)[\w$]+)+(?:::)*/i,/[&*$@%]\d+/,/(?!%=)[$@%][!"#$%&'()*+,\-.\/:;<=>?@[\\\]^_`{|}~]/],filehandle:{pattern:/<(?![<=])\S*>|\b_\b/,alias:"symbol"},vstring:{pattern:/v\d+(?:\.\d+)*|\d+(?:\.\d+){2,}/,alias:"string"},"function":{pattern:/sub [a-z0-9_]+/i,inside:{keyword:/sub/}},keyword:/\b(?:any|break|continue|default|delete|die|do|else|elsif|eval|for|foreach|given|goto|if|last|local|my|next|our|package|print|redo|require|say|state|sub|switch|undef|unless|until|use|when|while)\b/,number:/\b(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0b[01](?:_?[01])*|(?:\d(?:_?\d)*)?\.?\d(?:_?\d)*(?:[Ee][+-]?\d+)?)\b/,operator:/-[rwxoRWXOezsfdlpSbctugkTBMAC]\b|\+[+=]?|-[-=>]?|\*\*?=?|\/\/?=?|=[=~>]?|~[~=]?|\|\|?=?|&&?=?|<(?:=>?|<=?)?|>>?=?|![~=]?|[%^]=?|\.(?:=|\.\.?)?|[\\?]|\bx(?:=|\b)|\b(?:lt|gt|le|ge|eq|ne|cmp|not|and|or|xor)\b/,punctuation:/[{}[\];(),:]/}; -!function(e){e.languages.php=e.languages.extend("clike",{keyword:/\b(?:and|or|xor|array|as|break|case|cfunction|class|const|continue|declare|default|die|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|for|foreach|function|include|include_once|global|if|new|return|static|switch|use|require|require_once|var|while|abstract|interface|public|implements|private|protected|parent|throw|null|echo|print|trait|namespace|final|yield|goto|instanceof|finally|try|catch)\b/i,constant:/\b[A-Z_][A-Z0-9_]*\b/,comment:{pattern:/(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,lookbehind:!0}}),e.languages.insertBefore("php","string",{"shell-comment":{pattern:/(^|[^\\])#.*/,lookbehind:!0,alias:"comment"}}),e.languages.insertBefore("php","keyword",{delimiter:{pattern:/\?>|<\?(?:php|=)?/i,alias:"important"},variable:/\$+(?:\w+\b|(?={))/i,"package":{pattern:/(\\|namespace\s+|use\s+)[\w\\]+/,lookbehind:!0,inside:{punctuation:/\\/}}}),e.languages.insertBefore("php","operator",{property:{pattern:/(->)[\w]+/,lookbehind:!0}});var n={pattern:/{\$(?:{(?:{[^{}]+}|[^{}]+)}|[^{}])+}|(^|[^\\{])\$+(?:\w+(?:\[.+?]|->\w+)*)/,lookbehind:!0,inside:{rest:e.languages.php}};e.languages.insertBefore("php","string",{"nowdoc-string":{pattern:/<<<'([^']+)'(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\1;/,greedy:!0,alias:"string",inside:{delimiter:{pattern:/^<<<'[^']+'|[a-z_]\w*;$/i,alias:"symbol",inside:{punctuation:/^<<<'?|[';]$/}}}},"heredoc-string":{pattern:/<<<(?:"([^"]+)"(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\1;|([a-z_]\w*)(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\2;)/i,greedy:!0,alias:"string",inside:{delimiter:{pattern:/^<<<(?:"[^"]+"|[a-z_]\w*)|[a-z_]\w*;$/i,alias:"symbol",inside:{punctuation:/^<<<"?|[";]$/}},interpolation:n}},"single-quoted-string":{pattern:/'(?:\\[\s\S]|[^\\'])*'/,greedy:!0,alias:"string"},"double-quoted-string":{pattern:/"(?:\\[\s\S]|[^\\"])*"/,greedy:!0,alias:"string",inside:{interpolation:n}}}),delete e.languages.php.string,e.hooks.add("before-tokenize",function(n){if(/(?:<\?php|<\?)/gi.test(n.code)){var t=/(?:<\?php|<\?)[\s\S]*?(?:\?>|$)/gi;e.languages["markup-templating"].buildPlaceholders(n,"php",t)}}),e.hooks.add("after-tokenize",function(n){e.languages["markup-templating"].tokenizePlaceholders(n,"php")})}(Prism); -Prism.languages.insertBefore("php","variable",{"this":/\$this\b/,global:/\$(?:_(?:SERVER|GET|POST|FILES|REQUEST|SESSION|ENV|COOKIE)|GLOBALS|HTTP_RAW_POST_DATA|argc|argv|php_errormsg|http_response_header)\b/,scope:{pattern:/\b[\w\\]+::/,inside:{keyword:/static|self|parent/,punctuation:/::|\\/}}}); -Prism.languages.sql={comment:{pattern:/(^|[^\\])(?:\/\*[\s\S]*?\*\/|(?:--|\/\/|#).*)/,lookbehind:!0},variable:[{pattern:/@(["'`])(?:\\[\s\S]|(?!\1)[^\\])+\1/,greedy:!0},/@[\w.$]+/],string:{pattern:/(^|[^@\\])("|')(?:\\[\s\S]|(?!\2)[^\\]|\2\2)*\2/,greedy:!0,lookbehind:!0},"function":/\b(?:AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE)(?=\s*\()/i,keyword:/\b(?:ACTION|ADD|AFTER|ALGORITHM|ALL|ALTER|ANALYZE|ANY|APPLY|AS|ASC|AUTHORIZATION|AUTO_INCREMENT|BACKUP|BDB|BEGIN|BERKELEYDB|BIGINT|BINARY|BIT|BLOB|BOOL|BOOLEAN|BREAK|BROWSE|BTREE|BULK|BY|CALL|CASCADED?|CASE|CHAIN|CHAR(?:ACTER|SET)?|CHECK(?:POINT)?|CLOSE|CLUSTERED|COALESCE|COLLATE|COLUMNS?|COMMENT|COMMIT(?:TED)?|COMPUTE|CONNECT|CONSISTENT|CONSTRAINT|CONTAINS(?:TABLE)?|CONTINUE|CONVERT|CREATE|CROSS|CURRENT(?:_DATE|_TIME|_TIMESTAMP|_USER)?|CURSOR|CYCLE|DATA(?:BASES?)?|DATE(?:TIME)?|DAY|DBCC|DEALLOCATE|DEC|DECIMAL|DECLARE|DEFAULT|DEFINER|DELAYED|DELETE|DELIMITERS?|DENY|DESC|DESCRIBE|DETERMINISTIC|DISABLE|DISCARD|DISK|DISTINCT|DISTINCTROW|DISTRIBUTED|DO|DOUBLE|DROP|DUMMY|DUMP(?:FILE)?|DUPLICATE|ELSE(?:IF)?|ENABLE|ENCLOSED|END|ENGINE|ENUM|ERRLVL|ERRORS|ESCAPED?|EXCEPT|EXEC(?:UTE)?|EXISTS|EXIT|EXPLAIN|EXTENDED|FETCH|FIELDS|FILE|FILLFACTOR|FIRST|FIXED|FLOAT|FOLLOWING|FOR(?: EACH ROW)?|FORCE|FOREIGN|FREETEXT(?:TABLE)?|FROM|FULL|FUNCTION|GEOMETRY(?:COLLECTION)?|GLOBAL|GOTO|GRANT|GROUP|HANDLER|HASH|HAVING|HOLDLOCK|HOUR|IDENTITY(?:_INSERT|COL)?|IF|IGNORE|IMPORT|INDEX|INFILE|INNER|INNODB|INOUT|INSERT|INT|INTEGER|INTERSECT|INTERVAL|INTO|INVOKER|ISOLATION|ITERATE|JOIN|KEYS?|KILL|LANGUAGE|LAST|LEAVE|LEFT|LEVEL|LIMIT|LINENO|LINES|LINESTRING|LOAD|LOCAL|LOCK|LONG(?:BLOB|TEXT)|LOOP|MATCH(?:ED)?|MEDIUM(?:BLOB|INT|TEXT)|MERGE|MIDDLEINT|MINUTE|MODE|MODIFIES|MODIFY|MONTH|MULTI(?:LINESTRING|POINT|POLYGON)|NATIONAL|NATURAL|NCHAR|NEXT|NO|NONCLUSTERED|NULLIF|NUMERIC|OFF?|OFFSETS?|ON|OPEN(?:DATASOURCE|QUERY|ROWSET)?|OPTIMIZE|OPTION(?:ALLY)?|ORDER|OUT(?:ER|FILE)?|OVER|PARTIAL|PARTITION|PERCENT|PIVOT|PLAN|POINT|POLYGON|PRECEDING|PRECISION|PREPARE|PREV|PRIMARY|PRINT|PRIVILEGES|PROC(?:EDURE)?|PUBLIC|PURGE|QUICK|RAISERROR|READS?|REAL|RECONFIGURE|REFERENCES|RELEASE|RENAME|REPEAT(?:ABLE)?|REPLACE|REPLICATION|REQUIRE|RESIGNAL|RESTORE|RESTRICT|RETURNS?|REVOKE|RIGHT|ROLLBACK|ROUTINE|ROW(?:COUNT|GUIDCOL|S)?|RTREE|RULE|SAVE(?:POINT)?|SCHEMA|SECOND|SELECT|SERIAL(?:IZABLE)?|SESSION(?:_USER)?|SET(?:USER)?|SHARE|SHOW|SHUTDOWN|SIMPLE|SMALLINT|SNAPSHOT|SOME|SONAME|SQL|START(?:ING)?|STATISTICS|STATUS|STRIPED|SYSTEM_USER|TABLES?|TABLESPACE|TEMP(?:ORARY|TABLE)?|TERMINATED|TEXT(?:SIZE)?|THEN|TIME(?:STAMP)?|TINY(?:BLOB|INT|TEXT)|TOP?|TRAN(?:SACTIONS?)?|TRIGGER|TRUNCATE|TSEQUAL|TYPES?|UNBOUNDED|UNCOMMITTED|UNDEFINED|UNION|UNIQUE|UNLOCK|UNPIVOT|UNSIGNED|UPDATE(?:TEXT)?|USAGE|USE|USER|USING|VALUES?|VAR(?:BINARY|CHAR|CHARACTER|YING)|VIEW|WAITFOR|WARNINGS|WHEN|WHERE|WHILE|WITH(?: ROLLUP|IN)?|WORK|WRITE(?:TEXT)?|YEAR)\b/i,"boolean":/\b(?:TRUE|FALSE|NULL)\b/i,number:/\b0x[\da-f]+\b|\b\d+\.?\d*|\B\.\d+\b/i,operator:/[-+*\/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?|\b(?:AND|BETWEEN|IN|LIKE|NOT|OR|IS|DIV|REGEXP|RLIKE|SOUNDS LIKE|XOR)\b/i,punctuation:/[;[\]()`,.]/}; -Prism.languages.python={comment:{pattern:/(^|[^\\])#.*/,lookbehind:!0},"string-interpolation":{pattern:/(?:f|rf|fr)(?:("""|''')[\s\S]+?\1|("|')(?:\\.|(?!\2)[^\\\r\n])*\2)/i,greedy:!0,inside:{interpolation:{pattern:/((?:^|[^{])(?:{{)*){(?!{)(?:[^{}]|{(?!{)(?:[^{}]|{(?!{)(?:[^{}])+})+})+}/,lookbehind:!0,inside:{"format-spec":{pattern:/(:)[^:(){}]+(?=}$)/,lookbehind:!0},"conversion-option":{pattern:/![sra](?=[:}]$)/,alias:"punctuation"},rest:null}},string:/[\s\S]+/}},"triple-quoted-string":{pattern:/(?:[rub]|rb|br)?("""|''')[\s\S]+?\1/i,greedy:!0,alias:"string"},string:{pattern:/(?:[rub]|rb|br)?("|')(?:\\.|(?!\1)[^\\\r\n])*\1/i,greedy:!0},"function":{pattern:/((?:^|\s)def[ \t]+)[a-zA-Z_]\w*(?=\s*\()/g,lookbehind:!0},"class-name":{pattern:/(\bclass\s+)\w+/i,lookbehind:!0},decorator:{pattern:/(^\s*)@\w+(?:\.\w+)*/i,lookbehind:!0,alias:["annotation","punctuation"],inside:{punctuation:/\./}},keyword:/\b(?:and|as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|nonlocal|not|or|pass|print|raise|return|try|while|with|yield)\b/,builtin:/\b(?:__import__|abs|all|any|apply|ascii|basestring|bin|bool|buffer|bytearray|bytes|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|format|frozenset|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|memoryview|min|next|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|reversed|round|set|setattr|slice|sorted|staticmethod|str|sum|super|tuple|type|unichr|unicode|vars|xrange|zip)\b/,"boolean":/\b(?:True|False|None)\b/,number:/(?:\b(?=\d)|\B(?=\.))(?:0[bo])?(?:(?:\d|0x[\da-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+%=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]/,punctuation:/[{}[\];(),.:]/},Prism.languages.python["string-interpolation"].inside.interpolation.inside.rest=Prism.languages.python,Prism.languages.py=Prism.languages.python; -Prism.languages.yaml={scalar:{pattern:/([\-:]\s*(?:![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\2[^\r\n]+)*)/,lookbehind:!0,alias:"string"},comment:/#.*/,key:{pattern:/(\s*(?:^|[:\-,[{\r\n?])[ \t]*(?:![^\s]+)?[ \t]*)[^\r\n{[\]},#\s]+?(?=\s*:\s)/,lookbehind:!0,alias:"atrule"},directive:{pattern:/(^[ \t]*)%.+/m,lookbehind:!0,alias:"important"},datetime:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:\d{4}-\d\d?-\d\d?(?:[tT]|[ \t]+)\d\d?:\d{2}:\d{2}(?:\.\d*)?[ \t]*(?:Z|[-+]\d\d?(?::\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(?::\d{2}(?:\.\d*)?)?)(?=[ \t]*(?:$|,|]|}))/m,lookbehind:!0,alias:"number"},"boolean":{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:true|false)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},"null":{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:null|~)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},string:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|\s*#))/m,lookbehind:!0,greedy:!0},number:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)[+-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,lookbehind:!0},tag:/![^\s]+/,important:/[&*][\w]+/,punctuation:/---|[:[\]{}\-,|>?]|\.\.\./},Prism.languages.yml=Prism.languages.yaml; -!function(){function e(e,t){return Array.prototype.slice.call((t||document).querySelectorAll(e))}function t(e,t){return t=" "+t+" ",(" "+e.className+" ").replace(/[\n\t]/g," ").indexOf(t)>-1}function n(e,n,i){n="string"==typeof n?n:e.getAttribute("data-line");for(var o,l=n.replace(/\s+/g,"").split(","),a=+e.getAttribute("data-line-offset")||0,s=r()?parseInt:parseFloat,d=s(getComputedStyle(e).lineHeight),u=t(e,"line-numbers"),c=0;o=l[c++];){var p=o.split("-"),m=+p[0],f=+p[1]||m,h=e.querySelector('.line-highlight[data-range="'+o+'"]')||document.createElement("div");if(h.setAttribute("aria-hidden","true"),h.setAttribute("data-range",o),h.className=(i||"")+" line-highlight",u&&Prism.plugins.lineNumbers){var g=Prism.plugins.lineNumbers.getLine(e,m),y=Prism.plugins.lineNumbers.getLine(e,f);g&&(h.style.top=g.offsetTop+"px"),y&&(h.style.height=y.offsetTop-g.offsetTop+y.offsetHeight+"px")}else h.setAttribute("data-start",m),f>m&&h.setAttribute("data-end",f),h.style.top=(m-a-1)*d+"px",h.textContent=new Array(f-m+2).join(" \n");u?e.appendChild(h):(e.querySelector("code")||e).appendChild(h)}}function i(){var t=location.hash.slice(1);e(".temporary.line-highlight").forEach(function(e){e.parentNode.removeChild(e)});var i=(t.match(/\.([\d,-]+)$/)||[,""])[1];if(i&&!document.getElementById(t)){var r=t.slice(0,t.lastIndexOf(".")),o=document.getElementById(r);o&&(o.hasAttribute("data-line")||o.setAttribute("data-line",""),n(o,i,"temporary "),document.querySelector(".temporary.line-highlight").scrollIntoView())}}if("undefined"!=typeof self&&self.Prism&&self.document&&document.querySelector){var r=function(){var e;return function(){if("undefined"==typeof e){var t=document.createElement("div");t.style.fontSize="13px",t.style.lineHeight="1.5",t.style.padding=0,t.style.border=0,t.innerHTML=" 
 ",document.body.appendChild(t),e=38===t.offsetHeight,document.body.removeChild(t)}return e}}(),o=0;Prism.hooks.add("before-sanity-check",function(t){var n=t.element.parentNode,i=n&&n.getAttribute("data-line");if(n&&i&&/pre/i.test(n.nodeName)){var r=0;e(".line-highlight",n).forEach(function(e){r+=e.textContent.length,e.parentNode.removeChild(e)}),r&&/^( \n)+$/.test(t.code.slice(-r))&&(t.code=t.code.slice(0,-r))}}),Prism.hooks.add("complete",function l(e){var r=e.element.parentNode,a=r&&r.getAttribute("data-line");if(r&&a&&/pre/i.test(r.nodeName)){clearTimeout(o);var s=Prism.plugins.lineNumbers,d=e.plugins&&e.plugins.lineNumbers;t(r,"line-numbers")&&s&&!d?Prism.hooks.add("line-numbers",l):(n(r,a),o=setTimeout(i,1))}}),window.addEventListener("hashchange",i),window.addEventListener("resize",function(){var e=document.querySelectorAll("pre[data-line]");Array.prototype.forEach.call(e,function(e){n(e)})})}}(); -!function(){if("undefined"!=typeof self&&self.Prism&&self.document){var e="line-numbers",t=/\n(?!$)/g,n=function(e){var n=r(e),s=n["white-space"];if("pre-wrap"===s||"pre-line"===s){var l=e.querySelector("code"),i=e.querySelector(".line-numbers-rows"),a=e.querySelector(".line-numbers-sizer"),o=l.textContent.split(t);a||(a=document.createElement("span"),a.className="line-numbers-sizer",l.appendChild(a)),a.style.display="block",o.forEach(function(e,t){a.textContent=e||"\n";var n=a.getBoundingClientRect().height;i.children[t].style.height=n+"px"}),a.textContent="",a.style.display="none"}},r=function(e){return e?window.getComputedStyle?getComputedStyle(e):e.currentStyle||null:null};window.addEventListener("resize",function(){Array.prototype.forEach.call(document.querySelectorAll("pre."+e),n)}),Prism.hooks.add("complete",function(e){if(e.code){var r=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(r&&/pre/i.test(r.nodeName)&&(s.test(r.className)||s.test(e.element.className))&&!e.element.querySelector(".line-numbers-rows")){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s," ")),s.test(r.className)||(r.className+=" line-numbers");var l,i=e.code.match(t),a=i?i.length+1:1,o=new Array(a+1);o=o.join(""),l=document.createElement("span"),l.setAttribute("aria-hidden","true"),l.className="line-numbers-rows",l.innerHTML=o,r.hasAttribute("data-start")&&(r.style.counterReset="linenumber "+(parseInt(r.getAttribute("data-start"),10)-1)),e.element.appendChild(l),n(r),Prism.hooks.run("line-numbers",e)}}}),Prism.hooks.add("line-numbers",function(e){e.plugins=e.plugins||{},e.plugins.lineNumbers=!0}),Prism.plugins.lineNumbers={getLine:function(t,n){if("PRE"===t.tagName&&t.classList.contains(e)){var r=t.querySelector(".line-numbers-rows"),s=parseInt(t.getAttribute("data-start"),10)||1,l=s+(r.children.length-1);s>n&&(n=s),n>l&&(n=l);var i=n-s;return r.children[i]}}}}}(); diff --git a/web/components/bootstrap b/web/components/bootstrap deleted file mode 120000 index 379a160..0000000 --- a/web/components/bootstrap +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/bootstrap \ No newline at end of file diff --git a/web/components/diff b/web/components/diff deleted file mode 120000 index 6966ded..0000000 --- a/web/components/diff +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/diff \ No newline at end of file diff --git a/web/components/flag-icon-css b/web/components/flag-icon-css deleted file mode 120000 index 325c10a..0000000 --- a/web/components/flag-icon-css +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/flag-icon-css \ No newline at end of file diff --git a/web/components/iframe-resizer b/web/components/iframe-resizer deleted file mode 120000 index 72ea9a9..0000000 --- a/web/components/iframe-resizer +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/iframe-resizer \ No newline at end of file diff --git a/web/components/jquery b/web/components/jquery deleted file mode 120000 index ee57ada..0000000 --- a/web/components/jquery +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/jquery \ No newline at end of file diff --git a/web/favicon.png b/web/favicon.png deleted file mode 100644 index db26dfd..0000000 Binary files a/web/favicon.png and /dev/null differ diff --git a/web/index.php b/web/index.php index d66b7a8..5dd7e92 100644 --- a/web/index.php +++ b/web/index.php @@ -4,4 +4,4 @@ $app = require __DIR__.'/../app/bootstrap.php'; $app['env'] = 'prod'; -$app['http_cache']->run(); +$app->run();