chamilo / chamilo-lms

main/inc/lib/link.lib.php

Spacing +108 added lines, -108 removed lines

@@ -77,11 +77,11 @@ 
         $params['session_id'] = api_get_session_id();
         $params['category_id'] = isset($params['category_id']) ? $params['category_id'] : 0;
 
-        $sql =  "SELECT MAX(display_order)
+        $sql = "SELECT MAX(display_order)
                 FROM  ".$this->table."
                 WHERE
                     c_id = $courseId AND
-                    category_id = '" . intval($params['category_id'])."'";
+                    category_id = '".intval($params['category_id'])."'";
         $result = Database:: query($sql);
         list ($orderMax) = Database:: fetch_row($result);
         $order = $orderMax + 1;
@@ -185,7 +185,7 @@ 
 
             // We ensure URL to be absolute.
             if (strpos($urllink, '://') === false) {
-                $urllink = 'http://' . $urllink;
+                $urllink = 'http://'.$urllink;
             }
 
             // If the title is empty, we use the URL as title.
@@ -207,7 +207,7 @@ 
                     'c_id' => $course_id,
                     'url' => $urllink,
                     'title' => $title,
-                    'description' => $description ,
+                    'description' => $description,
                     'category_id' => $selectcategory,
                     'on_homepage' => $onhomepage,
                     'target' => $target,
