chamilo / chamilo-lms

main/inc/lib/javascript/svgedit/extensions/savefile_config.php

Spacing +15 added lines, -15 removed lines

@@ -18,8 +18,8 @@ 
 api_protect_course_script();
 api_block_anonymous_users();
 
-if(!isset($_POST['output_svg']) && !isset($_POST['output_png'])) {
-    api_not_allowed();//from Chamilo
+if (!isset($_POST['output_svg']) && !isset($_POST['output_png'])) {
+    api_not_allowed(); //from Chamilo
     die();
 }
 
@@ -43,16 +43,16 @@ 
 }
 
 //get SVG-Edit values
-$filename = $file;//from svg-edit
-$extension = $suffix;// from svg-edit
-$content = $contents;//from svg-edit
+$filename = $file; //from svg-edit
+$extension = $suffix; // from svg-edit
+$content = $contents; //from svg-edit
 
-$title = Database::escape_string(str_replace('_',' ',$filename));
+$title = Database::escape_string(str_replace('_', ' ', $filename));
 
 //get Chamilo variables
 
 if (!isset($_SESSION['draw_dir']) && !isset($_SESSION['whereami'])) {
-    api_not_allowed();//from Chamilo
+    api_not_allowed(); //from Chamilo
     die();
 }
 
@@ -61,7 +61,7 @@ 
 $relativeUrlPath = $_SESSION['draw_dir'];
 $currentTool = $_SESSION['whereami'];
 $dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-$saveDir=$dirBaseDocuments.$_SESSION['draw_dir'];
+$saveDir = $dirBaseDocuments.$_SESSION['draw_dir'];
 
 // a bit title security
 
@@ -94,7 +94,7 @@ 
 */
 
 //checks if the file exists, then rename the new
