Changeset 164

User picture

Author: Mighty Gorgon

(2010/01/17 11:48) About 2 years ago

Fixed some bugs:
* W3C compliance (thanks TuningBEB 2008)
* Wrong global blocks parsing in Bookmarks (thanks TuningBEB 2008)
* Added the possibility to show only today Birthdays by setting 0 in days to look forward in ACP

Affected files

Updated ip/trunk/blocks/birthdays.php Download diff

163164
33
33



34
		$template->assign_vars(array(
34
		$template->assign_vars(array(



35
			'BIRTHDAY_IMG' => $images['birthday_image'],
35
			'BIRTHDAY_IMG' => $images['birthday_image'],



36
			'L_WHOSBIRTHDAY_WEEK' => ($config['birthday_check_day'] > 1) ? sprintf((($birthdays_list['xdays']) ? $lang['Birthday_week'] :
$lang['Nobirthday_week']), $config['birthday_check_day']) . $birthdays_list['xdays'] : '',
36
			'L_WHOSBIRTHDAY_WEEK' => ($config['birthday_check_day'] >= 1) ? sprintf((($birthdays_list['xdays']) ? $lang['Birthday_week'] : $lang['Nobirthday_week']), $config['birthday_check_day']) . $birthdays_list['xdays'] : '',



37
			'L_WHOSBIRTHDAY_TODAY' => ($config['birthday_check_day']) ? ($birthdays_list['today']) ? $lang['Birthday_today'] . $birthdays_list['today'] : $lang['Nobirthday_today'] : ''
37
			'L_WHOSBIRTHDAY_TODAY' => ($birthdays_list['today']) ? $lang['Birthday_today'] . $birthdays_list['today'] : $lang['Nobirthday_today']



38
			)
38
			)



39
		);
39
		);



40
	}
40
	}





          

  Updated
ip/trunk/forum.php  Download diff




      
      
163164
200
	// Last Visit - END
200
	// Last Visit - END



201
201



202
	// Birthday Box - BEGIN
202
	// Birthday Box - BEGIN



203
	if ($config['index_birthday'] && ($config['birthday_check_day'] > 0))
203
	if ($config['index_birthday'])



