From 2577079910b6dbea90300a0cd2f5aa2e1de3473e Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 11 Aug 2015 11:13:00 +0200 Subject: [PATCH] Minor - format code. --- main/inc/lib/sessionmanager.lib.php | 4 +- main/session/resume_session.php | 38 +++++++++++-------- .../Entity/Repository/SequenceRepository.php | 14 ++++--- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index b944a25746..ec082589da 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -5420,11 +5420,11 @@ class SessionManager } $sql1 = "UPDATE $table SET position = '".intval($nextOrder)."' - WHERE session_id = $sessionId AND c_id = '".$thisCourseCode."'"; + WHERE session_id = $sessionId AND c_id = $thisCourseCode"; Database::query($sql1); $sql2 = "UPDATE $table SET position = '".intval($thisOrder)."' - WHERE session_id = $sessionId AND c_id = '".$nextId."'"; + WHERE session_id = $sessionId AND c_id = $nextId"; Database::query($sql2); return true; diff --git a/main/session/resume_session.php b/main/session/resume_session.php index 4d60d35d68..3dd6539a3d 100644 --- a/main/session/resume_session.php +++ b/main/session/resume_session.php @@ -122,9 +122,9 @@ $generalCoach = api_get_user_info($sessionInfo['id_coach']); $sessionField = new ExtraField('session'); $extraFieldData = $sessionField->getDataAndFormattedValues($sessionId); $multiple_url_is_on = api_get_multiple_access_url(); -$url_list = []; +$urlList = []; if ($multiple_url_is_on) { - $url_list = UrlManager::get_access_url_from_session($sessionId); + $urlList = UrlManager::get_access_url_from_session($sessionId); } $url = Display::url( @@ -148,24 +148,24 @@ if ($sessionInfo['nbr_courses'] == 0) { } else { $count = 0; $courseItem = ''; - + /** @var \Chamilo\CoreBundle\Entity\Repository\SessionRepository $sessionRepository */ $sessionRepository = Database::getManager()->getRepository('ChamiloCoreBundle:Session'); $courses = $sessionRepository->getCoursesOrderedByPosition($session); foreach ($courses as $course) { - //select the number of users - $sql = "SELECT count(*) + //select the number of users + $sql = "SELECT count(*) FROM $tbl_session_rel_user sru, $tbl_session_rel_course_rel_user srcru - WHERE - srcru.user_id = sru.user_id AND - srcru.session_id = sru.session_id AND - srcru.c_id = '".intval($course->getId())."' AND - sru.relation_type <> ".SESSION_RELATION_TYPE_RRHH." AND - srcru.session_id = '".intval($sessionId)."'"; + WHERE + srcru.user_id = sru.user_id AND + srcru.session_id = sru.session_id AND + srcru.c_id = '".intval($course->getId())."' AND + sru.relation_type <> ".SESSION_RELATION_TYPE_RRHH." AND + srcru.session_id = '".intval($sessionId)."'"; $rs = Database::query($sql); - $numberOfUsers = Database::result($rs, 0, 0); + $numberOfUsers = Database::result($rs, 0, 0); // Get coachs of the courses in session @@ -181,7 +181,10 @@ if ($sessionInfo['nbr_courses'] == 0) { $coachs = array(); if (Database::num_rows($rs) > 0) { while($info_coach = Database::fetch_array($rs)) { - $coachs[] = api_get_person_name($info_coach['firstname'], $info_coach['lastname']).' ('.$info_coach['username'].')'; + $coachs[] = api_get_person_name( + $info_coach['firstname'], + $info_coach['lastname'] + ).' ('.$info_coach['username'].')'; } } else { $coach = get_lang('None'); @@ -221,9 +224,14 @@ if ($sessionInfo['nbr_courses'] == 0) { $downUrl ); + if (!SessionManager::orderCourseIsEnabled()) { + $orderButtons = ''; + } + $courseUrl = api_get_course_url($course->getCode(), $sessionId); - //hide_course_breadcrumb the parameter has been added to hide the name of the course, that appeared in the default $interbreadcrumb + // hide_course_breadcrumb the parameter has been added to hide the name + // of the course, that appeared in the default $interbreadcrumb $courseItem .= ' '.Display::url( @@ -370,7 +378,7 @@ $tpl->assign('session', $sessionInfo); $tpl->assign('session_category', is_null($sessionCategory) ? null : $sessionCategory->getName()); $tpl->assign('session_dates', SessionManager::parseSessionDates($sessionInfo)); $tpl->assign('session_visibility', SessionManager::getSessionVisibility($sessionInfo)); -$tpl->assign('url_list', $url_list); +$tpl->assign('url_list', $urlList); $tpl->assign('extra_fields', $extraFieldData); $tpl->assign('course_list', $courseListToShow); $tpl->assign('user_list', $userListToShow); diff --git a/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php b/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php index c12feb4122..b77dba6cb8 100644 --- a/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php +++ b/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php @@ -6,6 +6,7 @@ namespace Chamilo\CoreBundle\Entity\Repository; use Chamilo\CoreBundle\Entity\SequenceResource; use Doctrine\ORM\EntityRepository; use Fhaculty\Graph\Vertex; +use Fhaculty\Graph\Set\Vertices; /** * Class SequenceRepository @@ -40,8 +41,8 @@ class SequenceRepository extends EntityRepository * @return array */ public function getRequirementAndDependencies($resourceId, $type) - { $sequence = $this->findRequirementForResource($resourceId, $type); - + { + $sequence = $this->findRequirementForResource($resourceId, $type); $result = ['requirements' => '', 'dependencies' => '']; if ($sequence && $sequence->hasGraph()) { $graph = $sequence->getSequence()->getUnSerializeGraph(); @@ -109,6 +110,7 @@ class SequenceRepository extends EntityRepository * Get the requirements for a resource only * @param int $resourceId The resource ID * @param int $type The type of sequence resource + * * @return array */ public function getRequirements($resourceId, $type) @@ -164,6 +166,7 @@ class SequenceRepository extends EntityRepository * Get the requirements and dependencies within a sequence for a resource * @param int $resourceId The resource ID * @param int $type The type of sequence resource + * * @return array */ public function getRequirementsAndDependenciesWithinSequences($resourceId, $type) @@ -209,11 +212,12 @@ class SequenceRepository extends EntityRepository } /** - * Get sessiones from vertices - * @param \Fhaculty\Graph\Set\Vertices $verticesEdges The vertices + * Get sessions from vertices + * @param Vertices $verticesEdges The vertices + * * @return array */ - private function findSessionFromVerticesEdges(\Fhaculty\Graph\Set\Vertices $verticesEdges) + private function findSessionFromVerticesEdges(Vertices $verticesEdges) { $sessionVertices = [];