diff --git a/.travis.yml b/.travis.yml index 2347cff..c3316a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,10 @@ language: php php: 7.3 addons: - apt: - packages: - - language-pack-fr + apt: + packages: + - language-pack-fr install: composer install --no-progress script: - - composer lint - - composer test + - composer lint + - composer test diff --git a/grumphp.yml b/grumphp.yml index 466e31a..7425276 100644 --- a/grumphp.yml +++ b/grumphp.yml @@ -1,17 +1,17 @@ --- parameters: - ascii: ~ - tasks: - jsonlint: ~ - xmllint: ~ - yamllint: ~ - composer: ~ - phpcs: - standard: PSR12 - ignore_patterns: - - RoboFile.php - phpstan: - level: max - configuration: phpstan.neon - ignore_patterns: - - RoboFile.php + ascii: ~ + tasks: + jsonlint: ~ + xmllint: ~ + yamllint: ~ + composer: ~ + phpcs: + standard: PSR12 + ignore_patterns: + - RoboFile.php + phpstan: + level: max + configuration: phpstan.neon + ignore_patterns: + - RoboFile.php diff --git a/phpunit.xml b/phpunit.xml index 146eaba..dfdb3ad 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,18 +1,18 @@ - - - classes/ - controllers/ - - - - - tests/ - - - - - - + + + classes/ + controllers/ + + + + + tests/ + + + + + + diff --git a/resources/error.xhtml b/resources/error.xhtml index b62b34f..c0f95bf 100644 --- a/resources/error.xhtml +++ b/resources/error.xhtml @@ -1,21 +1,23 @@ - + - + AllTube Download - Maintenance - - -
-
+ + +
+

- +

-
An error occurred in the application and your page could not be served. Please try again in a few moments.
-
+
An error occurred in the application and your page could not be served. Please try again in a few + moments. +
- +
+ diff --git a/resources/maintenance.xhtml b/resources/maintenance.xhtml index f84d871..c1c9eba 100644 --- a/resources/maintenance.xhtml +++ b/resources/maintenance.xhtml @@ -1,21 +1,21 @@ - + - + AllTube Download - Maintenance - - -
-
+ + +
+

- +

This application is undergoing maintenance right now. Please check back later.
-
- +
+ diff --git a/resources/sitemap.xml b/resources/sitemap.xml index cb423ae..f6331f0 100644 --- a/resources/sitemap.xml +++ b/resources/sitemap.xml @@ -1,12 +1,12 @@ - - https://alltubedownload.net/ - yearly - 1 - - - https://alltubedownload.net/extractors - weekly - + + https://alltubedownload.net/ + yearly + 1 + + + https://alltubedownload.net/extractors + weekly + diff --git a/templates/error.tpl b/templates/error.tpl index 55adeb5..49663ec 100644 --- a/templates/error.tpl +++ b/templates/error.tpl @@ -6,4 +6,4 @@ {t}Please check the URL of your video.{/t}

{$error|escape}

-{include file='inc/footer.tpl'} + {include file='inc/footer.tpl'} diff --git a/templates/extractors.tpl b/templates/extractors.tpl index fb85994..a1d1bce 100644 --- a/templates/extractors.tpl +++ b/templates/extractors.tpl @@ -3,10 +3,10 @@ {include file='inc/logo.tpl'}

{t}Supported websites{/t}

-
    - {foreach $extractors as $extractor} -
  • {$extractor}
    • - {/foreach} -
