Changeset 139
- Timestamp:
- 08/23/10 20:55:35 (18 months ago)
- Location:
- trunk
- Files:
-
- 6 added
- 8 modified
-
actions/ajax (added)
-
actions/ajax/add_facilitator.php (added)
-
actions/ajax/remove_facilitator.php (added)
-
actions/delete_educourse.php (modified) (1 diff)
-
api.php (modified) (2 diffs)
-
edufeedr_tables.sql (modified) (1 diff)
-
languages/en.php (modified) (16 diffs)
-
languages/et.php (modified) (16 diffs)
-
start.php (modified) (1 diff)
-
views/default/edufeedr/educourse_facilitators.php (added)
-
views/default/edufeedr/forms/edit_educourse.php (modified) (2 diffs)
-
views/default/edufeedr/singles (added)
-
views/default/edufeedr/singles/educourse_facilitator.php (added)
-
views/default/object/educourse.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/actions/delete_educourse.php
r83 r139 9 9 $educourse = get_entity($guid); 10 10 11 if ($educourse->getSubtype() == 'educourse' && $educourse->canEdit() && edufeedrCan EditEducourse($educourse)) {11 if ($educourse->getSubtype() == 'educourse' && $educourse->canEdit() && edufeedrCanManageEducourse($educourse)) { 12 12 $rowsaffected = $educourse->delete(); 13 13 if ($rowsaffected > 0) { -
trunk/api.php
r138 r139 20 20 if (isadminloggedin()) 21 21 return true; 22 else if (isloggedin() && $educourse->getSubtype() == 'educourse' && $educourse->getOwner() == get_loggedin_userid()) 23 return true; 24 22 else if (isloggedin() && $educourse->getSubtype() == 'educourse' && ($educourse->getOwner() == get_loggedin_userid() || edufeedrIsFacilitator($educourse))) 23 return true; 24 25 return false; 26 } 27 28 function edufeedrCanManageEducourse($educourse) { 29 if (isadminloggedin()) { 30 return true; 31 } else if (isloggedin() && $educourse->getSubtype() == 'educourse' && $educourse->getOwner()== get_loggedin_userid()) { 32 return true; 33 } 25 34 return false; 26 35 } … … 361 370 return get_data_row("SELECT * FROM {$CONFIG->dbprefix}edufeedr_course_assignments WHERE course_guid = $course_guid and id = $assignment_id"); 362 371 } 372 373 function edufeedrCourseFacilitators($educourse) { 374 global $CONFIG; 375 if ($educourse && $educourse->getSubtype() == 'educourse') { 376 return get_data("SELECT * FROM {$CONFIG->dbprefix}edufeedr_course_facilitators WHERE course_guid = {$educourse->getGUID()}"); 377 } 378 return false; 379 } 380 381 function edufeedrIsFacilitator($educourse) { 382 global $CONFIG; 383 if ($educourse && $educourse->getSubtype() == 'educourse') { 384 $current_user_guid = get_loggedin_userid(); 385 $is_facilitator = get_data_row("SELECT id FROM {$CONFIG->dbprefix}edufeedr_course_facilitators WHERE course_guid = {$educourse->getGUID()} and user_guid=$current_user_guid"); 386 if ($is_facilitator) { 387 return true; 388 } 389 } 390 return false; 391 } 363 392 ?> -
trunk/edufeedr_tables.sql
r93 r139 27 27 PRIMARY KEY (id) 28 28 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 29 30 CREATE TABLE IF NOT EXISTS prefix_edufeedr_course_facilitators ( 31 id bigint(20) unsigned NOT NULL auto_increment, 32 course_guid bigint(20) unsigned NOT NULL, 33 user_guid bigint(20) unsigned NOT NULL, 34 PRIMARY KEY (id) 35 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -
trunk/languages/en.php
r135 r139 7 7 File: /edufeedr/views/default/edufeedr/educourse_hidden.php 8 8 File: /edufeedr/views/default/edufeedr/educourse_hidden.php 9 Lines: 2 2, 339 Lines: 23, 35 10 10 Text: restore 11 11 _missing_translation_ … … 57 57 /* 58 58 File: /edufeedr/actions/unhide_comment.php 59 Lines: 2 159 Lines: 22 60 60 Text: Comment could not be restored. 61 61 _missing_translation_ … … 73 73 /* 74 74 File: /edufeedr/actions/unhide_comment.php 75 Lines: 1 875 Lines: 19 76 76 Text: Comment restored. 77 77 _missing_translation_ … … 145 145 /* 146 146 File: /edufeedr/api.php 147 Lines: 2 69147 Lines: 278 148 148 Text: Entered URL has no feed. 149 149 _missing_translation_ … … 194 194 File: /edufeedr/actions/remove_assignment.php 195 195 File: /edufeedr/actions/remove_participant.php 196 Lines: 3 25, 52, 78, 96, 55, 97, 79, 61, 24, 26196 Lines: 334, 52, 78, 96, 55, 97, 79, 61, 24, 26 197 197 Text: Error occured, object could not be sent to EduSuckr. 198 198 _missing_translation_ … … 210 210 /* 211 211 File: /edufeedr/views/default/edufeedr/educourse_post.php 212 File: /edufeedr/views/default/edufeedr/edufeedr_hidden.php 213 Lines: 31, 31 212 Lines: 31 214 213 Text: %s comments 215 214 _missing_translation_ … … 228 227 229 228 /* 229 File: /edufeedr/views/default/edufeedr/educourse_facilitators.php 230 Lines: 78 231 Text: Add 232 _missing_translation_ 233 */ 234 "edufeedr:href:button:add" => "Add", 235 236 /* 230 237 File: /edufeedr/views/default/edufeedr/forms/edit_assignment.php 231 238 Lines: 32 … … 314 321 File: /edufeedr/views/default/edufeedr/educourse_post.php 315 322 File: /edufeedr/views/default/edufeedr/educourse_post.php 316 File: /edufeedr/views/default/edufeedr/edufeedr_hidden.php 317 File: /edufeedr/views/default/edufeedr/edufeedr_hidden.php 318 Lines: 60, 103, 24, 40, 24, 40 323 Lines: 60, 103, 24, 40 319 324 Text: hide 320 325 _missing_translation_ … … 400 405 File: /edufeedr/views/default/edufeedr/educourse_hidden.php 401 406 File: /edufeedr/views/default/edufeedr/educourse_post.php 402 File: /edufeedr/views/default/edufeedr/edufeedr_hidden.php 403 Lines: 49, 20, 18, 18 407 Lines: 49, 21, 18 404 408 Text: %s by %s 405 409 _missing_translation_ … … 438 442 */ 439 443 "edufeedr:course:edit:participant" => "Edit participant", 444 445 /* 446 File: /edufeedr/views/default/edufeedr/educourse_facilitators.php 447 Lines: 75 448 Text: Type the username of another user to add and additional facilitator to this course. 449 _missing_translation_ 450 */ 451 "edufeedr:text:add_facilitator" => "Type the username of another user to add and additional facilitator to this course.", 440 452 441 453 /* … … 486 498 /* 487 499 File: /edufeedr/views/default/edufeedr/educourse_post.php 488 File: /edufeedr/views/default/edufeedr/edufeedr_hidden.php 489 Lines: 49, 49 500 Lines: 49 490 501 Text: Post a comment 491 502 _missing_translation_ … … 573 584 /* 574 585 File: /edufeedr/api.php 575 Lines: 293586 Lines: 302 576 587 Text: Post not found in blog RSS. 577 588 _missing_translation_ … … 669 680 670 681 /* 682 File: /edufeedr/views/default/edufeedr/educourse_facilitators.php 683 Lines: 20 684 Text: Facilitators 685 _missing_translation_ 686 */ 687 "edufeedr:label:course_facilitators" => "Facilitators", 688 689 /* 671 690 File: /edufeedr/join_educourse.php 672 691 Lines: 20 … … 694 713 /* 695 714 File: /edufeedr/actions/unhide_post.php 696 Lines: 1 8715 Lines: 19 697 716 Text: Post restored. 698 717 _missing_translation_ … … 881 900 /* 882 901 File: /edufeedr/api.php 883 Lines: 2 48902 Lines: 257 884 903 Text: Entered URL does not exist. 885 904 _missing_translation_ … … 942 961 /* 943 962 File: /edufeedr/actions/unhide_post.php 944 Lines: 2 1963 Lines: 22 945 964 Text: Post could not be restored. 946 965 _missing_translation_ -
trunk/languages/et.php
r135 r139 7 7 File: /edufeedr/views/default/edufeedr/educourse_hidden.php 8 8 File: /edufeedr/views/default/edufeedr/educourse_hidden.php 9 Lines: 2 2, 339 Lines: 23, 35 10 10 Text: restore 11 11 _missing_translation_ … … 57 57 /* 58 58 File: /edufeedr/actions/unhide_comment.php 59 Lines: 2 159 Lines: 22 60 60 Text: Comment could not be restored. 61 61 _missing_translation_ … … 73 73 /* 74 74 File: /edufeedr/actions/unhide_comment.php 75 Lines: 1 875 Lines: 19 76 76 Text: Comment restored. 77 77 _missing_translation_ … … 145 145 /* 146 146 File: /edufeedr/api.php 147 Lines: 2 69147 Lines: 278 148 148 Text: Entered URL has no feed. 149 149 _missing_translation_ … … 194 194 File: /edufeedr/actions/remove_assignment.php 195 195 File: /edufeedr/actions/remove_participant.php 196 Lines: 3 25, 52, 78, 96, 55, 97, 79, 61, 24, 26196 Lines: 334, 52, 78, 96, 55, 97, 79, 61, 24, 26 197 197 Text: Error occured, object could not be sent to EduSuckr. 198 198 _missing_translation_ … … 210 210 /* 211 211 File: /edufeedr/views/default/edufeedr/educourse_post.php 212 File: /edufeedr/views/default/edufeedr/edufeedr_hidden.php 213 Lines: 31, 31 212 Lines: 31 214 213 Text: %s comments 215 214 _missing_translation_ … … 228 227 229 228 /* 229 File: /edufeedr/views/default/edufeedr/educourse_facilitators.php 230 Lines: 78 231 Text: Add 232 _missing_translation_ 233 */ 234 "edufeedr:href:button:add" => "Add", 235 236 /* 230 237 File: /edufeedr/views/default/edufeedr/forms/edit_assignment.php 231 238 Lines: 32 … … 314 321 File: /edufeedr/views/default/edufeedr/educourse_post.php 315 322 File: /edufeedr/views/default/edufeedr/educourse_post.php 316 File: /edufeedr/views/default/edufeedr/edufeedr_hidden.php 317 File: /edufeedr/views/default/edufeedr/edufeedr_hidden.php 318 Lines: 60, 103, 24, 40, 24, 40 323 Lines: 60, 103, 24, 40 319 324 Text: hide 320 325 _missing_translation_ … … 400 405 File: /edufeedr/views/default/edufeedr/educourse_hidden.php 401 406 File: /edufeedr/views/default/edufeedr/educourse_post.php 402 File: /edufeedr/views/default/edufeedr/edufeedr_hidden.php 403 Lines: 49, 20, 18, 18 407 Lines: 49, 21, 18 404 408 Text: %s by %s 405 409 _missing_translation_ … … 438 442 */ 439 443 "edufeedr:course:edit:participant" => "Edit participant", 444 445 /* 446 File: /edufeedr/views/default/edufeedr/educourse_facilitators.php 447 Lines: 75 448 Text: Type the username of another user to add and additional facilitator to this course. 449 _missing_translation_ 450 */ 451 "edufeedr:text:add_facilitator" => "Type the username of another user to add and additional facilitator to this course.", 440 452 441 453 /* … … 486 498 /* 487 499 File: /edufeedr/views/default/edufeedr/educourse_post.php 488 File: /edufeedr/views/default/edufeedr/edufeedr_hidden.php 489 Lines: 49, 49 500 Lines: 49 490 501 Text: Post a comment 491 502 _missing_translation_ … … 573 584 /* 574 585 File: /edufeedr/api.php 575 Lines: 293586 Lines: 302 576 587 Text: Post not found in blog RSS. 577 588 _missing_translation_ … … 669 680 670 681 /* 682 File: /edufeedr/views/default/edufeedr/educourse_facilitators.php 683 Lines: 20 684 Text: Facilitators 685 _missing_translation_ 686 */ 687 "edufeedr:label:course_facilitators" => "Facilitators", 688 689 /* 671 690 File: /edufeedr/join_educourse.php 672 691 Lines: 20 … … 694 713 /* 695 714 File: /edufeedr/actions/unhide_post.php 696 Lines: 1 8715 Lines: 19 697 716 Text: Post restored. 698 717 _missing_translation_ … … 881 900 /* 882 901 File: /edufeedr/api.php 883 Lines: 2 48902 Lines: 257 884 903 Text: Entered URL does not exist. 885 904 _missing_translation_ … … 942 961 /* 943 962 File: /edufeedr/actions/unhide_post.php 944 Lines: 2 1963 Lines: 22 945 964 Text: Post could not be restored. 946 965 _missing_translation_ -
trunk/start.php
r137 r139 170 170 register_action('edufeedr/unhide_post', false, $CONFIG->pluginspath . 'edufeedr/actions/unhide_post.php'); 171 171 register_action('edufeedr/unhide_comment', false, $CONFIG->pluginspath . 'edufeedr/actions/unhide_comment.php'); 172 register_action('edufeedr/add_facilitator', false, $CONFIG->pluginspath . 'edufeedr/actions/ajax/add_facilitator.php'); 173 register_action('edufeedr/remove_facilitator', false, $CONFIG->pluginspath . 'edufeedr/actions/ajax/remove_facilitator.php'); 172 174 ?> -
trunk/views/default/edufeedr/forms/edit_educourse.php
r129 r139 91 91 $course_stop_aggregate_label = elgg_echo('edufeedr:label:educourse_stop_aggregate'); 92 92 $course_stop_aggregate_input = elgg_view('input/edufeedr_calendar', array('internalname' => 'stop_aggregate', 'value' => $stop_aggregate)); 93 94 $course_facilitators_input = elgg_view('edufeedr/educourse_facilitators', array('entity' => $vars['entity'], 'type' => 'edit')); 95 93 96 $form_aggregate_edit_addition = <<<EOT 94 97 <p> … … 99 102 <label>$course_stop_aggregate_label</label>$field_required<br /> 100 103 $course_stop_aggregate_input 101 </p> 104 </p> 105 $course_facilitators_input 106 102 107 EOT; 103 108 } else { -
trunk/views/default/object/educourse.php
r115 r139 48 48 if ($vars['entity']->canEdit() && edufeedrCanEditEducourse($vars['entity'])) { 49 49 $body .= '<div id="edufeedr_educourse_action_controls">'; 50 $body .= '<a href="' . $vars['url'] . 'pg/edufeedr/edit_educourse/' . $vars['entity']->getGUID() . '" title="' . elgg_echo('edit') . '"><img src="'. $vars['url'] .'mod/edufeedr/views/default/graphics/edit.png" alt="edit" /></a>'; 51 $body .= ' '; 52 $body .= elgg_view('output/edufeedr_confirmlink', array( 50 $body .= '<a href="' . $vars['url'] . 'pg/edufeedr/edit_educourse/' . $vars['entity']->getGUID() . '" title="' . elgg_echo('edit') . '"><img src="'. $vars['url'] .'mod/edufeedr/views/default/graphics/edit.png" alt="edit" /></a>'; 51 if (edufeedrCanManageEducourse($vars['entity'])) { 52 $body .= ' '; 53 $body .= elgg_view('output/edufeedr_confirmlink', array( 53 54 'href' => $vars['url'] . 'action/edufeedr/delete_educourse?educourse=' . $vars['entity']->getGUID(), 54 55 'text' => elgg_echo('delete'), … … 57 58 ) 58 59 ); 60 } 59 61 $body .= '</div>'; 60 62 } 61 63 62 64 // Display teacher 63 $body .= '<div class="edufeedr_course_teachers">'; 64 /*translation:Facilitator*/ 65 $body .= '<label>' . elgg_echo('edufeedr:label:course:facilitator') . ':</label><br />'; 66 $teacher = $vars['entity']->getOwnerEntity(); 67 $body .= $teacher->name . ' / '; 68 $body .= elgg_view('output/email', array('value' => $teacher->email)) . ' / '; 69 $body .= elgg_view('output/url', array('href' => $vars['entity']->course_blog, 'target' => '_blank')); 70 $body .= '</div>'; 65 $body .= elgg_view('edufeedr/educourse_facilitators', array('entity' => $vars['entity'], 'type' => 'view')); 71 66 72 67 $body .= '</div>';
