Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Florin C B. <ory...@us...> - 2013-04-05 11:38:17
|
Update of /cvsroot/mxbb/mx_smartor/admin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26893 Modified Files: admin_album_ext.php Log Message: Index: admin_album_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_ext.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_album_ext.php 9 Aug 2011 04:32:19 -0000 1.6 --- admin_album_ext.php 5 Apr 2013 11:38:14 -0000 1.7 *************** *** 26,34 **** require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx); - // - // Begin program proper - // - $mode = ''; - // ********************************************************************** --- 26,29 ---- *************** *** 47,67 **** // Mode setting // ! // ! if ($mx_request_vars->is_post('submit') ) ! { ! $mode = 'submit'; ! } ! else ! { ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); ! } - /* - if ($mx_request_vars->is_empty_post('fullurl') || $mx_request_vars->is_empty_post('fullurl')) - { - mx_message_die(GENERAL_ERROR, "Failed to update fullurl."); - } - */ - // // Main db settings --- 42,47 ---- // Mode setting // ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); // // Main db settings *************** *** 69,73 **** // $sql = "SELECT * ! FROM " . ALBUM_CONFIG_TABLE; if ( !$result = $db->sql_query( $sql ) ) { --- 49,53 ---- // $sql = "SELECT * ! FROM " . ALBUM_CONFIG_TABLE; if ( !$result = $db->sql_query( $sql ) ) { *************** *** 76,94 **** else { ! while ($row = $db->sql_fetchrow($result)) { $config_name = $row['config_name']; $config_value = $row['config_value']; $default_config[$config_name] = $config_value; ! ! $new[$config_name] = ( isset($_POST[$config_name]) ) ? $_POST[$config_name] : $default_config[$config_name]; ! if (isset($_POST['submit'])) { $sql = "UPDATE " . ALBUM_CONFIG_TABLE . " SET ! config_value = '" . str_replace( "\'", "''", $new[$config_name] ) . "' ! WHERE config_name = '$config_name'"; if ( !$db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Failed to update general configuration for $config_name", "", __LINE__, __FILE__, $sql ); } $mx_cache->put('album_config', $new); --- 56,74 ---- else { ! while ( $row = $db->sql_fetchrow( $result ) ) { $config_name = $row['config_name']; $config_value = $row['config_value']; $default_config[$config_name] = $config_value; ! ! $new[$config_name] = ( isset( $_POST[$config_name] ) ) ? $_POST[$config_name] : $default_config[$config_name]; ! if ( isset( $_POST['submit'] ) ) { $sql = "UPDATE " . ALBUM_CONFIG_TABLE . " SET ! config_value = '" . str_replace( "\'", "''", $new[$config_name] ) . "' ! WHERE config_name = '$config_name'"; if ( !$db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Failed to update general configuration for $config_name", "", __LINE__, __FILE__, $sql ); } $mx_cache->put('album_config', $new); *************** *** 96,100 **** } $db->sql_freeresult($result); ! if (isset($_POST['submit'])) { $message = $lang['album_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . mx_append_sid( "admin_album_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . "\">", "</a>" ); --- 76,81 ---- } $db->sql_freeresult($result); ! ! if ( isset( $_POST['submit'] ) ) { $message = $lang['album_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . mx_append_sid( "admin_album_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . "\">", "</a>" ); *************** *** 102,115 **** } } ! // // Populate parameter variables // $album_index = $new['index']; ! $album_fullurl = str_replace('http://www.', 'http://', $new['fullurl']); // $other = $new['other']; $override_default_pages = $new['override_default_pages']; $integration_enabled = $new['enable_integration']; - $fullurl_enabled = $new['enable_fullurl']; // --- 83,97 ---- } } ! // // Populate parameter variables // $album_index = $new['index']; ! // $other = $new['other']; + + $override_default_pages = $new['override_default_pages']; $integration_enabled = $new['enable_integration']; // *************** *** 117,121 **** // $pagelist_index = get_list_formatted('page_list', $new['index'], 'index'); ! // $pagelist_other = get_list_formatted('page_list', $new['other'], 'other'); // --- 99,104 ---- // $pagelist_index = get_list_formatted('page_list', $new['index'], 'index'); ! ! // $pagelist_other = get_list_formatted('page_list', $new['other'], 'other'); // *************** *** 125,129 **** $template->assign_vars( array( ! 'S_ALBUM_ACTION' => mx_append_sid("admin_album_ext.$phpEx"), 'L_ALBUM_TITLE' => $lang['mx_album_admin'], --- 108,112 ---- $template->assign_vars( array( ! 'S_ALBUM_ACTION' => mx_append_sid( "admin_album_ext.$phpEx" ), 'L_ALBUM_TITLE' => $lang['mx_album_admin'], *************** *** 144,157 **** 'L_ALBUM_INTEGRATION_ENABLED_YES' => $lang['integration_enabled_yes'], 'L_ALBUM_INTEGRATION_ENABLED_NO' => $lang['integration_enabled_no'], - - 'L_ALBUM_FULLURL_ENABLED_YES' => $lang['fullurl_enabled_yes'], - 'L_ALBUM_FULLURL_ENABLED_NO' => $lang['fullurl_enabled_no'], ! 'ALBUM_INTEGRATION_ENABLED_YES' => ($integration_enabled == '1') ? ' checked="checked"' : '', ! 'ALBUM_INTEGRATION_ENABLED_NO' => ($integration_enabled == '0') ? ' checked="checked"' : '', ! ! 'ALBUM_FULLURL_ENABLED_YES' => ($fullurl_enabled == '1') ? ' checked="checked"' : '', ! 'ALBUM_FULLURL_ENABLED_NO' => ($fullurl_enabled == '0') ? ' checked="checked"' : '', ! // // Default static settings or block settings --- 127,134 ---- 'L_ALBUM_INTEGRATION_ENABLED_YES' => $lang['integration_enabled_yes'], 'L_ALBUM_INTEGRATION_ENABLED_NO' => $lang['integration_enabled_no'], ! 'ALBUM_INTEGRATION_ENABLED_YES' => ( $integration_enabled == '1' ) ? ' checked="checked"' : '', ! 'ALBUM_INTEGRATION_ENABLED_NO' => ( $integration_enabled == '0' ) ? ' checked="checked"' : '', ! // // Default static settings or block settings *************** *** 166,174 **** 'OVERRIDE_DEFAULT_PAGES_CHECKBOX_NO' => ( $override_default_pages == '0' ) ? ' checked="checked"' : '', 'L_ALBUM_INDEX' => $lang['index'], 'ALBUM_INDEX' => $pagelist_index, ! ! 'L_FULLURL_INDEX' => $lang['fullurl'], ! 'ALBUM_FULLURL' => $album_fullurl, 'L_SUBMIT' => $lang['Submit'], --- 143,152 ---- 'OVERRIDE_DEFAULT_PAGES_CHECKBOX_NO' => ( $override_default_pages == '0' ) ? ' checked="checked"' : '', + 'L_ALBUM_INDEX' => $lang['index'], 'ALBUM_INDEX' => $pagelist_index, ! ! // 'L_SUBMIT' => $lang['submit'], ! // 'L_RESET' => $lang['reset'], 'L_SUBMIT' => $lang['Submit'], *************** *** 177,182 **** )); ! $template->pparse("body"); ! include_once($mx_root_path . 'admin/page_footer_admin.' . $phpEx); ?> --- 155,160 ---- )); ! $template->pparse( "body" ); ! include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); ?> |
|
From: Florin C B. <ory...@us...> - 2013-04-05 11:06:42
|
Update of /cvsroot/mxbb/core In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24766 Modified Files: favicon.ico Log Message: the new fav Index: favicon.ico =================================================================== RCS file: /cvsroot/mxbb/core/favicon.ico,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsbqSzv9 and /tmp/cvsggUcdB differ |
|
From: Florin C B. <ory...@us...> - 2013-04-05 11:01:27
|
Update of /cvsroot/mxbb/mx_calsnails/templates/prosilver In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23955 Modified Files: cal_view_month_lite.html Log Message: decode lang and not encode lang Index: cal_view_month_lite.html =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/templates/prosilver/cal_view_month_lite.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cal_view_month_lite.html 3 Apr 2013 12:58:29 -0000 1.1 --- cal_view_month_lite.html 5 Apr 2013 11:01:25 -0000 1.2 *************** *** 1,4 **** ! <script language="javascript" type="text/javascript"> ! <!-- var cssTextHover, cssTextLink; function swc(id,fon) { --- 1,3 ---- ! <script language="javascript" type="text/javascript"><!-- var cssTextHover, cssTextLink; function swc(id,fon) { *************** *** 12,16 **** } } - function setup() { if (document.all) { --- 11,14 ---- *************** *** 28,40 **** } setup(); ! //--> ! </script> ! <div class="clear"></div> ! <div class="forumbg block" style="vertical-align:top; text-color:white;"> ! <div class="inner"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0" class="forumline" style="border-top:none;"> <tr> <td> - <!-- BEGIN switch_show --> <table width="100%" cellpadding="2" cellspacing="1" border="0" align="center"> --- 26,35 ---- } setup(); ! //--></script> ! <div class="forumbg block" style="vertical-align: top; text-color: blue;"> ! <div class="inner bg2"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0" style="vertical-align: top; border-top:none;"> <tr> <td> <!-- BEGIN switch_show --> <table width="100%" cellpadding="2" cellspacing="1" border="0" align="center"> *************** *** 46,50 **** </table> <!-- END switch_show --> - <table width="100%" cellpadding="2" cellspacing="1" border="0" > <tr> --- 41,44 ---- *************** *** 62,66 **** <tr> <!-- BEGIN no_day --> ! <td {no_day.S_CELL}> </td> <!-- END no_day --> <!-- BEGIN daycell --> --- 56,60 ---- <tr> <!-- BEGIN no_day --> ! <td valign="top" {no_day.S_CELL}> </td> <!-- END no_day --> <!-- BEGIN daycell --> *************** *** 88,93 **** </td> </tr> ! </table> ! </div> ! <span class="corners-bottom"><span></span></span> </div> \ No newline at end of file --- 82,87 ---- </td> </tr> ! </table> ! </div> ! <span class="corners-bottom"><span></span></span> </div> \ No newline at end of file |
|
From: Florin C B. <ory...@us...> - 2013-04-05 11:01:19
|
Update of /cvsroot/mxbb/mx_calsnails/language/lang_swedish In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23930/lang_swedish Modified Files: lang_admin.php lang_main.php Log Message: decode lang and not encode lang Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/language/lang_swedish/lang_main.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_main.php 3 Apr 2013 10:56:53 -0000 1.3 --- lang_main.php 5 Apr 2013 11:01:16 -0000 1.4 *************** *** 190,192 **** --- 190,209 ---- $lang['Ev_this_month'] = 'Mĺnad '; $lang['Ev_next_month'] = 'Nästa mĺnad '; + + // + // For HebCal Months and Events + // + $lang['Tishrei'] = 'Tishrei'; + $lang['Heshvan'] = 'Heshvan'; + $lang['Kislev'] = 'Kislev'; + $lang['Tevet'] = 'Tevet'; + $lang['Shevat'] = 'Shevat'; + $lang['Adar'] = 'Adar'; + $lang['Adar II'] = 'Adar II'; + $lang['Nisan'] = 'Nisan'; + $lang['Iyar'] = 'Iyar'; + $lang['Sivan'] = 'Sivan'; + $lang['Tamuz'] = 'Tamuz'; + $lang['Av'] = 'Av'; + $lang['Elul'] = 'Elul'; ?> \ No newline at end of file |
|
From: Florin C B. <ory...@us...> - 2013-04-05 11:01:18
|
Update of /cvsroot/mxbb/mx_calsnails/language/lang_english In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23930/lang_english Modified Files: lang_admin.php lang_main.php Log Message: decode lang and not encode lang Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/language/lang_english/lang_main.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** lang_main.php 3 Jun 2008 20:08:37 -0000 1.10 --- lang_main.php 5 Apr 2013 11:01:16 -0000 1.11 *************** *** 192,194 **** --- 192,212 ---- $lang['Ev_this_month'] = 'This month '; $lang['Ev_next_month'] = 'Next month '; + + // + // For HebCal Months and Events + // + $lang['Tishrei'] = 'Tishrei'; + $lang['Heshvan'] = 'Heshvan'; + $lang['Kislev'] = 'Kislev'; + $lang['Tevet'] = 'Tevet'; + $lang['Shevat'] = 'Shevat'; + $lang['Adar'] = 'Adar'; + $lang['Adar II'] = 'Adar II'; + $lang['Nisan'] = 'Nisan'; + $lang['Iyar'] = 'Iyar'; + $lang['Sivan'] = 'Sivan'; + $lang['Tamuz'] = 'Tamuz'; + $lang['Av'] = 'Av'; + $lang['Elul'] = 'Elul'; + ?> \ No newline at end of file |
|
From: Florin C B. <ory...@us...> - 2013-04-05 11:01:09
|
Update of /cvsroot/mxbb/mx_calsnails/admin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23911/admin Modified Files: admin_calendar.php Log Message: decode lang and not encode lang Index: admin_calendar.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/admin/admin_calendar.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** admin_calendar.php 3 Apr 2013 10:56:51 -0000 1.19 --- admin_calendar.php 5 Apr 2013 11:01:06 -0000 1.20 *************** *** 30,40 **** // Read language definition // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); ! } ! else { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } --- 30,43 ---- // Read language definition // ********************************************************************** ! $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->decode_lang($mx_user->lang['default_lang']) : $board_config['default_lang']; ! // ------------------------------------------------------------------------- ! // Read Module Main Language Definition ! // ------------------------------------------------------------------------- ! if ((@include $module_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx") === false) { ! if ((@include $module_root_path . "language/lang_english/lang_main.$phpEx") === false) ! { ! mx_message_die(CRITICAL_ERROR, 'Module main language file ' . $mx_root_path . $module_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.'); ! } } |
|
From: Florin C B. <ory...@us...> - 2013-04-05 09:18:12
|
Update of /cvsroot/mxbb/core/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18616 Modified Files: mx_functions_style.php Log Message: decode lang and not encode lang Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** mx_functions_style.php 22 Oct 2012 15:56:56 -0000 1.121 --- mx_functions_style.php 5 Apr 2013 09:18:10 -0000 1.122 *************** *** 1692,1699 **** function _load_module_lang($lang_mode = MX_LANG_MAIN) { ! global $lang, $board_config, $mx_block, $phpEx, $mx_root_path; ! ! $default_lang = ($this->lang['default_lang']) ? $this->encode_lang($this->lang['default_lang']) : $board_config['default_lang']; ! if (empty($default_lang)) { --- 1692,1697 ---- function _load_module_lang($lang_mode = MX_LANG_MAIN) { ! global $lang, $board_config, $mx_block, $phpEx, $mx_root_path; ! $default_lang = ($this->lang['default_lang']) ? $this->decode_lang($this->lang['default_lang']) : $board_config['default_lang']; if (empty($default_lang)) { *************** *** 1701,1705 **** $default_lang= 'english'; } - if (!isset($this->loaded_langs[$mx_block->module_root_path])) { --- 1699,1702 ---- *************** *** 1714,1718 **** $module_lang_path = $mx_root_path . $mx_block->module_root_path; } - // ------------------------------------------------------------------------- // Read Module Main Language Definition --- 1711,1714 ---- *************** *** 1726,1730 **** } } - if ($lang_mode == MX_LANG_ADMIN || $lang_mode == MX_LANG_ALL) { --- 1722,1725 ---- *************** *** 1743,1747 **** } } ! /** * Enter description here... --- 1738,1742 ---- } } ! /** * Enter description here... |
|
From: Florin C B. <ory...@us...> - 2013-04-05 07:42:49
|
Update of /cvsroot/mxbb/core/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13529 Modified Files: mx_functions.php Log Message: function mx_t() for translation and compatibility with the calendar module features common with other CMS systems. Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** mx_functions.php 5 Apr 2013 07:36:36 -0000 1.114 --- mx_functions.php 5 Apr 2013 07:42:47 -0000 1.115 *************** *** 2675,2679 **** $options['langcode'] = $lang['USER_LANG'] ? $lang['USER_LANG'] : $mx_user->encode_lang($board_config['default_lang']); } ! if (!isset($lang[$string])) { $lang_string = $lang[$string]; --- 2675,2679 ---- $options['langcode'] = $lang['USER_LANG'] ? $lang['USER_LANG'] : $mx_user->encode_lang($board_config['default_lang']); } ! if (!empty($lang[$string])) { $lang_string = $lang[$string]; |
|
From: Florin C B. <ory...@us...> - 2013-04-05 07:36:38
|
Update of /cvsroot/mxbb/core/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12860 Modified Files: mx_functions.php Log Message: Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** mx_functions.php 5 Apr 2013 07:34:19 -0000 1.113 --- mx_functions.php 5 Apr 2013 07:36:36 -0000 1.114 *************** *** 2666,2670 **** * */ ! function mx_t($string, array $args = array(), array $options = array()) { global $lang, $mx_cache, $mx_user; --- 2666,2670 ---- * */ ! function t($string, array $args = array(), array $options = array()) { global $lang, $mx_cache, $mx_user; |
|
From: Florin C B. <ory...@us...> - 2013-04-05 07:34:21
|
Update of /cvsroot/mxbb/core/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12030 Modified Files: mx_functions.php Log Message: Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** mx_functions.php 5 Apr 2013 06:21:58 -0000 1.112 --- mx_functions.php 5 Apr 2013 07:34:19 -0000 1.113 *************** *** 2668,2704 **** function mx_t($string, array $args = array(), array $options = array()) { ! global $lang, $mx_cache; ! static $custom_strings; ! ! // Merge in default. ! if (empty($options['langcode'])) { ! $options['langcode'] = $lang['USER_LANG'] ? $lang['USER_LANG'] : $mx_user->encode_lang($board_config['default_lang']); ! } ! if (empty($options['context'])) { ! $options['context'] = ''; ! } ! ! // First, check for an array of customized strings. If present, use the array ! // *instead of* database lookups. ! // Cache the $custom_strings variable to improve performance. ! if (!isset($custom_strings[$options['langcode']])) ! { ! $custom_strings[$options['langcode']] = variable_get('locale_custom_strings_' . $options['langcode'], array()); ! } ! ! // Custom strings work for English. ! if (isset($custom_strings[$options['langcode']][$options['context']][$string])) ! { ! $string = $custom_strings[$options['langcode']][$options['context']][$string]; ! } ! ! if (empty($args)) ! { ! return $string; ! } ! else ! { ! return $mx_cache->format_string($string, $args); ! } } --- 2668,2694 ---- function mx_t($string, array $args = array(), array $options = array()) { ! global $lang, $mx_cache, $mx_user; ! static $lang_string; ! // Merge in default. ! if (empty($options['langcode'])) ! { ! $options['langcode'] = $lang['USER_LANG'] ? $lang['USER_LANG'] : $mx_user->encode_lang($board_config['default_lang']); ! } ! if (!isset($lang[$string])) ! { ! $lang_string = $lang[$string]; ! } ! else ! { ! $lang_string = $string; ! } ! if (empty($args)) ! { ! return $lang_string; ! } ! else ! { ! return $mx_cache->format_string($lang_string, $args); ! } } |
|
From: Florin C B. <ory...@us...> - 2013-04-05 06:22:00
|
Update of /cvsroot/mxbb/core/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7254 Modified Files: mx_functions.php mx_functions_core.php mx_functions_tools.php Log Message: function mx_t() for translation and compatibility with the calendar module features common with other CMS systems. Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** mx_functions_core.php 27 Jul 2011 21:17:47 -0000 1.124 --- mx_functions_core.php 5 Apr 2013 06:21:58 -0000 1.125 *************** *** 902,910 **** $lines[] = "'$k'=>" . $this->format_array($v); } ! else if (is_int($v)) { $lines[] = "'$k'=>$v"; } ! else if (is_bool($v)) { $lines[] = "'$k'=>" . (($v) ? 'true' : 'false'); --- 902,910 ---- $lines[] = "'$k'=>" . $this->format_array($v); } ! elseif (is_int($v)) { $lines[] = "'$k'=>$v"; } ! elseif (is_bool($v)) { $lines[] = "'$k'=>" . (($v) ? 'true' : 'false'); *************** *** 917,920 **** --- 917,952 ---- return 'array(' . implode(',', $lines) . ')'; } + + /** + * Replaces variable placeholders in a string with the requested values + * and escapes the values so they can be safely displayed as HTML. + * Function to sanitize values. + * @access private + * @param unknown_type $string + * @return unknown + */ + function format_string($string, array $args = array()) + { + $k = array(); + // Transform arguments before inserting them. + foreach ($args as $k => $v) + { + switch ($k[0]) + { + case '@': + // Escaped only. + $args[$k] = htmlspecialchars($v, ENT_QUOTE, 'UTF-8'); + break; + case '%': + default: + // Escaped and placeholder. + $args[$k] = '<em class="placeholder">' . htmlspecialchars($v, ENT_QUOTE, 'UTF-8') . '</em>'; + break; + case '!': + // Pass-through. + } + } + return strtr($string, $args); + } /** Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** mx_functions_tools.php 27 Feb 2011 00:49:59 -0000 1.63 --- mx_functions_tools.php 5 Apr 2013 06:21:58 -0000 1.64 *************** *** 3074,3078 **** return isset( $this->vars[$varname] ); } ! /** * Enter description here... --- 3074,3078 ---- return isset( $this->vars[$varname] ); } ! /** * Enter description here... *************** *** 3081,3098 **** * @return unknown */ ! function format_array( $array ) { $lines = array(); ! foreach ( $array as $k => $v ) { ! if ( is_array( $v ) ) { ! $lines[] = "'$k'=>" . $this->format_array( $v ); ! }elseif ( is_int( $v ) ) { $lines[] = "'$k'=>$v"; ! }elseif ( is_bool( $v ) ) { ! $lines[] = "'$k'=>" . ( ( $v ) ? 'TRUE' : 'FALSE' ); } else --- 3081,3100 ---- * @return unknown */ ! function format_array($array) { $lines = array(); ! foreach ($array as $k => $v) { ! if (is_array( $v )) { ! $lines[] = "'$k'=>" . $this->format_array($v); ! } ! elseif (is_int($v)) { $lines[] = "'$k'=>$v"; ! } ! elseif (is_bool($v)) { ! $lines[] = "'$k'=>" . (($v) ? 'TRUE' : 'FALSE'); } else *************** *** 3101,3108 **** } } ! return 'array(' . implode( ',', $lines ) . ')'; ! } } /** * Class mx_custom_field. --- 3103,3111 ---- } } ! return 'array(' . implode(',', $lines) . ')'; ! } } + /** * Class mx_custom_field. Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** mx_functions.php 5 Apr 2013 05:13:24 -0000 1.111 --- mx_functions.php 5 Apr 2013 06:21:58 -0000 1.112 *************** *** 2662,2673 **** /** ! * function t ! * temp replacement for t() ! * We provide for a possible localization function, t(). ! * * ! function t($string, array $args = array(), array $options = array()) { ! global $lang; static $custom_strings; --- 2662,2672 ---- /** ! * function mx_t ! * replacement for t() * ! */ ! function mx_t($string, array $args = array(), array $options = array()) { ! global $lang, $mx_cache; static $custom_strings; *************** *** 2700,2707 **** else { ! return format_string($string, $args); } } */ /** --- 2699,2727 ---- else { ! return $mx_cache->format_string($string, $args); } } + + /** + * A wrapper for htmlcheck_plain($value, ENT_COMPAT, 'UTF-8') + * See also + * function utf8_htmlspecialchars($value) + * from + * @package utf + */ + function utf8_htmlcheck_plain($value) + { + return htmlspecialchars($value, ENT_QUOTE, 'UTF-8'); + } + + /** + * Trying to display in a placeholder inside a message or text + * */ + function mx_placeholder($message) + { + // Adding placeholders to returned text + return '<em class="placeholder">' . utf8_htmlcheck_plain($text) . '</em>'; + } /** |
|
From: Florin C B. <ory...@us...> - 2013-04-05 05:13:26
|
Update of /cvsroot/mxbb/core/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3672 Modified Files: mx_functions.php Log Message: function t() for translation and compatibility with the calendar module features common with other CMS systems. Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** mx_functions.php 5 Apr 2013 05:07:49 -0000 1.110 --- mx_functions.php 5 Apr 2013 05:13:24 -0000 1.111 *************** *** 2666,2670 **** * We provide for a possible localization function, t(). * ! */ function t($string, array $args = array(), array $options = array()) { --- 2666,2670 ---- * We provide for a possible localization function, t(). * ! * function t($string, array $args = array(), array $options = array()) { *************** *** 2703,2706 **** --- 2703,2707 ---- } } + */ /** |
|
From: Florin C B. <ory...@us...> - 2013-04-05 05:07:52
|
Update of /cvsroot/mxbb/core/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2583 Modified Files: mx_functions.php Log Message: function t() for translation and compatibility with the calendar module features common with other CMS systems. Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** mx_functions.php 8 Oct 2012 09:05:08 -0000 1.109 --- mx_functions.php 5 Apr 2013 05:07:49 -0000 1.110 *************** *** 2662,2665 **** --- 2662,2708 ---- /** + * function t + * temp replacement for t() + * We provide for a possible localization function, t(). + * + */ + function t($string, array $args = array(), array $options = array()) + { + global $lang; + static $custom_strings; + + // Merge in default. + if (empty($options['langcode'])) { + $options['langcode'] = $lang['USER_LANG'] ? $lang['USER_LANG'] : $mx_user->encode_lang($board_config['default_lang']); + } + if (empty($options['context'])) { + $options['context'] = ''; + } + + // First, check for an array of customized strings. If present, use the array + // *instead of* database lookups. + // Cache the $custom_strings variable to improve performance. + if (!isset($custom_strings[$options['langcode']])) + { + $custom_strings[$options['langcode']] = variable_get('locale_custom_strings_' . $options['langcode'], array()); + } + + // Custom strings work for English. + if (isset($custom_strings[$options['langcode']][$options['context']][$string])) + { + $string = $custom_strings[$options['langcode']][$options['context']][$string]; + } + + if (empty($args)) + { + return $string; + } + else + { + return format_string($string, $args); + } + } + + /** * function eregi * |
|
From: Florin C B. <ory...@us...> - 2013-04-04 12:24:29
|
Update of /cvsroot/mxbb/mx_kb In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9081 Modified Files: db_install.php db_upgrade.php Log Message: longtext for news Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_install.php,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** db_install.php 5 Jul 2008 22:12:15 -0000 1.57 --- db_install.php 4 Apr 2013 12:24:26 -0000 1.58 *************** *** 120,124 **** approved tinyint(1) unsigned NOT NULL default '0', ! article_body text NOT NULL, bbcode_uid varchar(10) binary NOT NULL default '', article_type mediumint(8) unsigned NOT NULL default '0', --- 120,124 ---- approved tinyint(1) unsigned NOT NULL default '0', ! article_body longtext NOT NULL, bbcode_uid varchar(10) binary NOT NULL default '', article_type mediumint(8) unsigned NOT NULL default '0', Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_upgrade.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** db_upgrade.php 5 Jul 2008 22:12:16 -0000 1.48 --- db_upgrade.php 4 Apr 2013 12:24:26 -0000 1.49 *************** *** 247,250 **** --- 247,251 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allow_smilies', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allowed_html_tags', 'b,i,u,a')"; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_articles CHANGE article_body article_body LONGTEXT DEFAULT NULL"; // -------------------------------------------------------- |
|
From: Florin C B. <ory...@us...> - 2013-04-04 12:24:08
|
Update of /cvsroot/mxbb/mx_news In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9068 Modified Files: db_install.php db_upgrade.php mx_news.pak Log Message: longtext for news Index: mx_news.pak =================================================================== RCS file: /cvsroot/mxbb/mx_news/mx_news.pak,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_news.pak 22 May 2008 21:06:28 -0000 1.2 --- mx_news.pak 4 Apr 2013 12:24:06 -0000 1.3 *************** *** 13,16 **** parameter=+:73=+:161=+:max_characters=+:Number=+:200=+:=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - News List=+:Demo block=+:73=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 13,21 ---- parameter=+:73=+:161=+:max_characters=+:Number=+:200=+:=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:News Feed=+:Demo block=+:73=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:55=+:74=+:News=+:News Feed=+:mx_feed_list.php=+: ! parameter=+:74=+:162=+:url_file=+:Text=+:=+:=+:1=+:0 ! parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:News Feed=+:Demo block=+:74=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_news/db_install.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** db_install.php 5 Jul 2008 22:22:04 -0000 1.8 --- db_install.php 4 Apr 2013 12:24:06 -0000 1.9 *************** *** 56,60 **** comments_id int(10) NOT NULL auto_increment, block_id int(10) NOT NULL default '0', ! comments_text text NOT NULL, comments_title text NOT NULL, comments_time int(50) NOT NULL default '0', --- 56,60 ---- comments_id int(10) NOT NULL auto_increment, block_id int(10) NOT NULL default '0', ! comments_text longtext NOT NULL, comments_title text NOT NULL, comments_time int(50) NOT NULL default '0', Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_news/db_upgrade.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** db_upgrade.php 5 Jul 2008 22:22:05 -0000 1.6 --- db_upgrade.php 4 Apr 2013 12:24:06 -0000 1.7 *************** *** 42,57 **** { // Upgrade checks ! $upgrade_280 = false; ! $message = "<b>Upgrading!</b><br/><br/>"; ! ! if ( $upgrade_280 == 1 ) { ! } else { ! $message .= "<b>Nothing to upgrade...</b><br/><br/>"; ! } if ( !MXBB_27x ) --- 42,59 ---- { // Upgrade checks ! $upgrade_280 = true; // MX-Publisher 2.8 branch -> ! $message = "<b>Upgrading!</b><br/><br/>"; ! ! if ($upgrade_280 == 1) { ! $upgrade_280 = 1; ! $message .= "<b>Upgrading to v. 2.8.0...ok</b><br/><br/>"; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "simplenews_comments CHANGE comments_text comments_text LONGTEXT DEFAULT NULL"; } else { ! $message .= "<b>Validating v. 2.8.0...ok</b><br/><br/>"; ! } if ( !MXBB_27x ) *************** *** 63,67 **** } ! $message .= mx_do_install_upgrade( $sql ); $message .= "<b>...Now upgraded to v. $mx_module_version :-)</b><br/><br/>"; --- 65,69 ---- } ! $message .= mx_do_install_upgrade($sql); $message .= "<b>...Now upgraded to v. $mx_module_version :-)</b><br/><br/>"; |
|
From: Florin C B. <ory...@us...> - 2013-04-04 11:58:54
|
Update of /cvsroot/mxbb/mx_kb/kb/modules In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7500 Modified Files: kb_post.php Log Message: mx_append_sid() missing from post / edit Index: kb_post.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** kb_post.php 14 Sep 2008 00:29:46 -0000 1.21 --- kb_post.php 4 Apr 2013 11:58:51 -0000 1.22 *************** *** 487,491 **** } ! $kb_action_url = $kb_post_mode == 'add' ? $this->this_mxurl( 'mode=add' ) : $this->this_mxurl( 'mode=edit' ); $custom_data = $kb_post_mode == 'add' ? $mx_kb_custom_field->display_edit() : $mx_kb_custom_field->display_edit( $article_id ); --- 487,491 ---- } ! $kb_action_url = $kb_post_mode == 'add' ? mx_append_sid($this->this_mxurl('mode=add')) : mx_append_sid($this->this_mxurl('mode=edit')); $custom_data = $kb_post_mode == 'add' ? $mx_kb_custom_field->display_edit() : $mx_kb_custom_field->display_edit( $article_id ); |
|
From: Florin C B. <ory...@us...> - 2013-04-03 12:58:31
|
Update of /cvsroot/mxbb/mx_calsnails/templates/prosilver In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20926 Added Files: cal_day_events_lite.html cal_view_month_lite.html Log Message: prosilver --- NEW FILE: cal_day_events_lite.html --- <div class="clear"></div> <div class="forumbg block" style="vertical-align:top; text-color:white;"> <div class="inner"> <table width="{BLOCK_SIZE}" border="0" cellspacing="1" cellpadding="0" class="forumline" style="border-top:none;"> <tr> <td class="row1"> <!-- BEGIN switch_show --> <table width="{BLOCK_SIZE}" border="0" cellspacing="1" cellpadding="0" class="forumline" style="border-top:none;"> <tr> <td align="left">{PHPBBHEADER}<span class="nav"><a href="{U_INDEX}">{L_INDEX}</a> -> <a href="{U_CAL_HOME}">{CALENDAR}</a></span></td> <td align="right" class="genmed" valign="bottom">{CAL_VERSION}</td> </tr> </table> <!-- END switch_show --> <table width="{BLOCK_SIZE}" border="0" cellspacing="1" cellpadding="0" class="forumline" style="border-top:none;"> <tr> <th height="25" class="thHead"><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr>{BUTTON_PREV} <td nowrap="nowrap"> <center> <table cellpadding="0" border="0" cellspacing="0"> <tr> <td><span class="gen"><b><font color="#FFA34F">{CAL_DAY}</font></b> </span></td> <td class="row1" align="center"><span class="gen">{CAL_MONTH}</span></td> <td><span class="gen"> <b><font color="#FFA34F">{CAL_YEAR}</font></b></span></td> </tr> </table> </center> </td> {BUTTON_NEXT} </tr> </table> </th> </tr> <tr> <td> <table cellpadding="2" cellspacing="1" border="0" width="100%"> <tr> <td width="55%" class="row3" nowrap="nowrap"><span class="text"><b>{SUBJECT}</b></span><span class="gensmall">{CATEGORY}</span></td> <td width="15%" class="row3" nowrap="nowrap"><span class="text"><b><font color="#FFFFFF">{DATE}</font></b>(<b>{TIME}</b>)</span></td> <td width="15%" class="row3" nowrap="nowrap"><span class="text"><b>{END_DATE}</b>(<b>{TIME}</b>)</span></td> <td width="15%" class="row3" nowrap="nowrap"><span class="text"><b>{AUTHOR}</b></span></td> </tr> <!-- BEGIN no_events --> <tr> <td colspan="4"><span class="gen"><br />{no_events.NO_EVENTS}</span></td> </tr> <!-- END no_events --> <!-- BEGIN event_row --> <tr> <td class="row1"><span class="postbody"><b>{event_row.SUBJECT}</b></span><span class="gensmall">{event_row.CATEGORY}</span></td> <td class="row1" nowrap="nowrap"><span class="genmed">{event_row.DATE} {event_row.TIME}</span></td> <td class="row1" nowrap="nowrap"><span class="genmed">{event_row.END_DATE} {event_row.END_TIME}</span></td> <td class="row1" nowrap="nowrap"><span class="genmed">{event_row.AUTHOR}</span></td> </tr> <tr> <td class="row1" colspan="4"><span class="postbody">{event_row.DESC}</td> </tr> <tr> <td class="row1" colspan="4" align="right">{event_row.BUTTON_MOD} {event_row.BUTTON_DEL}</td> </tr> <tr> <td colspan="4"><span class="postbody"> </span></td> </tr> <!-- END event_row --> </table> </td> </tr> </table> <center> <br /> <br /> <table border="0" cellspacing="0" cellpadding="0"> <tr> {BUTTON_HOME} </tr> <tr> <td> <table> <tr> {BUTTON_ADD} {BUTTON_VAL} </tr> </table> </td> </tr> </table> </center> </td> </tr> </table> </div> <span class="corners-bottom"><span></span></span> </div> --- NEW FILE: cal_view_month_lite.html --- <script language="javascript" type="text/javascript"> <!-- var cssTextHover, cssTextLink; function swc(id,fon) { if (document.all) { var d=document.all[id]; for(var i=0;i<d.length;i++){ // go through everything of id "cal_id###" d[i].style.cssText=(fon?cssTextHover:cssTextLink); //set the style accordingly } } } function setup() { if (document.all) { dd=document.styleSheets; for(var j=0; j<dd.length; j++) { var ss=document.styleSheets[j].rules; for(var i=0;i<ss.length;i++){ var rr=ss[i]; strSelector=rr.selectorText; if(strSelector=="A:hover") cssTextHover=rr.style.cssText; else if (strSelector=="A:link") cssTextLink=rr.style.cssText; } } } } setup(); //--> </script> <div class="clear"></div> <div class="forumbg block" style="vertical-align:top; text-color:white;"> <div class="inner"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="forumline" style="border-top:none;"> <tr> <td> <!-- BEGIN switch_show --> <table width="100%" cellpadding="2" cellspacing="1" border="0" align="center"> <tr> <td align="left">{PHPBBHEADER}<span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a href="{U_CAL_HOME}" class="nav">{CALENDAR}</a></span></td> <td align=right class=genmed>{CAL_VERSION}</td> </tr> </table> <!-- END switch_show --> <table width="100%" cellpadding="2" cellspacing="1" border="0" > <tr> <td class="cat" align="center" colspan="7"><span class="gen"> {CAL_MONTH} {CAL_YEAR}</span></td> </tr> <tr> <td class="row3" width="14%" align="center"><b><span class="genmed">{DAY_HEAD_1}</span></b></td> <td class="row3" width="14%" align="center"><b><span class="genmed">{DAY_HEAD_2}</span></b></td> <td class="row3" width="14%" align="center"><b><span class="genmed">{DAY_HEAD_3}</span></b></td> <td class="row3" width="14%" align="center"><b><span class="genmed">{DAY_HEAD_4}</span></b></td> <td class="row3" width="14%" align="center"><b><span class="genmed">{DAY_HEAD_5}</span></b></td> <td class="row3" width="14%" align="center"><b><span class="genmed">{DAY_HEAD_6}</span></b></td> <td class="row3" width="14%" align="center"><b><span class="genmed">{DAY_HEAD_7}</span></b></td> </tr> <tr> <!-- BEGIN no_day --> <td {no_day.S_CELL}> </td> <!-- END no_day --> <!-- BEGIN daycell --> <td valign="top" {daycell.S_CELL}> <table width="100%" cellspacing="0" cellpadding="2" border="0"> <tr><td height="15" {daycell.S_HEAD}><a href="{daycell.U_DAY}" class="topictitle">{daycell.NUM_DAY}</a></td></tr> <tr><td height="60" valign="top" {daycell.S_DETAILS}><div style="overflow:auto; height:50px;">{daycell.DAY_EVENT_LIST}</div></td></tr> </table> </td> {daycell.WEEK_ROW} <!-- END daycell --> </tr> <tr> <td align="center" class="cat" colspan="7"> <table border="0" cellspacing="0" cellpadding="0"> <tr> {BUTTON_PREV}{BUTTON_ADD}{BUTTON_VALIDATE}{BUTTON_NEXT} </tr> <tr> </tr> </table> </td> </tr> </table> </td> </tr> </table> </div> <span class="corners-bottom"><span></span></span> </div> |
|
From: Florin C B. <ory...@us...> - 2013-04-03 12:57:24
|
Update of /cvsroot/mxbb/mx_calsnails/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20878 Modified Files: cal_functions.php Log Message: Module Upgraded to oO Index: cal_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/includes/cal_functions.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** cal_functions.php 3 Apr 2013 11:24:25 -0000 1.21 --- cal_functions.php 3 Apr 2013 12:57:22 -0000 1.22 *************** *** 1272,1276 **** if ($cal_hebrew) { ! if (($JDay == 1) || ($JDay == 1)) { // New MOON --- 1272,1276 ---- if ($cal_hebrew) { ! if (($JDay == 1) || ($JDay == 15)) { // New MOON |
|
From: Florin C B. <ory...@us...> - 2013-04-03 11:24:27
|
Update of /cvsroot/mxbb/mx_calsnails/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16508 Modified Files: cal_functions.php Log Message: Module Upgraded to oO Index: cal_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/includes/cal_functions.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** cal_functions.php 3 Apr 2013 10:56:51 -0000 1.20 --- cal_functions.php 3 Apr 2013 11:24:25 -0000 1.21 *************** *** 10,18 **** */ ! if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); } //class AdvanceCalendar class AdvanceCalendar extends JewishCalendar --- 10,60 ---- */ ! /** ! * @ignore ! */ ! if (!defined('IN_PORTAL')) { die("Hacking attempt"); } + @define('JEWISH_SDN_OFFSET', 347997); + @define('HALAKIM_PER_HOUR', 1080); + @define('HALAKIM_PER_DAY', 25920); + @define('HALAKIM_PER_LUNAR_CYCLE', ((29*HALAKIM_PER_DAY)+13753)); + @define('HALAKIM_PER_METONIC_CYCLE', (HALAKIM_PER_LUNAR_CYCLE * (12*19+7))); + @define('NEW_MOON_OF_CREATION', 31524); + @define('SUNDAY', 0); + @define('MONDAY', 1); + @define('TUESDAY', 2); + @define('WEDNESDAY', 3); + @define('THURSDAY', 4); + @define('FRIDAY', 5); + @define('SATURDAY', 6); + @define('NOON', (18*HALAKIM_PER_HOUR)); + @define('AM3_11_20', ((9*HALAKIM_PER_HOUR)+204)); + @define('AM9_32_43', ((15*HALAKIM_PER_HOUR)+589)); + @define('ALAFIM', " ××פ×× "); + + if(!defined('CAL_JEWISH_ADD_ALAFIM')) + { + define('CAL_JEWISH_ADD_ALAFIM', 4); + } + + if(!defined('CAL_JEWISH_ADD_ALAFIM_GERESH')) + { + define('CAL_JEWISH_ADD_ALAFIM_GERESH', 2); + } + + if(!defined('CAL_JEWISH_ADD_GERESHAYIM')) + { + define('CAL_JEWISH_ADD_GERESHAYIM', 8); + } + + $alef_bet = array('0','×','×','×','×','×','×','×','×','×','×','×','×','×','× ','ס','×¢','פ','צ','ק','ר','ש','ת'); + $monthsPerYear = array(12, 12, 13, 12, 12, 13, 12, 13, 12, 12, 13, 12, 12, 13, 12, 12, 13, 12, 13 ); + $yearOffset = array(0, 12, 24, 37, 49, 61, 74, 86, 99, 111, 123, 136, 148, 160, 173, 185, 197, 210, 222 ); + $jewishMonthHebName = array('', 'TISHREI', 'CHESHVAN', 'KISLEV', 'TEVET', 'SHVAT', 'ADAR', 'ADAR_B', 'NISAN', 'IYYAR', 'SIVAN', 'TAMUZ', 'AV', 'ELUL'); + + //class AdvanceCalendar class AdvanceCalendar extends JewishCalendar *************** *** 1849,1852 **** --- 1891,2171 ---- } return $mode == CAL_LANG_NATIVE ? $hebrew[$month] : $foreign[$month]; + } + + /** + * + * @package MXP Cal. Module + * @version $Id$ + * Copyright 1993-1995, Scott E. Lee, all rights reserved. + * Permission granted to use, copy, modify, distribute and sell so long as + * the above copyright and this permission statement are retained in all + * copies. THERE IS NO WARRANTY - USE AT YOUR OWN RISK. + * + */ + function MoladOfMetonicCycle($metonicCycle) + { + $r1 = NEW_MOON_OF_CREATION; + $r1 += $metonicCycle * (HALAKIM_PER_METONIC_CYCLE & 0xffff ); + $r2 = $r1 >> 16; + $r2 += $metonicCycle * ((HALAKIM_PER_METONIC_CYCLE >> 16)&0xffff); + $d2 = intval($r2 / HALAKIM_PER_DAY); + $r2 -= $d2 * HALAKIM_PER_DAY; + $r1 = ($r2 << 16) | ($r1 &0xffff); + $d1 = intval($r1 / HALAKIM_PER_DAY); + $r1 -= $d1 * HALAKIM_PER_DAY; + + return array(($d2<<16)|$d1, $r1); + } + + function Tishri1($metonicYear, $moladDay, $moladHalakim) + { + $tishri1 = $moladDay; + $dow = $tishri1 % 7; + $leapYear = $metonicYear == 2 || $metonicYear == 5 || $metonicYear == 7 || $metonicYear == 10 || $metonicYear == 13 || $metonicYear == 16 || $metonicYear == 18; + $lastWasLeapYear = $metonicYear == 3 || $metonicYear == 6 || $metonicYear == 8 || $metonicYear == 11 || $metonicYear == 14 || $metonicYear == 17 || $metonicYear == 0; + + if (($moladHalakim >= NOON) || ((!$leapYear) && $dow == TUESDAY && $moladHalakim >= AM3_11_20) || ($lastWasLeapYear && $dow == MONDAY && $moladHalakim >= AM9_32_43)) + { + $tishri1++; + $dow++; + + if ($dow == 7) + { + $dow = 0; + } + } + + if ($dow == WEDNESDAY || $dow == FRIDAY || $dow == SUNDAY) + { + $tishri1++; + } + + return $tishri1; + } + + function FindTishriMolad($inputDay) + { + global $monthsPerYear; + + $metonicCycle = intval(($inputDay + 310)/6940); + $mDay = $this->MoladOfMetonicCycle($metonicCycle); + + while ($mDay[0] < ($inputDay - 6940 + 310)) + { + $metonicCycle += 1; + $mDay[1] += HALAKIM_PER_METONIC_CYCLE; + $mDay[0] += intval($mDay[1] / HALAKIM_PER_DAY); + $mDay[1] %= HALAKIM_PER_DAY; + } + + for ($metonicYear = 0; $metonicYear < 18; $metonicYear++) + { + if ( $mDay[0] > ($inputDay - 74) ) break; + + $mDay[1] += HALAKIM_PER_LUNAR_CYCLE * $monthsPerYear[$metonicYear]; + $mDay[0] += intval($mDay[1] / HALAKIM_PER_DAY); + $mDay[1] %= HALAKIM_PER_DAY; + } + + return array($metonicCycle, $metonicYear, $mDay[0], $mDay[1]); + } + + function SdnToJewish($sdn) + { + global $monthsPerYear; + + $rYear = $rMonth = $rDay = 0; + + if ($sdn <= JEWISH_SDN_OFFSET) return array(0, 0, 0); + + $inputDay = $sdn - JEWISH_SDN_OFFSET; + $mCycle = $this->FindTishriMolad($inputDay); + + $tishri1 = $this->Tishri1($mCycle[1], $mCycle[2], $mCycle[3]); + + if ($inputDay >= $tishri1) + { + $rYear = $mCycle[0] * 19 + $mCycle[1] + 1; + + if ($inputDay < $tishri1 + 59) + { + if ($inputDay < $tishri1 + 30) + { + return array($rYear, 1, $inputDay - $tishri1 + 1); // Year , Month , Day + } + else + { + return array($rYear, 2, $inputDay - $tishri1 - 29); // Year , Month , Day + } + } + + $mCycle[3] += HALAKIM_PER_LUNAR_CYCLE * $monthsPerYear[$mCycle[1]]; + $mCycle[2] += intval($mCycle[3] / HALAKIM_PER_DAY); + $mCycle[3] %= HALAKIM_PER_DAY; + $tishri1After = Tishri1(($mCycle[1]+1)%19, $mCycle[2], $mCycle[3]); + } + else + { + $rYear = $mCycle[0] * 19 + $mCycle[1]; + + if ($inputDay >= $tishri1 - 177) + { + if ($inputDay > $tishri1 - 30) + { + return array($rYear, 13, $inputDay - $tishri1 + 30); + } + else if ($inputDay > $tishri1 - 60) + { + return array($rYear, 12, $inputDay - $tishri1 + 60); + } + else if ($inputDay > $tishri1 - 89) + { + return array($rYear, 11, $inputDay - $tishri1 + 89); + } + else if ($inputDay > $tishri1 - 119) + { + return array($rYear, 10, $inputDay - $tishri1 + 119); + } + else if ($inputDay > $tishri1 - 148) + { + return array($rYear, 9, $inputDay - $tishri1 + 148); + } + + return array($rYear, 8, $inputDay - $tishri1 + 178); + } + else + { + $rDay = $inputDay - $tishri1 + 207; + + if ($monthsPerYear[($rYear-1)%19] == 13) + { + $rMonth = 7; + + if ($rDay > 0) return array($rYear, $rMonth, $rDay); + + $rMonth -= 1; + $rDay += 30; + + if ($rDay > 0) return array($rYear, $rMonth, $rDay); + + $rMonth -= 1; + $rDay += 30; + } + else + { + $rMonth = 6; + + if ($rDay > 0) return array($rYear, $rMonth, $rDay); + + $rMonth -= 1; + $rDay += 30; + } + + if ($rDay > 0) return array($rYear, $rMonth, $rDay); + + $rMonth -= 1; + $rDay += 29; + + if ($rDay > 0) return array($rYear, $rMonth, $rDay); + + $tishri1After = $tishri1; + $mCycle = $this->FindTishriMolad ( $mCycle[2] - 365 ); + $tishri1 = $this->Tishri1 ( $mCycle[1] , $mCycle[2] , $mCycle[3] ); + } + } + + $yearLength = $tishri1After - $tishri1; + $mCycle[2] = $inputDay - $tishri1 - 29; + + if ($yearLength == 355 || $yearLength == 385) + { + if ($mCycle[2] <= 30) return array($rYear, 2, $mCycle[2]); + + $mCycle[2] -= 30; + } + else + { + if ($mCycle[2] <= 29) return array ($rYear, 2, $mCycle[2]); + + $mCycle[2] -= 29; + } + + return array($rYear, 3, $mCycle[2]); + } + + function heb_number_to_chars($n, $fl) + { + global $alef_bet; + + $last_letter = ''; + $num_string = ''; + $let_count = 0; + + if ($n > 9999 || $n < 1) return false; + + if (intval($n / 1000)) + { + $num_string .= $alef_bet[$n/1000]; + + if (CAL_JEWISH_ADD_ALAFIM_GERESH & $fl) $num_string .= "'"; + if (CAL_JEWISH_ADD_ALAFIM & $fl) $num_string .= ALAFIM; + + $n = $n % 1000; + } + + while ($n >= 400) + { + $num_string .= ($last_letter=$alef_bet[22]); + $let_count += 1; + $n -= 400; + } + + if ($n >= 100) + { + $num_string .= ($last_letter=$alef_bet[18+$n/100]); + $let_count += 1; + $n %= 100; + } + + if ($n == 15 || $n == 16) + { + $num_string .= $alef_bet[9]; + $num_string .= ($last_letter=$alef_bet[$n-9]); + $let_count += 2; + } + else + { + if ($n >= 10) + { + $num_string .= ($last_letter=$alef_bet[9+$n/10]); + $let_count += 1; + $n %= 10; + } + + if ($n > 0) + { + $num_string .= ($last_letter=$alef_bet[$n]); + $let_count += 1; + } + } + + if (CAL_JEWISH_ADD_GERESHAYIM & $fl) + { + switch ($let_count) + { + case 0: + break; + + case 1: + $num_string .= "'"; + break; + + default: + $num_string = substr($num_string, 0, -strlen($last_letter)) . '"' . $last_letter; + break; + } + } + + return $num_string; } *************** *** 1857,1868 **** { global $jewishMonthHebName, $mx_user; ! $jwdate = SdnToJewish($juliandaycount); if ($jwdate[0] <= 0 || $jwdate[0] > 9999) { return $mx_user->lang['YEAR_OUT_OF_RANGE']; } ! $day = $hebrew ? heb_number_to_chars($jwdate[2], $fl) : $jwdate[2]; $month = $mx_user->lang['jewish_months'][$jewishMonthHebName[$jwdate[1]]]; ! $year = $hebrew ? heb_number_to_chars($jwdate[0], $fl) : $jwdate[0]; return sprintf("%s %s %s", $day, $month, $year); } --- 2176,2187 ---- { global $jewishMonthHebName, $mx_user; ! $jwdate = $this->SdnToJewish($juliandaycount); if ($jwdate[0] <= 0 || $jwdate[0] > 9999) { return $mx_user->lang['YEAR_OUT_OF_RANGE']; } ! $day = $hebrew ? $this->heb_number_to_chars($jwdate[2], $fl) : $jwdate[2]; $month = $mx_user->lang['jewish_months'][$jewishMonthHebName[$jwdate[1]]]; ! $year = $hebrew ? $this->heb_number_to_chars($jwdate[0], $fl) : $jwdate[0]; return sprintf("%s %s %s", $day, $month, $year); } *************** *** 1887,1891 **** $juliandaycount = unixtojd($timestemp); $data = array(); ! $jwdate = SdnToJewish($juliandaycount); if ($jwdate[0] <= 0 || $jwdate[0] > 9999) { --- 2206,2210 ---- $juliandaycount = unixtojd($timestemp); $data = array(); ! $jwdate = $this->SdnToJewish($juliandaycount); if ($jwdate[0] <= 0 || $jwdate[0] > 9999) { *************** *** 1895,1900 **** $data = array( 'day' => $jwdate[2], ! 'day_heb' => heb_number_to_chars($jwdate[2], CAL_JEWISH_ADD_GERESHAYIM), ! 'day_lang' => $user_hebrew ? heb_number_to_chars($jwdate[2], CAL_JEWISH_ADD_GERESHAYIM) : $jwdate[2], 'month' => $jwdate[1], --- 2214,2219 ---- $data = array( 'day' => $jwdate[2], ! 'day_heb' => $this->heb_number_to_chars($jwdate[2], CAL_JEWISH_ADD_GERESHAYIM), ! 'day_lang' => $user_hebrew ? $this->heb_number_to_chars($jwdate[2], CAL_JEWISH_ADD_GERESHAYIM) : $jwdate[2], 'month' => $jwdate[1], *************** *** 1904,1909 **** 'year' => $jwdate[0], ! 'year_heb' => heb_number_to_chars($jwdate[0], CAL_JEWISH_ADD_GERESHAYIM), ! 'year_lang' => $user_hebrew ? heb_number_to_chars($jwdate[0], CAL_JEWISH_ADD_GERESHAYIM) : $jwdate[0], ); --- 2223,2228 ---- 'year' => $jwdate[0], ! 'year_heb' => $this->heb_number_to_chars($jwdate[0], CAL_JEWISH_ADD_GERESHAYIM), ! 'year_lang' => $user_hebrew ? $this->heb_number_to_chars($jwdate[0], CAL_JEWISH_ADD_GERESHAYIM) : $jwdate[0], ); *************** *** 1988,1992 **** } } - return sizeof($date) ? implode(" ", $date) : $format; } --- 2307,2310 ---- |
|
From: Florin C B. <ory...@us...> - 2013-04-03 10:57:23
|
Update of /cvsroot/mxbb/mx_calsnails/admin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14723/admin Modified Files: admin_calendar.php Log Message: Module Upgraded to oO Index: admin_calendar.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/admin/admin_calendar.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** admin_calendar.php 3 Jun 2008 20:07:08 -0000 1.18 --- admin_calendar.php 3 Apr 2013 10:56:51 -0000 1.19 *************** *** 39,43 **** } ! $caltable = CALLITE_CONFIG_TABLE; $sql = "SELECT * FROM " . $caltable; --- 39,43 ---- } ! $caltable = CALADV_CONFIG_TABLE; $sql = "SELECT * FROM " . $caltable; *************** *** 97,101 **** $show_headers_no = ( !$new['show_headers'] ) ? "checked=\"checked\"" : ""; ! function get_cal_levels( $field ) { global $lang, $new; --- 97,101 ---- $show_headers_no = ( !$new['show_headers'] ) ? "checked=\"checked\"" : ""; ! function get_caladv_levels( $field ) { global $lang, $new; *************** *** 123,128 **** } ! $s_cal_anon = get_cal_levels( 'allow_anon' ); ! $s_cal_type = get_cal_levels( 'allow_user_default' ); $template->set_filenames( array( "body" => "admin/calendar_config_body.tpl" ) ); --- 123,128 ---- } ! $s_cal_anon = get_caladv_levels( 'allow_anon' ); ! $s_cal_type = get_caladv_levels( 'allow_user_default' ); $template->set_filenames( array( "body" => "admin/calendar_config_body.tpl" ) ); |
|
From: Florin C B. <ory...@us...> - 2013-04-03 10:56:55
|
Update of /cvsroot/mxbb/mx_calsnails/language/lang_swedish In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14723/language/lang_swedish Modified Files: lang_admin.php lang_main.php Log Message: Module Upgraded to oO Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/language/lang_swedish/lang_main.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_main.php 3 Jun 2008 20:08:37 -0000 1.2 --- lang_main.php 3 Apr 2013 10:56:53 -0000 1.3 *************** *** 16,127 **** $lang['End_day'] = 'Slutdatum'; $lang['End_time'] = 'Sluttid'; ! $lang['Cal_subject'] = 'Ämne'; ! $lang['Cal_add_event'] = 'Lägg till händelse'; ! $lang['Cal_submit_event'] = 'Bekräfta händelse'; ! $lang['Cal_event_not_add'] = 'Har inte lagt till händelse...'; ! $lang['Cal_event_delete'] = 'Händelse raderad'; ! $lang['Cal_Del_mod'] = 'Radera/Ändra'; ! $lang['Cal_mod_only'] = 'Ändra'; $lang['Cal_back2cal'] = 'Kalender Hem'; ! $lang['Cal_mod_marked'] = 'Ändra händelse'; ! $lang['Cal_del_marked'] = 'Radera händelse'; ! $lang['Cal_must_sel_event'] = 'Du måste välja en händelse.'; ! $lang['Cal_edit_own_event'] = 'Ledsen, du kan bara ändra dina egna händelser.'; ! $lang['Cal_delete_event'] = 'Ledsen, du har inte tillåtelse att radera denna händelse.'; ! $lang['Cal_not_enough_access'] = 'Ledsen, åtkomst nekad'; ! $lang['Cal_must_member'] = 'Du måste vara aktoriserad för att ansluta och använda denna service'; $lang['Cal_alt_event'] = 'Aktuell:'; ! $lang['Validate'] = 'Godkänna händelse'; ! $lang['Cal_event_validated'] = 'Händelse(r) har blivit godkännd(a)/raderad(e)'; ! $lang['No events'] = 'För närvarande finns det inga händelser för detta datum'; ! $lang['No records'] = 'Inga händelser kräver godkännande'; ! $lang['No records modify'] = 'Inga händelser är tillgängliga att ändra'; ! $lang['No information'] = 'Otillräcklig information. Vänligen fyll i all relevant info'; ! $lang['Date before today'] = 'Ledsen, du kan inte bekräfta händelse för datum som redan varit'; ! $lang['Date before start'] = 'Ledsen, du kan inte bekräfta händelse som är slut innan de startat'; ! $lang['No date'] = 'Du måste välja ett start- och slutdatum'; ! $lang['No time'] = 'Du måste välja ett start- och slutdatum'; // // New Version 2.0.0 Additions. // ! $lang['Cal_event_add'] = 'Händelse tilllagd/ändrad...'; ! $lang['Cal_add4valid'] = 'Händelse skickad för bekräftelse av en administratör'; ! $lang['allow_categories'] = 'Använd kategorier med händelser'; ! $lang['require_categories'] = 'Begär en kategori med händelser:'; $lang['No_cat_selected'] = 'Ingen kategori vald'; ! $lang['Edit_cat'] = 'Ändra kategori'; ! $lang['Cats_explain'] = 'Använd denna delen för att lägga till, redigera eller radera kategorier som du använder i din databas. <br><br><b>NB:</b> Vänligen notera om du raderar en kategori som har blivit vald för en händelse kommer inte datan raderas men kommer hindra användare från att kunna filtrera eller visa raderade kategorier.'; $lang['Cats_title'] = 'Kategorikonfiguration'; ! $lang['Must_enter_cat'] = 'Du måste ange en kategori'; $lang['Cat_updated'] = 'Kategorin uppdaterad...'; $lang['Cat_added'] = 'Lagt till en kategori'; $lang['cat_removed'] = 'Kategorin borttagen...'; ! $lang['Add_new_cat'] = 'Lägg till en ny kategori'; ! $lang['Click_return_catadmin'] = 'Klicka %shär%s för att återvända till kategoriadministrationen'; ! $lang['Must_enter_valid_cat'] = 'Du måste använda giltiga alpha-/sifferbokstäver'; $lang['Filter_cats_alt'] = 'Visa endast vald kategori'; $lang['Filter_cats'] = 'Visa endast...'; $lang['Month_jump'] = 'Hoppa till...'; ! $lang['Recur_apply_to'] = 'Lagt till ändringar till:'; ! $lang['Recur_future'] = 'Framtida händelser'; ! $lang['Recur_solo'] = 'Endst denna händelse'; $lang['Recur_all'] = 'Alla upprepningar'; $lang['Cal_repeats'] = 'Upprepas varje:'; $lang['until'] = 'Fram till'; ! $lang['Earliest recur before today'] = 'Ledsen, det tidigaste datumet i denna kan inte flyttas före idag.\n<BR> Problemhändelse på: '; $lang['day'] = 'dag(ar)'; ! $lang['month'] = 'månad(er)'; ! $lang['year'] = 'år'; ! $lang['Event_length'] = 'Varje händelse varar till:'; ! $lang['Recur_title'] = 'Tillval återkommande info.'; ! $lang['Event_title'] = 'Händelseinfo.'; ! $lang['Event overlap'] = 'Återkommande evenemang kan inte upprepas före initial händelse har slutat'; ! $lang['R_period too small'] = 'Perioden som är tillgänglig för återkommande händelser är otillräcklig för vilka upprepningar'; ! $lang['Add notes'] = 'Lägg till tilläggsnoteringar för detta inlägg'; ! $lang['Add noted title'] = 'Lägg till noteringar'; ! $lang['Split solo'] = 'Dela till \'eget\' inlägg <i>(kommer inte längre uppdateras med relaterade händelser)</i>'; ! $lang['Split solo title'] = 'Dela till separat händelse'; ! $lang['Split future'] = 'Ändra alla händelseinlägg från detta och famåt'; ! $lang['Split future title'] = 'Ändra alla framtida händelser'; ! $lang['Edit all'] = 'Ändra alla relaterade händelseinlägg'; ! $land['Edit all title'] = 'Ändra alla relaterade händelser'; $lang['early_iteration'] = '(Tidigast upprepning efter dagens datum)'; ! $lang['global subject'] = 'Globalt Ämne'; ! $lang['global desc'] = 'Global händelseinfo'; ! $lang['Del future'] = 'Radera alla händelseinlägg från detta och famåt'; ! $lang['Del all'] = 'Radera alla relaterade händelseinlägg <i>(inkluderar inte delade inlägg)</i>'; ! $lang['Del this'] = 'Radera denna händelse'; ! $lang['Event_num'] = 'Händelsenummer:'; $lang['of'] = '<i>av</i>'; ! $lang['Additional info'] = 'Tilläggsinformation:'; ! $lang['Event specific'] = '(specifik till \'denna\' händelse):'; ! $lang['allow_user_post_default'] = 'Standard nivååtkomst för ALLA registrerade användare'; ! $lang['no_public'] = 'Ingen publik åtkomst'; $lang['view_only'] = 'Visa endast'; ! $lang['view_suggest'] = 'Visa,föreslagna händelser'; ! $lang['view_add'] = 'Visa,Adderade händelser'; ! $lang['view_edit_own'] = 'Visa,lägg till (Redigera/Radera egna)'; $lang['cal_admin'] = 'Kalender Admin'; ! $lang['Invalid date'] = 'En eller båda av de datum du har skickat är ogiltig'; ! $lang['Empty subject'] = 'Du måste skriva i en rubrik för händelsen'; ! $lang['Empty description'] = 'Du måste skriva i en beskrivning för din händelse'; $lang['max'] = 'Maximalt:'; ! $lang['Return'] = 'Gå tillbaka: '; $lang['View All'] = 'Visa Alla'; ! $lang['Calendar_Level'] = 'Kalendernivå'; $lang['Calendar_Categories'] = 'Kalenderkategorier'; $lang['Calendar Config'] = 'Kalenderkonfiguration'; --- 16,127 ---- $lang['End_day'] = 'Slutdatum'; $lang['End_time'] = 'Sluttid'; ! $lang['Cal_subject'] = 'Ãmne'; ! $lang['Cal_add_event'] = 'Lägg till händelse'; ! $lang['Cal_submit_event'] = 'Bekräfta händelse'; ! $lang['Cal_event_not_add'] = 'Har inte lagt till händelse...'; ! $lang['Cal_event_delete'] = 'Händelse raderad'; ! $lang['Cal_Del_mod'] = 'Radera/Ãndra'; ! $lang['Cal_mod_only'] = 'Ãndra'; $lang['Cal_back2cal'] = 'Kalender Hem'; ! $lang['Cal_mod_marked'] = 'Ãndra händelse'; ! $lang['Cal_del_marked'] = 'Radera händelse'; ! $lang['Cal_must_sel_event'] = 'Du mĺste välja en händelse.'; ! $lang['Cal_edit_own_event'] = 'Ledsen, du kan bara ändra dina egna händelser.'; ! $lang['Cal_delete_event'] = 'Ledsen, du har inte tillĺtelse att radera denna händelse.'; ! $lang['Cal_not_enough_access'] = 'Ledsen, ĺtkomst nekad'; ! $lang['Cal_must_member'] = 'Du mĺste vara aktoriserad för att ansluta och använda denna service'; $lang['Cal_alt_event'] = 'Aktuell:'; ! $lang['Validate'] = 'Godkänna händelse'; ! $lang['Cal_event_validated'] = 'Händelse(r) har blivit godkännd(a)/raderad(e)'; ! $lang['No events'] = 'För närvarande finns det inga händelser för detta datum'; ! $lang['No records'] = 'Inga händelser kräver godkännande'; ! $lang['No records modify'] = 'Inga händelser är tillgängliga att ändra'; ! $lang['No information'] = 'Otillräcklig information. Vänligen fyll i all relevant info'; ! $lang['Date before today'] = 'Ledsen, du kan inte bekräfta händelse för datum som redan varit'; ! $lang['Date before start'] = 'Ledsen, du kan inte bekräfta händelse som är slut innan de startat'; ! $lang['No date'] = 'Du mĺste välja ett start- och slutdatum'; ! $lang['No time'] = 'Du mĺste välja ett start- och slutdatum'; // // New Version 2.0.0 Additions. // ! $lang['Cal_event_add'] = 'Händelse tilllagd/ändrad...'; ! $lang['Cal_add4valid'] = 'Händelse skickad för bekräftelse av en administratör'; ! $lang['allow_categories'] = 'Använd kategorier med händelser'; ! $lang['require_categories'] = 'Begär en kategori med händelser:'; $lang['No_cat_selected'] = 'Ingen kategori vald'; ! $lang['Edit_cat'] = 'Ãndra kategori'; ! $lang['Cats_explain'] = 'Använd denna delen för att lägga till, redigera eller radera kategorier som du använder i din databas. <br><br><b>NB:</b> Vänligen notera om du raderar en kategori som har blivit vald för en händelse kommer inte datan raderas men kommer hindra användare frĺn att kunna filtrera eller visa raderade kategorier.'; $lang['Cats_title'] = 'Kategorikonfiguration'; ! $lang['Must_enter_cat'] = 'Du mĺste ange en kategori'; $lang['Cat_updated'] = 'Kategorin uppdaterad...'; $lang['Cat_added'] = 'Lagt till en kategori'; $lang['cat_removed'] = 'Kategorin borttagen...'; ! $lang['Add_new_cat'] = 'Lägg till en ny kategori'; ! $lang['Click_return_catadmin'] = 'Klicka %shär%s för att ĺtervända till kategoriadministrationen'; ! $lang['Must_enter_valid_cat'] = 'Du mĺste använda giltiga alpha-/sifferbokstäver'; $lang['Filter_cats_alt'] = 'Visa endast vald kategori'; $lang['Filter_cats'] = 'Visa endast...'; $lang['Month_jump'] = 'Hoppa till...'; ! $lang['Recur_apply_to'] = 'Lagt till ändringar till:'; ! $lang['Recur_future'] = 'Framtida händelser'; ! $lang['Recur_solo'] = 'Endst denna händelse'; $lang['Recur_all'] = 'Alla upprepningar'; $lang['Cal_repeats'] = 'Upprepas varje:'; $lang['until'] = 'Fram till'; ! $lang['Earliest recur before today'] = 'Ledsen, det tidigaste datumet i denna kan inte flyttas före idag.\n<BR> Problemhändelse pĺ: '; $lang['day'] = 'dag(ar)'; ! $lang['month'] = 'mĺnad(er)'; ! $lang['year'] = 'ĺr'; ! $lang['Event_length'] = 'Varje händelse varar till:'; ! $lang['Recur_title'] = 'Tillval ĺterkommande info.'; ! $lang['Event_title'] = 'Händelseinfo.'; ! $lang['Event overlap'] = 'Ĺterkommande evenemang kan inte upprepas före initial händelse har slutat'; ! $lang['R_period too small'] = 'Perioden som är tillgänglig för ĺterkommande händelser är otillräcklig för vilka upprepningar'; ! $lang['Add notes'] = 'Lägg till tilläggsnoteringar för detta inlägg'; ! $lang['Add noted title'] = 'Lägg till noteringar'; ! $lang['Split solo'] = 'Dela till \'eget\' inlägg <i>(kommer inte längre uppdateras med relaterade händelser)</i>'; ! $lang['Split solo title'] = 'Dela till separat händelse'; ! $lang['Split future'] = 'Ãndra alla händelseinlägg frĺn detta och famĺt'; ! $lang['Split future title'] = 'Ãndra alla framtida händelser'; ! $lang['Edit all'] = 'Ãndra alla relaterade händelseinlägg'; ! $land['Edit all title'] = 'Ãndra alla relaterade händelser'; $lang['early_iteration'] = '(Tidigast upprepning efter dagens datum)'; ! $lang['global subject'] = 'Globalt Ãmne'; ! $lang['global desc'] = 'Global händelseinfo'; ! $lang['Del future'] = 'Radera alla händelseinlägg frĺn detta och famĺt'; ! $lang['Del all'] = 'Radera alla relaterade händelseinlägg <i>(inkluderar inte delade inlägg)</i>'; ! $lang['Del this'] = 'Radera denna händelse'; ! $lang['Event_num'] = 'Händelsenummer:'; $lang['of'] = '<i>av</i>'; ! $lang['Additional info'] = 'Tilläggsinformation:'; ! $lang['Event specific'] = '(specifik till \'denna\' händelse):'; ! $lang['allow_user_post_default'] = 'Standard nivĺĺtkomst för ALLA registrerade användare'; ! $lang['no_public'] = 'Ingen publik ĺtkomst'; $lang['view_only'] = 'Visa endast'; ! $lang['view_suggest'] = 'Visa,föreslagna händelser'; ! $lang['view_add'] = 'Visa,Adderade händelser'; ! $lang['view_edit_own'] = 'Visa,lägg till (Redigera/Radera egna)'; $lang['cal_admin'] = 'Kalender Admin'; ! $lang['Invalid date'] = 'En eller bĺda av de datum du har skickat är ogiltig'; ! $lang['Empty subject'] = 'Du mĺste skriva i en rubrik för händelsen'; ! $lang['Empty description'] = 'Du mĺste skriva i en beskrivning för din händelse'; $lang['max'] = 'Maximalt:'; ! $lang['Return'] = 'Gĺ tillbaka: '; $lang['View All'] = 'Visa Alla'; ! $lang['Calendar_Level'] = 'Kalendernivĺ'; $lang['Calendar_Categories'] = 'Kalenderkategorier'; $lang['Calendar Config'] = 'Kalenderkonfiguration'; *************** *** 129,162 **** $lang['days'] = 'dag(ar)'; $lang['weeks'] = 'vecka(or)'; ! $lang['months'] = 'månad(er)'; ! $lang['years'] = 'år'; ! $lang['view_year'] = 'Årsöversikt'; ! $lang['view_month'] = 'Månadsöversikt'; ! $lang['view_week'] = 'Veckoöversikt'; ! $lang['view_day'] = 'Dag-/evenemangöversikt'; ! $lang['view_list'] = 'Listöversikt'; ! $lang['view'] = 'Översikt'; $lang['Submitted_by'] = 'Skickad av'; ! $lang['No_modify_old'] = 'Ledsen, du kan inte redigera en gammalt händelse'; ! $lang['Cat_in_use'] = 'Denna kategori är länkad till existerande händelser och kan inte raderas'; // // DEV lang 2.0.25 // ! $lang['require_time'] = 'Kräver start/slut tider för att skrivas in i nya händelser'; ! $lang['allow_private_event'] = 'Tillåt registrerade användare att lägga till privata händelser'; ! $lang['allow_group_event'] = 'Tillåt registrerade användare begränsa händelser till deras egna grupper'; ! $lang['event_access'] = 'Händelseåtkomst:'; $lang['private_event'] = 'Privat/Personlig'; $lang['public_event'] = 'Publik'; ! $lang['ug_event'] = 'Begränsad till användargrupp(er)'; ! $lang['group_select'] = 'Tillåtna användargrupper: <br /><i>(om tillämpbart)</i>'; ! $lang['group_event_explain'] = '<span class="genmed"><i>(Håll CTRL tangenten intryckt samtidigt som du väljer grupper med musen för att välja mer än en grupp)</i></span>'; ! $lang['No_private_events'] = 'Du har inte tillåtelse att lägga till privata händelser'; $lang['time_format'] = 'Tidformat'; --- 129,162 ---- $lang['days'] = 'dag(ar)'; $lang['weeks'] = 'vecka(or)'; ! $lang['months'] = 'mĺnad(er)'; ! $lang['years'] = 'ĺr'; ! $lang['view_year'] = 'Ĺrsöversikt'; ! $lang['view_month'] = 'Mĺnadsöversikt'; ! $lang['view_week'] = 'Veckoöversikt'; ! $lang['view_day'] = 'Dag-/evenemangöversikt'; ! $lang['view_list'] = 'Listöversikt'; ! $lang['view'] = 'Ãversikt'; $lang['Submitted_by'] = 'Skickad av'; ! $lang['No_modify_old'] = 'Ledsen, du kan inte redigera en gammalt händelse'; ! $lang['Cat_in_use'] = 'Denna kategori är länkad till existerande händelser och kan inte raderas'; // // DEV lang 2.0.25 // ! $lang['require_time'] = 'Kräver start/slut tider för att skrivas in i nya händelser'; ! $lang['allow_private_event'] = 'Tillĺt registrerade användare att lägga till privata händelser'; ! $lang['allow_group_event'] = 'Tillĺt registrerade användare begränsa händelser till deras egna grupper'; ! $lang['event_access'] = 'Händelseĺtkomst:'; $lang['private_event'] = 'Privat/Personlig'; $lang['public_event'] = 'Publik'; ! $lang['ug_event'] = 'Begränsad till användargrupp(er)'; ! $lang['group_select'] = 'Tillĺtna användargrupper: <br /><i>(om tillämpbart)</i>'; ! $lang['group_event_explain'] = '<span class="genmed"><i>(Hĺll CTRL tangenten intryckt samtidigt som du väljer grupper med musen för att välja mer än en grupp)</i></span>'; ! $lang['No_private_events'] = 'Du har inte tillĺtelse att lägga till privata händelser'; $lang['time_format'] = 'Tidformat'; *************** *** 175,183 **** // Added for MX-Publisher Portal module mx_calsnails // ! $lang['Events'] = 'Händelser'; ! $lang['allow_anon_post_default'] = 'Standardåtkomstnivå för ALLA anonyma användare'; ! $lang['Calendar_Events'] = 'Kalenderhändelse'; ! $lang['More_Info'] = 'Läs vidare...'; $lang['To_End_Date'] = 'Till:'; --- 175,183 ---- // Added for MX-Publisher Portal module mx_calsnails // ! $lang['Events'] = 'Händelser'; ! $lang['allow_anon_post_default'] = 'Standardĺtkomstnivĺ för ALLA anonyma användare'; ! $lang['Calendar_Events'] = 'Kalenderhändelse'; ! $lang['More_Info'] = 'Läs vidare...'; $lang['To_End_Date'] = 'Till:'; *************** *** 187,192 **** $lang['Ev_this_day'] = 'Idag'; $lang['Ev_this_week'] = 'Vecka '; ! $lang['Ev_next_week'] = 'Nästa vecka, '; ! $lang['Ev_this_month'] = 'Månad '; ! $lang['Ev_next_month'] = 'Nästa månad '; ?> \ No newline at end of file --- 187,192 ---- $lang['Ev_this_day'] = 'Idag'; $lang['Ev_this_week'] = 'Vecka '; ! $lang['Ev_next_week'] = 'Nästa vecka, '; ! $lang['Ev_this_month'] = 'Mĺnad '; ! $lang['Ev_next_month'] = 'Nästa mĺnad '; ?> \ No newline at end of file Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/language/lang_swedish/lang_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_admin.php 3 Jun 2008 20:08:37 -0000 1.2 --- lang_admin.php 3 Apr 2013 10:56:52 -0000 1.3 *************** *** 23,27 **** // $lang['Calsnails_title'] = 'Kalender'; ! $lang['1_Settings'] = 'Inställningar'; // --- 23,27 ---- // $lang['Calsnails_title'] = 'Kalender'; ! $lang['1_Settings'] = 'Inställningar'; // *************** *** 29,58 **** // $lang['Config_Calendar'] = 'Kalenderkonfiguration'; ! $lang['Config_Calendar_explain'] = 'Göt alla inställningar för din kalender nedan'; $lang['week_start'] = 'Veckostart'; ! $lang['subject_length'] = 'Ämneslängd'; ! $lang['subject_length_explain'] = 'Ställ in längden av bokstäver i ett händelseämne(titel) för huvudmånadsvisning<br><i>Notera: För dubbelbyte-språk, välj alltid ett jämnt antal bokstäver</i>'; ! $lang['cal_script_path_explain'] = 'Ingen aktuell är använd'; ! $lang['allow_anon'] = 'Tillåt anonym visning'; ! $lang['allow_old'] = 'Tillåt gamla händelser'; ! $lang['allow_old_explain'] = 'Tillåt att posta händelser för datum som varit'; $lang['show_headers'] = 'Visa phpBB2 huvudinfo'; ! $lang['cal_date_explain'] = "Använd endast om du önskar använda ett annat format från forum datumformat <a href='http://www.php.net/date' target='_other'>date()</a>"; $lang['category'] = 'Kategori'; $lang['Cal_config_updated'] = 'Kalenderkonfiguration uppdaterades...'; ! $lang['Cal_return_config'] = 'Klicka %shär%s för att återvända till kalenderkonfigurationen'; ! $lang['no_public'] = 'Ingen publik åtkomst'; $lang['view_only'] = 'Visa endast'; ! $lang['view_suggest'] = 'Visa,föreslagna händelser'; ! $lang['view_add'] = 'Visa,Adderade händelser'; ! $lang['view_edit_own'] = 'Visa,lägg till (Redigera/Radera egna)'; $lang['cal_admin'] = 'Kalender Admin'; ! $lang['allow_user_post_default'] = 'Standard nivååtkomst för ALLA registrerade användare'; ! $lang['allow_anon_post_default'] = 'Standardåtkomstnivå för ALLA anonyma användare'; // --- 29,58 ---- // $lang['Config_Calendar'] = 'Kalenderkonfiguration'; ! $lang['Config_Calendar_explain'] = 'Göt alla inställningar för din kalender nedan'; $lang['week_start'] = 'Veckostart'; ! $lang['subject_length'] = 'Ãmneslängd'; ! $lang['subject_length_explain'] = 'Ställ in längden av bokstäver i ett händelseämne(titel) för huvudmĺnadsvisning<br><i>Notera: För dubbelbyte-sprĺk, välj alltid ett jämnt antal bokstäver</i>'; ! $lang['cal_script_path_explain'] = 'Ingen aktuell är använd'; ! $lang['allow_anon'] = 'Tillĺt anonym visning'; ! $lang['allow_old'] = 'Tillĺt gamla händelser'; ! $lang['allow_old_explain'] = 'Tillĺt att posta händelser för datum som varit'; $lang['show_headers'] = 'Visa phpBB2 huvudinfo'; ! $lang['cal_date_explain'] = "Använd endast om du önskar använda ett annat format frĺn forum datumformat <a href='http://www.php.net/date' target='_other'>date()</a>"; $lang['category'] = 'Kategori'; $lang['Cal_config_updated'] = 'Kalenderkonfiguration uppdaterades...'; ! $lang['Cal_return_config'] = 'Klicka %shär%s för att ĺtervända till kalenderkonfigurationen'; ! $lang['no_public'] = 'Ingen publik ĺtkomst'; $lang['view_only'] = 'Visa endast'; ! $lang['view_suggest'] = 'Visa,föreslagna händelser'; ! $lang['view_add'] = 'Visa,Adderade händelser'; ! $lang['view_edit_own'] = 'Visa,lägg till (Redigera/Radera egna)'; $lang['cal_admin'] = 'Kalender Admin'; ! $lang['allow_user_post_default'] = 'Standard nivĺĺtkomst för ALLA registrerade användare'; ! $lang['allow_anon_post_default'] = 'Standardĺtkomstnivĺ för ALLA anonyma användare'; // *************** *** 60,66 **** // $lang['Calendar_Where'] = 'SQL var'; ! $lang['Calendar_Where_explain'] = 'Specificera villkoren för att filtrera kalenderhändelser.<br />Till exempel: användarnamn = "xxxx" OCH händelseräckvidd >= "yyyy-mm-dd hh:mm:ss"<br />Kolumninformation: id (int), username (string), stamp (datetime in the form "yyyy-mm-dd hh:mm:ss"), subject (string), description (string), user_id (int), eventspan (date)'; $lang['Calendar_Order'] = 'SQL sortera efter'; ! $lang['Calendar_Order_explain'] = 'Specificera lista med kolumner (komma-separerade) för att användas sorterat efter klausul.<br />Notera: Parametrar VAR och SORTERAT EFTER är använda för att dynamiskt bygga SQL framställning för detta block. Vänligen, verifiera att SQL syntaxen är korrekt.'; // ----------------------------------- --- 60,66 ---- // $lang['Calendar_Where'] = 'SQL var'; ! $lang['Calendar_Where_explain'] = 'Specificera villkoren för att filtrera kalenderhändelser.<br />Till exempel: användarnamn = "xxxx" OCH händelseräckvidd >= "yyyy-mm-dd hh:mm:ss"<br />Kolumninformation: id (int), username (string), stamp (datetime in the form "yyyy-mm-dd hh:mm:ss"), subject (string), description (string), user_id (int), eventspan (date)'; $lang['Calendar_Order'] = 'SQL sortera efter'; ! $lang['Calendar_Order_explain'] = 'Specificera lista med kolumner (komma-separerade) för att användas sorterat efter klausul.<br />Notera: Parametrar VAR och SORTERAT EFTER är använda för att dynamiskt bygga SQL framställning för detta block. Vänligen, verifiera att SQL syntaxen är korrekt.'; // ----------------------------------- *************** *** 69,96 **** $lang['Calendar_Block_Title'] = 'Blocktitel'; ! $lang['Calendar_Block_Title_explain'] = 'Denna parameter tillåter dig att åsidosätta standardblocktiteln (du kan använda något meningsfullt beroende på vilket område som används).'; $lang['Calendar_Events_dateformat'] = 'Datumformat'; ! $lang['Calendar_Events_dateformat_explain'] = "Använd endast om du önskar använda ett annat format från Calendar Lite datumformat (se <a href='http://www.php.net/date' target='_other'>date()</a>)"; $lang['Calendar_Vertical_Size'] = 'Vertikal storlek (pixels)'; ! $lang['Calendar_Vertical_Size_explain'] = 'Om du väljer 0, beror blockhöjden på antalet händelser, annars kommer storleken vara fast och blocket blir scrollbart.'; ! $lang['Calendar_Text_Length'] = 'Textlängd'; ! $lang['Calendar_Text_Length_explain'] = 'Specificera max antal bokstäver för händelsetext.'; ! $lang['Calendar_Events_Range'] = 'Intervall för händelse'; ! $lang['Calendar_Events_Range_explain'] = 'Specificera intervall (eller filtrera) för visade händelser.'; ! $lang['Calendar_Events_Prev'] = 'Dagar före intervallet'; ! $lang['Calendar_Events_Prev_explain'] = 'Använd denna parameter för att tillämpa en negativ sidogren till intervallet.'; $lang['Calendar_Events_Next'] = 'Dagar efter intervallet'; ! $lang['Calendar_Events_Next_explain'] = 'Använd denna parameter för att tillämpa en positiv sidogren till intervallet.'; $lang['Mod_group'] = 'Calsnails Moderatorgrupp'; ! $lang['Mod_group_explain'] = '- med adminrättigheter!'; ! $lang['auth_all'] = 'Standardrättigheter för alla gäster'; ! $lang['auth_reg'] = 'Standardrättigheter för alla registrerade användare'; $lang['auth_reg_explain'] = 'NOTE: Block EDIT permissions also affect the CalSnails Block. EDIT users become CalSnails moderators...'; ! $lang['cal_filter'] = 'Händelsefilter: visa bara händelser associerade med detta block'; ! $lang['cal_filter_explain'] = 'Notera: FALSE, betyder att alla händelser visas...'; $lang['cal_mod_group'] = 'Calsnails moderatorgrupp'; --- 69,97 ---- $lang['Calendar_Block_Title'] = 'Blocktitel'; ! $lang['Calendar_Block_Title_explain'] = 'Denna parameter tillĺter dig att ĺsidosätta standardblocktiteln (du kan använda nĺgot meningsfullt beroende pĺ vilket omrĺde som används).'; $lang['Calendar_Events_dateformat'] = 'Datumformat'; ! $lang['Calendar_Events_dateformat_explain'] = "Använd endast om du önskar använda ett annat format frĺn Calendar Lite datumformat (se <a href='http://www.php.net/date' target='_other'>date()</a>)"; $lang['Calendar_Vertical_Size'] = 'Vertikal storlek (pixels)'; ! $lang['Calendar_Vertical_Size_explain'] = 'Om du väljer 0, beror blockhöjden pĺ antalet händelser, annars kommer storleken vara fast och blocket blir scrollbart.'; ! $lang['Calendar_Text_Length'] = 'Textlängd'; ! $lang['Calendar_Text_Length_explain'] = 'Specificera max antal bokstäver för händelsetext.'; ! $lang['Calendar_Events_Range'] = 'Intervall för händelse'; ! $lang['Calendar_Events_Range_explain'] = 'Specificera intervall (eller filtrera) för visade händelser.'; ! $lang['Calendar_Events_Prev'] = 'Dagar före intervallet'; ! $lang['Calendar_Events_Prev_explain'] = 'Använd denna parameter för att tillämpa en negativ sidogren till intervallet.'; $lang['Calendar_Events_Next'] = 'Dagar efter intervallet'; ! $lang['Calendar_Events_Next_explain'] = 'Använd denna parameter för att tillämpa en positiv sidogren till intervallet.'; $lang['Mod_group'] = 'Calsnails Moderatorgrupp'; ! $lang['Mod_group_explain'] = '- med adminrättigheter!'; ! $lang['auth_all'] = 'Standardrättigheter för alla gäster'; ! $lang['auth_reg'] = 'Standardrättigheter för alla registrerade användare'; $lang['auth_reg_explain'] = 'NOTE: Block EDIT permissions also affect the CalSnails Block. EDIT users become CalSnails moderators...'; ! $lang['cal_filter'] = 'Händelsefilter: visa bara händelser associerade med detta block'; ! $lang['cal_filter_explain'] = 'Notera: FALSE, betyder att alla händelser visas...'; ! $lang['cal_hebrew'] = 'Hebrew Dates: Show some events added from the Hebrew Calendar'; $lang['cal_mod_group'] = 'Calsnails moderatorgrupp'; |
|
From: Florin C B. <ory...@us...> - 2013-04-03 10:56:54
|
Update of /cvsroot/mxbb/mx_calsnails/language/lang_english In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14723/language/lang_english Modified Files: lang_admin.php Log Message: Module Upgraded to oO Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/language/lang_english/lang_admin.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** lang_admin.php 3 Jun 2008 20:08:36 -0000 1.16 --- lang_admin.php 3 Apr 2013 10:56:52 -0000 1.17 *************** *** 91,94 **** --- 91,95 ---- $lang['cal_filter'] = 'Event Filter: Show events added for this Block only'; $lang['cal_filter_explain'] = 'NOTE: FALSE, means show ALL calendar events...'; + $lang['cal_hebrew'] = 'Hebrew Dates: Show some events added from the Hebrew Calendar'; $lang['cal_mod_group'] = 'CalSnails Moderator Group'; |
|
From: Florin C B. <ory...@us...> - 2013-03-19 06:43:47
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13052 Modified Files: album_picm.php Log Message: fixed thumb generation for bmp to png Index: album_picm.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_picm.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** album_picm.php 19 Mar 2013 05:54:09 -0000 1.13 --- album_picm.php 19 Mar 2013 06:43:45 -0000 1.14 *************** *** 449,453 **** exit; } ! if (($pic_info['filetype'] == 'bmp') && @file_exists($pic_info['thumbnail_m_fullpath']) && ($album_config['show_gif_mid_thumb'] == 1)) { header('Content-type: image/bmp'); --- 449,453 ---- exit; } ! if (($pic_info['filetype'] == 'bmp') && @file_exists($pic_med_fullpath)) { header('Content-type: image/bmp'); *************** *** 458,462 **** exit; } ! //$pic_fullpath = ALBUM_UPLOAD_PATH . $pic_filename; if (!@file_exists($pic_fullpath)) { --- 458,462 ---- exit; } ! //die("$pic_med_fullpath"); if (!@file_exists($pic_fullpath)) { *************** *** 570,574 **** $resize_function = 'imagecopyresampled'; $resize_function($thumbnail, $source, 0, 0, 0, 0, $thumbnail_width, $thumbnail_height, $pic_width, $pic_height); ! if ($album_config['midthumb_cache'] == true) { // ------------------------ --- 570,574 ---- $resize_function = 'imagecopyresampled'; $resize_function($thumbnail, $source, 0, 0, 0, 0, $thumbnail_width, $thumbnail_height, $pic_width, $pic_height); ! if (($album_config['midthumb_cache'] == 1)) { // ------------------------ *************** *** 577,583 **** $pic_filetype = '.png'; $pic_med_new = md5($pic_filename) . $pic_filetype; ! $pic_med_new_fullpath = ALBUM_CACHE_PATH . $pic_med_new; @imagepng($thumbnail, $pic_med_new_fullpath); @chmod($pic_med_new_fullpath, 0777); $sql = "UPDATE ". ALBUM_TABLE ." SET pic_thumbnail = '" . $pic_med_new . "' --- 577,587 ---- $pic_filetype = '.png'; $pic_med_new = md5($pic_filename) . $pic_filetype; ! $pic_med_new_fullpath = ALBUM_MED_CACHE_PATH . $pic_med_new; ! // Re-generate successfully. Write it to disk! ! //@imagepng($thumbnail, $pic_info['thumbnail_new_m_fullpath']); ! //@chmod($pic_info['thumbnail_new_m_fullpath'], 0777); @imagepng($thumbnail, $pic_med_new_fullpath); @chmod($pic_med_new_fullpath, 0777); + /* $sql = "UPDATE ". ALBUM_TABLE ." SET pic_thumbnail = '" . $pic_med_new . "' *************** *** 587,594 **** --- 591,607 ---- mx_message_die(GENERAL_ERROR, 'Could not update pic information', '', __LINE__, __FILE__, $sql); } + */ } + else + { + @imagepng($thumbnail, $pic_info['thumbnail_new_m_fullpath']); + @chmod($pic_info['thumbnail_new_m_fullpath'], 0777); + } imagepng($thumbnail); imagedestroy($thumbnail); //readfile($pic_med_new_fullpath); + //imagepng($thumbnail); + //header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); + //readfile($pic_nopic_fullpath); exit; } *************** *** 723,727 **** @imagejpeg($thumbnail, $pic_info['thumbnail_new_m_fullpath'], $album_config['thumbnail_quality']); break; ! case 'png': @imagepng($thumbnail, $pic_info['thumbnail_new_m_fullpath']); break; --- 736,741 ---- @imagejpeg($thumbnail, $pic_info['thumbnail_new_m_fullpath'], $album_config['thumbnail_quality']); break; ! case 'bmp': ! case 'png': @imagepng($thumbnail, $pic_info['thumbnail_new_m_fullpath']); break; *************** *** 735,739 **** @imagejpeg($thumbnail, '', $album_config['thumbnail_quality']); break; ! case 'png': @imagepng($thumbnail); break; --- 749,754 ---- @imagejpeg($thumbnail, '', $album_config['thumbnail_quality']); break; ! case 'bmp': ! case 'png': @imagepng($thumbnail); break; |
|
From: Florin C B. <ory...@us...> - 2013-03-19 05:54:12
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10648/modules Modified Files: album_pic.php album_picm.php album_thumbnail.php album_upload.php Log Message: Album Image Class Update to partialy support the other type of images Index: album_picm.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_picm.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** album_picm.php 19 Mar 2013 02:01:49 -0000 1.12 --- album_picm.php 19 Mar 2013 05:54:09 -0000 1.13 *************** *** 449,453 **** exit; } ! //$pic_fullpath = ALBUM_UPLOAD_PATH . $pic_filename; if (!@file_exists($pic_fullpath)) --- 449,461 ---- exit; } ! if (($pic_info['filetype'] == 'bmp') && @file_exists($pic_info['thumbnail_m_fullpath']) && ($album_config['show_gif_mid_thumb'] == 1)) ! { ! header('Content-type: image/bmp'); ! header('Content-Disposition: filename=' . $pic_info['title_reg'] . '.' . $pic_info['filetype']); ! $source = imagecreatefrompng($pic_info['thumbnail_m_fullpath']); ! //readfile($pic_info['thumbnail_m_fullpath']); ! imagebmp($source); ! exit; ! } //$pic_fullpath = ALBUM_UPLOAD_PATH . $pic_filename; if (!@file_exists($pic_fullpath)) *************** *** 530,533 **** --- 538,597 ---- } + + if ($pic_info['filetype'] == 'bmp') + { + $pic_med_fullpath = @file_exists($pic_med_fullpath) ? $pic_med_fullpath : $pic_fullpath; + // -------------------------------- + // GD does not support GIF so we must SEND a premade No-thumbnail pic then EXIT + // -------------------------------- + $thumbnail_size = 500; + $thumbnail_width = ($album_sp_config['midthumb_width']) ? $album_sp_config['midthumb_width'] : 350; + $thumbnail_height = ($album_sp_config['midthumb_height']) ? $album_sp_config['midthumb_height'] : 350; + + $pic_size = @getimagesize($pic_med_fullpath); + $pic_width = $pic_size[0]; + $pic_height = $pic_size[1]; + + if ($pic_width > $pic_height) + { + $thumbnail_width = $album_sp_config['midthumb_width']; + $thumbnail_height = $album_sp_config['midthumb_width'] * ($pic_height/$pic_width); + } + else + { + $thumbnail_height = $album_sp_config['midthumb_height']; + $thumbnail_width = $album_sp_config['midthumb_height'] * ($pic_width/$pic_height); + } + $file_header = 'Content-type: image/png'; + header('Content-Disposition: filename=' . $pic_info['title_reg'] . '.' . $file_header); + $source = imagecreatefrombmp($pic_med_fullpath); + $thumbnail = @imagecreatetruecolor($thumbnail_width, $thumbnail_height); + //$thumbnail = ($album_config['gd_version'] == 1) ? @imagecreate($thumbnail_width, $thumbnail_height) : @imagecreatetruecolor($thumbnail_width, $thumbnail_height); + $resize_function = 'imagecopyresampled'; + $resize_function($thumbnail, $source, 0, 0, 0, 0, $thumbnail_width, $thumbnail_height, $pic_width, $pic_height); + if ($album_config['midthumb_cache'] == true) + { + // ------------------------ + // Re-generate successfully. Write it to disk! + // ------------------------ + $pic_filetype = '.png'; + $pic_med_new = md5($pic_filename) . $pic_filetype; + $pic_med_new_fullpath = ALBUM_CACHE_PATH . $pic_med_new; + @imagepng($thumbnail, $pic_med_new_fullpath); + @chmod($pic_med_new_fullpath, 0777); + $sql = "UPDATE ". ALBUM_TABLE ." + SET pic_thumbnail = '" . $pic_med_new . "' + WHERE pic_id = '" . $pic_id . "'"; + if( !$result = $db->sql_query($sql) ) + { + mx_message_die(GENERAL_ERROR, 'Could not update pic information', '', __LINE__, __FILE__, $sql); + } + } + imagepng($thumbnail); + imagedestroy($thumbnail); + //readfile($pic_med_new_fullpath); + exit; + } + // ------------------------------------ // Send GD Thumbnail to browser Index: album_pic.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_pic.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** album_pic.php 19 Mar 2013 02:01:49 -0000 1.11 --- album_pic.php 19 Mar 2013 05:54:09 -0000 1.12 *************** *** 434,438 **** $is_wm = (($apply_wm == true) && @file_exists($pic_info['thumbnail_w_f_fullpath'])) ? true : false; ! if (($pic_info['filetype'] == 'gif') || ((($pic_info['filetype'] == 'jpg') || ($pic_info['filetype'] == 'png')) && ($apply_wm == false)) || $is_wm) { header($file_header); --- 434,438 ---- $is_wm = (($apply_wm == true) && @file_exists($pic_info['thumbnail_w_f_fullpath'])) ? true : false; ! if (($pic_info['filetype'] == 'gif') || ($pic_info['filetype'] == 'bmp') || ($pic_info['filetype'] == 'xbm') || ($pic_info['filetype'] == 'wbmp') || ((($pic_info['filetype'] == 'jpg') || ($pic_info['filetype'] == 'png')) && ($apply_wm == false)) || $is_wm) { header($file_header); Index: album_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_upload.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** album_upload.php 19 Mar 2013 02:01:49 -0000 1.8 --- album_upload.php 19 Mar 2013 05:54:09 -0000 1.9 *************** *** 975,979 **** // Resize on upload ! if ( ((($pic_width > $album_config['max_width']) || ($pic_height > $album_config['max_height'])) || ($recompress == 1)) && ($pic_filetype != '.xbmp')) { if ($album_config['gd_version'] == 0) --- 975,979 ---- // Resize on upload ! if ( ((($pic_width > $album_config['max_width']) || ($pic_height > $album_config['max_height'])) || ($recompress == 1)) && ($pic_filetype != '.gif') && ($pic_filetype != '.xbm') && ($pic_filetype != '.bmp')) { if ($album_config['gd_version'] == 0) *************** *** 1092,1096 **** // Need to rotate before thumbnail cache // -------------------------------------- ! if( ($pic_filetype != '.gif') && ($album_config['gd_version'] > 0) && ($_POST['rotation'] > 0) && (!$HotLinked) && ($album_config['switch_nuffload'] == 0) ) { // Uncomment the next line if you want to rotate clockwise and remember to change the language setting --- 1092,1096 ---- // Need to rotate before thumbnail cache // -------------------------------------- ! if( ($pic_filetype != '.gif') && ($pic_filetype != '.xbm') && ($pic_filetype != '.bmp') && ($album_config['gd_version'] > 0) && ($_POST['rotation'] > 0) && (!$HotLinked) && ($album_config['switch_nuffload'] == 0) ) { // Uncomment the next line if you want to rotate clockwise and remember to change the language setting *************** *** 1101,1110 **** switch ($pic_filetype) { ! case '.jpg': ! $read_function = 'imagecreatefromjpeg'; ! break; case '.png': ! $read_function = 'imagecreatefrompng'; ! break; } --- 1101,1125 ---- switch ($pic_filetype) { ! case '.gif': ! $read_function = 'imageCreateFromGIF'; ! break; ! case '.jpeg': ! $read_function = 'imageCreateFromJPEG'; ! break; case '.png': ! $read_function = 'imageCreateFromPNG'; ! break; ! case '.xbm': ! $read_function = 'ImageCreateFromXBM'; ! break; ! case '.wbmp': ! $read_function = 'imageCreateFromWBMP'; ! break; ! case '.bmp': ! $read_function = 'ImageCreateFromBMP'; ! break; ! default: ! $ermsg = $pic_filetype .' images are not supported<br />'; ! break; } *************** *** 1125,1138 **** switch ($pic_filetype) { - case '.jpg': - @unlink(ALBUM_UPLOAD_PATH . $pic_rotate); - @imagejpeg($rotate, ALBUM_UPLOAD_PATH . $pic_filename, $album_config['thumbnail_size']); - break; case '.png': @unlink(ALBUM_UPLOAD_PATH . $pic_rotate); @imagepng($rotate, ALBUM_UPLOAD_PATH . $pic_resize); break; } - @chmod(ALBUM_UPLOAD_PATH . $pic_filename, 0777); $pic_size = getimagesize(ALBUM_UPLOAD_PATH . $pic_filename); --- 1140,1169 ---- switch ($pic_filetype) { case '.png': @unlink(ALBUM_UPLOAD_PATH . $pic_rotate); @imagepng($rotate, ALBUM_UPLOAD_PATH . $pic_resize); break; + case 'gif': + @unlink(ALBUM_UPLOAD_PATH . $pic_rotate); + @imagegif($rotate, ALBUM_UPLOAD_PATH . $pic_resize); + break; + case '.xbm': + @unlink(ALBUM_UPLOAD_PATH . $pic_rotate); + @imagexbm($rotate, ALBUM_UPLOAD_PATH . $pic_resize); + break; + case '.wbmp': + @unlink(ALBUM_UPLOAD_PATH . $pic_rotate); + @imagewbmp($rotate, ALBUM_UPLOAD_PATH . $pic_resize); + break; + case '.bmp': + @unlink(ALBUM_UPLOAD_PATH . $pic_rotate); + @imagebmp($rotate, ALBUM_UPLOAD_PATH . $pic_resize); + break; + case '.jpg': + default: + @unlink(ALBUM_UPLOAD_PATH . $pic_rotate); + @imagejpeg($rotate, ALBUM_UPLOAD_PATH . $pic_filename, $album_config['thumbnail_size']); + break; } @chmod(ALBUM_UPLOAD_PATH . $pic_filename, 0777); $pic_size = getimagesize(ALBUM_UPLOAD_PATH . $pic_filename); *************** *** 1148,1152 **** // -------------------------------- ! if( ($album_config['thumbnail_cache'] == 1) && ($pic_filetype != '.gif') && ($album_config['gd_version'] > 0) ) { $gd_errored = false; --- 1179,1183 ---- // -------------------------------- ! if( ($album_config['thumbnail_cache'] == 1) && ($pic_filetype != '.gif') && ($pic_filetype != '.xbm') && ($pic_filetype != '.bmp') && ($album_config['gd_version'] > 0) ) { $gd_errored = false; *************** *** 1154,1163 **** switch ($pic_filetype) { ! case '.jpg': ! $read_function = 'imagecreatefromjpeg'; ! break; case '.png': ! $read_function = 'imagecreatefrompng'; ! break; } --- 1185,1209 ---- switch ($pic_filetype) { ! case '.gif': ! $read_function = 'imageCreateFromGIF'; ! break; ! case '.jpeg': ! $read_function = 'imageCreateFromJPEG'; ! break; case '.png': ! $read_function = 'imageCreateFromPNG'; ! break; ! case '.xbm': ! $read_function = 'ImageCreateFromXBM'; ! break; ! case '.wbmp': ! $read_function = 'imageCreateFromWBMP'; ! break; ! case '.bmp': ! $read_function = 'ImageCreateFromBMP'; ! break; ! default: ! $ermsg = $pic_filetype .' images are not supported<br />'; ! break; } *************** *** 1226,1229 **** --- 1272,1287 ---- @imagepng($thumbnail, ALBUM_CACHE_PATH . $pic_thumbnail); break; + case '.xbm': + @imagexbm($thumbnail, ALBUM_CACHE_PATH . $pic_thumbnail); + break; + case '.wbmp': + @imagewbmp($thumbnail, ALBUM_CACHE_PATH . $pic_thumbnail); + break; + case '.bmp': + @imagebmp($thumbnail, ALBUM_CACHE_PATH . $pic_thumbnail); + break; + default: + @imagejpeg($thumbnail, ALBUM_CACHE_PATH . $pic_thumbnail, '70'); + break; } @chmod(ALBUM_CACHE_PATH . $pic_thumbnail, 0777); *************** *** 1281,1285 **** // --- Smart Album Button BEGIN ---------------- // added by Tom XS2 Build 054 ! if ( defined('IS_PHPBBXS') ) { if ($is_personal_gallery == true) --- 1339,1343 ---- // --- Smart Album Button BEGIN ---------------- // added by Tom XS2 Build 054 ! if ( defined('IN_PORTAL') ) { if ($is_personal_gallery == true) Index: album_thumbnail.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_thumbnail.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** album_thumbnail.php 18 Mar 2013 03:41:25 -0000 1.11 --- album_thumbnail.php 19 Mar 2013 05:54:09 -0000 1.12 *************** *** 270,274 **** $read_function = 'ReadSourceFile'; $send_function = 'SendToBrowser'; ! break; default: header('Content-type: image/jpeg'); --- 270,279 ---- $read_function = 'ReadSourceFile'; $send_function = 'SendToBrowser'; ! break; ! case '.bmp': ! $file_header = 'Content-type: image/bmp'; ! $read_function = 'ReadSourceFile'; ! $send_function = 'SendToBrowser'; ! break; default: header('Content-type: image/jpeg'); *************** *** 304,308 **** $read_function = 'imagecreatefrompng'; $send_function = 'imagepng'; ! break; default: header('Content-type: image/jpeg'); --- 309,318 ---- $read_function = 'imagecreatefrompng'; $send_function = 'imagepng'; ! break; ! case '.bmp': ! $file_header = 'Content-type: image/png'; ! $read_function = 'imagecreatefrombmp'; ! $send_function = 'imagepng'; ! break; default: header('Content-type: image/jpeg'); *************** *** 316,381 **** } // ------------------------------------ ! // Send GIF Thumbnail to browser // ------------------------------------ ! if (($pic_info['filetype'] == 'gif') && ($useclass = false)) { ! $pic_thumbnail = @file_exists($pic_thumbnail) ? $pic_thumbnail : $pic_fullpath; // -------------------------------- // GD does not support GIF so we must SEND a premade No-thumbnail pic then EXIT // -------------------------------- ! if ($album_config['show_gif_mid_thumb'] == 1) ! { ! $thumbnail_size = 500; ! $thumbnail_width = ($album_config['thumbnail_size']) ? $album_config['thumbnail_size'] : 350; ! $thumbnail_height = ($album_config['thumbnail_size']) ? $album_config['thumbnail_size'] : 350; ! ! $pic_size = @getimagesize($pic_thumbnail); ! $pic_width = $pic_size[0]; ! $pic_height = $pic_size[1]; ! ! if ($pic_width > $pic_height) ! { ! $thumbnail_width = $album_config['thumbnail_size']; ! $thumbnail_height = $album_config['thumbnail_size'] * ($pic_height/$pic_width); ! } ! else ! { ! $thumbnail_height = $album_config['thumbnail_size']; ! $thumbnail_width = $album_config['thumbnail_size'] * ($pic_width/$pic_height); ! } ! ! header($file_header); ! ! $thumbnail = ($album_config['gd_version'] == 1) ? @imagecreate($thumbnail_width, $thumbnail_height) : @imagecreatetruecolor($thumbnail_width, $thumbnail_height); ! ! $resize_function = 'imagecopyresampled'; ! ! $source = $read_function($pic_thumbnail); ! ! @$resize_function($thumbnail, $source, 0, 0, 0, 0, $thumbnail_width, $thumbnail_height, $pic_width, $pic_height); ! $send_function($thumbnail); ! ! imagedestroy($thumbnail); } else { ! header('Content-type: image/gif'); ! readfile($module_root_path . 'album_mod/nothumbnail.jpg'); ! exit; } ! } ! elseif (($pic_info['filetype'] == 'gif') && ($Image->$read_function($pic_thumbnail)) && ($album_config['show_gif_mid_thumb'] == 1)) ! { ! $Image->$send_function($pic_title_reg, $pic_filetype, '', '', $album_config['thumbnail_quality']); ! $Image->Destroy(); exit; - } elseif ($pic_info['filetype'] == 'gif') { ! header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); readfile($pic_nopic_fullpath); --- 326,399 ---- } + if (!@file_exists($pic_fullpath)) + { + //mx_message_die(GENERAL_ERROR, 'error: image file does not exists', '', __LINE__, __FILE__, $pic_fullpath); + $pic_fullpath = $pic_nopic_fullpath; //!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'; + } + // ------------------------------------ ! // Try send GIF Thumbnail to browser using GD Class // ------------------------------------ ! if ((($pic_info['filetype'] == 'gif') || ($pic_info['filetype'] == 'bmp')) && ($Image->$read_function($pic_thumbnail)) && ($album_config['show_gif_mid_thumb'] == 1)) { ! //$Image->$send_function($pic_title_reg, $pic_filetype, '', '', $album_config['thumbnail_quality']); ! //$Image->Destroy(); ! //exit; ! ! } ! // ------------------------------------ ! // Try send GIF/BMP Thumbnail to browser again ! // ------------------------------------ ! if (($pic_info['filetype'] == 'gif') && @file_exists($pic_info['pic_thumbnail'])) ! { ! header('Content-type: image/gif'); ! header('Content-Disposition: filename=' . $pic_info['title_reg'] . '.' . $pic_info['filetype']); ! readfile($pic_info['thumbnail_fullpath']); ! exit; ! } ! if ($pic_info['filetype'] == 'gif') ! { ! $pic_thumbnail = @file_exists($pic_info['pic_thumbnail']) ? $pic_info['pic_thumbnail'] : $pic_fullpath; // -------------------------------- // GD does not support GIF so we must SEND a premade No-thumbnail pic then EXIT // -------------------------------- ! $thumbnail_size = 500; ! $thumbnail_width = ($album_config['thumbnail_size']) ? $album_config['thumbnail_size'] : 350; ! $thumbnail_height = ($album_config['thumbnail_size']) ? $album_config['thumbnail_size'] : 350; ! $pic_size = @getimagesize($pic_thumbnail); ! $pic_width = $pic_size[0]; ! $pic_height = $pic_size[1]; + if ($pic_width > $pic_height) + { + $thumbnail_width = $album_config['thumbnail_size']; + $thumbnail_height = $album_config['thumbnail_size'] * ($pic_height/$pic_width); } else { ! $thumbnail_height = $album_config['thumbnail_size']; ! $thumbnail_width = $album_config['thumbnail_size'] * ($pic_width/$pic_height); } ! ! header($file_header); ! $thumbnail = ($album_config['gd_version'] == 1) ? @imagecreate($thumbnail_width, $thumbnail_height) : @imagecreatetruecolor($thumbnail_width, $thumbnail_height); ! $resize_function = 'imagecopyresampled'; ! $source = $read_function($pic_thumbnail); ! ! $resize_function($thumbnail, $source, 0, 0, 0, 0, $thumbnail_width, $thumbnail_height, $pic_width, $pic_height); ! ! $send_function($thumbnail); ! ! imagedestroy($thumbnail); ! ! //header('Content-type: image/png'); ! //header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! //readfile($pic_nopic_fullpath); exit; } elseif ($pic_info['filetype'] == 'gif') { ! header('Content-type: image/png'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); readfile($pic_nopic_fullpath); *************** *** 383,390 **** } ! if (!@file_exists($pic_fullpath)) ! { ! //mx_message_die(GENERAL_ERROR, 'error: image file does not exists', '', __LINE__, __FILE__, $pic_fullpath); ! $pic_fullpath = $pic_nopic_fullpath; //!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'; } --- 401,468 ---- } ! if (($pic_info['filetype'] == 'bmp') && @file_exists($pic_thumbnail_fullpath)) ! { ! header('Content-type: image/bmp'); ! header('Content-Disposition: filename=' . $pic_info['title_reg'] . '.' . $pic_info['filetype']); ! $source = imagecreatefrompng($pic_thumbnail_fullpath); ! //readfile($pic_thumbnail_fullpath); ! imagebmp($source); ! exit; ! } ! if ($pic_info['filetype'] == 'bmp') ! { ! $pic_thumbnail = @file_exists($pic_info['pic_thumbnail']) ? $pic_info['pic_thumbnail'] : $pic_fullpath; ! // -------------------------------- ! // GD does not support GIF so we must SEND a premade No-thumbnail pic then EXIT ! // -------------------------------- ! $thumbnail_size = 255; ! $thumbnail_width = ($album_config['thumbnail_size']) ? $album_config['thumbnail_size'] : 255; ! $thumbnail_height = ($album_config['thumbnail_size']) ? $album_config['thumbnail_size'] : 255; ! ! $pic_size = @getimagesize($pic_thumbnail); ! $pic_width = $pic_size[0]; ! $pic_height = $pic_size[1]; ! ! if ($pic_width > $pic_height) ! { ! $thumbnail_width = $album_config['thumbnail_size']; ! $thumbnail_height = $album_config['thumbnail_size'] * ($pic_height/$pic_width); ! } ! else ! { ! $thumbnail_height = $album_config['thumbnail_size']; ! $thumbnail_width = $album_config['thumbnail_size'] * ($pic_width/$pic_height); ! } ! ! $file_header = 'Content-type: image/png'; ! header('Content-Disposition: filename=' . $pic_info['title_reg'] . '.' . $file_header); ! $source = imagecreatefrombmp($pic_fullpath); ! $thumbnail = @imagecreatetruecolor($thumbnail_width, $thumbnail_height); ! $resize_function = 'imagecopyresampled'; ! $resize_function($thumbnail, $source, 0, 0, 0, 0, $thumbnail_width, $thumbnail_height, $pic_width, $pic_height); ! if ($album_config['thumbnail_cache'] == 1) ! { ! // ------------------------ ! // Re-generate successfully. Write it to disk! ! // ------------------------ ! $pic_filetype = '.png'; ! $pic_thumbnail_new = md5($pic_filename) . $pic_filetype; ! $pic_thumbnail_new_fullpath = ALBUM_CACHE_PATH . $pic_thumbnail_new; ! @imagepng($thumbnail, $pic_thumbnail_new_fullpath); ! @chmod($pic_thumbnail_new_fullpath, 0777); ! $sql = "UPDATE ". ALBUM_TABLE ." ! SET pic_thumbnail = '" . $pic_thumbnail_new . "' ! WHERE pic_id = '" . $pic_id . "'"; ! if( !$result = $db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not update pic information', '', __LINE__, __FILE__, $sql); ! } ! } ! //imagepng($thumbnail); ! imagedestroy($thumbnail); ! //readfile($pic_thumbnail_new_fullpath); ! //header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! //readfile($pic_nopic_fullpath); ! exit; } *************** *** 487,490 **** --- 565,569 ---- @imagejpeg($thumbnail, $pic_thumbnail_new_fullpath, $album_config['thumbnail_quality']); break; + case '.bmp': case '.png': @imagepng($thumbnail, $pic_thumbnail_new_fullpath); *************** *** 503,506 **** --- 582,586 ---- break; case '.png': + case '.bmp': @imagepng($thumbnail); break; |
|
From: Florin C B. <ory...@us...> - 2013-03-19 05:54:11
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10648/includes Modified Files: album_image_class.php Log Message: Album Image Class Update to partialy support the other type of images Index: album_image_class.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_image_class.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** album_image_class.php 19 Mar 2013 02:01:49 -0000 1.8 --- album_image_class.php 19 Mar 2013 05:54:09 -0000 1.9 *************** *** 2984,2988 **** } ! /* function imageCreateFromBMP($filename) { --- 2984,2988 ---- } ! function imageCreateFromBMP($filename) { *************** *** 3026,3030 **** return $img; } ! */ /*********************************************/ /* Fonction: ImageCreateFromBMP */ --- 3026,3030 ---- return $img; } ! /*********************************************/ /* Fonction: ImageCreateFromBMP */ |
2 messages has been excluded from this view by a project administrator.
