diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..a419ce6 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,83 @@ +dev +- [ ] enhance public template + +1.1.0 - 2022.11.20 +- fix compatibility with Dotclear 2.24 (required) + +1.0.0 - 2021.11.06 +- fix javascript (and externalize them) +- fix modal +- fix page title +- fix permissions (dc2.20) +- fix various bugs and typo +- update translations (and remove .lang.php file) +- update readme (shields.io, links, ...) +- update public templates (using dotty and berlin) +- update ui (follow dc graphic design) +- add user pref on filters options (dc 2.20) + +0.9 - 2021.09.11 +- add user pref on table columns +- fix typo in admin menu + +0.8 - 2021.09.09 +- fix compatibility Dotclear v2.19 +- fix compatibility php7.3+, php8.0 +- fix license +- fix translation +- fix code style (near PSR2) +- fix widget options +- add option to show how many links use a category +- rewrite admin page (filter, sortable, breadcrumb, etc...) + +0.7 - 2013.11.03 +- Switch to Dotclear 2.6 +- Add dashboard icon +- Clean up code + +0.6.3 - 2010.11.12 +- Fixed install on nightly build + +0.6.2 - 2010.07.07 +- Fixed error on non-existing repository (tks Geraldine) + +0.6.1 - 2010.06.11 +- Removed rateIt behaviors (included in rateIt > 2.0) + +0.6 - 2010.06.06 +- Switched to DC 2.2 +- Fixed minor bugs +- Changed admin interface + +0.5.4 - 2010.03.06 +- Removed behavior when update only link_count + +0.5.3 - 2010.03.01 +- Fixed bug with null values +- Cleaned add and update functions + +0.5.1 - 2010.01.27 +- Fixed PostgreSQL compatibility on table creation + +0.5 - 2010.01.15 +- Added a public page with navigation and categories +- Added RSS/Atom feeds +- Added new sort option on widget +- Added support of plugin sitemap +- Added support of plugin rateIt (first step) +- Fixed author note on new link +- Fixed typo +- Prepared DC 2.2 Break + +0.3 - 2009.10.26 +- Removed option "open in new window" +- Added option "enable link" on widget +- Added option "random order" on widget +- Added reports to plugin activityReport + +0.2 - 2009.10.21 +- Fixed cat_id in admin +- Added trigger to update public side + +0.1 - 2009.10.19 +- First lab 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..ef1f308 --- /dev/null +++ b/README.md @@ -0,0 +1,43 @@ +# README + +[![Release](https://img.shields.io/github/v/release/JcDenis/alias)](https://github.com/JcDenis/alias/releases) +[![Date](https://img.shields.io/github/release-date/JcDenis/alias)](https://github.com/JcDenis/alias/releases) +[![Issues](https://img.shields.io/github/issues/JcDenis/alias)](https://github.com/JcDenis/alias/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/alias) +[![License](https://img.shields.io/github/license/JcDenis/alias)](https://github.com/JcDenis/alias/blob/master/LICENSE) + +## WHAT IS ALIAS ? + +_alias_ is a plugin for the open-source +web publishing software called Dotclear. + +This plugin creates public aliases of your blog's URLs. + +## REQUIREMENTS + + _alias_ requires: + + * admin permissions for management + * Dotclear 2.24 + +## USAGE + +First install _alias_, 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 ''Alias'' on admin dashboard sidebar. + +## LINKS + + * License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html) + * Source & contribution : [GitHub Page](https://github.com/JcDenis/alias) + * Packages & details: [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/alias) + +## CONTRIBUTORS + + * Olivier Meunier + * Franck-paul + * 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 abf1af4..b0046b8 100644 --- a/_admin.php +++ b/_admin.php @@ -1,90 +1,70 @@ addBehavior('exportFull',array('aliasBehaviors','exportFull')); -$core->addBehavior('exportSingle',array('aliasBehaviors','exportSingle')); -$core->addBehavior('importInit',array('aliasBehaviors','importInit')); -$core->addBehavior('importFull',array('aliasBehaviors','importFull')); -$core->addBehavior('importSingle',array('aliasBehaviors','importSingle')); - -$_menu['Plugins']->addItem(__('Aliases'),'plugin.php?p=alias','index.php?pf=alias/icon.png', - preg_match('/plugin.php\?p=alias(&.*)?$/',$_SERVER['REQUEST_URI']), - $core->auth->check('admin',$core->blog->id)); - -if (!isset($__resources['help']['alias'])) { - $__resources['help']['alias'] = dirname(__FILE__).'/locales/en/help.html'; - - if (file_exists(dirname(__FILE__).'/locales/'.$_lang.'/help.html')) { - $__resources['help']['alias'] = dirname(__FILE__).'/locales/'.$_lang.'/help.html'; - } +/** + * @brief alias, a plugin for Dotclear 2 + * + * @package Dotclear + * @subpackage Plugin + * + * @author Olivier Meunier and contributors + * + * @copyright Jean-Crhistian Denis + * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html + */ +if (!defined('DC_CONTEXT_ADMIN')) { + return null; } -# Behaviors -class aliasBehaviors -{ - public static function exportFull($core,$exp) - { - $exp->exportTable('alias'); - } +dcCore::app()->menu[dcAdmin::MENU_PLUGINS]->addItem( + __('Aliases'), + dcCore::app()->adminurl->get('admin.plugin.alias'), + dcPage::getPF('alias/icon.png'), + preg_match('/' . preg_quote(dcCore::app()->adminurl->get('admin.plugin.alias')) . '(&.*)?$/', $_SERVER['REQUEST_URI']), + dcCore::app()->auth->check(dcAuth::PERMISSION_ADMIN, dcCore::app()->blog->id) +); - public static function exportSingle($core,$exp,$blog_id) - { - $exp->export('alias', - 'SELECT alias_url, alias_destination, alias_position '. - 'FROM '.$core->prefix.'alias A '. - "WHERE A.blog_id = '".$blog_id."'" - ); - } +dcCore::app()->addBehavior('exportFullV2', function ($exp) { + $exp->exportTable('alias'); +}); - public static function importInit($bk,$core) - { - $bk->cur_alias = $core->con->openCursor($core->prefix.'alias'); - $bk->alias = new dcAliases($core); - $bk->aliases = $bk->alias->getAliases(); - } +dcCore::app()->addBehavior('exportSingleV2', function ($exp, $blog_id) { + $exp->export( + 'alias', + 'SELECT alias_url, alias_destination, alias_position ' . + 'FROM ' . dcCore::app()->prefix . 'alias A ' . + "WHERE A.blog_id = '" . $blog_id . "'" + ); +}); - public static function importFull($line,$bk,$core) - { - if ($line->__name == 'alias') - { - $bk->cur_alias->clean(); +dcCore::app()->addBehavior('importInitV2', function ($bk) { + $bk->cur_alias = dcCore::app()->con->openCursor(dcCore::app()->prefix . 'alias'); + $bk->alias = new dcAliases(); + $bk->aliases = $bk->alias->getAliases(); +}); - $bk->cur_alias->blog_id = (string) $line->blog_id; - $bk->cur_alias->alias_url = (string) $line->alias_url; - $bk->cur_alias->alias_destination = (string) $line->alias_destination; - $bk->cur_alias->alias_position = (integer) $line->alias_position; +dcCore::app()->addBehavior('importFullV2', function ($line, $bk) { + if ($line->__name == 'alias') { + $bk->cur_alias->clean(); - $bk->cur_alias->insert(); - } - } + $bk->cur_alias->blog_id = (string) $line->blog_id; + $bk->cur_alias->alias_url = (string) $line->alias_url; + $bk->cur_alias->alias_destination = (string) $line->alias_destination; + $bk->cur_alias->alias_position = (int) $line->alias_position; - public static function importSingle($line,$bk,$core) - { - if ($line->__name == 'alias') - { - $found = false; - foreach ($bk->aliases as $v) - { - if ($v['alias_url'] == $line->alias_url) { - $found = true; - } - } - if ($found) { - $bk->alias->deleteAlias($line->alias_url); - } - $bk->alias->createAlias($line->alias_url,$line->alias_destination,$line->alias_position); - } - } -} + $bk->cur_alias->insert(); + } +}); -?> +dcCore::app()->addBehavior('importSingleV2', function ($line, $bk) { + if ($line->__name == 'alias') { + $found = false; + foreach ($bk->aliases as $v) { + if ($v['alias_url'] == $line->alias_url) { + $found = true; + } + } + if ($found) { + $bk->alias->deleteAlias($line->alias_url); + } + $bk->alias->createAlias($line->alias_url, $line->alias_destination, $line->alias_position); + } +}); diff --git a/_define.php b/_define.php index d6f3f05..ac6e56b 100644 --- a/_define.php +++ b/_define.php @@ -1,21 +1,30 @@ registerModule( - /* Name */ "alias", - /* Description*/ "Create aliases of your blog's URLs", - /* Author */ "Olivier Meunier and contributors", - /* Version */ '1.2.1', - /* Permissions */ 'admin' + 'alias', + "Create aliases of your blog's URLs", + 'Olivier Meunier and contributors', + '1.3-dev', + [ + 'requires' => [['core', '2.24']], + 'permissions' => dcAuth::PERMISSION_ADMIN, + 'type' => 'plugin', + 'support' => 'https://github.com/JcDenis/alias', + 'details' => 'https://plugins.dotaddict.org/dc2/details/alias', + 'repository' => 'https://raw.githubusercontent.com/JcDenis/alias/master/dcstore.xml', + ] ); -?> diff --git a/_install.php b/_install.php index b5c6591..b9dc113 100644 --- a/_install.php +++ b/_install.php @@ -1,44 +1,51 @@ plugins->moduleInfo('alias','version'); - -if (version_compare($core->getVersion('alias'),$version,'>=')) { - return; +/** + * @brief alias, a plugin for Dotclear 2 + * + * @package Dotclear + * @subpackage Plugin + * + * @author Olivier Meunier and contributors + * + * @copyright Jean-Crhistian 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); +$version = dcCore::app()->plugins->moduleInfo('alias', 'version'); -$s->alias - ->blog_id('varchar',32,false) - ->alias_url('varchar',255,false) - ->alias_destination('varchar',255,false) - ->alias_position('smallint',0,false,1) - - ->primary('pk_alias','blog_id','alias_url') - - ->index('idx_alias_blog_id','btree','blog_id') - ->index('idx_alias_blog_id_alias_position','btree','blog_id','alias_position') - - ->reference('fk_alias_blog','blog_id','blog','blog_id','cascade','cascade') - ; +if (version_compare(dcCore::app()->getVersion('alias'), $version, '>=')) { + return null; +} -# Schema installation -$si = new dbStruct($core->con,$core->prefix); -$changes = $si->synchronize($s); +try { + $s = new dbStruct(dcCore::app()->con, dcCore::app()->prefix); -$core->setVersion('alias',$version); -return true; -?> \ No newline at end of file + $s->alias + ->blog_id('varchar', 32, false) + ->alias_url('varchar', 255, false) + ->alias_destination('varchar', 255, false) + ->alias_position('smallint', 0, false, 1) + + ->primary('pk_alias', 'blog_id', 'alias_url') + + ->index('idx_alias_blog_id', 'btree', 'blog_id') + ->index('idx_alias_blog_id_alias_position', 'btree', 'blog_id', 'alias_position') + + ->reference('fk_alias_blog', 'blog_id', 'blog', 'blog_id', 'cascade', 'cascade') + ; + + # Schema installation + $si = new dbStruct(dcCore::app()->con, dcCore::app()->prefix); + $changes = $si->synchronize($s); + + dcCore::app()->setVersion('alias', $version); + + return true; +} catch (Exception $e) { + dcCore::app()->error->add($e->getMessage()); +} + +return false; diff --git a/_prepend.php b/_prepend.php index 7fc495d..fa8f22f 100644 --- a/_prepend.php +++ b/_prepend.php @@ -1,15 +1,17 @@ +Clearbricks::lib()->autoload(['dcAliases' => __DIR__ . '/inc/class.dc.aliases.php']); diff --git a/_public.php b/_public.php index 3ddf316..09af15e 100644 --- a/_public.php +++ b/_public.php @@ -1,51 +1,52 @@ url->register('alias','','^(.*)$',array('urlAlias','alias')); +dcCore::app()->url->register('alias', '', '^(.*)$', ['urlAlias','alias']); class urlAlias extends dcUrlHandlers { - public static function alias($args) - { - $o = new dcAliases($GLOBALS['core']); - $aliases = $o->getAliases(); - - foreach ($aliases as $v) - { - if (@preg_match('#^/.*/$#',$v['alias_url']) && @preg_match($v['alias_url'],$args)) { - self::callAliasHandler(preg_replace($v['alias_url'],$v['alias_destination'],$args)); - return; - } elseif ($v['alias_url'] == $args) { - self::callAliasHandler($v['alias_destination']); - return; - } - } - - self::callAliasHandler($args); - } - - public function callAliasHandler($part) - { - global $core; - $core->url->unregister('alias'); - $core->url->getArgs($part,$type,$args); - - global $core; - if (!$type) { - $core->url->callDefaultHandler($args); - } else { - $core->url->callHandler($type,$args); - } - } + public static function alias($args) + { + $o = new dcAliases(); + $aliases = $o->getAliases(); + + foreach ($aliases as $v) { + if (@preg_match('#^/.*/$#', $v['alias_url']) && @preg_match($v['alias_url'], $args)) { + self::callAliasHandler(preg_replace($v['alias_url'], $v['alias_destination'], $args)); + + return; + } elseif ($v['alias_url'] == $args) { + self::callAliasHandler($v['alias_destination']); + + return; + } + } + + self::callAliasHandler($args); + } + + public static function callAliasHandler($part) + { + dcCore::app()->url->unregister('alias'); + dcCore::app()->url->getArgs($part, $type, $args); + + if (!$type) { + dcCore::app()->url->callDefaultHandler($args); + } else { + dcCore::app()->url->callHandler($type, $args); + } + } } -?> diff --git a/dcstore.xml b/dcstore.xml new file mode 100644 index 0000000..d1a52bb --- /dev/null +++ b/dcstore.xml @@ -0,0 +1,13 @@ + + + + alias + 1.3-dev + Olivier Meunier and contributors + Create aliases of your blog's URLs + https://github.com/JcDenis/alias/releases/download/v1.3-dev/plugin-alias.zip + 2.24 + https://plugins.dotaddict.org/dc2/details/alias + https://github.com/JcDenis/alias + + diff --git a/inc/class.dc.aliases.php b/inc/class.dc.aliases.php index 87e0d6f..e266b5d 100644 --- a/inc/class.dc.aliases.php +++ b/inc/class.dc.aliases.php @@ -1,111 +1,113 @@ core =& $core; - } - - public function getAliases() - { - if (is_array($this->aliases)) { - return $this->aliases; - } - - $this->aliases = array(); - $sql = 'SELECT alias_url, alias_destination, alias_position '. - 'FROM '.$this->core->prefix.'alias '. - "WHERE blog_id = '".$this->core->con->escape($this->core->blog->id)."' ". - 'ORDER BY alias_position ASC '; - $this->aliases = $this->core->con->select($sql)->rows(); - return $this->aliases; - } - - public function updateAliases($aliases) - { - usort($aliases,array($this,'sortCallback')); - foreach ($aliases as $v) { - if (!isset($v['alias_url']) || !isset($v['alias_destination'])) { - throw new Exception(__('Invalid aliases definitions')); - } - } - - $this->core->con->begin(); - try - { - $this->deleteAliases(); - foreach ($aliases as $k => $v) - { - if (!empty($v['alias_url']) && !empty($v['alias_destination'])) - { - $this->createAlias($v['alias_url'],$v['alias_destination'],$k+1); - } - } - - $this->core->con->commit(); - } - catch (Exception $e) - { - $this->core->con->rollback(); - throw $e; - } - } - - public function createAlias($url,$destination,$position) - { - if (!$url) { - throw new Exception(__('Alias URL is empty.')); - } - - if (!$destination) { - throw new Exception(__('Alias destination is empty.')); - } - - $cur = $this->core->con->openCursor($this->core->prefix.'alias'); - $cur->blog_id = (string) $this->core->blog->id; - $cur->alias_url = (string) $url; - $cur->alias_destination = (string) $destination; - $cur->alias_position = abs((integer) $position); - $cur->insert(); - } - - public function deleteAlias($url) - { - $this->core->con->execute( - 'DELETE FROM '.$this->core->prefix.'alias '. - "WHERE blog_id = '".$this->core->con->escape($this->core->blog->id)."' ". - "AND alias_url = '".$this->core->con->escape($url)."' " - ); - } + public const ALIAS_TABLE_NAME = 'alias'; - public function deleteAliases() - { - $this->core->con->execute( - 'DELETE FROM '.$this->core->prefix.'alias '. - "WHERE blog_id = '".$this->core->con->escape($this->core->blog->id)."' " - ); - } - - protected function sortCallback($a,$b) - { - if ($a['alias_position'] == $b['alias_position']) { - return 0; - } - return $a['alias_position'] < $b['alias_position'] ? -1 : 1; - } + protected $aliases; + + public function __construct() + { + } + + public function getAliases() + { + if (is_array($this->aliases)) { + return $this->aliases; + } + + $this->aliases = []; + $sql = 'SELECT alias_url, alias_destination, alias_position ' . + 'FROM ' . dcCore::app()->prefix . dcAliases::ALIAS_TABLE_NAME . ' ' . + "WHERE blog_id = '" . dcCore::app()->con->escape(dcCore::app()->blog->id) . "' " . + 'ORDER BY alias_position ASC '; + $this->aliases = dcCore::app()->con->select($sql)->rows(); + + return $this->aliases; + } + + public function updateAliases($aliases) + { + usort($aliases, [$this,'sortCallback']); + foreach ($aliases as $v) { + if (!isset($v['alias_url']) || !isset($v['alias_destination'])) { + throw new Exception(__('Invalid aliases definitions')); + } + } + + dcCore::app()->con->begin(); + + try { + $this->deleteAliases(); + foreach ($aliases as $k => $v) { + if (!empty($v['alias_url']) && !empty($v['alias_destination'])) { + $this->createAlias($v['alias_url'], $v['alias_destination'], $k + 1); + } + } + + dcCore::app()->con->commit(); + } catch (Exception $e) { + dcCore::app()->con->rollback(); + + throw $e; + } + } + + public function createAlias($url, $destination, $position) + { + if (!$url) { + throw new Exception(__('Alias URL is empty.')); + } + + if (!$destination) { + throw new Exception(__('Alias destination is empty.')); + } + + $cur = dcCore::app()->con->openCursor(dcCore::app()->prefix . dcAliases::ALIAS_TABLE_NAME); + $cur->blog_id = (string) dcCore::app()->blog->id; + $cur->alias_url = (string) $url; + $cur->alias_destination = (string) $destination; + $cur->alias_position = abs((int) $position); + $cur->insert(); + } + + public function deleteAlias($url) + { + dcCore::app()->con->execute( + 'DELETE FROM ' . dcCore::app()->prefix . dcAliases::ALIAS_TABLE_NAME . ' ' . + "WHERE blog_id = '" . dcCore::app()->con->escape(dcCore::app()->blog->id) . "' " . + "AND alias_url = '" . dcCore::app()->con->escape($url) . "' " + ); + } + + public function deleteAliases() + { + dcCore::app()->con->execute( + 'DELETE FROM ' . dcCore::app()->prefix . dcAliases::ALIAS_TABLE_NAME . ' ' . + "WHERE blog_id = '" . dcCore::app()->con->escape(dcCore::app()->blog->id) . "' " + ); + } + + protected function sortCallback($a, $b) + { + if ($a['alias_position'] == $b['alias_position']) { + return 0; + } + + return $a['alias_position'] < $b['alias_position'] ? -1 : 1; + } } -?> diff --git a/index.php b/index.php index 4c1000e..de39d22 100644 --- a/index.php +++ b/index.php @@ -1,38 +1,42 @@ getAliases(); # 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']); + http::redirect(dcCore::app()->admin->getPageURL() . '&up=1'); + } catch (Exception $e) { + dcCore::app()->error->add($e->getMessage()); + } } # New alias -if (isset($_POST['alias_url'])) -{ - try { - $o->createAlias($_POST['alias_url'],$_POST['alias_destination'],count($aliases)+1); - http::redirect($p_url.'&created=1'); - } catch (Exception $e) { - $core->error->add($e->getMessage()); - } +if (isset($_POST['alias_url'])) { + try { + $o->createAlias($_POST['alias_url'], $_POST['alias_destination'], count($aliases) + 1); + http::redirect(dcCore::app()->admin->getPageURL() . '&created=1'); + } catch (Exception $e) { + dcCore::app()->error->add($e->getMessage()); + } } ?> @@ -43,46 +47,42 @@ if (isset($_POST['alias_url'])) '.html::escapeHTML($core->blog->name).' › '.__('Aliases').''. -'