204
	{
204
	{



205
		$template->assign_vars(array('S_BIRTHDAYS' => true));
205
		$template->assign_vars(array('S_BIRTHDAYS' => true));



206
		$birthdays_list = array();
206
		$birthdays_list = array();


...
...
346
	// End add - Last visit MOD
346
	// End add - Last visit MOD



347
	// Start add - Birthday MOD
347
	// Start add - Birthday MOD



348
	'L_WHOSBIRTHDAY_WEEK' => ($config['birthday_check_day'] >= 1) ? sprintf((($birthdays_list['xdays']) ? $lang['Birthday_week'] : $lang['Nobirthday_week']),
$config['birthday_check_day']) . $birthdays_list['xdays'] : '',
348
	'L_WHOSBIRTHDAY_WEEK' => ($config['birthday_check_day'] >= 1) ? sprintf((($birthdays_list['xdays']) ? $lang['Birthday_week'] : $lang['Nobirthday_week']),
$config['birthday_check_day']) . $birthdays_list['xdays'] : '',



349
	'L_WHOSBIRTHDAY_TODAY' => ($config['birthday_check_day']) ? ($birthdays_list['today']) ? $lang['Birthday_today'] . $birthdays_list['today'] : $lang['Nobirthday_today'] : '',
349
	'L_WHOSBIRTHDAY_TODAY' => ($birthdays_list['today']) ? $lang['Birthday_today'] . $birthdays_list['today'] : $lang['Nobirthday_today'],



350
	// End add - Birthday MOD
350
	// End add - Birthday MOD



351
	'L_FORUM' => $lang['Forum'],
351
	'L_FORUM' => $lang['Forum'],



352
	'L_TOPICS' => $lang['Topics'],
352
	'L_TOPICS' => $lang['Topics'],





          

  Updated
ip/trunk/includes/db/mysql.php  Download diff




      
      
163164
1015
				$totaltime = $mtime[0] + $mtime[1] - $this->sql_init_time;
1015
				$totaltime = $mtime[0] + $mtime[1] - $this->sql_init_time;



1016
				echo ('
1016
				echo ('



1017
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1017
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">



1018
<html>
1018
<html xmlns="http://www.w3.org/1999/xhtml">



1019
<head>
1019
<head>



1020
	<link rel="stylesheet" href="' . IP_ROOT_PATH . 'templates/common/acp.css" type="text/css" />
1020
	<link rel="stylesheet" href="' . IP_ROOT_PATH . 'templates/common/acp.css" type="text/css" />



1021
	<meta name="author" content="Mighty Gorgon" />
1021
	<meta name="author" content="Mighty Gorgon" />





          

  Updated
ip/trunk/includes/mini_cal/mini_cal.php  Download diff




      
      
163164
158
	'L_MINI_CAL_SUN' => $lang['mini_cal']['day'][7],
158
	'L_MINI_CAL_SUN' => $lang['mini_cal']['day'][7],



159
	'U_PREV_MONTH' => $prev_month,
159
	'U_PREV_MONTH' => $prev_month,



160
	'U_NEXT_MONTH' => $next_month,
160
	'U_NEXT_MONTH' => $next_month,



161
	'L_WHOSBIRTHDAY_WEEK' => ($config['birthday_check_day'] > 1) ? sprintf((($birthdays_list['xdays']) ? $lang['Birthday_week'] : $lang['Nobirthday_week']),
$config['birthday_check_day']).$birthdays_list['xdays'] : '',
161
	'L_WHOSBIRTHDAY_WEEK' => ($config['birthday_check_day'] >= 1) ? sprintf((($birthdays_list['xdays']) ? $lang['Birthday_week'] : $lang['Nobirthday_week']), $config['birthday_check_day']).$birthdays_list['xdays'] : '',



162
	'L_WHOSBIRTHDAY_TODAY' => ($config['birthday_check_day']) ? ($birthdays_list['today']) ? $lang['Birthday_today'].$birthdays_list['today'] : $lang['Nobirthday_today'] : '',
162
	'L_WHOSBIRTHDAY_TODAY' => ($birthdays_list['today']) ? $lang['Birthday_today'] . $birthdays_list['today'] : $lang['Nobirthday_today'],



163
	)
163
	)



164
);
164
);



165
165





          

  Updated
ip/trunk/language/lang_english/lang_main.php  Download diff




      
      
163164
35
$lang['BBC_IP_CREDITS_STATIC'] = '
35
$lang['BBC_IP_CREDITS_STATIC'] = '



36
<a href="http://www.icyphoenix.com" title="Icy Phoenix"><img src="http://www.icyphoenix.com/images/logo_ip.png"
alt="Icy Phoenix" title="Icy Phoenix" /></a><br />
36
<a href="http://www.icyphoenix.com" title="Icy Phoenix"><img src="http://www.icyphoenix.com/images/logo_ip.png"
alt="Icy Phoenix" title="Icy Phoenix" /></a><br />



37
<span style="color: #dd2222;"><b>Mighty Gorgon</b></span>&nbsp;<i>(Luca Libralato)</i><br />
37
<span style="color: #dd2222;"><b>Mighty Gorgon</b></span>&nbsp;<i>(Luca Libralato)</i><br />



38
<br />



39
<b><i>Developer</i></b><br />
38
<b><i>Developer</i></b><br />



40
<br />
39
<br />



41
<br />
40
<br />


...
...
47
<b><i>Junior Developer</i></b><br />
46
<b><i>Junior Developer</i></b><br />



48
<br />
47
<br />



49
<br />
48
<br />



50
<span style="color: #dd2222;"><b>Bicet</b></span><br />



51
<b><i>phpBB XS Developer</i></b><br />



52
<br />



53
<br />



