diff --git a/app/Resources/public/css/themes/rainbow/default.css b/app/Resources/public/css/themes/rainbow/default.css index 5f3349410a..573da89fdd 100755 --- a/app/Resources/public/css/themes/rainbow/default.css +++ b/app/Resources/public/css/themes/rainbow/default.css @@ -2059,4 +2059,13 @@ blockquote p { .skills_chart > ul > li > ul > li > a { width: 8em; } - +.communications #skillList .thumbnail{ + border: none; +} +.communications #skillList .table-bordered{ + border: 1px solid #84bd00; +} +.table thead tr th.achieved{ + vertical-align: bottom; + border-bottom: 2px solid #84bd00; +} \ No newline at end of file diff --git a/app/bootstrap.php.cache b/app/bootstrap.php.cache index c968f55da0..300520e6d9 100644 --- a/app/bootstrap.php.cache +++ b/app/bootstrap.php.cache @@ -205,7 +205,7 @@ $this->headers[$key] = $values; $this->headers[$key] = array_merge($this->headers[$key], $values); } if ('cache-control'=== $key) { -$this->cacheControl = $this->parseCacheControl($values[0]); +$this->cacheControl = $this->parseCacheControl(implode(', ', $this->headers[$key])); } } public function has($key) @@ -332,6 +332,9 @@ $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file[ } } else { $file = array_map(array($this,'convertFileInformation'), $file); +if (array_keys($keys) === $keys) { +$file = array_filter($file); +} } } return $file; @@ -387,7 +390,7 @@ $authorizationHeader = $this->parameters['REDIRECT_HTTP_AUTHORIZATION']; if (null !== $authorizationHeader) { if (0 === stripos($authorizationHeader,'basic ')) { $exploded = explode(':', base64_decode(substr($authorizationHeader, 6)), 2); -if (count($exploded) == 2) { +if (2 == count($exploded)) { list($headers['PHP_AUTH_USER'], $headers['PHP_AUTH_PW']) = $exploded; } } elseif (empty($this->parameters['PHP_AUTH_DIGEST']) && (0 === stripos($authorizationHeader,'digest '))) { @@ -590,22 +593,22 @@ self::$requestFactory = $callable; public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null) { $dup = clone $this; -if ($query !== null) { +if (null !== $query) { $dup->query = new ParameterBag($query); } -if ($request !== null) { +if (null !== $request) { $dup->request = new ParameterBag($request); } -if ($attributes !== null) { +if (null !== $attributes) { $dup->attributes = new ParameterBag($attributes); } -if ($cookies !== null) { +if (null !== $cookies) { $dup->cookies = new ParameterBag($cookies); } -if ($files !== null) { +if (null !== $files) { $dup->files = new FileBag($files); } -if ($server !== null) { +if (null !== $server) { $dup->server = new ServerBag($server); $dup->headers = new HeaderBag($dup->server->getHeaders()); } @@ -816,7 +819,7 @@ $host = $host[0]; } elseif (!$host = $this->headers->get('HOST')) { return $this->server->get('SERVER_PORT'); } -if ($host[0] ==='[') { +if ('['=== $host[0]) { $pos = strpos($host,':', strrpos($host,']')); } else { $pos = strrpos($host,':'); @@ -847,7 +850,7 @@ public function getHttpHost() { $scheme = $this->getScheme(); $port = $this->getPort(); -if (('http'== $scheme && $port == 80) || ('https'== $scheme && $port == 443)) { +if (('http'== $scheme && 80 == $port) || ('https'== $scheme && 443 == $port)) { return $this->getHost(); } return $this->getHost().':'.$port; @@ -1043,7 +1046,7 @@ return in_array($this->getMethod(), array('GET','HEAD')); public function getContent($asResource = false) { $currentContentIsResource = is_resource($this->content); -if (PHP_VERSION_ID < 50600 && false === $this->content) { +if (\PHP_VERSION_ID < 50600 && false === $this->content) { throw new \LogicException('getContent() can only be called once when using the resource return type and PHP below 5.6.'); } if (true === $asResource) { @@ -1115,7 +1118,7 @@ $lang = $codes[1]; } } else { for ($i = 0, $max = count($codes); $i < $max; ++$i) { -if ($i === 0) { +if (0 === $i) { $lang = strtolower($codes[0]); } else { $lang .='_'.strtoupper($codes[$i]); @@ -1164,14 +1167,14 @@ $this->server->remove('IIS_WasUrlRewritten'); } elseif ($this->headers->has('X_REWRITE_URL')) { $requestUri = $this->headers->get('X_REWRITE_URL'); $this->headers->remove('X_REWRITE_URL'); -} elseif ($this->server->get('IIS_WasUrlRewritten') =='1'&& $this->server->get('UNENCODED_URL') !='') { +} elseif ('1'== $this->server->get('IIS_WasUrlRewritten') &&''!= $this->server->get('UNENCODED_URL')) { $requestUri = $this->server->get('UNENCODED_URL'); $this->server->remove('UNENCODED_URL'); $this->server->remove('IIS_WasUrlRewritten'); } elseif ($this->server->has('REQUEST_URI')) { $requestUri = $this->server->get('REQUEST_URI'); $schemeAndHttpHost = $this->getSchemeAndHttpHost(); -if (strpos($requestUri, $schemeAndHttpHost) === 0) { +if (0 === strpos($requestUri, $schemeAndHttpHost)) { $requestUri = substr($requestUri, strlen($schemeAndHttpHost)); } } elseif ($this->server->has('ORIG_PATH_INFO')) { @@ -1207,7 +1210,7 @@ $baseUrl ='/'.$seg.$baseUrl; } while ($last > $index && (false !== $pos = strpos($path, $baseUrl)) && 0 != $pos); } $requestUri = $this->getRequestUri(); -if ($requestUri !==''&& $requestUri[0] !=='/') { +if (''!== $requestUri &&'/'!== $requestUri[0]) { $requestUri ='/'.$requestUri; } if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, $baseUrl)) { @@ -1224,7 +1227,7 @@ $basename = basename($baseUrl); if (empty($basename) || !strpos(rawurldecode($truncatedRequestUri), $basename)) { return''; } -if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && $pos !== 0) { +if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && 0 !== $pos) { $baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl)); } return rtrim($baseUrl,'/'.DIRECTORY_SEPARATOR); @@ -1255,7 +1258,7 @@ return'/'; if (false !== $pos = strpos($requestUri,'?')) { $requestUri = substr($requestUri, 0, $pos); } -if ($requestUri !==''&& $requestUri[0] !=='/') { +if (''!== $requestUri &&'/'!== $requestUri[0]) { $requestUri ='/'.$requestUri; } $pathInfo = substr($requestUri, strlen($baseUrl)); diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php index b63e15e19d..960d967c35 100755 --- a/main/inc/lib/skill.lib.php +++ b/main/inc/lib/skill.lib.php @@ -1339,7 +1339,7 @@ class Skill extends Model - + @@ -1391,7 +1391,7 @@ class Skill extends Model $transparency = ''; if ($passed === false) { // @todo use a css class - $transparency = 'opacity: 0.4; filter: alpha(opacity=40);'; + $transparency = 'filter: alpha(opacity=40);'; } $label = $this->processSkillListSimple([$data], 'mini', $transparency); diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php index 1610aa164f..0104d090cf 100755 --- a/main/mySpace/myStudents.php +++ b/main/mySpace/myStudents.php @@ -1682,12 +1682,13 @@ if (empty($_GET['details'])) { '; echo Tracking::displayUserSkills( $user_info['user_id'], $courseInfo ? $courseInfo['real_id'] : 0, $sessionId ); +echo ''; if ($allowMessages === true) { // Messages
'.get_lang('AchievedSkills').''.get_lang('AchievedSkills').'