From 1bbbcc7361813e35617775656f27d4ba53302a41 Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Sun, 4 Dec 2022 19:25:33 +0100 Subject: [PATCH] update to dotclear 2.24 and admin UI refresh --- CHANGELOG.md | 6 + LICENSE | 339 ++++++++++++++++++++++++++++++++++ README.md | 45 +++++ _admin.php | 64 ++++--- _define.php | 52 +++--- _init.php | 20 ++ _install.php | 84 +++++---- _prepend.php | 47 ++--- _public.php | 167 ++++++++--------- changelog | 2 - dcstore.xml | 13 ++ icon.png | Bin 442 -> 0 bytes icon.svg | 27 +++ icon_b.png | Bin 1606 -> 0 bytes inc/class.files.alias.php | 234 ++++++++++++----------- inc/lib.files.alias.tools.php | 84 ++++----- index.php | 277 +++++++++++++-------------- locales/en/resources.php | 28 ++- locales/fr/main.po | 95 ++++------ locales/fr/resources.php | 28 ++- 20 files changed, 1001 insertions(+), 611 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 LICENSE create mode 100644 README.md create mode 100644 _init.php delete mode 100644 changelog create mode 100644 dcstore.xml delete mode 100644 icon.png create mode 100644 icon.svg delete mode 100644 icon_b.png diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..7212018 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,6 @@ +0.7 - 2022.12.04 +- update to Dotclear 2.24 +- refresh admin UI + +0.6 - 2015.06.19 +- first public release \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README.md b/README.md new file mode 100644 index 0000000..3f64e3d --- /dev/null +++ b/README.md @@ -0,0 +1,45 @@ +# README + +[![Release](https://img.shields.io/github/v/release/JcDenis/filesAlias)](https://github.com/JcDenis/filesAlias/releases) +[![Date](https://img.shields.io/github/release-date/JcDenis/filesAlias)](https://github.com/JcDenis/filesAlias/releases) +[![Issues](https://img.shields.io/github/issues/JcDenis/filesAlias)](https://github.com/JcDenis/filesAlias/issues) +[![Dotclear](https://img.shields.io/badge/dotclear-v2.24-blue.svg)](https://fr.dotclear.org/download) +[![Dotaddict](https://img.shields.io/badge/dotaddict-official-green.svg)](https://plugins.dotaddict.org/dc2/details/filesAlias) +[![License](https://img.shields.io/github/license/JcDenis/filesAlias)](https://github.com/JcDenis/filesAlias/blob/master/LICENSE) + +## WHAT IS FILESALIAS ? + +_filesAlias_ is a plugin for the open-source +web publishing software called Dotclear. + +This plugin creates public aliases of your blog's media. +Alias can be passworded and/or disposable. + +## REQUIREMENTS + + _filesAlias_ requires: + + * content admin permissions for management + * Dotclear 2.24 + +## USAGE + +First install _filesAlias_, manualy from a zip package or from +Dotaddict repository. (See Dotclear's documentation to know how do this) + +You can manage your aliases from menu ''Media sharing'' on admin dashboard sidebar. +You can change public URL handler (default is _pub/_) by using plugin myUrlhandlers. + +## LINKS + + * License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html) + * Source & contribution : [GitHub Page](https://github.com/JcDenis/filesAlias) + * Packages & details: [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/filesAlias) + +## CONTRIBUTORS + + * Osku + * Pierre Van Glabeke + * Jean-Christian Denis + + You are welcome to contribute to this code. \ No newline at end of file diff --git a/_admin.php b/_admin.php index a7635f3..2f22674 100644 --- a/_admin.php +++ b/_admin.php @@ -1,32 +1,36 @@ addItem(__('Medias sharing'), - $core->adminurl->get('admin.plugin.filesAlias'), - dcPage::getPF('filesAlias/icon.png'), - preg_match('/plugin.php(.*)$/',$_SERVER['REQUEST_URI']) && !empty($_REQUEST['p']) && $_REQUEST['p']=='filesAlias', - $core->auth->check('contentadmin',$core->blog->id)); - -$core->addBehavior('adminDashboardFavorites','filesAliasDashboardFavorites'); - -function filesAliasDashboardFavorites($core,$favs) -{ - $favs->register('filesAlias', array( - 'title' => __('Medias sharing'), - 'url' => $core->adminurl->get('admin.plugin.filesAlias'), - 'small-icon' => dcPage::getPF('filesAlias/icon.png'), - 'large-icon' => dcPage::getPF('filesAlias/icon_b.png'), - 'permissions' => 'usage,contentadmin' - )); +/** + * @brief filesAlias, a plugin for Dotclear 2 + * + * @package Dotclear + * @subpackage Plugin + * + * @author Osku and contributors + * + * @copyright Jean-Christian Denis + * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html + */ +if (!defined('DC_CONTEXT_ADMIN')) { + return null; } + +dcCore::app()->menu[dcAdmin::MENU_BLOG]->addItem( + __('Media sharing'), + dcCore::app()->adminurl->get('admin.plugin.filesAlias'), + urldecode(dcPage::getPF('filesAlias/icon.svg')), + preg_match('/' . preg_quote(dcCore::app()->adminurl->get('admin.plugin.filesAlias')) . '(&.*)?$/', $_SERVER['REQUEST_URI']), + dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([dcAuth::PERMISSION_CONTENT_ADMIN]), dcCore::app()->blog->id) +); + +dcCore::app()->addBehavior('adminDashboardFavoritesV2', function (dcFavorites $favs) { + $favs->register('filesAlias', [ + 'title' => __('Media sharing'), + 'url' => dcCore::app()->adminurl->get('admin.plugin.filesAlias'), + 'small-icon' => dcPage::getPF('filesAlias/icon.svg'), + 'large-icon' => dcPage::getPF('filesAlias/icon.svg'), + 'permissions' => dcCore::app()->auth->makePermissions([ + dcAuth::PERMISSION_USAGE, + dcAuth::PERMISSION_CONTENT_ADMIN, + ]), + ]); +}); diff --git a/_define.php b/_define.php index ec2ce4b..def6b9a 100644 --- a/_define.php +++ b/_define.php @@ -1,27 +1,29 @@ registerModule( - /* Name */ 'filesAlias', - /* Description*/ "Manage aliases of your blog's medias", - /* Author */ "Osku & Pierre Van Glabeke", - /* Version */ '0.6', - array( - 'permissions' => 'contentadmin', - 'type' => 'plugin', - 'dc_min' => '2.7', - 'support' => 'http://forum.dotclear.org/viewtopic.php?id=42317', - 'details' => 'http://plugins.dotaddict.org/dc2/details/filesAlias' - ) -); \ No newline at end of file + 'Files alias', + "Manage aliases of your blog's media", + 'Osku and contributors', + '0.7-dev', + [ + 'requires' => [['core', '2.24']], + 'permissions' => dcCore::app()->auth->makePermissions([ + dcAuth::PERMISSION_CONTENT_ADMIN, + ]), + 'type' => 'plugin', + //'support' => 'http://forum.dotclear.org/viewtopic.php?id=42317', + 'support' => 'https://github.com/JcDenis/filesAlias', + 'details' => 'https://plugins.dotaddict.org/dc2/details/filesAlias', + 'repository' => 'https://raw.githubusercontent.com/JcDenis/filesAlias/master/dcstore.xml', + ] +); diff --git a/_init.php b/_init.php new file mode 100644 index 0000000..f7ee15e --- /dev/null +++ b/_init.php @@ -0,0 +1,20 @@ +plugins->moduleInfo('filesAlias','version'); - -if (version_compare($core->getVersion('filesAlias'),$version,'>=')) { - return; +/** + * @brief filesAlias, a plugin for Dotclear 2 + * + * @package Dotclear + * @subpackage Plugin + * + * @author Osku and contributors + * + * @copyright Jean-Christian Denis + * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html + */ +if (!defined('DC_CONTEXT_ADMIN')) { + return null; } -/* Database schema --------------------------------------------------------- */ -$s = new dbStruct($core->con,$core->prefix); +try { + # Grab info + $mod_id = basename(__DIR__); + $version = dcCore::app()->plugins->moduleInfo($mod_id, 'version'); -$s->filesalias - ->blog_id('varchar',32,false) - ->filesalias_url('varchar',255,false) - ->filesalias_destination('varchar',255,false) - ->filesalias_password('varchar',32,true,null) - ->filesalias_disposable('smallint',0,false,0) - - ->primary('pk_filesalias','blog_id','filesalias_url') - - ->index('idx_filesalias_blog_id','btree','blog_id') - - ->reference('fk_filesalias_blog','blog_id','blog','blog_id','cascade','cascade') - ; + if (version_compare(dcCore::app()->getVersion($mod_id), $version, '>=')) { + return; + } -# Schema installation -$si = new dbStruct($core->con,$core->prefix); -$changes = $si->synchronize($s); + $s = new dbStruct(dcCore::app()->con, dcCore::app()->prefix); -$core->setVersion('filesAlias',$version); -return true; \ No newline at end of file + $s->{initFilesAlias::ALIAS_TABLE_NAME} + ->blog_id('varchar', 32, false) + ->filesalias_url('varchar', 255, false) + ->filesalias_destination('varchar', 255, false) + ->filesalias_password('varchar', 32, true, null) + ->filesalias_disposable('smallint', 0, false, 0) + + ->primary('pk_filesalias', 'blog_id', 'filesalias_url') + + ->index('idx_filesalias_blog_id', 'btree', 'blog_id') + + ->reference('fk_filesalias_blog', 'blog_id', 'blog', 'blog_id', 'cascade', 'cascade') + ; + + $si = new dbStruct(dcCore::app()->con, dcCore::app()->prefix); + $changes = $si->synchronize($s); + + dcCore::app()->setVersion($mod_id, $version); + + return true; +} catch (Exception $e) { + dcCore::app()->error->add($e->getMessage()); +} + +return false; diff --git a/_prepend.php b/_prepend.php index 350728c..85fbf0a 100644 --- a/_prepend.php +++ b/_prepend.php @@ -1,25 +1,30 @@ autoload([ + 'filesAliases' => __DIR__ . '/inc/class.files.alias.php', + 'aliasMedia' => __DIR__ . '/inc/class.files.alias.php', + 'PallazzoTools' => __DIR__ . '/inc/lib.files.alias.tools.php', +]); -$core->filealias = new filesAliases($core); +dcCore::app()->filealias = new filesAliases(); -$core->url->register('filesalias', - 'pub', - '^pub/(.+)$', - array('urlFilesAlias','alias') -); \ No newline at end of file +dcCore::app()->url->register( + 'filesalias', + 'pub', + '^pub/(.+)$', + ['urlFilesAlias','alias'] +); diff --git a/_public.php b/_public.php index 040d0a7..19a779d 100644 --- a/_public.php +++ b/_public.php @@ -1,102 +1,89 @@ tpl->setPath($core->tpl->getPath(), dirname(__FILE__).'/default-templates'); -$core->tpl->addValue('fileAliasURL',array('templateAlias','fileAliasURL')); +dcCore::app()->tpl->setPath(dcCore::app()->tpl->getPath(), __DIR__ . '/default-templates'); +dcCore::app()->tpl->addValue('fileAliasURL', ['templateAlias','fileAliasURL']); class templateAlias { - public static function fileAliasURL($attr) - { - global $core, $_ctx; - - $f = $GLOBALS['core']->tpl->getFilters($attr); - return 'blog->url.$core->url->getBase("filesalias")."/".$_ctx->filealias->filesalias_url').'; ?>'; - } + public static function fileAliasURL($attr) + { + $f = dcCore::app()->tpl->getFilters($attr); + + return 'blog->url.dcCore::app()->url->getBase("filesalias")."/".dcCore::app()->ctx->filealias->filesalias_url') . '; ?>'; + } } class urlFilesAlias extends dcUrlHandlers { - public static function alias($args) - { - $_ctx =& $GLOBALS['_ctx']; - $core =& $GLOBALS['core']; - $delete = false; - - $_ctx->filealias = $core->filealias->getAlias($args); + public static function alias($args) + { + $delete = false; - if ($_ctx->filealias->isEmpty()) { - self::p404(); - } - - if ($_ctx->filealias->filesalias_disposable) { - $delete = true; - } - - if ($_ctx->filealias->filesalias_password) { - - # Check for match - if (!empty($_POST['filepassword']) && $_POST['filepassword'] == $_ctx->filealias->filesalias_password) - { - self::servefile($_ctx->filealias->filesalias_destination,$args,$delete); - } - else - { - self::serveDocument('file-password-form.html','text/html',false); - return; - } - } - else - { - self::servefile($_ctx->filealias->filesalias_destination,$args,$delete); - } - } - - public static function servefile($target,$alias,$delete=false) - { - $core =& $GLOBALS['core']; - - $a= new aliasMedia($core); - $media = $a->getMediaId($target); + dcCore::app()->ctx->filealias = dcCore::app()->filealias->getAlias($args); - if (empty($media)) - { - self::p404(); - } - - $file = $core->media->getFile($media); - - if (empty($file->file)) - { - self::p404(); - } - - header('Content-type: '.$file->type); - header('Content-Length: '.$file->size); - header('Content-Disposition: attachment; filename="'.$file->basename.'"'); - - if (ob_get_length() > 0) { - ob_end_clean(); - } - flush(); - - readfile($file->file); - if ($delete) { - $core->filealias->deleteAlias($alias); - } + if (dcCore::app()->ctx->filealias->isEmpty()) { + self::p404(); + } - return; - } -} \ No newline at end of file + if (dcCore::app()->ctx->filealias->filesalias_disposable) { + $delete = true; + } + + if (dcCore::app()->ctx->filealias->filesalias_password) { + # Check for match + if (!empty($_POST['filepassword']) && $_POST['filepassword'] == dcCore::app()->ctx->filealias->filesalias_password) { + self::servefile(dcCore::app()->ctx->filealias->filesalias_destination, $args, $delete); + } else { + self::serveDocument('file-password-form.html', 'text/html', false); + + return; + } + } else { + self::servefile(dcCore::app()->ctx->filealias->filesalias_destination, $args, $delete); + } + } + + public static function servefile($target, $alias, $delete = false) + { + $a = new aliasMedia(); + $media = $a->getMediaId($target); + + if (empty($media)) { + self::p404(); + } + + $file = dcCore::app()->media->getFile($media); + + if (empty($file->file)) { + self::p404(); + } + + header('Content-type: ' . $file->type); + header('Content-Length: ' . $file->size); + header('Content-Disposition: attachment; filename="' . $file->basename . '"'); + + if (ob_get_length() > 0) { + ob_end_clean(); + } + flush(); + + readfile($file->file); + if ($delete) { + dcCore::app()->filealias->deleteAlias($alias); + } + } +} diff --git a/changelog b/changelog deleted file mode 100644 index b93a4ed..0000000 --- a/changelog +++ /dev/null @@ -1,2 +0,0 @@ -v0.6 - 19-06-2015 - Osku & Pierre Van Glabeke -* première version publique \ No newline at end of file diff --git a/dcstore.xml b/dcstore.xml new file mode 100644 index 0000000..429356f --- /dev/null +++ b/dcstore.xml @@ -0,0 +1,13 @@ + + + + Files alias + 0.7-dev + Osku and contributors + Manage aliases of your blog's media + https://github.com/JcDenis/filesAlias/releases/download/v0.7-dev/plugin-filesAlias.zip + 2.24 + https://plugins.dotaddict.org/dc2/details/filesAlias + https://github.com/JcDenis/filesAlias + + diff --git a/icon.png b/icon.png deleted file mode 100644 index 81a2044b2175920806fd0337ce971ff78febe13c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4H%pvNSB~8r!Bge2*kbx0 z<}jB%-fsE42RPJa%=7-^wFqesl%gf12H}MNubYWY! z;F*fg`&||$PFQKCJVCDEdy4Sn)X5Uz?Q0KTj##5|KZx1mi;HaSwp0EL4WgQslV=+; z?oNteyY> diff --git a/icon.svg b/icon.svg new file mode 100644 index 0000000..5103538 --- /dev/null +++ b/icon.svg @@ -0,0 +1,27 @@ + + + + diff --git a/icon_b.png b/icon_b.png deleted file mode 100644 index 4d54dc9e91652bc1692bd9eedc9b39755b9ffdce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1606 zcmV-M2D$l(P)Z5e)tbhHb=zXco3r zk!XBSq6zWO3y2AZ7o+a$tQ+kReNkiLpJ+sb34sUkf27-jiixt$h?rpHK@$vM>6jQL z*}C52!met=|zwexT&ON>Ne&?R=yP~S(;_}YDq3nohvd}0Z4WNy{{G1Ba z!EunJsty=Pdi=KkL^PbrB`lK#KsF5cf}tTtm3F{4o!*v#j4JU{>AG%xy&?18o96`} z(;tlVK6cLa z@evSm5;t3s16=$=ekw8^lWiIw2?oaId{)eMW`5@Ze52O;j%*n4!Px)=LqpC?9QL^o zbXhPodh1 zq`{m`Z)+57G*o|XKb_1sQ_IY3yp?uf3JwGBB9asI z9*G`#dG+vw>)!!y2A#xPh`bG4>DG`0oJ8(|K;?KX9c$fqA%S|QZ@G&72A4TZHLd|i zjnDhUR6-}?tG)xaxiwaG0Z`RXQ_<$X@{tua@4K~EbpgPb{(ME#{=pxC^Qt@rnRBCD zTI5$jH_kmhvLkPmW7jC)Y7MJ~r@+ssZXNV{cWAU_v=GJ6y!7>1>+!oWUdaF)5|!?> zfB!CxMr|<-WUX1_)`?04Ac;tPFxK*cDhe${H4exX%ofkm@PU0Rgj-U;d+>8_xfHzKdg$If; zCTn+lf=lMC4LH&ca-+)}rX&;`07bqmR7W-p_~wR&)&-W-J*}{~Q2pto-~bpg-{&hU zYj=AB*VU~L)bk`t&c|9MDLfCb_KIonqhb`12<2Zz)?N2y(_30!9rSsxMfDNj=fdqx zF9ioch4l+MKfbgeooMrDI^MQ@(D(IHQF#D3RH)tQqS!p(m2|9iQ_)5R2{=7>qc{jn z#kNxlicW=9bZ5rv+w^C&IX&@usB_tD7O~lhg)3k1!M@- zFMy;P&Y&z6xDS|(@(~`1rMp`4s_=v&dvCKC2M8DMPvMlKD!kWVqIq_#g`!Rb|8~IQXfe?y7=+WF3DGM=*a2Az!^8jt04eq(W@1C z_0(+ty1Z3xs25!Jp^5@9hG_nKjZk*@23#(JRTltYb-sIzto7XM)>t(LV9{`9)(cY! z)jNI5fhXM>tHuBTYz%hvK9_4j3_6Jx6}yKLeBW5DA4rT-v!BR}vlQ5hDk_SU`lSHX zI|a&y0ghMNi3)PufFvvJMdgsBQPrYea?Au&b-);?*%4qMX*_=0kIN5@E>bcczwI|C zqT!SX-IeyH+=$S9A{tH^fOM)ZuE@culx7Nw989O`;&3(((AOI>9<>is8&e_UHKPxW zpCbJ?5lY3|z6aUN%nm{ZWb?$+qcwkY_W#4vwSIj5AHIxC*gfL=EC2ui07*qoM6N<$ Ef*4}_egFUf diff --git a/inc/class.files.alias.php b/inc/class.files.alias.php index 68d9f91..d2b7749 100644 --- a/inc/class.files.alias.php +++ b/inc/class.files.alias.php @@ -1,130 +1,126 @@ core =& $core; - } - - public function getAliases() - { - if (is_array($this->aliases)) { - return $this->aliases; - } - - $this->aliases = array(); - $sql = 'SELECT filesalias_url, filesalias_destination, filesalias_password, filesalias_disposable '. - 'FROM '.$this->core->prefix.'filesalias '. - "WHERE blog_id = '".$this->core->con->escape($this->core->blog->id)."' ". - 'ORDER BY filesalias_url ASC '; - $this->aliases = $this->core->con->select($sql)->rows(); - return $this->aliases; - } - - public function getAlias($url) - { - $strReq = 'SELECT filesalias_url, filesalias_destination, filesalias_password, filesalias_disposable '. - 'FROM '.$this->core->prefix.'filesalias '. - "WHERE blog_id = '".$this->core->con->escape($this->core->blog->id)."' ". - "AND filesalias_url = '".$this->core->con->escape($url)."' ". - 'ORDER BY filesalias_url ASC '; + protected $aliases; - $rs = $this->core->con->select($strReq); - return $rs; - } - - public function updateAliases($aliases) - { - $this->core->con->begin(); - try - { - $this->deleteAliases(); - foreach ($aliases as $k => $v) - { - if (!empty($v['filesalias_url']) && !empty($v['filesalias_destination'])) - { - $v['filesalias_disposable'] = isset($v['filesalias_disposable']) ? true : false; - $this->createAlias($v['filesalias_url'],$v['filesalias_destination'],$v['filesalias_disposable'],$v['filesalias_password']); - } - } - - $this->core->con->commit(); - } - catch (Exception $e) - { - $this->core->con->rollback(); - throw $e; - } - } - - public function createAlias($url,$destination,$disposable=0,$password=null) - { - if (!$url) { - throw new Exception(__('File URL is empty.')); - } - - if (!$destination) { - throw new Exception(__('File destination is empty.')); - } - - $cur = $this->core->con->openCursor($this->core->prefix.'filesalias'); - $cur->blog_id = (string) $this->core->blog->id; - $cur->filesalias_url = (string) $url; - $cur->filesalias_destination = (string) $destination; - $cur->filesalias_password = $password; - $cur->filesalias_disposable = abs((integer) $disposable); - $cur->insert(); - } - - public function deleteAliases() - { - $this->core->con->execute( - 'DELETE FROM '.$this->core->prefix.'filesalias '. - "WHERE blog_id = '".$this->core->con->escape($this->core->blog->id)."' " - ); - } + public function __construct() + { + } - public function deleteAlias($url) - { - $this->core->con->execute( - 'DELETE FROM '.$this->core->prefix.'filesalias '. - "WHERE blog_id = '".$this->core->con->escape($this->core->blog->id)."' ". - "AND filesalias_url = '".$this->core->con->escape($url)."' " - ); - } + public function getAliases() + { + if (is_array($this->aliases)) { + return $this->aliases; + } + + $this->aliases = []; + $sql = 'SELECT filesalias_url, filesalias_destination, filesalias_password, filesalias_disposable ' . + 'FROM ' . dcCore::app()->prefix . initFilesAlias::ALIAS_TABLE_NAME . ' ' . + "WHERE blog_id = '" . dcCore::app()->con->escape(dcCore::app()->blog->id) . "' " . + 'ORDER BY filesalias_url ASC '; + $this->aliases = dcCore::app()->con->select($sql)->rows(); + + return $this->aliases; + } + + public function getAlias($url) + { + $strReq = 'SELECT filesalias_url, filesalias_destination, filesalias_password, filesalias_disposable ' . + 'FROM ' . dcCore::app()->prefix . initFilesAlias::ALIAS_TABLE_NAME . ' ' . + "WHERE blog_id = '" . dcCore::app()->con->escape(dcCore::app()->blog->id) . "' " . + "AND filesalias_url = '" . dcCore::app()->con->escape($url) . "' " . + 'ORDER BY filesalias_url ASC '; + + $rs = dcCore::app()->con->select($strReq); + + return $rs; + } + + public function updateAliases($aliases) + { + dcCore::app()->con->begin(); + + try { + $this->deleteAliases(); + foreach ($aliases as $k => $v) { + if (!empty($v['filesalias_url']) && !empty($v['filesalias_destination'])) { + $v['filesalias_disposable'] = isset($v['filesalias_disposable']) ? true : false; + $this->createAlias($v['filesalias_url'], $v['filesalias_destination'], $v['filesalias_disposable'], $v['filesalias_password']); + } + } + + dcCore::app()->con->commit(); + } catch (Exception $e) { + dcCore::app()->con->rollback(); + + throw $e; + } + } + + public function createAlias($url, $destination, $disposable = 0, $password = null) + { + if (!$url) { + throw new Exception(__('File URL is empty.')); + } + + if (!$destination) { + throw new Exception(__('File destination is empty.')); + } + + $cur = dcCore::app()->con->openCursor(dcCore::app()->prefix . initFilesAlias::ALIAS_TABLE_NAME); + $cur->blog_id = (string) dcCore::app()->blog->id; + $cur->filesalias_url = (string) $url; + $cur->filesalias_destination = (string) $destination; + $cur->filesalias_password = $password; + $cur->filesalias_disposable = abs((int) $disposable); + $cur->insert(); + } + + public function deleteAliases() + { + dcCore::app()->con->execute( + 'DELETE FROM ' . dcCore::app()->prefix . initFilesAlias::ALIAS_TABLE_NAME . ' ' . + "WHERE blog_id = '" . dcCore::app()->con->escape(dcCore::app()->blog->id) . "' " + ); + } + + public function deleteAlias($url) + { + dcCore::app()->con->execute( + 'DELETE FROM ' . dcCore::app()->prefix . initFilesAlias::ALIAS_TABLE_NAME . ' ' . + "WHERE blog_id = '" . dcCore::app()->con->escape(dcCore::app()->blog->id) . "' " . + "AND filesalias_url = '" . dcCore::app()->con->escape($url) . "' " + ); + } } class aliasMedia extends dcMedia { - public function __construct($core) - { - parent::__construct($core); - } + public function __construct() + { + } - public function getMediaId($target) - { - $strReq = - 'SELECT media_id '. - 'FROM '.$this->table.' '. - "WHERE media_path = '".$this->path."' ". - "AND media_file = '".$this->con->escape($target)."' "; - - $rs = $this->core->con->select($strReq); - return $rs->media_id; - } + public function getMediaId($target) + { + $strReq = 'SELECT media_id ' . + 'FROM ' . dcCore::app()->prefix . dcMedia::MEDIA_TABLE_NAME . ' ' . + //"WHERE media_path = '" . $this->path . "' " . + "WHERE media_path = '" . dcCore::app()->con->escape(dcCore::app()->blog->settings->system->public_path) . "' " . + "AND media_file = '" . dcCore::app()->con->escape($target) . "' "; + + $rs = dcCore::app()->con->select($strReq); + + return $rs->count() ? $rs->media_id : null; + } } diff --git a/inc/lib.files.alias.tools.php b/inc/lib.files.alias.tools.php index 3e1121b..be8fb63 100644 --- a/inc/lib.files.alias.tools.php +++ b/inc/lib.files.alias.tools.php @@ -1,54 +1,50 @@ = 0; $t--) { - $bcp = pow($base, $t); - $a = floor($in / $bcp) % $base; - $out = $out . substr($index, $a, 1); - $in = $in - ($a * $bcp); - } - $out = strrev($out); - - return $out; - } + $base = strlen($index); + + $out = ''; + for ($t = floor(log($in, $base)); $t >= 0; $t--) { + $bcp = pow($base, $t); + $a = floor($in / $bcp) % $base; + $out = $out . substr($index, $a, 1); + $in = $in - ($a * $bcp); + } + $out = strrev($out); + + return $out; + } } diff --git a/index.php b/index.php index 4290c19..dc25a9c 100644 --- a/index.php +++ b/index.php @@ -1,176 +1,157 @@ filealias; +$o = dcCore::app()->filealias; $aliases = $o->getAliases(); -$media = new dcMedia($core); -$a= new aliasMedia($core); +$media = new dcMedia(); +$a = new aliasMedia(); +$part = $_REQUEST['part'] ?? 'list'; # Update aliases -if (isset($_POST['a']) && is_array($_POST['a'])) -{ - try { - $o->updateAliases($_POST['a']); - http::redirect($p_url.'&up=1'); - } catch (Exception $e) { - $core->error->add($e->getMessage()); - } +if (isset($_POST['a']) && is_array($_POST['a'])) { + try { + $o->updateAliases($_POST['a']); + dcAdminNotices::addSuccessNotice(__('Aliases successfully updated.')); + dcCore::app()->adminurl->redirect('admin.plugin.filesAlias'); + } catch (Exception $e) { + dcCore::app()->error->add($e->getMessage()); + } } # New alias -if (isset($_POST['filesalias_url'])) -{ - $url = empty($_POST['filesalias_url']) ? PallazzoTools::rand_uniqid() : $_POST['filesalias_url']; +if (isset($_POST['filesalias_url'])) { + $url = empty($_POST['filesalias_url']) ? PallazzoTools::rand_uniqid() : $_POST['filesalias_url']; - $target = $_POST['filesalias_destination']; - $totrash = isset ($_POST['filesalias_disposable']) ? true : false; - $password = empty($_POST['filesalias_password'])? '' : $_POST['filesalias_password']; - - if (preg_match('/^'.preg_quote($media->root_url,'/').'/',$target)) { - $target = preg_replace('/^'.preg_quote($media->root_url,'/').'/','',$target); - $media = $a->getMediaId($target); + $target = $_POST['filesalias_destination']; + $totrash = isset($_POST['filesalias_disposable']) ? true : false; + $password = empty($_POST['filesalias_password']) ? '' : $_POST['filesalias_password']; - if (!empty($media)) - { - try { - $o->createAlias($url,$target,$totrash,$password); - http::redirect($p_url.'&created=1'); - } catch (Exception $e) { - $core->error->add($e->getMessage()); - } - } - else - { - $core->error->add(__('Target is not in medias manager.')); - } - } - else - { - $media = $a->getMediaId($target); + if (preg_match('/^' . preg_quote($media->root_url, '/') . '/', $target)) { + $target = preg_replace('/^' . preg_quote($media->root_url, '/') . '/', '', $target); + $found = $a->getMediaId($target); - if (!empty($media)) - { - try { - $o->createAlias($url,$target,$totrash,$password); - http::redirect($p_url.'&created=1'); - } catch (Exception $e) { - $core->error->add($e->getMessage()); - } - } - else - { - $core->error->add(__('Target is not in medias manager.')); - } - } + if (!empty($found)) { + try { + $o->createAlias($url, $target, $totrash, $password); + dcAdminNotices::addSuccessNotice(__('Alias for this media created.')); + dcCore::app()->adminurl->redirect('admin.plugin.filesAlias'); + } catch (Exception $e) { + dcCore::app()->error->add($e->getMessage()); + } + } else { + dcCore::app()->error->add(__('Target is not in media manager.')); + } + } else { + $found = $a->getMediaId($target); + + if (!empty($found)) { + try { + $o->createAlias($url, $target, $totrash, $password); + dcAdminNotices::addSuccessNotice(__('Alias for this media modified.')); + dcCore::app()->adminurl->redirect('admin.plugin.filesAlias'); + } catch (Exception $e) { + dcCore::app()->error->add($e->getMessage()); + } + } else { + dcCore::app()->error->add(__('Target is not in media manager.')); + } + } } ?> - <?php echo $page_title; ?> +<?php echo __('Media sharing'); ?> blog->name) => '', - __('Medias sharing') => '' - )). - dcPage::notices(); +if ($part == 'new') { + echo + dcPage::breadcrumb([ + html::escapeHTML(dcCore::app()->blog->name) => '', + __('Media sharing') => dcCore::app()->adminurl->get('admin.plugin.filesAlias'), + __('New alias') => '', + ]) . + dcPage::notices() . + '
' . + '

' . __('New alias') . '

' . + '

' . + form::field('filesalias_destination', 70, 255) . '

' . + '

' . __('Destination file must be in media manager.') . '

' . + '

' . + form::field('filesalias_url', 70, 255) . '

' . + '

' . __('Leave empty to get a randomize alias.') . '

' . + '

' . + form::field('filesalias_password', 70, 255) . '

' . + '

' . form::checkbox('filesalias_disposable', 1) . + '

' . + '

' . + dcCore::app()->formNonce() . + form::hidden('part', 'new') . + '

' . + '

' . sprintf(__('Do not put blog media URL "%s" in fields or it will be removed.'), $media->root_url) . '

' . + '
'; +} else { + echo + dcPage::breadcrumb([ + html::escapeHTML(dcCore::app()->blog->name) => '', + __('Media sharing') => '', + ]) . + dcPage::notices() . + '

' . __('New alias') . '

'; -?> -' . __('No alias') . '

'; + } else { + echo + '
' . + '
' . + '' . + '' . + '' . + '' . + '' . + '' . + '' . + ''; -if (!empty($_GET['created'])) { - dcPage::success(__('Alias for this media created.')); -} + foreach ($aliases as $k => $v) { + $url = dcCore::app()->blog->url . dcCore::app()->url->getBase('filesalias') . '/' . html::escapeHTML($v['filesalias_url']); -if (!empty($_GET['modified'])) { - dcPage::success(__('Configuration successfully updated.')); -} + $link = '' . __('link') . ''; + $v['filesalias_disposable'] ??= false; + echo + '' . + '' . + '' . + '' . + '' . + ''; + } -if (empty($aliases)) -{ - echo '

