From 216aa7fd0e500f101cde297fa558142ae582bc1d Mon Sep 17 00:00:00 2001 From: patrikx3 Date: Tue, 1 Jan 2019 18:38:51 +0100 Subject: [PATCH] robo8x [chore] 1/1/2019, 6:38:51 PM --- INSTALL.md | 2 +- README.md | 4 ++-- artifacts/php-7.2-ubuntu.md | 2 +- change-break.md | 2 +- changelog.md | 5 ++--- package.json | 2 +- src/GitList/Application.php | 9 +++------ src/twig/breadcrumb.twig | 4 ++-- todo.md | 2 +- 9 files changed, 14 insertions(+), 18 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index a180fd09..ed5bfd54 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -116,7 +116,7 @@ UrlToolkit { --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-15 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-16 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) diff --git a/README.md b/README.md index 8149a27d..6933c8d1 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ -# 🤖 P3X Gitlist - A decorated enhanced elegant, feature rich and modern private git ui repository viewer v2019.1.1-15 +# 🤖 P3X Gitlist - A decorated enhanced elegant, feature rich and modern private git ui repository viewer v2019.1.1-16 This is an open-source project. Star this repository, if you like it, or even donate! Thank you so much! :) @@ -138,7 +138,7 @@ December 31, 2018 --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-15 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-16 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) diff --git a/artifacts/php-7.2-ubuntu.md b/artifacts/php-7.2-ubuntu.md index 8ee7c5ee..919fc98d 100644 --- a/artifacts/php-7.2-ubuntu.md +++ b/artifacts/php-7.2-ubuntu.md @@ -20,7 +20,7 @@ sudo apt upgrade -y --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-15 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-16 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) diff --git a/change-break.md b/change-break.md index 37e6cf91..e03dad94 100644 --- a/change-break.md +++ b/change-break.md @@ -50,7 +50,7 @@ The following versions are not using `Babel`!!!! Yikes! --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-15 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-16 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) diff --git a/changelog.md b/changelog.md index 6a4c7c2b..c251b5aa 100644 --- a/changelog.md +++ b/changelog.md @@ -9,12 +9,11 @@ * added a variable: app.fixed_navbar in config.ini * you can set the navbar as fixed or not * added an alert when on the editor to let the users some people are not liking the full height editor mode and switch to the scroll mode -* the http user and git user with @ are replaced with %40 * added a new ssh variable so that the ssh clone button can be dynamic like the http_user_dynamic called ssh_user_dynamic * renamed the git_clone_subdir to ssh_clone_subdir, it make most sense * in the git clone ssh button was missing the protocol (ssh://) * the RSS content type application/rss+xml is obsolete so I changed the content type to application/xml - +* the http_user and the ssh_user is url encoded ## v2018.12.31 * config.ini changes @@ -215,7 +214,7 @@ require('codemirror/mode/yaml/yaml'); --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-15 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-16 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) diff --git a/package.json b/package.json index ff6cb4b4..3147c68b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p3x-gitlist", - "version": "2019.1.1-16", + "version": "2019.1.1-17", "corifeus": { "prod-dir": "prod", "css-postfix": "333a67e1315d881bf5f6d3010d0c93828f294f24f7be203534d473210b0bd3ca", diff --git a/src/GitList/Application.php b/src/GitList/Application.php index 640c9c46..417e98c0 100755 --- a/src/GitList/Application.php +++ b/src/GitList/Application.php @@ -50,20 +50,17 @@ public function __construct(Config $config, $root = null) $this['show_http_remote'] = $config->get('clone_button', 'show_http_remote'); $this['use_https'] = $config->get('clone_button', 'use_https'); $this['ssh_clone_subdir'] = $config->get('clone_button', 'ssh_clone_subdir'); - $this['http_user'] = $config->get('clone_button', 'http_user_dynamic') ? $_SERVER['PHP_AUTH_USER'] : $config->get('clone_button', 'http_user'); - - $this['http_user'] = str_replace('@', '%40', $this['http_user']); - $this['show_ssh_remote'] = $config->get('clone_button', 'show_ssh_remote'); if (!isset($_SERVER['PHP_AUTH_USER'])) { $_SERVER['PHP_AUTH_USER'] = ''; } - $this['ssh_user'] = $config->get('clone_button', 'ssh_user_dynamic') ? $_SERVER['PHP_AUTH_USER'] : $config->get('clone_button', 'ssh_user'); + $this['http_user'] = $config->get('clone_button', 'http_user_dynamic') ? $_SERVER['PHP_AUTH_USER'] : $config->get('clone_button', 'http_user'); + $this['show_ssh_remote'] = $config->get('clone_button', 'show_ssh_remote'); - $this['ssh_user'] = str_replace('@', '%40', $this['ssh_user']); + $this['ssh_user'] = $config->get('clone_button', 'ssh_user_dynamic') ? $_SERVER['PHP_AUTH_USER'] : $config->get('clone_button', 'ssh_user'); $this['git_http_subdir_calculated'] = $config->get('clone_button', 'git_http_subdir_calculated'); $this['git_http_subdir'] = $config->get('clone_button', 'git_http_subdir'); diff --git a/src/twig/breadcrumb.twig b/src/twig/breadcrumb.twig index 243fc41e..1c0e9286 100644 --- a/src/twig/breadcrumb.twig +++ b/src/twig/breadcrumb.twig @@ -98,13 +98,13 @@ + value="git clone ssh://{{ app.ssh_user | url_encode }}{{ app.ssh_user ? '@' }}{{ global.request.host }}:{{ app.ssh_clone_subdir }}{{ repo }}"> {% endif %} {% if app.show_http_remote %} + value="git clone http{{ app.use_https ? 's' }}://{{ app.http_user | url_encode }}{{ app.http_user ? '@' }}{{ global.request.host }}{{ app.git_http_subdir_calculated ? app.url_subdir : app.git_http_subdir }}/{{ repo }}"> {% endif %} diff --git a/todo.md b/todo.md index 02204269..557af9a8 100644 --- a/todo.md +++ b/todo.md @@ -32,7 +32,7 @@ --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-15 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.1.1-16 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact)