Расширение "Календарь" не отображает русскую раскладку как исправить?

MAKOMI · Сообщение **MAKOMI** » 27.08.2015 0:52

Есть расширение: "Календарь" при заполнение в русской раскладке в календаре вместо букв отображает символы ??????
Если заполнять в английской то все нормально.
Подскажите пожалуйста где и какой файл изменить или что надо добавить чтобы русский отображало нормально.
За ранее благодарен.

LavIgor · Сообщение **LavIgor** » 27.08.2015 12:05

В таких случаях ищем request_var или $request->variable для нужных полей, задаём там третьим параметром true и оборачиваем вызов функции в utf_normalize_nfc.
А ещё лучше жалуемся автору на то, что он умудрился это допустить на этапе разработки расширения.

MAKOMI · Сообщение **MAKOMI** » 29.08.2015 1:31

Спасибо за подсказку. Но проблема в том что я в этом не разбираюсь.

Не могли бы вы внести правку в одну - две строки как для примера в приложенный файл. А дальше я по аналогии продолжу.

Отправлено спустя 2 часа 19 минут 1 секунду:
С этим разобрался

LavIgor писал(а): задаём там третьим параметром true

А вот с этим полный ступор

LavIgor писал(а): оборачиваем вызов функции в utf_normalize_nfc

LavIgor · Сообщение **LavIgor** » 29.08.2015 12:09

MAKOMI писал(а): с этим полный ступор

Если через класс $request, то с этим разбираться, по-моему, не нужно.
Раньше было так (в phpBB 3.0) и местами используется до сих пор:

Код: Выделить всё

$subject = utf8_normalize_nfc(request_var('subject', '', true));

MAKOMI · Сообщение **MAKOMI** » 29.08.2015 13:14

Вот часть кода из Экста где требуется внести правку

Код: Выделить всё

// get vars
				$user_id = $this->user->data['user_id'];
				$subject = request_var('subject', '');
				if($subject == '') {
					$subject = NULL;
				}
				$text = request_var('text', '');
				if($text == '') {
					$text = NULL;
				}

Как тогда будет выглядеть правильно код с внесенной правкой?

Сообщение **Татьяна5** » 29.08.2015 18:03

Код: Выделить всё

// get vars
            $user_id = $this->user->data['user_id'];
           $subject = utf8_normalize_nfc(request_var('subject', '', true));
            if($subject == '') {
               $subject = NULL;
            }
            $text = utf8_normalize_nfc(request_var('text', '', true));
            if($text == '') {
               $text = NULL;
            }

MAKOMI · Сообщение **MAKOMI** » 30.08.2015 0:16

Аааааааааааааа!
Четыре часа игрался с анологией то в календаре ничего не меняется то просто отображается белый экран.
Подскажите пожалуйста в каких именно строках нужно добавить utf8_normalize_nfc, а то request_var присутствует в 37 строках. Замучался подбирать

Код: Выделить всё

