Thread: [PP-svn] SF.net SVN: projectpier: [113] ProjectPier/Branches/0.8.0.x
Brought to you by:
projectpier
Menu
▾
▴
projectpier-svn
|
From: <mik...@us...> - 2008-02-11 11:09:49
|
Revision: 113
http://projectpier.svn.sourceforge.net/projectpier/?rev=113&view=rev
Author: miknight
Date: 2008-02-11 03:09:54 -0800 (Mon, 11 Feb 2008)
Log Message:
-----------
Added 0.8.0.1 ChangeLog entries and version numbering
Modified Paths:
--------------
ProjectPier/Branches/0.8.0.x/application/functions.php
ProjectPier/Branches/0.8.0.x/changes.txt
ProjectPier/Branches/0.8.0.x/version.php
Modified: ProjectPier/Branches/0.8.0.x/application/functions.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/functions.php 2008-02-11 10:51:37 UTC (rev 112)
+++ ProjectPier/Branches/0.8.0.x/application/functions.php 2008-02-11 11:09:54 UTC (rev 113)
@@ -149,7 +149,7 @@
*/
function product_version() {
// 0.6 is the last version that comes without PRODUCT_VERSION constant that is set up
- return defined('PRODUCT_VERSION') ? PRODUCT_VERSION : '0.8.0';
+ return defined('PRODUCT_VERSION') ? PRODUCT_VERSION : '0.8.0.1';
} // product_version
/**
Modified: ProjectPier/Branches/0.8.0.x/changes.txt
===================================================================
--- ProjectPier/Branches/0.8.0.x/changes.txt 2008-02-11 10:51:37 UTC (rev 112)
+++ ProjectPier/Branches/0.8.0.x/changes.txt 2008-02-11 11:09:54 UTC (rev 113)
@@ -3,6 +3,15 @@
ProjectPier Change Log
~~~~~~~~~~~~~~~~~~~~~~
+----------------------------
+Version 0.8.0.1 12 Feb 2008
+----------------------------
+
+- Fixed (Node 665) - multiple XSS vulnerabilities
+- Fixed (Node 629) - XSRF when deleting companies, users or projects
+- Fixed (Node 455) - code unified to coding standards
+- Changed all files to be in Unix text file format
+
----------------------------------------------------------
Version 0.8.0 Release Candidate 1 (0.8.0RC1) 03 Sept 2007
----------------------------------------------------------
Modified: ProjectPier/Branches/0.8.0.x/version.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/version.php 2008-02-11 10:51:37 UTC (rev 112)
+++ ProjectPier/Branches/0.8.0.x/version.php 2008-02-11 11:09:54 UTC (rev 113)
@@ -13,6 +13,6 @@
*
*/
- return '0.8.0';
+ return '0.8.0.1';
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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/i...
[truncated message content] |
|
From: <mik...@us...> - 2008-02-15 02:51:50
|
Revision: 118
http://projectpier.svn.sourceforge.net/projectpier/?rev=118&view=rev
Author: miknight
Date: 2008-02-14 18:51:55 -0800 (Thu, 14 Feb 2008)
Log Message:
-----------
Merged r117 from trunk (missing XSRF files) and updated version information
Modified Paths:
--------------
ProjectPier/Branches/0.8.0.x/application/controllers/CompanyController.class.php
ProjectPier/Branches/0.8.0.x/application/controllers/FilesController.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/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/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
ProjectPier/Branches/0.8.0.x/changes.txt
ProjectPier/Branches/0.8.0.x/environment/classes/Inflector.class.php
ProjectPier/Branches/0.8.0.x/version.php
Added Paths:
-----------
ProjectPier/Branches/0.8.0.x/application/views/files/del_file.php
ProjectPier/Branches/0.8.0.x/application/views/message/del_message.php
ProjectPier/Branches/0.8.0.x/application/views/milestone/del_milestone.php
ProjectPier/Branches/0.8.0.x/application/views/task/del_list.php
ProjectPier/Branches/0.8.0.x/application/views/task/del_task.php
Modified: ProjectPier/Branches/0.8.0.x/application/controllers/CompanyController.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/controllers/CompanyController.class.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/application/controllers/CompanyController.class.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -252,8 +252,8 @@
} // if
$delete_data = array_var($_POST, 'deleteCompany');
- tpl_assign('company',$company);
- tpl_assign('delete_data',$delete_data);
+ tpl_assign('company', $company);
+ tpl_assign('delete_data', $delete_data);
if (!is_array($delete_data)) {
$delete_data = array(
Modified: ProjectPier/Branches/0.8.0.x/application/controllers/FilesController.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/controllers/FilesController.class.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/application/controllers/FilesController.class.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -493,8 +493,8 @@
} // if
$delete_data = array_var($_POST, 'deleteFile');
- tpl_assign('file',$file);
- tpl_assign('delete_data',$delete_data);
+ tpl_assign('file', $file);
+ tpl_assign('delete_data', $delete_data);
if (!is_array($delete_data)) {
$delete_data = array(
@@ -621,9 +621,9 @@
} // if
$delete_data = array_var($_POST, 'deleteFileRevision');
- tpl_assign('file',$file);
- tpl_assign('revision',$revision);
- tpl_assign('delete_data',$delete_data);
+ tpl_assign('file', $file);
+ tpl_assign('revision', $revision);
+ tpl_assign('delete_data', $delete_data);
if (!is_array($delete_data)) {
$delete_data = array(
Modified: ProjectPier/Branches/0.8.0.x/application/controllers/MessageController.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/controllers/MessageController.class.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/application/controllers/MessageController.class.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -322,8 +322,8 @@
} // if
$delete_data = array_var($_POST, 'deleteMessage');
- tpl_assign('message',$message);
- tpl_assign('delete_data',$delete_data);
+ tpl_assign('message', $message);
+ tpl_assign('delete_data', $delete_data);
if (!is_array($delete_data)) {
$delete_data = array(
Modified: ProjectPier/Branches/0.8.0.x/application/controllers/MilestoneController.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/controllers/MilestoneController.class.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/application/controllers/MilestoneController.class.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -245,8 +245,8 @@
} // if
$delete_data = array_var($_POST, 'deleteMilestone');
- tpl_assign('milestone',$milestone);
- tpl_assign('delete_data',$delete_data);
+ tpl_assign('milestone', $milestone);
+ tpl_assign('delete_data', $delete_data);
if (!is_array($delete_data)) {
$delete_data = array(
Modified: ProjectPier/Branches/0.8.0.x/application/controllers/ProjectController.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/controllers/ProjectController.class.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/application/controllers/ProjectController.class.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -397,7 +397,7 @@
} // if
$delete_data = array_var($_POST, 'deleteProject');
- tpl_assign('project',$project);
+ tpl_assign('project', $project);
tpl_assign('delete_data', $delete_data);
if (!is_array($delete_data)) {
Modified: ProjectPier/Branches/0.8.0.x/application/controllers/TaskController.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/controllers/TaskController.class.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/application/controllers/TaskController.class.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -216,8 +216,8 @@
} // if
$delete_data = array_var($_POST, 'deleteTaskList');
- tpl_assign('task_list',$task_list);
- tpl_assign('delete_data',$delete_data);
+ tpl_assign('task_list', $task_list);
+ tpl_assign('delete_data', $delete_data);
if (!is_array($delete_data)) {
$delete_data = array(
@@ -479,9 +479,9 @@
} // if
$delete_data = array_var($_POST, 'deleteTask');
- tpl_assign('task',$task);
- tpl_assign('task_list',$task_list);
- tpl_assign('delete_data',$$delete_data);
+ tpl_assign('task', $task);
+ tpl_assign('task_list', $task_list);
+ tpl_assign('delete_data', $delete_data);
if (!is_array($delete_data)) {
$delete_data = array(
Modified: ProjectPier/Branches/0.8.0.x/application/controllers/UserController.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/controllers/UserController.class.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/application/controllers/UserController.class.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -161,8 +161,8 @@
} // if
$delete_data = array_var($_POST, 'deleteUser');
- tpl_assign('user',$user);
- tpl_assign('delete_data',$delete_data);
+ tpl_assign('user', $user);
+ tpl_assign('delete_data', $delete_data);
if (!is_array($delete_data)) {
$delete_data = array(
Modified: ProjectPier/Branches/0.8.0.x/application/functions.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/functions.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/application/functions.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -149,7 +149,7 @@
*/
function product_version() {
// 0.6 is the last version that comes without PRODUCT_VERSION constant that is set up
- return defined('PRODUCT_VERSION') ? PRODUCT_VERSION : '0.8.0.1';
+ return defined('PRODUCT_VERSION') ? PRODUCT_VERSION : '0.8.0.2';
} // product_version
/**
Modified: ProjectPier/Branches/0.8.0.x/application/views/company/del_company.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/views/company/del_company.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/application/views/company/del_company.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -6,19 +6,19 @@
?>
<form action="<?php echo $company->getDeleteClientUrl() ?>" method="post">
-<?php tpl_display(get_template_path('form_errors')) ?>
+ <?php tpl_display(get_template_path('form_errors')) ?>
-<div><?php echo lang('about to delete') ?> <b><?php echo clean($company->getName()) ?></b></div>
+ <div><?php echo lang('about to delete') ?> <b><?php echo clean($company->getName()) ?></b></div>
-<div>
- <label><?php echo lang('confirm delete client') ?></label>
- <?php echo yes_no_widget('deleteCompany[really]', 'deleteCompanyReallyDelete', false, lang('yes'), lang('no')) ?>
-</div>
+ <div>
+ <label><?php echo lang('confirm delete client') ?></label>
+ <?php echo yes_no_widget('deleteCompany[really]', 'deleteCompanyReallyDelete', false, lang('yes'), lang('no')) ?>
+ </div>
-<div>
- <?php echo label_tag(lang('password')) ?>
- <?php echo password_field('deleteCompany[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
-</div>
+ <div>
+ <?php echo label_tag(lang('password')) ?>
+ <?php echo password_field('deleteCompany[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
+ </div>
-<?php echo submit_button(lang('delete client')) ?> <a href="<?php echo get_url('administration','clients') ?>"><?php echo lang('cancel') ?></a>
+ <?php echo submit_button(lang('delete client')) ?> <a href="<?php echo get_url('administration','clients') ?>"><?php echo lang('cancel') ?></a>
</form>
Copied: ProjectPier/Branches/0.8.0.x/application/views/files/del_file.php (from rev 117, ProjectPier/Trunk/application/views/files/del_file.php)
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/views/files/del_file.php (rev 0)
+++ ProjectPier/Branches/0.8.0.x/application/views/files/del_file.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -0,0 +1,24 @@
+<?php
+
+ set_page_title(lang('delete file'));
+ project_tabbed_navigation(PROJECT_TAB_FILES);
+ project_crumbs(lang('delete file'));
+
+?>
+<form action="<?php echo $file->getDeleteUrl() ?>" method="post">
+ <?php tpl_display(get_template_path('form_errors')) ?>
+
+ <div><?php echo lang('about to delete') ?> <?php echo strtolower(lang('file')) ?> <b><?php echo clean($file->getFilename()) ?></b></div>
+
+ <div>
+ <label><?php echo lang('confirm delete file') ?></label>
+ <?php echo yes_no_widget('deleteFile[really]', 'deleteFileReallyDelete', false, lang('yes'), lang('no')) ?>
+ </div>
+
+ <div>
+ <?php echo label_tag(lang('password')) ?>
+ <?php echo password_field('deleteFile[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
+ </div>
+
+ <?php echo submit_button(lang('delete file')) ?> <a href="<?php echo $file->getDetailsUrl() ?>"><?php echo lang('cancel') ?></a>
+</form>
Copied: ProjectPier/Branches/0.8.0.x/application/views/message/del_message.php (from rev 117, ProjectPier/Trunk/application/views/message/del_message.php)
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/views/message/del_message.php (rev 0)
+++ ProjectPier/Branches/0.8.0.x/application/views/message/del_message.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -0,0 +1,24 @@
+<?php
+
+ set_page_title(lang('delete message'));
+ project_tabbed_navigation(PROJECT_TAB_MESSAGES);
+ project_crumbs(lang('delete message'));
+
+?>
+<form action="<?php echo $message->getDeleteUrl() ?>" method="post">
+ <?php tpl_display(get_template_path('form_errors')) ?>
+
+ <div><?php echo lang('about to delete') ?> <?php echo strtolower(lang('message')) ?> <b><?php echo clean($message->getTitle()) ?></b></div>
+
+ <div>
+ <label><?php echo lang('confirm delete message') ?></label>
+ <?php echo yes_no_widget('deleteMessage[really]', 'deleteMessageReallyDelete', false, lang('yes'), lang('no')) ?>
+ </div>
+
+ <div>
+ <?php echo label_tag(lang('password')) ?>
+ <?php echo password_field('deleteMessage[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
+ </div>
+
+ <?php echo submit_button(lang('delete message')) ?> <a href="<?php echo get_url('message') ?>"><?php echo lang('cancel') ?></a>
+</form>
Copied: ProjectPier/Branches/0.8.0.x/application/views/milestone/del_milestone.php (from rev 117, ProjectPier/Trunk/application/views/milestone/del_milestone.php)
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/views/milestone/del_milestone.php (rev 0)
+++ ProjectPier/Branches/0.8.0.x/application/views/milestone/del_milestone.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -0,0 +1,24 @@
+<?php
+
+ set_page_title(lang('delete milestone'));
+ project_tabbed_navigation(PROJECT_TAB_MILESTONES);
+ project_crumbs(lang('delete milestone'));
+
+?>
+<form action="<?php echo $milestone->getDeleteUrl() ?>" method="post">
+ <?php tpl_display(get_template_path('form_errors')) ?>
+
+ <div><?php echo lang('about to delete') ?> <?php echo strtolower(lang('milestone')) ?> <b><?php echo clean($milestone->getName()) ?></b></div>
+
+ <div>
+ <label><?php echo lang('confirm delete milestone') ?></label>
+ <?php echo yes_no_widget('deleteMilestone[really]', 'deleteMilestoneReallyDelete', false, lang('yes'), lang('no')) ?>
+ </div>
+
+ <div>
+ <?php echo label_tag(lang('password')) ?>
+ <?php echo password_field('deleteMilestone[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
+ </div>
+
+ <?php echo submit_button(lang('delete milestone')) ?> <a href="<?php echo get_url('milestone') ?>"><?php echo lang('cancel') ?></a>
+</form>
Modified: ProjectPier/Branches/0.8.0.x/application/views/project/del_project.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/views/project/del_project.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/application/views/project/del_project.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -6,19 +6,19 @@
?>
<form action="<?php echo $project->getDeleteUrl() ?>" method="post">
-<?php tpl_display(get_template_path('form_errors')) ?>
+ <?php tpl_display(get_template_path('form_errors')) ?>
- <div><?php echo lang('about to delete') ?> <b><?php echo clean($project->getName()) ?></b></div>
-
- <div>
- <?php echo label_tag(lang('confirm delete project')) ?>
+ <div><?php echo lang('about to delete') ?> <b><?php echo clean($project->getName()) ?></b></div>
+
+ <div>
+ <label><?php echo label_tag(lang('confirm delete project')) ?></label>
<?php echo yes_no_widget('deleteProject[really]', 'deleteProjectReallyDelete', false, lang('yes'), lang('no')) ?>
- </div>
-
- <div>
+ </div>
+
+ <div>
<?php echo label_tag(lang('password')) ?>
<?php echo password_field('deleteProject[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
- </div>
-
- <?php echo submit_button(lang('delete project')) ?> <a href="<?php echo get_url('administration','projects') ?>"><?php echo lang('cancel') ?></a>
- </form>
+ </div>
+
+ <?php echo submit_button(lang('delete project')) ?> <a href="<?php echo get_url('administration','projects') ?>"><?php echo lang('cancel') ?></a>
+</form>
Copied: ProjectPier/Branches/0.8.0.x/application/views/task/del_list.php (from rev 117, ProjectPier/Trunk/application/views/task/del_list.php)
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/views/task/del_list.php (rev 0)
+++ ProjectPier/Branches/0.8.0.x/application/views/task/del_list.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -0,0 +1,24 @@
+<?php
+
+ set_page_title(lang('delete task list'));
+ project_tabbed_navigation(PROJECT_TAB_TASKS);
+ project_crumbs(lang('delete task list'));
+
+?>
+<form action="<?php echo $task_list->getDeleteUrl() ?>" method="post">
+ <?php tpl_display(get_template_path('form_errors')) ?>
+
+ <div><?php echo lang('about to delete') ?> <?php echo strtolower(lang('task list')) ?> <b><?php echo clean($task_list->getName()) ?></b></div>
+
+ <div>
+ <label><?php echo lang('confirm delete task list') ?></label>
+ <?php echo yes_no_widget('deleteTaskList[really]', 'deleteTaskListReallyDelete', false, lang('yes'), lang('no')) ?>
+ </div>
+
+ <div>
+ <?php echo label_tag(lang('password')) ?>
+ <?php echo password_field('deleteTaskList[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
+ </div>
+
+ <?php echo submit_button(lang('delete task list')) ?> <a href="<?php echo $task_list->getViewUrl() ?>"><?php echo lang('cancel') ?></a>
+</form>
Copied: ProjectPier/Branches/0.8.0.x/application/views/task/del_task.php (from rev 117, ProjectPier/Trunk/application/views/task/del_task.php)
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/views/task/del_task.php (rev 0)
+++ ProjectPier/Branches/0.8.0.x/application/views/task/del_task.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -0,0 +1,24 @@
+<?php
+
+ set_page_title(lang('delete task'));
+ project_tabbed_navigation(PROJECT_TAB_TASKS);
+ project_crumbs(lang('delete task'));
+
+?>
+<form action="<?php echo $task->getDeleteUrl() ?>" method="post">
+ <?php tpl_display(get_template_path('form_errors')) ?>
+
+ <div><?php echo lang('about to delete') ?> <?php echo strtolower(lang('task')) ?> <b><?php echo $task->getText() ?></b> from <?php echo strtolower(lang('task list')) ?> <b><?php echo clean($task_list->getName()) ?></div>
+
+ <div>
+ <label><?php echo lang('confirm delete task') ?></label>
+ <?php echo yes_no_widget('deleteTask[really]', 'deleteTaskReallyDelete', false, lang('yes'), lang('no')) ?>
+ </div>
+
+ <div>
+ <?php echo label_tag(lang('password')) ?>
+ <?php echo password_field('deleteTask[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
+ </div>
+
+ <?php echo submit_button(lang('delete task')) ?> <a href="<?php echo $task_list->getViewUrl() ?>"><?php echo lang('cancel') ?></a>
+</form>
Modified: ProjectPier/Branches/0.8.0.x/application/views/user/del_user.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/views/user/del_user.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/application/views/user/del_user.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -6,19 +6,19 @@
?>
<form action="<?php echo $user->getDeleteUrl() ?>" method="post">
-<?php tpl_display(get_template_path('form_errors')) ?>
+ <?php tpl_display(get_template_path('form_errors')) ?>
-<div><?php echo lang('about to delete') ?> <b><?php echo clean($user->getDisplayName()) ?></b></div>
+ <div><?php echo lang('about to delete') ?> <b><?php echo clean($user->getDisplayName()) ?></b></div>
-<div>
- <label><?php echo lang('confirm delete user') ?></label>
- <?php echo yes_no_widget('deleteUser[really]', 'deleteUserReallyDelete', false, lang('yes'), lang('no')) ?>
-</div>
+ <div>
+ <label><?php echo lang('confirm delete user') ?></label>
+ <?php echo yes_no_widget('deleteUser[really]', 'deleteUserReallyDelete', false, lang('yes'), lang('no')) ?>
+ </div>
-<div>
- <?php echo label_tag(lang('password')) ?>
- <?php echo password_field('deleteUser[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
-</div>
+ <div>
+ <?php echo label_tag(lang('password')) ?>
+ <?php echo password_field('deleteUser[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
+ </div>
-<?php echo submit_button(lang('delete user')) ?> <a href="<?php echo $user->getCompany()->getViewUrl() ?>"><?php echo lang('cancel') ?></a>
+ <?php echo submit_button(lang('delete user')) ?> <a href="<?php echo $user->getCompany()->getViewUrl() ?>"><?php echo lang('cancel') ?></a>
</form>
Modified: ProjectPier/Branches/0.8.0.x/changes.txt
===================================================================
--- ProjectPier/Branches/0.8.0.x/changes.txt 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/changes.txt 2008-02-15 02:51:55 UTC (rev 118)
@@ -4,6 +4,13 @@
~~~~~~~~~~~~~~~~~~~~~~
----------------------------
+Version 0.8.0.2 15 Feb 2008
+----------------------------
+
+- Fixed (Node 629) - Added missing XSRF files from 0.8.0.1
+- Minor code cleanups
+
+----------------------------
Version 0.8.0.1 12 Feb 2008
----------------------------
Modified: ProjectPier/Branches/0.8.0.x/environment/classes/Inflector.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/environment/classes/Inflector.class.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/environment/classes/Inflector.class.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -106,7 +106,7 @@
* @return string Camelized word. likeThis.
*/
static function camelize($lower_case_and_underscored_word) {
- return str_replace(" ","",ucwords(str_replace("_"," ",$lower_case_and_underscored_word)));
+ return str_replace(" ","",ucwords(str_replace("_", " ", $lower_case_and_underscored_word)));
}
/**
@@ -116,8 +116,8 @@
* @return string Underscore-syntaxed version of the $camel_cased_word
*/
static function underscore($camel_cased_word) {
- $camel_cased_word = preg_replace('/([A-Z]+)([A-Z])/','\1_\2', $camel_cased_word);
- return strtolower(preg_replace('/([a-z])([A-Z])/','\1_\2', $camel_cased_word));
+ $camel_cased_word = preg_replace('/([A-Z]+)([A-Z])/', '\1_\2', $camel_cased_word);
+ return strtolower(preg_replace('/([a-z])([A-Z])/', '\1_\2', $camel_cased_word));
}
/**
@@ -128,7 +128,7 @@
* @return string Human-readable string
*/
static function humanize($lower_case_and_underscored_word) {
- return ucwords(str_replace("_"," ",$lower_case_and_underscored_word));
+ return ucwords(str_replace("_", " ", $lower_case_and_underscored_word));
}
} // Inflector
Modified: ProjectPier/Branches/0.8.0.x/version.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/version.php 2008-02-15 02:22:46 UTC (rev 117)
+++ ProjectPier/Branches/0.8.0.x/version.php 2008-02-15 02:51:55 UTC (rev 118)
@@ -13,6 +13,6 @@
*
*/
- return '0.8.0.1';
+ return '0.8.0.2';
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-02-17 05:12:50
|
Revision: 122
http://projectpier.svn.sourceforge.net/projectpier/?rev=122&view=rev
Author: miknight
Date: 2008-02-16 21:12:56 -0800 (Sat, 16 Feb 2008)
Log Message:
-----------
Merged r121 from trunk (more missing XSRF files)
Modified Paths:
--------------
ProjectPier/Branches/0.8.0.x/application/controllers/FilesController.class.php
ProjectPier/Branches/0.8.0.x/application/views/files/index_sidebar.php
ProjectPier/Branches/0.8.0.x/language/en_us/actions.php
Added Paths:
-----------
ProjectPier/Branches/0.8.0.x/application/views/files/del_folder.php
ProjectPier/Branches/0.8.0.x/application/views/files/del_revision.php
Modified: ProjectPier/Branches/0.8.0.x/application/controllers/FilesController.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/controllers/FilesController.class.php 2008-02-17 05:07:58 UTC (rev 121)
+++ ProjectPier/Branches/0.8.0.x/application/controllers/FilesController.class.php 2008-02-17 05:12:56 UTC (rev 122)
@@ -203,6 +203,8 @@
* @return null
*/
function delete_folder() {
+ $this->setTemplate('del_folder');
+
$folder = ProjectFolders::findById(get_id());
if (!($folder instanceof ProjectFolder)) {
flash_error(lang('folder dnx'));
@@ -213,20 +215,45 @@
flash_error(lang('no access permissions'));
$this->redirectToReferer(get_url('files'));
} // if
+
+ $delete_data = array_var($_POST, 'deleteFolder');
+ tpl_assign('folder', $folder);
+ tpl_assign('delete_data', $delete_data);
- try {
- DB::beginWork();
- $folder->delete();
- ApplicationLogs::createLog($folder, active_project(), ApplicationLogs::ACTION_DELETE);
- DB::commit();
-
- flash_success(lang('success delete folder', $folder->getName()));
- } catch(Exception $e) {
- DB::rollback();
+ if (!is_array($delete_data)) {
+ $delete_data = array(
+ 'really' => 0,
+ 'password' => '',
+ ); // array
+ tpl_assign('delete_data', $delete_data);
+ } else if ($delete_data['really'] == 1) {
+ $password = $delete_data['password'];
+ if (trim($password) == '') {
+ tpl_assign('error', new Error(lang('password value missing')));
+ return $this->render();
+ }
+ if (!logged_user()->isValidPassword($password)) {
+ tpl_assign('error', new Error(lang('invalid login data')));
+ return $this->render();
+ }
+
+ try {
+ DB::beginWork();
+ $folder->delete();
+ ApplicationLogs::createLog($folder, active_project(), ApplicationLogs::ACTION_DELETE);
+ DB::commit();
+
+ flash_success(lang('success delete folder', $folder->getName()));
+ } catch(Exception $e) {
+ DB::rollback();
+ flash_error(lang('error delete folder'));
+ } // try
+
+ $this->redirectTo('files');
+ } else {
flash_error(lang('error delete folder'));
- } // try
-
- $this->redirectTo('files');
+ $this->redirectToUrl($folder->getDetailsUrl());
+ }
} // delete_folder
// ---------------------------------------------------
Added: ProjectPier/Branches/0.8.0.x/application/views/files/del_folder.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/views/files/del_folder.php (rev 0)
+++ ProjectPier/Branches/0.8.0.x/application/views/files/del_folder.php 2008-02-17 05:12:56 UTC (rev 122)
@@ -0,0 +1,24 @@
+<?php
+
+ set_page_title(lang('delete folder'));
+ project_tabbed_navigation(PROJECT_TAB_FILES);
+ project_crumbs(lang('delete folder'));
+
+?>
+<form action="<?php echo $folder->getDeleteUrl() ?>" method="post">
+ <?php tpl_display(get_template_path('form_errors')) ?>
+
+ <div><?php echo lang('about to delete') ?> <?php echo strtolower(lang('folder')) ?> <b><?php echo clean($folder->getName()) ?></b></div>
+
+ <div>
+ <label><?php echo lang('confirm delete folder') ?></label>
+ <?php echo yes_no_widget('deleteFolder[really]', 'deleteFolderReallyDelete', false, lang('yes'), lang('no')) ?>
+ </div>
+
+ <div>
+ <?php echo label_tag(lang('password')) ?>
+ <?php echo password_field('deleteFolder[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
+ </div>
+
+ <?php echo submit_button(lang('delete folder')) ?> <a href="<?php echo $folder->getBrowseUrl() ?>"><?php echo lang('cancel') ?></a>
+</form>
Added: ProjectPier/Branches/0.8.0.x/application/views/files/del_revision.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/views/files/del_revision.php (rev 0)
+++ ProjectPier/Branches/0.8.0.x/application/views/files/del_revision.php 2008-02-17 05:12:56 UTC (rev 122)
@@ -0,0 +1,24 @@
+<?php
+
+ set_page_title(lang('delete file revision'));
+ project_tabbed_navigation(PROJECT_TAB_FILES);
+ project_crumbs(lang('delete file revision'));
+
+?>
+<form action="<?php echo $revision->getDeleteUrl() ?>" method="post">
+ <?php tpl_display(get_template_path('form_errors')) ?>
+
+ <div><?php echo lang('about to delete') ?> <?php echo strtolower(lang('revision')) ?> <b><?php echo clean($revision->getObjectName()) ?></b></div>
+
+ <div>
+ <label><?php echo lang('confirm delete revision') ?></label>
+ <?php echo yes_no_widget('deleteFileRevision[really]', 'deleteFileRevisionReallyDelete', false, lang('yes'), lang('no')) ?>
+ </div>
+
+ <div>
+ <?php echo label_tag(lang('password')) ?>
+ <?php echo password_field('deleteFileRevision[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
+ </div>
+
+ <?php echo submit_button(lang('delete file revision')) ?> <a href="<?php echo $revision->getDetailsUrl() ?>"><?php echo lang('cancel') ?></a>
+</form>
Modified: ProjectPier/Branches/0.8.0.x/application/views/files/index_sidebar.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/views/files/index_sidebar.php 2008-02-17 05:07:58 UTC (rev 121)
+++ ProjectPier/Branches/0.8.0.x/application/views/files/index_sidebar.php 2008-02-17 05:12:56 UTC (rev 122)
@@ -11,9 +11,9 @@
<?php foreach ($folders as $folder) { ?>
<?php if (($current_folder instanceof ProjectFolder) && ($current_folder->getId() == $folder->getId())) { ?>
- <li><a href="<?php echo $folder->getBrowseUrl($order) ?>" class="selected"><?php echo clean($folder->getName()) ?></a> <?php if ($folder->canEdit(logged_user())) { ?><a href="<?php echo $folder->getEditUrl() ?>" class="blank" title="<?php echo lang('edit folder') ?>"><img src="<?php echo icon_url('edit.gif') ?>" alt="" /></a><?php } // if ?> <?php if ($folder->canDelete(logged_user())) { ?><a href="<?php echo $folder->getDeleteUrl() ?>" class="blank" onclick="return confirm('<?php echo lang('confirm delete folder') ?>')" title="<?php echo lang('delete folder') ?>"><img src="<?php echo icon_url('cancel_gray.gif') ?>" alt="" /></a><?php } // if ?></li>
+ <li><a href="<?php echo $folder->getBrowseUrl($order) ?>" class="selected"><?php echo clean($folder->getName()) ?></a> <?php if ($folder->canEdit(logged_user())) { ?><a href="<?php echo $folder->getEditUrl() ?>" class="blank" title="<?php echo lang('edit folder') ?>"><img src="<?php echo icon_url('edit.gif') ?>" alt="" /></a><?php } // if ?> <?php if ($folder->canDelete(logged_user())) { ?><a href="<?php echo $folder->getDeleteUrl() ?>" class="blank" title="<?php echo lang('delete folder') ?>"><img src="<?php echo icon_url('cancel_gray.gif') ?>" alt="" /></a><?php } // if ?></li>
<?php } else { ?>
- <li><a href="<?php echo $folder->getBrowseUrl($order) ?>"><?php echo clean($folder->getName()) ?></a> <?php if ($folder->canEdit(logged_user())) { ?><a href="<?php echo $folder->getEditUrl() ?>" class="blank" title="<?php echo lang('edit folder') ?>"><img src="<?php echo icon_url('edit.gif') ?>" alt="" /></a><?php } // if ?> <?php if ($folder->canDelete(logged_user())) { ?><a href="<?php echo $folder->getDeleteUrl() ?>" class="blank" onclick="return confirm('<?php echo lang('confirm delete folder') ?>')" title="<?php echo lang('delete folder') ?>"><img src="<?php echo icon_url('cancel_gray.gif') ?>" alt="" /></a><?php } // if ?></li>
+ <li><a href="<?php echo $folder->getBrowseUrl($order) ?>"><?php echo clean($folder->getName()) ?></a> <?php if ($folder->canEdit(logged_user())) { ?><a href="<?php echo $folder->getEditUrl() ?>" class="blank" title="<?php echo lang('edit folder') ?>"><img src="<?php echo icon_url('edit.gif') ?>" alt="" /></a><?php } // if ?> <?php if ($folder->canDelete(logged_user())) { ?><a href="<?php echo $folder->getDeleteUrl() ?>" class="blank" title="<?php echo lang('delete folder') ?>"><img src="<?php echo icon_url('cancel_gray.gif') ?>" alt="" /></a><?php } // if ?></li>
<?php } // if ?>
<?php } // foreach ?>
</ul>
Modified: ProjectPier/Branches/0.8.0.x/language/en_us/actions.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/language/en_us/actions.php 2008-02-17 05:07:58 UTC (rev 121)
+++ ProjectPier/Branches/0.8.0.x/language/en_us/actions.php 2008-02-17 05:12:56 UTC (rev 122)
@@ -91,6 +91,7 @@
'delete folder' => 'Delete folder',
'edit file revisions' => 'Edit revision',
+ 'delete file revision' => 'Delete revision',
'attach file' => 'Attach file',
'attach files' => 'Attach files',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-02-24 07:29:48
|
Revision: 134
http://projectpier.svn.sourceforge.net/projectpier/?rev=134&view=rev
Author: miknight
Date: 2008-02-23 23:29:54 -0800 (Sat, 23 Feb 2008)
Log Message:
-----------
Merged r132 from trunk (message comment email notification fix)
Modified Paths:
--------------
ProjectPier/Branches/0.8.0.x/application/models/notifier/Notifier.class.php
ProjectPier/Branches/0.8.0.x/language/en_us/errors.php
ProjectPier/Branches/0.8.0.x/language/en_us/site_interface.php
Modified: ProjectPier/Branches/0.8.0.x/application/models/notifier/Notifier.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/application/models/notifier/Notifier.class.php 2008-02-24 07:12:12 UTC (rev 133)
+++ ProjectPier/Branches/0.8.0.x/application/models/notifier/Notifier.class.php 2008-02-24 07:29:54 UTC (rev 134)
@@ -83,13 +83,13 @@
tpl_assign('new_message', $message);
- $recepients = array();
+ $recipients = array();
foreach ($people as $user) {
- $recepients[] = self::prepareEmailAddress($user->getEmail(), $user->getDisplayName());
+ $recipients[] = self::prepareEmailAddress($user->getEmail(), $user->getDisplayName());
} // foreach
return self::sendEmail(
- $recepients,
+ $recipients,
self::prepareEmailAddress($message->getCreatedBy()->getEmail(), $message->getCreatedByDisplayName()),
$message->getProject()->getName() . ' - ' . $message->getTitle(),
tpl_fetch(get_template_path('new_message', 'notifier'))
@@ -114,7 +114,7 @@
return true; // no subscribers
} // if
- $recepients = array();
+ $recipients = array();
foreach ($all_subscribers as $subscriber) {
if ($subscriber->getId() == $comment->getCreatedById()) {
continue; // skip comment author
@@ -122,15 +122,15 @@
if ($comment->isPrivate()) {
if ($subscriber->isMemberOfOwnerCompany()) {
- $recepients[] = self::prepareEmailAddress($subscriber->getEmail(), $subscriber->getDisplayName());
+ $recipients[] = self::prepareEmailAddress($subscriber->getEmail(), $subscriber->getDisplayName());
} // if
} else {
- $recepients[] = self::prepareEmailAddress($subscriber->getEmail(), $subscriber->getDisplayName());
+ $recipients[] = self::prepareEmailAddress($subscriber->getEmail(), $subscriber->getDisplayName());
} // of
} // foreach
- if (!count($recepients)) {
- return true; // no recepients
+ if (!count($recipients)) {
+ return true; // no recipients
} // if
tpl_assign('new_comment', $comment);
Modified: ProjectPier/Branches/0.8.0.x/language/en_us/errors.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/language/en_us/errors.php 2008-02-24 07:12:12 UTC (rev 133)
+++ ProjectPier/Branches/0.8.0.x/language/en_us/errors.php 2008-02-24 07:29:54 UTC (rev 134)
@@ -101,7 +101,7 @@
// Mass mailer
'massmailer subject required' => 'Message subject is required',
'massmailer message required' => 'Message body is required',
- 'massmailer select recepients' => 'Please select users that will receive this email',
+ 'massmailer select recipients' => 'Please select users that will receive this email',
); // array
Modified: ProjectPier/Branches/0.8.0.x/language/en_us/site_interface.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/language/en_us/site_interface.php 2008-02-24 07:12:12 UTC (rev 133)
+++ ProjectPier/Branches/0.8.0.x/language/en_us/site_interface.php 2008-02-24 07:29:54 UTC (rev 134)
@@ -79,7 +79,7 @@
// Tools
'administration tools' => 'Tools',
- 'test mail recepient' => 'Test recepient',
+ 'test mail recipient' => 'Test recipient',
'test mail message' => 'Test message',
'test mail message subject' => 'Test subject',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rcr...@us...> - 2008-06-16 08:43:00
|
Revision: 160
http://projectpier.svn.sourceforge.net/projectpier/?rev=160&view=rev
Author: rcrossvs
Date: 2008-06-16 01:43:05 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
provides upgrade script for 0.8.3, which fixes timezone #588. Thanks to Phil Hord for help
Modified Paths:
--------------
ProjectPier/Branches/0.8.0.x/init.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/version.php
Added Paths:
-----------
ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/RhubarbUpgradeScript.class.php
Modified: ProjectPier/Branches/0.8.0.x/init.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/init.php 2008-04-28 05:06:08 UTC (rev 159)
+++ ProjectPier/Branches/0.8.0.x/init.php 2008-06-16 08:43:05 UTC (rev 160)
@@ -59,7 +59,7 @@
define('PRODUCT_NAME', 'ProjectPier');
if (!defined('PRODUCT_VERSION')) {
- define('PRODUCT_VERSION', '0.8');
+ define('PRODUCT_VERSION', '0.8.0.3');
} // if
define('MAX_SEARCHABLE_FILE_SIZE', 1048576); // if file type is searchable script will load its content into search index. Using this constant you can set the max filesize of the file that will be imported. Noone wants 500MB in search index for single file
Modified: ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/OnionUpgradeScript.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/OnionUpgradeScript.class.php 2008-04-28 05:06:08 UTC (rev 159)
+++ ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/OnionUpgradeScript.class.php 2008-06-16 08:43:05 UTC (rev 160)
@@ -64,13 +64,22 @@
$config_is_set = require_once INSTALLATION_PATH . '/config/config.php';
if (!$config_is_set) {
- $this->printMessage('Valid config files was not found!', true);
+ $this->printMessage('Valid config file was not found!', true);
return false;
} else {
$this->printMessage('Config file found and loaded.');
} // if
// ---------------------------------------------------
+ // Check for version match (pre-0.7.0 had no version?)
+ // ---------------------------------------------------
+
+ if (defined('PRODUCT_VERSION') && PRODUCT_VERSION !== '0.6') {
+ $this->printMessage('This upgrade script can be used only to upgrade 0.6 to 0.7', true);
+ return false;
+ } // if
+
+ // ---------------------------------------------------
// Check if files and folders are writable
// ---------------------------------------------------
@@ -368,7 +377,7 @@
'ROOT_URL' => ROOT_URL,
'DEFAULT_LOCALIZATION' => DEFAULT_LOCALIZATION,
'DEBUG' => false,
- 'PRODUCT_VERSION' => require INSTALLATION_PATH . '/version.php',
+ 'PRODUCT_VERSION' => $this->getVersionTo(),
); // array
tpl_assign('config_file_constants', $constants);
if (file_put_contents(INSTALLATION_PATH . '/config/config.php', tpl_fetch(get_template_path('config_file')))) {
Modified: ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/PapayaUpgradeScript.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/PapayaUpgradeScript.class.php 2008-04-28 05:06:08 UTC (rev 159)
+++ ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/PapayaUpgradeScript.class.php 2008-06-16 08:43:05 UTC (rev 160)
@@ -23,8 +23,8 @@
*/
function __construct(Output $output) {
parent::__construct($output);
- $this->setVersionFrom('0.8.0');
- $this->setVersionTo('0.8.0');
+ $this->setVersionFrom('0.7');
+ $this->setVersionTo('0.7.1');
} // __construct
/**
@@ -49,7 +49,7 @@
} // if
if (PRODUCT_VERSION == '0.7.1') {
- $this->printMessage('You are already running ProjectPier 0.8.0');
+ $this->printMessage('You are already running activeCollab 0.7.1');
return true;
} // if
@@ -135,7 +135,7 @@
} // if
if (mysql_query('COMMIT')) {
- $this->printMessage('ProjectPier has been upgraded. You are now running ProjectPier 0.8.0 Enjoy!');
+ $this->printMessage('activeCollab has been upgraded. You are now running activeCollab 0.7.1. Enjoy!');
return true;
} else {
$this->printMessage('Failed to commit updates. Upgrade process failed!', true);
@@ -214,7 +214,7 @@
'ROOT_URL' => ROOT_URL,
'DEFAULT_LOCALIZATION' => DEFAULT_LOCALIZATION,
'DEBUG' => false,
- 'PRODUCT_VERSION' => require INSTALLATION_PATH . '/version.php',
+ 'PRODUCT_VERSION' => $this->getVersionTo(),
); // array
tpl_assign('config_file_constants', $constants);
if (file_put_contents(INSTALLATION_PATH . '/config/config.php', tpl_fetch(get_template_path('config_file')))) {
Added: ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/RhubarbUpgradeScript.class.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/RhubarbUpgradeScript.class.php (rev 0)
+++ ProjectPier/Branches/0.8.0.x/public/upgrade/scripts/RhubarbUpgradeScript.class.php 2008-06-16 08:43:05 UTC (rev 160)
@@ -0,0 +1,230 @@
+<?php
+
+ /**
+ * Upgrade from 0.7.1/0.8.0.x to 0.8.0.3
+ *
+ * @package ScriptUpgrader.scripts
+ * @http://www.projectpier.org/
+ */
+ class RhubarbUpgradeScript extends ScriptUpgraderScript {
+
+ /**
+ * Database connection link
+ *
+ * @var resource
+ */
+ private $database_connection = null;
+
+ /**
+ * Construct the RhubarbUpgradeScript
+ *
+ * @param Output $output
+ * @return RhubarbUpgradeScript
+ */
+ function __construct(Output $output) {
+ parent::__construct($output);
+ $this->setVersionFrom('0.8.0');
+ $this->setVersionTo('0.8.0.3');
+ } // __construct
+
+ /**
+ * Execute the script
+ *
+ * @param void
+ * @return boolean
+ */
+ function execute() {
+ define('ROOT', realpath(dirname(__FILE__) . '/../../../'));
+
+ // ---------------------------------------------------
+ // Load config
+ // ---------------------------------------------------
+
+ $config_is_set = require_once INSTALLATION_PATH . '/config/config.php';
+ if (!$config_is_set) {
+ $this->printMessage('Valid config file was not found!', true);
+ return false;
+ } else {
+ $this->printMessage('Config file found and loaded.');
+ }
+
+ if (PRODUCT_VERSION == '0.8.0.3') {
+ $this->printMessage('You are already running ProjectPier 0.8.0.3');
+ return true;
+ }
+
+ if (PRODUCT_VERSION !== '0.7.1' &&
+ preg_match('/^0\.8\.0(?:\.[0-3])?$/', PRODUCT_VERSION) == 0) {
+ $this->printMessage('This upgrade script can be used only to upgrade 0.7.1 or 0.8.0.x to 0.8.0.3', true);
+ return false;
+ }
+
+ // ---------------------------------------------------
+ // Connect to database
+ // ---------------------------------------------------
+
+ if ($this->database_connection = mysql_connect(DB_HOST, DB_USER, DB_PASS)) {
+ if (mysql_select_db(DB_NAME, $this->database_connection)) {
+ $this->printMessage('Upgrade script has connected to the database.');
+ } else {
+ $this->printMessage('Failed to select database ' . DB_NAME);
+ return false;
+ } // if
+ } else {
+ $this->printMessage('Failed to connect to database');
+ return false;
+ } // if
+
+ // ---------------------------------------------------
+ // Check MySQL version
+ // ---------------------------------------------------
+
+ $mysql_version = mysql_get_server_info($this->database_connection);
+ if ($mysql_version && version_compare($mysql_version, '4.1', '>=')) {
+ $constants['DB_CHARSET'] = 'utf8';
+ mysql_query("SET NAMES 'utf8'", $this->database_connection);
+ tpl_assign('default_collation', $default_collation = 'collate utf8_unicode_ci');
+ tpl_assign('default_charset', $default_charset = 'DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci');
+ } else {
+ tpl_assign('default_collation', $default_collation = '');
+ tpl_assign('default_charset', $default_charset = '');
+ } // if
+
+ tpl_assign('table_prefix', TABLE_PREFIX);
+
+ // ---------------------------------------------------
+ // Check test query
+ // ---------------------------------------------------
+
+ $test_table_name = TABLE_PREFIX . 'test_table';
+ $test_table_sql = "CREATE TABLE `$test_table_name` (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `name` varchar(50) $default_collation NOT NULL default '',
+ PRIMARY KEY (`id`)
+ ) ENGINE=InnoDB $default_charset;";
+
+ if (mysql_query($test_table_sql, $this->database_connection)) {
+ $this->printMessage('Test query has been executed. Its safe to proceed with database migration.');
+ mysql_query("DROP TABLE `$test_table_name`", $this->database_connection);
+ } else {
+ $this->printMessage('Failed to executed test query. MySQL said: ' . mysql_error($this->database_connection), true);
+ return false;
+ }
+
+ //return ;
+
+ // ---------------------------------------------------
+ // Execute migration
+ // ---------------------------------------------------
+
+ mysql_query('BEGIN WORK');
+
+ if ($this->fixTimezone() === false) {
+ mysql_query('ROLLBACK');
+ $this->printMessage('Upgrade process failed!', true);
+ return false;
+ }
+
+ if (!mysql_query('COMMIT')) {
+ $this->printMessage('Failed to commit updates. Upgrade process failed!', true);
+ return false;
+ }
+
+ $this->fixConfigFile();
+
+ $this->printMessage('ProjectPier has been upgraded. You are now running ProjectPier '.$this->getVersionTo().' Enjoy!');
+ }
+
+ /**
+ * Fix the timezone columns
+ *
+ * @param void
+ * @return null
+ */
+ function fixTimezone() {
+ $users_table = TABLE_PREFIX . 'users';
+ if (mysql_query("ALTER TABLE `$users_table` MODIFY COLUMN `timezone` FLOAT(3,1) NOT NULL DEFAULT '0.0'", $this->database_connection)) {
+ $this->printMessage('Users table has been updated');
+ } else {
+ $this->printMessage('Failed to update users table. MySQL said: ' . mysql_error($this->database_connection), true);
+ return false;
+ }
+ $companies_table = TABLE_PREFIX . 'companies';
+ if (mysql_query("ALTER TABLE `$companies_table` MODIFY COLUMN `timezone` FLOAT(3,1) NOT NULL DEFAULT '0.0'", $this->database_connection)) {
+ $this->printMessage('Companies table has been updated');
+ } else {
+ $this->printMessage('Failed to update companies table. MySQL said: ' . mysql_error($this->database_connection), true);
+ return false;
+ }
+ return true;
+ }
+
+
+ /**
+ * This function will update the configuration file
+ *
+ * @param void
+ * @return null
+ */
+ function fixConfigFile() {
+ $this->printMessage('Updating configuration file');
+
+ //----------------------------------------------------------
+ // Set up constants array with known values and defaults
+ //----------------------------------------------------------
+ $constants = array(
+ 'DB_ADAPTER' => DB_ADAPTER,
+ 'DB_HOST' => DB_HOST,
+ 'DB_USER' => DB_USER,
+ 'DB_PASS' => DB_PASS,
+ 'DB_NAME' => DB_NAME,
+ 'DB_CHARSET' => 'utf8',
+ 'DB_PERSIST' => true,
+ 'TABLE_PREFIX' => TABLE_PREFIX,
+ 'ROOT_URL' => ROOT_URL,
+ 'DEBUG' => false,
+ 'DEFAULT_LOCALIZATION' => 'en_us',
+ 'DEBUG' => false,
+ 'SHOW_MESSAGE_BODY' => true,
+ 'SHOW_COMMENT_BODY' => true,
+ 'SHOW_MILESTONE_BODY' => true,
+ ); // array
+
+ //----------------------------------------------------------
+ // Provide token_cookie_name only if defined
+ //----------------------------------------------------------
+ if (defined('TOKEN_COOKIE_NAME') ) {
+ $constants['TOKEN_COOKIE_NAME'] = TOKEN_COOKIE_NAME ;
+ }
+
+ //----------------------------------------------------------
+ // Replace default values with previously-defined values, if they exist.
+ //----------------------------------------------------------
+ foreach ($constants as $config_key => $config_value) {
+ if (defined($config_key)) {
+ $constants[$config_key] = constant($config_key);
+ } // if
+ } // foreach
+
+ //----------------------------------------------------------
+ // Insert changes to existing config
+ //----------------------------------------------------------
+ $constants['PRODUCT_VERSION'] = $this->getVersionTo() ;
+
+ //----------------------------------------------------------
+ // Write the config file out using a template
+ //----------------------------------------------------------
+ tpl_assign('config_file_constants', $constants);
+ if (file_put_contents(INSTALLATION_PATH . '/config/config.php', tpl_fetch(get_template_path('config_file')))) {
+ $this->printMessage('Configuration file updated');
+ return true;
+ } else {
+ $this->printMessage('Failed to update configuration file', true);
+ return false;
+ } // if
+ } // fixConfigFile
+
+
+ } // RhubarbUpgradeScript
+
+?>
Modified: ProjectPier/Branches/0.8.0.x/version.php
===================================================================
--- ProjectPier/Branches/0.8.0.x/version.php 2008-04-28 05:06:08 UTC (rev 159)
+++ ProjectPier/Branches/0.8.0.x/version.php 2008-06-16 08:43:05 UTC (rev 160)
@@ -3,16 +3,18 @@
/**
* Return version of codebase
*
- * This file contains the version of source code distribution. It does not always means the
- * version installed, just the version of the code. For instance, when you update the files
- * but you don't run the upgrade script - you are still using the old version with new files
- * ant that means that you are not actualy using new version. You'll most probably end up with
+ * This file contains the version of source code distribution. It does not reflect the
+ * version installed in the database, just the version of the code. For instance, when
+ * you update the code files to a new version but you don't run the upgrade script,
+ * you are still using the old version database with new code files. And that means
+ * that you are not actually using the new version. You'll most probably end up with
* a lot of problems and errors in that situation; they will be gone as soon as your run the
* upgrade script.
*
- *
+ * TODO: ProjectPier should check for version mismatches on startup and go to the
+ * Admin/Upgrade script page if needed.
*/
- return '0.8.0.2';
+ return '0.8.0.3';
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X