From cb17ba5e647f79bc0847ae4d9e22072bb6c0a931 Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Sun, 27 Nov 2022 21:22:12 +0100 Subject: [PATCH] update to dotclear 2.24 and some enhancement --- CHANGELOG.md | 5 + LICENSE | 339 ++++++++++++++++++++++++++++++++++++++ README.md | 43 +++++ _admin.php | 76 +++++++-- _define.php | 43 +++-- _prepend.php | 29 ++-- dcstore.xml | 13 ++ icon.png | Bin 525 -> 0 bytes icon.svg | 7 + inc/class.dc.log.list.php | 211 ++++++++++++------------ index.php | 206 ++++++++++------------- js/dclog.js | 17 +- locales/fr/main.po | 86 +++++----- 13 files changed, 751 insertions(+), 324 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 LICENSE create mode 100644 README.md create mode 100644 dcstore.xml delete mode 100644 icon.png create mode 100644 icon.svg diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..161139a --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,5 @@ +1.1 - 2022.11.27 +- Required Dotclear 2.24 +- Enhance list filters +- Add user pref columns +- Use SVG icon \ 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..bfbf915 --- /dev/null +++ b/README.md @@ -0,0 +1,43 @@ +# README + +[![Release](https://img.shields.io/github/v/release/JcDenis/dcLog)](https://github.com/JcDenis/dcLog/releases) +[![Date](https://img.shields.io/github/release-date/JcDenis/dcLog)](https://github.com/JcDenis/dcLog/releases) +[![Issues](https://img.shields.io/github/issues/JcDenis/dcLog)](https://github.com/JcDenis/dcLog/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/dcLog) +[![License](https://img.shields.io/github/license/JcDenis/dcLog)](https://github.com/JcDenis/dcLog/blob/master/LICENSE) + +## WHAT IS DCLOG ? + +_dcLog_ is a plugin for the open-source +web publishing software called Dotclear. + +Display dotclear's logs. + +## REQUIREMENTS + + _dcLog_ requires: + + * Dotclear 2.24 + * super admin permission + +## USAGE + +First install _dcLog_, manualy from a zip package or from +Dotaddict repository. (See Dotclear's documentation to know how do this) + +Once it's done you can manage your logs from menu +''Log'' on sidebar or you can add dashboard icon. + +## LINKS + + * License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html) + * Source & contribution : [GitHub Page](https://github.com/JcDenis/dcLog) + * Packages & details: [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/dcLog) + +## CONTRIBUTORS + + * Tomtom + * 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 600147b..7213954 100644 --- a/_admin.php +++ b/_admin.php @@ -1,18 +1,64 @@ addItem(__('Log'),'plugin.php?p=dcLog','index.php?pf=dcLog/icon.png', - preg_match('/plugin.php\?p=dcLog(&.*)?$/',$_SERVER['REQUEST_URI']), - $core->auth->isSuperAdmin()); +dcCore::app()->menu[dcAdmin::MENU_SYSTEM]->addItem( + __('Log'), + dcCore::app()->adminurl->get('admin.plugin.dcLog'), + dcPage::getPF('dcLog/icon.svg'), + preg_match('/' . preg_quote(dcCore::app()->adminurl->get('admin.plugin.dcLog')) . '(&.*)?$/', $_SERVER['REQUEST_URI']), + dcCore::app()->auth->isSuperAdmin() +); -?> \ No newline at end of file +dcCore::app()->addBehavior('adminColumnsListsV2', function (ArrayObject $cols) { + $cols['dcloglist'] = [ + __('Log'), + [ + 'date' => [true, __('Date')], + //'msg' => [true, __('Message')], + 'blog' => [true, __('Blog')], + 'table' => [true, __('Component')], + 'user' => [true, __('User')], + 'ip' => [false, __('IP')], + ], + ]; +}); + +dcCore::app()->addBehavior('adminFiltersListsV2', function (ArrayObject $sorts) { + $sorts['dcloglist'] = [ + __('Log'), + [ + __('Date') => 'log_dt', + __('Message') => 'log_msg', + __('Blog') => 'blog_id', + __('Component') => 'log_table', + __('User') => 'user_id', + __('IP') => 'log_ip', + ], + 'log_dt', + 'desc', + [__('Logs per page'), 30], + ]; +}); + +dcCore::app()->addBehavior('adminDashboardFavoritesV2', function (dcFavorites $favs) { + $favs->register('dcloglist', [ + 'title' => __('Log'), + 'url' => dcCore::app()->adminurl->get('admin.plugin.dcLog'), + 'small-icon' => dcPage::getPF('dcLog/icon.svg'), + 'large-icon' => dcPage::getPF('dcLog/icon.svg'), + 'permissions' => null, + ]); +}); diff --git a/_define.php b/_define.php index 0b30694..5448c04 100644 --- a/_define.php +++ b/_define.php @@ -1,21 +1,30 @@ registerModule( - /* Name */ "dcLog", - /* Description*/ "Displays Dotclear logs", - /* Author */ "Tomtom (http://blog.zenstyle.fr)", - /* Version */ '1.0.1' + 'dcLog', + 'Displays Dotclear logs', + 'Tomtom (http://blog.zenstyle.fr) and Contributors', + '1.1', + [ + 'requires' => [['core', '2.24']], + 'permissions' => null, + 'type' => 'plugin', + 'support' => 'https://github.com/JcDenis/dcLog', + 'details' => 'https://plugins.dotaddict.org/dc2/details/dcLog', + 'repository' => 'https://raw.githubusercontent.com/JcDenis/dcLog/master/dcstore.xml', + ] ); - -?> \ No newline at end of file diff --git a/_prepend.php b/_prepend.php index 721ce18..b579577 100644 --- a/_prepend.php +++ b/_prepend.php @@ -1,16 +1,17 @@ \ No newline at end of file +Clearbricks::lib()->autoload(['dcLogList' => __DIR__ . '/inc/class.dc.log.list.php']); diff --git a/dcstore.xml b/dcstore.xml new file mode 100644 index 0000000..0a9a98e --- /dev/null +++ b/dcstore.xml @@ -0,0 +1,13 @@ + + + + dcLog + 1.1 + Tomtom (http://blog.zenstyle.fr) and Contributors + Displays Dotclear logs + https://github.com/JcDenis/dcLog/releases/download/v1.1/plugin-dcLog.zip + 2.24 + https://plugins.dotaddict.org/dc2/details/dcLog + https://github.com/JcDenis/dcLog + + diff --git a/icon.png b/icon.png deleted file mode 100644 index b3d8ce01e2e9c5a6ce83c3b6d7715cbb2b9d3fb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 525 zcmV+o0`mQdP)>Z+sNt2+U0SgfoD!Wm8sxbT>nyV*Byc6US+Mev^`pI%-cR#%pfrES|$2%tg@7${Im zLBJqCKm^~%kqyWahMtFC{m)BDn@^W+n<9Vs4o8^{xZi&Mv#JmPg~hDhyn9@iQaYl1 zb`JLD2V96U6l8WL=?n97fC_~~t>ED5npj0DEXy*Oju~q^dmy7QgiIy_{eJ&PQrd=O zTr3tLpD%!=R5+2n4HYIFZ-%8JGt|1(g~rh-D=YFj+Az zW(A5Kmc(%jan)&(SOLdLpDi*0KTl?3g3&8WuNWgH;XS@00@rm1q##!+l~R*`BVp_N zo+o>~-p$tT{t5Bs0?k82!-S(@;vSVo<7@Jfu3S^qP;(9ryrKIh{yWa!k>a)0QvY16 P00000NkvXXu0mjf=yc!b diff --git a/icon.svg b/icon.svg new file mode 100644 index 0000000..4920c02 --- /dev/null +++ b/icon.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.onlinewebfonts.com/icon + + \ No newline at end of file diff --git a/inc/class.dc.log.list.php b/inc/class.dc.log.list.php index 7fc8657..95baf32 100644 --- a/inc/class.dc.log.list.php +++ b/inc/class.dc.log.list.php @@ -1,110 +1,107 @@ rs->isEmpty()) { - $pager = new pager($page,$this->rs_count,$nb_per_page,10); - $pager->var_page = 'page'; - - echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; - - $blocks = explode('%s',$html_block); - - echo $blocks[0]; - - echo - ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''; - - $this->rs->index(((integer)$page - 1) * $nb_per_page); - $iter = 0; - while ($iter < $nb_per_page) { - $this->logLine(); - - if ($this->rs->isEnd()) { - break; - } - else { - $this->rs->moveNext(); - $iter++; - } - } - - echo - ''. - '
'.__('Date').''.__('Message').''.__('Blog').''.__('Component').''.__('User').''.__('IP').'
'; - - echo $blocks[1]; - - echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; - } - else { - echo '