'.__('No alias').'

'; + echo '
' . __('Aliases list') . '
' . __('Destination') . ' - ' . html::escapeHTML($media->root_url) . '(-?-)' . __('Alias') . ' - ' . dcCore::app()->blog->url . dcCore::app()->url->getBase('filesalias') . '/' . '(-?-)' . __('Disposable') . '' . __('Password') . '
' . form::field(['a[' . $k . '][filesalias_destination]'], 40, 255, html::escapeHTML($v['filesalias_destination'])) . '' . form::field(['a[' . $k . '][filesalias_url]'], 20, 255, html::escapeHTML($v['filesalias_url'])) . '' . __('link') . '' . form::checkbox(['a[' . $k . '][filesalias_disposable]'], 1, $v['filesalias_disposable']) . '' . form::field(['a[' . $k . '][filesalias_password]'], 10, 255, html::escapeHTML($v['filesalias_password'])) . '
' . + '

' . __('To remove a link, empty its alias or destination.') . '

' . + '

' . dcCore::app()->formNonce() . form::hidden('part', 'list') . + '

' . + '
'; + } } -else -{ - $root_url = html::escapeHTML($media->root_url); - echo - '
'. - '
'. - ' - - '. - ''. - ''. - ''. - ''. - ''; - - foreach ($aliases as $k => $v) - { - $url = $core->blog->url.$core->url->getBase('filesalias').'/'.html::escapeHTML($v['filesalias_url']); - - $link = ''.__('link').''; - $v['filesalias_disposable'] = isset ($v['filesalias_disposable']) ? $v['filesalias_disposable'] : false; - echo - ''. - ''. - ''. - ''. - ''. - ''; - } - - echo '
'.__('Aliases list').'
'.__('Destination').' - '.$root_url.'(-?-)'.__('Alias').' - '.$core->blog->url.$core->url->getBase('filesalias').'/'.'(-?-)'.__('Disposable').''.__('Password').'
'.form::field(array('a['.$k.'][filesalias_destination]'),40,255,html::escapeHTML($v['filesalias_destination'])).''.form::field(array('a['.$k.'][filesalias_url]'),20,255,html::escapeHTML($v['filesalias_url'])).''.__('link').''.form::checkbox(array('a['.$k.'][filesalias_disposable]'),1,$v['filesalias_disposable']).''.form::field(array('a['.$k.'][filesalias_password]'),10,255,html::escapeHTML($v['filesalias_password'])).'
'. - '

