[PP-svn] SF.net SVN: projectpier: [122] ProjectPier/Branches/0.8.0.x

[<mik...@us...>]

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.