chamilo / chamilo-lms

main/inc/lib/notebook.lib.php

Spacing +25 added lines, -25 removed lines

@@ -29,7 +29,7 @@ 
         return "<script>
 				function confirmation (name)
 				{
-					if (confirm(\" " . get_lang("NoteConfirmDelete") . " \"+ name + \" ?\"))
+					if (confirm(\" " . get_lang("NoteConfirmDelete")." \"+ name + \" ?\"))
 						{return true;}
 					else
 						{return false;}
@@ -107,7 +107,7 @@ 
                 description 		AS note_comment,
                 session_id			AS session_id
                FROM $t_notebook
-               WHERE c_id = $course_id AND notebook_id = '" . intval($notebook_id) . "' ";
+               WHERE c_id = $course_id AND notebook_id = '".intval($notebook_id)."' ";
         $result = Database::query($sql);
         if (Database::num_rows($result) != 1) {
             return array();
@@ -181,8 +181,8 @@ 
         $sql = "DELETE FROM $t_notebook
                 WHERE
                     c_id = $course_id AND
-                    notebook_id='" . intval($notebook_id) . "' AND
-                    user_id = '" . api_get_user_id() . "'";
+                    notebook_id='".intval($notebook_id)."' AND
+                    user_id = '" . api_get_user_id()."'";
         $result = Database::query($sql);
         $affected_rows = Database::affected_rows($result);
         if ($affected_rows != 1) {
@@ -220,22 +220,22 @@ 
         echo '<div class="actions">';
         if (!api_is_anonymous()) {
             if (api_get_session_id() == 0)
-                echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' .
-                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+                echo '<a href="index.php?'.api_get_cidreq().'&action=addnote">'.
+                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
             elseif (api_is_allowed_to_session_edit(false, true)) {
-                echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' .
-                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+                echo '<a href="index.php?'.api_get_cidreq().'&action=addnote">'.
+                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
             }
         } else {
-            echo '<a href="javascript:void(0)">' . Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+            echo '<a href="javascript:void(0)">'.Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
         }
 
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=creation_date&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32') . '</a>';
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=update_date&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32') . '</a>';
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=title&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32') . '</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=creation_date&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32').'</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=update_date&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32').'</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=title&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32').'</a>';
         echo '</div>';
 
         if (!isset($_SESSION['notebook_view']) || !in_array($_SESSION['notebook_view'], array('creation_date', 'update_date', 'title'))) {
@@ -246,9 +246,9 @@ 
         $t_notebook = Database :: get_course_table(TABLE_NOTEBOOK);
         $order_by = "";
         if ($_SESSION['notebook_view'] == 'creation_date' || $_SESSION['notebook_view'] == 'update_date') {
-            $order_by = " ORDER BY " . $_SESSION['notebook_view'] . " $sort_direction ";
+            $order_by = " ORDER BY ".$_SESSION['notebook_view']." $sort_direction ";
         } else {
-            $order_by = " ORDER BY " . $_SESSION['notebook_view'] . " $sort_direction ";
+            $order_by = " ORDER BY ".$_SESSION['notebook_view']." $sort_direction ";
         }
 
         //condition for the session
@@ -261,7 +261,7 @@ 
         $sql = "SELECT * FROM $t_notebook
                 WHERE
                     c_id = $course_id AND
-                    user_id = '" . api_get_user_id() . "'
+                    user_id = '".api_get_user_id()."'
                     $condition_session
                     $cond_extra $order_by
                 ";
@@ -274,18 +274,18 @@ 
 
             $updateValue = '';
             if ($row['update_date'] <> $row['creation_date']) {
-                $updateValue = ', ' . get_lang('UpdateDate') . ': ' . date_to_str_ago($update_date) . '&nbsp;&nbsp;<span class="dropbox_date">' . $update_date . '</span>';
+                $updateValue = ', '.get_lang('UpdateDate').': '.date_to_str_ago($update_date).'&nbsp;&nbsp;<span class="dropbox_date">'.$update_date.'</span>';
             }
 
-            $actions = '<a href="' . api_get_self() . '?action=editnote&notebook_id=' . $row['notebook_id'] . '">' .
-                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . '</a>';
-            $actions .= '<a href="' . api_get_self() . '?action=deletenote&notebook_id=' . $row['notebook_id'] . '" onclick="return confirmation(\'' . $row['title'] . '\');">' .
-                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) . '</a>';
+            $actions = '<a href="'.api_get_self().'?action=editnote&notebook_id='.$row['notebook_id'].'">'.
+                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+            $actions .= '<a href="'.api_get_self().'?action=deletenote&notebook_id='.$row['notebook_id'].'" onclick="return confirmation(\''.$row['title'].'\');">'.
+                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
 
             echo Display::panel(
                 $row['description'],
-                $row['title'] . $session_img.' <div class="pull-right">'.$actions.'</div>',
-                get_lang('CreationDate') . ': ' . date_to_str_ago($creation_date) . '&nbsp;&nbsp;<span class="dropbox_date">' . $creation_date . $updateValue."</span>"
+                $row['title'].$session_img.' <div class="pull-right">'.$actions.'</div>',
+                get_lang('CreationDate').': '.date_to_str_ago($creation_date).'&nbsp;&nbsp;<span class="dropbox_date">'.$creation_date.$updateValue."</span>"
             );
         }
     }

Braces +3 added lines, -3 removed lines

@@ -219,10 +219,10 @@
         // action links
         echo '<div class="actions">';
         if (!api_is_anonymous()) {
-            if (api_get_session_id() == 0)
-                echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' .
+            if (api_get_session_id() == 0) {
+                            echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' .
                     Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
-            elseif (api_is_allowed_to_session_edit(false, true)) {
+            } elseif (api_is_allowed_to_session_edit(false, true)) {
                 echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' .
                     Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
             }

main/inc/lib/legal.lib.php

Indentation +121 added lines, -121 removed lines

@@ -15,15 +15,15 @@ 
     {
     }
 
-	/**
-	 * Add a new Term and Condition
-	 * @param int $language language id
-	 * @param string $content content
-	 * @param int $type term and condition type (0 or 1)
-	 * @param string $changes explain changes
-	 * @return boolean success
-	 */
-	public static function add($language, $content, $type, $changes)
+    /**
+     * Add a new Term and Condition
+     * @param int $language language id
+     * @param string $content content
+     * @param int $type term and condition type (0 or 1)
+     * @param string $changes explain changes
+     * @return boolean success
+     */
+    public static function add($language, $content, $type, $changes)
     {
         $legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
         $last = self::get_last_condition($language);
@@ -60,62 +60,62 @@ 
         }
     }
 
-	public static function delete($id)
+    public static function delete($id)
     {
-		/*
+        /*
 		$legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$id = intval($id);
 		$sql = "DELETE FROM $legal_table WHERE legal_id = '".$id."'";
 		*/
-	}
-
-	/**
-	 * Gets the last version of a Term and condition by language
-	 * @param int $language language id
-	 * @return array all the info of a Term and condition
-	 */
-	public static function get_last_condition_version($language)
+    }
+
+    /**
+     * Gets the last version of a Term and condition by language
+     * @param int $language language id
+     * @return array all the info of a Term and condition
+     */
+    public static function get_last_condition_version($language)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
-		$sql = "SELECT version FROM $legal_conditions_table
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $language= Database::escape_string($language);
+        $sql = "SELECT version FROM $legal_conditions_table
 		        WHERE language_id = '".$language."'
 		        ORDER BY legal_id DESC LIMIT 1 ";
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
         if (Database::num_rows($result) > 0) {
 
-			return $row['version'];
-		} else {
+            return $row['version'];
+        } else {
 
-			return 0;
-		}
-	}
+            return 0;
+        }
+    }
 
-	/**
-	 * Gets the data of a Term and condition by language
-	 * @param int $language language id
-	 * @return array all the info of a Term and condition
-	 */
-	public static function get_last_condition ($language)
+    /**
+     * Gets the data of a Term and condition by language
+     * @param int $language language id
+     * @return array all the info of a Term and condition
+     */
+    public static function get_last_condition ($language)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
-		$sql = "SELECT * FROM $legal_conditions_table
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $language= Database::escape_string($language);
+        $sql = "SELECT * FROM $legal_conditions_table
                 WHERE language_id = '".$language."'
                 ORDER BY version DESC
                 LIMIT 1 ";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		return Database::fetch_array($result);
-	}
+        return Database::fetch_array($result);
+    }
 
