chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r18432] - Changes buttons in the blog.

Browse Source 
- Corrects a bug in the blog task edition. (The tasks didn't edit)
skala
Noël Dieschburg 17 years ago
parent a8703d42bc
commit 69a3964c64
2 changed files with 26 additions and 29 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      main/blog/blog.php
  2. 42
      main/inc/lib/blog.lib.php

13
main/blog/blog.php
Unescape View File

@ -92,7 +92,8 @@ if (!empty($_POST['new_task_submit']))
{
Blog :: create_task($blog_id, $_POST['task_name'], $_POST['task_description'], $_POST['chkArticleDelete'], $_POST['chkArticleEdit'], $_POST['chkCommentsDelete'], $_POST['task_color']);
}
if (!empty($_POST['edit_task_submit']))
if (isset($_POST['edit_task_submit']))
{
Blog :: edit_task($_POST['blog_id'], $_POST['task_id'], $_POST['task_name'], $_POST['task_description'], $_POST['chkArticleDelete'], $_POST['chkArticleEdit'],$_POST['chkCommentsDelete'], $_POST['task_color']);
}
@ -101,9 +102,9 @@ if (!empty($_POST['assign_task_submit']))
Blog :: assign_task($blog_id, $_POST['task_user_id'], $_POST['task_task_id'], $_POST['task_year']."-".$_POST['task_month']."-".$_POST['task_day']);
}
if (!empty($_POST['assign_task_edit_submit']))
if (isset($_POST['assign_task_edit_submit']))
{
Blog :: edit_assigned_task($blog_id, $_POST['task_user_id'], $_POST['task_task_id'], $_POST['task_year']."-".$_POST['task_month']."-".$_POST['task_day'], $_POST['old_user_id'], $_POST['old_task_id'], $_POST['old_target_date']);
Blog :: edit_assigned_task($blog_id, $_POST['task_user_id'], $_POST['task_task_id'], $_POST['task_year']."-".$_POST['task_month']."-".$_POST['task_day'], $_POST['old_user_id'], $_POST['old_task_id'], $_POST['old_target_date']);
}
if (!empty($_POST['new_task_execution_submit']))
{
@ -143,7 +144,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks')
Blog :: delete_task($blog_id, (int)$_GET['task_id']);
if (isset($_GET['do']) && $_GET['do'] == 'delete_assignment')
Blog :: delete_assigned_task($blog_id, (int)$_GET['assignment_id']);
Blog :: delete_assigned_task($blog_id, Database::escape_string((int)$_GET['task_id']), Database::escape_string((int)$_GET['user_id']));
}
if (isset($_GET['action']) && $_GET['action'] == 'view_post')
@ -293,7 +294,7 @@ Blog :: display_minimonthcalendar($month, $year, $blog_id);
<form action="blog.php" method="get" enctype="multipart/form-data">
<input type="hidden" name="blog_id" value="<?php echo $blog_id ?>" />
<input type="hidden" name="action" value="view_search_result" />
<input type="text" size="20" name="q" value="<?php echo (isset($_GET['q']) ? $_GET['q'] : ''); ?>" /><input type="submit" value="<?php echo get_lang('Search'); ?>" />
<input type="text" size="20" name="q" value="<?php echo (isset($_GET['q']) ? $_GET['q'] : ''); ?>" /><button class="search" type="submit"><?php echo get_lang('Search'); ?></button>
</form>
</td>
</tr>
@ -435,7 +436,7 @@ switch ($current_page)
}
if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment')
{
Blog :: display_edit_assigned_task_form($blog_id, Database::escape_string((int)$_GET['assignment_id']));
Blog :: display_edit_assigned_task_form($blog_id, Database::escape_string((int)$_GET['task_id']), Database::escape_string((int)$_GET['user_id']));
}
Blog :: display_task_list($blog_id);
echo '<br /><br />';

42
main/inc/lib/blog.lib.php
Unescape View File

