diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfb7dc8..b6e3935 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
periodical 2021.08.xx
* update license
+ * update php code to PSR-2 style and short array
periodical 2013.11.11
* Switch to Dotclear 2.6
diff --git a/_admin.php b/_admin.php
index 61b752a..e4e13fa 100644
--- a/_admin.php
+++ b/_admin.php
@@ -12,54 +12,53 @@
# -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_CONTEXT_ADMIN')) {
-
- return null;
+ return null;
}
$core->blog->settings->addNamespace('periodical');
if ($core->blog->settings->periodical->periodical_active) {
- $_menu['Plugins']->addItem(
- __('Periodical'),
- 'plugin.php?p=periodical',
- 'index.php?pf=periodical/icon.png',
- preg_match(
- '/plugin.php\?p=periodical(&.*)?$/',
- $_SERVER['REQUEST_URI']
- ),
- $core->auth->check('usage,contentadmin', $core->blog->id)
- );
+ $_menu['Plugins']->addItem(
+ __('Periodical'),
+ 'plugin.php?p=periodical',
+ 'index.php?pf=periodical/icon.png',
+ preg_match(
+ '/plugin.php\?p=periodical(&.*)?$/',
+ $_SERVER['REQUEST_URI']
+ ),
+ $core->auth->check('usage,contentadmin', $core->blog->id)
+ );
- $core->addBehavior(
- 'adminDashboardFavorites',
- array('adminPeriodical', 'adminDashboardFavorites')
- );
- $core->addBehavior(
- 'adminPostHeaders',
- array('adminPeriodical', 'adminPostHeaders')
- );
- $core->addBehavior(
- 'adminPostsActionsPage',
- array('adminPeriodical', 'adminPostsActionsPage')
- );
- $core->addBehavior(
- 'adminPostFormItems',
- array('adminPeriodical', 'adminPostFormItems')
- );
- $core->addBehavior(
- 'adminAfterPostUpdate',
- array('adminPeriodical', 'adminAfterPostSave')
- );
- $core->addBehavior(
- 'adminAfterPostCreate',
- array('adminPeriodical', 'adminAfterPostSave')
- );
+ $core->addBehavior(
+ 'adminDashboardFavorites',
+ ['adminPeriodical', 'adminDashboardFavorites']
+ );
+ $core->addBehavior(
+ 'adminPostHeaders',
+ ['adminPeriodical', 'adminPostHeaders']
+ );
+ $core->addBehavior(
+ 'adminPostsActionsPage',
+ ['adminPeriodical', 'adminPostsActionsPage']
+ );
+ $core->addBehavior(
+ 'adminPostFormItems',
+ ['adminPeriodical', 'adminPostFormItems']
+ );
+ $core->addBehavior(
+ 'adminAfterPostUpdate',
+ ['adminPeriodical', 'adminAfterPostSave']
+ );
+ $core->addBehavior(
+ 'adminAfterPostCreate',
+ ['adminPeriodical', 'adminAfterPostSave']
+ );
}
$core->addBehavior(
- 'adminBeforePostDelete',
- array('adminPeriodical', 'adminBeforePostDelete')
+ 'adminBeforePostDelete',
+ ['adminPeriodical', 'adminBeforePostDelete']
);
/**
@@ -69,326 +68,310 @@ $core->addBehavior(
*/
class adminPeriodical
{
- public static $combo_period = null;
+ public static $combo_period = null;
- /**
- * Favorites.
- *
- * @param dcCore $core dcCore instance
- * @param arrayObject $favs Array of favorites
- */
- public static function adminDashboardFavorites(dcCore $core, $favs)
- {
- $favs->register('periodical', array(
- 'title' => __('Periodical'),
- 'url' => 'plugin.php?p=periodical',
- 'small-icon' => 'index.php?pf=periodical/icon.png',
- 'large-icon' => 'index.php?pf=periodical/icon-big.png',
- 'permissions' => $core->auth->check(
- 'usage,contentadmin',
- $core->blog->id
- ),
- 'active_cb' => array(
- 'adminPeriodical',
- 'adminDashboardFavoritesActive'
- )
- ));
- }
+ /**
+ * Favorites.
+ *
+ * @param dcCore $core dcCore instance
+ * @param arrayObject $favs Array of favorites
+ */
+ public static function adminDashboardFavorites(dcCore $core, $favs)
+ {
+ $favs->register('periodical', [
+ 'title' => __('Periodical'),
+ 'url' => 'plugin.php?p=periodical',
+ 'small-icon' => 'index.php?pf=periodical/icon.png',
+ 'large-icon' => 'index.php?pf=periodical/icon-big.png',
+ 'permissions' => $core->auth->check(
+ 'usage,contentadmin',
+ $core->blog->id
+ ),
+ 'active_cb' => [
+ 'adminPeriodical',
+ 'adminDashboardFavoritesActive'
+ ]
+ ]);
+ }
- /**
- * Favorites selection.
- *
- * @param string $request Requested page
- * @param array $params Requested parameters
- */
- public static function adminDashboardFavoritesActive($request, $params)
- {
- return $request == 'plugin.php'
- && isset($params['p'])
- && $params['p'] == 'periodical';
- }
+ /**
+ * Favorites selection.
+ *
+ * @param string $request Requested page
+ * @param array $params Requested parameters
+ */
+ public static function adminDashboardFavoritesActive($request, $params)
+ {
+ return $request == 'plugin.php'
+ && isset($params['p'])
+ && $params['p'] == 'periodical';
+ }
- /**
- * Add javascript for toggle
- *
- * @return string HTML head
- */
- public static function adminPostHeaders()
- {
- return dcPage::jsLoad('index.php?pf=periodical/js/toggle.js');
- }
+ /**
+ * Add javascript for toggle
+ *
+ * @return string HTML head
+ */
+ public static function adminPostHeaders()
+ {
+ return dcPage::jsLoad('index.php?pf=periodical/js/toggle.js');
+ }
- /**
- * Delete relation between post and period
- *
- * @param integer $post_id Post id
- */
- public static function adminBeforePostDelete($post_id)
- {
- self::delPeriod($GLOBALS['core'], $post_id);
- }
+ /**
+ * Delete relation between post and period
+ *
+ * @param integer $post_id Post id
+ */
+ public static function adminBeforePostDelete($post_id)
+ {
+ self::delPeriod($GLOBALS['core'], $post_id);
+ }
- /**
- * Add actions to posts page combo
- *
- * @param dcCore $core dcCore instance
- * @param dcPostsActionsPage $ap dcPostsActionsPage instance
- */
- public static function adminPostsActionsPage(dcCore $core, dcPostsActionsPage $pa)
- {
- $pa->addAction(
- array(
- __('Periodical') => array(
- __('Add to periodical') => 'periodical_add'
- )
- ),
- array('adminPeriodical', 'callbackAdd')
- );
+ /**
+ * Add actions to posts page combo
+ *
+ * @param dcCore $core dcCore instance
+ * @param dcPostsActionsPage $ap dcPostsActionsPage instance
+ */
+ public static function adminPostsActionsPage(dcCore $core, dcPostsActionsPage $pa)
+ {
+ $pa->addAction(
+ [__('Periodical') => [__('Add to periodical') => 'periodical_add']],
+ ['adminPeriodical', 'callbackAdd']
+ );
- if (!$core->auth->check('delete,contentadmin', $core->blog->id)) {
+ if (!$core->auth->check('delete,contentadmin', $core->blog->id)) {
+ return null;
+ }
+ $pa->addAction(
+ [__('Periodical') => [__('Remove from periodical') => 'periodical_remove']],
+ ['adminPeriodical', 'callbackRemove']
+ );
+ }
- return null;
- }
- $pa->addAction(
- array(
- __('Periodical') => array(
- __('Remove from periodical') => 'periodical_remove'
- )
- ),
- array('adminPeriodical', 'callbackRemove')
- );
- }
+ /**
+ * Posts actions callback to remove period
+ *
+ * @param dcCore $core dcCore instance
+ * @param dcPostsActionsPage $pa dcPostsActionsPage instance
+ * @param ArrayObject $post _POST actions
+ */
+ public static function callbackRemove(dcCore $core, dcPostsActionsPage $pa, ArrayObject $post)
+ {
+ # No entry
+ $posts_ids = $pa->getIDs();
+ if (empty($posts_ids)) {
+ throw new Exception(__('No entry selected'));
+ }
- /**
- * Posts actions callback to remove period
- *
- * @param dcCore $core dcCore instance
- * @param dcPostsActionsPage $pa dcPostsActionsPage instance
- * @param ArrayObject $post _POST actions
- */
- public static function callbackRemove(dcCore $core, dcPostsActionsPage $pa, ArrayObject $post)
- {
- # No entry
- $posts_ids = $pa->getIDs();
- if (empty($posts_ids)) {
- throw new Exception(__('No entry selected'));
- }
+ # No right
+ if (!$core->auth->check('delete,contentadmin', $core->blog->id)) {
+ throw new Exception(__('No enough right'));
+ }
- # No right
- if (!$core->auth->check('delete,contentadmin', $core->blog->id)) {
- throw new Exception(__('No enough right'));
- }
+ # Remove linked period
+ foreach($posts_ids as $post_id) {
+ self::delPeriod($core, $post_id);
+ }
- # Remove linked period
- foreach($posts_ids as $post_id) {
- self::delPeriod($core, $post_id);
- }
+ dcPage::addSuccessNotice(__('Posts have been removed from periodical.'));
+ $pa->redirect(true);
+ }
- dcPage::addSuccessNotice(__('Posts have been removed from periodical.'));
- $pa->redirect(true);
- }
+ /**
+ * Posts actions callback to add period
+ *
+ * @param dcCore $core dcCore instance
+ * @param dcPostsActionsPage $pa dcPostsActionsPage instance
+ * @param ArrayObject $post _POST actions
+ */
+ public static function callbackAdd(dcCore $core, dcPostsActionsPage $pa, ArrayObject $post)
+ {
+ # No entry
+ $posts_ids = $pa->getIDs();
+ if (empty($posts_ids)) {
+ throw new Exception(__('No entry selected'));
+ }
- /**
- * Posts actions callback to add period
- *
- * @param dcCore $core dcCore instance
- * @param dcPostsActionsPage $pa dcPostsActionsPage instance
- * @param ArrayObject $post _POST actions
- */
- public static function callbackAdd(dcCore $core, dcPostsActionsPage $pa, ArrayObject $post)
- {
- # No entry
- $posts_ids = $pa->getIDs();
- if (empty($posts_ids)) {
- throw new Exception(__('No entry selected'));
- }
+ //todo: check if selected posts is unpublished
- //todo: check if selected posts is unpublished
+ # Save action
+ if (!empty($post['periodical'])) {
+ foreach($posts_ids as $post_id) {
+ self::delPeriod($core, $post_id);
+ self::addPeriod($core, $post_id, $post['periodical']);
+ }
- # Save action
- if (!empty($post['periodical'])) {
- foreach($posts_ids as $post_id) {
- self::delPeriod($core, $post_id);
- self::addPeriod($core, $post_id, $post['periodical']);
- }
+ dcPage::addSuccessNotice(__('Posts have been added to periodical.'));
+ $pa->redirect(true);
+ }
- dcPage::addSuccessNotice(__('Posts have been added to periodical.'));
- $pa->redirect(true);
- }
+ # Display form
+ else {
+ $pa->beginPage(
+ dcPage::breadcrumb(array(
+ html::escapeHTML($core->blog->name) => '',
+ $pa->getCallerTitle() => $pa->getRedirection(true),
+ __('Add a period to this selection') => ''
+ ))
+ );
- # Display form
- else {
- $pa->beginPage(
- dcPage::breadcrumb(array(
- html::escapeHTML($core->blog->name) => '',
- $pa->getCallerTitle() => $pa->getRedirection(true),
- __('Add a period to this selection') => ''
- ))
- );
+ echo
+ '';
- ''.
- $core->formNonce().
- $pa->getHiddenFields().
- form::hidden(array('action'), 'periodical_add').
- '
'.
- '';
+ $pa->endPage();
+ }
+ }
- $pa->endPage();
- }
- }
+ /**
+ * Add form to post sidebar
+ *
+ * @param ArrayObject $main_items Main items
+ * @param ArrayObject $sidebar_items Sidebar items
+ * @param record $post Post record or null
+ */
+ public static function adminPostFormItems(ArrayObject $main_items, ArrayObject $sidebar_items, $post)
+ {
+ global $core;
- /**
- * Add form to post sidebar
- *
- * @param ArrayObject $main_items Main items
- * @param ArrayObject $sidebar_items Sidebar items
- * @param record $post Post record or null
- */
- public static function adminPostFormItems(ArrayObject $main_items, ArrayObject $sidebar_items, $post)
- {
- global $core;
+ # Get existing linked period
+ $period = '';
+ if ($post) {
+ $per = new periodical($core);
+ $rs = $per->getPosts(['post_id' => $post->post_id]);
+ $period = $rs->isEmpty() ? '' : $rs->periodical_id;
+ }
- # Get existing linked period
- $period = '';
- if ($post) {
- $per = new periodical($core);
- $rs = $per->getPosts(array('post_id' => $post->post_id));
- $period = $rs->isEmpty() ? '' : $rs->periodical_id;
- }
+ # Set linked period form items
+ $sidebar_items['options-box']['items']['period'] =
+ self::formPeriod($core, $period);
+ }
- # Set linked period form items
- $sidebar_items['options-box']['items']['period'] =
- self::formPeriod($core, $period);
- }
+ /**
+ * Save linked period
+ *
+ * @param cursor $cur Current post cursor
+ * @param integer $post_id Post id
+ */
+ public static function adminAfterPostSave(cursor $cur, $post_id)
+ {
+ global $core;
- /**
- * Save linked period
- *
- * @param cursor $cur Current post cursor
- * @param integer $post_id Post id
- */
- public static function adminAfterPostSave(cursor $cur, $post_id)
- {
- global $core;
+ if (!isset($_POST['periodical'])) {
+ return null;
+ }
- if (!isset($_POST['periodical'])) {
+ # Delete old linked period
+ self::delPeriod($core, $post_id);
- return null;
- }
+ # Add new linked period
+ self::addPeriod($core, $post_id, $_POST['periodical']);
+ }
- # Delete old linked period
- self::delPeriod($core, $post_id);
+ /**
+ * Posts period form field
+ *
+ * @param dcCore $core dcCore instance
+ * @param string $period Period
+ * @return string Period form content
+ */
+ protected static function formPeriod(dcCore $core, $period='')
+ {
+ $combo = self::comboPeriod($core);
- # Add new linked period
- self::addPeriod($core, $post_id, $_POST['periodical']);
- }
+ if (empty($combo)) {
+ return null;
+ }
- /**
- * Posts period form field
- *
- * @param dcCore $core dcCore instance
- * @param string $period Period
- * @return string Period form content
- */
- protected static function formPeriod(dcCore $core, $period='')
- {
- $combo = self::comboPeriod($core);
+ return
+ '' .
+ __('Periodical') . ' ' .
+ form::combo('periodical', $combo, $period) .
+ '
';
+ }
- if (empty($combo)) {
+ /**
+ * Combo of available periods
+ *
+ * @param dcCore $core dcCore instance
+ * @return array List of period
+ */
+ protected static function comboPeriod(dcCore $core)
+ {
+ if (adminPeriodical::$combo_period === null) {
- return null;
- }
+ $per = new periodical($core);
+ $periods = $per->getPeriods();
- return
- ''.
- __('Periodical').' '.
- form::combo('periodical', $combo, $period).
- '
';
- }
+ if ($periods->isEmpty()) {
+ adminPeriodical::$combo_period = [];
+ } else {
+ $combo = ['-' => ''];
+ while ($periods->fetch()) {
+ $combo[html::escapeHTML($periods->periodical_title)] = $periods->periodical_id;
+ }
+ }
+ adminPeriodical::$combo_period = $combo;
+ }
- /**
- * Combo of available periods
- *
- * @param dcCore $core dcCore instance
- * @return array List of period
- */
- protected static function comboPeriod(dcCore $core)
- {
- if (adminPeriodical::$combo_period === null) {
+ return adminPeriodical::$combo_period;
+ }
- $per = new periodical($core);
- $periods = $per->getPeriods();
+ /**
+ * Remove period from posts.
+ *
+ * @param dcCore $core dcCore instance
+ * @param integer $post_id Post id
+ */
+ protected static function delPeriod(dcCore $core, $post_id)
+ {
+ if ($post_id === null) {
+ return null;
+ }
- if ($periods->isEmpty()) {
+ $post_id = (integer) $post_id;
+ $per = new periodical($core);
+ $per->delPost($post_id);
+ }
- adminPeriodical::$combo_period = array();
- }
- else {
- $combo = array('-' => '');
- while ($periods->fetch()) {
- $combo[html::escapeHTML($periods->periodical_title)] = $periods->periodical_id;
- }
- }
- adminPeriodical::$combo_period = $combo;
- }
+ /**
+ * Add period to posts
+ *
+ * @param dcCore $core dcCore instance
+ * @param integer $post_id Post id
+ * @param array $period Period
+ */
+ protected static function addPeriod($core, $post_id, $period)
+ {
+ # Not saved
+ if ($post_id === null || empty($period)) {
+ return null;
+ }
- return adminPeriodical::$combo_period;
- }
+ # Period object
+ $per = new periodical($core);
- /**
- * Remove period from posts.
- *
- * @param dcCore $core dcCore instance
- * @param integer $post_id Post id
- */
- protected static function delPeriod(dcCore $core, $post_id)
- {
- if ($post_id === null) {
+ # Get periods
+ $period = $per->getPeriods(['periodical_id' => $period]);
- return null;
- }
+ # No period
+ if ($period->isEmpty()) {
+ return null;
+ }
- $post_id = (integer) $post_id;
- $per = new periodical($core);
- $per->delPost($post_id);
- }
+ $post_id = (integer) $post_id;
- /**
- * Add period to posts
- *
- * @param dcCore $core dcCore instance
- * @param integer $post_id Post id
- * @param array $period Period
- */
- protected static function addPeriod($core, $post_id, $period)
- {
- # Not saved
- if ($post_id === null || empty($period)) {
-
- return null;
- }
-
- # Period object
- $per = new periodical($core);
-
- # Get periods
- $period = $per->getPeriods(array('periodical_id' => $period));
-
- # No period
- if ($period->isEmpty()) {
-
- return null;
- }
-
- $post_id = (integer) $post_id;
-
- # Add relation
- $per->addPost($period->periodical_id, $post_id);
- }
-}
+ # Add relation
+ $per->addPost($period->periodical_id, $post_id);
+ }
+}
\ No newline at end of file
diff --git a/_config.php b/_config.php
index 2d2c461..7c1ab18 100644
--- a/_config.php
+++ b/_config.php
@@ -12,98 +12,94 @@
# -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_CONTEXT_MODULE')) {
-
- return null;
+ return null;
}
$redir = empty($_REQUEST['redir']) ?
- $list->getURL().'#plugins' : $_REQUEST['redir'];
+ $list->getURL() . '#plugins' : $_REQUEST['redir'];
# -- Combos --
-$sortby_combo = array(
- __('Create date') => 'post_creadt',
- __('Date') => 'post_dt',
- __('Id') => 'post_id'
-);
-$order_combo = array(
- __('Descending') => 'desc',
- __('Ascending') => 'asc'
-);
+$sortby_combo = [
+ __('Create date') => 'post_creadt',
+ __('Date') => 'post_dt',
+ __('Id') => 'post_id'
+];
+$order_combo = [
+ __('Descending') => 'desc',
+ __('Ascending') => 'asc'
+];
# -- Get settings --
$core->blog->settings->addNamespace('periodical');
$s = $core->blog->settings->periodical;
-$s_active = (boolean) $s->periodical_active;
-$s_upddate = (boolean) $s->periodical_upddate;
-$s_updurl = (boolean) $s->periodical_updurl;
-$e_order = (string) $s->periodical_pub_order;
-$e_order = explode(' ', $e_order);
-$s_sortby = in_array($e_order[0], $sortby_combo) ? $e_order[0] : 'post_dt';
-$s_order = isset($e_order[1]) && strtolower($e_order[1]) == 'desc' ? 'desc' : 'asc';
+$s_active = (boolean) $s->periodical_active;
+$s_upddate = (boolean) $s->periodical_upddate;
+$s_updurl = (boolean) $s->periodical_updurl;
+$e_order = (string) $s->periodical_pub_order;
+$e_order = explode(' ', $e_order);
+$s_sortby = in_array($e_order[0], $sortby_combo) ? $e_order[0] : 'post_dt';
+$s_order = isset($e_order[1]) && strtolower($e_order[1]) == 'desc' ? 'desc' : 'asc';
# -- Set settings --
if (!empty($_POST['save'])) {
+ try {
+ $s_active = !empty($_POST['s_active']);
+ $s_upddate = !empty($_POST['s_upddate']);
+ $s_updurl = !empty($_POST['s_updurl']);
+ $s_sortby = $_POST['s_sortby'];
+ $s_order = $_POST['s_order'];
- try {
- $s_active = !empty($_POST['s_active']);
- $s_upddate = !empty($_POST['s_upddate']);
- $s_updurl = !empty($_POST['s_updurl']);
- $s_sortby = $_POST['s_sortby'];
- $s_order = $_POST['s_order'];
+ $s->put('periodical_active', $s_active);
+ $s->put('periodical_upddate', $s_upddate);
+ $s->put('periodical_updurl', $s_updurl);
+ $s->put('periodical_pub_order', $s_sortby . ' ' . $s_order);
- $s->put('periodical_active', $s_active);
- $s->put('periodical_upddate', $s_upddate);
- $s->put('periodical_updurl', $s_updurl);
- $s->put('periodical_pub_order', $s_sortby.' '.$s_order);
+ $core->blog->triggerBlog();
- $core->blog->triggerBlog();
-
- dcPage::addSuccessNotice(
- __('Configuration has been successfully updated.')
- );
- http::redirect(
- $list->getURL('module=periodical&conf=1&redir='.
- $list->getRedir())
- );
- }
- catch (Exception $e) {
- $core->error->add($e->getMessage());
- }
+ dcPage::addSuccessNotice(
+ __('Configuration has been successfully updated.')
+ );
+ http::redirect($list->getURL(
+ 'module=periodical&conf=1&redir=' . $list->getRedir()
+ ));
+ } catch (Exception $e) {
+ $core->error->add($e->getMessage());
+ }
}
# -- Display form --
echo '
-
'.__('Activation').'
+
' . __('Activation') . '
-
'.
-form::checkbox('s_active', 1, $s_active).
-__('Enable plugin').'
+
' .
+form::checkbox('s_active', 1, $s_active) .
+__('Enable plugin') . '
-
'.__('Dates of published entries').'
+
' . __('Dates of published entries') . '
-
'.
-form::checkbox('s_upddate', 1, $s_upddate).
-__('Update post date').'
+
' .
+form::checkbox('s_upddate', 1, $s_upddate) .
+__('Update post date') . '
-
'.
-form::checkbox('s_updurl', 1, $s_updurl).
-__('Update post url').'
+
' .
+form::checkbox('s_updurl', 1, $s_updurl) .
+__('Update post url') . '
-
'.__('Order of publication of entries').'
+
' . __('Order of publication of entries') . '
-
'.__('Order by:').' '.
-form::combo('s_sortby', $sortby_combo, $s_sortby).'
+
'.__('Order by:') . ' ' .
+form::combo('s_sortby', $sortby_combo, $s_sortby) . '
-
'.__('Sort:').' '.
-form::combo('s_order', $order_combo, $s_order).'
+
'.__('Sort:').' ' .
+form::combo('s_order', $order_combo, $s_order) . '
-
'.__('No period').'
';
- }
- else {
- $pager = new dcPager($page, $this->rs_count, $nb_per_page, 10);
- $pager->html_prev = $this->html_prev;
- $pager->html_next = $this->html_next;
- $pager->var_page = 'page';
+ public function periodDisplay($page, $nb_per_page, $enclose_block='')
+ {
+ $echo = '';
+ if ($this->rs->isEmpty()) {
+ $echo .= '' .__('No period') .'
';
+ } else {
+ $pager = new dcPager($page, $this->rs_count, $nb_per_page, 10);
+ $pager->html_prev = $this->html_prev;
+ $pager->html_next = $this->html_next;
+ $pager->var_page = 'page';
- $html_block =
- ''.
- '
'.
- ''.
- ''.__('Name').' '.
- ''.__('Next update').' '.
- ''.__('Frequency').' '.
- ''.__('Publications').' '.
- ''.__('Entries').' '.
- ''.__('End date').' '.
- ' %s
'.
- '
' .
+ '
' .
+ '' .
+ '' . __('Name') . ' ' .
+ '' . __('Next update') . ' ' .
+ '' . __('Frequency') . ' ' .
+ '' . __('Publications') . ' ' .
+ '' . __('Entries') . ' ' .
+ '' . __('End date') . ' ' .
+ ' %s
' .
+ '
'.$nb_posts.' ';
+ return $echo;
+ }
+
+ private function periodLine()
+ {
+ $nb_posts = $this->rs->periodical->getPosts(['periodical_id' => $this->rs->periodical_id], true);
+ $nb_posts = $nb_posts->f(0);
+ $style = !$nb_posts ? ' offline' : '';
+ $posts_links = !$nb_posts ?
+ '0' :
+ '' . $nb_posts . ' ';
- $pub_int = in_array($this->rs->periodical_pub_int, $this->rs->periodical->getTimesCombo()) ?
- __(array_search($this->rs->periodical_pub_int, $this->rs->periodical->getTimesCombo())) : __('Unknow frequence');
+ $pub_int = in_array($this->rs->periodical_pub_int, $this->rs->periodical->getTimesCombo()) ?
+ __(array_search($this->rs->periodical_pub_int, $this->rs->periodical->getTimesCombo())) : __('Unknow frequence');
- $res =
- ''.
- ''.form::checkbox(array('periods[]'), $this->rs->periodical_id).' '.
- ''.html::escapeHTML($this->rs->periodical_title).' '.dt::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->periodical_curdt).' '.
- ''.$pub_int.' '.
- ''.$this->rs->periodical_pub_nb.' '.
- ''.$posts_links.' '.
- ''.dt::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->periodical_enddt).' '.
- ' ';
+ $res =
+ '' .
+ '' . form::checkbox(['periods[]'], $this->rs->periodical_id) . ' ' .
+ '' . html::escapeHTML($this->rs->periodical_title) . ' ' . dt::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->periodical_curdt) . ' ' .
+ '' . $pub_int . ' ' .
+ '' . $this->rs->periodical_pub_nb .' ' .
+ '' . $posts_links . ' ' .
+ '' . dt::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->periodical_enddt) . ' ' .
+ ' ';
- return $res;
- }
+ return $res;
+ }
- public function postDisplay($page, $nb_per_page, $base_url, $enclose_block='')
- {
- $echo = '';
- if ($this->rs->isEmpty()) {
- $echo .= ''.__('No entry').'
';
- }
- else {
- $pager = new dcPager($page, $this->rs_count, $nb_per_page,10);
- $pager->html_prev = $this->html_prev;
- $pager->html_next = $this->html_next;
- $pager->base_url = $base_url;
- $pager->var_page = 'page';
+ public function postDisplay($page, $nb_per_page, $base_url, $enclose_block='')
+ {
+ $echo = '';
+ if ($this->rs->isEmpty()) {
+ $echo .= '' . __('No entry') . '
';
+ } else {
+ $pager = new dcPager($page, $this->rs_count, $nb_per_page, 10);
+ $pager->html_prev = $this->html_prev;
+ $pager->html_next = $this->html_next;
+ $pager->base_url = $base_url;
+ $pager->var_page = 'page';
- $html_block =
- ''.
- ''.__('Title').' '.
- ''.__('Date').' '.
- ''.__('Category').' '.
- ''.__('Author').' '.
- ''.__('Status').' '.
- ''.__('Create date').' '.
- ' %s
';
+ $html_block =
+ '' .
+ '' . __('Title') . ' ' .
+ '' . __('Date') . ' ' .
+ '' . __('Category') . ' ' .
+ '' . __('Author') . ' ' .
+ '' . __('Status') . ' ' .
+ '' . __('Create date') . ' ' .
+ ' %s
';
- if ($enclose_block) {
- $html_block = sprintf($enclose_block, $html_block);
- }
+ if ($enclose_block) {
+ $html_block = sprintf($enclose_block, $html_block);
+ }
- $echo .= $pager->getLinks();
+ $echo .= $pager->getLinks();
- $blocks = explode('%s', $html_block);
+ $blocks = explode('%s', $html_block);
- $echo .= $blocks[0];
-
- while ($this->rs->fetch()) {
- $echo .= $this->postLine();
- }
-
- $echo .= $blocks[1];
+ $echo .= $blocks[0];
+
+ while ($this->rs->fetch()) {
+ $echo .= $this->postLine();
+ }
+
+ $echo .= $blocks[1];
- $echo .= $pager->getLinks();
- }
+ $echo .= $pager->getLinks();
+ }
- return $echo;
- }
-
- private function postLine()
- {
- if ($this->core->auth->check('categories', $this->core->blog->id)) {
- $cat_link = '%s ';
- }
- else {
- $cat_link = '%2$s';
- }
+ return $echo;
+ }
+
+ private function postLine()
+ {
+ if ($this->core->auth->check('categories', $this->core->blog->id)) {
+ $cat_link = '%s ';
+ } else {
+ $cat_link = '%2$s';
+ }
- if ($this->rs->cat_title) {
- $cat_title = sprintf(
- $cat_link,
- $this->rs->cat_id,
- html::escapeHTML($this->rs->cat_title)
- );
- }
- else {
- $cat_title = __('None');
- }
+ if ($this->rs->cat_title) {
+ $cat_title = sprintf(
+ $cat_link,
+ $this->rs->cat_id,
+ html::escapeHTML($this->rs->cat_title)
+ );
+ } else {
+ $cat_title = __('None');
+ }
- $img = ''.
- ''.form::checkbox(array('periodical_entries[]'), $this->rs->post_id,0).' '.
- ''.
- html::escapeHTML($this->rs->post_title).' '.dt::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->post_dt).' '.
- ''.$cat_title.' '.
- ''.$this->rs->user_id.' '.
- ''.$img_status.' '.$selected.' '.$protected.' '.$attach.' '.
- ''.dt::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->post_creadt, $this->rs->core->auth->getInfo('user_tz')).' '.
- ' ';
+ $res =
+ '' .
+ '' . form::checkbox(['periodical_entries[]'], $this->rs->post_id, 0) . ' ' .
+ '' .
+ html::escapeHTML($this->rs->post_title) . ' ' . dt::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->post_dt) . ' ' .
+ '' . $cat_title . ' ' .
+ '' . $this->rs->user_id . ' ' .
+ '' . $img_status . ' ' . $selected . ' ' . $protected . ' ' . $attach . ' ' .
+ '' . dt::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->post_creadt, $this->rs->core->auth->getInfo('user_tz')) . ' ' .
+ ' ';
- return $res;
- }
-}
+ return $res;
+ }
+}
\ No newline at end of file
diff --git a/inc/lib.periodical.socialmewriter.php b/inc/lib.periodical.socialmewriter.php
index 07fa993..01d395f 100644
--- a/inc/lib.periodical.socialmewriter.php
+++ b/inc/lib.periodical.socialmewriter.php
@@ -11,82 +11,80 @@
#
# -- END LICENSE BLOCK ------------------------------------
-if (!defined('DC_RC_PATH')){return;}
+if (!defined('DC_RC_PATH')){
+ return;
+}
# Add ability to send social messages when a feed is update
class periodicalSoCialMeWriter
{
- public static function soCialMeWriterMarker($rs)
- {
- $rs['periodicalcreate'] = array(
- 'name' => __('New periodical publication'),
- 'description' => __('When an entry is published on a period'),
- 'action' => array('Message','Link'),
- 'format' => array('Message'),
- 'wildcards' => array('Message' => array('%posttitle%','%posturl%','%shortposturl%','%postauthor%','%sitetitle%','%siteurl%','%shortsiteurl%'))
- );
- }
-
- public static function periodicalAfterPublishedPeriodicalEntry($core,$post,$period)
- {
- $key = 'periodicalcreate';
-
- # Is install
- if (!$core->plugins->moduleExists('soCialMe')) return;
-
- # Is active
- if (!$core->blog->settings->soCialMeWriter->active) return;
-
- # Load services
- $soCialMeWriter = new soCialMeWriter($core);
-
- # List of service per action
- $actions = $soCialMeWriter->getMarker('action');
-
- # List of format per type
- $formats = $soCialMeWriter->getMarker('format');
-
- # prepare data
- $shortposturl = soCialMeWriter::reduceURL($post->getURL());
- $shortposturl = $shortposturl ? $shortposturl : $post->getURL();
-
- $shortsiteurl = soCialMeWriter::reduceURL($core->blog->url);
- $shortsiteurl = $shortsiteurl ? $shortsiteurl : $core->blog->url;
-
- # sendMessage
- if (!empty($formats[$key]['Message']) && !empty($actions[$key]['Message']))
- {
- // parse message
- $message_txt = str_replace(
- array('%posttitle%','%posturl%','%shortposturl%','%postauthor%','%sitetitle%','%siteurl%','%shortsiteurl%'),
- array($post->post_title,$post->getURL(),$shortposturl,$post->getUserCN(),$core->blog->name,$core->blog->url,$shortsiteurl),
- $formats[$key]['Message']
- );
-
- // send message
- if (!empty($message_txt))
- {
- foreach($actions[$key]['Message'] as $service_id)
- {
- $soCialMeWriter->play($service_id,'Message','Content',$message_txt);
- }
- }
- }
-
- # sendLink
- if (!empty($actions[$key]['Link']))
- {
- foreach($actions[$key]['Link'] as $service_id)
- {
- $soCialMeWriter->play($service_id,'Link','Content',$post->post_title,$shortposturl);
- }
- }
-
- # sendData
- // not yet implemented
-
- #sendArticle
- // not yet implemented
- }
-}
-?>
\ No newline at end of file
+ public static function soCialMeWriterMarker($rs)
+ {
+ $rs['periodicalcreate'] = [
+ 'name' => __('New periodical publication'),
+ 'description' => __('When an entry is published on a period'),
+ 'action' => ['Message', 'Link'],
+ 'format' => ['Message'],
+ 'wildcards' => ['Message' => ['%posttitle%','%posturl%','%shortposturl%','%postauthor%','%sitetitle%','%siteurl%','%shortsiteurl%']]
+ ];
+ }
+
+ public static function periodicalAfterPublishedPeriodicalEntry($core, $post, $period)
+ {
+ $key = 'periodicalcreate';
+
+ # Is install
+ if (!$core->plugins->moduleExists('soCialMe')) {
+ return;
+ }
+ # Is active
+ if (!$core->blog->settings->soCialMeWriter->active) {
+ return;
+ }
+ # Load services
+ $soCialMeWriter = new soCialMeWriter($core);
+
+ # List of service per action
+ $actions = $soCialMeWriter->getMarker('action');
+
+ # List of format per type
+ $formats = $soCialMeWriter->getMarker('format');
+
+ # prepare data
+ $shortposturl = soCialMeWriter::reduceURL($post->getURL());
+ $shortposturl = $shortposturl ? $shortposturl : $post->getURL();
+
+ $shortsiteurl = soCialMeWriter::reduceURL($core->blog->url);
+ $shortsiteurl = $shortsiteurl ? $shortsiteurl : $core->blog->url;
+
+ # sendMessage
+ if (!empty($formats[$key]['Message']) && !empty($actions[$key]['Message'])) {
+ // parse message
+ $message_txt = str_replace(
+ ['%posttitle%', '%posturl%', '%shortposturl%', '%postauthor%', '%sitetitle%', '%siteurl%', '%shortsiteurl%'],
+ [$post->post_title, $post->getURL(), $shortposturl, $post->getUserCN(), $core->blog->name, $core->blog->url, $shortsiteurl],
+ $formats[$key]['Message']
+ );
+
+ // send message
+ if (!empty($message_txt)) {
+ foreach($actions[$key]['Message'] as $service_id) {
+ $soCialMeWriter->play($service_id, 'Message', 'Content', $message_txt);
+ }
+ }
+ }
+
+ # sendLink
+ if (!empty($actions[$key]['Link'])) {
+ foreach($actions[$key]['Link'] as $service_id) {
+ $soCialMeWriter->play($service_id, 'Link', 'Content', $post->post_title, $shortposturl);
+ }
+ }
+
+ # sendData
+ // not yet implemented
+
+ #sendArticle
+ // not yet implemented
+ }
+}
\ No newline at end of file
diff --git a/index.php b/index.php
index 72f6973..830c448 100644
--- a/index.php
+++ b/index.php
@@ -12,8 +12,7 @@
# -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_CONTEXT_ADMIN')) {
-
- return null;
+ return null;
}
dcPage::check('usage,contentadmin');
@@ -35,596 +34,577 @@ $part = isset($_REQUEST['part']) && $_REQUEST['part'] == 'period' ? 'period' : '
if ($part == 'period') {
- $starting_script = '';
-
- # Default value for period
- $period_id = null;
- $period_title = __('One post per day');
- $period_pub_nb = 1;
- $period_pub_int = 'day';
- $period_curdt = date('Y-m-d H:i:00', time());
- $period_enddt = date('Y-m-d H:i:00', time() + 31536000); //one year
-
- # Get period
- if (!empty($_REQUEST['period_id'])) {
- $rs = $per->getPeriods(array(
- 'periodical_id' => $_REQUEST['period_id']
- ));
- if ($rs->isEmpty()) {
- $core->error->add(__('This period does not exist.'));
- $period_id = null;
- }
- else {
- $period_id = $rs->periodical_id;
- $period_title = $rs->periodical_title;
- $period_pub_nb = $rs->periodical_pub_nb;
- $period_pub_int = $rs->periodical_pub_int;
- $period_curdt = date('Y-m-d H:i', strtotime($rs->periodical_curdt));
- $period_enddt = date('Y-m-d H:i', strtotime($rs->periodical_enddt));
-
- //todo load related posts
- }
- }
-
- # Set period
- if ($action == 'setperiod') {
-
- # Get POST values
- if (!empty($_POST['period_title'])) {
- $period_title = $_POST['period_title'];
- }
- if (!empty($_POST['period_pub_nb'])) {
- $period_pub_nb = abs((integer) $_POST['period_pub_nb']);
- }
- if (!empty($_POST['period_pub_int'])
- && in_array($_POST['period_pub_int'], $per->getTimesCombo())
- ) {
- $period_pub_int = $_POST['period_pub_int'];
- }
- if (!empty($_POST['period_curdt'])) {
- $period_curdt = date('Y-m-d H:i:00', strtotime($_POST['period_curdt']));
- }
- if (!empty($_POST['period_enddt'])) {
- $period_enddt = date('Y-m-d H:i:00', strtotime($_POST['period_enddt']));
- }
-
- # Check period title and dates
- $old_titles = $per->getPeriods(array(
- 'periodical_title' => $period_title
- ));
- if (!$old_titles->isEmpty()) {
- while($old_titles->fetch()) {
- if (!$period_id || $old_titles->periodical_id != $period_id) {
- $core->error->add(__('Period title is already taken'));
- }
- }
- }
- if (empty($period_title)) {
- $core->error->add(__('Period title is required'));
- }
- if (strtotime($period_curdt) > strtotime($period_enddt)) {
- $core->error->add(__('Start date must be older than end date'));
- }
-
- # If no error, set period
- if (!$core->error->flag()) {
-
- $cur = $per->openCursor();
- $cur->periodical_title = $period_title;
- $cur->periodical_curdt = $period_curdt;
- $cur->periodical_enddt = $period_enddt;
- $cur->periodical_pub_int = $period_pub_int;
- $cur->periodical_pub_nb = $period_pub_nb;
-
- # Update period
- if ($period_id) {
-
- $per->updPeriod($period_id, $cur);
-
- dcPage::addSuccessNotice(
- __('Period successfully updated.')
- );
- }
- # Create period
- else {
-
- $period_id = $per->addPeriod($cur);
-
- dcPage::addSuccessNotice(
- __('Period successfully created.')
- );
- }
-
- http::redirect(empty($_POST['redir']) ?
- $p_url.'&part=period&period_id='.$period_id.'#period' :
- $_POST['redir']
- );
- }
- }
-
- # Actions on related posts
- if (!$core->error->flag() && $period_id && $action && !empty($_POST['periodical_entries'])) {
-
- # Publish posts
- if ($action == 'publish') {
- try {
- foreach($_POST['periodical_entries'] as $id) {
- $id = (integer) $id;
- $core->blog->updPostStatus($id, 1);
- $per->delPost($id);
- }
-
- dcPage::addSuccessNotice(
- __('Entries successfully published.')
- );
-
- http::redirect(empty($_POST['redir']) ?
- $p_url.'&part=period&period_id='.$period_id.'#posts' :
- $_POST['redir']
- );
- }
- catch (Exception $e) {
- $core->error->add($e->getMessage());
- }
- }
-
- # Unpublish posts
- if ($action == 'unpublish') {
- try {
- foreach($_POST['periodical_entries'] as $id) {
- $id = (integer) $id;
- $core->blog->updPostStatus($id,0);
- $per->delPost($id);
- }
-
- dcPage::addSuccessNotice(
- __('Entries successfully unpublished.')
- );
-
- http::redirect(empty($_POST['redir']) ?
- $p_url.'&part=period&period_id='.$period_id.'#posts' :
- $_POST['redir']
- );
- }
- catch (Exception $e) {
- $core->error->add($e->getMessage());
- }
- }
-
- # Remove posts from periodical
- if ($action == 'remove_post_periodical') {
- try {
- foreach($_POST['periodical_entries'] as $id) {
- $id = (integer) $id;
- $per->delPost($id);
- }
-
- dcPage::addSuccessNotice(
- __('Entries successfully removed.')
- );
-
- http::redirect(empty($_POST['redir']) ?
- $p_url.'&part=period&period_id='.$period_id.'#posts' :
- $_POST['redir']
- );
- }
- catch (Exception $e) {
- $core->error->add($e->getMessage());
- }
- }
- }
-
- # Prepare combos for posts list
- if ($period_id) {
-
- try {
- # Getting categories
- $categories = $core->blog->getCategories(array('post_type' => 'post'));
-
- # Getting authors
- $users = $core->blog->getPostsUsers();
-
- # Getting dates
- $dates = $core->blog->getDates(array('type' => 'month'));
-
- # Getting langs
- $langs = $core->blog->getLangs();
- }
- catch (Exception $e) {
- $core->error->add($e->getMessage());
- }
- }
-
- # Creating filter combo boxes
- if ($period_id && !$core->error->flag()) {
-
- # Users combo
- $users_combo = array_merge(
- array('-' => ''),
- dcAdminCombos::getUsersCombo($users)
- );
-
- # Categories combo
- $categories_combo = array_merge(
- array(
- new formSelectOption('-', ''),
- new formSelectOption(__('(No cat)'), 'NULL')),
- dcAdminCombos::getCategoriesCombo($categories, false)
- );
- $categories_values = array();
- foreach ($categories_combo as $cat) {
- if (isset($cat->value)) {
- $categories_values[$cat->value] = true;
- }
- }
-
- # Status combo
- $status_combo = array_merge(
- array('-' => ''),
- dcAdminCombos::getPostStatusesCombo()
- );
-
- # Selection combo
- $selected_combo = array(
- '-' => '',
- __('Selected') => '1',
- __('Not selected') => '0'
- );
-
- # Attachments combo
- $attachment_combo = array(
- '-' => '',
- __('With attachments') => '1',
- __('Without attachments') => '0'
- );
-
- # Months combo
- $dt_m_combo = array_merge(
- array('-' => ''),
- dcAdminCombos::getDatesCombo($dates)
- );
-
- # Langs combo
- $lang_combo = array_merge(
- array('-' => ''),
- dcAdminCombos::getLangsCombo($langs, false)
- );
-
- # Sort_by combo
- $sortby_combo = array(
- __('Date') => 'post_dt',
- __('Title') => 'post_title',
- __('Category') => 'cat_title',
- __('Author') => 'user_id',
- __('Status') => 'post_status',
- __('Selected') => 'post_selected',
- __('Number of comments') => 'nb_comment',
- __('Number of trackbacks') => 'nb_trackback'
- );
-
- # order combo
- $order_combo = array(
- __('Descending') => 'desc',
- __('Ascending') => 'asc'
- );
-
- # parse filters
- $user_id = !empty($_GET['user_id']) ? $_GET['user_id'] : '';
- $cat_id = !empty($_GET['cat_id']) ? $_GET['cat_id'] : '';
- $status = isset($_GET['status']) ? $_GET['status'] : '';
- $selected = isset($_GET['selected']) ? $_GET['selected'] : '';
- $attachment = isset($_GET['attachment']) ? $_GET['attachment'] : '';
- $month = !empty($_GET['month']) ? $_GET['month'] : '';
- $lang = !empty($_GET['lang']) ? $_GET['lang'] : '';
- $sortby = !empty($_GET['sortby']) ? $_GET['sortby'] : 'post_dt';
- $order = !empty($_GET['order']) ? $_GET['order'] : 'desc';
-
- $show_filters = false;
-
- $page = !empty($_GET['page']) ? max(1, (integer) $_GET['page']) : 1;
- $nb_per_page = 30;
-
- if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
- if ($nb_per_page != $_GET['nb']) {
- $show_filters = true;
- }
- $nb_per_page = (integer) $_GET['nb'];
- }
-
- $params['limit'] = array((($page-1)*$nb_per_page), $nb_per_page);
- $params['no_content'] = true;
- $params['periodical_id'] = $period_id;
-
- # - User filter
- if ($user_id !== '' && in_array($user_id, $users_combo)) {
- $params['user_id'] = $user_id;
- $show_filters = true;
- }
- else {
- $user_id='';
- }
-
- # - Categories filter
- if ($cat_id !== '' && isset($categories_values[$cat_id])) {
- $params['cat_id'] = $cat_id;
- $show_filters = true;
- }
- else {
- $cat_id='';
- }
-
- # - Status filter
- if ($status !== '' && in_array($status, $status_combo)) {
- $params['post_status'] = $status;
- $show_filters = true;
- }
- else {
- $status='';
- }
-
- # - Selected filter
- if ($selected !== '' && in_array($selected, $selected_combo)) {
- $params['post_selected'] = $selected;
- $show_filters = true;
- }
- else {
- $selected='';
- }
-
- # - Selected filter
- if ($attachment !== '' && in_array($attachment, $attachment_combo)) {
- $params['media'] = $attachment;
- $params['link_type'] = 'attachment';
- $show_filters = true;
- }
- else {
- $attachment='';
- }
-
- # - Month filter
- if ($month !== '' && in_array($month, $dt_m_combo)) {
- $params['post_month'] = substr($month, 4, 2);
- $params['post_year'] = substr($month, 0, 4);
- $show_filters = true;
- }
- else {
- $month='';
- }
-
- # - Lang filter
- if ($lang !== '' && in_array($lang, $lang_combo)) {
- $params['post_lang'] = $lang;
- $show_filters = true;
- }
- else {
- $lang='';
- }
-
- # - Sortby and order filter
- if ($sortby !== '' && in_array($sortby, $sortby_combo)) {
- if ($order !== '' && in_array($order, $order_combo)) {
- $params['order'] = $sortby.' '.$order;
- }
- else {
- $order='desc';
- }
-
- if ($sortby != 'post_dt' || $order != 'desc') {
- $show_filters = true;
- }
- }
- else {
- $sortby='post_dt';
- $order='desc';
- }
-
- # Get posts
- try {
- $posts = $per->getPosts($params);
- $counter = $per->getPosts($params, true);
- $post_list = new adminPeriodicalList($core, $posts, $counter->f(0));
- }
- catch (Exception $e) {
- $core->error->add($e->getMessage());
- }
-
- $starting_script =
- dcPage::jsLoad(
- 'index.php?pf=periodical/js/postsfilter.js'
- ).
- '\n";
- }
-
- # Display
- echo '
- '.__('Periodical').' '.
- dcPage::jsLoad('index.php?pf=periodical/js/dates.js').
- $starting_script.
- dcPage::jsDatePicker().
- dcPage::jsPageTabs().
- '
- ';
-
- echo
- dcPage::breadcrumb(
- array(
- html::escapeHTML($core->blog->name) => '',
- __('Periodical') => $p_url.'&part=periods',
- (null === $period_id ? __('New period') : __('Edit period')) => ''
- )
- ).
- dcPage::notices();
-
- # Period form
- echo '
- ';
-
- if ($period_id && !$core->error->flag()) {
-
- # Actions combo box
- $combo_action = array();
- $combo_action[__('Entries')][__('Publish')] = 'publish';
- $combo_action[__('Entries')][__('Unpublish')] = 'unpublish';
- $combo_action[__('Periodical')][__('Remove from periodical')] = 'remove_post_periodical';
-
- $base_url = $p_url.
- '&period_id='.$period_id.
- '&part=period'.
- '&user_id='.$user_id.
- '&cat_id='.$cat_id.
- '&status='.$status.
- '&selected='.$selected.
- '&attachment='.$attachment.
- '&month='.$month.
- '&lang='.$lang.
- '&sortby='.$sortby.
- '&order='.$order.
- '&nb='.$nb_per_page.
- '&page=%s'.
- '#posts';
-
- echo '
- ';
-
- # Filters
- echo
- '
';
-
- # Posts list
- echo
- $post_list->postDisplay($page, $nb_per_page, $base_url,
- '
'
- );
-
- echo
- '
' . __('Periodical') . ' ' .
+ dcPage::jsLoad('index.php?pf=periodical/js/dates.js') .
+ $starting_script .
+ dcPage::jsDatePicker() .
+ dcPage::jsPageTabs() .
+ '
+ ';
+
+ echo
+ dcPage::breadcrumb(
+ [
+ html::escapeHTML($core->blog->name) => '',
+ __('Periodical') => $p_url . '&part=periods',
+ (null === $period_id ? __('New period') : __('Edit period')) => ''
+ ]
+ ) .
+ dcPage::notices();
+
+ # Period form
+ echo '
+ ';
+
+ if ($period_id && !$core->error->flag()) {
+
+ # Actions combo box
+ $combo_action = array();
+ $combo_action[__('Entries')][__('Publish')] = 'publish';
+ $combo_action[__('Entries')][__('Unpublish')] = 'unpublish';
+ $combo_action[__('Periodical')][__('Remove from periodical')] = 'remove_post_periodical';
+
+ $base_url = $p_url .
+ '&period_id=' .$period_id .
+ '&part=period' .
+ '&user_id=' . $user_id .
+ '&cat_id=' . $cat_id .
+ '&status=' . $status .
+ '&selected=' . $selected .
+ '&attachment=' . $attachment .
+ '&month=' . $month .
+ '&lang=' . $lang .
+ '&sortby=' . $sortby .
+ '&order=' . $order .
+ '&nb=' . $nb_per_page .
+ '&page=%s' .
+ '#posts';
+
+ echo '
+ ';
+
+ # Filters
+ echo
+ '
';
+
+ # Posts list
+ echo
+ $post_list->postDisplay($page, $nb_per_page, $base_url,
+ '
'
+ );
+
+ echo
+ '
'.__('Periodical').' '.
- dcPage::jsLoad(
- 'index.php?pf=periodical/js/periodsfilter.js'
- ).
- '\n".
- ''.
- ''.
+ # Display
+ echo
+ '' . __('Periodical') . ' ' .
+ dcPage::jsLoad(
+ 'index.php?pf=periodical/js/periodsfilter.js'
+ ) .
+ '\n" .
+ '' .
+ '' .
- dcPage::breadcrumb(
- array(
- html::escapeHTML($core->blog->name) => '',
- __('Periodical') => ''
- )
- ).
- dcPage::notices().
+ dcPage::breadcrumb(
+ [
+ html::escapeHTML($core->blog->name) => '',
+ __('Periodical') => ''
+ ]
+ ) .
+ dcPage::notices() .
- '
- '.__('New period').'
-
';
+ '
+ ' . __('New period') . '
+
';
- # Filter
- echo
- '';
+ '';
- # Posts list
- echo $period_list->periodDisplay($page, $nb_per_page,
- ''
+ );
}
@@ -835,10 +812,10 @@ dcPage::helpBlock('periodical');
# Page footer
echo
'
-'.__('Configuration').' -
-periodical - '.$core->plugins->moduleInfo('periodical', 'version').'
-' . __('Configuration') . ' -
+periodical - '. $core->plugins->moduleInfo('periodical', 'version') . '
+
-';
+';
\ No newline at end of file
diff --git a/locales/en/help/help.html b/locales/en/help/help.html
index 319e121..448a202 100644
--- a/locales/en/help/help.html
+++ b/locales/en/help/help.html
@@ -10,9 +10,8 @@
If you want some help or contribute to the plugin periodical, follow these links.
diff --git a/locales/en/resources.php b/locales/en/resources.php
index 996a871..71c7abb 100644
--- a/locales/en/resources.php
+++ b/locales/en/resources.php
@@ -12,8 +12,7 @@
# -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')) {
-
- return null;
+ return null;
}
-$__resources['help']['periodical'] = dirname(__FILE__).'/help/help.html';
+$__resources['help']['periodical'] = dirname(__FILE__) . '/help/help.html';
\ No newline at end of file
diff --git a/locales/fr/help/help.html b/locales/fr/help/help.html
index acda6a4..372d637 100644
--- a/locales/fr/help/help.html
+++ b/locales/fr/help/help.html
@@ -10,9 +10,8 @@
Si vous souhaitez plus d'aide ou apporter votre contribution à l'extension periodical, voici quelques liens utiles.
diff --git a/locales/fr/resources.php b/locales/fr/resources.php
index 996a871..71c7abb 100644
--- a/locales/fr/resources.php
+++ b/locales/fr/resources.php
@@ -12,8 +12,7 @@
# -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')) {
-
- return null;
+ return null;
}
-$__resources['help']['periodical'] = dirname(__FILE__).'/help/help.html';
+$__resources['help']['periodical'] = dirname(__FILE__) . '/help/help.html';
\ No newline at end of file
+' . __('Configuration') . ' -
+periodical - '. $core->plugins->moduleInfo('periodical', 'version') . '
+