'; - $return_data.= '
'.$row['title'].'
';
+ $return_data.= '
'.$row['title'].' '; //$return_data.= ''.$row['title'].''; echo '
'; $return_data.= $row['full_text']; diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index 84b5ae59d8..67db70e032 100644 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -1895,18 +1895,32 @@ class CourseManager { /** * Get list of courses for a given user * @param int user ID + * @param boolean Whether to include courses from session or not * @return array List of codes and db names * @author isaac flores paz */ - public static function get_courses_list_by_user_id ($user_id) { + public static function get_courses_list_by_user_id ($user_id, $include_sessions=false) { $course_list=array(); + $codes = array(); + $user_id = intval($user_id); $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE); $tbl_course_rel_user = Database::get_main_table(TABLE_MAIN_COURSE_USER); - $sql='SELECT c.code,c.db_name,c.title FROM '.$tbl_course.' c inner join '.$tbl_course_rel_user.' cru on c.code=cru.course_code WHERE cru.user_id='.Database::escape_string($user_id); + $sql='SELECT c.code,c.db_name,c.title FROM '.$tbl_course.' c inner join '.$tbl_course_rel_user.' cru on c.code=cru.course_code WHERE cru.user_id='.$user_id; $result=api_sql_query($sql,__FILE__,__LINE__); while ($row=Database::fetch_array($result,'ASSOC')) { - $course_list[]=$row; - } + $course_list[]=$row; + $codes[] = $row['code']; + } + if ($include_sessions === true) { + $tbl_csu = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); + $s = "SELECT distinct(c.code),c.db_name,c.title FROM $tbl_csu s, $tbl_course c WHERE id_user = $user_id AND s.course_code=c.code"; + $r = Database::query($s,__FILE__,__LINE__); + while ($row=Database::fetch_array($r,'ASSOC')) { + if (!in_array($row['code'],$codes)) { + $course_list[]=$row; + } + } + } return $course_list; } /** @@ -2115,5 +2129,16 @@ class CourseManager { } else { return false; //field not found } + } + /** + * Get the course id of an course by the database name + * @param string The database name + * @return string The course id + */ + public static function get_course_id_by_database_name ($db_name) { + $t_course = Database::get_main_table(TABLE_MAIN_COURSE); + $sql='SELECT code FROM '.$t_course.' WHERE db_name="'.Database::escape_string($db_name).'"'; + $rs=Database::query($sql,__FILE__,__LINE__); + return Database::result($rs,0,'code'); } } //end class CourseManager diff --git a/main/inc/lib/fckeditor/editor/_source/commandclasses/fck_othercommands.js b/main/inc/lib/fckeditor/editor/_source/commandclasses/fck_othercommands.js index ac26085052..f2d2c0ee70 100644 --- a/main/inc/lib/fckeditor/editor/_source/commandclasses/fck_othercommands.js +++ b/main/inc/lib/fckeditor/editor/_source/commandclasses/fck_othercommands.js @@ -40,7 +40,7 @@ var FCKDialogCommand = function( name, title, url, width, height, getStateFuncti FCKDialogCommand.prototype.Execute = function() { - FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, this.CustomValue, null, this.Resizable ) ; + FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, this.CustomValue, this.Resizable ) ; } FCKDialogCommand.prototype.GetState = function() @@ -186,7 +186,7 @@ FCKSourceCommand.prototype.Execute = function() { var iWidth = FCKConfig.ScreenWidth * 0.65 ; var iHeight = FCKConfig.ScreenHeight * 0.65 ; - FCKDialog.OpenDialog( 'FCKDialog_Source', FCKLang.Source, 'dialog/fck_source.html', iWidth, iHeight, null, null, true ) ; + FCKDialog.OpenDialog( 'FCKDialog_Source', FCKLang.Source, 'dialog/fck_source.html', iWidth, iHeight, null, true ) ; } else FCK.SwitchEditMode() ; diff --git a/main/inc/lib/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js b/main/inc/lib/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js index dccd794625..f919105a6f 100644 --- a/main/inc/lib/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js +++ b/main/inc/lib/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js @@ -193,9 +193,9 @@ FCKTextColorCommand.prototype._CreatePanelBody = function( targetDocument, targe oDiv.innerHTML = '
| ' + FCKLang.ColorMoreColors + ' |
@@ -79,7 +84,7 @@ window.onload = function()
version
2.6.4.1
- Build 23195 + Build 23405
2.6.4.1
- Build 23195 + Build 23405