chamilo / chamilo-lms

main/inc/lib/opengraph/OpenGraph.php

Indentation +48 added lines, -48 removed lines

@@ -18,11 +18,11 @@ 
 
 class OpenGraph implements Iterator
 {
-  /**
-   * There are base schema's based on type, this is just
-   * a map so that the schema can be obtained
-   *
-   */
+    /**
+     * There are base schema's based on type, this is just
+     * a map so that the schema can be obtained
+     *
+     */
     public static $TYPES = array(
         'activity' => array('activity', 'sport'),
         'business' => array('bar', 'company', 'cafe', 'hotel', 'restaurant'),
@@ -34,19 +34,19 @@ 
         'website' => array('blog', 'website'),
     );
 
-  /**
-   * Holds all the Open Graph values we've parsed from a page
-   *
-   */
+    /**
+     * Holds all the Open Graph values we've parsed from a page
+     *
+     */
     private $_values = array();
 
-  /**
-   * Fetches a URI and parses it for Open Graph data, returns
-   * false on error.
-   *
-   * @param $URI    URI to page to parse for Open Graph data
-   * @return OpenGraph
-   */
+    /**
+     * Fetches a URI and parses it for Open Graph data, returns
+     * false on error.
+     *
+     * @param $URI    URI to page to parse for Open Graph data
+     * @return OpenGraph
+     */
     static public function fetch($URI) {
         $curl = curl_init($URI);
 
@@ -69,13 +69,13 @@ 
         }
     }
 
-  /**
-   * Parses HTML and extracts Open Graph data, this assumes
-   * the document is at least well formed.
-   *
-   * @param $HTML    HTML to parse
-   * @return OpenGraph
-   */
+    /**
+     * Parses HTML and extracts Open Graph data, this assumes
+     * the document is at least well formed.
+     *
+     * @param $HTML    HTML to parse
+     * @return OpenGraph
+     */
     static private function _parse($HTML) {
         $old_libxml_error = libxml_use_internal_errors(true);
 
@@ -140,13 +140,13 @@ 
         return $page;
     }
 
-  /**
-   * Helper method to access attributes directly
-   * Example:
-   * $graph->title
-   *
-   * @param $key    Key to fetch from the lookup
-   */
+    /**
+     * Helper method to access attributes directly
+     * Example:
+     * $graph->title
+     *
+     * @param $key    Key to fetch from the lookup
+     */
     public function __get($key) {
         if (array_key_exists($key, $this->_values)) {
             return $this->_values[$key];
@@ -161,29 +161,29 @@ 
         }
     }
 
-  /**
-   * Return all the keys found on the page
-   *
-   * @return array
-   */
+    /**
+     * Return all the keys found on the page
+     *
+     * @return array
+     */
     public function keys() {
         return array_keys($this->_values);
     }
 
-  /**
-   * Helper method to check an attribute exists
-   *
-   * @param $key
-   */
+    /**
+     * Helper method to check an attribute exists
+     *
+     * @param $key
+     */
     public function __isset($key) {
         return array_key_exists($key, $this->_values);
     }
 
