diff --git a/contrib/update_board3portal_103.xml b/contrib/update_board3portal_103.xml new file mode 100644 index 00000000..c21d3998 --- /dev/null +++ b/contrib/update_board3portal_103.xml @@ -0,0 +1,294 @@ + + + + +
+ http://opensource.org/licenses/gpl-license.php GNU General Public License v2 + board3 Portal - Update from version 1.0.0RC3 + board3 Portal - Update von Version 1.0.0RC3 + Adds a portal to your forum. +It has several boxes wich can be turned on an off in the ACP and certain settings. + +Included language files: +» English (en) +» German (de) + +More langages can be found in our International forums: http://www.board3.de/viewforum.php?f=13 + + + Fügt ein Portal deinem Forum hinzu. +Es hat diverse Boxen, die über das ACP an- / abgeschaltet und eingestellt werden können. + +Dieses Portal basiert auf dem phpBB3 Portal a.k.a canverPortal ( www.phpbb3portal.com ) + + i hope you get everything working. Further developement, new boxes for the portal or questions are welcome at www.board3.de + Ich hoffe ihr habt Spaß am Portal. Neuen Code, bzw neue Boxen und Fragen könnt ihr auf www.board3.de posten. + + + Ice + + avaren + http://www.board3.de + + + + Kevin + + saint_hh + http://www.board3.de + + + + (N/A) + nickvergessen@gmx.de + nickvergessen + http://mods.flying-bits.org/ + + + + Walter + w.bobeth@digitalfotografie-foren.de + Redbull254 + http://www.digitalfotografie-foren.de + + + + Christian + + Christian_N + http://www.phpbb-projekt.de + + + + 1.0.2 + + easy + + 3.0.2 + + + Board3 Portal supports MOD Version Check. To use this feature, this mod has to be installed. + Board3 Portal unterstützt MOD Version Check. Um dieses Feature zu nutzen, muss dieser Mod installiert sein. + subsilver2 + subsilver2 + Deutsch + Update instructions for Board3 Portal Version 1.0.1 + Updateanleitung für Board3 Portal Version 1.0.1 + Update instructions for Board3 Portal Version 1.0.0 + Updateanleitung für Board3 Portal Version 1.0.0 + Update instructions for Board3 Portal Version 1.0.0RC3 + Updateanleitung für Board3 Portal Version 1.0.0RC3 + Update instructions for Board3 Portal Version 1.0.0RC2 + Updateanleitung für Board3 Portal Version 1.0.0RC2 + Update instructions for Board3 Portal Version 1.0.0RC1 + Updateanleitung für Board3 Portal Version 1.0.0RC1 + Update instructions for Board3 Portal Version 0.2.1 + Updateanleitung für Board3 Portal Version 0.2.1 + Update instructions for Board3 Portal Version 0.2.0 + Updateanleitung für Board3 Portal Version 0.2.0 + Update instructions for Board3 Portal Version 0.1.0 + Updateanleitung für Board3 Portal Version 0.1.0 + Update instructions for phpBB3 Portal Version 1.2.2 + Updateanleitung für phpBB3 Portal Version 1.2.2 + Update instructions for phpBB3 Portal Version 1.1.0b + Updateanleitung für phpBB3 Portal Version 1.1.0b + German + Installations-Anleitung + Install instructions + + + + 2008-09-27 + 1.0.2 + + Release of version 1.0.2. (Cleanup) + ModX 1.2.1 + Some tiny fixes + + + Release der Version 1.0.2. (aufräumen) + ModX 1.2.1 + Ein paar kleine Fixe + + + + 2008-09-09 + 1.0.1 + + Release of version 1.0.1. + + + Release der Version 1.0.1. + + + + 2008-09-08 + 1.0.0 + + Release of version 1. + + + Release der Version 1. + + + + 2008-08-31 + 1.0.0RC3 + + Added switch to choose if "views" and "replies" should be diplayed in extra colums. To solve problems of distroyed layouts in compact view of news and announcements. e.g. with thin styles. + subsilver2 style rework + Bugfixes, view: http://www.board3.de/bugtracker/viewcat.php?c=9 + + + Spalten "Antworten" und "Zugriffe" können nun bei der kompakten Ansicht der aktuellen Beiträge / Bekanntmachungen ausgeblendet werden, um Probleme mit dem Layout bei z.B. schmalen Styles zu beheben. + subsilver2 wurde überarbeitet + Bugfixes, siehe: http://www.board3.de/bugtracker/viewcat.php?c=9 + + + + 2008-08-20 + 1.0.0RC2 + + Added new style / own CSS for easier style adaption - provided by Graphic Corner / Pfoti: www.graphic-corner.ch + Normal and inline attachments are displayed properly now in news / announcements text view. (Thanks to connect for the inline attachments solution) + Rework of the compact view of news / announcements. Topic folders and icons are now displayed. Complete style rework. + #unread link for news / announcements. (Thanks to Mike, for pushing us in the right direction) + Team bloc: possibillity to let non-system groups display + Support for handymans MOD Version Check. To use this feature, this mod has to be installed. + Update to ModX 1.2.0 - package structure adapted + Language files rework + PayPal block rework. All supported currencies can be chosen with a drop-down button. The amount to donate can be typed in. + Bugfixes, view: http://www.board3.de/bugtracker/viewcat.php?c=8 + + + Neuer Style mit eigener CSS, zur einfacheren Anpassbarkeit an andere Styles - erstellt von Graphic Corner / Pfoti: www.graphic-corner.ch + Normale und inline Dateianhänge werden nun in der aktuellen Beiträge / Bekanntmachungen Text-Ansicht richtig angezeigt. (Danke an connect für die inline attachments Lösung) + Die kompakte Ansicht der aktuellen Beiträge / Bekanntmachungen wurde komplett überarbeitet. "Topic Folders" und Themen Symbole werden nun angezeigt. Der Style wurde komplett überarbeitet. + #unread Links für aktuelle Beiträge / Bekanntmachungen. (Danke an Mike, der uns in die richtige Richtung geschubst hat ;) + Team block: auch nicht-system Gruppen können nun angezeigt werden + Handymans MOD Version Check wird nun unterstützt. Um den Update Check zu nutzen, muss dieser Mod installiert sein. + Update auf ModX 1.2.0 - Packet Struktur angepasst. + Sprachdateien wurden überarbeitet. (Danke an Thomas.d) + PayPal überarbeitet. Alle von PayPal unterstützen Währungen können nun über einen Drop-Down-Button ausgewählt werden. Die zu spendende Summe kann man nun selbst eintippen. + Bugfixes, siehe: http://www.board3.de/bugtracker/viewcat.php?c=8 + + + + 2008-05-03 + 1.0.0RC1 + + Many bugfixes, view: http://www.board3.de/bugtracker/viewcat.php?c=6 + Adaptions to phpBB 3.0.1 + The link block can be edited in the ACP: add, delete links and order position + BBCode is now allowed in welcome message + Two custom blocks added, which can be filled with BBCode or HTML in the ACP. To use with ads, videos, images, whatever. + Complete rework of the News / Announcements. Implemented a achive system and pagnition. You can choose if you want to have the first or the newest post displayed in news. + Full MSSQL support + Forum list on the portal added + Show "Portal page" in "who is online" + Option to disable user permission check for News / Announcements + Style changer added + Attachment block: display attachments from one or more specific forums + attachments permission check added + + + Viele bugfixes, siehe: http://www.board3.de/bugtracker/viewcat.php?c=6 + An phpBB 3.0.1 angepasst + Der Link Block kann nun über das ACP verwaltet werden: erstellen, löschen und positionieren von Links + Es kann nun BBCode in der Willkommens Nachricht benutzt werden + Zwei anpassbare Blöcke hinzu gefügt, die im ACP mit BBCode oder HTML gefüllt werden könen. Für Werbung, Videos, Bilder, was auch immer. + Aktuelle Beiträge und Bekanntmachungen wurden komplett überarbeitet. Es wurde ein Archivsystem und die Anzeige von Seitenzahlen hinzu gefügt. Zusätzlich kann man nun wählen ob man der Ersten oder Neuesten Beitrag bei den aktuellen Beiträgen angezeigt bekommen möchte. + MSSQL Unterstützung + Forum Liste auf dem Portal hinzugefügt + Anzeige "Betrachtet das Portal" in "Wer ist online?" + Option die Berechtigungsprüfung für aktuelle Beiträge / Bekanntmachungen ab zu stellen + "Mein Board-Style" hinzugefügt + Dateianhänge: Anhänge aus einem oder mehreren bestimmten Foren anzeigen lassen + Berechtigungsprüfung hinzugefügt. + + + + 2008-02-03 + 0.2.1 + + Fixed a news/announcements permissions bug + Fixed a bug when no news posts were viewable due to account permissions + Fixed a bug in announcements/news/polls due to shadow topics left after a topic is moved + No longer required to be a founder to update/install, just an admin with "board" permissions + + + Fehler in der Berechtigungserkennung bei den aktuellen Beiträgen / Bekanntmachungen gefixt + Fehler bei den aktuellen Beiträgen / Bekanntmachungen / Abstimmungen gefixt + Man braucht nun nicht mehr als Gründer angemeldet zu sein + + + + 2008-02-03 + 0.2.0 + + added subsilver2 templates (valid XHTML 1.0 Strict) + added upcoming birthdays, configurable in ACP / thanks to Kendoo + complete rewrite of the poll system - checking user permissions, multible polls and more + added forum names with link in news and announcements boxes + added portal log messages in the ACP + fixed several bugs: http://www.board3.de/bugtracker/viewcat.php?c=1 + updated the MySQL installer + + + subsilver2 Templates hinzugefügt (valid XHTML 1.0 Strict) + Kommende Geburtstage, konfigurierbar im ACP / vielen Dank an Kendoo + Die Umfragen wurden komplett überarbeitet - Benutzer Berechtigungen werden geprüft, mehrere Abstimmungen sind möglich und mehr + Foren Namen mit Link in die aktuellen Beiträge und Bekanntmachungen hinzugefügt + Portal Log Meldungen im ACP hinzugefügt + Diverse Bugs gefixt: http://www.board3.de/bugtracker/viewcat.php?c=1 + Der MySQL Installer wurde überarbeitet + + + + 2008-01-15 + 0.1.0 + + Changes from "phpBB3 Portal 1.1.0Beta" to "board3 Portal - based on phpBB3 Portal Version 1.0.0": + completet all missing ACP Control for several boxes + valid XHTML 1.0 Strict template + fixed several bugs + added several language variables + changed the language file path to /en/mods/ + updated the install instructions + updated the MySQL installer + + + Änderungen von "phpBB3 Portal 1.1.0Beta" zu "board3 Portal - based on phpBB3 Portal Version 1.0.0": + Die ACP Verwaltung für diverse Boxen komplettiert + valid XHTML 1.0 Strict Template + Diverse Bugs gefixt + Diverse Sprachvariablen hinzugefügt + Pfad für die Sprachdateien ins Mod System integriert + Die Installationanweisungen komplett überarbeitet + Den MySQL Installer komplett überarbeitet + + + + +
+ + + + + + + + + + + + + + + + + + Browse to install_portal/install.php and run the installer, after successfull installation delete the installer. + subsilver2 user: please replace the root/styles/subsilver2/template/portal/block/announcements_compact.html file with the one from this package + install_portal/install.php aufrufen und ausführen, nach erfolgreicher Installation löschen + subsilver2 User: bitte ersetze die root/styles/subsilver2/template/portal/block/announcements_compact.html Datei mit der aus diesem Paket + + \ No newline at end of file diff --git a/install.xml b/install.xml index 96c9f9fd..ca3bc77d 100644 --- a/install.xml +++ b/install.xml @@ -316,7 +316,9 @@ Deny from All - + diff --git a/root/includes/acp/acp_pallet.php b/root/includes/acp/acp_pallet.php index 52eada8c..8bb9469d 100644 --- a/root/includes/acp/acp_pallet.php +++ b/root/includes/acp/acp_pallet.php @@ -21,7 +21,7 @@ class acp_pallet define('IN_PALLET_ACP', true); - $block_sql = 'SELECT * FROM phpbb_portal_blocks ORDER BY block_position ASC , block_order ASC'; + $block_sql = 'SELECT * FROM ' . PORTAL_BLOCKS_TABLE . ' ORDER BY block_position ASC , block_order ASC'; $block_result = $db->sql_query($block_sql); $template->assign_vars(array( @@ -141,7 +141,7 @@ class acp_pallet $template->assign_block_vars('table_row', $table_row); } - $l_title = 'ACP_ATTACHMENT_LAYOUT'; + $l_title = 'ACP_PALLET_LAYOUT'; $this->tpl_name = 'acp_pallet'; $this->page_title = $l_title; diff --git a/root/includes/acp/acp_portal.php b/root/includes/acp/acp_portal.php index 42b9c957..5f2dbc07 100644 --- a/root/includes/acp/acp_portal.php +++ b/root/includes/acp/acp_portal.php @@ -44,21 +44,9 @@ class acp_portal 'title' => 'ACP_PORTAL_GENERAL_INFO', 'vars' => array( 'legend1' => 'ACP_PORTAL_GENERAL_SETTINGS', - 'portal_advanced_stat' => array('lang' => 'PORTAL_ADVANCED_STAT' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), - 'portal_search' => array('lang' => 'PORTAL_SEARCH' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), - 'portal_leaders' => array('lang' => 'PORTAL_LEADERS' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), 'portal_leaders_ext' => array('lang' => 'PORTAL_LEADERS_EXT' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), - 'portal_clock' => array('lang' => 'PORTAL_CLOCK' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), - 'portal_link_us' => array('lang' => 'PORTAL_LINK_US' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), - 'portal_birthdays' => array('lang' => 'PORTAL_BIRTHDAYS' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), 'portal_birthdays_ahead' => array('lang' => 'PORTAL_BIRTHDAYS_AHEAD' , 'validate' => 'int' , 'type' => 'text:3:3' , 'explain' => true), - 'portal_random_member' => array('lang' => 'PORTAL_RANDOM_MEMBER' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), 'portal_forum_index' => array('lang' => 'PORTAL_FORUM_INDEX' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), - 'portal_whois_online' => array('lang' => 'PORTAL_WHOIS_ONLINE' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), - 'portal_change_style' => array('lang' => 'PORTAL_CHANGE_STYLE' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), - 'portal_main_menu' => array('lang' => 'PORTAL_MAIN_MENU' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), - 'portal_user_menu' => array('lang' => 'PORTAL_USER_MENU' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), - 'portal_friends' => array('lang' => 'PORTAL_FRIENDS' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true), 'portal_max_online_friends' => array('lang' => 'PORTAL_MAX_ONLINE_FRIENDS' , 'validate' => 'int' , 'type' => 'text:3:3' , 'explain' => true), 'legend2' => 'ACP_PORTAL_COLUMN_WIDTH_SETTINGS', @@ -72,7 +60,6 @@ class acp_portal 'title' => 'ACP_PORTAL_NEWS_SETTINGS', 'vars' => array( 'legend1' => 'ACP_PORTAL_NEWS_SETTINGS', - 'portal_news' => array('lang' => 'PORTAL_NEWS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_news_style' => array('lang' => 'PORTAL_NEWS_STYLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_show_all_news' => array('lang' => 'PORTAL_SHOW_ALL_NEWS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_number_of_news' => array('lang' => 'PORTAL_NUMBER_OF_NEWS', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), @@ -90,7 +77,6 @@ class acp_portal 'title' => 'ACP_PORTAL_ANNOUNCE_SETTINGS', 'vars' => array( 'legend1' => 'ACP_PORTAL_ANNOUNCE_SETTINGS', - 'portal_announcements' => array('lang' => 'PORTAL_ANNOUNCEMENTS' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_announcements_style' => array('lang' => 'PORTAL_ANNOUNCEMENTS_STYLE' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_number_of_announcements' => array('lang' => 'PORTAL_NUMBER_OF_ANNOUNCEMENTS' , 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), 'portal_announcements_day' => array('lang' => 'PORTAL_ANNOUNCEMENTS_DAY' , 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), @@ -107,7 +93,6 @@ class acp_portal 'title' => 'ACP_PORTAL_RECENT_SETTINGS', 'vars' => array( 'legend1' => 'ACP_PORTAL_RECENT_SETTINGS', - 'portal_recent' => array('lang' => 'PORTAL_RECENT' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_max_topics' => array('lang' => 'PORTAL_MAX_TOPIC' , 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), 'portal_recent_title_limit' => array('lang' => 'PORTAL_RECENT_TITLE_LIMIT' , 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), 'portal_exclude_forums' => array('lang' => 'PORTAL_EXCLUDE_FORUM' , 'validate' => 'string', 'type' => 'text:10:200', 'explain' => true), @@ -119,7 +104,6 @@ class acp_portal 'title' => 'ACP_PORTAL_WORDGRAPH_SETTINGS', 'vars' => array( 'legend1' => 'ACP_PORTAL_WORDGRAPH_SETTINGS', - 'portal_wordgraph' => array('lang' => 'PORTAL_WORDGRAPH' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_wordgraph_max_words' => array('lang' => 'PORTAL_WORDGRAPH_MAX_WORDS' , 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), 'portal_wordgraph_word_counts' => array('lang' => 'PORTAL_WORDGRAPH_WORD_COUNTS' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_wordgraph_ratio' => array('lang' => 'PORTAL_WORDGRAPH_RATIO' , 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), @@ -131,8 +115,6 @@ class acp_portal 'title' => 'ACP_PORTAL_PAYPAL_SETTINGS', 'vars' => array( 'legend2' => 'ACP_PORTAL_PAYPAL_SETTINGS', - 'portal_pay_c_block' => array('lang' => 'PORTAL_PAY_C_BLOCK' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'portal_pay_s_block' => array('lang' => 'PORTAL_PAY_S_BLOCK' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_pay_acc' => array('lang' => 'PORTAL_PAY_ACC' , 'validate' => 'string', 'type' => 'text:25:100', 'explain' => true), ) ); @@ -142,7 +124,6 @@ class acp_portal 'title' => 'ACP_PORTAL_ATTACHMENTS_NUMBER_SETTINGS', 'vars' => array( 'legend1' => 'ACP_PORTAL_ATTACHMENTS_NUMBER_SETTINGS', - 'portal_attachments' => array('lang' => 'PORTAL_ATTACHMENTS' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_attachments_number' => array('lang' => 'PORTAL_ATTACHMENTS_NUMBER' , 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), 'portal_attachments_forum_ids' => array('lang' => 'PORTAL_ATTACHMENTS_FORUM_IDS', 'validate' => 'string', 'type' => 'text:10:200', 'explain' => true), ) @@ -153,7 +134,6 @@ class acp_portal 'title' => 'ACP_PORTAL_MEMBERS_SETTINGS', 'vars' => array( 'legend1' => 'ACP_PORTAL_MEMBERS_SETTINGS', - 'portal_latest_members' => array('lang' => 'PORTAL_LATEST_MEMBERS' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_max_last_member' => array('lang' => 'PORTAL_MAX_LAST_MEMBER' , 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), ) ); @@ -185,7 +165,6 @@ class acp_portal 'title' => 'ACP_PORTAL_MOST_POSTER_SETTINGS', 'vars' => array( 'legend1' => 'ACP_PORTAL_MOST_POSTER_SETTINGS', - 'portal_top_posters' => array('lang' => 'PORTAL_TOP_POSTERS' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_max_most_poster' => array('lang' => 'PORTAL_MAX_MOST_POSTER' , 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), ) ); @@ -196,7 +175,6 @@ class acp_portal 'title' => 'ACP_PORTAL_WELCOME_SETTINGS', 'vars' => array( 'legend1' => 'ACP_PORTAL_WELCOME_SETTINGS', - 'portal_welcome' => array('lang' => 'PORTAL_WELCOME' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_welcome_guest' => array('lang' => 'PORTAL_WELCOME_GUEST' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_welcome_intro' => array('lang' => 'PORTAL_WELCOME_INTRO' , 'type' => 'textarea:6:6', 'explain' => true), ) @@ -208,12 +186,10 @@ class acp_portal 'title' => 'ACP_PORTAL_CUSTOM_SETTINGS', 'vars' => array( 'legend1' => 'ACP_PORTAL_CUSTOM_SMALL_SETTINGS', - 'portal_custom_small' => array('lang' => 'PORTAL_CUSTOM_SMALL' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_custom_small_headline' => array('lang' => 'PORTAL_CUSTOM_SMALL_HEADLINE' , 'validate' => 'string', 'type' => 'text:40:200', 'explain' => true), 'portal_custom_small_bbcode' => array('lang' => 'PORTAL_CUSTOM_SMALL_BBCODE' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_custom_code_small' => array('lang' => 'PORTAL_CUSTOM_CODE_SMALL' , 'type' => 'textarea:6:6', 'explain' => true), 'legend2' => 'ACP_PORTAL_CUSTOM_CENTER_SETTINGS', - 'portal_custom_center' => array('lang' => 'PORTAL_CUSTOM_CENTER' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_custom_center_headline' => array('lang' => 'PORTAL_CUSTOM_CENTER_HEADLINE' , 'validate' => 'string', 'type' => 'text:40:200', 'explain' => true), 'portal_custom_center_bbcode' => array('lang' => 'PORTAL_CUSTOM_CENTER_BBCODE' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_custom_code_center' => array('lang' => 'PORTAL_CUSTOM_CODE_CENTER' , 'type' => 'textarea:6:6', 'explain' => true), @@ -226,7 +202,6 @@ class acp_portal 'title' => 'ACP_PORTAL_MINICALENDAR_SETTINGS', 'vars' => array( 'legend1' => 'ACP_PORTAL_MINICALENDAR_SETTINGS', - 'portal_minicalendar' => array('lang' => 'PORTAL_MINICALENDAR' , 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'portal_minicalendar_today_color' => array('lang' => 'PORTAL_MINICALENDAR_TODAY_COLOR' , 'validate' => 'string', 'type' => 'text:10:10', 'explain' => true), 'portal_minicalendar_day_link_color' => array('lang' => 'PORTAL_MINICALENDAR_DAY_LINK_COLOR' , 'validate' => 'string', 'type' => 'text:10:10', 'explain' => true), ) @@ -237,7 +212,6 @@ class acp_portal 'title' => 'ACP_PORTAL_LINKS_SETTINGS', 'vars' => array( 'legend1' => 'ACP_PORTAL_LINKS_SETTINGS', - 'portal_links' => array('lang' => 'PORTAL_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), ) ); // Links require preprocessing diff --git a/root/install_portal/install.php b/root/install_portal/install.php index a9b43c22..f9aba3a6 100644 --- a/root/install_portal/install.php +++ b/root/install_portal/install.php @@ -496,6 +496,29 @@ if( $user->data['is_registered'] && $auth->acl_get('a_') ) 'module_auth' => '' ); $modules->update_module_data($linkblock); + $palletlist = array( + 'module_basename' => 'pallet', + 'module_enabled' => 1, + 'module_display' => 1, + 'parent_id' => $portal['module_id'], + 'module_class' => 'acp', + 'module_langname' => 'ACP_PALLET_LIST_INFO', + 'module_mode' => 'list', + 'module_auth' => '' + ); + $modules->update_module_data($palletlist); + $portallayout = array( + 'module_basename' => 'pallet', + 'module_enabled' => 1, + 'module_display' => 1, + 'parent_id' => $portal['module_id'], + 'module_class' => 'acp', + 'module_langname' => 'ACP_PORTAL_LAYOUT_INFO', + 'module_mode' => 'layout', + 'module_auth' => '' + ); + $modules->update_module_data($portallayout); + // clear cache and log what we did $cache->purge(); add_log('admin', $page_title . ' installed'); @@ -855,7 +878,29 @@ if( $user->data['is_registered'] && $auth->acl_get('a_') ) 'module_mode' => 'links', 'module_auth' => '' ); - $modules->update_module_data($linkblock); + $modules->update_module_data($linkblock); + $palletlist = array( + 'module_basename' => 'pallet', + 'module_enabled' => 1, + 'module_display' => 1, + 'parent_id' => $portal['module_id'], + 'module_class' => 'acp', + 'module_langname' => 'ACP_PALLET_LIST_INFO', + 'module_mode' => 'list', + 'module_auth' => '' + ); + $modules->update_module_data($palletlist); + $portallayout = array( + 'module_basename' => 'pallet', + 'module_enabled' => 1, + 'module_display' => 1, + 'parent_id' => $portal['module_id'], + 'module_class' => 'acp', + 'module_langname' => 'ACP_PORTAL_LAYOUT_INFO', + 'module_mode' => 'layout', + 'module_auth' => '' + ); + $modules->update_module_data($portallayout); // clear cache and log what we did $cache->purge(); @@ -1010,6 +1055,8 @@ if( $user->data['is_registered'] && $auth->acl_get('a_') ) OR module_langname = 'ACP_PORTAL_MINICALENDAR_INFO' OR module_langname = 'ACP_PORTAL_CUSTOM_INFO' OR module_langname = 'ACP_PORTAL_LINKS_INFO' + OR module_langname = 'ACP_PALLET_LIST_INFO' + OR module_langname = 'ACP_PORTAL_LAYOUT_INFO' "; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) diff --git a/root/install_portal/schemas/_mysql_40_schema.sql b/root/install_portal/schemas/_mysql_40_schema.sql index 4839b3ed..0232e65e 100644 --- a/root/install_portal/schemas/_mysql_40_schema.sql +++ b/root/install_portal/schemas/_mysql_40_schema.sql @@ -11,7 +11,7 @@ CREATE TABLE phpbb_portal_config ( # Table: 'phpbb_portal_blocks' CREATE TABLE phpbb_portal_blocks ( - block_name varchar(64) NOT NULL, + block_name varbinary(64) NOT NULL, block_type tinyint(1) DEFAULT '0' NOT NULL, block_enabled tinyint(1) DEFAULT '0' NOT NULL, block_position tinyint(1) DEFAULT '0' NOT NULL, diff --git a/root/install_portal/schemas/_schema_data.sql b/root/install_portal/schemas/_schema_data.sql index baaa769e..5af7d233 100644 --- a/root/install_portal/schemas/_schema_data.sql +++ b/root/install_portal/schemas/_schema_data.sql @@ -53,6 +53,7 @@ INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_anno INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_links_array', 'a:2:{i:1;a:2:{s:4:"text";s:9:"Board3.de";s:3:"url";s:21:"http://www.board3.de/";}i:2;a:2:{s:4:"text";s:9:"phpBB.com";s:3:"url";s:21:"http://www.phpbb.com/";}}'); INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_show_announcements_replies_views', '1'); INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_show_news_replies_views', '1'); +INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_welcome_guest', '1'); # Inserts who have to be checked at a later stage of the block pallet feature # INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_leaders_ext', '0'); @@ -76,7 +77,6 @@ INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_foru # INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_top_posters', '1'); # # INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_leaders', '1'); # # INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_advanced_stat', '1'); # -# INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_welcome_guest', '1'); # # INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_birthdays', '1'); # # INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_search', '1'); # # INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_friends', '1'); # diff --git a/root/language/de/mods/info_acp_portal.php b/root/language/de/mods/info_acp_portal.php index f8c101fc..d0af05a8 100644 --- a/root/language/de/mods/info_acp_portal.php +++ b/root/language/de/mods/info_acp_portal.php @@ -37,6 +37,8 @@ $lang = array_merge($lang, array( 'ACP_PORTAL_CUSTOM_INFO' => 'Eigener Block', 'ACP_PORTAL_MINICALENDAR_INFO' => 'Mini-Kalender', 'ACP_PORTAL_LINKS_INFO' => 'Links', + 'ACP_PALLET_LIST_INFO' => 'Block Verwaltung', + 'ACP_PORTAL_LAYOUT_INFO' => 'Portal Layout', )); ?> \ No newline at end of file diff --git a/root/language/de/mods/lang_pallet_acp.php b/root/language/de/mods/lang_pallet_acp.php new file mode 100644 index 00000000..a08ae189 --- /dev/null +++ b/root/language/de/mods/lang_pallet_acp.php @@ -0,0 +1,40 @@ + 'Move left', + 'MOVE_RIGHT' => 'Move right', +)); + +?> \ No newline at end of file diff --git a/root/language/en/mods/info_acp_portal.php b/root/language/en/mods/info_acp_portal.php index a569bae1..421e7722 100644 --- a/root/language/en/mods/info_acp_portal.php +++ b/root/language/en/mods/info_acp_portal.php @@ -38,6 +38,8 @@ $lang = array_merge($lang, array( 'ACP_PORTAL_CUSTOM_INFO' => 'Custom block', 'ACP_PORTAL_MINICALENDAR_INFO' => 'Mini calendar', 'ACP_PORTAL_LINKS_INFO' => 'Links', + 'ACP_PALLET_LIST_INFO' => 'Pallet list', + 'ACP_PORTAL_LAYOUT_INFO' => 'Portal layout', )); ?> \ No newline at end of file diff --git a/root/portal.php b/root/portal.php index 7243a7f5..3f4d2d04 100644 --- a/root/portal.php +++ b/root/portal.php @@ -101,7 +101,7 @@ if ( $load_center != TRUE ) $where = ''; } -$block_sql = 'SELECT * FROM phpbb_portal_blocks WHERE block_enabled = 1'.$where.' ORDER BY block_position ASC , block_order ASC'; +$block_sql = 'SELECT * FROM ' . PORTAL_BLOCKS_TABLE . ' WHERE block_enabled = 1'.$where.' ORDER BY block_position ASC , block_order ASC'; $block_result = $db->sql_query($block_sql); while ($block_row = $db->sql_fetchrow($block_result))