54
<b><i>Valued Contributors</i></b><br />
49
<b><i>Valued Contributors</i></b><br />



55
<span style="color: #228822;"><b>Andrea75</b></span><br />
50
<span style="color: #228822;"><b>Andrea75</b></span><br />



56
<span style="color: #dd2222;"><b>Artie</b></span><br />
51
<span style="color: #dd2222;"><b>Artie</b></span><br />



52
<span style="color: #dd2222;"><b>Bicet</b></span>&nbsp;<i>(phpBB XS Developer)</i><br />



57
<span style="color: #0000bb;"><b>brandsrus</b></span><br />
53
<span style="color: #0000bb;"><b>brandsrus</b></span><br />



58
<span style="color: #228822;"><b>buldo</b></span><br />
54
<span style="color: #228822;"><b>buldo</b></span><br />



59
<span style="color: #228822;"><b>casimedicos</b></span><br />
55
<span style="color: #228822;"><b>casimedicos</b></span><br />





          

  Updated
ip/trunk/search.php  Download diff




      
      
163164
124
$cms_auth_level = (isset($cms_config_layouts[$cms_page['page_id']]['view']) ? $cms_config_layouts[$cms_page['page_id']]['view'] : AUTH_ALL);
124
$cms_auth_level = (isset($cms_config_layouts[$cms_page['page_id']]['view']) ? $cms_config_layouts[$cms_page['page_id']]['view'] : AUTH_ALL);



125
check_page_auth($cms_page['page_id'], $cms_auth_level);
125
check_page_auth($cms_page['page_id'], $cms_auth_level);



126
126



127
if (isset($search_mode) && ($search_mode == 'bookmarks'))



128
{



129
	// TO DO: force to false, and decide if we would like to overwrite it with Profile Global Blocks settings...



130
	//$cms_page['global_blocks'] = (!empty($cms_config_layouts['profile']['global_blocks']) ? true : false);



131
	$cms_page['global_blocks'] = false;



132
}



133



134
// Define initial vars
127
// Define initial vars



135
if (isset($_POST['mode']) || isset($_GET['mode']))
128
if (isset($_POST['mode']) || isset($_GET['mode']))