'.__('No log').'

'; - } - } - - private function logLine() - { - $format = $this->core->blog->settings->system->date_format.' - '.$this->core->blog->settings->system->time_format; - - $tz = dt::getTimeOffset($this->core->blog->settings->system->blog_timezone); - - $date = dt::str($format,strtotime($this->rs->log_dt) + $tz); - - echo - ''."\n". - ''. - form::checkbox(array('ids[]'),$this->rs->log_id). - ' '.html::escapeHTML($date). - "\n". - ''. - html::escapeHTML($this->rs->log_msg). - "\n". - ''. - html::escapeHTML($this->rs->blog_id). - "\n". - ''. - html::escapeHTML($this->rs->log_table). - "\n". - ''. - html::escapeHTML($this->rs->getUserCN()). - "\n". - ''. - html::escapeHTML($this->rs->log_ip). - "\n". - "\n"; - } +/** + * @brief dcLog, a plugin for Dotclear 2 + * + * @package Dotclear + * @subpackage Plugin + * + * @author Tomtom (http://blog.zenstyle.fr) and Contributors + * + * @copyright Jean-Crhistian Denis + * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html + */ +if (!defined('DC_RC_PATH')) { + return null; } -?> \ No newline at end of file +class dcLogList extends adminGenericListV2 +{ + public function display($page, $nb_per_page, $enclose_block = '', $filter = false) + { + if ($this->rs->isEmpty()) { + if ($filter) { + echo '

' . __('No log matches the filter') . '

'; + } else { + echo '

' . __('No log') . '

'; + } + } else { + $pager = new dcPager($page, $this->rs_count, $nb_per_page, 10); + $entries = []; + if (isset($_REQUEST['entries'])) { + foreach ($_REQUEST['entries'] as $v) { + $entries[(int) $v] = true; + } + } + + $cols = [ + 'date' => '' . __('Date') . '', + 'msg' => '' . __('Message') . '', + 'blog' => '' . __('Blog') . '', + 'table' => '' . __('Component') . '', + 'user' => '' . __('User') . '', + 'ip' => '' . __('IP') . '', + ]; + $cols = new ArrayObject($cols); + $this->userColumns('dcloglist', $cols); + + $html_block = '
' . + ''; + + if ($filter) { + $html_block .= ''; + } + + $html_block .= '' . implode(iterator_to_array($cols)) . '%s
' . sprintf(__('List of %s logs matching the filter.'), $this->rs_count) . '
%s
'; + if ($enclose_block) { + $html_block = sprintf($enclose_block, $html_block); + } + + $blocks = explode('%s', $html_block); + + echo $pager->getLinks() . $blocks[0]; + + while ($this->rs->fetch()) { + $this->logLine(isset($entries[$this->rs->log_id])); + } + + echo $blocks[1] . $blocks[2] . $pager->getLinks(); + } + } + + private function logLine($checked) + { + $cols = [ + 'check' => '' . + form::checkbox(['entries[]'], $this->rs->log_id, ['checked' => $checked]) . + '', + 'date' => '' . + html::escapeHTML(dt::dt2str( + __('%Y-%m-%d %H:%M'), + $this->rs->log_dt + )) . + '', + 'msg' => '' . + nl2br(html::escapeHTML($this->rs->log_msg)) . + '', + 'blog' => '' . + html::escapeHTML($this->rs->blog_id) . + '', + 'table' => '' . + html::escapeHTML($this->rs->log_table) . + '', + 'user' => '' . + html::escapeHTML($this->rs->getUserCN()) . + '', + 'ip' => '' . + html::escapeHTML($this->rs->log_ip) . + '', + ]; + $cols = new ArrayObject($cols); + $this->userColumns('dcloglist', $cols); + + echo + '' . + implode(iterator_to_array($cols)) . + ''; + } +} diff --git a/index.php b/index.php index f19cd70..0bca535 100644 --- a/index.php +++ b/index.php @@ -1,138 +1,102 @@ auth->isSuperAdmin()) { return; } +if (!dcCore::app()->auth->isSuperAdmin()) { + return null; +} -# Var initialisation -$p_url = 'plugin.php?p=dcLog'; -$page = isset($_GET['page']) ? $_GET['page'] : 1; -$status = isset($_GET['status']) ? $_GET['status'] : null; -# filter initialisation -$blog_id = isset($_GET['blog_id']) ? $_GET['blog_id'] : null; -$user_id = isset($_GET['user_id']) ? $_GET['user_id'] : null; -$table = isset($_GET['table']) ? $_GET['table'] : null; -$ip = isset($_GET['ip']) ? $_GET['ip'] : null; -$nb = isset($_GET['nb']) ? $_GET['nb'] : 20; -# form initialisation -$ids = isset($_POST['ids']) ? $_POST['ids'] : null; -$del_all_log = isset($_POST['del_all_logs']) ? true : false; +$entries = $_POST['entries'] ?? null; +$del_all_log = isset($_POST['del_all_logs']) ? true : false; # Delete logs -if (isset($_POST['del_logs']) || isset($_POST['del_all_logs'])) -{ - try { - $core->log->delLogs($ids,$del_all_log); - $status = $del_all_log ? '2' : '1'; - http::redirect($p_url.'&del='.$status); - } - catch (Exception $e) { - $core->error->add($e->getMessage()); - } +if (isset($_POST['del_logs']) || isset($_POST['del_all_logs'])) { + try { + dcCore::app()->log->delLogs($entries, $del_all_log); + dcAdminNotices::addSuccessNotice( + $del_all_log ? + __('All logs have been successfully deleted') : + __('Selected logs have been successfully deleted') + ); + dcCore::app()->adminurl->redirect('admin.plugin.dcLog'); + } catch (Exception $e) { + dcCore::app()->error->add($e->getMessage()); + } } -# Gets logs & prepares display object -$params = array( - 'blog_id' => $blog_id, - 'user_id' => !is_null($user_id) && $user_id !== '' ? explode(',',$user_id) : $user_id, - 'log_table' => !is_null($table) && $table !== '' ? explode(',',$table) : $table, - 'log_ip' => !is_null($ip) && $ip !== '' ? explode(',',$ip) : $ip -); -$l_rs = $core->log->getLogs($params); -$l_nb = $l_rs->count(); -$l_list = new dcLogList($core,$l_rs,$l_nb); +$filter = new adminGenericFilterV2('dcloglist'); +$filter->add(dcAdminFilters::getPageFilter()); +$filter->add(dcAdminFilters::getInputFilter('blog_id', __('Blog:'))); +$filter->add(dcAdminFilters::getInputFilter('user_id', __('User:'))); +$filter->add(dcAdminFilters::getInputFilter('log_table', __('Component:'))); +$filter->add(dcAdminFilters::getInputFilter('log_ip', __('IP:'))); +$params = $filter->params(); -# Display -echo -''. -''. - ''.__('Log').''. - dcPage::jsLoad('js/filter-controls.js'). - dcPage::jsLoad('index.php?pf=dcLog/js/dclog.js'). - ''. -''."\n". -''; - -# Message -if (isset($_GET['del'])) { - $msg = ''; - - if ((integer) $_GET['del'] === 1) { - $msg = __('Selected logs have been successfully deleted'); - } - if ((integer) $_GET['del'] === 2) { - $msg = __('All logs have been successfully deleted'); - } - - echo !empty($msg) ? '