'.__('Aliases list').'

'; +'

' . html::escapeHTML(dcCore::app()->blog->name) . ' › ' . __('Aliases') . '

' . +'

' . __('Aliases list') . '

'; -if (empty($aliases)) -{ - echo '

'.__('No alias').'

'; -} -else -{ - echo - '
'. - ''. - ''. - ''. - ''. - ''; - - foreach ($aliases as $k => $v) - { - echo - ''. - ''. - ''. - ''. - ''; - } - - echo '
'.__('Alias URL').''.__('Alias destination').''.__('Alias position').'
'.form::field(array('a['.$k.'][alias_url]'),30,255,html::escapeHTML($v['alias_url'])).''.form::field(array('a['.$k.'][alias_destination]'),50,255,html::escapeHTML($v['alias_destination'])).''.form::field(array('a['.$k.'][alias_position]'),3,5,html::escapeHTML($v['alias_position'])).'
'. - '

'.__('To remove an alias, empty its URL or destination.').'

'. - '

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

'. - '
'; +if (empty($aliases)) { + echo '

' . __('No alias') . '

'; +} else { + echo + '
' . + '' . + '' . + '' . + '' . + ''; + + foreach ($aliases as $k => $v) { + echo + '' . + '' . + '' . + '' . + ''; + } + + echo '
' . __('Alias URL') . '' . __('Alias destination') . '' . __('Alias position') . '
' . form::field(['a[' . $k . '][alias_url]'], 30, 255, html::escapeHTML($v['alias_url'])) . '' . form::field(['a[' . $k . '][alias_destination]'], 50, 255, html::escapeHTML($v['alias_destination'])) . '' . form::field(['a[' . $k . '][alias_position]'], 3, 5, html::escapeHTML($v['alias_position'])) . '
' . + '

