diff --git a/admin/stats/tr_stats.php b/admin/stats/tr_stats.php index 4655acff6..523a395a4 100644 --- a/admin/stats/tr_stats.php +++ b/admin/stats/tr_stats.php @@ -24,7 +24,7 @@ echo ' foreach ($sql as $i => $query) { - $row = mysql_fetch_row(DB()->query($query)); + $row = mysqli_fetch_row(DB()->query($query)); echo "{$lang['TR_STATS'][$i]}{$row[0]}"; } @@ -45,4 +45,4 @@ if ($l = sys('la')) echo 'gen time: '. sprintf('%.3f', (array_sum(explode(' ', microtime())) - TIMESTART)) ." sec\n"; echo ''; -echo ''; \ No newline at end of file +echo ''; diff --git a/bt/includes/init_tr.php b/bt/includes/init_tr.php index f3f1b8298..12e2cd139 100644 --- a/bt/includes/init_tr.php +++ b/bt/includes/init_tr.php @@ -54,33 +54,33 @@ function error_exit ($msg = '') // Database class sql_db { - var $cfg = array(); - var $cfg_keys = array('dbhost', 'dbname', 'dbuser', 'dbpasswd', 'charset', 'persist'); - var $link = null; - var $result = null; - var $db_server = ''; - var $selected_db = null; + public $cfg = array(); + public $cfg_keys = array('dbhost', 'dbname', 'dbuser', 'dbpasswd', 'charset', 'persist'); + public $link = null; + public $result = null; + public $db_server = ''; + public $selected_db = null; - var $locked = false; + public $locked = false; - var $num_queries = 0; - var $sql_starttime = 0; - var $sql_inittime = 0; - var $sql_timetotal = 0; - var $sql_last_time = 0; - var $slow_time = 0; + public $num_queries = 0; + public $sql_starttime = 0; + public $sql_inittime = 0; + public $sql_timetotal = 0; + public $sql_last_time = 0; + public $slow_time = 0; - var $dbg = array(); - var $dbg_id = 0; - var $dbg_enabled = false; - var $cur_query = null; + public $dbg = array(); + public $dbg_id = 0; + public $dbg_enabled = false; + public $cur_query = null; - var $DBS = array(); + public $DBS = array(); /** * Constructor */ - function sql_db ($cfg_values) + function __construct ($cfg_values) { global $DBS; @@ -486,4 +486,4 @@ class sql_db $msg[] = ''; bb_log($msg, 'sql_error_tr'); } -} \ No newline at end of file +} diff --git a/common.php b/common.php index 68d47bf0f..a24da130e 100644 --- a/common.php +++ b/common.php @@ -304,7 +304,7 @@ function make_rand_str ($len = 10) $str = ''; while (strlen($str) < $len) { - $str .= str_shuffle(preg_replace('#[^0-9a-zA-Z]#', '', crypt(uniqid(mt_rand(), true)))); + $str .= str_shuffle(preg_replace('#[^0-9a-zA-Z]#', '', crypt(uniqid(mt_rand(), true), 'salt'))); } return substr($str, 0, $len); } @@ -507,4 +507,4 @@ else if (defined('IN_TRACKER')) dummy_exit(mt_rand(60, 2400)); } } -} \ No newline at end of file +} diff --git a/library/ajax/view_torrent.php b/library/ajax/view_torrent.php index af2327b8e..8100dfb41 100644 --- a/library/ajax/view_torrent.php +++ b/library/ajax/view_torrent.php @@ -48,18 +48,18 @@ function build_tor_filelist ($file_contents) class torrent { - var $tor_decoded = array(); - var $files_ary = array('/' => ''); - var $multiple = null; - var $root_dir = ''; - var $files_html = ''; + public $tor_decoded = array(); + public $files_ary = array('/' => ''); + public $multiple = null; + public $root_dir = ''; + public $files_html = ''; - function torrent ($decoded_file_contents) + public function __construct ($decoded_file_contents) { $this->tor_decoded = $decoded_file_contents; } - function get_filelist () + public function get_filelist () { $this->build_filelist_array(); @@ -79,7 +79,7 @@ class torrent } } - function build_filelist_array () + public function build_filelist_array () { $info = $this->tor_decoded['info']; @@ -154,7 +154,7 @@ class torrent } } - function build_file_item ($name, $length) + public function build_file_item ($name, $length) { global $bb_cfg, $images, $lang; @@ -169,7 +169,7 @@ class torrent return "$name $length $magnet_name $magnet_ext"; } - function build_filelist_html () + public function build_filelist_html () { global $html; return $html->array2html($this->files_ary); @@ -183,4 +183,4 @@ function clean_tor_dirname ($dirname) if ($bnc_error) $tor_filelist = ''.$lang['ERROR_BUILD'].'

