@@ -8,13 +8,13 @@ discard block |
||
8 | 8 | $s = WSCMSoapServer::singleton(); |
9 | 9 | |
10 | 10 | $s->register( |
11 | - 'WSCMUser.find_id_user', |
|
12 | - array( |
|
13 | - 'username' => 'xsd:string', |
|
14 | - 'password' => 'xsd:string', |
|
11 | + 'WSCMUser.find_id_user', |
|
12 | + array( |
|
13 | + 'username' => 'xsd:string', |
|
14 | + 'password' => 'xsd:string', |
|
15 | 15 | 'name' => 'xsd:string', |
16 | - ), |
|
17 | - array('return' => 'xsd:string'), |
|
16 | + ), |
|
17 | + array('return' => 'xsd:string'), |
|
18 | 18 | 'urn:WSCMService', |
19 | 19 | '', |
20 | 20 | '', |
@@ -23,14 +23,14 @@ discard block |
||
23 | 23 | ); |
24 | 24 | |
25 | 25 | $s->register( |
26 | - 'WSCMUser.get_user_name', |
|
27 | - array( |
|
28 | - 'username' => 'xsd:string', |
|
29 | - 'password' => 'xsd:string', |
|
26 | + 'WSCMUser.get_user_name', |
|
27 | + array( |
|
28 | + 'username' => 'xsd:string', |
|
29 | + 'password' => 'xsd:string', |
|
30 | 30 | 'id' => 'xsd:string', |
31 | 31 | 'field' => 'xsd:string' |
32 | - ), |
|
33 | - array('return' => 'xsd:string'), |
|
32 | + ), |
|
33 | + array('return' => 'xsd:string'), |
|
34 | 34 | 'urn:WSCMService', |
35 | 35 | '', |
36 | 36 | '', |
@@ -39,13 +39,13 @@ discard block |
||
39 | 39 | ); |
40 | 40 | |
41 | 41 | $s->register( |
42 | - 'WSCMUser.get_link_user_picture', |
|
43 | - array( |
|
44 | - 'username' => 'xsd:string', |
|
45 | - 'password' => 'xsd:string', |
|
42 | + 'WSCMUser.get_link_user_picture', |
|
43 | + array( |
|
44 | + 'username' => 'xsd:string', |
|
45 | + 'password' => 'xsd:string', |
|
46 | 46 | 'id' => 'xsd:string' |
47 | - ), |
|
48 | - array('return' => 'xsd:string'), |
|
47 | + ), |
|
48 | + array('return' => 'xsd:string'), |
|
49 | 49 | 'urn:WSCMService', |
50 | 50 | '', |
51 | 51 | '', |
@@ -54,14 +54,14 @@ discard block |
||
54 | 54 | ); |
55 | 55 | |
56 | 56 | $s->register( |
57 | - 'WSCMUser.send_invitation', |
|
58 | - array( |
|
59 | - 'username' => 'xsd:string', |
|
60 | - 'password' => 'xsd:string', |
|
57 | + 'WSCMUser.send_invitation', |
|
58 | + array( |
|
59 | + 'username' => 'xsd:string', |
|
60 | + 'password' => 'xsd:string', |
|
61 | 61 | 'userfriend_id' => 'xsd:string', |
62 | 62 | 'content_message' => 'xsd:string' |
63 | - ), |
|
64 | - array('return' => 'xsd:string'), |
|
63 | + ), |
|
64 | + array('return' => 'xsd:string'), |
|
65 | 65 | 'urn:WSCMService', |
66 | 66 | '', |
67 | 67 | '', |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | ); |
71 | 71 | |
72 | 72 | $s->register( |
73 | - 'WSCMUser.accept_friend', |
|
74 | - array( |
|
75 | - 'username' => 'xsd:string', |
|
76 | - 'password' => 'xsd:string', |
|
73 | + 'WSCMUser.accept_friend', |
|
74 | + array( |
|
75 | + 'username' => 'xsd:string', |
|
76 | + 'password' => 'xsd:string', |
|
77 | 77 | 'userfriend_id' => 'xsd:string' |
78 | - ), |
|
79 | - array('return' => 'xsd:string'), |
|
78 | + ), |
|
79 | + array('return' => 'xsd:string'), |
|
80 | 80 | 'urn:WSCMService', |
81 | 81 | '', |
82 | 82 | '', |
@@ -85,13 +85,13 @@ discard block |
||
85 | 85 | ); |
86 | 86 | |
87 | 87 | $s->register( |
88 | - 'WSCMUser.denied_invitation', |
|
89 | - array( |
|
90 | - 'username' => 'xsd:string', |
|
91 | - 'password' => 'xsd:string', |
|
88 | + 'WSCMUser.denied_invitation', |
|
89 | + array( |
|
90 | + 'username' => 'xsd:string', |
|
91 | + 'password' => 'xsd:string', |
|
92 | 92 | 'userfriend_id' => 'xsd:string' |
93 | - ), |
|
94 | - array('return' => 'xsd:string'), |
|
93 | + ), |
|
94 | + array('return' => 'xsd:string'), |
|
95 | 95 | 'urn:WSCMService', |
96 | 96 | '', |
97 | 97 | '', |
@@ -22,7 +22,7 @@ |
||
22 | 22 | $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id"; |
23 | 23 | $res = Database::query($sql); |
24 | 24 | while($row = Database::fetch_array($res)) { |
25 | - $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value) |
|
25 | + $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value) |
|
26 | 26 | VALUES (".$row['user_id'].", 11,'".$row['username']."')"; |
27 | - $res2 = Database::query($sql2); |
|
27 | + $res2 = Database::query($sql2); |
|
28 | 28 | } |
@@ -14,18 +14,18 @@ discard block |
||
14 | 14 | parse_str($_SERVER['QUERY_STRING'], $params); |
15 | 15 | |
16 | 16 | if(isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) { |
17 | - $webcamname = $params['webcamname']; |
|
18 | - $webcamdir = $params['webcamdir']; |
|
19 | - $webcamuserid = $params['webcamuserid']; |
|
17 | + $webcamname = $params['webcamname']; |
|
18 | + $webcamdir = $params['webcamdir']; |
|
19 | + $webcamuserid = $params['webcamuserid']; |
|
20 | 20 | } |
21 | 21 | else { |
22 | - api_not_allowed(); |
|
23 | - die(); |
|
22 | + api_not_allowed(); |
|
23 | + die(); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | if ($webcamuserid!= api_get_user_id() || api_get_user_id()==0 || $webcamuserid==0) { |
27 | - api_not_allowed(); |
|
28 | - die(); |
|
27 | + api_not_allowed(); |
|
28 | + die(); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | $ext = strtolower($ext[sizeof($ext) - 1]); |
43 | 43 | |
44 | 44 | if($ext!= 'jpg'){ |
45 | - die(); |
|
45 | + die(); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | //Do not use here check Fileinfo method because return: text/plain //CHECK THIS BEFORE COMMIT |
@@ -57,11 +57,11 @@ discard block |
||
57 | 57 | $title_to_save=str_replace('_',' ',$webcamname); |
58 | 58 | $webcamname_noex=basename($webcamname, ".jpg"); |
59 | 59 | if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){ |
60 | - $i = 1; |
|
61 | - while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++; |
|
62 | - $webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
63 | - $title_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
64 | - $title_to_save = str_replace('_',' ',$title_to_save); |
|
60 | + $i = 1; |
|
61 | + while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++; |
|
62 | + $webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
63 | + $title_to_save = $webcamname_noex . '_' . $i . '.'.$ext; |
|
64 | + $title_to_save = str_replace('_',' ',$title_to_save); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | $documentPath = $saveDir.'/'.$webcamname_to_save; |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | //Change to move_uploaded_file() function instead file_get_contents() to adapt the new lib |
71 | 71 | $content = move_uploaded_file($_FILES['webcam']['tmp_name'], $documentPath); |
72 | 72 | if (!$content) { |
73 | - print "PHP ERROR: Failed to read data\n"; |
|
74 | - exit(); |
|
73 | + print "PHP ERROR: Failed to read data\n"; |
|
74 | + exit(); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | //add document to database |
78 | - $doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save); |
|
79 | - api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
78 | + $doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save); |
|
79 | + api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); |
|
80 | 80 | /// |
81 | 81 | $url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath; |
82 | 82 | print get_lang('ClipSent'); |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | if ($image_resizing == 'noresizing' || $image_resizing == '') { |
78 | 78 | echo ' checked'; |
79 | 79 | } |
80 | - ?>> |
|
80 | + ?>> |
|
81 | 81 | </label> |
82 | 82 | <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?> |
83 | 83 | </div> |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | if ($image_resizing == 'resizing_auto' || $image_resizing == '') { |
88 | 88 | echo ' checked'; |
89 | 89 | } |
90 | - ?>> |
|
90 | + ?>> |
|
91 | 91 | </label> |
92 | 92 | <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?> |
93 | 93 | </div> |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $width = $_SESSION['image_resizing_width']; |
100 | 100 | $height = $_SESSION['image_resizing_height']; |
101 | 101 | } |
102 | - ?>> |
|
102 | + ?>> |
|
103 | 103 | </label> |
104 | 104 | <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?> |
105 | 105 | </div> |
@@ -107,13 +107,13 @@ discard block |
||
107 | 107 | <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label> |
108 | 108 | <div class="col-sm-3"> |
109 | 109 | <input class="form-control" name="width" type="text" id="width" <?php |
110 | - if ($image_resizing == 'resizing') { |
|
111 | - echo ' value="'.$width.'"'; |
|
112 | - echo ' class="enabled_input"'; |
|
110 | + if ($image_resizing == 'resizing') { |
|
111 | + echo ' value="'.$width.'"'; |
|
112 | + echo ' class="enabled_input"'; |
|
113 | 113 | } else { |
114 | 114 | echo ' class="disabled_input"'; |
115 | 115 | } |
116 | - ?> > |
|
116 | + ?> > |
|
117 | 117 | </div> |
118 | 118 | <div class="col-sm-8"></div> |
119 | 119 | </div> |
@@ -121,13 +121,13 @@ discard block |
||
121 | 121 | <label class="col-sm-1 control-label"><?php echo get_lang('Height'); ?></label> |
122 | 122 | <div class="col-sm-3"> |
123 | 123 | <input class="form-control" name="height" type="text" id="height" <?php |
124 | - if ($image_resizing == 'resizing') { |
|
125 | - echo ' value="'.$height.'"'; |
|
126 | - echo ' class="enabled_input"'; |
|
127 | - } else { |
|
124 | + if ($image_resizing == 'resizing') { |
|
125 | + echo ' value="'.$height.'"'; |
|
126 | + echo ' class="enabled_input"'; |
|
127 | + } else { |
|
128 | 128 | echo ' class="disabled_input"'; |
129 | 129 | } |
130 | - ?> > |
|
130 | + ?> > |
|
131 | 131 | </div> |
132 | 132 | <div class="col-sm-8"></div> |
133 | 133 | </div> |
@@ -24,12 +24,12 @@ |
||
24 | 24 | unset($_SESSION['temp_realpath_image']); |
25 | 25 | |
26 | 26 | if (!isset($_SESSION['exit_pixlr'])){ |
27 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
28 | - echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
29 | - api_not_allowed(true); |
|
27 | + $location=api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
28 | + echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
29 | + api_not_allowed(true); |
|
30 | 30 | } else { |
31 | - echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>'; |
|
32 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
33 | - echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
34 | - unset($_SESSION['exit_pixlr']); |
|
31 | + echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>'; |
|
32 | + $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
33 | + echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
34 | + unset($_SESSION['exit_pixlr']); |
|
35 | 35 | } |
@@ -15,8 +15,6 @@ discard block |
||
15 | 15 | This file has two large sections. |
16 | 16 | 1. code that belongs in document.php, but to avoid clutter I put the code here |
17 | 17 | 2. the function resize_image that handles the image resizing |
18 | - |
|
19 | - |
|
20 | 18 | * @author Patrick Cool |
21 | 19 | * @package chamilo.document |
22 | 20 | * @todo convert comments to be understandable to phpDocumentor |
@@ -34,16 +32,16 @@ discard block |
||
34 | 32 | * view is also possible when you choose not to resize the source images |
35 | 33 | */ |
36 | 34 | function resize_image($image, $target_width, $target_height, $slideshow = 0) { |
37 | - // Modifications by Ivan Tcholakov, 04-MAY-2009. |
|
38 | - $result = array(); |
|
39 | - if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) { |
|
40 | - $new_sizes = api_resize_image($image, $target_width, $target_height); |
|
41 | - $result[] = $new_sizes['height']; |
|
42 | - $result[] = $new_sizes['width']; |
|
43 | - } else { |
|
35 | + // Modifications by Ivan Tcholakov, 04-MAY-2009. |
|
36 | + $result = array(); |
|
37 | + if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) { |
|
38 | + $new_sizes = api_resize_image($image, $target_width, $target_height); |
|
39 | + $result[] = $new_sizes['height']; |
|
40 | + $result[] = $new_sizes['width']; |
|
41 | + } else { |
|
44 | 42 | $size = api_getimagesize($image); |
45 | - $result[] = $size['height']; |
|
46 | - $result[] = $size['width']; |
|
47 | - } |
|
48 | - return $result; |
|
43 | + $result[] = $size['height']; |
|
44 | + $result[] = $size['width']; |
|
45 | + } |
|
46 | + return $result; |
|
49 | 47 | } |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | |
29 | 29 | // COURSES WITH CATEGORIES |
30 | 30 | if (!empty($user_course_categories)) { |
31 | - foreach ($user_course_categories as $row) { |
|
32 | - echo Display::page_subheader($row['title']); |
|
33 | - echo '<a name="category'.$row['id'].'"></a>'; |
|
31 | + foreach ($user_course_categories as $row) { |
|
32 | + echo Display::page_subheader($row['title']); |
|
33 | + echo '<a name="category'.$row['id'].'"></a>'; |
|
34 | 34 | |
35 | - if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?> |
|
35 | + if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?> |
|
36 | 36 | <!-- We display the edit form for the category --> |
37 | 37 | |
38 | 38 | <form name="edit_course_category" method="post" action="courses.php?action=<?php echo $action; ?>"> |
@@ -243,15 +243,15 @@ discard block |
||
243 | 243 | </a> |
244 | 244 | <?php } else { |
245 | 245 | echo Display::display_icon('up_na.png', get_lang('Up'),'',22); |
246 | - } |
|
246 | + } |
|
247 | 247 | |
248 | - if ($key < $number_of_courses - 1) { ?> |
|
248 | + if ($key < $number_of_courses - 1) { ?> |
|
249 | 249 | <a href="courses.php?action=<?php echo $action; ?>&move=down&course=<?php echo $course['code']; ?>&category=<?php echo $course['user_course_cat']; ?>&sec_token=<?php echo $stok; ?>"> |
250 | 250 | <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?> |
251 | 251 | </a> |
252 | 252 | <?php } else { |
253 | 253 | echo Display::display_icon('down_na.png', get_lang('Down'),'',22); |
254 | - }?> |
|
254 | + }?> |
|
255 | 255 | </div> |
256 | 256 | <div style="float:left; margin-right:10px;"> |
257 | 257 | <!-- cancel subscrioption--> |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | </div> |
270 | 270 | <?php } |
271 | 271 | } |
272 | - ?> |
|
272 | + ?> |
|
273 | 273 | </td> |
274 | 274 | </tr> |
275 | 275 | <?php |
@@ -3,7 +3,7 @@ |
||
3 | 3 | |
4 | 4 | /** |
5 | 5 | * This script displays an area where teachers can edit the group properties and member list. |
6 | - * |
|
6 | + * |
|
7 | 7 | * @author various contributors |
8 | 8 | * @author Roan Embrechts (VUB), partial code cleanup, initial virtual course support |
9 | 9 | * @package chamilo.group |
@@ -89,7 +89,7 @@ |
||
89 | 89 | 'error' |
90 | 90 | ) |
91 | 91 | ); |
92 | - exit; |
|
92 | + exit; |
|
93 | 93 | } else { |
94 | 94 | /* DOWNLOAD THE FILE */ |
95 | 95 | // the user is allowed to download the file |