Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEVICE_TYPE_MOBILE 向けの出力バッファリングを削除 #270

Merged
merged 1 commit into from
May 30, 2019
Merged

DEVICE_TYPE_MOBILE 向けの出力バッファリングを削除 #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/class/SC_Customer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public function getCustomerDataFromEmailPass($pass, $email, $mobile = false)
* FIXME
* @return boolean 該当する会員が存在する場合は true、それ以外の場合
* は false を返す。
* @deprecated
*/
public function checkMobilePhoneId()
{
Expand Down
1 change: 1 addition & 0 deletions data/class/SC_MobileEmoji.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

/**
* 携帯端末の絵文字を扱うクラス
* @deprecated
*/
class SC_MobileEmoji
{
Expand Down
1 change: 1 addition & 0 deletions data/class/SC_MobileImage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

/**
* 画像変換クラス
* @deprecated
*/
class SC_MobileImage
{
Expand Down
10 changes: 5 additions & 5 deletions data/class/SC_MobileUserAgent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SC_MobileUserAgent
*/
public function getCarrier()
{
trigger_error(E_USER_DEPRECATED, 'Net_UserAgent_Mobile is deprecated');
trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED);
return false;
}

Expand All @@ -58,7 +58,7 @@ public function getCarrier()
*/
public function getId()
{
trigger_error(E_USER_DEPRECATED, 'Net_UserAgent_Mobile is deprecated');
trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED);
return false;
}

Expand All @@ -70,7 +70,7 @@ public function getId()
*/
public function getModel()
{
trigger_error(E_USER_DEPRECATED, 'Net_UserAgent_Mobile is deprecated');
trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED);
return false;
}

Expand All @@ -88,7 +88,7 @@ public function getModel()
*/
public function isSupported()
{
trigger_error(E_USER_DEPRECATED, 'Net_UserAgent_Mobile is deprecated');
trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED);
return false;
}

Expand All @@ -101,7 +101,7 @@ public function isSupported()
*/
public function isMobile()
{
trigger_error(E_USER_DEPRECATED, 'Net_UserAgent_Mobile is deprecated');
trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED);
return false;
}
}
3 changes: 3 additions & 0 deletions data/class/SC_MobileView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/

/**
* @deprecated
*/
class SC_MobileView extends SC_SiteView_Ex
{
public function __construct($setPrevURL = true)
Expand Down
15 changes: 0 additions & 15 deletions data/class/helper/SC_Helper_HandleError.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,21 +200,6 @@ public static function displaySystemError($errstr = null)

ob_clean();

// 絵文字変換・除去フィルターが有効か評価する。
$loaded_ob_emoji = false;
$arrObs = ob_get_status(true);
foreach ($arrObs as $arrOb) {
if ($arrOb['name'] === 'SC_MobileEmoji::handler') {
$loaded_ob_emoji = true;
break;
}
}

// 絵文字変換・除去フィルターが無効で、利用できる場合、有効にする。
if (!$loaded_ob_emoji && class_exists('SC_MobileEmoji')) {
ob_start(array('SC_MobileEmoji', 'handler'));
}

require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_SystemError_Ex.php';
$objPage = new LC_Page_Error_SystemError_Ex();
$objPage->init();
Expand Down
1 change: 1 addition & 0 deletions data/class/helper/SC_Helper_Mobile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
* @package Helper
* @author EC-CUBE CO.,LTD.
* @version $Id$
* @deprecated
*/
class SC_Helper_Mobile
{
Expand Down
1 change: 1 addition & 0 deletions data/class/sessionfactory/SC_SessionFactory_UseRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
* @package SC_SessionFactory
* @author EC-CUBE CO.,LTD.
* @version $Id$
* @deprecated
*/
class SC_SessionFactory_UseRequest extends SC_SessionFactory_Ex
{
Expand Down
1 change: 1 addition & 0 deletions data/include/image_converter.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php
/**
* 画像ファイルの変換を行う
* @deprecated
*/
class ImageConverter
{
Expand Down
11 changes: 0 additions & 11 deletions html/require.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,3 @@

require_once HTML_REALDIR . 'define.php';
require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';

// 絵文字変換 (除去) フィルターを組み込む。
ob_start(array('SC_MobileEmoji', 'handler'));

if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
// resize_image.phpは除外
if (stripos($_SERVER['REQUEST_URI'], ROOT_URLPATH . 'resize_image.php') === FALSE) {
$objMobile = new SC_Helper_Mobile_Ex();
$objMobile->sfMobileInit();
}
}