From 4a3c6d969b86a83361255f835a44e4424ed94ba7 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Thu, 9 Sep 2021 00:12:14 +0200
Subject: [PATCH] rewrite admin page. second pass. links ok.

---
 _prepend.php                       |   7 +-
 inc/lib.cinecturlink2.list.php     | 180 +++++----
 index.php                          | 614 +++++++++++++++++++++++++++--
 js/{cinecturlink2.js => c2cats.js} |   0
 js/c2link.js                       |  34 ++
 js/c2links.js                      |  17 +
 6 files changed, 738 insertions(+), 114 deletions(-)
 rename js/{cinecturlink2.js => c2cats.js} (100%)
 create mode 100644 js/c2link.js
 create mode 100644 js/c2links.js

diff --git a/_prepend.php b/_prepend.php
index 1461fab..d664ea7 100644
--- a/_prepend.php
+++ b/_prepend.php
@@ -18,9 +18,10 @@ if (!defined('DC_RC_PATH')) {
 $d = dirname(__FILE__) . '/inc/';
 
 $__autoload['cinecturlink2'] = $d . 'class.cinecturlink2.php';
-$__autoload['cinecturlink2Context']    = $d . 'lib.cinecturlink2.context.php';
-$__autoload['sitemapsCinecturlink2']    = $d . 'lib.sitemaps.cinecturlink2.php';
-$__autoload['cinecturlink2ActivityReportBehaviors']    = $d . 'lib.cinecturlink2.activityreport.php';
+$__autoload['cinecturlink2Context'] = $d . 'lib.cinecturlink2.context.php';
+$__autoload['adminlistCinecturlink2'] = $d . 'lib.cinecturlink2.list.php';
+$__autoload['sitemapsCinecturlink2'] = $d . 'lib.sitemaps.cinecturlink2.php';
+$__autoload['cinecturlink2ActivityReportBehaviors'] = $d . 'lib.cinecturlink2.activityreport.php';
 
 $core->url->register(
     'cinecturlink2',
diff --git a/inc/lib.cinecturlink2.list.php b/inc/lib.cinecturlink2.list.php
index 193ecd3..0a1eb85 100644
--- a/inc/lib.cinecturlink2.list.php
+++ b/inc/lib.cinecturlink2.list.php
@@ -12,90 +12,128 @@
  */
 
 if (!defined('DC_CONTEXT_ADMIN')) {
-
     return null;
 }
 
-class adminlistCinecturlink2 extends adminGenericList
+class adminlistCinecturlink2
 {
-    public function display($page, $nb_per_page, $url)
-    {
-        if ($this->rs->isEmpty()) {
-            echo '<p><strong>'.__('There is no link').'</strong></p>';
-        }
-        else {
-            $pager = new pager($page, $this->rs_count, $nb_per_page,10);
+    public $redir = '';
 
-            $pager->base_url = $url;
+    protected $core;
+    protected $rs;
+    protected $rs_count;
+    protected $html_prev;
+    protected $html_next;
+
+    public function __construct(dcCore $core, $rs, $rs_count)
+    {
+        $this->core = &$core;
+        $this->rs = &$rs;
+        $this->rs_count = $rs_count;
+        $this->html_prev = __('&#171; prev.');
+        $this->html_next = __('next &#187;');
+    }
+
+    public function display($page, $nb_per_page, $enclose_block = '', $filter = false, $redir = '')
+    {
+        $this->redir = $redir;
+        if ($this->rs->isEmpty()) {
+            if ($filter) {
+                echo '<p><strong>' . __('No link matches the filter') . '</strong></p>';
+            } else {
+                echo '<p><strong>' . __('No link') . '</strong></p>';
+            }
+        } else {
+            $pager   = new dcPager($page, $this->rs_count, $nb_per_page, 10);
+            $links = [];
+            if (isset($_REQUEST['links'])) {
+                foreach ($_REQUEST['links'] as $v) {
+                    $links[(integer) $v] = true;
+                }
+            }
 
             $html_block =
-            '<table class="clear">'.
-            '<thead>'.
-            '<tr>'.
-            '<th class="nowrap" colspan="2">'.__('Title').'</th>'.
-            '<th class="nowrap">'.__('Author').'</th>'.
-            '<th class="maximal">'.__('Description').'</th>'.
-            '<th class="maximal">'.__('Links').'</th>'.
-            '<th class="nowrap">'.__('Category').'</th>'.
-            '<th class="nowrap">'.__('My rating').'</th>'.
-            '<th class="nowrap">'.__('Date').'</th>'.
-            '</tr>'.
-            '</thead>'.
-            '<tbody>%s</tbody>'.
-            '</table>';
+            '<div class="table-outer">' .
+            '<table>' .
+            '<caption>' . ($filter ? 
+                sprintf(__('List of %s links matching the filter.'), $this->rs_count) :
+                sprintf(__('List of links (%s)'), $this->rs_count)
+            ). '</caption>' .
+            '<thead>' .
+            '<tr>' .
+            '<th colspan="2" class="first">' . __('Title') . '</th>' .
+            '<th scope="col">' . __('Author') . '</th>' .
+            '<th scope="col">' . __('Description') . '</th>' .
+            '<th scope="col">' . __('Links') . '</th>' .
+            '<th scope="col">' . __('Category') . '</th>' .
+            '<th scope="col">' . __('Rating') . '</th>' .
+            '<th scope="col">' . __('Date') . '</th>' .
+            '</tr>' .
+            '</thead>' .
+            '<tbody>%s</tbody>' .
+            '</table>' .
+            '%s</div>';
 
-            echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-            $blocks = explode('%s',$html_block);
-            echo $blocks[0];
-
-            $this->rs->index(((integer)$page - 1) * $nb_per_page);
-            $iter = 0;
-            while ($iter < $nb_per_page) {
-                echo $this->linkLine($url,$iter);
-
-                if ($this->rs->isEnd())
-                    break;
-                else
-                    $this->rs->moveNext();
-
-                $iter++;
+            if ($enclose_block) {
+                $html_block = sprintf($enclose_block, $html_block);
             }
-            echo $blocks[1];
-            echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
+            $blocks = explode('%s', $html_block);
+
+            echo $pager->getLinks() . $blocks[0];
+
+            while ($this->rs->fetch()) {
+                echo $this->linkLine(isset($links[$this->rs->link_id]));
+            }
+
+            echo $blocks[1] . $blocks[2] . $pager->getLinks();
         }
     }
 
-    private function linkLine($url, $loop)
+    private function linkLine($checked)
     {
         return
-        '<tr class="line">'."\n".
-        '<td class="nowrap">'.
-            form::checkbox(array('links[]'), $this->rs->link_id, 0).
-        '</td>'.
-        '<td class="nowrap">'.
-        '<a href="plugin.php?p=cinecturlink2&amp;link_id='.$this->rs->link_id.'#newlink" title="'.__('Edit').'">'.
-        html::escapeHTML($this->rs->link_title).
-        '</a>'.
-        "</td>\n".
-        '<td class="nowrap">'.
-        html::escapeHTML($this->rs->link_author).
-        "</td>\n".
-        '<td class="maximal">'.
-        html::escapeHTML($this->rs->link_desc).
-        "</td>\n".
-        '<td class="nowrap">'.
-        '<a href="'.$this->rs->link_url.'" title="'.html::escapeHTML($this->rs->link_url).'">'.__('URL').'</a> '.
-        '<a href="'.$this->rs->link_img.'" title="'.html::escapeHTML($this->rs->link_img).'">'.__('image').'</a> '.
-        "</td>\n".
-        '<td class="nowrap">'.
-        html::escapeHTML($this->rs->cat_title).
-        "</td>\n".
-        '<td class="nowrap">'.
-        html::escapeHTML($this->rs->link_note).'/20'.
-        "</td>\n".
-        '<td class="nowrap">'.
-        dt::dt2str($GLOBALS['core']->blog->settings->system->date_format.', '.$GLOBALS['core']->blog->settings->system->time_format,$this->rs->link_upddt,$GLOBALS['core']->auth->getInfo('user_tz')).
-        "</td>\n".
-        '</tr>'."\n";
+        '<tr class="line">' .
+        '<td class="nowrap">' .
+            form::checkbox(['entries[]'], $this->rs->link_id, ['checked'  => $checked]) .
+        '</td>' .
+        '<td class="nowrap" scope="row">' .
+        '<a href="' . $this->core->adminurl->get(
+            'admin.plugin.cinecturlink2', 
+            ['part' => 'link', 'linkid' => $this->rs->link_id, 'redir' => $this->redir]
+        ) . '" title="' . __('Edit') . '">' .
+        html::escapeHTML($this->rs->link_title) . '</a>' .
+        '</td>' .
+        '<td class="nowrap">' .
+        html::escapeHTML($this->rs->link_author) .
+        '</td>' .
+        '<td class="maximal">' .
+        html::escapeHTML($this->rs->link_desc) .
+        '</td>' .
+        '<td class="nowrap">' .
+        '<a href="' . $this->rs->link_url . '" title="' . 
+            html::escapeHTML($this->rs->link_url) . 
+        '">' . __('URL') . '</a> ' .
+        '<a href="' . $this->rs->link_img . '" title="' . 
+            html::escapeHTML($this->rs->link_img) . 
+        '">' . __('image') . '</a> ' .
+        '</td>' .
+        '<td class="nowrap">' .
+        '<a href="' . $this->core->adminurl->get(
+            'admin.plugin.cinecturlink2', 
+            ['part' => 'cat', 'catid' => $this->rs->cat_id, 'redir' => $this->redir]
+        ) . '" title="' . __('Edit') . '">' .
+        html::escapeHTML($this->rs->cat_title) . '</a>' .
+        '</td>' .
+        '<td class="nowrap count">' .
+        html::escapeHTML($this->rs->link_note) . '/20' .
+        '</td>' .
+        '<td class="nowrap count">' .
+        dt::dt2str(
+            $this->core->blog->settings->system->date_format . ', ' . $this->core->blog->settings->system->time_format, 
+            $this->rs->link_upddt, 
+            $this->core->auth->getInfo('user_tz')
+        ) .
+        '</td>' .
+        '</tr>' . "\n";
     }
 }
\ No newline at end of file
diff --git a/index.php b/index.php
index a371946..8786108 100644
--- a/index.php
+++ b/index.php
@@ -17,39 +17,322 @@ if (!defined('DC_CONTEXT_ADMIN')) {
 
 dcPage::check('contentadmin');
 
-$C2 = new cinecturlink2($core);
-
+$linkid = $_REQUEST['linkid'] ?? '';
+$linktitle = $_POST['linktitle'] ?? '';
+$linkdesc = $_POST['linkdesc'] ?? '';
+$linkauthor = $_POST['linkauthor'] ?? '';
+$linkurl = $_POST['linkurl'] ?? '';
+$linkcat = $_POST['linkcat'] ?? null;
+$linklang = $_POST['linklang'] ?? $core->auth->getInfo('user_lang');
+$linkimage = $_POST['linkimage'] ?? '';
+$linknote = $_POST['linknote'] ?? '';
 $catid = $_REQUEST['catid'] ?? '';
 $cattitle = $_POST['cattitle'] ?? '';
 $catdesc = $_POST['catdesc'] ?? '';
-$part = $_REQUEST['part'] ?? '';
-if (!in_array($part, ['links', 'link', 'cats', 'cat'])) {
-    $part = 'links';
-}
+$redir = $_REQUEST['redir'] ?? '';
+$part = $_REQUEST['part'] ?? 'links';
+$entries = $_POST['entries'] ?? [];
 $headers = '';
-
-$categories = $C2->getCategories();
-
 $breadcrumb = [
     html::escapeHTML($core->blog->name) => '',
-    __('My cinecturlink') => $part != 'links' ? $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'links']) : ''
+    __('My cinecturlink') => $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'links'])
 ];
+if (!in_array($part, ['links', 'link', 'cats', 'cat', 'dellinks', 'updlinksnote', 'updlinkscat'])) {
+    $part = 'links';
+}
+if (!is_array($entries)) {
+    $entries == [];
+}
+
+try {
+    $C2 = new cinecturlink2($core);
+    $categories = $C2->getCategories();
+    $categories_combo = ['-' => ''];
+    while($categories->fetch()) {
+        $cat_title = html::escapeHTML($categories->cat_title);
+        $categories_combo[$cat_title] = $categories->cat_id;
+    }
+} catch (Exception $e) {
+    $core->error->add($e->getMessage());
+}
+
+if ($part == 'dellinks') {
+    try {
+        // delete group of links
+        if (!empty($entries)) {
+            foreach ($entries as $id) {
+                $C2->delLink($id);
+            }
+            dcPage::addSuccessNotice(
+                __('Links successfully deleted.')
+            );
+            $core->adminurl->redirect('admin.plugin.cinecturlink2', ['part' => 'links']);
+        }
+    } catch (Exception $e) {
+        $core->error->add($e->getMessage());
+    }
+    $breadcrumb[__('Delete links')] = '';
+}
+
+// get list of secleted links
+if (in_array($part, ['updlinksnote', 'updlinkscat'])) {
+    try {
+        $links = $C2->getLinks(['link_id' => $entries]);
+    } catch (Exception $e) {
+        $core->error->add($e->getMessage());
+    }
+}
+
+if ($part == 'updlinksnote') {
+    try {
+        // update group of links note
+        if (!empty($entries) && isset($_POST['newlinknote'])) {
+            while($links->fetch()) {
+                if (in_array($links->link_id, $entries)) {
+                    $cur = $core->con->openCursor($C2->table);
+                    $cur->link_note = (integer) $_POST['newlinknote'];
+                    $C2->updLink($links->link_id, $cur);
+                }
+            }
+            dcPage::addSuccessNotice(
+                __('Links successfully updated.')
+            );
+            if (!empty($_POST['redir'])) {
+                http::redirect($redir);
+            } else {
+                $core->adminurl->redirect('admin.plugin.cinecturlink2', ['part' => 'links']);
+            }
+        }
+    } catch (Exception $e) {
+        $core->error->add($e->getMessage());
+    }
+    $breadcrumb[__('Update links rating')] = '';
+}
+
+if ($part == 'updlinkscat') {
+    try {
+        // update group of links category
+        if (!empty($entries) && !empty($_POST['newcatid'])) {
+            while($links->fetch()) {
+                if (in_array($links->link_id, $entries)) {
+                    $cur = $core->con->openCursor($C2->table);
+                    $cur->cat_id = (integer) $_POST['newcatid'];
+                    $C2->updLink($links->link_id, $cur);
+                }
+            }
+            dcPage::addSuccessNotice(
+                __('Links successfully updated.')
+            );
+            if (!empty($_POST['redir'])) {
+                http::redirect($redir);
+            } else {
+                $core->adminurl->redirect('admin.plugin.cinecturlink2', ['part' => 'links']);
+            }
+        }
+    } catch (Exception $e) {
+        $core->error->add($e->getMessage());
+    }
+    $breadcrumb[__('Update links category')] = '';
+} 
+
+if ($part == 'links') {
+    $sortby_combo = [
+        __('Date') => 'link_upddt',
+        __('Title') => 'link_title',
+        __('Category') => 'cat_title',
+        __('Rating') => 'link_note',
+    ];
+    $order_combo = [
+        __('Descending') => 'desc',
+        __('Ascending') => 'asc'
+    ];
+    $action_combo = [
+        __('Delete') => 'dellinks',
+        __('Change category') => 'updlinkscat',
+        __('Change rating') => 'updlinksnote'
+    ];
+
+    $show_filters = false;
+    $page = !empty($_GET['page']) ? max(1, (integer) $_GET['page']) : 1;
+    $nb_per_page    = $core->auth->user_prefs->interface->nb_posts_per_page ?: 30;
+    $default_sortby = 'link_upddt';
+    $default_order  = 'desc';
+    $sortby = !empty($_GET['sortby']) ? $_GET['sortby'] : $default_sortby;
+    $order  = !empty($_GET['order']) ? $_GET['order'] : $default_order;
+
+    if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
+        if ($nb_per_page != (integer) $_GET['nb']) {
+            $show_filters = true;
+        }
+        $nb_per_page = (integer) $_GET['nb'];
+    }
+    if (!in_array($sortby, $sortby_combo)) {
+        $sortby = $default_sortby;
+    }
+    if (!in_array($order, $order_combo)) {
+        $order = $default_order;
+    }
+    if ($sortby != $default_sortby || $order != $default_order) {
+        $show_filters = true;
+    }
+
+    $params = [];
+    $params['link_type'] = 'cinecturlink';
+    $params['limit'] = [(($page - 1) * $nb_per_page), $nb_per_page];
+    $params['no_content'] = true;
+    $params['order'] = $sortby . ' ' . $order;
+
+    if ($catid !== '' && in_array($catid, $categories_combo)) {
+        $params['cat_id'] = $catid;
+        $show_filters     = true;
+    } else {
+        $catid = '';
+    }
+
+    $links_list = null;
+
+    try {
+        $links = $C2->getLinks($params);
+        $links_counter = $C2->getLinks($params,true)->f(0);
+        $links_list = new adminlistCinecturlink2($core, $links, $links_counter);
+    } catch (Exception $e) {
+        $core->error->add($e->getMessage());
+    }
+
+    $breadcrumb[__('My cinecturlink')] = '';
+    $headers .= 
+        dcPage::jsVars(['dotclear.filter_reset_url' => $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'links'])]) .
+        dcPage::jsFilterControl($show_filters) .
+        dcPage::jsLoad(dcPage::getPF('cinecturlink2/js/c2links.js'));
+}
 
 if ($part == 'link') {
-    $breadcrumb[__('Link')] = '';
+    $langs_combo = l10n::getISOcodes(true);
+    $notes_combo = range(0, 20);
+    $media_combo = $tmp_media_combo = $dir = null;
+    try {
+        $allowed_media = ['png', 'jpg', 'gif', 'bmp', 'jpeg'];
+        $core->media = new dcMedia($core);
+        $core->media->chdir($core->blog->settings->cinecturlink2->cinecturlink2_folder);
+        $core->media->getDir();
+        $dir =& $core->media->dir;
+
+        foreach($dir['files'] as $file) {
+            if (!in_array(files::getExtension($file->relname), $allowed_media)) {
+                continue;
+            }
+            $tmp_media_combo[$file->media_title] = $file->file_url;
+        }
+        if (!empty($tmp_media_combo)) {
+            $media_combo = array_merge(['-' => ''], $tmp_media_combo);
+        }
+    } catch (Exception $e) {
+        //$core->error->add($e->getMessage());
+    }
+
+    if (!empty($_POST['save'])) {
+        try {
+            cinecturlink2::test_folder(
+                DC_ROOT . '/'  .$core->blog->settings->system->public_path,
+                $core->blog->settings->cinecturlink2->cinecturlink2_folder
+            );
+            if (empty($linktitle)) {
+                throw new Exception(__('You must provide a title.'));
+            }
+            if (empty($linkauthor)) {
+                throw new Exception(__('You must provide an author.'));
+            }
+            if (!preg_match('/https?:\/\/.+/', $linkimage)) {
+                throw new Exception(__('You must provide a link to an image.'));
+            }
+
+            $cur = $core->con->openCursor($C2->table);
+            $cur->link_title = $linktitle;
+            $cur->link_desc = $linkdesc;
+            $cur->link_author = $linkauthor;
+            $cur->link_url = $linkurl;
+            $cur->cat_id = $linkcat == '' ? null : $linkcat;
+            $cur->link_lang = $linklang;
+            $cur->link_img = $linkimage;
+            $cur->link_note = $linknote;
+
+            // create a link
+            if (empty($linkid)) {
+                $exists = $C2->getLinks(['link_title' => $linktitle], true)->f(0);
+                if ($exists) {
+                    throw new Exception(__('Link with same name already exists.'));
+                }
+                $linkid = $C2->addLink($cur);
+
+                dcPage::addSuccessNotice(
+                    __('Link successfully created.')
+                );
+            // update a link
+            } else {
+                $exists = $C2->getLinks(['link_id' => $linkid], true)->f(0);
+                if (!$exists) {
+                    throw new Exception(__('Unknown link.'));
+                }
+                $C2->updLink($linkid, $cur);
+
+                dcPage::addSuccessNotice(
+                    __('Link successfully updated.')
+                );
+            }
+            $core->adminurl->redirect('admin.plugin.cinecturlink2', 
+                [
+                    'part' => 'link',
+                    'linkid' => $linkid,
+                    'redir' => $redir
+                ]
+            );
+        } catch (Exception $e) {
+            $core->error->add($e->getMessage());
+        }
+    }
+
+    if (!empty($_POST['delete']) && !empty($linkid)) {
+        try {
+            $C2->delLink($linkid);
+
+            dcPage::addSuccessNotice(
+                __('Link successfully deleted.')
+            );
+            if (!empty($_POST['redir'])) {
+                http::redirect($redir);
+            } else {
+                $core->adminurl->redirect('admin.plugin.cinecturlink2', ['part' => 'links']);
+            }
+        } catch (Exception $e) {
+            $core->error->add($e->getMessage());
+        }
+    }
+
+    if (!empty($linkid)) {
+        $link = $C2->getLinks(['link_id' => $linkid]);
+        if (!$link->isEmpty()) {
+            $linktitle = $link->link_title;
+            $linkdesc = $link->link_desc;
+            $linkauthor = $link->link_author;
+            $linkurl = $link->link_url;
+            $linkcat = $link->cat_id;
+            $linklang = $link->link_lang;
+            $linkimage = $link->link_img;
+            $linknote = $link->link_note;
+        }
+    }
+    $breadcrumb[(empty($linkid) ? __('New link') : __('Edit link'))] = '';
+    $headers .=
+        "<script type=\"text/javascript\">\n//<![CDATA[
+        \$(function(){if(!document.getElementById){return;} 
+        \$('#newlinksearch').openGoogle('" . $core->auth->getInfo('user_lang') . "','#linktitle'); 
+        \$('#newimagesearch').openAmazon('" . $core->auth->getInfo('user_lang') . "','#linktitle'); 
+        \$('#newimageselect').fillLink('#linkimage'); 
+        });\n//]]>\n</script>\n" .
+        dcPage::jsLoad(dcPage::getPF('cinecturlink2/js/c2link.js'));
 }
 
 if ($part == 'cats') {
-    $breadcrumb[__('Categories')] = '';
-
-    $core->auth->user_prefs->addWorkspace('accessibility');
-    if (!$core->auth->user_prefs->accessibility->nodragdrop) {
-        $headers .=
-            dcPage::jsLoad('js/jquery/jquery-ui.custom.js') .
-            dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js') .
-            dcPage::jsLoad(dcPage::getPF('cinecturlink2/js/cinecturlink2.js'));
-    }
-
     try {
         // reorder categories
         if (!empty($_POST['save'])) {
@@ -83,7 +366,7 @@ if ($part == 'cats') {
                 $C2->delCategory($id);
             }
             dcPage::addSuccessNotice(
-                __('Category successfully deleted.')
+                __('Categories successfully deleted.')
             );
             $core->adminurl->redirect('admin.plugin.cinecturlink2', ['part' => 'cats']);
         }
@@ -91,12 +374,19 @@ if ($part == 'cats') {
     } catch (Exception $e) {
         $core->error->add($e->getMessage());
     }
+
+    $breadcrumb[__('Categories')] = '';
+
+    $core->auth->user_prefs->addWorkspace('accessibility');
+    if (!$core->auth->user_prefs->accessibility->nodragdrop) {
+        $headers .=
+            dcPage::jsLoad('js/jquery/jquery-ui.custom.js') .
+            dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js') .
+            dcPage::jsLoad(dcPage::getPF('cinecturlink2/js/c2cats.js'));
+    }
 }
 
 if ($part == 'cat') {
-    $breadcrumb[__('Categories')] = $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'cats']);
-    $breadcrumb[__('Category')] = '';
-
     try {
         // create category
         if (!empty($_POST['save']) && empty($catid) && !empty($cattitle) && !empty($catdesc)) {
@@ -144,9 +434,10 @@ if ($part == 'cat') {
     } catch (Exception $e) {
         $core->error->add($e->getMessage());
     }
+    $breadcrumb[__('Categories')] = $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'cats']);
+    $breadcrumb[(empty($catid) ? __('New category') : __('Edit category'))] = '';
 }
 
