Changeset 1086 for trunk

Timestamp:

12/22/09 14:21:51 (2 years ago)

Author:

Prostu

Message:

Show and delete all the pages that have a round name in their text.

Reviewed: ​http://reviewboard.infoarena.ro/r/115/

Location:

trunk

Files:

• common/db/textblock.php (modified) (3 diffs)
• www/controllers/attachment.php (modified) (1 diff)
• www/controllers/round.php (modified) (5 diffs)
• www/controllers/textblock.php (modified) (1 diff)
• www/index.php (modified) (1 diff)
• www/url.php (modified) (1 diff)
• www/views/round_delete.php (added)
• www/views/round_edit.php (modified) (1 diff)

trunk/common/db/textblock.php

@@ -243 +243 @@
 
 // Grep through textblocks. This is mostly a hack needed for macro_grep.php
-function textblock_grep($substr, $page, $regexp = false) {
+// Also used for round deletion
+function textblock_grep($substr, $page, $regexp = false, $offset = 0, $count = 0) {
     if (!$regexp) {
         $compare = "LIKE";
@@ -255 +256 @@
                       WHERE `name` LIKE '%s' AND
                             (`text` $compare '%s' OR `title` $compare '%s')
-                      ORDER BY `name`",
+                      ORDER BY `name`
+                      LIMIT %s, %s",
+                      db_escape($page), db_escape($substr), db_escape($substr),
+                      db_escape($offset), db_escape($count));
+    return db_fetch_all($query);
+}
+
+function textblock_grep_count($substr, $page, $regexp = false) {
+    if (!$regexp) {
+        $compare = "LIKE";
+    } else {
+        $compare = "REGEXP";
+    }
+    $query = sprintf("SELECT COUNT(*) as `cnt`
+                      FROM ia_textblock
+                      WHERE `name` LIKE '%s' AND
+                            (`text` $compare '%s' OR `title` $compare '%s')",
                       db_escape($page), db_escape($substr), db_escape($substr));
-    return db_fetch_all($query);
+    return db_fetch($query);
 }
 
@@ -278 +295 @@
     db_query("DELETE FROM `ia_textblock_revision` WHERE `name` = '$pageesc'");
     db_query("DELETE FROM `ia_textblock` WHERE `name` = '$pageesc'");
-    if (db_affected_rows() != 1) {
-        return true;
-    }
+
+    return (db_affected_rows() != 0);
 }
 

trunk/www/controllers/attachment.php

@@ -311 +311 @@
     $files = array();
     $deleted = 0;
