From: <var...@us...> - 2008-09-07 10:55:02
|
Revision: 6238 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6238&view=rev Author: vargenau Date: 2008-09-07 10:55:02 +0000 (Sun, 07 Sep 2008) Log Message: ----------- Removed history Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2008-09-07 10:40:22 UTC (rev 6237) +++ trunk/lib/IniConfig.php 2008-09-07 10:55:02 UTC (rev 6238) @@ -941,468 +941,6 @@ } -// $Log: not supported by cvs2svn $ -// Revision 1.120 2008/03/17 19:04:45 rurban -// added ENABLE_MAILNOTIFY (default true) -// -// Revision 1.119 2008/01/31 20:40:10 vargenau -// Implemented Mediawiki-like syntax for tables -// -// Revision 1.118 2007/09/01 13:24:23 rurban -// add INSECURE_ACTIONS_LOCALHOST_ONLY. advanced security settings -// -// Revision 1.117 2007/08/10 21:56:29 rurban -// add LOGIN_LOG,LDAP_SEARCH_FILTER,ENABLE_AUTH_OPENID -// -// Revision 1.116 2007/07/14 17:55:29 rurban -// SemanticWeb.php -// -// Revision 1.115 2007/04/18 20:40:49 rurban -// added DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS -// -// Revision 1.114 2007/02/17 22:49:24 rurban -// enable TEMP_DIR, fixes bug 1646080 -// -// Revision 1.113 2007/01/27 21:52:54 rurban -// Define TEMP_DIR always -// -// Revision 1.112 2007/01/22 23:59:52 rurban -// protect against PLUGIN_CACHED_CACHE_DIR definition -// -// Revision 1.111 2007/01/20 15:54:04 rurban -// rename USE_SEARCHHIGHLIGHT to ENABLE_SEARCHHIGHLIGHT -// -// Revision 1.110 2007/01/07 18:42:39 rurban -// Fix typo: BLOG_EMPTY_DEFAULT_PREFIX => BLOG_DEFAULT_EMPTY_PREFIX. Add USE_SEARCHHIGHLIGHT. Add EXTERNAL_HTML2PDF_PAGELIST logic. Update $AllActionPages. -// -// Revision 1.109 2007/01/04 16:40:47 rurban -// Add more action pages -// -// Revision 1.108 2007/01/03 21:22:22 rurban -// Add DISABLE_UNITS. -// -// Revision 1.107 2006/12/22 17:45:28 rurban -// add USE_BYTEA -// -// Revision 1.106 2006/11/19 13:52:18 rurban -// fix and stabilize MAP splitting -// -// Revision 1.105 2006/11/19 11:24:11 rurban -// IPV6 fix by matt brown, #1546571 -// An IPv6 address must be surrounded by square brackets to form a valid server name. -// -// Revision 1.104 2006/10/12 06:36:09 rurban -// Guard against unwanted DEBUG="DEBUG" logic. In detail (WikiDB), -// and generally by forcing all int constants to be defined as int. -// -// Revision 1.103 2006/08/15 13:36:23 rurban -// support iso-8859-2 -// -// Revision 1.102 2006/05/14 18:02:27 rurban -// patch from bug #1480077 by Kai Krakow -// -// Revision 1.101 2006/05/13 19:59:54 rurban -// added wysiwyg_editor-1.3a feature by Jean-Nicolas GEREONE <jea...@st...> -// converted wysiwyg_editor-1.3a js to WysiwygEdit framework -// changed default ENABLE_WYSIWYG = true and added WYSIWYG_BACKEND = Wikiwyg -// -// Revision 1.100 2006/03/19 14:23:51 rurban -// sf.net patch #1377011 by Matt Brown: add DATABASE_OPTIMISE_FREQUENCY -// -// Revision 1.99 2006/03/07 20:42:34 rurban -// add DBAUTH_PREF_INSERT support -// -// Revision 1.98 2006/01/12 16:22:47 rurban -// Add flatfile and cvsclient to $valid_database_types (internal testing) -// Fix bug #1381464 "Duplicate functions ver. 1.3.11p1" -// -// Revision 1.97 2005/10/29 14:16:38 rurban -// fix broken locale update -// -// Revision 1.96 2005/09/26 06:27:33 rurban -// default locale fix Thomas Harding -// -// Revision 1.95 2005/09/18 15:15:53 rurban -// add a proper Content-Encoding: gzip if compressed, and omit Content-Length then. -// -// Revision 1.94 2005/09/15 05:56:12 rurban -// read configurator desc from config-dist.ini, update desc, fix some warnings -// -// Revision 1.93 2005/09/14 05:57:19 rurban -// make ENABLE_MARKUP_TEMPLATE optional -// -// Revision 1.92 2005/08/06 13:00:21 rurban -// accept config.ini ACCESS_LOG_SQL = 0 -// -// Revision 1.91 2005/06/30 04:53:46 rurban -// use better /tmp/cache, dependent on TEMP_DIR and getenv("TEMP") -// -// Revision 1.90 2005/05/06 18:45:59 rurban -// add TOOLBAR_TEMPLATE_PULLDOWN (AddTemplate icon) -// -// Revision 1.89 2005/05/06 16:54:18 rurban -// support optional EXTERNAL_LINK_TARGET, default: _blank -// -// Revision 1.88 2005/04/25 20:17:13 rurban -// captcha feature by Benjamin Drieu. Patch #1110699 -// -// Revision 1.87 2005/04/08 18:11:50 rurban -// guard against empty default INI values -// -// Revision 1.86 2005/04/06 06:41:05 rurban -// add ENABLE_DISCUSSION_LINK dependency (to turn it off for 1.3.11) -// -// Revision 1.85 2005/03/27 20:36:16 rurban -// configurator recursion fixes, dont print temp _dsn vars -// -// Revision 1.84 2005/03/27 18:23:40 rurban -// compute locale only for setlocale and LC_ALL -// -// Revision 1.83 2005/02/28 21:24:32 rurban -// ignore forbidden ini_set warnings. Bug #1117254 by Xavier Roche -// -// Revision 1.82 2005/02/28 20:14:19 rurban -// prevent from recursion (configurator.php) -// -// Revision 1.81 2005/02/27 13:20:28 rurban -// remove clsclient (typo and still exp) -// -// Revision 1.80 2005/02/26 17:47:57 rurban -// configurator: add (c), support show=_part1 initial expand, enable -// ENABLE_FILE_OUTPUT, use part.id not name -// install.php: fixed for multiple invocations (on various missing vars) -// IniConfig: call install.php on more errors with expanded part. -// -// Revision 1.79 2005/02/11 14:45:44 rurban -// support ENABLE_LIVESEARCH, enable PDO sessions -// -// Revision 1.78 2005/02/10 19:01:19 rurban -// add PDO support -// -// Revision 1.77 2005/01/31 12:14:15 rurban -// correct spelling -// -// Revision 1.76 2005/01/31 00:31:00 rurban -// translate errmsg -// -// Revision 1.75 2005/01/30 21:52:09 rurban -// print early warning on wrong DATABASE_TYPE -// -// Revision 1.74 2005/01/29 20:35:52 rurban -// helper for local debugging (Zend Personal Edition) -// -// Revision 1.73 2005/01/25 06:51:37 rurban -// new options: TOOLBAR_PAGELINK_PULLDOWN, DATABASE_PERSISTENT -// -// Revision 1.72 2005/01/13 07:29:27 rurban -// Default ACCESS_LOG_SQL = 2 on SQL/ADODB -// -// Revision 1.71 2005/01/10 18:06:40 rurban -// $LANG from DEFAULT_LANGUAGE -// -// Revision 1.70 2005/01/04 20:22:44 rurban -// guess $LANG based on client -// -// Revision 1.69 2004/12/23 14:07:34 rurban -// fix default language detection if DEFAULT_LANGUAGE=, collapse to 2char lang code, fix typo in @bindtextdomain -// -// Revision 1.68 2004/12/14 21:35:15 rurban -// support new BLOG_EMPTY_DEFAULT_PREFIX -// -// Revision 1.67 2004/11/30 09:51:35 rurban -// changed KEYWORDS from pageprefix to search term. added installer detection. -// -// Revision 1.66 2004/11/17 17:23:12 rurban -// fixed chdir back from locale -// -// Revision 1.65 2004/11/11 10:31:26 rurban -// Disable default options in config-dist.ini -// Add new CATEGORY_GROUP_PAGE root page: Default: Translation of "CategoryGroup" -// Clarify more options. -// -// Revision 1.64 2004/11/09 17:11:03 rurban -// * revert to the wikidb ref passing. there's no memory abuse there. -// * use new wikidb->_cache->_id_cache[] instead of wikidb->_iwpcache, to effectively -// store page ids with getPageLinks (GleanDescription) of all existing pages, which -// are also needed at the rendering for linkExistingWikiWord(). -// pass options to pageiterator. -// use this cache also for _get_pageid() -// This saves about 8 SELECT count per page (num all pagelinks). -// * fix passing of all page fields to the pageiterator. -// * fix overlarge session data which got broken with the latest ACCESS_LOG_SQL changes -// -// Revision 1.63 2004/11/07 16:47:32 rurban -// fix VIRTUAL_PATH -// -// Revision 1.62 2004/11/07 16:02:51 rurban -// new sql access log (for spam prevention), and restructured access log class -// dbh->quote (generic) -// pear_db: mysql specific parts seperated (using replace) -// -// Revision 1.61 2004/11/06 17:01:30 rurban -// unify DATABASE constants init as with DBAUTH -// -// Revision 1.60 2004/11/06 03:06:58 rurban -// make use of dumped static config state in config/config.php (if writable) -// -// Revision 1.59 2004/11/05 20:53:35 rurban -// login cleanup: better debug msg on failing login, -// checked password less immediate login (bogo or anon), -// checked olduser pref session error, -// better PersonalPage without password warning on minimal password length=0 -// (which is default now) -// -// Revision 1.58 2004/11/03 16:50:31 rurban -// some new defaults and constants, renamed USE_DOUBLECLICKEDIT to ENABLE_DOUBLECLICKEDIT -// -// Revision 1.57 2004/11/01 10:43:55 rurban -// seperate PassUser methods into seperate dir (memory usage) -// fix WikiUser (old) overlarge data session -// remove wikidb arg from various page class methods, use global ->_dbi instead -// ... -// -// Revision 1.56 2004/10/21 20:20:53 rurban -// From patch #970004 "Double clic to edit" by pixels. -// -// Revision 1.55 2004/10/14 19:23:58 rurban -// remove debugging prints -// -// Revision 1.54 2004/10/14 17:13:01 rurban -// use DATABASE_PREFIX -// -// Revision 1.53 2004/10/12 13:13:19 rurban -// php5 compatibility (5.0.1 ok) -// -// Revision 1.52 2004/10/04 23:38:07 rurban -// unittest fix -// -// Revision 1.51 2004/09/20 13:40:19 rurban -// define all config.ini settings, only the supported will be taken from -default. -// support USE_EXTERNAL_HTML2PDF renderer (htmldoc tested) -// -// Revision 1.50 2004/09/06 09:28:58 rurban -// fix PLUGIN_CACHED_CACHE_DIR fallback logic. ini entry did not work before -// -// Revision 1.49 2004/07/13 13:07:27 rurban -// improved DB_SESSION logic -// -// Revision 1.48 2004/07/05 13:09:37 rurban -// ENABLE_RAW_HTML_LOCKEDONLY, ENABLE_RAW_HTML_SAFE -// -// Revision 1.47 2004/07/03 16:51:05 rurban -// optional DBADMIN_USER:DBADMIN_PASSWD for action=upgrade (if no ALTER permission) -// added atomic mysql REPLACE for PearDB as in ADODB -// fixed _lock_tables typo links => link -// fixes unserialize ADODB bug in line 180 -// -// Revision 1.46 2004/07/02 09:55:58 rurban -// more stability fixes: new DISABLE_GETIMAGESIZE if your php crashes when loading LinkIcons: failing getimagesize in old phps; blockparser stabilized -// -// Revision 1.45 2004/07/01 08:51:21 rurban -// dumphtml: added exclude, print pagename before processing -// -// Revision 1.44 2004/06/29 08:52:22 rurban -// Use ...version() $need_content argument in WikiDB also: -// To reduce the memory footprint for larger sets of pagelists, -// we don't cache the content (only true or false) and -// we purge the pagedata (_cached_html) also. -// _cached_html is only cached for the current pagename. -// => Vastly improved page existance check, ACL check, ... -// -// Now only PagedList info=content or size needs the whole content, esp. if sortable. -// -// Revision 1.43 2004/06/29 06:48:02 rurban -// Improve LDAP auth and GROUP_LDAP membership: -// no error message on false password, -// added two new config vars: LDAP_OU_USERS and LDAP_OU_GROUP with GROUP_METHOD=LDAP -// fixed two group queries (this -> user) -// stdlib: ConvertOldMarkup still flawed -// -// Revision 1.42 2004/06/28 15:01:07 rurban -// fixed LDAP_SET_OPTION handling, LDAP error on connection problem -// -// Revision 1.41 2004/06/25 14:29:17 rurban -// WikiGroup refactoring: -// global group attached to user, code for not_current user. -// improved helpers for special groups (avoid double invocations) -// new experimental config option ENABLE_XHTML_XML (fails with IE, and document.write()) -// fixed a XHTML validation error on userprefs.tmpl -// -// Revision 1.40 2004/06/22 07:12:48 rurban -// removed USE_TAGLINES constant -// -// Revision 1.39 2004/06/21 16:22:28 rurban -// add DEFAULT_DUMP_DIR and HTML_DUMP_DIR constants, for easier cmdline dumps, -// fixed dumping buttons locally (images/buttons/), -// support pages arg for dumphtml, -// optional directory arg for dumpserial + dumphtml, -// fix a AllPages warning, -// show dump warnings/errors on DEBUG, -// don't warn just ignore on wikilens pagelist columns, if not loaded. -// RateIt pagelist column is called "rating", not "ratingwidget" (Dan?) -// -// Revision 1.38 2004/06/21 08:39:36 rurban -// pear/Cache update from Cache-1.5.4 (added db and trifile container) -// pear/DB update from DB-1.6.1 (mysql bugfixes, php5 compat, DB_PORTABILITY features) -// -// Revision 1.37 2004/06/19 12:32:37 rurban -// new TEMP_DIR for ziplib -// -// Revision 1.36 2004/06/19 10:06:37 rurban -// Moved lib/plugincache-config.php to config/*.ini -// use PLUGIN_CACHED_* constants instead of global $CacheParams -// -// Revision 1.35 2004/06/15 09:15:52 rurban -// IMPORTANT: fixed passwd handling for passwords stored in prefs: -// fix encrypted usage, actually store and retrieve them from db -// fix bogologin with passwd set. -// fix php crashes with call-time pass-by-reference (references wrongly used -// in declaration AND call). This affected mainly Apache2 and IIS. -// (Thanks to John Cole to detect this!) -// -// Revision 1.34 2004/06/13 13:54:25 rurban -// Catch fatals on the four dump calls (as file and zip, as html and mimified) -// FoafViewer: Check against external requirements, instead of fatal. -// Change output for xhtmldumps: using file:// urls to the local fs. -// Catch SOAP fatal by checking for GOOGLE_LICENSE_KEY -// Import GOOGLE_LICENSE_KEY and FORTUNE_DIR from config.ini. -// -// Revision 1.33 2004/06/08 19:48:16 rurban -// fixed foreign setup: no ugly skipped msg for the GenericPages, load english actionpages if translated not found -// -// Revision 1.32 2004/06/08 10:54:46 rurban -// better acl dump representation, read back acl and owner -// -// Revision 1.31 2004/06/06 16:58:51 rurban -// added more required ActionPages for foreign languages -// install now english ActionPages if no localized are found. (again) -// fixed default anon user level to be 0, instead of -1 -// (wrong "required administrator to view this page"...) -// -// Revision 1.30 2004/06/04 12:40:21 rurban -// Restrict valid usernames to prevent from attacks against external auth or compromise -// possible holes. -// Fix various WikiUser old issues with default IMAP,LDAP,POP3 configs. Removed these. -// Fxied more warnings -// -// Revision 1.29 2004/06/04 11:58:38 rurban -// added USE_TAGLINES -// -// Revision 1.28 2004/06/03 20:42:49 rurban -// fixed bad warning #964850 -// -// Revision 1.27 2004/06/03 10:18:19 rurban -// fix FileUser locking issues, new config ENABLE_PAGEPERM -// -// Revision 1.26 2004/06/02 18:01:45 rurban -// init global FileFinder to add proper include paths at startup -// adds PHPWIKI_DIR if started from another dir, lib/pear also -// fix slashify for Windows -// fix USER_AUTH_POLICY=old, use only USER_AUTH_ORDER methods (besides HttpAuth) -// -// Revision 1.25 2004/05/27 17:49:05 rurban -// renamed DB_Session to DbSession (in CVS also) -// added WikiDB->getParam and WikiDB->getAuthParam method to get rid of globals -// remove leading slash in error message -// added force_unlock parameter to File_Passwd (no return on stale locks) -// fixed adodb session AffectedRows -// added FileFinder helpers to unify local filenames and DATA_PATH names -// editpage.php: new edit toolbar javascript on ENABLE_EDIT_TOOLBAR -// -// Revision 1.24 2004/05/18 13:33:13 rurban -// we already have a CGI function -// -// Revision 1.23 2004/05/17 17:43:29 rurban -// CGI: no PATH_INFO fix -// -// Revision 1.22 2004/05/16 22:07:35 rurban -// check more config-default and predefined constants -// various PagePerm fixes: -// fix default PagePerms, esp. edit and view for Bogo and Password users -// implemented Creator and Owner -// BOGOUSERS renamed to BOGOUSER -// fixed syntax errors in signin.tmpl -// -// Revision 1.21 2004/05/08 22:55:12 rurban -// Fixed longstanding sf.net:demo problem. endless loop, caused by an empty definition of -// WIKI_NAME_REGEXP. Exactly this constant wasn't checked for its default setting. -// -// Revision 1.20 2004/05/08 20:21:00 rurban -// remove php tags in Log -// -// Revision 1.19 2004/05/08 19:55:29 rurban -// support <span>inlined plugin-result</span>: -// if the plugin is parsed inside a line, use <span> instead of -// <div tightenable top bottom> -// e.g. for "This is the current Phpwiki <plugin SystemInfo version> version. -// -// Revision 1.18 2004/05/08 16:58:19 rurban -// don't ignore some false config values (e.g. USE_PATH_INFO false was ignored) -// -// Revision 1.17 2004/05/06 19:26:15 rurban -// improve stability, trying to find the InlineParser endless loop on sf.net -// -// remove end-of-zip comments to fix sf.net bug #777278 and probably #859628 -// -// Revision 1.16 2004/05/02 15:10:05 rurban -// new finally reliable way to detect if /index.php is called directly -// and if to include lib/main.php -// new global AllActionPages -// SetupWiki now loads all mandatory pages: HOME_PAGE, action pages, and warns if not. -// WikiTranslation what=buttons for Carsten to create the missing MacOSX buttons -// PageGroupTestOne => subpages -// renamed PhpWikiRss to PhpWikiRecentChanges -// more docs, default configs, ... -// -// Revision 1.15 2004/05/01 15:59:29 rurban -// more php-4.0.6 compatibility: superglobals -// -// Revision 1.14 2004/04/29 23:25:12 rurban -// re-ordered locale init (as in 1.3.9) -// fixed loadfile with subpages, and merge/restore anyway -// (sf.net bug #844188) -// -// Revision 1.13 2004/04/29 21:54:05 rurban -// typo -// -// Revision 1.12 2004/04/27 16:16:27 rurban -// more subtle config problems with defaults -// -// Revision 1.11 2004/04/26 20:44:34 rurban -// locking table specific for better databases -// -// Revision 1.10 2004/04/26 13:22:32 rurban -// calculate bool old or dynamic constants later -// -// Revision 1.9 2004/04/26 12:15:01 rurban -// check default config values -// -// Revision 1.8 2004/04/23 16:55:59 zorloc -// If using Db auth and DBAUTH_AUTH_DSN is empty set DBAUTH_AUTH_DSN to $DBParams['dsn'] -// -// Revision 1.7 2004/04/20 22:26:27 zorloc -// Removed Pear_Config for parse_ini_file(). -// -// Revision 1.6 2004/04/20 18:10:27 rurban -// config refactoring: -// FileFinder is needed for WikiFarm scripts calling index.php -// config run-time calls moved to lib/IniConfig.php:fix_configs() -// added PHPWIKI_DIR smart-detection code (Theme finder) -// moved FileFind to lib/FileFinder.php -// cleaned lib/config.php -// -// Revision 1.5 2004/04/20 17:21:57 rurban -// WikiFarm code: honor predefined constants -// -// Revision 1.4 2004/04/20 17:08:19 rurban -// Some IniConfig fixes: prepend our private lib/pear dir -// switch from " to ' in the auth statements -// use error handling. -// WikiUserNew changes for the new "'$variable'" syntax -// in the statements -// TODO: optimization to put config vars into the session. -// - // (c-file-style: "gnu") // Local Variables: // mode: php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2008-09-19 02:33:38
|
Revision: 6270 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6270&view=rev Author: vargenau Date: 2008-09-19 09:33:49 +0000 (Fri, 19 Sep 2008) Log Message: ----------- Update AllActionPages: add BlogArchives, BlogJournal and AllUserPages Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2008-09-19 09:27:21 UTC (rev 6269) +++ trunk/lib/IniConfig.php 2008-09-19 09:33:49 UTC (rev 6270) @@ -604,13 +604,13 @@ grep -l '\?plugin ' *| perl -ne'$/=0;chop; s/%([\da-fA-F]{2})/pack("C",hex($1))/ge; next LINE if m{^(Help/|Template|Pgsrc)}; print "$_\n"; {local $/;open F,"<$_"; $f=join("",<F>);} push @a,$_ if $f=~/plugin $_/; END{print join(":",@a)};' */ $AllActionPages = explode(':', - 'AllPages:AllUsers:AppendText:AuthorHistory:BackLinks:CreatePage:EditMetaData:FindPage:FullTextSearch:' + 'AllPages:AllUsers:AppendText:AuthorHistory:BackLinks:BlogArchives:BlogJournal:CreatePage:EditMetaData:FindPage:FullTextSearch:' .'FuzzyPages:InterWikiSearch:LikePages:LinkDatabase:LinkSearch:ListRelations:ModeratedPage:' .'MostPopular:OrphanedPages:PageDump:PageHistory:PageInfo:PasswordReset:PluginManager:RandomPage:' .'RateIt:RecentChanges:RecentComments:RelatedChanges:SearchHighlight:SemanticRelations:SemanticSearch:' .'TitleSearch:TranslateText:UpLoad:UserPreferences:WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect' // plus some derivations - .':DebugInfo:LeastPopular:RecentEdits:AllPagesCreatedByMe:AllPagesLastEditedByMe:AllPagesOwnedByMe:' + .':DebugInfo:LeastPopular:RecentEdits:AllPagesCreatedByMe:AllPagesLastEditedByMe:AllPagesOwnedByMe:AllUserPages' .'PhpWikiAdministration/Remove:PhpWikiAdministration/Chmod:' .'PhpWikiAdministration/Rename:PhpWikiAdministration/Replace:' .'PhpWikiAdministration/SetAcl:PhpWikiAdministration/Chown'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2008-09-25 08:14:49
|
Revision: 6279 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6279&view=rev Author: vargenau Date: 2008-09-25 08:14:05 +0000 (Thu, 25 Sep 2008) Log Message: ----------- More readable layout for action pages Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2008-09-24 19:05:59 UTC (rev 6278) +++ trunk/lib/IniConfig.php 2008-09-25 08:14:05 UTC (rev 6279) @@ -604,21 +604,35 @@ grep -l '\?plugin ' *| perl -ne'$/=0;chop; s/%([\da-fA-F]{2})/pack("C",hex($1))/ge; next LINE if m{^(Help/|Template|Pgsrc)}; print "$_\n"; {local $/;open F,"<$_"; $f=join("",<F>);} push @a,$_ if $f=~/plugin $_/; END{print join(":",@a)};' */ $AllActionPages = explode(':', - 'AllPages:AllUsers:AppendText:AuthorHistory:BackLinks:BlogArchives:BlogJournal:CreatePage:EditMetaData:FindPage:FullTextSearch:' - .'FuzzyPages:InterWikiSearch:LikePages:LinkDatabase:LinkSearch:ListRelations:ModeratedPage:' - .'MostPopular:OrphanedPages:PageDump:PageHistory:PageInfo:PasswordReset:PluginManager:RandomPage:' - .'RateIt:RecentChanges:RecentComments:RelatedChanges:SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:' - .'TitleSearch:TranslateText:UpLoad:UserPreferences:WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:' - // plus some derivations - .'DebugInfo:LeastPopular:LockedPages:' - .'RecentEdits:MyRecentEdits:' - .'FullRecentChanges:MyRecentChanges:RecentChangesMyPages:' - .'AllPagesCreatedByMe:AllPagesLastEditedByMe:AllPagesOwnedByMe:AllUserPages' - .'RecentNewPages:' - .'PhpWikiAdministration:' - .'PhpWikiAdministration/Remove:PhpWikiAdministration/Chmod:' - .'PhpWikiAdministration/Rename:PhpWikiAdministration/Replace:' - .'PhpWikiAdministration/SetAcl:PhpWikiAdministration/Chown'); + 'AllPages:AllUsers:AppendText:AuthorHistory:' + .'BackLinks:BlogArchives:BlogJournal:' + .'CreatePage:' + .'EditMetaData:' + .'FindPage:FullTextSearch:FuzzyPages:' + .'InterWikiSearch:' + .'LikePages:LinkDatabase:LinkSearch:ListRelations:' + .'ModeratedPage:MostPopular:' + .'OrphanedPages:' + .'PageDump:PageHistory:PageInfo:PasswordReset:PluginManager:' + .'RandomPage:RateIt:RecentChanges:RecentComments:RelatedChanges:' + .'SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:' + .'TitleSearch:TranslateText:' + .'UpLoad:UserPreferences:' + .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:' + // plus some derivations + .'AllPagesCreatedByMe:AllPagesLastEditedByMe:AllPagesOwnedByMe:AllUserPages:' + .'DebugInfo:' + .'FullRecentChanges:' + .'LeastPopular:LockedPages:' + .'MyRecentEdits:MyRecentChanges:' + .'PhpWikiAdministration:' + .'PhpWikiAdministration/Chmod:' + .'PhpWikiAdministration/Chown:' + .'PhpWikiAdministration/Remove:' + .'PhpWikiAdministration/Rename:' + .'PhpWikiAdministration/Replace:' + .'PhpWikiAdministration/SetAcl:' + .'RecentChangesMyPages:RecentEdits:RecentNewPages'); // If user has not defined PHPWIKI_DIR, and we need it if (!defined('PHPWIKI_DIR') and !file_exists("themes/default")) { $themes_dir = FindFile("themes"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2008-09-26 18:00:02
|
Revision: 6283 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6283&view=rev Author: vargenau Date: 2008-09-26 17:59:57 +0000 (Fri, 26 Sep 2008) Log Message: ----------- Missing quote error Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2008-09-26 13:02:23 UTC (rev 6282) +++ trunk/lib/IniConfig.php 2008-09-26 17:59:57 UTC (rev 6283) @@ -618,7 +618,7 @@ .'SearchHighlight:SemanticRelations:SemanticSearch:SpellCheck:SystemInfo:' .'TitleSearch:TranslateText:' .'UpLoad:UriResolver:UserPreferences:' - .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:WikiBlog' + .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:WikiBlog:' // plus some derivations .'AllPagesCreatedByMe:AllPagesLastEditedByMe:AllPagesOwnedByMe:AllUserPages:' .'DebugInfo:' @@ -632,7 +632,7 @@ .'PhpWikiAdministration/Rename:' .'PhpWikiAdministration/Replace:' .'PhpWikiAdministration/SetAcl:' - .'RecentChangesMyPages:RecentEdits:RecentNewPages: + .'RecentChangesMyPages:RecentEdits:RecentNewPages:' .'UserContribs'); // If user has not defined PHPWIKI_DIR, and we need it if (!defined('PHPWIKI_DIR') and !file_exists("themes/default")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-02-12 18:43:32
|
Revision: 6490 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6490&view=rev Author: vargenau Date: 2009-02-12 18:43:27 +0000 (Thu, 12 Feb 2009) Log Message: ----------- Markup, Purge, SearchReplace Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-02-11 21:46:59 UTC (rev 6489) +++ trunk/lib/IniConfig.php 2009-02-12 18:43:27 UTC (rev 6490) @@ -629,9 +629,11 @@ .'PhpWikiAdministration:' .'PhpWikiAdministration/Chmod:' .'PhpWikiAdministration/Chown:' + .'PhpWikiAdministration/Markup:' + .'PhpWikiAdministration/Purge:' .'PhpWikiAdministration/Remove:' .'PhpWikiAdministration/Rename:' - .'PhpWikiAdministration/Replace:' + .'PhpWikiAdministration/SearchReplace:' .'PhpWikiAdministration/SetAcl:' .'RecentChangesMyPages:RecentEdits:RecentNewPages:' .'UserContribs'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-02-26 13:57:16
|
Revision: 6578 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6578&view=rev Author: vargenau Date: 2009-02-26 13:57:14 +0000 (Thu, 26 Feb 2009) Log Message: ----------- Include some action pages only if DEBUG is true Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-02-26 13:34:44 UTC (rev 6577) +++ trunk/lib/IniConfig.php 2009-02-26 13:57:14 UTC (rev 6578) @@ -601,33 +601,28 @@ // or contain basic functionality. /* All pages containing plugins of the same name as the filename: - cd pgsrc - grep -l '\?plugin ' *| perl -ne'$/=0;chop; s/%([\da-fA-F]{2})/pack("C",hex($1))/ge; next LINE if m{^(Help/|Template|Pgsrc)}; print "$_\n"; {local $/;open F,"<$_"; $f=join("",<F>);} push @a,$_ if $f=~/plugin $_/; END{print join(":",@a)};' */ $AllActionPages = explode(':', 'AllPages:AllUsers:AppendText:AuthorHistory:' .'BackLinks:BlogArchives:BlogJournal:' .'CreatePage:' - .'EditMetaData:' .'FindPage:FullTextSearch:FuzzyPages:' .'InterWikiSearch:' .'LdapSearch:LikePages:LinkDatabase:LinkSearch:ListRelations:' .'ModeratedPage:MostPopular:' .'OrphanedPages:' .'PageDump:PageHistory:PageInfo:PasswordReset:PluginManager:' - .'RandomPage:RateIt:RecentChanges:RecentComments:RelatedChanges:' - .'SearchHighlight:SemanticRelations:SemanticSearch:SpellCheck:SystemInfo:' + .'RateIt:RecentChanges:RecentComments:RelatedChanges:' + .'SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:' .'TitleSearch:TranslateText:' .'UpLoad:UriResolver:UserPreferences:' .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:WikiBlog:' // plus some derivations .'AllPagesCreatedByMe:AllPagesLastEditedByMe:AllPagesOwnedByMe:AllUserPages:' - .'DebugInfo:' .'FullRecentChanges:' .'LeastPopular:LockedPages:' .'MyRecentEdits:MyRecentChanges:' .'PhpWikiAdministration:' - .'PhpWikiAdministration/Chmod:' .'PhpWikiAdministration/Chown:' .'PhpWikiAdministration/Markup:' .'PhpWikiAdministration/Purge:' @@ -637,6 +632,16 @@ .'PhpWikiAdministration/SetAcl:' .'RecentChangesMyPages:RecentEdits:RecentNewPages:' .'UserContribs'); + + // Add some some action pages depending on configuration + if (defined('DEBUG') and DEBUG) { + $AllActionPages[] = 'DebugInfo'; + $AllActionPages[] = 'EditMetaData'; + $AllActionPages[] = 'RandomPage'; // RandomPage does not work + $AllActionPages[] = 'SpellCheck'; // SpellCheck does not work + $AllActionPages[] = 'PhpWikiAdministration/Chmod'; + } + // If user has not defined PHPWIKI_DIR, and we need it if (!defined('PHPWIKI_DIR') and !file_exists("themes/default")) { $themes_dir = FindFile("themes"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-02-26 14:32:34
|
Revision: 6579 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6579&view=rev Author: vargenau Date: 2009-02-26 14:32:29 +0000 (Thu, 26 Feb 2009) Log Message: ----------- Do not include some action pages for GFORGE Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-02-26 13:57:14 UTC (rev 6578) +++ trunk/lib/IniConfig.php 2009-02-26 14:32:29 UTC (rev 6579) @@ -14,6 +14,7 @@ */ /* * Copyright 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam + * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -608,13 +609,13 @@ .'CreatePage:' .'FindPage:FullTextSearch:FuzzyPages:' .'InterWikiSearch:' - .'LdapSearch:LikePages:LinkDatabase:LinkSearch:ListRelations:' + .'LikePages:LinkDatabase:LinkSearch:ListRelations:' .'ModeratedPage:MostPopular:' .'OrphanedPages:' - .'PageDump:PageHistory:PageInfo:PasswordReset:PluginManager:' - .'RateIt:RecentChanges:RecentComments:RelatedChanges:' + .'PageDump:PageHistory:PageInfo:PluginManager:' + .'RecentChanges:RecentComments:RelatedChanges:' .'SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:' - .'TitleSearch:TranslateText:' + .'TitleSearch:' .'UpLoad:UriResolver:UserPreferences:' .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:WikiBlog:' // plus some derivations @@ -641,6 +642,12 @@ $AllActionPages[] = 'SpellCheck'; // SpellCheck does not work $AllActionPages[] = 'PhpWikiAdministration/Chmod'; } + if (!defined('GFORGE') or !GFORGE) { + $AllActionPages[] = 'LdapSearch'; + $AllActionPages[] = 'PasswordReset'; + $AllActionPages[] = 'RateIt'; // RateIt works only in wikilens theme + $AllActionPages[] = 'TranslateText'; + } // If user has not defined PHPWIKI_DIR, and we need it if (!defined('PHPWIKI_DIR') and !file_exists("themes/default")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-02-26 14:36:51
|
Revision: 6580 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6580&view=rev Author: vargenau Date: 2009-02-26 14:36:44 +0000 (Thu, 26 Feb 2009) Log Message: ----------- In Gforge, disable update_locale because Zend Debugger crash Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-02-26 14:32:29 UTC (rev 6579) +++ trunk/lib/IniConfig.php 2009-02-26 14:36:44 UTC (rev 6580) @@ -778,7 +778,14 @@ if (!defined('DEFAULT_LANGUAGE')) // not needed anymore define('DEFAULT_LANGUAGE', ''); // detect from client - update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE); + // Gforge hack + if (!defined('GFORGE') or !GFORGE) { + // Disable update_locale because Zend Debugger crash + if(! extension_loaded('Zend Debugger')) { + update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE); + } + } + if (empty($LANG)) { if (!defined("DEFAULT_LANGUAGE") or !DEFAULT_LANGUAGE) { // TODO: defer this to WikiRequest::initializeLang() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-03-01 14:27:58
|
Revision: 6609 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6609&view=rev Author: vargenau Date: 2009-03-01 14:27:40 +0000 (Sun, 01 Mar 2009) Log Message: ----------- mkdir 0777, not 777 Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-03-01 12:07:16 UTC (rev 6608) +++ trunk/lib/IniConfig.php 2009-03-01 14:27:40 UTC (rev 6609) @@ -524,7 +524,7 @@ $rs['PLUGIN_CACHED_CACHE_DIR'] = TEMP_DIR . '/cache'; if (!FindFile($rs['PLUGIN_CACHED_CACHE_DIR'], 1)) { // [29ms] FindFile(TEMP_DIR, false, 1); // TEMP must exist! - mkdir($rs['PLUGIN_CACHED_CACHE_DIR'], 777); + mkdir($rs['PLUGIN_CACHED_CACHE_DIR'], 0777); } // will throw an error if not exists. define('PLUGIN_CACHED_CACHE_DIR', FindFile($rs['PLUGIN_CACHED_CACHE_DIR'],false,1)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-03-08 14:26:09
|
Revision: 6663 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6663&view=rev Author: vargenau Date: 2009-03-08 14:25:56 +0000 (Sun, 08 Mar 2009) Log Message: ----------- RandomPage now works Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-03-08 13:00:48 UTC (rev 6662) +++ trunk/lib/IniConfig.php 2009-03-08 14:25:56 UTC (rev 6663) @@ -613,6 +613,7 @@ .'ModeratedPage:MostPopular:' .'OrphanedPages:' .'PageDump:PageHistory:PageInfo:PluginManager:' + .'RandomPage:' .'RecentChanges:RecentComments:RelatedChanges:' .'SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:' .'TitleSearch:' @@ -638,7 +639,6 @@ if (defined('DEBUG') and DEBUG) { $AllActionPages[] = 'DebugInfo'; $AllActionPages[] = 'EditMetaData'; - $AllActionPages[] = 'RandomPage'; // RandomPage does not work $AllActionPages[] = 'SpellCheck'; // SpellCheck does not work $AllActionPages[] = 'PhpWikiAdministration/Chmod'; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-03-27 10:48:35
|
Revision: 6725 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6725&view=rev Author: vargenau Date: 2009-03-27 10:48:28 +0000 (Fri, 27 Mar 2009) Log Message: ----------- No InterWikiSearch and UriResolver in Gforge Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-03-27 10:07:24 UTC (rev 6724) +++ trunk/lib/IniConfig.php 2009-03-27 10:48:28 UTC (rev 6725) @@ -608,7 +608,6 @@ .'BackLinks:BlogArchives:BlogJournal:' .'CreatePage:' .'FindPage:FullTextSearch:FuzzyPages:' - .'InterWikiSearch:' .'LikePages:LinkDatabase:LinkSearch:ListRelations:' .'ModeratedPage:MostPopular:' .'OrphanedPages:' @@ -617,7 +616,7 @@ .'RecentChanges:RecentComments:RelatedChanges:' .'SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:' .'TitleSearch:' - .'UpLoad:UriResolver:UserPreferences:' + .'UpLoad:UserPreferences:' .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:WikiBlog:' // plus some derivations .'AllPagesCreatedByMe:AllPagesLastEditedByMe:AllPagesOwnedByMe:AllUserPages:' @@ -643,10 +642,12 @@ $AllActionPages[] = 'PhpWikiAdministration/Chmod'; } if (!defined('GFORGE') or !GFORGE) { + $AllActionPages[] = 'InterWikiSearch'; $AllActionPages[] = 'LdapSearch'; $AllActionPages[] = 'PasswordReset'; $AllActionPages[] = 'RateIt'; // RateIt works only in wikilens theme $AllActionPages[] = 'TranslateText'; + $AllActionPages[] = 'UriResolver'; } // If user has not defined PHPWIKI_DIR, and we need it This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2009-04-01 13:23:34
|
Revision: 6757 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6757&view=rev Author: rurban Date: 2009-04-01 12:13:15 +0000 (Wed, 01 Apr 2009) Log Message: ----------- formatting and re-added comment Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-04-01 11:39:14 UTC (rev 6756) +++ trunk/lib/IniConfig.php 2009-04-01 12:13:15 UTC (rev 6757) @@ -594,14 +594,19 @@ // Even on simple 8bit charsets, where just <>& need to be replaced. For iso-8859-[2-4] e.g. // See <php-src>/ext/standard/html.c // For performance reasons we require a magic constant to ignore this warning. - if (defined('IGNORE_CHARSET_NOT_SUPPORTED_WARNING') and IGNORE_CHARSET_NOT_SUPPORTED_WARNING) { - $ErrorManager->pushErrorHandler(new WikiFunctionCb('_ignore_unknown_charset_warning')); + if (defined('IGNORE_CHARSET_NOT_SUPPORTED_WARNING') + and IGNORE_CHARSET_NOT_SUPPORTED_WARNING) + { + $ErrorManager->pushErrorHandler + (new WikiFunctionCb('_ignore_unknown_charset_warning')); } // Used by SetupWiki to pull in required pages, if not translated, then in english. // Also used by _WikiTranslation. Really important are only those which return pagelists // or contain basic functionality. /* All pages containing plugins of the same name as the filename: + cd pgsrc + grep -l '\?plugin ' *| perl -ne'$/=0;chop; s/%([\da-fA-F]{2})/pack("C",hex($1))/ge; next LINE if m{^(Help/|Template|Pgsrc)}; print "$_\n"; {local $/;open F,"<$_"; $f=join("",<F>);} push @a,$_ if $f=~/plugin $_/; END{print join(":",@a)};' */ $AllActionPages = explode(':', 'AllPages:AllUsers:AppendText:AuthorHistory:' @@ -612,8 +617,7 @@ .'ModeratedPage:MostPopular:' .'OrphanedPages:' .'PageDump:PageHistory:PageInfo:PluginManager:' - .'RandomPage:' - .'RecentChanges:RecentComments:RelatedChanges:' + .'RandomPage:RecentChanges:RecentComments:RelatedChanges:' .'SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:' .'TitleSearch:' .'UpLoad:UserPreferences:' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-06-01 10:09:35
|
Revision: 6836 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6836&view=rev Author: vargenau Date: 2009-06-01 10:09:24 +0000 (Mon, 01 Jun 2009) Log Message: ----------- Implement external pages (ENABLE_EXTERNAL_PAGES) Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-06-01 10:04:38 UTC (rev 6835) +++ trunk/lib/IniConfig.php 2009-06-01 10:09:24 UTC (rev 6836) @@ -202,7 +202,8 @@ 'ENABLE_MARKUP_DIVSPAN', 'USE_BYTEA', 'UPLOAD_USERDIR', 'DISABLE_UNITS', 'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', 'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY', - 'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX', 'ENABLE_PAGE_PUBLIC' + 'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX', 'ENABLE_PAGE_PUBLIC', + 'ENABLE_EXTERNAL_PAGES' ); $rs = @parse_ini_file($file); @@ -621,7 +622,7 @@ .'SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:' .'TitleSearch:' .'UpLoad:UserPreferences:' - .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:WikiBlog:' + .'WantedPages:WhoIsOnline:WikiAdminSelect:WikiBlog:' // plus some derivations .'AllPagesCreatedByMe:AllPagesLastEditedByMe:AllPagesOwnedByMe:AllUserPages:' .'FullRecentChanges:' @@ -652,7 +653,13 @@ $AllActionPages[] = 'RateIt'; // RateIt works only in wikilens theme $AllActionPages[] = 'TranslateText'; $AllActionPages[] = 'UriResolver'; + $AllActionPages[] = 'WatchPage'; } + if (defined('GFORGE') and GFORGE) { + if (defined('ENABLE_EXTERNAL_PAGES') and ENABLE_EXTERNAL_PAGES) { + $AllActionPages[] = 'ExternalPages'; + } + } // If user has not defined PHPWIKI_DIR, and we need it if (!defined('PHPWIKI_DIR') and !file_exists("themes/default")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2009-06-04 11:49:43
|
Revision: 6881 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6881&view=rev Author: rurban Date: 2009-06-04 11:48:41 +0000 (Thu, 04 Jun 2009) Log Message: ----------- add ENABLE_AJAX Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-06-04 11:47:52 UTC (rev 6880) +++ trunk/lib/IniConfig.php 2009-06-04 11:48:41 UTC (rev 6881) @@ -182,7 +182,7 @@ // List of all valid config options to be define()d which take booleans. $_IC_VALID_BOOL = array ('ENABLE_USER_NEW', 'ENABLE_PAGEPERM', 'ENABLE_EDIT_TOOLBAR', 'JS_SEARCHREPLACE', - 'ENABLE_XHTML_XML', 'ENABLE_DOUBLECLICKEDIT', 'ENABLE_LIVESEARCH', + 'ENABLE_XHTML_XML', 'ENABLE_DOUBLECLICKEDIT', 'ENABLE_LIVESEARCH', 'ENABLE_ACDROPDOWN', 'USECACHE', 'WIKIDB_NOCACHE_MARKUP', 'ENABLE_REVERSE_DNS', 'ENCRYPTED_PASSWD', 'ZIPDUMP_AUTH', 'ENABLE_RAW_HTML', 'ENABLE_RAW_HTML_LOCKEDONLY', 'ENABLE_RAW_HTML_SAFE', @@ -203,7 +203,7 @@ 'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', 'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY', 'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX', 'ENABLE_PAGE_PUBLIC', - 'ENABLE_EXTERNAL_PAGES' + 'ENABLE_AJAX', 'ENABLE_EXTERNAL_PAGES' ); $rs = @parse_ini_file($file); @@ -646,11 +646,12 @@ $AllActionPages[] = 'SpellCheck'; // SpellCheck does not work $AllActionPages[] = 'PhpWikiAdministration/Chmod'; } + // The GFORGE theme omits them if (!defined('GFORGE') or !GFORGE) { $AllActionPages[] = 'InterWikiSearch'; $AllActionPages[] = 'LdapSearch'; $AllActionPages[] = 'PasswordReset'; - $AllActionPages[] = 'RateIt'; // RateIt works only in wikilens theme + $AllActionPages[] = 'RateIt'; // RateIt works only in wikilens derived themes $AllActionPages[] = 'TranslateText'; $AllActionPages[] = 'UriResolver'; $AllActionPages[] = 'WatchPage'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2009-07-14 07:10:50
|
Revision: 7023 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7023&view=rev Author: rurban Date: 2009-07-14 07:10:47 +0000 (Tue, 14 Jul 2009) Log Message: ----------- Fix Windows gettext on non-english OS but english phpwiki: Only bindtextdomain on non-english Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-07-14 04:48:29 UTC (rev 7022) +++ trunk/lib/IniConfig.php 2009-07-14 07:10:47 UTC (rev 7023) @@ -828,26 +828,30 @@ } } else { - // Working around really weird gettext problems: (4.3.2, 4.3.6 win) - // bindtextdomain() returns the current domain path. - // 1. If the script is not index.php but something like "de", on a different path - // then bindtextdomain() fails, but after chdir to the correct path it will work okay. - // 2. But the weird error "Undefined variable: bindtextdomain" is generated then. - $bindtextdomain_path = FindFile("locale", false, true); $chback = 0; - if (isWindows()) - $bindtextdomain_path = str_replace("/", "\\", $bindtextdomain_path); - $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain_path); - if (realpath($bindtextdomain_real) != realpath($bindtextdomain_path)) { - // this will happen with virtual_paths. chdir and try again. - chdir($bindtextdomain_path); - $chback = 1; + if ($LANG != 'en') { + + // Working around really weird gettext problems: (4.3.2, 4.3.6 win) + // bindtextdomain() in returns the current domain path. + // 1. If the script is not index.php but something like "de", on a different path + // then bindtextdomain() fails, but after chdir to the correct path it will work okay. + // 2. But the weird error "Undefined variable: bindtextdomain" is generated then. + $bindtextdomain_path = FindFile("locale", false, true); + if (isWindows()) + $bindtextdomain_path = str_replace("/", "\\", $bindtextdomain_path); $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain_path); + if (realpath($bindtextdomain_real) != realpath($bindtextdomain_path)) { + // this will happen with virtual_paths. chdir and try again. + chdir($bindtextdomain_path); + $chback = 1; + $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain_path); + } } // tell gettext not to use unicode. PHP >= 4.2.0. Thanks to Kai Krakow. if (defined('CHARSET') and function_exists('bind_textdomain_codeset')) @bind_textdomain_codeset("phpwiki", CHARSET); - textdomain("phpwiki"); + if ($LANG != 'en') + textdomain("phpwiki"); if ($chback) { // change back chdir($bindtextdomain_real . (isWindows() ? "\\.." : "/..")); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-09-15 15:16:48
|
Revision: 7118 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7118&view=rev Author: vargenau Date: 2009-09-15 15:16:38 +0000 (Tue, 15 Sep 2009) Log Message: ----------- Add NewPagesPerUser in action pages list Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-09-15 08:02:20 UTC (rev 7117) +++ trunk/lib/IniConfig.php 2009-09-15 15:16:38 UTC (rev 7118) @@ -619,6 +619,7 @@ .'FindPage:FullTextSearch:FuzzyPages:' .'LikePages:LinkDatabase:LinkSearch:ListRelations:' .'ModeratedPage:MostPopular:' + .'NewPagesPerUser:' .'OrphanedPages:' .'PageDump:PageHistory:PageInfo:PluginManager:' .'RandomPage:RecentChanges:RecentComments:RelatedChanges:' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-09-28 12:56:25
|
Revision: 7164 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7164&view=rev Author: vargenau Date: 2009-09-28 12:56:08 +0000 (Mon, 28 Sep 2009) Log Message: ----------- Do not create DebugInfo in Gforge, even if DEBUG is active Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-09-28 12:53:12 UTC (rev 7163) +++ trunk/lib/IniConfig.php 2009-09-28 12:56:08 UTC (rev 7164) @@ -643,15 +643,15 @@ .'RecentChangesMyPages:RecentEdits:RecentNewPages:' .'UserContribs'); - // Add some some action pages depending on configuration - if (defined('DEBUG') and DEBUG) { - $AllActionPages[] = 'DebugInfo'; - $AllActionPages[] = 'EditMetaData'; - $AllActionPages[] = 'SpellCheck'; // SpellCheck does not work - $AllActionPages[] = 'PhpWikiAdministration/Chmod'; - } // The GFORGE theme omits them if (!defined('GFORGE') or !GFORGE) { + // Add some some action pages depending on configuration + if (defined('DEBUG') and DEBUG) { + $AllActionPages[] = 'DebugInfo'; + $AllActionPages[] = 'EditMetaData'; + $AllActionPages[] = 'SpellCheck'; // SpellCheck does not work + $AllActionPages[] = 'PhpWikiAdministration/Chmod'; + } $AllActionPages[] = 'InterWikiSearch'; $AllActionPages[] = 'LdapSearch'; $AllActionPages[] = 'PasswordReset'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-10-19 08:01:12
|
Revision: 7219 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7219&view=rev Author: vargenau Date: 2009-10-19 08:01:01 +0000 (Mon, 19 Oct 2009) Log Message: ----------- Less action pages for Gforge Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2009-10-19 07:46:27 UTC (rev 7218) +++ trunk/lib/IniConfig.php 2009-10-19 08:01:01 UTC (rev 7219) @@ -601,7 +601,7 @@ */ $AllActionPages = explode(':', 'AllPages:AllUsers:AppendText:AuthorHistory:' - .'BackLinks:BlogArchives:BlogJournal:' + .'BackLinks:' .'CreatePage:' .'FindPage:FullTextSearch:FuzzyPages:' .'LikePages:LinkDatabase:LinkSearch:ListRelations:' @@ -609,11 +609,11 @@ .'NewPagesPerUser:' .'OrphanedPages:' .'PageDump:PageHistory:PageInfo:PluginManager:' - .'RandomPage:RecentChanges:RecentComments:RelatedChanges:' + .'RandomPage:RecentChanges:RelatedChanges:' .'SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:' .'TitleSearch:' .'UpLoad:UserPreferences:' - .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:WikiBlog:' + .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:' // plus some derivations .'AllPagesCreatedByMe:AllPagesLastEditedByMe:AllPagesOwnedByMe:AllUserPages:' .'FullRecentChanges:' @@ -621,7 +621,6 @@ .'MyRecentEdits:MyRecentChanges:' .'PhpWikiAdministration:' .'PhpWikiAdministration/Chown:' - .'PhpWikiAdministration/Markup:' .'PhpWikiAdministration/Purge:' .'PhpWikiAdministration/Remove:' .'PhpWikiAdministration/Rename:' @@ -639,12 +638,17 @@ $AllActionPages[] = 'SpellCheck'; // SpellCheck does not work $AllActionPages[] = 'PhpWikiAdministration/Chmod'; } + $AllActionPages[] = 'BlogArchives'; + $AllActionPages[] = 'BlogJournal'; $AllActionPages[] = 'InterWikiSearch'; $AllActionPages[] = 'LdapSearch'; $AllActionPages[] = 'PasswordReset'; + $AllActionPages[] = 'PhpWikiAdministration/Markup'; $AllActionPages[] = 'RateIt'; // RateIt works only in wikilens derived themes + $AllActionPages[] = 'RecentComments'; $AllActionPages[] = 'TranslateText'; $AllActionPages[] = 'UriResolver'; + $AllActionPages[] = 'WikiBlog'; } if (defined('GFORGE') and GFORGE) { if (defined('ENABLE_EXTERNAL_PAGES') and ENABLE_EXTERNAL_PAGES) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-05-04 13:32:46
|
Revision: 7375 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7375&view=rev Author: vargenau Date: 2010-05-04 13:32:35 +0000 (Tue, 04 May 2010) Log Message: ----------- Add RateIt for Gforge Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2010-05-04 13:30:52 UTC (rev 7374) +++ trunk/lib/IniConfig.php 2010-05-04 13:32:35 UTC (rev 7375) @@ -609,6 +609,7 @@ .'NewPagesPerUser:' .'OrphanedPages:' .'PageDump:PageHistory:PageInfo:PluginManager:' + .'RateIt:' // RateIt works only in wikilens derived themes .'RandomPage:RecentChanges:RelatedChanges:' .'SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:' .'TitleSearch:' @@ -644,7 +645,6 @@ $AllActionPages[] = 'LdapSearch'; $AllActionPages[] = 'PasswordReset'; $AllActionPages[] = 'PhpWikiAdministration/Markup'; - $AllActionPages[] = 'RateIt'; // RateIt works only in wikilens derived themes $AllActionPages[] = 'RecentComments'; $AllActionPages[] = 'TranslateText'; $AllActionPages[] = 'UriResolver'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-05-12 14:16:47
|
Revision: 7400 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7400&view=rev Author: vargenau Date: 2010-05-12 14:16:41 +0000 (Wed, 12 May 2010) Log Message: ----------- Full list of plugins for non-Gforge Phpwiki Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2010-05-12 09:56:32 UTC (rev 7399) +++ trunk/lib/IniConfig.php 2010-05-12 14:16:41 UTC (rev 7400) @@ -696,6 +696,41 @@ $AllAllowedPlugins[] = 'WikiPoll'; $AllAllowedPlugins[] = 'YouTube'; + // The GFORGE theme omits them + if (!defined('GFORGE') or !GFORGE) { + $AllAllowedPlugins[] = 'AddComment'; + $AllAllowedPlugins[] = 'AnalyseAccessLogSql'; + $AllAllowedPlugins[] = 'AsciiMath'; + $AllAllowedPlugins[] = '_AuthInfo'; + $AllAllowedPlugins[] = '_BackendInfo'; + $AllAllowedPlugins[] = 'CacheTest'; + $AllAllowedPlugins[] = 'CategoryPage'; + $AllAllowedPlugins[] = 'FoafViewer'; + $AllAllowedPlugins[] = 'FrameInclude'; + $AllAllowedPlugins[] = 'GraphViz'; + $AllAllowedPlugins[] = '_GroupInfo'; + $AllAllowedPlugins[] = 'HtmlConverter'; + $AllAllowedPlugins[] = 'Imdb'; + $AllAllowedPlugins[] = 'JabberPresence'; + $AllAllowedPlugins[] = 'ListPages'; + $AllAllowedPlugins[] = 'PhpWeather'; + $AllAllowedPlugins[] = 'Ploticus'; + $AllAllowedPlugins[] = 'PopularNearby'; + $AllAllowedPlugins[] = 'PreferenceApp'; + $AllAllowedPlugins[] = '_PreferencesInfo'; + $AllAllowedPlugins[] = '_Retransform'; + $AllAllowedPlugins[] = 'SqlResult'; + $AllAllowedPlugins[] = 'TeX2png'; + $AllAllowedPlugins[] = 'text2png'; + $AllAllowedPlugins[] = 'TexToPng'; + $AllAllowedPlugins[] = 'VisualWiki'; + $AllAllowedPlugins[] = 'WantedPagesOld'; + $AllAllowedPlugins[] = 'WikiAdminChmod'; + $AllAllowedPlugins[] = 'WikiAdminMarkup'; + $AllAllowedPlugins[] = 'WikiForum'; + $AllAllowedPlugins[] = '_WikiTranslation'; + } + // Used by SetupWiki to pull in required pages, if not translated, then in english. // Also used by _WikiTranslation. Really important are only those which return pagelists // or contain basic functionality. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-05-18 15:52:06
|
Revision: 7408 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7408&view=rev Author: vargenau Date: 2010-05-18 15:52:00 +0000 (Tue, 18 May 2010) Log Message: ----------- Do not die for Gforge Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2010-05-18 15:45:48 UTC (rev 7407) +++ trunk/lib/IniConfig.php 2010-05-18 15:52:00 UTC (rev 7408) @@ -14,7 +14,7 @@ */ /* * Copyright 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam - * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent + * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -546,7 +546,9 @@ if (is_writable($dump)) { save_dump($dump); } else { - die($dump . " is not writable"); + if (! defined('GFORGE') or !GFORGE) { + die($dump . " is not writable"); + } } // store locale[] in config.php? This is too problematic. fixup_dynamic_configs($file); // [100ms] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2010-06-07 10:36:09
|
Revision: 7470 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7470&view=rev Author: rurban Date: 2010-06-07 10:36:03 +0000 (Mon, 07 Jun 2010) Log Message: ----------- Always define GFORGE true or false Do not fail if config/config.php is not writable. This is optional only. Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2010-06-07 09:47:12 UTC (rev 7469) +++ trunk/lib/IniConfig.php 2010-06-07 10:36:03 UTC (rev 7470) @@ -109,7 +109,7 @@ function IniConfig($file) { - // check config/config.php dump for faster startup + // Optionally check config/config.php dump for faster startup $dump = substr($file, 0, -3)."php"; if (isWindows($dump)) $dump = str_replace("/","\\",$dump); if (file_exists($dump) and is_readable($dump) and filesize($dump) > 0 and sort_file_mtime($dump, $file) < 0) { @@ -203,7 +203,7 @@ 'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY', 'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX', 'ENABLE_PAGE_PUBLIC', 'ENABLE_AJAX', 'ENABLE_EXTERNAL_PAGES', - 'READONLY' + 'READONLY', 'GFORGE' ); $rs = @parse_ini_file($file); @@ -553,10 +553,6 @@ // The question is if reading this is faster then doing IniConfig() + fixup_static_configs() if (is_writable($dump)) { save_dump($dump); - } else { - if (! defined('GFORGE') or !GFORGE) { - die($dump . " is not writable"); - } } // store locale[] in config.php? This is too problematic. fixup_dynamic_configs($file); // [100ms] @@ -624,9 +620,9 @@ .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect'); // The GFORGE theme omits them - if (!defined('GFORGE') or !GFORGE) { + if (!GFORGE) { // Add some some action pages depending on configuration - if (defined('DEBUG') and DEBUG) { + if (DEBUG) { $ActionPages[] = 'DebugInfo'; $ActionPages[] = 'EditMetaData'; $ActionPages[] = 'SpellCheck'; // SpellCheck does not work @@ -710,7 +706,7 @@ $AllAllowedPlugins[] = 'YouTube'; // The GFORGE theme omits them - if (!defined('GFORGE') or !GFORGE) { + if (!GFORGE) { $AllAllowedPlugins[] = 'AddComment'; $AllAllowedPlugins[] = 'AnalyseAccessLogSql'; $AllAllowedPlugins[] = 'AsciiMath'; @@ -770,16 +766,16 @@ $AllActionPages[] = 'UserContribs'; // The GFORGE theme omits them - if (!defined('GFORGE') or !GFORGE) { + if (!GFORGE) { // Add some some action pages depending on configuration - if (defined('DEBUG') and DEBUG) { + if (DEBUG) { $AllActionPages[] = 'PhpWikiAdministration/Chmod'; } $AllActionPages[] = 'PhpWikiAdministration/Markup'; } - if (defined('GFORGE') and GFORGE) { - if (defined('ENABLE_EXTERNAL_PAGES') and ENABLE_EXTERNAL_PAGES) { + if (GFORGE) { + if (ENABLE_EXTERNAL_PAGES) { $AllAllowedPlugins[] = 'WikiAdminSetExternal'; $AllActionPages[] = 'ExternalPages'; } @@ -915,7 +911,7 @@ define('DEFAULT_LANGUAGE', ''); // detect from client // Gforge hack - if (!defined('GFORGE') or !GFORGE) { + if (!GFORGE) { // Disable update_locale because Zend Debugger crash if(! extension_loaded('Zend Debugger')) { update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-10 15:09:49
|
Revision: 7524 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7524&view=rev Author: vargenau Date: 2010-06-10 15:09:43 +0000 (Thu, 10 Jun 2010) Log Message: ----------- Add MyRatings Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2010-06-10 13:45:18 UTC (rev 7523) +++ trunk/lib/IniConfig.php 2010-06-10 15:09:43 UTC (rev 7524) @@ -752,6 +752,7 @@ $AllActionPages[] = 'FullRecentChanges'; $AllActionPages[] = 'LeastPopular'; $AllActionPages[] = 'LockedPages'; + $AllActionPages[] = 'MyRatings'; // MyRatings works only in wikilens derived themes $AllActionPages[] = 'MyRecentEdits'; $AllActionPages[] = 'MyRecentChanges'; $AllActionPages[] = 'PhpWikiAdministration'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2010-06-23 13:13:45
|
Revision: 7557 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7557&view=rev Author: rurban Date: 2010-06-23 13:13:40 +0000 (Wed, 23 Jun 2010) Log Message: ----------- activate FacebookLike Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2010-06-23 13:13:12 UTC (rev 7556) +++ trunk/lib/IniConfig.php 2010-06-23 13:13:40 UTC (rev 7557) @@ -657,6 +657,7 @@ $AllAllowedPlugins[] = 'Diff'; $AllAllowedPlugins[] = 'DynamicIncludePage'; $AllAllowedPlugins[] = 'ExternalSearch'; + $AllAllowedPlugins[] = 'FacebookLike'; $AllAllowedPlugins[] = 'FileInfo'; $AllAllowedPlugins[] = 'GoogleMaps'; $AllAllowedPlugins[] = 'GooglePlugin'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-08-12 14:54:48
|
Revision: 7643 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7643&view=rev Author: vargenau Date: 2010-08-12 14:54:41 +0000 (Thu, 12 Aug 2010) Log Message: ----------- Whitespace only Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2010-08-12 14:47:15 UTC (rev 7642) +++ trunk/lib/IniConfig.php 2010-08-12 14:54:41 UTC (rev 7643) @@ -217,7 +217,7 @@ } } unset($k); unset($v); - + foreach ($_IC_VALID_VALUE as $item) { if (defined($item)) { unset($rs[$item]); @@ -260,7 +260,7 @@ $val = false; //trigger_error(sprintf("missing boolean config setting for %s",$item)); } - + // calculate them later: old or dynamic constants if (!array_key_exists($item, $rs) and in_array($item, array('USE_PATH_INFO', 'USE_DB_SESSION', @@ -319,7 +319,7 @@ trigger_error(sprintf("Invalid DATABASE_TYPE=%s. Choose one of %s", DATABASE_TYPE, join(",", $valid_database_types)), E_USER_ERROR); - unset($valid_database_types); + unset($valid_database_types); if (DATABASE_TYPE == 'PDO') { if (!check_php_version(5)) trigger_error("Invalid DATABASE_TYPE=PDO. PDO requires at least php-5.0!", @@ -334,7 +334,7 @@ } // Detect readonly database, e.g. system mounted read-only for maintenance // via dbh->readonly later. Unfortunately not possible as constant. - + // USE_DB_SESSION default logic: if (!defined('USE_DB_SESSION')) { if ($DBParams['db_session_table'] @@ -363,7 +363,7 @@ } } unset($item); unset($major); unset($max); - + // User authentication if (!isset($GLOBALS['USER_AUTH_ORDER'])) { if (isset($rs['USER_AUTH_ORDER'])) @@ -377,7 +377,7 @@ if (in_array('Db', $GLOBALS['USER_AUTH_ORDER']) && empty($rs['DBAUTH_AUTH_DSN'])) { $rs['DBAUTH_AUTH_DSN'] = $DBParams['dsn']; } - + global $DBAuthParams; $DBAP_MAP = array('DBAUTH_AUTH_DSN' => 'auth_dsn', 'DBAUTH_AUTH_CHECK' => 'auth_check', @@ -463,7 +463,7 @@ } } unset($item); - + // LDAP bind options global $LDAP_SET_OPTION; if (defined('LDAP_SET_OPTION') and LDAP_SET_OPTION) { @@ -548,7 +548,7 @@ unset($rs); unset($rsdef); - + fixup_static_configs($file); //[1ms] // Dump all globals and constants // The question is if reading this is faster then doing IniConfig() + fixup_static_configs() @@ -575,7 +575,7 @@ global $HTTP_SERVER_VARS, $DBParams, $LANG, $ErrorManager; // init FileFinder to add proper include paths FindFile("lib/interwiki.map",true); - + // "\x80"-"\x9f" (and "\x00" - "\x1f") are non-printing control // chars in iso-8859-* // $FieldSeparator = "\263"; // this is a superscript 3 in ISO-8859-1. @@ -789,7 +789,7 @@ $themes_dir = FindFile("themes"); define('PHPWIKI_DIR', dirname($themes_dir)); } - + // If user has not defined DATA_PATH, we want to use relative URLs. if (!defined('DATA_PATH')) { // fix similar to the one suggested by jkalmbach for @@ -814,7 +814,7 @@ if (!defined('THEME')) define('THEME', 'default'); - + /*$configurator_link = HTML(HTML::br(), "=>", HTML::a(array('href'=>DATA_PATH."/configurator.php"), _("Configurator")));*/ @@ -1044,7 +1044,7 @@ } } } - + if (SERVER_PORT && SERVER_PORT != (SERVER_PROTOCOL == 'https' ? 443 : 80)) { define('SERVER_URL', @@ -1126,5 +1126,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |