kenjis / codeigniter-tettei-apps

application/views/bbs_delete_finished_mobile.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 </table>
 
 <hr>
-<?=anchor('bbs', 'ﾄｯﾌﾟに戻る');?>
+<?=anchor('bbs', 'ﾄｯﾌﾟに戻る'); ?>
 
 </body>
 </html>

application/controllers/Bbs.php

Doc Comments +3 added lines

@@ -311,6 +311,9 @@
 	}
 
 # 携帯端末かどうかを判定し、ビューをロードするプライベートメソッドです。
+	/**
+	 * @param string $file
+	 */
 	private function _load_view($file, $data = '')
 	{
 # 携帯端末の場合は、「_mobile」がファイル名に付くビューファイルをロードします。

Spacing +7 added lines, -7 removed lines

@@ -31,7 +31,7 @@ 
 	{
 # 引数から$offsetに値が渡されます。これは、3番目のURIセグメントの値です。
 # ユーザが変更可能なデータですので、int型へ変換し、必ず整数値にします。
-		$offset = (int) $offset;
+		$offset = (int)$offset;
 
 # 新しい記事ID順に、limit値とoffset値を指定し、bbsテーブルから記事データ
 # (オブジェクト)を取得し、$data['query']に代入します。order_by()メソッドは、
@@ -121,8 +121,8 @@ 
 # メソッドを使い、ランダムな4桁の数字を取得します。
 		$vals = [
 					'word'      => random_string('numeric', 4),
-					'img_path'  => FCPATH . 'captcha/',
-					'img_url'   => base_url() . 'captcha/'
+					'img_path'  => FCPATH.'captcha/',
+					'img_url'   => base_url().'captcha/'
 				];
 		$cap = create_captcha($vals);
 		$data = [
@@ -149,12 +149,12 @@ 
 	public function delete($id = '')
 	{
 # 第1引数、つまり、3番目のURIセグメントのデータをint型に変換します。
-		$id = (int) $id;
+		$id = (int)$id;
 # POSTされたpasswordフィールドの値を$passwordに代入します。
 		$password = $this->input->post('password');
 # POSTされたdeleteフィールドの値を$deleteに代入します。この値が
 # 1の場合は、削除を実行します。1以外は、削除の確認ページを表示します。
-		$delete = (int) $this->input->post('delete');
+		$delete = (int)$this->input->post('delete');
 
 # 削除パスワードが入力されていない場合は、エラーページを表示します。
 		if ($password == '')
@@ -286,7 +286,7 @@ 
 # 有効期限を2時間に設定し、それ以前に生成されたキャプチャをデータベースから
 # 削除します。delete()メソッドの第2引数では、「captcha_time <」を配列のキーに
 # していますが、このように記述することで、WHERE句の条件の演算子を指定できます。
-		$expiration = time() - 7200;	// 有効期限 2時間
+		$expiration = time() - 7200; // 有効期限 2時間
 		$this->db->delete('captcha', ['captcha_time <' => $expiration]);
 
 # バリデーション(検証)クラスより引数$strに渡された、ユーザからの入力値がデータ
@@ -324,7 +324,7 @@ 
 # 携帯端末の場合は、「_mobile」がファイル名に付くビューファイルをロードします。
 		if ($this->agent->is_mobile())
 		{
-			$this->load->view($file . '_mobile', $data);
+			$this->load->view($file.'_mobile', $data);
 		}
 		else
 		{

Braces +6 added lines, -12 removed lines

@@ -61,8 +61,7 @@ 
 		{
 			$config['full_tag_open']  = '<tr><td bgcolor="#EEEEEE">';
 			$config['full_tag_close'] = '</td></tr>';
-		}
-		else
+		} else
 		{
 			$config['full_tag_open']  = '<p class="pagination">';
 			$config['full_tag_close'] = '</p>';
@@ -98,8 +97,7 @@ 
 			$this->_delete_captcha_data();
 
 			$this->_show_post_page();
-		}
-		else
+		} else
 		{
 			$data = [];
 			$data['name']       = $this->input->post('name');
@@ -169,8 +167,7 @@ 
 		if ($password == '')
 		{
 			$this->_load_view('bbs_delete_error');
-		}
-		else
+		} else
 		{
 # 記事IDと削除パスワードを条件として、bbsテーブルを検索します。
 			$this->db->where('id', $id);
@@ -223,8 +220,7 @@ 
 		if ($this->agent->is_mobile())
 		{
 			$this->form_validation->set_error_delimiters('<div>', '</div>');
-		}
-		else
+		} else
 		{
 			$this->form_validation->set_error_delimiters('<div class="error">', '</div>');
 		}
@@ -268,8 +264,7 @@ 
 			$this->_delete_captcha_data();
 
 			$this->_show_post_page();
-		}
-		else
+		} else
 		{
 # 検証にパスした場合は、送られたデータとIPアドレスをbbsテーブルに登録します。
 			$data = [];
@@ -337,8 +332,7 @@ 
 		if ($this->agent->is_mobile())
 		{
 			$this->load->view($file . '_mobile', $data);
-		}
-		else
+		} else
 		{
 			$this->load->view($file, $data);
 		}

application/libraries/Twig.php

Indentation +236 added lines, -236 removed lines

@@ -17,242 +17,242 @@
 
 class Twig
 {
-    /**
-     * @var array Paths to Twig templates
-     */
-    private $paths = [];
-
-    /**
-     * @var array Twig Environment Options
-     * @see http://twig.sensiolabs.org/doc/api.html#environment-options
-     */
-    private $config = [];
-
-    /**
-     * @var array Functions to add to Twig
-     */
-    private $functions_asis = [
-        'base_url', 'site_url',
-    ];
-
-    /**
-     * @var array Functions with `is_safe` option
-     * @see http://twig.sensiolabs.org/doc/advanced.html#automatic-escaping
-     */
-    private $functions_safe = [
-        'form_open', 'form_close', 'form_error', 'form_hidden', 'set_value',
+	/**
+	 * @var array Paths to Twig templates
+	 */
+	private $paths = [];
+
+	/**
+	 * @var array Twig Environment Options
+	 * @see http://twig.sensiolabs.org/doc/api.html#environment-options
+	 */
+	private $config = [];
+
+	/**
+	 * @var array Functions to add to Twig
+	 */
+	private $functions_asis = [
+		'base_url', 'site_url',
+	];
+
+	/**
+	 * @var array Functions with `is_safe` option
+	 * @see http://twig.sensiolabs.org/doc/advanced.html#automatic-escaping
+	 */
+	private $functions_safe = [
+		'form_open', 'form_close', 'form_error', 'form_hidden', 'set_value',
 //		'form_open_multipart', 'form_upload', 'form_submit', 'form_dropdown',
 //		'set_radio', 'set_select', 'set_checkbox',
-    ];
-
-    /**
-     * @var bool Whether functions are added or not
-     */
-    private $functions_added = FALSE;
-
-    /**
-     * @var Twig_Environment
-     */
-    private $twig;
-
-    /**
-     * @var Twig_Loader_Filesystem
-     */
-    private $loader;
-
-    public function __construct($params = [])
-    {
-        if (isset($params['functions']))
-        {
-            $this->functions_asis =
-                array_unique(
-                    array_merge($this->functions_asis, $params['functions'])
-                );
-            unset($params['functions']);
-        }
-        if (isset($params['functions_safe']))
-        {
-            $this->functions_safe =
-                array_unique(
-                    array_merge($this->functions_safe, $params['functions_safe'])
-                );
-            unset($params['functions_safe']);
-        }
-
-        if (isset($params['paths']))
-        {
-            $this->paths = $params['paths'];
-            unset($params['paths']);
-        }
-        else
-        {
-            $this->paths = [VIEWPATH];
-        }
-
-        // default Twig config
-        $this->config = [
-            'cache'      => APPPATH . 'cache/twig',
-            'debug'      => ENVIRONMENT !== 'production',
-            'autoescape' => 'html',
-        ];
-
-        $this->config = array_merge($this->config, $params);
-    }
-
-    protected function resetTwig()
-    {
-        $this->twig = null;
-        $this->createTwig();
-    }
-
-    protected function createTwig()
-    {
-        // $this->twig is singleton
-        if ($this->twig !== null)
-        {
-            return;
-        }
-
-        if ($this->loader === null)
-        {
-            $this->loader = new \Twig_Loader_Filesystem($this->paths);
-        }
-
-        $twig = new \Twig_Environment($this->loader, $this->config);
-
-        if ($this->config['debug'])
-        {
-            $twig->addExtension(new \Twig_Extension_Debug());
-        }
-
-        $this->twig = $twig;
-    }
-
-    protected function setLoader($loader)
-    {
-        $this->loader = $loader;
-    }
-
-    /**
-     * Registers a Global
-     *
-     * @param string $name  The global name
-     * @param mixed  $value The global value
-     */
-    public function addGlobal($name, $value)
-    {
-        $this->createTwig();
-        $this->twig->addGlobal($name, $value);
-    }
-
-    /**
-     * Renders Twig Template and Set Output
-     *
-     * @param string $view   Template filename without `.twig`
-     * @param array  $params Array of parameters to pass to the template
-     */
-    public function display($view, $params = [])
-    {
-        $CI =& get_instance();
-        $CI->output->set_output($this->render($view, $params));
-    }
-
-    /**
-     * Renders Twig Template and Returns as String
-     *
-     * @param string $view   Template filename without `.twig`
-     * @param array  $params Array of parameters to pass to the template
-     * @return string
-     */
-    public function render($view, $params = [])
-    {
-        $this->createTwig();
-        // We call addFunctions() here, because we must call addFunctions()
-        // after loading CodeIgniter functions in a controller.
-        $this->addFunctions();
-
-        $view = $view . '.twig';
-        return $this->twig->render($view, $params);
-    }
-
-    protected function addFunctions()
-    {
-        // Runs only once
-        if ($this->functions_added)
-        {
-            return;
-        }
-
-        // as is functions
-        foreach ($this->functions_asis as $function)
-        {
-            if (function_exists($function))
-            {
-                $this->twig->addFunction(
-                    new \Twig_SimpleFunction(
-                        $function,
-                        $function
-                    )
-                );
-            }
-        }
-
-        // safe functions
-        foreach ($this->functions_safe as $function)
-        {
-            if (function_exists($function))
-            {
-                $this->twig->addFunction(
-                    new \Twig_SimpleFunction(
-                        $function,
-                        $function,
-                        ['is_safe' => ['html']]
-                    )
-                );
-            }
-        }
-
-        // customized functions
-        if (function_exists('anchor'))
-        {
-            $this->twig->addFunction(
-                new \Twig_SimpleFunction(
-                    'anchor',
-                    [$this, 'safe_anchor'],
-                    ['is_safe' => ['html']]
-                )
-            );
-        }
-
-        $this->functions_added = TRUE;
-    }
-
-    /**
-     * @param string $uri
-     * @param string $title
-     * @param array  $attributes [changed] only array is acceptable
-     * @return string
-     */
-    public function safe_anchor($uri = '', $title = '', $attributes = [])
-    {
-        $uri = html_escape($uri);
-        $title = html_escape($title);
-
-        $new_attr = [];
-        foreach ($attributes as $key => $val)
-        {
-            $new_attr[html_escape($key)] = html_escape($val);
-        }
-
-        return anchor($uri, $title, $new_attr);
-    }
-
-    /**
-     * @return \Twig_Environment
-     */
-    public function getTwig()
-    {
-        $this->createTwig();
-        return $this->twig;
-    }
+	];
+
+	/**
+	 * @var bool Whether functions are added or not
+	 */
+	private $functions_added = FALSE;
+
+	/**
+	 * @var Twig_Environment
+	 */
+	private $twig;
+
+	/**
+	 * @var Twig_Loader_Filesystem
+	 */
+	private $loader;
+
+	public function __construct($params = [])
+	{
+		if (isset($params['functions']))
+		{
+			$this->functions_asis =
+				array_unique(
+					array_merge($this->functions_asis, $params['functions'])
+				);
+			unset($params['functions']);
+		}
+		if (isset($params['functions_safe']))
+		{
+			$this->functions_safe =
+				array_unique(
+					array_merge($this->functions_safe, $params['functions_safe'])
+				);
+			unset($params['functions_safe']);
+		}
+
+		if (isset($params['paths']))
+		{
+			$this->paths = $params['paths'];
+			unset($params['paths']);
+		}
+		else
+		{
+			$this->paths = [VIEWPATH];
+		}
+
+		// default Twig config
+		$this->config = [
+			'cache'      => APPPATH . 'cache/twig',
+			'debug'      => ENVIRONMENT !== 'production',
+			'autoescape' => 'html',
+		];
+
+		$this->config = array_merge($this->config, $params);
+	}
+
+	protected function resetTwig()
+	{
+		$this->twig = null;
+		$this->createTwig();
+	}
+
+	protected function createTwig()
+	{
+		// $this->twig is singleton
+		if ($this->twig !== null)
+		{
+			return;
+		}
+
+		if ($this->loader === null)
+		{
+			$this->loader = new \Twig_Loader_Filesystem($this->paths);
+		}
+
+		$twig = new \Twig_Environment($this->loader, $this->config);
+
+		if ($this->config['debug'])
+		{
+			$twig->addExtension(new \Twig_Extension_Debug());
+		}
+
+		$this->twig = $twig;
+	}
+
+	protected function setLoader($loader)
+	{
+		$this->loader = $loader;
+	}
+
+	/**
+	 * Registers a Global
+	 *
+	 * @param string $name  The global name
+	 * @param mixed  $value The global value
+	 */
+	public function addGlobal($name, $value)
+	{
+		$this->createTwig();
+		$this->twig->addGlobal($name, $value);
+	}
+
+	/**
+	 * Renders Twig Template and Set Output
+	 *
+	 * @param string $view   Template filename without `.twig`
+	 * @param array  $params Array of parameters to pass to the template
+	 */
+	public function display($view, $params = [])
+	{
+		$CI =& get_instance();
+		$CI->output->set_output($this->render($view, $params));
+	}
+
+	/**
+	 * Renders Twig Template and Returns as String
+	 *
+	 * @param string $view   Template filename without `.twig`
+	 * @param array  $params Array of parameters to pass to the template
+	 * @return string
+	 */
+	public function render($view, $params = [])
+	{
+		$this->createTwig();
+		// We call addFunctions() here, because we must call addFunctions()
+		// after loading CodeIgniter functions in a controller.
+		$this->addFunctions();
+
+		$view = $view . '.twig';
+		return $this->twig->render($view, $params);
+	}
+
+	protected function addFunctions()
+	{
+		// Runs only once
+		if ($this->functions_added)
+		{
+			return;
+		}
+
+		// as is functions
+		foreach ($this->functions_asis as $function)
+		{
+			if (function_exists($function))
+			{
+				$this->twig->addFunction(
+					new \Twig_SimpleFunction(
+						$function,
+						$function
+					)
+				);
+			}
+		}
+
+		// safe functions
+		foreach ($this->functions_safe as $function)
+		{
+			if (function_exists($function))
+			{
+				$this->twig->addFunction(
+					new \Twig_SimpleFunction(
+						$function,
+						$function,
+						['is_safe' => ['html']]
+					)
+				);
+			}
+		}
+
+		// customized functions
+		if (function_exists('anchor'))
+		{
+			$this->twig->addFunction(
+				new \Twig_SimpleFunction(
+					'anchor',
+					[$this, 'safe_anchor'],
+					['is_safe' => ['html']]
+				)
+			);
+		}
+
+		$this->functions_added = TRUE;
+	}
+
+	/**
+	 * @param string $uri
+	 * @param string $title
+	 * @param array  $attributes [changed] only array is acceptable
+	 * @return string
+	 */
+	public function safe_anchor($uri = '', $title = '', $attributes = [])
+	{
+		$uri = html_escape($uri);
+		$title = html_escape($title);
+
+		$new_attr = [];
+		foreach ($attributes as $key => $val)
+		{
+			$new_attr[html_escape($key)] = html_escape($val);
+		}
+
+		return anchor($uri, $title, $new_attr);
+	}
+
+	/**
+	 * @return \Twig_Environment
+	 */
+	public function getTwig()
+	{
+		$this->createTwig();
+		return $this->twig;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
 
         // default Twig config
         $this->config = [
-            'cache'      => APPPATH . 'cache/twig',
+            'cache'      => APPPATH.'cache/twig',
             'debug'      => ENVIRONMENT !== 'production',
             'autoescape' => 'html',
         ];
@@ -153,7 +153,7 @@ 
      */
     public function display($view, $params = [])
     {
-        $CI =& get_instance();
+        $CI = & get_instance();
         $CI->output->set_output($this->render($view, $params));
     }
 
@@ -171,7 +171,7 @@ 
         // after loading CodeIgniter functions in a controller.
         $this->addFunctions();
 
-        $view = $view . '.twig';
+        $view = $view.'.twig';
         return $this->twig->render($view, $params);
     }
 

Braces +1 added lines, -2 removed lines

@@ -83,8 +83,7 @@
         {
             $this->paths = $params['paths'];
             unset($params['paths']);
-        }
-        else
+        } else
         {
             $this->paths = [VIEWPATH];
         }