+
    + {foreach $extractors as $extractor} +
  • {$extractor}
    • + {/foreach} +
{include file='inc/footer.tpl'} diff --git a/templates/inc/footer.tpl b/templates/inc/footer.tpl index 2a889ca..dbf7c74 100644 --- a/templates/inc/footer.tpl +++ b/templates/inc/footer.tpl @@ -31,7 +31,7 @@ · + href="https://liberapay.com/Rudloff/donate"> {t}Donate{/t}
diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl index 43f0f62..00a98c8 100644 --- a/templates/inc/head.tpl +++ b/templates/inc/head.tpl @@ -1,25 +1,25 @@ - + {if isset($description)} - - - + + + {/if} - - + + {$config->appName}{if isset($title)} - {$title|escape}{/if} - - - - - - - - + + + + + + + + - + diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index 8a9c569..3e8f233 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -13,8 +13,8 @@ {if $supportedLocale != $locale}
  • + lang="{$supportedLocale->getBcp47()}" + href="{path_for name='locale' data=['locale'=>$supportedLocale->getIso15897()]}"> {if $supportedLocale->getCountry()} {$supportedLocale->getCountry()->getEmoji()} {/if} diff --git a/templates/inc/logo.tpl b/templates/inc/logo.tpl index 0b3dade..b1da44f 100644 --- a/templates/inc/logo.tpl +++ b/templates/inc/logo.tpl @@ -1,4 +1,5 @@

    - -{$config->appName} -

    + + {$config->appName} + diff --git a/templates/index.tpl b/templates/index.tpl index 707c45d..21e11d4 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -2,41 +2,45 @@ {include file='inc/header.tpl'}
    + alt="{$config->appName}" width="328" height="284">
    • - -
    + +
    + required placeholder="http://example.com/video"/> - {if $config->uglyUrls} - - {/if} -
    - {if $config->convert} -
    -
    - - -
    - - + {if $config->uglyUrls} + + {/if} +
    + {if $config->convert} +
    +
    + + +
    + + +
    -
    - {/if} -
    + {/if} +
    {t}See all supported websites{/t}

    {t}Drag this to your bookmarks bar:{/t}

    - {t}Bookmarklet{/t} + {t}Bookmarklet{/t}
    diff --git a/templates/info.tpl b/templates/info.tpl index 0a3435d..07ae547 100644 --- a/templates/info.tpl +++ b/templates/info.tpl @@ -1,100 +1,105 @@ {include file="inc/head.tpl"}
    -
    -
    -{include file="inc/logo.tpl"} -{$title=" +
    +
    + {include file="inc/logo.tpl"} + {$title=" "} -

    - {t params=['@title' => $title]}You are going to download @title.{/t} -

    -{if isset($video->thumbnail)} - -{/if} -{if isset($video->description)} - -{/if} -{if isset($video->upload_date)} - -{/if} -
    -
    - - {if $config->uglyUrls} - - {/if} - {if isset($video->formats) && count($video->formats) > 1} -

    -

    - {/if} - {if $config->stream} - stream != 'ask'}checked{/if} name="stream" id="stream"/> - -

    - {/if} - {if $config->convertAdvanced} - - - - {t}with{/t} - - - {t}kbit/s audio{/t} -

    - {/if} -
    -
    -
    -
    -{include file="inc/footer.tpl"} +

    + {t params=['@title' => $title]}You are going to download @title.{/t} +

    + {if isset($video->thumbnail)} + + {/if} + {if isset($video->description)} + + {/if} + {if isset($video->upload_date)} + + {/if} +
    +
    + + {if $config->uglyUrls} + + {/if} + {if isset($video->formats) && count($video->formats) > 1} +

    + +
    +
    + {/if} + {if $config->stream} + stream != 'ask'}checked{/if} name="stream" id="stream"/> + +
    +
    + {/if} + {if $config->convertAdvanced} + + + + {t}with{/t} + + + {t}kbit/s audio{/t} +
    +
    + {/if} +
    +
    +
    +
    + {include file="inc/footer.tpl"} diff --git a/templates/password.tpl b/templates/password.tpl index 3425f36..62c0f4c 100644 --- a/templates/password.tpl +++ b/templates/password.tpl @@ -6,9 +6,9 @@

    {t}You need a password in order to download this video.{/t}

    - +

    - +
    -{include file='inc/footer.tpl'} + {include file='inc/footer.tpl'} diff --git a/templates/playlist.tpl b/templates/playlist.tpl index 5804e4b..179a394 100644 --- a/templates/playlist.tpl +++ b/templates/playlist.tpl @@ -1,43 +1,44 @@ {include file="inc/head.tpl"}
    -
    -{include file="inc/logo.tpl"} +
    + {include file="inc/logo.tpl"} -{if isset($video->title)} - {$title=" + {if isset($video->title)} + {$title=" {$video->title} "} -

    - {t params=['@title'=>$title]}Videos extracted from @title:{/t} -

    -{/if} +

    + {t params=['@title'=>$title]}Videos extracted from @title:{/t} +

    + {/if} -{if $config->stream} - webpage_url}" class="downloadBtn">Download everything -{/if} -{foreach $video->entries as $entry} -
    -

    webpage_url}" class="downloadBtn">Download everything + {/if} + {foreach $video->entries as $entry} +
    +

    - {if !isset($entry->title)} - {if $entry->ie_key == YoutubePlaylist} - Playlist - {else} - Video - {/if} - {else} - {$entry->title} - {/if} -

    - url}">{t}Download{/t} - url}">{t}More options{/t} -
    -{/foreach} + {if !isset($entry->title)} + {if $entry->ie_key == YoutubePlaylist} + Playlist + {else} + Video + {/if} + {else} + {$entry->title} + {/if} +

    + url}">{t}Download{/t} + url}">{t}More options{/t} +
    + {/foreach} -
    -{include file="inc/footer.tpl"} +
    + {include file="inc/footer.tpl"}