Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Florin C B. <ory...@us...> - 2014-05-16 18:06:28
|
Update of /cvsroot/mxbb/core/includes/sessions/smf2 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16099 Added Files: index.htm Log Message: Creating folders for SMF Backend --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Florin C B. <ory...@us...> - 2014-05-16 18:05:39
|
Update of /cvsroot/mxbb/core/includes/shared/smf2/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15652/includes Log Message: Directory /cvsroot/mxbb/core/includes/shared/smf2/includes added to the repository |
|
From: Florin C B. <ory...@us...> - 2014-05-16 18:05:31
|
Update of /cvsroot/mxbb/core/includes/shared/smf2 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15624/smf2 Log Message: Directory /cvsroot/mxbb/core/includes/shared/smf2 added to the repository |
|
From: Florin C B. <ory...@us...> - 2014-05-16 18:05:15
|
Update of /cvsroot/mxbb/core/includes/sessions/mybb In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15591/mybb Log Message: Directory /cvsroot/mxbb/core/includes/sessions/mybb added to the repository |
|
From: Florin C B. <ory...@us...> - 2014-05-16 18:02:41
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14920 Modified Files: functions.php Log Message: Some fixes for internal Backend Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** functions.php 5 Jun 2013 14:05:59 -0000 1.27 --- functions.php 16 May 2014 18:02:39 -0000 1.28 *************** *** 931,1120 **** } ! // ! // Renaming this for now... ! // ! if (!function_exists('realpath')) { ! if (DIRECTORY_SEPARATOR != '\\' && !(bool) ini_get('safe_mode') && function_exists('shell_exec') && trim(`realpath .`)) { ! /** ! * @author Chris Smith <ch...@pr...> ! * @copyright 2006 Project Minerva Team ! * @param string $path The path which we should attempt to resolve. ! * @return mixed ! * @ignore ! */ ! function phpbb3_realpath($path) { ! $arg = escapeshellarg($path); ! return trim(`realpath '$arg'`); } } else { ! /** ! * Checks if a path ($path) is absolute or relative ! * ! * @param string $path Path to check absoluteness of ! * @return boolean ! */ ! function is_absolute($path) ! { ! return ($path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:/#i', $path))) ? true : false; ! } ! ! /** ! * @author Chris Smith <ch...@pr...> ! * @copyright 2006 Project Minerva Team ! * @param string $path The path which we should attempt to resolve. ! * @return mixed ! */ ! function phpbb3_realpath($path) { ! // Now to perform funky shizzle ! ! // Switch to use UNIX slashes ! $path = str_replace(DIRECTORY_SEPARATOR, '/', $path); ! $path_prefix = ''; ! ! // Determine what sort of path we have ! if (is_absolute($path)) { ! $absolute = true; ! ! if ($path[0] == '/') ! { ! // Absolute path, *NIX style ! $path_prefix = ''; ! } ! else ! { ! // Absolute path, Windows style ! // Remove the drive letter and colon ! $path_prefix = $path[0] . ':'; ! $path = substr($path, 2); ! } } else { ! // Relative Path ! // Prepend the current working directory ! if (function_exists('getcwd')) ! { ! // This is the best method, hopefully it is enabled! ! $path = str_replace(DIRECTORY_SEPARATOR, '/', getcwd()) . '/' . $path; ! $absolute = true; ! if (preg_match('#^[a-z]:#i', $path)) ! { ! $path_prefix = $path[0] . ':'; ! $path = substr($path, 2); ! } ! else ! { ! $path_prefix = ''; ! } ! } ! else if (isset($_SERVER['SCRIPT_FILENAME']) && !empty($_SERVER['SCRIPT_FILENAME'])) ! { ! // Warning: If chdir() has been used this will lie! ! // Warning: This has some problems sometime (CLI can create them easily) ! $path = str_replace(DIRECTORY_SEPARATOR, '/', dirname($_SERVER['SCRIPT_FILENAME'])) . '/' . $path; ! $absolute = true; ! $path_prefix = ''; ! } ! else ! { ! // We have no way of getting the absolute path, just run on using relative ones. ! $absolute = false; ! $path_prefix = '.'; ! } } ! // Remove any repeated slashes ! $path = preg_replace('#/{2,}#', '/', $path); ! // Remove the slashes from the start and end of the path ! $path = trim($path, '/'); ! // Break the string into little bits for us to nibble on ! $bits = explode('/', $path); ! // Remove any . in the path, renumber array for the loop below ! $bits = array_values(array_diff($bits, array('.'))); ! // Lets get looping, run over and resolve any .. (up directory) ! for ($i = 0, $max = sizeof($bits); $i < $max; $i++) { ! // @todo Optimise ! if ($bits[$i] == '..' ) { ! if (isset($bits[$i - 1])) ! { ! if ($bits[$i - 1] != '..') ! { ! // We found a .. and we are able to traverse upwards, lets do it! ! unset($bits[$i]); ! unset($bits[$i - 1]); ! $i -= 2; ! $max -= 2; ! $bits = array_values($bits); ! } ! } ! else if ($absolute) // ie. !isset($bits[$i - 1]) && $absolute ! { ! // We have an absolute path trying to descend above the root of the filesystem ! // ... Error! ! return false; ! } } } ! // Prepend the path prefix ! array_unshift($bits, $path_prefix); ! $resolved = ''; ! $max = sizeof($bits) - 1; ! // Check if we are able to resolve symlinks, Windows cannot. ! $symlink_resolve = (function_exists('readlink')) ? true : false; ! foreach ($bits as $i => $bit) { ! if (@is_dir("$resolved/$bit") || ($i == $max && @is_file("$resolved/$bit"))) ! { ! // Path Exists ! if ($symlink_resolve && is_link("$resolved/$bit") && ($link = readlink("$resolved/$bit"))) ! { ! // Resolved a symlink. ! $resolved = $link . (($i == $max) ? '' : '/'); ! continue; ! } ! } ! else ! { ! // Something doesn't exist here! ! // This is correct realpath() behaviour but sadly open_basedir and safe_mode make this problematic ! // return false; ! } ! $resolved .= $bit . (($i == $max) ? '' : '/'); } ! // @todo If the file exists fine and open_basedir only has one path we should be able to prepend it ! // because we must be inside that basedir, the question is where... ! // @internal The slash in is_dir() gets around an open_basedir restriction ! if (!@file_exists($resolved) || (!is_dir($resolved . '/') && !is_file($resolved))) ! { ! return false; ! } ! // Put the slashes back to the native operating systems slashes ! $resolved = str_replace('/', DIRECTORY_SEPARATOR, $resolved); ! return $resolved; // We got here, in the end! ! } } } ! else { /** --- 931,1109 ---- } ! /** ! * Checks if a path ($path) is absolute or relative ! * ! * @param string $path Path to check absoluteness of ! * @return boolean ! */ ! function phpbb_is_absolute($path) { ! return (isset($path[0]) && $path[0] == '/' || preg_match('#^[a-z]:[/\\\]#i', $path)) ? true : false; ! } ! ! /** ! * @author Chris Smith <ch...@pr...> ! * @copyright 2006 Project Minerva Team ! * @param string $path The path which we should attempt to resolve. ! * @return mixed ! */ ! function phpbb_own_realpath($path) ! { ! global $request; ! ! // Now to perform funky shizzle ! ! // Switch to use UNIX slashes ! $path = str_replace(DIRECTORY_SEPARATOR, '/', $path); ! $path_prefix = ''; ! ! // Determine what sort of path we have ! if (phpbb_is_absolute($path)) { ! $absolute = true; ! ! if ($path[0] == '/') { ! // Absolute path, *NIX style ! $path_prefix = ''; ! } ! else ! { ! // Absolute path, Windows style ! // Remove the drive letter and colon ! $path_prefix = $path[0] . ':'; ! $path = substr($path, 2); } } else { ! // Relative Path ! // Prepend the current working directory ! if (function_exists('getcwd')) { ! // This is the best method, hopefully it is enabled! ! $path = str_replace(DIRECTORY_SEPARATOR, '/', getcwd()) . '/' . $path; ! $absolute = true; ! if (preg_match('#^[a-z]:#i', $path)) { ! $path_prefix = $path[0] . ':'; ! $path = substr($path, 2); } else { ! $path_prefix = ''; } + } + else if ($request->server('SCRIPT_FILENAME')) + { + // Warning: If chdir() has been used this will lie! + // Warning: This has some problems sometime (CLI can create them easily) + $filename = htmlspecialchars_decode($request->server('SCRIPT_FILENAME')); + $path = str_replace(DIRECTORY_SEPARATOR, '/', dirname($filename)) . '/' . $path; + $absolute = true; + $path_prefix = ''; + } + else + { + // We have no way of getting the absolute path, just run on using relative ones. + $absolute = false; + $path_prefix = '.'; + } + } ! // Remove any repeated slashes ! $path = preg_replace('#/{2,}#', '/', $path); ! // Remove the slashes from the start and end of the path ! $path = trim($path, '/'); ! // Break the string into little bits for us to nibble on ! $bits = explode('/', $path); ! // Remove any . in the path, renumber array for the loop below ! $bits = array_values(array_diff($bits, array('.'))); ! // Lets get looping, run over and resolve any .. (up directory) ! for ($i = 0, $max = sizeof($bits); $i < $max; $i++) ! { ! // @todo Optimise ! if ($bits[$i] == '..' ) ! { ! if (isset($bits[$i - 1])) { ! if ($bits[$i - 1] != '..') { ! // We found a .. and we are able to traverse upwards, lets do it! ! unset($bits[$i]); ! unset($bits[$i - 1]); ! $i -= 2; ! $max -= 2; ! $bits = array_values($bits); } } + else if ($absolute) // ie. !isset($bits[$i - 1]) && $absolute + { + // We have an absolute path trying to descend above the root of the filesystem + // ... Error! + return false; + } + } + } ! // Prepend the path prefix ! array_unshift($bits, $path_prefix); ! $resolved = ''; ! $max = sizeof($bits) - 1; ! // Check if we are able to resolve symlinks, Windows cannot. ! $symlink_resolve = (function_exists('readlink')) ? true : false; ! foreach ($bits as $i => $bit) ! { ! if (@is_dir("$resolved/$bit") || ($i == $max && @is_file("$resolved/$bit"))) ! { ! // Path Exists ! if ($symlink_resolve && is_link("$resolved/$bit") && ($link = readlink("$resolved/$bit"))) { ! // Resolved a symlink. ! $resolved = $link . (($i == $max) ? '' : '/'); ! continue; } + } + else + { + // Something doesn't exist here! + // This is correct realpath() behaviour but sadly open_basedir and safe_mode make this problematic + // return false; + } + $resolved .= $bit . (($i == $max) ? '' : '/'); + } ! // @todo If the file exists fine and open_basedir only has one path we should be able to prepend it ! // because we must be inside that basedir, the question is where... ! // @internal The slash in is_dir() gets around an open_basedir restriction ! if (!@file_exists($resolved) || (!@is_dir($resolved . '/') && !is_file($resolved))) ! { ! return false; ! } ! // Put the slashes back to the native operating systems slashes ! $resolved = str_replace('/', DIRECTORY_SEPARATOR, $resolved); ! // Check for DIRECTORY_SEPARATOR at the end (and remove it!) ! if (substr($resolved, -1) == DIRECTORY_SEPARATOR) ! { ! return substr($resolved, 0, -1); } + + return $resolved; // We got here, in the end! } ! ! /* ! * A wrapper for realpath ! */ ! if (!function_exists('realpath')) { /** *************** *** 1122,1131 **** * @ignore */ ! function phpbb3_realpath($path) { ! return realpath($path); } } if (!function_exists('htmlspecialchars_decode')) { --- 1111,1155 ---- * @ignore */ ! function phpbb_realpath($path) { ! return phpbb_own_realpath($path); ! } ! } ! else ! { ! /** ! * A wrapper for realpath ! */ ! function phpbb_realpath($path) ! { ! $realpath = realpath($path); ! ! // Strangely there are provider not disabling realpath but returning strange values. :o ! // We at least try to cope with them. ! if ($realpath === $path || $realpath === false) ! { ! return phpbb_own_realpath($path); ! } ! ! // Check for DIRECTORY_SEPARATOR at the end (and remove it!) ! if (substr($realpath, -1) == DIRECTORY_SEPARATOR) ! { ! $realpath = substr($realpath, 0, -1); ! } ! ! return $realpath; } } + /** + * Renaming this for now... + * for compatibility with phpBB 3.0.x Olympus. + * @ignore + */ + function phpbb3_realpath($path) + { + return phpbb_realpath($path); + } + if (!function_exists('htmlspecialchars_decode')) { *************** *** 4324,4329 **** { // remove complete path to installation, with the risk of changing backslashes meant to be there ! $errfile = str_replace(array(phpBB2::phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile); ! $msg_text = str_replace(array(phpBB2::phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text); echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n"; --- 4348,4353 ---- { // remove complete path to installation, with the risk of changing backslashes meant to be there ! $errfile = str_replace(array(self::phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile); ! $msg_text = str_replace(array(self::phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text); echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n"; |
|
From: Florin C B. <ory...@us...> - 2014-05-16 18:02:26
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14874/phpbb3 Modified Files: core.php session.php Log Message: Some fixes for internal Backend Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/core.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** core.php 9 May 2014 07:52:03 -0000 1.27 --- core.php 16 May 2014 18:02:23 -0000 1.28 *************** *** 193,225 **** global $db, $portal_config, $phpbb_root_path, $mx_root_path; global $table_prefix, $phpEx, $tplEx; ! $table_prefix = false; ! ! // // Define relative path to phpBB, and validate - // $phpbb_root_path = $mx_root_path . $portal_config['portal_backend_path']; str_replace("//", "/", $phpbb_root_path); $portal_backend_valid_file = @file_exists($phpbb_root_path . "mcp.$phpEx"); ! ! // // Load phpbb config.php (to get table prefix) - // if ((include $phpbb_root_path . "config.$phpEx") === false) { ! die('Configuration file (config) ' . $phpbb_root_path . "/config.$phpEx" . ' couldn\'t be opened.'); } - // // Define backend template extension ! // ! $tplEx = 'html'; ! ! // // Validate db connection for backend - // $_result = $db->sql_query("SELECT config_value from " . $table_prefix . "config WHERE config_name = 'cookie_domain'"); $portal_backend_valid_db = $db->sql_numrows($_result) != 0; ! return $portal_backend_valid_file && !empty($table_prefix) && $portal_backend_valid_db; } --- 193,217 ---- global $db, $portal_config, $phpbb_root_path, $mx_root_path; global $table_prefix, $phpEx, $tplEx; ! $table_prefix = false; ! // Define relative path to phpBB, and validate $phpbb_root_path = $mx_root_path . $portal_config['portal_backend_path']; str_replace("//", "/", $phpbb_root_path); $portal_backend_valid_file = @file_exists($phpbb_root_path . "mcp.$phpEx"); ! // Load phpbb config.php (to get table prefix) if ((include $phpbb_root_path . "config.$phpEx") === false) { ! die('Configuration file (config) ' . $phpbb_root_path . "config.$phpEx" . ' couldn\'t be opened.'); } // Define backend template extension ! $tplEx = 'html'; ! // Validate db connection for backend $_result = $db->sql_query("SELECT config_value from " . $table_prefix . "config WHERE config_name = 'cookie_domain'"); $portal_backend_valid_db = $db->sql_numrows($_result) != 0; ! return $portal_backend_valid_file && !empty($table_prefix) && $portal_backend_valid_db; } *************** *** 359,363 **** // Rename config keys and get internal sitename/sitedesc - // case 'portal_name': --- 351,354 ---- *************** *** 424,432 **** { global $db, $portal_config, $board_config, $dss_seeded; ! $val = $board_config['rand_seed'] . microtime(); $val = md5($val); $board_config['rand_seed'] = md5($board_config['rand_seed'] . $val . 'a'); ! if($dss_seeded !== true) { --- 415,423 ---- { global $db, $portal_config, $board_config, $dss_seeded; ! $val = $board_config['rand_seed'] . microtime(); $val = md5($val); $board_config['rand_seed'] = md5($board_config['rand_seed'] . $val . 'a'); ! if($dss_seeded !== true) { *************** *** 434,446 **** config_value = '" . $board_config['rand_seed'] . "' WHERE config_name = 'rand_seed'"; ! ! if( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, "Unable to reseed PRNG", "", __LINE__, __FILE__, $sql); } ! $dss_seeded = true; } - return substr($val, 4, 16); } --- 425,439 ---- config_value = '" . $board_config['rand_seed'] . "' WHERE config_name = 'rand_seed'"; ! //display an error debuging message only if the portal is installed/upgraded ! if(!@$db->sql_query($sql) && @!file_exists('install')) { mx_message_die(GENERAL_ERROR, "Unable to reseed PRNG", "", __LINE__, __FILE__, $sql); } ! elseif(!@$db->sql_query($sql) && @file_exists('install')) ! { ! mx_message_die(GENERAL_ERROR, "Unable to reseed PRNG"."<br />Please finish upgrading and <br />". t(isset($lang['Please_remove_install_contrib'])), "", __LINE__, __FILE__, $sql); ! } $dss_seeded = true; } return substr($val, 4, 16); } Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** session.php 2 Jul 2013 02:24:03 -0000 1.60 --- session.php 16 May 2014 18:02:23 -0000 1.61 *************** *** 2215,2229 **** { global $board_config, $db; ! if (!empty($this->lang_id)) { return $this->lang_id; } ! if (!$this->lang_name) { $this->lang_name = $board_config['default_lang']; } ! $sql = 'SELECT lang_id FROM ' . LANG_TABLE . " --- 2215,2229 ---- { global $board_config, $db; ! if (!empty($this->lang_id)) { return $this->lang_id; } ! if (!$this->lang_name) { $this->lang_name = $board_config['default_lang']; } ! $sql = 'SELECT lang_id FROM ' . LANG_TABLE . " *************** *** 2232,2236 **** $this->lang_id = (int) $db->sql_fetchfield('lang_id'); $db->sql_freeresult($result); ! return $this->lang_id; } --- 2232,2236 ---- $this->lang_id = (int) $db->sql_fetchfield('lang_id'); $db->sql_freeresult($result); ! return $this->lang_id; } *************** *** 2255,2259 **** --- 2255,2463 ---- $db->sql_freeresult($result); } + + /** + * Gets the user's info + * + * Will take the users email, username or member id and return their data + * + * @param int || string $username the user's email address username or member id + * @return array $results containing the user info || bool false + * @since 0.1.2 + */ + function load_user($user, $force_str = false) + { + if (!is_numeric($user) || $force_str) + { + $user = phpBB2::phpbb_clean_username($user); + } + else + { + $user = intval($user); + } + + //$this->data = array(); + + // we'll try id || email, then username + if (is_numeric($user)) + { + // number is most likely a member id + $this->data = get_user_by_id($user); + } + else + { + // the email can't be purely numeric + $this->data = get_user_by_email($user); + } + + if (empty($this->data)) + { + $this->data = get_user_by_username($user); + } + /* + if (empty($this->data)) + { + return false; + } + else + { + return $this->data; + } + */ + } + + /** + * Load user helper + * + * @param array $user_ids + */ + function load_users(array $user_ids) + { + $user_ids[] = ANONYMOUS; + + // Make user_ids unique and convert to integer. + $user_ids = array_map('intval', array_unique($user_ids)); + + // Do not load users we already have in $this->users + $user_ids = array_diff($user_ids, array_keys($this->users)); + + if (sizeof($user_ids)) + { + $sql = 'SELECT * + FROM ' . USERS_TABLE . ' + WHERE ' . $db->sql_in_set('user_id', $user_ids); + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $this->users[$row['user_id']] = $row; + } + $db->sql_freeresult($result); + } + } + + /** + * Gets the user's info from their email address + * + * Will take the users email address and return an array containing all the + * user's information in the db. Will return false on failure + * + * @param string $email the user's email address + * @return array $results containing the user info || bool false + * @since 0.1.0 + */ + function get_user_by_email($email_address = '') + { + global $db; + if ('' == $email_address || !is_string($email_address) || 2 > count(explode('@', $email_address))) + { + return false; + } + $sql = $db->sql_build_query('SELECT', ' + SELECT * FROM ' . USERS_TABLE . ' + WHERE email_address = {string:email_address}', + array('email_address' => $email_address, )); + $result = $db->sql_query_limit($sql, 1); + $return = $db->sql_fetchrow($result); + if (!$return) + { + $db->sql_freeresult($result); + //trigger_error($mx_user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING); + } + if (empty($return)) + { + return false; + } + else + { + // return all the results. + return $return; + } + } + /** + * Gets the user's info from their member id + * + * Will take the users member id and return an array containing all the + * user's information in the db. Will return false on failure + * + * @param int $id the user's member id + * @return array $results containing the user info || bool false + * @since 0.1.2 + */ + function get_user_by_id($user_id = '') + { + global $db; + if ('' == $user_id || !is_numeric($user_id)) + { + return false; + } + else + { + $id = intval($user_id); + if (0 == $user_id) + { + return false; + } + } + $sql = $db->sql_build_query('SELECT', ' + SELECT * FROM ' . USERS_TABLE . ' + WHERE user_id = {int:user_id}', + array('user_id' => $user_id, )); + $result = $db->sql_query_limit($sql, 1); + $return = $db->sql_fetchrow($result); + if (!$return) + { + $db->sql_freeresult($result); + //trigger_error($mx_user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING); + } + if (empty($return)) + { + return false; + } + else + { + // return all the results. + return $return; + } + } + + /** + * Gets the user's info from their member name (username) + * + * Will take the users member name and return an array containing all the + * user's information in the db. Will return false on failure + * + * @param string $username the user's member name + * @return array $results containing the user info || bool false + * @since 0.1.0 + */ + function get_user_by_name($user_name = '') + { + global $db; + if ('' == $user_name || !is_string($user_name)) + { + return false; + } + $sql = $db->sql_build_query('SELECT', ' + SELECT * FROM ' . USERS_TABLE . ' + WHERE user_name = {string:user_name}', + array('user_name' => $user_name, )); + $result = $db->sql_query_limit($sql, 1); + $return = $db->sql_fetchrow($result); + if (!$return) + { + $db->sql_freeresult($result); + //trigger_error($mx_user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING); + } + if (empty($return)) + { + return false; + } + else + { + // return all the results. + return $return; + } + } /** |
|
From: Florin C B. <ory...@us...> - 2014-05-16 18:02:25
|
Update of /cvsroot/mxbb/core/includes/sessions/internal In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14874/internal Modified Files: core.php session.php Log Message: Some fixes for internal Backend Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/core.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** core.php 9 May 2014 07:52:03 -0000 1.18 --- core.php 16 May 2014 18:02:23 -0000 1.19 *************** *** 245,253 **** { global $db, $portal_config, $board_config, $lang, $dss_seeded; ! $val = $portal_config['rand_seed'] . microtime(); $val = md5($val); $portal_config['rand_seed'] = md5($portal_config['rand_seed'] . $val . 'a'); - if($dss_seeded !== true) { --- 245,252 ---- { global $db, $portal_config, $board_config, $lang, $dss_seeded; ! $val = $portal_config['rand_seed'] . microtime(); $val = md5($val); $portal_config['rand_seed'] = md5($portal_config['rand_seed'] . $val . 'a'); if($dss_seeded !== true) { *************** *** 255,259 **** rand_seed = '" . $portal_config['rand_seed'] . "' WHERE portal_id = '1'"; - //display an error debuging message only if the portal is installed/upgraded if(!@$db->sql_query($sql) && @!file_exists('install')) --- 254,257 ---- *************** *** 263,272 **** elseif(!@$db->sql_query($sql) && @file_exists('install')) { ! mx_message_die(GENERAL_ERROR, "Unable to reseed PRNG"."<br />Please finish upgrading and <br />".$lang['Please_remove_install_contrib'], "", __LINE__, __FILE__, $sql); } $dss_seeded = true; } - return substr($val, 4, 16); } --- 261,269 ---- elseif(!@$db->sql_query($sql) && @file_exists('install')) { ! mx_message_die(GENERAL_ERROR, "Unable to reseed PRNG"."<br />Please finish upgrading and <br />". t(isset($lang['Please_remove_install_contrib'])), "", __LINE__, __FILE__, $sql); } $dss_seeded = true; } return substr($val, 4, 16); } Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/session.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** session.php 9 May 2014 07:52:03 -0000 1.20 --- session.php 16 May 2014 18:02:23 -0000 1.21 *************** *** 652,657 **** --- 652,717 ---- return; } + /** + * Sync UserData + * @access private + */ + function sync_userdata($userdata = false) + { + if (empty($userdata)) + { + return false; + } + foreach ($userdata as $key => $value) + { + $do = true; + switch ($key) + { + // Rename user_data keys and get internal sitename/sitedesc + case 'user_id': + case 'user_name': + case 'user_regdate': + case 'user_posts': + case 'user_level': + case 'user_lang': + break; + /* + case 'last_login': + $key = 'user_lastvisit'; + break; + */ + } + if ($do) + { + return $userdata[$key] = $value; + } + } + } /** + * A replacement for unserialize that returns whether it worked and + * populates the unserialized variable by reference. + * + * @author walf + * @link http://www.php.net/manual/pt_BR/function.unserialize.php#105500 + * @param string $serialized the serialized data + * @param array $into the variable to hold the unserialized array + * @return bool whether the data was unserialized or not + * borrowed here from SMF Backend + * @since 0.1.2 + * + */ + function funserialize($serialized, &$into) + { + static $sfalse; + if ($sfalse === null) + { + $sfalse = serialize(false); + } + $into = @unserialize($serialized); + return $into !== false || @rtrim($serialized) === $sfalse; + //whitespace at end of serialized var is ignored by PHP + } + + /** * Setup style * |
|
From: Florin C B. <ory...@us...> - 2014-05-16 18:02:09
|
Update of /cvsroot/mxbb/core In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14790 Modified Files: login.php Log Message: Some fixes for internal Backend Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core/login.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** login.php 28 Jun 2013 15:32:38 -0000 1.34 --- login.php 16 May 2014 18:02:06 -0000 1.35 *************** *** 53,72 **** } ! if($mx_request_vars->is_request('login') || $mx_request_vars->is_request('logout') ) { ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! ! case 'phpbb2': ! ! include($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/login.'.$phpEx); ! break; ! ! case 'phpbb3': ! ! include($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/login.'.$phpEx); ! break; ! } } else --- 53,59 ---- } ! if($mx_request_vars->is_request('login') || $mx_request_vars->is_request('logout')) { ! include($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/login.'.$phpEx); } else |
|
From: Florin C B. <ory...@us...> - 2014-05-16 18:02:08
|
Update of /cvsroot/mxbb/core/includes/db In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14790/includes/db Modified Files: mysql.php mysql4.php mysqli.php Log Message: Some fixes for internal Backend Index: mysql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** mysql.php 28 Jun 2013 15:33:26 -0000 1.26 --- mysql.php 16 May 2014 18:02:05 -0000 1.27 *************** *** 48,54 **** $this->server = $sqlserver . (($port) ? ':' . $port : ''); $this->dbname = $database; ! $this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link); ! if ($this->db_connect_id && $this->dbname != '') { --- 48,54 ---- $this->server = $sqlserver . (($port) ? ':' . $port : ''); $this->dbname = $database; ! $this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link); ! if ($this->db_connect_id && $this->dbname != '') { *************** *** 57,71 **** // Determine what version we are using and if it natively supports UNICODE $this->mysql_version = mysql_get_server_info($this->db_connect_id); ! if (version_compare($this->mysql_version, '4.1.3', '>=')) { $this->sql_layer = 'mysql4'; ! ! if (UTF_STATUS === 'phpbb3') { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); // enforce strict mode on databases that support it } ! if (version_compare($this->mysql_version, '5.0.2', '>=')) { --- 57,71 ---- // Determine what version we are using and if it natively supports UNICODE $this->mysql_version = mysql_get_server_info($this->db_connect_id); ! if (version_compare($this->mysql_version, '4.1.3', '>=')) { $this->sql_layer = 'mysql4'; ! ! if (DBCHARACTER_SET === 'uft8') { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); // enforce strict mode on databases that support it } ! if (version_compare($this->mysql_version, '5.0.2', '>=')) { *************** *** 74,78 **** @mysql_free_result($result); $modes = array_map('trim', explode(',', $row['sql_mode'])); ! // TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES if (!in_array('TRADITIONAL', $modes)) --- 74,78 ---- @mysql_free_result($result); $modes = array_map('trim', explode(',', $row['sql_mode'])); ! // TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES if (!in_array('TRADITIONAL', $modes)) *************** *** 82,86 **** $modes[] = 'STRICT_ALL_TABLES'; } ! if (!in_array('STRICT_TRANS_TABLES', $modes)) { --- 82,86 ---- $modes[] = 'STRICT_ALL_TABLES'; } ! if (!in_array('STRICT_TRANS_TABLES', $modes)) { *************** *** 88,92 **** } } ! $mode = implode(',', $modes); @mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id); --- 88,92 ---- } } ! $mode = implode(',', $modes); @mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id); *************** *** 101,105 **** $this->sql_layer = 'mysql'; } - return $this->db_connect_id; } --- 101,104 ---- Index: mysql4.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql4.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mysql4.php 28 Jun 2013 15:33:26 -0000 1.24 --- mysql4.php 16 May 2014 18:02:05 -0000 1.25 *************** *** 51,59 **** $this->server = $sqlserver . (($port) ? ':' . $port : ''); $this->dbname = $database; ! $this->sql_layer = 'mysql4'; $this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link); ! if ($this->db_connect_id && $this->dbname != '') { --- 51,59 ---- $this->server = $sqlserver . (($port) ? ':' . $port : ''); $this->dbname = $database; ! $this->sql_layer = 'mysql4'; $this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link); ! if ($this->db_connect_id && $this->dbname != '') { *************** *** 62,74 **** // Determine what version we are using and if it natively supports UNICODE $this->mysql_version = mysql_get_server_info($this->db_connect_id); ! if (version_compare($this->mysql_version, '4.1.3', '>=')) { ! if (defined('UTF_STATUS') && (UTF_STATUS === 'phpbb3')) { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); // enforce strict mode on databases that support it } ! if (version_compare($this->mysql_version, '5.0.2', '>=')) { --- 62,74 ---- // Determine what version we are using and if it natively supports UNICODE $this->mysql_version = mysql_get_server_info($this->db_connect_id); ! if (version_compare($this->mysql_version, '4.1.3', '>=')) { ! if (defined('DBCHARACTER_SET') && (DBCHARACTER_SET === 'uft8')) { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); // enforce strict mode on databases that support it } ! if (version_compare($this->mysql_version, '5.0.2', '>=')) { *************** *** 77,81 **** @mysql_free_result($result); $modes = array_map('trim', explode(',', $row['sql_mode'])); - // TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES if (!in_array('TRADITIONAL', $modes)) --- 77,80 ---- *************** *** 85,89 **** $modes[] = 'STRICT_ALL_TABLES'; } - if (!in_array('STRICT_TRANS_TABLES', $modes)) { --- 84,87 ---- *************** *** 91,99 **** } } - $mode = implode(',', $modes); @mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id); } - } else if (version_compare($this->mysql_version, '4.0.0', '>=')) --- 89,95 ---- *************** *** 105,113 **** $this->sql_layer = 'mysql'; } - return $this->db_connect_id; } } - return $this->sql_error(''); } --- 101,107 ---- Index: mysqli.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysqli.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** mysqli.php 28 Jun 2013 15:33:26 -0000 1.27 --- mysqli.php 16 May 2014 18:02:06 -0000 1.28 *************** *** 49,60 **** $this->dbname = $database; $port = (!$port) ? NULL : $port; ! // Persistant connections not supported by the mysqli extension? $this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port); - if ($this->db_connect_id && $this->dbname != '') { ! // mysqli only supported by phpBB3 ! if (defined('UTF_STATUS') && (UTF_STATUS === 'phpbb3')) { mysqli_query($this->db_connect_id, "SET NAMES 'utf8'"); // enforce strict mode on databases that support it --- 49,59 ---- $this->dbname = $database; $port = (!$port) ? NULL : $port; ! // Persistant connections not supported by the mysqli extension? $this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port); if ($this->db_connect_id && $this->dbname != '') { ! // mysqli extension is only supported by mysql v. 4.1+ ! if (defined('DBCHARACTER_SET') && (DBCHARACTER_SET === 'utf8')) { mysqli_query($this->db_connect_id, "SET NAMES 'utf8'"); // enforce strict mode on databases that support it *************** *** 66,70 **** mysqli_free_result($result); $modes = array_map('trim', explode(',', $row['sql_mode'])); - // TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES if (!in_array('TRADITIONAL', $modes)) --- 65,68 ---- *************** *** 74,78 **** $modes[] = 'STRICT_ALL_TABLES'; } - if (!in_array('STRICT_TRANS_TABLES', $modes)) { --- 72,75 ---- *************** *** 80,84 **** } } - $mode = implode(',', $modes); @mysqli_query($this->db_connect_id, "SET SESSION sql_mode='{$mode}'"); --- 77,80 ---- *************** *** 86,90 **** return $this->db_connect_id; } - return $this->sql_error(''); } --- 82,85 ---- |
Update of /cvsroot/mxbb/core/install/templates In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27739 Added Files: mx_install_body.php mx_install_button.php mx_install_footer.php mx_install_header.php mx_install_language.php mx_install_phpinfo.php Log Message: this template files will have classes for SMF --- NEW FILE: mx_install_footer.php --- </td> </tr> <tr> <td> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td align="center" valign="top" nowrap><span class="gensmall">{L_INSTALLER_NAME}<br />v. {L_INSTALLER_VERSION}</span></td> <td align="center" valign="top" width="100%"><span class="gen">{L_INSTALL_MOREINFO}</span></td> <td align="right" valign="top"><span class="gen"> {L_INSTALL_PHPINFO}</span></td> </tr> </table> </td> </tr> </table> </td> </tr> </table> </body> </html> --- NEW FILE: mx_install_phpinfo.php --- <table border="0" align="center" cellspacing="0" cellpadding="0"> <tr> <td align="center">{PHPINFO}</td> </tr> </table> --- NEW FILE: mx_install_language.php --- <form name="frmInstall" action="{S_FORM_ACTION}" method="post"> <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> <th colspan="2">{L_INITIAL_CONFIGURATION}</th> </tr> <tr> <td class="row1" width="50%" align="right"><span class="gen"><b>{L_LANGUAGE}: </b></span></td> <td class="row2">{S_LANG_SELECT}</td> </tr> <tr> <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_SUBMIT}" /></td> </tr> </table> </form> --- NEW FILE: mx_install_button.php --- <!-- BEGIN switch_are_you_sure --> <script language="javascript1.2" type="text/javascript"><!-- function areYouSure() { return confirm('{L_ARE_YOU_SURE}'); } //--></script> <!-- END switch_are_you_sure --> <form name="frmInstall" action="{S_FORM_ACTION}" method="post"> <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input <!-- BEGIN switch_are_you_sure --> onclick="return areYouSure();" <!-- END switch_are_you_sure --> class="mainoption" type="submit" value="{L_SUBMIT}" /></td> </tr> </table> </form> --- NEW FILE: mx_install_body.php --- <script language="javascript1.2" type="text/javascript"><!-- function getObj(obj) { return ( document.getElementById ? document.getElementById(obj) : ( document.all ? document.all[obj] : null ) ); } function displayObj(obj, status) { var x = getObj(obj); if( x && x.style ) x.style.display = status; } function check_backend_path() { if( document.forms['frmInstall'] && document.forms['frmInstall'].elements['select_backend_path'] ) { var i = document.forms['frmInstall'].elements['select_backend_path'].value; if (i == -1) { displayObj('backend', 'none'); displayObj('mxbb', 'block'); displayObj('dbms_mxbb', 'block'); } else { displayObj('backend', 'block'); displayObj('mxbb', 'none'); displayObj('dbms_mxbb', 'none'); } for( var x in pathinfo[i] ) { document.forms['frmInstall'].elements[x].value = pathinfo[i][x]; } } } function check_database_type() { if( document.forms['frmInstall'] && document.forms['frmInstall'].elements['dbms_mxbb'] ) { var i = document.forms['frmInstall'].elements['dbms_mxbb'].value; for( var x in pathinfo[i] ) { document.forms['frmInstall'].elements[x].value = pathinfo[i][x]; } } } var pathinfo = []; var i = -1; <!-- BEGIN datarow --> pathinfo[i] = []; pathinfo[i]['info'] = '{datarow.INFO}'; pathinfo[i]['backend_path'] = '{datarow.BACKEND_PATH}'; pathinfo[i]['backend_url'] = '{datarow.BACKEND_URL}'; pathinfo[i]['portal_backend'] = '{datarow.PORTAL_BACKEND}'; //Display selected Backend pathinfo[i]['portal_url'] = '{datarow.PORTAL_URL}'; pathinfo[i]['dbms'] = '{datarow.DBMS}'; //pathinfo[i]['dbms_mxbb'] = '{datarow.DBMS_SELECT}'; pathinfo[i]['dbms_mxbb'] = '{datarow.S_DBMS_TYPE}'; pathinfo[i]['dbhost'] = '{datarow.DB_HOST}'; pathinfo[i]['dbhost_mxbb'] = '{datarow.DB_HOST}'; pathinfo[i]['dbname'] = '{datarow.DB_NAME}'; pathinfo[i]['dbuser'] = '{datarow.DB_USER}'; pathinfo[i]['dbpasswd'] = '{datarow.DB_PASSWD}'; pathinfo[i]['dbcharacter_set'] = '{datarow.DB_CHARACTER_SET}'; pathinfo[i]['dbcharacter_set_mxbb'] = '{datarow.DB_CHARACTER_SET}'; pathinfo[i]['dbprefix'] = '{datarow.DB_PREFIX}'; pathinfo[i]['mx_prefix'] = '{datarow.MX_DB_PREFIX}'; //pathinfo[i]['acm_type'] = '{datarow.ACM_TYPE}'; //pathinfo[i]['backend_root'] = '{datarow.BACKEND_ROOT}'; i++; <!-- END datarow --> window.onload = check_backend_path; //--></script> <noscript><div align="center" style="color:red;">{L_NOSCRIPT_WARNING}</div></noscript> <form name="frmInstall" action="{S_FORM_ACTION}" method="post"> <table cellpadding="2" cellspacing="1" border="0"> <tr> <th colspan="2">{L_INITIAL_CONFIGURATION}</th> </tr> <!-- BEGIN switch_readonly_mode --> <tr> <td class="row1" align="right" width="50%"><span class="gen"><b>{L_BACKEND}: </b></span><br /><span class="gensmall">{L_Backend_explain}: </span></td> <td class="row2">{S_BACKEND_PATH}</td> </tr> <!-- END switch_readonly_mode --> <tr> <td class="row1" align="right" width="50%"><span class="gen">{L_PORTAL_BACKEND}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="portal_backend" value="{PORTAL_BACKEND}" {READONLY} /></td> </tr> <!-- BEGIN switch_readonly_mode --> <tr> <td class="row1" colspan="2" align="center"><input size="140" class="info" type="text" name="info" value="{INFO}" {READONLY} /></td></td> </tr> <!-- END switch_readonly_mode --> <!-- <tr> <td class="row1" align="right"><span class="gen"><b>{L_ACM_TYPE}: </b></span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="acm_type" value="{ACM_TYPE}" /></td> </tr> --> <tr> <th colspan="2">{L_PORTAL_CONFIGURATION}{READ_ONLY}</th> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_PORTAL_URL}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" size="80" name="portal_url" value="{PORTAL_URL}" /></td> </tr> <tr><td colspan="2"><div id="backend" style="display:none;" class="genmed"><table width="100%" cellpadding="2" cellspacing="1" border="0"> <tr> <td class="row1" align="right"><span class="gen">{L_BACKEND_URL}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" size="80" name="backend_url" value="{BACKEND_URL}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_BACKEND_PATH}: </span></td> <td class="row2"><input type="text" size="80" name="backend_path" value="{BACKEND_PATH}" /></td> </tr> <!-- BEGIN switch_readonly_mode --> <tr> <th colspan="2">{L_DATABASE_CONFIGURATION}{READ_ONLY}</th> </tr> <tr> <td class="row1" align="right" width="50%"><span class="gen">{L_DBMS}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="dbms" value="{DBMS}" {READONLY}/></td> </tr> <!-- END switch_readonly_mode --> <tr> <td class="row1" align="right"><span class="gen"><b>{L_MX_DB_PREFIX}: </b></span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="mx_prefix" value="{MX_DB_PREFIX}" /></td> </tr> <!-- BEGIN switch_readonly_mode --> <tr> <td class="row1" align="right"><span class="gen">{L_DB_CHARACTER_SET}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="dbcharacter_set" value="{DB_CHARACTER_SET}" {READONLY} /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_HOST}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="dbhost" value="{DB_HOST}" {READONLY} /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_NAME}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="dbname" value="{DB_NAME}" {READONLY} /></td> </tr> <!-- END switch_readonly_mode --> <tr> <td class="row1" align="right"><span class="gen">{L_DB_USER}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="dbuser" value="{DB_USER}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_PASSWORD}: </span></td> <td class="row2"><input type="password" name="dbpasswd" value="{DB_PASSWD}" /></td> </tr> <!-- BEGIN switch_readonly_mode --> <tr> <td class="row1" align="right"><span class="gen">{L_DB_PREFIX}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="dbprefix" value="{DB_PREFIX}" {READONLY} /></td> </tr> <!-- END switch_readonly_mode --> <tr> <td class="row1" align="right"><span class="gen">{L_MXP_ADMINNAME}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="admin_name" value="" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD}: </span></td> <td class="row2"><input class="inputbox autowidth" type="password" name="admin_pass1" value="" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD2}: </span></td> <td class="row2"><input class="inputbox autowidth" type="password" name="admin_pass2" value="" /></td> </tr> <tr> <td class="row1" colspan="2" align="center"><span class="gensmall"><font color="red">{L_MXP_ADMIN}</font></span></td></td> </tr> <tr> <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="BACKEND" type="submit" value="{L_SUBMIT}" /></td> </tr> </table></div></td></tr> <tr><td colspan="2"><div id="mxbb" style="display:none;" class="genmed"><table width="100%" cellpadding="2" cellspacing="1" border="0"> <tr> <th colspan="2">{L_DATABASE_CONFIGURATION}</th> </tr> <!--tr> <td class="row1" align="right" width="50%"><span class="gen">{L_DBMS}: </span></td> <td class="row2"><select name="dbms_mxbb">{DBMS_SELECT}</select></td> </tr--> <tr> <td class="row1" align="right" width="50%"><span class="gen">{L_DBMS}: </span></td> <td class="row2">{S_DBMS_TYPE}</td> </tr> <tr> <td class="row1" align="right"><span class="gen"><b>{L_MX_DB_PREFIX}: </b></span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="mx_prefix" value="{MX_DB_PREFIX}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_CHARACTER_SET}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="dbcharacter_set_mxbb" value="{DB_CHARACTER_SET}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_HOST}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="dbhost_mxbb" value="{DB_HOST}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_NAME}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="dbname_mxbb" value="{DB_NAME}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_USER}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="dbuser_mxbb" value="{DB_USER}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_PASSWORD}: </span></td> <td class="row2"><input type="password" name="dbpasswd_mxbb" value="{DB_PASSWD}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_MXP_ADMINNAME}: </span></td> <td class="row2"><input class="inputbox autowidth" type="text" name="admin_name_mxbb" value="" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD}: </span></td> <td class="row2"><input class="inputbox autowidth" type="password" name="admin_pass1_mxbb" value="" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD2}: </span></td> <td class="row2"><input class="inputbox autowidth" type="password" name="admin_pass2_mxbb" value="" /></td> </tr> <tr> <td class="row1" colspan="2" align="center"><span class="gensmall"><font color="red">{L_MXP_ADMIN}</font></span></td></td> </tr> <tr> <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="mxbb" type="submit" value="{L_SUBMIT}" /></td> </tr> </table></div></td></tr> </table> </form> --- NEW FILE: mx_install_header.php --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Style-Type" content="text/css" /> <meta name="robots" content="noindex" /> <title>{L_INSTALLATION}</title> <link rel="stylesheet" type="text/css" href="{BACKEND_URL}Themes/default/css/index.css?fin20" /> <link rel="stylesheet" type="text/css" href="{BACKEND_URL}Themes/default/css/install.css?fin20" /> <script type="text/javascript" src="{BACKEND_URL}Themes/default/scripts/script.js"></script> <style type="text/css"> <!-- /* The original subSilver Theme for phpBB version 2+ Created by subBlue design http://www.subBlue.com */ /* General page style. The scroll bar colours only visible in IE5.5+ */ body { background-color: #E5E5E5; scrollbar-face-color: #DEE3E7; scrollbar-highlight-color: #FFFFFF; scrollbar-shadow-color: #DEE3E7; scrollbar-3dlight-color: #D1D7DC; scrollbar-arrow-color: #006699; scrollbar-track-color: #EFEFEF; scrollbar-darkshadow-color: #98AAB1; } /* General font families for common tags */ font,th,td,p { font-family: Verdana, Arial, Helvetica, sans-serif } a:link,a:active,a:visited { color : #006699; } a:hover { text-decoration: underline; color : #DD6900; } hr { height: 0px; border: solid #D1D7DC 0px; border-top-width: 1px;} /* This is the border line & background colour round the entire page */ .bodyline { background-color: #FFFFFF; border: 1px #98AAB1 solid; } /* This is the outline round the main forum tables */ .forumline { background-color: #FFFFFF; border: 2px #006699 solid; } /* Main table cell colours and backgrounds */ td.row1 { background-color: #EFEFEF; } td.row2 { background-color: #DEE3E7; } td.row3 { background-color: #D1D7DC; } /* This is for the table cell above the Topics, Post & Last posts on the index.php page By default this is the fading out gradiated silver background. However, you could replace this with a bitmap specific for each forum */ td.rowpic { background-color: #FFFFFF; background-image: url({U_INSTALL_URL}images/cellpic2.jpg); background-repeat: repeat-y; } /* Header cells - the blue and silver gradient backgrounds */ th { color: #FFA34F; font-size: 11px; font-weight : bold; background-color: #006699; height: 25px; background-image: url({U_INSTALL_URL}images/cellpic3.gif); } td.cat,td.catHead,td.catSides,td.catLeft,td.catRight,td.catBottom { background-image: url({U_INSTALL_URL}images/cellpic1.gif); background-color:#D1D7DC; border: #FFFFFF; border-style: solid; height: 28px; } /* Setting additional nice inner borders for the main table cells. The names indicate which sides the border will be on. Don't worry if you don't understand this, just ignore it :-) */ td.cat,td.catHead,td.catBottom { height: 29px; border-width: 0px 0px 0px 0px; } th.thHead,th.thSides,th.thTop,th.thLeft,th.thRight,th.thBottom,th.thCornerL,th.thCornerR { font-weight: bold; border: #FFFFFF; border-style: solid; height: 28px; } td.row3Right,td.spaceRow { background-color: #D1D7DC; border: #FFFFFF; border-style: solid; } th.thHead,td.catHead { font-size: 12px; border-width: 1px 1px 0px 1px; } th.thSides,td.catSides,td.spaceRow { border-width: 0px 1px 0px 1px; } th.thRight,td.catRight,td.row3Right { border-width: 0px 1px 0px 0px; } th.thLeft,td.catLeft { border-width: 0px 0px 0px 1px; } th.thBottom,td.catBottom { border-width: 0px 1px 1px 1px; } th.thTop { border-width: 1px 0px 0px 0px; } th.thCornerL { border-width: 1px 0px 0px 1px; } th.thCornerR { border-width: 1px 1px 0px 0px; } /* The largest text used in the index page title and toptic title etc. */ .maintitle,h1,h2 { font-weight: bold; font-size: 22px; font-family: "Trebuchet MS",Verdana, Arial, Helvetica, sans-serif; text-decoration: none; line-height : 120%; color : #000000; } /* General text */ .gen { font-size : 12px; } .genmed { font-size : 11px; } .gensmall { font-size : 10px; } .gen,.genmed,.gensmall { color : #000000; } a.gen,a.genmed,a.gensmall { color: #006699; text-decoration: none; } a.gen:hover,a.genmed:hover,a.gensmall:hover { color: #DD6900; text-decoration: underline; } /* The register, login, search etc links at the top of the page */ .mainmenu { font-size : 11px; color : #000000 } a.mainmenu { text-decoration: none; color : #006699; } a.mainmenu:hover{ text-decoration: underline; color : #DD6900; } /* Forum category titles */ .cattitle { font-weight: bold; font-size: 12px ; letter-spacing: 1px; color : #006699} a.cattitle { text-decoration: none; color : #006699; } a.cattitle:hover{ text-decoration: underline; } /* Forum title: Text and link to the forums used in: index.php */ .forumlink { font-weight: bold; font-size: 12px; color : #006699; } a.forumlink { text-decoration: none; color : #006699; } a.forumlink:hover{ text-decoration: underline; color : #DD6900; } /* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */ .nav { font-weight: bold; font-size: 11px; color : #000000;} a.nav { text-decoration: none; color : #006699; } a.nav:hover { text-decoration: underline; } /* titles for the topics: could specify viewed link colour too */ .topictitle { font-weight: bold; font-size: 11px; color : #000000; } a.topictitle:link { text-decoration: none; color : #006699; } a.topictitle:visited { text-decoration: none; color : #5493B4; } a.topictitle:hover { text-decoration: underline; color : #DD6900; } /* Name of poster in viewmsg.php and viewtopic.php and other places */ .name { font-size : 11px; color : #000000;} /* Location, number of posts, post date etc */ .postdetails { font-size : 10px; color : #000000; } /* The content of the posts (body of text) */ .postbody { font-size : 12px;} a.postlink:link { text-decoration: none; color : #006699 } a.postlink:visited { text-decoration: none; color : #5493B4; } a.postlink:hover { text-decoration: underline; color : #DD6900} /* Quote & Code blocks */ .code { font-family: Courier, 'Courier New', sans-serif; font-size: 11px; color: #006600; background-color: #FAFAFA; border: #D1D7DC; border-style: solid; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px } .quote { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #444444; line-height: 125%; background-color: #FAFAFA; border: #D1D7DC; border-style: solid; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px } /* Copyright and bottom info */ .copyright { font-size: 10px; font-family: Verdana, Arial, Helvetica, sans-serif; color: #444444; letter-spacing: -1px;} a.copyright { color: #444444; text-decoration: none;} a.copyright:hover { color: #000000; text-decoration: underline;} /* Form elements */ input,textarea, select { color : #000000; font: normal 11px Verdana, Arial, Helvetica, sans-serif; border-color : #000000; } /* The text input fields background colour */ input.post, textarea.post, select { background-color : #FFFFFF; } input { text-indent : 2px; } /* The buttons used for bbCode styling in message post */ input.button { background-color : #EFEFEF; color : #000000; font-size: 11px; font-family: Verdana, Arial, Helvetica, sans-serif; } /* The main submit button option */ input.mainoption { background-color : #FAFAFA; font-weight : bold; } /* None-bold submit button */ input.liteoption { background-color : #FAFAFA; font-weight : normal; } /* None-bold submit button */ input.info { background-color : #FAFAFA; font-weight : normal; font-size: 11px; font-family: Verdana, Arial, Helvetica, sans-serif; border: solid red 2px; height: 30px; padding: 5px; } /* This is the line in the posting page which shows the rollover help line. This is actually a text box, but if set to be the same colour as the background no one will know ;) */ .helpline { background-color: #DEE3E7; border-style: none; } --> </style> <script language="javascript1.2" type="text/javascript"><!-- // Import the fancy styles for IE only (NS4.x doesn't use the @import function) if( document.all ) { document.write('<sty'+'le type="text/css">\n'+ 'body {\n'+ ' scrollbar-face-color: #DEE3E7;\n'+ ' scrollbar-highlight-color: #FFFFFF;\n'+ ' scrollbar-shadow-color: #DEE3E7;\n'+ ' scrollbar-3dlight-color: #D1D7DC;\n'+ ' scrollbar-arrow-color: #006699;\n'+ ' scrollbar-track-color: #EFEFEF;\n'+ ' scrollbar-darkshadow-color: #98AAB1;\n'+ '}\n'+ 'input, textarea, select {\n'+ ' border-top-width : 1px;\n'+ ' border-right-width : 1px;\n'+ ' border-bottom-width : 1px;\n'+ ' border-left-width : 1px;\n'+ '}\n'+ 'input { text-indent : 2px; }\n'+ 'input.button {\n'+ ' border-top-width : 1px;\n'+ ' border-right-width : 1px;\n'+ ' border-bottom-width : 1px;\n'+ ' border-left-width : 1px;\n'+ '}\n<'+'/'+'sty'+'le>'); } //--></script> </head> <body bgcolor="#E5E5E5" text="#000000" link="#006699" vlink="#5584AA"> <table width="100%" border="0" cellspacing="0" cellpadding="10" align="center"> <tr> <td class="bodyline" width="100%"> <table width="100%" border="0" cellspacing="0" cellpadding="4"> <tr> <td> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td><a href="http://mxpcms.sourceforge.net/" target="_blank"><img src="../templates/_core/images/logo.gif" border="0" alt="MX-Publisher" vspace="1" /></a></td> <td align="center" width="100%" valign="middle"><span class="maintitle">{L_INSTALLATION}</span></td> <td align="center" valign="top" nowrap><span class="gensmall">{L_PORTAL_NAME}<br />v. {L_PORTAL_VERSION}</span></td> </tr> </table> </td> </tr> <tr> <td> <table width="90%" border="0" align="center" cellspacing="0" cellpadding="0"> <tr> <td> <table border="0" align="center" cellspacing="0" cellpadding="0"> <tr> <td> <span class="gen">{L_INSTRUCTION_TEXT}</span> </td> </tr> </table> </td> </tr> </table> </td> </tr> <tr> <td width="100%" align="center"> |
|
From: Florin C B. <ory...@us...> - 2014-05-13 18:06:04
|
Update of /cvsroot/mxbb/core/install/templates In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27551 Modified Files: mx_install_body.tpl Log Message: fix Index: mx_install_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_body.tpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mx_install_body.tpl 13 May 2014 17:59:43 -0000 1.12 --- mx_install_body.tpl 13 May 2014 18:06:02 -0000 1.13 *************** *** 49,53 **** pathinfo[i] = []; pathinfo[i]['info'] = '{datarow.INFO}'; ! pathinfo[i]['portal_backend_path'] = '{datarow.BACKEND_PATH}'; pathinfo[i]['backend_url'] = '{datarow.BACKEND_URL}'; pathinfo[i]['portal_backend'] = '{datarow.PORTAL_BACKEND}'; //Display selected Backend --- 49,53 ---- pathinfo[i] = []; pathinfo[i]['info'] = '{datarow.INFO}'; ! pathinfo[i]['backend_path'] = '{datarow.BACKEND_PATH}'; pathinfo[i]['backend_url'] = '{datarow.BACKEND_URL}'; pathinfo[i]['portal_backend'] = '{datarow.PORTAL_BACKEND}'; //Display selected Backend *************** *** 66,70 **** pathinfo[i]['mx_prefix'] = '{datarow.MX_DB_PREFIX}'; //pathinfo[i]['acm_type'] = '{datarow.ACM_TYPE}'; ! pathinfo[i]['backend_root_path'] = '{datarow.BACKEND_ROOT}'; i++; <!-- END datarow --> --- 66,70 ---- pathinfo[i]['mx_prefix'] = '{datarow.MX_DB_PREFIX}'; //pathinfo[i]['acm_type'] = '{datarow.ACM_TYPE}'; ! //pathinfo[i]['backend_root'] = '{datarow.BACKEND_ROOT}'; i++; <!-- END datarow --> *************** *** 110,118 **** <td class="row2"><input class="inputbox autowidth" type="text" size="80" name="backend_url" value="{BACKEND_URL}" /></td> </tr> - <!-- BEGIN switch_readonly_mode --> <tr> <td class="row1" align="right"><span class="gen">{L_BACKEND_PATH}: </span></td> ! <td class="row2"><input type="text" size="80" name="portal_backend_path" value="{BACKEND_PATH}" {READONLY} /></td> ! </tr> <tr> <th colspan="2">{L_DATABASE_CONFIGURATION}{READ_ONLY}</th> --- 110,118 ---- <td class="row2"><input class="inputbox autowidth" type="text" size="80" name="backend_url" value="{BACKEND_URL}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_BACKEND_PATH}: </span></td> ! <td class="row2"><input type="text" size="80" name="backend_path" value="{BACKEND_PATH}" /></td> ! </tr> ! <!-- BEGIN switch_readonly_mode --> <tr> <th colspan="2">{L_DATABASE_CONFIGURATION}{READ_ONLY}</th> |
|
From: Florin C B. <ory...@us...> - 2014-05-13 17:59:45
|
Update of /cvsroot/mxbb/core/install/language/lang_english In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25972/language/lang_english Modified Files: lang_admin.php Log Message: some fixes to the internal BACKEND, plus some support for other backends compatible in the future versions Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/install/language/lang_english/lang_admin.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lang_admin.php 9 May 2014 07:53:01 -0000 1.6 --- lang_admin.php 13 May 2014 17:59:43 -0000 1.7 *************** *** 45,49 **** $lang['Portal_backend'] = 'Backend Name'; $lang['Session_backend'] = 'Users & Sessions'; ! $lang['Session_backend_explain'] = 'The MX-Publisher-IWizard has detected installed phpBB boards on this server. <br />Select here if you plan to use MX-Publisher with phpBB users and sessions. <br />If you are unsure (or if you want to install MX-Publisher without phpBB), select \'Internal\' setup. <br />You may update this setting later in the MX-Publisher adminCP'; $lang['Phpbb_path'] = 'phpBB relative path'; $lang['Phpbb_path_explain'] = 'Relative path to phpBB, ex. phpBB/ or ../phpBB/<br />Note the slashes "/", they are important!'; --- 45,49 ---- $lang['Portal_backend'] = 'Backend Name'; $lang['Session_backend'] = 'Users & Sessions'; ! $lang['Session_backend_explain'] = 'The MX-Publisher-IWizard has detected installed forum boards on this server. <br />Select here if you plan to use MX-Publisher with forums users and sessions. <br />If you are unsure (or if you want to install MX-Publisher without phpBB), select \'Internal\' setup. <br />You may update this setting later in the MX-Publisher adminCP'; $lang['Phpbb_path'] = 'phpBB relative path'; $lang['Phpbb_path_explain'] = 'Relative path to phpBB, ex. phpBB/ or ../phpBB/<br />Note the slashes "/", they are important!'; *************** *** 58,61 **** --- 58,63 ---- $lang['DB_Name'] = 'Your Database Name'; $lang['DB_Username'] = 'Database Username'; + $lang['DB_Character_Set'] = 'Database Character Set'; + $lang['DB_Character_Set_explain'] = 'Character Set ex. utf8'; $lang['MXP_Adminname'] = 'MXP Admin Username'; $lang['DB_Password'] = 'Database Password'; *************** *** 77,80 **** --- 79,90 ---- $lang['Install_phpbb_db_failed'] = 'Sorry, we could not connect to the phpBB database.<br />Please check that your phpBB is correctly installed and up and running BEFORE installing MX-Publisher.<br />\n<br />\n'; $lang['Install_phpbb_unsupported'] = 'Unfortunately, the phpBB board installed on this server is not supported by MX-Publisher.<br />Please check the release notes for installation requirements.<br />\n<br />\n'; + $lang['Install_smf_not_found'] = 'Sorry, we could not find any SMF board installed on this server.<br />Please install phpBB BEFORE installing MX-Publisher.<br />\n<br />\n'; + $lang['Install_smf_db_failed'] = 'Sorry, we could not connect to the SMF database.<br />Please check that your phpBB is correctly installed and up and running BEFORE installing MX-Publisher.<br />\n<br />\n'; + $lang['Install_smf_unsupported'] = 'Unfortunately, the phpBB board installed on this server is not supported by MX-Publisher.<br />Please check the release notes for installation requirements.<br />\n<br />\n'; + $lang['Install_mybb_not_found'] = 'Sorry, we could not find any myBB board installed on this server.<br />Please install myBB BEFORE installing MX-Publisher.<br />\n<br />\n'; + $lang['Install_mybb_db_failed'] = 'Sorry, we could not connect to the myBB database.<br />Please check that your myBB is correctly installed and up and running BEFORE installing MX-Publisher.<br />\n<br />\n'; + $lang['Install_mybb_unsupported'] = 'Unfortunately, the phpBB board installed on this server is not supported by MX-Publisher.<br />Please check the release notes for installation requirements.<br />\n<br />\n'; + $lang['Install_forums_not_found'] = 'Sorry, we could not find any forum board installed on this server.<br />Please install a forum suppported by this installer BEFORE installing MX-Publisher.<br />\n<br />\n'; + $lang['Install_forums_unsupported'] = 'Unfortunately, any forum board installed on this server is not supported by MX-Publisher.<br />Please check the release notes for installation requirements.<br />\n<br />\n'; $lang['Install_noscript_warning'] = 'Sorry, this installation requires a JavaScript enabled browser. It might not work on your browser.'; $lang['Upgrade_are_you_sure'] = 'This upgrade procedure will make modifications to your database. Are you sure you wish to proceed?'; |
|
From: Florin C B. <ory...@us...> - 2014-05-09 08:28:16
|
Update of /cvsroot/mxbb/core/install/templates In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4457/templates Modified Files: mx_install_body.html mx_install_body.tpl Log Message: Index: mx_install_body.html =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_body.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_install_body.html 9 May 2014 07:52:29 -0000 1.2 --- mx_install_body.html 9 May 2014 08:28:14 -0000 1.3 *************** *** 124,132 **** <tr> <td class="row1" align="right"><span class="gen">{L_DB_USER}: </span></td> ! <td class="row2"><input class="inputbox autowidth" type="text" name="dbuser" value="{DB_USER}"{READONLY} /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_PASSWORD}: </span></td> ! <td class="row2"><input type="password" name="dbpasswd" value="{DB_PASSWD}"{READONLY} /></td> </tr> <tr> --- 124,132 ---- <tr> <td class="row1" align="right"><span class="gen">{L_DB_USER}: </span></td> ! <td class="row2"><input class="inputbox autowidth" type="text" name="dbuser" value="{DB_USER}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_PASSWORD}: </span></td> ! <td class="row2"><input type="password" name="dbpasswd" value="{DB_PASSWD}" /></td> </tr> <tr> Index: mx_install_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_body.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mx_install_body.tpl 9 May 2014 07:52:29 -0000 1.10 --- mx_install_body.tpl 9 May 2014 08:28:14 -0000 1.11 *************** *** 125,133 **** <tr> <td class="row1" align="right"><span class="gen">{L_DB_USER}: </span></td> ! <td class="row2"><input type="text" name="dbuser" value="{DB_USER}"{READONLY} /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_PASSWORD}: </span></td> ! <td class="row2"><input type="password" name="dbpasswd" value="{DB_PASSWD}"{READONLY} /></td> </tr> <tr> --- 125,133 ---- <tr> <td class="row1" align="right"><span class="gen">{L_DB_USER}: </span></td> ! <td class="row2"><input type="text" name="dbuser" value="{DB_USER}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_DB_PASSWORD}: </span></td> ! <td class="row2"><input type="password" name="dbpasswd" value="{DB_PASSWD}" /></td> </tr> <tr> |
|
From: Florin C B. <ory...@us...> - 2014-05-09 07:58:38
|
Update of /cvsroot/mxbb/core/admin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1376 Modified Files: index.php page_header_admin.php Log Message: fix Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** page_header_admin.php 26 Aug 2013 23:09:35 -0000 1.35 --- page_header_admin.php 9 May 2014 07:58:36 -0000 1.36 *************** *** 57,61 **** } **********/ ! $template->set_filenames(array('header' => 'admin/page_header.'.$tplEx)); // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility $l_timezone = explode('.', $board_config['board_timezone']); --- 57,63 ---- } **********/ ! ! $template->set_filenames(array('header' => 'admin/page_header.tpl')); ! // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility $l_timezone = explode('.', $board_config['board_timezone']); *************** *** 64,71 **** $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); $template_config_row = $mx_user->_load_template_config(); - $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], //'PAGE_TITLE' => $page_title, 'L_ADMIN' => $lang['Admin'], 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), --- 66,73 ---- $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); $template_config_row = $mx_user->_load_template_config(); $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], //'PAGE_TITLE' => $page_title, + 'L_ADMIN' => $lang['Admin'], 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), *************** *** 128,143 **** 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'T_PHPBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : 'stylesheet.css', 'T_MXBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : $mx_user->template_name.'.css', 'T_GECKO_STYLESHEET' => 'gecko.css', ! 'MX_ICON_CSS' => $images['mx_graphics']['icon_style'], 'LOGO' => $images['mx_logo'], //- MX-Publisher ! // Backend 'PHPBB' => !(PORTAL_BACKEND === 'internal'), ! // Additional css for gecko browsers 'GECKO' => strstr($useragent, 'Gecko'), --- 130,145 ---- 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'T_PHPBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : 'stylesheet.css', 'T_MXBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : $mx_user->template_name.'.css', 'T_GECKO_STYLESHEET' => 'gecko.css', ! 'MX_ICON_CSS' => $images['mx_graphics']['icon_style'], 'LOGO' => $images['mx_logo'], //- MX-Publisher ! // Backend 'PHPBB' => !(PORTAL_BACKEND === 'internal'), ! // Additional css for gecko browsers 'GECKO' => strstr($useragent, 'Gecko'), *************** *** 154,159 **** header ('Cache-Control: private, pre-check=0, post-check=0, max-age=0'); } ! header('Expires: 0'); ! header('Pragma: no-cache'); $template->pparse('header'); --- 156,161 ---- header ('Cache-Control: private, pre-check=0, post-check=0, max-age=0'); } ! header ('Expires: 0'); ! header ('Pragma: no-cache'); $template->pparse('header'); Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** index.php 27 Aug 2013 07:01:24 -0000 1.68 --- index.php 9 May 2014 07:58:36 -0000 1.69 *************** *** 84,90 **** // ------------- ! /* ! * Generate relevant output ! */ if ($mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'left' ) { --- 84,90 ---- // ------------- ! // ! // Generate relevant output ! // if ($mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'left' ) { *************** *** 103,109 **** "L_PORTAL_INDEX" => $lang['Portal_index'], "L_PREVIEW_PORTAL" => $lang['Preview_portal'], ! "LOGO" => $images['mx_logo'], ! "U_FORUM_INDEX" => mx_append_sid(PHPBB_URL . "index.$phpEx"), "U_ADMIN_INDEX" => mx_append_sid("index.$phpEx?pane=right"), --- 103,109 ---- "L_PORTAL_INDEX" => $lang['Portal_index'], "L_PREVIEW_PORTAL" => $lang['Preview_portal'], ! "LOGO" => $images['mx_logo'], ! "U_FORUM_INDEX" => mx_append_sid(PHPBB_URL . "index.$phpEx"), "U_ADMIN_INDEX" => mx_append_sid("index.$phpEx?pane=right"), *************** *** 117,121 **** //-MOD: DHTML Menu for ACP "L_FORUM_INDEX" => $lang['Main_index'], ! "L_ADMIN_INDEX" => $lang['Admin_Index'] )); --- 117,121 ---- //-MOD: DHTML Menu for ACP "L_FORUM_INDEX" => $lang['Main_index'], ! "L_ADMIN_INDEX" => $lang['Admin_Index'], )); *************** *** 317,323 **** $mx_backend->load_forum_stats(); ! /* ! * Get users online information. ! */ $sql = $mx_backend->generate_session_online_sql(); --- 317,323 ---- $mx_backend->load_forum_stats(); ! // ! // Get users online information. ! // $sql = $mx_backend->generate_session_online_sql(); *************** *** 341,348 **** $reg_userid_ary = array(); ! if( count($onlinerow_reg) ) { $registered_users = 0; ! for($i = 0; $i < count($onlinerow_reg); $i++) { --- 341,351 ---- $reg_userid_ary = array(); ! if(count($onlinerow_reg)) { $registered_users = 0; ! //-MOD: ViewOnline extension for mxBB Portal Pages ! $location = $lang['Forum_index']; ! $location_url = "index.$phpEx?pane=right"; ! for($i = 0; $i < count($onlinerow_reg); $i++) { *************** *** 353,368 **** $username = $onlinerow_reg[$i]['username']; ! if( $onlinerow_reg[$i]['user_allow_viewonline'] || $userdata['user_level'] == ADMIN ) { $registered_users++; ! $hidden = false; } else { $hidden_users++; ! $hidden = true; } ! ! if($onlinerow_reg[$i]['user_session_page'] < 1) { switch($onlinerow_reg[$i]['user_session_page']) --- 356,371 ---- $username = $onlinerow_reg[$i]['username']; ! if( isset($onlinerow_reg[$i]['user_allow_viewonline']) || $userdata['user_level'] == ADMIN ) { $registered_users++; ! $hidden = FALSE; } else { $hidden_users++; ! $hidden = TRUE; } ! ! if( $onlinerow_reg[$i]['user_session_page'] < 1 ) { switch($onlinerow_reg[$i]['user_session_page']) *************** *** 416,420 **** "FORUM_LOCATION" => $location, "IP_ADDRESS" => $reg_ip, ! "U_WHOIS_IP" => $whois_url . $reg_ip, "U_USER_PROFILE" => mx_append_sid(PHPBB_URL . "admin_users.$phpEx?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']), --- 419,423 ---- "FORUM_LOCATION" => $location, "IP_ADDRESS" => $reg_ip, ! "U_WHOIS_IP" => $whois_url . $reg_ip, "U_USER_PROFILE" => mx_append_sid(PHPBB_URL . "admin_users.$phpEx?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']), *************** *** 431,449 **** } ! /* ! * Guest users ! */ ! if( count($onlinerow_guest)) { $guest_users = 0; ! for($i = 0; $i < count($onlinerow_guest); $i++) { $guest_userip_ary[] = $onlinerow_guest[$i]['session_ip']; $guest_users++; ! if( $onlinerow_guest[$i]['session_page'] < 1 ) { ! switch( $onlinerow_guest[$i]['session_page']) { case PAGE_INDEX: --- 434,452 ---- } ! // ! // Guest users ! // ! if( count($onlinerow_guest) ) { $guest_users = 0; ! for($i = 0; $i < count($onlinerow_guest); $i++) { $guest_userip_ary[] = $onlinerow_guest[$i]['session_ip']; $guest_users++; ! if( $onlinerow_guest[$i]['session_page'] < 1 ) { ! switch( $onlinerow_guest[$i]['session_page'] ) { case PAGE_INDEX: *************** *** 473,481 **** } ! $row_color = ($guest_users % 2) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2']; ! $row_class = ($guest_users % 2) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2']; ! $guest_ip = $mx_backend->decode_ip($onlinerow_guest[$i]['session_ip']); ! $template->assign_block_vars("guest_user_row", array( "ROW_COLOR" => "#" . $row_color, --- 476,485 ---- } ! ! $row_color = ( $guest_users % 2 ) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2']; ! $row_class = ( $guest_users % 2 ) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2']; ! $guest_ip = $mx_backend->decode_ip($onlinerow_guest[$i]['session_ip']); ! $template->assign_block_vars("guest_user_row", array( "ROW_COLOR" => "#" . $row_color, *************** *** 486,490 **** "FORUM_LOCATION" => $location, "IP_ADDRESS" => $guest_ip, ! "U_WHOIS_IP" => $whois_url . $guest_ip, "U_FORUM_LOCATION" => mx_append_sid($location_url)) --- 490,494 ---- "FORUM_LOCATION" => $location, "IP_ADDRESS" => $guest_ip, ! "U_WHOIS_IP" => $whois_url . $guest_ip, "U_FORUM_LOCATION" => mx_append_sid($location_url)) *************** *** 527,531 **** @fputs($fsock, "HOST: mxpcms.sourceforge.net\r\n"); @fputs($fsock, "Connection: close\r\n\r\n"); ! $get_info = false; while (!feof($fsock)) --- 531,535 ---- @fputs($fsock, "HOST: mxpcms.sourceforge.net\r\n"); @fputs($fsock, "Connection: close\r\n\r\n"); ! $get_info = false; while (!feof($fsock)) *************** *** 544,555 **** } fclose($fsock); ! $mx_version_info = explode("\n", $mx_version_info); $latest_mx_head_revision = (int) $mx_version_info[0]; $latest_mx_minor_revision = (int) $mx_version_info[2]; $latest_mx_patch_revision = (int) $mx_version_info[3]; // For betas/RC ! $latest_mx_version = (int) $mx_version_info[0] . '.' . (int) $mx_version_info[1] . '.' . (int) $mx_version_info[2]; ! if ($latest_mx_head_revision == 3 && $minor_mx_revision == $latest_mx_minor_revision) { --- 548,559 ---- } fclose($fsock); ! $mx_version_info = explode("\n", $mx_version_info); $latest_mx_head_revision = (int) $mx_version_info[0]; $latest_mx_minor_revision = (int) $mx_version_info[2]; $latest_mx_patch_revision = (int) $mx_version_info[3]; // For betas/RC ! $latest_mx_version = (int) $mx_version_info[0] . '.' . (int) $mx_version_info[1] . '.' . (int) $mx_version_info[2]; ! if ($latest_mx_head_revision == 3 && $minor_mx_revision == $latest_mx_minor_revision) { *************** *** 573,579 **** } } ! $mx_version_info .= '<p>' . $lang['MXP_Mailing_list_subscribe_reminder'] . '</p>'; ! $template->assign_vars(array( 'MXBB_VERSION_INFO' => $mx_version_info, --- 577,583 ---- } } ! $mx_version_info .= '<p>' . $lang['MXP_Mailing_list_subscribe_reminder'] . '</p>'; ! $template->assign_vars(array( 'MXBB_VERSION_INFO' => $mx_version_info, *************** *** 581,600 **** 'L_VERSION_INFORMATION' => $lang['Version_information']) ); ! $template->pparse("body"); ! include('./page_footer_admin.'.$phpEx); } else { ! /* ! * Generate frameset ! */ $template->set_filenames(array( "body" => "admin/index_frameset.".$tplEx) ); ! ! $template->assign_vars(array( ! "L_ADMIN_TITLE" => $lang['Mx-Publisher_adminCP'], "S_FRAME_NAV" => mx_append_sid("index.$phpEx?pane=left"), "S_FRAME_MAIN" => mx_append_sid("index.$phpEx?pane=right")) --- 585,604 ---- 'L_VERSION_INFORMATION' => $lang['Version_information']) ); ! $template->pparse("body"); ! include('./page_footer_admin.'.$phpEx); } else { ! // ! // Generate frameset ! // $template->set_filenames(array( "body" => "admin/index_frameset.".$tplEx) ); ! ! $template->assign_vars(array( ! 'ADMIN_TITLE' => $lang['Mx-Publisher_adminCP'], "S_FRAME_NAV" => mx_append_sid("index.$phpEx?pane=left"), "S_FRAME_MAIN" => mx_append_sid("index.$phpEx?pane=right")) |
|
From: Florin C B. <ory...@us...> - 2014-05-09 07:53:23
|
Update of /cvsroot/mxbb/core/templates/mxBase1 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv638 Modified Files: mxBase1.cfg Log Message: some fixes to the internal BACKEND, plus some support for other backends compatible in the future versions Index: mxBase1.cfg =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase1/mxBase1.cfg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mxBase1.cfg 27 Apr 2008 18:40:17 -0000 1.3 --- mxBase1.cfg 9 May 2014 07:53:21 -0000 1.4 *************** *** 19,26 **** $mx_template_settings['portal_backend'] = 'internal'; - // // Do not alter this line! ! // ! define(MX_TEMPLATE_CONFIG, true); $mx_template_config = true; --- 19,24 ---- $mx_template_settings['portal_backend'] = 'internal'; // Do not alter this line! ! //define(MX_TEMPLATE_CONFIG, true); $mx_template_config = true; |
|
From: Florin C B. <ory...@us...> - 2014-05-09 07:53:13
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv623 Modified Files: mx_menu_nav.php Log Message: some fixes to the internal BACKEND, plus some support for other backends compatible in the future versions Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** mx_menu_nav.php 2 Jun 2013 12:56:34 -0000 1.38 --- mx_menu_nav.php 9 May 2014 07:53:11 -0000 1.39 *************** *** 67,73 **** define($nav_def_key, true); ! // ! // Get the current MX page. ! // $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, ''); --- 67,73 ---- define($nav_def_key, true); ! /* ! * Get the current MX page. ! **/ $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, ''); *************** *** 129,135 **** $template->set_filenames($template_tmp); ! // ! // Get menu data ! // if ( $mx_cache->_exists( '_menu_' . $block_id ) ) { --- 129,135 ---- $template->set_filenames($template_tmp); ! /* ! * Get menu data ! **/ if ( $mx_cache->_exists( '_menu_' . $block_id ) ) { *************** *** 191,197 **** $hasCurrentMenu = $catData[$key]['is_current']; } - } ! if(!$menuIsCat) { --- 191,196 ---- $hasCurrentMenu = $catData[$key]['is_current']; } } ! if(!$menuIsCat) { *************** *** 205,209 **** if ($bbcode_bitfield !== '') { ! $mx_bbcode = new mx_bbcode(base64_encode($bbcode_bitfield)); } //$depth = 0; --- 204,222 ---- if ($bbcode_bitfield !== '') { ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! case 'smf2': ! case 'mybb': ! $mx_bbcode = new mx_bbcode(); ! break; ! case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': ! $mx_bbcode = new mx_bbcode(base64_encode($bbcode_bitfield)); ! break; ! } } //$depth = 0; |
|
From: Florin C B. <ory...@us...> - 2014-05-09 07:53:04
|
Update of /cvsroot/mxbb/core/install/language/lang_romanian In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv574/lang_romanian Modified Files: lang_admin.php Log Message: some fixes to the internal BACKEND, plus some support for other backends compatible in the future versions Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/install/language/lang_romanian/lang_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_admin.php 17 Jun 2013 22:46:01 -0000 1.3 --- lang_admin.php 9 May 2014 07:53:02 -0000 1.4 *************** *** 33,36 **** --- 33,38 ---- $lang['Install_Instruction_MXP_Admin'] = 'DacÄ MXP nume-admin Åi parola sunt lÄsate goale, administratorul dvs. de cont va fi creat: numele de utilizator (admin), parola (admin). ModificaÅ£i aceastÄ parolÄ URGENT!'; $lang['Install_Instruction_phpBB'] = 'VÄ rugÄm sÄ luaÅ£i seama, chiar dacÄ aveÅ£i de gând sÄ folosiÅ£i MX-Publisher cu phpBB, aceastÄ instalare nu vÄ modificÄ baza de date phpBB în nici un fel.'; + $lang['Install_Instruction_SMF'] = 'VÄ rugÄm sÄ luaÅ£i seama, chiar dacÄ aveÅ£i de gând sÄ folosiÅ£i MX-Publisher cu SMF, aceastÄ instalare nu vÄ modificÄ baza de date SMF în nici un fel.'; + $lang['Install_Instruction_MyBB'] = 'VÄ rugÄm sÄ luaÅ£i seama, chiar dacÄ aveÅ£i de gând sÄ folosiÅ£i MX-Publisher cu MyBB, aceastÄ instalare nu vÄ modificÄ baza de date MyBB în nici un fel.'; $lang['Upgrade_Instruction'] = 'MX-Publisher este deja instalat. Te rog fÄ backuri la baza ta de date acum !<br /><br />UrmÄtoarea etapÄ va modifica structura bazei de date (te rog noteazÄ cÄ MX-Publisher nu modificÄ baza de date a forumului phpBB în nici un fel). DacÄ totuÅi din oarecare motiv acestÄ procedurÄ de upgradare eÅuiazÄ, Nu ar exista nici o cale de întoarcere la statutul curect. Te rog fÄ backupuri ale bazei de date ÃNAINTE de a proceda !<br /><br />OdatÄ ce aceasta este gata, dÄ click pe butonul de jos pentru a începe procedura de upgradare.'; $lang['Install_moreinfo'] = '%sNote de Lansare%s | %sPachet Bun Venit%s | %sFAQ Online%s | %sForumuri de Suport%s | %sTermeni De Utilizare%s'; |
|
From: Florin C B. <ory...@us...> - 2014-05-09 07:52:32
|
Update of /cvsroot/mxbb/core/install/templates In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv507/templates Modified Files: mx_install_body.html mx_install_body.tpl Log Message: some fixes to the internal BACKEND, plus some support for other backends compatible in the future versions Index: mx_install_body.html =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_body.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_install_body.html 20 Jun 2013 17:09:13 -0000 1.1 --- mx_install_body.html 9 May 2014 07:52:29 -0000 1.2 *************** *** 12,28 **** } ! function check_phpbb_path() { ! if( document.forms['frmInstall'] && document.forms['frmInstall'].elements['select_phpbb_path'] ) { ! var i = document.forms['frmInstall'].elements['select_phpbb_path'].value; if (i == -1) { ! displayObj('phpbb', 'none'); displayObj('mxbb', 'block'); } else { ! displayObj('phpbb', 'block'); displayObj('mxbb', 'none'); } --- 12,28 ---- } ! function check_backend_path() { ! if( document.forms['frmInstall'] && document.forms['frmInstall'].elements['select_backend_path'] ) { ! var i = document.forms['frmInstall'].elements['select_backend_path'].value; if (i == -1) { ! displayObj('backend', 'none'); displayObj('mxbb', 'block'); } else { ! displayObj('backend', 'block'); displayObj('mxbb', 'none'); } *************** *** 39,44 **** pathinfo[i] = []; pathinfo[i]['info'] = '{datarow.INFO}'; ! pathinfo[i]['phpbb_path'] = '{datarow.PHPBB_PATH}'; ! //pathinfo[i]['phpbb_url'] = '{datarow.PHPBB_URL}'; pathinfo[i]['portal_backend'] = '{datarow.PORTAL_BACKEND}'; pathinfo[i]['portal_url'] = '{datarow.PORTAL_URL}'; --- 39,44 ---- pathinfo[i] = []; pathinfo[i]['info'] = '{datarow.INFO}'; ! pathinfo[i]['backend_path'] = '{datarow.BACKEND_PATH}'; ! pathinfo[i]['backend_url'] = '{datarow.BACKEND_URL}'; pathinfo[i]['portal_backend'] = '{datarow.PORTAL_BACKEND}'; pathinfo[i]['portal_url'] = '{datarow.PORTAL_URL}'; *************** *** 52,60 **** pathinfo[i]['prefix'] = '{datarow.DB_PREFIX}'; //pathinfo[i]['acm_type'] = '{datarow.ACM_TYPE}'; ! pathinfo[i]['phpbb_root_path'] = '{datarow.PHPBB_ROOT}'; i++; <!-- END datarow --> ! window.onload = check_phpbb_path; //--></script> <noscript> --- 52,60 ---- pathinfo[i]['prefix'] = '{datarow.DB_PREFIX}'; //pathinfo[i]['acm_type'] = '{datarow.ACM_TYPE}'; ! pathinfo[i]['backend_root_path'] = '{datarow.BACKEND_ROOT}'; i++; <!-- END datarow --> ! window.onload = check_backend_path; //--></script> <noscript> *************** *** 68,73 **** <!-- BEGIN switch_readonly_mode --> <tr> ! <td class="row1" align="right" width="50%"><span class="gen"><b>{L_Backend}: </b></span><br /><span class="gensmall">{L_Backend_explain}: </span></td> ! <td class="row2">{S_PHPBB_PATH}</td> </tr> <!-- END switch_readonly_mode --> --- 68,73 ---- <!-- BEGIN switch_readonly_mode --> <tr> ! <td class="row1" align="right" width="50%"><span class="gen"><b>{L_BACKEND}: </b></span><br /><span class="gensmall">{L_Backend_explain}: </span></td> ! <td class="row2">{S_BACKEND_PATH}</td> </tr> <!-- END switch_readonly_mode --> *************** *** 97,111 **** </tr> ! <tr><td colspan="2"><div id="phpbb" style="display:none;" class="genmed"><table width="100%" cellpadding="2" cellspacing="1" border="0"> - <!-- <tr> ! <td class="row1" align="right"><span class="gen">{L_PHPBB_URL}: </span></td> ! <td class="row2"><input class="inputbox autowidth" type="text" size="80" name="phpbb_url" value="{PHPBB_URL}"{READONLY} /></td> </tr> - --> <tr> ! <td class="row1" align="right"><span class="gen">{L_PHPBB_PATH}: </span></td> ! <td class="row2"><input class="inputbox autowidth" type="text" size="80" name="phpbb_path" value="{PHPBB_PATH}"{READONLY} /></td> </tr> <tr> --- 97,109 ---- </tr> ! <tr><td colspan="2"><div id="backend" style="display:none;" class="genmed"><table width="100%" cellpadding="2" cellspacing="1" border="0"> <tr> ! <td class="row1" align="right"><span class="gen">{L_BACKEND_URL}: </span></td> ! <td class="row2"><input class="inputbox autowidth" type="text" size="80" name="backend_url" value="{BACKEND_URL}"{READONLY} /></td> </tr> <tr> ! <td class="row1" align="right"><span class="gen">{L_BACKEND_PATH}: </span></td> ! <td class="row2"><input type="text" size="80" name="backend_path" value="{BACKEND_PATH}"{READONLY} /></td> </tr> <tr> *************** *** 152,156 **** </tr> <tr> ! <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="phpbb" type="submit" value="{L_SUBMIT}" /></td> </tr> --- 150,154 ---- </tr> <tr> ! <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="BACKEND" type="submit" value="{L_SUBMIT}" /></td> </tr> Index: mx_install_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_body.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_install_body.tpl 12 Sep 2008 06:27:37 -0000 1.9 --- mx_install_body.tpl 9 May 2014 07:52:29 -0000 1.10 *************** *** 12,23 **** } ! function check_phpbb_path() { ! if( document.forms['frmInstall'] && document.forms['frmInstall'].elements['select_phpbb_path'] ) { ! var i = document.forms['frmInstall'].elements['select_phpbb_path'].value; if (i == -1) { displayObj('phpbb', 'none'); displayObj('mxbb', 'block'); } --- 12,24 ---- } ! function check_backend_path() { ! if( document.forms['frmInstall'] && document.forms['frmInstall'].elements['select_backend_path'] ) { ! var i = document.forms['frmInstall'].elements['select_backend_path'].value; if (i == -1) { displayObj('phpbb', 'none'); + displayObj('smf', 'none'); displayObj('mxbb', 'block'); } *************** *** 25,28 **** --- 26,30 ---- { displayObj('phpbb', 'block'); + displayObj('smf', 'block'); displayObj('mxbb', 'none'); } *************** *** 39,47 **** pathinfo[i] = []; pathinfo[i]['info'] = '{datarow.INFO}'; ! pathinfo[i]['phpbb_path'] = '{datarow.PHPBB_PATH}'; ! //pathinfo[i]['phpbb_url'] = '{datarow.PHPBB_URL}'; pathinfo[i]['portal_backend'] = '{datarow.PORTAL_BACKEND}'; pathinfo[i]['portal_url'] = '{datarow.PORTAL_URL}'; pathinfo[i]['dbms'] = '{datarow.DBMS}'; pathinfo[i]['dbhost'] = '{datarow.DB_HOST}'; pathinfo[i]['dbhost_mxbb'] = '{datarow.DB_HOST}'; --- 41,50 ---- pathinfo[i] = []; pathinfo[i]['info'] = '{datarow.INFO}'; ! pathinfo[i]['backend_path'] = '{datarow.BACKEND_PATH}'; ! pathinfo[i]['backend_url'] = '{datarow.BACKEND_URL}'; pathinfo[i]['portal_backend'] = '{datarow.PORTAL_BACKEND}'; pathinfo[i]['portal_url'] = '{datarow.PORTAL_URL}'; pathinfo[i]['dbms'] = '{datarow.DBMS}'; + pathinfo[i]['dbms_mxbb'] = '{datarow.DBMS_SELECT}'; pathinfo[i]['dbhost'] = '{datarow.DB_HOST}'; pathinfo[i]['dbhost_mxbb'] = '{datarow.DB_HOST}'; *************** *** 51,60 **** pathinfo[i]['prefix'] = '{datarow.DB_PREFIX}'; //pathinfo[i]['acm_type'] = '{datarow.ACM_TYPE}'; ! pathinfo[i]['phpbb_root_path'] = '{datarow.PHPBB_ROOT}'; i++; <!-- END datarow --> ! window.onload = check_phpbb_path; ! //--></script><noscript> <div align="center" style="color:red;">{L_NOSCRIPT_WARNING}</div> </noscript> --- 54,64 ---- pathinfo[i]['prefix'] = '{datarow.DB_PREFIX}'; //pathinfo[i]['acm_type'] = '{datarow.ACM_TYPE}'; ! pathinfo[i]['backend_root_path'] = '{datarow.BACKEND_ROOT}'; i++; <!-- END datarow --> ! window.onload = check_backend_path; ! //--></script> ! <noscript> <div align="center" style="color:red;">{L_NOSCRIPT_WARNING}</div> </noscript> *************** *** 66,71 **** <!-- BEGIN switch_readonly_mode --> <tr> ! <td class="row1" align="right" width="50%"><span class="gen"><b>{L_Backend}: </b></span><br /><span class="gensmall">{L_Backend_explain}: </span></td> ! <td class="row2">{S_PHPBB_PATH}</td> </tr> <!-- END switch_readonly_mode --> --- 70,75 ---- <!-- BEGIN switch_readonly_mode --> <tr> ! <td class="row1" align="right" width="50%"><span class="gen"><b>{L_BACKEND}: </b></span><br /><span class="gensmall">{L_Backend_explain}: </span></td> ! <td class="row2">{S_BACKEND_PATH}</td> </tr> <!-- END switch_readonly_mode --> *************** *** 95,110 **** </tr> ! <tr><td colspan="2"><div id="phpbb" style="display:none;" class="genmed"><table width="100%" cellpadding="2" cellspacing="1" border="0"> ! ! <!-- <tr> ! <td class="row1" align="right"><span class="gen">{L_PHPBB_URL}: </span></td> ! <td class="row2"><input type="text" size="80" name="phpbb_url" value="{PHPBB_URL}"{READONLY} /></td> </tr> - --> <tr> ! <td class="row1" align="right"><span class="gen">{L_PHPBB_PATH}: </span></td> ! <td class="row2"><input type="text" size="80" name="phpbb_path" value="{PHPBB_PATH}"{READONLY} /></td> ! </tr> <tr> <th colspan="2">{L_DATABASE_CONFIGURATION}{READ_ONLY}</th> --- 99,111 ---- </tr> ! <tr><td colspan="2"><div id="backend" style="display:none;" class="genmed"><table width="100%" cellpadding="2" cellspacing="1" border="0"> <tr> ! <td class="row1" align="right"><span class="gen">{L_BACKEND_URL}: </span></td> ! <td class="row2"><input type="text" size="80" name="backend_url" value="{BACKEND_URL}"{READONLY} /></td> </tr> <tr> ! <td class="row1" align="right"><span class="gen">{L_BACKEND_PATH}: </span></td> ! <td class="row2"><input type="text" size="80" name="backend_path" value="{BACKEND_PATH}"{READONLY} /></td> ! </tr> <tr> <th colspan="2">{L_DATABASE_CONFIGURATION}{READ_ONLY}</th> *************** *** 150,154 **** </tr> <tr> ! <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="phpbb" type="submit" value="{L_SUBMIT}" /></td> </tr> --- 151,155 ---- </tr> <tr> ! <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="BACKEND" type="submit" value="{L_SUBMIT}" /></td> </tr> |
|
From: Florin C B. <ory...@us...> - 2014-05-09 07:52:21
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb2/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv485 Modified Files: emailer.php Log Message: some fixes to the internal BACKEND, plus some support for other backends compatible in the future versions Index: emailer.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/emailer.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** emailer.php 6 Jan 2010 19:40:39 -0000 1.6 --- emailer.php 9 May 2014 07:52:17 -0000 1.7 *************** *** 258,263 **** case 'internal': case 'phpbb3': ! if (!$board_config['board_email']) { --- 258,267 ---- case 'internal': + case 'smf2': + case 'mybb': case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': if (!$board_config['board_email']) { |
|
From: Florin C B. <ory...@us...> - 2014-05-09 07:52:06
|
Update of /cvsroot/mxbb/core/includes/sessions/internal In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32556/internal Modified Files: bbcode.php constants.php core.php session.php Log Message: some fixes to the internal BACKEND, plus some support for other backends compatible in the future versions Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/core.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** core.php 28 Jun 2013 15:33:47 -0000 1.17 --- core.php 9 May 2014 07:52:03 -0000 1.18 *************** *** 35,41 **** class mx_backend { - // // XS Template - use backend db settings - // var $edit_db = false; --- 35,39 ---- *************** *** 52,65 **** global $table_prefix, $phpEx, $tplEx; - // // Define relative path to "phpBB", and validate - // $phpbb_root_path = $mx_root_path . 'includes/shared/phpbb2/'; str_replace("//", "/", $phpbb_root_path); $portal_backend_valid_file = @file_exists($phpbb_root_path . "includes/functions.$phpEx"); - // // Define backend template extension - // $tplEx = 'tpl'; --- 50,59 ---- *************** *** 94,101 **** define('PHPBB_URL', $server_url_phpbb); ! // ! // Now sync Configs ! // In phpBB mode, we rely on native phpBB configs, thus we need to sync mxp and phpbb settings ! // $this->sync_configs(); } --- 88,95 ---- define('PHPBB_URL', $server_url_phpbb); ! /* ! * Now sync Configs ! * In phpBB mode, we rely on native phpBB configs, thus we need to sync mxp and phpbb settings ! */ $this->sync_configs(); } *************** *** 226,234 **** case 'internal': case 'phpbb2': $path = $mx_root_path . 'includes/shared/phpbb2/includes/'; ! break; case 'phpbb3': $path = $mx_root_path . 'includes/shared/phpbb3/includes/'; ! break; } return $path; --- 220,235 ---- case 'internal': case 'phpbb2': + case 'smf2': + case 'mybb': $path = $mx_root_path . 'includes/shared/phpbb2/includes/'; ! break; case 'phpbb3': + case 'olympus': + case 'ascraeus': $path = $mx_root_path . 'includes/shared/phpbb3/includes/'; ! break; ! case 'rhea': ! $path = $mx_root_path . 'includes/shared/phpbb3/includes/'; ! break; } return $path; *************** *** 299,310 **** $s_last_visit = ( $userdata['session_logged_in'] ) ? phpBB2::create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : ''; ! ! // // Obtain number of new private messages // if user is logged in - // if ( ($userdata['session_logged_in']) && (empty($gen_simple_header)) ) { ! if ( $userdata['user_new_privmsg'] ) { $l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms']; --- 300,309 ---- $s_last_visit = ( $userdata['session_logged_in'] ) ? phpBB2::create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : ''; ! // Obtain number of new private messages // if user is logged in if ( ($userdata['session_logged_in']) && (empty($gen_simple_header)) ) { ! if (isset($userdata['user_new_privmsg'])) { $l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms']; *************** *** 340,344 **** } ! if ( $userdata['user_unread_privmsg'] ) { $l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms']; --- 339,343 ---- } ! if (isset($userdata['user_unread_privmsg'])) { $l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms']; Index: constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/constants.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** constants.php 28 Jun 2013 15:33:47 -0000 1.4 --- constants.php 9 May 2014 07:52:03 -0000 1.5 *************** *** 16,158 **** // Debug Level ! //define('DEBUG', 1); // Debugging on ! define('DEBUG', 0); // Debugging off // User Levels <- Do not change the values of USER or ADMIN ! define('DELETED', -1); ! define('ANONYMOUS', -1); ! define('USER', 0); ! define('ADMIN', 1); ! define('MOD', 2); // User related ! define('USER_ACTIVATION_NONE', 0); ! define('USER_ACTIVATION_SELF', 1); ! define('USER_ACTIVATION_ADMIN', 2); ! define('USER_AVATAR_NONE', 0); ! define('USER_AVATAR_UPLOAD', 1); ! define('USER_AVATAR_REMOTE', 2); ! define('USER_AVATAR_GALLERY', 3); // Group settings ! define('GROUP_OPEN', 0); ! define('GROUP_CLOSED', 1); ! define('GROUP_HIDDEN', 2); // Forum state ! define('FORUM_UNLOCKED', 0); ! define('FORUM_LOCKED', 1); // Topic status ! define('TOPIC_UNLOCKED', 0); ! define('TOPIC_LOCKED', 1); ! define('TOPIC_MOVED', 2); ! define('TOPIC_WATCH_NOTIFIED', 1); ! define('TOPIC_WATCH_UN_NOTIFIED', 0); // Topic types ! define('POST_NORMAL', 0); ! define('POST_STICKY', 1); ! define('POST_ANNOUNCE', 2); ! define('POST_GLOBAL_ANNOUNCE', 3); // SQL codes ! define('BEGIN_TRANSACTION', 1); ! define('END_TRANSACTION', 2); // Error codes ! define('GENERAL_MESSAGE', 200); ! define('GENERAL_ERROR', 202); ! define('CRITICAL_MESSAGE', 203); ! define('CRITICAL_ERROR', 204); // Private messaging ! define('PRIVMSGS_READ_MAIL', 0); ! define('PRIVMSGS_NEW_MAIL', 1); ! define('PRIVMSGS_SENT_MAIL', 2); ! define('PRIVMSGS_SAVED_IN_MAIL', 3); ! define('PRIVMSGS_SAVED_OUT_MAIL', 4); ! define('PRIVMSGS_UNREAD_MAIL', 5); // URL PARAMETERS ! define('POST_TOPIC_URL', 't'); ! define('POST_CAT_URL', 'c'); ! define('POST_FORUM_URL', 'f'); ! define('POST_USERS_URL', 'u'); ! define('POST_POST_URL', 'p'); ! define('POST_GROUPS_URL', 'g'); // Session parameters ! define('SESSION_METHOD_COOKIE', 100); ! define('SESSION_METHOD_GET', 101); // Page numbers for session handling ! define('PAGE_INDEX', 0); ! define('PAGE_LOGIN', -1); ! define('PAGE_SEARCH', -2); ! define('PAGE_REGISTER', -3); ! define('PAGE_PROFILE', -4); ! define('PAGE_VIEWONLINE', -6); ! define('PAGE_VIEWMEMBERS', -7); ! define('PAGE_FAQ', -8); ! define('PAGE_POSTING', -9); ! define('PAGE_PRIVMSGS', -10); ! define('PAGE_GROUPCP', -11); ! define('PAGE_TOPIC_OFFSET', 5000); // Auth settings ! define('AUTH_LIST_ALL', 0); ! define('AUTH_ALL', 0); ! define('AUTH_REG', 1); ! define('AUTH_ACL', 2); ! define('AUTH_MOD', 3); ! define('AUTH_ADMIN', 5); ! define('AUTH_VIEW', 1); ! define('AUTH_READ', 2); ! define('AUTH_POST', 3); ! define('AUTH_REPLY', 4); ! define('AUTH_EDIT', 5); ! define('AUTH_DELETE', 6); ! define('AUTH_ANNOUNCE', 7); ! define('AUTH_STICKY', 8); ! define('AUTH_POLLCREATE', 9); ! define('AUTH_VOTE', 10); ! define('AUTH_ATTACH', 11); // Table names ! //define('CONFIRM_TABLE', $table_prefix.'confirm'); ! //define('AUTH_ACCESS_TABLE', $table_prefix.'auth_access'); ! //define('BANLIST_TABLE', $table_prefix.'banlist'); ! //define('CATEGORIES_TABLE', $table_prefix.'categories'); ! //define('CONFIG_TABLE', $table_prefix.'config'); ! //define('DISALLOW_TABLE', $table_prefix.'disallow'); ! //define('FORUMS_TABLE', $table_prefix.'forums'); ! define('GROUPS_TABLE', $mx_table_prefix.'groups'); ! //define('POSTS_TABLE', $table_prefix.'posts'); ! //define('POSTS_TEXT_TABLE', $table_prefix.'posts_text'); ! //define('PRIVMSGS_TABLE', $table_prefix.'privmsgs'); ! //define('PRIVMSGS_TEXT_TABLE', $table_prefix.'privmsgs_text'); ! //define('PRIVMSGS_IGNORE_TABLE', $table_prefix.'privmsgs_ignore'); ! //define('PRUNE_TABLE', $table_prefix.'forum_prune'); ! //define('RANKS_TABLE', $table_prefix.'ranks'); ! //define('SEARCH_TABLE', $table_prefix.'search_results'); ! //define('SEARCH_WORD_TABLE', $table_prefix.'search_wordlist'); ! //define('SEARCH_MATCH_TABLE', $table_prefix.'search_wordmatch'); ! define('SESSIONS_TABLE', $mx_table_prefix.'sessions'); ! define('SESSIONS_KEYS_TABLE', $mx_table_prefix.'sessions_keys'); ! define('SMILIES_TABLE', $mx_table_prefix.'smilies'); ! //define('THEMES_TABLE', $table_prefix.'themes'); ! //define('THEMES_NAME_TABLE', $table_prefix.'themes_name'); ! //define('TOPICS_TABLE', $table_prefix.'topics'); ! //define('TOPICS_WATCH_TABLE', $table_prefix.'topics_watch'); ! define('USER_GROUP_TABLE', $mx_table_prefix.'user_group'); ! define('USERS_TABLE', $mx_table_prefix.'users'); ! define('WORDS_TABLE', $mx_table_prefix.'words'); ! //define('VOTE_DESC_TABLE', $table_prefix.'vote_desc'); ! //define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results'); ! //define('VOTE_USERS_TABLE', $table_prefix.'vote_voters'); ?> \ No newline at end of file --- 16,158 ---- // Debug Level ! //@define('DEBUG', 1); // Debugging on ! @define('DEBUG', 0); // Debugging off // User Levels <- Do not change the values of USER or ADMIN ! @define('DELETED', -1); ! @define('ANONYMOUS', -1); ! @define('USER', 0); ! @define('ADMIN', 1); ! @define('MOD', 2); // User related ! @define('USER_ACTIVATION_NONE', 0); ! @define('USER_ACTIVATION_SELF', 1); ! @define('USER_ACTIVATION_ADMIN', 2); ! @define('USER_AVATAR_NONE', 0); ! @define('USER_AVATAR_UPLOAD', 1); ! @define('USER_AVATAR_REMOTE', 2); ! @define('USER_AVATAR_GALLERY', 3); // Group settings ! @define('GROUP_OPEN', 0); ! @define('GROUP_CLOSED', 1); ! @define('GROUP_HIDDEN', 2); // Forum state ! @define('FORUM_UNLOCKED', 0); ! @define('FORUM_LOCKED', 1); // Topic status ! @define('TOPIC_UNLOCKED', 0); ! @define('TOPIC_LOCKED', 1); ! @define('TOPIC_MOVED', 2); ! @define('TOPIC_WATCH_NOTIFIED', 1); ! @define('TOPIC_WATCH_UN_NOTIFIED', 0); // Topic types ! @define('POST_NORMAL', 0); ! @define('POST_STICKY', 1); ! @define('POST_ANNOUNCE', 2); ! @define('POST_GLOBAL_ANNOUNCE', 3); // SQL codes ! @define('BEGIN_TRANSACTION', 1); ! @define('END_TRANSACTION', 2); // Error codes ! @define('GENERAL_MESSAGE', 200); ! @define('GENERAL_ERROR', 202); ! @define('CRITICAL_MESSAGE', 203); ! @define('CRITICAL_ERROR', 204); // Private messaging ! @define('PRIVMSGS_READ_MAIL', 0); ! @define('PRIVMSGS_NEW_MAIL', 1); ! @define('PRIVMSGS_SENT_MAIL', 2); ! @define('PRIVMSGS_SAVED_IN_MAIL', 3); ! @define('PRIVMSGS_SAVED_OUT_MAIL', 4); ! @define('PRIVMSGS_UNREAD_MAIL', 5); // URL PARAMETERS ! @define('POST_TOPIC_URL', 't'); ! @define('POST_CAT_URL', 'c'); ! @define('POST_FORUM_URL', 'f'); ! @define('POST_USERS_URL', 'u'); ! @define('POST_POST_URL', 'p'); ! @define('POST_GROUPS_URL', 'g'); // Session parameters ! @define('SESSION_METHOD_COOKIE', 100); ! @define('SESSION_METHOD_GET', 101); // Page numbers for session handling ! @define('PAGE_INDEX', 0); ! @define('PAGE_LOGIN', -1); ! @define('PAGE_SEARCH', -2); ! @define('PAGE_REGISTER', -3); ! @define('PAGE_PROFILE', -4); ! @define('PAGE_VIEWONLINE', -6); ! @define('PAGE_VIEWMEMBERS', -7); ! @define('PAGE_FAQ', -8); ! @define('PAGE_POSTING', -9); ! @define('PAGE_PRIVMSGS', -10); ! @define('PAGE_GROUPCP', -11); ! @define('PAGE_TOPIC_OFFSET', 5000); // Auth settings ! @define('AUTH_LIST_ALL', 0); ! @define('AUTH_ALL', 0); ! @define('AUTH_REG', 1); ! @define('AUTH_ACL', 2); ! @define('AUTH_MOD', 3); ! @define('AUTH_ADMIN', 5); ! @define('AUTH_VIEW', 1); ! @define('AUTH_READ', 2); ! @define('AUTH_POST', 3); ! @define('AUTH_REPLY', 4); ! @define('AUTH_EDIT', 5); ! @define('AUTH_DELETE', 6); ! @define('AUTH_ANNOUNCE', 7); ! @define('AUTH_STICKY', 8); ! @define('AUTH_POLLCREATE', 9); ! @define('AUTH_VOTE', 10); ! @define('AUTH_ATTACH', 11); // Table names ! //@define('CONFIRM_TABLE', $table_prefix.'confirm'); ! //@define('AUTH_ACCESS_TABLE', $table_prefix.'auth_access'); ! //@define('BANLIST_TABLE', $table_prefix.'banlist'); ! //@define('CATEGORIES_TABLE', $table_prefix.'categories'); ! //@define('CONFIG_TABLE', $table_prefix.'config'); ! //@define('DISALLOW_TABLE', $table_prefix.'disallow'); ! //@define('FORUMS_TABLE', $table_prefix.'forums'); ! @define('GROUPS_TABLE', $mx_table_prefix.'groups'); ! //@define('POSTS_TABLE', $table_prefix.'posts'); ! //@define('POSTS_TEXT_TABLE', $table_prefix.'posts_text'); ! //@define('PRIVMSGS_TABLE', $table_prefix.'privmsgs'); ! //@define('PRIVMSGS_TEXT_TABLE', $table_prefix.'privmsgs_text'); ! //@define('PRIVMSGS_IGNORE_TABLE', $table_prefix.'privmsgs_ignore'); ! //@define('PRUNE_TABLE', $table_prefix.'forum_prune'); ! //@define('RANKS_TABLE', $table_prefix.'ranks'); ! //@define('SEARCH_TABLE', $table_prefix.'search_results'); ! //@define('SEARCH_WORD_TABLE', $table_prefix.'search_wordlist'); ! //@define('SEARCH_MATCH_TABLE', $table_prefix.'search_wordmatch'); ! @define('SESSIONS_TABLE', $mx_table_prefix.'sessions'); ! @define('SESSIONS_KEYS_TABLE', $mx_table_prefix.'sessions_keys'); ! @define('SMILIES_TABLE', $mx_table_prefix.'smilies'); ! //@define('THEMES_TABLE', $table_prefix.'themes'); ! //@define('THEMES_NAME_TABLE', $table_prefix.'themes_name'); ! //@define('TOPICS_TABLE', $table_prefix.'topics'); ! //@define('TOPICS_WATCH_TABLE', $table_prefix.'topics_watch'); ! @define('USER_GROUP_TABLE', $mx_table_prefix.'user_group'); ! @define('USERS_TABLE', $mx_table_prefix.'users'); ! @define('WORDS_TABLE', $mx_table_prefix.'words'); ! //@define('VOTE_DESC_TABLE', $table_prefix.'vote_desc'); ! //@define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results'); ! //@define('VOTE_USERS_TABLE', $table_prefix.'vote_voters'); ?> \ No newline at end of file Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/session.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** session.php 28 Jun 2013 15:33:47 -0000 1.19 --- session.php 9 May 2014 07:52:03 -0000 1.20 *************** *** 56,71 **** global $portal_config; ! $this->data = $this->session_pagestart($this->user_ip, - ( MX_PORTAL_PAGES_OFFSET + $this->page_id )); - // // Simulate the user lang setting - // $this->data['user_lang'] = $portal_config['default_lang']; ! $this->data['user_dateformat'] = $portal_config['user_dateformat']; ! $this->data['user_timezone'] = $portal_config['user_timezone']; - // // Populate session_id - // $this->session_id = $this->data['session_id']; } --- 56,68 ---- global $portal_config; ! $this->data = $this->session_pagestart($this->user_ip, - (MX_PORTAL_PAGES_OFFSET + $this->page_id)); // Simulate the user lang setting $this->data['user_lang'] = $portal_config['default_lang']; ! $this->data['user_dateformat'] = $portal_config['default_dateformat']; ! $this->data['user_timezone'] = $portal_config['board_timezone']; ! $this->data['user_dst'] = 1; // Populate session_id $this->session_id = $this->data['session_id']; } *************** *** 94,98 **** { $sessiondata = array(); ! $session_id = $mx_request_vars->get('sid', mztnt); $sessionmethod = SESSION_METHOD_GET; } --- 91,95 ---- { $sessiondata = array(); ! $session_id = $mx_request_vars->get('sid', MX_TYPE_NO_TAGS); $sessionmethod = SESSION_METHOD_GET; } *************** *** 620,624 **** { global $db, $template, $board_config, $userdata, $phpbb_auth, $phpEx, $phpbb_root_path, $mx_root_path, $mx_cache; ! global $mx_request_vars, $portal_config; //added for mxp $lang_set = !$lang_set ? (defined('IN_ADMIN') ? 'lang_admin' : 'lang_main') : $lang_set; --- 617,621 ---- { global $db, $template, $board_config, $userdata, $phpbb_auth, $phpEx, $phpbb_root_path, $mx_root_path, $mx_cache; ! global $mx_request_vars, $portal_config, $shared_lang_path; //added for mxp $lang_set = !$lang_set ? (defined('IN_ADMIN') ? 'lang_admin' : 'lang_main') : $lang_set; *************** *** 628,632 **** $this->date_format = $board_config['default_dateformat']; ! $this->timezone = $board_config['user_timezone'] * 3600; $this->dst = $this->data['user_dst'] * 3600; --- 625,629 ---- $this->date_format = $board_config['default_dateformat']; ! $this->timezone = $board_config['board_timezone'] * 3600; $this->dst = $this->data['user_dst'] * 3600; Index: bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/bbcode.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bbcode.php 28 Jun 2013 15:33:47 -0000 1.3 --- bbcode.php 9 May 2014 07:52:03 -0000 1.4 *************** *** 15,22 **** } ! // // Now load some bbcodes, to be extended for this backend (see below) ! // ! include_once($mx_root_path . 'includes/mx_functions_bbcode.' . $phpEx); // BBCode associated functions /** --- 15,25 ---- } ! /* ! * Here comes a mxp version of original phpbb2 bbcode.php ! * Last in file are the mxp wrapper functions ! */ ! // Now load some bbcodes, to be extended for this backend (see below) ! require($mx_root_path . 'includes/mx_functions_bbcode.' . $phpEx); // BBCode associated functions /** *************** *** 43,47 **** --- 46,60 ---- var $template_bitfield; var $template_filename = ''; + + var $site_url = ''; + var $document_id = ''; + var $access_key = ''; + var $height = 0; + var $width = 0; + /** + * Constructor + * Init bbcode cache entries if bitfield is specified + */ function mx_bbcode($bitfield = '') { *************** *** 56,60 **** $this->smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed $this->smiley_root_path = $phpbb_root_path; //same here ! $this->smilies_path = str_replace("//", "/", $board_config['smilies_path']); } --- 69,73 ---- $this->smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed $this->smiley_root_path = $phpbb_root_path; //same here ! $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); //Added by OryNider $this->smilies_path = str_replace("//", "/", $board_config['smilies_path']); } |
Update of /cvsroot/mxbb/core/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32488/includes Modified Files: mx_functions_bbcode.php mx_functions_core.php mx_functions_emailer.php mx_functions_style.php mx_functions_tools.php page_header.php Log Message: some fixes to the internal BACKEND, plus some support for other backends compatible in the future versions Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** mx_functions_core.php 4 Jul 2013 00:26:48 -0000 1.139 --- mx_functions_core.php 9 May 2014 07:51:42 -0000 1.140 *************** *** 105,109 **** // Get MX-Publisher config settings $portal_config = $this->obtain_mxbb_config(); ! // Check some vars if (!$portal_config['portal_version']) --- 105,109 ---- // Get MX-Publisher config settings $portal_config = $this->obtain_mxbb_config(); ! //print_r($portal_config); // Check some vars if (!$portal_config['portal_version']) *************** *** 1907,1910 **** --- 1907,1912 ---- global $userdata, $lang; + $is_admin = ($userdata['user_level'] == ADMIN && $userdata['session_logged_in']) ? true : 0; + // Weird rewrite for php5 - anyone explaining why wins a medal ;) $temp_row = isset($this->block_config[$this->block_id]) ? $this->block_config[$this->block_id] : false; *************** *** 1924,1928 **** $this->auth_view = $this->_auth_ary['auth_view']; $this->auth_edit = $this->_auth_ary['auth_edit']; ! $this->auth_mod = $this->_auth_ary['auth_mod']; $this->block_time = $this->block_info['block_time']; --- 1926,1930 ---- $this->auth_view = $this->_auth_ary['auth_view']; $this->auth_edit = $this->_auth_ary['auth_edit']; ! $this->auth_mod = isset($this->_auth_ary['auth_mod']) ? $this->_auth_ary['auth_mod'] : $is_admin; $this->block_time = $this->block_info['block_time']; *************** *** 3592,3597 **** global $mx_block, $tplEx, $_GET; ! $this->info = $this->page_config[$this->page_id]['page_info']; ! /* * IP filter --- 3594,3601 ---- global $mx_block, $tplEx, $_GET; ! $this->info = &$this->page_config[$this->page_id]['page_info']; ! ! $is_admin = ($userdata['user_level'] == ADMIN && $userdata['session_logged_in']) ? true : 0; ! /* * IP filter *************** *** 3624,3633 **** $this->page_navigation_block = $this->info['page_navigation_block'] == 0 ? $portal_config['navigation_block'] : $this->info['page_navigation_block']; - // // Set the public view auth - // $this->_auth_ary = $this->auth(); $this->auth_view = $this->_auth_ary['auth_view']; ! $this->auth_mod = $this->_auth_ary['auth_mod']; $this->auth_ip = $mx_ip->auth($this->info['ip_filter']); --- 3628,3636 ---- $this->page_navigation_block = $this->info['page_navigation_block'] == 0 ? $portal_config['navigation_block'] : $this->info['page_navigation_block']; // Set the public view auth $this->_auth_ary = $this->auth(); $this->auth_view = $this->_auth_ary['auth_view']; ! //$this->auth_mod = $this->_auth_ary['auth_mod']; ! $this->auth_mod = isset($this->_auth_ary['auth_mod']) ? $this->_auth_ary['auth_mod'] : $is_admin; $this->auth_ip = $mx_ip->auth($this->info['ip_filter']); *************** *** 3635,3639 **** $this->total_column = count($this->columns); ! $this->blocks = $this->page_config[$this->page_id]['blocks']; $this->total_block = count($this->blocks); --- 3638,3642 ---- $this->total_column = count($this->columns); ! $this->blocks = &$this->page_config[$this->page_id]['blocks']; $this->total_block = count($this->blocks); *************** *** 3996,4000 **** public function auth($auth_data = '', $group_data = '', $moderator_data = '') { ! global $db, $lang, $userdata; $auth_label = array('auth_view'); --- 3999,4003 ---- public function auth($auth_data = '', $group_data = '', $moderator_data = '') { ! global $db, $lang, $mx_user, $userdata; $auth_label = array('auth_view'); *************** *** 4002,4013 **** $auth_fields_groups = array('page_auth_view_group'); ! $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; ! $auth_user = array(); for( $i = 0; $i < count($auth_fields); $i++ ) { - // // Fix for making this method useful also other pages, not only current one. - // $auth_data = !empty($auth_data) ? $auth_data : $this->info[$auth_fields[$i]]; $group_data = !empty($group_data) ? $group_data : $this->info[$auth_fields_groups[$i]]; --- 4005,4015 ---- $auth_fields_groups = array('page_auth_view_group'); ! $is_admin = ($userdata['user_level'] == ADMIN && $userdata['session_logged_in']) ? TRUE : 0; ! $auth_user['auth_mod'] = $is_admin; ! $auth_user = array(); for( $i = 0; $i < count($auth_fields); $i++ ) { // Fix for making this method useful also other pages, not only current one. $auth_data = !empty($auth_data) ? $auth_data : $this->info[$auth_fields[$i]]; $group_data = !empty($group_data) ? $group_data : $this->info[$auth_fields_groups[$i]]; *************** *** 4022,4041 **** case AUTH_REG: ! $auth_user[$auth_label[$i]] = ( $userdata['session_logged_in'] ) ? TRUE : 0; $auth_user[$auth_label[$i] . '_type'] = $lang['Auth_Registered_Users']; break; case AUTH_ANONYMOUS: ! $auth_user[$auth_label[$i]] = ( ! $userdata['session_logged_in'] ) ? TRUE : 0; $auth_user[$auth_label[$i] . '_type'] = $lang['Auth_Anonymous_Users']; break; case AUTH_ACL: // PRIVATE ! $auth_user[$auth_label[$i]] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($group_data) || $is_admin : 0; $auth_user[$auth_label[$i] . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: ! $auth_user[$auth_label[$i]] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($moderator_data) || $is_admin : 0; $auth_user[$auth_label[$i] . '_type'] = $lang['Auth_Moderators']; break; --- 4024,4043 ---- case AUTH_REG: ! $auth_user[$auth_label[$i]] = ($userdata['session_logged_in']) ? TRUE : 0; $auth_user[$auth_label[$i] . '_type'] = $lang['Auth_Registered_Users']; break; case AUTH_ANONYMOUS: ! $auth_user[$auth_label[$i]] = (!$userdata['session_logged_in']) ? TRUE : 0; $auth_user[$auth_label[$i] . '_type'] = $lang['Auth_Anonymous_Users']; break; case AUTH_ACL: // PRIVATE ! $auth_user[$auth_label[$i]] = ($userdata['session_logged_in']) ? mx_is_group_member($group_data) || $is_admin : 0; $auth_user[$auth_label[$i] . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: ! $auth_user[$auth_label[$i]] = ($userdata['session_logged_in']) ? mx_is_group_member($moderator_data) || $is_admin : 0; $auth_user[$auth_label[$i] . '_type'] = $lang['Auth_Moderators']; break; *************** *** 4051,4058 **** } } - - // // Is user a moderator? ! $auth_user['auth_mod'] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($moderator_data) || $is_admin : 0; return $auth_user; --- 4053,4058 ---- } } // Is user a moderator? ! $auth_user['auth_mod'] = ($userdata['session_logged_in']) ? mx_is_group_member($moderator_data) || $is_admin : 0; return $auth_user; Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mx_functions_bbcode.php 28 Jun 2013 15:32:38 -0000 1.21 --- mx_functions_bbcode.php 9 May 2014 07:51:42 -0000 1.22 *************** *** 31,41 **** mt_srand( (double) microtime() * 1000000); - class bbcode_base { - function bbcode() { ! $this->bbcode_uid = $this->make_bbcode_uid(); } --- 31,39 ---- mt_srand( (double) microtime() * 1000000); class bbcode_base { function bbcode() { ! $this->bbcode_uid = $this->make_bbcode_uid(); } *************** *** 55,73 **** $tpl_filename = $template->make_filename('bbcode.tpl'); $tpl = fread(fopen($tpl_filename, 'r'), filesize($tpl_filename)); ! // replace \ with \\ and then ' with \'. $tpl = str_replace('\\', '\\\\', $tpl); $tpl = str_replace('\'', '\\\'', $tpl); ! // strip newlines. $tpl = str_replace("\n", '', $tpl); ! // Turn template blocks into PHP assignment statements for the values of $bbcode_tpls.. $tpl = preg_replace('#<!-- BEGIN (.*?) -->(.*?)<!-- END (.*?) -->#', "\n" . '$bbcode_tpls[\'\\1\'] = \'\\2\';', $tpl); ! $bbcode_tpls = array(); ! eval($tpl); ! return $bbcode_tpls; } --- 53,71 ---- $tpl_filename = $template->make_filename('bbcode.tpl'); $tpl = fread(fopen($tpl_filename, 'r'), filesize($tpl_filename)); ! // replace \ with \\ and then ' with \'. $tpl = str_replace('\\', '\\\\', $tpl); $tpl = str_replace('\'', '\\\'', $tpl); ! // strip newlines. $tpl = str_replace("\n", '', $tpl); ! // Turn template blocks into PHP assignment statements for the values of $bbcode_tpls.. $tpl = preg_replace('#<!-- BEGIN (.*?) -->(.*?)<!-- END (.*?) -->#', "\n" . '$bbcode_tpls[\'\\1\'] = \'\\2\';', $tpl); ! $bbcode_tpls = array(); ! eval($tpl); ! return $bbcode_tpls; } *************** *** 86,105 **** function prepare_bbcode_template($bbcode_tpl) { global $lang; $bbcode_tpl['olist_open'] = str_replace('{LIST_TYPE}', '\\1', $bbcode_tpl['olist_open']); - $bbcode_tpl['color_open'] = str_replace('{COLOR}', '\\1', $bbcode_tpl['color_open']); - $bbcode_tpl['size_open'] = str_replace('{SIZE}', '\\1', $bbcode_tpl['size_open']); ! ! $bbcode_tpl['quote_open'] = str_replace('{L_QUOTE}', $lang['Quote'], $bbcode_tpl['quote_open']); ! $bbcode_tpl['quote_username_open'] = str_replace('{L_QUOTE}', $lang['Quote'], $bbcode_tpl['quote_username_open']); $bbcode_tpl['quote_username_open'] = str_replace('{L_WROTE}', $lang['wrote'], $bbcode_tpl['quote_username_open']); $bbcode_tpl['quote_username_open'] = str_replace('{USERNAME}', '\\1', $bbcode_tpl['quote_username_open']); - $bbcode_tpl['code_open'] = str_replace('{L_CODE}', $lang['Code'], $bbcode_tpl['code_open']); - $bbcode_tpl['img'] = str_replace('{URL}', '\\1', $bbcode_tpl['img']); --- 84,98 ---- function prepare_bbcode_template($bbcode_tpl) { + global $document_id, $access_key, $height, $width; global $lang; $bbcode_tpl['olist_open'] = str_replace('{LIST_TYPE}', '\\1', $bbcode_tpl['olist_open']); $bbcode_tpl['color_open'] = str_replace('{COLOR}', '\\1', $bbcode_tpl['color_open']); $bbcode_tpl['size_open'] = str_replace('{SIZE}', '\\1', $bbcode_tpl['size_open']); ! $bbcode_tpl['quote_open'] = str_replace('{L_QUOTE}', $lang['Quote'], $bbcode_tpl['quote_open']); $bbcode_tpl['quote_username_open'] = str_replace('{L_QUOTE}', $lang['Quote'], $bbcode_tpl['quote_username_open']); $bbcode_tpl['quote_username_open'] = str_replace('{L_WROTE}', $lang['wrote'], $bbcode_tpl['quote_username_open']); $bbcode_tpl['quote_username_open'] = str_replace('{USERNAME}', '\\1', $bbcode_tpl['quote_username_open']); $bbcode_tpl['code_open'] = str_replace('{L_CODE}', $lang['Code'], $bbcode_tpl['code_open']); $bbcode_tpl['img'] = str_replace('{URL}', '\\1', $bbcode_tpl['img']); *************** *** 118,125 **** $bbcode_tpl['email'] = str_replace('{EMAIL}', '\\1', $bbcode_tpl['email']); //Start more bbcode $bbcode_tpl['stream'] = str_replace('{URL}', '\\1', $bbcode_tpl['stream']); - $bbcode_tpl['web'] = str_replace('{URL}', '\\1', $bbcode_tpl['web']); $bbcode_tpl['flash'] = str_replace('{WIDTH}', '\\1', $bbcode_tpl['flash']); $bbcode_tpl['flash'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['flash']); --- 111,136 ---- $bbcode_tpl['email'] = str_replace('{EMAIL}', '\\1', $bbcode_tpl['email']); + + // bbcode_box Mod + $bbcode_tpl['align_open'] = str_replace('{ALIGN}', '\\1', $bbcode_tpl['align_open']); + // $bbcode_tpl['stream'] = str_replace('{URL}', '\\1', $bbcode_tpl['stream']); + $bbcode_tpl['ram'] = str_replace('{URL}', '\\1', $bbcode_tpl['ram']); + $bbcode_tpl['marq_open'] = str_replace('{MARQ}', '\\1', $bbcode_tpl['marq_open']); + $bbcode_tpl['table_open'] = str_replace('{TABLE}', '\\1', $bbcode_tpl['table_open']); + $bbcode_tpl['cell_open'] = str_replace('{CELL}', '\\1', $bbcode_tpl['cell_open']); + $bbcode_tpl['web'] = str_replace('{URL}', '\\1', $bbcode_tpl['web']); + //$bbcode_tpl['center_open'] = str_replace('{CENTER}', '\\1', $bbcode_tpl['center_open']); + //$bbcode_tpl['flash'] = str_replace('{WIDTH}', '\\1', $bbcode_tpl['flash']); + //$bbcode_tpl['flash'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['flash']); + //$bbcode_tpl['flash'] = str_replace('{URL}', '\\3', $bbcode_tpl['flash']); + //$bbcode_tpl['video'] = str_replace('{URL}', '\\3', $bbcode_tpl['video']); + //$bbcode_tpl['video'] = str_replace('{WIDTH}', '\\1', $bbcode_tpl['video']); + //$bbcode_tpl['video'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['video']); + $bbcode_tpl['font_open'] = str_replace('{FONT}', '\\1', $bbcode_tpl['font_open']); + $bbcode_tpl['poet_open'] = str_replace('{POET}', '\\1', $bbcode_tpl['poet_open']); + // bbcode_box Mod //Start more bbcode $bbcode_tpl['stream'] = str_replace('{URL}', '\\1', $bbcode_tpl['stream']); $bbcode_tpl['flash'] = str_replace('{WIDTH}', '\\1', $bbcode_tpl['flash']); $bbcode_tpl['flash'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['flash']); *************** *** 132,149 **** $bbcode_tpl['youtube'] = str_replace('{YOUTUBEID}', '\\1', $bbcode_tpl['youtube']); $bbcode_tpl['youtube'] = str_replace('{YOUTUBELINK}', $lang['Link'], $bbcode_tpl['youtube']); $bbcode_tpl['ipaper'] = str_replace('{IPAPERID}', '\\1', $bbcode_tpl['ipaper']); ! $bbcode_tpl['ipaper'] = str_replace('{IPAPERKEY}', '\\2', $bbcode_tpl['ipaper']); ! $bbcode_tpl['ipaper'] = str_replace('{HEIGHT}', '\\3', $bbcode_tpl['ipaper']); ! $bbcode_tpl['ipaper'] = str_replace('{WIDTH}', '\\4', $bbcode_tpl['ipaper']); ! $bbcode_tpl['ipaper'] = str_replace('{IPAPERLINK}', $lang['Link'], $bbcode_tpl['ipaper']); $bbcode_tpl['scribd'] = str_replace('{SCRIBDURL}', $lang['Link'], $bbcode_tpl['scribd']); //Stop more bbcode ! define("BBCODE_TPL_READY", true); ! return $bbcode_tpl; } /** * Does second-pass bbencoding. This should be used before displaying the message in * a thread. Assumes the message is already first-pass encoded, and we are given the --- 143,176 ---- $bbcode_tpl['youtube'] = str_replace('{YOUTUBEID}', '\\1', $bbcode_tpl['youtube']); $bbcode_tpl['youtube'] = str_replace('{YOUTUBELINK}', $lang['Link'], $bbcode_tpl['youtube']); + $bbcode_tpl['youtube'] = str_replace('{WIDTH}', '\\3', $bbcode_tpl['youtube']); + $bbcode_tpl['youtube'] = str_replace('{HEIGHT}', '\\4', $bbcode_tpl['youtube']); $bbcode_tpl['ipaper'] = str_replace('{IPAPERID}', '\\1', $bbcode_tpl['ipaper']); ! $bbcode_tpl['ipaper'] = str_replace('{IPAPERKEY}', '\\2', $bbcode_tpl['ipaper']); ! $bbcode_tpl['ipaper'] = str_replace('{WIDTH}', '\\3', $bbcode_tpl['ipaper']); ! $bbcode_tpl['ipaper'] = str_replace('{HEIGHT}', '\\4', $bbcode_tpl['ipaper']); ! $bbcode_tpl['ipaper'] = str_replace('{IPAPERLINK}', '\\5', $bbcode_tpl['ipaper']); ! //$bbcode_tpl['scribd'] = str_replace('{WIDTH}', '\\1', $bbcode_tpl['scribd']); ! //$bbcode_tpl['scribd'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['scribd']); ! $bbcode_tpl['scribd'] = str_replace('{SCRIBDID}', '\\1', $bbcode_tpl['scribd']); $bbcode_tpl['scribd'] = str_replace('{SCRIBDURL}', $lang['Link'], $bbcode_tpl['scribd']); //Stop more bbcode ! define("BBCODE_TPL_READY", true); ! return $bbcode_tpl; } /** + * custom version of nl2br which takes custom BBCodes into account + */ + function bbcode_nl2br($text) + { + // custom BBCodes might contain carriage returns so they + // are not converted into <br /> so now revert that + $text = str_replace(array("\n", "\r"), array('<br />', "\n"), $text); + return $text; + } + + /** * Does second-pass bbencoding. This should be used before displaying the message in * a thread. Assumes the message is already first-pass encoded, and we are given the *************** *** 151,158 **** * This a temporary function */ ! function bbencode_second_pass($text, $uid) { global $lang, $bbcode_tpl; $text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $text); --- 178,206 ---- * This a temporary function */ ! function bbencode_second_pass($text, $uid = '', $bitfield = false) { global $lang, $bbcode_tpl; + + if ($uid) + { + $this->bbcode_uid = $uid; + } + + if ($bitfield !== false) + { + $this->bbcode_bitfield = $bitfield; + // Init those added with a new bbcode_bitfield (already stored codes will not get parsed again) + $this->bbcode_cache_init(); + } + + //Check if it's a phpBB3 block + if ($bitfield) + { + $this->bbcode_second_pass($text, $uid, $bitfield); + } + + //$text = str_replace(array("\n", "\r"), array('<br />', "\n"), $text); + $text = str_replace(array("\n", "\r"), array('<br />', ""), $text); $text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $text); *************** *** 178,185 **** $bbcode_tpl = $this->prepare_bbcode_template($bbcode_tpl); } ! // [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts. $text = $this->bbencode_second_pass_code($text, $uid, $bbcode_tpl); ! // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. $text = str_replace("[quote:$uid]", $bbcode_tpl['quote_open'], $text); --- 226,236 ---- $bbcode_tpl = $this->prepare_bbcode_template($bbcode_tpl); } ! // [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts. $text = $this->bbencode_second_pass_code($text, $uid, $bbcode_tpl); ! ! // [IPAPER] and [/IPAPER] for posting iPaper in your posts. ! $text = $this->bbencode_ipaper_pass_render($text, $uid, $bbcode_tpl); ! // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. $text = str_replace("[quote:$uid]", $bbcode_tpl['quote_open'], $text); *************** *** 254,282 **** //Strat more bbcode $text = preg_replace($patterns, $replacements, $text); ! // align ! $text = preg_replace("/\[align=(left|right|center|justify):$uid\]/si", $bbcode_tpl['align_open'], $text); ! $text = str_replace("[/align:$uid]", $bbcode_tpl['align_close'], $text); ! // marquee ! $text = preg_replace("/\[marq=(left|right|up|down):$uid\]/si", $bbcode_tpl['marq_open'], $text); ! $text = str_replace("[/marq:$uid]", $bbcode_tpl['marq_close'], $text); ! // table ! $text = preg_replace("/\[table=(.*?):$uid\]/si", $bbcode_tpl['table_open'], $text); ! $text = str_replace("[/table:$uid]", $bbcode_tpl['table_close'], $text); ! // cell ! $text = preg_replace("/\[cell=(.*?):$uid\]/si", $bbcode_tpl['cell_open'], $text); ! $text = str_replace("[/cell:$uid]", $bbcode_tpl['cell_close'], $text); ! // center ! $text = preg_replace("/\[center:$uid\]/si", $bbcode_tpl['center_open'], $text); ! $text = str_replace("[/center:$uid]", $bbcode_tpl['center_close'], $text); ! // font ! $text = preg_replace("/\[font=(.*?):$uid\]/si", $bbcode_tpl['font_open'], $text); ! $text = str_replace("[/font:$uid]", $bbcode_tpl['font_close'], $text); ! // poet ! $text = preg_replace("/\[poet(.*?):$uid\]/si", $bbcode_tpl['poet_open'], $text); ! $text = str_replace("[/poet:$uid]", $bbcode_tpl['poet_close'], $text); ! //[hr] ! $text = str_replace("[hr:$uid]", $bbcode_tpl['hr'], $text); ! ! // bbcode_box Mod // [fade] and [/fade] for faded text. $text = str_replace("[fade:$uid]", $bbcode_tpl['fade_open'], $text); --- 305,332 ---- //Strat more bbcode $text = preg_replace($patterns, $replacements, $text); ! // align ! $text = preg_replace("/\[align=(left|right|center|justify):$uid\]/si", $bbcode_tpl['align_open'], $text); ! $text = str_replace("[/align:$uid]", $bbcode_tpl['align_close'], $text); ! // marquee ! $text = preg_replace("/\[marq=(left|right|up|down):$uid\]/si", $bbcode_tpl['marq_open'], $text); ! $text = str_replace("[/marq:$uid]", $bbcode_tpl['marq_close'], $text); ! // table ! $text = preg_replace("/\[table=(.*?):$uid\]/si", $bbcode_tpl['table_open'], $text); ! $text = str_replace("[/table:$uid]", $bbcode_tpl['table_close'], $text); ! // cell ! $text = preg_replace("/\[cell=(.*?):$uid\]/si", $bbcode_tpl['cell_open'], $text); ! $text = str_replace("[/cell:$uid]", $bbcode_tpl['cell_close'], $text); ! // center ! $text = preg_replace("/\[center:$uid\]/si", $bbcode_tpl['center_open'], $text); ! $text = str_replace("[/center:$uid]", $bbcode_tpl['center_close'], $text); ! // font ! $text = preg_replace("/\[font=(.*?):$uid\]/si", $bbcode_tpl['font_open'], $text); ! $text = str_replace("[/font:$uid]", $bbcode_tpl['font_close'], $text); ! // poet ! $text = preg_replace("/\[poet(.*?):$uid\]/si", $bbcode_tpl['poet_open'], $text); ! $text = str_replace("[/poet:$uid]", $bbcode_tpl['poet_close'], $text); ! //[hr] ! $text = str_replace("[hr:$uid]", $bbcode_tpl['hr'], $text); ! // bbcode_box Mod // [fade] and [/fade] for faded text. $text = str_replace("[fade:$uid]", $bbcode_tpl['fade_open'], $text); *************** *** 941,959 **** * @return string */ ! function decode($bbtext, $bbcode_uid, $smilies_on = true) { global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page; ! ! $mytext = stripslashes($bbtext); if (!empty($bbcode_uid)) { ! $mytext = $this->bbencode_second_pass($mytext, $bbcode_uid); } ! if ($smilies_on) { $mytext = $this->smilies_pass($mytext); } ! $mytext = str_replace("\n", "\n<br />\n", $mytext); ! return $this->make_clickable($mytext); } --- 991,1035 ---- * @return string */ ! function decode($mytext, $bbcode_uid, $smilies_on = true, $bbcode_bitfield = false) { global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page; ! ! if (!$mytext) ! { ! return ''; ! } ! ! $mytext = mx_censor_text($mytext); ! ! //Do some checks ! $phpbb3_text = $bbcode_bitfield ? true : false; ! $bbcode_bitfield = ($bbcode_bitfield && (strlen($bbcode_bitfield) < 2)) ? false : $bbcode_bitfield; ! if (!empty($bbcode_uid)) { ! $mytext = $this->bbencode_second_pass($mytext, $bbcode_uid, $bbcode_bitfield); } ! ! $mytext = str_replace(array("\n", "\r"), array('<br />', "\n"), $mytext); ! $mytext = $this->bbcode_nl2br($mytext); ! ! //$mytext = smiley_text($mytext, !($flags & OPTION_FLAG_SMILIES)); ! if ($smilies_on && $phpbb3_text) ! { ! $mytext = $this->smilies3_pass($mytext); ! } ! else if ($smilies_on) { $mytext = $this->smilies_pass($mytext); } ! ! //$mytext = str_replace("\n", "\n<br />\n", $mytext); ! ! if ($mytext != '') ! { ! $mytext = $this->make_clickable($mytext); ! } ! ! return $mytext; } *************** *** 1075,1079 **** return $message; } - } ?> \ No newline at end of file --- 1151,1154 ---- Index: mx_functions_emailer.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_emailer.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_functions_emailer.php 28 Jun 2013 15:32:38 -0000 1.4 --- mx_functions_emailer.php 9 May 2014 07:51:42 -0000 1.5 *************** *** 258,263 **** case 'internal': case 'phpbb3': ! if (!$board_config['board_email']) { --- 258,267 ---- case 'internal': + case 'smf2': + case 'mybb': case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': if (!$board_config['board_email']) { Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** mx_functions_tools.php 2 Jul 2013 02:24:03 -0000 1.66 --- mx_functions_tools.php 9 May 2014 07:51:42 -0000 1.67 *************** *** 1905,1916 **** { case 'internal': ! case 'phpbb2': - $attach_sig = $userdata['user_attachsig']; break; ! case 'phpbb3': ! $attach_sig = ($board_config['allow_sig'] && $mx_user->data['user_sig']) ? TRUE : 0; break; --- 1905,1918 ---- { case 'internal': ! case 'smf2': ! case 'mybb': case 'phpbb2': $attach_sig = $userdata['user_attachsig']; break; ! case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': $attach_sig = ($board_config['allow_sig'] && $mx_user->data['user_sig']) ? TRUE : 0; break; *************** *** 1970,1976 **** { case 'internal': ! case 'phpbb2': ! $sql = "SELECT COUNT(privmsgs_id) AS inbox_items, MIN(privmsgs_date) AS oldest_post_time FROM " . PRIVMSGS_TABLE . " --- 1972,1979 ---- { case 'internal': ! case 'smf2': ! case 'mybb': case 'phpbb2': ! $sql = "SELECT COUNT(privmsgs_id) AS inbox_items, MIN(privmsgs_date) AS oldest_post_time FROM " . PRIVMSGS_TABLE . " *************** *** 1980,1985 **** AND privmsgs_to_userid = " . $to_userdata['user_id']; break; ! case 'phpbb3': $sql = 'SELECT t.msg_id, COUNT(t.msg_id) as inbox_items, SUM(t.pm_unread) as oldest_post_time --- 1983,1991 ---- AND privmsgs_to_userid = " . $to_userdata['user_id']; break; ! case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': $sql = 'SELECT t.msg_id, COUNT(t.msg_id) as inbox_items, SUM(t.pm_unread) as oldest_post_time *************** *** 2041,2069 **** { case 'internal': ! ! case 'phpbb2': ! $sql_info = "INSERT INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig) VALUES (" . PRIVMSGS_NEW_MAIL . ", '" . str_replace("\'", "''", $privmsg_subject) . "', " . $this->from_id . ", " . $to_userdata['user_id'] . ", $msg_time, '$user_ip', $this->html_on, $this->bbcode_on, $this->smilies_on, $attach_sig)"; - if ( !($result = $db->sql_query($sql_info)) ) { mx_message_die(GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info); } - $privmsg_sent_id = $db->sql_nextid(); ! ! $sql = "INSERT INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text) ! VALUES ($privmsg_sent_id, '" . $bbcode_uid . "', '" . str_replace("\'", "''", $privmsg_message) . "')"; ! ! if ( !$db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql); ! } ! ! ! // // Add to the users new pm counter - // $sql = "UPDATE " . USERS_TABLE . " SET user_new_privmsg = user_new_privmsg + 1, user_last_privmsg = " . time() . " --- 2047,2067 ---- { case 'internal': ! case 'smf2': ! case 'mybb': ! case 'phpbb2': $sql_info = "INSERT INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig) VALUES (" . PRIVMSGS_NEW_MAIL . ", '" . str_replace("\'", "''", $privmsg_subject) . "', " . $this->from_id . ", " . $to_userdata['user_id'] . ", $msg_time, '$user_ip', $this->html_on, $this->bbcode_on, $this->smilies_on, $attach_sig)"; if ( !($result = $db->sql_query($sql_info)) ) { mx_message_die(GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info); } $privmsg_sent_id = $db->sql_nextid(); ! $sql = "INSERT INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text) VALUES ($privmsg_sent_id, '" . $bbcode_uid . "', '" . str_replace("\'", "''", $privmsg_message) . "')"; ! if ( !$db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql); ! } ! // Add to the users new pm counter $sql = "UPDATE " . USERS_TABLE . " SET user_new_privmsg = user_new_privmsg + 1, user_last_privmsg = " . time() . " *************** *** 2075,2079 **** } - if ( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) && $to_userdata['user_active'] ) { --- 2073,2076 ---- *************** *** 2083,2122 **** $server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://'; $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/'; ! ! // // Include and initiate emailer - // include_once($mx_root_path . 'includes/mx_functions_emailer.'.$phpEx); $emailer = new mx_emailer($board_config['smtp_delivery']); ! $emailer->from($board_config['board_email']); $emailer->replyto($board_config['board_email']); ! $emailer->use_template('privmsg_notify', $to_userdata['user_lang']); $emailer->email_address($to_userdata['user_email']); $emailer->set_subject($lang['Notification_subject']); ! $emailer->assign_vars(array( 'USERNAME' => $to_username, 'SITENAME' => $board_config['sitename'], 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', ! 'U_INBOX' => $server_protocol . $server_name . $server_port . $script_name . '?folder=inbox') ); ! $emailer->send(); $emailer->reset(); } ! ! //return; ! ! $msg = $lang['Message_sent'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . mx_append_sid("privmsg.$phpEx?folder=inbox") . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid("index.$phpEx") . '">', '</a>'); ! ! mx_message_die(GENERAL_MESSAGE, $msg); break; ! ! case 'phpbb3': ! if (!class_exists('parse_message')) { --- 2080,2117 ---- $server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://'; $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/'; ! // Include and initiate emailer include_once($mx_root_path . 'includes/mx_functions_emailer.'.$phpEx); $emailer = new mx_emailer($board_config['smtp_delivery']); ! $emailer->from($board_config['board_email']); $emailer->replyto($board_config['board_email']); ! $emailer->use_template('privmsg_notify', $to_userdata['user_lang']); $emailer->email_address($to_userdata['user_email']); $emailer->set_subject($lang['Notification_subject']); ! $emailer->assign_vars(array( 'USERNAME' => $to_username, 'SITENAME' => $board_config['sitename'], 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', ! 'U_INBOX' => $server_protocol . $server_name . $server_port . $script_name . '?folder=inbox') ); ! $emailer->send(); $emailer->reset(); } ! //return; ! $msg = $lang['Message_sent'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . mx_append_sid("privmsg.$phpEx?folder=inbox") . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid("index.$phpEx") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $msg); break; ! ! case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': ! if (!class_exists('parse_message')) { *************** *** 2125,2129 **** $message_parser = new parse_message($privmsg_message); ! $message_parser->message = $privmsg_message; $message_parser->parse(true, true, true, false, false, true, true); --- 2120,2124 ---- $message_parser = new parse_message($privmsg_message); ! $message_parser->message = $privmsg_message; $message_parser->parse(true, true, true, false, false, true, true); *************** *** 2373,2399 **** { case 'internal': - case 'phpbb2': ! $sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_level = '$admin_type'"; break; ! case 'phpbb3': ! $sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_type = 1"; break; ! } ! ! ! if ( !( $result = $db->sql_query( $sql ) ) ) { mx_message_die( GENERAL_ERROR, "Could not obtain author data", '', __LINE__, __FILE__, $sql ); } ! $user_ids_array = array(); while( $row = $db->sql_fetchrow( $result ) ) --- 2368,2396 ---- { case 'internal': case 'phpbb2': ! case 'smf2': ! case 'mybb': ! $sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_level = '$admin_type'"; break; ! case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': ! $sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_type = 1"; break; ! } ! if ( !( $result = $db->sql_query( $sql ) ) ) { mx_message_die( GENERAL_ERROR, "Could not obtain author data", '', __LINE__, __FILE__, $sql ); } ! $user_ids_array = array(); while( $row = $db->sql_fetchrow( $result ) ) *************** *** 2408,2412 **** } } - return $user_ids_array; } --- 2405,2408 ---- *************** *** 3909,3923 **** { case 'internal': break; case 'phpbb2': ! $sql = "SELECT topic_first_post_id, topic_last_post_id FROM " . TOPICS_TABLE . " WHERE topic_id = '$topic_id'"; break; ! case 'phpbb3': ! $sql = 'SELECT p.post_approved, t.topic_first_post_id, t.topic_last_post_id, t.topic_type, t.topic_replies, t.topic_replies_real, t.topic_approved FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p --- 3905,3923 ---- { case 'internal': + case 'smf2': + case 'mybb': break; case 'phpbb2': ! $sql = "SELECT topic_first_post_id, topic_last_post_id FROM " . TOPICS_TABLE . " WHERE topic_id = '$topic_id'"; break; ! case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': $sql = 'SELECT p.post_approved, t.topic_first_post_id, t.topic_last_post_id, t.topic_type, t.topic_replies, t.topic_replies_real, t.topic_approved FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p *************** *** 3953,3957 **** case 'phpbb3': ! $data['topic_approved'] = $topic_row['topic_approved']; $data['post_approved'] = $topic_row['post_approved']; --- 3953,3959 ---- case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': $data['topic_approved'] = $topic_row['topic_approved']; $data['post_approved'] = $topic_row['post_approved']; *************** *** 3978,3983 **** { case 'internal': break; ! case 'phpbb2': // --- 3980,3987 ---- { case 'internal': + case 'smf2': + case 'mybb': break; ! case 'phpbb2': // *************** *** 3993,3999 **** $topic_id = $mode == 'newtopic' ? $db->sql_nextid() : $topic_id; break; - - case 'phpbb3': /* if (!function_exists('submit_post')) --- 3997,4005 ---- $topic_id = $mode == 'newtopic' ? $db->sql_nextid() : $topic_id; break; + case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': /* if (!function_exists('submit_post')) *************** *** 4100,4105 **** { case 'internal': break; ! case 'phpbb2': $sql = "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) VALUES ($topic_id, $forum_id, " . $user_id . ", '$username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $user_attach_sig)"; --- 4106,4113 ---- { case 'internal': + case 'smf2': + case 'mybb': break; ! case 'phpbb2': $sql = "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) VALUES ($topic_id, $forum_id, " . $user_id . ", '$username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $user_attach_sig)"; *************** *** 4112,4115 **** --- 4120,4126 ---- case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': /* $sql_data = array( *************** *** 4171,4174 **** --- 4182,4187 ---- { case 'internal': + case 'smf2': + case 'mybb': break; *************** *** 4191,4195 **** case 'phpbb3': ! //$topic_id = $this->submit_phpbb_post($post_mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message); break; --- 4204,4210 ---- case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': //$topic_id = $this->submit_phpbb_post($post_mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message); break; *************** *** 4245,4248 **** --- 4260,4265 ---- { case 'internal': + case 'smf2': + case 'mybb': break; *************** *** 4251,4255 **** --- 4268,4276 ---- break; + case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': //To do break; *************** *** 4300,4310 **** mx_message_die( GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql ); } ! ! // // Add search words - // switch (PORTAL_BACKEND) { case 'internal': break; --- 4321,4331 ---- mx_message_die( GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql ); } ! // Add search words switch (PORTAL_BACKEND) { case 'internal': + case 'smf2': + case 'mybb': break; *************** *** 4314,4317 **** --- 4335,4341 ---- break; case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': //To do break; *************** *** 5253,5265 **** { case 'internal': ! case 'phpbb2': ! break; case 'phpbb3': ! $topic_update_sql .= ', topic_last_view_time = ' . $current_time; ! break; } --- 5277,5292 ---- { case 'internal': ! case 'smf2': ! case 'mybb': case 'phpbb2': ! break; case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': $topic_update_sql .= ', topic_last_view_time = ' . $current_time; ! break; } *************** *** 5284,5290 **** $is_last_post = ($last_post_id == $post_id) ? true : false; - // // Start delete - // $sql = "DELETE FROM " . POSTS_TABLE . " WHERE post_id = $post_id"; --- 5311,5315 ---- *************** *** 5298,5302 **** { case 'internal': ! case 'phpbb2': --- 5323,5330 ---- { case 'internal': ! case 'smf2': ! case 'mybb': ! break; ! case 'phpbb2': *************** *** 5307,5315 **** mx_message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); } ! break; case 'phpbb3': ! ! break; } --- 5335,5345 ---- mx_message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); } ! break; case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': ! break; } Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** page_header.php 28 Jun 2013 15:32:38 -0000 1.76 --- page_header.php 9 May 2014 07:51:42 -0000 1.77 *************** *** 164,167 **** --- 164,169 ---- { case 'internal': + case 'smf2': + case 'mybb': case 'phpbb2': $admin = ($userdata['session_logged_in'] && $userdata['user_level'] == ADMIN) ? true : false; *************** *** 169,172 **** --- 171,177 ---- case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': global $phpbb_auth; $admin = (!$phpbb_auth->acl_get('a_') && $mx_user->data['user_id'] != ANONYMOUS) ? true : false; *************** *** 233,237 **** //Login page or box constants 'S_AUTOLOGIN_ENABLED' => ($board_config['allow_autologin']) ? true : false, ! 'S_BOARD_DISABLED' => ($board_config['board_disable']) ? true : false, //To Do - configurable in AdminCP --- 238,242 ---- //Login page or box constants 'S_AUTOLOGIN_ENABLED' => ($board_config['allow_autologin']) ? true : false, ! 'S_BOARD_DISABLED' => ($board_config['portal_status']) ? true : false, //To Do - configurable in AdminCP *************** *** 304,308 **** 'T_PHPBB_STYLESHEET' => $mx_user->theme['head_stylesheet'], ! 'T_STYLESHEET_LINK' => (!isset($mx_user->theme['theme_storedb'])) ? "{$phpbb_root_path}styles/" . $mx_user->theme['template_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$mx_user->session_id&id=" . $mx_user->theme['style_id'] . '&lang=' . $mx_user->encode_lang($board_config['default_lang']), 'T_MXBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : $mx_user->template_name.'.css', 'T_GECKO_STYLESHEET' => 'gecko.css', --- 309,313 ---- 'T_PHPBB_STYLESHEET' => $mx_user->theme['head_stylesheet'], ! 'T_STYLESHEET_LINK' => (!isset($mx_user->theme['theme_storedb'])) ? "{$phpbb_root_path}styles/" . $mx_user->template_name . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$mx_user->session_id&id=" . $mx_user->theme['style_id'] . '&lang=' . $mx_user->encode_lang($board_config['default_lang']), 'T_MXBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : $mx_user->template_name.'.css', 'T_GECKO_STYLESHEET' => 'gecko.css', Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** mx_functions_style.php 27 Aug 2013 06:30:49 -0000 1.139 --- mx_functions_style.php 9 May 2014 07:51:42 -0000 1.140 *************** *** 114,120 **** global $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user, $mx_block; - // // ? - // if($this->subtemplates) { --- 114,118 ---- *************** *** 122,128 **** } - // // Check replacements list - // if(!$xs_include && isset($this->replace[$filename])) { --- 120,124 ---- *************** *** 132,138 **** $style_path = $mx_user->template_name; - // // Also search for "the other" file extension - // $filename2 = substr_count($filename, 'html') ? str_replace(".html", ".tpl", $filename) : str_replace(".tpl", ".html", $filename); --- 128,132 ---- *************** *** 203,210 **** switch (PORTAL_BACKEND) { - // // Look at phpBB2-Root folder... - // case 'internal': case 'phpbb2': $this->debug_paths .= '<br>phpbb2'; --- 197,204 ---- switch (PORTAL_BACKEND) { // Look at phpBB2-Root folder... case 'internal': + case 'smf2': + case 'mybb': case 'phpbb2': $this->debug_paths .= '<br>phpbb2'; *************** *** 221,229 **** } ! break; ! // // Look at phpBB3-Root folder... - // case 'phpbb3': $this->debug_paths .= '<br>phpbb3'; $fileSearch = array(); --- 215,223 ---- } ! break; // Look at phpBB3-Root folder... case 'phpbb3': + case 'olympus': + case 'ascraeus': $this->debug_paths .= '<br>phpbb3'; $fileSearch = array(); *************** *** 301,306 **** return $temppath; } ! break; } --- 295,327 ---- return $temppath; } + + break; + case 'rhea': + $this->debug_paths .= '<br>phpbb4'; + $fileSearch = array(); + $fileSearch[] = $style_path . '/' . 'template'; // First check current template + $fileSearch[] = $mx_user->cloned_template_name . '/' . 'template'; // Then check Cloned template + $fileSearch[] = $mx_user->default_template_name . '/' . 'template'; // Then check Default template + $fileSearch[] = './'; + $temppath = $this->doFileSearch($fileSearch, $filename, $filename2, 'styles/', $phpbb_root_path, false); + + /* + * This doesn't fit in...so left as is. + */ + if(@file_exists($phpbb_root_path . 'adm/style/' . $filename) ) + { + /* + * First check ACP template + */ + $this->module_template_path = $phpbb_root_path . 'adm/style/'; + $temppath = $phpbb_root_path . 'adm/style/' . $filename; + } ! if (!empty($this->module_template_path)) ! { ! return $temppath; ! } ! ! break; } *************** *** 728,742 **** { case 'internal': ! case 'phpbb3': ! $shared_lang_path = $mx_root_path . 'includes/shared/phpbb2/language/'; //$template_path = 'styles/'; ! break; ! ! case 'phpbb2': ! $shared_lang_path = $phpbb_root_path . 'language/'; ! break; } --- 749,765 ---- { case 'internal': ! case 'smf2': ! case 'mybb': case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': $shared_lang_path = $mx_root_path . 'includes/shared/phpbb2/language/'; //$template_path = 'styles/'; ! break; ! ! case 'phpbb2': $shared_lang_path = $phpbb_root_path . 'language/'; ! break; } *************** *** 879,882 **** --- 902,907 ---- { case 'internal': + case 'smf2': + case 'mybb': $sql = "SELECT themes_id, style_name FROM " . MX_THEMES_TABLE . " *************** *** 892,895 **** --- 917,923 ---- break; case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': $sql = "SELECT mxt.themes_id, bbt.style_id, bbt.style_name FROM " . MX_THEMES_TABLE . " AS mxt, " . STYLES_TEMPLATE_TABLE . " AS stt, " . STYLES_TABLE . " AS bbt *************** *** 914,917 **** --- 942,947 ---- { case 'internal': + case 'smf2': + case 'mybb': $sql = "SELECT themes_id, style_name FROM " . MX_THEMES_TABLE . " *************** *** 927,930 **** --- 957,963 ---- break; case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': $sql = "SELECT mxt.themes_id, bbt.style_id, bbt.style_name FROM " . MX_THEMES_TABLE . " AS mxt, " . STYLES_TEMPLATE_TABLE . " AS stt, " . STYLES_TABLE . " AS bbt *************** *** 1009,1024 **** { case 'internal': $sql = 'SELECT * FROM ' . MX_THEMES_TABLE; ! break; case 'phpbb2': $sql = 'SELECT * FROM ' . THEMES_TABLE; ! break; case 'phpbb3': $sql = "SELECT bbt.*, stt.* FROM " . MX_THEMES_TABLE . " mxt, " . STYLES_TABLE . " bbt, " . STYLES_TEMPLATE_TABLE . " stt WHERE mxt.template_name = stt.template_path"; ! break; } if ( !($result = $db->sql_query_limit($sql, 1)) ) --- 1042,1062 ---- { case 'internal': + case 'smf2': + case 'mybb': $sql = 'SELECT * FROM ' . MX_THEMES_TABLE; ! break; case 'phpbb2': $sql = 'SELECT * FROM ' . THEMES_TABLE; ! break; case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': $sql = "SELECT bbt.*, stt.* FROM " . MX_THEMES_TABLE . " mxt, " . STYLES_TABLE . " bbt, " . STYLES_TEMPLATE_TABLE . " stt WHERE mxt.template_name = stt.template_path"; ! break; } if ( !($result = $db->sql_query_limit($sql, 1)) ) *************** *** 1041,1054 **** { case 'internal': case 'phpbb2': $this->template_name = $row['template_name']; $this->style_name = $row['template_name']; $style = $row['themes_id']; ! break; case 'phpbb3': $this->template_name = $row['template_path']; $this->style_name = $row['style_name']; $style = $row['style_id']; ! break; } --- 1079,1097 ---- { case 'internal': + case 'smf2': + case 'mybb': case 'phpbb2': $this->template_name = $row['template_name']; $this->style_name = $row['template_name']; $style = $row['themes_id']; ! break; case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': $this->template_name = $row['template_path']; $this->style_name = $row['style_name']; $style = $row['style_id']; ! break; } *************** *** 1087,1099 **** { case 'internal': foreach($template_config_row as $key => $value) { $row[$key] = $value; } ! break; case 'phpbb3': $row['style_copy'] = $template_config_row['template_copy']; $row['head_stylesheet'] = $row['template_path'] . '.css'; ! break; } --- 1130,1147 ---- { case 'internal': + case 'smf2': + case 'mybb': foreach($template_config_row as $key => $value) { $row[$key] = $value; } ! break; case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': $row['style_copy'] = $template_config_row['template_copy']; $row['head_stylesheet'] = $row['template_path'] . '.css'; ! break; } *************** *** 1116,1121 **** $this->_load_mxbb_images(); break; ! case 'internal': case 'phpbb3': $this->_load_mxbb_images(); break; --- 1164,1174 ---- $this->_load_mxbb_images(); break; ! case 'internal': ! case 'smf2': ! case 'mybb': case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': $this->_load_mxbb_images(); break; *************** *** 1150,1153 **** --- 1203,1208 ---- { case 'internal': + case 'smf2': + case 'mybb': $sql = "SELECT * FROM " . MX_THEMES_TABLE . " *************** *** 1163,1166 **** --- 1218,1224 ---- break; case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': $sql = "SELECT t . * , s . * FROM " . MX_THEMES_TABLE . " AS m, " . STYLES_TABLE . " AS s, " . STYLES_TEMPLATE_TABLE . " AS t, " . STYLES_THEME_TABLE . " AS c, " . STYLES_IMAGESET_TABLE . " i *************** *** 1209,1216 **** --- 1267,1279 ---- { case 'internal': + case 'smf2': + case 'mybb': case 'phpbb2': $phpbb_images = $images; break; case 'phpbb3': + case 'olympus': + case 'ascraeus': + case 'rhea': $phpbb_images = $this->_load_phpbb_images(); break; *************** *** 1276,1279 **** --- 1339,1344 ---- { case 'internal': + case 'smf2': + case 'mybb': @define(TEMPLATE_CONFIG, TRUE); break; *************** *** 1314,1318 **** } break; ! case 'phpbb3': /* * Load phpBB Template configuration data --- 1379,1386 ---- } break; ! case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': /* * Load phpBB Template configuration data *************** *** 1566,1576 **** { case 'internal': @define(TEMPLATE_CONFIG, TRUE); ! break; ! case 'phpbb2': ! break; ! case 'phpbb3': ! /**/ // Here we overwrite phpBB images from the template configuration file with images from database --- 1634,1649 ---- { case 'internal': + case 'smf2': + case 'mybb': @define(TEMPLATE_CONFIG, TRUE); ! break; ! case 'phpbb2': ! break; ! ! case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': /**/ // Here we overwrite phpBB images from the template configuration file with images from database *************** *** 1638,1641 **** --- 1711,1715 ---- $images['voting_graphic'] = $this->images('voting_graphic'); /**/ + break; } *************** *** 1899,1906 **** { case 'internal': break; case 'phpbb2': ! case 'phpbb3': $this->_load_phpbb_images(); break; --- 1973,1985 ---- { case 'internal': + case 'smf2': + case 'mybb': break; case 'phpbb2': ! case 'phpbb3': ! case 'olympus': ! case 'ascraeus': ! case 'rhea': $this->_load_phpbb_images(); break; |
|
From: Florin C B. <ory...@us...> - 2014-05-09 07:51:44
|
Update of /cvsroot/mxbb/core In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32488 Modified Files: common.php index.php Log Message: some fixes to the internal BACKEND, plus some support for other backends compatible in the future versions Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** common.php 4 May 2014 22:36:14 -0000 1.120 --- common.php 9 May 2014 07:51:42 -0000 1.121 *************** *** 33,40 **** @ini_set('display_errors', '1'); //@error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! @error_reporting(E_ALL & ~E_NOTICE); //Default error reporting in PHP 5.2+ //@session_cache_expire (1440); //@set_time_limit (0); ! include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.' . $phpEx); // For nice error output // ================================================================================ --- 33,40 ---- @ini_set('display_errors', '1'); //@error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! //@error_reporting(E_ALL & ~E_NOTICE); //Default error reporting in PHP 5.2+ //@session_cache_expire (1440); //@set_time_limit (0); ! //include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.' . $phpEx); // For nice error output // ================================================================================ Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** index.php 26 Jun 2013 09:15:22 -0000 1.87 --- index.php 9 May 2014 07:51:42 -0000 1.88 *************** *** 194,203 **** { $module_root_path = $mx_root_path . $mx_block->module_root_path; ! //this will fix the path if ((@include $module_root_path . $mx_block->block_file) === false) { ! $module_root_path = $mx_block->module_root_path; ! include($module_root_path . $mx_block->block_file); ! } } $mx_block->block_contents = ob_get_contents(); --- 194,206 ---- { $module_root_path = $mx_root_path . $mx_block->module_root_path; ! //this will fix the path if ((@include $module_root_path . $mx_block->block_file) === false) { ! $module_root_path = $mx_block->module_root_path; ! if (!is_dir($module_root_path . $mx_block->block_file . '/')) ! { ! include($module_root_path . $mx_block->block_file); ! } ! } } $mx_block->block_contents = ob_get_contents(); |
|
From: Florin C B. <ory...@us...> - 2014-05-04 23:24:04
|
Update of /cvsroot/mxbb/mx_pjirc In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21055 Modified Files: mx_pjirc.pak pjirc_front.php Log Message: Index: mx_pjirc.pak =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/mx_pjirc.pak,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_pjirc.pak 4 May 2014 23:06:15 -0000 1.3 --- mx_pjirc.pak 4 May 2014 23:24:02 -0000 1.4 *************** *** 5,9 **** block=+:=+:pjirc Front=+:Demo block=+:66=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:78=+:126=+:PJIRC Block=+:PJIRC Index=+:pjirc_chat.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:PJIRC Index=+:Demo block=+:126=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 --- 5,9 ---- block=+:=+:pjirc Front=+:Demo block=+:66=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:78=+:126=+:PJIRC Block=+:PJIRC Index=+:index.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:PJIRC Index=+:Demo block=+:126=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 Index: pjirc_front.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_front.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pjirc_front.php 4 May 2014 23:06:15 -0000 1.6 --- pjirc_front.php 4 May 2014 23:24:02 -0000 1.7 *************** *** 212,216 **** 'CHATTERS_LIST' => $chatters_list, 'L_CLICK_TO_JOIN_CHAT' => $lang['Click_to_join_chat'], ! 'S_JOIN_CHAT' => mx_append_sid(PORTAL_URL . 'modules/mx_pjirc/pjirc_chat.'.$phpEx), 'L_LOGIN_TO_JOIN_CHAT' => $lang['Login_to_join_chat'], 'L_ALREADY_CHATTING' => $lang['Already_chatting'], --- 212,216 ---- 'CHATTERS_LIST' => $chatters_list, 'L_CLICK_TO_JOIN_CHAT' => $lang['Click_to_join_chat'], ! 'S_JOIN_CHAT' => mx_append_sid(PORTAL_URL . 'modules/mx_pjirc/index.'.$phpEx), 'L_LOGIN_TO_JOIN_CHAT' => $lang['Login_to_join_chat'], 'L_ALREADY_CHATTING' => $lang['Already_chatting'], |
|
From: Florin C B. <ory...@us...> - 2014-05-04 23:06:29
|
Update of /cvsroot/mxbb/mx_pjirc/language/lang_english In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18127/lang_english Modified Files: lang_faq.php lang_main.php Log Message: utf-8 update Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/language/lang_english/lang_main.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_main.php 9 Feb 2008 11:33:22 -0000 1.3 --- lang_main.php 4 May 2014 23:06:27 -0000 1.4 *************** *** 8,12 **** * */ - $lang['Chat'] = "Chat"; $lang['How_Many_Chatters'] = "There are <b>%d</b> user(s) on Chat now"; --- 8,11 ---- *************** *** 24,26 **** // That's all Folks! // ------------------------------------------------- ! ?> --- 23,25 ---- // That's all Folks! // ------------------------------------------------- ! ?> \ No newline at end of file Index: lang_faq.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/language/lang_english/lang_faq.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_faq.php 9 Feb 2008 11:33:21 -0000 1.3 --- lang_faq.php 4 May 2014 23:06:26 -0000 1.4 *************** *** 8,18 **** * */ - //PIRC Chat MOD FAQ by Eric - $faq[] = array("--", "PIRC Questions"); $faq[] = array("I can't Log in!", "If you are using Sun Java Virtual Machine instead of the Microsoft one, go to the control panel, then \"java plugin\", then \"browser\", and uncheck \"Internet Explorer\" checkbox.<br /><br />If you aren't using Sun Java and you still can't log in, make sure you are saying yes to the Sercurity Warning that Pops up. If you don't it won't let you log in.<br /><br />If you still can't log in this is a problem with PIRC. This is taken from their FAQ: \"...if you want pjirc to work correctly, you MUST install your irc server on the same server than the one running your website. This website may only contains pjirc files while the rest of the \"real\" website is on any other host, that's not a problem. But the pjirc files ARE to be on the irc server.\""); $faq[] = array("What if my name is being used?", "If your name is being used by someone else on the server then it will have a message pop up where you can change your name. Try adding numbers to the end of your name. Spaces aren't allowed in your name!"); $faq[] = array("What are the smilies?", "The smilies are the same ones that are on the board."); ! ! ?> --- 8,15 ---- * */ //PIRC Chat MOD FAQ by Eric $faq[] = array("--", "PIRC Questions"); $faq[] = array("I can't Log in!", "If you are using Sun Java Virtual Machine instead of the Microsoft one, go to the control panel, then \"java plugin\", then \"browser\", and uncheck \"Internet Explorer\" checkbox.<br /><br />If you aren't using Sun Java and you still can't log in, make sure you are saying yes to the Sercurity Warning that Pops up. If you don't it won't let you log in.<br /><br />If you still can't log in this is a problem with PIRC. This is taken from their FAQ: \"...if you want pjirc to work correctly, you MUST install your irc server on the same server than the one running your website. This website may only contains pjirc files while the rest of the \"real\" website is on any other host, that's not a problem. But the pjirc files ARE to be on the irc server.\""); $faq[] = array("What if my name is being used?", "If your name is being used by someone else on the server then it will have a message pop up where you can change your name. Try adding numbers to the end of your name. Spaces aren't allowed in your name!"); $faq[] = array("What are the smilies?", "The smilies are the same ones that are on the board."); ! ?> \ No newline at end of file |
|
From: Florin C B. <ory...@us...> - 2014-05-04 23:06:17
|
Update of /cvsroot/mxbb/mx_pjirc/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18086/includes Modified Files: common.php functions.php Log Message: utf-8 update Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/includes/functions.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** functions.php 4 Jun 2008 00:09:11 -0000 1.1 --- functions.php 4 May 2014 23:06:15 -0000 1.2 *************** *** 2,6 **** /** * ! * @package MxPmodule_mx_pafileDB * @version $Id$ * @copyright (c) 2002-2006 [ory...@rd..., OryNider] MxP Project Team --- 2,6 ---- /** * ! * @package MxPmodule_mx_pjIRC * @version $Id$ * @copyright (c) 2002-2006 [ory...@rd..., OryNider] MxP Project Team *************** *** 9,15 **** */ ! if ( !defined( 'IN_PORTAL' ) ) { ! die( "Hacking attempt" ); } --- 9,15 ---- */ ! if (!defined('IN_PORTAL')) { ! die("Hacking attempt(0)"); } *************** *** 17,26 **** // [ COMMON FUNCTIONS ] // ================================================================================ ! ! function user_join($nick) { global $pjirc_config, $db; ! $current_time=date("U"); $sql = "DELETE FROM ".PJIRC_SESSION_TABLE." WHERE username = '".addslashes($nick)."'"; --- 17,25 ---- // [ COMMON FUNCTIONS ] // ================================================================================ ! function pjuser_join($nick) { global $pjirc_config, $db; ! $current_time = date("U"); $sql = "DELETE FROM ".PJIRC_SESSION_TABLE." WHERE username = '".addslashes($nick)."'"; *************** *** 32,36 **** $sql = "INSERT INTO ".PJIRC_SESSION_TABLE." (username, time)" . " VALUES ('" .addslashes($nick). "', ".$current_time.")"; ! if( !$result = $db->sql_query($sql) ) { die("SQL Error in function user_join(): INSERT<br />" . $sql); --- 31,35 ---- $sql = "INSERT INTO ".PJIRC_SESSION_TABLE." (username, time)" . " VALUES ('" .addslashes($nick). "', ".$current_time.")"; ! if(!$result = $db->sql_query($sql)) { die("SQL Error in function user_join(): INSERT<br />" . $sql); *************** *** 39,48 **** //Update user statue "chatting/not chatting" ! function update_user($nick,$time) { global $pjirc_config, $board_config, $db, $lang; ! ! $sql="update ".PJIRC_SESSION_TABLE." set time='$time' where username='$nick'"; ! if( !$result = $db->sql_query($sql) ) { --- 38,46 ---- //Update user statue "chatting/not chatting" ! function pjupdate_user($nick, $time) { global $pjirc_config, $board_config, $db, $lang; ! ! $sql="update ".PJIRC_SESSION_TABLE." set time='$time' where username='$nick'"; if( !$result = $db->sql_query($sql) ) { *************** *** 52,128 **** } ! function drop_users($period) { global $pjirc_config, $board_config, $db, $lang; ! $current_time=date("U"); //prevent delay ! $period=$period+2; // Calcul max_time ! $max_time=$current_time-$period; ! ! $sql="delete from ".PJIRC_SESSION_TABLE." where time<'$max_time'"; ! ! if( !$result = $db->sql_query($sql) ) ! { ! die("SQL Error in function drop_users()"); ! } } ! ! if ((include_once $mx_root_path . "modules/mx_online_adv/includes/functions.$phpEx") === false) { ! function online_spider_surfing($nick, $bot_id) { ! global $db; ! ! $current_time=date("U"); ! ! $sql = "DELETE FROM ".ONLINE_ADV_SESSION_TABLE." WHERE username = '".addslashes($nick)."'"; ! if( !$result = $db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, 'SQL Error in function online_spider_surfing()', '', __LINE__, __FILE__, $sql); ! } ! ! $sql = "INSERT INTO ".ONLINE_ADV_SESSION_TABLE." (username, time, bot_id)" . ! " VALUES ('" .addslashes($nick). "', '" .$current_time. "', '" .$bot_id. "')"; ! if( !$result = $db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, 'SQL Error in function online_spider_surfing()', '', __LINE__, __FILE__, $sql); ! } } ! ! function update_spiders_surfing($nick,$time,$bot_id) { ! global $board_config, $db, $lang; $sql="update ".ONLINE_ADV_SESSION_TABLE." SET time='$time', bot_id='$bot_id' WHERE username='$nick'"; ! ! if( !$result = $db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, 'SQL Error in function update_spiders_surfing()', '', __LINE__, __FILE__, $sql); ! } } ! function drop_spiders_surfing($period) ! { ! global $radio_config, $db, $lang; ! ! $current_time = date("U"); ! //Prevent delay ! $period = $period + 10; ! // Calcul max_time ! $max_time = $current_time - $period; ! $sql = "DELETE from " . ONLINE_ADV_SESSION_TABLE . " WHERE time < $max_time"; ! if(!$result = $db->sql_query($sql)) ! { ! //mx_message_die(CRITICAL_ERROR, 'SQL Error in function drop_spiders_surfing()', '', __LINE__, __FILE__, $sql); ! } } } ! ?> \ No newline at end of file --- 50,120 ---- } ! function pjdrop_users($period) { global $pjirc_config, $board_config, $db, $lang; ! $current_time = date("U"); //prevent delay ! $period = $period + 2; // Calcul max_time ! $max_time = $current_time - $period; ! ! $sql = "delete from ".PJIRC_SESSION_TABLE." where time < '$max_time'"; ! if(!$result = $db->sql_query($sql)) ! { ! die("SQL Error in function drop_users()"); ! } } ! //if ((include_once $mx_root_path . "modules/mx_online_adv/includes/functions.$phpEx") === true) ! //{ ! function pjonline_spider_surfing($nick, $bot_id) { ! global $db; ! $current_time = date("U"); ! ! $sql = "DELETE FROM ".ONLINE_ADV_SESSION_TABLE." WHERE username = '".addslashes($nick)."'"; ! if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'SQL Error in function online_spider_surfing()', '', __LINE__, __FILE__, $sql); } ! ! $sql = "INSERT INTO ".ONLINE_ADV_SESSION_TABLE." (username, time, bot_id)" . ! " VALUES ('" .addslashes($nick). "', '" .$current_time. "', '" .$bot_id. "')"; ! if(!$result = $db->sql_query($sql)) { ! //mx_message_die(GENERAL_ERROR, 'SQL Error in function online_spider_surfing()', '', __LINE__, __FILE__, $sql); ! } ! } + function pjupdate_spiders_surfing($nick,$time,$bot_id) + { + global $board_config, $db, $lang; + $sql="update ".ONLINE_ADV_SESSION_TABLE." SET time='$time', bot_id='$bot_id' WHERE username='$nick'"; ! if(!$result = $db->sql_query($sql)) ! { ! //mx_message_die(GENERAL_ERROR, 'SQL Error in function update_spiders_surfing()', '', __LINE__, __FILE__, $sql); } + } + function pjdrop_spiders_surfing($period) + { + global $radio_config, $db, $lang; ! $current_time = date("U"); ! //Prevent delay ! $period = $period + 10; ! // Calcul max_time ! $max_time = $current_time - $period; ! $sql = "DELETE from " . ONLINE_ADV_SESSION_TABLE . " WHERE time < $max_time"; ! if(!$result = $db->sql_query($sql)) ! { ! //mx_message_die(CRITICAL_ERROR, 'SQL Error in function drop_spiders_surfing()', '', __LINE__, __FILE__, $sql); } } ! //} ?> \ No newline at end of file Index: common.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/includes/common.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** common.php 24 Jan 2009 13:42:41 -0000 1.7 --- common.php 4 May 2014 23:06:15 -0000 1.8 *************** *** 24,28 **** if( !defined('IN_PORTAL') ) { ! die("Hacking attempt"); } --- 24,28 ---- if( !defined('IN_PORTAL') ) { ! die("Hacking attempt(0)"); } *************** *** 40,44 **** include_once($module_root_path . 'includes/functions.'.$phpEx); - $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->decode_lang($mx_user->lang['default_lang']) : $board_config['default_lang']; --- 40,43 ---- *************** *** 61,75 **** // $cfg_chatname = $board_config['sitename'] . ' -> ' . 'Pjirc'; - - // ================================================================================ // [ PJIRC CONFIG ] // ================================================================================ - // // Get Pjirc Settings from config table // ! if( defined('_PJIRC_CONFIG') ) { $pjirc_config = array(); --- 60,71 ---- // $cfg_chatname = $board_config['sitename'] . ' -> ' . 'Pjirc'; // ================================================================================ // [ PJIRC CONFIG ] // ================================================================================ // // Get Pjirc Settings from config table // ! if(defined('_PJIRC_CONFIG')) { $pjirc_config = array(); *************** *** 102,136 **** //Get The User Agent // ! global $_SERVER, $HTTP_USER_AGENT, $HTTP_SERVER_VARS; ! ! if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) ) ! { ! $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT']; ! } ! else if ( !empty( $HTTP_SERVER_VARS['HTTP_USER_AGENT'] ) ) ! { ! $HTTP_USER_AGENT = $HTTP_SERVER_VARS['HTTP_USER_AGENT']; ! } ! else if ( !isset( $HTTP_USER_AGENT ) ) ! { ! $HTTP_USER_AGENT = ''; ! } ! if ( empty( $user_agent ) ) ! { ! $user_agent = $HTTP_USER_AGENT; ! } ! $user_agent = strtolower( $user_agent ); ! // Determine browser and version ! // The order in which we test the agents patterns is important ! // Intentionally ignore Konquerer. It should show up as Mozilla. ! // post-Netscape Mozilla versions using Gecko show up as Mozilla 5.0 ! // known browsers, list will be updated routinely, check back now and then ! // covers Netscape 6-7, K-Meleon, Most linux versions, uses moz array below ! // search engine spider bots: ! // various http utility libaries ! // download apps if ( preg_match( '/(googlebot |google\/)([0-9]*).([0-9]{1,2})/', $user_agent, $matches ) ) ; --- 98,131 ---- //Get The User Agent // + global $_SERVER, $HTTP_USER_AGENT, $HTTP_SERVER_VARS; ! if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) ) ! { ! $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT']; ! } ! else if ( !empty( $HTTP_SERVER_VARS['HTTP_USER_AGENT'] ) ) ! { ! $HTTP_USER_AGENT = $HTTP_SERVER_VARS['HTTP_USER_AGENT']; ! } ! else if ( !isset( $HTTP_USER_AGENT ) ) ! { ! $HTTP_USER_AGENT = ''; ! } ! if ( empty( $user_agent ) ) ! { ! $user_agent = $HTTP_USER_AGENT; ! } ! $user_agent = strtolower( $user_agent ); ! // Determine browser and version ! // The order in which we test the agents patterns is important ! // Intentionally ignore Konquerer. It should show up as Mozilla. ! // post-Netscape Mozilla versions using Gecko show up as Mozilla 5.0 ! // known browsers, list will be updated routinely, check back now and then ! // covers Netscape 6-7, K-Meleon, Most linux versions, uses moz array below ! // search engine spider bots: ! // various http utility libaries ! // download apps if ( preg_match( '/(googlebot |google\/)([0-9]*).([0-9]{1,2})/', $user_agent, $matches ) ) ; *************** *** 388,392 **** { //$current_time = date("U"); ! online_spider_surfing($agent, $bot_id); } else --- 383,387 ---- { //$current_time = date("U"); ! pjonline_spider_surfing($agent, $bot_id); } else |
2 messages has been excluded from this view by a project administrator.