' . __('To remove an alias, empty its URL or destination.') . '

' . + '

' . dcCore::app()->formNonce() . + '

' . + '
'; } echo -'

'.__('New alias').'

'. -'
'. -'

'. -'

'. -'

'.$core->formNonce().'

'. +'

' . __('New alias') . '

' . +'' . +'

' . +'

' . +'

' . dcCore::app()->formNonce() . '

' . '
'; dcPage::helpBlock('alias'); diff --git a/locales/en/resources.php b/locales/en/resources.php new file mode 100644 index 0000000..01f7399 --- /dev/null +++ b/locales/en/resources.php @@ -0,0 +1,17 @@ +resources['help']['alias'] = __DIR__ . '/help/help.html'; diff --git a/locales/fr/main.lang.php b/locales/fr/main.lang.php index 79d87dd..8d5eb26 100644 --- a/locales/fr/main.lang.php +++ b/locales/fr/main.lang.php @@ -1,4 +1,15 @@ \ No newline at end of file +$GLOBALS['__l10n']['Update'] = 'Mettre à jour'; +$GLOBALS['__l10n']['New alias'] = 'Nouvel alias'; +$GLOBALS['__l10n']['Alias URL:'] = 'URL de l\'alias :'; +$GLOBALS['__l10n']['Alias destination:'] = 'Destination de l\'alias :'; diff --git a/locales/fr/resources.php b/locales/fr/resources.php new file mode 100644 index 0000000..01f7399 --- /dev/null +++ b/locales/fr/resources.php @@ -0,0 +1,17 @@ +resources['help']['alias'] = __DIR__ . '/help/help.html';