diff --git a/_admin.php b/_admin.php index 2e19eb4..374770d 100644 --- a/_admin.php +++ b/_admin.php @@ -50,12 +50,9 @@ 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->adminurl->get('admin.plugin.periodical'), + dcPage::getPF('periodical/icon.png'), + preg_match('/' . preg_quote($core->adminurl->get('admin.plugin.periodical')) . '(&.*)?$/', $_SERVER['REQUEST_URI']), $core->auth->check('usage,contentadmin', $core->blog->id) ); diff --git a/_public.php b/_public.php index 00ee910..245c4e5 100644 --- a/_public.php +++ b/_public.php @@ -64,14 +64,12 @@ class publicPeriodical $cur_period = $core->con->openCursor($core->prefix . 'periodical'); while($periods->fetch()) { - # Check if period is ongoing $cur_tz = strtotime($periods->periodical_curdt); $end_tz = strtotime($periods->periodical_enddt); $now_tz = $now + dt::getTimeOffset($periods->periodical_tz, $now); - if ($now_tz > $cur_tz && $now_tz < $end_tz) { - + if ($cur_tz < $now_tz && $now_tz < $end_tz) { $last_nb = 0; $last_tz = $cur_tz; @@ -90,12 +88,10 @@ class publicPeriodical $limit += 1; } } catch (Exception $e) { - } # If period need update if ($limit > 0) { - # Get posts to publish related to this period $posts_params = []; $posts_params['periodical_id'] = $periods->periodical_id; @@ -103,13 +99,12 @@ class publicPeriodical $posts_params['order'] = $posts_order; $posts_params['limit'] = $limit * $max_nb; $posts_params['no_content'] = true; - $posts = $core->auth->sudo([$per, 'getPosts'], $posts_params); + $posts = $core->auth->sudo([$per, 'getPosts'], $posts_params); if (!$posts->isEmpty()) { $cur_post = $core->con->openCursor($core->prefix . 'post'); while($posts->fetch()) { - # Publish post with right date $cur_post->clean(); $cur_post->post_status = 1;