chamilo / chamilo-lms

main/auth/openid/login.php

Doc Comments +1 added lines

@@ -337,6 +337,7 @@
 
 /**
  * Make a HTTP request - This function has been copied straight over from Drupal 6 code (drupal_http_request)
+ * @param string $data
  */
 function openid_http_request($url, $headers = array(), $method = 'GET', $data = NULL, $retry = 3) {
     $result = new stdClass();

Spacing +15 added lines, -15 removed lines

@@ -13,7 +13,7 @@ 
 /**
  * Initialisation
  */
-require_once api_get_path(CONFIGURATION_PATH) . 'auth.conf.php';
+require_once api_get_path(CONFIGURATION_PATH).'auth.conf.php';
 
 require_once 'openid.lib.php';
 require_once 'xrds.lib.php';
@@ -68,7 +68,7 @@ 
     // Now that there is an association created, move on
     // to request authentication from the IdP
     $identity = (!empty($services[0]['delegate'])) ? $services[0]['delegate'] : $claimed_id;
-    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0 . '/server', $services[0]['types'])) {
+    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0.'/server', $services[0]['types'])) {
         $identity = 'http://openid.net/identifier_select/2.0';
     }
     $authn_request = openid_authentication_request($claimed_id, $identity, $return_to, $assoc_handle, $services[0]['version']);
@@ -126,7 +126,7 @@ 
 
     $xrds_url = $claimed_id;
     if (_openid_is_xri($claimed_id)) {
-        $xrds_url = 'http://xri.net/' . $claimed_id;
+        $xrds_url = 'http://xri.net/'.$claimed_id;
     }
     $url = @parse_url($xrds_url);
     if ($url['scheme'] == 'http' || $url['scheme'] == 'https') {
@@ -191,7 +191,7 @@ 
     //@todo Remove Old Associations:
     $openid_association = Database::get_main_table(TABLE_MAIN_OPENID_ASSOCIATION);
     $sql = "DELETE FROM $openid_association
-            WHERE created + expires_in < '" . api_get_utc_datetime() . "'";
+            WHERE created + expires_in < '".api_get_utc_datetime()."'";
     Database::query($sql);
 
     // Check to see if we have an association for this IdP already
@@ -347,17 +347,17 @@ 
     switch ($uri['scheme']) {
         case 'http':
             $port = isset($uri['port']) ? $uri['port'] : 80;
-            $host = $uri['host'] . ($port != 80 ? ':' . $port : '');
+            $host = $uri['host'].($port != 80 ? ':'.$port : '');
             $fp = @fsockopen($uri['host'], $port, $errno, $errstr, 15);
             break;
         case 'https':
             // Note: Only works for PHP 4.3 compiled with OpenSSL.
             $port = isset($uri['port']) ? $uri['port'] : 443;
-            $host = $uri['host'] . ($port != 443 ? ':' . $port : '');
-            $fp = @fsockopen('ssl://' . $uri['host'], $port, $errno, $errstr, 20);
+            $host = $uri['host'].($port != 443 ? ':'.$port : '');
+            $fp = @fsockopen('ssl://'.$uri['host'], $port, $errno, $errstr, 20);
             break;
         default:
-            $result->error = 'invalid schema ' . $uri['scheme'];
+            $result->error = 'invalid schema '.$uri['scheme'];
             return $result;
     }
 
@@ -373,7 +373,7 @@ 
     // Construct the path to act on.
     $path = isset($uri['path']) ? $uri['path'] : '/';
     if (isset($uri['query'])) {
-        $path .= '?' . $uri['query'];
+        $path .= '?'.$uri['query'];
     }
 
     // Create HTTP request.
@@ -383,23 +383,23 @@ 
         // host that do not take into account the port number.
         'Host' => "Host: $host",
         'User-Agent' => 'User-Agent: Chamilo (+http://www.chamilo.org/)',
-        'Content-Length' => 'Content-Length: ' . strlen($data)
+        'Content-Length' => 'Content-Length: '.strlen($data)
     );
 
     // If the server url has a user then attempt to use basic authentication
     if (isset($uri['user'])) {
-        $defaults['Authorization'] = 'Authorization: Basic ' . base64_encode($uri['user'] . (!empty($uri['pass']) ? ":" . $uri['pass'] : ''));
+        $defaults['Authorization'] = 'Authorization: Basic '.base64_encode($uri['user'].(!empty($uri['pass']) ? ":".$uri['pass'] : ''));
     }
 
     foreach ($headers as $header => $value) {
-        $defaults[$header] = $header . ': ' . $value;
+        $defaults[$header] = $header.': '.$value;
     }
 
