Index: trunk/xpressme_integration_kit/admin/block_check.php =================================================================== --- trunk/admin/block_check.php (revision 170) +++ trunk/xpressme_integration_kit/admin/block_check.php (revision 232) @@ -82,27 +82,27 @@ echo $xoops_block_check->get_message(); echo "

"; - echo _AM_XP_BLOCK_OK ; + echo _AM_XP2_BLOCK_OK ; } else { echo $xoops_block_check->get_message(); echo "

\n"; - echo _AM_XP_BLOCK_NG."
\n"; - echo _AM_XP_BLOCK_REPAIR_HOWTO."
\n"; + echo _AM_XP2_BLOCK_NG."
\n"; + echo _AM_XP2_BLOCK_REPAIR_HOWTO."
\n"; echo '
'."\n"; - echo _AM_XP_BLOCK_REPAIR_STEP1 .' : '."\n"; - echo ''."
\n"; + echo _AM_XP2_BLOCK_REPAIR_STEP1 .' : '."\n"; + echo ''."
\n"; echo '     '; - echo _AM_XP_BLOCK_REMOVE_NOTE; + echo _AM_XP2_BLOCK_REMOVE_NOTE; echo "
\n"; echo "
\n"; - echo _AM_XP_BLOCK_REPAIR_STEP2 . ' : ' . _AM_XP_BLOCK_UPDATE . "
\n"; + echo _AM_XP2_BLOCK_REPAIR_STEP2 . ' : ' . _AM_XP2_BLOCK_UPDATE . "
\n"; echo '     '; - echo '' .$xoops_block_check->module_name . ' ' . _AM_XP_TO_MODELE_UPDATE .''; + echo '' .$xoops_block_check->module_name . ' ' . _AM_XP2_TO_MODELE_UPDATE .''; echo "
\n"; echo "
\n"; - echo _AM_XP_BLOCK_REPAIR_STEP3 . ' : ' . _AM_XP_BLOCK_ADMIN_SETTING . "
\n"; + echo _AM_XP2_BLOCK_REPAIR_STEP3 . ' : ' . _AM_XP2_BLOCK_ADMIN_SETTING . "
\n"; echo '     '; - echo '' .$xoops_block_check->module_name . ' ' . _AM_XP_BLOCK_TO_SETTING .''; + echo '' .$xoops_block_check->module_name . ' ' . _AM_XP2_BLOCK_TO_SETTING .''; echo "
\n"; } Index: trunk/xpressme_integration_kit/admin/index.php =================================================================== --- trunk/admin/index.php (revision 170) +++ trunk/xpressme_integration_kit/admin/index.php (revision 232) @@ -29,4 +29,50 @@ // ------------------------------------------------------------------------- // //include_once 'cp_functions.php'; + +function admin_check_user_meta_prefix($is_report = false){ + global $xoopsModule; + $xoopsDB =& Database::getInstance(); + + $mydirname = basename(dirname(dirname(__FILE__))); + $my_dirpath = dirname(dirname(__FILE__)); + $wp_prefix_only = $mydirname; + if ($wp_prefix_only == 'wordpress') $wp_prefix_only ='wp'; + $db_prefix = $xoopsDB->prefix($wp_prefix_only); + + $usermeta_tbl = $db_prefix . '_usermeta'; + $meta_key_pattern = '_' . $wp_prefix_only . '_'; + + $sql = "SELECT count(umeta_id) as data_count ,meta_key FROM $usermeta_tbl GROUP BY meta_key HAVING meta_key LIKE '%" . $meta_key_pattern ."%'" ; + $res = $xoopsDB->query($sql, 0, 0); + + if ($res === false){ + $check_str = _AM_XP2_USER_META_NONE . "
\n"; + } else { + $error =false; + $check_str = ''; + while($row = $xoopsDB->fetchArray($res)){ + $data_count = $row['data_count']; + $meta_key = $row['meta_key']; + if ( !preg_match('/^'.$db_prefix. '_.*/',$meta_key , $maches)){ + $check_str .= sprintf(_AM_XP2_USER_META_ERR , $meta_key,$data_count) ."
\n"; + $error = true; + } + } + if (!$error) + $check_str = _AM_XP2_USER_META_OK ; + } + if ($is_report) { + echo "******** " . _AM_XP2_USER_META_KEY . "********" . "
\n"; + echo $check_str . "
\n
\n"; + } else { + echo "
" . _AM_XP2_USER_META_KEY . ""; + echo "
"; + echo $check_str; + echo "
"; + echo "
"; + } + +} + function get_xpress_plugin_data( $plugin_file, $markup = true, $translate = true ) { // We don't need to write to the file, so just open for reading. @@ -103,8 +149,8 @@ { if ($is_report) { - echo "******** " . _AM_XPRESS_PLUGIN . "********" . "
\n"; - echo get_xpress_active_plugin_list(' ') . "
\n"; - } else { - echo "
" . _AM_XPRESS_PLUGIN . ""; + echo "******** " . _AM_XP2_PLUGIN . "********" . "
\n"; + echo get_xpress_active_plugin_list('') . "
\n"; + } else { + echo "
" . _AM_XP2_PLUGIN . ""; echo "
"; echo get_xpress_active_plugin_list(); @@ -120,67 +166,67 @@ if ($is_report) { - echo "******** " . _AM_SYSTEM_INFO . "********" . "
\n"; - echo ' ' . "SERVER: ". $_SERVER['SERVER_SOFTWARE']. "
\n"; - echo ' ' . "PHP Version: " . phpversion() . "
\n"; - echo ' ' . "MySQL Version: " . mysql_get_server_info() . "
"; - echo ' ' . "XOOPS Version: " . XOOPS_VERSION . "
"; - echo ' ' . "XPressME Version: " . $xoopsModule->getInfo('version') . ' ' . $xoopsModule->getInfo('codename') . "
\n"; - echo ' ' . "WordPress Version: " . $wp_version . "
\n"; - echo ' ' . "WP DB Version: " . $wp_db_version . "
\n"; - echo "
\n"; - echo ' ' . "safemode: " ; + echo "******** " . _AM_XP2_SYSTEM_INFO . "********" . "
\n"; + echo "SERVER: ". $_SERVER['SERVER_SOFTWARE']. "
\n"; + echo "PHP Version: " . phpversion() . "
\n"; + echo "MySQL Version: " . mysql_get_server_info() . "
"; + echo "XOOPS Version: " . XOOPS_VERSION . "
"; + echo "XPressME Version: " . $xoopsModule->getInfo('version') . ' ' . $xoopsModule->getInfo('codename') . "
\n"; + echo "WordPress Version: " . $wp_version . "
\n"; + echo "WP DB Version: " . $wp_db_version . "
\n"; + echo "
\n"; + echo "safemode: " ; echo ( ini_get( 'safe_mode' ) ) ? "ON" : "OFF"; echo "
\n"; - echo ' ' . "register_globals: " ; + echo "register_globals: " ; echo ( ini_get( 'register_globals' )) ? "ON" : "OFF" ; echo "
\n"; - echo ' ' . "magic_quotes_gpc: " ; + echo "magic_quotes_gpc: " ; echo ( ini_get( 'magic_quotes_gpc' )) ? "ON" : "OFF"; echo "
\n"; - echo ' ' . "XML extension: " ; + echo "XML extension: " ; echo ( extension_loaded( 'xml' )) ? "ON" : "OFF"; echo "
\n"; - echo ' ' . "memory_limit: " ; + echo "memory_limit: " ; echo ini_get( 'memory_limit' ); echo "
\n"; - echo ' ' . "post_max_size: " ; + echo "post_max_size: " ; echo ini_get( 'post_max_size' ); echo "
\n"; - echo ' ' . "upload_max_filesize: " ; + echo "upload_max_filesize: " ; echo ini_get( 'upload_max_filesize' ); echo "
\n"; - echo ' ' . "display_errors: " ; + echo "display_errors: " ; echo ( ini_get( 'display_errors' )) ? "ON" : "OFF"; echo "
\n"; - echo ' ' . "MB extension: " ; + echo "MB extension: " ; echo ( extension_loaded( 'mbstring' )) ? "ON" : "OFF"; echo "
\n"; - echo ' ' . "mbstring.language: " ; + echo "mbstring.language: " ; echo ini_get( 'mbstring.language' ); echo "
\n"; - echo ' ' . "mbstring.encoding_translation: " ; + echo "mbstring.encoding_translation: " ; echo ( ini_get( 'mbstring.encoding_translation' )) ? "ON" : "OFF"; echo "
\n"; - echo ' ' . "mbstring.internal_encoding: " ; + echo "mbstring.internal_encoding: " ; echo ini_get( 'mbstring.internal_encoding' ); echo "
\n"; - echo ' ' . "mbstring.http_input: " ; + echo "mbstring.http_input: " ; echo ini_get( 'mbstring.http_input' ); echo "
\n"; - echo ' ' . "mbstring.http_output: " ; + echo "mbstring.http_output: " ; echo ini_get( 'mbstring.http_output' ); echo "
\n"; - echo ' ' . "mbstring.detect_order: " ; + echo "mbstring.detect_order: " ; echo ini_get( 'mbstring.detect_order' ); echo "
\n"; - echo ' ' . "mbstring.substitute_character: " ; + echo "mbstring.substitute_character: " ; echo ini_get( 'mbstring.substitute_character' ); echo "
\n"; - echo ' ' . "mbstring.func_overload: " ; + echo "mbstring.func_overload: " ; echo ( ini_get( 'mbstring.func_overload' )) ? "ON" : "OFF"; echo "
\n"; echo "
\n"; } else { - echo "
" . _AM_SYSTEM_INFO . ""; + echo "
" . _AM_XP2_SYSTEM_INFO . ""; echo "
"; echo "" . $_SERVER['SERVER_SOFTWARE'] . "
"; @@ -255,6 +301,6 @@ $xoops_config = new ConfigFromXoops; if ($is_report) { - echo "******** " . _AM_XOOPS_CONFIG_INFO . "********" . "
\n"; - echo ' ' . 'XOOPS_ROOT_PATH: ' ; + echo "******** " . _AM_XP2_XOOPS_CONFIG_INFO . "********" . "
\n"; + echo 'XOOPS_ROOT_PATH: ' ; if(XOOPS_ROOT_PATH !== $xoops_config->xoops_root_path) echo 'ERROR '; @@ -263,5 +309,5 @@ echo "
\n"; - echo ' ' . 'XOOPS_TRUST_PATH: ' ; + echo 'XOOPS_TRUST_PATH: ' ; if(XOOPS_TRUST_PATH !== $xoops_config->xoops_trust_path) echo 'ERROR '; @@ -270,5 +316,5 @@ echo "
\n"; - echo ' ' . 'XOOPS_URL: ' ; + echo 'XOOPS_URL: ' ; if(XOOPS_URL !== $xoops_config->xoops_url) echo 'ERROR '; @@ -278,5 +324,5 @@ if (defined('XOOPS_SALT')){ - echo ' ' . 'XOOPS_SALT: ' ; + echo 'XOOPS_SALT: ' ; if(XOOPS_SALT !== $xoops_config->xoops_salt) echo 'ERROR '; @@ -287,5 +333,5 @@ if (defined('XOOPS_DB_SALT')){ - echo ' ' . 'XOOPS_DB_SALT: ' ; + echo 'XOOPS_DB_SALT: ' ; if(XOOPS_DB_SALT !== $xoops_config->xoops_db_salt) echo 'ERROR '; @@ -295,5 +341,5 @@ } - echo ' ' . 'XOOPS_DB_HOST: ' ; + echo 'XOOPS_DB_HOST: ' ; if(XOOPS_DB_HOST !== $xoops_config->xoops_db_host) echo 'ERROR '; @@ -302,5 +348,5 @@ echo "
\n"; - echo ' ' . 'XOOPS_DB_USER: ' ; + echo 'XOOPS_DB_USER: ' ; if(XOOPS_DB_USER !== $xoops_config->xoops_db_user) echo 'ERROR '; @@ -309,5 +355,5 @@ echo "
\n"; - echo ' ' . 'XOOPS_DB_PASS: ' ; + echo 'XOOPS_DB_PASS: ' ; if(XOOPS_DB_PASS !== $xoops_config->xoops_db_pass) echo 'ERROR '; @@ -316,5 +362,5 @@ echo "
\n"; - echo ' ' . 'XOOPS_DB_NAME: ' ; + echo 'XOOPS_DB_NAME: ' ; if(XOOPS_DB_NAME !== $xoops_config->xoops_db_name) echo 'ERROR '; @@ -323,5 +369,5 @@ echo "
\n"; - echo ' ' . 'XOOPS_DB_PREFIX: ' ; + echo 'XOOPS_DB_PREFIX: ' ; if(XOOPS_DB_PREFIX !== $xoops_config->xoops_db_prefix) echo 'ERROR '; @@ -332,5 +378,5 @@ } else { - echo "
" . _AM_XOOPS_CONFIG_INFO . ""; + echo "
" . _AM_XP2_XOOPS_CONFIG_INFO . ""; echo "
"; echo ''; @@ -472,17 +518,17 @@ if ($is_report){ - echo "******** " . _AM_XPRESS_STATS . "********" . "
\n"; - echo ' ' . _AM_XPRESS_CATEGORIES .": ".@$count_category. "
\n"; - echo ' ' . _AM_XPRESS_ARTICLES .": ". $count_article. "
\n"; - echo ' ' . _AM_XPRESS_AUTHORS .": ". $count_author. "
\n"; + echo "******** " . _AM_XP2_STATS . "********" . "
\n"; + echo _AM_XP2_CATEGORIES .": ".@$count_category. "
\n"; + echo _AM_XP2_ARTICLES .": ". $count_article. "
\n"; + echo _AM_XP2_AUTHORS .": ". $count_author. "
\n"; } else { - echo "
" . _AM_XPRESS_STATS . ""; + echo "
" . _AM_XP2_STATS . ""; echo "
"; - echo "".@$count_category; - echo "
"; - echo "". $count_article; - echo "
"; - echo "". $count_author; + echo "".@$count_category; + echo "
"; + echo "". $count_article; + echo "
"; + echo "". $count_author; echo ""; echo "
"; @@ -490,4 +536,27 @@ } } +function xpress_block_state($is_report = false) +{ + require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ; + $xoops_config = new ConfigFromXoops; + + include_once(dirname(dirname(__FILE__) ). '/class/check_blocks_class.php'); + $xoops_block_check =& xoops_block_check::getInstance(); + $xoops_block_check->check_blocks($xoops_config->module_name); + if ($is_report){ + echo "******** " . _AM_XP2_BLOCK_STATS . "********" . "
\n"; + echo $xoops_block_check->get_message(); + echo "
\n"; + echo "
\n"; + } else { + echo "
" . _AM_XP2_BLOCK_STATS . ""; + echo "
"; + echo $xoops_block_check->get_message(); + echo "
"; + echo "
"; + } +} + + require_once '../../../include/cp_header.php' ; //require_once '../include/gtickets.php' ; @@ -539,8 +608,10 @@ xpress_config_from_xoops_view($report); xpress_active_plugin_list($report); +xpress_block_state($report); +admin_check_user_meta_prefix($report); xpress_state($report); echo '
'."\n"; -echo ''.' '; -echo ''."
\n"; +echo ''.' '; +echo ''."
\n"; echo "\n"; Index: trunk/xpressme_integration_kit/admin/menu.php =================================================================== --- trunk/admin/menu.php (revision 170) +++ trunk/xpressme_integration_kit/admin/menu.php (revision 232) @@ -43,11 +43,11 @@ $i=0; -$adminmenu[$i]['title'] = _MI_MENU_SYS_INFO ; +$adminmenu[$i]['title'] = _MI_XP2_MENU_SYS_INFO ; $adminmenu[$i++]['link'] = "admin/index.php"; -//$adminmenu[$i]['title'] = _MI_MENU_BLOCK_ADMIN ; +//$adminmenu[$i]['title'] = _MI_XP2_MENU_BLOCK_ADMIN ; //$adminmenu[$i++]['link'] = "admin/admin_blocks.php"; -$adminmenu[$i]['title'] = _MI_MENU_BLOCK_CHECK ; +$adminmenu[$i]['title'] = _MI_XP2_MENU_BLOCK_CHECK ; $adminmenu[$i++]['link'] = "admin/block_check.php";