-
 echo 
 '<html><head><title>'.__('Cinecturlink 2').'</title>' .
 $headers .
@@ -154,25 +445,247 @@ $headers .
 dcPage::breadcrumb($breadcrumb) .
 dcPage::notices();
 
-if ($part == "links") {
-    echo 
-    '<p><a href="' . 
-        $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'cats']) . 
-    '">' . __('Edit categories') .' </a></p>' .
-    '<p class="top-add"><a class="button add" href="' . 
-        $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'link']) . 
-    '">' . __('New Link') .' </a></p>';
+if (!empty($redir)) {
+    echo '<p><a class="back" href="' . $redir . '">' . __('Back') .' </a></p>';
+}
+if (!empty($title)) {
+    echo '<h3>' . $title . '</h3>';
+}
 
+if ($part == 'updlinksnote') {
+    if ($links->isEmpty()) {
+        echo '<p>'.__('There is no link').'</p>';
+    } else {
+        echo '<h4>' . __('Links') . '</h4><ul>';
+        while($links->fetch()) {
+            echo '<li><strong>' . $links->link_title . '</strong> ' . $links->link_note . '/20</li>';
+        }
+        echo '</ul>';
+
+        echo '<h4>' . __('Rating') . '</h4>
+        <form method="post" action="' . $core->adminurl->get('admin.plugin.cinecturlink2') . '">' .
+        '<p><label for="newlinknote" class="ib">' . __('New rating:') . '</label> ' .
+            form::number('newlinknote', [
+                'min'        => 0,
+                'max'        => 20,
+                'default'    => 10
+            ]) . '/20' . '</p>' .
+        '<p>' .
+        '<input type="submit" value="' . __('Save') . ' (s)" accesskey="s" name="save" /> ' .
+        '<a id="post-cancel" href="' . ($redir ? $redir : 
+            $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'links'])
+        ) . '" class="button" accesskey="c">' . __('Cancel') . ' (c)</a> ';
+        foreach($entries as $id) {
+            echo form::hidden(['entries[]'], $id);
+        }
+        echo 
+        form::hidden('part', 'updlinksnote') .
+        form::hidden('redir', $redir) .
+        $core->formNonce() . '</p>' .
+        '</form>';
+    }
+}
+
+if ($part == 'updlinkscat') {
+    if ($links->isEmpty()) {
+        echo '<p>'.__('There is no link').'</p>';
+    } else {
+        echo '<h4>' . __('Links') . '</h4><ul>';
+        while($links->fetch()) {
+            echo '<li><strong>' . $links->link_title . '</strong> ' . $links->link_note . '/20</li>';
+        }
+        echo '</ul>';
+
+        echo '<h4>' . __('Category') . '</h4>
+        <form method="post" action="' . $core->adminurl->get('admin.plugin.cinecturlink2') . '">' .
+        '<p><label for="newcatid" class="ib">' . __('New category:') . '</label> ' .
+        form::combo('newcatid', $categories_combo, $catid) . '</p>' .
+        '<input type="submit" value="' . __('Save') . ' (s)" accesskey="s" name="save" /> ' .
+        '<a id="post-cancel" href="' . ($redir ? $redir : 
+            $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'links'])
+        ) . '" class="button" accesskey="c">' . __('Cancel') . ' (c)</a> ';
+        foreach($entries as $id) {
+            echo form::hidden(['entries[]'], $id);
+        }
+        echo 
+        form::hidden('part', 'updlinkscat') .
+        form::hidden('redir', $redir) .
+        $core->formNonce() . '</p>' .
+        '</form>';
+    }
+}
+
+if ($part == "links") {
+    $links_redir = $core->adminurl->get(
+        'admin.plugin.cinecturlink2', 
+        [
+            'part' => 'links',
+            'catid' => $catid,
+            'sortby' => $sortby,
+            'order' => $order,
+            'page' => $page,
+            'nb' => $nb_per_page
+        ]
+    );
+    echo 
+    '<p>' .
+    '<a class="button" href="' . 
+        $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'cats', 'redir' => $links_redir]) . 
+    '">' . __('Edit categories') .' </a>' .
+    '</p>' .
+    '<p class="top-add"><a class="button add" href="' . 
+        $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'link', 'redir' => $links_redir]) . 
+    '">' . __('New Link') .'</a> <a class="button add" href="' . 
+        $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'cat', 'redir' => $links_redir]) . 
+    '">' . __('New Category') .' </a></p>';
+
+    if ($links->isEmpty()) {
+        echo '<p>'.__('There is no link').'</p>';
+    } else {
+        echo
+        '<form action="' . $core->adminurl->get('admin.plugin.cinecturlink2') . '" method="get" id="filters-form">' .
+        '<h3 class="out-of-screen-if-js">' . __('Show filters and display options') . '</h3>' .
+
+        '<div class="table">' .
+
+        '<div class="cell">' .
+        '<h4>' . __('Filters') . '</h4>' .
+        '<p><label for="cat_id" class="ib">' . __('Category:') . '</label> ' .
+        form::combo('catid', $categories_combo, $catid) . '</p>' .
+        '</div>'.
+            
+        '<div class="cell filters-options">' .
+        '<p><label for="sortby" class="ib">' . __('Order by:') . '</label> ' .
+        form::combo('sortby', $sortby_combo, $sortby) . '</p>' .
+        '</div><div class="cell">' .
+        '<p><label for="order" class="ib">' . __('Sort:') . '</label> ' .
+        form::combo('order', $order_combo, $order) . '</p>' .
+        '</div><div class="cell">' .
+        '<p><span class="label ib">' . __('Show') . '</span> <label for="nb" class="classic">'.
+        form::field('nb', 3, 3, $nb_per_page) . ' ' .
+        __('entries per page') . '</label></p>' .
+        form::hidden('p', 'cinecturlink2') .
+        form::hidden('part', 'links') .
+        //form::hidden('filters-options-id', 'c2links') .
+        //'<p class="hidden-if-no-js"><a href="#" id="filter-options-save">' . __('Save current options') . '</a></p>' .
+        '</div>' .
+
+        '</div>' .
+
+        '<p><input type="submit" value="' . __('Apply filters and display options') . '" />' .
+        '<br class="clear" /></p>' . //Opera sucks
+        '</form>';
+
+        $links_list->display($page, $nb_per_page,
+            '<form action="' . $core->adminurl->get('admin.plugin.cinecturlink2') . '" method="post" id="form-entries">' .
+
+            '%s' .
+
+            '<div class="two-cols">' .
+            '<p class="col checkboxes-helpers"></p>' .
+
+            '<p class="col right"><label for="action" class="classic">' . __('Selected links action:') . '</label> ' .
+            form::combo('part', $action_combo) .
+            '<input id="do-action" type="submit" value="' . __('ok') . '" disabled /></p>' .
+            form::hidden(['sortby'], $sortby) .
+            form::hidden(['order'], $order) .
+            form::hidden(['page'], $page) .
+            form::hidden(['nb'], $nb_per_page) .
+            form::hidden(['redir'], $links_redir) .
+            $core->formNonce() .
+            '</div>' .
+            '</form>',
+            $show_filters,
+            $links_redir
+        );
+    }
 }
 
 if ($part == "link") {
 
+    echo '
+    <form id="newlinkform" method="post" action="' . $core->adminurl->get('admin.plugin.cinecturlink2') . '">
+
+    <div class="two-cols clearfix">
+    <div class="col70">
+    <p><label for="linktitle">' . __('Title:') . ' ' .
+    form::field('linktitle', 60, 255, html::escapeHTML($linktitle), 'maximal') .
+    '</label></p>
+    <p><label for="linkdesc">' . __('Description:') . ' ' .
+    form::field('linkdesc', 60, 255,  html::escapeHTML($linkdesc), 'maximal') .
+    '</label></p>
+    <p><label for="linkauthor">' . __('Author:') . ' ' .
+    form::field('linkauthor', 60, 255,  html::escapeHTML($linkauthor), 'maximal') .
+    '</label></p>
+    <p><label for="linkurl">' . __('Details URL:') . ' ' .
+    form::field('linkurl', 60, 255,  html::escapeHTML($linkurl), 'maximal') . '</label>' .
+    '<a class="modal" href="http://google.com" id="newlinksearch">' .
+    __('Search with Google') . '</a>' .
+    '</p>
+    <p><label for="linkimage">' . __('Image URL:') . ' ' .
+    form::field('linkimage', 60, 255,  html::escapeHTML($linkimage), 'maximal') . '</label>' .
+    '<a class="modal" href="http://amazon.com" id="newimagesearch">' .
+    __('Search with Amazon') . '</a>' .
+    '</p>';
+
+    if (empty($media_combo)) {
+        echo
+        '<p class="form-note">' . __('There is no image in cinecturlink media path.') . '</p>';
+    } else {
+        echo '
+        <p><label for="newimageselect">' . __('or select from repository:') . ' ' .
+        form::combo('newimageselect', $media_combo, '', 'maximal') .
+        '</label></p>' .
+        '<p class="form-note">' . __('Go to media manager to add image to cinecturlink path.') . '</p>';
+    }
+
+    echo '
+    </div>
+    <div class="col30">
+    <p><label for="linkcat">' . __('Category:') . '</label> ' .
+    form::combo('linkcat', $categories_combo, $linkcat) .
+    '</p>
+    <p><label for="linklang">' . __('Lang:') . '</label> ' .
+    form::combo('linklang', $langs_combo, $linklang) .
+    '</p>
+    <p><label for="linknote">' . __('Rating:') . '</label> ' .
+        form::number('linknote', [
+            'min'        => 0,
+            'max'        => 20,
+            'default'    => $linknote
+        ]) . '/20' . '</p>
+    </div></div>
+
+    <p class="border-top">' .
+    '<input type="submit" value="' . __('Save') . ' (s)" accesskey="s" name="save" /> ' .
+    '<a id="post-cancel" href="' . 
+        $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'links']) . 
+    '" class="button" accesskey="c">' . __('Cancel') . ' (c)</a> '.
+    '<input type="submit" class="delete" value="' . __('Delete') . '" name="delete" />' .
+    form::hidden('linkid', $linkid) .
+    form::hidden('part', 'link') .
+    form::hidden('redir', $redir) .
+    $core->formNonce() . '
+    </p>
+    </form>';
 }
 
 if ($part == "cats") {
     echo 
     '<p class="top-add"><a class="button add" href="' . 
-        $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'cat']) . 
+        $core->adminurl->get(
+            'admin.plugin.cinecturlink2', 
+            [
+                'part' => 'cat', 
+                'redir' => $core->adminurl->get(
+                    'admin.plugin.cinecturlink2', 
+                    [
+                        'part' => 'cats',
+                        'redir' => $redir,
+                    ]
+                )
+            ]
+        ) . 
     '">' . __('New Category') .' </a></p>';
 
     if ($categories->isEmpty()) {
@@ -180,8 +693,7 @@ if ($part == "cats") {
     }
     else {
         echo '
-        <form id="c2items" method="post" action="' . 
-            $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'cats']) . '">
+        <form id="c2items" method="post" action="' . $core->adminurl->get('admin.plugin.cinecturlink2') . '">
         <div class="table-outer">
         <table class="dragable">
         <caption>' . __('Categories list') . '</caption>