@@ -220,9 +220,9 @@ 
                 if ((api_get_setting('search_enabled') == 'true') &&
                     $link_id && extension_loaded('xapian')
                 ) {
-                    require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
-                    require_once api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php';
-                    require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+                    require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
+                    require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
+                    require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
                     $course_int_id = $_course['real_id'];
                     $courseCode = $_course['code'];
@@ -235,7 +235,7 @@ 
                         if (isset ($_REQUEST[$specific_field['code']])) {
                             $sterms = trim($_REQUEST[$specific_field['code']]);
                             if (!empty ($sterms)) {
-                                $all_specific_terms .= ' ' . $sterms;
+                                $all_specific_terms .= ' '.$sterms;
                                 $sterms = explode(',', $sterms);
                                 foreach ($sterms as $sterm) {
                                     $ic_slide->addTerm(
@@ -262,12 +262,12 @@ 
                         SE_COURSE_ID => $courseCode,
                         SE_TOOL_ID => TOOL_LINK,
                         SE_DATA => array(
-                            'link_id' => (int)$link_id
+                            'link_id' => (int) $link_id
                         ),
-                        SE_USER => (int)api_get_user_id(),
+                        SE_USER => (int) api_get_user_id(),
                     );
                     $ic_slide->xapian_data = serialize($xapian_data);
-                    $description = $all_specific_terms . ' ' . $description;
+                    $description = $all_specific_terms.' '.$description;
                     $ic_slide->addValue('content', $description);
 
                     // Add category name if set.
@@ -279,7 +279,7 @@ 
                         $sql_cat = sprintf(
                             $sql_cat,
                             $table_link_category,
-                            (int)$selectcategory,
+                            (int) $selectcategory,
                             $course_int_id
                         );
                         $result = Database:: query($sql_cat);
@@ -399,7 +399,7 @@ 
                 // This will make a restore function possible for the platform administrator.
 
                 $sql = "UPDATE $tbl_link SET on_homepage='0'
-                        WHERE c_id = $course_id AND id='" . $id . "'";
+                        WHERE c_id = $course_id AND id='".$id."'";
                 Database:: query($sql);
 
                 api_item_property_update(
@@ -415,12 +415,12 @@ 
                 break;
             case 'category':
                 // First we delete the category itself and afterwards all the links of this category.
-                $sql = "DELETE FROM " . $tbl_categories . "
-                        WHERE c_id = $course_id AND id='" . $id . "'";
+                $sql = "DELETE FROM ".$tbl_categories."
+                        WHERE c_id = $course_id AND id='".$id."'";
                 Database:: query($sql);
 
-                $sql = "DELETE FROM " . $tbl_link . "
-                        WHERE c_id = $course_id AND category_id='" . $id . "'";
+                $sql = "DELETE FROM ".$tbl_link."
+                        WHERE c_id = $course_id AND category_id='".$id."'";
                 Database:: query($sql);
 
                 api_item_property_update(
@@ -459,16 +459,16 @@ 
                 $row = Database:: fetch_array($res);
                 require_once api_get_path(
                         LIBRARY_PATH
-                    ) . 'search/ChamiloIndexer.class.php';
+                    ).'search/ChamiloIndexer.class.php';
                 $di = new ChamiloIndexer();
-                $di->remove_document((int)$row['search_did']);
+                $di->remove_document((int) $row['search_did']);
             }
             $sql = 'DELETE FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s LIMIT 1';
             $sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_LINK, $link_id);
             Database:: query($sql);
 
             // Remove terms from db.
-            require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+            require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
             delete_all_values_for_item($course_id, TOOL_DOCUMENT, $link_id);
         }
     }
@@ -484,8 +484,8 @@ 
     {
         $tbl_link = Database:: get_course_table(TABLE_LINK);
         $course_id = api_get_course_int_id();
-        $sql = "SELECT * FROM " . $tbl_link . "
-                WHERE c_id = $course_id AND id='" . intval($id) . "' ";
+        $sql = "SELECT * FROM ".$tbl_link."
+                WHERE c_id = $course_id AND id='".intval($id)."' ";
         $result = Database::query($sql);
         $data = array();
         if (Database::num_rows($result)) {
@@ -514,7 +514,7 @@ 
 
         // We ensure URL to be absolute.
         if (strpos($values['url'], '://') === false) {
-            $values['url'] = 'http://' . $_POST['url'];
+            $values['url'] = 'http://'.$_POST['url'];
         }
 
         // If the title is empty, we use the URL as title.
@@ -532,18 +532,18 @@ 
         }
 
         // Finding the old category_id.
-        $sql = "SELECT * FROM " . $tbl_link . "
-                WHERE c_id = $course_id AND id='" . $id . "'";
+        $sql = "SELECT * FROM ".$tbl_link."
+                WHERE c_id = $course_id AND id='".$id."'";
         $result = Database:: query($sql);
         $row = Database:: fetch_array($result);
         $category_id = $row['category_id'];
 
         if ($category_id != $values['category_id']) {
             $sql = "SELECT MAX(display_order)
-                    FROM " . $tbl_link . "
+                    FROM " . $tbl_link."
                     WHERE
                         c_id = $course_id AND
-                        category_id='" . intval($values['category_id']) . "'";
+                        category_id='".intval($values['category_id'])."'";
             $result = Database:: query($sql);
             list ($max_display_order) = Database:: fetch_row($result);
             $max_display_order++;
@@ -560,7 +560,7 @@ 
             'target' => $values['target'],
             'category_id' => $values['category_id'],
         ];
-        Database::update($tbl_link, $params, ['c_id = ? AND id = ?' => [$course_id, $id] ]);
+        Database::update($tbl_link, $params, ['c_id = ? AND id = ?' => [$course_id, $id]]);
 
         // Update search enchine and its values table if enabled.
         if (api_get_setting('search_enabled') == 'true') {
@@ -613,7 +613,7 @@ 
                             $_REQUEST[$specific_field['code']]
                         );
                         if (!empty ($sterms)) {
-                            $all_specific_terms .= ' ' . $sterms;
+                            $all_specific_terms .= ' '.$sterms;
                             $sterms = explode(',', $sterms);
                             foreach ($sterms as $sterm) {
                                 $ic_slide->addTerm(
@@ -640,13 +640,13 @@ 
                     SE_COURSE_ID => $course_id,
                     SE_TOOL_ID => TOOL_LINK,
                     SE_DATA => array(
-                        'link_id' => (int)$id
+                        'link_id' => (int) $id
                     ),
-                    SE_USER => (int)api_get_user_id(),
+                    SE_USER => (int) api_get_user_id(),
 
                 );
                 $ic_slide->xapian_data = serialize($xapian_data);
-                $link_description = $all_specific_terms . ' ' . $link_description;
+                $link_description = $all_specific_terms.' '.$link_description;
                 $ic_slide->addValue('content', $link_description);
 
                 // Add category name if set.
@@ -674,7 +674,7 @@ 
                 $di = new ChamiloIndexer();
                 isset ($_POST['language']) ? $lang = Database:: escape_string($_POST['language']) : $lang = 'english';
                 $di->connectDb(null, null, $lang);
-                $di->remove_document((int)$se_ref['search_did']);
+                $di->remove_document((int) $se_ref['search_did']);
                 $di->addChunk($ic_slide);
 
                 // Index and return search engine document id.
@@ -791,7 +791,7 @@ 
         $sql = "SELECT *, linkcat.id
                 FROM $tblLinkCategory linkcat
                 WHERE
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                     $sessionCondition
                 ORDER BY linkcat.display_order DESC";
 
@@ -803,10 +803,10 @@ 
                 INNER JOIN $tblItemProperty itemproperties
                 ON (linkcat.id = itemproperties.ref AND linkcat.c_id = itemproperties.c_id)
                 WHERE
-                    itemproperties.tool = '" . TOOL_LINK_CATEGORY . "' AND
+                    itemproperties.tool = '".TOOL_LINK_CATEGORY."' AND
                     (itemproperties.visibility = '0' OR itemproperties.visibility = '1')
                     $sessionCondition AND
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                 ORDER BY linkcat.display_order DESC";
 
         $result = Database::query($sql);
@@ -829,10 +829,10 @@ 
                 INNER JOIN $tblItemProperty itemproperties
                 ON (linkcat.id = itemproperties.ref AND linkcat.c_id = itemproperties.c_id)
                 WHERE
-                    itemproperties.tool = '" . TOOL_LINK_CATEGORY . "' AND
+                    itemproperties.tool = '".TOOL_LINK_CATEGORY."' AND
                     (itemproperties.visibility = '0' OR itemproperties.visibility = '1')
                     $sessionCondition AND
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                 ORDER BY linkcat.display_order DESC
                 ";
         $result = Database::query($sql);
@@ -864,12 +864,12 @@ 
                 INNER JOIN $TABLE_ITEM_PROPERTY itemproperties
                 ON (link.id=itemproperties.ref AND link.c_id = itemproperties.c_id )
                 WHERE
-                    itemproperties.tool='" . TOOL_LINK . "' AND
-                    link.category_id='" . $catid . "' AND
+                    itemproperties.tool='".TOOL_LINK."' AND
+                    link.category_id='" . $catid."' AND
                     (itemproperties.visibility='0' OR itemproperties.visibility='1')
                     $condition_session AND
-                    link.c_id = " . $course_id . " AND
-                    itemproperties.c_id = " . $course_id . "
+                    link.c_id = ".$course_id." AND
+                    itemproperties.c_id = " . $course_id."
                 ORDER BY link.display_order DESC";
         $result = Database:: query($sql);
         $numberoflinks = Database:: num_rows($result);
@@ -892,14 +892,14 @@ 
                             'retweet',
                             'default btn-sm',
                             array(
-                                'onclick' => "check_url('" . $myrow['id'] . "', '" . addslashes($myrow['url']) . "');",
+                                'onclick' => "check_url('".$myrow['id']."', '".addslashes($myrow['url'])."');",
                                 'title' => get_lang('CheckURL')
                                 )
                             );
                     $link_validator .= Display::span(
                         '',
                         array(
-                            'id' => 'url_id_' . $myrow['id'],
+                            'id' => 'url_id_'.$myrow['id'],
                             'class' => 'check-link'
                             )
                     );
@@ -909,10 +909,10 @@ 
                 if (api_is_allowed_to_edit(null, true)) {
 
                     if ($session_id == $myrow['session_id']) {
-                        $url = api_get_self() . '?' . api_get_cidreq() .
-                            '&action=editlink&category=' . (!empty ($category) ? $category : '') .
-                            '&id=' . $myrow['id'] .
-                            '&category_id=' . $myrow['id'];
+                        $url = api_get_self().'?'.api_get_cidreq().
+                            '&action=editlink&category='.(!empty ($category) ? $category : '').
+                            '&id='.$myrow['id'].
+                            '&category_id='.$myrow['id'];
                         $title = get_lang('Edit');
                         $toolbar .= Display::toolbarButton(
                             '',
@@ -940,10 +940,10 @@ 
                         }*/
 
                         if ($myrow['visibility'] == '1') {
-                            $url .= 'link.php?' . api_get_cidreq() .
-                                '&sec_token=' . $token .
-                                '&action=invisible&id=' . $myrow['id'] .
-                                '&scope=link&category_id=' . $myrow['category_id'];
+                            $url .= 'link.php?'.api_get_cidreq().
+                                '&sec_token='.$token.
+                                '&action=invisible&id='.$myrow['id'].
+                                '&scope=link&category_id='.$myrow['category_id'];
                             $title = get_lang('MakeInvisible');
                             $toolbar .= Display::toolbarButton(
                                 '',
@@ -957,7 +957,7 @@ 
 
                         }
                         if ($myrow['visibility'] == '0') {
-                            $url .= 'link.php?' . api_get_cidreq() .'&sec_token=' . $token .'&action=visible&id=' . $myrow['id'] .'&scope=link&category_id=' . $myrow['category_id'];
+                            $url .= 'link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=visible&id='.$myrow['id'].'&scope=link&category_id='.$myrow['category_id'];
                             $title = get_lang('MakeVisible');
                             $toolbar .= Display::toolbarButton(
                                 '',
@@ -970,8 +970,8 @@ 
                             );
                         }
 
-                        $url .= api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=deletelink&id=' . $myrow['id'] .'&category_id=' . $myrow['category_id'];
-                        $event = "javascript: if(!confirm('" . get_lang('LinkDelconfirm') . "'))return false;";
+                        $url .= api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=deletelink&id='.$myrow['id'].'&category_id='.$myrow['category_id'];
+                        $event = "javascript: if(!confirm('".get_lang('LinkDelconfirm')."'))return false;";
                         $title = get_lang('Delete');
 
                         $toolbar .= Display::toolbarButton(
@@ -1012,7 +1012,7 @@ 
                     $content .= '<div class="pull-right"><div class="btn-group">'.$toolbar.'</div></div>';
                     $content .= '<h4 class="list-group-item-heading">';
                     $content .= $iconLink;
-                    $url =  'link_goto.php?' . api_get_cidreq() .'&link_id=' . $myrow['id'] .'&link_url=' . urlencode($myrow['url']);
+                    $url = 'link_goto.php?'.api_get_cidreq().'&link_id='.$myrow['id'].'&link_url='.urlencode($myrow['url']);
                     $content .= Display::tag(
                             'a',
                             Security:: remove_XSS($myrow['title']),
@@ -1025,7 +1025,7 @@ 
                     $content .= $session_img;
                     $content .= '</h4>';
 
-                    $content .= '<p class="list-group-item-text">' . $myrow['description'] . '</p>';
+                    $content .= '<p class="list-group-item-text">'.$myrow['description'].'</p>';
                     $content .= '</div>';
                 } else {
                     if (api_is_allowed_to_edit(null, true)) {
@@ -1033,7 +1033,7 @@ 
                         $content .= '<div class="pull-right"><div class="btn-group">'.$toolbar.'</div></div>';
                         $content .= '<h4 class="list-group-item-heading">';
                         $content .= $iconLink;
-                        $url = 'link_goto.php?' . api_get_cidreq() .'&link_id=' . $myrow['id'] . "&link_url=" . urlencode($myrow['url']);
+                        $url = 'link_goto.php?'.api_get_cidreq().'&link_id='.$myrow['id']."&link_url=".urlencode($myrow['url']);
                         $content .= Display::tag(
                                 'a',
                                 Security:: remove_XSS($myrow['title']),
@@ -1046,7 +1046,7 @@ 
                         $content .= $link_validator;
                         $content .= $session_img;
                         $content .= '</h4>';
-                        $content .= '<p class="list-group-item-text">' . $myrow['description'] . '</p>';
+                        $content .= '<p class="list-group-item-text">'.$myrow['description'].'</p>';
                         $content .= '</div>';
                     }
                 }
@@ -1068,58 +1068,58 @@ 
     {
         $categoryId = $category['id'];
         $token = null;
-        $tools = '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&sec_token=' . $token . '&action=editcategory&id=' . $categoryId . '&category_id=' . $categoryId . '" title=' . get_lang('Modify') . '">' .
+        $tools = '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=editcategory&id='.$categoryId.'&category_id='.$categoryId.'" title='.get_lang('Modify').'">'.
             Display:: return_icon(
                 'edit.png',
                 get_lang('Modify'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
 
         // DISPLAY MOVE UP COMMAND only if it is not the top link.
         if ($currentCategory != 0) {
-            $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&sec_token=' . $token . '&action=up&up='.$categoryId.'&category_id='.$categoryId.'" title="'.get_lang('Up').'">'.
+            $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=up&up='.$categoryId.'&category_id='.$categoryId.'" title="'.get_lang('Up').'">'.
                 Display:: return_icon(
                     'up.png',
                     get_lang('Up'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         } else {
             $tools .= Display:: return_icon(
                 'up_na.png',
                 get_lang('Up'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
         }
 
         // DISPLAY MOVE DOWN COMMAND only if it is not the bottom link.
-        if ($currentCategory < $countCategories-1) {
-            $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=down&down=' . $categoryId .'&category_id=' . $categoryId . '">'.
+        if ($currentCategory < $countCategories - 1) {
+            $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=down&down='.$categoryId.'&category_id='.$categoryId.'">'.
                 Display:: return_icon(
                     'down.png',
                     get_lang('Down'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         } else {
             $tools .= Display:: return_icon(
                     'down_na.png',
                     get_lang('Down'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         }
 
-        $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=deletecategory&id='.$categoryId.            "&category_id=$categoryId\"
-            onclick=\"javascript: if(!confirm('" . get_lang('CategoryDelconfirm') . "')) return false;\">".
+        $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=deletecategory&id='.$categoryId."&category_id=$categoryId\"
+            onclick=\"javascript: if(!confirm('".get_lang('CategoryDelconfirm')."')) return false;\">".
             Display:: return_icon(
                 'delete.png',
                 get_lang('Delete'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
 
         return $tools;
     }
@@ -1166,7 +1166,7 @@ 
             $movetable = $tbl_link;
             // Getting the category of the link.
             if (!empty ($thiscatlinkId)) {
-                $sql = "SELECT category_id FROM " . $movetable . "
+                $sql = "SELECT category_id FROM ".$movetable."
                         WHERE c_id = $courseId AND id='$thiscatlinkId'";
                 $result = Database:: query($sql);
                 $catid = Database:: fetch_array($result);
@@ -1186,7 +1186,7 @@ 
                         ORDER BY display_order $sortDirection";
             } else {
                 $sql = "SELECT id, display_order FROM  $movetable
-                        WHERE c_id = $courseId AND category_id='" . $catid[0] . "'
+                        WHERE c_id = $courseId AND category_id='".$catid[0]."'
                         ORDER BY display_order $sortDirection";
             }
             $linkresult = Database:: query($sql);
@@ -1200,12 +1200,12 @@ 
                     $nextlinkOrder = $sortrow['display_order'];
 
                     Database:: query(
-                        "UPDATE " . $movetable . "
+                        "UPDATE ".$movetable."
                         SET display_order = '$nextlinkOrder'
                         WHERE c_id = $courseId  AND id =  '$thiscatlinkId'"
                     );
                     Database:: query(
-                        "UPDATE " . $movetable . "
+                        "UPDATE ".$movetable."
                         SET display_order = '$thislinkOrder'
                         WHERE c_id = $courseId  AND id =  '$nextlinkId'"
                     );
@@ -1233,10 +1233,10 @@ 
         $course_id = api_get_course_int_id();
 
         $result = Database:: query(
-            "SELECT id FROM " . $tbl_categories . "
-            WHERE c_id = $course_id AND category_title='" . Database::escape_string(
+            "SELECT id FROM ".$tbl_categories."
+            WHERE c_id = $course_id AND category_title='".Database::escape_string(
                 $catname
-            ) . "'"
+            )."'"
         );
         if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array(
                 $result
@@ -1246,7 +1246,7 @@ 
         }
 
         $result = Database:: query(
-            "SELECT MAX(display_order) FROM " . $tbl_categories . " WHERE c_id = $course_id "
+            "SELECT MAX(display_order) FROM ".$tbl_categories." WHERE c_id = $course_id "
         );
         list ($max_order) = Database:: fetch_row($result);
 
@@ -1273,12 +1273,12 @@ 
         $tbl_link = Database:: get_course_table(TABLE_LINK);
         $course_id = api_get_course_int_id();
 
-        $urleq = "url='" . Database:: escape_string($url) . "'";
-        $cateq = "category_id=" . intval($cat);
+        $urleq = "url='".Database:: escape_string($url)."'";
+        $cateq = "category_id=".intval($cat);
 
         $result = Database:: query("
             SELECT id FROM $tbl_link
-            WHERE c_id = $course_id AND " . $urleq . ' AND ' . $cateq
+            WHERE c_id = $course_id AND ".$urleq.' AND '.$cateq
         );
 
         if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array(
@@ -1286,14 +1286,14 @@ 
             ))
         ) {
             Database:: query(
-                "UPDATE $tbl_link set title='" . Database:: escape_string(
+                "UPDATE $tbl_link set title='".Database:: escape_string(
                     $title
-                ) . "', description='" . Database:: escape_string(
+                )."', description='".Database:: escape_string(
                     $description
-                ) . "'
-                WHERE c_id = $course_id AND  id='" . Database:: escape_string(
+                )."'
+                WHERE c_id = $course_id AND  id='".Database:: escape_string(
                     $row['id']
-                ) . "'"
+                )."'"
             );
 
             $ipu = 'LinkUpdated';
@@ -1302,18 +1302,18 @@ 
             // Add new link
             $result = Database:: query(
                 "SELECT MAX(display_order) FROM  $tbl_link
-                WHERE c_id = $course_id AND category_id='" . intval($cat) . "'"
+                WHERE c_id = $course_id AND category_id='".intval($cat)."'"
             );
             list ($max_order) = Database:: fetch_row($result);
 
             Database:: query(
                 "INSERT INTO $tbl_link (c_id, url, title, description, category_id, display_order, on_homepage)
-                VALUES (" . api_get_course_int_id() . ",
-                '" . Database:: escape_string($url) . "',
-                '" . Database:: escape_string($title) . "',
-                '" . Database:: escape_string($description) . "',
-                '" . intval($cat) . "','" . (intval($max_order) + 1) . "',
-                '" . intval($on_homepage) .
+                VALUES (".api_get_course_int_id().",
+                '" . Database:: escape_string($url)."',
+                '" . Database:: escape_string($title)."',
+                '" . Database:: escape_string($description)."',
+                '" . intval($cat)."','".(intval($max_order) + 1)."',
+                '" . intval($on_homepage).
                 "')"
             );
 
@@ -1391,30 +1391,30 @@ 
                     )
                 ) { // possibly in <...>
                     if (($kwlist = trim($regs[1])) != '') {
-                        $kw = '<i kw="' . htmlspecialchars($kwlist) . '">';
+                        $kw = '<i kw="'.htmlspecialchars($kwlist).'">';
                     } else {
                         $kw = '';
                     }
                     // i.e. assume only one of the $hide_fields will be present
                     // and if found, hide the value as expando property of an <i> tag
                 } elseif (trim($value)) {
-                    $d .= ', ' . $key . ':' . $value;
+                    $d .= ', '.$key.':'.$value;
                 }
             }
         }
         if (!empty($d)) {
-            $d = substr($d, 2) . ' - ';
+            $d = substr($d, 2).' - ';
         }
 
         return Link::put_link(
             $url,
             $cat,
             $title,
-            $kw . ereg_replace(
+            $kw.ereg_replace(
                 '\[((/?(b|big|i|small|sub|sup|u))|br/)\]',
                 '<\\1>',
-                htmlspecialchars($d . $linkdata['description'])
-            ) . ($kw ? '</i>' : ''),
+                htmlspecialchars($d.$linkdata['description'])
+            ).($kw ? '</i>' : ''),
             $linkdata['on_homepage'] ? '1' : '0',
             $linkdata['hidden'] ? '1' : '0'
         );
@@ -1535,19 +1535,19 @@ 
         echo '<div class="actions">';
         if (api_is_allowed_to_edit(null, true)) {
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addlink&category_id='.$categoryId.'">'.
-                Display::return_icon('new_link.png', get_lang('LinkAdd'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_link.png', get_lang('LinkAdd'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addcategory&category_id='.$categoryId.'">'.
-                Display::return_icon('new_folder.png', get_lang('CategoryAdd'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_folder.png', get_lang('CategoryAdd'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $categories = Link::getLinkCategories($course_id, $session_id);
         $count = count($categories);
         if (!empty($count)) {
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=none">';
-            echo Display::return_icon('forum_listview.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . ' </a>';
+            echo Display::return_icon('forum_listview.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).' </a>';
 
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=all">';
-            echo Display::return_icon('forum_nestedview.png', get_lang('NestedView'), '', ICON_SIZE_MEDIUM) . '</a>';
+            echo Display::return_icon('forum_nestedview.png', get_lang('NestedView'), '', ICON_SIZE_MEDIUM).'</a>';
         }
         echo '</div>';
 
@@ -1579,12 +1579,12 @@ 
             $strVisibility = '';
             $visibilityClass = null;
             if ($myrow['visibility'] == '1') {
-                $strVisibility =  '<a href="link.php?' . api_get_cidreq() .  '&sec_token='.$token.'&action=invisible&id=' . $myrow['id'] . '&scope=' . TOOL_LINK_CATEGORY . '" title="' . get_lang('Hide') . '">' .
-                    Display :: return_icon('visible.png', get_lang('Hide'), array (), ICON_SIZE_SMALL) . '</a>';
+                $strVisibility = '<a href="link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=invisible&id='.$myrow['id'].'&scope='.TOOL_LINK_CATEGORY.'" title="'.get_lang('Hide').'">'.
+                    Display :: return_icon('visible.png', get_lang('Hide'), array(), ICON_SIZE_SMALL).'</a>';
             } elseif ($myrow['visibility'] == '0') {
                 $visibilityClass = 'invisible';
-                $strVisibility =  ' <a href="link.php?' . api_get_cidreq() .  '&sec_token='.$token.'&action=visible&id=' . $myrow['id'] . '&scope=' . TOOL_LINK_CATEGORY . '" title="' . get_lang('Show') . '">' .
-                    Display :: return_icon('invisible.png', get_lang('Show'), array (), ICON_SIZE_SMALL) . '</a>';
+                $strVisibility = ' <a href="link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=visible&id='.$myrow['id'].'&scope='.TOOL_LINK_CATEGORY.'" title="'.get_lang('Show').'">'.
+                    Display :: return_icon('invisible.png', get_lang('Show'), array(), ICON_SIZE_SMALL).'</a>';
             }
 
             $header = '';

main/inc/lib/extra_field_option.lib.php

Spacing +2 added lines, -2 removed lines

@@ -216,7 +216,7 @@ 
 
                         foreach ($sub_options as $sub_option) {
                             if (!empty($sub_option)) {
-                                $new_params  = array(
+                                $new_params = array(
                                     'field_id' => $field_id,
                                     'option_value' => $sub_id,
                                     'display_text' => $sub_option,
@@ -552,7 +552,7 @@ 
         echo '<div class="actions">';
         $field_id = isset($_REQUEST['field_id']) ? intval($_REQUEST['field_id']) : null;
         echo '<a href="'.api_get_self().'?action=add&type='.$this->type.'&field_id='.$field_id.'">'.
-                Display::return_icon('add_user_fields.png', get_lang('Add'), '', ICON_SIZE_MEDIUM ).'</a>';
+                Display::return_icon('add_user_fields.png', get_lang('Add'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
         echo Display::grid_html('extra_field_options');
     }

main/inc/lib/add_many_session_to_category_functions.lib.php

Spacing +5 added lines, -5 removed lines

@@ -21,12 +21,12 @@ 
      * @assert () !== ''
      * @assert ('abc','single') !== ''
      */
-    function search_courses($needle,$type)
+    function search_courses($needle, $type)
     {
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 		$xajax_response = new xajaxResponse();
 		$return = '';
-		if(!empty($needle) && !empty($type)) {
+		if (!empty($needle) && !empty($type)) {
 			// xajax send utf8 datas... datas in db can be non-utf8 datas
 			$charset = api_get_system_encoding();
 			$needle = api_convert_encoding($needle, $charset, 'utf-8');
@@ -38,12 +38,12 @@ 
 			$course_list = array();
 
 			$return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
-			while($course = Database :: fetch_array($rs)) {
+			while ($course = Database :: fetch_array($rs)) {
 				$course_list[] = $course['id'];
-				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
+				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'], ENT_QUOTES).'">'.$course['name'].'</option>';
 			}
 			$return .= '</select>';
-			$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+			$xajax_response -> addAssign('ajax_list_courses_multiple', 'innerHTML', api_utf8_encode($return));
 		}
 		$_SESSION['course_list'] = $course_list;
 		return $xajax_response;

main/inc/lib/statistics.lib.php

Spacing +43 added lines, -43 removed lines

@@ -104,10 +104,10 @@ 
         $course_user_table = Database:: get_main_table(TABLE_MAIN_COURSE_USER);
         $course_table = Database:: get_main_table(TABLE_MAIN_COURSE);
         $user_table = Database:: get_main_table(TABLE_MAIN_USER);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
-        $active_filter = $onlyActive?' AND active=1':'';
-        $status_filter = isset($status)?' AND status = '.intval($status):'';
+        $active_filter = $onlyActive ? ' AND active=1' : '';
+        $status_filter = isset($status) ? ' AND status = '.intval($status) : '';
 
         if (api_is_multiple_url_enabled()) {
             $sql = "SELECT COUNT(DISTINCT(u.user_id)) AS number
@@ -131,7 +131,7 @@ 
                     FROM $user_table
                     WHERE 1=1 $status_filter $active_filter";
             if (isset ($categoryCode)) {
-                $status_filter = isset($status)?' AND status = '.intval($status):'';
+                $status_filter = isset($status) ? ' AND status = '.intval($status) : '';
                 $sql = "SELECT COUNT(DISTINCT(cu.user_id)) AS number
                         FROM $course_user_table cu, $course_table c
                         WHERE
@@ -156,7 +156,7 @@ 
     public static function countSessions()
     {
         $session_table = Database :: get_main_table(TABLE_MAIN_SESSION);
-        $access_url_rel_session_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+        $access_url_rel_session_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         if (api_is_multiple_url_enabled()) {
             $current_url_id = api_get_current_access_url_id();
             $sql = "SELECT COUNT(id) AS number
@@ -179,9 +179,9 @@ 
     public static function getNumberOfActivities()
     {
         // Database table definitions
-        $track_e_default  = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
+        $track_e_default = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
         $table_user = Database::get_main_table(TABLE_MAIN_USER);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
         if (api_is_multiple_url_enabled()) {
             $sql = "SELECT count(default_id) AS total_number_of_items
@@ -225,7 +225,7 @@ 
         $from = intval($from);
         $numberOfItems = intval($numberOfItems);
 
-        if (!in_array($direction, array('ASC','DESC'))) {
+        if (!in_array($direction, array('ASC', 'DESC'))) {
             $direction = 'DESC';
         }
 
@@ -276,7 +276,7 @@ 
         $sql .= " LIMIT $from,$numberOfItems ";
 
         $res = Database::query($sql);
-        $activities = array ();
+        $activities = array();
         while ($row = Database::fetch_row($res)) {
 
             if (strpos($row[1], '_object') === false && strpos($row[1], '_array') === false) {
@@ -343,7 +343,7 @@ 
         $sql = "SELECT code, name FROM $categoryTable
                 ORDER BY tree_pos";
         $res = Database::query($sql);
-        $categories = array ();
+        $categories = array();
         while ($category = Database::fetch_object($res)) {
             $categories[$category->code] = $category->name;
         }
@@ -364,7 +364,7 @@ 
             $data_max = ($data_max < $value ? $value : $data_max);
         }
         reset($data);
-        $result = array ();
+        $result = array();
         $delta = $max / $data_max;
         foreach ($data as $index => $value) {
             $result[$index] = (int) round($value * $delta);
@@ -398,9 +398,9 @@ 
             } else {
                 $number_label = Statistics::makeSizeString($number);
             }
-            $percentage = ($total>0?number_format(100*$number/$total, 1, ',', '.'):'0');
+            $percentage = ($total > 0 ? number_format(100 * $number / $total, 1, ',', '.') : '0');
 
-            echo '<tr class="row_'.($i%2 == 0 ? 'odd' : 'even').'">
+            echo '<tr class="row_'.($i % 2 == 0 ? 'odd' : 'even').'">
                     <td width="150">'.$subtitle.'</td>
                     <td width="550">'.Display::bar_progress($percentage, false).'</td>
                     <td align="right">'.$number_label.'</td>';
@@ -408,7 +408,7 @@ 
                 echo '<td align="right"> '.$percentage.'%</td>';
             }
             echo '</tr>';
-            $i ++;
+            $i++;
         }
         if ($showTotal) {
             if (!$isFileSize) {
@@ -428,17 +428,17 @@ 
     public static function printLoginStats($type)
     {
         $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
 
         $table_url = null;
         $where_url = null;
         $now = api_get_utc_datetime();
-        $where_url_last = ' WHERE login_date > DATE_SUB("' . $now . '",INTERVAL 1 %s)';
+        $where_url_last = ' WHERE login_date > DATE_SUB("'.$now.'",INTERVAL 1 %s)';
         if (api_is_multiple_url_enabled()) {
             $table_url = ", $access_url_rel_user_table";
             $where_url = " WHERE login_user_id=user_id AND access_url_id='".$current_url_id."'";
-            $where_url_last = ' AND login_date > DATE_SUB("' . $now . '",INTERVAL 1 %s)';
+            $where_url_last = ' AND login_date > DATE_SUB("'.$now.'",INTERVAL 1 %s)';
         }
 
         $period = get_lang('PeriodMonth');
@@ -453,13 +453,13 @@ 
             case 'hour':
                 $period = get_lang('PeriodHour');
                 $sql = "SELECT DATE_FORMAT( login_date, '%H' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url." GROUP BY stat_date ORDER BY stat_date ";
-                $sql_last_x = "SELECT DATE_FORMAT( login_date, '%H' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last,'DAY')." GROUP BY stat_date ORDER BY stat_date ";
+                $sql_last_x = "SELECT DATE_FORMAT( login_date, '%H' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last, 'DAY')." GROUP BY stat_date ORDER BY stat_date ";
                 break;
             case 'day':
                 $periodCollection = api_get_week_days_long();
                 $period = get_lang('PeriodDay');
                 $sql = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url." GROUP BY stat_date ORDER BY DATE_FORMAT( login_date, '%w' ) ";
-                $sql_last_x = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last,'WEEK')." GROUP BY stat_date ORDER BY DATE_FORMAT( login_date, '%w' ) ";
+                $sql_last_x = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last, 'WEEK')." GROUP BY stat_date ORDER BY DATE_FORMAT( login_date, '%w' ) ";
                 break;
         }
         if ($sql_last_x) {
@@ -501,14 +501,14 @@ 
     {
         $totalLogin = array();
         $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
         if (api_is_multiple_url_enabled()) {
             $table_url = ", $access_url_rel_user_table";
             $where_url = " AND login_user_id=user_id AND access_url_id='".$current_url_id."'";
         } else {
             $table_url = '';
-            $where_url='';
+            $where_url = '';
         }
         $now = api_get_utc_datetime();
         $field = 'login_user_id';
@@ -540,14 +540,14 @@ 
     {
         $totalLogin = [];
         $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
         if (api_is_multiple_url_enabled()) {
             $table_url = ", $access_url_rel_user_table";
             $where_url = " AND login_user_id=user_id AND access_url_id='".$current_url_id."'";
         } else {
             $table_url = '';
-            $where_url='';
+            $where_url = '';
         }
         $now = api_get_utc_datetime();
         $field = 'login_user_id';
@@ -557,7 +557,7 @@ 
         $sql = "SELECT count($field) AS number, date(login_date) as login_date FROM $table $table_url WHERE DATE_ADD(login_date, INTERVAL 15 DAY) >= '$now' $where_url GROUP BY date(login_date)";
         
         $res = Database::query($sql);
-        while($row = Database::fetch_array($res,'ASSOC')){
+        while ($row = Database::fetch_array($res, 'ASSOC')) {
             $totalLogin[$row['login_date']] = $row['number'];
         }
         
@@ -652,13 +652,13 @@ 
     public static function printUserPicturesStats()
     {
         $user_table = Database :: get_main_table(TABLE_MAIN_USER);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
         $url_condition = null;
         $url_condition2 = null;
         $table = null;
         if (api_is_multiple_url_enabled()) {
-            $url_condition =  ", $access_url_rel_user_table as url WHERE url.user_id=u.user_id AND access_url_id='".$current_url_id."'";
+            $url_condition = ", $access_url_rel_user_table as url WHERE url.user_id=u.user_id AND access_url_id='".$current_url_id."'";
             $url_condition2 = " AND url.user_id=u.user_id AND access_url_id='".$current_url_id."'";
             $table = ", $access_url_rel_user_table as url ";
         }
@@ -690,7 +690,7 @@ 
             'width=200px',
             false
         );
-        $renderer =& $form->defaultRenderer();
+        $renderer = & $form->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $form->addElement('hidden', 'report', 'activities');
         $form->addElement('hidden', 'activities_direction', 'DESC');
@@ -740,10 +740,10 @@ 
         $columns[1] = 'access_date';
         $sql_order[SORT_ASC] = 'ASC';
         $sql_order[SORT_DESC] = 'DESC';
-        $per_page = isset($_GET['per_page'])?intval($_GET['per_page']) : 10;
-        $page_nr = isset($_GET['page_nr'])?intval($_GET['page_nr']) : 1;
-        $column = isset($_GET['column'])?intval($_GET['column']) : 0;
-        $date_diff = isset($_GET['date_diff'])?intval($_GET['date_diff']) : 60;
+        $per_page = isset($_GET['per_page']) ? intval($_GET['per_page']) : 10;
+        $page_nr = isset($_GET['page_nr']) ? intval($_GET['page_nr']) : 1;
+        $column = isset($_GET['column']) ? intval($_GET['column']) : 0;
+        $date_diff = isset($_GET['date_diff']) ? intval($_GET['date_diff']) : 60;
 
         $direction = isset($_GET['direction']) ? $_GET['direction'] : SORT_ASC;
 
@@ -772,25 +772,25 @@ 
                         access_url_id='".$current_url_id."'
                    GROUP BY c_id
                    HAVING c_id <> ''
-                   AND DATEDIFF( '".date('Y-m-d h:i:s')."' , access_date ) <= ". $date_diff;
+                   AND DATEDIFF( '".date('Y-m-d h:i:s')."' , access_date ) <= ".$date_diff;
         } else {
             $sql = "SELECT * FROM $table
                    GROUP BY c_id
                    HAVING c_id <> ''
-                   AND DATEDIFF( '".date('Y-m-d h:i:s')."' , access_date ) <= ". $date_diff;
+                   AND DATEDIFF( '".date('Y-m-d h:i:s')."' , access_date ) <= ".$date_diff;
         }
         $sql .= ' ORDER BY '.$columns[$column].' '.$sql_order[$direction];
-        $from = ($page_nr -1) * $per_page;
+        $from = ($page_nr - 1) * $per_page;
         $sql .= ' LIMIT '.$from.','.$per_page;
 
         echo '<p>'.get_lang('LastAccess').' &gt;= '.$date_diff.' '.get_lang('Days').'</p>';
         $res = Database::query($sql);
         if (Database::num_rows($res) > 0) {
-            $courses = array ();
+            $courses = array();
             while ($obj = Database::fetch_object($res)) {
                 $courseInfo = api_get_course_info_by_id($obj->c_id);
-                $course = array ();
-                $course[]= '<a href="'.api_get_path(WEB_COURSE_PATH).$courseInfo['code'].'">'.$courseInfo['code'].' <a>';
+                $course = array();
+                $course[] = '<a href="'.api_get_path(WEB_COURSE_PATH).$courseInfo['code'].'">'.$courseInfo['code'].' <a>';
                 // Allow sort by date hiding the numerical date
                 $course[] = '<span style="display:none;">'.$obj->access_date.'</span>'.api_convert_and_format_date($obj->access_date);
                 $courses[] = $course;
@@ -863,7 +863,7 @@ 
     {
         $user_friend_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
         $user_table = Database::get_main_table(TABLE_MAIN_USER);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
 
         if (api_is_multiple_url_enabled()) {
@@ -895,7 +895,7 @@ 
     {
         $totalLogin = array();
         $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
         $total = self::countUsers();
         if (api_is_multiple_url_enabled()) {
@@ -903,14 +903,14 @@ 
             $where_url = " AND login_user_id=user_id AND access_url_id='".$current_url_id."'";
         } else {
             $table_url = '';
-            $where_url='';
+            $where_url = '';
         }
         $now = api_get_utc_datetime();
-        $sql[get_lang('ThisDay')]    =
+        $sql[get_lang('ThisDay')] =
             "SELECT count(distinct(login_user_id)) AS number ".
             " FROM $table $table_url ".
             " WHERE DATE_ADD(login_date, INTERVAL 1 DAY) >= '$now' $where_url";
-        $sql[get_lang('Last7days')]  =
+        $sql[get_lang('Last7days')] =
             "SELECT count(distinct(login_user_id)) AS number ".
             " FROM $table $table_url ".
             " WHERE DATE_ADD(login_date, INTERVAL 7 DAY) >= '$now' $where_url";
@@ -922,7 +922,7 @@ 
             "SELECT count(distinct(login_user_id)) AS number ".
             " FROM $table $table_url ".
             " WHERE DATE_ADD(login_date, INTERVAL 6 MONTH) >= '$now' $where_url";
-        $sql[get_lang('NeverConnected')]      =
+        $sql[get_lang('NeverConnected')] =
             "SELECT count(distinct(login_user_id)) AS number ".
             " FROM $table $table_url WHERE 1=1 $where_url";
         foreach ($sql as $index => $query) {

main/inc/lib/auth.lib.php

Spacing +46 added lines, -46 removed lines

@@ -46,12 +46,12 @@ 
         $special_course_list = array();
         if (Database::num_rows($result) > 0) {
             while ($result_row = Database::fetch_array($result)) {
-                $special_course_list[] = '"' . $result_row['item_id'] . '"';
+                $special_course_list[] = '"'.$result_row['item_id'].'"';
             }
         }
         $without_special_courses = '';
         if (!empty($special_course_list)) {
-            $without_special_courses = ' AND course.id NOT IN (' . implode(',', $special_course_list) . ')';
+            $without_special_courses = ' AND course.id NOT IN ('.implode(',', $special_course_list).')';
         }
 
         // Secondly we select the courses that are in a category (user_course_cat<>0) and sort these according to the sort of the category
@@ -70,8 +70,8 @@ 
                 FROM $TABLECOURS course, $TABLECOURSUSER  course_rel_user
                 WHERE
                     course.id = course_rel_user.c_id AND
-                    course_rel_user.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
-                    course_rel_user.user_id = '" . $user_id . "' $without_special_courses
+                    course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
+                    course_rel_user.user_id = '" . $user_id."' $without_special_courses
                 ORDER BY course_rel_user.sort ASC";
         $result = Database::query($sql);
         $courses = array();
@@ -102,7 +102,7 @@ 
     {
         $user_id = api_get_user_id();
         $table_category = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
-        $sql = "SELECT * FROM " . $table_category . "
+        $sql = "SELECT * FROM ".$table_category."
                 WHERE user_id=$user_id
                 ORDER BY sort ASC";
         $result = Database::query($sql);
@@ -144,13 +144,13 @@ 
         $special_course_list = array();
         if (Database::num_rows($result) > 0) {
             while ($result_row = Database::fetch_array($result)) {
-                $special_course_list[] = '"' . $result_row['item_id'] . '"';
+                $special_course_list[] = '"'.$result_row['item_id'].'"';
             }
         }
 
         $without_special_courses = '';
         if (!empty($special_course_list)) {
-            $without_special_courses = ' AND course.id NOT IN (' . implode(',', $special_course_list) . ')';
+            $without_special_courses = ' AND course.id NOT IN ('.implode(',', $special_course_list).')';
         }
 
         $sql = "SELECT
@@ -161,8 +161,8 @@ 
                 $TABLECOURSUSER  course_rel_user
                 WHERE
                     course.id = course_rel_user.c_id AND
-                    course_rel_user.user_id = '" . $user_id . "' AND
-                    course_rel_user.relation_type <> " . COURSE_RELATION_TYPE_RRHH . "
+                    course_rel_user.user_id = '".$user_id."' AND
+                    course_rel_user.relation_type <> " . COURSE_RELATION_TYPE_RRHH."
                     $without_special_courses
                 ORDER BY course_rel_user.user_course_cat, course_rel_user.sort ASC";
         $result = Database::query($sql);
@@ -191,11 +191,11 @@ 
         $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
         $max_sort_value = api_max_sort_value($newcategory, $current_user);
         $sql = "UPDATE $TABLECOURSUSER SET
-                    user_course_cat='" . $newcategory . "',
-                    sort='" . ($max_sort_value + 1) . "'
+                    user_course_cat='".$newcategory."',
+                    sort='" . ($max_sort_value + 1)."'
                 WHERE
-                    c_id ='" . $courseId . "' AND
-                    user_id='" . $current_user . "' AND
+                    c_id ='" . $courseId."' AND
+                    user_id='" . $current_user."' AND
                     relation_type<>" . COURSE_RELATION_TYPE_RRHH;
         $resultQuery = Database::query($sql);
 
@@ -254,18 +254,18 @@ 
             $targetCourseId = $targetCourseInfo['real_id'];
 
             $sql = "UPDATE $table
-                    SET sort='" . $target_course['sort'] . "'
+                    SET sort='".$target_course['sort']."'
                     WHERE
-                        c_id = '" . $courseId . "' AND
-                        user_id = '" . $current_user_id . "' AND
+                        c_id = '" . $courseId."' AND
+                        user_id = '" . $current_user_id."' AND
                         relation_type<>" . COURSE_RELATION_TYPE_RRHH;
 
             $result1 = Database::query($sql);
 
-            $sql = "UPDATE $table SET sort='" . $source_course['sort'] . "'
+            $sql = "UPDATE $table SET sort='".$source_course['sort']."'
                     WHERE
-                        c_id ='" . $targetCourseId . "' AND
-                        user_id='" . $current_user_id . "' AND
+                        c_id ='" . $targetCourseId."' AND
+                        user_id='" . $current_user_id."' AND
                         relation_type<>" . COURSE_RELATION_TYPE_RRHH;
 
             $result2 = Database::query($sql);
@@ -309,10 +309,10 @@ 
         }
 
         if (count($target_category) > 0 && count($source_category) > 0) {
-            $sql_update1 = "UPDATE $table_user_defined_category SET sort='" . Database::escape_string($target_category['sort']) . "'
-                            WHERE id='" . intval($source_category['id']) . "' AND user_id='" . $current_user_id . "'";
-            $sql_update2 = "UPDATE $table_user_defined_category SET sort='" . Database::escape_string($source_category['sort']) . "'
-                            WHERE id='" . intval($target_category['id']) . "' AND user_id='" . $current_user_id . "'";
+            $sql_update1 = "UPDATE $table_user_defined_category SET sort='".Database::escape_string($target_category['sort'])."'
+                            WHERE id='" . intval($source_category['id'])."' AND user_id='".$current_user_id."'";
+            $sql_update2 = "UPDATE $table_user_defined_category SET sort='".Database::escape_string($source_category['sort'])."'
+                            WHERE id='" . intval($target_category['id'])."' AND user_id='".$current_user_id."'";
 
             $result1 = Database::query($sql_update2);
             $result2 = Database::query($sql_update1);
@@ -331,8 +331,8 @@ 
     {
         $current_user_id = api_get_user_id();
         $table_category = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
-        $sql = "SELECT * FROM " . $table_category . "
-                WHERE user_id='" . $current_user_id . "'
+        $sql = "SELECT * FROM ".$table_category."
+                WHERE user_id='" . $current_user_id."'
                 ORDER BY sort ASC";
         $result = Database::query($sql);
         while ($row = Database::fetch_array($result)) {
@@ -355,8 +355,8 @@ 
         $result = false;
         $tucc = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
         $sql = "UPDATE $tucc
-                SET title='" . api_htmlentities($title, ENT_QUOTES, api_get_system_encoding()) . "'
-                WHERE id='" . $category_id . "'";
+                SET title='".api_htmlentities($title, ENT_QUOTES, api_get_system_encoding())."'
+                WHERE id='" . $category_id."'";
         $resultQuery = Database::query($sql);
         if (Database::affected_rows($resultQuery)) {
             $result = true;
@@ -377,7 +377,7 @@ 
         $category_id = intval($category_id);
         $result = false;
         $sql_delete = "DELETE FROM $tucc
-                      WHERE id='" . $category_id . "' and user_id='" . $current_user_id . "'";
+                      WHERE id='".$category_id."' and user_id='".$current_user_id."'";
         $resultQuery = Database::query($sql_delete);
        if (Database::affected_rows($resultQuery)) {
             $result = true;
@@ -385,9 +385,9 @@ 
         $sql = "UPDATE $TABLECOURSUSER
                 SET user_course_cat='0'
                 WHERE
-                    user_course_cat='" . $category_id . "' AND
-                    user_id='" . $current_user_id . "' AND
-                    relation_type<>" . COURSE_RELATION_TYPE_RRHH . " ";
+                    user_course_cat='".$category_id."' AND
+                    user_id='" . $current_user_id."' AND
+                    relation_type<>" . COURSE_RELATION_TYPE_RRHH." ";
         Database::query($sql);
 
         return $result;
@@ -420,20 +420,20 @@ 
         if (Database::num_rows($special_course_result) > 0) {
             $special_course_list = array();
             while ($result_row = Database::fetch_array($special_course_result)) {
-                $special_course_list[] = '"' . $result_row['item_id'] . '"';
+                $special_course_list[] = '"'.$result_row['item_id'].'"';
             }
         }
         $without_special_courses = '';
         if (!empty($special_course_list)) {
-            $without_special_courses = ' AND course.code NOT IN (' . implode(',', $special_course_list) . ')';
+            $without_special_courses = ' AND course.code NOT IN ('.implode(',', $special_course_list).')';
         }
 
         $search_term_safe = Database::escape_string($search_term);
         $sql_find = "SELECT * FROM $courseTable
                     WHERE (
-                            code LIKE '%" . $search_term_safe . "%' OR
-                            title LIKE '%" . $search_term_safe . "%' OR
-                            tutor_name LIKE '%" . $search_term_safe . "%'
+                            code LIKE '%".$search_term_safe."%' OR
+                            title LIKE '%" . $search_term_safe."%' OR
+                            tutor_name LIKE '%" . $search_term_safe."%'
                         )
                         $without_special_courses
                     ORDER BY title, visual_code ASC
@@ -450,9 +450,9 @@ 
                             ON (url_rel_course.c_id = course.id)
                             WHERE
                                 access_url_id = $url_access_id AND (
-                                    code LIKE '%" . $search_term_safe . "%' OR
-                                    title LIKE '%" . $search_term_safe . "%' OR
-                                    tutor_name LIKE '%" . $search_term_safe . "%'
+                                    code LIKE '%".$search_term_safe."%' OR
+                                    title LIKE '%" . $search_term_safe."%' OR
+                                    tutor_name LIKE '%" . $search_term_safe."%'
                                 )
                                 $without_special_courses
                             ORDER BY title, visual_code ASC
@@ -513,8 +513,8 @@ 
         // (s)he can only delete the course
         $sql = "SELECT * FROM $tbl_course_user
                 WHERE
-                    user_id='" . $current_user_id . "' AND
-                    c_id ='" . $courseId . "' AND
+                    user_id='".$current_user_id."' AND
+                    c_id ='" . $courseId."' AND
                     status='1' ";
         $result_check = Database::query($sql);
         $number_of_rows = Database::num_rows($result_check);
@@ -541,17 +541,17 @@ 
         $result = false;
 
         // step 1: we determine the max value of the user defined course categories
-        $sql = "SELECT sort FROM $tucc WHERE user_id='" . $current_user_id . "' ORDER BY sort DESC";
+        $sql = "SELECT sort FROM $tucc WHERE user_id='".$current_user_id."' ORDER BY sort DESC";
         $rs_sort = Database::query($sql);
         $maxsort = Database::fetch_array($rs_sort);
         $nextsort = $maxsort['sort'] + 1;
 
         // step 2: we check if there is already a category with this name, if not we store it, else we give an error.
-        $sql = "SELECT * FROM $tucc WHERE user_id='" . $current_user_id . "' AND title='" . $category_title . "'ORDER BY sort DESC";
+        $sql = "SELECT * FROM $tucc WHERE user_id='".$current_user_id."' AND title='".$category_title."'ORDER BY sort DESC";
         $rs = Database::query($sql);
         if (Database::num_rows($rs) == 0) {
             $sql_insert = "INSERT INTO $tucc (user_id, title,sort)
-                           VALUES ('" . $current_user_id . "', '" . api_htmlentities($category_title, ENT_QUOTES, api_get_system_encoding()) . "', '" . $nextsort . "')";
+                           VALUES ('".$current_user_id."', '".api_htmlentities($category_title, ENT_QUOTES, api_get_system_encoding())."', '".$nextsort."')";
             $resultQuery = Database::query($sql_insert);
             if (Database::affected_rows($resultQuery)) {
                 $result = true;
@@ -628,10 +628,10 @@ 
             if (isset($_POST['course_registration_code']) && $_POST['course_registration_code'] != $all_course_information['registration_code']) {
                 return false;
             }
-            $message = get_lang('CourseRequiresPassword') . '<br />';
+            $message = get_lang('CourseRequiresPassword').'<br />';
             $message .= $all_course_information['title'].' ('.$all_course_information['visual_code'].') ';
 
-            $action  = api_get_path(WEB_CODE_PATH) . "auth/courses.php?action=subscribe_user_with_password&sec_token=" . $_SESSION['sec_token'];
+            $action  = api_get_path(WEB_CODE_PATH)."auth/courses.php?action=subscribe_user_with_password&sec_token=".$_SESSION['sec_token'];
             $form = new FormValidator('subscribe_user_with_password', 'post', $action);
             $form->addElement('hidden', 'sec_token', $_SESSION['sec_token']);
             $form->addElement('hidden', 'subscribe_user_with_password', $all_course_information['code']);

main/inc/lib/javascript/chat/video.php

Spacing +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
 $idUserLocal = api_get_user_id();
 $userLocal = api_get_user_info($idUserLocal, true);
 $htmlHeadXtra[] = '<script type="text/javascript" src="'
-    . api_get_path(WEB_PATH) . 'web/assets/SimpleWebRTC/latest.js'
-    . '"></script>' . "\n";
+    . api_get_path(WEB_PATH).'web/assets/SimpleWebRTC/latest.js'
+    . '"></script>'."\n";
 
 $template = new Template();
 $template->assign('room_name', $chatVideo->getRoomName());

main/inc/lib/thematic.lib.php

Spacing +62 added lines, -62 removed lines

@@ -74,7 +74,7 @@ 
         $from = intval($from);
         $number_of_items = intval($number_of_items);
 
-        if (!in_array($direction, array('ASC','DESC'))) {
+        if (!in_array($direction, array('ASC', 'DESC'))) {
             $direction = 'ASC';
         }
 
@@ -97,24 +97,24 @@ 
             $thematic[1] = '<a href="index.php?'.api_get_cidreq().'&action=thematic_details&thematic_id='.$thematic[0].'">'.
                 Security::remove_XSS($thematic[1], STUDENT).$session_star.'</a>';
             if (api_is_allowed_to_edit(null, true)) {
-                $actions  = '';
+                $actions = '';
 
                 if (api_get_session_id()) {
                     if (api_get_session_id() == $thematic[3]) {
                         $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('lesson_plan.png',get_lang('ThematicPlan'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                            Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
                         $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('lesson_plan_calendar.png',get_lang('ThematicAdvance'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                            Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
 
                         $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
+                            Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
                         $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions .= Display::return_icon('lesson_plan_na.png',get_lang('ThematicPlan'),'',ICON_SIZE_SMALL).'&nbsp;';
-                        $actions .= Display::return_icon('lesson_plan_calendar_na.png',get_lang('ThematicAdvance'),'',ICON_SIZE_SMALL).'&nbsp;';
-                        $actions .= Display::return_icon('edit_na.png',get_lang('Edit'),'',ICON_SIZE_SMALL);
-                        $actions .= Display::return_icon('delete_na.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'&nbsp;';
+                        $actions .= Display::return_icon('lesson_plan_na.png', get_lang('ThematicPlan'), '', ICON_SIZE_SMALL).'&nbsp;';
+                        $actions .= Display::return_icon('lesson_plan_calendar_na.png', get_lang('ThematicAdvance'), '', ICON_SIZE_SMALL).'&nbsp;';
+                        $actions .= Display::return_icon('edit_na.png', get_lang('Edit'), '', ICON_SIZE_SMALL);
+                        $actions .= Display::return_icon('delete_na.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'&nbsp;';
                         $actions .= Display::url(
                             Display::return_icon('cd.gif', get_lang('Copy')),
                             'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$thematic[0]
@@ -122,26 +122,26 @@ 
                     }
                 } else {
                     $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic[0].'">'.
-                        Display::return_icon('lesson_plan.png',get_lang('ThematicPlan'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                        Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
                     $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic[0].'">'.
-                        Display::return_icon('lesson_plan_calendar.png',get_lang('ThematicAdvance'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                        Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
 
                     if ($thematic[2] > 1) {
                         $actions .= '<a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('up.png', get_lang('Up'),'',ICON_SIZE_SMALL).'</a>';
+                            Display::return_icon('up.png', get_lang('Up'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions .= Display::return_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
+                        $actions .= Display::return_icon('up_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
                     }
                     if ($thematic[2] < self::get_max_thematic_item()) {
                         $actions .= '<a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('down.png',get_lang('Down'),'',ICON_SIZE_SMALL).'</a>';
+                            Display::return_icon('down.png', get_lang('Down'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions .= Display::return_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
+                        $actions .= Display::return_icon('down_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
                     }
                     $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$thematic[0].'">'.
-                        Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
+                        Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
                     $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$thematic[0].'">'.
-                        Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+                        Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
                 }
                 $thematics[] = array($thematic[0], $thematic[1], $actions);
             }
@@ -278,9 +278,9 @@ 
         $res = Database::query($sql);
         if (Database::num_rows($res) > 0) {
             if (!empty($thematic_id)) {
-                $data = Database::fetch_array($res,'ASSOC');
+                $data = Database::fetch_array($res, 'ASSOC');
             } else {
-                while ($row = Database::fetch_array($res,'ASSOC')) {
+                while ($row = Database::fetch_array($res, 'ASSOC')) {
                     $data[$row['id']] = $row;
                 }
             }
@@ -375,7 +375,7 @@ 
 
         if (is_array($thematic_id)) {
             foreach ($thematic_id as $id) {
-                $id	= intval($id);
+                $id = intval($id);
                 $sql = "UPDATE $tbl_thematic SET active = 0
                         WHERE c_id = $course_id AND id = $id";
                 $result = Database::query($sql);
@@ -391,8 +391,8 @@ 
                     );
                 }
             }
-        } else  {
-            $thematic_id	= intval($thematic_id);
+        } else {
+            $thematic_id = intval($thematic_id);
             $sql = "UPDATE $tbl_thematic SET active = 0
                     WHERE c_id = $course_id AND id = $thematic_id";
             $result = Database::query($sql);
@@ -428,8 +428,8 @@ 
         $new_thematic_id = $thematic_copy->thematic_save();
         if (!empty($new_thematic_id)) {
             $thematic_advanced = self::get_thematic_advance_by_thematic_id($thematic_id);
-            if(!empty($thematic_advanced)) {
-                foreach($thematic_advanced as $item) {
+            if (!empty($thematic_advanced)) {
+                foreach ($thematic_advanced as $item) {
                     $thematic = new Thematic();
                     $thematic->set_thematic_advance_attributes(
                         0,
@@ -492,7 +492,7 @@ 
         $column = intval($column);
         $from   = intval($from);
         $number_of_items = intval($number_of_items);
-        if (!in_array($direction, array('ASC','DESC'))) {
+        if (!in_array($direction, array('ASC', 'DESC'))) {
             $direction = 'ASC';
         }
         $data = array();
@@ -525,8 +525,8 @@ 
                     $thematic_advance[1] = api_get_local_time($thematic_advance[1]);
                     $thematic_advance[1] = api_format_date($thematic_advance[1], DATE_TIME_FORMAT_LONG);
                     $actions  = '';
-                    $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_edit&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
-                    $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('delete.png',get_lang('Delete'),'',22).'</a></center>';
+                    $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_edit&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('edit.png', get_lang('Edit'), '', 22).'</a>';
+                    $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('delete.png', get_lang('Delete'), '', 22).'</a></center>';
                     $data[] = array($i, $thematic_advance[1], $thematic_advance[2], $thematic_advance[3], $actions);
                     $i++;
                 }
@@ -590,7 +590,7 @@ 
 
                 $session_star = '';
                 if (api_is_allowed_to_edit(null, true)) {
-                    if ($thematic_advance['session_id'] !=0) {
+                    if ($thematic_advance['session_id'] != 0) {
                         $session_star = api_get_session_image(api_get_session_id(), $uinfo['status']);
                     }
                 }
@@ -616,13 +616,13 @@ 
 
         foreach ($data as $thematic_id => $thematic_plan_data) {
             $new_thematic_plan_data = array();
-            foreach($thematic_plan_data as $thematic_item) {
+            foreach ($thematic_plan_data as $thematic_item) {
                 $thematic_simple_list[] = $thematic_item['description_type'];
                 $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
             }
 
             if (!empty($thematic_simple_list)) {
-                foreach($thematic_simple_list as $item) {
+                foreach ($thematic_simple_list as $item) {
                     $default_thematic_plan_title[$item] = $new_thematic_plan_data[$item]['title'];
                 }
             }
@@ -638,7 +638,7 @@ 
                     }
                     if (!empty($data[$thematic_id][$id]['title']) && !empty($data[$thematic_id][$id]['description'])) {
                         if (api_is_allowed_to_edit(null, true)) {
-                            if ($data[$thematic_id][$id]['session_id'] !=0) {
+                            if ($data[$thematic_id][$id]['session_id'] != 0) {
                                 $session_star = api_get_session_image(api_get_session_id(), $uinfo['status']);
                             }
                         }
@@ -651,7 +651,7 @@ 
             if ($no_data) {
                 $return .= '<div><em>'.get_lang('StillDoNotHaveAThematicPlan').'</em></div>';
             }
-            $return  .= '</div>';
+            $return .= '</div>';
             $final_return[$thematic_id] = $return;
         }
         return $final_return;
@@ -691,7 +691,7 @@ 
                 api_get_session_id()
             );
             foreach ($list as $value) {
-                $elements[$value['ref']]= $value;
+                $elements[$value['ref']] = $value;
             }
         }
 
@@ -865,18 +865,18 @@ 
             api_get_session_id()
         );
 
-        $thematic_plan_complete_list  = array();
+        $thematic_plan_complete_list = array();
         $thematic_plan_id_list = array();
 
         if (!empty($items_from_course)) {
-            foreach($items_from_course as $item) {
+            foreach ($items_from_course as $item) {
                 $thematic_plan_id_list[] = $item['ref'];
                 $thematic_plan_complete_list[$item['ref']] = $item;
             }
         }
 
         if (!empty($items_from_session)) {
-            foreach($items_from_session as $item) {
+            foreach ($items_from_session as $item) {
                 $thematic_plan_id_list[] = $item['ref'];
                 $thematic_plan_complete_list[$item['ref']] = $item;
             }
@@ -898,7 +898,7 @@ 
                 if (!isset($thematic_id) && !isset($description_type)) {
                     // group all data group by thematic id
                     $tmp = array();
-                    while ($row = Database::fetch_array($rs,'ASSOC')) {
+                    while ($row = Database::fetch_array($rs, 'ASSOC')) {
                         $tmp[] = $row['thematic_id'];
                         if (in_array($row['thematic_id'], $tmp)) {
                             $row['session_id'] = $thematic_plan_complete_list[$row['id']];
@@ -906,7 +906,7 @@ 
                         }
                     }
                 } else {
-                    while ($row = Database::fetch_array($rs,'ASSOC')) {
+                    while ($row = Database::fetch_array($rs, 'ASSOC')) {
                         $row['session_id'] = $thematic_plan_complete_list[$row['id']];
                         $data[] = $row;
                     }
@@ -941,8 +941,8 @@ 
         );
 
         $elements_to_show = array();
-        foreach($list as $value) {
-            $elements_to_show[]= $value['ref'];
+        foreach ($list as $value) {
+            $elements_to_show[] = $value['ref'];
         }
         $condition = '';
         if (!empty($elements_to_show)) {
@@ -954,7 +954,7 @@ 
                     c_id = $course_id AND
                     thematic_id = $thematic_id AND
                     description_type = '$description_type'";
-        $rs	 = Database::query($sql);
+        $rs = Database::query($sql);
 
         $affected_rows = 0;
         if (Database::num_rows($rs) > 0) {
@@ -1190,7 +1190,7 @@ 
             $diff = array_diff($all, $a_thematic_advance_ids);
             if (!empty($diff)) {
                 $upd = "UPDATE $tbl_thematic_advance SET done_advance = 0
-    			        WHERE c_id = $course_id AND id IN(".implode(',',$diff).") ";
+    			        WHERE c_id = $course_id AND id IN(".implode(',', $diff).") ";
                 Database::query($upd);
             }
 
@@ -1304,7 +1304,7 @@ 
             $course_code = api_get_course_id();
         }
         if (api_get_session_id()) {
-            $thematic_data = $this->get_thematic_list(null, $course_code );
+            $thematic_data = $this->get_thematic_list(null, $course_code);
         } else {
             $thematic_data = $this->get_thematic_list(null, $course_code, 0);
         }
@@ -1356,7 +1356,7 @@ 
             }
             // calculate average by thematic
             $count_total_advances = count($advances);
-            $average = round(($count_done_advances*100)/$count_total_advances);
+            $average = round(($count_done_advances * 100) / $count_total_advances);
         }
 
         return $average;
@@ -1447,12 +1447,12 @@ 
     public function get_default_thematic_plan_title()
     {
         $default_thematic_plan_titles = array();
-        $default_thematic_plan_titles[1]= get_lang('Objectives');
-        $default_thematic_plan_titles[2]= get_lang('SkillToAcquire');
-        $default_thematic_plan_titles[3]= get_lang('Methodology');
-        $default_thematic_plan_titles[4]= get_lang('Infrastructure');
-        $default_thematic_plan_titles[5]= get_lang('Assessment');
-        $default_thematic_plan_titles[6]= get_lang('Others');
+        $default_thematic_plan_titles[1] = get_lang('Objectives');
+        $default_thematic_plan_titles[2] = get_lang('SkillToAcquire');
+        $default_thematic_plan_titles[3] = get_lang('Methodology');
+        $default_thematic_plan_titles[4] = get_lang('Infrastructure');
+        $default_thematic_plan_titles[5] = get_lang('Assessment');
+        $default_thematic_plan_titles[6] = get_lang('Others');
 
         return $default_thematic_plan_titles;
     }
@@ -1464,12 +1464,12 @@ 
     public function get_default_thematic_plan_icon()
     {
         $default_thematic_plan_icon = array();
-        $default_thematic_plan_icon[1]= 'icons/32/objective.png';
-        $default_thematic_plan_icon[2]= 'icons/32/skills.png';
-        $default_thematic_plan_icon[3]= 'icons/32/strategy.png';
-        $default_thematic_plan_icon[4]= 'icons/32/laptop.png';
-        $default_thematic_plan_icon[5]= 'icons/32/assessment.png';
-        $default_thematic_plan_icon[6]= 'icons/32/wizard.png';
+        $default_thematic_plan_icon[1] = 'icons/32/objective.png';
+        $default_thematic_plan_icon[2] = 'icons/32/skills.png';
+        $default_thematic_plan_icon[3] = 'icons/32/strategy.png';
+        $default_thematic_plan_icon[4] = 'icons/32/laptop.png';
+        $default_thematic_plan_icon[5] = 'icons/32/assessment.png';
+        $default_thematic_plan_icon[6] = 'icons/32/wizard.png';
 
         return $default_thematic_plan_icon;
     }
@@ -1481,11 +1481,11 @@ 
     public function get_default_question()
     {
         $question = array();
-        $question[1]= get_lang('ObjectivesQuestions');
-        $question[2]= get_lang('SkillToAcquireQuestions');
-        $question[3]= get_lang('MethodologyQuestions');
-        $question[4]= get_lang('InfrastructureQuestions');
-        $question[5]= get_lang('AssessmentQuestions');
+        $question[1] = get_lang('ObjectivesQuestions');
+        $question[2] = get_lang('SkillToAcquireQuestions');
+        $question[3] = get_lang('MethodologyQuestions');
+        $question[4] = get_lang('InfrastructureQuestions');
+        $question[5] = get_lang('AssessmentQuestions');
 
         return $question;
     }

main/inc/lib/glossary.lib.php

Spacing +34 added lines, -34 removed lines

@@ -39,13 +39,13 @@ 
      * @param int $glossary_id
      * @return string The glossary description
      */
-    public static function get_glossary_term_by_glossary_id ($glossary_id)
+    public static function get_glossary_term_by_glossary_id($glossary_id)
     {
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
         $course_id = api_get_course_int_id();
         $sql = "SELECT description FROM $glossary_table
                 WHERE c_id = $course_id  AND glossary_id =".intval($glossary_id);
-        $rs=Database::query($sql);
+        $rs = Database::query($sql);
         if (Database::num_rows($rs) > 0) {
             $row = Database::fetch_array($rs);
 
@@ -61,9 +61,9 @@ 
      * @param string The glossary term name
      * @return string The glossary description
      */
-    public static function get_glossary_term_by_glossary_name ($glossary_name)
+    public static function get_glossary_term_by_glossary_name($glossary_name)
     {
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
         $sql_filter = api_get_session_condition($session_id);
@@ -163,7 +163,7 @@ 
         $course_id = api_get_course_int_id();
 
         // check if the glossary term already exists
-        if (GlossaryManager::glossary_exists($values['glossary_title'],$values['glossary_id'])) {
+        if (GlossaryManager::glossary_exists($values['glossary_title'], $values['glossary_id'])) {
             // display the feedback message
             if ($message)
                 Display::display_error_message(get_lang('GlossaryTermAlreadyExistsYouShouldEditIt'));
@@ -210,7 +210,7 @@ 
         $get_max = "SELECT MAX(display_order) FROM $t_glossary
                     WHERE c_id = $course_id ";
         $res_max = Database::query($get_max);
-        if (Database::num_rows($res_max)==0) {
+        if (Database::num_rows($res_max) == 0) {
             return 0;
         }
         $row = Database::fetch_array($res_max);
@@ -231,7 +231,7 @@ 
      * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
      * @version januari 2009, dokeos 1.8.6
      */
-    public static function glossary_exists($term, $not_id='')
+    public static function glossary_exists($term, $not_id = '')
     {
         // Database table definition
         $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
@@ -241,7 +241,7 @@ 
                 WHERE
                     c_id = $course_id AND
                     name = '".Database::escape_string($term)."'";
-        if ($not_id<>'') {
+        if ($not_id <> '') {
             $sql .= " AND glossary_id <> '".intval($not_id)."'";
         }
         $result = Database::query($sql);
@@ -347,27 +347,27 @@ 
         // action links
         echo '<div class="actions">';
 
-        if (api_is_allowed_to_edit(null,true)) {
+        if (api_is_allowed_to_edit(null, true)) {
             echo '<a href="index.php?'.api_get_cidreq().'&action=addglossary&msg=add?'.api_get_cidreq().'">'.
-                Display::return_icon('new_glossary_term.png',get_lang('TermAddNew'),'', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_glossary_term.png', get_lang('TermAddNew'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         echo '<a href="index.php?'.api_get_cidreq().'&action=export">'.
-            Display::return_icon('export_csv.png',get_lang('ExportGlossaryAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
-        if (api_is_allowed_to_edit(null,true)) {
+            Display::return_icon('export_csv.png', get_lang('ExportGlossaryAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
+        if (api_is_allowed_to_edit(null, true)) {
             echo '<a href="index.php?'.api_get_cidreq().'&action=import">'.
-                Display::return_icon('import_csv.png',get_lang('ImportGlossary'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('import_csv.png', get_lang('ImportGlossary'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         echo '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf">'.
-            Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
-        if ((isset($_SESSION['glossary_view']) && $_SESSION['glossary_view'] == 'table') or (!isset($_SESSION['glossary_view']))){
+        if ((isset($_SESSION['glossary_view']) && $_SESSION['glossary_view'] == 'table') or (!isset($_SESSION['glossary_view']))) {
             echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=list">'.
-                Display::return_icon('view_detailed.png',get_lang('ListView'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('view_detailed.png', get_lang('ListView'), '', ICON_SIZE_MEDIUM).'</a>';
         } else {
             echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=table">'.
-                Display::return_icon('view_text.png',get_lang('TableView'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('view_text.png', get_lang('TableView'), '', ICON_SIZE_MEDIUM).'</a>';
         }
         echo '</div>';
         if (!$_SESSION['glossary_view'] || $_SESSION['glossary_view'] == 'table') {
@@ -380,9 +380,9 @@ 
             //$table->set_header(0, '', false);
             $table->set_header(0, get_lang('TermName'), true);
             $table->set_header(1, get_lang('TermDefinition'), true);
-            if (api_is_allowed_to_edit(null,true)) {
+            if (api_is_allowed_to_edit(null, true)) {
                 $table->set_header(2, get_lang('Actions'), false, 'width=90px', array('class' => 'td_actions'));
-                $table->set_column_filter(2, array('GlossaryManager','actions_filter'));
+                $table->set_column_filter(2, array('GlossaryManager', 'actions_filter'));
             }
             $table->display();
         }
@@ -399,11 +399,11 @@ 
      */
     public static function display_glossary_list()
     {
-        $glossary_data = self::get_glossary_data(0,1000,0,'ASC');
+        $glossary_data = self::get_glossary_data(0, 1000, 0, 'ASC');
         foreach ($glossary_data as $key => $glossary_item) {
             $actions = '';
-            if (api_is_allowed_to_edit(null,true)) {
-                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '',$glossary_item).'</div>';
+            if (api_is_allowed_to_edit(null, true)) {
+                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '', $glossary_item).'</div>';
             }
             echo Display::panel($glossary_item[1], $glossary_item[0].' '.$actions);
         }
@@ -418,7 +418,7 @@ 
      * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
      * @version januari 2009, dokeos 1.8.6
      */
-    public static  function get_number_glossary_terms($session_id=0)
+    public static  function get_number_glossary_terms($session_id = 0)
     {
         // Database table definition
         $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
@@ -456,7 +456,7 @@ 
         $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
         $t_item_propery = Database :: get_course_table(TABLE_ITEM_PROPERTY);
 
-        if (api_is_allowed_to_edit(null,true)) {
+        if (api_is_allowed_to_edit(null, true)) {
             $col2 = " glossary.glossary_id	as col2, ";
         } else {
             $col2 = " ";
@@ -471,8 +471,8 @@ 
             'glossary.session_id'
         );
         $column = intval($column);
-        if (!in_array($direction,array('DESC', 'ASC'))) {
-            $direction          = 'ASC';
+        if (!in_array($direction, array('DESC', 'ASC'))) {
+            $direction = 'ASC';
         }
         $from = intval($from);
         $number_of_items = intval($number_of_items);
@@ -497,15 +497,15 @@ 
         while ($data = Database::fetch_array($res)) {
             // Validation when belongs to a session
             $session_img = api_get_session_image($data['session_id'], $_user['status']);
-            $array[0] = $data[0] . $session_img;
+            $array[0] = $data[0].$session_img;
 
             if (!$_SESSION['glossary_view'] || $_SESSION['glossary_view'] == 'table') {
-                $array[1] = str_replace(array('<p>','</p>'),array('','<br />'),$data[1]);
+                $array[1] = str_replace(array('<p>', '</p>'), array('', '<br />'), $data[1]);
             } else {
                 $array[1] = $data[1];
             }
 
-            if (api_is_allowed_to_edit(null,true)) {
+            if (api_is_allowed_to_edit(null, true)) {
                 $array[2] = $data[2];
             }
             $return[] = $array;
@@ -528,14 +528,14 @@ 
     public static function actions_filter($glossary_id, $url_params, $row)
     {
         $glossary_id = $row[2];
-        $return = '<a href="'.api_get_self().'?action=edit_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
+        $return = '<a href="'.api_get_self().'?action=edit_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.Display::return_icon('edit.png', get_lang('Edit'), '', 22).'</a>';
         $glossary_data = GlossaryManager::get_glossary_information($glossary_id);
 
         $glossary_term = $glossary_data['glossary_title'];
 
         if (api_is_allowed_to_edit(null, true)) {
             if ($glossary_data['session_id'] == api_get_session_id()) {
-                $return .= '<a href="'.api_get_self().'?action=delete_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'" onclick="return confirmation(\''.$glossary_term.'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>';
+                $return .= '<a href="'.api_get_self().'?action=delete_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'" onclick="return confirmation(\''.$glossary_term.'\');">'.Display::return_icon('delete.png', get_lang('Delete'), '', 22).'</a>';
             } else {
                 $return  = get_lang('EditionNotAvailableFromSession');
             }
@@ -556,7 +556,7 @@ 
     {
         return "<script type=\"text/javascript\">
 				function confirmation (name) {
-					if (confirm(\" ". get_lang("TermConfirmDelete") ." \"+ name + \" ?\"))
+					if (confirm(\" ". get_lang("TermConfirmDelete")." \"+ name + \" ?\"))
 						{return true;}
 					else
 						{return false;}
@@ -616,7 +616,7 @@ 
         $res = Database::query($sql);
         $found = false;
         while ($row = Database::fetch_array($res)) {
-            if ($found && empty($next_id))	{
+            if ($found && empty($next_id)) {
                 $next_id = $row['glossary_id'];
                 $next_display_order = $row['display_order'];
             }

main/inc/lib/internationalization.lib.php

Spacing +9 added lines, -9 removed lines

@@ -105,7 +105,7 @@ 
     ) {
       require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
       global $langstats;
-      $langstats->add_use($variable,'');
+      $langstats->add_use($variable, '');
     }
 
     if (!isset($used_lang_vars)) {
@@ -371,7 +371,7 @@ 
     if ($use_users_timezone == 'true') {
         $userId = api_get_user_id();
         // Get the timezone based on user preference, if it exists
-        $timezone_user = UserManager::get_extra_user_data_by_field($userId,'timezone');
+        $timezone_user = UserManager::get_extra_user_data_by_field($userId, 'timezone');
         if (isset($timezone_user['timezone']) && $timezone_user['timezone'] != null) {
             $to_timezone = $timezone_user['timezone'];
         }
@@ -636,10 +636,10 @@ 
         // We replace %a %A %b %B masks of date format with translated strings
         $translated = &_api_get_day_month_names($language);
         $date_format = str_replace(array('%A', '%a', '%B', '%b'),
-        array($translated['days_long'][(int)strftime('%w', $time )],
-            $translated['days_short'][(int)strftime('%w', $time)],
-            $translated['months_long'][(int)strftime('%m', $time) - 1],
-            $translated['months_short'][(int)strftime('%m', $time) - 1]),
+        array($translated['days_long'][(int) strftime('%w', $time)],
+            $translated['days_short'][(int) strftime('%w', $time)],
+            $translated['months_long'][(int) strftime('%m', $time) - 1],
+            $translated['months_short'][(int) strftime('%m', $time) - 1]),
         $date_format);
         $formatted_date = api_to_system_encoding(strftime($date_format, $time), 'UTF-8');
     }
@@ -737,7 +737,7 @@ 
         if ($seconds > $time) {
             continue;
         }
-        $current_value = intval($time/$seconds);
+        $current_value = intval($time / $seconds);
 
         if ($current_value != 1) {
             $date_str = $sec_time_plu[$i];
@@ -754,7 +754,7 @@ 
     }
 
     if (!empty($key_result)) {
-        if ($key_result[0] == $min_day && $key_result[1]== $min_minute) {
+        if ($key_result[0] == $min_day && $key_result[1] == $min_minute) {
             $key_result[1] = ' 0 '.$min_hours;
             $str_result[0] = $time_result[0].' '.$key_result[0];
             $str_result[1] = $key_result[1];
@@ -1687,7 +1687,7 @@ 
  * @return string					Returns the encoding identificator modified in suitable for comparison way.
  */
 function api_refine_encoding_id($encoding) {
-    if (is_array($encoding)){
+    if (is_array($encoding)) {
         return array_map('api_refine_encoding_id', $encoding);
     }
     return strtoupper(str_replace('_', '-', $encoding));