@ -683,14 +683,10 @@ class Blog
* @param Integer $blog_id
* @param Integer $assignment_id
*/
function delete_assigned_task($blog_id, $assignment_id)
function delete_assigned_task($blog_id, $task_id,$user_id)
{
// Init
$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
$parameters = explode('|',$assignment_id);
$task_id = $parameters[0];
$user_id = $parameters[1];
// Delete posts
$sql = "DELETE FROM $tbl_blogs_tasks_rel_user WHERE `blog_id` = '".(int)$blog_id."' AND `task_id` = '".(int)$task_id."' AND `user_id` = '".(int)$user_id."'";
api_sql_query($sql, __FILE__, __LINE__);
@ -1336,7 +1332,7 @@ class Blog
<td>
<input type="hidden" name="action" value="" />
<input type="hidden" name="new_post_submit" value="true" />
<input type="submit" name="Submit" value="' . get_lang('Ok') . '" />
<button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button>
</td>
</tr>
</table>
@ -1400,7 +1396,7 @@ class Blog
<input type="hidden" name="action" value="" />
<input type="hidden" name="edit_post_submit" value="true" />
<input type="hidden" name="post_id" value="' . (int)$_GET['post_id'] . '" />
<input type="submit" name="Submit" value="' . get_lang('Ok') . '" />
<button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button>
</td>
</tr>
</table>
@ -1534,10 +1530,10 @@ class Blog
'<td>'.stripslashes($assignment['description']) . '</td>',
'<td>' . $assignment['target_date'] . '</td>',
'<td width="50">',
'<a href="' .api_get_self(). '?action=manage_tasks&amp;blog_id=' . $assignment['blog_id'] . '&amp;do=edit_assignment&amp;assignment_id=' . $assignment['task_id'] . '|' . $assignment['user_id'] . '">',
'<a href="' .api_get_self(). '?action=manage_tasks&amp;blog_id=' . $assignment['blog_id'] . '&amp;do=edit_assignment&amp;task_id=' . $assignment['task_id'] . '&amp;user_id=' . $assignment['user_id'] . '">',
'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
"</a>\n",
'<a href="' .api_get_self(). '?action=manage_tasks&amp;blog_id=' . $assignment['blog_id'] . '&amp;do=delete_assignment&amp;assignment_id=' . $assignment['task_id'] . '|' . $assignment['user_id'] . '" ',
'<a href="' .api_get_self(). '?action=manage_tasks&amp;blog_id=' . $assignment['blog_id'] . '&amp;do=delete_assignment&amp;task_id=' . $assignment['task_id'] . '&amp;user_id=' . $assignment['user_id'] . '" ',
'onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"',
'<img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
"</a>\n",
@ -1610,7 +1606,7 @@ class Blog
<td align="right">&nbsp;</td>
<input type="hidden" name="action" value="" />
<input type="hidden" name="new_task_submit" value="true" />
<td><br /><input type="submit" name="Submit" value="' . get_lang('Ok') . '" /></td>
<td><br /><button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button></td>
</tr>
</table>
</form>';
@ -1703,7 +1699,7 @@ class Blog
<input type="hidden" name="edit_task_submit" value="true" />
<input type="hidden" name="task_id" value="' . $task['task_id'] . '" />
<input type="hidden" name="blog_id" value="' . $task['blog_id'] . '" />
<input type="submit" name="Submit" value="' . get_lang('Ok') . '" /></td>
<button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button></td>
</tr>
</table>
</form>';
@ -1821,7 +1817,7 @@ class Blog
<td align="right">&nbsp;</td>
<input type="hidden" name="action" value="" />
<input type="hidden" name="assign_task_submit" value="true" />
<td><br /><input type="submit" name="Submit" value="' . get_lang('Ok') . '" /></td>
<td><br /><button class="save" type="submit" name="Submit">' . get_lang('Ok') . '</button></td>
</tr>
</table>
</form>';
@ -1832,11 +1828,11 @@ class Blog
* @author Toon Keppens
*
*/
function display_edit_assigned_task_form($blog_id, $assignment_id)
function display_edit_assigned_task_form($blog_id, $task_id, $user_id)
{
$parameters = explode('|', $assignment_id);
$task_id = $parameters[0];
$user_id = $parameters[1];
//$parameters = explode('_', $assignment_id);
//$task_id = $parameters[0];
//$user_id = $parameters[1];
/* ------------- */
// Init
@ -1986,7 +1982,7 @@ class Blog
<input type="hidden" name="old_user_id" value="' . $user_id . '" />
<input type="hidden" name="old_target_date" value="' . $old_date . '" />
<input type="hidden" name="assign_task_edit_submit" value="true" />
<td><br /><input type="submit" name="Submit" value="' . get_lang('Ok') . '" /></td>
<td><br /><button class="save type="submit" name="Submit">' . get_lang('Ok') . '</button></td>
</tr>
</table>
</form>';
@ -2066,7 +2062,7 @@ class Blog
`task_id` = " . (int)$old_task_id . " AND
`target_date` = '" . mysql_real_escape_string($old_target_date) . "'
";
$result = @api_sql_query($sql, __FILE__, __LINE__);
}
}
@ -2265,7 +2261,7 @@ class Blog
echo '<option value="select_subscribe">' . get_lang('Register') . '</option>';
echo '</select>';
echo '<input type="hidden" name="register" value="true" />';
echo '<input type="submit" value="' . get_lang('Ok') . '"/>';
echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
echo '</form>';
}
@ -2371,7 +2367,7 @@ class Blog
echo '<option value="select_unsubscribe">' . get_lang('UnRegister') . '</option>';
echo '</select>';
echo '<input type="hidden" name="unregister" value="true" />';
echo '<input type="submit" value="' . get_lang('Ok') . '"/>';
echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
echo '</form>';
}
@ -2447,7 +2443,7 @@ class Blog
{
echo ' <input type="hidden" name="new_comment_submit" value="true" />';
}
echo ' <input type="submit" name="Submit" value="' . get_lang('Ok') . '" />
echo ' <button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button>
</td>
</tr>
</table>
@ -2646,7 +2642,7 @@ class Blog
<td align="right">&nbsp;</td>
<input type="hidden" name="action" value="" />
<input type="hidden" name="new_blog_submit" value="true" />
<td><br /><input type="submit" name="Submit" value="' . get_lang('Ok') . '" /></td>
<td><br /><button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button></td>
</tr>
</table>
</form>';
@ -2684,7 +2680,7 @@ class Blog
<input type="hidden" name="action" value="" />
<input type="hidden" name="edit_blog_submit" value="true" />
<input type="hidden" name="blog_id" value="' . $blog['blog_id'] . '" />
<td><br /><input type="submit" name="Submit" value="' . get_lang('Ok') . '" /></td>
<td><br /><button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button></td>
</tr>
</table>
</form>';

Write Preview
Loading…
Cancel
Save