@@ -208,7 +720,20 @@ if ($part == "cats") {
             form::hidden(['dynorder[]', 'dynorder-' . $i], $id) . '</td>
             <td class="minimal">' . form::checkbox(['items_selected[]', 'ims-' . $i], $id) . '</td>
             <td class="nowrap"><a title="' . __('Edit') .'" href="' . 
-                $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'cat', 'catid' => $id]) . 
+                $core->adminurl->get(
+                    'admin.plugin.cinecturlink2', 
+                    [
+                        'part' => 'cat', 
+                        'catid' => $id, 
+                        'redir' => $core->adminurl->get(
+                            'admin.plugin.cinecturlink2', 
+                            [
+                                'part' => 'cats',
+                                'redir' => $redir
+                            ]
+                        )
+                    ]
+                ) . 
             '">' . html::escapeHTML($categories->cat_title) . '</a></td>
             <td class="maximal">' . html::escapeHTML($categories->cat_desc) . '</td>
             </tr>';
@@ -227,6 +752,7 @@ if ($part == "cats") {
         '" class="button" accesskey="c">' . __('Cancel') . ' (c)</a> '.
         '<input type="submit" class="delete" value="' . __('Delete selection') . '" name="delete" />' .
         form::hidden('im_order', '') .
+        form::hidden('part', 'cats') .
         $core->formNonce() . '</p>' .
         '</form>';
     }
@@ -240,9 +766,16 @@ if ($part == 'cat') {
             $catdesc = $category->cat_desc;
         }
     }
+
+    if ($catid) {
+        $links = $C2->getLinks(['cat_id' => $catid], true)->f(0);
+        echo '<p class="info">' . (empty($links) ?
+            __('No link uses this category.') :
+            sprintf(__('A link uses this category.', '%s links use this category.', $links), $links)
+        ) . '</p>';
+    }
     echo '
-    <h3>' . (empty($catid) ? __('Add categorie') : __('Edit categorie')) . '</h3>
-    <form method="post" action="'. $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'cat']) .'">
+    <form method="post" action="'. $core->adminurl->get('admin.plugin.cinecturlink2') .'">
     <p><label for="cattitle">' . __('Title:') . ' ' .
     form::field('cattitle', 60, 64, $cattitle, 'maximal') .
     '</label></p>
@@ -256,6 +789,7 @@ if ($part == 'cat') {
     '" class="button" accesskey="c">' . __('Cancel') . ' (c)</a> '.
     (!empty($catid) ? ' <input type="submit" class="delete" value="' . __('Delete') . '" name="delete" />' : '') .
     form::hidden('catid', $catid) .
+    form::hidden('part', 'cat') .
     $core->formNonce() . '</p>' .
     '</form>';
 }
diff --git a/js/cinecturlink2.js b/js/c2cats.js
similarity index 100%
rename from js/cinecturlink2.js
rename to js/c2cats.js
diff --git a/js/c2link.js b/js/c2link.js
new file mode 100644
index 0000000..570fca6
--- /dev/null
+++ b/js/c2link.js
@@ -0,0 +1,34 @@
+;if(window.jQuery) (function($){
+    $.fn.openGoogle = function(lang,target){
+        return this.each(function(){
+            $(this).click(function(){
+                var val = $(target).attr('value');
+                if (val!=''){
+                    searchwindow=window.open('http://www.google.com/search?hl='+lang+'&q='+val,'search','scrollbars=yes,width=800,height=600,resize=yes,toolbar=yes,menubar=yes');
+                    searchwindow.focus();
+                }
+                return false;
+            });
+        });
+    }
+    $.fn.openAmazon = function(lang,target){
+        return this.each(function(){
+            $(this).click(function(){
+                var val = $(target).attr('value');
+                if (val!=''){
+                    searchwindow=window.open('http://www.amazon.fr/exec/obidos/external-search?keyword='+val+'&mode=blended','search','scrollbars=yes,width=800,height=600,resize=yes,toolbar=yes,menubar=yes');
+                    searchwindow.focus();
+                }
+                return false;
+            });
+        });
+    }
+    $.fn.fillLink = function(target){
+        return this.each(function(){
+            $(this).change(function(){
+                $(target).attr('value',$(this).attr('value'));
+                return false;
+            });
+        });
+    }
+})(jQuery);
\ No newline at end of file
diff --git a/js/c2links.js b/js/c2links.js
new file mode 100644
index 0000000..8320f80
--- /dev/null
+++ b/js/c2links.js
@@ -0,0 +1,17 @@
+/*
+$(function() {
+  // checkboxes selection
+  $('.checkboxes-helpers').each(function() {
+    dotclear.checkboxesHelpers(this);
+  });
+});
+*/
+$(function () {
+  $('.checkboxes-helpers').each(function () {
+    dotclear.checkboxesHelpers(this, undefined, '#form-entries td input[type=checkbox]', '#form-entries #do-action');
+  });
+  $('#form-entries td input[type=checkbox]').enableShiftClick();
+  dotclear.condSubmit('#form-entries td input[type=checkbox]', '#form-entries #do-action');
+  dotclear.postsActionsHelper();
+  dotclear.responsiveCellHeaders(document.querySelector('#form-entries table'), '#form-entries table', 1);
+});
\ No newline at end of file