diff --git a/phpBB/admin/page_footer_admin.php b/phpBB/admin/page_footer_admin.php index 8ee1123113..e181640451 100644 --- a/phpBB/admin/page_footer_admin.php +++ b/phpBB/admin/page_footer_admin.php @@ -28,27 +28,16 @@ if ( !defined('IN_PHPBB') ) // // Show the overall footer. // -$current_time = time(); - $template->set_filenames(array( - "page_footer" => "admin/page_footer.tpl") + 'page_footer' => 'admin/page_footer.tpl') ); $template->assign_vars(array( - "PHPBB_VERSION" => "2.0 " . $board_config['version'], - "TRANSLATION_INFO" => $lang['TRANSLATION_INFO']) + 'PHPBB_VERSION' => '2' . $board_config['version'], + 'TRANSLATION_INFO' => $lang['TRANSLATION_INFO']) ); -$template->pparse("page_footer"); - -// -// Output page creation time -// -$mtime = microtime(); -$mtime = explode(" ",$mtime); -$mtime = $mtime[1] + $mtime[0]; -$endtime = $mtime; -$totaltime = ($endtime - $starttime); +$template->pparse('page_footer'); // // Close our DB connection. @@ -73,10 +62,10 @@ if( $do_gzip_compress ) $gzip_contents = gzcompress($gzip_contents, 9); $gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4); - echo "\x1f\x8b\x08\x00\x00\x00\x00\x00"; + echo '\x1f\x8b\x08\x00\x00\x00\x00\x00'; echo $gzip_contents; - echo pack("V", $gzip_crc); - echo pack("V", $gzip_size); + echo pack('V', $gzip_crc); + echo pack('V', $gzip_size); } exit; diff --git a/phpBB/db/schemas/ms_access_primer.zip b/phpBB/db/schemas/ms_access_primer.zip index 5665be4368..ee3cabf8b4 100644 Binary files a/phpBB/db/schemas/ms_access_primer.zip and b/phpBB/db/schemas/ms_access_primer.zip differ diff --git a/phpBB/db/schemas/mssql_basic.sql b/phpBB/db/schemas/mssql_basic.sql index 61c9cc47a7..3ccbeb7231 100644 --- a/phpBB/db/schemas/mssql_basic.sql +++ b/phpBB/db/schemas/mssql_basic.sql @@ -67,7 +67,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_user INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.yourdomain.tld'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-4'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.0'); /* -- Categories diff --git a/phpBB/db/schemas/mysql_basic.sql b/phpBB/db/schemas/mysql_basic.sql index 9790e62609..908d58b7f0 100644 --- a/phpBB/db/schemas/mysql_basic.sql +++ b/phpBB/db/schemas/mysql_basic.sql @@ -60,7 +60,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.myserver.tld'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-4'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.0'); # -- Categories diff --git a/phpBB/db/schemas/postgres_basic.sql b/phpBB/db/schemas/postgres_basic.sql index a11ac0b1ed..495d42d75a 100644 --- a/phpBB/db/schemas/postgres_basic.sql +++ b/phpBB/db/schemas/postgres_basic.sql @@ -61,7 +61,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.yourdomain.tld'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-4'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.0'); -- Categories INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 10); diff --git a/phpBB/template.inc b/phpBB/template.inc deleted file mode 100644 index b77a071acd..0000000000 --- a/phpBB/template.inc +++ /dev/null @@ -1,375 +0,0 @@ - remove undefined variables - * "comment" => replace undefined variables with comments - * "keep" => keep undefined variables - */ - var $unknowns = "remove"; - - /* "yes" => halt, "report" => report error, continue, "no" => ignore error quietly */ - var $halt_on_error = "yes"; - - /* last error message is retained here */ - var $last_error = ""; - - - /***************************************************************************/ - /* public: Constructor. - * root: template directory. - * unknowns: how to handle unknown variables. - */ - function Template($root = ".", $unknowns = "remove") { - $this->set_root($root); - $this->set_unknowns($unknowns); - } - - /* public: setroot(pathname $root) - * root: new template directory. - */ - function set_root($root) { - if (!is_dir($root)) { - $this->halt("set_root: $root is not a directory."); - return false; - } - - $this->root = $root; - return true; - } - - /* public: set_unknowns(enum $unknowns) - * unknowns: "remove", "comment", "keep" - * - */ - function set_unknowns($unknowns = "keep") { - $this->unknowns = $unknowns; - } - - /* public: set_file(array $filelist) - * filelist: array of handle, filename pairs. - * - * public: set_file(string $handle, string $filename) - * handle: handle for a filename, - * filename: name of template file - */ - function set_file($handle, $filename = "") { - if (!is_array($handle)) { - if ($filename == "") { - $this->halt("set_file: For handle $handle filename is empty."); - return false; - } - $this->file[$handle] = $this->filename($filename); - } else { - reset($handle); - while(list($h, $f) = each($handle)) { - $this->file[$h] = $this->filename($f); - } - } - } - - /* public: set_block(string $parent, string $handle, string $name = "") - * extract the template $handle from $parent, - * place variable {$name} instead. - */ - function set_block($parent, $handle, $name = "") { - if (!$this->loadfile($parent)) { - $this->halt("subst: unable to load $parent."); - return false; - } - if ($name == "") - $name = $handle; - - $str = $this->get_var($parent); - $reg = "/(.*?)\n\s*/sm"; - preg_match($reg, $str, $m); - $str = preg_replace($reg, "{" . "$name}", $str); - $this->set_var($handle, $m[1]); - $this->set_var($parent, $str); - } - - /* public: set_var(array $values) - * values: array of variable name, value pairs. - * - * public: set_var(string $varname, string $value) - * varname: name of a variable that is to be defined - * value: value of that variable - */ - function set_var($varname, $value = "") { - if (!is_array($varname)) { - if (!empty($varname)) - if ($this->debug) print "scalar: set *$varname* to *$value*
\n"; - $this->varkeys[$varname] = '{' . $varname . '}'; - $this->varvals[$varname] = $value; - } else { - reset($varname); - while(list($k, $v) = each($varname)) { - if (!empty($k)) - if ($this->debug) print "array: set *$k* to *$v*
\n"; - $this->varkeys[$k] = '{' . $k . '}'; - $this->varvals[$k] = $v; - } - } - } - - /* public: subst(string $handle) - * handle: handle of template where variables are to be substituted. - */ - function subst($handle) { - if (!$this->loadfile($handle)) { - $this->halt("subst: unable to load $handle."); - return false; - } - - $str = $this->get_var($handle); - // This will break if $str is an array... Not sure if that ever - // actually happens, so we'll use this check for a while. - if (is_array($str)) die ("str is an array."); - - reset($this->varkeys); - while (list($k, $v) = each ($this->varkeys)) - { - $str = str_replace($this->varkeys[$k], $this->varvals[$k], $str); - } - - return $str; - } - - /* public: psubst(string $handle) - * handle: handle of template where variables are to be substituted. - */ - function psubst($handle) { - print $this->subst($handle); - - return false; - } - - /* public: parse(string $target, string $handle, boolean append) - * public: parse(string $target, array $handle, boolean append) - * target: handle of variable to generate - * handle: handle of template to substitute - * append: append to target handle - */ - function parse($target, $handle, $append = false) - { - if (!is_array($handle)) - { - $str = $this->subst($handle); - if ($append) - { - $this->set_var($target, $this->get_var($target) . $str); - } - else - { - $this->set_var($target, $str); - } - } - else - { - reset($handle); - while(list($i, $h) = each($handle)) - { - $str = $this->subst($h); - $this->set_var($target, $str); - } - } - - return $str; - } - - function pparse($target, $handle, $append = false) { - print $this->parse($target, $handle, $append); - return false; - } - - /* public: get_vars() - */ - function get_vars() { - reset($this->varkeys); - while(list($k, $v) = each($this->varkeys)) { - $result[$k] = $this->varvals[$k]; - } - - return $result; - } - - /* public: get_var(string varname) - * varname: name of variable. - * - * public: get_var(array varname) - * varname: array of variable names - */ - function get_var($varname) { - if (!is_array($varname)) { - return $this->varvals[$varname]; - } else { - reset($varname); - while(list($k, $v) = each($varname)) { - $result[$k] = $this->varvals[$k]; - } - - return $result; - } - } - - /* public: get_undefined($handle) - * handle: handle of a template. - */ - function get_undefined($handle) { - if (!$this->loadfile($handle)) { - $this->halt("get_undefined: unable to load $handle."); - return false; - } - - preg_match_all("/\{([^}]+)\}/", $this->get_var($handle), $m); - $m = $m[1]; - if (!is_array($m)) - return false; - - reset($m); - while(list($k, $v) = each($m)) { - if (!isset($this->varkeys[$v])) - $result[$v] = $v; - } - - if (count($result)) - return $result; - else - return false; - } - - /* public: finish(string $str) - * str: string to finish. - */ - function finish($str) { - switch ($this->unknowns) { - case "keep": - break; - - case "remove": - $str = preg_replace('/{[^ \t\r\n}]+}/', "", $str); - break; - - case "comment": - $str = preg_replace('/{([^ \t\r\n}]+)}/', "", $str); - break; - } - - return $str; - } - - /* public: p(string $varname) - * varname: name of variable to print. - */ - function p($varname) { - print $this->finish($this->get_var($varname)); - } - - function get($varname) { - return $this->finish($this->get_var($varname)); - } - - /***************************************************************************/ - /* private: filename($filename) - * filename: name to be completed. - */ - function filename($filename) { - if (substr($filename, 0, 1) != "/") { - $filename = $this->root."/".$filename; - } - - if (!file_exists($filename)) - $this->halt("filename: file $filename does not exist."); - - return $filename; - } - - /* private: varname($varname) - * varname: name of a replacement variable to be protected. - */ - function varname($varname) { - return preg_quote("{".$varname."}"); - } - - - /* private: loadfile(string $handle) - * handle: load file defined by handle, if it is not loaded yet. - */ - function loadfile($handle) { - if (isset($this->varkeys[$handle]) and !empty($this->varvals[$handle])) - return true; - - if (!isset($this->file[$handle])) { - $this->halt("loadfile: $handle is not a valid handle."); - return false; - } - $filename = $this->file[$handle]; - - $str = implode("", @file($filename)); - if (empty($str)) { - $this->halt("loadfile: While loading $handle, $filename does not exist or is empty."); - return false; - } - - $this->set_var($handle, $str); - - return true; - } - - /***************************************************************************/ - /* public: halt(string $msg) - * msg: error message to show. - */ - function halt($msg) { - $this->last_error = $msg; - - if ($this->halt_on_error != "no") - $this->haltmsg($msg); - - if ($this->halt_on_error == "yes") - die("Halted."); - - return false; - } - - /* public, override: haltmsg($msg) - * msg: error message to show. - */ - function haltmsg($msg) { - printf("Template Error: %s
\n", $msg); - } -} -?>