You can subscribe to this list here.
2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <var...@us...> - 2021-07-29 19:32:26
|
Revision: 10399 http://sourceforge.net/p/phpwiki/code/10399 Author: vargenau Date: 2021-07-29 19:32:25 +0000 (Thu, 29 Jul 2021) Log Message: ----------- lib/upgrade.php: remove unused functions installTable and _convert_cached_html Modified Paths: -------------- trunk/lib/upgrade.php Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2021-07-29 19:11:48 UTC (rev 10398) +++ trunk/lib/upgrade.php 2021-07-29 19:32:25 UTC (rev 10399) @@ -152,7 +152,8 @@ if ($translation == $pagename) $this->doPgsrcUpdate($pagename, $path, $filename); elseif (findLocalizedFile('pgsrc/' . urlencode($translation), 1)) - $this->doPgsrcUpdate($translation, $loc_path, urlencode($translation)); else + $this->doPgsrcUpdate($translation, $loc_path, urlencode($translation)); + else $this->doPgsrcUpdate($pagename, $path, $filename); } } @@ -238,200 +239,6 @@ } /** - * TODO: Search table definition in appropriate schema - * and create it. - * Supported: mysql and generic SQL, for ADODB and PearDB. - */ - private function installTable($table, $backend_type) - { - global $DBParams; - if (!$this->isSQL) - return; - echo _("MISSING"), " ... \n"; - /* - $schema = findFile("schemas/${backend_type}.sql"); - if (!$schema) { - echo " ",_("FAILED"),": ",sprintf(_("no schema %s found"), - "schemas/${backend_type}.sql")," ... <br />\n"; - return false; - } - */ - extract($this->dbi->_backend->_table_names); - $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : ''; - switch ($table) { - case 'session': - assert($session_tbl); - if ($backend_type == 'mysql') { - $this->dbi->genericSqlQuery(" -CREATE TABLE $session_tbl ( - sess_id CHAR(32) NOT NULL DEFAULT '', - sess_data BLOB NOT NULL, - sess_date INT UNSIGNED NOT NULL, - sess_ip CHAR(15) NOT NULL, - PRIMARY KEY (sess_id), - INDEX (sess_date) -)"); - } else { - $this->dbi->genericSqlQuery(" -CREATE TABLE $session_tbl ( - sess_id CHAR(32) NOT NULL DEFAULT '', - sess_data " . ($backend_type == 'pgsql' ? 'TEXT' : 'BLOB') . " NOT NULL, - sess_date INT, - sess_ip CHAR(15) NOT NULL -)"); - $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX sess_id ON $session_tbl (sess_id)"); - } - $this->dbi->genericSqlQuery("CREATE INDEX sess_date on session (sess_date)"); - echo " ", _("CREATED"); - break; - case 'pref': - $pref_tbl = $prefix . 'pref'; - if ($backend_type == 'mysql') { - $this->dbi->genericSqlQuery(" -CREATE TABLE $pref_tbl ( - userid CHAR(48) BINARY NOT NULL UNIQUE, - prefs TEXT NULL DEFAULT '', - PRIMARY KEY (userid) -)"); - } else { - $this->dbi->genericSqlQuery(" -CREATE TABLE $pref_tbl ( - userid CHAR(48) NOT NULL, - prefs TEXT NULL DEFAULT '' -)"); - $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX userid ON $pref_tbl (userid)"); - } - echo " ", _("CREATED"); - break; - case 'member': - $member_tbl = $prefix . 'member'; - if ($backend_type == 'mysql') { - $this->dbi->genericSqlQuery(" -CREATE TABLE $member_tbl ( - userid CHAR(48) BINARY NOT NULL, - groupname CHAR(48) BINARY NOT NULL DEFAULT 'users', - INDEX (userid), - INDEX (groupname) -)"); - } else { - $this->dbi->genericSqlQuery(" -CREATE TABLE $member_tbl ( - userid CHAR(48) NOT NULL, - groupname CHAR(48) NOT NULL DEFAULT 'users' -)"); - $this->dbi->genericSqlQuery("CREATE INDEX userid ON $member_tbl (userid)"); - $this->dbi->genericSqlQuery("CREATE INDEX groupname ON $member_tbl (groupname)"); - } - echo " ", _("CREATED"); - break; - case 'rating': - $rating_tbl = $prefix . 'rating'; - if ($backend_type == 'mysql') { - $this->dbi->genericSqlQuery(" -CREATE TABLE $rating_tbl ( - dimension INT(4) NOT NULL, - raterpage INT(11) NOT NULL, - rateepage INT(11) NOT NULL, - ratingvalue FLOAT NOT NULL, - rateeversion INT(11) NOT NULL, - tstamp TIMESTAMP(14) NOT NULL, - PRIMARY KEY (dimension, raterpage, rateepage) -)"); - } else { - $this->dbi->genericSqlQuery(" -CREATE TABLE $rating_tbl ( - dimension INT(4) NOT NULL, - raterpage INT(11) NOT NULL, - rateepage INT(11) NOT NULL, - ratingvalue FLOAT NOT NULL, - rateeversion INT(11) NOT NULL, - tstamp TIMESTAMP(14) NOT NULL -)"); - $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX rating" - . " ON $rating_tbl (dimension, raterpage, rateepage)"); - } - echo " ", _("CREATED"); - break; - case 'accesslog': - $log_tbl = $prefix . 'accesslog'; - // fields according to http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178 - /* - A User Agent agent varchar(255) Mozilla/4.0 (compat; MSIE 6.0; Windows) - a CGi request arguments request_args varchar(255) user=Smith&cart=1231&item=532 - b Bytes transfered bytes_sent int unsigned 32561 - c??? Text of cookie cookie varchar(255) Apache=sdyn.fooonline.net 1300102700823 - f Local filename requested request_file varchar(255) /var/www/html/books-cycroad.html - H HTTP request_protocol request_protocol varchar(10) HTTP/1.1 - h Name of remote host remote_host varchar(50) blah.foobar.com - I Request ID (from modd_unique_id) id char(19) POlFcUBRH30AAALdBG8 - l Ident user info remote_logname varcgar(50) bobby - M Machine ID??? machine_id varchar(25) web01 - m HTTP request method request_method varchar(10) GET - P httpd cchild PID child_pid smallint unsigned 3215 - p http port server_port smallint unsigned 80 - R Referer referer varchar(255) http://www.biglinks4u.com/linkpage.html - r Request in full form request_line varchar(255) GET /books-cycroad.html HTTP/1.1 - S Time of request in UNIX time_t format time_stamp int unsigned 1005598029 - T Seconds to service request request_duration smallint unsigned 2 - t Time of request in human format request_time char(28) [02/Dec/2001:15:01:26 -0800] - U Request in simple form request_uri varchar(255) /books-cycroad.html - u User info from HTTP auth remote_user varchar(50) bobby - v Virtual host servicing the request virtual_host varchar(255) - */ - $this->dbi->genericSqlQuery(" -CREATE TABLE $log_tbl ( - time_stamp int unsigned, - remote_host varchar(100), - remote_user varchar(50), - request_method varchar(10), - request_line varchar(255), - request_args varchar(255), - request_uri varchar(255), - request_time char(28), - status smallint unsigned, - bytes_sent smallint unsigned, - referer varchar(255), - agent varchar(255), - request_duration float -)"); - $this->dbi->genericSqlQuery("CREATE INDEX log_time ON $log_tbl (time_stamp)"); - $this->dbi->genericSqlQuery("CREATE INDEX log_host ON $log_tbl (remote_host)"); - echo " ", _("CREATED"); - break; - } - echo "<br />\n"; - } - - /** - * move _cached_html for all pages from pagedata into a new separate blob. - * decoupled from action=upgrade, so that it can be used by a WikiAdminUtils button also. - */ - private function _convert_cached_html() - { - if (!$this->isSQL) - return 0; - - $pages = $this->dbi->getAllPages(); - $cache =& $this->dbi->_cache; - $count = 0; - extract($this->dbi->_backend->_table_names); - while ($page = $pages->next()) { - $pagename = $page->getName(); - $data = $this->dbi->_backend->get_pagedata($pagename); - if (!empty($data['_cached_html'])) { - $cached_html = $data['_cached_html']; - $data['_cached_html'] = ''; - $cache->update_pagedata($pagename, $data); - // store as blob, not serialized - $this->dbi->genericSqlQuery("UPDATE $page_tbl SET cached_html=? WHERE pagename=?", - array($cached_html, $pagename)); - $count++; - } - } - return $count; - } - - /** * preg_replace over local file. * Only line-orientated matches possible. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 19:11:51
|
Revision: 10398 http://sourceforge.net/p/phpwiki/code/10398 Author: vargenau Date: 2021-07-29 19:11:48 +0000 (Thu, 29 Jul 2021) Log Message: ----------- PhpWeather plugin removed, uses deprecated mysql functions Modified Paths: -------------- trunk/lib/IniConfig.php trunk/lib/WikiPlugin.php trunk/lib/plugin/WikiTranslation.php trunk/locale/Makefile trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/it/pgsrc/NoteDiRilascio trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo trunk/pgsrc/ReleaseNotes Removed Paths: ------------- trunk/lib/phpweather-2.2.2/ trunk/lib/plugin/PhpWeather.php trunk/locale/fr/pgsrc/Aide%2FGreffonM%C3%A9t%C3%A9oPhp trunk/locale/zh/pgsrc/Help%2FPhpWeatherPlugin trunk/pgsrc/Help%2FPhpWeatherPlugin Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/lib/IniConfig.php 2021-07-29 19:11:48 UTC (rev 10398) @@ -634,7 +634,6 @@ $AllAllowedPlugins[] = 'PageTrail'; $AllAllowedPlugins[] = 'PhotoAlbum'; $AllAllowedPlugins[] = 'PhpHighlight'; - $AllAllowedPlugins[] = 'PhpWeather'; $AllAllowedPlugins[] = 'PopularTags'; $AllAllowedPlugins[] = 'PopUp'; $AllAllowedPlugins[] = 'PrevNext'; Modified: trunk/lib/WikiPlugin.php =================================================================== --- trunk/lib/WikiPlugin.php 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/lib/WikiPlugin.php 2021-07-29 19:11:48 UTC (rev 10398) @@ -518,8 +518,7 @@ // As an additional hack, mark the ETag weak, since, // for all we know, the page might depend - // on things other than the WikiDB (e.g. PhpWeather, - // Calendar...) + // on things other than the WikiDB (e.g. Calendar...) $timestamp = $dbi->getTimestamp(); $request->appendValidators(array('dbi_timestamp' => $timestamp, Deleted: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/lib/plugin/PhpWeather.php 2021-07-29 19:11:48 UTC (rev 10398) @@ -1,181 +0,0 @@ -<?php -/** - * Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam - * - * This file is part of PhpWiki. - * - * PhpWiki is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * PhpWiki is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with PhpWiki; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * SPDX-License-Identifier: GPL-2.0-or-later - * - */ - -/** - * Usage: - * - * <<PhpWeather >> - * <<PhpWeather menu=true >> - * <<PhpWeather icao=KJFK >> - * <<PhpWeather language=en >> - * <<PhpWeather units=only_metric >> - * <<PhpWeather icao||=CYYZ cc||=CA language||=en menu=true >> - * - * If you want a menu, and you also want to change the default station - * or language, then you have to use the ||= form, or else the user - * wont be able to change the station or language. - * - * The units argument should be one of only_metric, only_imperial, - * both_metric, or both_imperial. - */ - -if (!defined('PHPWEATHER_BASE_DIR')) { - /* PhpWeather has not been loaded before. We include the base class from PhpWeather. */ - include_once 'lib/phpweather-2.2.2/phpweather.php'; -} - -class WikiPlugin_PhpWeather - extends WikiPlugin -{ - function getDescription() - { - return _("Provide weather reports from the Internet."); - } - - function getDefaultArguments() - { - return array('icao' => 'EKAH', - 'cc' => 'DK', - 'language' => 'en', - 'menu' => false, - 'units' => 'both_metric'); - } - - /** - * @param WikiDB $dbi - * @param string $argstr - * @param WikiRequest $request - * @param string $basepage - * @return mixed - */ - function run($dbi, $argstr, &$request, $basepage) - { - require_once(PHPWEATHER_BASE_DIR . '/output/pw_images.php'); - require_once(PHPWEATHER_BASE_DIR . '/pw_utilities.php'); - - extract($this->getArgs($argstr, $request)); - $html = HTML(); - - $w = new phpweather(); // Our weather object - - if (!empty($icao)) { - /* We assign the ICAO to the weather object: */ - $w->set_icao($icao); - if (!$w->get_country_code()) { - /* The country code couldn't be resolved, so we - * shouldn't use the ICAO: */ - trigger_error(sprintf(_("The ICAO “%s” wasn't recognized."), $icao)); - $icao = ''; - } - } - - if (!empty($icao)) { - - /* We check and correct the language if necessary: */ - //if (!in_array($language, array_keys($w->get_languages('text')))) { - if (!in_array($language, array_keys(get_languages('text')))) { - trigger_error(sprintf(_("%s does not know about the language “%s”, using “en” instead."), - $this->getName(), $language)); - $language = 'en'; - } - - $class = "pw_text_$language"; - require_once(PHPWEATHER_BASE_DIR . "/output/$class.php"); - - $t = new $class($w); - $t->set_pref_units($units); - $i = new pw_images($w); - - $i_temp = HTML::img(array('src' => $i->get_temp_image())); - $i_wind = HTML::img(array('src' => $i->get_winddir_image())); - $i_sky = HTML::img(array('src' => $i->get_sky_image())); - - $m = $t->print_pretty(); - - $m_td = HTML::td(HTML::p(new RawXml($m))); - - $i_tr = HTML::tr(); - $i_tr->pushContent(HTML::td($i_temp)); - $i_tr->pushContent(HTML::td($i_wind)); - - $i_table = HTML::table($i_tr); - $i_table->pushContent(HTML::tr(HTML::td(array('colspan' => '2'), - $i_sky))); - - $tr = HTML::tr(); - $tr->pushContent($m_td); - $tr->pushContent(HTML::td($i_table)); - - $html->pushContent(HTML::table($tr)); - - } - - /* We make a menu if asked to, or if $icao is empty: */ - if ($menu || empty($icao)) { - - $form_arg = array('action' => $request->getURLtoSelf(), - 'method' => 'get'); - - /* The country box is always part of the menu: */ - $p1 = HTML::p(new RawXml(get_countries_select($w, $cc))); - - /* We want to save the language: */ - $p1->pushContent(HTML::input(array('type' => 'hidden', - 'name' => 'language', - 'value' => $language))); - /* And also the ICAO: */ - $p1->pushContent(HTML::input(array('type' => 'hidden', - 'name' => 'icao', - 'value' => $icao))); - - $caption = (empty($cc) ? _("Submit country") : _("Change country")); - $p1->pushContent(HTML::input(array('type' => 'submit', - 'value' => $caption))); - - $html->pushContent(HTML::form($form_arg, $p1)); - - if (!empty($cc)) { - /* We have selected a country, now display a list with - * the available stations in that country: */ - $p2 = HTML::p(); - - /* We need the country code after the form is submitted: */ - $p2->pushContent(HTML::input(array('type' => 'hidden', - 'name' => 'cc', - 'value' => $cc))); - - $p2->pushContent(new RawXml(get_stations_select($w, $cc, $icao))); - $p2->pushContent(new RawXml(get_languages_select($language))); - $p2->pushContent(HTML::input(array('type' => 'submit', - 'value' => _("Submit location")))); - - $html->pushContent(HTML::form($form_arg, $p2)); - - } - - } - - return $html; - } -} Modified: trunk/lib/plugin/WikiTranslation.php =================================================================== --- trunk/lib/plugin/WikiTranslation.php 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/lib/plugin/WikiTranslation.php 2021-07-29 19:11:48 UTC (rev 10398) @@ -145,8 +145,6 @@ _("PhotoAlbumPlugin") . ',' . _("PhpHighlight") . ',' . _("PhpHighlightPlugin") . ',' . - _("PhpWeather") . ',' . - _("PhpWeatherPlugin") . ',' . _("PhpWiki") . ',' . _("PhpWikiAdministration") . ',' . _("PhpWikiDocumentation") . ',' . Modified: trunk/locale/Makefile =================================================================== --- trunk/locale/Makefile 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/locale/Makefile 2021-07-29 19:11:48 UTC (rev 10398) @@ -152,277 +152,6 @@ ${POT_FILE}: .././lib/pear/File_Passwd.php ${POT_FILE}: .././lib/pear/JSON.php ${POT_FILE}: .././lib/pear/PEAR.php -${POT_FILE}: .././lib/phpweather-2.2.2/base_object.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/connectivity_test.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/index.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/make_config.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/make_db.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/make_stations.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_dependency_and.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_dependency_equal.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_dependency_not.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_dependency_or.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_dependency.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option_boolean.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_optiongroup.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option_integer.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option_multi_select.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option_select.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option_text.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_validator_ereg.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_validator.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_validator_range.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/reset_session.php -${POT_FILE}: .././lib/phpweather-2.2.2/config/speed_test.php -${POT_FILE}: .././lib/phpweather-2.2.2/currentimage.php -${POT_FILE}: .././lib/phpweather-2.2.2/data_retrieval.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AF.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AG.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AL.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AN.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AO.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AQ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AT.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AU.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AW.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AZ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BA.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BB.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BD.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BF.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BG.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BH.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BI.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BJ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BN.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BO.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BS.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BW.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BY.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BZ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CA.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CD.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CF.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CG.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CH.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CI.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CK.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CL.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CN.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CO.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/countries.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CU.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CV.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CX.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CY.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CZ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DJ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DK.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DO.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DZ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/EC.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/EE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/EG.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/EH.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ES.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ET.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/FI.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/FJ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/FK.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/FM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/FR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GA.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GB.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GD.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GF.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GH.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GI.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GL.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GN.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GP.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GQ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GS.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GT.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GW.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GY.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/HK.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/HN.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/HR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/HT.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/HU.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ID.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IL.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IN.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IO.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IQ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IS.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IT.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/JM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/JO.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/JP.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KH.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KI.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KN.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KP.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KW.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KY.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KZ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LA.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LB.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LC.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LK.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LS.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LT.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LU.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LV.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LY.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MA.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MD.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MG.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MH.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MK.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ML.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MO.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MQ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MT.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MU.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MV.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MW.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MX.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MY.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MZ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NA.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NC.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NG.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NI.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NL.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NO.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NP.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NZ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/OM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PA.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PF.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PG.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PH.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PK.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PL.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PT.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PW.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PY.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/QA.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/RE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/RO.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/RU.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/RW.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SA.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SB.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SC.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SD.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SG.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SH.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SI.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SK.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SL.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SN.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SO.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ST.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SV.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SY.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SZ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TD.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TG.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TH.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TJ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TL.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TN.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TO.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TR.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TT.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TV.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TW.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TZ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/UA.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/UG.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/UM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/US.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/UY.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/UZ.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VC.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VG.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VI.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VN.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VU.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/WS.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/YE.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/YU.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ZA.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ZM.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ZW.php -${POT_FILE}: .././lib/phpweather-2.2.2/db_layer.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_adodb.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_common.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_dba.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_mysql.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_null.php -${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_pgsql.php -${POT_FILE}: .././lib/phpweather-2.2.2/db_updater.php -${POT_FILE}: .././lib/phpweather-2.2.2/defaults-dist.php -${POT_FILE}: .././lib/phpweather-2.2.2/images-test.php -${POT_FILE}: .././lib/phpweather-2.2.2/index.php -${POT_FILE}: .././lib/phpweather-2.2.2/languages.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_images.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_output.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_cs.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_da.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_de.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_en_GB.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_en.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_en_US.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_es.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_fi.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_fr.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_hu.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_it.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_nl.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_no.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_pl.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_pt.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_sk.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_sv.php -${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_tr.php -${POT_FILE}: .././lib/phpweather-2.2.2/phpweather.php -${POT_FILE}: .././lib/phpweather-2.2.2/pw_utilities.php ${POT_FILE}: .././lib/plugin/AddComment.php ${POT_FILE}: .././lib/plugin/AllPages.php ${POT_FILE}: .././lib/plugin/AllUsers.php @@ -494,7 +223,6 @@ ${POT_FILE}: .././lib/plugin/PasswordReset.php ${POT_FILE}: .././lib/plugin/PhotoAlbum.php ${POT_FILE}: .././lib/plugin/PhpHighlight.php -${POT_FILE}: .././lib/plugin/PhpWeather.php ${POT_FILE}: .././lib/plugin/Ploticus.php ${POT_FILE}: .././lib/plugin/PluginManager.php ${POT_FILE}: .././lib/plugin/PopularNearby.php Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Deleted: trunk/locale/fr/pgsrc/Aide%2FGreffonM%C3%A9t%C3%A9oPhp =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FGreffonM%C3%A9t%C3%A9oPhp 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/locale/fr/pgsrc/Aide%2FGreffonM%C3%A9t%C3%A9oPhp 2021-07-29 19:11:48 UTC (rev 10398) @@ -1,95 +0,0 @@ -Date: Mon, 30 Mar 2020 15:49:22 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) -Content-Type: application/x-phpwiki; - pagename=Aide%2FGreffonM%C3%A9t%C3%A9oPhp; - flags=PAGE_LOCKED; - charset=UTF-8 -Content-Transfer-Encoding: binary - -Le [[Aide:GreffonWiki|greffon]] **~MétéoPhp** (//PhpWeather//) utilise [[http://phpweather.sourceforge.net/|PhpWeather]] -pour afficher un bout de texte avec la météo actuelle pour n'importe quel aéroport -dans le monde. Cela ressemble à ça : - -<<PhpWeather menu=true>> - -== Arguments == - -{| class="bordered" -|- -! Argument -! Description -! Valeur par défaut -|- -| **menu** -| -Mettre ceci sur ##true## pour que le greffon affiche un menu après le -rapport. L'utilisateur pourra sélectionner un pays à partir de ce menu -et, après ça, un aéroport et une langue. -| false -|- -| **icao** -| -Utilisez ceci pour pré-sélectionner un aéroport spécifique à la place -de l'aéroport par défaut qui est ##EKAH##. - -Si vous voulez que -l'utilisateur puisse changer la station en utilisant le menu alors -lancer le greffon comme ceci : ##<<PhpWeather menu=true icao||=EKYT>>## -de telle sorte que la valeur peut être ré-écrite lorsque l'utilisateur soumet le formulaire. - -Si vous mettez seulement : ##<<PhpWeather menu=true icao=EKYT>>## -alors rien ne se produira lorsque l'utilisateur sélectionnera une autre -station depuis la liste. -| -|- -| **cc** -| -Spécifie le code du pays (country code). Vous pouvez l'utiliser si vous -souhaitez pré-sélectionner un pays différent de celui spécifié dans l'ICAO. - -Ainsi, ##<<PhpWeather menu=true cc|~|~=GB icao|~|~=KTTS>>## -affichera la météo courante à NASA Shuttle Facility, États-Unis -(##KTTS##) et en même temps donnera à l'utilisateur une liste des -stations du Royaume-Uni. - -Comme l'exemple le montre vous devriez utiliser -##cc||=XX## en le combinant avec **menu** mis sur ##true##. -| -|- -| **language** -| -La langue par défaut. Quand vous combinez **language** avec **menu** mis -à ##true## alors souvenez-vous d'utiliser la forme ##language~|~|=xx##. -| -|- -| **units** -| -Vous pouvez spécifer le manière dont les unités seront affichées. Le choix -se fait sur la possibilité d'avoir les deux unités (métriques ou impériales) -ou juste l'un d'entres elles. Mettant **units** sur ##both_metric## affichera -la valeur métrique d'abord et ensuite l'impériale entre parenthèses. -**units** sur ##both_imperial## fait exactement l'inverse. - -Si vous voulez l'une ou l'autre seulement alors mettez **units** sur -##only_metric## ou ##only_imperial## et ça le fera. -| -|} - -== Exemple == - -Le temps chez les Bretons : -{{{ -<<PhpWeather cc=FR icao=LFRN language=fr units=only_metric>> -}}} - -et qui est actuellement : -<<PhpWeather cc=FR icao=LFRN language=fr units=only_metric>> - -== Problèmes connus == - -Le greffon ne fonctionne pas à travers un proxy. - -<noinclude> ----- -[[DocumentationDePhpWiki]] [[CatégorieGreffonWiki]] -</noinclude> Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/pgsrc/NoteDiRilascio =================================================================== --- trunk/locale/it/pgsrc/NoteDiRilascio 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/locale/it/pgsrc/NoteDiRilascio 2021-07-29 19:11:48 UTC (rev 10398) @@ -1,4 +1,4 @@ -Date: Sat, 2 Jan 2021 19:46:14 +0000 +Date: Thu, 29 Jul 2021 21:08:02 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=NoteDiRilascio; @@ -11,11 +11,22 @@ == 1.6.0 2020-12-XX Marc-Etienne Vargenau == Major release: -* PHP 7 compatible +* PHP 7 compatible (works from PHP 5.3.3 to PHP 7) * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles. * Flash is dead * Internet Explorer is dead +=== Fixes === +* Make function IsSafeURL more strict +* Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3) +* It was possible to rename a page to a name with illegal characters, like ~[~] +* Better handling of page names with slash +* Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen) +* Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael. +* Better check arguments for ~GoogleMaps plugin +* Revert Subversion commit 9111, bad side effects; re-opening Bug#607 BackLinks do not work inside a RichTable +* Security fixes + === Changes === * Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table * Update jQuery to 2.2.4 @@ -31,27 +42,20 @@ * Valid HTML5 and CSS3 logos (in debug mode) * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth. * Remove Fusionforge-specific files (g view.php wikiadmin.php wikilist.php) +* Remove USE_SAFE_DBSESSION (always true) * PDO patch by Sébastien Le Callonnec * Updated pgsrc pages in all languages -* Security fixes * Adding SPDX-License-Identifier in PHP source files -=== Bugs === -* Make function IsSafeURL more strict -* Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3) -* It was possible to rename a page to a name with illegal characters, like ~[~] -* Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen) -* Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael. -* Better check arguments for ~GoogleMaps plugin - === Plugins === * ~UpLoad plugin: put date and author in history * ~UpLoad plugin: don't inline images -* phpweather-2.2.2 included in ~PhpWiki; ~PhpWeather plugin allowed in Fusionforge +* PhpWeather removed, uses deprecated mysql functions * ~HtmlConverter plugin: check file is encoded in UTF-8; ~HtmlConverter plugin allowed in Fusionforge * Use jquery.autoheight.js plugin for Transclude plugin * Repair [[Help:PhotoAlbumPlugin|PhotoAlbumPlugin]] * Rename action page ~DebugInfo as ~DebugBackendInfo (to be consistent with plugin name) +* Better check boolean arguments in plugins == 1.5.5 2015-12-11 Marc-Etienne Vargenau == @@ -174,7 +178,7 @@ * fix Bug#1752172 undefined method {{{TextSearchQuery_node_or::_sql_quote()}}} * dba: fix sorting for empty mtime field * ~LdapSearch: fix layout and logic -* ~FileInfo: fix Upload: links +* ~FileInfo: fix ##Upload~:## links * XHTML validation corrections (vargenau) * avoid recursive modification when renaming a page like '~PageFoo to '~PageFooTwo' (vargenau) * fix Bug#1808002 Table of contents plugin does not nest numbering (vargenau) Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/locale/po/de.po 2021-07-29 19:11:48 UTC (rev 10398) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-16 13:23+0200\n" +"POT-Creation-Date: 2021-07-29 21:10+0200\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp " "<car...@us...>, Helmer Pardun <pardunpress@t-online." @@ -2267,27 +2267,6 @@ msgid "Invalid color: %s" msgstr "Ungültige Farbe: %s" -msgid "Provide weather reports from the Internet." -msgstr "Der PhpWetter plugin gibt Auskunft zur Wetterlage vom Internet." - -#, php-format -msgid "The ICAO “%s” wasn't recognized." -msgstr "Die angegebene ICAO »%s« war nicht bekannt." - -#, php-format -msgid "%s does not know about the language “%s”, using “en” instead." -msgstr "" -"%s weißt nichts von die Sprache »%s«, stattdessen wird »en« angewendet." - -msgid "Submit country" -msgstr "Land eingeben" - -msgid "Change country" -msgstr "Land ändern" - -msgid "Submit location" -msgstr "Land eingeben" - msgid "Ploticus image creation." msgstr "" @@ -4235,12 +4214,6 @@ msgid "PhpHighlightPlugin" msgstr "PhpHighlightPlugin" -msgid "PhpWeather" -msgstr "PhpWetter" - -msgid "PhpWeatherPlugin" -msgstr "PhpWetterPlugin" - msgid "PhpWiki" msgstr "PhpWiki" @@ -4683,81 +4656,7 @@ msgid "CREATED" msgstr "ERZEUGT" -msgid "database" -msgstr "Datenbank" - -msgid "db version: we want " -msgstr "" - -msgid "db version: we have " -msgstr "" - -msgid "Backend type: " -msgstr "Backend Typ: " - #, php-format -msgid "Check for table %s" -msgstr "Prüfe Tabelle %s" - -msgid "You need to upgrade to schema/psql-initialize.sql manually!" -msgstr "" - -msgid "Check for new session.sess_ip column" -msgstr "Prüfe auf neue Spalte session.sess_ip column" - -msgid "SKIP" -msgstr "" - -msgid "ADDING" -msgstr "HINZU" - -msgid "Check for mysql session.sess_id sanity" -msgstr "Prüfe auf mysql session.sess_id Korrektheit" - -msgid "fixed" -msgstr "geändert" - -msgid "Check for mysql page.id auto_increment flag" -msgstr "Prüfe auf mysql page.id auto_increment Flag" - -msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" -msgstr "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)" - -#, php-format -msgid "version <em>%s</em>" -msgstr "version <em>%s</em>" - -msgid "not affected" -msgstr "nicht betroffen" - -msgid "FIXED" -msgstr "AUSGEBESSERT" - -msgid "Check for ACCESS_LOG_SQL passwords in POST requests" -msgstr "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests" - -msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)" -msgstr "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests" - -msgid "FIXING" -msgstr "" - -msgid "db version: upgrade to " -msgstr "" - -msgid "Check for extra page.cached_html column" -msgstr "" - -msgid "CONVERTING" -msgstr "KONVERTIERE" - -msgid "Check for relation field in link table" -msgstr "" - -msgid "Rebuild entire database to upgrade relation links" -msgstr "" - -#, php-format msgid "%s not found in %s" msgstr "%s nicht gefunden in %s" @@ -4782,6 +4681,9 @@ msgid "fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX" msgstr "" +msgid "FIXED" +msgstr "AUSGEBESSERT" + msgid "fixed with" msgstr "Geändert mit" @@ -5997,6 +5899,73 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#~ msgid "Provide weather reports from the Internet." +#~ msgstr "Der PhpWetter plugin gibt Auskunft zur Wetterlage vom Internet." + +#~ msgid "The ICAO “%s” wasn't recognized." +#~ msgstr "Die angegebene ICAO »%s« war nicht bekannt." + +#~ msgid "%s does not know about the language “%s”, using “en” instead." +#~ msgstr "" +#~ "%s weißt nichts von die Sprache »%s«, stattdessen wird »en« angewendet." + +#~ msgid "Submit country" +#~ msgstr "Land eingeben" + +#~ msgid "Change country" +#~ msgstr "Land ändern" + +#~ msgid "Submit location" +#~ msgstr "Land eingeben" + +#~ msgid "PhpWeather" +#~ msgstr "PhpWetter" + +#~ msgid "PhpWeatherPlugin" +#~ msgstr "PhpWetterPlugin" + +#~ msgid "database" +#~ msgstr "Datenbank" + +#~ msgid "Backend type: " +#~ msgstr "Backend Typ: " + +#~ msgid "Check for table %s" +#~ msgstr "Prüfe Tabelle %s" + +#~ msgid "Check for new session.sess_ip column" +#~ msgstr "Prüfe auf neue Spalte session.sess_ip column" + +#~ msgid "ADDING" +#~ msgstr "HINZU" + +#~ msgid "Check for mysql session.sess_id sanity" +#~ msgstr "Prüfe auf mysql session.sess_id Korrektheit" + +#~ msgid "fixed" +#~ msgstr "geändert" + +#~ msgid "Check for mysql page.id auto_increment flag" +#~ msgstr "Prüfe auf mysql page.id auto_increment Flag" + +#~ msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" +#~ msgstr "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)" + +#~ msgid "version <em>%s</em>" +#~ msgstr "version <em>%s</em>" + +#~ msgid "not affected" +#~ msgstr "nicht betroffen" + +#~ msgid "Check for ACCESS_LOG_SQL passwords in POST requests" +#~ msgstr "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests" + +#~ msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)" +#~ msgstr "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests" + +#~ msgid "CONVERTING" +#~ msgstr "KONVERTIERE" + #~ msgid "GoodStyle" #~ msgstr "GuterStil" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/locale/po/es.po 2021-07-29 19:11:48 UTC (rev 10398) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-16 13:23+0200\n" +"POT-Creation-Date: 2021-07-29 21:10+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -2205,26 +2205,6 @@ msgid "Invalid color: %s" msgstr "" -msgid "Provide weather reports from the Internet." -msgstr "" - -#, php-format -msgid "The ICAO “%s” wasn't recognized." -msgstr "" - -#, php-format -msgid "%s does not know about the language “%s”, using “en” instead." -msgstr "" - -msgid "Submit country" -msgstr "" - -msgid "Change country" -msgstr "" - -msgid "Submit location" -msgstr "" - msgid "Ploticus image creation." msgstr "" @@ -4115,12 +4095,6 @@ msgid "PhpHighlightPlugin" msgstr "" -msgid "PhpWeather" -msgstr "" - -msgid "PhpWeatherPlugin" -msgstr "" - msgid "PhpWiki" msgstr "" @@ -4551,81 +4525,7 @@ msgid "CREATED" msgstr "" -msgid "database" -msgstr "" - -msgid "db version: we want " -msgstr "" - -msgid "db version: we have " -msgstr "" - -msgid "Backend type: " -msgstr "" - #, php-format -msgid "Check for table %s" -msgstr "" - -msgid "You need to upgrade to schema/psql-initialize.sql manually!" -msgstr "" - -msgid "Check for new session.sess_ip column" -msgstr "" - -msgid "SKIP" -msgstr "" - -msgid "ADDING" -msgstr "" - -msgid "Check for mysql session.sess_id sanity" -msgstr "" - -msgid "fixed" -msgstr "fijo" - -msgid "Check for mysql page.id auto_increment flag" -msgstr "" - -msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" -msgstr "" - -#, php-format -msgid "version <em>%s</em>" -msgstr "versión <em>%s</em>" - -msgid "not affected" -msgstr "" - -msgid "FIXED" -msgstr "" - -msgid "Check for ACCESS_LOG_SQL passwords in POST requests" -msgstr "" - -msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)" -msgstr "" - -msgid "FIXING" -msgstr "" - -msgid "db version: upgrade to " -msgstr "" - -msgid "Check for extra page.cached_html column" -msgstr "" - -msgid "CONVERTING" -msgstr "" - -msgid "Check for relation field in link table" -msgstr "" - -msgid "Rebuild entire database to upgrade relation links" -msgstr "" - -#, php-format msgid "%s not found in %s" msgstr "" @@ -4650,6 +4550,9 @@ msgid "fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX" msgstr "" +msgid "FIXED" +msgstr "" + msgid "fixed with" msgstr "" @@ -5817,6 +5720,12 @@ msgid "Edit this page" msgstr "Corrija esta página" +#~ msgid "fixed" +#~ msgstr "fijo" + +#~ msgid "version <em>%s</em>" +#~ msgstr "versión <em>%s</em>" + #~ msgid "GoodStyle" #~ msgstr "BuenEstilo" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/locale/po/fr.po 2021-07-29 19:11:48 UTC (rev 10398) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-16 13:23+0200\n" +"POT-Creation-Date: 2021-07-29 21:10+0200\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -2249,26 +2249,6 @@ msgid "Invalid color: %s" msgstr "Couleur non valide : %s" -msgid "Provide weather reports from the Internet." -msgstr "Météo importée d'internet." - -#, php-format -msgid "The ICAO “%s” wasn't recognized." -msgstr "L'ICAO « %s » n'a pas été reconnu." - -#, php-format -msgid "%s does not know about the language “%s”, using “en” instead." -msgstr "%s ne connaît pas la langue « %s », utilisation de « en » à la place." - -msgid "Submit country" -msgstr "Soumettre le pays" - -msgid "Change country" -msgstr "Changer le pays" - -msgid "Submit location" -msgstr "Soumettre la localisation" - msgid "Ploticus image creation." msgstr "Création de l'image Ploticus." @@ -4209,12 +4189,6 @@ msgid "PhpHighlightPlugin" msgstr "GreffonColorationPhp" -msgid "PhpWeather" -msgstr "MétéoPhp" - -msgid "PhpWeatherPlugin" -msgstr "GreffonMétéoPhp" - msgid "PhpWiki" msgstr "PhpWiki" @@ -4653,82 +4627,7 @@ msgid "CREATED" msgstr "CRÉÉ" -msgid "database" -msgstr "base de données" - -msgid "db version: we want " -msgstr "Version de la base de données : on veut " - -msgid "db version: we have " -msgstr "Version de la base de données : on a " - -msgid "Backend type: " -msgstr "Type de backend : " - #, php-format -msgid "Check for table %s" -msgstr "Vérifie la table %s" - -msgid "You need to upgrade to schema/psql-initialize.sql manually!" -msgstr "Vous devez mettre à jour schema/psql-initialize.sql à la main !" - -msgid "Check for new session.sess_ip column" -msgstr "Recherche une nouvelle colonne session.sess_ip" - -msgid "SKIP" -msgstr "SAUTÉ" - -msgid "ADDING" -msgstr "AJOUT" - -msgid "Check for mysql session.sess_id sanity" -msgstr "" - -msgid "fixed" -msgstr "" - -msgid "Check for mysql page.id auto_increment flag" -msgstr "" - -msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" -msgstr "" - -#, php-format -msgid "version <em>%s</em>" -msgstr "version <em>%s</em>" - -msgid "not affected" -msgstr "non affectée" - -msgid "FIXED" -msgstr "CORRIGÉ" - -msgid "Check for ACCESS_LOG_SQL passwords in POST requests" -msgstr "" - -msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)" -msgstr "" - -msgid "FIXING" -msgstr "" - -msgid "db version: upgrade to " -msgstr "Version de la base de données : mise à niveau vers " - -msgid "Check for extra page.cached_html column" -msgstr "Recherche une colonne supplémentaire page.cached_html" - -msgid "CONVERTING" -msgstr "" - -msgid "Check for relation field in link table" -msgstr "Vérifie le champ relation dans la table des liens" - -msgid "Rebuild entire database to upgrade relation links" -msgstr "" -"Reconstruit toute la base de données pour mettre à jour les liens de relation" - -#, php-format msgid "%s not found in %s" msgstr "%s non trouvé dans %s" @@ -4753,6 +4652,9 @@ msgid "fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX" msgstr "" +msgid "FIXED" +msgstr "CORRIGÉ" + msgid "fixed with" msgstr "" @@ -5945,10 +5847,81 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "Provide weather reports from the Internet." +#~ msgstr "Météo importée d'internet." + +#~ msgid "The ICAO “%s” wasn't recognized." +#~ msgstr "L'ICAO « %s » n'a pas été reconnu." + +#~ msgid "%s does not know about the language “%s”, using “en” instead." +#~ msgstr "" +#~ "%s ne connaît pas la langue « %s », utilisation de « en » à la place." + +#~ msgid "Submit country" +#~ msgstr "Soumettre le pays" + +#~ msgid "Change country" +#~ msgstr "Changer le pays" + +#~ msgid "Submit location" +#~ msgstr "Soumettre la localisation" + +#~ msgid "PhpWeather" +#~ msgstr "MétéoPhp" + +#~ msgid "PhpWeatherPlugin" +#~ msgstr "GreffonMétéoPhp" + +#~ msgid "database" +#~ msgstr "base de données" + +#~ msgid "db version: we want " +#~ msgstr "Version de la base de données : on veut " + +#~ msgid "db version: we have " +#~ msgstr "Version de la base de données : on a " + +#~ msgid "Backend type: " +#~ msgstr "Type de backend : " + +#~ msgid "Check for table %s" +#~ msgstr "Vérifie la table %s" + +#~ msgid "You need to upgrade to schema/psql-initialize.sql manually!" +#~ msgstr "Vous devez mettre à jour schema/psql-initialize.sql à la main !" + +#~ msgid "Check for new session.sess_ip column" +#~ msgstr "Recherche une nouvelle colonne session.sess_ip" + +#~ msgid "SKIP" +#~ msgstr "SAUTÉ" + +#~ msgid "ADDING" +#~ msgstr "AJOUT" + +#~ msgid "version <em>%s</em>" +#~ msgstr "version <em>%s</em>" + +#~ msgid "not affected" +#~ msgstr "non affectée" + +#~ msgid "db version: upgrade to " +#~ msgstr "Version de la base de données : mise à niveau vers " + +#~ msgid "Check for extra page.cached_html column" +#~ msgstr "Recherche une colonne supplémentaire page.cached_html" + +#~ msgid "Check for relation field in link table" +#~ msgstr "Vérifie le champ relation dans la table des liens" + +#~ msgid "Rebuild entire database to upgrade relation links" +#~ msgstr "" +#~ "Reconstruit toute la base de données pour mettre à jour les liens de " +#~ "relation" + #~ msgid "CreatePage failed" #~ msgstr "La création de la page a échoué" -#, php-format #~ msgid "Do you really want to create the page “%s”?" #~ msgstr "Voulez-vous réellement créer la page « %s » ?" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/locale/po/it.po 2021-07-29 19:11:48 UTC (rev 10398) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-16 13:23+0200\n" +"POT-Creation-Date: 2021-07-29 21:10+0200\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -2186,26 +2186,6 @@ msgid "Invalid color: %s" msgstr "" -msgid "Provide weather reports from the Internet." -msgstr "" - -#, php-format -msgid "The ICAO “%s” wasn't recognized." -msgstr "" - -#, php-format -msgid "%s does not know about the language “%s”, using “en” instead." -msgstr "" - -msgid "Submit country" -msgstr "" - -msgid "Change country" -msgstr "" - -msgid "Submit location" -msgstr "" - msgid "Ploticus image creation." msgstr "" @@ -4092,12 +4072,6 @@ msgid "PhpHighlightPlugin" msgstr "" -msgid "PhpWeather" -msgstr "" - -msgid "PhpWeatherPlugin" -msgstr "" - msgid "PhpWiki" msgstr "" @@ -4528,81 +4502,7 @@ msgid "CREATED" msgstr "" -msgid "database" -msgstr "" - -msgid "db version: we want " -msgstr "" - -msgid "db version: we have " -msgstr "" - -msgid "Backend type: " -msgstr "" - #, php-format -msgid "Check for table %s" -msgstr "" - -msgid "You need to upgrade to schema/psql-initialize.sql manually!" -msgstr "" - -msgid "Check for new session.sess_ip column" -msgstr "" - -msgid "SKIP" -msgstr "" - -msgid "ADDING" -msgstr "" - -msgid "Check for mysql session.sess_id sanity" -msgstr "" - -msgid "fixed" -msgstr "" - -msgid "Check for mysql page.id auto_increment flag" -msgstr "" - -msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" -msgstr "" - -#, php-format -msgid "version <em>%s</em>" -msgstr "versione <em>%s</em>" - -msgid "not affected" -msgstr "" - -msgid "FIXED" -msgstr "" - -msgid "Check for ACCESS_LOG_SQL passwords in POST requests" -msgstr "" - -msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)" -msgstr "" - -msgid "FIXING" -msgstr "" - -msgid "db version: upgrade to " -msgstr "" - -msgid "Check for extra page.cached_html column" -msgstr "" - -msgid "CONVERTING" -msgstr "" - -msgid "Check for relation field in link table" -msgstr "" - -msgid "Rebuild entire database to upgrade relation links" -msgstr "" - -#, php-format msgid "%s not found in %s" msgstr "%s non trovato in %s" @@ -4627,6 +4527,9 @@ msgid "fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX" msgstr "" +msgid "FIXED" +msgstr "" + msgid "fixed with" msgstr "Modifica" @@ -5776,6 +5679,9 @@ msgid "Edit this page" msgstr "" +#~ msgid "version <em>%s</em>" +#~ msgstr "versione <em>%s</em>" + #~ msgid "GoodStyle" #~ msgstr "BuonStile" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/locale/po/ja.po 2021-07-29 19:11:48 UTC (rev 10398) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-16 13:23+0200\n" +"POT-Creation-Date: 2021-07-29 21:10+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -2172,26 +2172,6 @@ msgid "Invalid color: %s" msgstr "" -msgid "Provide weather reports from the Internet." -msgstr "" - -#, php-format -msgid "The ICAO “%s” wasn't recognized." -msgstr "" - -#, php-format -msgid "%s does not know about the language “%s”, using “en” instead." -msgstr "" - -msgid "Submit country" -msgstr "国名送信" - -msgid "Change country" -msgstr "国名変更" - -msgid "Submit location" -msgstr "所在地変更" - msgid "Ploticus image creation." msgstr "" @@ -4078,12 +4058,6 @@ msgid "PhpHighlightPlugin" msgstr "PHPハイライトプラグイン" -msgid "PhpWeather" -msgstr "" - -msgid "PhpWeatherPlugin" -msgstr "" - msgid "PhpWiki" msgstr "" @@ -4514,81 +4488,7 @@ msgid "CREATED" msgstr "" -msgid "database" -msgstr "" - -msgid "db version: we want " -msgstr "" - -msgid "db version: we have " -msgstr "" - -msgid "Backend type: " -msgstr "" - #, php-format -msgid "Check for table %s" -msgstr "" - -msgid "You need to upgrade to schema/psql-initialize.sql manually!" -msgstr "" - -msgid "Check for new session.sess_ip column" -msgstr "" - -msgid "SKIP" -msgstr "" - -msgid "ADDING" -msgstr "" - -msgid "Check for mysql session.sess_id sanity" -msgstr "" - -msgid "fixed" -msgstr "" - -msgid "Check for mysql page.id auto_increment flag" -msgstr "" - -msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" -msgstr "" - -#, php-format -msgid "version <em>%s</em>" -msgstr "バージョン <em>%s</em>" - -msgid "not affected" -msgstr "" - -msgid "FIXED" -msgstr "" - -msgid "Check for ACCESS_LOG_SQL passwords in POST requests" -msgstr "" - -msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)" -msgstr "" - -msgid "FIXING" -msgstr "" - -msgid "db version: upgrade to " -msgstr "" - -msgid "Check for extra page.cached_html column" -msgstr "" - -msgid "CONVERTING" -msgstr "" - -msgid "Check for relation field in link table" -msgstr "" - -msgid "Rebuild entire database to upgrade relation links" -msgstr "" - -#, php-format msgid "%s not found in %s" msgstr "" @@ -4613,6 +4513,9 @@ msgid "fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX" msgstr "" +msgid "FIXED" +msgstr "" + msgid "fixed with" msgstr "" @@ -5762,6 +5665,18 @@ msgid "Edit this page" msgstr "ページを編集しています" +#~ msgid "Submit country" +#~ msgstr "国名送信" + +#~ msgid "Change country" +#~ msgstr "国名変更" + +#~ msgid "Submit location" +#~ msgstr "所在地変更" + +#~ msgid "version <em>%s</em>" +#~ msgstr "バージョン <em>%s</em>" + #~ msgid "Page info" #~ msgstr "ページ情報" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/locale/po/nl.po 2021-07-29 19:11:48 UTC (rev 10398) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-16 13:23+0200\n" +"POT-Creation-Date: 2021-07-29 21:10+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -2178,26 +2178,6 @@ msgid "Invalid color: %s" msgstr "" -msgid "Provide weather reports from the Internet." -msgstr "" - -#, php-format -msgid "The ICAO “%s” wasn't recognized." -msgstr "" - -#, php-format -msgid "%s does not know about the language “%s”, using “en” instead." -msgstr "" - -msgid "Submit country" -msgstr "" - -msgid "Change country" -msgstr "" - -msgid "Submit location" -msgstr "" - msgid "Ploticus image creation." msgstr "" @@ -4084,12 +4064,6 @@ msgid "PhpHighlightPlugin" msgstr "" -msgid "PhpWeather" -msgstr "" - -msgid "PhpWeatherPlugin" -msgstr "" - msgid "PhpWiki" msgstr "" @@ -4520,81 +4494,7 @@ msgid "CREATED" msgstr "" -msgid "database" -msgstr "" - -msgid "db version: we want " -msgstr "" - -msgid "db version: we have " -msgstr "" - -msgid "Backend type: " -msgstr "" - #, php-format -msgid "Check for table %s" -msgstr "" - -msgid "You need to upgrade to schema/psql-initialize.sql manually!" -msgstr "" - -msgid "Check for new session.sess_ip column" -msgstr "" - -msgid "SKIP" -msgstr "" - -msgid "ADDING" -msgstr "" - -msgid "Check for mysql session.sess_id sanity" -msgstr "" - -msgid "fixed" -msgstr "" - -msgid "Check for mysql page.id auto_increment flag" -msgstr "" - -msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" -msgstr "" - -#, php-format -msgid "version <em>%s</em>" -msgstr "versie <em>%s</em>" - -msgid "not affected" -msgstr "" - -msgid "FIXED" -msgstr "" - -msgid "Check for ACCESS_LOG_SQL passwords in POST requests" -msgstr "" - -msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)" -msgstr "" - -msgid "FIXING" -msgstr "" - -msgid "db version: upgrade to " -msgstr "" - -msgid "Check for extra page.cached_html column" -msgstr "" - -msgid "CONVERTING" -msgstr "" - -msgid "Check for relation field in link table" -msgstr "" - -msgid "Rebuild entire database to upgrade relation links" -msgstr "" - -#, php-format msgid "%s not found in %s" msgstr "" @@ -4619,6 +4519,9 @@ msgid "fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX" msgstr "" +msgid "FIXED" +msgstr "" + msgid "fixed with" msgstr "" @@ -5768,6 +5671,9 @@ msgid "Edit this page" msgstr "" +#~ msgid "version <em>%s</em>" +#~ msgstr "versie <em>%s</em>" + #~ msgid "GoodStyle" #~ msgstr "GoedeStijl" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/locale/po/phpwiki.pot 2021-07-29 19:11:48 UTC (rev 10398) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-16 13:23+0200\n" +"POT-Creation-Date: 2021-07-29 21:10+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -2172,26 +2172,6 @@ msgid "Invalid color: %s" msgstr "" -msgid "Provide weather reports from the Internet." -msgstr "" - -#, php-format -msgid "The ICAO “%s” wasn't recognized." -msgstr "" - -#, php-format -msgid "%s does not know about the language “%s”, using “en” instead." -msgstr "" - -msgid "Submit country" -msgstr "" - -msgid "Change country" -msgstr "" - -msgid "Submit location" -msgstr "" - msgid "Ploticus image creation." msgstr "" @@ -4078,12 +4058,6 @@ msgid "PhpHighlightPlugin" msgstr "" -msgid "PhpWeather" -msgstr "" - -msgid "PhpWeatherPlugin" -msgstr "" - msgid "PhpWiki" msgstr "" @@ -4514,81 +4488,7 @@ msgid "CREATED" msgstr "" -msgid "database" -msgstr "" - -msgid "db version: we want " -msgstr "" - -msgid "db version: we have " -msgstr "" - -msgid "Backend type: " -msgstr "" - #, php-format -msgid "Check for table %s" -msgstr "" - -msgid "You need to upgrade to schema/psql-initialize.sql manually!" -msgstr "" - -msgid "Check for new session.sess_ip column" -msgstr "" - -msgid "SKIP" -msgstr "" - -msgid "ADDING" -msgstr "" - -msgid "Check for mysql session.sess_id sanity" -msgstr "" - -msgid "fixed" -msgstr "" - -msgid "Check for mysql page.id auto_increment flag" -msgstr "" - -msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" -msgstr "" - -#, php-format -msgid "version <em>%s</em>" -msgstr "" - -msgid "not affected" -msgstr "" - -msgid "FIXED" -msgstr "" - -msgid "Check for ACCESS_LOG_SQL passwords in POST requests" -msgstr "" - -msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)" -msgstr "" - -msgid "FIXING" -msgstr "" - -msgid "db version: upgrade to " -msgstr "" - -msgid "Check for extra page.cached_html column" -msgstr "" - -msgid "CONVERTING" -msgstr "" - -msgid "Check for relation field in link table" -msgstr "" - -msgid "Rebuild entire database to upgrade relation links" -msgstr "" - -#, php-format msgid "%s not found in %s" msgstr "" @@ -4613,6 +4513,9 @@ msgid "fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX" msgstr "" +msgid "FIXED" +msgstr "" + msgid "fixed with" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2021-07-29 17:42:03 UTC (rev 10397) +++ trunk/locale/po/sv.po 2021-07-29 19:11:48 UTC (rev 10398) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-16 13:23+0200\n" +"POT-Creation-Date: 2021-07-29 21:10+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -2173,26 +2173,6 @@ msgid "Invalid color: %s" msgstr "" -msgid "Provide weather reports from the Internet." -msgstr "" - -#, php-format -msgid "The ICAO “%s” wasn't recognized." -msgstr "" - -#, php-format -msgid "%s does not know about the language “%s”, using “en” instead." -msgstr "" - -msgid "Submit country" -msgstr "" - -msgid "Change country" -msgstr "" - -msgid "Submit location" -msgstr "" - msgid "Ploticus image creation." msgstr "" @@ -4079,12 +4059,6 @@ msgid "PhpHighlightPlugin" msgstr "" -msgid "PhpWeather" -msgstr "" - -msgid "PhpWeatherPlugin" -msgstr "" - msgid "PhpWiki" msgstr "" @@ -4515,81 +4489,7 @@ msgid "CREATED" msgstr "" -msgid "database" -msgstr "" - -msgid "db version: we want " -msgstr "" - -msgid "db version: we have " -msgstr "" - -msgid "Backend type: " -msgstr "" - #, php-format -msgid "Check for table %s" -msgstr ""... [truncated message content] |
From: <var...@us...> - 2021-07-29 17:42:06
|
Revision: 10397 http://sourceforge.net/p/phpwiki/code/10397 Author: vargenau Date: 2021-07-29 17:42:03 +0000 (Thu, 29 Jul 2021) Log Message: ----------- Remove function listOfFields that calls mysql_list_fields in PEAR Modified Paths: -------------- trunk/lib/WikiDB/backend/ADODB.php trunk/lib/WikiDB/backend/PDO.php trunk/lib/WikiDB/backend/PDO_mysql.php trunk/lib/WikiDB/backend/PearDB.php trunk/lib/upgrade.php Modified: trunk/lib/WikiDB/backend/ADODB.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB.php 2021-07-29 17:14:42 UTC (rev 10396) +++ trunk/lib/WikiDB/backend/ADODB.php 2021-07-29 17:42:03 UTC (rev 10397) @@ -1295,31 +1295,6 @@ { return $this->_dbh->MetaTables(); } - - // other database needs another connection and other privileges. - function listOfFields($database, $table) - { - $field_list = array(); - $old_db = $this->database(); - if ($database != $old_db) { - $this->_dbh->Connect($this->_parsedDSN['hostspec'], - DBADMIN_USER ? DBADMIN_USER : $this->_parsedDSN['username'], - DBADMIN_PASSWD ? DBADMIN_PASSWD : $this->_parsedDSN['password'], - $database); - } - foreach ($this->_dbh->MetaColumns($table, false) as $field) { - $field_list[] = $field->name; - } - if ($database != $old_db) { - $this->_dbh->close(); - $this->_dbh->Connect($this->_parsedDSN['hostspec'], - $this->_parsedDSN['username'], - $this->_parsedDSN['password'], - $old_db); - } - return $field_list; - } - } class WikiDB_backend_ADODB_generic_iter Modified: trunk/lib/WikiDB/backend/PDO.php =================================================================== --- trunk/lib/WikiDB/backend/PDO.php 2021-07-29 17:14:42 UTC (rev 10396) +++ trunk/lib/WikiDB/backend/PDO.php 2021-07-29 17:42:03 UTC (rev 10397) @@ -1297,12 +1297,6 @@ return array(); } - function listOfFields($database, $table) - { - trigger_error("PDO: virtual listOfFields", E_USER_ERROR); - return array(); - } - /* * LIMIT with OFFSET is not SQL specified. * mysql: LIMIT $offset, $count Modified: trunk/lib/WikiDB/backend/PDO_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_mysql.php 2021-07-29 17:14:42 UTC (rev 10396) +++ trunk/lib/WikiDB/backend/PDO_mysql.php 2021-07-29 17:42:03 UTC (rev 10397) @@ -97,37 +97,6 @@ return $tables; } - function listOfFields($database, $table) - { - $old_db = $this->database(); - if ($database != $old_db) { - try { - $dsn = preg_replace("/dbname=\w+;/", "dbname=" . $database, $this->_dsn); - $dsn = preg_replace("/database=\w+;/", "database=" . $database, $dsn); - $conn = new PDO($dsn, - DBADMIN_USER ? DBADMIN_USER : $this->_parsedDSN['username'], - DBADMIN_PASSWD ? DBADMIN_PASSWD : $this->_parsedDSN['password']); - } catch (PDOException $e) { - echo "<br>\nDB Connection failed: " . $e->getMessage(); - echo "<br>\nDSN: '", $this->_dsn, "'"; - echo "<br>\n_parsedDSN: '", print_r($this->_parsedDSN), "'"; - $conn = $this->_dbh; - } - } else { - $conn = $this->_dbh; - } - $sth = $conn->prepare("SHOW COLUMNS FROM $table"); - $sth->execute(); - $field_list = array(); - while ($row = $sth->fetch(PDO::FETCH_NUM)) { - $field_list[] = $row[0]; - } - if ($database != $old_db) { - unset($conn); - } - return $field_list; - } - /* * offset specific syntax within mysql * convert from,count to SQL "LIMIT $offset, $count" Modified: trunk/lib/WikiDB/backend/PearDB.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB.php 2021-07-29 17:14:42 UTC (rev 10396) +++ trunk/lib/WikiDB/backend/PearDB.php 2021-07-29 17:42:03 UTC (rev 10397) @@ -1151,28 +1151,6 @@ { return $this->_dbh->getListOf('tables'); } - - function listOfFields($database, $table) - { - if (($this->backendType() == 'mysql') || ($this->backendType() == 'mysqli')) { - $fields = array(); - assert(!empty($database)); - assert(!empty($table)); - $result = mysql_list_fields($database, $table, $this->_dbh->connection) or - trigger_error(__FILE__ . ':' . __LINE__ . ' ' . mysql_error(), E_USER_WARNING); - if (!$result) return array(); - $columns = mysql_num_fields($result); - for ($i = 0; $i < $columns; $i++) { - $fields[] = mysql_field_name($result, $i); - } - mysql_free_result($result); - return $fields; - } else { - // TODO: try ADODB version? - trigger_error("Unsupported dbtype and backend. Either switch to ADODB or check it manually."); - return false; - } - } } /** Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2021-07-29 17:14:42 UTC (rev 10396) +++ trunk/lib/upgrade.php 2021-07-29 17:42:03 UTC (rev 10397) @@ -24,7 +24,7 @@ */ /** - * Upgrade existing WikiDB and config settings after installing a new PhpWiki sofwtare version. + * Upgrade existing WikiDB and config settings after installing a new PhpWiki software version. * Status: almost no queries for verification. * simple merge conflict resolution, or Overwrite All. * @@ -57,7 +57,7 @@ public $error_caught; public $_configUpdates; public $check_args; - private $dbi; + public $dbi; private $request; private $phpwiki_version; private $isSQL; @@ -403,208 +403,6 @@ } /** - * Update from ~1.3.4 to current. - * tables: Only session, user, pref and member - * jeffs-hacks database api (around 1.3.2) later: - * people should export/import their pages if using that old versions. - */ - public function CheckDatabaseUpdate() - { - global $DBParams; - - echo "<h2>", sprintf(_("Check for necessary %s updates"), - _("database")), - " - ", DATABASE_TYPE, "</h2>\n"; - echo _("db version: we want "), $this->current_db_version, "\n<br />"; - echo _("db version: we have "), $this->db_version, "\n<br />"; - if ($this->db_version >= $this->current_db_version) { - echo _("OK"), "<br />\n"; - return; - } - - $backend_type = $this->dbi->_backend->backendType(); - if ($this->isSQL) { - echo "<p>", _("Backend type: "), $backend_type, "</p>\n"; - $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : ''; - $tables = $this->dbi->_backend->listOfTables(); - foreach (explode(':', 'session:pref:member') as $table) { - echo sprintf(_("Check for table %s"), $table), " ... "; - if (!in_array($prefix . $table, $tables)) { - $this->installTable($table, $backend_type); - } else { - echo _("OK"), " <br />\n"; - } - } - } - - if ($this->phpwiki_version >= 1030.12200612 and $this->db_version < 1030.13) { - if ($this->isSQL and preg_match("/(pgsql|postgres)/", $backend_type)) { - trigger_error(_("You need to upgrade to schema/psql-initialize.sql manually!"), - E_USER_WARNING); - // $this->_upgrade_psql_tsearch2(); - } - $this->_upgrade_relation_links(); - } - - if (ACCESS_LOG_SQL and $this->isSQL) { - $table = "accesslog"; - echo sprintf(_("Check for table %s"), $table), " ... "; - if (!in_array($prefix . $table, $tables)) { - $this->installTable($table, $backend_type); - } else { - echo _("OK"), " <br />\n"; - } - } - if ($this->isSQL and (class_exists("RatingsUserFactory") or $this->dbi->isWikiPage(_("RateIt")))) { - $table = "rating"; - echo sprintf(_("Check for table %s"), $table), " ... "; - if (!in_array($prefix . $table, $tables)) { - $this->installTable($table, $backend_type); - } else { - echo _("OK"), " <br />\n"; - } - } - $backend = &$this->dbi->_backend->_dbh; - if ($this->isSQL) - extract($this->dbi->_backend->_table_names); - - // 1.3.8 added session.sess_ip - if ($this->isSQL and $this->phpwiki_version >= 1030.08 and USE_DB_SESSION - and isset($this->request->_dbsession) - ) { - echo _("Check for new session.sess_ip column"), " ... "; - $database = $this->dbi->_backend->database(); - assert(!empty($DBParams['db_session_table'])); - $session_tbl = $prefix . $DBParams['db_session_table']; - $sess_fields = $this->dbi->_backend->listOfFields($database, $session_tbl); - if (!$sess_fields) { - echo _("SKIP"); - } elseif (!strstr(strtolower(join(':', $sess_fields)), "sess_ip")) { - // TODO: postgres test (should be able to add columns at the end, but not in between) - echo "<b>", _("ADDING"), "</b>", " ... "; - $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl ADD sess_ip CHAR(15) NOT NULL"); - $this->dbi->genericSqlQuery("CREATE INDEX sess_date ON $session_tbl (sess_date)"); - } else { - echo _("OK"); - } - echo "<br />\n"; - if (substr($backend_type, 0, 5) == 'mysql') { - // upgrade to 4.1.8 destroyed my session table: - // sess_id => varchar(10), sess_data => varchar(5). For others obviously also. - echo _("Check for mysql session.sess_id sanity"), " ... "; - $result = $this->dbi->genericSqlQuery("DESCRIBE $session_tbl"); - if (DATABASE_TYPE == 'SQL') { - $iter = new WikiDB_backend_PearDB_generic_iter($backend, $result); - } elseif (DATABASE_TYPE == 'ADODB') { - $iter = new WikiDB_backend_ADODB_generic_iter($backend, $result, - array("Field", "Type", "Null", "Key", "Default", "Extra")); - } elseif (DATABASE_TYPE == 'PDO') { - $iter = new WikiDB_backend_PDO_generic_iter($backend, $result); - } - while ($col = $iter->next()) { - if ($col["Field"] == 'sess_id' and !strstr(strtolower($col["Type"]), 'char(32)')) { - $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_id" - . " sess_id CHAR(32) NOT NULL"); - echo "sess_id ", $col["Type"], " ", _("fixed"), " => CHAR(32) "; - } - if ($col["Field"] == 'sess_ip' and !strstr(strtolower($col["Type"]), 'char(15)')) { - $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_ip" - . " sess_ip CHAR(15) NOT NULL"); - echo "sess_ip ", $col["Type"], " ", _("fixed"), " => CHAR(15) "; - } - } - echo _("OK"), "<br />\n"; - } - } - - if ($this->isSQL and ACCESS_LOG_SQL & 2) { - echo _("Check for ACCESS_LOG_SQL passwords in POST requests"), " ... "; - // Don't display passwords in POST requests (up to 2005-02-04 12:03:20) - $res = $this->dbi->genericSqlIter("SELECT time_stamp, remote_host, " . - "request_args FROM ${prefix}accesslog WHERE request_args LIKE " . - "'%s:6:\"passwd\"%' AND request_args NOT LIKE '%s:6:\"passwd\";" . - "s:15:\"<not displayed>\"%'"); - $count = 0; - while ($row = $res->next()) { - $args = preg_replace("/(s:6:\"passwd\";s:15:\").*(\")/", - "$1<not displayed>$2", $row["request_args"]); - $ts = $row["time_stamp"]; - $rh = $row["remote_host"]; - $this->dbi->genericSqlQuery("UPDATE ${prefix}accesslog SET " . - "request_args='$args' WHERE time_stamp=$ts AND " . - "remote_host='$rh'"); - $count++; - } - if ($count > 0) - echo "<b>" . _("FIXED") . "</b><br />\n"; - else - echo _("OK") . "<br />\n"; - - if ($this->phpwiki_version >= 1030.13) { - echo _("Check for ACCESS_LOG_SQL remote_host varchar(50)"), " ... "; - $database = $this->dbi->_backend->database(); - $accesslog_tbl = $prefix . 'accesslog'; - $fields = $this->dbi->_backend->listOfFields($database, $accesslog_tbl); - if (!$fields) { - echo _("SKIP"); - } elseif (strstr(strtolower(join(':', $sess_fields)), "remote_host")) { - // TODO: how to check size, already done? - echo "<b>", _("FIXING"), "remote_host</b>", " ... "; - $this->dbi->genericSqlQuery("ALTER TABLE $accesslog_tbl CHANGE remote_host VARCHAR(100)"); - } else { - echo _("FAILED"); - } - echo "<br />\n"; - } - } - $this->_upgrade_cached_html(); - - if ($this->db_version < $this->current_db_version) { - $this->dbi->set_db_version($this->current_db_version); - $this->db_version = $this->dbi->get_db_version(); - echo _("db version: upgrade to "), $this->db_version, " ... ", _("OK"), "<br />\n"; - flush(); - } - } - - /** - * if page.cached_html does not exists: - * put _cached_html from pagedata into a new separate blob, - * not into the huge serialized string. - * - * It is only rarely needed: for current page only, if-not-modified, - * but was extracted for every simple page iteration. - */ - private function _upgrade_cached_html() - { - if (!$this->isSQL) - return; - if ($this->phpwiki_version >= 1030.10) { - echo _("Check for extra page.cached_html column"), " ... "; - $database = $this->dbi->_backend->database(); - extract($this->dbi->_backend->_table_names); - $fields = $this->dbi->_backend->listOfFields($database, $page_tbl); - if (!$fields) { - echo _("SKIP"), "<br />\n"; - return; - } - if (!strstr(strtolower(join(':', $fields)), "cached_html")) { - echo "<b>", _("ADDING"), "</b>", " ... "; - $backend_type = $this->dbi->_backend->backendType(); - if (substr($backend_type, 0, 5) == 'mysql') - $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html MEDIUMBLOB"); - else - $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html BLOB"); - echo "<b>", _("CONVERTING"), "</b>", " ... "; - $count = $this->_convert_cached_html(); - echo $count, " ", _("OK"), "<br />\n"; - } else { - echo _("OK"), "<br />\n"; - } - } - } - - /** * move _cached_html for all pages from pagedata into a new separate blob. * decoupled from action=upgrade, so that it can be used by a WikiAdminUtils button also. */ @@ -634,44 +432,6 @@ } /** - * upgrade to 1.3.13 link structure. - */ - private function _upgrade_relation_links() - { - if ($this->phpwiki_version >= 1030.12200610 and $this->isSQL) { - echo _("Check for relation field in link table"), " ... "; - $database = $this->dbi->_backend->database(); - $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : ''; - $link_tbl = $prefix . 'link'; - $fields = $this->dbi->_backend->listOfFields($database, $link_tbl); - if (!$fields) { - echo _("SKIP"); - } elseif (strstr(strtolower(join(':', $fields)), "link")) { - echo "<b>", _("ADDING"), " relation</b>", " ... "; - $this->dbi->genericSqlQuery("ALTER TABLE $link_tbl ADD relation INT DEFAULT 0;"); - $this->dbi->genericSqlQuery("CREATE INDEX link_relation ON $link_tbl (relation);"); - } else { - echo _("FAILED"); - } - echo "<br />\n"; - } - if ($this->phpwiki_version >= 1030.12200610) { - echo _("Rebuild entire database to upgrade relation links"), " ... "; - if (DATABASE_TYPE == 'dba') { - echo "<b>", _("CONVERTING"), " dba linktable</b>", "(~2 min, max 4 min) ... "; - flush(); - longer_timeout(240); - $this->dbi->_backend->_linkdb->rebuild(); - } else { - flush(); - longer_timeout(180); - $this->dbi->_backend->rebuild(); - } - echo _("OK"), "<br />\n"; - } - } - - /** * preg_replace over local file. * Only line-orientated matches possible. */ @@ -731,7 +491,7 @@ array('key' => 'cache_control_none', 'fixed_with' => 1012.0, 'header' => sprintf(_("Check for %s"), "CACHE_CONTROL = NONE"), - 'applicable_args' => 'CACHE_CONTROL', + 'applicable_args' => array('CACHE_CONTROL'), 'notice' => _("CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"), 'check_args' => array("/^\s*CACHE_CONTROL\s*=\s*NONE/", "CACHE_CONTROL = NO_CACHE"))); $entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined_and_empty')); @@ -741,7 +501,7 @@ array('key' => 'group_method_none', 'fixed_with' => 1012.0, 'header' => sprintf(_("Check for %s"), "GROUP_METHOD = NONE"), - 'applicable_args' => 'GROUP_METHOD', + 'applicable_args' => array('GROUP_METHOD'), 'notice' => _("GROUP_METHOD is set to NONE, and must be changed to \"NONE\""), 'check_args' => array("/^\s*GROUP_METHOD\s*=\s*NONE/", "GROUP_METHOD = \"NONE\""))); $entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined_and_empty')); @@ -751,7 +511,7 @@ array('key' => 'blog_empty_default_prefix', 'fixed_with' => 1013.0, 'header' => sprintf(_("Check for %s"), "BLOG_EMPTY_DEFAULT_PREFIX"), - 'applicable_args' => 'BLOG_EMPTY_DEFAULT_PREFIX', + 'applicable_args' => array('BLOG_EMPTY_DEFAULT_PREFIX'), 'notice' => _("fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX"), 'check_args' => array("/BLOG_EMPTY_DEFAULT_PREFIX\s*=/", "BLOG_DEFAULT_EMPTY_PREFIX ="))); $entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined')); @@ -808,10 +568,6 @@ $this->{$k} = $params[$k]; } } - if (!is_array($this->applicable_args)) // single arg convenience shortcut - $this->applicable_args = array($this->applicable_args); - if (!is_array($this->check_args)) // single arg convenience shortcut - $this->check_args = array($this->check_args); if ($this->notice === '' and count($this->applicable_args) > 0) $this->notice = 'Check for ' . join(', ', $this->applicable_args); $this->_db_key = "_upgrade"; @@ -940,9 +696,6 @@ @ini_set("implicit_flush", true); StartLoadDump($request, _("Upgrading this PhpWiki")); $upgrade = new Upgrade($request); - if (!$request->getArg('nodb')) { - $upgrade->CheckDatabaseUpdate(); // first check cached_html and friends - } if (!$request->getArg('nopgsrc')) { $upgrade->CheckPgsrcUpdate(); $upgrade->CheckActionPageUpdate(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 17:14:44
|
Revision: 10396 http://sourceforge.net/p/phpwiki/code/10396 Author: vargenau Date: 2021-07-29 17:14:42 +0000 (Thu, 29 Jul 2021) Log Message: ----------- lib/upgrade.php: add members, simplify code Modified Paths: -------------- trunk/lib/upgrade.php Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2021-07-29 16:44:29 UTC (rev 10395) +++ trunk/lib/upgrade.php 2021-07-29 17:14:42 UTC (rev 10396) @@ -57,14 +57,17 @@ public $error_caught; public $_configUpdates; public $check_args; + private $dbi; + private $request; + private $phpwiki_version; + private $isSQL; + private $db_version; function __construct(&$request) { $this->request =& $request; - $this->dbi =& $request->_dbi; // no reference for dbadmin ? + $this->dbi =& $request->_dbi; $this->phpwiki_version = $this->current_db_version = phpwiki_version(); - //$this->current_db_version = 1030.13; // should be stored in the db. should be phpwiki_version - $this->db_version = $this->dbi->get_db_version(); $this->isSQL = $this->dbi->_backend->isSQL(); } @@ -412,7 +415,6 @@ echo "<h2>", sprintf(_("Check for necessary %s updates"), _("database")), " - ", DATABASE_TYPE, "</h2>\n"; - $dbadmin = $this->request->getArg('dbadmin'); echo _("db version: we want "), $this->current_db_version, "\n<br />"; echo _("db version: we have "), $this->db_version, "\n<br />"; if ($this->db_version >= $this->current_db_version) { @@ -534,9 +536,9 @@ $count++; } if ($count > 0) - echo "<b>", _("FIXED"), "</b>", "<br />\n"; + echo "<b>" . _("FIXED") . "</b><br />\n"; else - echo _("OK"), "<br />\n"; + echo _("OK") . "<br />\n"; if ($this->phpwiki_version >= 1030.13) { echo _("Check for ACCESS_LOG_SQL remote_host varchar(50)"), " ... "; @@ -570,43 +572,36 @@ * put _cached_html from pagedata into a new separate blob, * not into the huge serialized string. * - * It is only rarelely needed: for current page only, if-not-modified, + * It is only rarely needed: for current page only, if-not-modified, * but was extracted for every simple page iteration. */ - private function _upgrade_cached_html($verbose = true) + private function _upgrade_cached_html() { if (!$this->isSQL) - return 0; - $count = 0; + return; if ($this->phpwiki_version >= 1030.10) { - if ($verbose) - echo _("Check for extra page.cached_html column"), " ... "; + echo _("Check for extra page.cached_html column"), " ... "; $database = $this->dbi->_backend->database(); extract($this->dbi->_backend->_table_names); $fields = $this->dbi->_backend->listOfFields($database, $page_tbl); if (!$fields) { echo _("SKIP"), "<br />\n"; - return 0; + return; } if (!strstr(strtolower(join(':', $fields)), "cached_html")) { - if ($verbose) - echo "<b>", _("ADDING"), "</b>", " ... "; + echo "<b>", _("ADDING"), "</b>", " ... "; $backend_type = $this->dbi->_backend->backendType(); if (substr($backend_type, 0, 5) == 'mysql') $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html MEDIUMBLOB"); else $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html BLOB"); - if ($verbose) - echo "<b>", _("CONVERTING"), "</b>", " ... "; + echo "<b>", _("CONVERTING"), "</b>", " ... "; $count = $this->_convert_cached_html(); - if ($verbose) - echo $count, " ", _("OK"), "<br />\n"; + echo $count, " ", _("OK"), "<br />\n"; } else { - if ($verbose) - echo _("OK"), "<br />\n"; + echo _("OK"), "<br />\n"; } } - return $count; } /** @@ -715,7 +710,7 @@ // todo: skip $reason = sprintf(_("%s not found in %s"), $match, $filename); unlink($out); - return array($found, $reason); + return array(false, $reason); } else { @unlink("$file.bak"); @rename($file, "$file.bak"); @@ -780,6 +775,12 @@ public $method_cb; public $check_cb; public $reason; + public array $applicable_args; + public object $parent; + private array $check_args; + private string $notice; + private string $_db_key; + private $upgrade; /** * Add an upgrade item to be checked. @@ -906,13 +907,13 @@ { public function _applicable_defined() { - return (boolean)defined($this->applicable_args[0]); + return defined($this->applicable_args[0]); } public function _applicable_defined_and_empty() { $const = $this->applicable_args[0]; - return (boolean)(defined($const) and !constant($const)); + return defined($const) and !constant($const); } public function default_method($args) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 16:44:31
|
Revision: 10395 http://sourceforge.net/p/phpwiki/code/10395 Author: vargenau Date: 2021-07-29 16:44:29 +0000 (Thu, 29 Jul 2021) Log Message: ----------- lib/upgrade.php: remove code using mysql_list_fields, mysql_num_fields, mysql_field_name, mysql_field_flags, mysql_free_result Modified Paths: -------------- trunk/lib/upgrade.php Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2021-07-29 15:46:37 UTC (rev 10394) +++ trunk/lib/upgrade.php 2021-07-29 16:44:29 UTC (rev 10395) @@ -515,103 +515,6 @@ } } - /* TODO: - ALTER TABLE link ADD relation INT DEFAULT 0; - CREATE INDEX linkrelation ON link (relation); - */ - - // 1.3.10 mysql requires page.id auto_increment - // mysql, mysqli or mysqlt - if ($this->phpwiki_version >= 1030.099 and substr($backend_type, 0, 5) == 'mysql' - and DATABASE_TYPE != 'PDO' - ) { - echo _("Check for mysql page.id auto_increment flag"), " ... "; - assert(!empty($page_tbl)); - $database = $this->dbi->_backend->database(); - // mysql_list_fields and mysql_num_fields removed in PHP 7 - $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection()); - $columns = mysql_num_fields($fields); - for ($i = 0; $i < $columns; $i++) { - if (mysql_field_name($fields, $i) == 'id') { - $flags = mysql_field_flags($fields, $i); - //DONE: something was wrong with ADODB here. - if (!strstr(strtolower($flags), "auto_increment")) { - echo "<b>", _("ADDING"), "</b>", " ... "; - // MODIFY col_def valid since mysql 3.22.16, - // older mysql's need CHANGE old_col col_def - $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE id" - . " id INT NOT NULL AUTO_INCREMENT"); - $fields = mysql_list_fields($database, $page_tbl); - if (!strstr(strtolower(mysql_field_flags($fields, $i)), "auto_increment")) - echo ' <span style="color: red; font-weight: bold;">' . _("FAILED") . "</span><br />\n"; - else - echo _("OK"), "<br />\n"; - } else { - echo _("OK"), "<br />\n"; - } - break; - } - } - mysql_free_result($fields); - } - - // Check for mysql 4.1.x/5.0.0a binary search problem. - // http://bugs.mysql.com/bug.php?id=4398 - // "select * from page where LOWER(pagename) like '%search%'" does not apply LOWER! - // Confirmed for 4.1.0alpha,4.1.3-beta,5.0.0a; not yet tested for 4.1.2alpha, - // On windows only, though utf8 would be useful elsewhere also. - // Illegal mix of collations (latin1_bin,IMPLICIT) and - // (utf8_general_ci, COERCIBLE) for operation '=']) - if (isWindows() and substr($backend_type, 0, 5) == 'mysql') { - echo _("Check for mysql 4.1.x/5.0.0 binary search on Windows problem"), " ... "; - $mysql_version = $this->dbi->_backend->_serverinfo['version']; - if ($mysql_version < 401.0) { - echo sprintf(_("version <em>%s</em>"), $mysql_version), " ", - _("not affected"), "<br />\n"; - } elseif ($mysql_version >= 401.6) { // FIXME: since which version? - $row = $this->dbi->_backend->getRow("SHOW CREATE TABLE $page_tbl"); - $result = join(" ", $row); - if (strstr(strtolower($result), "character set") - and strstr(strtolower($result), "collate") - ) { - echo _("OK"), "<br />\n"; - } else { - $charset = 'UTF-8'; - $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename " - . "pagename VARCHAR(100) " - . "CHARACTER SET '$charset' COLLATE '$charset" . "_bin' NOT NULL"); - echo sprintf(_("version <em>%s</em>"), $mysql_version), - " <b>", _("FIXED"), "</b>", - "<br />\n"; - } - } elseif (DATABASE_TYPE != 'PDO') { - // check if already fixed - extract($this->dbi->_backend->_table_names); - assert(!empty($page_tbl)); - $database = $this->dbi->_backend->database(); - // mysql_list_fields and mysql_num_fields removed in PHP 7 - $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection()); - $columns = mysql_num_fields($fields); - for ($i = 0; $i < $columns; $i++) { - if (mysql_field_name($fields, $i) == 'pagename') { - $flags = mysql_field_flags($fields, $i); - // I think it was fixed with 4.1.6, but I tested it only with 4.1.8 - if ($mysql_version > 401.0 and $mysql_version < 401.6) { - // remove the binary flag - if (strstr(strtolower($flags), "binary")) { - // FIXME: on duplicate pagenames this will fail! - $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename" - . " pagename VARCHAR(100) NOT NULL"); - echo sprintf(_("version <em>%s</em>"), $mysql_version), - "<b>", _("FIXED"), "</b>" - , "<br />\n"; - } - } - break; - } - } - } - } if ($this->isSQL and ACCESS_LOG_SQL & 2) { echo _("Check for ACCESS_LOG_SQL passwords in POST requests"), " ... "; // Don't display passwords in POST requests (up to 2005-02-04 12:03:20) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 15:46:38
|
Revision: 10394 http://sourceforge.net/p/phpwiki/code/10394 Author: vargenau Date: 2021-07-29 15:46:37 +0000 (Thu, 29 Jul 2021) Log Message: ----------- configurator.php: use __construct Modified Paths: -------------- trunk/configurator.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2021-07-29 15:01:20 UTC (rev 10393) +++ trunk/configurator.php 2021-07-29 15:46:37 UTC (rev 10394) @@ -1651,7 +1651,6 @@ */ class _variable { - var $config_item_name; var $default_value; var $description; @@ -1658,7 +1657,7 @@ var $prefix; var $jscheck; - function _variable($config_item_name, $default_value = '', $description = '', $jscheck = '') + function __construct($config_item_name, $default_value = '', $description = '', $jscheck = '') { $this->config_item_name = $config_item_name; if (!$description) @@ -1682,7 +1681,7 @@ function _define($config_item_name, $default_value = '', $description = '', $jscheck = '') { - $this->_variable($config_item_name, $default_value, $description, $jscheck); + _variable::__construct($config_item_name, $default_value, $description, $jscheck); } function value() @@ -1953,9 +1952,9 @@ extends _define { - function numeric_define($config_item_name, $default_value = '', $description = '', $jscheck = '') + function __construct($config_item_name, $default_value = '', $description = '', $jscheck = '') { - $this->_define($config_item_name, $default_value, $description, $jscheck); + parent::__construct($config_item_name, $default_value, $description, $jscheck); if (!$jscheck) $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' is not an integer.', '^[-+]?[0-9]+$', '" . $this->get_config_item_name() . "', this);\""; } @@ -2044,11 +2043,10 @@ class _define_password extends _define { - - function _define_password($config_item_name, $default_value = '', $description = '', $jscheck = '') + function __construct($config_item_name, $default_value = '', $description = '', $jscheck = '') { if ($config_item_name == $default_value) $default_value = ''; - $this->_define($config_item_name, $default_value, $description, $jscheck); + parent::__construct($config_item_name, $default_value, $description, $jscheck); if (!$jscheck) $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '" . $this->get_config_item_name() . "', this);\""; @@ -2087,11 +2085,11 @@ extends _define_password { - function _define_password_optional($config_item_name, $default_value = '', $description = '', $jscheck = '') + function __construct($config_item_name, $default_value = '', $description = '', $jscheck = '') { if ($config_item_name == $default_value) $default_value = ''; if (!$jscheck) $this->jscheck = " "; - $this->_define($config_item_name, $default_value, $description, $jscheck); + parent::__construct($config_item_name, $default_value, $description, $jscheck); } function _get_config_line($posted_value) @@ -2128,10 +2126,10 @@ class _variable_password extends _variable { - function _variable_password($config_item_name, $default_value = '', $description = '', $jscheck = '') + function __construct($config_item_name, $default_value = '', $description = '', $jscheck = '') { if ($config_item_name == $default_value) $default_value = ''; - $this->_define($config_item_name, $default_value, $description, $jscheck); + parent::__construct($config_item_name, $default_value, $description, $jscheck); if (!$jscheck) $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '" . $this->get_config_item_name() . "', this);\""; } @@ -2314,7 +2312,7 @@ extends _define { // adds ->values property, instead of ->default_value - function boolean_define($config_item_name, $values = false, $description = '', $jscheck = '') + function __construct($config_item_name, $values = false, $description = '', $jscheck = '') { $this->config_item_name = $config_item_name; if (!$description) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 15:01:27
|
Revision: 10393 http://sourceforge.net/p/phpwiki/code/10393 Author: vargenau Date: 2021-07-29 15:01:20 +0000 (Thu, 29 Jul 2021) Log Message: ----------- configurator.php: check default_value exists Modified Paths: -------------- trunk/configurator.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2021-07-29 13:14:35 UTC (rev 10392) +++ trunk/configurator.php 2021-07-29 15:01:20 UTC (rev 10393) @@ -1829,9 +1829,13 @@ if (!empty($HTTP_POST_VARS[$this->config_item_name])) { return $HTTP_POST_VARS[$this->config_item_name]; } else { - $option = key($this->default_value); - next($this->default_value); - return $option; + if (is_array($this->default_value)) { + $option = key($this->default_value); + next($this->default_value); + return $option; + } else { + return ''; + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 13:14:38
|
Revision: 10392 http://sourceforge.net/p/phpwiki/code/10392 Author: vargenau Date: 2021-07-29 13:14:35 +0000 (Thu, 29 Jul 2021) Log Message: ----------- configurator.php: replace "each" to be compatable with PHP 8 Modified Paths: -------------- trunk/configurator.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2021-07-29 12:53:49 UTC (rev 10391) +++ trunk/configurator.php 2021-07-29 13:14:35 UTC (rev 10392) @@ -1826,10 +1826,11 @@ function value() { global $HTTP_POST_VARS; - if (!empty($HTTP_POST_VARS[$this->config_item_name])) + if (!empty($HTTP_POST_VARS[$this->config_item_name])) { return $HTTP_POST_VARS[$this->config_item_name]; - else { - list($option, $label) = each($this->default_value); + } else { + $option = key($this->default_value); + next($this->default_value); return $option; } } @@ -2353,7 +2354,7 @@ $default_value = $this->default_value ? 'true' : 'false'; /* There can usually only be two options, there can be * three options in the case of a boolean_define_commented_optional */ - while (list($option, $label) = each($values)) { + foreach ($values as $option => $label) { if (!is_null($this->default_value) and $option === $default_value) $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n"; else @@ -2376,7 +2377,8 @@ { if ($this->description) $n = "\n"; - list($default_value, $label) = each($this->default_value); + $default_value = key($this->default_value); + next($this->default_value); if ($posted_value == $default_value) return "${n};" . $this->_config_format($posted_value); elseif ($posted_value == '') @@ -2603,7 +2605,7 @@ <table> '; - while (list($property, $obj) = each($properties)) { + foreach ($properties as $property => $obj) { echo $obj->get_instructions($property); if ($h = $obj->get_html()) { echo "<td>" . $h . "</td>\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 12:53:51
|
Revision: 10391 http://sourceforge.net/p/phpwiki/code/10391 Author: vargenau Date: 2021-07-29 12:53:49 +0000 (Thu, 29 Jul 2021) Log Message: ----------- configurator.php: add description for DISABLED_ACTIONS Modified Paths: -------------- trunk/configurator.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2021-07-29 10:29:52 UTC (rev 10390) +++ trunk/configurator.php 2021-07-29 12:53:49 UTC (rev 10391) @@ -532,8 +532,14 @@ new numeric_define_optional('MINOR_EDIT_TIMEOUT', MINOR_EDIT_TIMEOUT); $properties["Disabled Actions"] = - new array_define('DISABLED_ACTIONS', DISABLED_ACTIONS /*array()*/); + new array_define('DISABLED_ACTIONS', array("dumpserial", "loadfile"), "Actions listed in this array will not be allowed. The complete list +of actions can be found in lib/main.php with the function +getActionDescription. +purge, remove, revert, xmlrpc, soap, upload, browse, create, diff, dumphtml, +dumpserial, edit, loadfile, lock, unlock, viewsource, zip, ziphtml, ... +"); + $properties["Moderate all Pagechanges"] = new boolean_define_commented_optional('ENABLE_MODERATEDPAGE_ALL'); @@ -2302,7 +2308,6 @@ class boolean_define extends _define { - // adds ->values property, instead of ->default_value function boolean_define($config_item_name, $values = false, $description = '', $jscheck = '') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 10:29:55
|
Revision: 10390 http://sourceforge.net/p/phpwiki/code/10390 Author: vargenau Date: 2021-07-29 10:29:52 +0000 (Thu, 29 Jul 2021) Log Message: ----------- configurator.php: remove DEBUG Modified Paths: -------------- trunk/configurator.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2021-07-29 10:26:22 UTC (rev 10389) +++ trunk/configurator.php 2021-07-29 10:29:52 UTC (rev 10390) @@ -324,8 +324,6 @@ </div> <?php -define('DEBUG', 0); -//define('DEBUG', 1); /** * The Configurator is a php script to aid in the configuration of PhpWiki. * Parts of this file were based on PHPWeather's configurator.php file. @@ -2541,8 +2539,6 @@ "; $posted = $GLOBALS['HTTP_POST_VARS']; - /*if (defined('DEBUG')) - printArray($GLOBALS['HTTP_POST_VARS']);*/ foreach ($properties as $option_name => $a) { $posted_value = stripslashes($posted[$a->config_item_name]); @@ -2605,7 +2601,6 @@ while (list($property, $obj) = each($properties)) { echo $obj->get_instructions($property); if ($h = $obj->get_html()) { - if (defined('DEBUG') and DEBUG) $h = get_class($obj) . "<br />\n" . $h; echo "<td>" . $h . "</td>\n"; } echo '</tr>'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 10:26:23
|
Revision: 10389 http://sourceforge.net/p/phpwiki/code/10389 Author: vargenau Date: 2021-07-29 10:26:22 +0000 (Thu, 29 Jul 2021) Log Message: ----------- configurator.php: fix size Modified Paths: -------------- trunk/configurator.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2021-07-29 10:23:46 UTC (rev 10388) +++ trunk/configurator.php 2021-07-29 10:26:22 UTC (rev 10389) @@ -1753,7 +1753,7 @@ { $size = strlen($this->default_value) > 45 ? 90 : 50; return $this->get_config_item_header() . - "<input type=\"text\" size=\"$50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " . + "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " . $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 10:23:48
|
Revision: 10388 http://sourceforge.net/p/phpwiki/code/10388 Author: vargenau Date: 2021-07-29 10:23:46 +0000 (Thu, 29 Jul 2021) Log Message: ----------- configurator.php: mysqli Modified Paths: -------------- trunk/configurator.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2021-07-29 10:22:09 UTC (rev 10387) +++ trunk/configurator.php 2021-07-29 10:23:46 UTC (rev 10388) @@ -657,9 +657,9 @@ </pre> For a MySQL database, the following should work: <pre> - mysql://user:password@host/databasename + mysqli://user:password@host/databasename </pre> -To connect over a unix socket, use something like +To connect over a Unix socket, use something like <pre> mysql://user:password@unix(/path/to/socket)/databasename </pre> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 10:22:13
|
Revision: 10387 http://sourceforge.net/p/phpwiki/code/10387 Author: vargenau Date: 2021-07-29 10:22:09 +0000 (Thu, 29 Jul 2021) Log Message: ----------- configurator.php: remove target=_new Modified Paths: -------------- trunk/configurator.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2021-07-29 10:12:57 UTC (rev 10386) +++ trunk/configurator.php 2021-07-29 10:22:09 UTC (rev 10387) @@ -348,19 +348,19 @@ * - Descriptive text will be changed into comments (preceeded by ; ) * for the final output to config.ini. * - * - Only a limited set of html is allowed: pre, dl dt dd; it will be + * - Only a limited set of HTML is allowed: pre, dl dt dd; it will be * stripped from the final output. * * - Line breaks and spacing will be preserved for the final output. * * - Double line breaks are automatically converted to paragraphs - * for the html version of the descriptive text. + * for the HTML version of the descriptive text. * * - Double-quotes and dollar signs in the descriptive text must be * escaped: \" and \$. Instead of escaping double-quotes you can use * single (') quotes for the enclosing quotes. * - * - Special characters like < and > must use html entities, + * - Special characters like < and > must use HTML entities, * they will be converted back to characters for the final output. */ @@ -523,8 +523,8 @@ $properties["Allow RawHtml Plugin if safe HTML code"] = new boolean_define_commented_optional('ENABLE_RAW_HTML_SAFE', '', " -If this is set, all unsafe html code is stripped automatically (experimental!) -See <a href=\"http://chxo.com/scripts/safe_html-test.php\" target=\"_new\">chxo.com/scripts/safe_html-test.php</a> +If this is set, all unsafe HTML code is stripped automatically (experimental!) +See <a href=\"http://chxo.com/scripts/safe_html-test.php\">chxo.com/scripts/safe_html-test.php</a> "); $properties["Maximum Upload Size"] = @@ -1354,7 +1354,7 @@ Search term used for automatic page classification by keyword extraction. Any links on a page to pages whose names match this search -will be used keywords in the keywords html meta tag. This is an aid to +will be used keywords in the keywords HTML meta tag. This is an aid to classification by search engines. The value of the match is used as the keyword. @@ -1363,7 +1363,7 @@ $properties["Author and Copyright Site Navigation Links"] = new _define_commented_optional('COPYRIGHTPAGE_TITLE', "GNU General Public License", " -These will be inserted as <link rel> tags in the html header of +These will be inserted as <link rel> tags in the HTML header of every page, for search engines and for browsers like Mozilla which take advantage of link rel site navigation. @@ -2419,7 +2419,7 @@ } } -// html utility functions +// HTML utility functions function nl2p($text) { preg_match_all("@\s*(<pre>.*?</pre>|<dl>.*?</dl>|.*?(?=\n\n|<pre>|<dl>|$))@s", @@ -2480,7 +2480,7 @@ $d = str_replace("</dd>", "", $d); $d = str_replace("<p>", "", $d); $d = str_replace("</p>", "", $d); - //restore html entities into characters + //restore HTML entities into characters // https://www.php.net/manual/en/function.htmlentities.php $trans = get_html_translation_table(HTML_ENTITIES); $trans = array_flip($trans); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 10:12:59
|
Revision: 10386 http://sourceforge.net/p/phpwiki/code/10386 Author: vargenau Date: 2021-07-29 10:12:57 +0000 (Thu, 29 Jul 2021) Log Message: ----------- configurator.php: use CSS Modified Paths: -------------- trunk/configurator.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2021-07-29 10:11:22 UTC (rev 10385) +++ trunk/configurator.php 2021-07-29 10:12:57 UTC (rev 10386) @@ -2599,7 +2599,7 @@ echo ' <form action="', $configurator, '" method="post"> <input type="hidden" name="action" value="make_config" /> -<table cellpadding="4" cellspacing="0"> +<table> '; while (list($property, $obj) = each($properties)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-29 10:11:25
|
Revision: 10385 http://sourceforge.net/p/phpwiki/code/10385 Author: vargenau Date: 2021-07-29 10:11:22 +0000 (Thu, 29 Jul 2021) Log Message: ----------- configurator.php: use CSS Modified Paths: -------------- trunk/configurator.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2021-07-28 17:12:38 UTC (rev 10384) +++ trunk/configurator.php 2021-07-29 10:11:22 UTC (rev 10385) @@ -56,7 +56,7 @@ * subsequent requests will fail. (POST to save the INI) */ -global $HTTP_POST_VARS, $tdwidth; +global $HTTP_POST_VARS; if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS']; if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS']; if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS']; @@ -74,7 +74,6 @@ $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["PHP_SELF"]); } -$tdwidth = 700; $config_file = (substr(PHP_OS, 0, 3) == 'WIN') ? 'config\\config.ini' : 'config/config.ini'; $fs_config_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $config_file; if (isset($_POST['create'])) header('Location: ' . $configurator . '?show=_part1&create=1#create'); @@ -169,7 +168,6 @@ <title>Configuration tool for PhpWiki <?php echo $config_file ?></title> <style type="text/css" media="screen"> <!-- - /* TABLE { border: thin solid black } */ body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 80%; @@ -179,8 +177,13 @@ font-size: 120%; } + table { + border-spacing: 0; + } + td { border: thin solid black; + padding: 4px; } tr { @@ -203,7 +206,7 @@ td.instructions { background-color: #ffffee; - width: <?php echo $tdwidth ?>px; + width: 700px; color: inherit; } @@ -216,6 +219,7 @@ td.unchangeable-variable-left { border-top: none; background-color: #ffffee; + width: 700px; color: inherit; } @@ -380,8 +384,7 @@ $properties["Part Zero"] = new part('_part0', $SEPARATOR . "\n", " -Part Zero: (optional) -Latest Development and Tricky Options"); +Part Zero: Latest Development and Tricky Options"); if (defined('INCLUDE_PATH')) $include_path = INCLUDE_PATH; @@ -1742,9 +1745,8 @@ function get_instructions($title) { - global $tdwidth; $i = "<h3>" . $title . "</h3>\n " . nl2p($this->_get_description()) . "\n"; - return "<tr>\n<td width=\"$tdwidth\" class=\"instructions\">\n" . $i . "</td>\n"; + return "<tr>\n<td class=\"instructions\">\n" . $i . "</td>\n"; } function get_html() @@ -1781,11 +1783,10 @@ function get_instructions($title) { - global $tdwidth; $i = "<h3>" . $title . "</h3>\n " . nl2p($this->_get_description()) . "\n"; // $i .= "<em>Not editable.</em><br />\n<pre>" . $this->default_value."</pre>"; return '<tr><td style="width:100%;" class="unchangeable-variable-top" colspan="2">' . "\n" . $i . "</td></tr>\n" - . '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="' . $tdwidth . '"> </td>'; + . '<tr style="border-top: none;"><td class="unchangeable-variable-left"> </td>'; } } @@ -2377,7 +2378,7 @@ return "${n};" . $this->_config_format($posted_value); elseif ($posted_value == '') return "${n};" . $this->_config_format('false'); else - return "${n}" . $this->_config_format($posted_value); + return "${n}" . $this->_config_format($posted_value); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 17:12:40
|
Revision: 10384 http://sourceforge.net/p/phpwiki/code/10384 Author: vargenau Date: 2021-07-28 17:12:38 +0000 (Wed, 28 Jul 2021) Log Message: ----------- backendType: check for "mysqli" also Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB.php Modified: trunk/lib/WikiDB/backend/PearDB.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB.php 2021-07-28 15:12:26 UTC (rev 10383) +++ trunk/lib/WikiDB/backend/PearDB.php 2021-07-28 17:12:38 UTC (rev 10384) @@ -1154,7 +1154,7 @@ function listOfFields($database, $table) { - if ($this->backendType() == 'mysql') { + if (($this->backendType() == 'mysql') || ($this->backendType() == 'mysqli')) { $fields = array(); assert(!empty($database)); assert(!empty($table)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 15:12:28
|
Revision: 10383 http://sourceforge.net/p/phpwiki/code/10383 Author: vargenau Date: 2021-07-28 15:12:26 +0000 (Wed, 28 Jul 2021) Log Message: ----------- Use __construct Modified Paths: -------------- trunk/lib/XMLRPC/xmlrpc.inc trunk/lib/XMLRPC/xmlrpc_emu.inc trunk/lib/XMLRPC/xmlrpcs.inc trunk/lib/XMLRPC/xmlrpcs_emu.inc trunk/lib/XmlRpcServer.php trunk/lib/pear/Cache/Application.php trunk/lib/pear/Cache/Function.php trunk/lib/pear/Cache/Graphics.php trunk/lib/pear/Cache/HTTP_Request.php trunk/lib/pear/Cache/OutputCompression.php trunk/lib/pear/JSON.php trunk/themes/blog/jscalendar/calendar.php Modified: trunk/lib/XMLRPC/xmlrpc.inc =================================================================== --- trunk/lib/XMLRPC/xmlrpc.inc 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/lib/XMLRPC/xmlrpc.inc 2021-07-28 15:12:26 UTC (rev 10383) @@ -894,7 +894,7 @@ var $verifyhost = 1; var $no_multicall = false; - function xmlrpc_client($path, $server, $port = 0) + function __construct($path, $server, $port = 0) { $this->port = $port; $this->server = $server; @@ -1185,7 +1185,7 @@ var $errstr = ''; var $hdrs = array(); - function xmlrpcresp($val, $fcode = 0, $fstr = '') + function __construct($val, $fcode = 0, $fstr = '') { if ($fcode != 0) { // error @@ -1253,7 +1253,7 @@ var $params = array(); var $debug = 0; - function xmlrpcmsg($meth, $pars = 0) + function __construct($meth, $pars = 0) { $this->methodname = $meth; if (is_array($pars) && sizeof($pars) > 0) { @@ -1532,7 +1532,7 @@ var $me = array(); var $mytype = 0; - function xmlrpcval($val = -1, $type = '') + function __construct($val = -1, $type = '') { global $xmlrpcTypes; $this->me = array(); Modified: trunk/lib/XMLRPC/xmlrpc_emu.inc =================================================================== --- trunk/lib/XMLRPC/xmlrpc_emu.inc 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/lib/XMLRPC/xmlrpc_emu.inc 2021-07-28 15:12:26 UTC (rev 10383) @@ -6,8 +6,8 @@ 08/30/01 - last modified by Dan Libby <da...@li...> This code provides API compatibility with Edd Dumbill's php xmlrpc -library (http://phpxmlrpc.sourceforge.net/) but uses the xmlrpc-epi -engine for the actual xml processing. It is intended to provide a +library (http://phpxmlrpc.sourceforge.net/) but uses the xmlrpc-epi +engine for the actual xml processing. It is intended to provide a smooth transition path for those who would like to be able to use either implementation. @@ -161,8 +161,7 @@ var $username = ""; var $password = ""; - // constructor - function xmlrpc_client($path, $server, $port = 80) + function __construct($path, $server, $port = 80) { $this->port = $port; $this->server = $server; @@ -229,8 +228,7 @@ var $fs; var $hdrs; - // constructor. - function xmlrpcresp($val, $fcode = 0, $fstr = "") + function __construct($val, $fcode = 0, $fstr = "") { if ($fcode != 0) { $this->fn = $fcode; @@ -283,8 +281,7 @@ var $params = array(); var $debug = 0; - // constructor - function xmlrpcmsg($meth, $pars = 0) + function __construct($meth, $pars = 0) { $this->methodname = $meth; if (is_array($pars) && sizeof($pars) > 0) { @@ -385,8 +382,7 @@ var $me = array(); var $mytype = 0; - // constructor - function xmlrpcval($val = -1, $type = "") + function __construct($val = -1, $type = "") { global $xmlrpcTypes; $this->me = array(); Modified: trunk/lib/XMLRPC/xmlrpcs.inc =================================================================== --- trunk/lib/XMLRPC/xmlrpcs.inc 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/lib/XMLRPC/xmlrpcs.inc 2021-07-28 15:12:26 UTC (rev 10383) @@ -225,7 +225,7 @@ { var $dmap = array(); - function xmlrpc_server($dispMap = '', $serviceNow = 1) + function __construct($dispMap = '', $serviceNow = 1) { global $HTTP_RAW_POST_DATA; // dispMap is a dispatch array of methods Modified: trunk/lib/XMLRPC/xmlrpcs_emu.inc =================================================================== --- trunk/lib/XMLRPC/xmlrpcs_emu.inc 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/lib/XMLRPC/xmlrpcs_emu.inc 2021-07-28 15:12:26 UTC (rev 10383) @@ -6,8 +6,8 @@ 08/30/01 - last modified by Dan Libby <da...@li...> This code provides API compatibility with Edd Dumbill's php xmlrpc -library (http://phpxmlrpc.sourceforge.net/) but uses the xmlrpc-epi -engine for the actual xml processing. It is intended to provide a +library (http://phpxmlrpc.sourceforge.net/) but uses the xmlrpc-epi +engine for the actual xml processing. It is intended to provide a smooth transition path for those who would like to be able to use either implementation. @@ -26,11 +26,11 @@ - xmlrpc_decode, xmlrpc_encode are present in both the xmlrpc-epi C extension and the usefulinc implementation, and conflict. They have been enhanced and renamed to val_to_php, php_to_val. - + - the xmlrpc-epi engine uses different fault codes and strings than the xmlrpc.inc. Application fault codes will remain unchanged between implementations, but system codes will likely be - different. + different. See http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php - Certain methods are not implemented and will typically return @@ -50,7 +50,7 @@ // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF @@ -126,7 +126,7 @@ var $xmlrpc_server; // constructor. creates server and optionally services request. - function xmlrpc_server($dispMap, $serviceNow = 1) + function __construct($dispMap, $serviceNow = 1) { global $HTTP_RAW_POST_DATA; // dispMap is a despatch array of methods @@ -274,4 +274,4 @@ { global $_xmlrpc_debuginfo; $_xmlrpc_debuginfo = $_xmlrpc_debuginfo . $m . "\n"; -} +} Modified: trunk/lib/XmlRpcServer.php =================================================================== --- trunk/lib/XmlRpcServer.php 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/lib/XmlRpcServer.php 2021-07-28 15:12:26 UTC (rev 10383) @@ -947,7 +947,7 @@ $dmap['wiki.' . $name] = $val; } - $this->xmlrpc_server($dmap, 0 /* delay service*/); + parent::__construct($dmap, 0 /* delay service*/); } function service() Modified: trunk/lib/pear/Cache/Application.php =================================================================== --- trunk/lib/pear/Cache/Application.php 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/lib/pear/Cache/Application.php 2021-07-28 15:12:26 UTC (rev 10383) @@ -44,7 +44,7 @@ // // $app =& new Cache_Application(); // $app->register('foo'); -// $app->register('bar', $bar); +// $app->register('bar', $bar); // // $foo = 'Different data'; // @@ -53,7 +53,7 @@ // // As with session_register(), the contents of the variable at the *end* of the // request is registered and not at the point of registration. Therefore in this -// example, for the $foo variable, the string 'Different data' is stored and not +// example, for the $foo variable, the string 'Different data' is stored and not // 'Some data'. The exception to this rule is if you use the second argument to // register() as in the second call to it above. This will cause the data supplied // in the second argument to be stored and not the contents at the end of the request. @@ -72,7 +72,6 @@ class Cache_Application extends Cache { - var $data; var $id; var $group; @@ -79,18 +78,16 @@ var $registered_vars; /** - * Constructor - * * @param string Name of container class * @param array Array with container class options */ - function Cache_Application($container = 'file', $container_options = array('cache_dir' => '/tmp/', 'filename_prefix' => 'cache_'), $id = 'application_var', $group = 'application_cache') + function __construct($container = 'file', $container_options = array('cache_dir' => '/tmp/', 'filename_prefix' => 'cache_'), $id = 'application_var', $group = 'application_cache') { $this->id = $id; $this->group = $group; $this->registered_vars = array(); - $this->Cache($container, $container_options); + parent::__construct($container, $container_options); $this->data = $this->isCached($this->id, $this->group) ? unserialize($this->get($this->id, $this->group)) : array(); // If register_globals on, global all registered variables @@ -176,4 +173,4 @@ return $this->data; } } -?> \ No newline at end of file +?> Modified: trunk/lib/pear/Cache/Function.php =================================================================== --- trunk/lib/pear/Cache/Function.php 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/lib/pear/Cache/Function.php 2021-07-28 15:12:26 UTC (rev 10383) @@ -55,12 +55,12 @@ * $cache->call('foobar'); * * Note: -* -* You cannot cache every function. You should only cache +* +* You cannot cache every function. You should only cache * functions that only depend on their arguments and don't use -* global or static variables, don't rely on database queries or +* global or static variables, don't rely on database queries or * files, and so on. -* +* * @author Sebastian Bergmann <sb...@se...> * @module Function_Cache * @modulegroup Function_Cache @@ -79,15 +79,14 @@ * @param array Array with container class options * @param integer Number of seconds for which to cache */ - function Cache_Function($container = 'file', - $container_options = array('cache_dir' => '.', - 'filename_prefix' => 'cache_' - ), - $expires = 3600 - ) + function __construct($container = 'file', + $container_options = array('cache_dir' => '.', + 'filename_prefix' => 'cache_' + ), + $expires = 3600) { - $this->Cache($container, $container_options); - $this->expires = $expires; + parent::__construct($container, $container_options); + $this->expires = $expires; } /** Modified: trunk/lib/pear/Cache/Graphics.php =================================================================== --- trunk/lib/pear/Cache/Graphics.php 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/lib/pear/Cache/Graphics.php 2021-07-28 15:12:26 UTC (rev 10383) @@ -21,20 +21,20 @@ /** * Graphics disk cache. -* -* The usual way to create images is to pass some arguments that describe the image -* to a script that dynamically creates an image. For every image of a page +* +* The usual way to create images is to pass some arguments that describe the image +* to a script that dynamically creates an image. For every image of a page * a new PHP interpreter gets started. This is a good way to kill your webserver. -* -* When dealing with dynamically generated images you should not call another script +* +* When dealing with dynamically generated images you should not call another script * to generate the images but generate the images by the script that produces the page * that contains the images. This is a major improvement but it's only half the way. -* +* * There's no need to rerender an image on every request. A simple disk cache can reduce -* the computation time dramatically. This is what the class graphics_cache is for. -* +* the computation time dramatically. This is what the class graphics_cache is for. +* * Usage: -* +* * // create an instance of the graphics cache * $cache = new graphics_cache; * @@ -42,16 +42,16 @@ * * // compute an ID for your image based on typical parameters * $id = m5d( $size, $colors, $label); -* +* * // check if it's cached * if (!($link = $cache->getImageLink($id, 'gif'))) { -* +* * // hmmm, it's not cached, create it * ... * // cacheImageLink() and cacheImage() make the ImageGIF() call! * // cacheImage() returns the value of ImageGIF() [etc.], cacheImageLink() returns a URL * $link = $cache->cacheImageLink($id, $img, 'gif'); -* +* * } * * // Ok, let's build the ImageLink @@ -60,8 +60,8 @@ * * // for cacheImage(): * // header('Content-type: image/gif'); print $cache->cacheImage($id, $img, 'gif'); -* * +* * The class requires PHP 4.0.2+ [ImageType()]. Note that cacheImage() works with * the output buffer. Modify it if required! * @@ -71,15 +71,13 @@ */ class Cache_Graphics extends Cache { - - /** * Cache URL prefix. - * + * * Make sure that the cache URL prefix points to the $cache_dir, otherwise - * your links will be broken. Use setCacheURL to specify the cache_url and + * your links will be broken. Use setCacheURL to specify the cache_url and * setCacheDir() for the cache_dir. - * + * * @var string * @see setCacheURL(), setCacheDir() */ @@ -88,10 +86,10 @@ /** * Directory where cached files get stored. * s - * Make sure that the cache_dir is writable and offers enough space. Check + * Make sure that the cache_dir is writable and offers enough space. Check * also if your cache_url points to the directory. Use setCacheDir() to set * the variable. - * + * * @var string * @see setCacheDir(), setCacheURL() */ @@ -99,15 +97,15 @@ /** * Nameprefix of cached files. - * - * Per default the prefix "graphics_" gets used. You might use this + * + * Per default the prefix "graphics_" gets used. You might use this * for versioning or to ease (manual) clean ups. * * @var string */ var $cache_file_prefix = 'graphics_'; - - + + /** * Cache container group. * @@ -115,41 +113,38 @@ */ var $cache_group = 'graphics'; - + /** * Mapping from supported image type to a ImageType() constant. - * + * * Referr to the PHP manual for more informations on ImageType() - * + * * @var array * @link http://www.php.net/ImageType */ var $imagetypes = array( - 'gif' => IMG_GIF, + 'gif' => IMG_GIF, 'jpg' => IMG_JPG, 'png' => IMG_PNG, 'wbmp' => IMG_WBMP ); - /** * Instantiates a cache file container. - * */ - function Cache_Graphics() + function __construct() { - $this->Cache('file', array('cache_dir' => $this->cache_dir, 'filename_prefix' => $this->cache_file_prefix)); - - } // end constructor + parent::__construct('file', array('cache_dir' => $this->cache_dir, 'filename_prefix' => $this->cache_file_prefix)); - + } + /** * Returns the content of a cached image file. - * + * * This function can be used to send the image directly to the browser. * Make sure that you send a correspondending header before sending the image itself. * - * Always try to get the image from the cache before you compute it. See + * Always try to get the image from the cache before you compute it. See * the class docs for an example. * * @param string Image-ID @@ -156,7 +151,7 @@ * @param string Image type: gif, jpg, png, wbmp * @return string Image file contents if a cached file exists otherwise an empty string * @see cacheImage() - */ + */ function getImage($id, $format = 'png') { $id = $this->generateID($id, $format); @@ -163,11 +158,11 @@ return $this->get($id, $this->cache_group); } // end func getImage - + /** * Returns an array with a link to the cached image and the image file path. - * - * Always try to get the image from the cache before you compute it. See + * + * Always try to get the image from the cache before you compute it. See * the class docs for an example. * * @param string Image-ID @@ -186,14 +181,14 @@ return array($this->container->getFilename($id, $this->cache_group), $file); } // end func getImageLink - + /** * Create an image from the given image handler, cache it and return the file content. * * Always try to retrive the image from the cache before you compute it. - * - * Warning: this function uses the output buffer. If you expect collisions + * + * Warning: this function uses the output buffer. If you expect collisions * modify the code. * * @param string Image-ID. Used as a part of the cache filename. @@ -201,9 +196,9 @@ * based on characteristic values such as the color, size etc. * @param string Image handler to create the image from. * @param string Image type: gif, jpg, png, wbmp. Also used as filename suffix. - * If an unsupported type is requested the functions tries to + * If an unsupported type is requested the functions tries to * fallback to a supported type before throwing an exeption. - * @return string Image content returned by ImageGIF/... + * @return string Image content returned by ImageGIF/... * @throws Cache_Error * @access public * @see getImage() @@ -231,10 +226,10 @@ if ($image = $this->get($id, $this->cache_group)) { return $image; } - // save the image to the output buffer, write it to disk and + // save the image to the output buffer, write it to disk and // return the image. ob_end_clean(); - ob_start(); + ob_start(); if (strtoupper($format) == 'JPG') { $genFormat = 'JPEG'; @@ -256,8 +251,8 @@ return $image; } // end func cacheImage - + /** * Create an image from the given image handler, cache it and return a url and the file path of the image. * @@ -268,7 +263,7 @@ * based on characteristic values such as the color, size etc. * @param string Image handler to create the image from. * @param string Image type: gif, jpg, png, wbmp. Also used as filename suffix. - * If an unsupported type is requested the functions tries to + * If an unsupported type is requested the functions tries to * fallback to a supported type before throwing an exeption. * @return array [ full path to the image file, image url ] * @throws Cache_Error @@ -285,7 +280,7 @@ // Check if the requested image type is supported by the GD lib. // If not, try a callback to the first available image type. if (!isset($this->imagetypes[$format]) || !($types & $this->imagetypes[$format])) { - foreach ($this->imagetypes as $supported => $bitmask) + foreach ($this->imagetypes as $supported => $bitmask) if ($types & $bitmask) { new Cache_Error("The build in GD lib does not support the image type $format. Fallback to $supported.", __FILE__, __LINE__); } else { @@ -314,13 +309,13 @@ return array($ffile, $url); } // end func cacheImageLink - + /** - * Sets the URL prefix used when rendering HTML Tags. - * - * Make sure that the URL matches the cache directory, + * Sets the URL prefix used when rendering HTML Tags. + * + * Make sure that the URL matches the cache directory, * otherwise you'll get broken links. - * + * * @param string * @access public * @see setCacheDir() @@ -331,13 +326,13 @@ $cache_url .= '/'; } $this->cache_url = $cache_url; - + } // end func setCacheURL - + /** * Sets the directory where to cache generated Images - * + * * @param string * @access public * @see setCacheURL() @@ -350,13 +345,13 @@ $this->cache_dir = $cache_dir; $this->container->cache_dir = $cache_dir; } // end func setCacheDir - - + + function generateID($variable, $format = 'png') { return md5(serialize($variable)) . '.' . $format; } // end func generateID - - + + } // end class Cache_Graphics ?> Modified: trunk/lib/pear/Cache/HTTP_Request.php =================================================================== --- trunk/lib/pear/Cache/HTTP_Request.php 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/lib/pear/Cache/HTTP_Request.php 2021-07-28 15:12:26 UTC (rev 10383) @@ -106,8 +106,6 @@ // --- Public methods --- /** - * Constructor - * * @param $url The url to access * @param $params Associative array of parameters which can be: * method - Method to use, GET, POST etc @@ -128,9 +126,9 @@ * @see Cache, HTTP_Request * @access public */ - function Cache_HTTP_Request($url, $params = null, $container = 'file', - $containerOptions = null, $expires = 3600, - $mode = CACHE_HTTP_REQUEST_KEEP_LOCAL_COPY) + function __construct($url, $params = null, $container = 'file', + $containerOptions = null, $expires = 3600, + $mode = CACHE_HTTP_REQUEST_KEEP_LOCAL_COPY) { if (!isset($params)) { $params = array(); @@ -142,7 +140,7 @@ 'filename_prefix' => 'cache_' ); } - $this->Cache($container, $containerOptions); + parent::__construct($container, $containerOptions); $this->_request = new HTTP_Request($url, $params); $this->_id = md5($url.serialize($params)); $this->_id2 = md5($this->_id); // we need two keys Modified: trunk/lib/pear/Cache/OutputCompression.php =================================================================== --- trunk/lib/pear/Cache/OutputCompression.php 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/lib/pear/Cache/OutputCompression.php 2021-07-28 15:12:26 UTC (rev 10383) @@ -57,10 +57,10 @@ */ class Cache_OutputCompression extends Cache_Output { - + /** * Encoding, what the user (its browser) of your website accepts - * + * * "auto" stands for test using $_SERVER['HTTP_ACCEPT_ENCODING']($HTTP_ACCEPT_ENCODING). * * @var string @@ -67,32 +67,31 @@ * @see Cache_OutputCompression(), setEncoding() */ var $encoding = 'auto'; - - + + /** * Method used for compression * * @var string * @see isCompressed() - */ + */ var $compression = ''; - + /** * Sets the storage details and the content encoding used (if not autodetection) - * + * * @param string Name of container class * @param array Array with container class options * @param string content encoding mode - auto => test which encoding the user accepts - */ - function Cache_OutputCompression($container, $container_options = '', $encoding = 'auto') + */ + function __construct($container, $container_options = '', $encoding = 'auto') { $this->setEncoding($encoding); - $this->Cache($container, $container_options); - - } // end constructor + parent::__construct($container, $container_options); - + } + /** * Call parent deconstructor. */ @@ -100,8 +99,8 @@ { $this->_Cache(); } // end deconstructor - + function generateID($variable) { $this->compression = $this->getEncoding(); @@ -108,11 +107,11 @@ return md5(serialize($variable) . serialize($this->compression)); } // end generateID - - function get($id, $group) + + function get($id, $group = 'default') { $this->content = ''; - + if (!$this->caching) { return ''; } @@ -122,14 +121,14 @@ } return $this->content; } // end func get - - + + /** - * Stops the output buffering, saves it to the cache and returns the _compressed_ content. + * Stops the output buffering, saves it to the cache and returns the _compressed_ content. * * If you need the uncompressed content for further procession before * it's saved in the cache use endGet(). endGet() does _not compress_. - */ + */ function end($expire = 0, $userdata = '') { $content = ob_get_contents(); @@ -138,23 +137,23 @@ // store in the cache if ($this->caching) { $this->extSave($this->output_id, $content, $userdata, $expire, $this->output_group); - return $this->content; + return $this->content; } - - return $content; + + return $content; } // end func end() - - + + function endPrint($expire = 0, $userdata = '') { $this->printContent($this->end($expire, $userdata)); } // end func endPrint - + /** * Saves the given data to the cache. - * - */ + * + */ function extSave($id, $cachedata, $userdata, $expires = 0, $group = 'default') { if (!$this->caching) { @@ -162,7 +161,7 @@ } if ($this->compression) { - $len = strlen($cachedata); + $len = strlen($cachedata); $crc = crc32($cachedata); $cachedata = gzcompress($cachedata, 9); $this->content = substr($cachedata, 0, strlen($cachedata) - 4) . pack('V', $crc) . pack('V', $len); @@ -171,13 +170,13 @@ } return $this->container->save($id, $this->content, $expires, $group, $userdata); } // end func extSave - + /** * Sends the compressed data to the user. - * + * * @param string * @access public - */ + */ function printContent($content = '') { $server = &$this->_importGlobalVariable("server"); @@ -199,15 +198,15 @@ header('Vary: Accept-Encoding'); print "\x1f\x8b\x08\x00\x00\x00\x00\x00"; } - + } - + die($content); } // end func printContent - - + + /** - * Returns the encoding method of the current dataset. + * Returns the encoding method of the current dataset. * * @access public * @return string Empty string (which evaluates to false) means no compression @@ -219,7 +218,7 @@ /** * Sets the encoding to be used. - * + * * @param string "auto" means autodetect for every client * @access public * @see $encoding @@ -228,18 +227,18 @@ { $this->encoding = $encoding; } // end func setEncoding - - + + /** * Returns the encoding to be used for the data transmission to the client. * * @see setEncoding() - */ + */ function getEncoding() { $server = &$this->_importGlobalVariable("server"); - // encoding set by user + // encoding set by user if ('auto' != $this->encoding) { return $this->encoding; } @@ -252,7 +251,7 @@ } // no compression return ''; - + } // end func getEncoding // {{{ _importGlobalVariable() @@ -264,9 +263,9 @@ * @param string Type of variable (server, session, post) * @return array */ - function &_importGlobalVariable($variable) + function &_importGlobalVariable($variable) { - + $var = null; switch (strtolower($variable)) { @@ -301,7 +300,7 @@ } return $var; - } + } // }} } // end class OutputCompression Modified: trunk/lib/pear/JSON.php =================================================================== --- trunk/lib/pear/JSON.php 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/lib/pear/JSON.php 2021-07-28 15:12:26 UTC (rev 10383) @@ -134,8 +134,8 @@ * bubble up with an error, so all return values * from encode() should be checked with isError() * - SERVICES_JSON_USE_TO_JSON: call toJSON when serializing objects - * It serializes the return value from the toJSON call rather - * than the object it'self, toJSON can return associative arrays, + * It serializes the return value from the toJSON call rather + * than the object it'self, toJSON can return associative arrays, * strings or numbers, if you return an object, make sure it does * not have a toJSON method, otherwise an error will occur. */ @@ -150,7 +150,7 @@ var $_mb_strlen = false; var $_mb_substr = false; var $_mb_convert_encoding = false; - + /** * convert a string from one UTF-16 char to one UTF-8 char * @@ -274,10 +274,10 @@ $ret = $this->_encode($var); setlocale(LC_NUMERIC, $lc); return $ret; - + } /** - * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format + * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format * * @param mixed $var any number, boolean, string, array, or object to be encoded. * see argument 1 to Services_JSON() above for array-parsing behavior. @@ -287,9 +287,9 @@ * @return mixed JSON string representation of input var or an error if a problem occurs * @access public */ - function _encode($var) + function _encode($var) { - + switch (gettype($var)) { case 'boolean': return $var ? 'true' : 'false'; @@ -354,7 +354,7 @@ $ascii .= '?'; break; } - + $char = pack('C*', $ord_var_c, ord($var[$c + 1])); $c += 1; $utf16 = $this->utf82utf16($char); @@ -480,27 +480,27 @@ return '[' . join(',', $elements) . ']'; case 'object': - + // support toJSON methods. if (($this->use & SERVICES_JSON_USE_TO_JSON) && method_exists($var, 'toJSON')) { // this may end up allowing unlimited recursion // so we check the return value to make sure it's not got the same method. $recode = $var->toJSON(); - + if (method_exists($recode, 'toJSON')) { - + return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new Services_JSON_Error(class_name($var). " toJSON returned an object with a toJSON method."); - + } - + return $this->_encode( $recode ); - } - + } + $vars = get_object_vars($var); - + $properties = array_map(array($this, 'name_value'), array_keys($vars), array_values($vars)); @@ -764,7 +764,7 @@ // element in an associative array, // for now $parts = array(); - + if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:/Uis', $slice, $parts)) { // "name":value pair $key = $this->decode($parts[1]); @@ -871,13 +871,13 @@ return false; } - + /** * Calculates length of string in bytes - * @param string + * @param string * @return integer length */ - function strlen8( $str ) + function strlen8( $str ) { if ( $this->_mb_strlen ) { return mb_strlen( $str, "8bit" ); @@ -884,15 +884,15 @@ } return strlen( $str ); } - + /** * Returns part of a string, interpreting $start and $length as number of bytes. - * @param string - * @param integer start - * @param integer length + * @param string + * @param integer start + * @param integer length * @return integer length */ - function substr8( $string, $start, $length=false ) + function substr8( $string, $start, $length=false ) { if ( $length === false ) { $length = $this->strlen8( $string ) - $start; @@ -909,10 +909,10 @@ class Services_JSON_Error extends PEAR_Error { - function Services_JSON_Error($message = 'unknown error', $code = null, - $mode = null, $options = null, $userinfo = null) + function __construct($message = 'unknown error', $code = null, + $mode = null, $options = null, $userinfo = null) { - parent::PEAR_Error($message, $code, $mode, $options, $userinfo); + parent::__construct($message, $code, $mode, $options, $userinfo); } } @@ -923,11 +923,11 @@ */ class Services_JSON_Error { - function Services_JSON_Error($message = 'unknown error', $code = null, - $mode = null, $options = null, $userinfo = null) + function __construct($message = 'unknown error', $code = null, + $mode = null, $options = null, $userinfo = null) { } } - + } Modified: trunk/themes/blog/jscalendar/calendar.php =================================================================== --- trunk/themes/blog/jscalendar/calendar.php 2021-07-28 14:52:50 UTC (rev 10382) +++ trunk/themes/blog/jscalendar/calendar.php 2021-07-28 15:12:26 UTC (rev 10383) @@ -21,10 +21,10 @@ var $calendar_theme_file; var $calendar_options; - function DHTML_Calendar($calendar_lib_path = '/calendar/', - $lang = 'en', - $theme = 'calendar-win2k-1', - $stripped = true) { + function __construct($calendar_lib_path = '/calendar/', + $lang = 'en', + $theme = 'calendar-win2k-1', + $stripped = true) { if ($stripped) { $this->calendar_file = 'calendar_stripped.js'; $this->calendar_setup_file = 'calendar-setup_stripped.js'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 14:53:00
|
Revision: 10382 http://sourceforge.net/p/phpwiki/code/10382 Author: vargenau Date: 2021-07-28 14:52:50 +0000 (Wed, 28 Jul 2021) Log Message: ----------- No default value before mandatory argument Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2021-07-28 14:45:17 UTC (rev 10381) +++ trunk/lib/WikiTheme.php 2021-07-28 14:52:50 UTC (rev 10382) @@ -1836,7 +1836,7 @@ * @param string $img_url URL for button's image. * @param array $img_attr Additional attributes for the <img> tag. */ - function __construct($text, $name = '', $class = '', $img_url, $img_attr = array()) + function __construct($text, $name, $class, $img_url, $img_attr = array()) { parent::__construct('input', array('type' => 'image', 'src' => $img_url, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 14:45:25
|
Revision: 10381 http://sourceforge.net/p/phpwiki/code/10381 Author: vargenau Date: 2021-07-28 14:45:17 +0000 (Wed, 28 Jul 2021) Log Message: ----------- function pageLink: same prototype as base class Modified Paths: -------------- trunk/lib/plugin/PageHistory.php trunk/lib/plugin/RecentChanges.php trunk/themes/blog/lib/RecentChanges.php Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2021-07-28 14:29:15 UTC (rev 10380) +++ trunk/lib/plugin/PageHistory.php 2021-07-28 14:45:17 UTC (rev 10381) @@ -178,7 +178,7 @@ 'value' => $rev->getVersion())); } - function pageLink($rev, $link_text = false) + function pageLink($rev, $link_text = '') { $text = fmt("Version %d", $rev->getVersion()); return _RecentChanges_HtmlFormatter::pageLink($rev, $text); Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2021-07-28 14:29:15 UTC (rev 10380) +++ trunk/lib/plugin/RecentChanges.php 2021-07-28 14:45:17 UTC (rev 10381) @@ -193,7 +193,6 @@ function pageLink($rev, $link_text = '') { - return WikiLink($this->include_versions_in_URLs() ? $rev : $rev->getPage(), 'auto', $link_text); /* @@ -677,7 +676,7 @@ return $linkurl; } - function pageLink($rev, $link_text = false) + function pageLink($rev, $link_text = '') { $linkurl = parent::pageLink($rev); $linkurl->setAttr('target', '_content'); Modified: trunk/themes/blog/lib/RecentChanges.php =================================================================== --- trunk/themes/blog/lib/RecentChanges.php 2021-07-28 14:29:15 UTC (rev 10380) +++ trunk/themes/blog/lib/RecentChanges.php 2021-07-28 14:45:17 UTC (rev 10381) @@ -31,7 +31,7 @@ class _blog_RecentChanges_BoxFormatter extends _RecentChanges_BoxFormatter { - function pageLink(&$rev, $link_text = false) + function pageLink($rev, $link_text = '') { if (!$link_text and $rev->get('pagetype') == 'wikiblog') $link_text = $rev->get('summary'); @@ -46,7 +46,7 @@ class _blog_RecentChanges_Formatter extends _RecentChanges_HtmlFormatter { - function pageLink(&$rev, $link_text = false) + function pageLink($rev, $link_text = '') { if (!$link_text and $rev->get('pagetype') == 'wikiblog') $link_text = $rev->get('summary'); @@ -53,14 +53,3 @@ return WikiLink($rev, 'auto', $link_text); } } -/* -class _blog_PageHistory_Formatter -extends _PageHistory_HtmlFormatter -{ - function pageLink (&$rev, $link_text=false) { - if (!$link_text and $rev->get('pagetype') == 'wikiblog') - $link_text = $rev->get('summary'); - return WikiLink($rev,'auto',$link_text); - } -} -*/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 14:29:23
|
Revision: 10380 http://sourceforge.net/p/phpwiki/code/10380 Author: vargenau Date: 2021-07-28 14:29:15 +0000 (Wed, 28 Jul 2021) Log Message: ----------- function makeActionButton: same prototype as base class Modified Paths: -------------- trunk/themes/MonoBook/themeinfo.php trunk/themes/shamino_com/themeinfo.php trunk/themes/smaller/themeinfo.php Modified: trunk/themes/MonoBook/themeinfo.php =================================================================== --- trunk/themes/MonoBook/themeinfo.php 2021-07-28 14:20:23 UTC (rev 10379) +++ trunk/themes/MonoBook/themeinfo.php 2021-07-28 14:29:15 UTC (rev 10380) @@ -41,7 +41,8 @@ class WikiTheme_MonoBook extends WikiTheme_Wikilens { /* this adds selected to the class */ - function makeActionButton($action, $label = false, $page_or_rev = false, $options = false) + function makeActionButton($action, $label = '', + $page_or_rev = false, $options = array()) { extract($this->_get_name_and_rev($page_or_rev)); Modified: trunk/themes/shamino_com/themeinfo.php =================================================================== --- trunk/themes/shamino_com/themeinfo.php 2021-07-28 14:20:23 UTC (rev 10379) +++ trunk/themes/shamino_com/themeinfo.php 2021-07-28 14:29:15 UTC (rev 10380) @@ -45,7 +45,8 @@ class WikiTheme_shamino_com extends WikiTheme { - function makeActionButton($action, $label = false, $page_or_rev = false) + function makeActionButton($action, $label = '', + $page_or_rev = false, $options = array()) { extract($this->_get_name_and_rev($page_or_rev)); Modified: trunk/themes/smaller/themeinfo.php =================================================================== --- trunk/themes/smaller/themeinfo.php 2021-07-28 14:20:23 UTC (rev 10379) +++ trunk/themes/smaller/themeinfo.php 2021-07-28 14:29:15 UTC (rev 10380) @@ -40,8 +40,8 @@ class WikiTheme_smaller extends WikiTheme { - - function makeActionButton($action, $label = false, $page_or_rev = false) + function makeActionButton($action, $label = '', + $page_or_rev = false, $options = array()) { extract($this->_get_name_and_rev($page_or_rev)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 14:20:24
|
Revision: 10379 http://sourceforge.net/p/phpwiki/code/10379 Author: vargenau Date: 2021-07-28 14:20:23 +0000 (Wed, 28 Jul 2021) Log Message: ----------- function &query: same prototype as base class Modified Paths: -------------- trunk/lib/pear/DB/dbase.php Modified: trunk/lib/pear/DB/dbase.php =================================================================== --- trunk/lib/pear/DB/dbase.php 2021-07-28 14:15:41 UTC (rev 10378) +++ trunk/lib/pear/DB/dbase.php 2021-07-28 14:20:23 UTC (rev 10379) @@ -269,7 +269,7 @@ // }}} // {{{ &query() - function &query($query = null) + function &query($query, $params = array()) { // emulate result resources $this->res_row[(int)$this->result] = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 14:15:47
|
Revision: 10378 http://sourceforge.net/p/phpwiki/code/10378 Author: vargenau Date: 2021-07-28 14:15:41 +0000 (Wed, 28 Jul 2021) Log Message: ----------- function format_revision: same prototype as base class Modified Paths: -------------- trunk/themes/MacOSX/lib/RecentChanges.php trunk/themes/Portland/lib/RecentChanges.php trunk/themes/SpaceWiki/lib/RecentChanges.php trunk/themes/Wordpress/lib/RecentChanges.php Modified: trunk/themes/MacOSX/lib/RecentChanges.php =================================================================== --- trunk/themes/MacOSX/lib/RecentChanges.php 2021-07-28 13:48:57 UTC (rev 10377) +++ trunk/themes/MacOSX/lib/RecentChanges.php 2021-07-28 14:15:41 UTC (rev 10378) @@ -62,7 +62,7 @@ class _MacOSX_RecentChanges_Formatter extends _RecentChanges_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return MacOSX_RC_revision_formatter($this, $rev); } @@ -71,7 +71,7 @@ class _MacOSX_PageHistory_Formatter extends _PageHistory_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return MacOSX_PH_revision_formatter($this, $rev); } Modified: trunk/themes/Portland/lib/RecentChanges.php =================================================================== --- trunk/themes/Portland/lib/RecentChanges.php 2021-07-28 13:48:57 UTC (rev 10377) +++ trunk/themes/Portland/lib/RecentChanges.php 2021-07-28 14:15:41 UTC (rev 10378) @@ -54,7 +54,7 @@ class _Portland_RecentChanges_Formatter extends _RecentChanges_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return Portland_RC_revision_formatter($this, $rev); } @@ -73,7 +73,7 @@ class _Portland_PageHistory_Formatter extends _PageHistory_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return Portland_RC_revision_formatter($this, $rev); } Modified: trunk/themes/SpaceWiki/lib/RecentChanges.php =================================================================== --- trunk/themes/SpaceWiki/lib/RecentChanges.php 2021-07-28 13:48:57 UTC (rev 10377) +++ trunk/themes/SpaceWiki/lib/RecentChanges.php 2021-07-28 14:15:41 UTC (rev 10378) @@ -62,7 +62,7 @@ class _SpaceWiki_RecentChanges_Formatter extends _RecentChanges_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return SpaceWiki_RC_revision_formatter($this, $rev); } @@ -88,7 +88,7 @@ class _SpaceWiki_PageHistory_Formatter extends _PageHistory_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return SpaceWiki_PH_revision_formatter($this, $rev); } Modified: trunk/themes/Wordpress/lib/RecentChanges.php =================================================================== --- trunk/themes/Wordpress/lib/RecentChanges.php 2021-07-28 13:48:57 UTC (rev 10377) +++ trunk/themes/Wordpress/lib/RecentChanges.php 2021-07-28 14:15:41 UTC (rev 10378) @@ -54,7 +54,7 @@ class _Wordpress_RecentChanges_Formatter extends _RecentChanges_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return Wordpress_RC_revision_formatter($this, $rev); } @@ -73,7 +73,7 @@ class _Wordpress_PageHistory_Formatter extends _PageHistory_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return Wordpress_RC_revision_formatter($this, $rev); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 13:48:59
|
Revision: 10377 http://sourceforge.net/p/phpwiki/code/10377 Author: vargenau Date: 2021-07-28 13:48:57 +0000 (Wed, 28 Jul 2021) Log Message: ----------- PHP Doc Modified Paths: -------------- trunk/lib/pear/File_Passwd.php Modified: trunk/lib/pear/File_Passwd.php =================================================================== --- trunk/lib/pear/File_Passwd.php 2021-07-28 13:33:10 UTC (rev 10376) +++ trunk/lib/pear/File_Passwd.php 2021-07-28 13:48:57 UTC (rev 10377) @@ -72,15 +72,14 @@ * breaks bc to v1.3 and smaller). * Don't forget to call close() to save changes! * - * @param $file name of the passwd file - * @param $lock if 'true' $lockfile will be locked - * @param $lockfile name of the temp file, where changes are saved + * @param string $file name of the passwd file + * @param bool $lock if 'true' $lockfile will be locked + * @param string $lockfile name of the temp file, where changes are saved * - * @access public * @see close() */ - function __construct($file, $lock = 0, $lockfile = "") { + function __construct($file, $lock = false, $lockfile = "") { $this->filename = $file; if( !empty( $lockfile) ) { $this->lockfile = $lockfile; @@ -95,7 +94,7 @@ flock($this->fplock, LOCK_UN); fclose($this->fplock); } else { - trigger_error('File_Passwd lock conflict: Try &force_unlock=1',E_USER_NOTICE); + trigger_error('File_Passwd lock conflict: Try &force_unlock=1'); } } $this->fplock = fopen($this->lockfile, 'w'); @@ -125,11 +124,11 @@ /** * Adds a user * - * @param $user new user id - * @param $pass password for new user - * @param $cvs cvs user id (needed for pserver passwd files) + * @param string $user new user id + * @param string $pass password for new user + * @param string $cvsuser cvs user id (needed for pserver passwd files) * - * @return mixed returns PEAR_Error, if the user already exists + * @return bool|PEAR_Error returns PEAR_Error, if the user already exists * @access public */ function addUser($user, $pass, $cvsuser = "") { @@ -145,11 +144,11 @@ /** * Modifies a user * - * @param $user user id - * @param $pass new password for user - * @param $cvs cvs user id (needed for pserver passwd files) + * @param string $user user id + * @param string $pass new password for user + * @param string $cvsuser cvs user id (needed for pserver passwd files) * - * @return mixed returns PEAR_Error, if the user doesn't exists + * @return bool|PEAR_Error returns PEAR_Error, if the user doesn't exists * @access public */ @@ -166,9 +165,9 @@ /** * Deletes a user * - * @param $user user id + * @param string $user user id * - * @return mixed returns PEAR_Error, if the user doesn't exists + * @return bool|PEAR_Error returns PEAR_Error, if the user doesn't exists * @access public */ @@ -176,6 +175,7 @@ if (isset($this->users[$user]) && $this->locked) { unset($this->users[$user]); unset($this->cvs[$user]); + return true; } else { return new PEAR_Error( "Couldn't delete user '$user', because the user doesn't exists!", 3, PEAR_ERROR_RETURN) ; } @@ -184,8 +184,8 @@ /** * Verifies a user's password * - * @param $user user id - * @param $pass password for user + * @param string $user user id + * @param string $pass password for user * * @return boolean true if password is ok * @access public This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 13:33:12
|
Revision: 10376 http://sourceforge.net/p/phpwiki/code/10376 Author: vargenau Date: 2021-07-28 13:33:10 +0000 (Wed, 28 Jul 2021) Log Message: ----------- php7:notice PHP Deprecated: Array and string offset access syntax with curly braces is deprecated Modified Paths: -------------- trunk/lib/PagePerm.php Modified: trunk/lib/PagePerm.php =================================================================== --- trunk/lib/PagePerm.php 2021-07-28 13:30:02 UTC (rev 10375) +++ trunk/lib/PagePerm.php 2021-07-28 13:33:10 UTC (rev 10376) @@ -395,7 +395,7 @@ return true; } $allow = -1; - if (!empty($this->perm{$access})) { + if (!empty($this->perm[$access])) { foreach ($this->perm[$access] as $group => $bool) { if ($this->isMember($user, $group)) { return $bool; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 13:30:05
|
Revision: 10375 http://sourceforge.net/p/phpwiki/code/10375 Author: vargenau Date: 2021-07-28 13:30:02 +0000 (Wed, 28 Jul 2021) Log Message: ----------- Add DOCTYPE, add <title>, add language in <html> Modified Paths: -------------- trunk/ImageTile.php Modified: trunk/ImageTile.php =================================================================== --- trunk/ImageTile.php 2021-07-28 13:29:15 UTC (rev 10374) +++ trunk/ImageTile.php 2021-07-28 13:30:02 UTC (rev 10375) @@ -47,7 +47,15 @@ @$fp = fopen($file, 'w+'); if (!$fp) { header("Content-type: text/html"); - echo "<html><head></head><body>ERROR : unable to open $file in write mode</body></html>"; + echo "<!DOCTYPE html>\n"; + echo "<html xml:lang=\"en\" lang=\"en\">\n"; + echo "<head>\n"; + echo "<title>ERROR: unable to open $file in write mode</title>\n"; + echo "</head>\n"; + echo "<body>\n"; + echo "<p>ERROR: unable to open $file in write mode</p>\n"; + echo "</body>\n"; + echo "</html>"; } fwrite($fp, $source); $remove = 1; @@ -58,7 +66,15 @@ if (!$fp) { header("Content-type: text/html"); - echo "<html><head></head><body>Not an image</body></html>"; + echo "<!DOCTYPE html>\n"; + echo "<html xml:lang=\"en\" lang=\"en\">\n"; + echo "<head>\n"; + echo "<title>Not an image</title>\n"; + echo "</head>\n"; + echo "<body>\n"; + echo "<p>Not an image</p>\n"; + echo "</body>\n"; + echo "</html>"; exit(); } else { @@ -126,7 +142,15 @@ default: //we are not stupid... header("Content-type: text/html"); - echo "<html><head></head><body>Not an image</body></html>"; + echo "<!DOCTYPE html>\n"; + echo "<html xml:lang=\"en\" lang=\"en\">\n"; + echo "<head>\n"; + echo "<title>Not an image</title>\n"; + echo "</head>\n"; + echo "<body>\n"; + echo "<p>Not an image</p>\n"; + echo "</body>\n"; + echo "</html>"; exit(); break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |