Changeset 21514 for branches/version-2_12-dev/html
- Timestamp:
- 2012/02/15 19:56:17 (14 years ago)
- Location:
- branches/version-2_12-dev/html
- Files:
-
- 5 edited
-
admin/load_module_config.php (modified) (1 diff)
-
define.php (modified) (1 diff)
-
upgrade/index.php (modified) (2 diffs)
-
user_data/packages/admin/js/ownersstore.js.php (modified) (7 diffs)
-
user_data/plugins/google_analytics/classes/pages/LC_Page_Admin_GoogleAnalytics.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/html/admin/load_module_config.php
r21481 r21514 39 39 if (!empty($module_id) && is_numeric($module_id)) { 40 40 41 GC_Utils::gfPrintLog( "loading module ====> module_id = ". $module_id);41 GC_Utils::gfPrintLog('loading module ====> module_id = ' . $module_id); 42 42 43 43 $objQuery = new SC_Query(); -
branches/version-2_12-dev/html/define.php
r21481 r21514 1 1 <?php 2 2 /** HTMLディレクトリからのDATAディレクトリの相対パス */ 3 define('HTML2DATA_DIR', "../data/");3 define('HTML2DATA_DIR', '../data/'); 4 4 5 5 /** data/module 以下の PEAR ライブラリのみを使用する */ 6 set_include_path(realpath(dirname(__FILE__) . "/". HTML2DATA_DIR . 'module'));6 set_include_path(realpath(dirname(__FILE__) . '/' . HTML2DATA_DIR . 'module')); 7 7 8 8 /** -
branches/version-2_12-dev/html/upgrade/index.php
r21481 r21514 25 25 26 26 if ($_SERVER['REQUEST_METHOD'] !== 'POST') { 27 header( "HTTP/1.1 400 Bad Request");27 header('HTTP/1.1 400 Bad Request'); 28 28 exit(); 29 29 } … … 64 64 break; 65 65 default: 66 header( "HTTP/1.1 400 Bad Request");67 GC_Util::gfPrintLog( "modeの値が正しくありません。:".$mode);66 header('HTTP/1.1 400 Bad Request'); 67 GC_Util::gfPrintLog('modeの値が正しくありません。:'.$mode); 68 68 exit(); 69 69 break; -
branches/version-2_12-dev/html/user_data/packages/admin/js/ownersstore.js.php
r21481 r21514 40 40 // remove ajax window 41 41 remove: function() { 42 $( "#TB_window").fadeOut(42 $('#TB_window').fadeOut( 43 43 'fast', 44 44 function(){ … … 46 46 } 47 47 ); 48 $( "#TB_load").remove();48 $('#TB_load').remove(); 49 49 //if IE 6 50 50 if (typeof document.body.style.maxHeight == 'undefined') { … … 63 63 if (document.getElementById('TB_HideSelect') === null) { 64 64 $('body').append("<iframe id='TB_HideSelect'></iframe><div id='TB_overlay'></div><div id='TB_window'></div>"); 65 $( "#TB_overlay").click(this.remove);65 $('#TB_overlay').click(this.remove); 66 66 } 67 67 //all others … … 69 69 if (document.getElementById('TB_overlay') === null) { 70 70 $('body').append("<div id='TB_overlay'></div><div id='TB_window'></div>"); 71 $( "#TB_overlay").click(this.remove);71 $('#TB_overlay').click(this.remove); 72 72 } 73 73 } … … 75 75 if (this.detectMacFF()) { 76 76 //use png overlay so hide flash 77 $( "#TB_overlay").addClass('TB_overlayMacFFBGHack');77 $('#TB_overlay').addClass('TB_overlayMacFFBGHack'); 78 78 } else { 79 79 //use background and opacity 80 $( "#TB_overlay").addClass('TB_overlayBG');80 $('#TB_overlay').addClass('TB_overlayBG'); 81 81 } 82 82 … … 86 86 + " <p style='color:#ffffff'>" + loading_message + "</p>" 87 87 + " <img src='" + loading_img.src + "' />" 88 + "</div>"88 + '</div>' 89 89 ); 90 90 $('#TB_load').show(); … … 101 101 var ajaxContentH = TB_HEIGHT - 45; 102 102 103 if ($( "#TB_window").css('display') != 'block') {104 $( "#TB_window").append(103 if ($('#TB_window').css('display') != 'block') { 104 $('#TB_window').append( 105 105 "<div id='TB_title'>" 106 106 + " <div id='TB_ajaxWindowTitle'></div>" 107 107 + " <div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' onclick='OwnersStore.remove();'>close</a></div>" 108 + "</div>"108 + '</div>' 109 109 + "<div id='TB_ajaxContent' style='width:" + ajaxContentW + "px;height:" + ajaxContentH + "px'>" 110 + "</div>"110 + '</div>' 111 111 ); 112 112 //this means the window is already up, we are just loading new content via ajax 113 113 } else { 114 $( "#TB_ajaxContent")[0].style.width = ajaxContentW +'px';115 $( "#TB_ajaxContent")[0].style.height = ajaxContentH +'px';116 $( "#TB_ajaxContent")[0].scrollTop = 0;114 $('#TB_ajaxContent')[0].style.width = ajaxContentW +'px'; 115 $('#TB_ajaxContent')[0].style.height = ajaxContentH +'px'; 116 $('#TB_ajaxContent')[0].scrollTop = 0; 117 117 } 118 118 119 $( "#TB_load").remove();120 $( "#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'});119 $('#TB_load').remove(); 120 $('#TB_window').css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'}); 121 121 122 122 // take away IE6 123 123 if (!(jQuery.browser.msie && jQuery.browser.version < 7)) { 124 $( "#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'});124 $('#TB_window').css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'}); 125 125 } 126 126 127 $( "#TB_ajaxWindowTitle").html(title);128 $( "#TB_ajaxContent").html(contents);129 $( "#TB_window").css({display:'block'});127 $('#TB_ajaxWindowTitle').html(title); 128 $('#TB_ajaxContent').html(contents); 129 $('#TB_window').css({display:'block'}); 130 130 131 131 // DL成功時に設定ボタンを表示 -
branches/version-2_12-dev/html/user_data/plugins/google_analytics/classes/pages/LC_Page_Admin_GoogleAnalytics.php
r21481 r21514 53 53 54 54 if (empty($_POST['mode'])) { 55 $_POST['mode'] = "";55 $_POST['mode'] = ''; 56 56 } 57 57 58 58 if (empty($_GET['mode'])) { 59 $_GET['mode'] = "";59 $_GET['mode'] = ''; 60 60 } 61 61 } … … 123 123 . htmlspecialchars($ua, ENT_QUOTES) . "');\n?>\n"; 124 124 125 $configFile = $this->arrPluginInfo['fullpath'] . "classes/pages/ga_config.php";125 $configFile = $this->arrPluginInfo['fullpath'] . 'classes/pages/ga_config.php'; 126 126 $handle = fopen($configFile, 'w'); 127 127 if (!$handle) {
Note: See TracChangeset
for help on using the changeset viewer.