'.$msg.'

' : ''; -} - -# Combo blog -$combo_blog = array(__('All blogs') => 'all'); -$blogs = $core->getBlogs(); -while ($blogs->fetch()) { - $combo_blog[sprintf('%s (%s)',$blogs->blog_name,$blogs->blog_id)] = $blogs->blog_id; +try { + $logs = dcCore::app()->log->getLogs($params); + $logs_counter = $logs->count(); + $logs_list = new dcLogList($logs, $logs_counter); +} catch (Exception $e) { + dcCore::app()->error->add($e->getMessage()); } echo -'

'.html::escapeHTML($core->blog->name).' › '.__('Log').'

'. -'

'. -__('Filters').'

'. -'
'. - form::hidden('p','dcLog'). - '
'.__('Filters').''. - '
'. - '

'. - '

'. - '

 '. - '

'. - '
'. - '

'. - '

'. - '
'. - '
'. //Opera sucks - '
'. -'
'; +'' . __('Log') . '' . +dcPage::jsJson('dclog_list', [ + 'confirm_delete_selected_log' => __('Are you sure you want to delete selected logs?'), + 'confirm_delete_all_log' => __('Are you sure you want to delete all logs?'), +]) . +$filter->js(dcCore::app()->adminurl->get('admin.plugin.dcLog')) . +dcPage::jsLoad(dcPage::getPF('dcLog/js/dclog.js')) . +'' . +dcPage::breadcrumb([ + __('System') => '', + __('Log') => dcCore::app()->adminurl->get('admin.plugin.dcLog'), +]) . +dcPage::notices(); -$l_list->display($page,$nb, - '
'. +if (isset($logs) && isset($logs_list)) { + if ($logs->isEmpty() && !$filter->show()) { + echo '

' . __('There are no logs') . '

'; + } else { + $filter->display( + 'admin.plugin.dcLog', + form::hidden('p', 'dcLog') + ); + $logs_list->display( + $filter->__get('page'), + $filter->__get('nb'), + '' . - '%s'. + '%s' . - '
'. - '

'. + '
' . + '

' . - '

 '. - '

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