<?php
/**
*
* @package phpBB Extension - DG Calendar
* @copyright (c) 2015 DG Kim
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/

namespace dg\calendar\controller;

class main
{	
	/** @var \phpbb\auth\auth */
	protected $auth;
	
	/* @var \phpbb\config\config */
	protected $config;
	
	/* @var \phpbb\db\driver_interface */
	protected $db;

	/* @var \phpbb\controller\helper */
	protected $helper;

	/* @var \phpbb\template\template */
	protected $template;

	/* @var \phpbb\user */
	protected $user;
  
  	/* @var \dg\calendar\calendar\fetch_events */
  	protected $fetch_events;
  
  	/** @var dg.calendar.config.table */
  	protected $config_table;
	
	/** @var dg.calendar.events.table */
  	protected $events_table;
	
	/** @var core.root_path */
	protected $root_path;
	
	/**
	* PHP file extension
	* @var string
	*/
	protected $php_ext;

	/**
	* Constructor
	*
	* @param \phpbb\auth\auth $auth
	* @param \phpbb\config\config $config
	* @param \phpbb\controller\helper $helper
	* @param \phpbb\template\template $template
	* @param \phpbb\user $user
	* @param \dg\calendar\calendar\fetch_events $fetch_events
	* @param string $config_table
	* @param string $events_table
	*/
	public function __construct($auth, $config, $db, $helper, $template, $user, $events, $config_table, $events_table, $root_path, $php_ext)
	{
		$this->auth = $auth;
		$this->config = $config;
		$this->db = $db;
		$this->helper = $helper;
		$this->template = $template;
		$this->user = $user;
		$this->events = $events;
		$this->root_path = $root_path;
		$this->php_ext = $php_ext;

		define('CALENDAR_CONFIG_TABLE', $config_table);
		define('CALENDAR_EVENTS_TABLE', $events_table);
		
		if (!function_exists('get_username_string'))
		{
		   include $this->root_path . 'includes/functions_content.' . $this->php_ext; 
		} 
		if (!function_exists('get_user_avatar'))
		{
		   include $this->root_path . 'includes/functions_display.' . $this->php_ext; 
		}
	}

	/**
	* Controller for route /calendar/{month}/{year}
	*
	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
	*/
	public function handle($month, $year)
	{	 
		if($this->auth->acl_get('m_calendar')) {
			$this->template->assign_vars(array(
				'U_MODERATE_CALENDAR'	=> $this->helper->route('moderate'),
			));
		}

		if($month == NULL) {
			$month = date('n');
		}
		if($year == NULL) {
			$year = date('Y');
		}
		
		$month_array = array(
			1   => $this->user->lang('JANUARY'),
			2   => $this->user->lang('FEBRUARY'),
			3   => $this->user->lang('MARCH'),
			4   => $this->user->lang('APRIL'),
			5   => $this->user->lang('MAY'),
			6   => $this->user->lang('JUNE'),
			7   => $this->user->lang('JULY'),
			8   => $this->user->lang('AUGUST'),
			9   => $this->user->lang('SEPTEMBER'),
			10  => $this->user->lang('OCTOBER'),
			11  => $this->user->lang('NOVEMBER'),
			12  => $this->user->lang('DECEMBER'),
		);
		
		// get the previous and next month
		if($year == date('Y')) {
			// previous month
			if($month == 1) {
				$previous = $this->helper->route('main', array('month' => 12, 'year' => $year - 1));
				$previous_month = $month_array[12];
			}
			else {
				$previous = $this->helper->route('main', array('month' => $month - 1));
				$previous_month = $month_array[$month - 1];
			}
			// next month
			if($month == 12) {
				$next = $this->helper->route('main', array('month' => 1, 'year' => $year + 1));
				$next_month = $month_array[1];
			}
			else {
				$next = $this->helper->route('main', array('month' => $month + 1));
				$next_month = $month_array[$month + 1];
			}
		}
		else {
			// previous month
			if($month == 1) {
				$previous = $this->helper->route('main', array('month' => 12, 'year' => $year - 1));
				$previous_month = $month_array[12];
			}
			else {
				$previous = $this->helper->route('main', array('month' => $month - 1, 'year' => $year));
				$previous_month = $month_array[$month - 1];
			}
			// next month
			if($month == 12) {
				$next = $this->helper->route('main', array('month' => 1, 'year' => $year + 1));
				$next_month = $month_array[1];
			}
			else {
				$next = $this->helper->route('main', array('month' => $month + 1, 'year' => $year));
				$next_month = $month_array[$month + 1];
			}
		}
		
		// assign variables
		$this->template->assign_vars(array(
			'U_CALENDAR_PAGE'	=> $this->helper->route('main'),
			'U_CREATE_LINK'		=> $this->helper->route('create'),
			'U_MONTH_PREVIOUS'	=> $previous,
			'U_MONTH_NEXT'		=> $next,
			
			'S_CAN_MAKE_EVENT'	=> $this->auth->acl_get('u_new_event'),
			
			'CALENDAR_TITLE' 	=> $month_array[$month].' '.$year,
			'CALENDAR_OUTPUT'	=> $this->draw_calendar($month, $year),
			
			'MONTH_PREVIOUS'	=> $previous_month,
			'MONTH_NEXT'			=> $next_month,
		));
		
		$this->template->assign_block_vars('navlinks', array(
			'FORUM_NAME'			=> $this->user->lang('CALENDAR_PAGE'),
			'U_VIEW_FORUM'		=> $this->helper->route('main'),
		));

		return $this->helper->render('calendar_body.html', $this->user->lang('CALENDAR'));
	}
	
	/**
	* Controller for route /calendar/create
	*
	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
	*/
	public function create()
	{
		if(!$this->auth->acl_get('u_new_event')) {
			trigger_error('NOT_AUTHORISED');
		}
		
		$this->template->assign_block_vars('navlinks', array(
			'FORUM_NAME'			=> $this->user->lang('CALENDAR_PAGE'),
			'U_VIEW_FORUM'		=> $this->helper->route('main'),
		));
		
		$submit = (isset($_POST['post'])) ? true : false;
		
		// get data from form
		$user_id 		= $this->user->data['user_id'];
		$title 			= request_var('title', '');
		$month 			= request_var('month', 0);
		$day			= request_var('day', 0);
		$year			= request_var('year', 0);
		if(request_var('start_hour', 0) == -1 || request_var('start_minute', 0) == -1 || request_var('end_hour', 0) == -1 || request_var('end_minute', 0) == -1 || request_var('start_meridiem', '') == '--' || request_var('end_meridiem', '') == '--') {
			$start_time = NULL;
			$end_time	= NULL;
		}
		else {
			$start_time		= request_var('start_hour', 0) . ':' . str_pad(request_var('start_minute', 0), 2, '0', STR_PAD_LEFT) . ' ' . request_var('start_meridiem', '');
			$end_time		= request_var('end_hour', 0) . ':' . str_pad(request_var('end_minute', 0), 2, '0', STR_PAD_LEFT) . ' ' . request_var('end_meridiem', '');
		}
		$description	= request_var('description', '');
		if($description == '') {
			$description = NULL;
		}
		
		// build error array
		$errors = array();
		if($submit) {
			if (strlen($title) == 0) {
				$errors[] = $this->user->lang('FIELD_REQUIRED', $this->user->lang('TITLE'));
			}
			if ($year == '') {
				$errors[] = $this->user->lang('FIELD_REQUIRED', $this->user->lang('YEAR'));
			}
			if ($this->time_to_number($start_time, $this->user->lang('PM')) > $this->time_to_number($end_time, $this->user->lang('PM'))) {
				$errors[] = $this->user->lang('WRONG_TIME');
			}
		}
		
		// if no error
		if($submit && empty($errors)) {
			$new_id = $this->events->add_event($user_id, time(), $month, $day, $year, $start_time, $end_time, $title, $description);
			
			meta_refresh(3, $this->helper->route('main'));
			
			$message =  $this->user->lang['EVENT_SUCCESSFUL'] . '<br /><br /><a href="' . $this->helper->route('event', array('id' => $new_id)) . '">'. $this->user->lang['VIEW_EVENT'] . '</a><br /><a href="' . generate_board_url() . '/app.php/calendar">'. $this->user->lang['RETURN_CALENDAR'] . '</a>';
			trigger_error($message);
		}
		// if not submitted
		else {
			$c_action = $this->helper->route('create');
			
			$month_array = array(
				1   => $this->user->lang('JANUARY'),
				2   => $this->user->lang('FEBRUARY'),
				3   => $this->user->lang('MARCH'),
				4   => $this->user->lang('APRIL'),
				5   => $this->user->lang('MAY'),
				6   => $this->user->lang('JUNE'),
				7   => $this->user->lang('JULY'),
				8   => $this->user->lang('AUGUST'),
				9   => $this->user->lang('SEPTEMBER'),
				10  => $this->user->lang('OCTOBER'),
				11  => $this->user->lang('NOVEMBER'),
				12  => $this->user->lang('DECEMBER'),
			);
			
			// make default current date
			$months_options = "";
			$i = 1;
			foreach($month_array as $month) {
				if($i == date('n')) {
					$months_options .= '<option value=' . $i . ' selected="selected">' . $month .'</option>';
				}
				else {
					$months_options .= '<option value=' . $i . '>' . $month .'</option>';
				}
				$i++;
			}
			
			$days_options = "";
			for($i = 1; $i <= 31; $i++) {
				if($i == date('j')) {
					$days_options .= '<option value=' . $i . ' selected="selected">' . $i .'</option>';
				}
				else {
					$days_options .= '<option value=' . $i . '>' . $i .'</option>';
				}
			}
			
			$hours_options = "";
			$hours_options .= '<option value="-1" selected="selected">--</option>';
			for($i = 1; $i <= 12; $i++) {
				$hours_options .= '<option value=' . $i . '>' . $i .'</option>';
			}
			
			$minutes_options = "";
			$minutes_options .= '<option value="-1" selected="selected">--</option>';
			for($i = 0; $i < 12; $i++) {
				$minutes_options .= '<option value=' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) . '>' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) .'</option>';
			}
			
			$meridiem_options = "";
			$meridiem_array = array($this->user->lang('AM'), $this->user->lang('PM'));
			$meridiem_options .= '<option value="--" selected="selected">--</option>';
			foreach($meridiem_array as $option) {
				$meridiem_options .= '<option value=' . $option . '>' . $option . '</option>';
			}
			
			$this->template->assign_vars(array(
				'S_CREATE_ACTION'			=> $c_action,
				'S_HAS_ERRORS'				=> !empty($errors),
			
				'U_CALENDAR_PAGE'			=> $this->helper->route('main'),
				
				'DAYS_OPTIONS'				=> $days_options,
				'ERRORS'						=> implode($errors, '<br />'),
				'HOURS_OPTIONS'				=> $hours_options,
				'MERIDIEM_OPTIONS'			=> $meridiem_options,
				'MINUTES_OPTIONS'			=> $minutes_options,
				'MONTHS_OPTIONS'			=> $months_options,
				'YEAR'						=> date('Y'),
			));
		}
		
		return $this->helper->render('event_create_body.html', $this->user->lang('CREATE_EVENT'));
	}
	
	/**
	* Controller for route /calendar/event/{id}
	*
	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
	*/
	public function event($id)
	{
		$event = $this->events->get_events(false, false, $id);
		$this->template->assign_block_vars('navlinks', array(
			'FORUM_NAME'			=> $this->user->lang('CALENDAR_PAGE'),
			'U_VIEW_FORUM'		=> $this->helper->route('main'),
		));
		
		// build content
		$content = "";
		
		$content .= '<b>' . $this->user->lang('DATE') . ':</b> ' . $event['month'] . '/' . $event['day'] . '/' . $event['year'];
		if($event['start'] != NULL) {
			$content .= '<br/><b>' . $this->user->lang('START_TIME') . ':</b> ' . $event['start'];
			$content .= '<br/><b>' . $this->user->lang('END_TIME') . ':</b> ' . $event['end'];
		}
		if($event['description'] != NULL) {
			$content .= '<br/><b>' . $this->user->lang('DESCRIPTION') . ':</b> ' . $event['description'];
		}
		
		// comment link
		if($this->auth->acl_get('u_event_comment')) {
			$this->template->assign_vars(array(
				'U_COMMENT_LINK'		=> $this->helper->route('posting', array('mode' => 'post', 'id' => $id)),
			));
		}
		
		// moderator stuff
		$moderator = false;
		if($this->auth->acl_get('m_calendar')) {
			$moderator = true;
			$this->template->assign_vars(array(
				'U_DELETE_LINK'		=> $this->helper->route('manage', array('mode' => 'delete', 'id' => $id)),
				'U_EDIT_LINK'		=> $this->helper->route('manage', array('mode' => 'edit', 'id' => $id)),
				'U_REPORT_LINK'		=> $this->helper->route('manage', array('mode' => 'report', 'id' => $id)),
			));
		}
		
		// delete/edit/report links
		if($this->user->data['user_id'] == $event['user_id']) {
			if($this->auth->acl_get('u_self_delete')) {
				$this->template->assign_vars(array(
					'U_DELETE_LINK'		=> $this->helper->route('manage', array('mode' => 'delete', 'id' => $id)),
				));
			}
			
			if($this->auth->acl_get('u_self_edit')) {
				$this->template->assign_vars(array(
					'U_EDIT_LINK'		=> $this->helper->route('manage', array('mode' => 'edit', 'id' => $id)),
				));
			}
			
			if($this->auth->acl_get('u_event_report')) {
				$this->template->assign_vars(array(
					'U_REPORT_LINK'		=> $this->helper->route('manage', array('mode' => 'report', 'id' => $id)),
				));
			}
		}
		
		// build comments
		$comments = $this->events->get_comments($id);
		
		for ($i = 0; $i < count($comments); $i++)
		{
			$sql = 'SELECT *
					 FROM ' . USERS_TABLE . '
					 WHERE user_id = ' . $event['user_id'];
			$result = $this->db->sql_query($sql);
			$member = $this->db->sql_fetchrow($result);
			
			$num = $i % 2 + 1;
			$this->template->assign_block_vars('commentrow', array(
				'BG'				=> 'bg' . $num,
				'POST_ID' 		=> $comments[$i]['id'],
				'POST_TIME'		=> date($member['user_dateformat'], $comments[$i]['post_time']),
				'POSTER'			=> get_username_string("full", $member['user_id'], $member['username'], $member['user_colour']),
				'SUBJECT'		=> $comments[$i]['subject'],
				'TEXT'			=> $comments[$i]['text'],
			));
		}
		
		// build user
		$sql = 'SELECT *
				 FROM ' . USERS_TABLE . '
				 WHERE user_id = ' . $event['user_id'];
		$result = $this->db->sql_query($sql);
		$member = $this->db->sql_fetchrow($result);

		$this->template->assign_vars(array(
			'EVENT_CONTENT'			=> $content,
			'EVENT_POSTER'			=> $this->user->lang('EVENT_BY', get_username_string("full", $member['user_id'], $member['username'], $member['user_colour'])),
			'EVENT_TITLE'			=> $event['title'],
			
			'S_MODERATOR'			=> $moderator,
			
			'U_CALENDAR_PAGE'		=> $this->helper->route('main'),
			'U_EVENT_SELF'			=> $this->helper->route('event', array('id' => $id)),
		));
		
		return $this->helper->render('calendar_event_body.html', $event['title']);
	}
	
	/**
	* Controller for route /calendar/moderate
	*
	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
	*/
	public function moderate()
	{	 
		if(!$this->auth->acl_get('m_calendar')) {
			trigger_error('NOT_AUTHORISED');
		}
	
		$events = $this->events->get_events(5, true);
		
		$last_5 = "";
		for($i = 0; $i < count($events); $i++) {
			$sql = 'SELECT *
				 FROM ' . USERS_TABLE . '
				 WHERE user_id = ' . $events[$i]['user_id'];
			$result = $this->db->sql_query($sql);
			$member = $this->db->sql_fetchrow($result);
			
			if($i % 2 == 0) {
				$last_5 .= '<tr class="bg1"><td>' . $events[$i]['title'] . '</td><td>' . get_username_string("full", $member['user_id'], $member['username'], $member['user_colour']) . '</td><td><a href="' . $this->helper->route('event', array('id' =>  $events[$i]['id'])) . '">' . $this->user->lang('VIEW_EVENT') . '</a></td><td>' . date($member['user_dateformat'], $events[$i]['post_time']) . '</td></tr>';
			}
			else {
				$last_5 .= '<tr class="bg2"><td>' . $events[$i]['title'] . '</td><td>' . get_username_string("full", $member['user_id'], $member['username'], $member['user_colour']) . '</td><td><a href="' . $this->helper->route('event', array('id' => $events[$i]['id'])) . '">' . $this->user->lang('VIEW_EVENT') . '</a></td><td>' . date($member['user_dateformat'], $events[$i]['post_time']) . '</td></tr>';
			}
		}
		$this->template->assign_vars(array(
			'LAST_5_EVENTS'			=> $last_5,
		));
		
		if(!empty($events)) {
			$this->template->assign_vars(array(
				'S_HAS_EVENTS'			=> true,
			));
		}
		
		$navlinks_array = array(
			array(
				'FORUM_NAME'			=> $this->user->lang('CALENDAR_PAGE'),
				'U_VIEW_FORUM'		=> $this->helper->route('main'),
			),
			array(
				'FORUM_NAME'			=> $this->user->lang['MCP_CALENDAR'],
				'U_VIEW_FORUM'		=> $this->helper->route('moderate'),
			),
		);
		
		foreach($navlinks_array as $name)
		{
			$this->template->assign_block_vars('navlinks', array(
				'FORUM_NAME'	 		=> $name['FORUM_NAME'],
				'U_VIEW_FORUM'		=> $name['U_VIEW_FORUM'],
			));
		}
		
		return $this->helper->render('calendar_moderate_body.html', $this->user->lang('CALENDAR'));
	}
	
	/**
	* Controller for route /calendar/manage/{mode}/{id}
	*
	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
	*/
	public function manage($mode, $id)
	{	
		switch($mode) {
			case 'delete':
				// handle permission
				$event = $this->events->get_events(false, false, $id);
				
				$perm = false;
				if($this->auth->acl_get('m_calendar')) {
					$perm = true;
				}
				
				if($this->user->data['user_id'] == $event['user_id']) {
					if($this->auth->acl_get('u_self_delete')) {
						$perm = true;
					}
				}
				
				if($perm) {
					$submit = request_var('submit', 0);
					// check mode
					if (confirm_box(true))
					{
						$this->events->delete_event($id);
						
						meta_refresh(3, $this->helper->route('main'));
							
						$message =  $this->user->lang['EVENT_DELETE_SUCCESSFUL'] . '<br /><br /><a href="' . generate_board_url() . '/app.php/calendar">'. $this->user->lang['RETURN_CALENDAR'] . '</a>';
						trigger_error($message);
					}
					else
					{
						if($submit) {
							meta_refresh(3, $this->helper->route('event', array('id' => $id)));
							
							$message =  $this->user->lang['EVENT_NOT_DELETED'] . '<br /><br /><a href="' . $this->helper->route('event', array('id' => $id)) .'">'. $this->user->lang['RETURN_EVENT'] . '</a>';
							trigger_error($message);
						}
						else {
							$s_hidden_fields = build_hidden_fields(array(
								'submit'    => true,
								'event' 		=> $event,
								)
							);
					
							//display mode
							confirm_box(false, 'EVENT_DELETE', $s_hidden_fields);
						}
					}
				}
				else {
					trigger_error('NOT_AUTHORISED');
				}
				
				break;
			case 'lock':
			
				break;
			case 'edit':
				$event = $this->events->get_events(false, false, $id, true);
				
				$perm = false;
				if($this->auth->acl_get('m_calendar')) {
					$perm = true;
				}
				
				if($this->user->data['user_id'] == $event['user_id']) {
					if($this->auth->acl_get('u_self_edit')) {
						$perm = true;
					}
				}
				
				if(!$perm) {
					trigger_error('NOT_AUTHORISED');
				}
				
				$this->template->assign_block_vars('navlinks', array(
					'FORUM_NAME'			=> $this->user->lang('CALENDAR_PAGE'),
					'U_VIEW_FORUM'		=> $this->helper->route('main'),
				));
				
				$submit = (isset($_POST['post'])) ? true : false;
		
				// get data from form
				$user_id 		= $this->user->data['user_id'];
				$title 			= request_var('title', '');
				$month 			= request_var('month', 0);
				$day			= request_var('day', 0);
				$year			= request_var('year', 0);
				if(request_var('start_hour', 0) == -1 || request_var('start_minute', 0) == -1 || request_var('end_hour', 0) == -1 || request_var('end_minute', 0) == -1 || request_var('start_meridiem', '') == '--' || request_var('end_meridiem', '') == '--') {
					$start_time = NULL;
					$end_time	= NULL;
				}
				else {
					$start_time		= request_var('start_hour', 0) . ':' . str_pad(request_var('start_minute', 0), 2, '0', STR_PAD_LEFT) . ' ' . request_var('start_meridiem', '');
					$end_time		= request_var('end_hour', 0) . ':' . str_pad(request_var('end_minute', 0), 2, '0', STR_PAD_LEFT) . ' ' . request_var('end_meridiem', '');
				}
				$description	= request_var('description', '');
				if($description == '') {
					$description = NULL;
				}
				
				// build error array
				$errors = array();
				if($submit) {
					if (strlen($title) == 0) {
						$errors[] = $this->user->lang('FIELD_REQUIRED', $this->user->lang('TITLE'));
					}
					if ($year == '') {
						$errors[] = $this->user->lang('FIELD_REQUIRED', $this->user->lang('YEAR'));
					}
					if ($this->time_to_number($start_time, $this->user->lang('PM')) > $this->time_to_number($end_time, $this->user->lang('PM'))) {
						$errors[] = $this->user->lang('WRONG_TIME');
					}
				}
				
				// if no error
				if($submit && empty($errors)) {
					$this->events->edit_event($id, $user_id, $month, $day, $year, $start_time, $end_time, $title, $description);
					
					meta_refresh(3, $this->helper->route('main'));
					
					$message =  $this->user->lang['EVENT_SUCCESSFUL_EDIT'] . '<br /><br /><a href="' . $this->helper->route('event', array('id' =>  $event['id'])) . '">'. $this->user->lang['RETURN_EVENT'] . '</a><br /><a href="' . generate_board_url() . '/app.php/calendar">'. $this->user->lang['RETURN_CALENDAR'] . '</a>';
					trigger_error($message);
				}
				// if not submitted
				else {
					$e_action = $this->helper->route('manage', array('mode' => 'edit', 'id' => $id));
					
					$month_array = array(
						1   => $this->user->lang('JANUARY'),
						2   => $this->user->lang('FEBRUARY'),
						3   => $this->user->lang('MARCH'),
						4   => $this->user->lang('APRIL'),
						5   => $this->user->lang('MAY'),
						6   => $this->user->lang('JUNE'),
						7   => $this->user->lang('JULY'),
						8   => $this->user->lang('AUGUST'),
						9   => $this->user->lang('SEPTEMBER'),
						10  => $this->user->lang('OCTOBER'),
						11  => $this->user->lang('NOVEMBER'),
						12  => $this->user->lang('DECEMBER'),
					);
					
					$meridiem_array = array($this->user->lang('AM'), $this->user->lang('PM'));
					
					// make default be the event
					$months_options = "";
					$i = 1;
					foreach($month_array as $month) {
						if($i == $event['month']) {
							$months_options .= '<option value=' . $i . ' selected="selected">' . $month .'</option>';
						}
						else {
							$months_options .= '<option value=' . $i . '>' . $month .'</option>';
						}
						$i++;
					}
					
					$days_options = "";
					for($i = 1; $i <= 31; $i++) {
						if($i == $event['day']) {
							$days_options .= '<option value=' . $i . ' selected="selected">' . $i .'</option>';
						}
						else {
							$days_options .= '<option value=' . $i . '>' . $i .'</option>';
						}
					}
					
					$start = $this->explode_time($event['start']);
					
					$hours_options_start = "";
					if($start[0] == '') {
						$hours_options_start .= '<option value="-1" selected="selected">--</option>';
						for($i = 1; $i <= 12; $i++) {
							$hours_options_start .= '<option value=' . $i . '>' . $i .'</option>';
						}
					}
					else {
						$hours_options_start .= '<option value="-1">--</option>';
						for($i = 1; $i <= 12; $i++) {
							if($start[0] == $i) {
								$hours_options_start .= '<option value=' . $i . ' selected="selected">' . $i .'</option>';
							}
							else {
								$hours_options_start .= '<option value=' . $i . '>' . $i .'</option>';
							}
						}
					}
					
					$minutes_options_start = "";
					if($start[1] == '') {
						$minutes_options_start .= '<option value="-1" selected="selected">--</option>';
						for($i = 0; $i < 12; $i++) {
							$minutes_options_start .= '<option value=' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) . '>' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) .'</option>';
						}
					}
					else {
						$minutes_options_start .= '<option value="-1">--</option>';
						for($i = 0; $i < 12; $i++) {
							if($start[1] == str_pad($i * 5, 2, '0', STR_PAD_LEFT)) {
								$minutes_options_start .= '<option value=' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) . ' selected="selected">' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) .'</option>';
							}
							else {
								$minutes_options_start .= '<option value=' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) . '>' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) .'</option>';
							}
						}
					}
					
					$meridiem_options_start = "";
					if($start[2] == '') {
						$meridiem_options_start .= '<option value="--" selected="selected">--</option>';
						foreach($meridiem_array as $option) {
							$meridiem_options_start .= '<option value=' . $option . '>' . $option . '</option>';
						}
					}
					else {
						$meridiem_options_start .= '<option value="--">--</option>';
						foreach($meridiem_array as $option) {
							if($start[2] == $option) {
								$meridiem_options_start .= '<option value=' . $option . ' selected="selected">' . $option . '</option>';
							}
							else {
								$meridiem_options_start .= '<option value=' . $option . '>' . $option . '</option>';
							}
						}
					}
					
					$end = $this->explode_time($event['end']);
					
					$hours_options_end = "";
					if($end[0] == '') {
						$hours_options_end .= '<option value="-1" selected="selected">--</option>';
						for($i = 1; $i <= 12; $i++) {
							$hours_options_end .= '<option value=' . $i . '>' . $i .'</option>';
						}
					}
					else {
						$hours_options_end .= '<option value="-1">--</option>';
						for($i = 1; $i <= 12; $i++) {
							if($end[0] == $i) {
								$hours_options_end .= '<option value=' . $i . ' selected="selected">' . $i .'</option>';
							}
							else {
								$hours_options_end .= '<option value=' . $i . '>' . $i .'</option>';
							}
						}
					}
					
					$minutes_options_end = "";
					if($end[1] == '') {
						$minutes_options_end .= '<option value="-1" selected="selected">--</option>';
						for($i = 0; $i < 12; $i++) {
							$minutes_options_end .= '<option value=' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) . '>' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) .'</option>';
						}
					}
					else {
						$minutes_options_end .= '<option value="-1">--</option>';
						for($i = 0; $i < 12; $i++) {
							if($end[1] == str_pad($i * 5, 2, '0', STR_PAD_LEFT)) {
								$minutes_options_end .= '<option value=' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) . ' selected="selected">' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) .'</option>';
							}
							else {
								$minutes_options_end .= '<option value=' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) . '>' . str_pad($i * 5, 2, '0', STR_PAD_LEFT) .'</option>';
							}
						}
					}
					
					$meridiem_options_end = "";
					if($end[2] == '') {
						$meridiem_options_end .= '<option value="--" selected="selected">--</option>';
						foreach($meridiem_array as $option) {
							$meridiem_options_end .= '<option value=' . $option . '>' . $option . '</option>';
						}
					}
					else {
						$meridiem_options_start .= '<option value="--">--</option>';
						foreach($meridiem_array as $option) {
							if($end[2] == $option) {
								$meridiem_options_end .= '<option value=' . $option . ' selected="selected">' . $option . '</option>';
							}
							else {
								$meridiem_options_end .= '<option value=' . $option . '>' . $option . '</option>';
							}
						}
					}
					
					$this->template->assign_vars(array(
						'S_EDIT_ACTION'				=> $e_action,
						'S_HAS_ERRORS'				=> !empty($errors),
					
						'U_CALENDAR_PAGE'			=> $this->helper->route('main'),
						
						'DAYS_OPTIONS'				=> $days_options,
						'DESCRIPTION'				=> $event['description'],
						'ERRORS'					=> implode($errors, '<br />'),
						'HOURS_OPTIONS_START'		=> $hours_options_start,
						'HOURS_OPTIONS_END'			=> $hours_options_end,
						'MERIDIEM_OPTIONS_START'	=> $meridiem_options_start,
						'MERIDIEM_OPTIONS_END'		=> $meridiem_options_end,
						'MINUTES_OPTIONS_START'		=> $minutes_options_start,
						'MINUTES_OPTIONS_END'		=> $minutes_options_end,
						'MONTHS_OPTIONS'			=> $months_options,
						'TITLE'						=> $event['title'],
						'YEAR'						=> $event['year'],
					));
				}
			
				return $this->helper->render('event_edit_body.html', $this->user->lang('CALENDAR'));
				break;
		}
	}
	
	/**
	* Controller for route /calendar/posting/{mode}/{event}/{post}
	*
	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
	*/
	public function posting($mode, $id, $post)
	{	
		switch($mode) {
			case 'post':
				if($this->auth->acl_get('u_event_comment')) {
				}
				else {
					trigger_error('NOT_AUTHORISED');
				}
				
				$submit = (isset($_POST['post'])) ? true : false;
			
				$event = $this->events->get_events(false, false, $id);
				$this->template->assign_vars(array(
					'EVENT_TITLE'			=> $event['title'],
					'RE_VALUE'				=> $this->user->lang('RE') . ' ' . $event['title'],
					
					'U_EVENT_SELF'			=> $this->helper->route('event', array('id' => $id)),
				));
				
				$navlinks_array = array(
					array(
						'FORUM_NAME'			=> $this->user->lang('CALENDAR_PAGE'),
						'U_VIEW_FORUM'			=> $this->helper->route('main'),
					),
					array(
						'FORUM_NAME'			=> $event['title'],
						'U_VIEW_FORUM'			=> $this->helper->route('event', array('id' => $id)),
					),
				);
				
				foreach($navlinks_array as $name)
				{
					$this->template->assign_block_vars('navlinks', array(
						'FORUM_NAME'			=> $name['FORUM_NAME'],
						'U_VIEW_FORUM'		=> $name['U_VIEW_FORUM'],
					));
				}
				
				// get vars
				$user_id = $this->user->data['user_id'];
				$subject = request_var('subject', '');
				if($subject == '') {
					$subject = NULL;
				}
				$text = request_var('text', '');
				if($text == '') {
					$text = NULL;
				}
				
				// build error array
				$errors = array();
				if($submit) {
					if (strlen($text) == 0) {
						$errors[] = $this->user->lang('FIELD_NO_EMPTY', $this->user->lang('MESSAGE'));
					}
				}
				
				// if no error
				if($submit && empty($errors)) {
					$this->events->add_comment($id, $user_id, time(), $subject, $text);
					
					meta_refresh(3, $this->helper->route('main'));
					
					$message =  $this->user->lang['COMMENT_SUCCESSFUL'] . '<br /><br /><a href="' . $this->helper->route('event', array('id' =>  $event['id'])) . '">'. $this->user->lang['RETURN_EVENT'] . '</a><br /><a href="' . generate_board_url() . '/app.php/calendar">'. $this->user->lang['RETURN_CALENDAR'] . '</a>';
					trigger_error($message);
				}
				// if not submitted
				else {
					$c_action = $this->helper->route('posting', array('mode' => 'post', 'id' => $id));
					
					$this->template->assign_vars(array(
						'S_CREATE_ACTION'			=> $c_action,
						'S_HAS_ERRORS'				=> !empty($errors),
					
						'U_CALENDAR_PAGE'			=> $this->helper->route('main'),
						
						'ERRORS'					=> implode($errors, '<br />'),
					));
				}
				
				return $this->helper->render('event_posting_post.html', $this->user->lang('COMMENT'));
				break;
		}
	}
	
	// private methods

	// the big thing where there's a calendar
	private function draw_calendar($month, $year){
		/* draw table */
		$calendar = '<table cellpadding="0" cellspacing="0" class="calendar">';
		  
		/* table headings */
		$headings = array($this->user->lang('SUNDAY'), $this->user->lang('MONDAY'), $this->user->lang('TUESDAY'), $this->user->lang('WEDNESDAY'), $this->user->lang('THURSDAY'), $this->user->lang('FRIDAY'), $this->user->lang('SATURDAY'));
		$calendar .= '<thead class="calendar-head"><tr class="calendar-row"><td class="calendar-day-head">'.implode('</td><td class="calendar-day-head">', $headings).'</td></tr></thead>';
		
		/* generation found at http://davidwalsh.name/php-calendar */  
		/* days and weeks vars now ... */
		$running_day = date('w', mktime(0, 0, 0, $month, 1, $year));
		$days_in_month = date('t', mktime(0, 0, 0, $month, 1, $year));
		$days_in_this_week = 1;
		$day_counter = 0;
		$dates_array = array();
		  
		/* row for week one */
		$calendar .= '<tr class="calendar-row">';
		  
		/* print "blank" days until the first of the current week */
		for($x = 0; $x < $running_day; $x++) {
			$calendar .= '<td class="calendar-day-np"> </td>';
			$days_in_this_week++;
		}
		  
		/* keep going with days.... */
		for($list_day = 1; $list_day <= $days_in_month; $list_day++) {
			if($list_day == date('j') && $month == date('n') && $year == date('Y')) {
				$calendar .= '<td class="calendar-day today">';
			}
			else {
				$calendar .= '<td class="calendar-day">';
			}
			/* add in the day number */
			$calendar .= '<div class="day-number">'.$list_day.'</div>';
		  
			$events = $this->events->get_events_of_day($month, $list_day, $year);

			if(!empty($events)) {
				for($i = 0; $i < count($events); $i++) {
					$events[$i]['time_number'] = $this->time_to_number($events[$i]['start'], $this->user->lang('PM'));
				}
				usort($events, function ($a, $b) {
					return strnatcmp($a['time_number'], $b['time_number']);
				});
			}
			
			foreach($events as $event) {
		 		$calendar .= '<div class="calendar-event"><b><a href="' . $this->helper->route('event', array('id' =>  $event['id'])) . '">' . $event['title']. '</a></b>';
				if($event['start'] != NULL) {
					$calendar .= '<br/>' . $event['start'] . ' - ' . $event['end'];
				}
				$calendar .= '</div>';
			}
			unset($events);
		
			$calendar .= '</td>';
			
			if($running_day == 6) {
				$calendar .= '</tr>';
				
				if(($day_counter+1) != $days_in_month) {
		  			$calendar .= '<tr class="calendar-row">';
				}
			
				$running_day = -1;
				$days_in_this_week = 0;
			}
			
			$days_in_this_week++; $running_day++; $day_counter++;
		}
		  
		/* finish the rest of the days in the week */
		if($days_in_this_week < 8) {
			for($x = 1; $x <= (8 - $days_in_this_week); $x++) {
				$calendar .= '<td class="calendar-day-np"> </td>';
			}
		}
  
		/* final row */
		$calendar .= '</tr>';
  
		/* end the table */
		$calendar .= '</table>';

		/* all done, return result */
		return $calendar;
	}
	
	private function time_to_number($time, $pm) {
		// explode time into parts
		$parts = array();
		$parts = explode(':', $time);
		
		$second_parts = array();
		$second_parts = explode(' ', $parts[1]);
		
		$parts[1] = $second_parts[0];
		$parts[2] = $second_parts[1];
		
		// calculate minute number of day
		if($parts[2] == $pm) {
			$parts[0] = $parts[0] + 12;
		}
		
		$number = $parts[0] * 60 + $parts[1];
		return $number;
	}
	
	public function explode_time($time) {
		// explode time into parts
		$parts = array();
		$parts = explode(':', $time);
		
		$second_parts = array();
		$second_parts = explode(' ', $parts[1]);
		
		$parts[1] = $second_parts[0];
		$parts[2] = $second_parts[1];
		
		return $parts;
	}
}