-    $request = $method . ' ' . $path . " HTTP/1.0\r\n";
+    $request = $method.' '.$path." HTTP/1.0\r\n";
     $request .= implode("\r\n", $defaults);
     $request .= "\r\n\r\n";
     if ($data) {
-        $request .= $data . "\r\n";
+        $request .= $data."\r\n";
     }
     $result->request = $request;
 
@@ -425,7 +425,7 @@ 
         if (isset($result->headers[$header]) && $header == 'Set-Cookie') {
             // RFC 2109: the Set-Cookie response header comprises the token Set-
             // Cookie:, followed by a comma-separated list of one or more cookies.
-            $result->headers[$header] .= ',' . trim($value);
+            $result->headers[$header] .= ','.trim($value);
         } else {
             $result->headers[$header] = trim($value);
         }

main/auth/openid/openid.lib.php

Doc Comments +16 added lines

@@ -121,6 +121,7 @@ 
 
 /**
  * Encode a message from _openid_create_message for HTTP Post
+ * @param null|string $message
  */
 function _openid_encode_message($message) {
     $encoded_message = '';
@@ -173,6 +174,7 @@ 
 
 /**
  * Pull the href attribute out of an html link element.
+ * @param string $rel
  */
 function _openid_link_href($rel, $html) {
     $rel = preg_quote($rel);
@@ -186,6 +188,7 @@ 
 
 /**
  * Pull the http-equiv attribute out of an html meta element
+ * @param string $equiv
  */
 function _openid_meta_httpequiv($equiv, $html) {
     preg_match('|<meta\s+http-equiv=["\']' . $equiv . '["\'](.*)/?>|iU', $html, $matches);
@@ -221,6 +224,10 @@ 
     return base64_encode($signature);
 }
 
+/**
+ * @param string $key
+ * @param null|string $text
+ */
 function _openid_hmac($key, $text) {
     if (strlen($key) > OPENID_SHA1_BLOCKSIZE) {
         $key = _openid_sha1($key, true);
@@ -256,6 +263,9 @@ 
     return base64_encode(_openid_dh_long_to_binary($str));
 }
 
+/**
+ * @param string $str
+ */
 function _openid_dh_binary_to_long($str) {
     $bytes = array_merge(unpack('C*', $str));
 
@@ -297,6 +307,9 @@ 
     return $string;
 }
 
+/**
+ * @param string $secret
+ */
 function _openid_dh_xorsecret($shared, $secret) {
     $dh_shared_str = _openid_dh_long_to_binary($shared);
     $sha1_dh_shared = _openid_sha1($dh_shared_str);
@@ -308,6 +321,9 @@ 
     return $xsecret;
 }
 
+/**
+ * @param string $stop
+ */
 function _openid_dh_rand($stop) {
     static $duplicate_cache = array();
 

Spacing +23 added lines, -23 removed lines

@@ -9,10 +9,10 @@ 
  * Code
  */
 // Diffie-Hellman Key Exchange Default Value.
-define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801' .
-        '966915404479707795314057629378541917580651227423698188993727816152646631' .
-        '438561595825688188889951272158842675419950341258706556549803580104870537' .
-        '681476726513255747040765857479291291572334510643245094715007229621094194' .
+define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801'.
+        '966915404479707795314057629378541917580651227423698188993727816152646631'.
+        '438561595825688188889951272158842675419950341258706556549803580104870537'.
+        '681476726513255747040765857479291291572334510643245094715007229621094194'.
         '349783925984760375594985848253359305585439638443');
 
 // Constants for Diffie-Hellman key exchange computations.
@@ -32,10 +32,10 @@ 
 function openid_redirect_http($url, $message) {
     $query = array();
     foreach ($message as $key => $val) {
-        $query[] = $key . '=' . urlencode($val);
+        $query[] = $key.'='.urlencode($val);
     }
     $sep = (strpos($url, '?') === FALSE) ? '?' : '&';
-    header('Location: ' . $url . $sep . implode('&', $query), TRUE, 302);
+    header('Location: '.$url.$sep.implode('&', $query), TRUE, 302);
     //exit;
 }
 
@@ -44,12 +44,12 @@ 
  * This function should be deprecated for 1.8.6.2 needs documentation
  */
 function openid_redirect($url, $message) {
-    $output = '<html><head><title>' . get_lang('OpenIDRedirect') . "</title></head>\n<body>";
-    $output .= '<form method="post" action="' . $url . '" id="openid-redirect-form">';
+    $output = '<html><head><title>'.get_lang('OpenIDRedirect')."</title></head>\n<body>";
+    $output .= '<form method="post" action="'.$url.'" id="openid-redirect-form">';
     foreach ($message as $key => $value) {
-        $output .='<input type="hidden" name="' . $key . '" value="' . $value . '">';
+        $output .= '<input type="hidden" name="'.$key.'" value="'.$value.'">';
     }
-    $output .= '<noscript><input type="submit" name="submit" value="' . get_lang('Send') . '"/></noscript>';
+    $output .= '<noscript><input type="submit" name="submit" value="'.get_lang('Send').'"/></noscript>';
     $output .= '</form>';
     $output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>';
     $output .= "</body></html>";
@@ -94,7 +94,7 @@ 
     $normalized_url = $url;
 
     if (stristr($url, '://') === FALSE) {
-        $normalized_url = 'http://' . $url;
+        $normalized_url = 'http://'.$url;
     }
 
     if (substr_count($normalized_url, '/') < 3) {
@@ -133,7 +133,7 @@ 
             if ($encoded_message != '') {
                 $encoded_message .= '&';
             }
-            $encoded_message .= rawurlencode(trim($parts[0])) . '=' . rawurlencode(trim($parts[1]));
+            $encoded_message .= rawurlencode(trim($parts[0])).'='.rawurlencode(trim($parts[1]));
         }
     }
 
@@ -164,10 +164,10 @@ 
  */
 function _openid_nonce() {
     // YYYY-MM-DDThh:mm:ssTZD UTC, plus some optional extra unique chars
-    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z') .
-            chr(mt_rand(0, 25) + 65) .
-            chr(mt_rand(0, 25) + 65) .
-            chr(mt_rand(0, 25) + 65) .
+    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z').
+            chr(mt_rand(0, 25) + 65).
+            chr(mt_rand(0, 25) + 65).
+            chr(mt_rand(0, 25) + 65).
             chr(mt_rand(0, 25) + 65);
 }
 
@@ -176,7 +176,7 @@ 
  */
 function _openid_link_href($rel, $html) {
     $rel = preg_quote($rel);
-    preg_match('|<link\s+rel=["\'](.*)' . $rel . '(.*)["\'](.*)/?>|iU', $html, $matches);
+    preg_match('|<link\s+rel=["\'](.*)'.$rel.'(.*)["\'](.*)/?>|iU', $html, $matches);
     if (isset($matches[3])) {
         preg_match('|href=["\']([^"]+)["\']|iU', $matches[0], $href);
         return trim($href[1]);
@@ -188,7 +188,7 @@ 
  * Pull the http-equiv attribute out of an html meta element
  */
 function _openid_meta_httpequiv($equiv, $html) {
-    preg_match('|<meta\s+http-equiv=["\']' . $equiv . '["\'](.*)/?>|iU', $html, $matches);
+    preg_match('|<meta\s+http-equiv=["\']'.$equiv.'["\'](.*)/?>|iU', $html, $matches);
     if (isset($matches[1])) {
         preg_match('|content=["\']([^"]+)["\']|iU', $matches[1], $content);
         return $content[1];
@@ -209,8 +209,8 @@ 
     $sign_data = array();
 
     foreach ($keys_to_sign as $key) {
-        if (isset($message_array['openid.' . $key])) {
-            $sign_data[$key] = $message_array['openid.' . $key];
+        if (isset($message_array['openid.'.$key])) {
+            $sign_data[$key] = $message_array['openid.'.$key];
         }
     }
 
@@ -229,8 +229,8 @@ 
     $key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
     $ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
     $opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
-    $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
-    $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
+    $hash1 = _openid_sha1(($key ^ $ipad).$text, true);
+    $hmac = _openid_sha1(($key ^ $opad).$hash1, true);
 
     return $hmac;
 }
@@ -337,7 +337,7 @@ 
     }
 
     do {
-        $bytes = "\x00" . _openid_get_bytes($nbytes);
+        $bytes = "\x00"._openid_get_bytes($nbytes);
         $n = _openid_dh_binary_to_long($bytes);
         // Keep looping if this value is in the low duplicated range.
     } while (bccomp($n, $duplicate) < 0);

Braces +3 added lines, -2 removed lines

@@ -61,8 +61,9 @@
  */
 function _openid_is_xri($identifier) {
     $firstchar = substr($identifier, 0, 1);
-    if ($firstchar == "@" || $firstchar == "=")
-        return TRUE;
+    if ($firstchar == "@" || $firstchar == "=") {
+            return TRUE;
+    }
 
     if (stristr($identifier, 'xri://') !== FALSE) {
         return TRUE;

main/auth/shibboleth/app/model/shibboleth_store.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
     /**
      *
-     * @return ShibbolethData 
+     * @return ShibbolethStore 
      */
     public static function instance()
     {

Braces +2 added lines, -4 removed lines

@@ -168,12 +168,10 @@
                 if (empty($result))
                 {
                     $result = $default;
-                }
-                else if (count($result) == 1)
+                } else if (count($result) == 1)
                 {
                     $result = reset($result);
-                }
-                else
+                } else
                 {
                     $result = $result;
                 }

main/auth/shibboleth/app/model/user.class.php

Doc Comments +3 added lines

@@ -56,6 +56,9 @@
         return $this->get(array('shibb_unique_id' => $id));
     }
     
+    /**
+     * @param string $id
+     */
     public function shibboleth_id_exists($id)
     {
         return $this->exist(array('shibb_unique_id' => $id));

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace Shibboleth;
 
-require_once dirname(__FILE__) . '/scaffold/user.class.php';
+require_once dirname(__FILE__).'/scaffold/user.class.php';
 
 /**
  * A Chamilo user. Model for the User table.

main/auth/shibboleth/app/shibboleth.class.php

Doc Comments +2 added lines, -1 removed lines

@@ -128,7 +128,7 @@ 
 
     /**
      *
-     * @param ShibbolethUser $user
+     * @param ShibbolethUser $shibb_user
      */
     public static function save($shibb_user)
     {
@@ -230,6 +230,7 @@ 
      * Sends an email to the Chamilo and Shibboleth administrators in the name
      * of the logged-in user.
      *
+     * @param string $subject
      */
     public static function email_admin($subject, $message)
     {

Spacing +2 added lines, -2 removed lines

@@ -78,14 +78,14 @@
 
     public static function sys_path()
     {
-        $path = dirname(__FILE__) . '/../';
+        $path = dirname(__FILE__).'/../';
         return $path;
     }
 
     public static function url($path = '')
     {
         $result = api_get_path('WEB_PATH');
-        $result .= '/main/auth/shibboleth/' . $path;
+        $result .= '/main/auth/shibboleth/'.$path;
         return $result;
     }
 

main/auth/shibboleth/db/shibboleth_upgrade.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      * Creates the 'shibb_unique_id' field in the table 'user' of the main Chamilo database if it doesn't exist yet
      *
      * @author Nicolas Rod
-     * @return void
+     * @return false|null
      */
     public static function create_shibb_unique_id_field_if_missing()
     {

main/auth/shibboleth/lib/store.class.php

Doc Comments +3 added lines

@@ -346,6 +346,9 @@
         return $result;
     }
 
+    /**
+     * @param string $sql
+     */
     protected function execute($sql)
     {
         return Database::query($sql, null, __FILE__);

Spacing +3 added lines, -3 removed lines

@@ -246,9 +246,9 @@ 
 
         $db_name = $this->get_db_name($object);
         $sql = "INSERT INTO `{$db_name}`.`{$this->table_name}` ";
-        $sql .= ' (' . join(', ', $keys) . ') ';
+        $sql .= ' ('.join(', ', $keys).') ';
         $sql .= 'VALUES';
-        $sql .= ' (' . join(', ', $values) . ') ';
+        $sql .= ' ('.join(', ', $values).') ';
 
         $result = $this->execute($sql);
         if ($result)
@@ -295,7 +295,7 @@ 
         $items = array();
         foreach ($args as $key => $val)
         {
-            $items[] = $key . ' = ' . $this->format_value($val);
+            $items[] = $key.' = '.$this->format_value($val);
         }
         return implode(' AND ', $items);
     }

Braces +8 added lines, -16 removed lines

@@ -107,8 +107,7 @@ 
         if ($this->is_new($object))
         {
             $result = $this->insert($object);
-        }
-        else
+        } else
         {
             $result = $this->update($object);
         }
@@ -257,8 +256,7 @@ 
             $object->{$this->id_name} = $id;
             $object->{db_name} = $db_name;
             return $id;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -278,16 +276,13 @@ 
                     return '';
                 }
                 $args = array($this->pk_name, $arg);
-            }
-            else if (is_string($arg))
+            } else if (is_string($arg))
             {
                 return $arg;
-            }
-            else if (is_array($arg))
+            } else if (is_array($arg))
             {
                 $args = $arg;
-            }
-            else
+            } else
             {
                 return $arg;
             }
@@ -309,17 +304,14 @@ 
         if (is_bool($var))
         {
             return $value ? '1' : '0';
-        }
-        else if (is_numeric($value))
+        } else if (is_numeric($value))
         {
             return empty($value) ? '0' : $value;
-        }
-        else if (is_string($value))
+        } else if (is_string($value))
         {
             $value = mysql_escape_string($value);
             return "'$value'";
-        }
-        else
+        } else
         {
             return $value;
         }