-	/**
-	 * Gets the last version of a Term and condition by language
-	 * @param int $language language id
-	 * @return boolean | int the version or false if does not exist
-	 */
-	public static function get_last_version($language)
+    /**
+     * Gets the last version of a Term and condition by language
+     * @param int $language language id
+     * @return boolean | int the version or false if does not exist
+     */
+    public static function get_last_version($language)
     {
         $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
         $language = intval($language);
@@ -133,15 +133,15 @@ 
 
             return false;
         }
-	}
+    }
 
-	/**
-	 * Show the last condition
-	 * @param array with type and content i.e array('type'=>'1', 'content'=>'hola');
+    /**
+     * Show the last condition
+     * @param array with type and content i.e array('type'=>'1', 'content'=>'hola');
      *
-	 * @return string html preview
-	 */
-	public static function show_last_condition($term_preview)
+     * @return string html preview
+     */
+    public static function show_last_condition($term_preview)
     {
         $preview = '';
         switch ($term_preview['type']) {
@@ -167,80 +167,80 @@ 
             default:
                 break;
         }
-		return 	$preview;
-	}
-
-	/**
-	 * Get the terms and condition table (only for maintenance)
-	 * @param int offset
-	 * @param int number of items
-	 * @param int column
-	 * @return array
-	 */
-	public static function get_legal_data($from, $number_of_items, $column)
+        return 	$preview;
+    }
+
+    /**
+     * Get the terms and condition table (only for maintenance)
+     * @param int offset
+     * @param int number of items
+     * @param int column
+     * @return array
+     */
+    public static function get_legal_data($from, $number_of_items, $column)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
-		$from = intval($from);
-		$number_of_items = intval($number_of_items);
-		$column = intval($column);
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
+        $from = intval($from);
+        $number_of_items = intval($number_of_items);
+        $column = intval($column);
 
- 		$sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
+            $sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
 				FROM $legal_conditions_table inner join $lang_table l on(language_id = l.id) ";
-		$sql .= "ORDER BY language, version ASC ";
-		$sql .= "LIMIT $from, $number_of_items ";
-
-		$result = Database::query($sql);
-		$legals = array ();
-		$versions = array ();
-		while ($legal = Database::fetch_array($result)) {
-			// max 2000 chars
-			//echo strlen($legal[1]); echo '<br>';
-			$versions[]=$legal[0];
-			$languages[]=$legal[1];
-			if (strlen($legal[2])>2000)
-				$legal[2]= substr($legal[2],0,2000).' ... ';
-			if ($legal[4]==0)
-				$legal[4]= get_lang('HTMLText');
-			elseif($legal[4]==1)
-				$legal[4]=get_lang('PageLink');
-			$legals[] = $legal;
-		}
-		return $legals;
-	}
-
-	/**
-	 * Gets the number of terms and conditions available
-	 * @return int
-	 */
-	public static function count()
+        $sql .= "ORDER BY language, version ASC ";
+        $sql .= "LIMIT $from, $number_of_items ";
+
+        $result = Database::query($sql);
+        $legals = array ();
+        $versions = array ();
+        while ($legal = Database::fetch_array($result)) {
+            // max 2000 chars
+            //echo strlen($legal[1]); echo '<br>';
+            $versions[]=$legal[0];
+            $languages[]=$legal[1];
+            if (strlen($legal[2])>2000)
+                $legal[2]= substr($legal[2],0,2000).' ... ';
+            if ($legal[4]==0)
+                $legal[4]= get_lang('HTMLText');
+            elseif($legal[4]==1)
+                $legal[4]=get_lang('PageLink');
+            $legals[] = $legal;
+        }
+        return $legals;
+    }
+
+    /**
+     * Gets the number of terms and conditions available
+     * @return int
+     */
+    public static function count()
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$sql = "SELECT count(*) as count_result
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $sql = "SELECT count(*) as count_result
 		        FROM $legal_conditions_table
 		        ORDER BY legal_id DESC ";