136
{
129
{


...
...
166
$search_id = (isset($_GET['search_id'])) ? $_GET['search_id'] : '';
159
$search_id = (isset($_GET['search_id'])) ? $_GET['search_id'] : '';



167
$search_mode = !empty($search_mode) ? $search_mode : $search_id;
160
$search_mode = !empty($search_mode) ? $search_mode : $search_id;



168
161



162
if (isset($search_mode) && ($search_mode == 'bookmarks'))



163
{



164
	// TO DO: force to false, and decide if we would like to overwrite it with Profile Global Blocks settings...



165
	//$cms_page['global_blocks'] = (!empty($cms_config_layouts['profile']['global_blocks']) ? true : false);



166
	$cms_page['global_blocks'] = false;



167
}



168



169
if (isset($_POST['show_results']) || isset($_GET['show_results']))
169
if (isset($_POST['show_results']) || isset($_GET['show_results']))



170
{
170
{



171
	$show_results = (isset($_POST['show_results'])) ? $_POST['show_results'] : $_GET['show_results'];
171
	$show_results = (isset($_POST['show_results'])) ? $_POST['show_results'] : $_GET['show_results'];





          

  Updated
ip/trunk/templates/common/acp/index_frameset.tpl  Download diff




      
      
163164
1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">



2
<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-->
2
<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-->



3
<html dir="{S_CONTENT_DIRECTION}">
3
<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}">



4
<head>
4
<head>



5
<title>Icy Phoenix Administration</title>
5
<title>Icy Phoenix Administration</title>



6
<meta http-equiv="Content-Type" content="text/html;" />
6
<meta http-equiv="Content-Type" content="text/html;" />





          

  Updated
ip/trunk/templates/common/acp/ip_header.tpl  Download diff




      
      
163164
1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">



2
<html>
2
<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}">



3
<head>
3
<head>



4
<title>Icy Phoenix Administration</title>
4
<title>Icy Phoenix Administration</title>



5
<meta http-equiv="Content-Type" content="text/html;" />
5
<meta http-equiv="Content-Type" content="text/html;" />





          

  Updated
ip/trunk/templates/default/blocks/birthdays_block.tpl  Download diff




      
      
163164
16
{IMG_THL}{IMG_THC}<img class="max-min-right" style="{SHOW_HIDE_PADDING}" src="{IMG_MINIMISE}"
onclick="ShowHide('birthday','birthday_h','birthday');" alt="{L_HIDE}" /><a href="{U_CALENDAR}"
class="forumlink">{L_BIRTHDAYS}</a>{IMG_THR}<table class="forumlinenb" width="100%" cellspacing="0"
cellpadding="0">
16
{IMG_THL}{IMG_THC}<img class="max-min-right" style="{SHOW_HIDE_PADDING}" src="{IMG_MINIMISE}"
onclick="ShowHide('birthday','birthday_h','birthday');" alt="{L_HIDE}" /><a href="{U_CALENDAR}"
class="forumlink">{L_BIRTHDAYS}</a>{IMG_THR}<table class="forumlinenb" width="100%" cellspacing="0"
cellpadding="0">



17
<tr>
17
<tr>



18
	<td class="row1 row-center" rowspan="2" width="95" valign="middle"><div
class="center-block"><img src="{BIRTHDAY_IMG}" alt="" /></div></td>
18
	<td class="row1 row-center" rowspan="2" width="95" valign="middle"><div
class="center-block"><img src="{BIRTHDAY_IMG}" alt="" /></div></td>



19
	<td class="row1"><span class="gensmall">{L_WHOSBIRTHDAY_TODAY}<br />{L_WHOSBIRTHDAY_WEEK}<br /></span></td>
19
	<td class="row1"><span class="gensmall">{L_WHOSBIRTHDAY_TODAY}</span><br /><!-- IF L_WHOSBIRTHDAY_WEEK --><span class="gensmall">{L_WHOSBIRTHDAY_WEEK}</span><br /><!-- ENDIF --></td>



20
</tr>
20
</tr>



21
</table>{IMG_TFL}{IMG_TFC}{IMG_TFR}
21
</table>{IMG_TFL}{IMG_TFC}{IMG_TFR}



22
</div>
22
</div>





          

  Updated
ip/trunk/templates/default/contact_us_body.tpl  Download diff




      
      
163164
28
//-->
28
//-->



29
</script>
29
</script>



30
30



31
<form action="{S_POST_ACTION}" method="post" name="post" onSubmit="return checkForm(this)">
31
<form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)">



32
32



33
<!-- BEGIN delete_account -->
33
<!-- BEGIN delete_account -->



34
{IMG_TBL}<table class="forumline" width="100%" cellspacing="0" cellpadding="0">
34
{IMG_TBL}<table class="forumline" width="100%" cellspacing="0" cellpadding="0">





          

  Updated
ip/trunk/templates/default/index_body.tpl  Download diff




      
      
163164
123
{IMG_THL}{IMG_THC}<img class="max-min-right" style="{SHOW_HIDE_PADDING}" src="{IMG_MINIMISE}"
onclick="ShowHide('birthday','birthday_h','birthday');" alt="{L_HIDE}" /><a href="{U_CALENDAR}"
class="forumlink">{L_BIRTHDAYS}</a>{IMG_THR}<table class="forumlinenb" width="100%" cellspacing="0"
cellpadding="0">
123
{IMG_THL}{IMG_THC}<img class="max-min-right" style="{SHOW_HIDE_PADDING}" src="{IMG_MINIMISE}"
onclick="ShowHide('birthday','birthday_h','birthday');" alt="{L_HIDE}" /><a href="{U_CALENDAR}"
class="forumlink">{L_BIRTHDAYS}</a>{IMG_THR}<table class="forumlinenb" width="100%" cellspacing="0"
cellpadding="0">



124
<tr>
124
<tr>



125
	<td class="row1 row-center" rowspan="2" width="95" valign="middle"><div
class="center-block"><img src="{BIRTHDAY_IMG}" alt="" /></div></td>
125
	<td class="row1 row-center" rowspan="2" width="95" valign="middle"><div
class="center-block"><img src="{BIRTHDAY_IMG}" alt="" /></div></td>



126
	<td class="row1"><span class="gensmall">{L_WHOSBIRTHDAY_TODAY}<br />{L_WHOSBIRTHDAY_WEEK}<br /></span></td>
126
	<td class="row1"><span class="gensmall">{L_WHOSBIRTHDAY_TODAY}</span><br /><!-- IF L_WHOSBIRTHDAY_WEEK --><span class="gensmall">{L_WHOSBIRTHDAY_WEEK}</span><br /><!-- ENDIF --></td>



127
</tr>
127
</tr>



128
</table>{IMG_TFL}{IMG_TFC}{IMG_TFR}
128
</table>{IMG_TFL}{IMG_TFC}{IMG_TFR}



129
</div>
129
</div>





          

  Updated
ip/trunk/templates/default/links_js_body.tpl  Download diff




      
      
163164
1
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">



2
<html>
2
<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}">