'.$tor_filelist; -$this->response['html'] = $tor_filelist; \ No newline at end of file +$this->response['html'] = $tor_filelist; diff --git a/library/attach_mod/includes/functions_attach.php b/library/attach_mod/includes/functions_attach.php index cab4f37ca..4746283c7 100644 --- a/library/attach_mod/includes/functions_attach.php +++ b/library/attach_mod/includes/functions_attach.php @@ -588,7 +588,7 @@ function get_var($var_name, $default, $multibyte = false) */ function attach_mod_sql_escape($text) { - if (function_exists('mysql_real_escape_string')) + if (function_exists('mysqli_real_escape_string')) { return DB()->escape_string($text); } @@ -687,4 +687,4 @@ function attach_mod_sql_build_array($query, $assoc_ary = false) } return $query; -} \ No newline at end of file +} diff --git a/library/attach_mod/posting_attachments.php b/library/attach_mod/posting_attachments.php index 368706b3a..7a75027a0 100644 --- a/library/attach_mod/posting_attachments.php +++ b/library/attach_mod/posting_attachments.php @@ -10,26 +10,26 @@ define('FILENAME_CRYPTIC_LENGTH', 64); class attach_parent { - var $post_attach = false; - var $attach_filename = ''; - var $filename = ''; - var $type = ''; - var $extension = ''; - var $file_comment = ''; - var $num_attachments = 0; // number of attachments in message - var $filesize = 0; - var $filetime = 0; - var $thumbnail = 0; - var $page = 0; // On which page we are on ? This should be filled by child classes. + public $post_attach = false; + public $attach_filename = ''; + public $filename = ''; + public $type = ''; + public $extension = ''; + public $file_comment = ''; + public $num_attachments = 0; // number of attachments in message + public $filesize = 0; + public $filetime = 0; + public $thumbnail = 0; + public $page = 0; // On which page we are on ? This should be filled by child classes. // Switches - var $add_attachment_body = 0; - var $posted_attachments_body = 0; + public $add_attachment_body = 0; + public $posted_attachments_body = 0; /** * Constructor */ - function attach_parent() + public function __construct() { $this->add_attachment_body = get_var('add_attachment_body', 0); $this->posted_attachments_body = get_var('posted_attachments_body', 0); @@ -52,7 +52,7 @@ class attach_parent /** * Get Quota Limits */ - function get_quota_limits($userdata_quota, $user_id = 0) + public function get_quota_limits($userdata_quota, $user_id = 0) { global $attach_config; @@ -206,7 +206,7 @@ class attach_parent * Handle all modes... (intern) * @private */ - function handle_attachments($mode) + public function handle_attachments($mode) { global $is_auth, $attach_config, $refresh, $post_id, $submit, $preview, $error, $error_msg, $lang; @@ -594,7 +594,7 @@ class attach_parent /** * Basic Insert Attachment Handling for all Message Types */ - function do_insert_attachment($mode, $message_type, $message_id) + public function do_insert_attachment($mode, $message_type, $message_id) { global $upload_dir; @@ -735,7 +735,7 @@ class attach_parent * Attachment Mod entry switch/output (intern) * @private */ - function display_attachment_bodies() + public function display_attachment_bodies() { global $attach_config, $is_auth, $lang, $template, $upload_dir, $forum_id; @@ -831,7 +831,7 @@ class attach_parent /** * Upload an Attachment to Filespace (intern) */ - function upload_attachment() + public function upload_attachment() { global $error, $error_msg, $lang, $attach_config, $userdata, $upload_dir, $forum_id; @@ -1186,7 +1186,7 @@ class attach_parent } // Copy the temporary attachment to the right location (copy, move_uploaded_file) - function move_uploaded_attachment($upload_mode, $file) + public function move_uploaded_attachment($upload_mode, $file) { global $error, $error_msg, $lang, $upload_dir; @@ -1262,7 +1262,7 @@ class attach_posting extends attach_parent /** * Constructor */ - function attach_posting() + public function __construct() { $this->attach_parent(); $this->page = 0; @@ -1271,7 +1271,7 @@ class attach_posting extends attach_parent /** * Insert an Attachment into a Post (this is the second function called from posting.php) */ - function insert_attachment($post_id) + public function insert_attachment($post_id) { global $is_auth, $mode; @@ -1313,7 +1313,7 @@ class attach_posting extends attach_parent /** * Handle Attachments (Add/Delete/Edit/Show) - This is the first function called from every message handler */ - function posting_attachment_mod() + public function posting_attachment_mod() { global $mode, $confirm, $is_auth, $post_id, $delete, $refresh; @@ -1355,4 +1355,4 @@ function execute_posting_attachment_handling() $attachment_mod['posting'] = new attach_posting(); $attachment_mod['posting']->posting_attachment_mod(); -} \ No newline at end of file +} diff --git a/library/includes/api/sphinx.php b/library/includes/api/sphinx.php index 68b29869e..62e97dd8d 100644 --- a/library/includes/api/sphinx.php +++ b/library/includes/api/sphinx.php @@ -379,51 +379,51 @@ function sphFixUint ( $value ) /// sphinx searchd client class class SphinxClient extends cache_common { - var $_host; ///< searchd host (default is "localhost") - var $_port; ///< searchd port (default is 9312) - var $_offset; ///< how many records to seek from result-set start (default is 0) - var $_limit; ///< how many records to return from result-set starting at offset (default is 20) - var $_mode; ///< query matching mode (default is SPH_MATCH_ALL) - var $_weights; ///< per-field weights (default is 1 for all fields) - var $_sort; ///< match sorting mode (default is SPH_SORT_RELEVANCE) - var $_sortby; ///< attribute to sort by (defualt is "") - var $_min_id; ///< min ID to match (default is 0, which means no limit) - var $_max_id; ///< max ID to match (default is 0, which means no limit) - var $_filters; ///< search filters - var $_groupby; ///< group-by attribute name - var $_groupfunc; ///< group-by function (to pre-process group-by attribute value with) - var $_groupsort; ///< group-by sorting clause (to sort groups in result set with) - var $_groupdistinct;///< group-by count-distinct attribute - var $_maxmatches; ///< max matches to retrieve - var $_cutoff; ///< cutoff to stop searching at (default is 0) - var $_retrycount; ///< distributed retries count - var $_retrydelay; ///< distributed retries delay - var $_anchor; ///< geographical anchor point - var $_indexweights; ///< per-index weights - var $_ranker; ///< ranking mode (default is SPH_RANK_PROXIMITY_BM25) - var $_maxquerytime; ///< max query time, milliseconds (default is 0, do not limit) - var $_fieldweights; ///< per-field-name weights - var $_overrides; ///< per-query attribute values overrides - var $_select; ///< select-list (attributes or expressions, with optional aliases) + public $_host; ///< searchd host (default is "localhost") + public $_port; ///< searchd port (default is 9312) + public $_offset; ///< how many records to seek from result-set start (default is 0) + public $_limit; ///< how many records to return from result-set starting at offset (default is 20) + public $_mode; ///< query matching mode (default is SPH_MATCH_ALL) + public $_weights; ///< per-field weights (default is 1 for all fields) + public $_sort; ///< match sorting mode (default is SPH_SORT_RELEVANCE) + public $_sortby; ///< attribute to sort by (defualt is "") + public $_min_id; ///< min ID to match (default is 0, which means no limit) + public $_max_id; ///< max ID to match (default is 0, which means no limit) + public $_filters; ///< search filters + public $_groupby; ///< group-by attribute name + public $_groupfunc; ///< group-by function (to pre-process group-by attribute value with) + public $_groupsort; ///< group-by sorting clause (to sort groups in result set with) + public $_groupdistinct;///< group-by count-distinct attribute + public $_maxmatches; ///< max matches to retrieve + public $_cutoff; ///< cutoff to stop searching at (default is 0) + public $_retrycount; ///< distributed retries count + public $_retrydelay; ///< distributed retries delay + public $_anchor; ///< geographical anchor point + public $_indexweights; ///< per-index weights + public $_ranker; ///< ranking mode (default is SPH_RANK_PROXIMITY_BM25) + public $_maxquerytime; ///< max query time, milliseconds (default is 0, do not limit) + public $_fieldweights; ///< per-field-name weights + public $_overrides; ///< per-query attribute values overrides + public $_select; ///< select-list (attributes or expressions, with optional aliases) - var $_error; ///< last error message - var $_warning; ///< last warning message - var $_connerror; ///< connection error vs remote error flag + public $_error; ///< last error message + public $_warning; ///< last warning message + public $_connerror; ///< connection error vs remote error flag - var $_reqs; ///< requests array for multi-query - var $_mbenc; ///< stored mbstring encoding - var $_arrayresult; ///< whether $result["matches"] should be a hash or an array - var $_timeout; ///< connect timeout + public $_reqs; ///< requests array for multi-query + public $_mbenc; ///< stored mbstring encoding + public $_arrayresult; ///< whether $result["matches"] should be a hash or an array + public $_timeout; ///< connect timeout - var $bb_queries = array(); - var $bb_indexes = array(); + public $bb_queries = array(); + public $bb_indexes = array(); ///////////////////////////////////////////////////////////////////////////// // common stuff ///////////////////////////////////////////////////////////////////////////// /// create a new client object and fill defaults - function SphinxClient () + public function __construct () { $this->dbg_enabled = sql_dbg_enabled(); @@ -469,32 +469,32 @@ class SphinxClient extends cache_common $this->_timeout = 0; } - function __destruct() + public function __destruct() { if ( $this->_socket !== false ) fclose ( $this->_socket ); } /// get last error message (string) - function GetLastError () + public function GetLastError () { return $this->_error; } /// get last warning message (string) - function GetLastWarning () + public function GetLastWarning () { return $this->_warning; } /// get last error flag (to tell network connection errors from searchd errors or broken responses) - function IsConnectError() + public function IsConnectError() { return $this->_connerror; } /// set searchd host name (string) and port (integer) - function SetServer ( $host, $port = 0 ) + public function SetServer ( $host, $port = 0 ) { assert ( is_string($host) ); if ( $host[0] == '/') @@ -516,14 +516,14 @@ class SphinxClient extends cache_common } /// set server connection timeout (0 to remove) - function SetConnectTimeout ( $timeout ) + public function SetConnectTimeout ( $timeout ) { assert ( is_numeric($timeout) ); $this->_timeout = $timeout; } - function _Send ( $handle, $data, $length ) + public function _Send ( $handle, $data, $length ) { if ( feof($handle) || fwrite ( $handle, $data, $length ) !== $length ) { @@ -537,7 +537,7 @@ class SphinxClient extends cache_common ///////////////////////////////////////////////////////////////////////////// /// enter mbstring workaround mode - function _MBPush () + public function _MBPush () { $this->_mbenc = ""; if ( ini_get ( "mbstring.func_overload" ) & 2 ) @@ -548,14 +548,14 @@ class SphinxClient extends cache_common } /// leave mbstring workaround mode - function _MBPop () + public function _MBPop () { if ( $this->_mbenc ) mb_internal_encoding ( $this->_mbenc ); } /// connect to searchd server - function _Connect () + public function _Connect () { $this->cur_query = "connect to: {$this->_host}"; $this->debug('start'); @@ -630,7 +630,7 @@ class SphinxClient extends cache_common } /// get and check response packet from searchd server - function _GetResponse ( $fp, $client_ver ) + public function _GetResponse ( $fp, $client_ver ) { $response = ""; $len = 0; @@ -702,7 +702,7 @@ class SphinxClient extends cache_common /// set offset and count into result set, /// and optionally set max-matches and cutoff limits - function SetLimits ( $offset, $limit, $max=0, $cutoff=0 ) + public function SetLimits ( $offset, $limit, $max=0, $cutoff=0 ) { assert ( is_int($offset) ); assert ( is_int($limit) ); @@ -719,7 +719,7 @@ class SphinxClient extends cache_common /// set maximum query time, in milliseconds, per-index /// integer, 0 means "do not limit" - function SetMaxQueryTime ( $max ) + public function SetMaxQueryTime ( $max ) { assert ( is_int($max) ); assert ( $max>=0 ); @@ -727,7 +727,7 @@ class SphinxClient extends cache_common } /// set matching mode - function SetMatchMode ( $mode ) + public function SetMatchMode ( $mode ) { assert ( $mode==SPH_MATCH_ALL || $mode==SPH_MATCH_ANY @@ -740,7 +740,7 @@ class SphinxClient extends cache_common } /// set ranking mode - function SetRankingMode ( $ranker ) + public function SetRankingMode ( $ranker ) { assert ( $ranker==SPH_RANK_PROXIMITY_BM25 || $ranker==SPH_RANK_BM25 @@ -751,7 +751,7 @@ class SphinxClient extends cache_common } /// set matches sorting mode - function SetSortMode ( $mode, $sortby="" ) + public function SetSortMode ( $mode, $sortby="" ) { assert ( $mode==SPH_SORT_RELEVANCE || @@ -769,7 +769,7 @@ class SphinxClient extends cache_common /// bind per-field weights by order /// DEPRECATED; use SetFieldWeights() instead - function SetWeights ( $weights ) + public function SetWeights ( $weights ) { assert ( is_array($weights) ); foreach ( $weights as $weight ) @@ -779,7 +779,7 @@ class SphinxClient extends cache_common } /// bind per-field weights by name - function SetFieldWeights ( $weights ) + public function SetFieldWeights ( $weights ) { assert ( is_array($weights) ); foreach ( $weights as $name=>$weight ) @@ -791,7 +791,7 @@ class SphinxClient extends cache_common } /// bind per-index weights by name - function SetIndexWeights ( $weights ) + public function SetIndexWeights ( $weights ) { assert ( is_array($weights) ); foreach ( $weights as $index=>$weight ) @@ -804,7 +804,7 @@ class SphinxClient extends cache_common /// set IDs range to match /// only match records if document ID is beetwen $min and $max (inclusive) - function SetIDRange ( $min, $max ) + public function SetIDRange ( $min, $max ) { assert ( is_numeric($min) ); assert ( is_numeric($max) ); @@ -815,7 +815,7 @@ class SphinxClient extends cache_common /// set values set filter /// only match records where $attribute value is in given set - function SetFilter ( $attribute, $values, $exclude=false ) + public function SetFilter ( $attribute, $values, $exclude=false ) { assert ( is_string($attribute) ); assert ( is_array($values) ); @@ -832,7 +832,7 @@ class SphinxClient extends cache_common /// set range filter /// only match records if $attribute value is beetwen $min and $max (inclusive) - function SetFilterRange ( $attribute, $min, $max, $exclude=false ) + public function SetFilterRange ( $attribute, $min, $max, $exclude=false ) { assert ( is_string($attribute) ); assert ( is_numeric($min) ); @@ -844,7 +844,7 @@ class SphinxClient extends cache_common /// set float range filter /// only match records if $attribute value is beetwen $min and $max (inclusive) - function SetFilterFloatRange ( $attribute, $min, $max, $exclude=false ) + public function SetFilterFloatRange ( $attribute, $min, $max, $exclude=false ) { assert ( is_string($attribute) ); assert ( is_float($min) ); @@ -857,7 +857,7 @@ class SphinxClient extends cache_common /// setup anchor point for geosphere distance calculations /// required to use @geodist in filters and sorting /// latitude and longitude must be in radians - function SetGeoAnchor ( $attrlat, $attrlong, $lat, $long ) + public function SetGeoAnchor ( $attrlat, $attrlong, $lat, $long ) { assert ( is_string($attrlat) ); assert ( is_string($attrlong) ); @@ -868,7 +868,7 @@ class SphinxClient extends cache_common } /// set grouping attribute and function - function SetGroupBy ( $attribute, $func, $groupsort="@group desc" ) + public function SetGroupBy ( $attribute, $func, $groupsort="@group desc" ) { assert ( is_string($attribute) ); assert ( is_string($groupsort) ); @@ -885,14 +885,14 @@ class SphinxClient extends cache_common } /// set count-distinct attribute for group-by queries - function SetGroupDistinct ( $attribute ) + public function SetGroupDistinct ( $attribute ) { assert ( is_string($attribute) ); $this->_groupdistinct = $attribute; } /// set distributed retries count and delay - function SetRetries ( $count, $delay=0 ) + public function SetRetries ( $count, $delay=0 ) { assert ( is_int($count) && $count>=0 ); assert ( is_int($delay) && $delay>=0 ); @@ -902,7 +902,7 @@ class SphinxClient extends cache_common /// set result set format (hash or array; hash by default) /// PHP specific; needed for group-by-MVA result sets that may contain duplicate IDs - function SetArrayResult ( $arrayresult ) + public function SetArrayResult ( $arrayresult ) { assert ( is_bool($arrayresult) ); $this->_arrayresult = $arrayresult; @@ -911,7 +911,7 @@ class SphinxClient extends cache_common /// set attribute values override /// there can be only one override per attribute /// $values must be a hash that maps document IDs to attribute values - function SetOverride ( $attrname, $attrtype, $values ) + public function SetOverride ( $attrname, $attrtype, $values ) { assert ( is_string ( $attrname ) ); assert ( in_array ( $attrtype, array ( SPH_ATTR_INTEGER, SPH_ATTR_TIMESTAMP, SPH_ATTR_BOOL, SPH_ATTR_FLOAT, SPH_ATTR_BIGINT ) ) ); @@ -921,7 +921,7 @@ class SphinxClient extends cache_common } /// set select-list (attributes or expressions), SQL-like syntax - function SetSelect ( $select ) + public function SetSelect ( $select ) { assert ( is_string ( $select ) ); $this->_select = $select; @@ -930,14 +930,14 @@ class SphinxClient extends cache_common ////////////////////////////////////////////////////////////////////////////// /// clear all filters (for multi-queries) - function ResetFilters () + public function ResetFilters () { $this->_filters = array(); $this->_anchor = array(); } /// clear groupby settings (for multi-queries) - function ResetGroupBy () + public function ResetGroupBy () { $this->_groupby = ""; $this->_groupfunc = SPH_GROUPBY_DAY; @@ -946,7 +946,7 @@ class SphinxClient extends cache_common } /// clear all attribute value overrides (for multi-queries) - function ResetOverrides () + public function ResetOverrides () { $this->_overrides = array (); } @@ -955,7 +955,7 @@ class SphinxClient extends cache_common /// connect to searchd server, run given search query through given indexes, /// and return the search results - function Query ( $query, $index="*", $comment="" ) + public function Query ( $query, $index="*", $comment="" ) { assert ( empty($this->_reqs) ); @@ -977,7 +977,7 @@ class SphinxClient extends cache_common } /// helper to pack floats in network byte order - function _PackFloat ( $f ) + public function _PackFloat ( $f ) { $t1 = pack ( "f", $f ); // machine order list(,$t2) = unpack ( "L*", $t1 ); // int in machine order @@ -986,7 +986,7 @@ class SphinxClient extends cache_common /// add query to multi-query batch /// returns index into results array from RunQueries() call - function AddQuery ( $query, $index="*", $comment="" ) + public function AddQuery ( $query, $index="*", $comment="" ) { // mbstring workaround $this->_MBPush (); @@ -1101,7 +1101,7 @@ class SphinxClient extends cache_common } /// connect to searchd, run queries batch, and return an array of result sets - function RunQueries () + public function RunQueries () { if ( empty($this->_reqs) ) { @@ -1146,7 +1146,7 @@ class SphinxClient extends cache_common } /// parse and return search query (or queries) response - function _ParseSearchResponse ( $response, $nreqs ) + public function _ParseSearchResponse ( $response, $nreqs ) { $p = 0; // current position $max = strlen($response); // max position for checks, to protect against broken responses @@ -1309,7 +1309,7 @@ class SphinxClient extends cache_common /// connect to searchd server, and generate exceprts (snippets) /// of given documents for given query. returns false on failure, /// an array of snippets on success - function BuildExcerpts ( $docs, $index, $words, $opts=array() ) + public function BuildExcerpts ( $docs, $index, $words, $opts=array() ) { assert ( is_array($docs) ); assert ( is_string($index) ); @@ -1414,7 +1414,7 @@ class SphinxClient extends cache_common /// connect to searchd server, and generate keyword list for a given query /// returns false on failure, /// an array of words on success - function BuildKeywords ( $query, $index, $hits ) + public function BuildKeywords ( $query, $index, $hits ) { assert ( is_string($query) ); assert ( is_string($index) ); @@ -1491,7 +1491,7 @@ class SphinxClient extends cache_common return $res; } - function EscapeString ( $string ) + public function EscapeString ( $string ) { $from = array ( '\\', '(',')','|','-','!','@','~','"','&', '/', '^', '$', '=' ); $to = array ( '\\\\', '\(','\)','\|','\-','\!','\@','\~','\"', '\&', '\/', '\^', '\$', '\=' ); @@ -1505,7 +1505,7 @@ class SphinxClient extends cache_common /// batch update given attributes in given rows in given indexes /// returns amount of updated documents (0 or more) on success, or -1 on failure - function UpdateAttributes ( $index, $attrs, $values, $mva=false ) + public function UpdateAttributes ( $index, $attrs, $values, $mva=false ) { // verify everything assert ( is_string($index) ); @@ -1577,7 +1577,7 @@ class SphinxClient extends cache_common // persistent connections ///////////////////////////////////////////////////////////////////////////// - function Open() + public function Open() { if ( $this->_socket !== false ) { @@ -1596,7 +1596,7 @@ class SphinxClient extends cache_common return true; } - function Close() + public function Close() { if ( $this->_socket === false ) { @@ -1614,7 +1614,7 @@ class SphinxClient extends cache_common // status ////////////////////////////////////////////////////////////////////////// - function Status () + public function Status () { $this->_MBPush (); if (!( $fp = $this->_Connect() )) @@ -1650,4 +1650,4 @@ class SphinxClient extends cache_common // // $Id: sphinxapi.php 2055 2009-11-06 23:09:58Z shodan $ -// \ No newline at end of file +// diff --git a/library/includes/bbcode.php b/library/includes/bbcode.php index fe5c619ca..1884c1ec4 100644 --- a/library/includes/bbcode.php +++ b/library/includes/bbcode.php @@ -441,11 +441,11 @@ function add_search_words ($post_id, $post_message, $topic_title = '', $only_ret class bbcode { - var $tpl = array(); // шаблоны для замены тегов - var $smilies = null; // смайлы - var $found_spam = null; // найденные спам "слова" - var $del_words = array(); // см. get_words_rate() - var $tidy_cfg = array( + public $tpl = array(); // шаблоны для замены тегов + public $smilies = null; // смайлы + public $found_spam = null; // найденные спам "слова" + public $del_words = array(); // см. get_words_rate() + public $tidy_cfg = array( 'drop-empty-paras' => false, 'fix-uri' => false, 'force-output' => true, @@ -464,7 +464,7 @@ class bbcode 'show-warnings' => false, 'wrap' => 0, ); - var $block_tags = array( + public $block_tags = array( 'align', 'br', 'clear', @@ -474,17 +474,17 @@ class bbcode 'quote', 'spoiler', ); - var $preg = array(); - var $str = array(); - var $preg_search = array(); - var $preg_repl = array(); - var $str_search = array(); - var $str_repl = array(); + public $preg = array(); + public $str = array(); + public $preg_search = array(); + public $preg_repl = array(); + public $str_search = array(); + public $str_repl = array(); /** * Constructor */ - function bbcode () + public function __construct () { $this->tpl = get_bbcode_tpl(); @@ -494,7 +494,7 @@ class bbcode /** * init_replacements */ - function init_replacements () + public function init_replacements () { $tpl = $this->tpl; $img_exp = '(https?:)?//[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png)([a-z0-9/?&%;][^\[\]]*)?'; @@ -556,7 +556,7 @@ class bbcode * bbcode2html * $text должен быть уже обработан htmlCHR($text, false, ENT_NOQUOTES); */ - function bbcode2html ($text) + public function bbcode2html ($text) { global $bb_cfg; @@ -606,7 +606,7 @@ class bbcode /** * Clean up */ - static function clean_up ($text) + static public function clean_up ($text) { $text = trim($text); $text = str_replace("\r", '', $text); @@ -683,7 +683,7 @@ class bbcode /** * [code] callback */ - function code_callback ($m) + public function code_callback ($m) { $code = trim($m[2]); $code = str_replace(' ', '  ', $code); @@ -696,7 +696,7 @@ class bbcode /** * [url] callback */ - function url_callback ($m) + public function url_callback ($m) { global $bb_cfg; @@ -720,7 +720,7 @@ class bbcode /** * Escape tags inside tiltes in [quote="tilte"] */ - function escape_tiltes_callback ($m) + public function escape_tiltes_callback ($m) { $tilte = substr($m[3], 0, 250); $tilte = str_replace(array('[', ']', ':', ')', '"'), array('[', ']', ':', ')', '"'), $tilte); @@ -732,7 +732,7 @@ class bbcode /** * make_clickable */ - function make_clickable ($text) + public function make_clickable ($text) { $url_regexp = "# (?
', $text); $text = str_replace("\n", '
', $text); @@ -815,7 +815,7 @@ class bbcode /** * tidy */ - function tidy ($text) + public function tidy ($text) { $text = tidy_repair_string($text, $this->tidy_cfg, 'utf8'); return $text; @@ -842,14 +842,14 @@ function bbcode2html ($text) class words_rate { - var $dbg_mode = false; - var $words_rate = 0; - var $deleted_words = array(); - var $del_text_hl = ''; - var $words_del_exp = ''; - var $words_cnt_exp = '#[a-zA-Zа-яА-ЯёЁ]{4,}#'; + public $dbg_mode = false; + public $words_rate = 0; + public $deleted_words = array(); + public $del_text_hl = ''; + public $words_del_exp = ''; + public $words_cnt_exp = '#[a-zA-Zа-яА-ЯёЁ]{4,}#'; - function words_rate () + public function __construct () { // слова начинающиеся на.. $del_list = file_get_contents(BB_ROOT .'/library/words_rate_del_list.txt'); @@ -863,7 +863,7 @@ class words_rate /** * возвращает "показатель полезности" сообщения используемый для автоудаления коротких сообщений типа "спасибо", "круто" и т.д. */ - function get_words_rate ($text) + public function get_words_rate ($text) { $this->words_rate = 127; // максимальное значение по умолчанию $this->deleted_words = array(); @@ -959,4 +959,4 @@ function get_parsed_post ($postrow, $mode = 'full', $return_chars = 600) function update_post_html ($postrow) { DB()->query("DELETE FROM ". BB_POSTS_HTML ." WHERE post_id = ". (int) $postrow['post_id'] ." LIMIT 1"); -} \ No newline at end of file +} diff --git a/library/includes/cache/apc.php b/library/includes/cache/apc.php index 472d79edb..fef484190 100644 --- a/library/includes/cache/apc.php +++ b/library/includes/cache/apc.php @@ -4,11 +4,11 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class cache_apc extends cache_common { - var $used = true; - var $engine = 'APC'; - var $prefix = null; + public $used = true; + public $engine = 'APC'; + public $prefix = null; - function cache_apc ($prefix = null) + public function __construct ($prefix = null) { if (!$this->is_installed()) { @@ -18,7 +18,7 @@ class cache_apc extends cache_common $this->prefix = $prefix; } - function get ($name, $get_miss_key_callback = '', $ttl = 0) + public function get ($name, $get_miss_key_callback = '', $ttl = 0) { $this->cur_query = "cache->get('$name')"; $this->debug('start'); @@ -29,7 +29,7 @@ class cache_apc extends cache_common return apc_fetch($this->prefix . $name); } - function set ($name, $value, $ttl = 0) + public function set ($name, $value, $ttl = 0) { $this->cur_query = "cache->set('$name')"; $this->debug('start'); @@ -40,7 +40,7 @@ class cache_apc extends cache_common return apc_store($this->prefix . $name, $value, $ttl); } - function rm ($name = '') + public function rm ($name = '') { if ($name) { @@ -58,8 +58,8 @@ class cache_apc extends cache_common } } - function is_installed () + public function is_installed () { return function_exists('apc_fetch'); } -} \ No newline at end of file +} diff --git a/library/includes/cache/common.php b/library/includes/cache/common.php index 79a0ff525..65de44cfd 100644 --- a/library/includes/cache/common.php +++ b/library/includes/cache/common.php @@ -4,11 +4,11 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class cache_common { - var $used = false; + public $used = false; /** * Returns value of variable */ - function get ($name, $get_miss_key_callback = '', $ttl = 604800) + public function get ($name, $get_miss_key_callback = '', $ttl = 604800) { if ($get_miss_key_callback) return $get_miss_key_callback($name); return is_array($name) ? array() : false; @@ -16,30 +16,30 @@ class cache_common /** * Store value of variable */ - function set ($name, $value, $ttl = 604800) + public function set ($name, $value, $ttl = 604800) { return false; } /** * Remove variable */ - function rm ($name = '') + public function rm ($name = '') { return false; } - var $num_queries = 0; - var $sql_starttime = 0; - var $sql_inittime = 0; - var $sql_timetotal = 0; - var $cur_query_time = 0; + public $num_queries = 0; + public $sql_starttime = 0; + public $sql_inittime = 0; + public $sql_timetotal = 0; + public $cur_query_time = 0; - var $dbg = array(); - var $dbg_id = 0; - var $dbg_enabled = false; - var $cur_query = null; + public $dbg = array(); + public $dbg_id = 0; + public $dbg_enabled = false; + public $cur_query = null; - function debug ($mode, $cur_query = null) + public function debug ($mode, $cur_query = null) { if (!$this->dbg_enabled) return; @@ -65,7 +65,7 @@ class cache_common } } - function debug_find_source ($mode = '') + public function debug_find_source ($mode = '') { foreach (debug_backtrace() as $trace) { @@ -81,4 +81,4 @@ class cache_common } return 'src not found'; } -} \ No newline at end of file +} diff --git a/library/includes/cache/file.php b/library/includes/cache/file.php index 8538d22c6..9eb7b1aad 100644 --- a/library/includes/cache/file.php +++ b/library/includes/cache/file.php @@ -4,19 +4,19 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class cache_file extends cache_common { - var $used = true; - var $engine = 'Filecache'; - var $dir = null; - var $prefix = null; + public $used = true; + public $engine = 'Filecache'; + public $dir = null; + public $prefix = null; - function cache_file ($dir, $prefix = null) + public function __construct ($dir, $prefix = null) { $this->dir = $dir; $this->prefix = $prefix; $this->dbg_enabled = sql_dbg_enabled(); } - function get ($name, $get_miss_key_callback = '', $ttl = 0) + public function get ($name, $get_miss_key_callback = '', $ttl = 0) { $filename = $this->dir . clean_filename($this->prefix . $name) . '.php'; @@ -34,7 +34,7 @@ class cache_file extends cache_common return (!empty($filecache['value'])) ? $filecache['value'] : false; } - function set ($name, $value, $ttl = 86400) + public function set ($name, $value, $ttl = 86400) { if (!function_exists('var_export')) { @@ -63,7 +63,7 @@ class cache_file extends cache_common return (bool) file_write($filecache, $filename, false, true, true); } - function rm ($name = '') + public function rm ($name = '') { $clear = false; if ($name) @@ -104,7 +104,7 @@ class cache_file extends cache_common return $clear; } - function gc ($expire_time = TIMENOW) + public function gc ($expire_time = TIMENOW) { $clear = false; @@ -133,4 +133,4 @@ class cache_file extends cache_common return $clear; } -} \ No newline at end of file +} diff --git a/library/includes/cache/memcache.php b/library/includes/cache/memcache.php index 0c76fecf6..c642638fd 100644 --- a/library/includes/cache/memcache.php +++ b/library/includes/cache/memcache.php @@ -4,14 +4,14 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class cache_memcache extends cache_common { - var $used = true; - var $engine = 'Memcache'; - var $cfg = null; - var $prefix = null; - var $memcache = null; - var $connected = false; + public $used = true; + public $engine = 'Memcache'; + public $cfg = null; + public $prefix = null; + public $memcache = null; + public $connected = false; - function cache_memcache ($cfg, $prefix = null) + public function __construct ($cfg, $prefix = null) { if (!$this->is_installed()) { @@ -24,7 +24,7 @@ class cache_memcache extends cache_common $this->dbg_enabled = sql_dbg_enabled(); } - function connect () + public function connect () { $connect_type = ($this->cfg['pconnect']) ? 'pconnect' : 'connect'; @@ -47,7 +47,7 @@ class cache_memcache extends cache_common $this->cur_query = null; } - function get ($name, $get_miss_key_callback = '', $ttl = 0) + public function get ($name, $get_miss_key_callback = '', $ttl = 0) { if (!$this->connected) $this->connect(); @@ -60,7 +60,7 @@ class cache_memcache extends cache_common return ($this->connected) ? $this->memcache->get($this->prefix . $name) : false; } - function set ($name, $value, $ttl = 0) + public function set ($name, $value, $ttl = 0) { if (!$this->connected) $this->connect(); @@ -73,7 +73,7 @@ class cache_memcache extends cache_common return ($this->connected) ? $this->memcache->set($this->prefix . $name, $value, false, $ttl) : false; } - function rm ($name = '') + public function rm ($name = '') { if (!$this->connected) $this->connect(); @@ -93,8 +93,8 @@ class cache_memcache extends cache_common } } - function is_installed () + public function is_installed () { return class_exists('Memcache'); } -} \ No newline at end of file +} diff --git a/library/includes/cache/redis.php b/library/includes/cache/redis.php index 431dade3a..489c1bec8 100644 --- a/library/includes/cache/redis.php +++ b/library/includes/cache/redis.php @@ -4,14 +4,14 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class cache_redis extends cache_common { - var $used = true; - var $engine = 'Redis'; - var $cfg = null; - var $redis = null; - var $prefix = null; - var $connected = false; + public $used = true; + public $engine = 'Redis'; + public $cfg = null; + public $redis = null; + public $prefix = null; + public $connected = false; - function cache_redis ($cfg, $prefix = null) + public function __construct ($cfg, $prefix = null) { if (!$this->is_installed()) { @@ -24,7 +24,7 @@ class cache_redis extends cache_common $this->dbg_enabled = sql_dbg_enabled(); } - function connect () + public function connect () { $this->cur_query = 'connect '. $this->cfg['host'] .':'. $this->cfg['port']; $this->debug('start'); @@ -43,7 +43,7 @@ class cache_redis extends cache_common $this->cur_query = null; } - function get ($name, $get_miss_key_callback = '', $ttl = 0) + public function get ($name, $get_miss_key_callback = '', $ttl = 0) { if (!$this->connected) $this->connect(); @@ -56,7 +56,7 @@ class cache_redis extends cache_common return ($this->connected) ? unserialize($this->redis->get($this->prefix . $name)) : false; } - function set ($name, $value, $ttl = 0) + public function set ($name, $value, $ttl = 0) { if (!$this->connected) $this->connect(); @@ -82,7 +82,7 @@ class cache_redis extends cache_common } } - function rm ($name = '') + public function rm ($name = '') { if (!$this->connected) $this->connect(); @@ -102,8 +102,8 @@ class cache_redis extends cache_common } } - function is_installed () + public function is_installed () { return class_exists('Redis'); } -} \ No newline at end of file +} diff --git a/library/includes/cache/sqlite.php b/library/includes/cache/sqlite.php index cc9004bcf..9abbc9a9b 100644 --- a/library/includes/cache/sqlite.php +++ b/library/includes/cache/sqlite.php @@ -4,10 +4,10 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class cache_sqlite extends cache_common { - var $used = true; - var $db = null; - var $prefix = null; - var $cfg = array( + public $used = true; + public $db = null; + public $prefix = null; + public $cfg = array( 'db_file_path' => '/path/to/cache.db.sqlite', 'table_name' => 'cache', 'table_schema' => 'CREATE TABLE cache ( @@ -21,7 +21,7 @@ class cache_sqlite extends cache_common 'log_name' => 'CACHE', ); - function cache_sqlite ($cfg, $prefix = null) + function __construct ($cfg, $prefix = null) { $this->cfg = array_merge($this->cfg, $cfg); $this->db = new sqlite_common($this->cfg); @@ -111,7 +111,7 @@ class cache_sqlite extends cache_common class sqlite_common extends cache_common { - var $cfg = array( + public $cfg = array( 'db_file_path' => 'sqlite.db', 'table_name' => 'table_name', 'table_schema' => 'CREATE TABLE table_name (...)', @@ -121,20 +121,20 @@ class sqlite_common extends cache_common 'shard_type' => 'none', # none, string, int (тип перевичного ключа для шардинга) 'shard_val' => 0, # для string - кол. начальных символов, для int - делитель (будет использован остаток от деления) ); - var $engine = 'SQLite'; - var $dbh = null; - var $connected = false; - var $shard_val = false; + public $engine = 'SQLite'; + public $dbh = null; + public $connected = false; + public $shard_val = false; - var $table_create_attempts = 0; + public $table_create_attempts = 0; - function sqlite_common ($cfg) + public function __construct ($cfg) { $this->cfg = array_merge($this->cfg, $cfg); $this->dbg_enabled = sql_dbg_enabled(); } - function connect () + public function connect () { $this->cur_query = ($this->dbg_enabled) ? 'connect to: '. $this->cfg['db_file_path'] : 'connect'; $this->debug('start'); @@ -155,13 +155,13 @@ class sqlite_common extends cache_common $this->cur_query = null; } - function create_table () + public function create_table () { $this->table_create_attempts++; return $this->dbh->query($this->cfg['table_schema']); } - function shard ($name) + public function shard ($name) { $type = $this->cfg['shard_type']; @@ -193,7 +193,7 @@ class sqlite_common extends cache_common $this->cfg['db_file_path'] = str_replace('*', $shard_val, $this->cfg['db_file_path']); } - function query ($query) + public function query ($query) { if (!$this->connected) $this->connect(); @@ -229,13 +229,13 @@ class sqlite_common extends cache_common return $result; } - function fetch_row ($query) + public function fetch_row ($query) { $result = $this->query($query); return is_resource($result) ? $result->fetchArray(SQLITE3_ASSOC) : false; } - function fetch_rowset ($query) + public function fetch_rowset ($query) { $result = $this->query($query); $rowset = array(); @@ -246,22 +246,22 @@ class sqlite_common extends cache_common return $rowset; } - function changes () + public function changes () { return is_resource($this->dbh) ? $this->dbh->changes() : 0; } - function escape ($str) + public function escape ($str) { return SQLite3::escapeString($str); } - function get_error_msg () + public function get_error_msg () { return 'SQLite error #'. ($err_code = $this->dbh->lastErrorCode()) .': '. $this->dbh->lastErrorMsg(); } - function rm ($name = '') + public function rm ($name = '') { if ($name) { @@ -275,14 +275,14 @@ class sqlite_common extends cache_common return (bool) $result; } - function gc ($expire_time = TIMENOW) + public function gc ($expire_time = TIMENOW) { $result = $this->db->query("DELETE FROM ". $this->cfg['table_name'] ." WHERE cache_expire_time < $expire_time"); return ($result) ? sqlite_changes($this->db->dbh) : 0; } - function trigger_error ($msg = 'DB Error') + public function trigger_error ($msg = 'DB Error') { if (error_reporting()) trigger_error($msg, E_USER_ERROR); } -} \ No newline at end of file +} diff --git a/library/includes/cache/xcache.php b/library/includes/cache/xcache.php index b1e391f72..8da30667c 100644 --- a/library/includes/cache/xcache.php +++ b/library/includes/cache/xcache.php @@ -4,11 +4,11 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class cache_xcache extends cache_common { - var $used = true; - var $engine = 'XCache'; - var $prefix = null; + public $used = true; + public $engine = 'XCache'; + public $prefix = null; - function cache_xcache ($prefix = null) + public function __construct ($prefix = null) { if (!$this->is_installed()) { @@ -18,7 +18,7 @@ class cache_xcache extends cache_common $this->prefix = $prefix; } - function get ($name, $get_miss_key_callback = '', $ttl = 0) + public function get ($name, $get_miss_key_callback = '', $ttl = 0) { $this->cur_query = "cache->get('$name')"; $this->debug('start'); @@ -29,7 +29,7 @@ class cache_xcache extends cache_common return xcache_get($this->prefix . $name); } - function set ($name, $value, $ttl = 0) + public function set ($name, $value, $ttl = 0) { $this->cur_query = "cache->set('$name')"; $this->debug('start'); @@ -40,7 +40,7 @@ class cache_xcache extends cache_common return xcache_set($this->prefix . $name, $value, $ttl); } - function rm ($name = '') + public function rm ($name = '') { if ($name) { @@ -60,8 +60,8 @@ class cache_xcache extends cache_common } } - function is_installed () + public function is_installed () { return function_exists('xcache_get'); } -} \ No newline at end of file +} diff --git a/library/includes/classes/emailer.php b/library/includes/classes/emailer.php index 2ad378edf..43ea648a3 100644 --- a/library/includes/classes/emailer.php +++ b/library/includes/classes/emailer.php @@ -4,14 +4,14 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class emailer { - var $msg, $subject, $extra_headers; - var $addresses, $reply_to, $from; - var $use_smtp; + public $msg, $subject, $extra_headers; + public $addresses, $reply_to, $from; + public $use_smtp; - var $tpl_msg = array(); - var $vars = array(); + public $tpl_msg = array(); + public $vars = array(); - function emailer ($use_smtp/*$tpl_name, $sbj, $to_address*/) + public function __construct ($use_smtp/*$tpl_name, $sbj, $to_address*/) { global $bb_cfg; @@ -25,7 +25,7 @@ class emailer $this->email_address($to_address);*/ } - function set_default_vars () + public function set_default_vars () { global $bb_cfg; @@ -37,7 +37,7 @@ class emailer } // Resets all the data (address, template file, etc etc to default - function reset () + public function reset () { $this->addresses = array(); $this->msg = $this->extra_headers = ''; @@ -45,44 +45,44 @@ class emailer } // Sets an email address to send to - function email_address ($address) + public function email_address ($address) { $this->addresses['to'] = trim($address); } - function cc ($address) + public function cc ($address) { $this->addresses['cc'][] = trim($address); } - function bcc ($address) + public function bcc ($address) { $this->addresses['bcc'][] = trim($address); } - function replyto ($address) + public function replyto ($address) { $this->reply_to = trim($address); } - function from ($address) + public function from ($address) { $this->from = trim($address); } // set up subject for mail - function set_subject ($subject = '') + public function set_subject ($subject = '') { $this->subject = trim(preg_replace('#[\n\r]+#s', '', $subject)); } // set up extra mail headers - function extra_headers ($headers) + public function extra_headers ($headers) { $this->extra_headers .= trim($headers) . "\n"; } - function use_template ($template_file, $template_lang = '') + public function use_template ($template_file, $template_lang = '') { global $bb_cfg; @@ -125,13 +125,13 @@ class emailer } // assign variables - function assign_vars ($vars) + public function assign_vars ($vars) { $this->vars = array_merge($this->vars, $vars); } // Send the mail out to the recipients set previously in var $this->address - function send ($email_format = 'text') + public function send ($email_format = 'text') { global $bb_cfg, $userdata; @@ -225,7 +225,7 @@ class emailer return true; } - function encode ($str) + public function encode ($str) { if ($this->encoding == '') { @@ -241,4 +241,4 @@ class emailer return $start . $str . $end; } -} \ No newline at end of file +} diff --git a/library/includes/classes/recaptcha.php b/library/includes/classes/recaptcha.php index bdc7580ff..a1f972402 100644 --- a/library/includes/classes/recaptcha.php +++ b/library/includes/classes/recaptcha.php @@ -54,7 +54,7 @@ class ReCaptcha * * @param string $secret shared secret between site and ReCAPTCHA server. */ - function ReCaptcha($secret) + public function __construct($secret) { if ($secret == null || $secret == "") { die("To use Google reCAPTCHA you must get an API key from " . self::$_signupUrl . ""); @@ -136,4 +136,4 @@ class ReCaptcha return $recaptchaResponse; } -} \ No newline at end of file +} diff --git a/library/includes/classes/sitemap.php b/library/includes/classes/sitemap.php index c4632de9c..e3b7826a5 100644 --- a/library/includes/classes/sitemap.php +++ b/library/includes/classes/sitemap.php @@ -4,18 +4,18 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class sitemap { - var $home = ''; - var $limit = 0; - var $topic_priority = '0.5'; - var $stat_priority = '0.5'; - var $priority = '0.6'; - var $cat_priority = '0.7'; + public $home = ''; + public $limit = 0; + public $topic_priority = '0.5'; + public $stat_priority = '0.5'; + public $priority = '0.6'; + public $cat_priority = '0.7'; - function sitemap () { + public function __construct () { $this->home = make_url(); } - function build_map () { + public function build_map () { $map = "\n\n"; $map .= $this->get_static(); $map .= $this->get_forum(); @@ -25,7 +25,7 @@ class sitemap return $map; } - function build_index ($count) { + public function build_index ($count) { $lm = date('c'); $map = "\n\n"; $map .= "\n{$this->home}internal_data/sitemap/sitemap1.xml\n{$lm}\n\n"; @@ -38,7 +38,7 @@ class sitemap return $map; } - function build_stat () { + public function build_stat () { $map = "\n\n"; $map .= $this->get_static(); $map .= $this->get_forum(); @@ -47,7 +47,7 @@ class sitemap return $map; } - function build_map_topic ($n) { + public function build_map_topic ($n) { $map = "\n\n"; $map .= $this->get_topic($n); $map .= ""; @@ -55,7 +55,7 @@ class sitemap return $map; } - function get_forum () { + public function get_forum () { global $datastore; $this->priority = $this->cat_priority; @@ -81,7 +81,7 @@ class sitemap return $xml; } - function get_topic ($page = false) { + public function get_topic ($page = false) { global $datastore; $xml = ''; @@ -119,7 +119,7 @@ class sitemap return $xml; } - function get_static () { + public function get_static () { global $bb_cfg; $xml = ''; @@ -142,7 +142,7 @@ class sitemap return $xml; } - function get_xml ($loc, $lm) { + public function get_xml ($loc, $lm) { $xml = "\t\n"; $xml .= "\t\t$loc\n"; $xml .= "\t\t$lm\n"; @@ -152,7 +152,7 @@ class sitemap return $xml; } - function send_url ($url, $map) { + public function send_url ($url, $map) { $data = false; $file = $url.urlencode($map); @@ -174,7 +174,7 @@ class sitemap } } - function create () { + public function create () { $row = DB()->fetch_row("SELECT COUNT(*) AS count FROM " . BB_TOPICS); if (!$this->limit) $this->limit = $row['count']; @@ -214,4 +214,4 @@ class sitemap $params['sitemap_time'] = TIMENOW; bb_update_config($params); } -} \ No newline at end of file +} diff --git a/library/includes/core/caches.php b/library/includes/core/caches.php index ac10299ce..84da880b8 100644 --- a/library/includes/core/caches.php +++ b/library/includes/core/caches.php @@ -4,17 +4,17 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class CACHES { - var $cfg = array(); // конфиг - var $obj = array(); // кеш-объекты - var $ref = array(); // ссылки на $obj (имя_кеша => кеш_объект) + public $cfg = array(); // конфиг + public $obj = array(); // кеш-объекты + public $ref = array(); // ссылки на $obj (имя_кеша => кеш_объект) - function CACHES ($cfg) + public function __construct ($cfg) { $this->cfg = $cfg['cache']; $this->obj['__stub'] = new cache_common(); } - function get_cache_obj ($cache_name) + public function get_cache_obj ($cache_name) { if (!isset($this->ref[$cache_name])) { @@ -99,7 +99,7 @@ class CACHES return $this->ref[$cache_name]; } - function get_db_path ($name, $cfg, $ext) + public function get_db_path ($name, $cfg, $ext) { if (!empty($cfg['shard_type']) && $cfg['shard_type'] != 'none') { @@ -111,8 +111,8 @@ class CACHES } } - function get_table_schema ($cfg) + public function get_table_schema ($cfg) { return "CREATE TABLE {$cfg['table_name']} ( {$cfg['columns']} )"; } -} \ No newline at end of file +} diff --git a/library/includes/core/dbs.php b/library/includes/core/dbs.php index a3e9ef913..048597d16 100644 --- a/library/includes/core/dbs.php +++ b/library/includes/core/dbs.php @@ -4,17 +4,17 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class DBS { - var $cfg = array(); // $srv_name => $srv_cfg - var $srv = array(); // $srv_name => $db_obj - var $alias = array(); // $srv_alias => $srv_name + public $cfg = array(); // $srv_name => $srv_cfg + public $srv = array(); // $srv_name => $db_obj + public $alias = array(); // $srv_alias => $srv_name - var $log_file = 'sql_queries'; - var $log_counter = 0; - var $num_queries = 0; - var $sql_inittime = 0; - var $sql_timetotal = 0; + public $log_file = 'sql_queries'; + public $log_counter = 0; + public $num_queries = 0; + public $sql_inittime = 0; + public $sql_timetotal = 0; - function DBS ($cfg) + public function __construct ($cfg) { $this->cfg = $cfg['db']; $this->alias = $cfg['db_alias']; @@ -26,7 +26,7 @@ class DBS } // получение/инициализация класса для сервера $srv_name - function get_db_obj ($srv_name_or_alias = 'db1') + public function get_db_obj ($srv_name_or_alias = 'db1') { $srv_name = $this->get_srv_name($srv_name_or_alias); @@ -39,7 +39,7 @@ class DBS } // определение имени сервера - function get_srv_name ($name) + public function get_srv_name ($name) { if (isset($this->alias[$name])) { @@ -55,4 +55,4 @@ class DBS } return $srv_name; } -} \ No newline at end of file +} diff --git a/library/includes/core/mysql.php b/library/includes/core/mysql.php index 1efc207ea..385488f36 100644 --- a/library/includes/core/mysql.php +++ b/library/includes/core/mysql.php @@ -4,41 +4,41 @@ if (!defined('SQL_DEBUG')) die(basename(__FILE__)); class sql_db { - var $cfg = array(); - var $cfg_keys = array('dbhost', 'dbname', 'dbuser', 'dbpasswd', 'charset', 'persist'); - var $link = null; - var $result = null; - var $db_server = ''; - var $selected_db = null; - var $inited = false; + public $cfg = array(); + public $cfg_keys = array('dbhost', 'dbname', 'dbuser', 'dbpasswd', 'charset', 'persist'); + private $link = null; + public $result = null; + public $db_server = ''; + public $selected_db = null; + public $inited = false; - var $locked = false; - var $locks = array(); + public $locked = false; + public $locks = array(); - var $num_queries = 0; - var $sql_starttime = 0; - var $sql_inittime = 0; - var $sql_timetotal = 0; - var $cur_query_time = 0; - var $slow_time = 0; + public $num_queries = 0; + public $sql_starttime = 0; + public $sql_inittime = 0; + public $sql_timetotal = 0; + public $cur_query_time = 0; + public $slow_time = 0; - var $dbg = array(); - var $dbg_id = 0; - var $dbg_enabled = false; - var $cur_query = null; + public $dbg = array(); + public $dbg_id = 0; + public $dbg_enabled = false; + public $cur_query = null; - var $do_explain = false; - var $explain_hold = ''; - var $explain_out = ''; + public $do_explain = false; + public $explain_hold = ''; + public $explain_out = ''; - var $shutdown = array(); + public $shutdown = array(); - var $DBS = array(); + public $DBS = array(); /** * Constructor */ - function sql_db ($cfg_values) + public function __construct ($cfg_values) { global $DBS; @@ -58,16 +58,13 @@ class sql_db /** * Initialize connection */ - function init () + public function init () { // Connect to server - $this->link = $this->connect(); - - // Select database - $this->selected_db = $this->select_db(); + $this->connect(); // Set charset - if ($this->cfg['charset'] && !@mysql_set_charset($this->cfg['charset'], $this->link)) + if ($this->cfg['charset'] && !mysqli_set_charset($this->link, $this->cfg['charset'])) { if (!$this->sql_query("SET NAMES {$this->cfg['charset']}")) { @@ -84,14 +81,15 @@ class sql_db /** * Open connection */ - function connect () + public function connect () { - $this->cur_query = ($this->dbg_enabled) ? ($this->cfg['persist'] ? 'p' : '') . "connect to: {$this->cfg['dbhost']}" : 'connect'; + $this->cur_query = ($this->dbg_enabled) ? "connect to: {$this->cfg['dbhost']}" : 'connect'; $this->debug('start'); - $connect_type = ($this->cfg['persist']) ? 'mysql_pconnect' : 'mysql_connect'; + $p = ((bool)$this->cfg['persist']) ? 'p:' : ''; + $this->link = mysqli_connect($p . $this->cfg['dbhost'], $this->cfg['dbuser'], $this->cfg['dbpasswd'], $this->cfg['dbname']); - if (!$link = @$connect_type($this->cfg['dbhost'], $this->cfg['dbuser'], $this->cfg['dbpasswd'])) + if (mysqli_connect_error()) { $server = (DBG_USER) ? $this->cfg['dbhost'] : ''; header("HTTP/1.0 503 Service Unavailable"); @@ -103,37 +101,14 @@ class sql_db $this->debug('stop'); $this->cur_query = null; - - return $link; - } - - /** - * Select database - */ - function select_db () - { - $this->cur_query = ($this->dbg_enabled) ? "select db: {$this->cfg['dbname']}" : 'select db'; - $this->debug('start'); - - if (!@mysql_select_db($this->cfg['dbname'], $this->link)) - { - $database = (DBG_USER) ? $this->cfg['dbhost'] : ''; - die("Could not select database $database"); - } - - $this->debug('stop'); - $this->cur_query = null; - - return $this->cfg['dbname']; } /** * Base query method */ - function sql_query ($query) + public function sql_query ($query) { - if (!is_resource($this->link)) - { + if (!$this->link) { $this->init(); } if (is_array($query)) @@ -147,7 +122,7 @@ class sql_db $this->cur_query = $query; $this->debug('start'); - if (!$this->result = mysql_query($query, $this->link)) + if (!$this->result = mysqli_query($this->link, $query)) { $this->log_error(); } @@ -167,7 +142,7 @@ class sql_db /** * Execute query WRAPPER (with error handling) */ - function query ($query) + public function query ($query) { if (!$result = $this->sql_query($query)) { @@ -180,13 +155,13 @@ class sql_db /** * Return number of rows */ - function num_rows ($result = false) + public function num_rows ($result = false) { $num_rows = false; if ($result OR $result = $this->result) { - $num_rows = is_resource($result) ? mysql_num_rows($result) : false; + $num_rows = $result instanceof mysqli_result ? mysqli_num_rows($result) : false; } return $num_rows; @@ -195,15 +170,15 @@ class sql_db /** * Return number of affected rows */ - function affected_rows () + public function affected_rows () { - return is_resource($this->link) ? mysql_affected_rows($this->link) : -1; + return mysqli_affected_rows($this->link); } /** * Fetch current field */ - function sql_fetchfield($field, $rownum = -1, $query_id = 0) + public function sql_fetchfield($field, $rownum = -1, $query_id = 0) { if(!$query_id) { @@ -213,7 +188,7 @@ class sql_db { if($rownum > -1) { - $result = @mysql_result($query_id, $rownum, $field); + $result = $this->sql_result($query_id, $rownum, $field); } else { @@ -244,12 +219,19 @@ class sql_db } } + private function sql_result(mysqli_result $res, $row, $field = 0) + { + $res->data_seek($row); + $dataRow = $res->fetch_array(); + return $dataRow[$field]; + } + /** * Fetch current row */ - function sql_fetchrow ($result, $field_name = '') + public function sql_fetchrow ($result, $field_name = '') { - $row = mysql_fetch_assoc($result); + $row = mysqli_fetch_assoc($result); if ($field_name) { @@ -264,7 +246,7 @@ class sql_db /** * Alias of sql_fetchrow() */ - function fetch_next ($result) + public function fetch_next ($result) { return $this->sql_fetchrow($result); } @@ -272,7 +254,7 @@ class sql_db /** * Fetch row WRAPPER (with error handling) */ - function fetch_row ($query, $field_name = '') + public function fetch_row ($query, $field_name = '') { if (!$result = $this->sql_query($query)) { @@ -285,11 +267,11 @@ class sql_db /** * Fetch all rows */ - function sql_fetchrowset ($result, $field_name = '') + public function sql_fetchrowset ($result, $field_name = '') { $rowset = array(); - while ($row = mysql_fetch_assoc($result)) + while ($row = mysqli_fetch_assoc($result)) { $rowset[] = ($field_name) ? $row[$field_name] : $row; } @@ -300,7 +282,7 @@ class sql_db /** * Fetch all rows WRAPPER (with error handling) */ - function fetch_rowset ($query, $field_name = '') + public function fetch_rowset ($query, $field_name = '') { if (!$result = $this->sql_query($query)) { @@ -313,7 +295,7 @@ class sql_db /** * Fetch all rows WRAPPER (with error handling) */ - function fetch_all ($query, $field_name = '') + public function fetch_all ($query, $field_name = '') { if (!$result = $this->sql_query($query)) { @@ -326,19 +308,21 @@ class sql_db /** * Get last inserted id after insert statement */ - function sql_nextid () + public function sql_nextid () { - return mysql_insert_id($this->link); + return mysqli_insert_id($this->link); } /** * Free sql result */ - function sql_freeresult ($result = false) + public function sql_freeresult ($result = false) { if ($result OR $result = $this->result) { - $return_value = is_resource($result) ? mysql_free_result($result) : false; + if ($result instanceof mysqli_result) { + mysqli_free_result($result); + } } $this->result = null; @@ -347,7 +331,7 @@ class sql_db /** * Escape data used in sql query */ - function escape ($v, $check_type = false, $dont_escape = false) + public function escape ($v, $check_type = false, $dont_escape = false) { if ($dont_escape) return $v; if (!$check_type) return $this->escape_string($v); @@ -367,14 +351,13 @@ class sql_db /** * Escape string */ - function escape_string ($str) + public function escape_string ($str) { - if (!is_resource($this->link)) - { + if (!$this->link) { $this->init(); } - return mysql_real_escape_string($str, $this->link); + return mysqli_real_escape_string($this->link, $str); } /** @@ -382,7 +365,7 @@ class sql_db * * Possible $query_type values: INSERT, INSERT_SELECT, MULTI_INSERT, UPDATE, SELECT */ - function build_array ($query_type, $input_ary, $data_already_escaped = false, $check_data_type_in_escape = true) + public function build_array ($query_type, $input_ary, $data_already_escaped = false, $check_data_type_in_escape = true) { $fields = $values = $ary = $query = array(); $dont_escape = $data_already_escaped; @@ -448,7 +431,7 @@ class sql_db return "\n". $query ."\n"; } - function get_empty_sql_array () + public function get_empty_sql_array () { return array( 'SELECT' => array(), @@ -464,7 +447,7 @@ class sql_db ); } - function build_sql ($sql_ary) + public function build_sql ($sql_ary) { $sql = ''; array_deep($sql_ary, 'array_unique', false, true); @@ -509,11 +492,10 @@ class sql_db /** * Return sql error array */ - function sql_error () + public function sql_error () { - if (is_resource($this->link)) - { - return array('code' => mysql_errno($this->link), 'message' => mysql_error($this->link)); + if ($this->link) { + return array('code' => mysqli_errno($this->link), 'message' => mysqli_error($this->link)); } else { @@ -524,10 +506,9 @@ class sql_db /** * Close sql connection */ - function close () + public function close () { - if (is_resource($this->link)) - { + if ($this->link) { $this->unlock(); if (!empty($this->locks)) @@ -540,7 +521,7 @@ class sql_db $this->exec_shutdown_queries(); - mysql_close($this->link); + mysqli_close($this->link); } $this->link = $this->selected_db = null; @@ -549,7 +530,7 @@ class sql_db /** * Add shutdown query */ - function add_shutdown_query ($sql) + public function add_shutdown_query ($sql) { $this->shutdown['__sql'][] = $sql; } @@ -557,7 +538,7 @@ class sql_db /** * Exec shutdown queries */ - function exec_shutdown_queries () + public function exec_shutdown_queries () { if (empty($this->shutdown)) return; @@ -579,7 +560,7 @@ class sql_db /** * Lock tables */ - function lock ($tables, $lock_type = 'WRITE') + public function lock ($tables, $lock_type = 'WRITE') { if ($this->cfg['persist']) { @@ -603,7 +584,7 @@ class sql_db /** * Unlock tables */ - function unlock () + public function unlock () { if ($this->locked && $this->sql_query("UNLOCK TABLES")) { @@ -616,7 +597,7 @@ class sql_db /** * Obtain user level lock */ - function get_lock ($name, $timeout = 0) + public function get_lock ($name, $timeout = 0) { $lock_name = $this->get_lock_name($name); $timeout = (int) $timeout; @@ -633,7 +614,7 @@ class sql_db /** * Obtain user level lock status */ - function release_lock ($name) + public function release_lock ($name) { $lock_name = $this->get_lock_name($name); $row = $this->fetch_row("SELECT RELEASE_LOCK('$lock_name') AS lock_result"); @@ -649,7 +630,7 @@ class sql_db /** * Release user level lock */ - function is_free_lock ($name) + public function is_free_lock ($name) { $lock_name = $this->get_lock_name($name); $row = $this->fetch_row("SELECT IS_FREE_LOCK('$lock_name') AS lock_result"); @@ -659,7 +640,7 @@ class sql_db /** * Make per db unique lock name */ - function get_lock_name ($name) + public function get_lock_name ($name) { if (!$this->selected_db) { @@ -672,7 +653,7 @@ class sql_db /** * Get info about last query */ - function query_info () + public function query_info () { $info = array(); @@ -681,7 +662,7 @@ class sql_db $info[] = "$num rows"; } - if (is_resource($this->link) AND $ext = mysql_info($this->link)) + if ($this->link AND $ext = mysqli_info($this->link)) { $info[] = "$ext"; } @@ -690,15 +671,15 @@ class sql_db $info[] = "$aff rows"; } - return str_compact(join(', ', $info)); + return str_compact(implode(', ', $info)); } /** * Get server version */ - function server_version () + public function server_version () { - preg_match('#^(\d+\.\d+\.\d+).*#', mysql_get_server_info(), $m); + preg_match('#^(\d+\.\d+\.\d+).*#', mysqli_get_server_info($this->link), $m); return $m[1]; } @@ -706,7 +687,7 @@ class sql_db * Set slow query marker for xx seconds * This will disable counting other queries as "slow" during this time */ - function expect_slow_query ($ignoring_time = 60, $new_priority = 10) + public function expect_slow_query ($ignoring_time = 60, $new_priority = 10) { if ($old_priority = CACHE('bb_cache')->get('dont_log_slow_query')) { @@ -723,7 +704,7 @@ class sql_db /** * Store debug info */ - function debug ($mode) + public function debug ($mode) { if (!SQL_DEBUG) return; @@ -787,7 +768,7 @@ class sql_db /** * Trigger error */ - function trigger_error ($msg = 'DB Error') + public function trigger_error ($msg = 'DB Error') { if (error_reporting()) { @@ -808,7 +789,7 @@ class sql_db /** * Find caller source */ - function debug_find_source ($mode = '') + public function debug_find_source ($mode = '') { foreach (debug_backtrace() as $trace) { @@ -828,7 +809,7 @@ class sql_db /** * Prepare for logging */ - function log_next_query ($queries_count = 1, $log_file = 'sql_queries') + public function log_next_query ($queries_count = 1, $log_file = 'sql_queries') { $this->DBS['log_file'] = $log_file; $this->DBS['log_counter'] = $queries_count; @@ -837,7 +818,7 @@ class sql_db /** * Log query */ - function log_query ($log_file = 'sql_queries') + public function log_query ($log_file = 'sql_queries') { $q_time = ($this->cur_query_time >= 10) ? round($this->cur_query_time, 0) : sprintf('%.4f', $this->cur_query_time); $msg = array(); @@ -858,7 +839,7 @@ class sql_db /** * Log slow query */ - function log_slow_query ($log_file = 'sql_slow_bb') + public function log_slow_query ($log_file = 'sql_slow_bb') { if (!defined('IN_FIRST_SLOW_QUERY') && CACHE('bb_cache')->get('dont_log_slow_query')) { @@ -870,7 +851,7 @@ class sql_db /** * Log error */ - function log_error () + public function log_error () { if (!SQL_LOG_ERRORS) return; @@ -896,7 +877,7 @@ class sql_db /** * Explain queries (based on code from phpBB3) */ - function explain ($mode, $html_table = '', $row = '') + public function explain ($mode, $html_table = '', $row = '') { $query = str_compact($this->cur_query); // remove comments @@ -920,9 +901,9 @@ class sql_db { $html_table = false; - if ($result = @mysql_query("EXPLAIN $query", $this->link)) + if ($result = mysqli_query($this->link, "EXPLAIN $query")) { - while ($row = @mysql_fetch_assoc($result)) + while ($row = mysqli_fetch_assoc($result)) { $html_table = $this->explain('add_explain_row', $html_table, $row); } @@ -981,4 +962,4 @@ class sql_db break; } } -} \ No newline at end of file +} diff --git a/library/includes/datastore/apc.php b/library/includes/datastore/apc.php index 03a52c1f2..bd895079c 100644 --- a/library/includes/datastore/apc.php +++ b/library/includes/datastore/apc.php @@ -4,10 +4,10 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class datastore_apc extends datastore_common { - var $engine = 'APC'; - var $prefix = null; + public $engine = 'APC'; + public $prefix = null; - function datastore_apc ($prefix = null) + public function __construct ($prefix = null) { if (!$this->is_installed()) { @@ -17,7 +17,7 @@ class datastore_apc extends datastore_common $this->prefix = $prefix; } - function store ($title, $var) + public function store ($title, $var) { $this->data[$title] = $var; @@ -30,7 +30,7 @@ class datastore_apc extends datastore_common return (bool) apc_store($this->prefix . $title, $var); } - function clean () + public function clean () { foreach ($this->known_items as $title => $script_name) { @@ -44,7 +44,7 @@ class datastore_apc extends datastore_common } } - function _fetch_from_store () + public function _fetch_from_store () { if (!$items = $this->queued_items) { @@ -64,8 +64,8 @@ class datastore_apc extends datastore_common } } - function is_installed () + public function is_installed () { return function_exists('apc_fetch'); } -} \ No newline at end of file +} diff --git a/library/includes/datastore/common.php b/library/includes/datastore/common.php index 8b7232582..dc6b4acd7 100644 --- a/library/includes/datastore/common.php +++ b/library/includes/datastore/common.php @@ -7,24 +7,24 @@ class datastore_common /** * Директория с builder-скриптами (внутри INC_DIR) */ - var $ds_dir = 'datastore/'; + public $ds_dir = 'datastore/'; /** * Готовая к употреблению data * array('title' => data) */ - var $data = array(); + public $data = array(); /** * Список элементов, которые будут извлечены из хранилища при первом же запросе get() * до этого момента они ставятся в очередь $queued_items для дальнейшего извлечения _fetch()'ем * всех элементов одним запросом * array('title1', 'title2'...) */ - var $queued_items = array(); + public $queued_items = array(); /** * 'title' => 'builder script name' inside "includes/datastore" dir */ - var $known_items = array( + public $known_items = array( 'cat_forums' => 'build_cat_forums.php', 'jumpbox' => 'build_cat_forums.php', 'viewtopic_forum_select' => 'build_cat_forums.php', @@ -41,12 +41,12 @@ class datastore_common /** * Constructor */ - function datastore_common () {} + public function __construct () {} /** * @param array(item1_title, item2_title...) or single item's title */ - function enqueue ($items) + public function enqueue ($items) { foreach ((array) $items as $item) { @@ -58,7 +58,7 @@ class datastore_common } } - function &get ($title) + public function &get ($title) { if (!isset($this->data[$title])) { @@ -68,9 +68,9 @@ class datastore_common return $this->data[$title]; } - function store ($item_name, $item_data) {} + public function store ($item_name, $item_data) {} - function rm ($items) + public function rm ($items) { foreach ((array) $items as $item) { @@ -78,7 +78,7 @@ class datastore_common } } - function update ($items) + public function update ($items) { if ($items == 'all') { @@ -90,7 +90,7 @@ class datastore_common } } - function _fetch () + public function _fetch () { $this->_fetch_from_store(); @@ -105,9 +105,9 @@ class datastore_common $this->queued_items = array(); } - function _fetch_from_store () {} + public function _fetch_from_store () {} - function _build_item ($title) + public function _build_item ($title) { if (!empty($this->known_items[$title])) { @@ -119,18 +119,18 @@ class datastore_common } } - var $num_queries = 0; - var $sql_starttime = 0; - var $sql_inittime = 0; - var $sql_timetotal = 0; - var $cur_query_time = 0; + public $num_queries = 0; + public $sql_starttime = 0; + public $sql_inittime = 0; + public $sql_timetotal = 0; + public $cur_query_time = 0; - var $dbg = array(); - var $dbg_id = 0; - var $dbg_enabled = false; - var $cur_query = null; + public $dbg = array(); + public $dbg_id = 0; + public $dbg_enabled = false; + public $cur_query = null; - function debug ($mode, $cur_query = null) + public function debug ($mode, $cur_query = null) { if (!$this->dbg_enabled) return; @@ -156,7 +156,7 @@ class datastore_common } } - function debug_find_source ($mode = '') + public function debug_find_source ($mode = '') { foreach (debug_backtrace() as $trace) { @@ -172,4 +172,4 @@ class datastore_common } return 'src not found'; } -} \ No newline at end of file +} diff --git a/library/includes/datastore/file.php b/library/includes/datastore/file.php index 8eeddb7d5..3c42e95c0 100644 --- a/library/includes/datastore/file.php +++ b/library/includes/datastore/file.php @@ -4,18 +4,18 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class datastore_file extends datastore_common { - var $dir = null; - var $prefix = null; - var $engine = 'Filecache'; + public $dir = null; + public $prefix = null; + public $engine = 'Filecache'; - function datastore_file ($dir, $prefix = null) + public function __construct ($dir, $prefix = null) { $this->prefix = $prefix; $this->dir = $dir; $this->dbg_enabled = sql_dbg_enabled(); } - function store ($title, $var) + public function store ($title, $var) { $this->cur_query = "cache->set('$title')"; $this->debug('start'); @@ -36,7 +36,7 @@ class datastore_file extends datastore_common return (bool) file_write($filecache, $filename, false, true, true); } - function clean () + public function clean () { $dir = $this->dir; @@ -58,7 +58,7 @@ class datastore_file extends datastore_common } } - function _fetch_from_store () + public function _fetch_from_store () { if (!$items = $this->queued_items) { @@ -84,4 +84,4 @@ class datastore_file extends datastore_common } } } -} \ No newline at end of file +} diff --git a/library/includes/datastore/memcache.php b/library/includes/datastore/memcache.php index 96fdf9242..2900b6ff7 100644 --- a/library/includes/datastore/memcache.php +++ b/library/includes/datastore/memcache.php @@ -4,13 +4,13 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class datastore_memcache extends datastore_common { - var $cfg = null; - var $memcache = null; - var $connected = false; - var $engine = 'Memcache'; - var $prefix = null; + public $cfg = null; + public $memcache = null; + public $connected = false; + public $engine = 'Memcache'; + public $prefix = null; - function datastore_memcache ($cfg, $prefix = null) + public function __construct ($cfg, $prefix = null) { if (!$this->is_installed()) { @@ -23,7 +23,7 @@ class datastore_memcache extends datastore_common $this->dbg_enabled = sql_dbg_enabled(); } - function connect () + public function connect () { $connect_type = ($this->cfg['pconnect']) ? 'pconnect' : 'connect'; @@ -46,7 +46,7 @@ class datastore_memcache extends datastore_common $this->cur_query = null; } - function store ($title, $var) + public function store ($title, $var) { if (!$this->connected) $this->connect(); $this->data[$title] = $var; @@ -60,7 +60,7 @@ class datastore_memcache extends datastore_common return (bool) $this->memcache->set($this->prefix . $title, $var); } - function clean () + public function clean () { if (!$this->connected) $this->connect(); foreach ($this->known_items as $title => $script_name) @@ -75,7 +75,7 @@ class datastore_memcache extends datastore_common } } - function _fetch_from_store () + public function _fetch_from_store () { if (!$items = $this->queued_items) { @@ -96,8 +96,8 @@ class datastore_memcache extends datastore_common } } - function is_installed () + public function is_installed () { return class_exists('Memcache'); } -} \ No newline at end of file +} diff --git a/library/includes/datastore/redis.php b/library/includes/datastore/redis.php index 10b71019d..fdebadf69 100644 --- a/library/includes/datastore/redis.php +++ b/library/includes/datastore/redis.php @@ -4,13 +4,13 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class datastore_redis extends datastore_common { - var $cfg = null; - var $redis = null; - var $prefix = null; - var $connected = false; - var $engine = 'Redis'; + public $cfg = null; + public $redis = null; + public $prefix = null; + public $connected = false; + public $engine = 'Redis'; - function datastore_redis ($cfg, $prefix = null) + public function __construct ($cfg, $prefix = null) { if (!$this->is_installed()) { @@ -23,7 +23,7 @@ class datastore_redis extends datastore_common $this->prefix = $prefix; } - function connect () + public function connect () { $this->cur_query = 'connect '. $this->cfg['host'] .':'. $this->cfg['port']; $this->debug('start'); @@ -42,7 +42,7 @@ class datastore_redis extends datastore_common $this->cur_query = null; } - function store ($title, $var) + public function store ($title, $var) { if (!$this->connected) $this->connect(); $this->data[$title] = $var; @@ -56,7 +56,7 @@ class datastore_redis extends datastore_common return (bool) $this->redis->set($this->prefix . $title, serialize($var)); } - function clean () + public function clean () { if (!$this->connected) $this->connect(); foreach ($this->known_items as $title => $script_name) @@ -71,7 +71,7 @@ class datastore_redis extends datastore_common } } - function _fetch_from_store () + public function _fetch_from_store () { if (!$items = $this->queued_items) { @@ -92,8 +92,8 @@ class datastore_redis extends datastore_common } } - function is_installed () + public function is_installed () { return class_exists('Redis'); } -} \ No newline at end of file +} diff --git a/library/includes/datastore/sqlite.php b/library/includes/datastore/sqlite.php index ecc5616e1..896337b0f 100644 --- a/library/includes/datastore/sqlite.php +++ b/library/includes/datastore/sqlite.php @@ -4,10 +4,10 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class datastore_sqlite extends datastore_common { - var $engine = 'SQLite'; - var $db = null; - var $prefix = null; - var $cfg = array( + public $engine = 'SQLite'; + public $db = null; + public $prefix = null; + public $cfg = array( 'db_file_path' => '/path/to/datastore.db.sqlite', 'table_name' => 'datastore', 'table_schema' => 'CREATE TABLE datastore ( @@ -20,14 +20,14 @@ class datastore_sqlite extends datastore_common 'log_name' => 'DATASTORE', ); - function datastore_sqlite ($cfg, $prefix = null) + public function __construct ($cfg, $prefix = null) { $this->cfg = array_merge($this->cfg, $cfg); $this->db = new sqlite_common($this->cfg); $this->prefix = $prefix; } - function store ($item_name, $item_data) + public function store ($item_name, $item_data) { $this->data[$item_name] = $item_data; @@ -39,12 +39,12 @@ class datastore_sqlite extends datastore_common return (bool) $result; } - function clean () + public function clean () { $this->db->query("DELETE FROM ". $this->cfg['table_name']); } - function _fetch_from_store () + public function _fetch_from_store () { if (!$items = $this->queued_items) return; @@ -63,4 +63,4 @@ class datastore_sqlite extends datastore_common } $this->db->debug('stop'); } -} \ No newline at end of file +} diff --git a/library/includes/datastore/xcache.php b/library/includes/datastore/xcache.php index 2bd5f3fb8..57a703550 100644 --- a/library/includes/datastore/xcache.php +++ b/library/includes/datastore/xcache.php @@ -4,10 +4,10 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class datastore_xcache extends datastore_common { - var $prefix = null; - var $engine = 'XCache'; + public $prefix = null; + public $engine = 'XCache'; - function datastore_xcache ($prefix = null) + public function __construct ($prefix = null) { if (!$this->is_installed()) { @@ -18,7 +18,7 @@ class datastore_xcache extends datastore_common $this->prefix = $prefix; } - function store ($title, $var) + public function store ($title, $var) { $this->data[$title] = $var; @@ -31,7 +31,7 @@ class datastore_xcache extends datastore_common return (bool) xcache_set($this->prefix . $title, $var); } - function clean () + public function clean () { foreach ($this->known_items as $title => $script_name) { @@ -45,7 +45,7 @@ class datastore_xcache extends datastore_common } } - function _fetch_from_store () + public function _fetch_from_store () { if (!$items = $this->queued_items) { @@ -65,8 +65,8 @@ class datastore_xcache extends datastore_common } } - function is_installed () + public function is_installed () { return function_exists('xcache_get'); } -} \ No newline at end of file +} diff --git a/library/includes/functions.php b/library/includes/functions.php index d4db85468..0f6aef96a 100644 --- a/library/includes/functions.php +++ b/library/includes/functions.php @@ -118,13 +118,13 @@ function is_unread ($ref, $topic_id = 0, $forum_id = 0) // class ads_common { - var $ad_blocks = array(); - var $active_ads = array(); + public $ad_blocks = array(); + public $active_ads = array(); /** * Constructor */ - function ads_common () + function __construct () { global $bb_cfg; @@ -536,18 +536,18 @@ function auth_check ($bf_ary, $bf_key, $perm_ary, $perm_key, $is_admin = false) class Date_Delta { - var $auto_granularity = array( + public $auto_granularity = array( 60 => 'seconds', // set granularity to "seconds" if delta less then 1 minute 10800 => 'minutes', // 3 hours 259200 => 'hours', // 3 days 31363200 => 'mday', // 12 months 311040000 => 'mon', // 10 years ); - var $intervals = array(); - var $format = ''; + public $intervals = array(); + public $format = ''; // Creates new object. - function Date_Delta() + function __construct() { global $lang; @@ -694,11 +694,11 @@ function get_select ($select, $selected = null, $return_as = 'html', $first_opt class html_common { - var $options = ''; - var $attr = array(); - var $cur_attr = null; - var $max_length = HTML_SELECT_MAX_LENGTH; - var $selected = array(); + public $options = ''; + public $attr = array(); + public $cur_attr = null; + public $max_length = HTML_SELECT_MAX_LENGTH; + public $selected = array(); function build_select ($name, $params, $selected = null, $max_length = HTML_SELECT_MAX_LENGTH, $multiple_size = null, $js = '') { @@ -2106,7 +2106,7 @@ function cat_exists ($cat_id) // class log_action { - var $log_type = array( + public $log_type = array( # LOG_TYPE_NAME LOG_TYPE_ID 'mod_topic_delete' => 1, 'mod_topic_move' => 2, @@ -2118,10 +2118,10 @@ class log_action 'adm_user_ban' => 8, 'adm_user_unban' => 9, ); - var $log_type_select = array(); - var $log_disabled = false; + public $log_type_select = array(); + public $log_disabled = false; - function init () + public function init () { global $lang, $bb_cfg; @@ -2131,7 +2131,7 @@ class log_action } } - function mod ($type_name, $args = array()) + public function mod ($type_name, $args = array()) { global $userdata; @@ -2178,7 +2178,7 @@ class log_action DB()->query("INSERT INTO ". BB_LOG ." $sql_args"); } - function admin ($type_name, $args = array()) + public function admin ($type_name, $args = array()) { $this->mod($type_name, $args); } @@ -2824,4 +2824,4 @@ function bb_captcha ($mode, $callback = '') bb_simple_die(__FUNCTION__ .": invalid mode '$mode'"); } return false; -} \ No newline at end of file +} diff --git a/library/includes/functions_upload.php b/library/includes/functions_upload.php index 9c2762217..2b5e4f346 100644 --- a/library/includes/functions_upload.php +++ b/library/includes/functions_upload.php @@ -4,28 +4,28 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); class upload_common { - var $cfg = array( + public $cfg = array( 'max_size' => 0, 'max_width' => 0, 'max_height' => 0, 'allowed_ext' => array(), 'upload_path' => '', ); - var $file = array( + public $file = array( 'name' => '', 'type' => '', 'size' => 0, 'tmp_name' => '', 'error' => UPLOAD_ERR_NO_FILE, ); - var $orig_name = ''; - var $file_path = ''; // Stored file path - var $file_ext = ''; - var $file_ext_id = ''; - var $file_size = ''; - var $ext_ids = array(); // array_flip($bb_cfg['file_id_ext']) - var $errors = array(); - var $img_types = array( + public $orig_name = ''; + public $file_path = ''; // Stored file path + public $file_ext = ''; + public $file_ext_id = ''; + public $file_size = ''; + public $ext_ids = array(); // array_flip($bb_cfg['file_id_ext']) + public $errors = array(); + public $img_types = array( 1 => 'gif', 2 => 'jpg', 3 => 'png', @@ -34,7 +34,7 @@ class upload_common 8 => 'tiff', ); - function init ($cfg = array(), $post_params = array(), $uploaded_only = true) + public function init ($cfg = array(), $post_params = array(), $uploaded_only = true) { global $bb_cfg, $lang; @@ -116,7 +116,7 @@ class upload_common return true; } - function store ($mode = '', $params = array()) + public function store ($mode = '', $params = array()) { if ($mode == 'avatar') { @@ -135,7 +135,7 @@ class upload_common } } - function _move ($file_path) + public function _move ($file_path) { $dir = dirname($file_path); if (!file_exists($dir)) @@ -159,4 +159,4 @@ class upload_common return file_exists($file_path); } -} \ No newline at end of file +} diff --git a/library/includes/sessions.php b/library/includes/sessions.php index d0e1c75d9..940a4723b 100644 --- a/library/includes/sessions.php +++ b/library/includes/sessions.php @@ -10,7 +10,7 @@ class user_common /** * Config */ - var $cfg = array( + public $cfg = array( 'req_login' => false, // requires user to be logged in 'req_session_admin' => false, // requires active admin session (for moderation or admin actions) ); @@ -18,7 +18,7 @@ class user_common /** * PHP-JS exchangeable options (JSON'ized as {USER_OPTIONS_JS} in TPL) */ - var $opt_js = array( + public $opt_js = array( 'only_new' => 0, // show ony new posts or topics 'h_av' => 0, // hide avatar 'h_rnk_i' => 0, // hide rank images @@ -36,7 +36,7 @@ class user_common /** * Defaults options for guests */ - var $opt_js_guest = array( + public $opt_js_guest = array( 'h_av' => 1, // hide avatar 'h_rnk_i' => 1, // hide rank images 'h_smile' => 1, // hide smilies @@ -46,7 +46,7 @@ class user_common /** * Sessiondata */ - var $sessiondata = array( + public $sessiondata = array( 'uk' => null, 'uid' => null, 'sid' => '', @@ -55,22 +55,22 @@ class user_common /** * Old $userdata */ - var $data = array(); + public $data = array(); /** * Shortcuts */ - var $id = null; + public $id = null; /** * Misc */ - var $show_ads = false; + public $show_ads = false; /** * Constructor */ - function user_common () + public function __construct () { $this->get_sessiondata(); } @@ -78,7 +78,7 @@ class user_common /** * Start session (restore existent session or create new) */ - function session_start ($cfg = array()) + public function session_start ($cfg = array()) { global $bb_cfg; @@ -214,7 +214,7 @@ class user_common /** * Create new session for the given user */ - function session_create ($userdata, $auto_created = false) + public function session_create ($userdata, $auto_created = false) { global $bb_cfg; @@ -333,7 +333,7 @@ class user_common /** * Initialize sessiondata stored in cookies */ - function session_end ($update_lastvisit = false, $set_cookie = true) + public function session_end ($update_lastvisit = false, $set_cookie = true) { DB()->query(" DELETE FROM ". BB_SESSIONS ." @@ -375,7 +375,7 @@ class user_common /** * Login */ - function login ($args, $mod_admin_login = false) + public function login ($args, $mod_admin_login = false) { $username = !empty($args['login_username']) ? clean_username($args['login_username']) : ''; $password = !empty($args['login_password']) ? $args['login_password'] : ''; @@ -440,7 +440,7 @@ class user_common /** * Initialize sessiondata stored in cookies */ - function get_sessiondata () + public function get_sessiondata () { $sd_resv = !empty($_COOKIE[COOKIE_DATA]) ? @unserialize($_COOKIE[COOKIE_DATA]) : array(); @@ -464,7 +464,7 @@ class user_common /** * Store sessiondata in cookies */ - function set_session_cookies ($user_id) + public function set_session_cookies ($user_id) { global $bb_cfg; @@ -506,7 +506,7 @@ class user_common /** * Verify autologin_id */ - function verify_autologin_id ($userdata, $expire_check = false, $create_new = true) + public function verify_autologin_id ($userdata, $expire_check = false, $create_new = true) { global $bb_cfg; @@ -533,7 +533,7 @@ class user_common /** * Create autologin_id */ - function create_autologin_id ($userdata, $create_new = true) + public function create_autologin_id ($userdata, $create_new = true) { $autologin_id = ($create_new) ? make_rand_str(LOGIN_KEY_LENGTH) : ''; @@ -550,7 +550,7 @@ class user_common /** * Set shortcuts */ - function set_shortcuts () + public function set_shortcuts () { $this->id =& $this->data['user_id']; $this->active =& $this->data['user_active']; @@ -566,7 +566,7 @@ class user_common /** * Initialise user settings */ - function init_userprefs () + public function init_userprefs () { global $bb_cfg, $theme, $lang, $DeltaTime; @@ -613,7 +613,7 @@ class user_common /** * Mark read */ - function mark_read ($type) + public function mark_read ($type) { if ($type === 'all_forums') { @@ -645,7 +645,7 @@ class user_common /** * Load misc options */ - function load_opt_js () + public function load_opt_js () { if (IS_GUEST) { @@ -665,7 +665,7 @@ class user_common /** * Get not auth forums */ - function get_not_auth_forums ($auth_type) + public function get_not_auth_forums ($auth_type) { global $datastore; @@ -725,7 +725,7 @@ class user_common /** * Get excluded forums */ - function get_excluded_forums ($auth_type, $return_as = 'csv') + public function get_excluded_forums ($auth_type, $return_as = 'csv') { $excluded = array(); @@ -764,7 +764,7 @@ class user_common /** * Enqueue ads */ - function enqueue_ads () + public function enqueue_ads () { global $datastore, $bb_cfg; @@ -869,4 +869,4 @@ function session_pagestart ($user_ip = USER_IP, $page_id = 0, $req_login = false $user->session_start(array('req_login' => $req_login)); return $user->data; -} \ No newline at end of file +} diff --git a/library/includes/template.php b/library/includes/template.php index 39e67ca21..9e66729f4 100644 --- a/library/includes/template.php +++ b/library/includes/template.php @@ -35,7 +35,7 @@ define('XS_TAG_BEGINELSE', 11); class Template { - var $classname = "Template"; + public $classname = "Template"; // variable that holds all the data we'll be substituting into // the compiled templates. @@ -45,76 +45,76 @@ class Template // if it's a root-level variable, it'll be like this: // $this->vars[varname] == value or $this->_tpldata['.'][0][varname] == value // array "vars" is added for easier access to data - var $_tpldata = array('.' => array(0 => array())); - var $vars; + public $_tpldata = array('.' => array(0 => array())); + public $vars; // Hash of filenames for each template handle. - var $files = array(); - var $files_cache = array(); // array of cache files that exists - var $files_cache2 = array(); // array of cache files (exists or not exists) + public $files = array(); + public $files_cache = array(); // array of cache files that exists + public $files_cache2 = array(); // array of cache files (exists or not exists) // Root template directory. - var $root = ''; + public $root = ''; // Cache directory - var $cachedir = CACHE_DIR; + public $cachedir = CACHE_DIR; // Template root directory - var $tpldir = ''; + public $tpldir = ''; // Default template directory. // If file for default template isn't found file from this template is used. - var $tpldef = 'default'; + public $tpldef = 'default'; // this will hash handle names to the compiled code for that handle. - var $compiled_code = array(); + public $compiled_code = array(); // This will hold the uncompiled code for that handle. - var $uncompiled_code = array(); + public $uncompiled_code = array(); // Cache settings - var $use_cache = 1; - var $cache_writable = 1; + public $use_cache = 1; + public $cache_writable = 1; // Auto-compile setting - var $auto_compile = 1; + public $auto_compile = 1; // Current template name - var $tpl = ''; - var $cur_tpl = ''; + public $tpl = ''; + public $cur_tpl = ''; // List of replacements. tpl files in this list will be replaced with other tpl files // according to configuration in xs.cfg - var $replace = array(); + public $replace = array(); // counter for include - var $include_count = 0; + public $include_count = 0; // extension tpl-cache files - var $cached_tpl_ext = 'php'; + public $cached_tpl_ext = 'php'; // eXtreme Styles variables - var $xs_started = 0; - var $xs_version = 8; // number version. internal. do not change. - var $xs_versiontxt = '2.3.1'; // text version + public $xs_started = 0; + public $xs_version = 8; // number version. internal. do not change. + public $xs_versiontxt = '2.3.1'; // text version // These handles will be parsed if pparse() is executed. // Can be used to automatically include header/footer if there is any content. - var $preparse = ''; - var $postparse = ''; + public $preparse = ''; + public $postparse = ''; // subtemplates mod detection - var $subtemplates = false; + public $subtemplates = false; // style configuration - var $style_config = array(); + public $style_config = array(); - var $lang = array(); + public $lang = array(); /** * Constructor. Installs XS mod on first run or updates it and sets the root dir. */ - function Template($root = '.') + public function __construct($root = '.') { global $bb_cfg, $lang; @@ -132,7 +132,7 @@ class Template * Destroys this template object. Should be called when you're done with it, in order * to clear out the template data so you can load/parse a new template set. */ - function destroy() + public function destroy() { $this->_tpldata = array('.' => array(0 => array())); $this->vars = &$this->_tpldata['.'][0]; @@ -144,7 +144,7 @@ class Template * be an absolute name, or a name relative to the rootdir for this Template * object. */ - function make_filename($filename, $xs_include = false) + public function make_filename($filename, $xs_include = false) { // Check replacements list if(!$xs_include && isset($this->replace[$filename])) @@ -167,7 +167,7 @@ class Template * Returns empty string if non-cachable (for tpl files outside of root dir). * $filename should be absolute filename */ - function make_filename_cache ($filename) + public function make_filename_cache ($filename) { $filename = clean_filename(str_replace(TEMPLATES_DIR, '', $filename)); @@ -178,7 +178,7 @@ class Template * Sets the template filenames for handles. $filename_array * should be a hash of handle => filename pairs. */ - function set_filenames ($filenames) + public function set_filenames ($filenames) { foreach ($filenames as $handle => $filename) { @@ -189,7 +189,7 @@ class Template /** * Assigns template filename for handle. */ - function set_filename($handle, $filename, $xs_include = false, $quiet = false) + public function set_filename($handle, $filename, $xs_include = false, $quiet = false) { $can_cache = $this->use_cache; $this->files[$handle] = $this->make_filename($filename, $xs_include); @@ -241,7 +241,7 @@ class Template /** * includes file or executes code */ - function execute($filename, $code, $handle) + public function execute($filename, $code, $handle) { $this->cur_tpl = $filename; @@ -265,7 +265,7 @@ class Template * and run the compiled code. This will print out * the results of executing the template. */ - function pparse($handle) + public function pparse($handle) { // parsing header if there is one if($this->preparse || $this->postparse) @@ -331,7 +331,7 @@ class Template /** * Precompile file */ - function precompile($template, $filename) + public function precompile($template, $filename) { global $precompile_num; if(empty($precompile_num)) @@ -389,7 +389,7 @@ class Template * Note that all desired assignments to the variables in $handle should be done * BEFORE calling this function. */ - function assign_var_from_handle($varname, $handle) + public function assign_var_from_handle($varname, $handle) { ob_start(); $res = $this->pparse($handle); @@ -403,7 +403,7 @@ class Template * variable assignments. Note that this should only be called once per block * iteration. */ - function assign_block_vars($blockname, $vararray) + public function assign_block_vars($blockname, $vararray) { if (strstr($blockname, '.')) { @@ -437,7 +437,7 @@ class Template * Root-level variable assignment. Adds to current assignments, overriding * any existing variable assignment with the same name. */ - function assign_vars ($vararray) + public function assign_vars ($vararray) { foreach ($vararray as $key => $val) { @@ -449,7 +449,7 @@ class Template * Root-level variable assignment. Adds to current assignments, overriding * any existing variable assignment with the same name. */ - function assign_var ($varname, $varval = true) + public function assign_var ($varname, $varval = true) { $this->vars[$varname] = $varval; } @@ -459,7 +459,7 @@ class Template * Root-level. Adds to current assignments, appends * to any existing variable assignment with the same name. */ - function append_vars ($vararray) + public function append_vars ($vararray) { foreach ($vararray as $key => $val) { @@ -471,7 +471,7 @@ class Template * If not already done, load the file for the given handle and populate * the uncompiled_code[] hash with its code. Do not compile. */ - function loadfile($handle) + public function loadfile($handle) { // If cached file exists do nothing - it will be included via include() if(!empty($this->files_cache[$handle])) @@ -510,7 +510,7 @@ class Template * It's ready to be inserted into an "echo" line in one of the templates. * NOTE: expects a trailing "." on the namespace. */ - function generate_block_varref($namespace, $varname) + public function generate_block_varref($namespace, $varname) { // Strip the trailing period. $namespace = substr($namespace, 0, strlen($namespace) - 1); @@ -535,7 +535,7 @@ class Template * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above. * NOTE: does not expect a trailing "." on the blockname. */ - function generate_block_data_ref($blockname, $include_last_iterator) + public function generate_block_data_ref($blockname, $include_last_iterator) { // Get an array of the blocks involved. $blocks = explode('.', $blockname); @@ -550,7 +550,7 @@ class Template } } - function compile_code($filename, $code) + public function compile_code($filename, $code) { // $filename - file to load code from. used if $code is empty // $code - tpl code @@ -905,7 +905,7 @@ class Template /* * Compile code between tags */ - function _compile_text($code) + public function _compile_text($code) { if(strlen($code) < 3) { @@ -942,7 +942,7 @@ class Template // Compile IF tags - much of this is from Smarty with // some adaptions for our block level methods // - function compile_tag_if($tag_args, $elseif) + public function compile_tag_if($tag_args, $elseif) { /* Tokenize args for 'if' tag. */ preg_match_all('/(?: @@ -1066,7 +1066,7 @@ class Template } // This is from Smarty - function _parse_is_expr($is_arg, $tokens) + public function _parse_is_expr($is_arg, $tokens) { $expr_end = 0; $negate_expr = false; @@ -1135,7 +1135,7 @@ class Template /** * Compiles code and writes to cache if needed */ - function compile2($code, $handle, $cache_file) + public function compile2($code, $handle, $cache_file) { $code = $this->compile_code('', $code, XS_USE_ISSET); if ($cache_file && !empty($this->use_cache) && !empty($this->auto_compile)) @@ -1158,7 +1158,7 @@ class Template * for use in assign_code_from_handle(). * This function isn't used and kept only for compatibility with original template.php */ - function compile($code, $do_not_echo = false, $retvar = '') + public function compile($code, $do_not_echo = false, $retvar = '') { $code = ' ?'.'>' . $this->compile_code('', $code, true) . '<'."?php \n"; if ($do_not_echo) @@ -1171,12 +1171,12 @@ class Template /** * Write cache to disk */ - function write_cache($filename, $code) + public function write_cache($filename, $code) { file_write($code, $filename, false, true, true); } - function xs_startup() + public function xs_startup() { global $bb_cfg; @@ -1197,9 +1197,9 @@ class Template } } - function lang_error($var) + public function lang_error($var) { trigger_error(basename($this->cur_tpl) ." : undefined language variable {L_{$var}}", E_USER_WARNING); return "Undefined: {L_{$var}}"; } -} \ No newline at end of file +} diff --git a/viewforum.php b/viewforum.php index 3cbee8594..0f14f94d1 100644 --- a/viewforum.php +++ b/viewforum.php @@ -497,7 +497,7 @@ foreach ($topic_rowset as $topic) 'TOR_STATUS_ICON' => isset($topic['tor_status']) ? $bb_cfg['tor_icons'][$topic['tor_status']] : '', 'TOR_STATUS_TEXT' => isset($topic['tor_status']) ? $lang['TOR_STATUS_NAME'][$topic['tor_status']] : '', - 'ATTACH' => $topic['topic_attachment'], + 'ATTACH' => isset($topic['topic_attachment']) ? $topic['topic_attachment'] : false, 'STATUS' => $topic['topic_status'], 'TYPE' => $topic['topic_type'], 'DL' => ($topic['topic_dl_type'] == TOPIC_DL_TYPE_DL && !$forum_data['allow_reg_tracker']), @@ -575,4 +575,4 @@ $template->assign_vars(array( 'PARENT_FORUM_NAME' => ($parent_id = $forum_data['forum_parent']) ? $forums['forum_name_html'][$parent_id] : '', )); -print_page('viewforum.tpl'); \ No newline at end of file +print_page('viewforum.tpl'); diff --git a/viewtopic.php b/viewtopic.php index f8d6ca00e..65b042de9 100644 --- a/viewtopic.php +++ b/viewtopic.php @@ -131,7 +131,7 @@ if ($userdata['session_admin'] && !empty($_REQUEST['mod'])) $datastore->enqueue(array('viewtopic_forum_select')); } } -if ($t_data['topic_attachment']) +if (isset($t_data['topic_attachment'])) { $datastore->enqueue(array( 'attach_extensions', @@ -604,7 +604,7 @@ $template->assign_vars(array( )); require(INC_DIR .'torrent_show_dl_list.php'); -if ($t_data['topic_attachment']) +if (isset($t_data['topic_attachment'])) { require(ATTACH_DIR .'attachment_mod.php'); init_display_post_attachments($t_data['topic_attachment']); @@ -722,10 +722,24 @@ for($i = 0; $i < $total_posts; $i++) { if ($user_sig) { - $user_sig = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $user_sig . '<'), 1, -1)); + $user_sig = str_replace( + '\"', '"', + substr( + preg_replace_callback('#(\>(((?>([^><]+|(?R)))*)\<))#s', function ($matches) use ($orig_word, $replacement_word) { + return preg_replace($orig_word, $replacement_word, $matches[0]); + }, '>' . $user_sig . '<'), 1, -1 + ) + ); } - $message = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $message . '<'), 1, -1)); + $message = str_replace( + '\"', '"', + substr( + preg_replace_callback('#(\>(((?>([^><]+|(?R)))*)\<))#s', function ($matches) use ($orig_word, $replacement_word) { + return preg_replace($orig_word, $replacement_word, $matches[0]); + }, '>' . $message . '<'), 1, -1 + ) + ); } // Replace newlines (we use this rather than nl2br because till recently it wasn't XHTML compliant) @@ -825,7 +839,7 @@ for($i = 0; $i < $total_posts; $i++) 'RG_SIG_ATTACH' => $postrow[$i]['attach_rg_sig'], )); - if ($postrow[$i]['post_attachment'] && $is_auth['auth_download'] && function_exists('display_post_attachments')) + if (isset($postrow[$i]['post_attachment']) && $is_auth['auth_download'] && function_exists('display_post_attachments')) { display_post_attachments($post_id, $postrow[$i]['post_attachment']); } @@ -893,4 +907,4 @@ if (IS_ADMIN) )); } -print_page('viewtopic.tpl'); \ No newline at end of file +print_page('viewtopic.tpl');