-  /**
-   * Will return true if the page has location data embedded
-   *
-   * @return boolean Check if the page has location data
-   */
+    /**
+     * Will return true if the page has location data embedded
+     *
+     * @return boolean Check if the page has location data
+     */
     public function hasLocation() {
         if (array_key_exists('latitude', $this->_values) && array_key_exists('longitude', $this->_values)) {
             return true;
@@ -197,9 +197,9 @@ 
         return $valid_address;
     }
 
-  /**
-   * Iterator code
-   */
+    /**
+     * Iterator code
+     */
     private $_position = 0;
     public function rewind() { reset($this->_values); $this->_position = 0; }
     public function current() { return current($this->_values); }

main/inc/lib/events_dispatcher.class.php

Braces +3 added lines, -1 removed lines

@@ -18,9 +18,11 @@
 
         foreach ($event_config[$event_name]["actions"] as $func) {
             $execute = true;
-            if (!function_exists($func)) // if the function doesn't exist, we log
+            if (!function_exists($func)) {
+                // if the function doesn't exist, we log
             {
                 error_log("EventsDispatcher warning : ".$func." does not exist.");
+            }
                 $execute = false;
             }
 

main/inc/lib/auth.lib.php

Indentation +1 added lines, -1 removed lines

@@ -379,7 +379,7 @@
         $sql_delete = "DELETE FROM $tucc
                       WHERE id='" . $category_id . "' and user_id='" . $current_user_id . "'";
         $resultQuery = Database::query($sql_delete);
-       if (Database::affected_rows($resultQuery)) {
+        if (Database::affected_rows($resultQuery)) {
             $result = true;
         }
         $sql = "UPDATE $TABLECOURSUSER

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/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/internationalization.lib.php

Indentation +21 added lines, -22 removed lines

@@ -103,13 +103,13 @@ 
     if (isset($_configuration['language_measure_frequency']) &&
         $_configuration['language_measure_frequency'] == 1
     ) {
-      require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
-      global $langstats;
-      $langstats->add_use($variable,'');
+        require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
+        global $langstats;
+        $langstats->add_use($variable,'');
     }
 
     if (!isset($used_lang_vars)) {
-    	$used_lang_vars = array();
+        $used_lang_vars = array();
     }
 
     // Caching results from some API functions, for speed.
@@ -305,7 +305,7 @@ 
     static $text_direction = array();
 
     if (empty($language)) {
-    	$language = api_get_interface_language();
+        $language = api_get_interface_language();
     }
     if (!isset($text_direction[$language])) {
         $text_direction[$language] = in_array(api_purify_language_id($language),
@@ -536,24 +536,24 @@ 
             case DATE_FORMAT_ONLY_DAYNAME:
                 $date_format = get_lang('dateFormatOnlyDayName', '', $language);
                 if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
                 break;
             case DATE_FORMAT_NUMBER_NO_YEAR:
                 $date_format = get_lang('dateFormatShortNumberNoYear', '', $language);
-        		if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
+                if (INTL_INSTALLED) {
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
+                break;
+            case DATE_FORMAT_NUMBER:
+                $date_format = get_lang('dateFormatShortNumber', '', $language);
+                if (INTL_INSTALLED) {
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
                 break;
-        	case DATE_FORMAT_NUMBER:
-        		$date_format = get_lang('dateFormatShortNumber', '', $language);
-        		if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
-        		break;
             case TIME_NO_SEC_FORMAT:
                 $date_format = get_lang('timeNoSecFormat', '', $language);
                 if (INTL_INSTALLED) {
@@ -589,14 +589,14 @@ 
                     $timetype = IntlDateFormatter::SHORT;
                 }
                 break;
-			case DATE_TIME_FORMAT_SHORT:
+            case DATE_TIME_FORMAT_SHORT:
                 $date_format = get_lang('dateTimeFormatShort', '', $language);
                 if (INTL_INSTALLED) {
                     $datetype = IntlDateFormatter::FULL;
                     $timetype = IntlDateFormatter::SHORT;
                 }
                 break;
-			case DATE_TIME_FORMAT_SHORT_TIME_FIRST:
+            case DATE_TIME_FORMAT_SHORT_TIME_FIRST:
                 $date_format = get_lang('dateTimeFormatShortTimeFirst', '', $language);
                 if (INTL_INSTALLED) {
                     $datetype = IntlDateFormatter::FULL;
@@ -1817,7 +1817,6 @@ 
 
 /**
  * Return true a date is valid
-
  * @param string $date example: 2014-06-30 13:05:05
  * @param string $format example: "Y-m-d H:i:s"
  *

Braces +1 added lines, -2 removed lines

@@ -1710,8 +1710,7 @@
             }
         }
         return false;
-    }
-    elseif (is_array($encoding2)) {
+    } elseif (is_array($encoding2)) {
         foreach ($encoding2 as $encoding) {
             if (api_equal_encodings($encoding1, $encoding, $strict)) {
                 return true;

Doc Comments +17 added lines, -11 removed lines

@@ -437,6 +437,7 @@ 
  * If null, the timezone will be determined based on user preference,
  * or timezone chosen by the admin for the platform.
  * @param string The timezone to be converted from. If null, UTC will be assumed.
+ * @param string $to_timezone
  * @return string The converted time formatted as Y-m-d H:i:s
  *
  * @author Guillaume Viguier <guillaume.viguier@beeznest.com>
@@ -793,6 +794,7 @@ 
  * @param mixed The time to be converted
  * @param mixed Format to be used (TIME_NO_SEC_FORMAT, DATE_FORMAT_SHORT, DATE_FORMAT_LONG, DATE_TIME_FORMAT_LONG)
  * @param string Timezone to be converted from. If null, UTC will be assumed.
+ * @param string $from_timezone
  * @return string Converted and localized date
  *
  * @author Guillaume Viguier <guillaume.viguier@beeznest.com>
@@ -862,7 +864,7 @@ 
  * @param int/string $format (optional)	The person name format. It may be a pattern-string (for example '%t %l, %f' or '%T %F %L', ...) or some of the constants PERSON_NAME_COMMON_CONVENTION (default), PERSON_NAME_WESTERN_ORDER, PERSON_NAME_EASTERN_ORDER, PERSON_NAME_LIBRARY_ORDER.
  * @param string $language (optional)	The language id. If it is omitted, the current interface language is assumed. This parameter has meaning with the format PERSON_NAME_COMMON_CONVENTION only.
  * @param string $encoding (optional)	The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return bool							The result is sort of full name of the person.
+ * @return string							The result is sort of full name of the person.
  * Sample results:
  * Peter Ustinoff or Dr. Peter Ustinoff     - the Western order
  * Ustinoff Peter or Dr. Ustinoff Peter     - the Eastern order
@@ -956,7 +958,7 @@ 
 
 /**
  * Checks whether a given format represents person name in Western order (for which first name is first).
- * @param int/string $format (optional)	The person name format. It may be a pattern-string (for example '%t. %l, %f') or some of the constants PERSON_NAME_COMMON_CONVENTION (default), PERSON_NAME_WESTERN_ORDER, PERSON_NAME_EASTERN_ORDER, PERSON_NAME_LIBRARY_ORDER.
+ * @param integer $format (optional)	The person name format. It may be a pattern-string (for example '%t. %l, %f') or some of the constants PERSON_NAME_COMMON_CONVENTION (default), PERSON_NAME_WESTERN_ORDER, PERSON_NAME_EASTERN_ORDER, PERSON_NAME_LIBRARY_ORDER.
  * @param string $language (optional)	The language id. If it is omitted, the current interface language is assumed. This parameter has meaning with the format PERSON_NAME_COMMON_CONVENTION only.
  * @return bool							The result TRUE means that the order is first_name last_name, FALSE means last_name first_name.
  * Note: You may use this function for determing the order of the fields or columns "First name" and "Last name" in forms, tables and reports.
@@ -1184,8 +1186,8 @@ 
 
 /**
  * This function returns a string or an array with all occurrences of search in subject (ignoring case) replaced with the given replace value.
- * @param mixed $search					String or array of strings to be found.
- * @param mixed $replace				String or array of strings used for replacement.
+ * @param string $search					String or array of strings to be found.
+ * @param string $replace				String or array of strings used for replacement.
  * @param mixed $subject				String or array of strings being searched.
  * @param int $count (optional)			The number of matched and replaced needles will be returned in count, which is passed by reference.
  * @param string $encoding (optional)	The used internally by this function character encoding.
@@ -1248,10 +1250,10 @@ 
 /**
  * Finds first occurrence of a string within another, case insensitive.
  * @param string $haystack					The string from which to get the first occurrence.
- * @param mixed $needle						The string to be found.
+ * @param string $needle						The string to be found.
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return mixed							Returns the portion of $haystack, or FALSE if $needle is not found.
+ * @return false|string							Returns the portion of $haystack, or FALSE if $needle is not found.
  * Notes:
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence of $needle.
@@ -1307,7 +1309,7 @@ 
  * @param mixed $needle						The string which first character is to be found.
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return mixed							Returns the portion of $haystack, or FALSE if the first character from $needle is not found.
+ * @return false|string							Returns the portion of $haystack, or FALSE if the first character from $needle is not found.
  * Notes:
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence.
@@ -1374,7 +1376,7 @@ 
  * @param mixed $needle						The string to be found.
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return mixed							Returns the portion of $haystack, or FALSE if $needle is not found.
+ * @return false|string							Returns the portion of $haystack, or FALSE if $needle is not found.
  * Notes:
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence of $needle.
@@ -1555,8 +1557,8 @@ 
 
 /**
  * Performs a regular expression search and replace, UTF-8 aware when it is applicable.
- * @param string|array $pattern			The pattern to search for. It can be either a string or an array with strings.
- * @param string|array $replacement		The string or an array with strings to replace.
+ * @param string $pattern			The pattern to search for. It can be either a string or an array with strings.
+ * @param string $replacement		The string or an array with strings to replace.
  * @param string|array $subject			The string or an array with strings to search and replace.
  * @param int $limit					The maximum possible replacements for each pattern in each subject string. Defaults to -1 (no limit).
  * @param int &$count					If specified, this variable will be filled with the number of replacements done.
@@ -1808,6 +1810,7 @@ 
 /**
  * Checks a string for UTF-8 validity.
  *
+ * @param string $string
  */
 function api_is_valid_utf8(&$string)
 {
@@ -1950,7 +1953,7 @@ 
 /**
  * Replaces non-valid formats for person names with the default (English) format.
  * @param string $format	The input format to be verified.
- * @return bool				Returns the same format if is is valid, otherwise returns a valid English format.
+ * @return string				Returns the same format if is is valid, otherwise returns a valid English format.
  */
 function _api_validate_person_name_format($format) {
     if (empty($format) || stripos($format, '%f') === false || stripos($format, '%l') === false) {
@@ -2077,6 +2080,9 @@ 
 
 // This function checks whether the function _api_convert_encoding() (the php-
 // implementation) is able to convert from/to a given encoding.
+/**
+ * @param string $encoding
+ */
 function _api_convert_encoding_supports($encoding) {
     static $supports = array();
     if (!isset($supports[$encoding])) {

Spacing +8 added lines, -8 removed lines

@@ -94,7 +94,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)) {
@@ -643,10 +643,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');
     }
@@ -744,7 +744,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];
@@ -761,7 +761,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];
@@ -1694,7 +1694,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));

main/inc/lib/phpseclib/Crypt/Random.php

Indentation +3 added lines, -3 removed lines

@@ -167,9 +167,9 @@
             ini_set('session.use_cookies', $old_use_cookies);
             session_cache_limiter($old_session_cache_limiter);
         } else {
-           if (isset($_OLD_SESSION)) {
-               $_SESSION = $_OLD_SESSION;
-               unset($_OLD_SESSION);
+            if (isset($_OLD_SESSION)) {
+                $_SESSION = $_OLD_SESSION;
+                unset($_OLD_SESSION);
             } else {
                 unset($_SESSION);
             }

Spacing +10 added lines, -10 removed lines

@@ -145,12 +145,12 @@ 
         session_start();
 
         $v = $seed = $_SESSION['seed'] = pack('H*', sha1(
-            serialize($_SERVER) .
-            serialize($_POST) .
-            serialize($_GET) .
-            serialize($_COOKIE) .
-            serialize($GLOBALS) .
-            serialize($_SESSION) .
+            serialize($_SERVER).
+            serialize($_POST).
+            serialize($_GET).
+            serialize($_COOKIE).
+            serialize($GLOBALS).
+            serialize($_SESSION).
             serialize($_OLD_SESSION)
         ));
         if (!isset($_SESSION['count'])) {
@@ -183,8 +183,8 @@ 
         // http://tools.ietf.org/html/rfc4253#section-7.2
         //
         // see the is_string($crypto) part for an example of how to expand the keys
-        $key = pack('H*', sha1($seed . 'A'));
-        $iv = pack('H*', sha1($seed . 'C'));
+        $key = pack('H*', sha1($seed.'A'));
+        $iv = pack('H*', sha1($seed.'C'));
 
         // ciphers are used as per the nist.gov link below. also, see this link:
         //
@@ -231,7 +231,7 @@ 
             $i = pack('H*', sha1(microtime()));
             $r = pack('H*', sha1($i ^ $v));
             $v = pack('H*', sha1($r ^ $i));
-            $result.= $r;
+            $result .= $r;
         }
         return substr($result, 0, $length);
     }
@@ -243,7 +243,7 @@ 
         $i = $crypto->encrypt(microtime());
         $r = $crypto->encrypt($i ^ $v);
         $v = $crypto->encrypt($r ^ $i);
-        $result.= $r;
+        $result .= $r;
     }
     return substr($result, 0, $length);
 }

main/inc/lib/phpseclib/Crypt/AES.php

Spacing +18 added lines, -18 removed lines

@@ -177,7 +177,7 @@ 
      */
     function Crypt_AES($mode = CRYPT_AES_MODE_CBC)
     {
-        if ( !defined('CRYPT_AES_MODE') ) {
+        if (!defined('CRYPT_AES_MODE')) {
             switch (true) {
                 case extension_loaded('mcrypt') && in_array('rijndael-128', mcrypt_list_algorithms()):
                     define('CRYPT_AES_MODE', CRYPT_AES_MODE_MCRYPT);
@@ -187,7 +187,7 @@ 
             }
         }
 
-        switch ( CRYPT_AES_MODE ) {
+        switch (CRYPT_AES_MODE) {
             case CRYPT_AES_MODE_MCRYPT:
                 switch ($mode) {
                     case CRYPT_AES_MODE_ECB:
@@ -267,7 +267,7 @@ 
     function setIV($iv)
     {
         parent::setIV($iv);
-        if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT ) {
+        if (CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT) {
             $this->changed = true;
         }
     }
@@ -291,7 +291,7 @@ 
      */
     function encrypt($plaintext)
     {
-        if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT ) {
+        if (CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT) {
             $this->_mcryptSetup();
 
             // re: http://phpseclib.sourceforge.net/cfb-demo.phps
@@ -308,11 +308,11 @@ 
                     $max = 16 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
@@ -325,15 +325,15 @@ 
                             mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
                             $this->enbuffer['enmcrypt_init'] = false;
                         }
-                        $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 16));
+                        $ciphertext .= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 16));
                         $iv = substr($ciphertext, -16);
-                        $len%= 16;
+                        $len %= 16;
                     } else {
                         while ($len >= 16) {
                             $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, 16);
-                            $ciphertext.= $iv;
-                            $len-= 16;
-                            $i+= 16;
+                            $ciphertext .= $iv;
+                            $len -= 16;
+                            $i += 16;
                         }
                     }
                 }
@@ -342,7 +342,7 @@ 
                     $iv = mcrypt_generic($this->ecb, $iv);
                     $block = $iv ^ substr($plaintext, -$len);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
 
@@ -376,7 +376,7 @@ 
      */
     function decrypt($ciphertext)
     {
-        if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT ) {
+        if (CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT) {
             $this->_mcryptSetup();
 
             if ($this->mode == 'ncfb' && $this->continuousBuffer) {
@@ -390,11 +390,11 @@ 
                     $max = 16 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
@@ -403,13 +403,13 @@ 
                 }
                 if ($len >= 16) {
                     $cb = substr($ciphertext, $i, $len - $len % 16);
-                    $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
+                    $plaintext .= mcrypt_generic($this->ecb, $iv.$cb) ^ $cb;
                     $iv = substr($cb, -16);
-                    $len%= 16;
+                    $len %= 16;
                 }
                 if ($len) {
                     $iv = mcrypt_generic($this->ecb, $iv);
-                    $plaintext.= $iv ^ substr($ciphertext, -$len);
+                    $plaintext .= $iv ^ substr($ciphertext, -$len);
                     $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
                     $pos = $len;
                 }

Doc Comments +2 added lines

@@ -98,6 +98,7 @@ 
      * CRYPT_DES_MODE_ECB or CRYPT_DES_MODE_CBC.  If not explictly set, CRYPT_DES_MODE_CBC will be used.
      *
      * @param optional Integer $mode
+     * @param integer $mode
      * @return Crypt_TripleDES
      * @access public
      */
@@ -318,6 +319,7 @@ 
      *
      * @access public
      * @param String $plaintext
+     * @return string
      */
     function encrypt($plaintext)
     {

main/inc/lib/phpseclib/Crypt/Blowfish.php

Indentation +2 added lines, -2 removed lines

@@ -625,13 +625,13 @@
             $l^= $p[++$i];
             $r^= ($sb_0[$l >> 24 & 0xff]  +
                   $sb_1[$l >> 16 & 0xff]  ^
-                  $sb_2[$l >>  8 & 0xff]) +
+                    $sb_2[$l >>  8 & 0xff]) +
                   $sb_3[$l       & 0xff];
 
             $r^= $p[++$i];
             $l^= ($sb_0[$r >> 24 & 0xff]  +
                   $sb_1[$r >> 16 & 0xff]  ^
-                  $sb_2[$r >>  8 & 0xff]) +
+                    $sb_2[$r >>  8 & 0xff]) +
                   $sb_3[$r       & 0xff];
 
         }

Spacing +45 added lines, -45 removed lines

@@ -278,7 +278,7 @@ 
      * @access private
      * @var    array
      */
-    var $sbox0 = array (
+    var $sbox0 = array(
         0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
         0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
         0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
@@ -469,7 +469,7 @@ 
      */
     function Crypt_Blowfish($mode = CRYPT_BLOWFISH_MODE_CBC)
     {
-        if ( !defined('CRYPT_BLOWFISH_MODE') ) {
+        if (!defined('CRYPT_BLOWFISH_MODE')) {
             switch (true) {
                 case extension_loaded('mcrypt') && in_array('blowfish', mcrypt_list_algorithms()):
                     define('CRYPT_BLOWFISH_MODE', CRYPT_BLOWFISH_MODE_MCRYPT);
@@ -479,7 +479,7 @@ 
             }
         }
 
-        switch ( CRYPT_BLOWFISH_MODE ) {
+        switch (CRYPT_BLOWFISH_MODE) {
             case CRYPT_BLOWFISH_MODE_MCRYPT:
                 switch ($mode) {
                     case CRYPT_BLOWFISH_MODE_ECB:
@@ -590,13 +590,13 @@ 
         $datar = 0;
         for ($i = 0; $i < 18; $i += 2) {
             $this->_encryptBlock($datal, $datar);
-            $this->bctx['p'][$i    ] = $datal;
+            $this->bctx['p'][$i] = $datal;
             $this->bctx['p'][$i + 1] = $datar;
         }
         for ($i = 0; $i < 4; ++$i) {
             for ($j = 0; $j < 256; $j += 2) {
                 $this->_encryptBlock($datal, $datar);
-                $this->bctx['sb'][$i][$j    ] = $datal;
+                $this->bctx['sb'][$i][$j] = $datal;
                 $this->bctx['sb'][$i][$j + 1] = $datar;
             }
         }
@@ -622,17 +622,17 @@ 
 
         $i = -1;
         while ($i < 15) {
-            $l^= $p[++$i];
-            $r^= ($sb_0[$l >> 24 & 0xff]  +
-                  $sb_1[$l >> 16 & 0xff]  ^
-                  $sb_2[$l >>  8 & 0xff]) +
-                  $sb_3[$l       & 0xff];
-
-            $r^= $p[++$i];
-            $l^= ($sb_0[$r >> 24 & 0xff]  +
-                  $sb_1[$r >> 16 & 0xff]  ^
-                  $sb_2[$r >>  8 & 0xff]) +
-                  $sb_3[$r       & 0xff];
+            $l ^= $p[++$i];
+            $r ^= ($sb_0[$l >> 24 & 0xff] +
+                  $sb_1[$l >> 16 & 0xff] ^
+                  $sb_2[$l >> 8 & 0xff]) +
+                  $sb_3[$l & 0xff];
+
+            $r ^= $p[++$i];
+            $l ^= ($sb_0[$r >> 24 & 0xff] +
+                  $sb_1[$r >> 16 & 0xff] ^
+                  $sb_2[$r >> 8 & 0xff]) +
+                  $sb_3[$r & 0xff];
 
         }
         $Xr = $l ^ $p[16];
@@ -656,7 +656,7 @@ 
 
         switch ($method) {
             default: // 'pbkdf2'
-                list(, , $hash, $salt, $count) = func_get_args();
+                list(,, $hash, $salt, $count) = func_get_args();
                 if (!isset($hash)) {
                     $hash = 'sha1';
                 }
@@ -680,12 +680,12 @@ 
                     $hmac = new Crypt_Hash();
                     $hmac->setHash($hash);
                     $hmac->setKey($password);
-                    $f = $u = $hmac->hash($salt . pack('N', $i++));
+                    $f = $u = $hmac->hash($salt.pack('N', $i++));
                     for ($j = 2; $j <= $count; $j++) {
                         $u = $hmac->hash($u);
-                        $f^= $u;
+                        $f ^= $u;
                     }
-                    $key.= $f;
+                    $key .= $f;
                 }
         }
 
@@ -727,7 +727,7 @@ 
      */
     function encrypt($plaintext)
     {
-        if ( CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_MODE_MCRYPT ) {
+        if (CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_MODE_MCRYPT) {
             if ($this->paddable) {
                 $plaintext = $this->_pad($plaintext);
             }
@@ -753,11 +753,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
@@ -770,15 +770,15 @@ 
                             mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
                             $this->enbuffer['enmcrypt_init'] = false;
                         }
-                        $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
+                        $ciphertext .= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
                         $iv = substr($ciphertext, -8);
-                        $len%= 8;
+                        $len %= 8;
                     } else {
                         while ($len >= 8) {
                             $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, 8);
-                            $ciphertext.= $iv;
-                            $len-= 8;
-                            $i+= 8;
+                            $ciphertext .= $iv;
+                            $len -= 8;
+                            $i += 8;
                         }
                     }
                 }
@@ -786,7 +786,7 @@ 
                     $iv = mcrypt_generic($this->ecb, $iv);
                     $block = $iv ^ substr($plaintext, -$len);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 return $ciphertext;
@@ -818,7 +818,7 @@ 
      */
     function decrypt($ciphertext)
     {
-        if ( CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_MODE_MCRYPT ) {
+        if (CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_MODE_MCRYPT) {
             if ($this->paddable) {
                 // we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
                 // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
@@ -846,11 +846,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
@@ -858,13 +858,13 @@ 
                 }
                 if ($len >= 8) {
                     $cb = substr($ciphertext, $i, $len - $len % 8);
-                    $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
+                    $plaintext .= mcrypt_generic($this->ecb, $iv.$cb) ^ $cb;
                     $iv = substr($cb, -8);
-                    $len%= 8;
+                    $len %= 8;
                 }
                 if ($len) {
                     $iv = mcrypt_generic($this->ecb, $iv);
-                    $plaintext.= $iv ^ substr($ciphertext, -$len);
+                    $plaintext .= $iv ^ substr($ciphertext, -$len);
                     $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
                     $pos = $len;
                 }
@@ -1032,7 +1032,7 @@ 
     function _generate_xor(&$iv)
     {
         $xor = $iv;
-        for ($j = 4; $j <= 8; $j+=4) {
+        for ($j = 4; $j <= 8; $j += 4) {
             $temp = substr($iv, -$j, 4);
             switch ($temp) {
                 case "\xFF\xFF\xFF\xFF":
@@ -1058,7 +1058,7 @@ 
      */
     function inline_crypt_setup()
     {/*{{{*/
-        $lambda_functions =& Crypt_Blowfish::get_lambda_functions();
+        $lambda_functions = & Crypt_Blowfish::get_lambda_functions();
         $block_size = 8;
         $mode = $this->mode;
         $code_hash = "$mode";
@@ -1075,8 +1075,8 @@ 
                 $l = $in[1];
                 $r = $in[2];
             ';
-            for ($i = 0; $i < 16; $i+= 2) {
-                $_encryptBlock.= '
+            for ($i = 0; $i < 16; $i += 2) {
+                $_encryptBlock .= '
                     $l^= $p_'.($i).';
                     $r^= ($sb_0[$l >> 24 & 0xff]  +
                           $sb_1[$l >> 16 & 0xff]  ^
@@ -1090,7 +1090,7 @@ 
                           $sb_3[$r       & 0xff];
                 ';
             }
-            $_encryptBlock.= '
+            $_encryptBlock .= '
                 $in = pack("N*", $r ^ $p_17, $l ^ $p_16);
             ';
 
@@ -1101,8 +1101,8 @@ 
                 $r = $in[2];
             ';
 
-            for ($i = 17; $i > 2; $i-= 2) {
-                $_decryptBlock.= '
+            for ($i = 17; $i > 2; $i -= 2) {
+                $_decryptBlock .= '
                     $l^= $p_'.($i).';
                     $r^= ($sb_0[$l >> 24 & 0xff]  +
                           $sb_1[$l >> 16 & 0xff]  ^
@@ -1117,7 +1117,7 @@ 
                 ';
             }
 
-            $_decryptBlock.= '
+            $_decryptBlock .= '
                 $in = pack("N*", $r ^ $p_0, $l ^ $p_1);
             ';
 
@@ -1439,12 +1439,12 @@ 
                     break;
             }
             $fnc_head = '$action, &$self, $text';
-            $fnc_body = $init_cryptBlock . 'if ($action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }';
+            $fnc_body = $init_cryptBlock.'if ($action == "encrypt") { '.$encrypt.' } else { '.$decrypt.' }';
 
             if (function_exists('create_function') && is_callable('create_function')) {
                 $lambda_functions[$code_hash] = create_function($fnc_head, $fnc_body);
             } else {
-                eval('function ' . ($lambda_functions[$code_hash] = 'f' . md5(microtime())) . '(' . $fnc_head . ') { ' . $fnc_body . ' }');
+                eval('function '.($lambda_functions[$code_hash] = 'f'.md5(microtime())).'('.$fnc_head.') { '.$fnc_body.' }');
             }
         }
         $this->inline_crypt = $lambda_functions[$code_hash];

Braces +1 added lines, -2 removed lines

@@ -545,8 +545,7 @@
 
         if (!$keylength) {
             $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-        }
-        elseif ($keylength > 56) {
+        } elseif ($keylength > 56) {
             $key = substr($key, 0, 56);
         }
 

Doc Comments +3 added lines

@@ -563,6 +563,7 @@ 
      * If not explictly set, CRYPT_TWOFISH_MODE_CBC will be used.
      *
      * @param optional Integer $mode
+     * @param integer $mode
      * @access public
      */
     function Crypt_Twofish($mode = CRYPT_TWOFISH_MODE_CBC)
@@ -1072,6 +1073,7 @@ 
      *
      * @see Crypt_Twofish::_unpad()
      * @access private
+     * @param string $text
      */
     function _pad($text)
     {
@@ -1099,6 +1101,7 @@ 
      *
      * @see Crypt_Twofish::_pad()
      * @access private
+     * @param string $text
      */
     function _unpad($text)
     {

main/inc/lib/phpseclib/Crypt/RC4.php

Spacing +11 added lines, -11 removed lines

@@ -171,7 +171,7 @@ 
      */
     function Crypt_RC4()
     {
-        if ( !defined('CRYPT_RC4_MODE') ) {
+        if (!defined('CRYPT_RC4_MODE')) {
             switch (true) {
                 case extension_loaded('mcrypt') && (defined('MCRYPT_ARCFOUR') || defined('MCRYPT_RC4')) && in_array('arcfour', mcrypt_list_algorithms()):
                     define('CRYPT_RC4_MODE', CRYPT_RC4_MODE_MCRYPT);
@@ -181,7 +181,7 @@ 
             }
         }
 
-        switch ( CRYPT_RC4_MODE ) {
+        switch (CRYPT_RC4_MODE) {
             case CRYPT_RC4_MODE_MCRYPT:
                 switch (true) {
                     case defined('MCRYPT_ARCFOUR'):
@@ -209,7 +209,7 @@ 
     {
         $this->key = $key;
 
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
+        if (CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT) {
             mcrypt_generic_init($this->encryptStream, $this->key, '');
             mcrypt_generic_init($this->decryptStream, $this->key, '');
             return;
@@ -249,7 +249,7 @@ 
 
         switch ($method) {
             default: // 'pbkdf2'
-                list(, , $hash, $salt, $count) = func_get_args();
+                list(,, $hash, $salt, $count) = func_get_args();
                 if (!isset($hash)) {
                     $hash = 'sha1';
                 }
@@ -276,12 +276,12 @@ 
                     $hmac = new Crypt_Hash();
                     $hmac->setHash($hash);
                     $hmac->setKey($password);
-                    $f = $u = $hmac->hash($salt . pack('N', $i++));
+                    $f = $u = $hmac->hash($salt.pack('N', $i++));
                     for ($j = 2; $j <= $count; $j++) {
                         $u = $hmac->hash($u);
-                        $f^= $u;
+                        $f ^= $u;
                     }
-                    $key.= $f;
+                    $key .= $f;
                 }
         }
 
@@ -349,7 +349,7 @@ 
      */
     function _crypt($text, $mode)
     {
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
+        if (CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT) {
             $keyStream = $mode == CRYPT_RC4_ENCRYPT ? 'encryptStream' : 'decryptStream';
 
             if (!$this->continuousBuffer) {
@@ -381,7 +381,7 @@ 
             $keyStream[$i] = $keyStream[$j];
             $keyStream[$j] = $temp;
             $temp = $keyStream[($keyStream[$i] + $keyStream[$j]) & 255];
-            $newText.= chr(ord($text[$k]) ^ $temp);
+            $newText .= chr(ord($text[$k]) ^ $temp);
         }
 
         if ($this->continuousBuffer) {
@@ -438,7 +438,7 @@ 
      */
     function enableContinuousBuffer()
     {
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
+        if (CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT) {
             mcrypt_generic_init($this->encryptStream, $this->key, '');
             mcrypt_generic_init($this->decryptStream, $this->key, '');
         }
@@ -456,7 +456,7 @@ 
      */
     function disableContinuousBuffer()
     {
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_INTERNAL ) {
+        if (CRYPT_RC4_MODE == CRYPT_RC4_MODE_INTERNAL) {
             $this->encryptIndex = $this->decryptIndex = array(0, 0);
             $this->encryptStream = $this->decryptStream = false;
         }