3
<head>
3
<head>



4
<title>Links</title>
4
<title>Links</title>



5
<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}">
5
<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}">





          

  Updated
ip/trunk/templates/default/mini_cal_body.tpl  Download diff




      
      
163164
20
	</tr>
20
	</tr>



21
	<!-- END mini_cal_row -->
21
	<!-- END mini_cal_row -->



22
22



23
	<tr><td colspan="7" class="row1" align="left"><span
class="gensmall">{L_WHOSBIRTHDAY_TODAY}</span></td></tr>
23
	<tr><td colspan="7" class="row1" align="left"><span class="gensmall">{L_WHOSBIRTHDAY_TODAY}</span><!-- IF L_WHOSBIRTHDAY_WEEK --><br /><span class="gensmall">{L_WHOSBIRTHDAY_WEEK}</span><!-- ENDIF --></td></tr>



24
	<tr><td colspan="7" class="row1" align="left"><span class="gensmall">{L_WHOSBIRTHDAY_WEEK}</span></td></tr>



25
24



26
	<!-- BEGIN switch_mini_cal_events -->
25
	<!-- BEGIN switch_mini_cal_events -->



27
	<tr><th colspan="7" height="28"><span class="cattitle">{L_MINI_CAL_EVENTS}</span></th></tr>
26
	<tr><th colspan="7" height="28"><span class="cattitle">{L_MINI_CAL_EVENTS}</span></th></tr>





          

  Updated
styles/prosilver_ip/index_body.tpl  Download diff




      
      
163164
52
			//-->
52
			//-->



53
			</script>
53
			</script>



54
			<h3><img class="max-min-right" style="padding-right: 6px;" src="{IMG_MINIMISE}"
onclick="ShowHide('birthday','birthday_h','birthday');" alt="{L_HIDE}" /><a
href="{U_CALENDAR}">{L_BIRTHDAYS}</a></h3>
54
			<h3><img class="max-min-right" style="padding-right: 6px;" src="{IMG_MINIMISE}"
onclick="ShowHide('birthday','birthday_h','birthday');" alt="{L_HIDE}" /><a
href="{U_CALENDAR}">{L_BIRTHDAYS}</a></h3>



55
			{L_WHOSBIRTHDAY_TODAY}<br />{L_WHOSBIRTHDAY_WEEK}<br />
55
			{L_WHOSBIRTHDAY_TODAY}<br /><!-- IF L_WHOSBIRTHDAY_WEEK -->{L_WHOSBIRTHDAY_WEEK}<br /><!-- ENDIF -->



56
		</div>
56
		</div>



57
		</li>
57
		</li>



58
	</ul>
58
	</ul>