diff --git a/main/document/document.inc.php b/main/document/document.inc.php index 8918cde32b..3558eb4e14 100644 --- a/main/document/document.inc.php +++ b/main/document/document.inc.php @@ -222,6 +222,10 @@ function create_document_link($document_data, $show_as_icon = false, $counter = if ($filetype == 'file') { $copy_to_myfiles = ''.Display::return_icon('briefcase.png', get_lang('CopyToMyFiles'), array(),ICON_SIZE_SMALL).'  '; } + $send_to = ''; +// if ($filetype == 'file') { +// $send_to = Portfolio::share($document_data['id'], array('style' => 'float:right;')); +// } } $pdf_icon = ''; @@ -239,7 +243,7 @@ function create_document_link($document_data, $show_as_icon = false, $counter = if ( preg_match('/mp3$/i', urldecode($url)) || (preg_match('/wav$/i', urldecode($url)) && !preg_match('/_chnano_.wav$/i', urldecode($url))) || preg_match('/ogg$/i', urldecode($url))) { - return ''.$title.''.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon; + return ''.$title.''.$force_download_html.$send_to.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon; } elseif ( //Show preview sith yoxview preg_match('/html$/i', urldecode($url)) || @@ -262,14 +266,14 @@ function create_document_link($document_data, $show_as_icon = false, $counter = if ($visibility == false) { $class = "thickbox invisible"; } - return ''.$title.''.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon; + return ''.$title.''.$force_download_html.$send_to.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon; } else { $url = 'showinframes.php?'.api_get_cidreq().'&id='.$document_data['id'].$req_gid; //No plugin just the old and good showinframes.php page - return ''.$title.''.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon; + return ''.$title.''.$force_download_html.$send_to.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon; } } else { - return ''.$title.''.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon; + return ''.$title.''.$force_download_html.$send_to.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon; } //end copy files to users myfiles } else { diff --git a/main/document/document.php b/main/document/document.php index 54db4672e9..b9e2b4262c 100644 --- a/main/document/document.php +++ b/main/document/document.php @@ -142,6 +142,9 @@ $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null; $message = ''; switch ($action) { + case PortfolioController::ACTION_SHARE: + $message = Portfolio::controller()->run()->message(); + break; case 'download': $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id()); // Check whether the document is in the database diff --git a/main/inc/lib/autoload.class.php b/main/inc/lib/autoload.class.php index 9ac86dd237..a9a9c87372 100644 --- a/main/inc/lib/autoload.class.php +++ b/main/inc/lib/autoload.class.php @@ -120,6 +120,7 @@ class Autoload $result['CourseSession'] = '/main/coursecopy/classes/CourseSession.class.php'; $result['CsvReader'] = '/main/inc/lib/system/io/csv_reader.class.php'; $result['CsvWriter'] = '/main/inc/lib/system/io/csv_writer.class.php'; + $result['Curl'] = '/main/inc/lib/system/net/curl.class.php'; $result['CurrentCourse'] = '/main/inc/lib/current_course.class.php'; $result['CurrentUser'] = '/main/inc/lib/current_user.class.php'; $result['CustomPages'] = '/main/inc/lib/custom_pages.class.php'; @@ -270,6 +271,7 @@ class Autoload $result['MyHorBar'] = '/main/inc/lib/pchart/MyHorBar.class.php'; $result['MySpace'] = '/main/mySpace/myspace.lib.php'; $result['Nanogong'] = '/main/inc/lib/nanogong.lib.php'; + $result['NetworkCredential'] = '/main/inc/lib/system/net/network_credential.class.php'; $result['NewMediaForm'] = '/main/media/lib/new_media_form.class.php'; $result['NotebookManager'] = '/main/inc/lib/notebook.lib.php'; $result['Notification'] = '/main/inc/lib/notification.lib.php'; @@ -295,6 +297,13 @@ class Autoload $result['Pager_Sliding'] = '/main/inc/lib/pear/Pager/Sliding.php'; $result['PclZip'] = '/main/inc/lib/pclzip/pclzip.lib.php'; $result['Plugin'] = '/main/inc/lib/plugin.class.php'; + $result['Portfolio'] = '/main/inc/lib/portfolio.class.php'; + $result['PortfolioController'] = '/main/inc/lib/portfolio.class.php'; + $result['PortfolioShare'] = '/main/inc/lib/portfolio.class.php'; + $result['Portfolio\Artefact'] = '/main/inc/lib/system/portfolio/artefact.class.php'; + $result['Portfolio\Mahara'] = '/main/inc/lib/system/portfolio/mahara.class.php'; + $result['Portfolio\Portfolio'] = '/main/inc/lib/system/portfolio/portfolio.class.php'; + $result['Portfolio\User'] = '/main/inc/lib/system/portfolio/user.class.php'; $result['Promotion'] = '/main/inc/lib/promotion.lib.php'; $result['Question'] = '/main/exercice/question.class.php'; $result['QuickformElement'] = '/main/inc/lib/pear/HTML/QuickForm/Renderer/Object.php'; @@ -441,6 +450,7 @@ class Autoload $result['learnpathList'] = '/main/newscorm/learnpathList.class.php'; $result['learnpath_processor'] = '/main/inc/lib/search/tool_processors/learnpath_processor.class.php'; $result['link_processor'] = '/main/inc/lib/search/tool_processors/link_processor.class.php'; + $result['net\HttpChannel'] = '/main/inc/lib/system/net/http_channel.class.php'; $result['pCache'] = '/main/inc/lib/pchart/pCache.class.php'; $result['pChart'] = '/main/inc/lib/pchart/pChart.class.php'; $result['pData'] = '/main/inc/lib/pchart/pData.class.php'; diff --git a/main/inc/lib/chamilo.class.php b/main/inc/lib/chamilo.class.php index 95770d6533..037f4148c2 100644 --- a/main/inc/lib/chamilo.class.php +++ b/main/inc/lib/chamilo.class.php @@ -42,6 +42,15 @@ class Chamilo { return ChamiloSession::instance(); } + + /** + * + * @return CurrentUser + */ + static function user() + { + return ChamiloSession::instance()->user(); + } /** * Returns a full url from local/absolute path and parameters. diff --git a/main/inc/lib/current_user.class.php b/main/inc/lib/current_user.class.php index 33d45a3d40..b66188047a 100644 --- a/main/inc/lib/current_user.class.php +++ b/main/inc/lib/current_user.class.php @@ -53,7 +53,7 @@ class CurrentUser return $this->get('lastName'); } - public function mail() + public function email() { return $this->get('mail'); }