-		$result = Database::query($sql);
-		$url = Database::fetch_array($result,'ASSOC');
-		$result = $url['count_result'];
-
-		return $result;
-	}
-
-	/**
-	 * Get type of terms and conditions
-	 * @param int The legal id
-	 * @param int The language id
-	 * @return int The current type of terms and conditions
-	 */
-	public static function get_type_of_terms_and_conditions($legal_id, $language_id)
+        $result = Database::query($sql);
+        $url = Database::fetch_array($result,'ASSOC');
+        $result = $url['count_result'];
+
+        return $result;
+    }
+
+    /**
+     * Get type of terms and conditions
+     * @param int The legal id
+     * @param int The language id
+     * @return int The current type of terms and conditions
+     */
+    public static function get_type_of_terms_and_conditions($legal_id, $language_id)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$legal_id = intval($legal_id);
-		$language_id = intval($language_id);
-		$sql = 'SELECT type FROM '.$legal_conditions_table.'
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $legal_id = intval($legal_id);
+        $language_id = intval($language_id);
+        $sql = 'SELECT type FROM '.$legal_conditions_table.'
 		        WHERE legal_id="'.$legal_id.'" AND language_id="'.$language_id.'"';
-		$rs = Database::query($sql);
+        $rs = Database::query($sql);
 
-		return Database::result($rs,0,'type');
-	}
+        return Database::result($rs,0,'type');
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -44,7 +44,7 @@ 
             Database::insert($legal_table, $params);
 
             return true;
-        } elseif($last['type'] != $type && $language==$last['language_id']) {
+        } elseif ($last['type'] != $type && $language == $last['language_id']) {
             //update
             $id = $last['legal_id'];
             $params = [
@@ -77,7 +77,7 @@ 
 	public static function get_last_condition_version($language)
     {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
+		$language = Database::escape_string($language);
 		$sql = "SELECT version FROM $legal_conditions_table
 		        WHERE language_id = '".$language."'
 		        ORDER BY legal_id DESC LIMIT 1 ";
@@ -97,10 +97,10 @@ 
 	 * @param int $language language id
 	 * @return array all the info of a Term and condition
 	 */
-	public static function get_last_condition ($language)
+	public static function get_last_condition($language)
     {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
+		$language = Database::escape_string($language);
 		$sql = "SELECT * FROM $legal_conditions_table
                 WHERE language_id = '".$language."'
                 ORDER BY version DESC
@@ -124,9 +124,9 @@ 
                 ORDER BY version DESC
                 LIMIT 1 ";
         $result = Database::query($sql);
-        if (Database::num_rows($result)>0){
+        if (Database::num_rows($result) > 0) {
             $version = Database::fetch_array($result);
-            $version = explode(':',$version[0]);
+            $version = explode(':', $version[0]);
 
             return $version[0];
         } else {
@@ -153,7 +153,7 @@ 
                 break;
                 // Page link
             case 1:
-                $preview ='<fieldset>
+                $preview = '<fieldset>
                              <legend>'.get_lang('TermsAndConditions').'</legend>';
                 $preview .= '<div id="legal-accept-wrapper" class="form-item">
                 <label class="option" for="legal-accept">
@@ -185,25 +185,25 @@ 
 		$number_of_items = intval($number_of_items);
 		$column = intval($column);
 
- 		$sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
+ 		$sql = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
 				FROM $legal_conditions_table inner join $lang_table l on(language_id = l.id) ";
 		$sql .= "ORDER BY language, version ASC ";
 		$sql .= "LIMIT $from, $number_of_items ";
 
 		$result = Database::query($sql);
-		$legals = array ();
-		$versions = array ();
+		$legals = array();
+		$versions = array();
 		while ($legal = Database::fetch_array($result)) {
 			// max 2000 chars
 			//echo strlen($legal[1]); echo '<br>';
-			$versions[]=$legal[0];
-			$languages[]=$legal[1];
-			if (strlen($legal[2])>2000)
-				$legal[2]= substr($legal[2],0,2000).' ... ';
-			if ($legal[4]==0)
-				$legal[4]= get_lang('HTMLText');
-			elseif($legal[4]==1)
-				$legal[4]=get_lang('PageLink');
+			$versions[] = $legal[0];
+			$languages[] = $legal[1];
+			if (strlen($legal[2]) > 2000)
+				$legal[2] = substr($legal[2], 0, 2000).' ... ';
+			if ($legal[4] == 0)
+				$legal[4] = get_lang('HTMLText');
+			elseif ($legal[4] == 1)
+				$legal[4] = get_lang('PageLink');
 			$legals[] = $legal;
 		}
 		return $legals;
@@ -220,7 +220,7 @@ 
 		        FROM $legal_conditions_table
 		        ORDER BY legal_id DESC ";
 		$result = Database::query($sql);
-		$url = Database::fetch_array($result,'ASSOC');
+		$url = Database::fetch_array($result, 'ASSOC');
 		$result = $url['count_result'];
 
 		return $result;
@@ -241,6 +241,6 @@ 
 		        WHERE legal_id="'.$legal_id.'" AND language_id="'.$language_id.'"';
 		$rs = Database::query($sql);
 
-		return Database::result($rs,0,'type');
+		return Database::result($rs, 0, 'type');
 	}
 }

Braces +8 added lines, -6 removed lines

@@ -198,12 +198,14 @@
 			//echo strlen($legal[1]); echo '<br>';
 			$versions[]=$legal[0];
 			$languages[]=$legal[1];
-			if (strlen($legal[2])>2000)
-				$legal[2]= substr($legal[2],0,2000).' ... ';
-			if ($legal[4]==0)
-				$legal[4]= get_lang('HTMLText');
-			elseif($legal[4]==1)
-				$legal[4]=get_lang('PageLink');
+			if (strlen($legal[2])>2000) {
+							$legal[2]= substr($legal[2],0,2000).' ... ';
+			}
+			if ($legal[4]==0) {
+							$legal[4]= get_lang('HTMLText');
+			} elseif($legal[4]==1) {
+							$legal[4]=get_lang('PageLink');
+			}
 			$legals[] = $legal;
 		}
 		return $legals;

main/inc/lib/message.lib.php

Indentation +1 added lines, -1 removed lines

@@ -1532,7 +1532,7 @@
 
         if (isset($_REQUEST['action'])) {
             switch ($_REQUEST['action']) {
-                 case 'mark_as_unread' :
+                    case 'mark_as_unread' :
                     $number_of_selected_messages = count($_POST['id']);
                     if (is_array($_POST['id'])) {
                         foreach ($_POST['id'] as $index => $message_id) {

Braces +24 added lines, -16 removed lines

@@ -131,8 +131,9 @@ 
             $direction = 'DESC';
         } else {
             $column = intval($column);
-            if (!in_array($direction, array('ASC', 'DESC')))
-                $direction = 'ASC';
+            if (!in_array($direction, array('ASC', 'DESC'))) {
+                            $direction = 'ASC';
+            }
         }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
 
@@ -488,8 +489,9 @@ 
     public static function delete_message_by_user_receiver($user_receiver_id, $id)
     {
         $table_message = Database::get_main_table(TABLE_MESSAGE);
-        if ($id != strval(intval($id)))
-            return false;
+        if ($id != strval(intval($id))) {
+                    return false;
+        }
         $user_receiver_id = intval($user_receiver_id);
         $id = intval($id);
         $sql = "SELECT * FROM $table_message
@@ -664,8 +666,9 @@ 
      */
     public static function update_message($user_id, $message_id)
     {
-        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id)))
-            return false;
+        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) {
+                    return false;
+        }
 
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $sql = "UPDATE $table_message SET msg_status = '0'
@@ -705,8 +708,9 @@ 
      */
     public static function get_message_by_user($user_id, $message_id)
     {
-        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id)))
-            return false;
+        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) {
+                    return false;
+        }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $query = "SELECT * FROM $table_message
                   WHERE user_receiver_id=".intval($user_id)." AND id='".intval($message_id)."'";
@@ -721,8 +725,9 @@ 
      */
     public static function get_messages_by_group($group_id)
     {
-        if ($group_id != strval(intval($group_id)))
-            return false;
+        if ($group_id != strval(intval($group_id))) {
+                    return false;
+        }
 
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $group_id = intval($group_id);
@@ -749,8 +754,9 @@ 
      */
     public static function get_messages_by_group_by_message($group_id, $message_id)
     {
-        if ($group_id != strval(intval($group_id)))
-            return false;
+        if ($group_id != strval(intval($group_id))) {
+                    return false;
+        }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $group_id = intval($group_id);
         $sql = "SELECT * FROM $table_message
@@ -828,8 +834,9 @@ 
      */
     public static function exist_message($user_id, $id)
     {
-        if ($id != strval(intval($id)) || $user_id != strval(intval($user_id)))
-            return false;
+        if ($id != strval(intval($id)) || $user_id != strval(intval($user_id))) {
+                    return false;
+        }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $query = "SELECT id FROM $table_message
                   WHERE
@@ -860,8 +867,9 @@ 
             $direction = 'DESC';
         } else {
             $column = intval($column);
-            if (!in_array($direction, array('ASC', 'DESC')))
-                $direction = 'ASC';
+            if (!in_array($direction, array('ASC', 'DESC'))) {
+                            $direction = 'ASC';
+            }
         }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $request = api_is_xml_http_request();

Spacing +20 added lines, -20 removed lines

@@ -682,7 +682,7 @@ 
      * @param string $type
      * @return bool
      */
-    public static function update_message_status($user_id, $message_id,$type)
+    public static function update_message_status($user_id, $message_id, $type)
     {
         $type = intval($type);
         if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) {
@@ -996,7 +996,7 @@ 
 
         $receiverUserInfo = api_get_user_info($row['user_receiver_id']);
 
-        $message_content .='<tr>';
+        $message_content .= '<tr>';
         if (api_get_setting('allow_social_tool') == 'true') {
             if ($source == 'outbox') {
                 $message_content .= get_lang('From').': <a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> '.
@@ -1012,7 +1012,7 @@ 
                 $message_content .= get_lang('From').':&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.get_lang('Me').'</b>';
             }
         }
-        $message_content .=' '.get_lang('Date').':  '.api_get_local_time($row['send_date']).'
+        $message_content .= ' '.get_lang('Date').':  '.api_get_local_time($row['send_date']).'
 		        <br />
 		        <hr style="color:#ddd" />
 		        <table height="209px" width="100%">
@@ -1038,7 +1038,7 @@ 
         $message_content .= '<a href="inbox.php?action=deleteone&id='.$message_id.'&'.$social_link.'" >'.
             Display::return_icon('delete.png', get_lang('DeleteMessage')).'</a>&nbsp';
 
-        $message_content .='</div></td>
+        $message_content .= '</div></td>
 		      <td width=10></td>
 		    </tr>
 		</table>';
@@ -1115,7 +1115,7 @@ 
 
                 $items = $topic['count'];
                 $reply_label = ($items == 1) ? get_lang('GroupReply') : get_lang('GroupReplies');
-                $label =  Display::label($items.' '.$reply_label);
+                $label = Display::label($items.' '.$reply_label);
                 $topic['title'] = trim($topic['title']);
 
                 if (empty($topic['title'])) {
@@ -1225,7 +1225,7 @@ 
         $name = $user_sender_info['complete_name'];
 
         $topic_page_nr = isset($_GET['topics_page_nr']) ? intval($_GET['topics_page_nr']) : null;
-        $links.= '<div id="message-reply-link">';
+        $links .= '<div id="message-reply-link">';
         if (($my_group_role == GROUP_USER_PERMISSION_ADMIN ||
             $my_group_role == GROUP_USER_PERMISSION_MODERATOR) ||
             $main_message['user_sender_id'] == $current_user_id
@@ -1237,7 +1237,7 @@ 
                 'group_id' => $group_id,
                 'message_id' => $main_message['id'],
                 'action' => 'edit_message_group',
-                'anchor_topic' => 'topic_' . $main_message['id'],
+                'anchor_topic' => 'topic_'.$main_message['id'],
                 'topics_page_nr' => $topic_page_nr,
                 'items_page_nr' => $items_page_nr,
                 'topic_id' => $main_message['id']
@@ -1267,7 +1267,7 @@ 
             'group_id' => $group_id,
             'message_id' => $main_message['id'],
             'action' => 'reply_message_group',
-            'anchor_topic' => 'topic_' . $main_message['id'],
+            'anchor_topic' => 'topic_'.$main_message['id'],
             'topics_page_nr' => $topic_page_nr,
             'topic_id' => $main_message['id']
         ]);
@@ -1283,10 +1283,10 @@ 
             ]
         );
 
-        $links.= '</div>';
+        $links .= '</div>';
 
         $userPicture = $user_sender_info['avatar'];
-        $main_content.= '<div class="message-group-author">
+        $main_content .= '<div class="message-group-author">
                          <img src="'.$userPicture.'" alt="'.$name.'"  width="32" height="32" title="'.$name.'" /></div>';
         $user_link = '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$main_message['user_sender_id'].'">'.$name.'&nbsp;</a>';
 
@@ -1299,7 +1299,7 @@ 
             $date = '<div class="message-group-date"> '.get_lang('Created').' '.date_to_str_ago($main_message['send_date']).'</div>';
         }
         $attachment = '<div class="message-attach">'.(!empty($files_attachments) ? implode('<br />', $files_attachments) : '').'</div>';
-        $main_content.= '<div class="message-group-content">'.$links.$user_link.' '.$date.$main_message['content'].$attachment.'</div>';
+        $main_content .= '<div class="message-group-content">'.$links.$user_link.' '.$date.$main_message['content'].$attachment.'</div>';
         $main_content = Security::remove_XSS($main_content, STUDENT, true);
 
         $html .= Display::div(Display::div(Display::div($main_content, array('class' => 'group_social_sub_item', 'style' => 'background-color:#fff;')), array('class' => 'group_social_item')), array('class' => 'group_social_grid'));
@@ -1320,18 +1320,18 @@ 
                 $files_attachments = self::get_links_message_attachment_files($topic['id']);
                 $name = $user_sender_info['complete_name'];
 
-                $links.= '<div id="message-reply-link">';
+                $links .= '<div id="message-reply-link">';
                 if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
-                    $links.= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Edit').'" title="'.get_lang('Edit').'">'.
+                    $links .= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Edit').'" title="'.get_lang('Edit').'">'.
                         Display :: return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
                 }