+
     foreach($arguments as $value) {
         if(is_numeric($value)) {

trunk/www/controllers/round.php

@@ -6 +6 @@
 require_once(IA_ROOT_DIR."common/round.php");
 require_once(IA_ROOT_DIR."common/tags.php");
+require_once(IA_ROOT_DIR."common/textblock.php");
+require_once(IA_ROOT_DIR."www/format/pager.php");
 
 // Displays form to either create a new round or edit an existing one.
@@ -41 +43 @@
     $round_types = array();
     foreach (round_get_types() as $round_type => $pretty_name) {
-        if (identity_can("round-edit", round_init('round_id', $round_type, 
+        if (identity_can("round-edit", round_init('round_id', $round_type,
             $identity_user)))
             $round_types[$round_type] = $pretty_name;
@@ -51 +53 @@
     $all_task_ids = array();
     foreach ($all_tasks as $idx => $task) {
-        if ($round['type'] != 'user-defined' || 
+        if ($round['type'] != 'user-defined' ||
             identity_can('task-use-in-user-round', $task)) {
             $all_task_ids[$task['id']] = true;
@@ -256 +258 @@
     $round_types = array();
     foreach (round_get_types() as $round_type => $pretty_name) {
-        if (identity_can("round-create", round_init("round_id", $round_type, 
+        if (identity_can("round-create", round_init("round_id", $round_type,
             $identity_user)))
             $round_types[$round_type] = $pretty_name;
@@ -272 +274 @@
 }
 
+function controller_round_delete($round_id) {
+    // Validate round_id
+    if (!is_round_id($round_id)) {
+        flash_error('Identificatorul rundei este invalid');
+        redirect(url_home());
+    }
+
+    // Get round
+    $round = round_get($round_id);
+    if (!$round) {
+        flash_error("Runda nu exista");
+        redirect(url_home());
+    }
+
+    // Security check
+    identity_require('round-delete', $round);
+
+    $options = pager_init_options();
+
+    $textblock_list = textblock_grep('%"'.$round_id.'"%', '%', false, $options['first_entry'],
+                                     $options['display_entries']);
+
+    for ($i = 0; $i < count ($textblock_list); ++$i) {
+        $textblock_list[$i]['id'] = $options['first_entry'] + $i + 1;
+    }
+
+    // Form stuff.
+    $values = array();
+    $errors = array();
+
+    // Create view
+    $view = array();
+    $view['textblock_list'] = $textblock_list;
+    $view['title'] = "Stergere textblockuri corelate cu $round_id";
+    $view['page_name'] = url_round_delete($round_id);
+    $view['round_id'] = $round_id;
+    $view['round'] = $round;
+    $view['form_values'] = $values;
+    $view['form_errors'] = $errors;
+    $entries = textblock_grep_count('%"'.$round_id.'"%', '%', false);
+    $view['total_entries'] = $entries['cnt'];
+    $view['first_entry'] = $options['first_entry'];
+    $view['display_entries'] = $options['display_entries'];
+
+    execute_view_die("views/round_delete.php", $view);
+}
+
 ?>

trunk/www/controllers/textblock.php

@@ -216 +216 @@
 }
 
+// Delete a list of textblocks
+function controller_textblock_delete_many($textblocks, $redirect) {
+    $deleted = 0;
+    $not_deleted_because_of_permision = 0;
+    $bad_page_names = 0;
+
+    if (!is_array($textblocks)) {
+        flash_error("Nu au fost specificate pagini pentru a fi sterse");
+        redirect($redirect);
+    }
+
+    foreach ($textblocks as $name) {
+        if (!is_page_name($name)) {
+            ++$bad_page_names;
+        } else if (identity_can("textblock-delete", textblock_get_revision($name))) {
+            $deleted += textblock_delete($name);
+        } else {
+            ++$not_deleted_because_of_permision;
+        }
+    }
+
+    flash($deleted." textblockuri au fost sterse.");
+    if ($not_deleted_because_of_permision) {
+        flash($not_deleted_because_of_permision.
+              " textblockuri nu au putut fi sterse din cauza permisiunilor.");
+    }
+    if ($bad_page_names) {
+        flash($bad_page_names." textblockuri au numele corupt");
+    }
+    redirect($redirect);
+}
+
 // Delete a certain revision
 function controller_textblock_delete_revision($page = null, $rev_num = null) {

trunk/www/index.php

@@ -115 +115 @@
 }
 
-// Round detail editor
+// Round detail editor and deleter
 else if ($urlstart == 'admin' && getattr($pagepath, 1) == 'runda') {
     $obj_id = implode("/", array_slice($pagepath, 2));
     require_once(IA_ROOT_DIR.'www/controllers/round.php');
-    controller_round_details($obj_id);
+    require_once(IA_ROOT_DIR.'www/controllers/textblock.php');
+    if ($action == 'sterge-runda') {
+        if (request('delete')) {
+            $v = request('textblocks');
+            controller_textblock_delete_many($v, url_round_delete($obj_id));
+        } else {
+            controller_round_delete($obj_id);
+        }
+    } else {
+        controller_round_details($obj_id);
+    }
 }
 

trunk/www/url.php

@@ -306 +306 @@
 }
 
+function url_round_delete($round_id) {
+    log_assert(is_round_id($round_id));
+    return url_complex("admin/runda/$round_id", array('action' => 'sterge-runda'));
+}
+
 // Job/monitor stuff.
 

trunk/www/views/round_edit.php

@@ -73 +73 @@
 <h1>Editare runda <?= format_link(url_textblock($round['page_name']), $round['title']) ?></h1>
 
+<form action="<?= html_escape(url_round_delete($round['id'])) ?>" method="post" style="float: right">
+    <input type="hidden" name="" value="<?= html_escape($round['id']) ?>" />
+    <input onclick="" type="submit" value="Sterge runda" id="form_delete" class="button important" />
+</form>
+
 <?php if ($round['state'] == 'running') { ?>
     <div class="warning">