Отправлено спустя 6 минут 17 секунд:

LavIgor писал(а): А ещё лучше жалуемся автору на то, что он умудрился это допустить на этапе разработки расширения.

Это уже сделал. А вот исправит ли он этот косяк зависит от его его желания ведь он же АВТОР.

Сообщение **Татьяна5** » 30.08.2015 13:14

MAKOMI писал(а): в каких именно строках

Для title, description, subject, text (а для часов, минут и пр. кодировка уже не так важна)

MAKOMI · Сообщение **MAKOMI** » 30.08.2015 18:07

Татьяна5 писал(а): Для title, description, subject, text (а для часов, минут и пр. кодировка уже не так важна)

Огромное спасибо за помощь. Заработало!!!
P.S. Тему можно закрывать.

phpBB Guru - Официальная русская поддержка форума phpBB3

Расширение "Календарь" не отображает русскую раскладку как исправить?

Расширение "Календарь" не отображает русскую раскладку как исправить?

Re: Расширение "Календарь" не отображает русскую раскладку как исправить?

Re: Расширение "Календарь" не отображает русскую раскладку как исправить?

Re: Расширение "Календарь" не отображает русскую раскладку как исправить?

Re: Расширение "Календарь" не отображает русскую раскладку как исправить?

Re: Расширение "Календарь" не отображает русскую раскладку как исправить?

Re: Расширение "Календарь" не отображает русскую раскладку как исправить?

Re: Расширение "Календарь" не отображает русскую раскладку как исправить?

Re: Расширение "Календарь" не отображает русскую раскладку как исправить?