diff --git a/root/adm/images/icon_left.gif b/root/adm/images/icon_left.gif index a17a6408..6bae0d5b 100644 Binary files a/root/adm/images/icon_left.gif and b/root/adm/images/icon_left.gif differ diff --git a/root/adm/images/icon_right.gif b/root/adm/images/icon_right.gif index d88b63f4..47900839 100644 Binary files a/root/adm/images/icon_right.gif and b/root/adm/images/icon_right.gif differ diff --git a/root/includes/acp/acp_pallet.php b/root/includes/acp/acp_pallet.php index 8bb9469d..abad7d4d 100644 --- a/root/includes/acp/acp_pallet.php +++ b/root/includes/acp/acp_pallet.php @@ -1,170 +1,170 @@ -add_lang('mods/lang_pallet_acp'); - - define('IN_PALLET_ACP', true); - - $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( - 'ICON_MOVE_RIGHT' => '' . $user->lang['MOVE_RIGHT'] . '', - 'ICON_MOVE_LEFT' => '' . $user->lang['MOVE_LEFT'] . '', - )); - - - $block_array = array(); - - while ($block_row = $db->sql_fetchrow($block_result)) - { - switch( $block_row['block_position'] ) - { - case 0: - $block_pos = 'left'; - $block_type = 'side'; - break; - case 1: - $block_pos = 'center'; - $block_type = ''; - break; - case 2: - $block_pos = 'right'; - $block_type = 'side'; - break; - } - - $block_array[$block_pos][$block_row['block_order']] = array( - 'block_name' => ( $block_type == '' ) ? $block_row['block_name'] : $block_row['block_name'] . '_' . $block_type, - 'block_enabled' => $block_row['block_enabled'], - ); - } - - $left_count = sizeof($block_array['left']); - $center_count = sizeof($block_array['center']); - $right_count = sizeof($block_array['right']); - - $table_length = max($left_count, $center_count, $right_count); - - for($i = 0; $i < $table_length; $i++) { - $table_row = array( - 'LEFT' => '', - 'S_LEFT_ENALBED' => false, - 'CENTER' => '', - 'S_CENTER_ENALBED' => false, - 'RIGHT' => '', - 'S_RIGHT_ENALBED' => false, - 'S_LEFT_FIRST_ROW' => false, - 'S_LEFT_LAST_ROW' => false, - 'S_CENTER_FIRST_ROW' => false, - 'S_CENTER_LAST_ROW' => false, - 'S_RIGHT_FIRST_ROW' => false, - 'S_RIGHT_LAST_ROW' => false, - ); - - if( isset( $block_array['left'][$i] ) ) - { - if( $i == 0 ) - { - $table_row['S_LEFT_FIRST_ROW'] = true; - } - - if( $i == $left_count-1 ) - { - $table_row['S_LEFT_LAST_ROW'] = true; - } - - if ( $block_array['left'][$i]['block_enabled'] ) - { - $table_row['S_LEFT_ENABLED'] = true; - } - - $table_row['LEFT'] = $block_array['left'][$i]['block_name']; - } - - if( isset( $block_array['center'][$i] ) ) - { - if( $i == 0 ) - { - $table_row['S_CENTER_FIRST_ROW'] = true; - } - - if( $i == $center_count-1 ) - { - $table_row['S_CENTER_LAST_ROW'] = true; - } - - if ( $block_array['center'][$i]['block_enabled'] ) - { - $table_row['S_CENTER_ENABLED'] = true; - } - - $table_row['CENTER'] = $block_array['center'][$i]['block_name']; - } - - if( isset( $block_array['right'][$i] ) ) - { - if( $i == 0 ) - { - $table_row['S_RIGHT_FIRST_ROW'] = true; - } - - if( $i == $right_count-1 ) - { - $table_row['S_RIGHT_LAST_ROW'] = true; - } - - if ( $block_array['right'][$i]['block_enabled'] ) - { - $table_row['S_RIGHT_ENABLED'] = true; - } - - $table_row['RIGHT'] = $block_array['right'][$i]['block_name']; - } - - $template->assign_block_vars('table_row', $table_row); - } - - $l_title = 'ACP_PALLET_LAYOUT'; - - $this->tpl_name = 'acp_pallet'; - $this->page_title = $l_title; - - $template->assign_var('S_LAYOUT_SETTINGS', true); - - - - /*$template->assign_vars(array( - 'L_TITLE' => $user->lang[$l_title], - 'L_TITLE_EXPLAIN' => $user->lang[$l_title . '_EXPLAIN'], - 'U_ACTION' => $this->u_action) - ); - - $template->assign_block_vars('options', array( - 'KEY' => $config_key, - 'TITLE' => (isset($user->lang[$vars['lang']])) ? $user->lang[$vars['lang']] : $vars['lang'], - 'S_EXPLAIN' => $vars['explain'], - 'TITLE_EXPLAIN' => $l_explain, - 'CONTENT' => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars), - ) - );*/ - } -} - +add_lang('mods/lang_pallet_acp'); + + define('IN_PALLET_ACP', true); + + $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( + 'ICON_MOVE_RIGHT' => '' . $user->lang['MOVE_RIGHT'] . '', + 'ICON_MOVE_LEFT' => '' . $user->lang['MOVE_LEFT'] . '', + )); + + + $block_array = array(); + + while ($block_row = $db->sql_fetchrow($block_result)) + { + switch( $block_row['block_position'] ) + { + case 0: + $block_pos = 'left'; + $block_type = 'side'; + break; + case 1: + $block_pos = 'center'; + $block_type = ''; + break; + case 2: + $block_pos = 'right'; + $block_type = 'side'; + break; + } + + $block_array[$block_pos][$block_row['block_order']] = array( + 'block_name' => ( $block_type == '' ) ? $block_row['block_name'] : $block_row['block_name'] . '_' . $block_type, + 'block_enabled' => $block_row['block_enabled'], + ); + } + + $left_count = sizeof($block_array['left']); + $center_count = sizeof($block_array['center']); + $right_count = sizeof($block_array['right']); + + $table_length = max($left_count, $center_count, $right_count); + + for($i = 0; $i < $table_length; $i++) { + $table_row = array( + 'LEFT' => '', + 'S_LEFT_ENALBED' => false, + 'CENTER' => '', + 'S_CENTER_ENALBED' => false, + 'RIGHT' => '', + 'S_RIGHT_ENALBED' => false, + 'S_LEFT_FIRST_ROW' => false, + 'S_LEFT_LAST_ROW' => false, + 'S_CENTER_FIRST_ROW' => false, + 'S_CENTER_LAST_ROW' => false, + 'S_RIGHT_FIRST_ROW' => false, + 'S_RIGHT_LAST_ROW' => false, + ); + + if( isset( $block_array['left'][$i] ) ) + { + if( $i == 0 ) + { + $table_row['S_LEFT_FIRST_ROW'] = true; + } + + if( $i == $left_count-1 ) + { + $table_row['S_LEFT_LAST_ROW'] = true; + } + + if ( $block_array['left'][$i]['block_enabled'] ) + { + $table_row['S_LEFT_ENABLED'] = true; + } + + $table_row['LEFT'] = $block_array['left'][$i]['block_name']; + } + + if( isset( $block_array['center'][$i] ) ) + { + if( $i == 0 ) + { + $table_row['S_CENTER_FIRST_ROW'] = true; + } + + if( $i == $center_count-1 ) + { + $table_row['S_CENTER_LAST_ROW'] = true; + } + + if ( $block_array['center'][$i]['block_enabled'] ) + { + $table_row['S_CENTER_ENABLED'] = true; + } + + $table_row['CENTER'] = $block_array['center'][$i]['block_name']; + } + + if( isset( $block_array['right'][$i] ) ) + { + if( $i == 0 ) + { + $table_row['S_RIGHT_FIRST_ROW'] = true; + } + + if( $i == $right_count-1 ) + { + $table_row['S_RIGHT_LAST_ROW'] = true; + } + + if ( $block_array['right'][$i]['block_enabled'] ) + { + $table_row['S_RIGHT_ENABLED'] = true; + } + + $table_row['RIGHT'] = $block_array['right'][$i]['block_name']; + } + + $template->assign_block_vars('table_row', $table_row); + } + + $l_title = 'ACP_PALLET_LAYOUT'; + + $this->tpl_name = 'acp_pallet'; + $this->page_title = $l_title; + + $template->assign_var('S_LAYOUT_SETTINGS', true); + + + + /*$template->assign_vars(array( + 'L_TITLE' => $user->lang[$l_title], + 'L_TITLE_EXPLAIN' => $user->lang[$l_title . '_EXPLAIN'], + 'U_ACTION' => $this->u_action) + ); + + $template->assign_block_vars('options', array( + 'KEY' => $config_key, + 'TITLE' => (isset($user->lang[$vars['lang']])) ? $user->lang[$vars['lang']] : $vars['lang'], + 'S_EXPLAIN' => $vars['explain'], + 'TITLE_EXPLAIN' => $l_explain, + 'CONTENT' => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars), + ) + );*/ + } +} + ?> \ No newline at end of file diff --git a/root/includes/acp/info/acp_pallet.php b/root/includes/acp/info/acp_pallet.php index ca12eefe..3a8f9a53 100644 --- a/root/includes/acp/info/acp_pallet.php +++ b/root/includes/acp/info/acp_pallet.php @@ -1,32 +1,32 @@ - 'acp_pallet', - 'title' => 'ACP_PALLET_INFO', - 'version' => '1.0.0', - 'modes' => array( - 'list' => array('title' => 'ACP_PALLET_LIST_INFO', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')), - 'layout' => array('title' => 'ACP_PORTAL_LAYOUT_INFO', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')), - ), - ); - } -} - + 'acp_pallet', + 'title' => 'ACP_PALLET_INFO', + 'version' => '1.0.0', + 'modes' => array( + 'list' => array('title' => 'ACP_PALLET_LIST_INFO', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')), + 'layout' => array('title' => 'ACP_PORTAL_LAYOUT_INFO', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')), + ), + ); + } +} + ?> \ No newline at end of file diff --git a/root/install_portal/schemas/_firebird_schema.sql b/root/install_portal/schemas/_firebird_schema.sql index 3a80ca6f..375a95bc 100644 --- a/root/install_portal/schemas/_firebird_schema.sql +++ b/root/install_portal/schemas/_firebird_schema.sql @@ -1,5 +1,5 @@ # -# $Id: $ +# $Id$ # diff --git a/root/install_portal/schemas/_mssql_schema.sql b/root/install_portal/schemas/_mssql_schema.sql index 33ef1dbd..6756ed40 100644 --- a/root/install_portal/schemas/_mssql_schema.sql +++ b/root/install_portal/schemas/_mssql_schema.sql @@ -1,6 +1,6 @@ /* - $Id: $ + $Id$ */ diff --git a/root/install_portal/schemas/_mysql_40_schema.sql b/root/install_portal/schemas/_mysql_40_schema.sql index 0232e65e..76c061dc 100644 --- a/root/install_portal/schemas/_mysql_40_schema.sql +++ b/root/install_portal/schemas/_mysql_40_schema.sql @@ -1,5 +1,5 @@ # -# $Id: $ +# $Id$ # # Table: 'phpbb_portal_config' diff --git a/root/install_portal/schemas/_mysql_41_schema.sql b/root/install_portal/schemas/_mysql_41_schema.sql index 4c25ca57..1effb8be 100644 --- a/root/install_portal/schemas/_mysql_41_schema.sql +++ b/root/install_portal/schemas/_mysql_41_schema.sql @@ -1,5 +1,5 @@ # -# $Id: $ +# $Id$ # # Table: 'phpbb_portal_config' diff --git a/root/install_portal/schemas/_oracle_schema.sql b/root/install_portal/schemas/_oracle_schema.sql index 3a813635..17953d3c 100644 --- a/root/install_portal/schemas/_oracle_schema.sql +++ b/root/install_portal/schemas/_oracle_schema.sql @@ -1,54 +1,54 @@ -/* - - $Id: $ - -*/ - -/* - This first section is optional, however its probably the best method - of running phpBB on Oracle. If you already have a tablespace and user created - for phpBB you can leave this section commented out! - - The first set of statements create a phpBB tablespace and a phpBB user, - make sure you change the password of the phpBB user before you run this script!! -*/ - -/* -CREATE TABLESPACE "PHPBB" - LOGGING - DATAFILE 'E:\ORACLE\ORADATA\LOCAL\PHPBB.ora' - SIZE 10M - AUTOEXTEND ON NEXT 10M - MAXSIZE 100M; - -CREATE USER "PHPBB" - PROFILE "DEFAULT" - IDENTIFIED BY "phpbb_password" - DEFAULT TABLESPACE "PHPBB" - QUOTA UNLIMITED ON "PHPBB" - ACCOUNT UNLOCK; - -GRANT ANALYZE ANY TO "PHPBB"; -GRANT CREATE SEQUENCE TO "PHPBB"; -GRANT CREATE SESSION TO "PHPBB"; -GRANT CREATE TABLE TO "PHPBB"; -GRANT CREATE TRIGGER TO "PHPBB"; -GRANT CREATE VIEW TO "PHPBB"; -GRANT "CONNECT" TO "PHPBB"; - -COMMIT; -DISCONNECT; - -CONNECT phpbb/phpbb_password; -*/ -/* - Table: 'phpbb_portal_config' -*/ -CREATE TABLE phpbb_portal_config ( - config_name varchar2(255) DEFAULT '' , - config_value clob DEFAULT '' , - CONSTRAINT pk_phpbb_portal_config PRIMARY KEY (config_name) -) -/ - - +/* + + $Id$ + +*/ + +/* + This first section is optional, however its probably the best method + of running phpBB on Oracle. If you already have a tablespace and user created + for phpBB you can leave this section commented out! + + The first set of statements create a phpBB tablespace and a phpBB user, + make sure you change the password of the phpBB user before you run this script!! +*/ + +/* +CREATE TABLESPACE "PHPBB" + LOGGING + DATAFILE 'E:\ORACLE\ORADATA\LOCAL\PHPBB.ora' + SIZE 10M + AUTOEXTEND ON NEXT 10M + MAXSIZE 100M; + +CREATE USER "PHPBB" + PROFILE "DEFAULT" + IDENTIFIED BY "phpbb_password" + DEFAULT TABLESPACE "PHPBB" + QUOTA UNLIMITED ON "PHPBB" + ACCOUNT UNLOCK; + +GRANT ANALYZE ANY TO "PHPBB"; +GRANT CREATE SEQUENCE TO "PHPBB"; +GRANT CREATE SESSION TO "PHPBB"; +GRANT CREATE TABLE TO "PHPBB"; +GRANT CREATE TRIGGER TO "PHPBB"; +GRANT CREATE VIEW TO "PHPBB"; +GRANT "CONNECT" TO "PHPBB"; + +COMMIT; +DISCONNECT; + +CONNECT phpbb/phpbb_password; +*/ +/* + Table: 'phpbb_portal_config' +*/ +CREATE TABLE phpbb_portal_config ( + config_name varchar2(255) DEFAULT '' , + config_value clob DEFAULT '' , + CONSTRAINT pk_phpbb_portal_config PRIMARY KEY (config_name) +) +/ + + diff --git a/root/install_portal/schemas/_postgres_schema.sql b/root/install_portal/schemas/_postgres_schema.sql index 3bf0d9ef..a98810b7 100644 --- a/root/install_portal/schemas/_postgres_schema.sql +++ b/root/install_portal/schemas/_postgres_schema.sql @@ -1,95 +1,95 @@ -/* - - $Id: $ - -*/ - -BEGIN; - -/* - Domain definition -*/ -CREATE DOMAIN varchar_ci AS varchar(255) NOT NULL DEFAULT ''::character varying; - -/* - Operation Functions -*/ -CREATE FUNCTION _varchar_ci_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) = LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_not_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) != LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_less_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) < LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_less_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) <= LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_greater_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) > LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_greater_equals(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) >= LOWER($2)' LANGUAGE SQL STRICT; - -/* - Operators -*/ -CREATE OPERATOR <( - PROCEDURE = _varchar_ci_less_than, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); - -CREATE OPERATOR <=( - PROCEDURE = _varchar_ci_less_equal, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); - -CREATE OPERATOR >( - PROCEDURE = _varchar_ci_greater_than, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); - -CREATE OPERATOR >=( - PROCEDURE = _varchar_ci_greater_equals, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); - -CREATE OPERATOR <>( - PROCEDURE = _varchar_ci_not_equal, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR =( - PROCEDURE = _varchar_ci_equal, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - HASHES, - MERGES, - SORT1= <); - -/* - Table: 'phpbb_portal_config' -*/ -CREATE TABLE phpbb_portal_config ( - config_name varchar(255) DEFAULT '' NOT NULL, - config_value TEXT DEFAULT '' NOT NULL, - PRIMARY KEY (config_name) -); - - - +/* + + $Id$ + +*/ + +BEGIN; + +/* + Domain definition +*/ +CREATE DOMAIN varchar_ci AS varchar(255) NOT NULL DEFAULT ''::character varying; + +/* + Operation Functions +*/ +CREATE FUNCTION _varchar_ci_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) = LOWER($2)' LANGUAGE SQL STRICT; +CREATE FUNCTION _varchar_ci_not_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) != LOWER($2)' LANGUAGE SQL STRICT; +CREATE FUNCTION _varchar_ci_less_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) < LOWER($2)' LANGUAGE SQL STRICT; +CREATE FUNCTION _varchar_ci_less_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) <= LOWER($2)' LANGUAGE SQL STRICT; +CREATE FUNCTION _varchar_ci_greater_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) > LOWER($2)' LANGUAGE SQL STRICT; +CREATE FUNCTION _varchar_ci_greater_equals(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) >= LOWER($2)' LANGUAGE SQL STRICT; + +/* + Operators +*/ +CREATE OPERATOR <( + PROCEDURE = _varchar_ci_less_than, + LEFTARG = varchar_ci, + RIGHTARG = varchar_ci, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); + +CREATE OPERATOR <=( + PROCEDURE = _varchar_ci_less_equal, + LEFTARG = varchar_ci, + RIGHTARG = varchar_ci, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); + +CREATE OPERATOR >( + PROCEDURE = _varchar_ci_greater_than, + LEFTARG = varchar_ci, + RIGHTARG = varchar_ci, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); + +CREATE OPERATOR >=( + PROCEDURE = _varchar_ci_greater_equals, + LEFTARG = varchar_ci, + RIGHTARG = varchar_ci, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); + +CREATE OPERATOR <>( + PROCEDURE = _varchar_ci_not_equal, + LEFTARG = varchar_ci, + RIGHTARG = varchar_ci, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR =( + PROCEDURE = _varchar_ci_equal, + LEFTARG = varchar_ci, + RIGHTARG = varchar_ci, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + HASHES, + MERGES, + SORT1= <); + +/* + Table: 'phpbb_portal_config' +*/ +CREATE TABLE phpbb_portal_config ( + config_name varchar(255) DEFAULT '' NOT NULL, + config_value TEXT DEFAULT '' NOT NULL, + PRIMARY KEY (config_name) +); + + + COMMIT; \ No newline at end of file diff --git a/root/install_portal/schemas/_schema_data.sql b/root/install_portal/schemas/_schema_data.sql index 486ab5c5..a2ac99f3 100644 --- a/root/install_portal/schemas/_schema_data.sql +++ b/root/install_portal/schemas/_schema_data.sql @@ -1,5 +1,5 @@ # -# $Id: schema_data.sql,v 1.257 2007/09/20 21:19:00 stoffel04 Exp $ +# $Id$ # # POSTGRES BEGIN # diff --git a/root/install_portal/schemas/_sqlite_schema.sql b/root/install_portal/schemas/_sqlite_schema.sql index f5c0c1cb..885df1ad 100644 --- a/root/install_portal/schemas/_sqlite_schema.sql +++ b/root/install_portal/schemas/_sqlite_schema.sql @@ -1,5 +1,5 @@ # -# $Id: $ +# $Id$ # BEGIN TRANSACTION; diff --git a/root/language/en/mods/lang_pallet_acp.php b/root/language/en/mods/lang_pallet_acp.php index 1fffce2d..a6b5ac54 100644 --- a/root/language/en/mods/lang_pallet_acp.php +++ b/root/language/en/mods/lang_pallet_acp.php @@ -1,51 +1,51 @@ - 'Block management', - 'TITLE' => 'Block management', - 'TITLE_EXPLAIN' => 'You can maintain your blocks here: edit, add, move and delete.', - 'PALLET_LAYOUT' => 'Block layout', - 'COLUMN_LEFT' => 'Left column', - 'COLUMN_CENTER' => 'Center column', - 'COLUMN_RIGHT' => 'Right column', - 'PALLET_KEY' => 'Caption', - 'KEY' => 'Function', - 'ENABLE' => 'Edit', - 'DISABLE' => 'Disable', - 'MOVE_LEFT' => 'Move left', - 'MOVE_RIGHT' => 'Move right', -)); - + 'Block management', + 'TITLE' => 'Block management', + 'TITLE_EXPLAIN' => 'You can maintain your blocks here: edit, add, move and delete.', + 'PALLET_LAYOUT' => 'Block layout', + 'COLUMN_LEFT' => 'Left column', + 'COLUMN_CENTER' => 'Center column', + 'COLUMN_RIGHT' => 'Right column', + 'PALLET_KEY' => 'Caption', + 'KEY' => 'Function', + 'ENABLE' => 'Edit', + 'DISABLE' => 'Disable', + 'MOVE_LEFT' => 'Move left', + 'MOVE_RIGHT' => 'Move right', +)); + ?> \ No newline at end of file diff --git a/root/portal/block/clock.php b/root/portal/block/clock.php index 42aa3063..f9cee3c3 100644 --- a/root/portal/block/clock.php +++ b/root/portal/block/clock.php @@ -1,26 +1,26 @@ -filename['clock_block'])) -{ - $template->set_filenames(array( - 'clock_block' => 'portal/block/clock.html') - ); -} - -$block_temp = $template->assign_display('clock_block'); - -$template->assign_block_vars('portal_column_'.$block_pos, array( - 'BLOCK_DATA' => $block_temp) -); -unset( $block_temp ); +filename['clock_block'])) +{ + $template->set_filenames(array( + 'clock_block' => 'portal/block/clock.html') + ); +} + +$block_temp = $template->assign_display('clock_block'); + +$template->assign_block_vars('portal_column_'.$block_pos, array( + 'BLOCK_DATA' => $block_temp) +); +unset( $block_temp ); ?> \ No newline at end of file diff --git a/root/portal/block/forum_index.php b/root/portal/block/forum_index.php index 6a8ea26a..2736ca75 100644 --- a/root/portal/block/forum_index.php +++ b/root/portal/block/forum_index.php @@ -1,40 +1,40 @@ -assign_vars(array( -'FORUM_IMG' => $user->img('forum_read', 'NO_NEW_POSTS'), -'FORUM_NEW_IMG' => $user->img('forum_unread', 'NEW_POSTS'), -'FORUM_LOCKED_IMG' => $user->img('forum_read_locked', 'NO_NEW_POSTS_LOCKED'), -'FORUM_NEW_LOCKED_IMG' => $user->img('forum_unread_locked', 'NO_NEW_POSTS_LOCKED'), -'S_DISPLAY_PORTAL_FORUM_INDEX' => true, - -'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'mark=forums') : '', -'U_MCP' => ($auth->acl_get('m_') || $auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=front', true, $user->session_id) : '') -); - -if (!isset($template->filename['forum_index_block'])) -{ - $template->set_filenames(array( - 'forum_index_block' => 'portal/block/forum_index.html') - ); -} - -$block_temp = $template->assign_display('forum_index_block'); - -$template->assign_block_vars('portal_column_'.$block_pos, array( - 'BLOCK_DATA' => $block_temp) -); -unset( $block_temp ); - +assign_vars(array( +'FORUM_IMG' => $user->img('forum_read', 'NO_NEW_POSTS'), +'FORUM_NEW_IMG' => $user->img('forum_unread', 'NEW_POSTS'), +'FORUM_LOCKED_IMG' => $user->img('forum_read_locked', 'NO_NEW_POSTS_LOCKED'), +'FORUM_NEW_LOCKED_IMG' => $user->img('forum_unread_locked', 'NO_NEW_POSTS_LOCKED'), +'S_DISPLAY_PORTAL_FORUM_INDEX' => true, + +'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'mark=forums') : '', +'U_MCP' => ($auth->acl_get('m_') || $auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=front', true, $user->session_id) : '') +); + +if (!isset($template->filename['forum_index_block'])) +{ + $template->set_filenames(array( + 'forum_index_block' => 'portal/block/forum_index.html') + ); +} + +$block_temp = $template->assign_display('forum_index_block'); + +$template->assign_block_vars('portal_column_'.$block_pos, array( + 'BLOCK_DATA' => $block_temp) +); +unset( $block_temp ); + ?> \ No newline at end of file diff --git a/root/portal/block/jumpbox.php b/root/portal/block/jumpbox.php index d26c6798..b76a1ced 100644 --- a/root/portal/block/jumpbox.php +++ b/root/portal/block/jumpbox.php @@ -1,27 +1,27 @@ -filename['jumpbox_block'])) -{ - $template->set_filenames(array( - 'jumpbox_block' => 'portal/block/jumpbox.html') - ); -} - -$block_temp = $template->assign_display('jumpbox_block'); - -$template->assign_block_vars('portal_column_'.$block_pos, array( - 'BLOCK_DATA' => $block_temp) -); -unset( $block_temp ); - +filename['jumpbox_block'])) +{ + $template->set_filenames(array( + 'jumpbox_block' => 'portal/block/jumpbox.html') + ); +} + +$block_temp = $template->assign_display('jumpbox_block'); + +$template->assign_block_vars('portal_column_'.$block_pos, array( + 'BLOCK_DATA' => $block_temp) +); +unset( $block_temp ); + ?> \ No newline at end of file diff --git a/root/portal/block/leaders_ext.php b/root/portal/block/leaders_ext.php index ff3beaa0..726efb5a 100644 --- a/root/portal/block/leaders_ext.php +++ b/root/portal/block/leaders_ext.php @@ -1,126 +1,126 @@ -add_lang('groups'); - -$legends = array(); -$groups = array(); - -if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) -{ - $sql = 'SELECT group_id, group_name, group_colour, group_type - FROM ' . GROUPS_TABLE . ' - WHERE group_legend = 1 - ORDER BY group_name ASC'; -} -else -{ - $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type - FROM ' . GROUPS_TABLE . ' g - LEFT JOIN ' . USER_GROUP_TABLE . ' ug - ON ( - g.group_id = ug.group_id - AND ug.user_id = ' . $user->data['user_id'] . ' - AND ug.user_pending = 0 - ) - WHERE g.group_legend = 1 - AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ') - ORDER BY g.group_name ASC'; -} -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $groups[$row['group_id']] = array( - 'group_name' => $row['group_name'], - 'group_colour' => $row['group_colour'], - 'group_type' => $row['group_type'], - 'group_users' => array(), - ); - $legends[] = $row['group_id']; -} -$db->sql_freeresult($result); - -if( sizeof($legends) ) -{ - $sql = 'SELECT - u.user_id, u.username, u.user_colour, u.group_id - FROM - ' . USERS_TABLE . ' AS u - WHERE - '. $db->sql_in_set('u.group_id', $legends) . ' - ORDER BY u.username ASC'; - - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $groups[$row['group_id']]['group_users'][] = array( - 'user_id' => $row['user_id'], - 'username' => $row['username'], - 'user_colour' => $row['user_colour'], - ); - } - - $db->sql_freeresult($result); -} - -if( sizeof($groups) ) -{ - foreach($groups as $group_id => $group) - { - if( sizeof($group['group_users']) ) - { - $group_name = ($group['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group['group_name']] : $group['group_name']; - $u_group = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $group_id); - - $template->assign_block_vars('group', array( - 'GROUP_NAME' => $group_name, - 'GROUP_COLOUR' => $group['group_colour'], - 'U_GROUP' => $u_group, - )); - - foreach($group['group_users'] as $group_user) - { - $template->assign_block_vars('group.member', array( - 'USER_ID' => $group_user['user_id'], - 'USERNAME_FULL' => get_username_string('full', $group_user['user_id'], $group_user['username'], $group_user['user_colour']), - )); - } - } - } -} -if (!isset($template->filename['leaders_ext_block'])) -{ - $template->set_filenames(array( - 'leaders_ext_block' => 'portal/block/leaders_ext.html') - ); -} - -$block_temp = $template->assign_display('leaders_ext_block'); - -$template->assign_block_vars('portal_column_'.$block_pos, array( - 'BLOCK_DATA' => $block_temp) -); -unset( $block_temp ); +add_lang('groups'); + +$legends = array(); +$groups = array(); + +if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) +{ + $sql = 'SELECT group_id, group_name, group_colour, group_type + FROM ' . GROUPS_TABLE . ' + WHERE group_legend = 1 + ORDER BY group_name ASC'; +} +else +{ + $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type + FROM ' . GROUPS_TABLE . ' g + LEFT JOIN ' . USER_GROUP_TABLE . ' ug + ON ( + g.group_id = ug.group_id + AND ug.user_id = ' . $user->data['user_id'] . ' + AND ug.user_pending = 0 + ) + WHERE g.group_legend = 1 + AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ') + ORDER BY g.group_name ASC'; +} +$result = $db->sql_query($sql); + +while ($row = $db->sql_fetchrow($result)) +{ + $groups[$row['group_id']] = array( + 'group_name' => $row['group_name'], + 'group_colour' => $row['group_colour'], + 'group_type' => $row['group_type'], + 'group_users' => array(), + ); + $legends[] = $row['group_id']; +} +$db->sql_freeresult($result); + +if( sizeof($legends) ) +{ + $sql = 'SELECT + u.user_id, u.username, u.user_colour, u.group_id + FROM + ' . USERS_TABLE . ' AS u + WHERE + '. $db->sql_in_set('u.group_id', $legends) . ' + ORDER BY u.username ASC'; + + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $groups[$row['group_id']]['group_users'][] = array( + 'user_id' => $row['user_id'], + 'username' => $row['username'], + 'user_colour' => $row['user_colour'], + ); + } + + $db->sql_freeresult($result); +} + +if( sizeof($groups) ) +{ + foreach($groups as $group_id => $group) + { + if( sizeof($group['group_users']) ) + { + $group_name = ($group['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group['group_name']] : $group['group_name']; + $u_group = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $group_id); + + $template->assign_block_vars('group', array( + 'GROUP_NAME' => $group_name, + 'GROUP_COLOUR' => $group['group_colour'], + 'U_GROUP' => $u_group, + )); + + foreach($group['group_users'] as $group_user) + { + $template->assign_block_vars('group.member', array( + 'USER_ID' => $group_user['user_id'], + 'USERNAME_FULL' => get_username_string('full', $group_user['user_id'], $group_user['username'], $group_user['user_colour']), + )); + } + } + } +} +if (!isset($template->filename['leaders_ext_block'])) +{ + $template->set_filenames(array( + 'leaders_ext_block' => 'portal/block/leaders_ext.html') + ); +} + +$block_temp = $template->assign_display('leaders_ext_block'); + +$template->assign_block_vars('portal_column_'.$block_pos, array( + 'BLOCK_DATA' => $block_temp) +); +unset( $block_temp ); ?> \ No newline at end of file diff --git a/root/styles/prosilver/template/portal/block/forum_index.html b/root/styles/prosilver/template/portal/block/forum_index.html index 5fc3e74a..c5e28088 100644 --- a/root/styles/prosilver/template/portal/block/forum_index.html +++ b/root/styles/prosilver/template/portal/block/forum_index.html @@ -1,12 +1,12 @@ - - - - - - + + + + + +
\ No newline at end of file diff --git a/root/styles/prosilver/template/portal/block/jumpbox.html b/root/styles/prosilver/template/portal/block/jumpbox.html index 8d53b8f1..2fe9f399 100644 --- a/root/styles/prosilver/template/portal/block/jumpbox.html +++ b/root/styles/prosilver/template/portal/block/jumpbox.html @@ -15,5 +15,5 @@ - -
+ +
diff --git a/root/styles/prosilver/template/portal/block/leaders_ext.html b/root/styles/prosilver/template/portal/block/leaders_ext.html index e6bf9ac4..c71376e9 100644 --- a/root/styles/prosilver/template/portal/block/leaders_ext.html +++ b/root/styles/prosilver/template/portal/block/leaders_ext.html @@ -1,18 +1,18 @@ - -
-
- -

 {L_THE_TEAM}

