Menu
▾
▴
[mxbb-commits] mx_calsnails db_install.php, 1.21, 1.22 db_upgrade.php, 1.14, 1.15 mx_calendar_events.php, 1.20, 1.21
|
From: Jon O. <jon...@us...> - 2006-06-29 22:03:26
|
Update of /cvsroot/mxbb/mx_calsnails In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27752/modules/mx_calsnails Modified Files: db_install.php db_upgrade.php mx_calendar_events.php Log Message: Installation bug adminCP lang keys initialization checks Index: mx_calendar_events.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/mx_calendar_events.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_calendar_events.php 29 Jun 2006 13:39:03 -0000 1.20 --- mx_calendar_events.php 29 Jun 2006 22:03:22 -0000 1.21 *************** *** 72,79 **** // $cal_block_id = $mx_block->get_parameters( 'target_block' ); - $cal_page_id = get_page_id( $cal_block_id ); ! $cal_block_config = read_block_config( $cal_block_id ); ! $cal_page_filter = $cal_block_config[$cal_block_id]['cal_filter']['parameter_value'] == 'TRUE'; // --- 72,91 ---- // $cal_block_id = $mx_block->get_parameters( 'target_block' ); ! // ! // Toggles ! // ! if (intval($cal_block_id) > 0) ! { ! $cal_page_id = get_page_id( $cal_block_id ); ! $cal_block_config = read_block_config( $cal_block_id ); ! $cal_page_filter = $cal_block_config[$cal_block_id]['cal_filter']['parameter_value'] == 'TRUE'; ! } ! else ! { ! $cal_page_id = $page_id; ! $cal_page_filter = false; ! $template->assign_block_vars( 'no_events', array( 'NO_EVENTS' => 'This block is not correctly configured. Use the blockCP and define its target calsnails block.' ) ); ! } // Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/db_install.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** db_install.php 29 Jun 2006 13:39:03 -0000 1.21 --- db_install.php 29 Jun 2006 22:03:22 -0000 1.22 *************** *** 61,65 **** bbcode_uid varchar(10), block_id mediumint(8) unsigned NOT NULL default '0', ! PRIMARY KEY (id) )", // Table: Calendar Lite Configuration --- 61,65 ---- bbcode_uid varchar(10), block_id mediumint(8) unsigned NOT NULL default '0', ! PRIMARY KEY (event_id) )", // Table: Calendar Lite Configuration Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/db_upgrade.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** db_upgrade.php 29 Jun 2006 13:39:03 -0000 1.14 --- db_upgrade.php 29 Jun 2006 22:03:22 -0000 1.15 *************** *** 71,157 **** $sql[] = "ALTER TABLE " . CALLITE_EVENTS_TABLE . " ADD block_id mediumint(8) unsigned NOT NULL default '0' "; - /* - // Now add some new parameters for the main LITE block - // First get function_id - $sqltmp = "SELECT function_id FROM " . $mx_table_prefix . "function WHERE function_file = 'calendar.php' LIMIT 1"; - if ( !( $result = $db->sql_query( $sqltmp ) ) ) - { - mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql ); - } - $row = $db->sql_fetchrow( $result ) ; - $function_id = $row['function_id']; - // Then get block_id(s) - $sqltmp2 = "SELECT block_id FROM " . $mx_table_prefix . "block WHERE function_id = '$function_id' LIMIT 1"; - if ( !( $result = $db->sql_query( $sqltmp2 ) ) ) - { - mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql ); - } - - $parameter_id = getMaxId( PARAMETER_TABLE, 'parameter_id' ); - $parameter_id1 = $parameter_id + 1; - $sql[] = "REPLACE INTO " . $mx_table_prefix . "parameter VALUES('" . $parameter_id1 . "', '" . $function_id . "', 'auth_all', 'Function', '1', 'get_list_static(\"{parameter_id}[]\",array(\"No access\",\"View only\",\"View,Suggest\",\"View,Add\",\"View,Add(Edit/Delete own)\"),\"{parameter_value}\")')"; - $parameter_id2 = $parameter_id + 2; - $sql[] = "REPLACE INTO " . $mx_table_prefix . "parameter VALUES('" . $parameter_id2 . "', '" . $function_id . "', 'auth_reg', 'Function', '2', 'get_list_static(\"{parameter_id}[]\",array(\"No access\",\"View only\",\"View,Suggest\",\"View,Add\",\"View,Add(Edit/Delete own)\"),\"{parameter_value}\")')"; - $parameter_id3 = $parameter_id + 3; - $sql[] = "REPLACE INTO " . $mx_table_prefix . "parameter VALUES('" . $parameter_id3 . "', '" . $function_id . "', 'cal_filter', 'Boolean', 'FALSE', '')"; - - while ( $row = $db->sql_fetchrow( $result ) ) - { - $block_id = $row['block_id']; - $sql[] = "REPLACE INTO " . $mx_table_prefix . "block_system_parameter VALUES('" . $block_id . "', '" . $parameter_id1 . "', '1', NULL)"; - $sql[] = "REPLACE INTO " . $mx_table_prefix . "block_system_parameter VALUES('" . $block_id . "', '" . $parameter_id2 . "', '2', NULL)"; - $sql[] = "REPLACE INTO " . $mx_table_prefix . "block_system_parameter VALUES('" . $block_id . "', '" . $parameter_id3 . "', 'FALSE', NULL)"; - } - // Now add some new parameters for the mini calendar - // First get function_id - $sqltmp = "SELECT function_id FROM " . $mx_table_prefix . "function WHERE function_file = 'mx_calendar_mini.php' LIMIT 1"; - if ( !( $result = $db->sql_query( $sqltmp ) ) ) - { - mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql ); - } - $row = $db->sql_fetchrow( $result ) ; - $function_id = $row['function_id']; - // Then get block_id(s) - $sqltmp2 = "SELECT block_id FROM " . $mx_table_prefix . "block WHERE function_id = '$function_id' LIMIT 1"; - if ( !( $result = $db->sql_query( $sqltmp2 ) ) ) - { - mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql ); - } - - $parameter_id = getMaxId( PARAMETER_TABLE, 'parameter_id' ); - $parameter_id1 = $parameter_id + 1; - $sql[] = "REPLACE INTO " . $mx_table_prefix . "parameter VALUES('" . $parameter_id1 . "', '" . $function_id . "', 'target_block', 'Function', '0', 'get_list_formatted(\"calsnails\",\"{parameter_value}\",\"{parameter_id}[]\")')"; - - while ( $row = $db->sql_fetchrow( $result ) ) - { - $block_id = $row['block_id']; - $sql[] = "REPLACE INTO " . $mx_table_prefix . "block_system_parameter VALUES('" . $block_id . "', '" . $parameter_id1 . "', '0', NULL)"; - } - // Now add some new parameters for the EVENTS block - // First get function_id - $sqltmp = "SELECT function_id FROM " . $mx_table_prefix . "function WHERE function_file = 'mx_calendar_events.php' LIMIT 1"; - if ( !( $result = $db->sql_query( $sqltmp ) ) ) - { - mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql ); - } - $row = $db->sql_fetchrow( $result ) ; - $function_id = $row['function_id']; - // Then get block_id(s) - $sqltmp2 = "SELECT block_id FROM " . $mx_table_prefix . "block WHERE function_id = '$function_id' LIMIT 1"; - if ( !( $result = $db->sql_query( $sqltmp2 ) ) ) - { - mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql ); - } - - $parameter_id = getMaxId( PARAMETER_TABLE, 'parameter_id' ); - $parameter_id1 = $parameter_id + 1; - $sql[] = "REPLACE INTO " . $mx_table_prefix . "parameter VALUES('" . $parameter_id1 . "', '" . $function_id . "', 'target_block', 'Function', '0', 'get_list_formatted(\"calsnails\",\"{parameter_value}\",\"{parameter_id}[]\")')"; - - while ( $row = $db->sql_fetchrow( $result ) ) - { - $block_id = $row['block_id']; - $sql[] = "REPLACE INTO " . $mx_table_prefix . "block_system_parameter VALUES('" . $block_id . "', '" . $parameter_id1 . "', '0', NULL)"; - } - */ } --- 71,74 ---- |
