[PP-svn] SF.net SVN: projectpier: [110] ProjectPier/Branches/0.8.0.x
Brought to you by:
projectpier
|
From: <mik...@us...> - 2008-02-10 01:45:04
|
Revision: 110
http://projectpier.svn.sourceforge.net/projectpier/?rev=110&view=rev
Author: miknight
Date: 2008-02-09 17:45:07 -0800 (Sat, 09 Feb 2008)
Log Message:
-----------
Merged up to r103 from trunk and added XSS and XSRF security fixes
Modified Paths:
--------------
ProjectPier/Branches/0.8.0.x/.htaccess
ProjectPier/Branches/0.8.0.x/application/application.php
ProjectPier/Branches/0.8.0.x/application/controllers/AccessController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/AccountController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/AdministrationController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/ApplicationController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/CommentController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/CompanyController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/ConfigController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/DashboardController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/ErrorController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/FeedController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/FilesController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/FormController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/MessageController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/MilestoneController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/ProjectController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/TagController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/TaskController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/UserController.class.php
ProjectPier/Branches/0.8.0.x/application/functions.php
ProjectPier/Branches/0.8.0.x/application/helpers/application.php
ProjectPier/Branches/0.8.0.x/application/helpers/breadcrumbs.php
ProjectPier/Branches/0.8.0.x/application/helpers/common.php
ProjectPier/Branches/0.8.0.x/application/helpers/company_website.php
ProjectPier/Branches/0.8.0.x/application/helpers/form.php
ProjectPier/Branches/0.8.0.x/application/helpers/format.php
ProjectPier/Branches/0.8.0.x/application/helpers/page.php
ProjectPier/Branches/0.8.0.x/application/helpers/pageactions.php
ProjectPier/Branches/0.8.0.x/application/helpers/pagination.php
ProjectPier/Branches/0.8.0.x/application/helpers/project_website.php
ProjectPier/Branches/0.8.0.x/application/helpers/tabbednavigation.php
ProjectPier/Branches/0.8.0.x/application/helpers/textile.php
ProjectPier/Branches/0.8.0.x/application/layouts/account.php
ProjectPier/Branches/0.8.0.x/application/layouts/administration.php
ProjectPier/Branches/0.8.0.x/application/layouts/complete_install.php
ProjectPier/Branches/0.8.0.x/application/layouts/dashboard.php
ProjectPier/Branches/0.8.0.x/application/layouts/dialog.php
ProjectPier/Branches/0.8.0.x/application/layouts/error.php
ProjectPier/Branches/0.8.0.x/application/layouts/ical.php
ProjectPier/Branches/0.8.0.x/application/layouts/project_website.php
ProjectPier/Branches/0.8.0.x/application/layouts/xml.php
ProjectPier/Branches/0.8.0.x/application/models/ApplicationDataObject.class.php
ProjectPier/Branches/0.8.0.x/application/models/CompanyWebsite.class.php
ProjectPier/Branches/0.8.0.x/application/models/ProjectDataObject.class.php
ProjectPier/Branches/0.8.0.x/application/models/PublicFiles.class.php
ProjectPier/Branches/0.8.0.x/application/models/VersionChecker.class.php
ProjectPier/Branches/0.8.0.x/application/models/administration_tools/AdministrationTool.class.php
ProjectPier/Branches/0.8.0.x/application/models/administration_tools/AdministrationTools.class.php
ProjectPier/Branches/0.8.0.x/application/models/administration_tools/base/BaseAdministrationTool.class.php
ProjectPier/Branches/0.8.0.x/application/models/administration_tools/base/BaseAdministrationTools.class.php
ProjectPier/Branches/0.8.0.x/application/models/anonymous_users/AnonymousUser.class.php
ProjectPier/Branches/0.8.0.x/application/models/application_logs/ApplicationLog.class.php
ProjectPier/Branches/0.8.0.x/application/models/application_logs/ApplicationLogs.class.php
ProjectPier/Branches/0.8.0.x/application/models/application_logs/base/BaseApplicationLog.class.php
ProjectPier/Branches/0.8.0.x/application/models/application_logs/base/BaseApplicationLogs.class.php
ProjectPier/Branches/0.8.0.x/application/models/attached_files/AttachedFile.class.php
ProjectPier/Branches/0.8.0.x/application/models/attached_files/AttachedFiles.class.php
ProjectPier/Branches/0.8.0.x/application/models/attached_files/base/BaseAttachedFile.class.php
ProjectPier/Branches/0.8.0.x/application/models/attached_files/base/BaseAttachedFiles.class.php
ProjectPier/Branches/0.8.0.x/application/models/comments/Comment.class.php
ProjectPier/Branches/0.8.0.x/application/models/comments/Comments.class.php
ProjectPier/Branches/0.8.0.x/application/models/comments/base/BaseComment.class.php
ProjectPier/Branches/0.8.0.x/application/models/comments/base/BaseComments.class.php
ProjectPier/Branches/0.8.0.x/application/models/companies/Companies.class.php
ProjectPier/Branches/0.8.0.x/application/models/companies/Company.class.php
ProjectPier/Branches/0.8.0.x/application/models/companies/base/BaseCompanies.class.php
ProjectPier/Branches/0.8.0.x/application/models/companies/base/BaseCompany.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_categories/ConfigCategories.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_categories/ConfigCategory.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_categories/base/BaseConfigCategories.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_categories/base/BaseConfigCategory.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/complex/FileStorageConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/complex/MailTransportConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/complex/SecureSmtpConnectionConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/complex/ThemeConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/general/BoolConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/general/ConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/general/DateTimeConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/general/FloatConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/general/IntegerConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/general/PasswordConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/general/StringConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_handlers/general/TextConfigHandler.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_options/ConfigOption.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_options/ConfigOptions.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_options/base/BaseConfigOption.class.php
ProjectPier/Branches/0.8.0.x/application/models/config_options/base/BaseConfigOptions.class.php
ProjectPier/Branches/0.8.0.x/application/models/errors/AdministratorDnxError.class.php
ProjectPier/Branches/0.8.0.x/application/models/errors/OwnerCompanyDnxError.class.php
ProjectPier/Branches/0.8.0.x/application/models/file_types/FileType.class.php
ProjectPier/Branches/0.8.0.x/application/models/file_types/FileTypes.class.php
ProjectPier/Branches/0.8.0.x/application/models/file_types/base/BaseFileType.class.php
ProjectPier/Branches/0.8.0.x/application/models/file_types/base/BaseFileTypes.class.php
ProjectPier/Branches/0.8.0.x/application/models/im_types/ImType.class.php
ProjectPier/Branches/0.8.0.x/application/models/im_types/ImTypes.class.php
ProjectPier/Branches/0.8.0.x/application/models/im_types/base/BaseImType.class.php
ProjectPier/Branches/0.8.0.x/application/models/im_types/base/BaseImTypes.class.php
ProjectPier/Branches/0.8.0.x/application/models/message_subscriptions/MessageSubscription.class.php
ProjectPier/Branches/0.8.0.x/application/models/message_subscriptions/MessageSubscriptions.class.php
ProjectPier/Branches/0.8.0.x/application/models/message_subscriptions/base/BaseMessageSubscription.class.php
ProjectPier/Branches/0.8.0.x/application/models/message_subscriptions/base/BaseMessageSubscriptions.class.php
ProjectPier/Branches/0.8.0.x/application/models/notifier/Notifier.class.php
ProjectPier/Branches/0.8.0.x/application/models/notifier/NotifierConnectionError.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_companies/ProjectCompanies.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_companies/ProjectCompany.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_companies/base/BaseProjectCompanies.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_companies/base/BaseProjectCompany.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_file_revisions/ProjectFileRevision.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_file_revisions/ProjectFileRevisions.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_file_revisions/base/BaseProjectFileRevision.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_file_revisions/base/BaseProjectFileRevisions.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_files/ProjectFile.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_files/ProjectFiles.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_files/base/BaseProjectFile.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_files/base/BaseProjectFiles.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_folders/ProjectFolder.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_folders/ProjectFolders.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_folders/base/BaseProjectFolder.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_folders/base/BaseProjectFolders.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_forms/ProjectForm.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_forms/ProjectForms.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_forms/base/BaseProjectForm.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_forms/base/BaseProjectForms.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_messages/ProjectMessage.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_messages/ProjectMessages.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_messages/base/BaseProjectMessage.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_messages/base/BaseProjectMessages.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_milestones/ProjectMilestone.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_milestones/ProjectMilestones.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_milestones/base/BaseProjectMilestone.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_milestones/base/BaseProjectMilestones.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_task_lists/ProjectTaskList.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_task_lists/ProjectTaskLists.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_task_lists/base/BaseProjectTaskList.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_task_lists/base/BaseProjectTaskLists.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_tasks/ProjectTask.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_tasks/ProjectTasks.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_tasks/base/BaseProjectTask.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_tasks/base/BaseProjectTasks.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_users/ProjectUser.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_users/ProjectUsers.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_users/base/BaseProjectUser.class.php
ProjectPier/Branches/0.8.0.x/application/models/project_users/base/BaseProjectUsers.class.php
ProjectPier/Branches/0.8.0.x/application/models/projects/Project.class.php
ProjectPier/Branches/0.8.0.x/application/models/projects/Projects.class.php
ProjectPier/Branches/0.8.0.x/application/models/projects/base/BaseProject.class.php
ProjectPier/Branches/0.8.0.x/application/models/projects/base/BaseProjects.class.php
ProjectPier/Branches/0.8.0.x/application/models/searchable_objects/SearchableObject.class.php
ProjectPier/Branches/0.8.0.x/application/models/searchable_objects/SearchableObjects.class.php
ProjectPier/Branches/0.8.0.x/application/models/searchable_objects/base/BaseSearchableObject.class.php
ProjectPier/Branches/0.8.0.x/application/models/searchable_objects/base/BaseSearchableObjects.class.php
ProjectPier/Branches/0.8.0.x/application/models/tags/Tag.class.php
ProjectPier/Branches/0.8.0.x/application/models/tags/Tags.class.php
ProjectPier/Branches/0.8.0.x/application/models/tags/base/BaseTag.class.php
ProjectPier/Branches/0.8.0.x/application/models/tags/base/BaseTags.class.php
ProjectPier/Branches/0.8.0.x/application/models/user_im_values/UserImValue.class.php
ProjectPier/Branches/0.8.0.x/application/models/user_im_values/UserImValues.class.php
ProjectPier/Branches/0.8.0.x/application/models/user_im_values/base/BaseUserImValue.class.php
ProjectPier/Branches/0.8.0.x/application/models/user_im_values/base/BaseUserImValues.class.php
ProjectPier/Branches/0.8.0.x/application/models/users/User.class.php
ProjectPier/Branches/0.8.0.x/application/models/users/Users.class.php
ProjectPier/Branches/0.8.0.x/application/models/users/base/BaseUser.class.php
ProjectPier/Branches/0.8.0.x/application/models/users/base/BaseUsers.class.php
ProjectPier/Branches/0.8.0.x/application/models/versons_feed/VersionsFeed.class.php
ProjectPier/Branches/0.8.0.x/application/models/versons_feed/VersionsFeedDownloadLink.class.php
ProjectPier/Branches/0.8.0.x/application/models/versons_feed/VersionsFeedEntry.class.php
ProjectPier/Branches/0.8.0.x/application/views/access/complete_installation.php
ProjectPier/Branches/0.8.0.x/application/views/access/forgot_password.php
ProjectPier/Branches/0.8.0.x/application/views/access/login.php
ProjectPier/Branches/0.8.0.x/application/views/account/edit_avatar.php
ProjectPier/Branches/0.8.0.x/application/views/account/edit_password.php
ProjectPier/Branches/0.8.0.x/application/views/account/edit_profile.php
ProjectPier/Branches/0.8.0.x/application/views/account/index.php
ProjectPier/Branches/0.8.0.x/application/views/account/update_permissions.php
ProjectPier/Branches/0.8.0.x/application/views/administration/clients.php
ProjectPier/Branches/0.8.0.x/application/views/administration/configuration.php
ProjectPier/Branches/0.8.0.x/application/views/administration/index.php
ProjectPier/Branches/0.8.0.x/application/views/administration/list_users.php
ProjectPier/Branches/0.8.0.x/application/views/administration/members.php
ProjectPier/Branches/0.8.0.x/application/views/administration/projects.php
ProjectPier/Branches/0.8.0.x/application/views/administration/tool_mass_mailer.php
ProjectPier/Branches/0.8.0.x/application/views/administration/tool_test_email.php
ProjectPier/Branches/0.8.0.x/application/views/administration/tools.php
ProjectPier/Branches/0.8.0.x/application/views/administration/upgrade.php
ProjectPier/Branches/0.8.0.x/application/views/advanced_pagination.php
ProjectPier/Branches/0.8.0.x/application/views/application/render_application_logs.php
ProjectPier/Branches/0.8.0.x/application/views/application/system_notices.php
ProjectPier/Branches/0.8.0.x/application/views/application/user_box.php
ProjectPier/Branches/0.8.0.x/application/views/comment/add_comment.php
ProjectPier/Branches/0.8.0.x/application/views/comment/object_comments.php
ProjectPier/Branches/0.8.0.x/application/views/comment/post_comment_form.php
ProjectPier/Branches/0.8.0.x/application/views/company/add_company.php
ProjectPier/Branches/0.8.0.x/application/views/company/card.php
ProjectPier/Branches/0.8.0.x/application/views/company/company_card.php
ProjectPier/Branches/0.8.0.x/application/views/company/edit_logo.php
ProjectPier/Branches/0.8.0.x/application/views/company/update_permissions.php
ProjectPier/Branches/0.8.0.x/application/views/company/view_client_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/company/view_company.php
ProjectPier/Branches/0.8.0.x/application/views/config/update_category.php
ProjectPier/Branches/0.8.0.x/application/views/config/update_category_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/dashboard/index.php
ProjectPier/Branches/0.8.0.x/application/views/dashboard/index_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/dashboard/my_projects.php
ProjectPier/Branches/0.8.0.x/application/views/dashboard/my_projects_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/dashboard/my_tasks.php
ProjectPier/Branches/0.8.0.x/application/views/dashboard/my_tasks_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/error/db_connect.php
ProjectPier/Branches/0.8.0.x/application/views/error/error_message.php
ProjectPier/Branches/0.8.0.x/application/views/files/add_file.php
ProjectPier/Branches/0.8.0.x/application/views/files/add_file_revision.php
ProjectPier/Branches/0.8.0.x/application/views/files/add_folder.php
ProjectPier/Branches/0.8.0.x/application/views/files/attach_files.php
ProjectPier/Branches/0.8.0.x/application/views/files/attach_to_object.php
ProjectPier/Branches/0.8.0.x/application/views/files/file_details.php
ProjectPier/Branches/0.8.0.x/application/views/files/index.php
ProjectPier/Branches/0.8.0.x/application/views/files/index_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/files/list_attached_files.php
ProjectPier/Branches/0.8.0.x/application/views/files/order_and_pagination.php
ProjectPier/Branches/0.8.0.x/application/views/form/add_project_form.php
ProjectPier/Branches/0.8.0.x/application/views/form/index.php
ProjectPier/Branches/0.8.0.x/application/views/form/submit.php
ProjectPier/Branches/0.8.0.x/application/views/form/submit_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/form_errors.php
ProjectPier/Branches/0.8.0.x/application/views/message/add_comment.php
ProjectPier/Branches/0.8.0.x/application/views/message/add_message.php
ProjectPier/Branches/0.8.0.x/application/views/message/index.php
ProjectPier/Branches/0.8.0.x/application/views/message/index_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/message/view.php
ProjectPier/Branches/0.8.0.x/application/views/message/view_message.php
ProjectPier/Branches/0.8.0.x/application/views/message/view_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/milestone/add_milestone.php
ProjectPier/Branches/0.8.0.x/application/views/milestone/index.php
ProjectPier/Branches/0.8.0.x/application/views/milestone/index_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/milestone/view.php
ProjectPier/Branches/0.8.0.x/application/views/milestone/view_milestone.php
ProjectPier/Branches/0.8.0.x/application/views/notifier/forgot_password.php
ProjectPier/Branches/0.8.0.x/application/views/notifier/milestone_assigned.php
ProjectPier/Branches/0.8.0.x/application/views/notifier/new_account.php
ProjectPier/Branches/0.8.0.x/application/views/notifier/new_comment.php
ProjectPier/Branches/0.8.0.x/application/views/notifier/new_message.php
ProjectPier/Branches/0.8.0.x/application/views/project/add_project.php
ProjectPier/Branches/0.8.0.x/application/views/project/overview.php
ProjectPier/Branches/0.8.0.x/application/views/project/overview_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/project/people.php
ProjectPier/Branches/0.8.0.x/application/views/project/permissions.php
ProjectPier/Branches/0.8.0.x/application/views/project/search.php
ProjectPier/Branches/0.8.0.x/application/views/project/search_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/project/tags.php
ProjectPier/Branches/0.8.0.x/application/views/tag/project_tag.php
ProjectPier/Branches/0.8.0.x/application/views/task/add_list.php
ProjectPier/Branches/0.8.0.x/application/views/task/add_task.php
ProjectPier/Branches/0.8.0.x/application/views/task/index.php
ProjectPier/Branches/0.8.0.x/application/views/task/index_sidebar.php
ProjectPier/Branches/0.8.0.x/application/views/task/reorder_tasks.php
ProjectPier/Branches/0.8.0.x/application/views/task/task_list.php
ProjectPier/Branches/0.8.0.x/application/views/task/view_list.php
ProjectPier/Branches/0.8.0.x/application/views/user/add_user.php
ProjectPier/Branches/0.8.0.x/application/views/user/card.php
ProjectPier/Branches/0.8.0.x/application/views/user/index.php
ProjectPier/Branches/0.8.0.x/application/views/user/user_card.php
ProjectPier/Branches/0.8.0.x/changes.txt
ProjectPier/Branches/0.8.0.x/config/config.php
ProjectPier/Branches/0.8.0.x/config/empty.config.php
ProjectPier/Branches/0.8.0.x/environment/classes/AutoLoader.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/Cookie.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/CountryCodes.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/Env.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/Error.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/Inflector.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/StringTwister.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/Timezones.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/container/Container.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/container/IContainer.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/container/ObjectContainer.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/controller/ApiController.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/controller/Controller.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/controller/PageController.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/dataaccess/DataManager.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/dataaccess/DataObject.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/dataaccess/DataPagination.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/datetimevalue/DateTimeValue.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/datetimevalue/DateTimeValueLib.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/debug/BenchmarkTimer.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/ControllerDnxError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/DAOValidationError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/DBConnectError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/DBQueryError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/FormSubmissionErrors.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/InvalidControllerActionError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/InvalidEmailAddressError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/InvalidInstanceError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/InvalidParamError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/InvalidUploadError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/LibraryDnxError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/filesystem/DirDnxError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/filesystem/DirNotWritableError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/filesystem/FailedToCreateFolderError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/filesystem/FailedToMoveFileError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/filesystem/FailedToWriteFileError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/filesystem/FileDnxError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/errors/filesystem/FileNotWriableError.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/flash/Flash.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/flash/flash.php
ProjectPier/Branches/0.8.0.x/environment/classes/localization/Localization.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/localization/localization.php
ProjectPier/Branches/0.8.0.x/environment/classes/logger/Logger.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/logger/Logger_Backend.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/logger/Logger_Entry.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/logger/Logger_Session.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/logger/backend/Logger_Backend_File.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/template/Template.class.php
ProjectPier/Branches/0.8.0.x/environment/classes/template/template.php
ProjectPier/Branches/0.8.0.x/environment/constants.php
ProjectPier/Branches/0.8.0.x/environment/environment.php
ProjectPier/Branches/0.8.0.x/environment/functions/files.php
ProjectPier/Branches/0.8.0.x/environment/functions/general.php
ProjectPier/Branches/0.8.0.x/environment/functions/utf.php
ProjectPier/Branches/0.8.0.x/environment/library/database/DB.class.php
ProjectPier/Branches/0.8.0.x/environment/library/database/DBResult.class.php
ProjectPier/Branches/0.8.0.x/environment/library/database/adapters/AbstractDBAdapter.class.php
ProjectPier/Branches/0.8.0.x/environment/library/database/adapters/MysqlDBAdapter.class.php
ProjectPier/Branches/0.8.0.x/environment/library/database/database.php
ProjectPier/Branches/0.8.0.x/environment/library/database/errors/DBAdapterDnx.class.php
ProjectPier/Branches/0.8.0.x/environment/library/database/errors/DBConnectError.class.php
ProjectPier/Branches/0.8.0.x/environment/library/database/errors/DBQueryError.class.php
ProjectPier/Branches/0.8.0.x/environment/templates/benchmark_timer_brief.php
ProjectPier/Branches/0.8.0.x/environment/templates/benchmark_timer_full.php
ProjectPier/Branches/0.8.0.x/environment/templates/dump_error.php
ProjectPier/Branches/0.8.0.x/index.php
ProjectPier/Branches/0.8.0.x/init.php
ProjectPier/Branches/0.8.0.x/language/en_us/actions.php
ProjectPier/Branches/0.8.0.x/language/en_us/administration.php
ProjectPier/Branches/0.8.0.x/language/en_us/countries.php
ProjectPier/Branches/0.8.0.x/language/en_us/emails.php
ProjectPier/Branches/0.8.0.x/language/en_us/errors.php
ProjectPier/Branches/0.8.0.x/language/en_us/general.php
ProjectPier/Branches/0.8.0.x/language/en_us/messages.php
ProjectPier/Branches/0.8.0.x/language/en_us/objects.php
ProjectPier/Branches/0.8.0.x/language/en_us/project_interface.php
ProjectPier/Branches/0.8.0.x/language/en_us/site_interface.php
ProjectPier/Branches/0.8.0.x/language/en_us/timezones.php
ProjectPier/Branches/0.8.0.x/language/en_us.php
ProjectPier/Branches/0.8.0.x/library/feed/Angie_Feed.class.php
ProjectPier/Branches/0.8.0.x/library/feed/Angie_Feed_Author.class.php
ProjectPier/Branches/0.8.0.x/library/feed/Angie_Feed_Item.class.php
ProjectPier/Branches/0.8.0.x/library/feed/Angie_Feed_Renderer.class.php
ProjectPier/Branches/0.8.0.x/library/feed/renderer/Angie_Feed_Renderer_RSS2.class.php
ProjectPier/Branches/0.8.0.x/library/filerepository/FileRepository.class.php
ProjectPier/Branches/0.8.0.x/library/filerepository/backend/FileRepository_Backend.class.php
ProjectPier/Branches/0.8.0.x/library/filerepository/backend/FileRepository_Backend_FileSystem.class.php
ProjectPier/Branches/0.8.0.x/library/filerepository/backend/FileRepository_Backend_MySQL.class.php
ProjectPier/Branches/0.8.0.x/library/filerepository/errors/FileNotInRepositoryError.class.php
ProjectPier/Branches/0.8.0.x/library/filerepository/errors/FileRepositoryAddError.class.php
ProjectPier/Branches/0.8.0.x/library/filerepository/errors/FileRepositoryDeleteError.class.php
ProjectPier/Branches/0.8.0.x/library/icalendar/components/iCalendar_Calendar.class.php
ProjectPier/Branches/0.8.0.x/library/icalendar/components/iCalendar_Component.class.php
ProjectPier/Branches/0.8.0.x/library/icalendar/components/iCalendar_Event.class.php
ProjectPier/Branches/0.8.0.x/library/icalendar/components/iCalendar_Todo.class.php
ProjectPier/Branches/0.8.0.x/library/icalendar/error/iCalendar_InvalidComponentPropertyError.class.php
ProjectPier/Branches/0.8.0.x/library/icalendar/error/iCalendar_InvalidComponentSubcomponentError.class.php
ProjectPier/Branches/0.8.0.x/library/icalendar/iCalendar.class.php
ProjectPier/Branches/0.8.0.x/library/icalendar/iCalendar_PropertyValue.class.php
ProjectPier/Branches/0.8.0.x/library/simplegd/classes/SimpleGdImage.class.php
ProjectPier/Branches/0.8.0.x/library/simplegd/errors/FailedToLoadImageError.class.php
ProjectPier/Branches/0.8.0.x/library/simplegd/errors/FileNotImageError.class.php
ProjectPier/Branches/0.8.0.x/library/simplegd/errors/ImageTypeNotSupportedError.class.php
ProjectPier/Branches/0.8.0.x/library/swift/lib/Swift/Authenticator/POP3SMTP_.php
ProjectPier/Branches/0.8.0.x/library/swift/lib/Swift/Connection/Multi.php
ProjectPier/Branches/0.8.0.x/library/swift/lib/Swift/Connection/NativeMail.php
ProjectPier/Branches/0.8.0.x/library/swift/lib/Swift/Connection/Rotator.php
ProjectPier/Branches/0.8.0.x/library/swift/lib/Swift/Connection/SMTP.php
ProjectPier/Branches/0.8.0.x/library/swift/lib/Swift/Connection/Sendmail.php
ProjectPier/Branches/0.8.0.x/library/swift/lib/Swift/Plugin/Errors.php
ProjectPier/Branches/0.8.0.x/library/swift/lib/Swift/Plugin/Template.php
ProjectPier/Branches/0.8.0.x/library/swift/lib/Swift/Stream/MailProxy.php
ProjectPier/Branches/0.8.0.x/library/swift/lib/Swift/Stream/Processor.php
ProjectPier/Branches/0.8.0.x/library/swift/lib/Swift/Stream.php
ProjectPier/Branches/0.8.0.x/library/swift/swift.php
ProjectPier/Branches/0.8.0.x/library/textile/Textile.class.php
ProjectPier/Branches/0.8.0.x/license.txt
ProjectPier/Branches/0.8.0.x/public/assets/javascript/app.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/modules/addFileForm.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/modules/addMessageForm.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/modules/addProjectForm.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/modules/addTaskForm.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/modules/addUserForm.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/modules/attachFiles.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/modules/attachToObjectForm.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/modules/massmailerForm.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/modules/updatePermissionsForm.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/modules/updateUserPermissions.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/widgets/MoreOptions/widget.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/widgets/UserBoxMenu/widget.css
ProjectPier/Branches/0.8.0.x/public/assets/javascript/widgets/UserBoxMenu/widget.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/animation/animation-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/autocomplete/autocomplete-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/calendar/assets/calendar.css
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/calendar/calendar-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/connection/connection-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/container/assets/container.css
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/container/container-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/container/container_core-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/dom/dom-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/dragdrop/dragdrop-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/event/event-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/fonts/fonts-min.css
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/fonts/fonts.css
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/grids/grids-min.css
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/grids/grids.css
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/menu/assets/menu.css
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/menu/menu-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/reset/reset-min.css
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/reset/reset.css
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/slider/slider-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/treeview/assets/tree.css
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/treeview/treeview-min.js
ProjectPier/Branches/0.8.0.x/public/assets/javascript/yui/yahoo/yahoo-min.js
ProjectPier/Branches/0.8.0.x/public/index.php
ProjectPier/Branches/0.8.0.x/public/install/assets/style.css
ProjectPier/Branches/0.8.0.x/public/install/console.php
ProjectPier/Branches/0.8.0.x/public/install/include.php
ProjectPier/Branches/0.8.0.x/public/install/index.php
ProjectPier/Branches/0.8.0.x/public/install/installation/acInstallation.class.php
ProjectPier/Branches/0.8.0.x/public/install/installation/installation.php
ProjectPier/Branches/0.8.0.x/public/install/installation/steps/ChecksStep.class.php
ProjectPier/Branches/0.8.0.x/public/install/installation/steps/FinishStep.class.php
ProjectPier/Branches/0.8.0.x/public/install/installation/steps/SystemConfigStep.class.php
ProjectPier/Branches/0.8.0.x/public/install/installation/steps/WelcomeStep.class.php
ProjectPier/Branches/0.8.0.x/public/install/installation/templates/__step_controls.php
ProjectPier/Branches/0.8.0.x/public/install/installation/templates/__step_errors.php
ProjectPier/Branches/0.8.0.x/public/install/installation/templates/checks.php
ProjectPier/Branches/0.8.0.x/public/install/installation/templates/config_file.php
ProjectPier/Branches/0.8.0.x/public/install/installation/templates/finish.php
ProjectPier/Branches/0.8.0.x/public/install/installation/templates/layout.php
ProjectPier/Branches/0.8.0.x/public/install/installation/templates/sql/mysql_initial_data.php
ProjectPier/Branches/0.8.0.x/public/install/installation/templates/sql/mysql_schema.php
ProjectPier/Branches/0.8.0.x/public/install/installation/templates/system_config_form.php
ProjectPier/Branches/0.8.0.x/public/install/installation/templates/welcome.php
ProjectPier/Branches/0.8.0.x/public/install/library/classes/ChecklistItem.class.php
ProjectPier/Branches/0.8.0.x/public/install/library/classes/Output.class.php
ProjectPier/Branches/0.8.0.x/public/install/library/classes/Output_Console.class.php
ProjectPier/Branches/0.8.0.x/public/install/library/classes/Output_Html.class.php
ProjectPier/Branches/0.8.0.x/public/install/library/classes/ScriptInstaller.class.php
ProjectPier/Branches/0.8.0.x/public/install/library/classes/ScriptInstallerStep.class.php
ProjectPier/Branches/0.8.0.x/public/install/library/classes/Template.class.php
ProjectPier/Branches/0.8.0.x/public/install/library/constants.php
ProjectPier/Branches/0.8.0.x/public/install/library/functions.php
ProjectPier/Branches/0.8.0.x/public/upgrade/assets/style.css
ProjectPier/Branches/0.8.0.x/public/upgrade/console.php
ProjectPier/Branches/0.8.0.x/public/upgrade/include.php
ProjectPier/Branches/0.8.0.x/public/upgrade/index.php
ProjectPier/Branches/0.8.0.x/public/upgrade/library/classes/ChecklistItem.class.php
ProjectPier/Branches/0.8.0.x/public/upgrade/library/classes/Output.class.php
ProjectPier/Branches/0.8.0.x/public/upgrade/library/classes/Output_Console.class.php
ProjectPier/Branches/0.8.0.x/public/upgrade/library/classes/Output_Html.class.php
ProjectPier/Branches/0.8.0.x/public/upgrade/library/classes/ScriptUpgrader.class.php
ProjectPier/Branches/0.8.0.x/public/upgrade/library/classes/ScriptUpgraderScript.class.php
ProjectPier/Branches/0.8.0.x/public/upgrade/library/functions.php
ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/OnionUpgradeScript.class.php
ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/PapayaUpgradeScript.class.php
ProjectPier/Branches/0.8.0.x/public/upgrade/templates/checklist.php
ProjectPier/Branches/0.8.0.x/public/upgrade/templates/config_file.php
ProjectPier/Branches/0.8.0.x/public/upgrade/templates/db_migration/onion.php
ProjectPier/Branches/0.8.0.x/public/upgrade/templates/layout.php
ProjectPier/Branches/0.8.0.x/readme.txt
ProjectPier/Branches/0.8.0.x/upgrade.txt
ProjectPier/Branches/0.8.0.x/version.php
Added Paths:
-----------
ProjectPier/Branches/0.8.0.x/application/views/company/del_company.php
ProjectPier/Branches/0.8.0.x/application/views/project/del_project.php
ProjectPier/Branches/0.8.0.x/application/views/user/del_user.php
Modified: ProjectPier/Branches/0.8.0.x/.htaccess
===================================================================
--- ProjectPier/Branches/0.8.0.x/.htaccess 2008-02-06 09:36:06 UTC (rev 109)
+++ ProjectPier/Branches/0.8.0.x/.htaccess 2008-02-10 01:45:07 UTC (rev 110)
@@ -1 +1 @@
-AddDefaultCharset utf-8
\ No newline at end of file
+AddDefaultCharset utf-8
Modified: ProjectPier/Branches/0.8.0.x/application/application.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/application.php 2008-02-06 09:36:06 UTC (rev 109)
+++ ProjectPier/Branches/0.8.0.x/application/application.php 2008-02-10 01:45:07 UTC (rev 110)
@@ -20,18 +20,18 @@
try {
CompanyWebsite::init();
- if(config_option('upgrade_check_enabled', false)) {
+ if (config_option('upgrade_check_enabled', false)) {
VersionChecker::check(false);
} // if
- if(config_option('file_storage_adapter', 'mysql') == FILE_STORAGE_FILE_SYSTEM) {
+ if (config_option('file_storage_adapter', 'mysql') == FILE_STORAGE_FILE_SYSTEM) {
FileRepository::setBackend(new FileRepository_Backend_FileSystem(FILES_DIR));
} else {
FileRepository::setBackend(new FileRepository_Backend_MySQL(DB::connection()->getLink(), TABLE_PREFIX));
} // if
PublicFiles::setRepositoryPath(ROOT . '/public/files');
- if(trim(PUBLIC_FOLDER) == '') {
+ if (trim(PUBLIC_FOLDER) == '') {
PublicFiles::setRepositoryUrl(with_slash(ROOT_URL) . 'files');
} else {
PublicFiles::setRepositoryUrl(with_slash(ROOT_URL) . 'public/files');
@@ -45,7 +45,7 @@
// Other type of error? We need to break here
} catch(Exception $e) {
- if(Env::isDebugging()) {
+ if (Env::isDebugging()) {
Env::dumpError($e);
} else {
Logger::log($e, Logger::FATAL);
@@ -53,4 +53,4 @@
} // if
} // if
-?>
\ No newline at end of file
+?>
Modified: ProjectPier/Branches/0.8.0.x/application/controllers/AccessController.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/controllers/AccessController.class.php 2008-02-06 09:36:06 UTC (rev 109)
+++ ProjectPier/Branches/0.8.0.x/application/controllers/AccessController.class.php 2008-02-10 01:45:07 UTC (rev 110)
@@ -1,219 +1,223 @@
-<?php
-
- /**
- * Access login, used for handling login / logout requests
- *
- * @version 1.0
- * @http://www.projectpier.org/
- */
- class AccessController extends ApplicationController {
-
- /**
- * Construct controller
- *
- * @param void
- * @return null
- */
- function __construct() {
- parent::__construct();
-
- $this->setLayout('dialog');
- $this->addHelper('form', 'breadcrumbs', 'pageactions', 'tabbednavigation', 'company_website', 'project_website');
- } // __construct
-
- /**
- * Show and process login form
- *
- * @param void
- * @return null
- */
- function login() {
- $this->addHelper('form');
-
- if(function_exists('logged_user') && (logged_user() instanceof User)) {
- $this->redirectTo('dashboard');
- } // if
-
- $login_data = array_var($_POST, 'login');
- if(!is_array($login_data)) {
- $login_data = array();
- foreach($_GET as $k => $v) {
- if(str_starts_with($k, 'ref_')) $login_data[$k] = $v;
- } // foreach
- } // if
-
- tpl_assign('login_data', $login_data);
-
- if(is_array(array_var($_POST, 'login'))) {
- $username = array_var($login_data, 'username');
- $password = array_var($login_data, 'password');
- $remember = array_var($login_data, 'remember') == 'checked';
-
- if(trim($username == '')) {
- tpl_assign('error', new Error(lang('username value missing')));
- $this->render();
- } // if
-
- if(trim($password) == '') {
- tpl_assign('error', new Error(lang('password value missing')));
- $this->render();
- } // if
-
- $user = Users::getByUsername($username, owner_company());
- if(!($user instanceof User)) {
- tpl_assign('error', new Error(lang('invalid login data')));
- $this->render();
- } // if
-
- if(!$user->isValidPassword($password)) {
- tpl_assign('error', new Error(lang('invalid login data')));
- $this->render();
- } // if
-
- try {
- CompanyWebsite::instance()->logUserIn($user, $remember);
- } catch(Exception $e) {
- tpl_assign('error', new Error(lang('invalid login data')));
- $this->render();
- } // try
-
- $ref_controller = null;
- $ref_action = null;
- $ref_params = array();
-
- foreach($login_data as $k => $v) {
- if(str_starts_with($k, 'ref_')) {
- $ref_var_name = trim(substr($k, 4, strlen($k)));
- switch ($ref_var_name) {
- case 'c':
- $ref_controller = $v;
- break;
- case 'a':
- $ref_action = $v;
- break;
- default:
- $ref_params[$ref_var_name] = $v;
- } // switch
- } // if
- } // if
- if(!count($ref_params)) $ref_params = null;
-
- if($ref_controller && $ref_action) {
- $this->redirectTo($ref_controller, $ref_action, $ref_params);
- } else {
- $this->redirectTo('dashboard');
- } // if
- } // if
- } // login
-
- /**
- * Log user out
- *
- * @access public
- * @param void
- * @return null
- */
- function logout() {
- CompanyWebsite::instance()->logUserOut();
- $this->redirectTo('access', 'login');
- } // logout
-
- /**
- * Render and process forgot password form
- *
- * @param void
- * @return null
- */
- function forgot_password() {
- $your_email = trim(array_var($_POST, 'your_email'));
- tpl_assign('your_email', $your_email);
-
- if(array_var($_POST, 'submited') == 'submited') {
- if(!is_valid_email($your_email)) {
- tpl_assign('error', new InvalidEmailAddressError($your_email, lang('invalid email address')));
- $this->render();
- } // if
-
- $user = Users::getByEmail($your_email);
- if(!($user instanceof User)) {
- flash_error(lang('email address not in use', $your_email));
- $this->redirectTo('access', 'forgot_password');
- } // if
-
- try {
- Notifier::forgotPassword($user);
- flash_success(lang('success forgot password'));
- } catch(Exception $e) {
- flash_error(lang('error forgot password'));
- } // try
-
- $this->redirectTo('access', 'forgot_password');
- } // if
- } // forgot_password
-
- /**
- * Finish the installation - create owner company and administrator
- *
- * @param void
- * @return null
- */
- function complete_installation() {
- if(Companies::getOwnerCompany() instanceof Company) {
- die('Owner company already exists'); // Somebody is trying to access this method even if the user already exists
- } // if
- $this->setLayout('complete_install');
- $form_data = array_var($_POST, 'form');
- tpl_assign('form_data', $form_data);
-
- if(array_var($form_data, 'submited') == 'submited') {
- try {
- $admin_password = trim(array_var($form_data, 'admin_password'));
- $admin_password_a = trim(array_var($form_data, 'admin_password_a'));
-
- if(trim($admin_password) == '') {
- throw new Error(lang('password value required'));
- } // if
-
- if($admin_password <> $admin_password_a) {
- throw new Error(lang('passwords dont match'));
- } // if
-
- DB::beginWork();
-
- Users::delete(); // clear users table
- Companies::delete(); // clear companies table
-
- // Create the administrator user
- $administrator = new User();
- $administrator->setId(1);
- $administrator->setCompanyId(1);
- $administrator->setUsername(array_var($form_data, 'admin_username'));
- $administrator->setEmail(array_var($form_data, 'admin_email'));
- $administrator->setPassword($admin_password);
- $administrator->setIsAdmin(true);
- $administrator->setAutoAssign(true);
-
- $administrator->save();
-
- // Create a company
- $company = new Company();
- $company->setId(1);
- $company->setClientOfId(0);
- $company->setName(array_var($form_data, 'company_name'));
- $company->setCreatedById(1);
-
- $company->save();
-
- DB::commit();
-
- $this->redirectTo('access', 'login');
- } catch(Exception $e) {
- tpl_assign('error', $e);
- DB::rollback();
- } // try
- } // if
- } // complete_installation
-
- } // AccessController
-
-?>
\ No newline at end of file
+<?php
+
+ /**
+ * Access login, used for handling login / logout requests
+ *
+ * @version 1.0
+ * @http://www.projectpier.org/
+ */
+ class AccessController extends ApplicationController {
+
+ /**
+ * Construct controller
+ *
+ * @param void
+ * @return null
+ */
+ function __construct() {
+ parent::__construct();
+
+ $this->setLayout('dialog');
+ $this->addHelper('form', 'breadcrumbs', 'pageactions', 'tabbednavigation', 'company_website', 'project_website');
+ } // __construct
+
+ /**
+ * Show and process login form
+ *
+ * @param void
+ * @return null
+ */
+ function login() {
+ $this->addHelper('form');
+
+ if (function_exists('logged_user') && (logged_user() instanceof User)) {
+ $this->redirectTo('dashboard');
+ } // if
+
+ $login_data = array_var($_POST, 'login');
+ if (!is_array($login_data)) {
+ $login_data = array();
+ foreach ($_GET as $k => $v) {
+ if (str_starts_with($k, 'ref_')) {
+ $login_data[$k] = $v;
+ }
+ } // foreach
+ } // if
+
+ tpl_assign('login_data', $login_data);
+
+ if (is_array(array_var($_POST, 'login'))) {
+ $username = array_var($login_data, 'username');
+ $password = array_var($login_data, 'password');
+ $remember = array_var($login_data, 'remember') == 'checked';
+
+ if (trim($username == '')) {
+ tpl_assign('error', new Error(lang('username value missing')));
+ $this->render();
+ } // if
+
+ if (trim($password) == '') {
+ tpl_assign('error', new Error(lang('password value missing')));
+ $this->render();
+ } // if
+
+ $user = Users::getByUsername($username, owner_company());
+ if (!($user instanceof User)) {
+ tpl_assign('error', new Error(lang('invalid login data')));
+ $this->render();
+ } // if
+
+ if (!$user->isValidPassword($password)) {
+ tpl_assign('error', new Error(lang('invalid login data')));
+ $this->render();
+ } // if
+
+ try {
+ CompanyWebsite::instance()->logUserIn($user, $remember);
+ } catch(Exception $e) {
+ tpl_assign('error', new Error(lang('invalid login data')));
+ $this->render();
+ } // try
+
+ $ref_controller = null;
+ $ref_action = null;
+ $ref_params = array();
+
+ foreach ($login_data as $k => $v) {
+ if (str_starts_with($k, 'ref_')) {
+ $ref_var_name = trim(substr($k, 4, strlen($k)));
+ switch ($ref_var_name) {
+ case 'c':
+ $ref_controller = $v;
+ break;
+ case 'a':
+ $ref_action = $v;
+ break;
+ default:
+ $ref_params[$ref_var_name] = $v;
+ } // switch
+ } // if
+ } // if
+ if (!count($ref_params)) {
+ $ref_params = null;
+ }
+
+ if ($ref_controller && $ref_action) {
+ $this->redirectTo($ref_controller, $ref_action, $ref_params);
+ } else {
+ $this->redirectTo('dashboard');
+ } // if
+ } // if
+ } // login
+
+ /**
+ * Log user out
+ *
+ * @access public
+ * @param void
+ * @return null
+ */
+ function logout() {
+ CompanyWebsite::instance()->logUserOut();
+ $this->redirectTo('access', 'login');
+ } // logout
+
+ /**
+ * Render and process forgot password form
+ *
+ * @param void
+ * @return null
+ */
+ function forgot_password() {
+ $your_email = trim(array_var($_POST, 'your_email'));
+ tpl_assign('your_email', $your_email);
+
+ if (array_var($_POST, 'submited') == 'submited') {
+ if (!is_valid_email($your_email)) {
+ tpl_assign('error', new InvalidEmailAddressError($your_email, lang('invalid email address')));
+ $this->render();
+ } // if
+
+ $user = Users::getByEmail($your_email);
+ if (!($user instanceof User)) {
+ flash_error(lang('email address not in use', $your_email));
+ $this->redirectTo('access', 'forgot_password');
+ } // if
+
+ try {
+ Notifier::forgotPassword($user);
+ flash_success(lang('success forgot password'));
+ } catch(Exception $e) {
+ flash_error(lang('error forgot password'));
+ } // try
+
+ $this->redirectTo('access', 'forgot_password');
+ } // if
+ } // forgot_password
+
+ /**
+ * Finish the installation - create owner company and administrator
+ *
+ * @param void
+ * @return null
+ */
+ function complete_installation() {
+ if (Companies::getOwnerCompany() instanceof Company) {
+ die('Owner company already exists'); // Somebody is trying to access this method even if the user already exists
+ } // if
+ $this->setLayout('complete_install');
+ $form_data = array_var($_POST, 'form');
+ tpl_assign('form_data', $form_data);
+
+ if (array_var($form_data, 'submited') == 'submited') {
+ try {
+ $admin_password = trim(array_var($form_data, 'admin_password'));
+ $admin_password_a = trim(array_var($form_data, 'admin_password_a'));
+
+ if (trim($admin_password) == '') {
+ throw new Error(lang('password value required'));
+ } // if
+
+ if ($admin_password <> $admin_password_a) {
+ throw new Error(lang('passwords dont match'));
+ } // if
+
+ DB::beginWork();
+
+ Users::delete(); // clear users table
+ Companies::delete(); // clear companies table
+
+ // Create the administrator user
+ $administrator = new User();
+ $administrator->setId(1);
+ $administrator->setCompanyId(1);
+ $administrator->setUsername(array_var($form_data, 'admin_username'));
+ $administrator->setEmail(array_var($form_data, 'admin_email'));
+ $administrator->setPassword($admin_password);
+ $administrator->setIsAdmin(true);
+ $administrator->setAutoAssign(true);
+
+ $administrator->save();
+
+ // Create a company
+ $company = new Company();
+ $company->setId(1);
+ $company->setClientOfId(0);
+ $company->setName(array_var($form_data, 'company_name'));
+ $company->setCreatedById(1);
+
+ $company->save();
+
+ DB::commit();
+
+ $this->redirectTo('access', 'login');
+ } catch(Exception $e) {
+ tpl_assign('error', $e);
+ DB::rollback();
+ } // try
+ } // if
+ } // complete_installation
+
+ } // AccessController
+
+?>
Modified: ProjectPier/Branches/0.8.0.x/application/controllers/AccountController.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/controllers/AccountController.class.php 2008-02-06 09:36:06 UTC (rev 109)
+++ ProjectPier/Branches/0.8.0.x/application/controllers/AccountController.class.php 2008-02-10 01:45:07 UTC (rev 110)
@@ -1,397 +1,397 @@
-<?php
-
- /**
- * User account controller with all the parts related to it (profile update, private messages etc)
- *
- * @version 1.0
- * @http://www.projectpier.org/
- */
- class AccountController extends ApplicationController {
-
- /**
- * Construct the AccountController
- *
- * @access public
- * @param void
- * @return AccountController
- */
- function __construct() {
- parent::__construct();
- prepare_company_website_controller($this, 'account');
- } // __construct
-
- /**
- * Show account index page
- *
- * @access public
- * @param void
- * @return null
- */
- function index() {
- tpl_assign('user', logged_user());
- } // index
-
- /**
- * Edit logged user profile
- *
- * @access public
- * @param void
- * @return null
- */
- function edit_profile() {
- $user = Users::findById(get_id());
- if(!($user instanceof User)) {
- flash_error(lang('user dnx'));
- $this->redirectTo('dashboard');
- } // if
-
- $company = $user->getCompany();
- if(!($company instanceof Company)) {
- flash_error(lang('company dnx'));
- $this->redirectToReferer(get_url('administration'));
- } // if
-
- if(!$user->canUpdateProfile(logged_user())) {
- flash_error(lang('no access permissions'));
- $this->redirectTo('dashboard');
- } // if
-
- $redirect_to = array_var($_GET, 'redirect_to');
- if((trim($redirect_to)) == '' || !is_valid_url($redirect_to)) {
- $redirect_to = $user->getCardUrl();
- } // if
- tpl_assign('redirect_to', $redirect_to);
-
- $im_types = ImTypes::findAll(array('order' => '`id`'));
-
- $user_data = array_var($_POST, 'user');
- if(!is_array($user_data)) {
- $user_data = array(
- 'username' => $user->getUsername(),
- 'email' => $user->getEmail(),
- 'display_name' => $user->getDisplayName(),
- 'title' => $user->getTitle(),
- 'office_number' => $user->getOfficeNumber(),
- 'fax_number' => $user->getFaxNumber(),
- 'mobile_number' => $user->getMobileNumber(),
- 'home_number' => $user->getHomeNumber(),
- 'timezone' => $user->getTimezone(),
- 'is_admin' => $user->getIsAdmin(),
- 'auto_assign' => $user->getAutoAssign(),
- 'company_id' => $user->getCompanyId(),
- ); // array
-
- if(is_array($im_types)) {
- foreach($im_types as $im_type) {
- $user_data['im_' . $im_type->getId()] = $user->getImValue($im_type);
- } // forech
- } // if
-
- $default_im = $user->getDefaultImType();
- $user_data['default_im'] = $default_im instanceof ImType ? $default_im->getId() : '';
-
- } // if
-
- tpl_assign('user', $user);
- tpl_assign('company', $company);
- tpl_assign('user_data', $user_data);
- tpl_assign('im_types', $im_types);
-
- if(is_array(array_var($_POST, 'user'))) {
- try {
- DB::beginWork();
-
- $user->setFromAttributes($user_data);
- $user->save();
-
- $user->clearImValues();
-
- foreach($im_types as $im_type) {
- $value = trim(array_var($user_data, 'im_' . $im_type->getId()));
- if($value <> '') {
-
- $user_im_value = new UserImValue();
-
- $user_im_value->setUserId($user->getId());
- $user_im_value->setImTypeId($im_type->getId());
- $user_im_value->setValue($value);
- $user_im_value->setIsDefault(array_var($user_data, 'default_im') == $im_type->getId());
-
- $user_im_value->save();
- } // if
- } // foreach
-
- DB::commit();
-
- flash_success(lang('success update profile'));
- $this->redirectToUrl($redirect_to);
- } catch(Exception $e) {
- DB::rollback();
- tpl_assign('error', $e);
- } // try
- } // if
- } // edit_profile
-
- /**
- * Edit logged user password
- *
- * @access public
- * @param void
- * @return null
- */
- function edit_password() {
- $user = Users::findById(get_id());
- if(!($user instanceof User)) {
- flash_error(lang('user dnx'));
- $this->redirectTo('dashboard');
- } // if
-
- if(!$user->canUpdateProfile(logged_user())) {
- flash_error(lang('no access permissions'))...
[truncated message content] |