packages: phorum/paths.patch - fix paths check on install - sanity_checks/d...
glen
glen at pld-linux.org
Thu Feb 18 16:06:28 CET 2010
Author: glen Date: Thu Feb 18 15:06:28 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fix paths check on install - sanity_checks/distro.php
---- Files affected:
packages/phorum:
paths.patch (1.17 -> 1.18)
---- Diffs:
================================================================
Index: packages/phorum/paths.patch
diff -u packages/phorum/paths.patch:1.17 packages/phorum/paths.patch:1.18
--- packages/phorum/paths.patch:1.17 Wed Feb 10 17:19:23 2010
+++ packages/phorum/paths.patch Thu Feb 18 16:06:23 2010
@@ -759,3 +759,249 @@
return array(
PHORUM_SANITY_WARN,
"The language for forum \"".
+--- phorum-5.2.14/include/admin/sanity_checks/distro.php 2010-02-18 16:32:06.797737180 +0200
++++ phorum-5.2.14/include/admin/sanity_checks/distro.php 2010-02-18 16:29:33.147537685 +0200
+@@ -21,6 +22,8 @@
+
+ $phorum_check = "Check if all required Phorum files are available";
+
++ define('PHORUM_HTDOCS_DIR', PHORUM_DIR.'/htdocs');
++
+ // A list of files which we consider to be the minimal set of
+ // Phorum files to get a working Phorum. Some files are checked
+ // through code later on, because the rules are somewhat more
+@@ -28,111 +31,111 @@
+ // the database layers, where at least one layer should be
+ // available).
+ $GLOBALS["PHORUM"]["minimal_distro"] = array (
+- 'admin.'.PHORUM_FILE_EXTENSION,
+- 'common.'.PHORUM_FILE_EXTENSION,
+- 'control.'.PHORUM_FILE_EXTENSION,
+- 'feed.'.PHORUM_FILE_EXTENSION,
+- 'file.'.PHORUM_FILE_EXTENSION,
+- 'follow.'.PHORUM_FILE_EXTENSION,
+- 'include/admin/PhorumAdminMenu.php',
+- 'include/admin/PhorumInputForm.php',
+- 'include/admin/badwords.php',
+- 'include/admin/banlist.php',
+- 'include/admin/cache.php',
+- 'include/admin/cache_purge.php',
+- 'include/admin/customprofile.php',
+- 'include/admin/default.php',
+- 'include/admin/deletefolder.php',
+- 'include/admin/deleteforum.php',
+- 'include/admin/editfolder.php',
+- 'include/admin/editforum.php',
+- 'include/admin/file_purge.php',
+- 'include/admin/footer.php',
+- 'include/admin/forum_defaults.php',
+- 'include/admin/groups.php',
+- 'include/admin/header.php',
+- 'include/admin/index.php',
+- 'include/admin/install.php',
+- 'include/admin/login.php',
+- 'include/admin/logout.php',
+- 'include/admin/manage_languages.php',
+- 'include/admin/message_prune.php',
+- 'include/admin/mods.php',
+- 'include/admin/modsettings.php',
+- 'include/admin/newfolder.php',
+- 'include/admin/newforum.php',
+- 'include/admin/sanity_checks/cache.php',
+- 'include/admin/sanity_checks/database.php',
+- 'include/admin/sanity_checks/language.php',
+- 'include/admin/sanity_checks/modules.php',
+- 'include/admin/sanity_checks/php_safety.php',
+- 'include/admin/sanity_checks/upload_limits.php',
+- 'include/admin/sanity_checks.php',
+- 'include/admin/settings.php',
+- 'include/admin/status.php',
+- 'include/admin/upgrade.php',
+- 'include/admin/version.php',
+- 'include/api/base.php',
+- 'include/api/user.php',
+- 'include/api/file_storage.php',
+- 'include/api/custom_profile_fields.php',
+- 'include/constants.php',
+- 'include/controlcenter/email.php',
+- 'include/controlcenter/files.php',
+- 'include/controlcenter/forum.php',
+- 'include/controlcenter/groupmod.php',
+- 'include/controlcenter/groups.php',
+- 'include/controlcenter/messages.php',
+- 'include/controlcenter/password.php',
+- 'include/controlcenter/privacy.php',
+- 'include/controlcenter/sig.php',
+- 'include/controlcenter/subthreads.php',
+- 'include/controlcenter/summary.php',
+- 'include/controlcenter/user.php',
+- 'include/controlcenter/users.php',
+- 'include/email_functions.php',
+- 'include/feed_functions.php',
+- 'include/format_functions.php',
+- 'include/index_classic.php',
+- 'include/index_new.php',
+- 'include/moderation_functions.php',
+- 'include/posting/action_attachments.php',
+- 'include/posting/action_cancel.php',
+- 'include/posting/action_edit.php',
+- 'include/posting/action_post.php',
+- 'include/posting/action_preview.php',
+- 'include/posting/check_banlist.php',
+- 'include/posting/check_integrity.php',
+- 'include/posting/check_permissions.php',
+- 'include/posting/request_first.php',
+- 'include/posting/request_followup.php',
+- 'include/profile_functions.php',
+- 'include/templates.php',
+- 'include/thread_info.php',
+- 'include/thread_sort.php',
+- 'include/upload_functions.php',
+- 'include/version_functions.php',
+- 'include/api/modules.php',
+- 'include/api/custom_profile_fields.php',
+- 'include/api/file_storage.php',
+- 'include/api/base.php',
+- 'include/api/user.php',
+- 'index.'.PHORUM_FILE_EXTENSION,
+- 'list.'.PHORUM_FILE_EXTENSION,
+- 'login.'.PHORUM_FILE_EXTENSION,
+- 'moderation.'.PHORUM_FILE_EXTENSION,
+- 'pm.'.PHORUM_FILE_EXTENSION,
+- 'posting.'.PHORUM_FILE_EXTENSION,
+- 'profile.'.PHORUM_FILE_EXTENSION,
+- 'read.'.PHORUM_FILE_EXTENSION,
+- 'redirect.'.PHORUM_FILE_EXTENSION,
+- 'register.'.PHORUM_FILE_EXTENSION,
+- 'report.'.PHORUM_FILE_EXTENSION,
+- 'css.'.PHORUM_FILE_EXTENSION,
+- 'rss.'.PHORUM_FILE_EXTENSION,
+- 'feed.'.PHORUM_FILE_EXTENSION,
+- 'search.'.PHORUM_FILE_EXTENSION,
+- 'versioncheck.php',
++ PHORUM_DIR.'/common.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/admin.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/control.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/feed.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/file.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/follow.'.PHORUM_FILE_EXTENSION,
++ PHORUM_INCLUDES_DIR.'/admin/PhorumAdminMenu.php',
++ PHORUM_INCLUDES_DIR.'/admin/PhorumInputForm.php',
++ PHORUM_INCLUDES_DIR.'/admin/badwords.php',
++ PHORUM_INCLUDES_DIR.'/admin/banlist.php',
++ PHORUM_INCLUDES_DIR.'/admin/cache.php',
++ PHORUM_INCLUDES_DIR.'/admin/cache_purge.php',
++ PHORUM_INCLUDES_DIR.'/admin/customprofile.php',
++ PHORUM_INCLUDES_DIR.'/admin/default.php',
++ PHORUM_INCLUDES_DIR.'/admin/deletefolder.php',
++ PHORUM_INCLUDES_DIR.'/admin/deleteforum.php',
++ PHORUM_INCLUDES_DIR.'/admin/editfolder.php',
++ PHORUM_INCLUDES_DIR.'/admin/editforum.php',
++ PHORUM_INCLUDES_DIR.'/admin/file_purge.php',
++ PHORUM_INCLUDES_DIR.'/admin/footer.php',
++ PHORUM_INCLUDES_DIR.'/admin/forum_defaults.php',
++ PHORUM_INCLUDES_DIR.'/admin/groups.php',
++ PHORUM_INCLUDES_DIR.'/admin/header.php',
++ PHORUM_INCLUDES_DIR.'/admin/index.php',
++ PHORUM_INCLUDES_DIR.'/admin/install.php',
++ PHORUM_INCLUDES_DIR.'/admin/login.php',
++ PHORUM_INCLUDES_DIR.'/admin/logout.php',
++ PHORUM_INCLUDES_DIR.'/admin/manage_languages.php',
++ PHORUM_INCLUDES_DIR.'/admin/message_prune.php',
++ PHORUM_INCLUDES_DIR.'/admin/mods.php',
++ PHORUM_INCLUDES_DIR.'/admin/modsettings.php',
++ PHORUM_INCLUDES_DIR.'/admin/newfolder.php',
++ PHORUM_INCLUDES_DIR.'/admin/newforum.php',
++ PHORUM_INCLUDES_DIR.'/admin/sanity_checks/cache.php',
++ PHORUM_INCLUDES_DIR.'/admin/sanity_checks/database.php',
++ PHORUM_INCLUDES_DIR.'/admin/sanity_checks/language.php',
++ PHORUM_INCLUDES_DIR.'/admin/sanity_checks/modules.php',
++ PHORUM_INCLUDES_DIR.'/admin/sanity_checks/php_safety.php',
++ PHORUM_INCLUDES_DIR.'/admin/sanity_checks/upload_limits.php',
++ PHORUM_INCLUDES_DIR.'/admin/sanity_checks.php',
++ PHORUM_INCLUDES_DIR.'/admin/settings.php',
++ PHORUM_INCLUDES_DIR.'/admin/status.php',
++ PHORUM_INCLUDES_DIR.'/admin/upgrade.php',
++ PHORUM_INCLUDES_DIR.'/admin/version.php',
++ PHORUM_INCLUDES_DIR.'/api/base.php',
++ PHORUM_INCLUDES_DIR.'/api/user.php',
++ PHORUM_INCLUDES_DIR.'/api/file_storage.php',
++ PHORUM_INCLUDES_DIR.'/api/custom_profile_fields.php',
++ PHORUM_INCLUDES_DIR.'/constants.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/email.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/files.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/forum.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/groupmod.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/groups.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/messages.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/password.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/privacy.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/sig.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/subthreads.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/summary.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/user.php',
++ PHORUM_INCLUDES_DIR.'/controlcenter/users.php',
++ PHORUM_INCLUDES_DIR.'/email_functions.php',
++ PHORUM_INCLUDES_DIR.'/feed_functions.php',
++ PHORUM_INCLUDES_DIR.'/format_functions.php',
++ PHORUM_INCLUDES_DIR.'/index_classic.php',
++ PHORUM_INCLUDES_DIR.'/index_new.php',
++ PHORUM_INCLUDES_DIR.'/moderation_functions.php',
++ PHORUM_INCLUDES_DIR.'/posting/action_attachments.php',
++ PHORUM_INCLUDES_DIR.'/posting/action_cancel.php',
++ PHORUM_INCLUDES_DIR.'/posting/action_edit.php',
++ PHORUM_INCLUDES_DIR.'/posting/action_post.php',
++ PHORUM_INCLUDES_DIR.'/posting/action_preview.php',
++ PHORUM_INCLUDES_DIR.'/posting/check_banlist.php',
++ PHORUM_INCLUDES_DIR.'/posting/check_integrity.php',
++ PHORUM_INCLUDES_DIR.'/posting/check_permissions.php',
++ PHORUM_INCLUDES_DIR.'/posting/request_first.php',
++ PHORUM_INCLUDES_DIR.'/posting/request_followup.php',
++ PHORUM_INCLUDES_DIR.'/profile_functions.php',
++ PHORUM_INCLUDES_DIR.'/templates.php',
++ PHORUM_INCLUDES_DIR.'/thread_info.php',
++ PHORUM_INCLUDES_DIR.'/thread_sort.php',
++ PHORUM_INCLUDES_DIR.'/upload_functions.php',
++ PHORUM_INCLUDES_DIR.'/version_functions.php',
++ PHORUM_INCLUDES_DIR.'/api/modules.php',
++ PHORUM_INCLUDES_DIR.'/api/custom_profile_fields.php',
++ PHORUM_INCLUDES_DIR.'/api/file_storage.php',
++ PHORUM_INCLUDES_DIR.'/api/base.php',
++ PHORUM_INCLUDES_DIR.'/api/user.php',
++ PHORUM_HTDOCS_DIR.'/index.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/list.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/login.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/moderation.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/pm.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/posting.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/profile.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/read.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/redirect.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/register.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/report.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/css.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/rss.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/feed.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/search.'.PHORUM_FILE_EXTENSION,
++ PHORUM_HTDOCS_DIR.'/versioncheck.php',
+ );
+
+ // A list of database layer files that ship with Phorum.
+@@ -206,7 +209,7 @@
+ // Check if we have at least one database layer available.
+ // ------------------------------------------------------------------
+
+- $dir = @opendir("include/db");
++ $dir = @opendir(PHORUM_INCLUDES_DIR."/db");
+ if (! $dir) return array(
+ PHORUM_SANITY_CRIT,
+ "Phorum is unable to open the directory \"include/db/\". This
+@@ -273,7 +276,7 @@
+ // Check if we have at least one language available.
+ // ------------------------------------------------------------------
+
+- $dir = @opendir("include/lang/");
++ $dir = @opendir(PHORUM_INCLUDES_DIR."/lang/");
+ if (! $dir) return array(
+ PHORUM_SANITY_CRIT,
+ "Phorum is unable to open the directory \"include/lang/\". This
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/paths.patch?r1=1.17&r2=1.18&f=u
More information about the pld-cvs-commit
mailing list