-                $links.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Reply').'" title="'.get_lang('Reply').'">';
-                $links.= Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
-                $links.= '</div>';
+                $links .= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Reply').'" title="'.get_lang('Reply').'">';
+                $links .= Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
+                $links .= '</div>';
 
                 $userPicture = $user_sender_info['avatar'];
 
-                $html_items.= '<div class="message-group-author"><img src="'.$userPicture.'" alt="'.$name.'"  width="32" height="32" title="'.$name.'" /></div>';
+                $html_items .= '<div class="message-group-author"><img src="'.$userPicture.'" alt="'.$name.'"  width="32" height="32" title="'.$name.'" /></div>';
                 $user_link = '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$topic['user_sender_id'].'">'.$name.'&nbsp;</a>';
 
                 $date = '';
@@ -1343,7 +1343,7 @@ 
                     $date = '<div class="message-group-date"> '.get_lang('Created').' '.date_to_str_ago($topic['send_date']).'</div>';
                 }
                 $attachment = '<div class="message-attach">'.(!empty($files_attachments) ? implode('<br />', $files_attachments) : '').'</div>';
-                $html_items.= '<div class="message-group-content">'.$links.$user_link.' '.$date.Security::remove_XSS($topic['content'], STUDENT, true).$attachment.'</div>';
+                $html_items .= '<div class="message-group-content">'.$links.$user_link.' '.$date.Security::remove_XSS($topic['content'], STUDENT, true).$attachment.'</div>';
 
                 $base_padding = 20;
 
@@ -1618,7 +1618,7 @@ 
                     break;
                 case 'deleteone' :
                     MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_GET['id']);
-                    $html .=Display::return_message(api_xml_http_response_encode($success), 'normal', false);
+                    $html .= Display::return_message(api_xml_http_response_encode($success), 'normal', false);
                     $html .= '<br/>';
                     break;
             }
@@ -1710,7 +1710,7 @@ 
                 ON m.user_sender_id = u.user_id
                 WHERE
                     m.user_receiver_id = $userId AND
-                    m.msg_status = " . MESSAGE_STATUS_UNREAD . "
+                    m.msg_status = ".MESSAGE_STATUS_UNREAD."
                     AND m.id > $lastId
                 ORDER BY m.send_date DESC";
 

Doc Comments +7 added lines, -5 removed lines

@@ -639,6 +639,8 @@ 
      * @param  int	message id
      * @param  int	message user id (receiver user id or sender user id)
      * @param  int	group id (optional)
+     * @param integer $message_id
+     * @param integer $message_uid
      * @return void
      */
     public static function delete_message_attachment_file($message_id, $message_uid, $group_id = 0)
@@ -683,7 +685,7 @@ 
      * update messages by user id and message id
      * @param  int		$user_id
      * @param  int		$message_id
