From f3e91e2c2210b8a27a0e51f780be9576c1693ff4 Mon Sep 17 00:00:00 2001 From: Alain Peyrat Date: Tue, 27 May 2008 20:56:57 +0000 Subject: [PATCH] Easyforge global change on include paths --- gforge/INSTALL | 2 +- gforge/common/docman/Document.class.php | 4 +- .../common/docman/DocumentFactory.class.php | 4 +- gforge/common/docman/DocumentGroup.class.php | 2 +- .../docman/DocumentGroupFactory.class.php | 4 +- gforge/common/docman/engine/majwords.php | 12 ++-- gforge/common/docman/engine/parser_oo.php | 2 +- .../common/docman/engine/parser_pdf.php.php | 2 +- gforge/common/docman/engine/parser_text.php | 2 +- gforge/common/forum/Forum.class.php | 4 +- gforge/common/forum/ForumFactory.class.php | 4 +- gforge/common/forum/ForumMessage.class.php | 6 +- .../forum/ForumMessageFactory.class.php | 4 +- gforge/common/forum/ForumsForUser.class.php | 6 +- gforge/common/frs/FRSFile.class.php | 2 +- gforge/common/frs/FRSPackage.class.php | 4 +- gforge/common/frs/FRSRelease.class.php | 4 +- gforge/common/include/GForge.class.php | 2 +- gforge/common/include/Group.class.php | 28 ++++----- .../common/include/GroupJoinRequest.class.php | 4 +- gforge/common/include/MailParser.class.php | 2 +- gforge/common/include/Permission.class.php | 2 +- gforge/common/include/Role.class.php | 2 +- gforge/common/include/RoleObserver.class.php | 2 +- gforge/common/include/SCM.class.php | 2 +- gforge/common/include/System.class.php | 2 +- gforge/common/include/User.class.php | 2 +- gforge/common/include/constants.php | 1 - gforge/common/include/session.php | 4 +- gforge/common/include/system/LDAP.class.php | 4 +- .../common/include/system/NSSPGSQL.class.php | 2 +- gforge/common/include/system/UNIX.class.php | 2 +- gforge/common/include/system/pgsql.class.php | 2 +- gforge/common/mail/MailingList.class.php | 2 +- .../common/mail/MailingListFactory.class.php | 4 +- gforge/common/pm/ProjectCategory.class.php | 2 +- gforge/common/pm/ProjectGroup.class.php | 2 +- .../common/pm/ProjectGroupFactory.class.php | 4 +- gforge/common/pm/ProjectTask.class.php | 4 +- gforge/common/pm/ProjectTaskFactory.class.php | 4 +- .../common/pm/ProjectTasksForUser.class.php | 8 +-- gforge/common/pm/import_utils.php | 2 +- .../reporting/ReportGroupAdded.class.php | 2 +- .../common/reporting/ReportGroupCum.class.php | 2 +- .../reporting/ReportProjectAct.class.php | 2 +- .../reporting/ReportProjectTime.class.php | 2 +- gforge/common/reporting/ReportSetup.class.php | 2 +- .../common/reporting/ReportSiteAct.class.php | 2 +- .../common/reporting/ReportSiteTime.class.php | 2 +- .../reporting/ReportTrackerAct.class.php | 2 +- .../common/reporting/ReportUserAct.class.php | 2 +- .../reporting/ReportUserAdded.class.php | 2 +- .../common/reporting/ReportUserCum.class.php | 2 +- .../common/reporting/ReportUserTime.class.php | 2 +- gforge/common/reporting/TimeEntry.class.php | 4 +- gforge/common/scm/SCMFactory.class.php | 4 +- .../search/ArtifactSearchQuery.class.php | 2 +- .../common/search/DocsSearchQuery.class.php | 2 +- .../search/ExportProjectSearchQuery.class.php | 2 +- .../common/search/ForumSearchQuery.class.php | 2 +- .../common/search/ForumsSearchQuery.class.php | 2 +- gforge/common/search/FrsSearchQuery.class.php | 2 +- .../common/search/NewsSearchQuery.class.php | 2 +- .../common/search/PeopleSearchQuery.class.php | 2 +- .../search/ProjectSearchQuery.class.php | 2 +- .../common/search/SkillSearchQuery.class.php | 2 +- .../common/search/TasksSearchQuery.class.php | 2 +- .../search/TrackersSearchQuery.class.php | 2 +- gforge/common/survey/Survey.class.php | 4 +- gforge/common/survey/SurveyFactory.class.php | 4 +- gforge/common/survey/SurveyQuestion.class.php | 2 +- .../survey/SurveyQuestionFactory.class.php | 4 +- gforge/common/survey/SurveyResponse.class.php | 2 +- .../survey/SurveyResponseFactory.class.php | 4 +- gforge/common/tracker/Artifact.class.php | 6 +- .../tracker/ArtifactBoxOptions.class.php | 2 +- .../common/tracker/ArtifactCanned.class.php | 2 +- .../tracker/ArtifactExtraField.class.php | 2 +- .../ArtifactExtraFieldElement.class.php | 2 +- .../common/tracker/ArtifactFactory.class.php | 8 +-- gforge/common/tracker/ArtifactFile.class.php | 2 +- .../common/tracker/ArtifactFromID.class.php | 2 +- .../common/tracker/ArtifactHistory.class.php | 2 +- .../common/tracker/ArtifactMessage.class.php | 2 +- gforge/common/tracker/ArtifactQuery.class.php | 4 +- .../tracker/ArtifactQueryFactory.class.php | 4 +- gforge/common/tracker/ArtifactType.class.php | 2 +- .../tracker/ArtifactTypeFactory.class.php | 4 +- gforge/common/tracker/ArtifactTypes.class.php | 8 +-- gforge/common/tracker/Artifacts.class.php | 4 +- .../common/tracker/ArtifactsForUser.class.php | 8 +-- gforge/cronjobs/backup_site.php | 4 +- gforge/cronjobs/calculate_user_metric.php | 4 +- gforge/cronjobs/check_stale_tracker_items.php | 4 +- gforge/cronjobs/daily_task_email.php | 6 +- gforge/cronjobs/db_project_sums.php | 4 +- gforge/cronjobs/db_stats_agg.php | 4 +- gforge/cronjobs/db_trove_maint.php | 4 +- gforge/cronjobs/forum_gateway.php | 10 +-- gforge/cronjobs/ftp_create_group_access.php | 4 +- gforge/cronjobs/mail/mailaliases.php | 4 +- gforge/cronjobs/mail/mailing_lists_create.php | 4 +- gforge/cronjobs/massmail.php | 4 +- gforge/cronjobs/project_cleanup.php | 4 +- .../project_weekly_metric-backfill.php | 2 +- gforge/cronjobs/project_weekly_metric.php | 4 +- gforge/cronjobs/rating_stats.php | 4 +- gforge/cronjobs/reporting_cron.php | 6 +- gforge/cronjobs/rotate_activity.php | 4 +- gforge/cronjobs/send_pending_items_mail.php | 4 +- gforge/cronjobs/site_stats.php | 4 +- gforge/cronjobs/stats_projects-backfill.php | 2 +- gforge/cronjobs/tracker_gateway.php | 10 +-- gforge/cronjobs/update_filesize.php | 2 +- gforge/cronjobs/vacuum.php | 4 +- .../db/20010304-4-artifact-convert-files.php | 2 +- gforge/db/20021213_doc_data-migrate.php | 2 +- gforge/db/20040826_migrateforum.php | 2 +- gforge/db/20040826_migraterbac.php | 8 +-- gforge/db/20041211-syncmail.php | 6 +- gforge/db/20041222-1-delete-task-artifact.php | 4 +- gforge/db/20050127-frs-reorg.php | 8 +-- gforge/db/20050325-2.php | 6 +- gforge/db/20050617.php | 2 +- gforge/db/20050804-2.php | 2 +- gforge/db/startpoint.php | 2 +- gforge/db/upgrade-db.php | 2 +- .../include/ASelectAuthPlugin.class.php | 2 +- .../include/aselectextauth-init.php | 2 +- .../cvssyncmail/common/cvssyncmail-init.php | 2 +- .../cvssyncmail/include/cvssyncmail-init.php | 2 +- gforge/plugins/cvstracker/bin/post.php | 4 +- .../cvstracker/common/cvstracker-init.php | 2 +- gforge/plugins/cvstracker/www/newcommit.php | 4 +- gforge/plugins/eirc/include/eirc-init.php | 2 +- gforge/plugins/eirc/www/eirc.php | 2 +- .../ExternalHtmlSearchRenderer.class.php | 2 +- .../include/ExternalSearchEngine.class.php | 4 +- .../include/ExternalSearchPlugin.class.php | 6 +- .../include/externalsearch-init.php | 2 +- .../fckeditor/common/fckeditor-init.php | 2 +- .../common/fckeditorPlugin.class.php | 2 +- .../default/connectors/php/connector.php | 10 +-- .../editor/filemanager/upload/php/upload.php | 4 +- .../helloworld/common/helloworld-init.php | 2 +- gforge/plugins/helloworld/www/index.php | 4 +- .../include/LdapExtAuthPlugin.class.php | 4 +- .../ldapextauth/include/ldapextauth-init.php | 2 +- gforge/plugins/mantis/include/mantis-init.php | 2 +- gforge/plugins/mantis/www/index.php | 4 +- .../mediawiki/common/mediawiki-init.php | 2 +- .../mediawiki/mediawiki-skin/GForge.php | 2 +- .../share/mediawiki1.7/LocalLdapSettings.php | 2 +- .../usr/share/mediawiki1.7/LocalSettings.php | 4 +- .../mediawiki1.7/includes/GFProject.class.php | 2 +- .../includes/GForgeAuthentication.php | 4 +- .../share/mediawiki1.7/includes/GForgePre.php | 42 ++++++------- .../includes/LdapAuthentication.php | 2 +- .../usr/share/mediawiki1.7/skins/GForge.php | 2 +- gforge/plugins/mediawiki/www/index.php | 2 +- .../online_help/common/online_help-init.php | 2 +- .../common/projects_hierarchy-init.php | 2 +- .../projects_hierarchy/www/add_link.php | 2 +- .../projects_hierarchy/www/add_son.php | 2 +- .../projects_hierarchy/www/del_father.php | 2 +- .../projects_hierarchy/www/del_son.php | 2 +- .../plugins/projects_hierarchy/www/index.php | 2 +- .../projects_hierarchy/www/softwaremap.php | 6 +- .../projects_hierarchy/www/wait_son.php | 2 +- .../common/quota_management-init.php | 2 +- gforge/plugins/quota_management/www/index.php | 4 +- gforge/plugins/quota_management/www/quota.php | 4 +- .../quota_management/www/quota_admin.php | 4 +- .../quota_management/www/quota_project.php | 4 +- .../scmccase/common/CCasePlugin.class.php | 2 +- .../plugins/scmccase/common/scmccase-init.php | 2 +- gforge/plugins/scmcvs/bin/aclcheck.php | 4 +- .../plugins/scmcvs/common/CVSPlugin.class.php | 2 +- gforge/plugins/scmcvs/common/scmcvs-init.php | 2 +- gforge/plugins/scmcvs/cronjobs/cvs.php | 10 +-- gforge/plugins/scmcvs/cronjobs/ftp_create.php | 4 +- .../plugins/scmcvs/cronjobs/history_parse.php | 4 +- gforge/plugins/scmcvs/cronjobs/homedirs.php | 4 +- gforge/plugins/scmcvs/cronjobs/ssh_create.php | 4 +- gforge/plugins/scmcvs/cronjobs/tarballs.php | 4 +- gforge/plugins/scmcvs/cronjobs/usergroup.php | 4 +- gforge/plugins/scmcvs/www/acl.php | 4 +- gforge/plugins/scmsvn/bin/svn-create.php | 4 +- .../plugins/scmsvn/common/SVNPlugin.class.php | 2 +- gforge/plugins/scmsvn/common/scmsvn-init.php | 2 +- gforge/plugins/scmsvn/cronjobs/create_svn.php | 4 +- gforge/plugins/scmsvn/cronjobs/svn-stats.php | 6 +- gforge/plugins/scmsvn/cronjobs/tarballs.php | 4 +- .../plugins/scmsvn/cronjobs/update_users.php | 4 +- .../common/svncommitemail-init.php | 4 +- .../include/svncommitemail-init.php | 4 +- gforge/plugins/svntracker/bin/post.php | 4 +- .../svntracker/common/svntracker-init.php | 2 +- gforge/plugins/svntracker/www/newcommit.php | 4 +- .../webcalendar/common/webcalendar-init.php | 2 +- .../plugins/webcalendar/www/activity_log.php | 4 +- gforge/plugins/webcalendar/www/add_entry.php | 2 +- gforge/plugins/webcalendar/www/admin.php | 2 +- .../plugins/webcalendar/www/admin_handler.php | 2 +- gforge/plugins/webcalendar/www/adminhome.php | 2 +- .../plugins/webcalendar/www/approve_entry.php | 2 +- .../webcalendar/www/assistant_edit.php | 2 +- .../www/assistant_edit_handler.php | 2 +- .../plugins/webcalendar/www/availability.php | 2 +- gforge/plugins/webcalendar/www/category.php | 2 +- .../webcalendar/www/category_handler.php | 2 +- gforge/plugins/webcalendar/www/colors.php | 2 +- gforge/plugins/webcalendar/www/datesel.php | 2 +- gforge/plugins/webcalendar/www/day.php | 2 +- gforge/plugins/webcalendar/www/del_entry.php | 2 +- gforge/plugins/webcalendar/www/del_layer.php | 2 +- gforge/plugins/webcalendar/www/edit_entry.php | 4 +- .../webcalendar/www/edit_entry_handler.php | 6 +- gforge/plugins/webcalendar/www/edit_layer.php | 2 +- .../webcalendar/www/edit_layer_handler.php | 2 +- .../plugins/webcalendar/www/edit_nonusers.php | 2 +- .../webcalendar/www/edit_nonusers_handler.php | 2 +- .../plugins/webcalendar/www/edit_report.php | 2 +- .../webcalendar/www/edit_report_handler.php | 2 +- .../plugins/webcalendar/www/edit_template.php | 2 +- gforge/plugins/webcalendar/www/edit_user.php | 2 +- .../webcalendar/www/edit_user_handler.php | 2 +- gforge/plugins/webcalendar/www/export.php | 2 +- .../webcalendar/www/export_handler.php | 2 +- gforge/plugins/webcalendar/www/group_edit.php | 2 +- .../webcalendar/www/group_edit_handler.php | 2 +- gforge/plugins/webcalendar/www/help_admin.php | 2 +- gforge/plugins/webcalendar/www/help_bug.php | 2 +- .../webcalendar/www/help_edit_entry.php | 2 +- .../plugins/webcalendar/www/help_import.php | 2 +- gforge/plugins/webcalendar/www/help_index.php | 2 +- .../plugins/webcalendar/www/help_layers.php | 2 +- gforge/plugins/webcalendar/www/help_pref.php | 2 +- gforge/plugins/webcalendar/www/import.php | 2 +- .../webcalendar/www/import_handler.php | 4 +- .../webcalendar/www/includes/config.php | 2 +- gforge/plugins/webcalendar/www/index.php | 4 +- gforge/plugins/webcalendar/www/index2.php | 2 +- .../plugins/webcalendar/www/install/index.php | 2 +- gforge/plugins/webcalendar/www/layers.php | 2 +- .../plugins/webcalendar/www/layers_toggle.php | 2 +- .../webcalendar/www/list_unapproved.php | 2 +- gforge/plugins/webcalendar/www/month.php | 2 +- .../webcalendar/www/nonusers_handler.php | 2 +- gforge/plugins/webcalendar/www/pref.php | 2 +- .../plugins/webcalendar/www/pref_handler.php | 2 +- gforge/plugins/webcalendar/www/purge.php | 2 +- .../plugins/webcalendar/www/reject_entry.php | 2 +- gforge/plugins/webcalendar/www/report.php | 2 +- gforge/plugins/webcalendar/www/search.php | 2 +- .../webcalendar/www/search_handler.php | 2 +- .../plugins/webcalendar/www/select_user.php | 2 +- .../plugins/webcalendar/www/set_entry_cat.php | 2 +- gforge/plugins/webcalendar/www/users.php | 6 +- gforge/plugins/webcalendar/www/usersel.php | 2 +- gforge/plugins/webcalendar/www/view_d.php | 2 +- gforge/plugins/webcalendar/www/view_entry.php | 4 +- gforge/plugins/webcalendar/www/view_l.php | 2 +- gforge/plugins/webcalendar/www/view_m.php | 2 +- gforge/plugins/webcalendar/www/view_t.php | 2 +- gforge/plugins/webcalendar/www/view_v.php | 2 +- gforge/plugins/webcalendar/www/view_w.php | 2 +- gforge/plugins/webcalendar/www/views.php | 2 +- gforge/plugins/webcalendar/www/views_edit.php | 2 +- .../webcalendar/www/views_edit_handler.php | 2 +- gforge/plugins/webcalendar/www/week.php | 2 +- .../plugins/webcalendar/www/week_details.php | 2 +- gforge/plugins/webcalendar/www/year.php | 2 +- .../include/WikiGroupSearchEngine.class.php | 2 +- .../include/WikiHtmlSearchRenderer.class.php | 4 +- .../wiki/include/WikiSearchEngine.class.php | 2 +- .../wiki/include/WikiSearchQuery.class.php | 2 +- gforge/plugins/wiki/include/wiki-init.php | 2 +- gforge/plugins/wiki/www/g | 11 ++-- gforge/utils/fixscripts/fix_broken_uids.php | 2 +- gforge/utils/fixscripts/fix_image_data.php | 2 +- .../utils/fixscripts/tools_data_cleanup.php | 2 +- gforge/utils/fixscripts/upgrade_bug_data.php | 2 +- .../fixscripts/upgrade_filerelease_data.php | 2 +- .../utils/fixscripts/upgrade_forum_data.php | 2 +- gforge/utils/fixscripts/upgrade_task_data.php | 2 +- gforge/www/404.php | 2 +- gforge/www/account/change_email-complete.php | 4 +- gforge/www/account/change_email.php | 2 +- gforge/www/account/change_pw.php | 4 +- gforge/www/account/editsshkeys.php | 4 +- gforge/www/account/first.php | 2 +- gforge/www/account/index.php | 4 +- gforge/www/account/login.php | 2 +- gforge/www/account/logout.php | 2 +- gforge/www/account/lostlogin.php | 4 +- gforge/www/account/lostpw.php | 2 +- gforge/www/account/pending-resend.php | 2 +- gforge/www/account/register.php | 6 +- gforge/www/account/setlang.php | 2 +- gforge/www/account/unsubscribe.php | 4 +- gforge/www/account/verify.php | 2 +- gforge/www/activity/index.php | 2 +- gforge/www/admin/admin_table.php | 2 +- gforge/www/admin/approve-pending.php | 16 ++--- gforge/www/admin/configman.php | 4 +- gforge/www/admin/cronman.php | 6 +- gforge/www/admin/database.php | 4 +- gforge/www/admin/edit_frs_filetype.php | 2 +- gforge/www/admin/edit_frs_processor.php | 2 +- gforge/www/admin/edit_licenses.php | 2 +- gforge/www/admin/edit_theme.php | 2 +- gforge/www/admin/groupdelete.php | 6 +- gforge/www/admin/groupedit.php | 8 +-- gforge/www/admin/grouplist.php | 4 +- gforge/www/admin/index.php | 4 +- gforge/www/admin/massmail.php | 4 +- gforge/www/admin/pluginman.php | 4 +- gforge/www/admin/responses_admin.php | 10 +-- gforge/www/admin/search.php | 4 +- gforge/www/admin/trove/trove_cat_add.php | 6 +- gforge/www/admin/trove/trove_cat_edit.php | 6 +- gforge/www/admin/trove/trove_cat_list.php | 6 +- gforge/www/admin/unsubscribe.php | 4 +- gforge/www/admin/useredit.php | 6 +- gforge/www/admin/userlist.php | 4 +- gforge/www/admin/vhost.php | 6 +- gforge/www/dbimage.php | 2 +- gforge/www/developer/diary.php | 4 +- gforge/www/developer/index.php | 4 +- gforge/www/developer/monitor.php | 2 +- gforge/www/developer/rate.php | 4 +- gforge/www/docman/admin/index.php | 14 ++--- gforge/www/docman/display_doc.php | 6 +- gforge/www/docman/doceditor.php | 2 +- .../include/DocumentGroupHTML.class.php | 4 +- gforge/www/docman/index.php | 8 +-- gforge/www/docman/new.php | 12 ++-- gforge/www/docman/search.php | 10 +-- gforge/www/docman/view.php | 6 +- gforge/www/download.php | 2 +- gforge/www/env.inc.php | 62 ++++++++++++++----- gforge/www/export/forum.php | 2 +- gforge/www/export/index.php | 2 +- gforge/www/export/projhtml.php | 4 +- gforge/www/export/projnews.php | 4 +- gforge/www/export/projtitl.php | 4 +- gforge/www/export/rss20_activity.php | 6 +- gforge/www/export/rss20_newreleases.php | 7 ++- gforge/www/export/rss20_news.php | 7 ++- gforge/www/export/rss_project.php | 4 +- gforge/www/export/rss_sfnewreleases.php | 4 +- gforge/www/export/rss_sfnews.php | 4 +- gforge/www/export/rss_sfprojects.php | 4 +- gforge/www/export/tracker.php | 12 ++-- gforge/www/export/trove_tree.php | 2 +- gforge/www/forum/admin/ForumAdmin.class.php | 2 +- gforge/www/forum/admin/attachments.php | 14 ++--- gforge/www/forum/admin/index.php | 16 ++--- gforge/www/forum/admin/monitor.php | 16 ++--- gforge/www/forum/admin/pending.php | 12 ++-- gforge/www/forum/admin/pendingmsgdetail.php | 10 +-- gforge/www/forum/attachment.php | 4 +- gforge/www/forum/forum.php | 16 ++--- .../www/forum/include/AttachManager.class.php | 2 +- gforge/www/forum/include/ForumHTML.class.php | 10 +-- gforge/www/forum/index.php | 8 +-- gforge/www/forum/message.php | 14 ++--- gforge/www/forum/monitor.php | 6 +- gforge/www/forum/myforums.php | 12 ++-- gforge/www/forum/new.php | 8 +-- gforge/www/forum/save.php | 6 +- gforge/www/frs/admin/deletepackage.php | 6 +- gforge/www/frs/admin/deleterelease.php | 10 +-- gforge/www/frs/admin/editrelease.php | 10 +-- gforge/www/frs/admin/index.php | 10 +-- gforge/www/frs/admin/qrs.php | 10 +-- gforge/www/frs/admin/showreleases.php | 10 +-- gforge/www/frs/download.php | 8 +-- gforge/www/frs/index.php | 4 +- gforge/www/frs/monitor.php | 6 +- gforge/www/frs/shownotes.php | 4 +- gforge/www/help/index.php | 2 +- gforge/www/help/tracker.php | 2 +- gforge/www/help/trove_cat.php | 2 +- gforge/www/include/BBCodeSupport.class.php | 2 +- .../www/include/BBCodeSupportHtml.class.php | 2 +- gforge/www/include/HTMLSupport.class.php | 2 +- gforge/www/include/Layout.class.php | 4 +- gforge/www/include/SmilieSupport.class.php | 2 +- .../www/include/SmilieSupportHtml.class.php | 2 +- gforge/www/include/TextSupport.class.php | 8 +-- gforge/www/include/features_boxes.php | 2 +- gforge/www/include/note.php | 2 +- gforge/www/include/pre.php | 52 ++++++++-------- gforge/www/include/project_home.php | 6 +- gforge/www/include/squal_pre.php | 32 +++++----- gforge/www/include/stats_function.php | 2 +- gforge/www/include/user_home.php | 2 +- gforge/www/index.php | 8 +-- gforge/www/mail/admin/deletelist.php | 6 +- gforge/www/mail/admin/index.php | 8 +-- gforge/www/mail/index.php | 8 +-- gforge/www/my/bookmark_add.php | 4 +- gforge/www/my/bookmark_delete.php | 4 +- gforge/www/my/bookmark_edit.php | 4 +- gforge/www/my/diary.php | 4 +- gforge/www/my/index.php | 10 +-- gforge/www/my/rmproject.php | 2 +- gforge/www/new/index.php | 4 +- gforge/www/news/admin/index.php | 12 ++-- gforge/www/news/index.php | 6 +- gforge/www/news/submit.php | 10 +-- gforge/www/notepad.php | 2 +- gforge/www/people/admin/index.php | 4 +- gforge/www/people/createjob.php | 6 +- gforge/www/people/editjob.php | 4 +- gforge/www/people/editprofile.php | 6 +- gforge/www/people/helpwanted-latest.php | 4 +- gforge/www/people/index.php | 6 +- gforge/www/people/viewjob.php | 4 +- gforge/www/people/viewprofile.php | 6 +- gforge/www/pm/add_task.php | 2 +- gforge/www/pm/admin/index.php | 8 +-- gforge/www/pm/browse_task.php | 2 +- gforge/www/pm/calendar.php | 6 +- gforge/www/pm/downloadcsv.php | 4 +- gforge/www/pm/gantt.php | 4 +- gforge/www/pm/ganttofuser.php | 4 +- .../www/pm/include/ProjectGroupHTML.class.php | 2 +- .../www/pm/include/ProjectTaskHTML.class.php | 4 +- gforge/www/pm/index.php | 6 +- gforge/www/pm/mod_task.php | 6 +- gforge/www/pm/msproject/msp.php | 14 ++--- gforge/www/pm/msproject/xmlparser.php | 2 +- gforge/www/pm/postuploadcsv.php | 2 +- gforge/www/pm/reporting/index.php | 14 ++--- gforge/www/pm/task.php | 38 ++++++------ gforge/www/project/admin/database.php | 4 +- gforge/www/project/admin/editgroupinfo.php | 4 +- gforge/www/project/admin/editimages.php | 4 +- gforge/www/project/admin/group_trove.php | 6 +- gforge/www/project/admin/history.php | 4 +- gforge/www/project/admin/index.php | 10 +-- gforge/www/project/admin/massadd.php | 6 +- gforge/www/project/admin/massfinish.php | 6 +- gforge/www/project/admin/roleedit.php | 10 +-- gforge/www/project/admin/vhost.php | 4 +- gforge/www/project/index.php | 4 +- gforge/www/project/memberlist.php | 2 +- gforge/www/project/report/index.php | 2 +- gforge/www/project/request.php | 4 +- gforge/www/project/stats/index.php | 6 +- gforge/www/projects | 7 +-- gforge/www/register/projectinfo.php | 6 +- gforge/www/reporting/groupadded.php | 6 +- gforge/www/reporting/groupadded_graph.php | 4 +- gforge/www/reporting/groupcum.php | 6 +- gforge/www/reporting/groupcum_graph.php | 4 +- gforge/www/reporting/index.php | 8 +-- gforge/www/reporting/projectact.php | 6 +- gforge/www/reporting/projectact_graph.php | 6 +- gforge/www/reporting/projecttime.php | 6 +- gforge/www/reporting/projecttime_graph.php | 6 +- gforge/www/reporting/rebuild.php | 8 +-- gforge/www/reporting/siteact.php | 6 +- gforge/www/reporting/siteact_graph.php | 6 +- gforge/www/reporting/sitetime.php | 6 +- gforge/www/reporting/sitetime_graph.php | 6 +- gforge/www/reporting/sitetimebar.php | 6 +- gforge/www/reporting/sitetimebar_graph.php | 4 +- gforge/www/reporting/timeadd.php | 6 +- gforge/www/reporting/timecategory.php | 6 +- gforge/www/reporting/timeentry.php | 4 +- gforge/www/reporting/toolspie.php | 6 +- gforge/www/reporting/toolspie_graph.php | 6 +- gforge/www/reporting/trackerpie_graph.php | 8 +-- gforge/www/reporting/useract.php | 6 +- gforge/www/reporting/useract_graph.php | 6 +- gforge/www/reporting/useradded.php | 6 +- gforge/www/reporting/useradded_graph.php | 4 +- gforge/www/reporting/usercum.php | 6 +- gforge/www/reporting/usercum_graph.php | 4 +- gforge/www/reporting/usersummary.php | 6 +- gforge/www/reporting/usertime.php | 6 +- gforge/www/reporting/usertime_graph.php | 6 +- gforge/www/scm/admin/index.php | 6 +- gforge/www/scm/index.php | 4 +- gforge/www/scm/reporting/commits_graph.php | 6 +- .../www/scm/reporting/commitstime_graph.php | 4 +- gforge/www/scm/reporting/index.php | 4 +- gforge/www/scm/viewvc.php | 6 +- gforge/www/search/advanced_search.php | 6 +- .../search/include/SearchManager.class.php | 18 +++--- .../engines/ArtifactSearchEngine.class.php | 4 +- .../engines/DocsGroupSearchEngine.class.php | 2 +- .../engines/ForumSearchEngine.class.php | 2 +- .../engines/ForumsGroupSearchEngine.class.php | 2 +- .../engines/FrsGroupSearchEngine.class.php | 2 +- .../engines/GroupSearchEngine.class.php | 2 +- .../engines/NewsGroupSearchEngine.class.php | 2 +- .../include/engines/SearchEngine.class.php | 3 +- .../engines/TasksGroupSearchEngine.class.php | 2 +- .../TrackersGroupSearchEngine.class.php | 2 +- ...AdvancedSearchHtmlSearchRenderer.class.php | 16 ++--- .../ArtifactHtmlSearchRenderer.class.php | 4 +- .../DocsHtmlSearchRenderer.class.php | 4 +- .../ForumHtmlSearchRenderer.class.php | 4 +- .../ForumsHtmlSearchRenderer.class.php | 4 +- .../renderers/FrsHtmlSearchRenderer.class.php | 4 +- .../FullProjectHtmlSearchRenderer.class.php | 16 ++--- .../HtmlGroupSearchRenderer.class.php | 2 +- .../renderers/HtmlSearchRenderer.class.php | 2 +- .../NewsHtmlSearchRenderer.class.php | 4 +- .../PeopleHtmlSearchRenderer.class.php | 4 +- .../ProjectHtmlSearchRenderer.class.php | 4 +- .../ProjectRssSearchRenderer.class.php | 4 +- .../renderers/RssSearchRenderer.class.php | 4 +- .../SkillHtmlSearchRenderer.class.php | 4 +- .../TasksHtmlSearchRenderer.class.php | 4 +- .../TrackersHtmlSearchRenderer.class.php | 4 +- gforge/www/search/index.php | 6 +- gforge/www/sendmessage.php | 2 +- gforge/www/snapshots.php | 2 +- gforge/www/snippet/add_snippet_to_package.php | 4 +- gforge/www/snippet/addversion.php | 4 +- gforge/www/snippet/browse.php | 4 +- gforge/www/snippet/delete.php | 4 +- gforge/www/snippet/detail.php | 4 +- gforge/www/snippet/download.php | 4 +- gforge/www/snippet/index.php | 4 +- gforge/www/snippet/package.php | 4 +- gforge/www/snippet/submit.php | 4 +- gforge/www/soap/common/group.php | 6 +- gforge/www/soap/common/user.php | 4 +- gforge/www/soap/docman/docman.php | 13 ++-- gforge/www/soap/frs/frs.php | 8 +-- gforge/www/soap/index.php | 25 ++++---- gforge/www/soap/nusoap.php | 16 ++--- gforge/www/soap/pm/pm.php | 12 ++-- gforge/www/soap/reporting/timeentry.php | 4 +- gforge/www/soap/scm/scm.php | 2 +- gforge/www/soap/tracker/query.php | 8 +-- gforge/www/soap/tracker/tracker.php | 16 ++--- gforge/www/softwaremap/trove_list.php | 4 +- gforge/www/source.php | 2 +- gforge/www/squal/get_session_hash.php | 2 +- gforge/www/stats/graphs.php | 4 +- gforge/www/stats/i18n.php | 4 +- gforge/www/stats/index.php | 4 +- gforge/www/stats/lastlogins.php | 2 +- gforge/www/stats/projects.php | 4 +- gforge/www/stats/users_graph.php | 4 +- gforge/www/stats/views_graph.php | 4 +- gforge/www/survey/admin/add_question.php | 4 +- gforge/www/survey/admin/add_survey.php | 6 +- gforge/www/survey/admin/edit_question.php | 4 +- gforge/www/survey/admin/edit_survey.php | 6 +- gforge/www/survey/admin/graphs.php | 12 ++-- gforge/www/survey/admin/index.php | 4 +- gforge/www/survey/admin/question.php | 8 +-- gforge/www/survey/admin/show_questions.php | 4 +- gforge/www/survey/admin/show_results.php | 18 +++--- .../survey/admin/show_results_aggregate.php | 6 +- .../survey/admin/show_results_comments.php | 6 +- gforge/www/survey/admin/show_results_csv.php | 6 +- .../survey/admin/show_results_individual.php | 4 +- gforge/www/survey/admin/survey.php | 12 ++-- .../www/survey/include/SurveyHTML.class.php | 4 +- gforge/www/survey/index.php | 6 +- gforge/www/survey/privacy.php | 6 +- gforge/www/survey/rating_resp.php | 2 +- gforge/www/survey/survey.php | 6 +- gforge/www/survey/survey_resp.php | 8 +-- gforge/www/tarballs.php | 2 +- .../www/themes/gforge-classic/Theme.class.php | 2 +- .../gforge-simple-theme/Theme.class.php | 2 +- gforge/www/themes/gforge/Theme.class.php | 7 ++- gforge/www/top/index.php | 2 +- gforge/www/top/mostactive.php | 4 +- gforge/www/top/topusers.php | 2 +- gforge/www/tracker/admin/index.php | 54 ++++++++-------- gforge/www/tracker/browse.php | 4 +- gforge/www/tracker/download.php | 10 +-- gforge/www/tracker/downloadcsv.php | 2 +- .../include/ArtifactFileHtml.class.php | 2 +- .../tracker/include/ArtifactHtml.class.php | 2 +- .../include/ArtifactTypeHtml.class.php | 6 +- gforge/www/tracker/index.php | 24 +++---- gforge/www/tracker/query.php | 2 +- gforge/www/tracker/reporting/index.php | 8 +-- .../tracker/reporting/trackeract_graph.php | 4 +- .../tracker/reporting/trackerpie_graph.php | 8 +-- gforge/www/tracker/taskmgr.php | 6 +- gforge/www/tracker/tracker.php | 32 +++++----- gforge/www/users | 8 +-- 596 files changed, 1454 insertions(+), 1417 deletions(-) diff --git a/gforge/INSTALL b/gforge/INSTALL index ec9cda206a..c32e7c3e62 100644 --- a/gforge/INSTALL +++ b/gforge/INSTALL @@ -359,7 +359,7 @@ talk to the postgres database. Find a php-pgsql RPM or recompile php to have pgql support. If you're sure you have php-pgsql support, you can edit -common/include/database.php and remove the @ symbol from +common/include/database-pgsql.php and remove the @ symbol from this line: $conn = @pg_connect( diff --git a/gforge/common/docman/Document.class.php b/gforge/common/docman/Document.class.php index d0f373e385..1a06fb5b69 100644 --- a/gforge/common/docman/Document.class.php +++ b/gforge/common/docman/Document.class.php @@ -33,8 +33,8 @@ Complete OO rewrite by Tim Perdue 1/2003 */ -require_once('common/include/Error.class.php'); -require_once('common/docman/Parsedata.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'docman/Parsedata.class.php'; class Document extends Error { diff --git a/gforge/common/docman/DocumentFactory.class.php b/gforge/common/docman/DocumentFactory.class.php index d3bc0357dc..1401663ee1 100644 --- a/gforge/common/docman/DocumentFactory.class.php +++ b/gforge/common/docman/DocumentFactory.class.php @@ -33,8 +33,8 @@ Complete OO rewrite by Tim Perdue 1/2003 */ -require_once('common/include/Error.class.php'); -require_once('common/docman/Document.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'docman/Document.class.php'; class DocumentFactory extends Error { diff --git a/gforge/common/docman/DocumentGroup.class.php b/gforge/common/docman/DocumentGroup.class.php index 35f81dfdea..e334156beb 100644 --- a/gforge/common/docman/DocumentGroup.class.php +++ b/gforge/common/docman/DocumentGroup.class.php @@ -33,7 +33,7 @@ Complete OO rewrite by Tim Perdue 1/2003 */ -require_once('common/include/Error.class.php'); +require_once $gfcommon.'include/Error.class.php'; class DocumentGroup extends Error { diff --git a/gforge/common/docman/DocumentGroupFactory.class.php b/gforge/common/docman/DocumentGroupFactory.class.php index 2bb4abeccc..0cc05182d0 100644 --- a/gforge/common/docman/DocumentGroupFactory.class.php +++ b/gforge/common/docman/DocumentGroupFactory.class.php @@ -29,8 +29,8 @@ Document Groups */ -require_once('common/include/Error.class.php'); -require_once('common/forum/ForumMessage.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'forum/ForumMessage.class.php'; class DocumentGroupFactory extends Error { /** diff --git a/gforge/common/docman/engine/majwords.php b/gforge/common/docman/engine/majwords.php index 0614c2f552..968cfbc215 100644 --- a/gforge/common/docman/engine/majwords.php +++ b/gforge/common/docman/engine/majwords.php @@ -9,12 +9,12 @@ * @version $Id: 04_IMPROVDOC_75_document_specific_search_engine.dpatch,v 1.1 2006/01/11 17:02:45 fabio Exp $ */ -require_once('pre.php'); -require_once('www/docman/include/doc_utils.php'); -require_once('common/docman/Parsedata.class.php'); -require_once('common/docman/Document.class.php'); -require_once('common/docman/DocumentFactory.class.php'); -require_once('common/docman/DocumentGroupFactory.class.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'docman/include/doc_utils.php'; +require_once $gfcommon.'docman/Parsedata.class.php'; +require_once $gfcommon.'docman/Document.class.php'; +require_once $gfcommon.'docman/DocumentFactory.class.php'; +require_once $gfcommon.'docman/DocumentGroupFactory.class.php'; $p = new Parsedata ("$sys_engine_path"); // print_debug(print_r($p->get_parser_list (),true)); diff --git a/gforge/common/docman/engine/parser_oo.php b/gforge/common/docman/engine/parser_oo.php index 2ca1380baf..715e288190 100644 --- a/gforge/common/docman/engine/parser_oo.php +++ b/gforge/common/docman/engine/parser_oo.php @@ -8,7 +8,7 @@ * */ -require_once("parser_text.inc.php"); +require_once $gfcommon.'docman/engine/parser_text.inc.php'; if ($argc != 2) diff --git a/gforge/common/docman/engine/parser_pdf.php.php b/gforge/common/docman/engine/parser_pdf.php.php index a073f978f6..5f1b51efc9 100644 --- a/gforge/common/docman/engine/parser_pdf.php.php +++ b/gforge/common/docman/engine/parser_pdf.php.php @@ -8,7 +8,7 @@ * */ -require_once("parser_text.inc.php"); +require_once $gfcommon.'docman/engine/parser_text.inc.php'; if ($argc != 2) diff --git a/gforge/common/docman/engine/parser_text.php b/gforge/common/docman/engine/parser_text.php index 202a8b3a1c..436395099e 100644 --- a/gforge/common/docman/engine/parser_text.php +++ b/gforge/common/docman/engine/parser_text.php @@ -8,7 +8,7 @@ * */ -require_once("parser_text.inc.php"); +require_once $gfcommon.'docman/engine/parser_text.inc.php'; if ($argc != 2) { diff --git a/gforge/common/forum/Forum.class.php b/gforge/common/forum/Forum.class.php index add9368b6e..70257656aa 100644 --- a/gforge/common/forum/Forum.class.php +++ b/gforge/common/forum/Forum.class.php @@ -34,8 +34,8 @@ Complete OO rewrite by Tim Perdue 12/2002 */ -require_once('common/include/Error.class.php'); -require_once('common/forum/ForumMessage.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'forum/ForumMessage.class.php'; // This string is used when sending the notification mail for identifying the // user response define('FORUM_MAIL_MARKER', '#+#+#+#+#+#+#+#+#+#+#+#+#+#+#+#+#+'); diff --git a/gforge/common/forum/ForumFactory.class.php b/gforge/common/forum/ForumFactory.class.php index 24fabb2575..0caffede9a 100644 --- a/gforge/common/forum/ForumFactory.class.php +++ b/gforge/common/forum/ForumFactory.class.php @@ -35,8 +35,8 @@ */ -require_once('common/include/Error.class.php'); -require_once('common/forum/Forum.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'forum/Forum.class.php'; class ForumFactory extends Error { diff --git a/gforge/common/forum/ForumMessage.class.php b/gforge/common/forum/ForumMessage.class.php index adc96ea493..47f936d687 100644 --- a/gforge/common/forum/ForumMessage.class.php +++ b/gforge/common/forum/ForumMessage.class.php @@ -34,9 +34,9 @@ Complete OO rewrite by Tim Perdue 12/2002 */ -require_once('common/include/Error.class.php'); -include_once('common/include/TextSanitizer.class.php'); // for parsing the mail body -include_once('common/include/User.class.php'); +require_once $gfcommon.'include/Error.class.php'; +include_once $gfcommon.'include/TextSanitizer.class.php'; // for parsing the mail body +include_once $gfcommon.'include/User.class.php'; class ForumMessage extends Error { diff --git a/gforge/common/forum/ForumMessageFactory.class.php b/gforge/common/forum/ForumMessageFactory.class.php index c7d3a20093..a2a1d79e17 100644 --- a/gforge/common/forum/ForumMessageFactory.class.php +++ b/gforge/common/forum/ForumMessageFactory.class.php @@ -34,8 +34,8 @@ Complete OO rewrite by Tim Perdue 12/2002 */ -require_once('common/include/Error.class.php'); -require_once('common/forum/ForumMessage.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'forum/ForumMessage.class.php'; class ForumMessageFactory extends Error { diff --git a/gforge/common/forum/ForumsForUser.class.php b/gforge/common/forum/ForumsForUser.class.php index b77efb5e3d..0fe8627150 100644 --- a/gforge/common/forum/ForumsForUser.class.php +++ b/gforge/common/forum/ForumsForUser.class.php @@ -25,9 +25,9 @@ */ -require_once('common/include/Error.class.php'); -require_once('common/forum/Forum.class.php'); -require_once('common/include/User.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'forum/Forum.class.php'; +require_once $gfcommon.'include/User.class.php'; class ForumsForUser extends Error { diff --git a/gforge/common/frs/FRSFile.class.php b/gforge/common/frs/FRSFile.class.php index aa993c7ad2..cd8d13c160 100644 --- a/gforge/common/frs/FRSFile.class.php +++ b/gforge/common/frs/FRSFile.class.php @@ -24,7 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('common/include/Error.class.php'); +require_once $gfcommon.'include/Error.class.php'; class FRSFile extends Error { diff --git a/gforge/common/frs/FRSPackage.class.php b/gforge/common/frs/FRSPackage.class.php index d84a2fd790..28f8e7544a 100644 --- a/gforge/common/frs/FRSPackage.class.php +++ b/gforge/common/frs/FRSPackage.class.php @@ -24,8 +24,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('common/include/Error.class.php'); -require_once('common/frs/FRSRelease.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'frs/FRSRelease.class.php'; function &get_frs_packages($Group) { $res=db_query("SELECT * FROM frs_package WHERE group_id='".$Group->getID()."'"); diff --git a/gforge/common/frs/FRSRelease.class.php b/gforge/common/frs/FRSRelease.class.php index 0bace79b2c..78cba63540 100644 --- a/gforge/common/frs/FRSRelease.class.php +++ b/gforge/common/frs/FRSRelease.class.php @@ -25,8 +25,8 @@ */ -require_once('common/include/Error.class.php'); -require_once('common/frs/FRSFile.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'frs/FRSFile.class.php'; /** * Factory method which creates a FRSRelease from an release id diff --git a/gforge/common/include/GForge.class.php b/gforge/common/include/GForge.class.php index e2ebb4c068..4cf9a45343 100644 --- a/gforge/common/include/GForge.class.php +++ b/gforge/common/include/GForge.class.php @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('common/include/Error.class.php'); +require_once $gfcommon.'include/Error.class.php'; class GForge extends Error { /** diff --git a/gforge/common/include/Group.class.php b/gforge/common/include/Group.class.php index bd808339c4..37a48e4bf7 100644 --- a/gforge/common/include/Group.class.php +++ b/gforge/common/include/Group.class.php @@ -34,20 +34,20 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('common/tracker/ArtifactTypes.class.php'); -require_once('common/tracker/ArtifactTypeFactory.class.php'); -require_once('common/forum/Forum.class.php'); -require_once('common/forum/ForumFactory.class.php'); -require_once('common/pm/ProjectGroup.class.php'); -require_once('common/pm/ProjectGroupFactory.class.php'); -require_once('common/include/Role.class.php'); -require_once('common/frs/FRSPackage.class.php'); -require_once('common/docman/DocumentGroup.class.php'); -require_once('common/mail/MailingList.class.php'); -require_once('common/mail/MailingListFactory.class.php'); -require_once('common/survey/SurveyFactory.class.php'); -require_once('common/survey/SurveyQuestionFactory.class.php'); -require_once('common/include/gettext.php'); +require_once $gfcommon.'tracker/ArtifactTypes.class.php'; +require_once $gfcommon.'tracker/ArtifactTypeFactory.class.php'; +require_once $gfcommon.'forum/Forum.class.php'; +require_once $gfcommon.'forum/ForumFactory.class.php'; +require_once $gfcommon.'pm/ProjectGroup.class.php'; +require_once $gfcommon.'pm/ProjectGroupFactory.class.php'; +require_once $gfcommon.'include/Role.class.php'; +require_once $gfcommon.'frs/FRSPackage.class.php'; +require_once $gfcommon.'docman/DocumentGroup.class.php'; +require_once $gfcommon.'mail/MailingList.class.php'; +require_once $gfcommon.'mail/MailingListFactory.class.php'; +require_once $gfcommon.'survey/SurveyFactory.class.php'; +require_once $gfcommon.'survey/SurveyQuestionFactory.class.php'; +require_once $gfcommon.'include/gettext.php'; //the license_id of "Other/proprietary" license define('GROUP_LICENSE_OTHER',126); diff --git a/gforge/common/include/GroupJoinRequest.class.php b/gforge/common/include/GroupJoinRequest.class.php index 732332087e..61385312be 100644 --- a/gforge/common/include/GroupJoinRequest.class.php +++ b/gforge/common/include/GroupJoinRequest.class.php @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once('common/include/Error.class.php'); -require_once('common/include/Validator.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'include/Validator.class.php'; /* function &groupjoinrequest_get_object($group_id,$user_id,$data=false) { diff --git a/gforge/common/include/MailParser.class.php b/gforge/common/include/MailParser.class.php index 3f2053eac3..348c69ab8f 100755 --- a/gforge/common/include/MailParser.class.php +++ b/gforge/common/include/MailParser.class.php @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('common/include/Error.class.php'); +require_once $gfcommon.'include/Error.class.php'; class MailParser extends Error { diff --git a/gforge/common/include/Permission.class.php b/gforge/common/include/Permission.class.php index 53be0ecb05..289b9eb2f9 100644 --- a/gforge/common/include/Permission.class.php +++ b/gforge/common/include/Permission.class.php @@ -25,7 +25,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('common/include/Error.class.php'); +require_once $gfcommon.'include/Error.class.php'; $PERMISSION_OBJ=array(); diff --git a/gforge/common/include/Role.class.php b/gforge/common/include/Role.class.php index 3ac053d9da..f9461cd4a2 100644 --- a/gforge/common/include/Role.class.php +++ b/gforge/common/include/Role.class.php @@ -26,7 +26,7 @@ */ -require_once ('common/include/rbac_texts.php') ; +require_once $gfcommon.'include/rbac_texts.php' ; class Role extends Error { diff --git a/gforge/common/include/RoleObserver.class.php b/gforge/common/include/RoleObserver.class.php index ddc07ee473..3b9610e47d 100644 --- a/gforge/common/include/RoleObserver.class.php +++ b/gforge/common/include/RoleObserver.class.php @@ -26,7 +26,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once ('common/include/rbac_texts.php') ; +require_once $gfcommon.'include/rbac_texts.php' ; class RoleObserver extends Error { diff --git a/gforge/common/include/SCM.class.php b/gforge/common/include/SCM.class.php index 8c63a4e1ae..d618be84ea 100644 --- a/gforge/common/include/SCM.class.php +++ b/gforge/common/include/SCM.class.php @@ -25,7 +25,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('common/include/scm.php'); +require_once $gfcommon.'include/scm.php'; class SCM extends Plugin { /** diff --git a/gforge/common/include/System.class.php b/gforge/common/include/System.class.php index 2052ddc0dc..0f496acad2 100644 --- a/gforge/common/include/System.class.php +++ b/gforge/common/include/System.class.php @@ -24,7 +24,7 @@ * along with GForge; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('Error.class.php'); +require_once $gfcommon.'include/Error.class.php'; class System extends Error { /** diff --git a/gforge/common/include/User.class.php b/gforge/common/include/User.class.php index 4d4b0b5c36..ca610fd5c2 100644 --- a/gforge/common/include/User.class.php +++ b/gforge/common/include/User.class.php @@ -38,7 +38,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('www/include/vote_function.php'); +require_once $gfwww.'include/vote_function.php'; $USER_OBJ=array(); /** diff --git a/gforge/common/include/constants.php b/gforge/common/include/constants.php index 62c24cd208..86ba369a8c 100644 --- a/gforge/common/include/constants.php +++ b/gforge/common/include/constants.php @@ -1,6 +1,5 @@ Group); diff --git a/gforge/common/tracker/Artifacts.class.php b/gforge/common/tracker/Artifacts.class.php index 1d17a4df5b..12415ad6e2 100644 --- a/gforge/common/tracker/Artifacts.class.php +++ b/gforge/common/tracker/Artifacts.class.php @@ -25,8 +25,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('common/include/Error.class.php'); -require_once('common/tracker/Artifact.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'tracker/Artifact.class.php'; class Artifacts extends Error { diff --git a/gforge/common/tracker/ArtifactsForUser.class.php b/gforge/common/tracker/ArtifactsForUser.class.php index 69380b37db..53b1424ee0 100644 --- a/gforge/common/tracker/ArtifactsForUser.class.php +++ b/gforge/common/tracker/ArtifactsForUser.class.php @@ -24,10 +24,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once ('common/include/Error.class.php'); -require_once ('common/include/User.class.php'); -require_once ('common/tracker/Artifact.class.php'); -require_once ('common/tracker/ArtifactFromID.class.php'); +require_once $gfcommon.'include/Error.class.php'; +require_once $gfcommon.'include/User.class.php'; +require_once $gfcommon.'tracker/Artifact.class.php'; +require_once $gfcommon.'tracker/ArtifactFromID.class.php'; class ArtifactsForUser extends Error { diff --git a/gforge/cronjobs/backup_site.php b/gforge/cronjobs/backup_site.php index 1963262c5d..1a959df7f1 100755 --- a/gforge/cronjobs/backup_site.php +++ b/gforge/cronjobs/backup_site.php @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $database=$sys_dbname; //Database name from local.inc diff --git a/gforge/cronjobs/calculate_user_metric.php b/gforge/cronjobs/calculate_user_metric.php index 01d698acee..4ce28fa918 100755 --- a/gforge/cronjobs/calculate_user_metric.php +++ b/gforge/cronjobs/calculate_user_metric.php @@ -62,8 +62,8 @@ ON user_metric_history(month,day,user_id); */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err=''; $threshhold='1.6'; diff --git a/gforge/cronjobs/check_stale_tracker_items.php b/gforge/cronjobs/check_stale_tracker_items.php index e99090640c..862c2ee925 100755 --- a/gforge/cronjobs/check_stale_tracker_items.php +++ b/gforge/cronjobs/check_stale_tracker_items.php @@ -30,8 +30,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; if ($sys_database_type == 'mysql') { $sql = 'UPDATE artifact NATURAL JOIN artifact_group_list SET status_id = 2 diff --git a/gforge/cronjobs/daily_task_email.php b/gforge/cronjobs/daily_task_email.php index f56d3ba79d..d87c787e5e 100755 --- a/gforge/cronjobs/daily_task_email.php +++ b/gforge/cronjobs/daily_task_email.php @@ -24,9 +24,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once('squal_pre.php'); -require_once('common/pm/ProjectTasksForUser.class.php'); -require_once('common/include/cron_utils.php'); +require_once $gfwww.'include/squal_pre.php'; +require_once $gfcommon.'pm/ProjectTasksForUser.class.php'; +require_once $gfcommon.'include/cron_utils.php'; // // Set up this script to run as the site admin diff --git a/gforge/cronjobs/db_project_sums.php b/gforge/cronjobs/db_project_sums.php index 8f6bfab8f3..cf889c3524 100755 --- a/gforge/cronjobs/db_project_sums.php +++ b/gforge/cronjobs/db_project_sums.php @@ -24,8 +24,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err=''; diff --git a/gforge/cronjobs/db_stats_agg.php b/gforge/cronjobs/db_stats_agg.php index d425c1fc71..50d354880f 100755 --- a/gforge/cronjobs/db_stats_agg.php +++ b/gforge/cronjobs/db_stats_agg.php @@ -24,8 +24,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err=''; diff --git a/gforge/cronjobs/db_trove_maint.php b/gforge/cronjobs/db_trove_maint.php index 31487950a1..d8ad491d13 100755 --- a/gforge/cronjobs/db_trove_maint.php +++ b/gforge/cronjobs/db_trove_maint.php @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err=''; diff --git a/gforge/cronjobs/forum_gateway.php b/gforge/cronjobs/forum_gateway.php index 64d13faf81..f89f07dbef 100755 --- a/gforge/cronjobs/forum_gateway.php +++ b/gforge/cronjobs/forum_gateway.php @@ -26,11 +26,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once ('squal_pre.php'); -require_once ('common/include/Group.class.php'); -require_once ('common/include/MailParser.class.php'); -require_once ('common/forum/Forum.class.php'); -require_once ('common/forum/ForumMessage.class.php'); +require_once $gfwww.'include/squal_pre.php'; +require_once $gfcommon.'include/Group.class.php'; +require_once $gfcommon.'include/MailParser.class.php'; +require_once $gfcommon.'forum/Forum.class.php'; +require_once $gfcommon.'forum/ForumMessage.class.php'; class ForumGateway extends Error { /* diff --git a/gforge/cronjobs/ftp_create_group_access.php b/gforge/cronjobs/ftp_create_group_access.php index dd5cea5bb0..4511d030f0 100644 --- a/gforge/cronjobs/ftp_create_group_access.php +++ b/gforge/cronjobs/ftp_create_group_access.php @@ -24,8 +24,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $users = array(); diff --git a/gforge/cronjobs/mail/mailaliases.php b/gforge/cronjobs/mail/mailaliases.php index 22cb8550bb..b6cb7f9aff 100755 --- a/gforge/cronjobs/mail/mailaliases.php +++ b/gforge/cronjobs/mail/mailaliases.php @@ -25,8 +25,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; define('FILE_EXTENSION','.new'); // use .new when testing diff --git a/gforge/cronjobs/mail/mailing_lists_create.php b/gforge/cronjobs/mail/mailing_lists_create.php index 8fd60943ed..a8ffa9f984 100755 --- a/gforge/cronjobs/mail/mailing_lists_create.php +++ b/gforge/cronjobs/mail/mailing_lists_create.php @@ -7,8 +7,8 @@ // The /var/lib/gforge/dumps/mailman-aliases file will then be read by the mailaliases.php file // -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err = ''; diff --git a/gforge/cronjobs/massmail.php b/gforge/cronjobs/massmail.php index 4b866e6d2a..b1eef4ff83 100755 --- a/gforge/cronjobs/massmail.php +++ b/gforge/cronjobs/massmail.php @@ -30,8 +30,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err=''; diff --git a/gforge/cronjobs/project_cleanup.php b/gforge/cronjobs/project_cleanup.php index b6f5666992..ad8c77e999 100755 --- a/gforge/cronjobs/project_cleanup.php +++ b/gforge/cronjobs/project_cleanup.php @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err=''; diff --git a/gforge/cronjobs/project_weekly_metric-backfill.php b/gforge/cronjobs/project_weekly_metric-backfill.php index 1f4278bea4..d822722714 100755 --- a/gforge/cronjobs/project_weekly_metric-backfill.php +++ b/gforge/cronjobs/project_weekly_metric-backfill.php @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); +require $gfwww.'include/squal_pre.php'; for ($i=0; $i<510; $i++) { diff --git a/gforge/cronjobs/project_weekly_metric.php b/gforge/cronjobs/project_weekly_metric.php index 3c8397b26b..e51e95badf 100755 --- a/gforge/cronjobs/project_weekly_metric.php +++ b/gforge/cronjobs/project_weekly_metric.php @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err=''; diff --git a/gforge/cronjobs/rating_stats.php b/gforge/cronjobs/rating_stats.php index dbaadf42ef..449ff0533c 100755 --- a/gforge/cronjobs/rating_stats.php +++ b/gforge/cronjobs/rating_stats.php @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err=''; diff --git a/gforge/cronjobs/reporting_cron.php b/gforge/cronjobs/reporting_cron.php index 32e5da2c7e..0f40f99d5d 100755 --- a/gforge/cronjobs/reporting_cron.php +++ b/gforge/cronjobs/reporting_cron.php @@ -26,9 +26,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); -require ('common/reporting/ReportSetup.class.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; +require $gfcommon.'reporting/ReportSetup.class.php'; $err=''; diff --git a/gforge/cronjobs/rotate_activity.php b/gforge/cronjobs/rotate_activity.php index 8ec2faed5c..97abfe3caa 100755 --- a/gforge/cronjobs/rotate_activity.php +++ b/gforge/cronjobs/rotate_activity.php @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err=''; diff --git a/gforge/cronjobs/send_pending_items_mail.php b/gforge/cronjobs/send_pending_items_mail.php index 665a31955f..4737f5ae1b 100755 --- a/gforge/cronjobs/send_pending_items_mail.php +++ b/gforge/cronjobs/send_pending_items_mail.php @@ -35,8 +35,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require ('pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/pre.php'; +require $gfcommon.'include/cron_utils.php'; $options=$GLOBALS['argv']; diff --git a/gforge/cronjobs/site_stats.php b/gforge/cronjobs/site_stats.php index 14fc43b9b4..30550706dd 100755 --- a/gforge/cronjobs/site_stats.php +++ b/gforge/cronjobs/site_stats.php @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err=''; diff --git a/gforge/cronjobs/stats_projects-backfill.php b/gforge/cronjobs/stats_projects-backfill.php index c7d55c7e38..cf1855d387 100755 --- a/gforge/cronjobs/stats_projects-backfill.php +++ b/gforge/cronjobs/stats_projects-backfill.php @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once('squal_pre.php'); +require_once $gfwww.'include/squal_pre.php'; include_once('cronjobs/stats_projects.inc'); $i=0; diff --git a/gforge/cronjobs/tracker_gateway.php b/gforge/cronjobs/tracker_gateway.php index b0e0ef12d2..e06b2eb399 100755 --- a/gforge/cronjobs/tracker_gateway.php +++ b/gforge/cronjobs/tracker_gateway.php @@ -29,11 +29,11 @@ * This file is based on forum_gateway.php */ -require_once ('squal_pre.php'); -require_once ('common/include/Group.class.php'); -require_once ('common/include/MailParser.class.php'); -require_once ('common/tracker/Artifact.class.php'); -require_once ('common/tracker/ArtifactFactory.class.php'); +require_once $gfwww.'include/squal_pre.php'; +require_once $gfcommon.'include/Group.class.php'; +require_once $gfcommon.'include/MailParser.class.php'; +require_once $gfcommon.'tracker/Artifact.class.php'; +require_once $gfcommon.'tracker/ArtifactFactory.class.php'; class TrackerGateway extends Error { /* diff --git a/gforge/cronjobs/update_filesize.php b/gforge/cronjobs/update_filesize.php index 7bd1e10bbc..679538e0ab 100755 --- a/gforge/cronjobs/update_filesize.php +++ b/gforge/cronjobs/update_filesize.php @@ -32,7 +32,7 @@ * Thanks */ -require_once ('squal_pre.php'); +require_once $gfwww.'include/squal_pre.php'; db_begin(); diff --git a/gforge/cronjobs/vacuum.php b/gforge/cronjobs/vacuum.php index 8dc604c842..a7854f5c9b 100755 --- a/gforge/cronjobs/vacuum.php +++ b/gforge/cronjobs/vacuum.php @@ -24,8 +24,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err=''; diff --git a/gforge/db/20010304-4-artifact-convert-files.php b/gforge/db/20010304-4-artifact-convert-files.php index 368838953f..28a55177c4 100755 --- a/gforge/db/20010304-4-artifact-convert-files.php +++ b/gforge/db/20010304-4-artifact-convert-files.php @@ -1,7 +1,7 @@ #! /usr/bin/php5 -f */ -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; if (!$user_id) { exit_error('Error','No User Id Provided'); diff --git a/gforge/plugins/externalsearch/include/ExternalHtmlSearchRenderer.class.php b/gforge/plugins/externalsearch/include/ExternalHtmlSearchRenderer.class.php index 46da910058..289136e3ff 100644 --- a/gforge/plugins/externalsearch/include/ExternalHtmlSearchRenderer.class.php +++ b/gforge/plugins/externalsearch/include/ExternalHtmlSearchRenderer.class.php @@ -9,7 +9,7 @@ * @version $Id$ */ -require_once('www/search/include/renderers/SearchRenderer.class.php'); +require_once $gfwww.'search/include/renderers/SearchRenderer.class.php'; class ExternalHtmlSearchRenderer extends SearchRenderer { diff --git a/gforge/plugins/externalsearch/include/ExternalSearchEngine.class.php b/gforge/plugins/externalsearch/include/ExternalSearchEngine.class.php index b52086d00a..788e8e0254 100644 --- a/gforge/plugins/externalsearch/include/ExternalSearchEngine.class.php +++ b/gforge/plugins/externalsearch/include/ExternalSearchEngine.class.php @@ -9,7 +9,7 @@ * @version $Id$ */ -require_once('www/search/include/engines/GroupSearchEngine.class.php'); +require_once $gfwww.'search/include/engines/GroupSearchEngine.class.php'; class ExternalSearchEngine extends GroupSearchEngine { @@ -39,7 +39,7 @@ class ExternalSearchEngine extends GroupSearchEngine { } function & getSearchRenderer($words, $offset, $exact, $parameters) { - require_once('ExternalHtmlSearchRenderer.class.php'); + require_once $gfplugins.'externalsearch/include/ExternalHtmlSearchRenderer.class.php'; $renderer = new ExternalHtmlSearchRenderer($type, $this->name, $this->url, $words); return $renderer; } diff --git a/gforge/plugins/externalsearch/include/ExternalSearchPlugin.class.php b/gforge/plugins/externalsearch/include/ExternalSearchPlugin.class.php index 7955e33f41..509838cea1 100644 --- a/gforge/plugins/externalsearch/include/ExternalSearchPlugin.class.php +++ b/gforge/plugins/externalsearch/include/ExternalSearchPlugin.class.php @@ -10,8 +10,8 @@ * @version $Id$ */ -require_once ('www/search/include/SearchManager.class.php'); -require_once ('ExternalSearchEngine.class.php'); +require_once $gfwww.'search/include/SearchManager.class.php'; +require_once $gfplugins.'externalsearch/include/ExternalSearchEngine.class.php'; class ExternalSearchPlugin extends Plugin { function ExternalSearchPlugin() { @@ -25,7 +25,7 @@ class ExternalSearchPlugin extends Plugin { function CallHook($hookname, & $searchManager) { switch($hookname) { case 'search_engines': - require_once('plugins/externalsearch/config.php'); + require_once $gfconfig.'plugins/externalsearch/config.php'; foreach($externalSearchEngines AS $name => $url) { $type = SEARCH__TYPE_IS_EXTERNAL.'_'.$name; $searchManager->addSearchEngine( diff --git a/gforge/plugins/externalsearch/include/externalsearch-init.php b/gforge/plugins/externalsearch/include/externalsearch-init.php index db650d525d..ebf8906311 100644 --- a/gforge/plugins/externalsearch/include/externalsearch-init.php +++ b/gforge/plugins/externalsearch/include/externalsearch-init.php @@ -9,7 +9,7 @@ * @version $Id$ */ -require_once('ExternalSearchPlugin.class.php') ; +require_once $gfplugins.'externalsearch/include/ExternalSearchPlugin.class.php' ; define('SEARCH__TYPE_IS_EXTERNAL', 'external'); diff --git a/gforge/plugins/fckeditor/common/fckeditor-init.php b/gforge/plugins/fckeditor/common/fckeditor-init.php index fd370242aa..96008f22ac 100644 --- a/gforge/plugins/fckeditor/common/fckeditor-init.php +++ b/gforge/plugins/fckeditor/common/fckeditor-init.php @@ -24,7 +24,7 @@ * along with GForge-plugin-fckeditor; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once ('fckeditorPlugin.class.php') ; +require_once $gfplugins.'fckeditor/common/fckeditorPlugin.class.php' ; $fckeditorPluginObject = new fckeditorPlugin ; diff --git a/gforge/plugins/fckeditor/common/fckeditorPlugin.class.php b/gforge/plugins/fckeditor/common/fckeditorPlugin.class.php index 2895077682..418bbac786 100644 --- a/gforge/plugins/fckeditor/common/fckeditorPlugin.class.php +++ b/gforge/plugins/fckeditor/common/fckeditorPlugin.class.php @@ -53,7 +53,7 @@ class fckeditorPlugin extends Plugin { require_once("/usr/share/fckeditor/fckeditor.php"); } else { $use_system_fckeditor = false ; - require_once($GLOBALS['sys_plugins_path']."fckeditor/www/fckeditor.php"); + require_once $gfplugins.'fckeditor/www/fckeditor.php'; } if ($hookname == "groupisactivecheckbox") { diff --git a/gforge/plugins/fckeditor/www/editor/filemanager/browser/default/connectors/php/connector.php b/gforge/plugins/fckeditor/www/editor/filemanager/browser/default/connectors/php/connector.php index 13e7f25bdd..93ff3ddf35 100644 --- a/gforge/plugins/fckeditor/www/editor/filemanager/browser/default/connectors/php/connector.php +++ b/gforge/plugins/fckeditor/www/editor/filemanager/browser/default/connectors/php/connector.php @@ -18,11 +18,11 @@ * Frederico Caldeira Knabben (fredck@fckeditor.net) */ -include('config.php') ; -include('util.php') ; -include('io.php') ; -include('basexml.php') ; -include('commands.php') ; +include $gfplugins.'fckeditor/www/editor/filemanager/browser/default/connectors/php/config.php' ; +include $gfplugins.'fckeditor/www/editor/filemanager/browser/default/connectors/php/util.php' ; +include $gfplugins.'fckeditor/www/editor/filemanager/browser/default/connectors/php/io.php' ; +include $gfplugins.'fckeditor/www/editor/filemanager/browser/default/connectors/php/basexml.php' ; +include $gfplugins.'fckeditor/www/editor/filemanager/browser/default/connectors/php/commands.php' ; if ( !$Config['Enabled'] ) SendError( 1, 'This connector is disabled. Please check the "editor/filemanager/browser/default/connectors/php/config.php" file' ) ; diff --git a/gforge/plugins/fckeditor/www/editor/filemanager/upload/php/upload.php b/gforge/plugins/fckeditor/www/editor/filemanager/upload/php/upload.php index 909663ed67..7fd250d354 100644 --- a/gforge/plugins/fckeditor/www/editor/filemanager/upload/php/upload.php +++ b/gforge/plugins/fckeditor/www/editor/filemanager/upload/php/upload.php @@ -18,8 +18,8 @@ * Frederico Caldeira Knabben (fredck@fckeditor.net) */ -require('config.php') ; -require('util.php') ; +require $gfplugins.'fckeditor/www/editor/filemanager/upload/php/config.php' ; +require $gfplugins.'fckeditor/www/editor/filemanager/upload/php/util.php' ; // This is the function that sends the results of the uploading process. function SendResults( $errorNumber, $fileUrl = '', $fileName = '', $customMsg = '' ) diff --git a/gforge/plugins/helloworld/common/helloworld-init.php b/gforge/plugins/helloworld/common/helloworld-init.php index 5471b854f3..4d436e4055 100644 --- a/gforge/plugins/helloworld/common/helloworld-init.php +++ b/gforge/plugins/helloworld/common/helloworld-init.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once ('HelloWorldPlugin.class.php') ; +require_once $gfplugins.'helloworld/common/HelloWorldPlugin.class.php' ; $HelloWorldPluginObject = new HelloWorldPlugin ; diff --git a/gforge/plugins/helloworld/www/index.php b/gforge/plugins/helloworld/www/index.php index 5d65da601c..27c6736b26 100644 --- a/gforge/plugins/helloworld/www/index.php +++ b/gforge/plugins/helloworld/www/index.php @@ -9,8 +9,8 @@ */ require_once('../../env.inc.php'); -require_once('pre.php'); -require_once ('plugins/helloworld/config.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfconfig.'plugins/helloworld/config.php'; // the header that displays for the user portion of the plugin function helloworld_Project_Header($params) { diff --git a/gforge/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php b/gforge/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php index 302746eb23..ae73323e9a 100644 --- a/gforge/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php +++ b/gforge/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once('plugins/ldapextauth/mapping.php') ; +require_once 'plugins/ldapextauth/mapping.php' ; class LdapextauthPlugin extends Plugin { function LdapextauthPlugin () { @@ -32,7 +32,7 @@ class LdapextauthPlugin extends Plugin { $this->ldap_conn = false ; - require_once('plugins/ldapextauth/config.php') ; + require_once $gfconfig.'plugins/ldapextauth/config.php' ; $this->base_dn = $sys_ldap_dn ; $this->ldap_server = $sys_ldap_server ; $this->ldap_port = $sys_ldap_port ; diff --git a/gforge/plugins/ldapextauth/include/ldapextauth-init.php b/gforge/plugins/ldapextauth/include/ldapextauth-init.php index b9850de654..74719d8ca3 100644 --- a/gforge/plugins/ldapextauth/include/ldapextauth-init.php +++ b/gforge/plugins/ldapextauth/include/ldapextauth-init.php @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once ($GLOBALS['sys_plugins_path'].'/ldapextauth/include/LdapExtAuthPlugin.class.php') ; +require_once $gfplugins.'ldapextauth/include/LdapExtAuthPlugin.class.php' ; $LdapExtAuthPluginObject = new LdapExtAuthPlugin ; diff --git a/gforge/plugins/mantis/include/mantis-init.php b/gforge/plugins/mantis/include/mantis-init.php index d65f6957d1..134026a561 100644 --- a/gforge/plugins/mantis/include/mantis-init.php +++ b/gforge/plugins/mantis/include/mantis-init.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once ('MantisPlugin.class.php') ; +require_once $gfplugins.'mantis/include/MantisPlugin.class.php' ; $MantisPluginObject = new MantisPlugin ; diff --git a/gforge/plugins/mantis/www/index.php b/gforge/plugins/mantis/www/index.php index 068f9f8bd5..35dbd55028 100644 --- a/gforge/plugins/mantis/www/index.php +++ b/gforge/plugins/mantis/www/index.php @@ -8,8 +8,8 @@ */ require_once('../../env.inc.php'); -require_once('pre.php'); -require_once ('plugins/mantis/config.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfconfig.'plugins/mantis/config.php'; // the header that displays for the user portion of the plugin function helloworld_Project_Header($params) { diff --git a/gforge/plugins/mediawiki/common/mediawiki-init.php b/gforge/plugins/mediawiki/common/mediawiki-init.php index d081cb083d..be7ac19a1b 100644 --- a/gforge/plugins/mediawiki/common/mediawiki-init.php +++ b/gforge/plugins/mediawiki/common/mediawiki-init.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once ('MediaWikiPlugin.class.php') ; +require_once $gfplugins.'mediawiki/common/MediaWikiPlugin.class.php' ; $MediaWikiPluginObject = new MediaWikiPlugin ; diff --git a/gforge/plugins/mediawiki/mediawiki-skin/GForge.php b/gforge/plugins/mediawiki/mediawiki-skin/GForge.php index 62868d1b3b..c0606ce3d3 100644 --- a/gforge/plugins/mediawiki/mediawiki-skin/GForge.php +++ b/gforge/plugins/mediawiki/mediawiki-skin/GForge.php @@ -25,7 +25,7 @@ require_once ('/etc/gforge/local.inc') ; $GLOBALS['sys_urlroot'] = $sys_urlroot; $GLOBALS['sys_session_key'] = $sys_session_key; $GLOBALS['sys_session_expire'] = $sys_session_expire; -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; $GLOBALS['REMOTE_ADDR'] = getStringFromServer('REMOTE_ADDR') ; $GLOBALS['HTTP_USER_AGENT'] = getStringFromServer('HTTP_USER_AGENT') ; diff --git a/gforge/plugins/mediawiki/usr/share/mediawiki1.7/LocalLdapSettings.php b/gforge/plugins/mediawiki/usr/share/mediawiki1.7/LocalLdapSettings.php index d13fbd2a9a..ee8bbc3171 100644 --- a/gforge/plugins/mediawiki/usr/share/mediawiki1.7/LocalLdapSettings.php +++ b/gforge/plugins/mediawiki/usr/share/mediawiki1.7/LocalLdapSettings.php @@ -1,5 +1,5 @@ hooks[] = "scm_stats"; $this->hooks[] = "scm_plugin"; - require_once('plugins/scmccase/config.php') ; + require_once $gfconfig.'plugins/scmccase/config.php' ; $this->default_ccase_server = $default_ccase_server ; $this->this_server = $this_server ; diff --git a/gforge/plugins/scmccase/common/scmccase-init.php b/gforge/plugins/scmccase/common/scmccase-init.php index cd03ca1e3a..87dfac7408 100644 --- a/gforge/plugins/scmccase/common/scmccase-init.php +++ b/gforge/plugins/scmccase/common/scmccase-init.php @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once ($GLOBALS['sys_plugins_path'].'/scmccase/common/CCasePlugin.class.php') ; +require_once $gfplugins.'scmccase/common/CCasePlugin.class.php' ; $CCasePluginObject = new CCasePlugin ; diff --git a/gforge/plugins/scmcvs/bin/aclcheck.php b/gforge/plugins/scmcvs/bin/aclcheck.php index 82c38b54b8..325005f7f6 100755 --- a/gforge/plugins/scmcvs/bin/aclcheck.php +++ b/gforge/plugins/scmcvs/bin/aclcheck.php @@ -29,8 +29,8 @@ if (((int) $_SERVER['argc']) < 1) { exit(1); } -require_once('plugins/scmcvs/config.php'); -require ($sys_plugins_path.'/scmcvs/common/Snoopy.class.php'); +require_once $gfconfig.'plugins/scmcvs/config.php'; +require $gfplugins.'scmcvs/common/Snoopy.class.php'; // Input cleansing $env_cvsroot = (string) $_ENV['CVSROOT']; diff --git a/gforge/plugins/scmcvs/common/CVSPlugin.class.php b/gforge/plugins/scmcvs/common/CVSPlugin.class.php index 1a9864a77e..46df0ae065 100644 --- a/gforge/plugins/scmcvs/common/CVSPlugin.class.php +++ b/gforge/plugins/scmcvs/common/CVSPlugin.class.php @@ -13,7 +13,7 @@ class CVSPlugin extends SCM { $this->hooks[] = 'scm_plugin'; - require_once('plugins/scmcvs/config.php') ; + require_once $gfconfig.'plugins/scmcvs/config.php' ; $this->default_cvs_server = $default_cvs_server ; if ($cvs_root) { diff --git a/gforge/plugins/scmcvs/common/scmcvs-init.php b/gforge/plugins/scmcvs/common/scmcvs-init.php index 2892be3063..cfc9d42e57 100644 --- a/gforge/plugins/scmcvs/common/scmcvs-init.php +++ b/gforge/plugins/scmcvs/common/scmcvs-init.php @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once ($GLOBALS['sys_plugins_path'].'/scmcvs/common/CVSPlugin.class.php') ; +require_once $gfplugins.'scmcvs/common/CVSPlugin.class.php' ; $CVSPluginObject = new CVSPlugin ; diff --git a/gforge/plugins/scmcvs/cronjobs/cvs.php b/gforge/plugins/scmcvs/cronjobs/cvs.php index b8edce5518..b6ed5d2e70 100755 --- a/gforge/plugins/scmcvs/cronjobs/cvs.php +++ b/gforge/plugins/scmcvs/cronjobs/cvs.php @@ -25,12 +25,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); -require_once('common/mail/MailingList.class.php'); -require_once('common/mail/MailingListFactory.class.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; +require_once $gfcommon.'mail/MailingList.class.php'; +require_once $gfcommon.'mail/MailingListFactory.class.php'; -require_once('common/include/SCM.class.php') ; +require_once $gfcommon.'include/SCM.class.php' ; setup_plugin_manager () ; diff --git a/gforge/plugins/scmcvs/cronjobs/ftp_create.php b/gforge/plugins/scmcvs/cronjobs/ftp_create.php index f8a02675dd..f3fc08b0ad 100755 --- a/gforge/plugins/scmcvs/cronjobs/ftp_create.php +++ b/gforge/plugins/scmcvs/cronjobs/ftp_create.php @@ -28,8 +28,8 @@ /* This file creates the root directories for the FTP */ -require_once('squal_pre.php'); -require ('common/include/cron_utils.php'); +require_once $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $err = ''; diff --git a/gforge/plugins/scmcvs/cronjobs/history_parse.php b/gforge/plugins/scmcvs/cronjobs/history_parse.php index 8eea41e3f9..baaf829c7e 100755 --- a/gforge/plugins/scmcvs/cronjobs/history_parse.php +++ b/gforge/plugins/scmcvs/cronjobs/history_parse.php @@ -1,8 +1,8 @@ #!/usr/bin/php -q */ -require_once('squal_pre.php'); -require ('common/include/cron_utils.php'); +require_once $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; define('USER_DEFAULT_GROUP','users'); diff --git a/gforge/plugins/scmcvs/cronjobs/ssh_create.php b/gforge/plugins/scmcvs/cronjobs/ssh_create.php index 16fac4e17d..e13704a9c0 100755 --- a/gforge/plugins/scmcvs/cronjobs/ssh_create.php +++ b/gforge/plugins/scmcvs/cronjobs/ssh_create.php @@ -25,8 +25,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('squal_pre.php'); -require ('common/include/cron_utils.php'); +require_once $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $res=db_query("SELECT user_name,user_id,authorized_keys FROM users diff --git a/gforge/plugins/scmcvs/cronjobs/tarballs.php b/gforge/plugins/scmcvs/cronjobs/tarballs.php index 39e46bde44..22c119c9d9 100755 --- a/gforge/plugins/scmcvs/cronjobs/tarballs.php +++ b/gforge/plugins/scmcvs/cronjobs/tarballs.php @@ -3,8 +3,8 @@ $verbose=0; $scmname='scmroot'; -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $sys_scm_root_path = "$sys_chroot$cvsdir_prefix"; diff --git a/gforge/plugins/scmcvs/cronjobs/usergroup.php b/gforge/plugins/scmcvs/cronjobs/usergroup.php index a9c386ac90..ebf1bd3347 100755 --- a/gforge/plugins/scmcvs/cronjobs/usergroup.php +++ b/gforge/plugins/scmcvs/cronjobs/usergroup.php @@ -29,8 +29,8 @@ This file creates user / group permissions by editing the /etc/passwd /etc/shadow and /etc/group files */ -require_once('squal_pre.php'); -require ('common/include/cron_utils.php'); +require_once $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; // // Default values for the script diff --git a/gforge/plugins/scmcvs/www/acl.php b/gforge/plugins/scmcvs/www/acl.php index 6a0d30f747..119fa6fd95 100644 --- a/gforge/plugins/scmcvs/www/acl.php +++ b/gforge/plugins/scmcvs/www/acl.php @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once('common/include/escapingUtils.php'); -require_once('squal_pre.php'); +require_once $gfcommon.'include/escapingUtils.php'; +require_once $gfwww.'include/squal_pre.php'; if (!$sys_use_scm) { exit_disabled(); diff --git a/gforge/plugins/scmsvn/bin/svn-create.php b/gforge/plugins/scmsvn/bin/svn-create.php index 8bc11b16bc..7252308faf 100755 --- a/gforge/plugins/scmsvn/bin/svn-create.php +++ b/gforge/plugins/scmsvn/bin/svn-create.php @@ -25,8 +25,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; // /path/to/svn/bin/ $svn_path='/usr/bin'; diff --git a/gforge/plugins/scmsvn/common/SVNPlugin.class.php b/gforge/plugins/scmsvn/common/SVNPlugin.class.php index 89a2c1c60a..b61fe3e935 100644 --- a/gforge/plugins/scmsvn/common/SVNPlugin.class.php +++ b/gforge/plugins/scmsvn/common/SVNPlugin.class.php @@ -35,7 +35,7 @@ class SVNPlugin extends SCM { $this->hooks[] = 'scm_stats'; $this->hooks[] = 'scm_plugin'; - require_once('plugins/scmsvn/config.php') ; + require_once $gfconfig.'plugins/scmsvn/config.php' ; $this->default_svn_server = $default_svn_server ; $this->enabled_by_default = $enabled_by_default ; diff --git a/gforge/plugins/scmsvn/common/scmsvn-init.php b/gforge/plugins/scmsvn/common/scmsvn-init.php index c73a0cad3b..a866e6e2d7 100644 --- a/gforge/plugins/scmsvn/common/scmsvn-init.php +++ b/gforge/plugins/scmsvn/common/scmsvn-init.php @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once ($GLOBALS['sys_plugins_path'].'/scmsvn/common/SVNPlugin.class.php') ; +require_once $gfplugins.'scmsvn/common/SVNPlugin.class.php' ; $SVNPluginObject = new SVNPlugin ; diff --git a/gforge/plugins/scmsvn/cronjobs/create_svn.php b/gforge/plugins/scmsvn/cronjobs/create_svn.php index b735c478a6..056e0471c0 100755 --- a/gforge/plugins/scmsvn/cronjobs/create_svn.php +++ b/gforge/plugins/scmsvn/cronjobs/create_svn.php @@ -8,8 +8,8 @@ * @version $Id */ -require ('squal_pre.php'); -require_once('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require_once $gfcommon.'include/cron_utils.php'; // /path/to/svn/bin/ $svn_path='/usr/bin'; diff --git a/gforge/plugins/scmsvn/cronjobs/svn-stats.php b/gforge/plugins/scmsvn/cronjobs/svn-stats.php index f22be3fcb6..834a63da93 100755 --- a/gforge/plugins/scmsvn/cronjobs/svn-stats.php +++ b/gforge/plugins/scmsvn/cronjobs/svn-stats.php @@ -20,9 +20,9 @@ * along with GForge; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once ('squal_pre.php'); -require_once ('common/include/cron_utils.php'); -require_once ('plugins/scmsvn/config.php'); +require_once $gfwww.'include/squal_pre.php'; +require_once $gfcommon.'include/cron_utils.php'; +require_once $gfconfig.'plugins/scmsvn/config.php'; $pluginname = "scmsvn" ; // This variable should probably be moved to this plugin's config.php diff --git a/gforge/plugins/scmsvn/cronjobs/tarballs.php b/gforge/plugins/scmsvn/cronjobs/tarballs.php index 4f85ef59d7..d2bec3b860 100755 --- a/gforge/plugins/scmsvn/cronjobs/tarballs.php +++ b/gforge/plugins/scmsvn/cronjobs/tarballs.php @@ -8,8 +8,8 @@ $scmname='scmroot'; putenv("PATH=/usr/lib/subversion:".getenv('PATH')); $BACKUPPROG='hot-backup.py'; -require ('squal_pre.php'); -require ('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require $gfcommon.'include/cron_utils.php'; $sys_scm_root_path = "$sys_chroot$svndir_prefix"; diff --git a/gforge/plugins/scmsvn/cronjobs/update_users.php b/gforge/plugins/scmsvn/cronjobs/update_users.php index f65a818815..0ee88f50df 100644 --- a/gforge/plugins/scmsvn/cronjobs/update_users.php +++ b/gforge/plugins/scmsvn/cronjobs/update_users.php @@ -13,8 +13,8 @@ * @version $Id */ -require ('squal_pre.php'); -require_once('common/include/cron_utils.php'); +require $gfwww.'include/squal_pre.php'; +require_once $gfcommon.'include/cron_utils.php'; // Where is the SVN repository? $svn=$svndir_prefix; diff --git a/gforge/plugins/svncommitemail/common/svncommitemail-init.php b/gforge/plugins/svncommitemail/common/svncommitemail-init.php index 551f381681..90ffd7325e 100644 --- a/gforge/plugins/svncommitemail/common/svncommitemail-init.php +++ b/gforge/plugins/svncommitemail/common/svncommitemail-init.php @@ -23,12 +23,12 @@ global $sys_plugins_path; $found = false; if (is_dir($sys_plugins_path.'/svncommitemail/common/')) { if (is_file($sys_plugins_path.'/svncommitemail/common/SVNCommitEmailPlugin.class.php')) { - require_once ($sys_plugins_path.'/svncommitemail/common/SVNCommitEmailPlugin.class.php') ; + require_once $gfplugins.'svncommitemail/common/SVNCommitEmailPlugin.class.php' ; $found = true; } } else { if (is_file($sys_plugins_path.'/svncommitemail/include/SVNCommitEmailPlugin.class.php')) { - require_once ($sys_plugins_path.'/svncommitemail/include/SVNCommitEmailPlugin.class.php') ; + require_once $gfplugins.'svncommitemail/include/SVNCommitEmailPlugin.class.php' ; $found = true; } } diff --git a/gforge/plugins/svncommitemail/include/svncommitemail-init.php b/gforge/plugins/svncommitemail/include/svncommitemail-init.php index 643c8e619c..b1ae202c7a 100644 --- a/gforge/plugins/svncommitemail/include/svncommitemail-init.php +++ b/gforge/plugins/svncommitemail/include/svncommitemail-init.php @@ -22,12 +22,12 @@ global $sys_plugins_path; if (is_dir($sys_plugins_path.'/svncommitemail/common/')) { if (is_file($sys_plugins_path.'/svncommitemail/common/SVNCommitEmailPlugin.class.php')) { - require_once ($sys_plugins_path.'/svncommitemail/common/SVNCommitEmailPlugin.class.php') ; + require_once $gfplugins.'svncommitemail/common/SVNCommitEmailPlugin.class.php' ; $found = true; } } else { if (is_file($sys_plugins_path.'/svncommitemail/include/SVNCommitEmailPlugin.class.php')) { - require_once ($sys_plugins_path.'/svncommitemail/include/SVNCommitEmailPlugin.class.php') ; + require_once $gfplugins.'svncommitemail/include/SVNCommitEmailPlugin.class.php' ; $found = true; } } diff --git a/gforge/plugins/svntracker/bin/post.php b/gforge/plugins/svntracker/bin/post.php index 5942003595..aba468d3b3 100755 --- a/gforge/plugins/svntracker/bin/post.php +++ b/gforge/plugins/svntracker/bin/post.php @@ -31,8 +31,8 @@ */ -require ('plugins/svntracker/config.php'); -require ($sys_plugins_path.'/svntracker/common/Snoopy.class.php'); +require $gfconfig.'plugins/svntracker/config.php'; +require $gfplugins.'svntracker/common/Snoopy.class.php'; if ($svn_tracker_debug) { $file = fopen($svn_tracker_debug_file,"a+"); diff --git a/gforge/plugins/svntracker/common/svntracker-init.php b/gforge/plugins/svntracker/common/svntracker-init.php index d95ff185dc..b06931e7f2 100644 --- a/gforge/plugins/svntracker/common/svntracker-init.php +++ b/gforge/plugins/svntracker/common/svntracker-init.php @@ -23,7 +23,7 @@ * along with GForge-plugin-svntracker; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US */ -require_once ('svntrackerPlugin.class.php') ; +require_once $gfplugins.'svntracker/common/svntrackerPlugin.class.php' ; $svntrackerPluginObject = new svntrackerPlugin ; diff --git a/gforge/plugins/svntracker/www/newcommit.php b/gforge/plugins/svntracker/www/newcommit.php index e4086993c5..0805a491a1 100644 --- a/gforge/plugins/svntracker/www/newcommit.php +++ b/gforge/plugins/svntracker/www/newcommit.php @@ -16,8 +16,8 @@ * */ -require_once('squal_pre.php'); -require_once('plugins/svntracker/config.php'); +require_once $gfwww.'include/squal_pre.php'; +require_once $gfconfig.'plugins/svntracker/config.php'; if ($svn_tracker_debug) { $file = fopen($svn_tracker_debug_file,"a+"); diff --git a/gforge/plugins/webcalendar/common/webcalendar-init.php b/gforge/plugins/webcalendar/common/webcalendar-init.php index 6ad326a9e9..4508e87cfb 100644 --- a/gforge/plugins/webcalendar/common/webcalendar-init.php +++ b/gforge/plugins/webcalendar/common/webcalendar-init.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once ('webcalendarPlugin.class.php') ; +require_once $gfplugins.'webcalendar/common/webcalendarPlugin.class.php' ; $webcalendarPluginObject = new webcalendarPlugin ; diff --git a/gforge/plugins/webcalendar/www/activity_log.php b/gforge/plugins/webcalendar/www/activity_log.php index 24f6bd315a..be2cbbe565 100644 --- a/gforge/plugins/webcalendar/www/activity_log.php +++ b/gforge/plugins/webcalendar/www/activity_log.php @@ -1,6 +1,6 @@   "; diff --git a/gforge/plugins/webcalendar/www/admin_handler.php b/gforge/plugins/webcalendar/www/admin_handler.php index 81096bf55a..c3d9433239 100644 --- a/gforge/plugins/webcalendar/www/admin_handler.php +++ b/gforge/plugins/webcalendar/www/admin_handler.php @@ -1,6 +1,6 @@ diff --git a/gforge/plugins/webcalendar/www/group_edit_handler.php b/gforge/plugins/webcalendar/www/group_edit_handler.php index d6cb5b7f97..5d43377134 100644 --- a/gforge/plugins/webcalendar/www/group_edit_handler.php +++ b/gforge/plugins/webcalendar/www/group_edit_handler.php @@ -1,5 +1,5 @@ diff --git a/gforge/plugins/webcalendar/www/help_bug.php b/gforge/plugins/webcalendar/www/help_bug.php index 66aee711a0..38a34f417e 100644 --- a/gforge/plugins/webcalendar/www/help_bug.php +++ b/gforge/plugins/webcalendar/www/help_bug.php @@ -1,5 +1,5 @@ diff --git a/gforge/plugins/webcalendar/www/help_edit_entry.php b/gforge/plugins/webcalendar/www/help_edit_entry.php index 5917f6807f..5ac56fb6fb 100644 --- a/gforge/plugins/webcalendar/www/help_edit_entry.php +++ b/gforge/plugins/webcalendar/www/help_edit_entry.php @@ -1,5 +1,5 @@ diff --git a/gforge/plugins/webcalendar/www/help_import.php b/gforge/plugins/webcalendar/www/help_import.php index bb91e17b23..da52e6e13a 100644 --- a/gforge/plugins/webcalendar/www/help_import.php +++ b/gforge/plugins/webcalendar/www/help_import.php @@ -1,5 +1,5 @@ diff --git a/gforge/plugins/webcalendar/www/help_index.php b/gforge/plugins/webcalendar/www/help_index.php index 494cd6595a..8ad55b7535 100644 --- a/gforge/plugins/webcalendar/www/help_index.php +++ b/gforge/plugins/webcalendar/www/help_index.php @@ -1,5 +1,5 @@ diff --git a/gforge/plugins/webcalendar/www/help_layers.php b/gforge/plugins/webcalendar/www/help_layers.php index 71eee2ad5a..155888c2cf 100644 --- a/gforge/plugins/webcalendar/www/help_layers.php +++ b/gforge/plugins/webcalendar/www/help_layers.php @@ -1,5 +1,5 @@ diff --git a/gforge/plugins/webcalendar/www/help_pref.php b/gforge/plugins/webcalendar/www/help_pref.php index 81cd734075..80da953c72 100644 --- a/gforge/plugins/webcalendar/www/help_pref.php +++ b/gforge/plugins/webcalendar/www/help_pref.php @@ -1,5 +1,5 @@ diff --git a/gforge/plugins/webcalendar/www/import.php b/gforge/plugins/webcalendar/www/import.php index a377b648c3..5ad1d21650 100644 --- a/gforge/plugins/webcalendar/www/import.php +++ b/gforge/plugins/webcalendar/www/import.php @@ -15,7 +15,7 @@ * calendar and import them into WebCalendar with a category * "work". */ -include_once 'includes/init.php'; +include_once $gfplugins.'webcalendar/www/includes/init.php'; print_header(); diff --git a/gforge/plugins/webcalendar/www/import_handler.php b/gforge/plugins/webcalendar/www/import_handler.php index 15e42d39aa..1da0eccf79 100644 --- a/gforge/plugins/webcalendar/www/import_handler.php +++ b/gforge/plugins/webcalendar/www/import_handler.php @@ -25,8 +25,8 @@ * Security: * TBD */ -include_once 'includes/init.php'; -include_once 'includes/site_extras.php'; +include_once $gfplugins.'webcalendar/www/includes/init.php'; +include_once $gfplugins.'webcalendar/www/includes/site_extras.php'; $error = ''; print_header(); diff --git a/gforge/plugins/webcalendar/www/includes/config.php b/gforge/plugins/webcalendar/www/includes/config.php index 670f824926..37b48dbd9b 100644 --- a/gforge/plugins/webcalendar/www/includes/config.php +++ b/gforge/plugins/webcalendar/www/includes/config.php @@ -18,7 +18,7 @@ */ require_once('../../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; if ( empty ( $PHP_SELF ) && ! empty ( $_SERVER ) && ! empty ( $_SERVER['PHP_SELF'] ) ) { diff --git a/gforge/plugins/webcalendar/www/index.php b/gforge/plugins/webcalendar/www/index.php index dacbcd5266..efda257365 100644 --- a/gforge/plugins/webcalendar/www/index.php +++ b/gforge/plugins/webcalendar/www/index.php @@ -9,7 +9,7 @@ */ require_once('../../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; //require_once ('plugins/webcalendar/config.php'); // the header that displays for the user portion of the plugin @@ -104,7 +104,7 @@ function webcalendar_User_Header($params) { } */ -include_once 'includes/init.php'; +include_once $gfplugins.'webcalendar/www/includes/init.php'; // If not yet logged in, you will be redirected to login.php before // we get to this point (by connect.php included above) diff --git a/gforge/plugins/webcalendar/www/index2.php b/gforge/plugins/webcalendar/www/index2.php index b53411450e..4db9e87c52 100644 --- a/gforge/plugins/webcalendar/www/index2.php +++ b/gforge/plugins/webcalendar/www/index2.php @@ -1,7 +1,7 @@ 'Webcalendar','group'=>$group_id,'toptab'=>'webcalendar' )); diff --git a/gforge/plugins/webcalendar/www/install/index.php b/gforge/plugins/webcalendar/www/install/index.php index 951bdfea85..ae339b008e 100644 --- a/gforge/plugins/webcalendar/www/install/index.php +++ b/gforge/plugins/webcalendar/www/install/index.php @@ -18,7 +18,7 @@ * TODO: * Add translations to this page. */ -include_once '../includes/php-dbi.php'; +include_once $gfplugins.'webcalendar/www/install/../includes/php-dbi.php'; $file = "../includes/settings.php"; $fileDir = "../includes"; diff --git a/gforge/plugins/webcalendar/www/layers.php b/gforge/plugins/webcalendar/www/layers.php index e471551a4f..3f6aa531ef 100644 --- a/gforge/plugins/webcalendar/www/layers.php +++ b/gforge/plugins/webcalendar/www/layers.php @@ -1,5 +1,5 @@ diff --git a/gforge/plugins/webcalendar/www/set_entry_cat.php b/gforge/plugins/webcalendar/www/set_entry_cat.php index d19d8df6dd..94a21dc6ed 100644 --- a/gforge/plugins/webcalendar/www/set_entry_cat.php +++ b/gforge/plugins/webcalendar/www/set_entry_cat.php @@ -1,5 +1,5 @@ diff --git a/gforge/plugins/webcalendar/www/usersel.php b/gforge/plugins/webcalendar/www/usersel.php index 18f6091470..87df9cfc7c 100644 --- a/gforge/plugins/webcalendar/www/usersel.php +++ b/gforge/plugins/webcalendar/www/usersel.php @@ -1,5 +1,5 @@ diff --git a/gforge/utils/fixscripts/fix_broken_uids.php b/gforge/utils/fixscripts/fix_broken_uids.php index c16cd33fd5..a658c457b0 100644 --- a/gforge/utils/fixscripts/fix_broken_uids.php +++ b/gforge/utils/fixscripts/fix_broken_uids.php @@ -10,7 +10,7 @@ */ exit; -require('squal_pre.php'); +require $gfwww.'include/squal_pre.php'; if (!strstr($REMOTE_ADDR,$sys_internal_network)) { exit_permission_denied(); diff --git a/gforge/utils/fixscripts/fix_image_data.php b/gforge/utils/fixscripts/fix_image_data.php index 791f3e1a8b..5af7279b94 100644 --- a/gforge/utils/fixscripts/fix_image_data.php +++ b/gforge/utils/fixscripts/fix_image_data.php @@ -9,7 +9,7 @@ */ exit; -require('squal_pre.php'); +require $gfwww.'include/squal_pre.php'; if (!strstr($REMOTE_ADDR,$sys_internal_network)) { exit_permission_denied(); diff --git a/gforge/utils/fixscripts/tools_data_cleanup.php b/gforge/utils/fixscripts/tools_data_cleanup.php index a6868f28e5..05181ce778 100644 --- a/gforge/utils/fixscripts/tools_data_cleanup.php +++ b/gforge/utils/fixscripts/tools_data_cleanup.php @@ -6,7 +6,7 @@ * */ -require ('squal_pre.php'); +require $gfwww.'include/squal_pre.php'; if (!strstr($REMOTE_ADDR,$sys_internal_network)) { exit_permission_denied(); diff --git a/gforge/utils/fixscripts/upgrade_bug_data.php b/gforge/utils/fixscripts/upgrade_bug_data.php index d632720151..5fbb173090 100644 --- a/gforge/utils/fixscripts/upgrade_bug_data.php +++ b/gforge/utils/fixscripts/upgrade_bug_data.php @@ -14,7 +14,7 @@ exit; */ -require ('pre.php'); +require $gfwww.'include/pre.php'; session_require(array('group'=>'1','admin_flags'=>'A')); diff --git a/gforge/utils/fixscripts/upgrade_filerelease_data.php b/gforge/utils/fixscripts/upgrade_filerelease_data.php index 404513a251..3d73d7d283 100644 --- a/gforge/utils/fixscripts/upgrade_filerelease_data.php +++ b/gforge/utils/fixscripts/upgrade_filerelease_data.php @@ -23,7 +23,7 @@ exit; */ -require ('squal_pre.php'); +require $gfwww.'include/squal_pre.php'; echo $REMOTE_ADDR; diff --git a/gforge/utils/fixscripts/upgrade_forum_data.php b/gforge/utils/fixscripts/upgrade_forum_data.php index 01861a0e9e..889153b2c4 100644 --- a/gforge/utils/fixscripts/upgrade_forum_data.php +++ b/gforge/utils/fixscripts/upgrade_forum_data.php @@ -16,7 +16,7 @@ exit; */ -require ('pre.php'); +require $gfwww.'include/pre.php'; session_require(array('group'=>'1','admin_flags'=>'A')); diff --git a/gforge/utils/fixscripts/upgrade_task_data.php b/gforge/utils/fixscripts/upgrade_task_data.php index ab05b73489..286b499acb 100644 --- a/gforge/utils/fixscripts/upgrade_task_data.php +++ b/gforge/utils/fixscripts/upgrade_task_data.php @@ -14,7 +14,7 @@ exit; */ -require ('pre.php'); +require $gfwww.'include/pre.php'; session_require(array('group'=>'1','admin_flags'=>'A')); diff --git a/gforge/www/404.php b/gforge/www/404.php index 7ea3f87957..bbceda2f3d 100644 --- a/gforge/www/404.php +++ b/gforge/www/404.php @@ -24,7 +24,7 @@ */ require_once('env.inc.php'); -require_once('pre.php'); // Initial db and session library, opens session +require_once $gfwww.'include/pre.php'; // Initial db and session library, opens session $HTML->header(array('title'=>_('Requested Page not Found (Error 404)'))); diff --git a/gforge/www/account/change_email-complete.php b/gforge/www/account/change_email-complete.php index 6a26d73102..3222c78f7e 100644 --- a/gforge/www/account/change_email-complete.php +++ b/gforge/www/account/change_email-complete.php @@ -26,8 +26,8 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/account.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/account.php'; $confirm_hash = getStringFromRequest('confirm_hash'); diff --git a/gforge/www/account/change_email.php b/gforge/www/account/change_email.php index 8cea7c4823..4cdc3a6630 100644 --- a/gforge/www/account/change_email.php +++ b/gforge/www/account/change_email.php @@ -24,7 +24,7 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; session_require(array('isloggedin'=>1)); diff --git a/gforge/www/account/change_pw.php b/gforge/www/account/change_pw.php index e8ddc879fb..b9e5adebc1 100644 --- a/gforge/www/account/change_pw.php +++ b/gforge/www/account/change_pw.php @@ -24,8 +24,8 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/account.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/account.php'; session_require(array('isloggedin'=>1)); diff --git a/gforge/www/account/editsshkeys.php b/gforge/www/account/editsshkeys.php index 1700419fad..5b7d90ae81 100644 --- a/gforge/www/account/editsshkeys.php +++ b/gforge/www/account/editsshkeys.php @@ -24,8 +24,8 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/account.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/account.php'; session_require(array('isloggedin'=>1)); $u =& user_get_object(user_getid()); diff --git a/gforge/www/account/first.php b/gforge/www/account/first.php index c37cbfcd1d..93df736636 100644 --- a/gforge/www/account/first.php +++ b/gforge/www/account/first.php @@ -26,7 +26,7 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; site_user_header(array('title'=>sprintf(_('Welcome to %1$s'), $sys_name))); diff --git a/gforge/www/account/index.php b/gforge/www/account/index.php index dc812c691a..68b836e2cb 100644 --- a/gforge/www/account/index.php +++ b/gforge/www/account/index.php @@ -24,8 +24,8 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/timezones.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/timezones.php'; if (!session_loggedin()) { exit_not_logged_in(); diff --git a/gforge/www/account/login.php b/gforge/www/account/login.php index be67c581ab..aea4acf0b0 100644 --- a/gforge/www/account/login.php +++ b/gforge/www/account/login.php @@ -32,7 +32,7 @@ Header( "Cache-Control: no-cache"); Header( "Cache-Control: must-revalidate"); require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; $return_to = getStringFromRequest('return_to'); $login = getStringFromRequest('login'); diff --git a/gforge/www/account/logout.php b/gforge/www/account/logout.php index ee8b055f31..fd175371f6 100644 --- a/gforge/www/account/logout.php +++ b/gforge/www/account/logout.php @@ -28,7 +28,7 @@ Header( "Cache-Control: no-cache"); Header( "Cache-Control: must-revalidate"); require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; $return_to = getStringFromRequest('return_to'); diff --git a/gforge/www/account/lostlogin.php b/gforge/www/account/lostlogin.php index f06c9db553..3a88cd9956 100644 --- a/gforge/www/account/lostlogin.php +++ b/gforge/www/account/lostlogin.php @@ -26,8 +26,8 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/account.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/account.php'; $passwd = getStringFromRequest('passwd'); $passwd2 = getStringFromRequest('passwd2'); diff --git a/gforge/www/account/lostpw.php b/gforge/www/account/lostpw.php index e3738520c2..ab1e42a7d6 100644 --- a/gforge/www/account/lostpw.php +++ b/gforge/www/account/lostpw.php @@ -30,7 +30,7 @@ require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; if (getStringFromRequest('submit')) { if (!form_key_is_valid(getStringFromRequest('form_key'))) { diff --git a/gforge/www/account/pending-resend.php b/gforge/www/account/pending-resend.php index 082101c30a..f4e0992955 100644 --- a/gforge/www/account/pending-resend.php +++ b/gforge/www/account/pending-resend.php @@ -24,7 +24,7 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; if (getStringFromRequest('submit')) { $loginname = getStringFromRequest('loginname'); diff --git a/gforge/www/account/register.php b/gforge/www/account/register.php index 8e9ee31c91..e6cdd28905 100644 --- a/gforge/www/account/register.php +++ b/gforge/www/account/register.php @@ -24,9 +24,9 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/account.php'); -require_once('common/include/timezones.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/account.php'; +require_once $gfcommon.'include/timezones.php'; if ($sys_user_reg_restricted) { session_require(array('group'=>'1','admin_flags'=>'A')); diff --git a/gforge/www/account/setlang.php b/gforge/www/account/setlang.php index f2486e7529..12966a07bb 100644 --- a/gforge/www/account/setlang.php +++ b/gforge/www/account/setlang.php @@ -24,7 +24,7 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; $language_id=getStringFromRequest('language_id'); setcookie('cookie_language_id',$language_id,(time()+2592000),'/','',0); diff --git a/gforge/www/account/unsubscribe.php b/gforge/www/account/unsubscribe.php index b79524fd02..ec50b5b5c1 100644 --- a/gforge/www/account/unsubscribe.php +++ b/gforge/www/account/unsubscribe.php @@ -26,8 +26,8 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/account.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/account.php'; $confirm_hash = getStringFromRequest('confirm_hash'); diff --git a/gforge/www/account/verify.php b/gforge/www/account/verify.php index 3b66031afd..aa842f31d1 100644 --- a/gforge/www/account/verify.php +++ b/gforge/www/account/verify.php @@ -27,7 +27,7 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; $confirm_hash = getStringFromRequest('confirm_hash'); diff --git a/gforge/www/activity/index.php b/gforge/www/activity/index.php index 3f01ada29c..5b3e0a46d7 100644 --- a/gforge/www/activity/index.php +++ b/gforge/www/activity/index.php @@ -10,7 +10,7 @@ require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; /* Project Summary Page diff --git a/gforge/www/admin/admin_table.php b/gforge/www/admin/admin_table.php index 4b03a507cc..4d2eddfc07 100644 --- a/gforge/www/admin/admin_table.php +++ b/gforge/www/admin/admin_table.php @@ -285,7 +285,7 @@ function getUnitLabel($unit) { require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; session_require(array('group'=>'1','admin_flags'=>'A')); $HTML->header(array('title'=>sprintf(_('Edit the %1$ss Table'), ucwords(getUnitLabel($unit))))); diff --git a/gforge/www/admin/approve-pending.php b/gforge/www/admin/approve-pending.php index d007e88fb0..efbab6195f 100644 --- a/gforge/www/admin/approve-pending.php +++ b/gforge/www/admin/approve-pending.php @@ -28,14 +28,14 @@ $LIMIT = 50; require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/account.php'); -require_once('common/include/license.php'); -require_once('www/include/canned_responses.php'); -require_once('www/admin/admin_utils.php'); -require_once('www/project/admin/project_admin_utils.php'); -require_once('common/tracker/ArtifactTypes.class.php'); -require_once('common/forum/Forum.class.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/account.php'; +require_once $gfcommon.'include/license.php'; +require_once $gfwww.'include/canned_responses.php'; +require_once $gfwww.'admin/admin_utils.php'; +require_once $gfwww.'project/admin/project_admin_utils.php'; +require_once $gfcommon.'tracker/ArtifactTypes.class.php'; +require_once $gfcommon.'forum/Forum.class.php'; session_require(array('group'=>'1','admin_flags'=>'A')); diff --git a/gforge/www/admin/configman.php b/gforge/www/admin/configman.php index c8ba44532f..31ba7b74e6 100644 --- a/gforge/www/admin/configman.php +++ b/gforge/www/admin/configman.php @@ -29,8 +29,8 @@ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'admin/admin_utils.php'; site_admin_header(array('title'=>_('Site admin'))); diff --git a/gforge/www/admin/cronman.php b/gforge/www/admin/cronman.php index e48f5e95af..105d3e7616 100644 --- a/gforge/www/admin/cronman.php +++ b/gforge/www/admin/cronman.php @@ -26,9 +26,9 @@ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('www/admin/admin_utils.php'); -require_once ('common/include/cron_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'admin/admin_utils.php'; +require_once $gfcommon.'include/cron_utils.php'; site_admin_header(array('title'=>_('Site admin'))); diff --git a/gforge/www/admin/database.php b/gforge/www/admin/database.php index 8633814a5a..7802d8e997 100644 --- a/gforge/www/admin/database.php +++ b/gforge/www/admin/database.php @@ -32,8 +32,8 @@ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'admin/admin_utils.php'; if (!$sys_use_project_database) { exit_disabled(); diff --git a/gforge/www/admin/edit_frs_filetype.php b/gforge/www/admin/edit_frs_filetype.php index d95e900f40..926cb2d600 100644 --- a/gforge/www/admin/edit_frs_filetype.php +++ b/gforge/www/admin/edit_frs_filetype.php @@ -28,6 +28,6 @@ $unit = 'file_type'; $table = 'frs_filetype'; $primary_key = 'type_id'; -include_once('admin_table.php'); +include_once $gfwww.'admin/admin_table.php'; ?> diff --git a/gforge/www/admin/edit_frs_processor.php b/gforge/www/admin/edit_frs_processor.php index 1fc3cb1548..87712da2d9 100644 --- a/gforge/www/admin/edit_frs_processor.php +++ b/gforge/www/admin/edit_frs_processor.php @@ -28,6 +28,6 @@ $unit = 'processor'; $table = 'frs_processor'; $primary_key = 'processor_id'; -include_once('admin_table.php'); +include_once $gfwww.'admin/admin_table.php'; ?> diff --git a/gforge/www/admin/edit_licenses.php b/gforge/www/admin/edit_licenses.php index 8631318511..0439904dd3 100644 --- a/gforge/www/admin/edit_licenses.php +++ b/gforge/www/admin/edit_licenses.php @@ -29,6 +29,6 @@ $unit = 'license'; $table = 'licenses'; $primary_key = 'license_id'; -include_once('admin_table.php'); +include_once $gfwww.'admin/admin_table.php'; ?> diff --git a/gforge/www/admin/edit_theme.php b/gforge/www/admin/edit_theme.php index 1e38f5577b..303cefabef 100644 --- a/gforge/www/admin/edit_theme.php +++ b/gforge/www/admin/edit_theme.php @@ -28,6 +28,6 @@ $unit = 'theme'; $table = 'themes'; $primary_key = 'theme_id'; -include_once('admin_table.php'); +include_once $gfwww.'admin/admin_table.php'; ?> diff --git a/gforge/www/admin/groupdelete.php b/gforge/www/admin/groupdelete.php index 7e8f66f397..3e3cc48100 100644 --- a/gforge/www/admin/groupdelete.php +++ b/gforge/www/admin/groupdelete.php @@ -24,9 +24,9 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/license.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/license.php'; +require_once $gfwww.'admin/admin_utils.php'; session_require(array('group'=>'1','admin_flags'=>'A')); diff --git a/gforge/www/admin/groupedit.php b/gforge/www/admin/groupedit.php index e665311a5b..e40870559c 100644 --- a/gforge/www/admin/groupedit.php +++ b/gforge/www/admin/groupedit.php @@ -24,10 +24,10 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/license.php'); -require_once('www/admin/admin_utils.php'); -require_once('www/project/admin/project_admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/license.php'; +require_once $gfwww.'admin/admin_utils.php'; +require_once $gfwww.'project/admin/project_admin_utils.php'; session_require(array('group'=>'1','admin_flags'=>'A')); diff --git a/gforge/www/admin/grouplist.php b/gforge/www/admin/grouplist.php index 30b02f4bbd..428eed877c 100644 --- a/gforge/www/admin/grouplist.php +++ b/gforge/www/admin/grouplist.php @@ -24,8 +24,8 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'admin/admin_utils.php'; site_admin_header(array('title'=>_('Group List'))); diff --git a/gforge/www/admin/index.php b/gforge/www/admin/index.php index 12677c5971..f43d4ac0a7 100644 --- a/gforge/www/admin/index.php +++ b/gforge/www/admin/index.php @@ -30,8 +30,8 @@ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'admin/admin_utils.php'; site_admin_header(array('title'=>_('Site admin'))); diff --git a/gforge/www/admin/massmail.php b/gforge/www/admin/massmail.php index 0b6d2abfc9..6f92cdd59f 100644 --- a/gforge/www/admin/massmail.php +++ b/gforge/www/admin/massmail.php @@ -28,8 +28,8 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'admin/admin_utils.php'; session_require(array('group'=>'1','admin_flags'=>'A')); diff --git a/gforge/www/admin/pluginman.php b/gforge/www/admin/pluginman.php index d4ed567c9e..c4bdefaeac 100644 --- a/gforge/www/admin/pluginman.php +++ b/gforge/www/admin/pluginman.php @@ -28,8 +28,8 @@ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'admin/admin_utils.php'; site_admin_header(array('title'=>_('Site admin'))); diff --git a/gforge/www/admin/responses_admin.php b/gforge/www/admin/responses_admin.php index 2c0778e8d5..a86949678a 100644 --- a/gforge/www/admin/responses_admin.php +++ b/gforge/www/admin/responses_admin.php @@ -26,11 +26,11 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/account.php'); -require_once('www/include/canned_responses.php'); -require_once('www/admin/admin_utils.php'); -require_once('www/project/admin/project_admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/account.php'; +require_once $gfwww.'include/canned_responses.php'; +require_once $gfwww.'admin/admin_utils.php'; +require_once $gfwww.'project/admin/project_admin_utils.php'; site_admin_header(array('title'=>_('Site Admin: Edit Rejection Responses'))); diff --git a/gforge/www/admin/search.php b/gforge/www/admin/search.php index 2cb8283a7c..b820c83c8e 100644 --- a/gforge/www/admin/search.php +++ b/gforge/www/admin/search.php @@ -31,8 +31,8 @@ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'admin/admin_utils.php'; $search = getStringFromRequest('search'); $substr = getStringFromRequest('substr'); diff --git a/gforge/www/admin/trove/trove_cat_add.php b/gforge/www/admin/trove/trove_cat_add.php index de90127d1b..b7dfed966e 100644 --- a/gforge/www/admin/trove/trove_cat_add.php +++ b/gforge/www/admin/trove/trove_cat_add.php @@ -24,9 +24,9 @@ */ require_once('../../env.inc.php'); -require_once('pre.php'); -require_once('www/include/trove.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'include/trove.php'; +require_once $gfwww.'admin/admin_utils.php'; session_require(array('group'=>'1','admin_flags'=>'A')); diff --git a/gforge/www/admin/trove/trove_cat_edit.php b/gforge/www/admin/trove/trove_cat_edit.php index a0a6120797..4fcafda4a4 100644 --- a/gforge/www/admin/trove/trove_cat_edit.php +++ b/gforge/www/admin/trove/trove_cat_edit.php @@ -28,9 +28,9 @@ require_once('../../env.inc.php'); -require_once('pre.php'); -require_once('www/include/trove.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'include/trove.php'; +require_once $gfwww.'admin/admin_utils.php'; session_require(array('group'=>'1','admin_flags'=>'A')); diff --git a/gforge/www/admin/trove/trove_cat_list.php b/gforge/www/admin/trove/trove_cat_list.php index 52cac0d58d..44ce8a519d 100644 --- a/gforge/www/admin/trove/trove_cat_list.php +++ b/gforge/www/admin/trove/trove_cat_list.php @@ -25,9 +25,9 @@ require_once('../../env.inc.php'); -require_once('pre.php'); -require_once('www/include/trove.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'include/trove.php'; +require_once $gfwww.'admin/admin_utils.php'; // print current node, then all subnodes function printnode ($nodeid,$text) { diff --git a/gforge/www/admin/unsubscribe.php b/gforge/www/admin/unsubscribe.php index f00676232b..c3b7449358 100644 --- a/gforge/www/admin/unsubscribe.php +++ b/gforge/www/admin/unsubscribe.php @@ -28,8 +28,8 @@ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'admin/admin_utils.php'; session_require(array('group'=>'1','admin_flags'=>'A')); $user_name = getStringFromRequest('user_name'); diff --git a/gforge/www/admin/useredit.php b/gforge/www/admin/useredit.php index e5df8a3da1..141e951254 100644 --- a/gforge/www/admin/useredit.php +++ b/gforge/www/admin/useredit.php @@ -24,9 +24,9 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/account.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/account.php'; +require_once $gfwww.'admin/admin_utils.php'; session_require(array('group'=>'1','admin_flags'=>'A')); $unix_status2str = array( diff --git a/gforge/www/admin/userlist.php b/gforge/www/admin/userlist.php index ffb35cfb1a..ebdfa26cf7 100644 --- a/gforge/www/admin/userlist.php +++ b/gforge/www/admin/userlist.php @@ -24,8 +24,8 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'admin/admin_utils.php'; session_require(array('group'=>'1','admin_flags'=>'A')); $HTML->header(array('title'=>_(': User List'))); diff --git a/gforge/www/admin/vhost.php b/gforge/www/admin/vhost.php index d08f52742b..479ba06077 100644 --- a/gforge/www/admin/vhost.php +++ b/gforge/www/admin/vhost.php @@ -30,9 +30,9 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('common/include/account.php'); -require_once('www/admin/admin_utils.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/account.php'; +require_once $gfwww.'admin/admin_utils.php'; if (!$sys_use_project_vhost) { exit_disabled(); diff --git a/gforge/www/dbimage.php b/gforge/www/dbimage.php index e99ae1cc1c..86922f4906 100644 --- a/gforge/www/dbimage.php +++ b/gforge/www/dbimage.php @@ -24,7 +24,7 @@ */ require_once('env.inc.php'); -require_once('squal_pre.php'); +require_once $gfwww.'include/squal_pre.php'; $id = getStringFromRequest('id'); diff --git a/gforge/www/developer/diary.php b/gforge/www/developer/diary.php index 7d11b24dbb..228ca90026 100644 --- a/gforge/www/developer/diary.php +++ b/gforge/www/developer/diary.php @@ -24,8 +24,8 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('vote_function.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'include/vote_function.php'; $diary_user = getStringFromRequest('diary_user'); if ($diary_user) { diff --git a/gforge/www/developer/index.php b/gforge/www/developer/index.php index 81d7c2ea5d..df135e2461 100644 --- a/gforge/www/developer/index.php +++ b/gforge/www/developer/index.php @@ -30,7 +30,7 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; $user_id = getStringFromRequest('user_id'); $form_dev = getStringFromRequest('form_dev'); @@ -47,7 +47,7 @@ if (isset ($sys_noforcetype) && $sys_noforcetype) { if (!$user || !is_object($user) || $user->isError() || !$user->isActive()) { exit_error(_('That user does not exist.'),_('Invalid User')); } - include('user_home.php'); + include $gfwww.'include/user_home.php'; } } else { header("Location: ".util_make_url ('/users/'.user_getname($user_id).'/')); diff --git a/gforge/www/developer/monitor.php b/gforge/www/developer/monitor.php index 7daa90de5f..4b772889f1 100644 --- a/gforge/www/developer/monitor.php +++ b/gforge/www/developer/monitor.php @@ -25,7 +25,7 @@ require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; if (!session_loggedin()) { diff --git a/gforge/www/developer/rate.php b/gforge/www/developer/rate.php index 49ac596cca..e3c4f2a75e 100644 --- a/gforge/www/developer/rate.php +++ b/gforge/www/developer/rate.php @@ -24,8 +24,8 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('vote_function.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'include/vote_function.php'; if (!session_loggedin()) { diff --git a/gforge/www/docman/admin/index.php b/gforge/www/docman/admin/index.php index acd16e2cfa..d06430df08 100644 --- a/gforge/www/docman/admin/index.php +++ b/gforge/www/docman/admin/index.php @@ -23,13 +23,13 @@ */ require_once('../../env.inc.php'); -require_once('pre.php'); -require_once('www/docman/include/doc_utils.php'); -require_once('www/docman/include/DocumentGroupHTML.class.php'); -require_once('common/docman/DocumentFactory.class.php'); -require_once('common/docman/DocumentGroup.class.php'); -require_once('common/docman/DocumentGroupFactory.class.php'); -require_once('common/include/TextSanitizer.class.php'); // to make the HTML input by the user safe to store +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'docman/include/doc_utils.php'; +require_once $gfwww.'docman/include/DocumentGroupHTML.class.php'; +require_once $gfcommon.'docman/DocumentFactory.class.php'; +require_once $gfcommon.'docman/DocumentGroup.class.php'; +require_once $gfcommon.'docman/DocumentGroupFactory.class.php'; +require_once $gfcommon.'include/TextSanitizer.class.php'; // to make the HTML input by the user safe to store $group_id = getIntFromRequest('group_id'); if (!$group_id) { diff --git a/gforge/www/docman/display_doc.php b/gforge/www/docman/display_doc.php index 87e7548492..2fcb401d63 100644 --- a/gforge/www/docman/display_doc.php +++ b/gforge/www/docman/display_doc.php @@ -8,9 +8,9 @@ */ require_once('../env.inc.php'); -require_once('pre.php'); -require_once('include/doc_utils.php'); -require_once('common/docman/Document.class.php'); +require_once $gfwww.'include/pre.php'; +require_once $gfwww.'docman/include/doc_utils.php'; +require_once $gfcommon.'docman/Document.class.php'; $docid = getIntFromRequest('docid'); if ($docid) { diff --git a/gforge/www/docman/doceditor.php b/gforge/www/docman/doceditor.php index 2de182969b..65620115e9 100644 --- a/gforge/www/docman/doceditor.php +++ b/gforge/www/docman/doceditor.php @@ -29,7 +29,7 @@ // By Daniel A. P�rez 2005 require_once('../env.inc.php'); -require_once('pre.php'); +require_once $gfwww.'include/pre.php'; $group_id = getIntFromRequest('group_id'); //get the group id echo '