diff --git a/acp/portal_module.php b/acp/portal_module.php index 91aa680a..3aa4c7ef 100644 --- a/acp/portal_module.php +++ b/acp/portal_module.php @@ -125,7 +125,7 @@ class portal_module if (!($this->c_class = $this->portal_helper->get_module($module_data['module_classname']))) { - continue; + break; } // Load module language @@ -445,7 +445,7 @@ class portal_module if (!($this->c_class = $this->portal_helper->get_module($module_classname))) { - continue; + break; } // Do not add modules that shouldn't be added diff --git a/config/routing.yml b/config/routing.yml index c00cfd17..e4f3f884 100644 --- a/config/routing.yml +++ b/config/routing.yml @@ -1,6 +1,7 @@ board3_portal_controller: path: /portal - defaults: { _controller: board3.portal.main:handle } + defaults: + _controller: 'board3.portal.main:handle' # This is currently not supported yet # board3_portal_pages_controller: @@ -10,4 +11,5 @@ board3_portal_controller: # Redirect to portal by default board3_portal_redirect_controller: path: / - defaults: { _controller: board3.portal.main:handle } + defaults: + _controller: 'board3.portal.main:handle' diff --git a/config/services.yml b/config/services.yml index 1a5e76df..64e5b52c 100644 --- a/config/services.yml +++ b/config/services.yml @@ -2,9 +2,8 @@ imports: - { resource: modules.yml } parameters: - board3.portal.config.table: %core.table_prefix%portal_config - board3.portal.modules.table: %core.table_prefix%portal_modules - + board3.portal.config.table: '%core.table_prefix%portal_config' + board3.portal.modules.table: '%core.table_prefix%portal_modules' services: board3.portal.main: class: board3\portal\controller\main diff --git a/includes/functions.php b/includes/functions.php index cae58016..dd75bed3 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -173,7 +173,7 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite $on_page = floor($start_item / $per_page) + 1; $url_delim = (strpos($base_url, '?') === false) ? '?' : '&'; - $page_string = ($on_page == 1) ? ''; if ($add_prevnext_text) { if ($on_page != 1) { - $page_string = '' . $user->lang['PREVIOUS'] . '  ' . $page_string; + $page_string = '' . $user->lang['PREVIOUS'] . '  ' . $page_string; } if ($on_page != $total_pages) { - $page_string .= '  ' . $user->lang['NEXT'] . ''; + $page_string .= '  ' . $user->lang['NEXT'] . ''; } } diff --git a/language/de/modules/portal_search_module.php b/language/de/modules/portal_search_module.php index de22aab8..a8366678 100644 --- a/language/de/modules/portal_search_module.php +++ b/language/de/modules/portal_search_module.php @@ -38,5 +38,5 @@ $lang = array_merge($lang, array( 'PORTAL_SEARCH_POSTS' => 'Beiträge', 'PORTAL_SEARCH_AUTHOR' => 'Autor', 'PORTAL_SEARCH_ENGINE' => 'Suchmaschinen', - 'PORTAL_SEARCH_ADV' => 'erweiterte Suche', + 'PORTAL_SEARCH_ADV' => 'Erweiterte Suche', )); diff --git a/modules/calendar.php b/modules/calendar.php index 4d134abe..60e5f6d4 100644 --- a/modules/calendar.php +++ b/modules/calendar.php @@ -188,8 +188,8 @@ class calendar extends module_base // output our general calendar bits $down = $this->mini_cal_month - 1; $up = $this->mini_cal_month + 1; - $prev_month = ''; - $next_month = ''; + $prev_month = ''; + $next_month = ''; $this->template->assign_block_vars('minical', array( 'S_SUNDAY_FIRST' => ($this->config['board3_sunday_first_' . $module_id]) ? true : false, diff --git a/modules/custom.php b/modules/custom.php index 5e2f58a3..89ad43bf 100644 --- a/modules/custom.php +++ b/modules/custom.php @@ -307,7 +307,7 @@ class custom extends module_base default: if (!isset($custom_code)) { - $custom_code = generate_text_for_edit($portal_config['board3_custom_' . $module_id . '_code'], $this->config['board3_custom_' . $module_id . '_uid'], ''); + $custom_code = generate_text_for_edit($portal_config['board3_custom_' . $module_id . '_code'], $this->config['board3_custom_' . $module_id . '_uid'], 0); } $this->template->assign_vars(array( diff --git a/styles/prosilver/template/event/overall_footer_breadcrumb_prepend.html b/styles/prosilver/template/event/overall_footer_breadcrumb_prepend.html index f1799efd..e5cb7b5e 100644 --- a/styles/prosilver/template/event/overall_footer_breadcrumb_prepend.html +++ b/styles/prosilver/template/event/overall_footer_breadcrumb_prepend.html @@ -1 +1 @@ -{L_PORTAL} +{L_PORTAL} diff --git a/styles/prosilver/template/event/overall_header_breadcrumb_prepend.html b/styles/prosilver/template/event/overall_header_breadcrumb_prepend.html index f1799efd..e5cb7b5e 100644 --- a/styles/prosilver/template/event/overall_header_breadcrumb_prepend.html +++ b/styles/prosilver/template/event/overall_header_breadcrumb_prepend.html @@ -1 +1 @@ -{L_PORTAL} +{L_PORTAL} diff --git a/styles/prosilver/template/portal/modules/announcements_center.html b/styles/prosilver/template/portal/modules/announcements_center.html index b36b384d..b905e3b5 100644 --- a/styles/prosilver/template/portal/modules/announcements_center.html +++ b/styles/prosilver/template/portal/modules/announcements_center.html @@ -18,7 +18,7 @@ {announcements.center_row.PAGINATION}
diff --git a/styles/prosilver/template/portal/modules/announcements_center_compact.html b/styles/prosilver/template/portal/modules/announcements_center_compact.html index b98ecf4a..6842c22e 100644 --- a/styles/prosilver/template/portal/modules/announcements_center_compact.html +++ b/styles/prosilver/template/portal/modules/announcements_center_compact.html @@ -42,9 +42,13 @@
+ + +
+
@@ -64,8 +68,8 @@
{announcements.center_row.REPLIES} {L_REPLIES}
{announcements.center_row.TOPIC_VIEWS} {L_VIEWS}
-
{L_LAST_POST}{L_POST_BY_AUTHOR} {announcements.center_row.USERNAME_FULL_LAST} {L_VIEW_LATEST_POST}{L_VIEW_LATEST_POST}
- {announcements.center_row.LAST_POST_TIME} +
{L_LAST_POST}{L_POST_BY_AUTHOR} {announcements.center_row.USERNAME_FULL_LAST} {L_VIEW_LATEST_POST}{L_VIEW_LATEST_POST}
+ {announcements.center_row.LAST_POST_TIME}
@@ -74,6 +78,7 @@
  • diff --git a/styles/prosilver/template/portal/modules/friends_side.html b/styles/prosilver/template/portal/modules/friends_side.html index f1c814e4..5ed04616 100644 --- a/styles/prosilver/template/portal/modules/friends_side.html +++ b/styles/prosilver/template/portal/modules/friends_side.html @@ -1,7 +1,7 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} {L_FRIENDS_ONLINE}
    - {b3p_friends_online.USERNAME_FULL}
    + {b3p_friends_online.USERNAME_FULL}
    {L_NO_FRIENDS_ONLINE}
    @@ -9,7 +9,7 @@
    {L_FRIENDS_OFFLINE}
    - {b3p_friends_offline.USERNAME_FULL}
    + {b3p_friends_offline.USERNAME_FULL}
    {L_NO_FRIENDS_OFFLINE} diff --git a/styles/prosilver/template/portal/modules/login_box_side.html b/styles/prosilver/template/portal/modules/login_box_side.html index ca4ce8cc..246f2d4c 100644 --- a/styles/prosilver/template/portal/modules/login_box_side.html +++ b/styles/prosilver/template/portal/modules/login_box_side.html @@ -17,6 +17,8 @@
    + {S_LOGIN_REDIRECT} + {S_FORM_TOKEN_LOGIN} {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
    - \ No newline at end of file + diff --git a/styles/prosilver/template/portal/modules/news_center.html b/styles/prosilver/template/portal/modules/news_center.html index fed71797..50bce624 100644 --- a/styles/prosilver/template/portal/modules/news_center.html +++ b/styles/prosilver/template/portal/modules/news_center.html @@ -3,7 +3,6 @@ -
    @@ -13,10 +12,15 @@
    -

    {NEWEST_POST_IMG}{READ_POST_IMG} {news.news_row.ATTACH_ICON_IMG} {L_VIEW_TOPIC_POLL} {news.news_row.TITLE}

    +

    + + {postrow.MINI_POST} + + {news.news_row.TITLE} +

    {news.news_row.PAGINATION}
      -
    • {news.POSTED_BY_TEXT} {L_POST_BY_AUTHOR}{L_COLON} {news.news_row.POSTER_FULL} » {news.news_row.TIME}
      • +
    • {news.POSTED_BY_TEXT} {L_POST_BY_AUTHOR}{L_COLON} {news.news_row.POSTER_FULL} » {news.news_row.TIME}
    • {L_FORUM}{L_COLON} {news.news_row.FORUM_NAME}
    @@ -34,7 +38,12 @@
    {L_TOPIC_VIEWS}{L_COLON} {news.news_row.TOPIC_VIEWS}  •  {L_COMMENTS}{L_COLON} {news.news_row.REPLIES}  •  {L_PORTAL_POST_REPLY} {news.news_row.OPEN}{news.news_row.L_READ_FULL}{news.news_row.CLOSE} -
    {L_BACK_TO_TOP}
    +
    + + + {L_BACK_TO_TOP} + +

    diff --git a/styles/prosilver/template/portal/modules/news_compact_center.html b/styles/prosilver/template/portal/modules/news_compact_center.html index ed0efebb..a221a9fd 100644 --- a/styles/prosilver/template/portal/modules/news_compact_center.html +++ b/styles/prosilver/template/portal/modules/news_compact_center.html @@ -42,14 +42,18 @@
    + + +
    +
    - - {L_POST_BY_AUTHOR} {news.news_row.POSTER_FULL} » {news.news_row.TIME} + + {L_POSTED} {L_POST_BY_AUTHOR} {news.news_row.POSTER_FULL} » {news.news_row.TIME}
    {L_FORUM}{L_COLON} {news.news_row.FORUM_NAME} @@ -61,8 +65,8 @@
    {news.news_row.REPLIES} {L_REPLIES}
    {news.news_row.TOPIC_VIEWS} {L_VIEWS}
    -
    {L_LAST_POST}{L_POST_BY_AUTHOR} {news.news_row.USERNAME_FULL_LAST} {L_VIEW_LATEST_POST}{L_VIEW_LATEST_POST}
    - {news.news_row.LAST_POST_TIME}     +
    {L_LAST_POST}{L_POST_BY_AUTHOR} {news.news_row.USERNAME_FULL_LAST} {L_VIEW_LATEST_POST}{L_VIEW_LATEST_POST}
    + {news.news_row.LAST_POST_TIME}
    • diff --git a/styles/prosilver/template/portal/modules/random_member_side.html b/styles/prosilver/template/portal/modules/random_member_side.html index e6d3d48b..a6e8c5a4 100644 --- a/styles/prosilver/template/portal/modules/random_member_side.html +++ b/styles/prosilver/template/portal/modules/random_member_side.html @@ -1,7 +1,7 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R}
    {random_member.USERNAME_FULL}
    - {random_member.AVATAR_IMG}
    + {random_member.AVATAR_IMG}
    {random_member.RANK_TITLE}
    {random_member.RANK_IMG}
    diff --git a/styles/prosilver/template/portal/modules/search_side.html b/styles/prosilver/template/portal/modules/search_side.html index bcc2ba84..966ae0a8 100644 --- a/styles/prosilver/template/portal/modules/search_side.html +++ b/styles/prosilver/template/portal/modules/search_side.html @@ -49,7 +49,7 @@ function qsearch_onSubmit() {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R}

    - +