main/auth/sso/sso.Drupal.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
     /**
      * Validates the received active connection data with the database
-     * @return	bool	Return the loginFailed variable value to local.inc.php
+     * @return	null|false	Return the loginFailed variable value to local.inc.php
      */
     public function check_user()
     {

Spacing +11 added lines, -11 removed lines

@@ -22,11 +22,11 @@ 
  */
 class ssoDrupal
 {
-    public $protocol;   // 'http://',
-    public $domain;     // 'localhost/project/drupal',
-    public $auth_uri;   // '/?q=user',
+    public $protocol; // 'http://',
+    public $domain; // 'localhost/project/drupal',
+    public $auth_uri; // '/?q=user',
     public $deauth_uri; // '/?q=logout',
-    public $referer;    // http://my.chamilo.com/main/auth/profile.php
+    public $referer; // http://my.chamilo.com/main/auth/profile.php
 
     /**
      * Instanciates the object, initializing all relevant URL strings
@@ -123,9 +123,9 @@ 
                     && ($sso['username'] == $uData['username'])) {
 
                     //Check if the account is active (not locked)
-                    if ($uData['active']=='1') {
+                    if ($uData['active'] == '1') {
                         // check if the expiration date has not been reached
-                        if (empty($uData['expiration_date']) OR $uData['expiration_date'] > date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
+                        if (empty($uData['expiration_date']) OR $uData['expiration_date'] > date('Y-m-d H:i:s') OR $uData['expiration_date'] == '0000-00-00 00:00:00') {
 
                             //If Multiple URL is enabled
                             if (api_get_multiple_access_url()) {
@@ -158,11 +158,11 @@ 
                                             // the user credentials are OK, which
                                             // should be protection enough
                                             // against evil URL spoofing...
-                                            $sso_target = api_get_path(WEB_PATH) . base64_decode($sso['ruri']);
+                                            $sso_target = api_get_path(WEB_PATH).base64_decode($sso['ruri']);
                                         } else {
-                                            $sso_target = isset($sso['target']) ? $sso['target'] : api_get_path(WEB_PATH) . 'index.php';
+                                            $sso_target = isset($sso['target']) ? $sso['target'] : api_get_path(WEB_PATH).'index.php';
                                         }
-                                        header('Location: '. $sso_target);
+                                        header('Location: '.$sso_target);
                                         exit;
                                     } else {
                                         // user does not have permission for this site
@@ -279,12 +279,12 @@ 
         // If this is an administrator, allow him to make some changes in
         // the Chamilo profile
         if ($asAdmin && api_is_platform_admin(true)) {
-            return api_get_path(WEB_CODE_PATH) . "admin/user_edit.php?user_id=$userId";
+            return api_get_path(WEB_CODE_PATH)."admin/user_edit.php?user_id=$userId";
         }
         // If the user doesn't match a Drupal user, give the normal profile
         // link
         if ($drupalUserIdData === false) {
-            return api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
+            return api_get_path(WEB_CODE_PATH).'auth/profile.php';
         }
         // In all other cases, generate a link to the Drupal profile edition
         $drupalUserId = $drupalUserIdData['value'];

main/coursecopy/classes/Course.class.php

Doc Comments +2 added lines

@@ -327,6 +327,7 @@ 
 
     /**
     * Serialize the course with the best serializer available
+    * @return string
     */
     public static function serialize($course)
     {
@@ -339,6 +340,7 @@ 
 
     /**
     * Unserialize the course with the best serializer available
+    * @param string $course
     */
     public static function unserialize($course)
     {

Indentation +4 added lines, -4 removed lines

@@ -326,8 +326,8 @@ 
     }
 
     /**
-    * Serialize the course with the best serializer available
-    */
+     * Serialize the course with the best serializer available
+     */
     public static function serialize($course)
     {
         if (extension_loaded('igbinary')) {
@@ -338,8 +338,8 @@ 
     }
 
     /**
-    * Unserialize the course with the best serializer available
-    */
+     * Unserialize the course with the best serializer available
+     */
     public static function unserialize($course)
     {
         if (extension_loaded('igbinary')) {

Spacing +7 added lines, -7 removed lines

@@ -40,10 +40,10 @@ 
             if (is_array($resources)) {
                 foreach ($resources as $resource) {
                     Coursecopy\Resource::setClassType($resource);
-                    if ($resource->links_to($resource_to_check) ) {
+                    if ($resource->links_to($resource_to_check)) {
                         return true;
                     }
-                    if ($type == RESOURCE_LEARNPATH && get_class($resource)=='CourseCopyLearnpath') {
+                    if ($type == RESOURCE_LEARNPATH && get_class($resource) == 'CourseCopyLearnpath') {
                         if ($resource->has_item($resource_to_check)) {
                             return true;
                         }
@@ -70,7 +70,7 @@ 
      */
     public function has_resources($resource_type = null)
     {
-        if( $resource_type != null) {
+        if ($resource_type != null) {
             return isset($this->resources[$resource_type]) && is_array($this->resources[$resource_type]) && (count(
                     $this->resources[$resource_type]
                 ) > 0);
@@ -177,12 +177,12 @@ 
                             $description = $resource->content;
                             break;
                         case RESOURCE_THEMATIC:
-                            $title 			= $resource->title;
-                            $description 	= $resource->content;
+                            $title = $resource->title;
+                            $description = $resource->content;
                             break;
                         case RESOURCE_ATTENDANCE:
-                            $title 			= $resource->params['name'];
-                            $description 	= $resource->params['description'];
+                            $title = $resource->params['name'];
+                            $description = $resource->params['description'];
                             break;
                         case RESOURCE_WORK:
                             $title = $resource->title;