diff options
| author | Guillaume Virlet <github@virlet.org> | 2015-09-02 13:55:39 +0200 |
|---|---|---|
| committer | Guillaume Virlet <github@virlet.org> | 2015-09-08 22:00:37 +0200 |
| commit | ef591e7ee21435da9314c5f7f6ea983c6f423898 (patch) | |
| tree | a58c1bcaab33d42161b23d55c739737526ea17e9 /index.php | |
| parent | 0a813cfd7cdf3c81faba8568bf6e2e667aae6f13 (diff) | |
| download | Shaarli-ef591e7ee21435da9314c5f7f6ea983c6f423898.tar.gz Shaarli-ef591e7ee21435da9314c5f7f6ea983c6f423898.tar.zst Shaarli-ef591e7ee21435da9314c5f7f6ea983c6f423898.zip | |
Url: introduce global helper functions for cleanup and scheme detection
Relates to #314 & #326
Additions:
- add global `cleanup_url()` and `get_url_scheme()` functions
Modifications:
- replace `Url` usage in `index.php` by calls to global functions
- fix `Url` tests not being run: PHPUnit expects a single test class per file
- move classes to separate files
Diffstat (limited to 'index.php')
| -rwxr-xr-x | index.php | 9 |
1 files changed, 4 insertions, 5 deletions
| @@ -1454,12 +1454,11 @@ function renderPage() | |||
| 1454 | 1454 | ||
| 1455 | // -------- User want to post a new link: Display link edit form. | 1455 | // -------- User want to post a new link: Display link edit form. |
| 1456 | if (isset($_GET['post'])) { | 1456 | if (isset($_GET['post'])) { |
| 1457 | $url = new Url($_GET['post']); | 1457 | $url = cleanup_url($_GET['post']); |
| 1458 | $url->cleanup(); | ||
| 1459 | 1458 | ||
| 1460 | $link_is_new = false; | 1459 | $link_is_new = false; |
| 1461 | // Check if URL is not already in database (in this case, we will edit the existing link) | 1460 | // Check if URL is not already in database (in this case, we will edit the existing link) |
| 1462 | $link = $LINKSDB->getLinkFromUrl((string)$url); | 1461 | $link = $LINKSDB->getLinkFromUrl($url); |
| 1463 | if (!$link) | 1462 | if (!$link) |
| 1464 | { | 1463 | { |
| 1465 | $link_is_new = true; | 1464 | $link_is_new = true; |
| @@ -1471,7 +1470,7 @@ function renderPage() | |||
| 1471 | $tags = (empty($_GET['tags']) ? '' : $_GET['tags'] ); | 1470 | $tags = (empty($_GET['tags']) ? '' : $_GET['tags'] ); |
| 1472 | $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); | 1471 | $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); |
| 1473 | // If this is an HTTP(S) link, we try go get the page to extract the title (otherwise we will to straight to the edit form.) | 1472 | // If this is an HTTP(S) link, we try go get the page to extract the title (otherwise we will to straight to the edit form.) |
| 1474 | if (empty($title) && strpos($url->getScheme(), 'http') !== false) { | 1473 | if (empty($title) && strpos(get_url_scheme($url), 'http') !== false) { |
| 1475 | // Short timeout to keep the application responsive | 1474 | // Short timeout to keep the application responsive |
| 1476 | list($headers, $data) = get_http_url($url, 4); | 1475 | list($headers, $data) = get_http_url($url, 4); |
| 1477 | // FIXME: Decode charset according to specified in either 1) HTTP response headers or 2) <head> in html | 1476 | // FIXME: Decode charset according to specified in either 1) HTTP response headers or 2) <head> in html |
| @@ -1505,7 +1504,7 @@ function renderPage() | |||
| 1505 | $link = array( | 1504 | $link = array( |
| 1506 | 'linkdate' => $linkdate, | 1505 | 'linkdate' => $linkdate, |
| 1507 | 'title' => $title, | 1506 | 'title' => $title, |
| 1508 | 'url' => (string)$url, | 1507 | 'url' => $url, |
| 1509 | 'description' => $description, | 1508 | 'description' => $description, |
| 1510 | 'tags' => $tags, | 1509 | 'tags' => $tags, |
| 1511 | 'private' => $private | 1510 | 'private' => $private |