-if (file_exists($saveDir.'/'.$filename.'.'.$extension) && $currentTool=='document/createdraw') {
+if (file_exists($saveDir.'/'.$filename.'.'.$extension) && $currentTool == 'document/createdraw') {
     $message = get_lang('FileExistsChangeToSave');
     $params = array(
         'message' => $message,
@@ -110,21 +110,21 @@ 
 $documentPath = $saveDir.'/'.$drawFileName;
 
 //add new document to disk
-file_put_contents( $documentPath, $contents );
+file_put_contents($documentPath, $contents);
 
-if ($currentTool=='document/createdraw') {
+if ($currentTool == 'document/createdraw') {
     //add document to database
     $doc_id = add_document($_course, $relativeUrlPath.'/'.$drawFileName, 'file', filesize($documentPath), $title);
     api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
 
-} elseif($currentTool=='document/editdraw') {
+} elseif ($currentTool == 'document/editdraw') {
 
     //check path
-    if (!isset($_SESSION['draw_file'])){
-        api_not_allowed();//from Chamilo
+    if (!isset($_SESSION['draw_file'])) {
+        api_not_allowed(); //from Chamilo
         die();
     }
-    if ($_SESSION['draw_file'] == $drawFileName ){
+    if ($_SESSION['draw_file'] == $drawFileName) {
         $document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$drawFileName);
         update_existing_document($_course, $document_id, filesize($documentPath), null);
         api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);

main/auth/cas/authcas.php

Spacing +5 added lines, -5 removed lines

@@ -5,9 +5,9 @@ 
 * Gets all the info via the ldap module (ldap has to work)
 
 */
-require_once api_get_path(SYS_PATH) . 'main/auth/cas/cas_var.inc.php';
-require_once api_get_path(SYS_PATH) . 'main/auth/external_login/ldap.inc.php';
-require_once api_get_path(SYS_PATH) . 'main/auth/external_login/functions.inc.php';
+require_once api_get_path(SYS_PATH).'main/auth/cas/cas_var.inc.php';
+require_once api_get_path(SYS_PATH).'main/auth/external_login/ldap.inc.php';
+require_once api_get_path(SYS_PATH).'main/auth/external_login/functions.inc.php';
 
 /**
  * @return true if cas is configured
@@ -187,14 +187,14 @@ 
  */
 function get_cas_direct_URL($in_course_code)
 {
-    return api_get_path(WEB_PATH) . 'main/auth/cas/logincas.php?firstpage=' . $in_course_code;
+    return api_get_path(WEB_PATH).'main/auth/cas/logincas.php?firstpage='.$in_course_code;
 }
 
 function getCASLogoHTML()
 {
     $out_res = "";
     if (api_get_setting("casLogoURL") != "") {
-        $out_res = "<img src='" . api_get_setting("casLogoURL") . "' alt='CAS Logo' />";
+        $out_res = "<img src='".api_get_setting("casLogoURL")."' alt='CAS Logo' />";
     }
     return $out_res;
 }

main/auth/cas/lib/CAS.php

Spacing +73 added lines, -73 removed lines

@@ -33,14 +33,14 @@ 
 // hack by Vangelis Haniotakis to handle the absence of $_SERVER['REQUEST_URI'] in IIS

 //

 if (!$_SERVER['REQUEST_URI']) {

-    $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['QUERY_STRING'];

+    $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'].'?'.$_SERVER['QUERY_STRING'];

 }

 

 //

 // another one by Vangelis Haniotakis also to make phpCAS work with PHP5

 //

 if (version_compare(PHP_VERSION, '5', '>=')) {

-    require_once(dirname(__FILE__) . '/CAS/domxml-php4-to-php5.php');

+    require_once(dirname(__FILE__).'/CAS/domxml-php4-to-php5.php');

 }

 

 /**

@@ -322,7 +322,7 @@ 
 // ########################################################################

 

 // include client class

-include_once(dirname(__FILE__) . '/CAS/client.php');

+include_once(dirname(__FILE__).'/CAS/client.php');

 

 // ########################################################################

 //  INTERFACE CLASS

@@ -371,7 +371,7 @@ 
 

         phpCAS:: traceBegin();

         if (is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error($PHPCAS_INIT_CALL['method'] . '() has already been called (at ' . $PHPCAS_INIT_CALL['file'] . ':' . $PHPCAS_INIT_CALL['line'] . ')');

+            phpCAS:: error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')');

         }

         if (gettype($server_version) != 'string') {

             phpCAS:: error('type mismatched for parameter $server_version (should be `string\')');

@@ -392,7 +392,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__

+            'method' => __CLASS__.'::'.__FUNCTION__

         );

 

         // initialize the global object $PHPCAS_CLIENT

@@ -421,7 +421,7 @@ 
 

         phpCAS:: traceBegin();

         if (is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error($PHPCAS_INIT_CALL['method'] . '() has already been called (at ' . $PHPCAS_INIT_CALL['file'] . ':' . $PHPCAS_INIT_CALL['line'] . ')');

+            phpCAS:: error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')');

         }

         if (gettype($server_version) != 'string') {

             phpCAS:: error('type mismatched for parameter $server_version (should be `string\')');

@@ -442,7 +442,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__

+            'method' => __CLASS__.'::'.__FUNCTION__

         );

 

         // initialize the global object $PHPCAS_CLIENT

@@ -477,10 +477,10 @@ 
         if (empty ($filename)) {

             if (preg_match('/^Win.*/', getenv('OS'))) {

                 if (isset ($_ENV['TMP'])) {

-                    $debugDir = $_ENV['TMP'] . '/';

+                    $debugDir = $_ENV['TMP'].'/';

                 } else {

                     if (isset ($_ENV['TEMP'])) {

-                        $debugDir = $_ENV['TEMP'] . '/';

+                        $debugDir = $_ENV['TEMP'].'/';

                     } else {

                         $debugDir = '';

                     }

@@ -488,7 +488,7 @@ 
             } else {

                 $debugDir = DEFAULT_DEBUG_DIR;

             }

-            $filename = $debugDir . 'phpCAS.log';

+            $filename = $debugDir.'phpCAS.log';

         }

 

         if (empty ($PHPCAS_DEBUG['unique_id'])) {

@@ -536,7 +536,7 @@ 
             for ($i = 0; $i < $PHPCAS_DEBUG['indent']; $i++) {

                 $indent_str .= '|    ';

             }

-            error_log($PHPCAS_DEBUG['unique_id'] . ' ' . $indent_str . $str . "\n", 3, $PHPCAS_DEBUG['filename']);

+            error_log($PHPCAS_DEBUG['unique_id'].' '.$indent_str.$str."\n", 3, $PHPCAS_DEBUG['filename']);

         }

 

     }

@@ -566,7 +566,7 @@ 
                 }

             }

         }

-        echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>" . __CLASS__ . "::" . $function . '(): ' . htmlentities($msg) . "</b></font> in <b>" . $file . "</b> on line <b>" . $line . "</b><br />\n";

+        echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>".__CLASS__."::".$function.'(): '.htmlentities($msg)."</b></font> in <b>".$file."</b> on line <b>".$line."</b><br />\n";

         phpCAS:: trace($msg);

         phpCAS:: traceExit();

         exit ();

@@ -578,7 +578,7 @@ 
     function trace($str)

     {

         $dbg = phpCAS:: backtrace();

-        phpCAS:: log($str . ' [' . basename($dbg[1]['file']) . ':' . $dbg[1]['line'] . ']');

+        phpCAS:: log($str.' ['.basename($dbg[1]['file']).':'.$dbg[1]['line'].']');

     }

 

     /**

@@ -591,9 +591,9 @@ 
         $dbg = phpCAS:: backtrace();

         $str = '=> ';

         if (!empty ($dbg[2]['class'])) {

-            $str .= $dbg[2]['class'] . '::';

+            $str .= $dbg[2]['class'].'::';

         }

-        $str .= $dbg[2]['function'] . '(';

+        $str .= $dbg[2]['function'].'(';

         if (is_array($dbg[2]['args'])) {

             foreach ($dbg[2]['args'] as $index => $arg) {

                 if ($index != 0) {

@@ -602,7 +602,7 @@ 
                 $str .= str_replace("\n", "", var_export($arg, true));

             }

         }

-        $str .= ') [' . basename($dbg[2]['file']) . ':' . $dbg[2]['line'] . ']';

+        $str .= ') ['.basename($dbg[2]['file']).':'.$dbg[2]['line'].']';

         phpCAS:: log($str);

         $PHPCAS_DEBUG['indent']++;

     }

@@ -619,7 +619,7 @@ 
         $PHPCAS_DEBUG['indent']--;

         $dbg = phpCAS:: backtrace();

         $str = '';

-        $str .= '<= ' . str_replace("\n", "", var_export($res, true));

+        $str .= '<= '.str_replace("\n", "", var_export($res, true));

         phpCAS:: log($str);

     }

 

@@ -658,7 +658,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (gettype($lang) != 'string') {

             phpCAS:: error('type mismatched for parameter $lang (should be `string\')');

@@ -703,7 +703,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (gettype($header) != 'string') {

             phpCAS:: error('type mismatched for parameter $header (should be `string\')');

@@ -720,7 +720,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (gettype($footer) != 'string') {

             phpCAS:: error('type mismatched for parameter $footer (should be `string\')');

@@ -750,13 +750,13 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_CLIENT->isProxy()) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if ($PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called before ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() (called at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ')');

+            phpCAS:: error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')');

         }

         if (gettype($format) != 'string') {

             phpCAS:: error('type mismatched for parameter $format (should be `string\')');

@@ -796,13 +796,13 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_CLIENT->isProxy()) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if ($PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called before ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() (called at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ')');

+            phpCAS:: error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')');

         }

         if (gettype($user) != 'string') {

             phpCAS:: error('type mismatched for parameter $user (should be `string\')');

@@ -857,16 +857,16 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_CLIENT->isProxy()) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called after the programmer is sure the user has been authenticated (by calling ' . __CLASS__ . '::checkAuthentication() or ' . __CLASS__ . '::forceAuthentication()');

+            phpCAS:: error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-            phpCAS:: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+            phpCAS:: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be `string\')');

@@ -901,16 +901,16 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_CLIENT->isProxy()) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called after the programmer is sure the user has been authenticated (by calling ' . __CLASS__ . '::checkAuthentication() or ' . __CLASS__ . '::forceAuthentication()');

+            phpCAS:: error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-            phpCAS:: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+            phpCAS:: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be `string\')');

@@ -947,7 +947,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (gettype($n) != 'integer') {

             phpCAS:: error('type mismatched for parameter $header (should be `string\')');

@@ -965,7 +965,7 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

 

         $auth = $PHPCAS_CLIENT->checkAuthentication();

@@ -976,7 +976,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__,

+            'method' => __CLASS__.'::'.__FUNCTION__,

             'result' => $auth

         );

         phpCAS:: traceEnd($auth);

@@ -994,7 +994,7 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

 

         $auth = $PHPCAS_CLIENT->forceAuthentication();

@@ -1005,7 +1005,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__,

+            'method' => __CLASS__.'::'.__FUNCTION__,

             'result' => $auth

         );

 

@@ -1013,7 +1013,7 @@ 
             phpCAS:: trace('user is not authenticated, redirecting to the CAS server');

             $PHPCAS_CLIENT->forceAuthentication();

         } else {

-            phpCAS:: trace('no need to authenticate (user `' . phpCAS:: getUser() . '\' is already authenticated)');

+            phpCAS:: trace('no need to authenticate (user `'.phpCAS:: getUser().'\' is already authenticated)');

         }

 

         phpCAS:: traceEnd();

@@ -1029,7 +1029,7 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before'.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

 

         // store where the authentication has been checked and the result

@@ -1038,7 +1038,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__,

+            'method' => __CLASS__.'::'.__FUNCTION__,

             'result' => $auth

         );

 

@@ -1051,7 +1051,7 @@ 
      */

     function authenticate()

     {

-        phpCAS:: error('this method is deprecated. You should use ' . __CLASS__ . '::forceAuthentication() instead');

+        phpCAS:: error('this method is deprecated. You should use '.__CLASS__.'::forceAuthentication() instead');

     }

 

     /**

@@ -1066,7 +1066,7 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

 

         // call the isAuthenticated method of the global $PHPCAS_CLIENT object

@@ -1078,7 +1078,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__,

+            'method' => __CLASS__.'::'.__FUNCTION__,

             'result' => $auth

         );

         phpCAS:: traceEnd($auth);

@@ -1095,7 +1095,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         return ($PHPCAS_CLIENT->isSessionAuthenticated());

     }

@@ -1111,13 +1111,13 @@ 
     {

         global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::forceAuthentication() or ' . __CLASS__ . '::isAuthenticated()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-            phpCAS:: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+            phpCAS:: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

         }

         return $PHPCAS_CLIENT->getUser();

     }

@@ -1133,13 +1133,13 @@ 
     {

         global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::forceAuthentication() or ' . __CLASS__ . '::isAuthenticated()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-            phpCAS:: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+            phpCAS:: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

         }

         return $PHPCAS_CLIENT->getAttributes();

     }

@@ -1151,7 +1151,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         return ($PHPCAS_CLIENT->handleLogoutRequests($check_client, $allowed_clients));

     }

@@ -1166,7 +1166,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         return $PHPCAS_CLIENT->getServerLoginURL();

     }

@@ -1182,7 +1182,7 @@ 
         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

             phpCAS:: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be

@@ -1204,7 +1204,7 @@ 
         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

             phpCAS:: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be

@@ -1226,7 +1226,7 @@ 
         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

             phpCAS:: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be

@@ -1247,7 +1247,7 @@ 
         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

             phpCAS:: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be

@@ -1267,7 +1267,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         return $PHPCAS_CLIENT->getServerLogoutURL();

     }

@@ -1283,7 +1283,7 @@ 
         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

             phpCAS:: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be

@@ -1303,7 +1303,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         $parsedParams = array();

         if ($params != "") {

@@ -1334,7 +1334,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         if (!is_string($service)) {

             phpCAS:: error('type mismatched for parameter $service (should be `string\')');

@@ -1355,7 +1355,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         if (!is_string($url)) {

             phpCAS:: error('type mismatched for parameter $url (should be `string\')');

@@ -1377,7 +1377,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         if (!is_string($service)) {

             phpCAS:: error('type mismatched for parameter $service (should be `string\')');

@@ -1404,10 +1404,10 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_CLIENT->isProxy()) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be `string\')');

@@ -1427,7 +1427,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be `string\')');

@@ -1443,7 +1443,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         return ($PHPCAS_CLIENT->getURL());

     }

@@ -1455,7 +1455,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (gettype($target_service) != 'string') {

             phpCAS:: error('type mismatched for parameter $target_service(should be `string\')');

@@ -1473,7 +1473,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         if (gettype($cert) != 'string') {

             phpCAS:: error('type mismatched for parameter $cert (should be `string\')');

@@ -1492,7 +1492,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         if (gettype($cert) != 'string') {

             phpCAS:: error('type mismatched for parameter $cert (should be `string\')');

@@ -1509,7 +1509,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         $PHPCAS_CLIENT->setNoCasServerValidation();

         phpCAS:: traceEnd();

@@ -1528,7 +1528,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         $PHPCAS_CLIENT->setExtraCurlOption($key, $value);

         phpCAS:: traceEnd();

main/inc/lib/usergroup.lib.php

Spacing +70 added lines, -70 removed lines

@@ -82,7 +82,7 @@ 
             ";
             $result = Database::query($sql);
             if (Database::num_rows($result)) {
-                $row  = Database::fetch_array($result);
+                $row = Database::fetch_array($result);
 
                 return $row['count'];
             }
@@ -102,7 +102,7 @@ 
             ";
             $result = Database::query($sql);
             if (Database::num_rows($result)) {
-                $row  = Database::fetch_array($result);
+                $row = Database::fetch_array($result);
                 return $row['count'];
             }
         }
@@ -127,7 +127,7 @@ 
             ";
             $result = Database::query($sql);
             if (Database::num_rows($result)) {
-                $row  = Database::fetch_array($result);
+                $row = Database::fetch_array($result);
                 return $row['count'];
             }
 
@@ -148,7 +148,7 @@ 
             ";
             $result = Database::query($sql);
             if (Database::num_rows($result)) {
-                $row  = Database::fetch_array($result);
+                $row = Database::fetch_array($result);
                 return $row['count'];
             }
 
@@ -529,13 +529,13 @@ 
                 INNER JOIN {$this->table} g
                 ON (u.usergroup_id = g.id)
                 ";
-            $where =  array('where' => array('user_id = ? AND access_url_id = ? ' => array($userId, $urlId)));
+            $where = array('where' => array('user_id = ? AND access_url_id = ? ' => array($userId, $urlId)));
         } else {
             $from = $this->usergroup_rel_user_table." u
                 INNER JOIN {$this->table} g
                 ON (u.usergroup_id = g.id)
                 ";
-            $where =  array('where' => array('user_id = ?' => $userId));
+            $where = array('where' => array('user_id = ?' => $userId));
         }
 
         if ($filterByType !== null) {
@@ -568,10 +568,10 @@ 
             $urlId = api_get_current_access_url_id();
             $from = $this->usergroup_rel_user_table." u
                     INNER JOIN {$this->access_url_rel_usergroup} a ON (a.usergroup_id AND u.usergroup_id)";
-            $where =  array('where' => array('user_id = ? AND access_url_id = ? ' => array($userId, $urlId)));
+            $where = array('where' => array('user_id = ? AND access_url_id = ? ' => array($userId, $urlId)));
         } else {
             $from = $this->usergroup_rel_user_table." u ";
-            $where =  array('where' => array('user_id = ?' => $userId));
+            $where = array('where' => array('user_id = ?' => $userId));
         }
 
         $results = Database::select(
@@ -857,7 +857,7 @@ 
             }
             $result = $new_result;
         }
-        $columns = array('name', 'users', 'courses','sessions', 'group_type');
+        $columns = array('name', 'users', 'courses', 'sessions', 'group_type');
 
         if (!in_array($sidx, $columns)) {
             $sidx = 'name';
@@ -1263,7 +1263,7 @@ 
                 }
             }
         }
-        $response->addAssign('ajax_list_courses','innerHTML', api_utf8_encode($return));
+        $response->addAssign('ajax_list_courses', 'innerHTML', api_utf8_encode($return));
 
         return $response;
     }
@@ -1372,7 +1372,7 @@ 
      * @param string style css
      * @return array with the file and the style of an image i.e $array['file'] $array['style']
      */
-    public function get_picture_group($id, $picture_file, $height, $size_picture = GROUP_IMAGE_SIZE_MEDIUM , $style = '')
+    public function get_picture_group($id, $picture_file, $height, $size_picture = GROUP_IMAGE_SIZE_MEDIUM, $style = '')
     {
         $picture = array();
         $picture['style'] = $style;
@@ -1415,7 +1415,7 @@ 
             if (file_exists($file) && !is_dir($file)) {
                 $picture['file'] = $image_array['dir'].$picture_file;
             } else {
-                $picture['file'] = Display::returnIconPath('group_na.png',64);
+                $picture['file'] = Display::returnIconPath('group_na.png', 64);
             }
         }
         return $picture;
@@ -1485,7 +1485,7 @@ 
      */
     public function getAllowedPictureExtensions()
     {
-        return $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
+        return $allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
     }
 
     /**
@@ -1519,7 +1519,7 @@ 
         if (empty($user_id)) {
             $user_id = api_get_user_id();
         }
-        $user_role	= $this->get_user_group_role($user_id, $group_id);
+        $user_role = $this->get_user_group_role($user_id, $group_id);
         if (in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN))) {
             return true;
         } else {
@@ -1537,7 +1537,7 @@ 
         if (empty($user_id)) {
             $user_id = api_get_user_id();
         }
-        $user_role	= $this->get_user_group_role($user_id, $group_id);
+        $user_role = $this->get_user_group_role($user_id, $group_id);
         if (in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR))) {
             return true;
         } else {
@@ -1564,7 +1564,7 @@ 
             GROUP_USER_PERMISSION_READER,
             GROUP_USER_PERMISSION_HRM,
         );
-        $user_role	= self::get_user_group_role($user_id, $group_id);
+        $user_role = self::get_user_group_role($user_id, $group_id);
         if (in_array($user_role, $roles)) {
             return true;
         } else {
@@ -1581,7 +1581,7 @@ 
      * */
     public function get_user_group_role($user_id, $group_id)
     {
-        $table_group_rel_user= $this->usergroup_rel_user_table;
+        $table_group_rel_user = $this->usergroup_rel_user_table;
         $return_value = 0;
         if (!empty($user_id) && !empty($group_id)) {
             $sql = "SELECT relation_type FROM $table_group_rel_user
@@ -1589,8 +1589,8 @@ 
                         usergroup_id = ".intval($group_id)." AND
                         user_id = ".intval($user_id)." ";
             $result = Database::query($sql);
-            if (Database::num_rows($result)>0) {
-                $row = Database::fetch_array($result,'ASSOC');
+            if (Database::num_rows($result) > 0) {
+                $row = Database::fetch_array($result, 'ASSOC');
                 $return_value = $row['relation_type'];
             }
         }
@@ -1645,7 +1645,7 @@ 
         if (is_array($user_list) && is_array($group_list)) {
             foreach ($group_list as $group_id) {
                 foreach ($user_list as $user_id) {
-                    $role = self::get_user_group_role($user_id,$group_id);
+                    $role = self::get_user_group_role($user_id, $group_id);
                     if ($role == 0) {
                         $sql = "INSERT INTO $table_url_rel_group
 		               			SET
@@ -1676,7 +1676,7 @@ 
     public function delete_user_rel_group($user_id, $group_id)
     {
         $table = $this->usergroup_rel_user_table;
-        $sql= "DELETE FROM $table
+        $sql = "DELETE FROM $table
                WHERE
                 user_id = ".intval($user_id)." AND
                 usergroup_id = ".intval($group_id)."  ";
@@ -1732,7 +1732,7 @@ 
 
         $sql = "UPDATE $table_group_rel_user
    				SET relation_type = ".intval($relation_type)."
-                WHERE user_id = $user_id AND usergroup_id = $group_id" ;
+                WHERE user_id = $user_id AND usergroup_id = $group_id";
         Database::query($sql);
     }
 
@@ -1774,7 +1774,7 @@ 
         if (Database::num_rows($result) > 0) {
             while ($row = Database::fetch_array($result, 'ASSOC')) {
                 if ($with_image) {
-                    $picture = self::get_picture_group($row['id'], $row['picture'],80);
+                    $picture = self::get_picture_group($row['id'], $row['picture'], 80);
                     $img = '<img src="'.$picture['file'].'" />';
                     $row['picture'] = $img;
                 }
@@ -1810,11 +1810,11 @@ 
 				ORDER BY count DESC
 				LIMIT $num";
 
-        $result=Database::query($sql);
+        $result = Database::query($sql);
         $array = array();
         while ($row = Database::fetch_array($result, 'ASSOC')) {
             if ($with_image) {
-                $picture = self::get_picture_group($row['id'], $row['picture'],80);
+                $picture = self::get_picture_group($row['id'], $row['picture'], 80);
                 $img = '<img src="'.$picture['file'].'" />';
                 $row['picture'] = $img;
             }
@@ -1859,11 +1859,11 @@ 
                 ORDER BY created_at DESC
                 LIMIT $num ";
 
-        $result=Database::query($sql);
+        $result = Database::query($sql);
         $array = array();
         while ($row = Database::fetch_array($result, 'ASSOC')) {
             if ($with_image) {
-                $picture = self::get_picture_group($row['id'], $row['picture'],80);
+                $picture = self::get_picture_group($row['id'], $row['picture'], 80);
                 $img = '<img src="'.$picture['file'].'" />';
                 $row['picture'] = $img;
             }
@@ -1897,7 +1897,7 @@ 
         $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
         $group_id = intval($group_id);
 
-        if (empty($group_id)){
+        if (empty($group_id)) {
             return array();
         }
 
@@ -1912,9 +1912,9 @@ 
             $where_relation_condition = '';
         } else {
             $new_relation_type = array();
-            foreach($relation_type as $rel) {
+            foreach ($relation_type as $rel) {
                 $rel = intval($rel);
-                $new_relation_type[] ="'$rel'";
+                $new_relation_type[] = "'$rel'";
             }
             $relation_type = implode(',', $new_relation_type);
             if (!empty($relation_type))
@@ -1958,7 +1958,7 @@ 
         $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
         $group_id = intval($group_id);
 
-        if (empty($group_id)){
+        if (empty($group_id)) {
             return array();
         }
 
@@ -1969,7 +1969,7 @@ 
 			    WHERE gu.usergroup_id= $group_id
 			    ORDER BY relation_type, firstname";
 
-        $result=Database::query($sql);
+        $result = Database::query($sql);
         $array = array();
         while ($row = Database::fetch_array($result, 'ASSOC')) {
             $array[$row['id']] = $row;
@@ -1998,33 +1998,33 @@ 
             case GROUP_USER_PERMISSION_READER:
                 // I'm just a reader
                 $relation_group_title = get_lang('IAmAReader');
-                $links .=  '<li class="'. ($show == 'invite_friends' ? 'active' : '') .'"><a href="group_invitation.php?id='.$group_id.'">'.
-                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')) . get_lang('InviteFriends') . '</a></li>';
-                $links .=  '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
-                            Display::return_icon('group_leave.png', get_lang('LeaveGroup')) . get_lang('LeaveGroup') . '</a></li>';
+                $links .= '<li class="'.($show == 'invite_friends' ? 'active' : '').'"><a href="group_invitation.php?id='.$group_id.'">'.
+                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')).get_lang('InviteFriends').'</a></li>';
+                $links .= '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
+                            Display::return_icon('group_leave.png', get_lang('LeaveGroup')).get_lang('LeaveGroup').'</a></li>';
                 if (UserGroup::canLeave($group_info)) {
-                    $links .=  '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
-                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')) . get_lang('LeaveGroup') . '</a></li>';
+                    $links .= '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
+                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')).get_lang('LeaveGroup').'</a></li>';
                 }
                 break;
             case GROUP_USER_PERMISSION_ADMIN:
                 $relation_group_title = get_lang('IAmAnAdmin');
-                $links .=  '<li class="'. ($show == 'group_edit' ? 'active' : '') .'"><a href="group_edit.php?id='.$group_id.'">'.
-                            Display::return_icon('group_edit.png', get_lang('EditGroup')) . get_lang('EditGroup') . '</a></li>';
-                $links .=  '<li class="'. ($show == 'member_list' ? 'active' : '') .'"><a href="group_waiting_list.php?id='.$group_id.'">'.
-                            Display::return_icon('waiting_list.png', get_lang('WaitingList')) . get_lang('WaitingList') . '</a></li>';
-                $links .=  '<li class="'. ($show == 'invite_friends' ? 'active' : '') .'"><a href="group_invitation.php?id='.$group_id.'">'.
-                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')) . get_lang('InviteFriends') . '</a></li>';
+                $links .= '<li class="'.($show == 'group_edit' ? 'active' : '').'"><a href="group_edit.php?id='.$group_id.'">'.
+                            Display::return_icon('group_edit.png', get_lang('EditGroup')).get_lang('EditGroup').'</a></li>';
+                $links .= '<li class="'.($show == 'member_list' ? 'active' : '').'"><a href="group_waiting_list.php?id='.$group_id.'">'.
+                            Display::return_icon('waiting_list.png', get_lang('WaitingList')).get_lang('WaitingList').'</a></li>';
+                $links .= '<li class="'.($show == 'invite_friends' ? 'active' : '').'"><a href="group_invitation.php?id='.$group_id.'">'.
+                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')).get_lang('InviteFriends').'</a></li>';
                 if (UserGroup::canLeave($group_info)) {
                     $links .= '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
-                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')) . get_lang('LeaveGroup') . '</a></li>';
+                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')).get_lang('LeaveGroup').'</a></li>';
                 }
                 break;
             case GROUP_USER_PERMISSION_PENDING_INVITATION:
 //				$links .=  '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('addd.gif', get_lang('YouHaveBeenInvitedJoinNow'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('YouHaveBeenInvitedJoinNow').'</span></a></li>';
                 break;
             case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
-                $relation_group_title =  get_lang('WaitingForAdminResponse');
+                $relation_group_title = get_lang('WaitingForAdminResponse');
                 break;
             case GROUP_USER_PERMISSION_MODERATOR:
                 $relation_group_title = get_lang('IAmAModerator');
@@ -2032,28 +2032,28 @@ 
                 //$links .=  '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
                 //$links .=  '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>';
                 if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
-                    $links .=  '<li><a href="group_waiting_list.php?id='.$group_id.'">'.
-                                Display::return_icon('waiting_list.png', get_lang('WaitingList')) . get_lang('WaitingList') . '</a></li>';
+                    $links .= '<li><a href="group_waiting_list.php?id='.$group_id.'">'.
+                                Display::return_icon('waiting_list.png', get_lang('WaitingList')).get_lang('WaitingList').'</a></li>';
                 }
-                $links .=  '<li><a href="group_invitation.php?id='.$group_id.'">'.
-                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')) . get_lang('InviteFriends') . '</a></li>';
+                $links .= '<li><a href="group_invitation.php?id='.$group_id.'">'.
+                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')).get_lang('InviteFriends').'</a></li>';
                 if (UserGroup::canLeave($group_info)) {
-                    $links .=  '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
-                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')) . get_lang('LeaveGroup') . '</a></li>';
+                    $links .= '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
+                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')).get_lang('LeaveGroup').'</a></li>';
                 }
                 break;
             case GROUP_USER_PERMISSION_HRM:
                 $relation_group_title = get_lang('IAmAHRM');
                 $links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax" title="'.get_lang('ComposeMessage').'" data-size="lg" data-title="'.get_lang('ComposeMessage').'">'.
-                            Display::return_icon('new-message.png', get_lang('NewTopic')) . get_lang('NewTopic') . '</a></li>';
-                $links .=  '<li><a href="group_view.php?id='.$group_id.'">'.
-                            Display::return_icon('message_list.png', get_lang('MessageList')) . get_lang('MessageList') . '</a></li>';
-                $links .=  '<li><a href="group_invitation.php?id='.$group_id.'">'.
-                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')) . get_lang('InviteFriends') . '</a></li>';
-                $links .=  '<li><a href="group_members.php?id='.$group_id.'">'.
-                            Display::return_icon('member_list.png', get_lang('MemberList')) . get_lang('MemberList') . '</a></li>';
-                $links .=  '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
-                            Display::return_icon('delete_data.gif', get_lang('LeaveGroup')) . get_lang('LeaveGroup') . '</a></li>';
+                            Display::return_icon('new-message.png', get_lang('NewTopic')).get_lang('NewTopic').'</a></li>';
+                $links .= '<li><a href="group_view.php?id='.$group_id.'">'.
+                            Display::return_icon('message_list.png', get_lang('MessageList')).get_lang('MessageList').'</a></li>';
+                $links .= '<li><a href="group_invitation.php?id='.$group_id.'">'.
+                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')).get_lang('InviteFriends').'</a></li>';
+                $links .= '<li><a href="group_members.php?id='.$group_id.'">'.
+                            Display::return_icon('member_list.png', get_lang('MemberList')).get_lang('MemberList').'</a></li>';
+                $links .= '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
+                            Display::return_icon('delete_data.gif', get_lang('LeaveGroup')).get_lang('LeaveGroup').'</a></li>';
                 break;
             default:
                 //$links .=  '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('addd.gif', get_lang('JoinGroup'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('JoinGroup').'</a></span></li>';
@@ -2090,14 +2090,14 @@ 
      */
     public function get_groups_by_user_count($user_id = '', $relation_type = GROUP_USER_PERMISSION_READER, $with_image = false)
     {
-        $table_group_rel_user	= $this->usergroup_rel_user_table;
-        $tbl_group				= $this->table;
-        $user_id 				= intval($user_id);
+        $table_group_rel_user = $this->usergroup_rel_user_table;
+        $tbl_group = $this->table;
+        $user_id = intval($user_id);
 
         if ($relation_type == 0) {
             $where_relation_condition = '';
         } else {
-            $relation_type 			= intval($relation_type);
+            $relation_type = intval($relation_type);
             $where_relation_condition = "AND gu.relation_type = $relation_type ";
         }
 
@@ -2170,7 +2170,7 @@ 
         }
 
         $direction = 'ASC';
-        if (!in_array($direction, array('ASC','DESC'))) {
+        if (!in_array($direction, array('ASC', 'DESC'))) {
             $direction = 'ASC';
         }
 
@@ -2181,8 +2181,8 @@ 
         $sql .= " LIMIT $from,$number_of_items";
 
         $res = Database::query($sql);
-        if (Database::num_rows($res)> 0) {
-            while ($row = Database::fetch_array($res,'ASSOC')) {
+        if (Database::num_rows($res) > 0) {
+            while ($row = Database::fetch_array($res, 'ASSOC')) {
                 if (!in_array($row['id'], $return)) {
                     $return[$row['id']] = $row;
                 }
@@ -2207,7 +2207,7 @@ 
             if ($i == $max_level) {
                 $select_part .= "rg$rg_number.group_id as id_$rg_number ";
             } else {
-                $select_part .="rg$rg_number.group_id as id_$rg_number, ";
+                $select_part .= "rg$rg_number.group_id as id_$rg_number, ";
             }
             if ($i == 1) {
                 $cond_part .= "FROM $t_rel_group rg0 LEFT JOIN $t_rel_group rg$i on rg$rg_number.group_id = rg$i.subgroup_id ";
@@ -2395,7 +2395,7 @@ 
         $nameList = '<ul class="list-unstyled">';
 
         foreach ($groupsNameListParsed as $name) {
-            $nameList .= '<li>' . Display::span($name, ['class' => 'label label-info']) . '</li>';
+            $nameList .= '<li>'.Display::span($name, ['class' => 'label label-info']).'</li>';
         }
 
         $nameList .= '</ul>';

main/inc/ajax/sequence.ajax.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
                     try {
                         $graphImage = $graphviz->createImageHtml($graph);
                     } catch (UnexpectedValueException $e) {
-                        error_log($e->getMessage() . ' - Graph could not be rendered in resources sequence because GraphViz command "dot" could not be executed - Make sure graphviz is installed.');
+                        error_log($e->getMessage().' - Graph could not be rendered in resources sequence because GraphViz command "dot" could not be executed - Make sure graphviz is installed.');
                         $graphImage = '<p class="text-center"><small>'.get_lang('MissingChartLibraryPleaseCheckLog').'</small></p>';
                     }
                     echo $graphImage;
@@ -90,11 +90,11 @@ 
                         );
                     }
 
-                    $link = '<div class="parent" data-id="' . $id . '">';
+                    $link = '<div class="parent" data-id="'.$id.'">';
                     $link .= '<div class="big-icon">';
                     $link .= $image;
-                    $link .= '<div class="sequence-course">' . $sessionInfo['name'] . '</div>';
-                    $link .= '<a href="#" class="sequence-id">' . $id . '</a>';
+                    $link .= '<div class="sequence-course">'.$sessionInfo['name'].'</div>';
+                    $link .= '<a href="#" class="sequence-id">'.$id.'</a>';
                     $link .= $linkDelete;
                     $link .= $linkUndo;
                     $link .= '</div></div>';

main/admin/skill.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 
 $listAction = api_get_self();
 
-$action =  '';
+$action = '';
 if (isset($_GET['action']) && in_array($_GET['action'], ['add', 'edit', 'delete'])) {
     $action = $_GET['action'];
 }
@@ -52,8 +52,8 @@ 
 }
 $formToDisplay = $form->returnForm();
 
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => api_get_self(), 'name' => get_lang('ManageSkillsLevels'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => api_get_self(), 'name' => get_lang('ManageSkillsLevels'));
 
 $tpl = new Template($action);
 switch ($action) {

main/admin/skill_profile.php

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 
 $listAction = api_get_self();
 
-$action =  '';
+$action = '';
 if (isset($_GET['action']) && in_array($_GET['action'], ['add', 'edit', 'delete', 'move_up', 'move_down'])) {
     $action = $_GET['action'];
 }
@@ -43,9 +43,9 @@ 
 }
 $formToDisplay = $form->returnForm();
 
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'skill.php', 'name' => get_lang('ManageSkillsLevels'));
-$interbreadcrumb[] = array ('url' =>  api_get_self(), 'name' => get_lang('SkillProfile'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'skill.php', 'name' => get_lang('ManageSkillsLevels'));
+$interbreadcrumb[] = array('url' =>  api_get_self(), 'name' => get_lang('SkillProfile'));
 
 $tpl = new Template($action);
 switch ($action) {
@@ -56,7 +56,7 @@ 
         $position = $item->getPosition();
 
         if (!empty($position)) {
-            $item->setPosition($position-1);
+            $item->setPosition($position - 1);
         }
         $em->persist($item);
         $em->flush();
@@ -69,7 +69,7 @@ 
 
         $position = $item->getPosition();
 
-        $item->setPosition($position+1);
+        $item->setPosition($position + 1);
 
         $em->persist($item);
         $em->flush();

main/document/create_audio.php

Spacing +50 added lines, -50 removed lines

@@ -63,35 +63,35 @@ 
 }
 
 if ($dir[0] != '/') {
-    $dir = '/' . $dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
     $dir .= '/';
 }
 
-$filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $dir;
+$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-    $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
     $dir = '/';
 }
 
 //groups //TODO: clean
 if (!empty($groupId)) {
     $interbreadcrumb[] = array(
-        "url" => "../group/group_space.php?" . api_get_cidreq(),
+        "url" => "../group/group_space.php?".api_get_cidreq(),
         "name" => get_lang('GroupSpace')
     );
     $group = GroupManager:: get_group_properties($groupId);
     $path = explode('/', $dir);
-    if ('/' . $path[1] != $group['directory']) {
+    if ('/'.$path[1] != $group['directory']) {
         api_not_allowed(true);
     }
 }
 
 $interbreadcrumb[] = array(
-    "url" => "./document.php?curdirpath=" . urlencode($dir) . "&" . api_get_cidreq(),
+    "url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(),
     "name" => get_lang('Documents')
 );
 
@@ -128,11 +128,11 @@ 
 
 $dir_acum = '';
 for ($i = 0; $i < $array_len; $i++) {
-    $url_dir = 'document.php?&curdirpath=' . $dir_acum . $dir_array[$i];
+    $url_dir = 'document.php?&curdirpath='.$dir_acum.$dir_array[$i];
     //Max char 80
     $url_to_who = cut($dir_array[$i], 80);
     $interbreadcrumb[] = array('url' => $url_dir, 'name' => $url_to_who);
-    $dir_acum .= $dir_array[$i] . '/';
+    $dir_acum .= $dir_array[$i].'/';
 }
 
 $service = isset($_GET['service']) ? $_GET['service'] : 'pediaphon';
@@ -140,15 +140,15 @@ 
 Display:: display_header($nameTools, 'Doc');
 
 echo '<div class="actions">';
-echo '<a href="document.php?id=' . $document_id . '">' .
-    Display::return_icon('back.png', get_lang('BackTo') . ' ' . get_lang('DocumentsOverview'), '',
-        ICON_SIZE_MEDIUM) . '</a>';
+echo '<a href="document.php?id='.$document_id.'">'.
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '',
+        ICON_SIZE_MEDIUM).'</a>';
 
-echo '<a href="create_audio.php?' . api_get_cidreq() . '&id=' . $document_id . '&service=pediaphon">' .
-    Display::return_icon('pediaphon.png', get_lang('Pediaphon'), '', ICON_SIZE_MEDIUM) . '</a>';
+echo '<a href="create_audio.php?'.api_get_cidreq().'&id='.$document_id.'&service=pediaphon">'.
+    Display::return_icon('pediaphon.png', get_lang('Pediaphon'), '', ICON_SIZE_MEDIUM).'</a>';
 
-echo '<a href="create_audio.php?' . api_get_cidreq() . '&id=' . $document_id . '&service=google">' .
-    Display::return_icon('google.png', get_lang('GoogleAudio'), '', ICON_SIZE_MEDIUM) . '</a>';
+echo '<a href="create_audio.php?'.api_get_cidreq().'&id='.$document_id.'&service=google">'.
+    Display::return_icon('google.png', get_lang('GoogleAudio'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 ?>
     <!-- javascript and styles for textareaCounter-->
@@ -213,14 +213,14 @@ 
 $selected_language = null;
 
 while ($row = Database::fetch_array($result_select)) {
-    $options[$row['isocode']] = $row['original_name'] . ' (' . $row['english_name'] . ')';
+    $options[$row['isocode']] = $row['original_name'].' ('.$row['english_name'].')';
     if (in_array($row['isocode'], array('de', 'en', 'es', 'fr'))) {
-        $options_pedia[$row['isocode']] = $row['original_name'] . ' (' . $row['english_name'] . ')';
+        $options_pedia[$row['isocode']] = $row['original_name'].' ('.$row['english_name'].')';
     }
 }
 
 if ($service == 'google') {
-    $selected_language = api_get_language_isocode();//lang default is the course language
+    $selected_language = api_get_language_isocode(); //lang default is the course language
 
     $form = new FormValidator('form1', 'post', api_get_self().'?'.api_get_cidreq(), '', array('id' => 'form1'));
     $form->addHeader(get_lang('HelpText2Audio'));
@@ -272,16 +272,16 @@ 
         var voices = new Array()
 
         <!--German -->
-        voices['de'] = ["<?php echo get_lang('Female') . ' (de1)'; ?>|de1", "<?php echo get_lang('Male') . ' (de2)'; ?>|de2", "<?php echo get_lang('Female') . ' (de3)'; ?>|de3", "<?php echo get_lang('Male') . ' (de4)'; ?>|de4", "<?php echo get_lang('Female') . ' (de5)'; ?>|de5", "<?php echo get_lang('Male') . ' (de6)'; ?>|de6", "<?php echo get_lang('Female') . ' (de7)'; ?>|de7", "<?php echo get_lang('Female') . ' (de8 HQ)'; ?>|de8"]
+        voices['de'] = ["<?php echo get_lang('Female').' (de1)'; ?>|de1", "<?php echo get_lang('Male').' (de2)'; ?>|de2", "<?php echo get_lang('Female').' (de3)'; ?>|de3", "<?php echo get_lang('Male').' (de4)'; ?>|de4", "<?php echo get_lang('Female').' (de5)'; ?>|de5", "<?php echo get_lang('Male').' (de6)'; ?>|de6", "<?php echo get_lang('Female').' (de7)'; ?>|de7", "<?php echo get_lang('Female').' (de8 HQ)'; ?>|de8"]
 
         <!--English -->
-        voices['en'] = ["<?php echo get_lang('Male') . ' (en1)'; ?>|en1", "<?php echo get_lang('Male') . ' (en2 HQ)'; ?>|en2", "<?php echo get_lang('Female') . ' (us1)'; ?>|us1", "<?php echo get_lang('Male') . ' (us2)'; ?>|us2", "<?php echo get_lang('Male') . ' (us3)'; ?>|us3", "<?php echo get_lang('Female') . '(us4 HQ)'; ?>|us4"]
+        voices['en'] = ["<?php echo get_lang('Male').' (en1)'; ?>|en1", "<?php echo get_lang('Male').' (en2 HQ)'; ?>|en2", "<?php echo get_lang('Female').' (us1)'; ?>|us1", "<?php echo get_lang('Male').' (us2)'; ?>|us2", "<?php echo get_lang('Male').' (us3)'; ?>|us3", "<?php echo get_lang('Female').'(us4 HQ)'; ?>|us4"]
 
         <!--Spanish -->
-        voices['es'] = ["<?php echo get_lang('Male') . ' (es5 HQ)'; ?>|es5"]
+        voices['es'] = ["<?php echo get_lang('Male').' (es5 HQ)'; ?>|es5"]
 
         <!--French -->
-        voices['fr'] = ["<?php echo get_lang('Female') . ' (fr8 HQ)'; ?>|fr8"]
+        voices['fr'] = ["<?php echo get_lang('Female').' (fr8 HQ)'; ?>|fr8"]
 
         $(document).ready(function () {
             $('.lang').on('change', function () {
@@ -312,11 +312,11 @@ 
  */
 function downloadMP3_google($filepath, $dir)
 {
-    $location = 'create_audio.php?' . api_get_cidreq() . '&id=' . intval($_POST['id']) . '&service=google';
+    $location = 'create_audio.php?'.api_get_cidreq().'&id='.intval($_POST['id']).'&service=google';
 
     //security
     if (!isset($_POST['lang']) && !isset($_POST['text']) && !isset($_POST['title']) && !isset($filepath) && !isset($dir)) {
-        echo '<script>window.location.href="' . $location . '"</script>';
+        echo '<script>window.location.href="'.$location.'"</script>';
         return;
     }
 
@@ -326,33 +326,33 @@ 
     $clean_title = trim($_POST['title']);
     $clean_text = trim($_POST['text']);
     if (empty($clean_title) || empty($clean_text)) {
-        echo '<script>window.location.href="' . $location . '"</script>';
+        echo '<script>window.location.href="'.$location.'"</script>';
         
         return;
     }
     $clean_title = Security::remove_XSS($clean_title);
     $clean_title = Database::escape_string($clean_title);
-    $clean_title = str_replace(' ', '_', $clean_title);//compound file names
+    $clean_title = str_replace(' ', '_', $clean_title); //compound file names
 
     $clean_text = Security::remove_XSS($clean_text);
     $clean_lang = Security::remove_XSS($_POST['lang']);
 
     $extension = 'mp3';
-    $audio_filename = $clean_title . '.' . $extension;
+    $audio_filename = $clean_title.'.'.$extension;
     $audio_title = str_replace('_', ' ', $clean_title);
 
     //prevent duplicates
-    if (file_exists($filepath . '/' . $clean_title . '.' . $extension)) {
+    if (file_exists($filepath.'/'.$clean_title.'.'.$extension)) {
         $i = 1;
-        while (file_exists($filepath . '/' . $clean_title . '_' . $i . '.' . $extension)) {
+        while (file_exists($filepath.'/'.$clean_title.'_'.$i.'.'.$extension)) {
             $i++;
         }
-        $audio_filename = $clean_title . '_' . $i . '.' . $extension;
-        $audio_title = $clean_title . '_' . $i . '.' . $extension;
+        $audio_filename = $clean_title.'_'.$i.'.'.$extension;
+        $audio_title = $clean_title.'_'.$i.'.'.$extension;
         $audio_title = str_replace('_', ' ', $audio_title);
     }
 
-    $documentPath = $filepath . '/' . $audio_filename;
+    $documentPath = $filepath.'/'.$audio_filename;
 
     $clean_text = api_replace_dangerous_char($clean_text);
 
@@ -361,7 +361,7 @@ 
 
     $proxySettings = api_get_configuration_value('proxy_settings');
     $key = api_get_configuration_value('translate_app_google_key');
-    $url = "https://www.googleapis.com/language/translate/v2?key=$key&" . $clean_lang . "&target=$clean_lang&q=" . urlencode($clean_text) . "";
+    $url = "https://www.googleapis.com/language/translate/v2?key=$key&".$clean_lang."&target=$clean_lang&q=".urlencode($clean_text)."";
 
     if (empty($proxySettings)) {
         $content = file_get_contents($url);
@@ -381,7 +381,7 @@ 
     $relativeUrlPath = $dir;
     $doc_id = add_document(
         $_course,
-        $relativeUrlPath . $audio_filename,
+        $relativeUrlPath.$audio_filename,
         'file',
         filesize($documentPath),
         $audio_title
@@ -400,7 +400,7 @@ 
     );
     Display::display_confirmation_message(get_lang('DocumentCreated'));
     //return to location
-    echo '<script>window.location.href="' . $location . '"</script>';
+    echo '<script>window.location.href="'.$location.'"</script>';
 }
 
 /**
@@ -413,10 +413,10 @@ 
  */
 function downloadMP3_pediaphon($filepath, $dir)
 {
-    $location = 'create_audio.php?' . api_get_cidreq() . '&id=' . intval($_POST['id']) . '&service=pediaphon';
+    $location = 'create_audio.php?'.api_get_cidreq().'&id='.intval($_POST['id']).'&service=pediaphon';
     //security
     if (!isset($_POST['lang']) && !isset($_POST['text']) && !isset($_POST['title']) && !isset($filepath) && !isset($dir)) {
-        echo '<script>window.location.href="' . $location . '"</script>';
+        echo '<script>window.location.href="'.$location.'"</script>';
         return;
     }
     $_course = api_get_course_info();
@@ -426,33 +426,33 @@ 
     $clean_text = trim($_POST['text']);
     $clean_voices = Security::remove_XSS($_POST['voices']);
     if (empty($clean_title) || empty($clean_text) || empty($clean_voices)) {
-        echo '<script>window.location.href="' . $location . '"</script>';
+        echo '<script>window.location.href="'.$location.'"</script>';
 
         return;
     }
     $clean_title = Security::remove_XSS($clean_title);
     $clean_title = Database::escape_string($clean_title);
-    $clean_title = str_replace(' ', '_', $clean_title);//compound file names
+    $clean_title = str_replace(' ', '_', $clean_title); //compound file names
     $clean_text = Security::remove_XSS($clean_text);
     $clean_lang = Security::remove_XSS($_POST['lang']);
     $clean_speed = Security::remove_XSS($_POST['speed']);
 
     $extension = 'mp3';
-    $audio_filename = $clean_title . '.' . $extension;
+    $audio_filename = $clean_title.'.'.$extension;
     $audio_title = str_replace('_', ' ', $clean_title);
 
     //prevent duplicates
-    if (file_exists($filepath . '/' . $clean_title . '.' . $extension)) {
+    if (file_exists($filepath.'/'.$clean_title.'.'.$extension)) {
         $i = 1;
-        while (file_exists($filepath . '/' . $clean_title . '_' . $i . '.' . $extension)) {
+        while (file_exists($filepath.'/'.$clean_title.'_'.$i.'.'.$extension)) {
             $i++;
         }
-        $audio_filename = $clean_title . '_' . $i . '.' . $extension;
-        $audio_title = $clean_title . '_' . $i . '.' . $extension;
+        $audio_filename = $clean_title.'_'.$i.'.'.$extension;
+        $audio_title = $clean_title.'_'.$i.'.'.$extension;
         $audio_title = str_replace('_', ' ', $audio_title);
     }
 
-    $documentPath = $filepath . '/' . $audio_filename;
+    $documentPath = $filepath.'/'.$audio_filename;
     $clean_text = api_replace_dangerous_char($clean_text);
 
     //adding the file
@@ -461,17 +461,17 @@ 
         $url_pediaphon = 'http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice.cgi';
         $find_t2v = '/http\:\/\/www\.pediaphon\.org\/\~bischoff\/radiopedia\/mp3\/(.*)\.mp3\"/';
     } else {
-        $url_pediaphon = 'http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice_' . $clean_lang . '.cgi';//en, es, fr
-        $find_t2v = '/http\:\/\/www\.pediaphon\.org\/\~bischoff\/radiopedia\/mp3\/' . $clean_lang . '\/(.*)\.mp3\"/';
+        $url_pediaphon = 'http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice_'.$clean_lang.'.cgi'; //en, es, fr
+        $find_t2v = '/http\:\/\/www\.pediaphon\.org\/\~bischoff\/radiopedia\/mp3\/'.$clean_lang.'\/(.*)\.mp3\"/';
     }
 
-    $data = "stimme=" . $clean_voices . "&inputtext=" . $clean_text . "&speed=" . $clean_speed . "&go=speak";
+    $data = "stimme=".$clean_voices."&inputtext=".$clean_text."&speed=".$clean_speed."&go=speak";
     $opts = array(
         'http' =>
             array(
                 'method' => 'POST',
                 'header' => "Content-Type: application/x-www-form-urlencoded\r\n",
-                "Content-Length: " . strlen($data) . "\r\n",
+                "Content-Length: ".strlen($data)."\r\n",
                 'content' => $data
             )
     );
@@ -515,5 +515,5 @@ 
     );
     Display::display_confirmation_message(get_lang('DocumentCreated'));
     //return to location
-    echo '<script>window.location.href="' . $location . '"</script>';
+    echo '<script>window.location.href="'.$location.'"</script>';
 }

main/badge/issued_all.php

Spacing +10 added lines, -10 removed lines

@@ -13,7 +13,7 @@ 
 $skillId = isset($_GET['skill']) ? intval($_GET['skill']) : 0;
 
 if (!$userId || !$skillId) {
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 
@@ -31,7 +31,7 @@ 
         Display::return_message(get_lang('NoResults'), 'error')
     );
 
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 
@@ -167,7 +167,7 @@ 
         $entityManager->persist($skillIssue);
         $entityManager->flush();
 
-        header("Location: " . $skillIssue->getIssueUrlAll());
+        header("Location: ".$skillIssue->getIssueUrlAll());
         exit;
     }
 
@@ -198,7 +198,7 @@ 
         $entityManager->persist($skillUserComment);
         $entityManager->flush();
 
-        header("Location: " . $skillIssue->getIssueUrlAll());
+        header("Location: ".$skillIssue->getIssueUrlAll());
         exit;
     }
 
@@ -214,11 +214,11 @@ 
             $backpack = $configBackpack;
         }
 
-        $htmlHeadXtra[] = '<script src="' . $backpack . 'issuer.js"></script>';
+        $htmlHeadXtra[] = '<script src="'.$backpack.'issuer.js"></script>';
         $objSkill = new Skill();
         $assertionUrl = $skillIssueInfo['badge_assertion'];
         $skills = $objSkill->get($skillId);
-        $unbakedBadge = api_get_path(SYS_UPLOAD_PATH) . "badges/".$skills['icon'];
+        $unbakedBadge = api_get_path(SYS_UPLOAD_PATH)."badges/".$skills['icon'];
         if (!is_file($unbakedBadge)) {
             $unbakedBadge = api_get_path(WEB_CODE_PATH).'img/icons/128/badges-default.png';
         }
@@ -236,12 +236,12 @@ 
                 mkdir($bakedBadge, api_get_permissions_for_new_directories(), true);
             }
             $skillRelUserId = $skillIssueInfo['id'];
-            if (!file_exists($bakedBadge . "/badge_" . $skillRelUserId)) {
-                file_put_contents($bakedBadge . "/badge_" . $skillRelUserId . ".png", $bakedInfo);
+            if (!file_exists($bakedBadge."/badge_".$skillRelUserId)) {
+                file_put_contents($bakedBadge."/badge_".$skillRelUserId.".png", $bakedInfo);
             }
 
             //Process to validate a baked badge
-            $badgeContent = file_get_contents($bakedBadge . "/badge_" . $skillRelUserId . ".png");
+            $badgeContent = file_get_contents($bakedBadge."/badge_".$skillRelUserId.".png");
             $verifyBakedBadge = $png->extractBadgeInfo($badgeContent);
             if (!is_array($verifyBakedBadge)) {
                 $badgeInfoError = true;
@@ -249,7 +249,7 @@ 
 
             if (!$badgeInfoError) {
                 $personalBadge = UserManager::getUserPathById($userId, "web");
-                $personalBadge = $personalBadge."badges/badge_" . $skillRelUserId . ".png";
+                $personalBadge = $personalBadge."badges/badge_".$skillRelUserId.".png";
             }
         }
     }