' . + ' ' . + '' . + '

' . -echo -''. -''; + dcCore::app()->adminurl->getHiddenFormFields('admin.plugin.dcLog', $filter->values()) . + dcCore::app()->formNonce() . + '
' . + '', + $filter->show() + ); + } +} -?> \ No newline at end of file +echo ''; diff --git a/js/dclog.js b/js/dclog.js index 29be3a1..c74be5a 100644 --- a/js/dclog.js +++ b/js/dclog.js @@ -1 +1,16 @@ -$(function(){$('.checkboxes-helpers').each(function(){dotclear.checkboxesHelpers(this)});$('input[name="del_logs"]').click(function(){return window.confirm(dotclear.msg.confirm_delete_selected_log)});$('input[name="del_all_logs"]').click(function(){return window.confirm(dotclear.msg.confirm_delete_all_log)})}) \ No newline at end of file +/*global $, dotclear */ +'use strict'; + +Object.assign(dotclear.msg, dotclear.getData('dclog_list')); + +$(function(){ + $('.checkboxes-helpers').each(function(){ + dotclear.checkboxesHelpers(this) + }); + $('input[name="del_logs"]').click(function(){ + return window.confirm(dotclear.msg.confirm_delete_selected_log) + }); + $('input[name="del_all_logs"]').click(function(){ + return window.confirm(dotclear.msg.confirm_delete_all_log) + }) +}) \ No newline at end of file diff --git a/locales/fr/main.po b/locales/fr/main.po index f30f71b..c26fd68 100644 --- a/locales/fr/main.po +++ b/locales/fr/main.po @@ -1,78 +1,66 @@ -# Language: français -# Module: dcLog - 1.0 -# Date: 2010-05-08 09:25:09 -# Translated with translater 1.3 - msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: dcLog 1.0\n" +"Project-Id-Version: dcLog 1.1\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2010-05-08T09:25:09+00:00\n" -"Last-Translator: Thomas Bouron\n" +"PO-Revision-Date: 2022-11-27T20:16:51+00:00\n" +"Last-Translator: Jean-Crhistian 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:14 -#: index.php:54 -#: index.php:88 msgid "Log" msgstr "Log" -#: inc/class.dc.log.list.php:41 msgid "Message" msgstr "Message" -#: inc/class.dc.log.list.php:43 msgid "Component" msgstr "Composant" -#: inc/class.dc.log.list.php:44 msgid "User" msgstr "Utilisateur" -#: inc/class.dc.log.list.php:45 -msgid "IP" -msgstr "IP" - -#: inc/class.dc.log.list.php:73 -msgid "No log" -msgstr "Aucun log" - -#: index.php:59 -msgid "Are you sure you want to delete selected logs?" -msgstr "Êtes vous sur de vouloir supprimer les logs sélectionnés?" - -#: index.php:60 -msgid "Are you sure you want to delete all logs?" -msgstr "Êtes vous sur de vouloir supprimer tous les logs" - -#: index.php:71 -msgid "Selected logs have been successfully deleted" -msgstr "Les logs sélectionnés ont été supprimé avec succès" - -#: index.php:74 -msgid "All logs have been successfully deleted" -msgstr "Tous les logs ont été supprimé avec succès" - -#: index.php:81 -msgid "All blogs" -msgstr "Tous les blogs" - -#: index.php:100 -msgid "IP:" -msgstr "IP :" - -#: index.php:103 msgid "Logs per page" msgstr "Logs par page" -#: index.php:119 +msgid "No log matches the filter" +msgstr "Aucun log ne correspond au filtre" + +msgid "No log" +msgstr "Aucun log" + +msgid "List of %s logs matching the filter." +msgstr "Liste des %s logs correspondants au filtre." + +msgid "All logs have been successfully deleted" +msgstr "Tous les logs ont été supprimé avec succès" + +msgid "Selected logs have been successfully deleted" +msgstr "Les logs sélectionnés ont été supprimé avec succès" + +msgid "User:" +msgstr "Utilisateur :" + +msgid "Component:" +msgstr "Composant :" + +msgid "IP:" +msgstr "IP :" + +msgid "Are you sure you want to delete selected logs?" +msgstr "Êtes vous sur de vouloir supprimer les logs sélectionnés?" + +msgid "Are you sure you want to delete all logs?" +msgstr "Êtes vous sur de vouloir supprimer tous les logs" + +msgid "There are no logs" +msgstr "Il n'y a aucun log" + msgid "Delete selected logs" msgstr "Supprimer les logs sélectionnés" -#: index.php:120 msgid "Delete all logs" msgstr "Supprimer tous les logs"