- - {group.GROUP_NAME}
- - {group.member.USERNAME_FULL}
- -
- - {L_NO_GROUPS_P} - - -
-
+ +
+
+ +

 {L_THE_TEAM}

+ + {group.GROUP_NAME}
+ + {group.member.USERNAME_FULL}
+ +
+ + {L_NO_GROUPS_P} + + +
+

\ No newline at end of file diff --git a/root/styles/prosilver/template/portal/block/welcome.html b/root/styles/prosilver/template/portal/block/welcome.html index 7c6b1ea5..46357e96 100644 --- a/root/styles/prosilver/template/portal/block/welcome.html +++ b/root/styles/prosilver/template/portal/block/welcome.html @@ -1,20 +1,20 @@ - -
-
- - -
-
-
-
{PORTAL_WELCOME_INTRO}
-
-
-
- - -
-
- + +
+
+ + +
+
+
+
{PORTAL_WELCOME_INTRO}
+
+
+
+ + +
+
+
\ No newline at end of file diff --git a/root/styles/prosilver/theme/images/portal/index.html b/root/styles/prosilver/theme/images/portal/index.html index 841fe9e4..5832e4a2 100644 --- a/root/styles/prosilver/theme/images/portal/index.html +++ b/root/styles/prosilver/theme/images/portal/index.html @@ -1,8 +1,8 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/root/styles/subsilver2/template/portal/block/forum_index.html b/root/styles/subsilver2/template/portal/block/forum_index.html index ada89605..e0f3f06a 100644 --- a/root/styles/subsilver2/template/portal/block/forum_index.html +++ b/root/styles/subsilver2/template/portal/block/forum_index.html @@ -1,16 +1,16 @@ - - -
- - - - - - - - - - - -
{FORUM_NEW_IMG}{L_NEW_POSTS}  {FORUM_IMG}{L_NO_NEW_POSTS}  {FORUM_LOCKED_IMG}{L_FORUM_LOCKED}
+ + +
+ + + + + + + + + + + +
{FORUM_NEW_IMG}{L_NEW_POSTS}  {FORUM_IMG}{L_NO_NEW_POSTS}  {FORUM_LOCKED_IMG}{L_FORUM_LOCKED}

\ No newline at end of file diff --git a/root/styles/subsilver2/template/portal/block/leaders_ext.html b/root/styles/subsilver2/template/portal/block/leaders_ext.html index a1ee5ae1..25c2c5b9 100644 --- a/root/styles/subsilver2/template/portal/block/leaders_ext.html +++ b/root/styles/subsilver2/template/portal/block/leaders_ext.html @@ -1,27 +1,27 @@ - - - - - - - - - - - - - - - - - - - -
 {L_THE_TEAM}
- {group.GROUP_NAME} -
- {group.member.USERNAME_FULL}
-
- {L_NO_GROUPS_P} -
+ + + + + + + + + + + + + + + + + + + +
 {L_THE_TEAM}
+ {group.GROUP_NAME} +
+ {group.member.USERNAME_FULL}
+
+ {L_NO_GROUPS_P} +

\ No newline at end of file