'.__('To remove a link, empty its alias or destination.').'

'. - '

'.$core->formNonce(). - '

'. - '
'. - '
'; -} - -echo -'
-
-

'.__('New alias').'

-

'.form::field('filesalias_destination',70,255).' -

-

'.__('Destination file must be in media manager.').'

-

'.sprintf(__('Root URL "%s" will be automatically removed.'),$media->root_url).'

-

-

'.__('Leave empty to get a randomize alias.').'

-

'.form::checkbox('filesalias_disposable',1).'

-

-

'.$core->formNonce().'

-
-
'; dcPage::helpBlock('filesAlias'); ?> diff --git a/locales/en/resources.php b/locales/en/resources.php index 459abb3..6e42d26 100644 --- a/locales/en/resources.php +++ b/locales/en/resources.php @@ -1,17 +1,13 @@ resources['help']['filesAlias'] = __DIR__ . '/help/filesAlias.html'; diff --git a/locales/fr/main.po b/locales/fr/main.po index fd8235d..e713d61 100644 --- a/locales/fr/main.po +++ b/locales/fr/main.po @@ -1,101 +1,72 @@ -# Language: Français -# Module: filesAlias - 0.6beta -# Date: 2015-06-16 17:26:03 -# Translated with translater 2015.03.02 - msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: filesAlias 0.6beta\n" +"Project-Id-Version: filesAlias 0.7-dev\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2015-06-16T17:26:03+00:00\n" -"Last-Translator: brol\n" +"PO-Revision-Date: 2022-12-04T18:18:09+00:00\n" +"Last-Translator: Jean-Christian Denis\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: _admin.php:15 -#: _admin.php:24 -#: index.php:15 -#: index.php:91 -msgid "Medias sharing" -msgstr "Partage de médias" +msgid "Media sharing" +msgstr "Partage de media" -#: inc/class.files.alias.php:78 msgid "File URL is empty." msgstr "L'URL du fichier est vide." -#: inc/class.files.alias.php:82 msgid "File destination is empty." msgstr "La destination du fichier est vide." -#: index.php:57 -#: index.php:75 -msgid "Target is not in medias manager." -msgstr "La cible n'est pas dans le gestionnaire de médias." - -#: index.php:98 msgid "Aliases successfully updated." msgstr "Les alias ont été mis à jour avec succès." -#: index.php:102 msgid "Alias for this media created." msgstr "L'alias pour votre fichier a été créé." -#: index.php:111 -msgid "No alias" -msgstr "Aucun alias" +msgid "Target is not in media manager." +msgstr "La cible n'est pas dans le gestionnaire de media." -#: index.php:120 -msgid "Aliases list" -msgstr "Liste des alias" +msgid "Alias for this media modified." +msgstr "L'alias du media modifié." -#: index.php:122 -msgid "Destination" -msgstr "Destination" - -#: index.php:123 -msgid "Alias" -msgstr "Alias" - -#: index.php:124 -#: index.php:166 -msgid "Disposable" -msgstr "Jetable" - -#: index.php:132 -#: index.php:137 -msgid "link" -msgstr "lien" - -#: index.php:144 -msgid "To remove a link, empty its alias or destination." -msgstr "Pour supprimer un lien, vider son alias ou sa destination." - -#: index.php:154 msgid "New alias" msgstr "Nouvel alias" -#: index.php:157 msgid "Destination:" msgstr "Destination :" -#: index.php:159 msgid "Destination file must be in media manager." msgstr "Le fichier de destination doit se trouver dans la médiathèque." -#: index.php:160 -msgid "Root URL \"%s\" will be automatically removed." -msgstr "La racine URL '%s' sera automatiquement supprimée." - -#: index.php:162 msgid "URL (alias):" msgstr "URL (alias) :" -#: index.php:164 msgid "Leave empty to get a randomize alias." msgstr "Laisser vide pour obtenir un alias aléatoire." -msgid "Manage aliases of your blog's medias" -msgstr "Gérer les alias des médias de votre blog" +msgid "Disposable" +msgstr "Jetable" + +msgid "Do not put blog media URL \"%s\" in fields or it will be removed." +msgstr "Ne pas mettre l'URL des media \"%s\" dans les champs, ou il sera retiré." + +msgid "No alias" +msgstr "Aucun alias" + +msgid "Aliases list" +msgstr "Liste des alias" + +msgid "Destination" +msgstr "Destination" + +msgid "link" +msgstr "lien" + +msgid "To remove a link, empty its alias or destination." +msgstr "Pour supprimer un lien, vider son alias ou sa destination." + +msgid "Manage aliases of your blog's media" +msgstr "Gérer les alias des média de votre blog" diff --git a/locales/fr/resources.php b/locales/fr/resources.php index 459abb3..6e42d26 100644 --- a/locales/fr/resources.php +++ b/locales/fr/resources.php @@ -1,17 +1,13 @@ resources['help']['filesAlias'] = __DIR__ . '/help/filesAlias.html';