-     * @return resource
+     * @return false|null
      */
     public static function update_message($user_id, $message_id)
     {
@@ -703,7 +705,7 @@ 
      * @param int $user_id
      * @param int $message_id
      * @param string $type
-     * @return bool
+     * @return false|null
      */
     public static function update_message_status($user_id, $message_id,$type)
     {
@@ -740,6 +742,7 @@ 
     /**
      * get messages by group id
      * @param  int		group id
+     * @param integer $group_id
      * @return array
      */
     public static function get_messages_by_group($group_id)
@@ -1477,7 +1480,7 @@ 
      * Sort date by desc from a multi-dimensional array
      * @param array $array1  first array to compare
      * @param array $array2  second array to compare
-     * @return bool
+     * @return integer
      */
     public function order_desc_date($array1, $array2)
     {
@@ -1555,7 +1558,6 @@ 
     /**
      * @param $id
      * @param array $params
-     * @param string $display
      * @return string
      */
     public static function generate_invitation_form($id, $params = array())
@@ -1644,7 +1646,7 @@ 
 
     /**
      * @param string $keyword
-     * @return null|string
+     * @return string
      */
     public static function outbox_display($keyword = '')
     {

main/inc/lib/search/xapian/XapianQuery.php

Spacing +5 added lines, -5 removed lines

@@ -8,11 +8,11 @@ 
  * Code
  */
 require_once 'xapian.php';
-require_once dirname(__FILE__) . '/../IndexableChunk.class.php';
+require_once dirname(__FILE__).'/../IndexableChunk.class.php';
 //TODO: think another way without including specific fields here
-require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
-define('XAPIAN_DB', api_get_path(SYS_UPLOAD_PATH) . 'plugins/xapian/searchdb/');
+define('XAPIAN_DB', api_get_path(SYS_UPLOAD_PATH).'plugins/xapian/searchdb/');
 
 /**
  * Queries the database.
@@ -95,7 +95,7 @@ 
 
                 // process each specific field prefix
                 foreach ($specific_fields as $specific_field) {
-                    $results[$count]['sf-' . $specific_field['code']] = xapian_get_doc_terms($document, $specific_field['code']);
+                    $results[$count]['sf-'.$specific_field['code']] = xapian_get_doc_terms($document, $specific_field['code']);
                 }
 
                 // rest of data
@@ -261,6 +261,6 @@ 
     } else {
         $message_error = get_lang('SearchOtherXapianError');
     }
-    $display_message = get_lang('Error') . ' : ' . $message_error;
+    $display_message = get_lang('Error').' : '.$message_error;
     Display::display_error_message($display_message);
 }

main/inc/lib/search/get_terms.php

Spacing +6 added lines, -6 removed lines

@@ -17,8 +17,8 @@ 
     return;
 }
 
-require_once dirname(__FILE__) . '../../../global.inc.php';
-require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloQuery.php';
+require_once dirname(__FILE__).'../../../global.inc.php';
+require_once api_get_path(LIBRARY_PATH).'search/ChamiloQuery.php';
 
 /**
  * search with filter and build base array avoding repeated terms
@@ -33,7 +33,7 @@ 
     if (is_array($dkterms) && is_array($dkterms[1])) {
         foreach ($specific_fields as $specific_field) {
             foreach ($dkterms[1] as $obj) {
-                foreach ($obj['sf-' . $specific_field['code']] as $raw_term) {
+                foreach ($obj['sf-'.$specific_field['code']] as $raw_term) {
                     if (count($raw_term['name']) > 1) {
                         $normal_term = substr($raw_term['name'], 1);
                         $sf_terms[$specific_field['code']][$normal_term] = $normal_term;
@@ -54,10 +54,10 @@ 
 
 if (($cid = api_get_course_id()) != -1) { // with cid
     // course filter
-    $filter[] = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID . $cid);
+    $filter[] = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID.$cid);
     // term filter
     if ($term != '__all__') {
-        $filter[] = chamilo_get_boolean_query($prefix . $term);
+        $filter[] = chamilo_get_boolean_query($prefix.$term);
         // always and between term and courseid
         $filter = chamilo_join_queries($filter, null, 'and');
     }
@@ -65,7 +65,7 @@ 
     $sf_terms = get_usual_sf_terms($filter, $specific_fields);
 } else { // without cid
     if ($term != '__all__') {
-        $filter[] = chamilo_get_boolean_query($prefix . $term);
+        $filter[] = chamilo_get_boolean_query($prefix.$term);
 
         $sf_terms = get_usual_sf_terms($filter, $specific_fields);
     } else { // no cid and all/any terms

main/inc/lib/search/tool_processors/learnpath_processor.class.php

Spacing +7 added lines, -7 removed lines

@@ -8,9 +8,9 @@ 
 /**
  * Code
  */
-include_once dirname(__FILE__) . '/../../../global.inc.php';
-require_once dirname(__FILE__) . '/search_processor.class.php';
-require_once dirname(__FILE__) . '/../IndexableChunk.class.php';
+include_once dirname(__FILE__).'/../../../global.inc.php';
+require_once dirname(__FILE__).'/search_processor.class.php';
+require_once dirname(__FILE__).'/../IndexableChunk.class.php';
 
 /**
  * Process learning paths before pass it to search listing scripts
@@ -52,7 +52,7 @@ 
                     $visibility = api_get_item_visibility(api_get_course_info($courseid), TOOL_LEARNPATH, $lp_id);
                     if ($visibility) {
                         list($thumbnail, $image, $name, $author) = $this->get_information($courseid, $lp_id, $lp['has_document_id']);
-                        $url = api_get_path(WEB_PATH) . 'main/newscorm/lp_controller.php?cidReq=%s&action=view&lp_id=%s';
+                        $url = api_get_path(WEB_PATH).'main/newscorm/lp_controller.php?cidReq=%s&action=view&lp_id=%s';
                         $url = sprintf($url, $courseid, $lp_id);
                         $result = array(
                             'toolid' => TOOL_LEARNPATH,
@@ -128,16 +128,16 @@ 
             $name = '';
             if ($row = Database::fetch_array($dk_result)) {
                 // Get the image path
-                $img_location = api_get_path(WEB_COURSE_PATH) . $course_path . "/document/";
+                $img_location = api_get_path(WEB_COURSE_PATH).$course_path."/document/";
                 $thumbnail_path = str_replace('.png.html', '_thumb.png', $row['path']);
                 $big_img_path = str_replace('.png.html', '.png', $row['path']);
                 $thumbnail = '';
                 if (!empty($thumbnail_path)) {
-                    $thumbnail = $img_location . $thumbnail_path;
+                    $thumbnail = $img_location.$thumbnail_path;
                 }
                 $image = '';
                 if (!empty($big_img_path)) {
-                    $image = $img_location . $big_img_path;
+                    $image = $img_location.$big_img_path;
                 }
                 $name = $row['name'];
             }

main/inc/lib/baker.lib.php

Indentation +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
                 $data = substr($png,$ipos,$chunk['size']);
                 $sections = explode("\0", $data);
                 if ($sections[0] == $key) {
-                   return $sections;
+                    return $sections;
                 }
             }
             // Extract the data and the CRC

Spacing +18 added lines, -18 removed lines

@@ -51,7 +51,7 @@ 
             foreach (array_keys($this->_chunks[$type]) as $typekey) {
                 list($key, $data) = explode("\0", $this->_chunks[$type][$typekey]);
                 if (strcmp($key, $check) == 0) {
-                    echo 'Key "' . $check . '" already exists in "' . $type . '" chunk.';
+                    echo 'Key "'.$check.'" already exists in "'.$type.'" chunk.';
                     return false;
                 }
             }
@@ -70,11 +70,11 @@ 
      */
     public function addChunk($chunkType, $key, $value) {
         
-        $chunkData = $key . "\0" . $value;
-        $crc = pack("N", crc32($chunkType . $chunkData));
+        $chunkData = $key."\0".$value;
+        $crc = pack("N", crc32($chunkType.$chunkData));
         $len = pack("N", strlen($chunkData));
         
-        $newChunk = $len . $chunkType . $chunkData . $crc;
+        $newChunk = $len.$chunkType.$chunkData.$crc;
         $result = substr($this->_contents, 0, $this->_size - 12)
                 . $newChunk
                 . substr($this->_contents, $this->_size - 12, 12);
@@ -92,30 +92,30 @@ 
      */
     public function removeChunks($chunkType, $key, $png) {
         // Read the magic bytes and verify
-        $retval = substr($png,0,8);
+        $retval = substr($png, 0, 8);
         $ipos = 8;
         if ($retval != "\x89PNG\x0d\x0a\x1a\x0a")
             throw new Exception('Is not a valid PNG image');
         // Loop through the chunks. Byte 0-3 is length, Byte 4-7 is type
-        $chunkHeader = substr($png,$ipos,8);
+        $chunkHeader = substr($png, $ipos, 8);
         $ipos = $ipos + 8;
         while ($chunkHeader) {
             // Extract length and type from binary data
             $chunk = @unpack('Nsize/a4type', $chunkHeader);
             $skip = false;
-            if ( $chunk['type'] == $chunkType ) {
-                $data = substr($png,$ipos,$chunk['size']);
+            if ($chunk['type'] == $chunkType) {
+                $data = substr($png, $ipos, $chunk['size']);
                 $sections = explode("\0", $data);
                 print_r($sections);
-                if ( $sections[0] == $key ) $skip = true;
+                if ($sections[0] == $key) $skip = true;
             }
             // Extract the data and the CRC
-            $data = substr($png,$ipos,$chunk['size']+4);
+            $data = substr($png, $ipos, $chunk['size'] + 4);
             $ipos = $ipos + $chunk['size'] + 4;
             // Add in the header, data, and CRC
-            if ( ! $skip ) $retval = $retval . $chunkHeader . $data;
+            if (!$skip) $retval = $retval.$chunkHeader.$data;
             // Read next chunk header
-            $chunkHeader = substr($png,$ipos,8);
+            $chunkHeader = substr($png, $ipos, 8);
             $ipos = $ipos + 8;
         }
         return $retval;
@@ -131,34 +131,34 @@ 
      * If there is PNG information that matches the key an array is returned
      * 
      */
-    public function extractBadgeInfo($png, $key='openbadges') {
+    public function extractBadgeInfo($png, $key = 'openbadges') {
         // Read the magic bytes and verify
-        $retval = substr($png,0,8);
+        $retval = substr($png, 0, 8);
         $ipos = 8;
         if ($retval != "\x89PNG\x0d\x0a\x1a\x0a") {
             return false;
         }
 
         // Loop through the chunks. Byte 0-3 is length, Byte 4-7 is type
-        $chunkHeader = substr($png,$ipos,8);
+        $chunkHeader = substr($png, $ipos, 8);
         $ipos = $ipos + 8;
         while ($chunkHeader) {
             // Extract length and type from binary data
             $chunk = @unpack('Nsize/a4type', $chunkHeader);
             $skip = false;
             if ($chunk['type'] == 'tEXt') {
-                $data = substr($png,$ipos,$chunk['size']);
+                $data = substr($png, $ipos, $chunk['size']);
                 $sections = explode("\0", $data);
                 if ($sections[0] == $key) {
                    return $sections;
                 }
             }
             // Extract the data and the CRC
-            $data = substr($png,$ipos,$chunk['size']+4);
+            $data = substr($png, $ipos, $chunk['size'] + 4);
             $ipos = $ipos + $chunk['size'] + 4;
 
             // Read next chunk header
-            $chunkHeader = substr($png,$ipos,8);
+            $chunkHeader = substr($png, $ipos, 8);
             $ipos = $ipos + 8;
         }
     }

Braces +9 added lines, -4 removed lines

@@ -94,8 +94,9 @@ 
         // Read the magic bytes and verify
         $retval = substr($png,0,8);
         $ipos = 8;
-        if ($retval != "\x89PNG\x0d\x0a\x1a\x0a")
-            throw new Exception('Is not a valid PNG image');
+        if ($retval != "\x89PNG\x0d\x0a\x1a\x0a") {
+                    throw new Exception('Is not a valid PNG image');
+        }
         // Loop through the chunks. Byte 0-3 is length, Byte 4-7 is type
         $chunkHeader = substr($png,$ipos,8);
         $ipos = $ipos + 8;
@@ -107,13 +108,17 @@ 
                 $data = substr($png,$ipos,$chunk['size']);
                 $sections = explode("\0", $data);
                 print_r($sections);
-                if ( $sections[0] == $key ) $skip = true;
+                if ( $sections[0] == $key ) {
+                    $skip = true;
+                }
             }
             // Extract the data and the CRC
             $data = substr($png,$ipos,$chunk['size']+4);
             $ipos = $ipos + $chunk['size'] + 4;
             // Add in the header, data, and CRC
-            if ( ! $skip ) $retval = $retval . $chunkHeader . $data;
+            if ( ! $skip ) {
+                $retval = $retval . $chunkHeader . $data;
+            }
             // Read next chunk header
             $chunkHeader = substr($png,$ipos,8);
             $ipos = $ipos + 8;

main/inc/lib/formvalidator/Element/receivers.php

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
 	 */
 	function _createElements()
 	{
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
+		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
 		$this->_elements[0]->setChecked(true);
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
+		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
 		$this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
 		$this->_elements[2]->setSelected($this->receivers_selected);
 	}

Indentation +66 added lines, -66 removed lines

@@ -10,65 +10,65 @@ 
  */
 class HTML_QuickForm_receivers extends HTML_QuickForm_group
 {
-	/**
-	 * Array of all receivers
-	 */
-	var $receivers;
-	/**
-	 * Array of selected receivers
-	 */
-	var $receivers_selected;
-	/**
-	 * Constructor
-	 * @param string $elementName
-	 * @param string $elementLabel
-	 * @param array $attributes This should contain the keys 'receivers' and
-	 * 'receivers_selected'
-	 */
-	public function __construct($elementName = null, $elementLabel = null, $attributes = null)
-	{
-		$this->receivers = $attributes['receivers'];
-		$this->receivers_selected = $attributes['receivers_selected'];
-		unset($attributes['receivers']);
-		unset($attributes['receivers_selected']);
-		parent::__construct($elementName, $elementLabel, $attributes);
-		$this->_persistantFreeze = true;
-		$this->_appendName = true;
-		$this->_type = 'receivers';
-	}
-	/**
-	 * Create the form elements to build this element group
-	 */
-	function _createElements()
-	{
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
-		$this->_elements[0]->setChecked(true);
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
-		$this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
-		$this->_elements[2]->setSelected($this->receivers_selected);
-	}
-	/**
-	 * HTML representation
-	 */
-	public function toHtml()
-	{
-		include_once ('HTML/QuickForm/Renderer/Default.php');
-		$this->_separator = '<br/>';
-		$renderer = & new HTML_QuickForm_Renderer_Default();
-		$renderer->setElementTemplate('{element}');
-		$select_boxes = $this->_elements[2];
-		$select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
-		parent :: accept($renderer);
-		$js = $this->getElementJS();
-		return $renderer->toHtml().$js;
-	}
+    /**
+     * Array of all receivers
+     */
+    var $receivers;
+    /**
+     * Array of selected receivers
+     */
+    var $receivers_selected;
+    /**
+     * Constructor
+     * @param string $elementName
+     * @param string $elementLabel
+     * @param array $attributes This should contain the keys 'receivers' and
+     * 'receivers_selected'
+     */
+    public function __construct($elementName = null, $elementLabel = null, $attributes = null)
+    {
+        $this->receivers = $attributes['receivers'];
+        $this->receivers_selected = $attributes['receivers_selected'];
+        unset($attributes['receivers']);
+        unset($attributes['receivers_selected']);
+        parent::__construct($elementName, $elementLabel, $attributes);
+        $this->_persistantFreeze = true;
+        $this->_appendName = true;
+        $this->_type = 'receivers';
+    }
+    /**
+     * Create the form elements to build this element group
+     */
+    function _createElements()
+    {
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
+        $this->_elements[0]->setChecked(true);
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
+        $this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
+        $this->_elements[2]->setSelected($this->receivers_selected);
+    }
+    /**
+     * HTML representation
+     */
+    public function toHtml()
+    {
+        include_once ('HTML/QuickForm/Renderer/Default.php');
+        $this->_separator = '<br/>';
+        $renderer = & new HTML_QuickForm_Renderer_Default();
+        $renderer->setElementTemplate('{element}');
+        $select_boxes = $this->_elements[2];
+        $select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
+        parent :: accept($renderer);
+        $js = $this->getElementJS();
+        return $renderer->toHtml().$js;
+    }
 
-	/**
-	 * Get the necessary javascript
-	 */
+    /**
+     * Get the necessary javascript
+     */
     public function getElementJS()
-	{
-		$js = "<script type=\"text/javascript\">
+    {
+        $js = "<script type=\"text/javascript\">
 					/* <![CDATA[ */
 					receivers_hide('receivers_to');
 					function receivers_show(item) {
@@ -81,14 +81,14 @@ 
 					}
 					/* ]]> */
 					</script>\n";
-		return $js;
-	}
-	/**
-	 * accept renderer
-	 */
-	function accept(& $renderer, $required = false, $error = null)
-	{
-		$renderer->renderElement($this, $required, $error);
-	}
+        return $js;
+    }
+    /**
+     * accept renderer
+     */
+    function accept(& $renderer, $required = false, $error = null)
+    {
+        $renderer->renderElement($this, $required, $error);
+    }
 }
 ?>

main/inc/lib/formvalidator/Element/HtmlEditor.php

Indentation +2 added lines, -2 removed lines

@@ -74,9 +74,9 @@
             $styleCss = $this->editor->getConfigAttribute('style');
 
             if ($styleCss) {
-               $style = true;
+                $style = true;
             } else {
-               $style = false;
+                $style = false;
             }
 
             return $this->buildEditor($style);