chamilo / chamilo-lms

main/inc/lib/formvalidator/Rule/UsernameAvailable.php

Indentation +17 added lines, -17 removed lines

@@ -6,24 +6,24 @@
  */
 class HTML_QuickForm_Rule_UsernameAvailable extends HTML_QuickForm_Rule
 {
-	/**
-	 * Function to check if a username is available
-	 * @see HTML_QuickForm_Rule
-	 * @param string $username Wanted username
-	 * @param string $current_username
-	 * @return boolean True if username is available
-	 */
-	function validate($username, $current_username = null) {
-		$user_table = Database::get_main_table(TABLE_MAIN_USER);
+    /**
+     * Function to check if a username is available
+     * @see HTML_QuickForm_Rule
+     * @param string $username Wanted username
+     * @param string $current_username
+     * @return boolean True if username is available
+     */
+    function validate($username, $current_username = null) {
+        $user_table = Database::get_main_table(TABLE_MAIN_USER);
         $username = Database::escape_string($username);
         $current_username = Database::escape_string($current_username);
 
-		$sql = "SELECT * FROM $user_table WHERE username = '$username'";
-		if (!is_null($current_username)) {
-			$sql .= " AND username != '$current_username'";
-		}
-		$res = Database::query($sql);
-		$number = Database::num_rows($res);
-		return $number == 0;
-	}
+        $sql = "SELECT * FROM $user_table WHERE username = '$username'";
+        if (!is_null($current_username)) {
+            $sql .= " AND username != '$current_username'";
+        }
+        $res = Database::query($sql);
+        $number = Database::num_rows($res);
+        return $number == 0;
+    }
 }

main/inc/lib/formvalidator/Rule/CompareDateTimeText.php

Indentation +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
      * @return boolean True if the 2 given dates match the operator
      */
     function validate($values, $operator = null) {
-    	$datetime1 = api_strtotime($values[0]);
+        $datetime1 = api_strtotime($values[0]);
         $datetime2 = api_strtotime($values[1]);
 
         if (strpos($operator, 'allow_empty') !== false) {
@@ -21,7 +21,7 @@ 
                 return true;
             }
         }
-		$result =  parent::validate(array($datetime1, $datetime2), $operator);
+        $result =  parent::validate(array($datetime1, $datetime2), $operator);
         return $result;
     }
 }

main/inc/lib/formvalidator/Rule/MultipleRequired.php

Indentation +4 added lines, -4 removed lines

@@ -27,10 +27,10 @@
      */
     function validate($value, $options = null)
     {
-    	if(is_array($value))
-    	{
-    		$value = implode(null,$value);
-    	}
+        if(is_array($value))
+        {
+            $value = implode(null,$value);
+        }
         if ((string)$value == '') {
             return false;
         }

main/inc/lib/formvalidator/Rule/FileName.php

Indentation +14 added lines, -14 removed lines

@@ -9,18 +9,18 @@
 class HTML_QuickForm_Rule_FileName extends HTML_QuickForm_Rule
 {
 
-	/**
-	 * @param $value array     Uploaded file info (from $_FILES)
-	 * @param null $options
-	 * @return bool
-	 */
-	public function validate($value, $options = null)
-	{
-		if ((isset($elementValue['error']) && $elementValue['error'] == 0) ||
-			(!empty($elementValue['tmp_name']) && $elementValue['tmp_name'] != 'none')) {
-			return is_uploaded_file($elementValue['tmp_name']);
-		} else {
-			return false;
-		}
-	}
+    /**
+     * @param $value array     Uploaded file info (from $_FILES)
+     * @param null $options
+     * @return bool
+     */
+    public function validate($value, $options = null)
+    {
+        if ((isset($elementValue['error']) && $elementValue['error'] == 0) ||
+            (!empty($elementValue['tmp_name']) && $elementValue['tmp_name'] != 'none')) {
+            return is_uploaded_file($elementValue['tmp_name']);
+        } else {
+            return false;
+        }
+    }
 }

main/inc/lib/formvalidator/Rule/MaxFileSize.php

Indentation +17 added lines, -17 removed lines

@@ -7,22 +7,22 @@
  */
 class HTML_QuickForm_Rule_MaxFileSize extends HTML_QuickForm_Rule
 {
-	/**
-	 * @param $value array     Uploaded file info (from $_FILES)
-	 * @param null $options
-	 * @return bool
-	 */
-	public function validate($elementValue, $maxSize)
-	{
-		if (!empty($elementValue['error']) &&
-			(UPLOAD_ERR_FORM_SIZE == $elementValue['error'] || UPLOAD_ERR_INI_SIZE == $elementValue['error'])
-		) {
-			return false;
-		}
-		if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
-			return true;
-		}
+    /**
+     * @param $value array     Uploaded file info (from $_FILES)
+     * @param null $options
+     * @return bool
+     */
+    public function validate($elementValue, $maxSize)
+    {
+        if (!empty($elementValue['error']) &&
+            (UPLOAD_ERR_FORM_SIZE == $elementValue['error'] || UPLOAD_ERR_INI_SIZE == $elementValue['error'])
+        ) {
+            return false;
+        }
+        if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
+            return true;
+        }
 
-		return ($maxSize >= @filesize($elementValue['tmp_name']));
-	}
+        return ($maxSize >= @filesize($elementValue['tmp_name']));
+    }
 }

main/inc/lib/formvalidator/Rule/CompareFields.php

Indentation +15 added lines, -15 removed lines

@@ -6,24 +6,24 @@
  */
 class HTML_QuickForm_Compare_Fields extends HTML_QuickForm_Rule_Compare 
 {
-	/**
-	 * Function to check an array of fields 	 
-	 * @param   array of field names
+    /**
+     * Function to check an array of fields 	 
+     * @param   array of field names
      * @param   string operator ==, >=, etc
      * @param   string the value to compare
-	 * @return boolean True if date is valid
-	 */
-	function validate($values, $operator_and_max_value) {
+     * @return boolean True if date is valid
+     */
+    function validate($values, $operator_and_max_value) {
         if (is_array($values) && !empty($values) && !empty($operator_and_max_value)) {
-           $final_value = 0;
-           foreach ($values as $value) {
-               $final_value += $value;
-           }
-           $params = explode('@', $operator_and_max_value);
-           $operator    = $params[0];
-           $max_value   = $params[1];                      
-           return parent::validate(array($final_value, $max_value), $operator);
+            $final_value = 0;
+            foreach ($values as $value) {
+                $final_value += $value;
+            }
+            $params = explode('@', $operator_and_max_value);
+            $operator    = $params[0];
+            $max_value   = $params[1];                      
+            return parent::validate(array($final_value, $max_value), $operator);
         }
         return false;        
-	}
+    }
 }
\ No newline at end of file

main/inc/lib/system_announcements.lib.php

Indentation +433 added lines, -433 removed lines

@@ -10,17 +10,17 @@ 
     CONST VISIBLE_STUDENT = 2;
     CONST VISIBLE_TEACHER = 3;
 
-	/**
-	 * Displays all announcements
-	 * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
-	 * @param int $id The identifier of the announcement to display
-	 */
-	public static function display_announcements($visible, $id = -1)
+    /**
+     * Displays all announcements
+     * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
+     * @param int $id The identifier of the announcement to display
+     */
+    public static function display_announcements($visible, $id = -1)
     {
-		$user_selected_language = api_get_interface_language();
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $user_selected_language = api_get_interface_language();
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
         $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
-		$userGroup = new UserGroup();
+        $userGroup = new UserGroup();
 
         $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
         $groups = array();
@@ -55,47 +55,47 @@ 
                         WHERE group_id in $groups_string
                     ) ";
         }
-		$current_access_url_id = 1;
-		if (api_is_multiple_url_enabled()) {
-			$current_access_url_id = api_get_current_access_url_id();
-		}
-		$sql .= " AND access_url_id = '$current_access_url_id' ";
-		$sql .= " ORDER BY date_start DESC LIMIT 0,7";
-
-		$announcements = Database::query($sql);
-		if (Database::num_rows($announcements) > 0) {
-			$query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
-			$query_string = ereg_replace('&$', '', $query_string);
-			$url = api_get_self();
-			echo '<div class="system_announcements">';
-			echo '<h3>'.get_lang('SystemAnnouncements').'</h3>';
-			echo '<div style="margin:10px;text-align:right;"><a href="news_list.php">'.get_lang('More').'</a></div>';
-
-			while ($announcement = Database::fetch_object($announcements)) {
-				if ($id != $announcement->id) {
-					if (strlen($query_string) > 0) {
-						$show_url = 'news_list.php#'.$announcement->id;
-					} else {
-						$show_url = 'news_list.php#'.$announcement->id;
-					}
-			        $display_date = api_convert_and_format_date($announcement->display_date, DATE_FORMAT_LONG);
-					echo '<a name="'.$announcement->id.'"></a>
+        $current_access_url_id = 1;
+        if (api_is_multiple_url_enabled()) {
+            $current_access_url_id = api_get_current_access_url_id();
+        }
+        $sql .= " AND access_url_id = '$current_access_url_id' ";
+        $sql .= " ORDER BY date_start DESC LIMIT 0,7";
+
+        $announcements = Database::query($sql);
+        if (Database::num_rows($announcements) > 0) {
+            $query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
+            $query_string = ereg_replace('&$', '', $query_string);
+            $url = api_get_self();
+            echo '<div class="system_announcements">';
+            echo '<h3>'.get_lang('SystemAnnouncements').'</h3>';
+            echo '<div style="margin:10px;text-align:right;"><a href="news_list.php">'.get_lang('More').'</a></div>';
+
+            while ($announcement = Database::fetch_object($announcements)) {
+                if ($id != $announcement->id) {
+                    if (strlen($query_string) > 0) {
+                        $show_url = 'news_list.php#'.$announcement->id;
+                    } else {
+                        $show_url = 'news_list.php#'.$announcement->id;
+                    }
+                    $display_date = api_convert_and_format_date($announcement->display_date, DATE_FORMAT_LONG);
+                    echo '<a name="'.$announcement->id.'"></a>
 						<div class="system_announcement">
 							<div class="system_announcement_title"><a name="ann'.$announcement->id.'" href="'.$show_url.'">'.$announcement->title.'</a></div><div class="system_announcement_date">'.$display_date.'</div>
 					  	</div>';
-				} else {
-					echo '<div class="system_announcement">
+                } else {
+                    echo '<div class="system_announcement">
 							<div class="system_announcement_title">'
-								.$announcement->display_date.'
+                                .$announcement->display_date.'
 								<a name="ann'.$announcement->id.'" href="'.$url.'?'.$query_string.'#ann'.$announcement->id.'">'.$announcement->title.'</a>
 							</div>';
-				}
-				echo '<br />';
-			}
-			echo '</div>';
-		}
-		return;
-	}
+                }
+                echo '<br />';
+            }
+            echo '</div>';
+        }
+        return;
+    }
 
     /**
      * @param $visible
@@ -106,100 +106,100 @@ 
      */
     public static function display_all_announcements($visible, $id = -1, $start = 0,$user_id='')
     {
-		$user_selected_language = api_get_interface_language();
-		$start	= intval($start);
+        $user_selected_language = api_get_interface_language();
+        $start	= intval($start);
         $userGroup = new UserGroup();
-	    $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
-	    $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
+        $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
+        $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
         $groups = array();
-	    foreach ($temp_user_groups as $user_group) {
-	        $groups = array_merge($groups, array($user_group['id']));
-	        $groups = array_merge($groups, $userGroup->get_parent_groups($user_group['id']));
-	    }
+        foreach ($temp_user_groups as $user_group) {
+            $groups = array_merge($groups, array($user_group['id']));
+            $groups = array_merge($groups, $userGroup->get_parent_groups($user_group['id']));
+        }
 
-	    // Checks if tables exists to not break platform not updated
-	    $groups_string = '('.implode($groups,',').')';
+        // Checks if tables exists to not break platform not updated
+        $groups_string = '('.implode($groups,',').')';
 
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$now  = api_get_utc_datetime();
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $now  = api_get_utc_datetime();
 
-		$sql = "SELECT * FROM ".$db_table."
+        $sql = "SELECT * FROM ".$db_table."
 				WHERE
 				    (lang = '$user_selected_language' OR lang IS NULL) AND
 				    ( '$now' >= date_start AND '$now' <= date_end) ";
 
-		switch ($visible) {
-			case self::VISIBLE_GUEST :
-				$sql .= " AND visible_guest = 1 ";
-				break;
-			case self::VISIBLE_STUDENT :
-				$sql .= " AND visible_student = 1 ";
-				break;
-			case self::VISIBLE_TEACHER :
-				$sql .= " AND visible_teacher = 1 ";
-				break;
-		}
-
-	    if (count($groups) > 0) {
+        switch ($visible) {
+            case self::VISIBLE_GUEST :
+                $sql .= " AND visible_guest = 1 ";
+                break;
+            case self::VISIBLE_STUDENT :
+                $sql .= " AND visible_student = 1 ";
+                break;
+            case self::VISIBLE_TEACHER :
+                $sql .= " AND visible_teacher = 1 ";
+                break;
+        }
+
+        if (count($groups) > 0) {
             $sql .= " OR id IN (
                     SELECT announcement_id FROM $tbl_announcement_group
                     WHERE group_id in $groups_string
                     ) ";
-	    }
+        }
 
-		if (api_is_multiple_url_enabled()) {
-			$current_access_url_id = api_get_current_access_url_id();
+        if (api_is_multiple_url_enabled()) {
+            $current_access_url_id = api_get_current_access_url_id();
             $sql .= " AND access_url_id IN ('1', '$current_access_url_id')";
-		}
-
-		if(!isset($_GET['start']) || $_GET['start'] == 0) {
-			$sql .= " ORDER BY date_start DESC LIMIT ".$start.",20";
-		} else {
-			$sql .= " ORDER BY date_start DESC LIMIT ".($start+1).",20";
-		}
-		$announcements = Database::query($sql);
-		$content = '';
-		if (Database::num_rows($announcements) > 0) {
-			$query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
-			$query_string = ereg_replace('&$', '', $query_string);
-			$url = api_get_self();
-			$content .= '<div class="system_announcements">';
-			$content .= '<h3>'.get_lang('SystemAnnouncements').'</h3>';
-			$content .= '<table align="center">';
-				$content .= '<tr>';
-					$content .= '<td>';
-						$content .= SystemAnnouncementManager :: display_arrow($user_id);
-					$content .= '</td>';
-				$content .= '</tr>';
-			$content .= '</table>';
-			$content .= '<table align="center" border="0" width="900px">';
-			while ($announcement = Database::fetch_object($announcements)) {
-				$display_date = api_convert_and_format_date($announcement->display_date, DATE_FORMAT_LONG);
-				$content .= '<tr><td>';
-				$content .= '<a name="'.$announcement->id.'"></a>
+        }
+
+        if(!isset($_GET['start']) || $_GET['start'] == 0) {
+            $sql .= " ORDER BY date_start DESC LIMIT ".$start.",20";
+        } else {
+            $sql .= " ORDER BY date_start DESC LIMIT ".($start+1).",20";
+        }
+        $announcements = Database::query($sql);
+        $content = '';
+        if (Database::num_rows($announcements) > 0) {
+            $query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
+            $query_string = ereg_replace('&$', '', $query_string);
+            $url = api_get_self();
+            $content .= '<div class="system_announcements">';
+            $content .= '<h3>'.get_lang('SystemAnnouncements').'</h3>';
+            $content .= '<table align="center">';
+                $content .= '<tr>';
+                    $content .= '<td>';
+                        $content .= SystemAnnouncementManager :: display_arrow($user_id);
+                    $content .= '</td>';
+                $content .= '</tr>';
+            $content .= '</table>';
+            $content .= '<table align="center" border="0" width="900px">';
+            while ($announcement = Database::fetch_object($announcements)) {
+                $display_date = api_convert_and_format_date($announcement->display_date, DATE_FORMAT_LONG);
+                $content .= '<tr><td>';
+                $content .= '<a name="'.$announcement->id.'"></a>
 						<div class="system_announcement">
 						<h2>'.$announcement->title.'</h2><div class="system_announcement_date">'.$display_date.'</div>
 						<br />
 					  	<div class="system_announcement_content">'
-					  			.$announcement->content.'
+                                    .$announcement->content.'
 						</div>
 					  </div><br />';
-				$content .= '</tr></td>';
-			}
-			$content .= '</table>';
-
-			$content .= '<table align="center">';
-				$content .= '<tr>';
-					$content .= '<td>';
-						$content .= SystemAnnouncementManager :: display_arrow($user_id);
-					$content .= '</td>';
-				$content .= '</tr>';
-			$content .= '</table>';
-			$content .= '</div>';
-		}
-
-		return $content;
-	}
+                $content .= '</tr></td>';
+            }
+            $content .= '</table>';
+
+            $content .= '<table align="center">';
+                $content .= '<tr>';
+                    $content .= '<td>';
+                        $content .= SystemAnnouncementManager :: display_arrow($user_id);
+                    $content .= '</td>';
+                $content .= '</tr>';
+            $content .= '</table>';
+            $content .= '</div>';
+        }
+
+        return $content;
+    }
 
     /**
      * @param int $user_id
@@ -207,23 +207,23 @@ 
      */
     public static function display_arrow($user_id)
     {
-		$start = (int)$_GET['start'];
-		$nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start,$user_id);
-		$next = ((int)$_GET['start']+19);
-		$prev = ((int)$_GET['start']-19);
-		$content = '';
-		if(!isset($_GET['start']) || $_GET['start'] == 0) {
-			if($nb_announcement > 20) {
-				$content .= '<a href="news_list.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
-			}
-		} else {
-			echo '<a href="news_list.php?start='.$prev.'"> << '.get_lang('Prev').'</a>';
-			if ($nb_announcement > 20) {
-				$content .= '<a href="news_list.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
-			}
-		}
-		return $content;
-	}
+        $start = (int)$_GET['start'];
+        $nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start,$user_id);
+        $next = ((int)$_GET['start']+19);
+        $prev = ((int)$_GET['start']-19);
+        $content = '';
+        if(!isset($_GET['start']) || $_GET['start'] == 0) {
+            if($nb_announcement > 20) {
+                $content .= '<a href="news_list.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
+            }
+        } else {
+            echo '<a href="news_list.php?start='.$prev.'"> << '.get_lang('Prev').'</a>';
+            if ($nb_announcement > 20) {
+                $content .= '<a href="news_list.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
+            }
+        }
+        return $content;
+    }
 
     /**
      * @param int $start
@@ -232,82 +232,82 @@ 
      */
     public static function count_nb_announcement($start = 0, $user_id = '')
     {
-		$start = intval($start);
-		$visibility = api_is_allowed_to_create_course() ? self::VISIBLE_TEACHER : self::VISIBLE_STUDENT;
-		$user_selected_language = api_get_interface_language();
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$sql = 'SELECT id FROM '.$db_table.'
+        $start = intval($start);
+        $visibility = api_is_allowed_to_create_course() ? self::VISIBLE_TEACHER : self::VISIBLE_STUDENT;
+        $user_selected_language = api_get_interface_language();
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $sql = 'SELECT id FROM '.$db_table.'
 		        WHERE (lang="'.$user_selected_language.'" OR lang IS NULL) ';
-		if (isset($user_id)) {
-			switch ($visibility) {
-				case self::VISIBLE_GUEST :
-					$sql .= " AND visible_guest = 1 ";
-					break;
-				case self::VISIBLE_STUDENT :
-					$sql .= " AND visible_student = 1 ";
-					break;
-				case self::VISIBLE_TEACHER :
-					$sql .= " AND visible_teacher = 1 ";
-					break;
-			}
- 		}
-
-		$current_access_url_id = 1;
-		if (api_is_multiple_url_enabled()) {
-			$current_access_url_id = api_get_current_access_url_id();
-		}
-		$sql .= " AND access_url_id = '$current_access_url_id' ";
-
-
-		$sql .= 'LIMIT '.$start.', 21';
-		$announcements = Database::query($sql);
-		$i = 0;
-		while ($rows = Database::fetch_array($announcements)) {
-			$i++;
-		}
-		return $i;
-	}
-
-	/**
-	 * Get all announcements
-	 * @return array An array with all available system announcements (as php
-	 * objects)
-	 */
-	public static function get_all_announcements()
+        if (isset($user_id)) {
+            switch ($visibility) {
+                case self::VISIBLE_GUEST :
+                    $sql .= " AND visible_guest = 1 ";
+                    break;
+                case self::VISIBLE_STUDENT :
+                    $sql .= " AND visible_student = 1 ";
+                    break;
+                case self::VISIBLE_TEACHER :
+                    $sql .= " AND visible_teacher = 1 ";
+                    break;
+            }
+            }
+
+        $current_access_url_id = 1;
+        if (api_is_multiple_url_enabled()) {
+            $current_access_url_id = api_get_current_access_url_id();
+        }
+        $sql .= " AND access_url_id = '$current_access_url_id' ";
+
+
+        $sql .= 'LIMIT '.$start.', 21';
+        $announcements = Database::query($sql);
+        $i = 0;
+        while ($rows = Database::fetch_array($announcements)) {
+            $i++;
+        }
+        return $i;
+    }
+
+    /**
+     * Get all announcements
+     * @return array An array with all available system announcements (as php
+     * objects)
+     */
+    public static function get_all_announcements()
     {
-		$table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$now = api_get_utc_datetime();
-		$sql = "SELECT *, IF ( '$now'  >= date_start AND '$now' <= date_end, '1', '0') AS visible
+        $table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $now = api_get_utc_datetime();
+        $sql = "SELECT *, IF ( '$now'  >= date_start AND '$now' <= date_end, '1', '0') AS visible
 				FROM $table";
 
-		$current_access_url_id = 1;
-		if (api_is_multiple_url_enabled()) {
-			$current_access_url_id = api_get_current_access_url_id();
-		}
-		$sql .= " WHERE access_url_id = '$current_access_url_id' ";
-		$sql .= " ORDER BY date_start ASC";
-
-		$announcements = Database::query($sql);
-		$all_announcements = array();
-		while ($announcement = Database::fetch_object($announcements)) {
-			$all_announcements[] = $announcement;
-		}
-		return $all_announcements;
-	}
-
-	/**
-	 * Adds an announcement to the database
-	 * @param string Title of the announcement
-	 * @param string Content of the announcement
-	 * @param string Start date (YYYY-MM-DD HH:II: SS)
-	 * @param string End date (YYYY-MM-DD HH:II: SS)
-	 * @param int    Whether the announcement should be visible to teachers (1) or not (0)
-	 * @param int    Whether the announcement should be visible to students (1) or not (0)
-	 * @param int    Whether the announcement should be visible to anonymous users (1) or not (0)
-	 * @param string The language for which the announvement should be shown. Leave null for all langages
-	 * @param int    Whether to send an e-mail to all users (1) or not (0)
-	 * @return mixed  insert_id on success, false on failure
-	 */
+        $current_access_url_id = 1;
+        if (api_is_multiple_url_enabled()) {
+            $current_access_url_id = api_get_current_access_url_id();
+        }
+        $sql .= " WHERE access_url_id = '$current_access_url_id' ";
+        $sql .= " ORDER BY date_start ASC";
+
+        $announcements = Database::query($sql);
+        $all_announcements = array();
+        while ($announcement = Database::fetch_object($announcements)) {
+            $all_announcements[] = $announcement;
+        }
+        return $all_announcements;
+    }
+
+    /**
+     * Adds an announcement to the database
+     * @param string Title of the announcement
+     * @param string Content of the announcement
+     * @param string Start date (YYYY-MM-DD HH:II: SS)
+     * @param string End date (YYYY-MM-DD HH:II: SS)
+     * @param int    Whether the announcement should be visible to teachers (1) or not (0)
+     * @param int    Whether the announcement should be visible to students (1) or not (0)
+     * @param int    Whether the announcement should be visible to anonymous users (1) or not (0)
+     * @param string The language for which the announvement should be shown. Leave null for all langages
+     * @param int    Whether to send an e-mail to all users (1) or not (0)
+     * @return mixed  insert_id on success, false on failure
+     */
     public static function add_announcement(
         $title,
         $content,
@@ -321,112 +321,112 @@ 
         $add_to_calendar = false,
         $sendEmailTest = false
     ) {
-		$original_content = $content;
-		$a_dateS = explode(' ',$date_start);
-		$a_arraySD = explode('-',$a_dateS[0]);
-		$a_arraySH = explode(':',$a_dateS[1]);
-		$date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
+        $original_content = $content;
+        $a_dateS = explode(' ',$date_start);
+        $a_arraySD = explode('-',$a_dateS[0]);
+        $a_arraySH = explode(':',$a_dateS[1]);
+        $date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
 
-		$a_dateE = explode(' ',$date_end);
-		$a_arrayED = explode('-',$a_dateE[0]);
-		$a_arrayEH = explode(':',$a_dateE[1]);
-		$date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
+        $a_dateE = explode(' ',$date_end);
+        $a_arrayED = explode('-',$a_dateE[0]);
+        $a_arrayEH = explode(':',$a_dateE[1]);
+        $date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
 
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
 
-		if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
-			Display :: display_normal_message(get_lang('InvalidStartDate'));
-			return false;
-		}
+        if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
+            Display :: display_normal_message(get_lang('InvalidStartDate'));
+            return false;
+        }
 
-		if (($date_end_to_compare[1] ||
+        if (($date_end_to_compare[1] ||
             $date_end_to_compare[2] ||
             $date_end_to_compare[0]) &&
             !checkdate($date_end_to_compare[1], $date_end_to_compare[2], $date_end_to_compare[0])
         ) {
-			Display :: display_normal_message(get_lang('InvalidEndDate'));
-			return false;
-		}
-		if (strlen(trim($title)) == 0) {
-			Display::display_normal_message(get_lang('InvalidTitle'));
-			return false;
-		}
-
-		$start = api_get_utc_datetime($date_start);
+            Display :: display_normal_message(get_lang('InvalidEndDate'));
+            return false;
+        }
+        if (strlen(trim($title)) == 0) {
+            Display::display_normal_message(get_lang('InvalidTitle'));
+            return false;
+        }
+
+        $start = api_get_utc_datetime($date_start);
         $end = api_get_utc_datetime($date_end);
 
-		//Fixing urls that are sent by email
-		$content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
-		$content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
+        //Fixing urls that are sent by email
+        $content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
+        $content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
 
         $lang = is_null($lang) ? '' : $lang;
 
-		$current_access_url_id = 1;
-		if (api_is_multiple_url_enabled()) {
-			$current_access_url_id = api_get_current_access_url_id();
-		}
-
-		$params = [
-			'title' => $title,
-			'content' => $content,
-			'date_start' => $start,
-			'date_end' => $end,
-			'visible_teacher' => $visible_teacher,
-			'visible_student' => $visible_student,
-			'visible_guest' => $visible_guest,
-			'lang' => $lang,
-			'access_url_id' => $current_access_url_id,
-		];
-
-		$resultId = Database::insert($db_table, $params);
-
-		if ($resultId) {
-
-			if ($sendEmailTest) {
-				SystemAnnouncementManager::send_system_announcement_by_email(
-					$title,
-					$content,
-					$visible_teacher,
-					$visible_student,
-					$lang,
-					true
-				);
-			} else {
-				if ($send_mail == 1) {
-					SystemAnnouncementManager::send_system_announcement_by_email(
-						$title,
-						$content,
-						$visible_teacher,
-						$visible_student,
-						$lang
-					);
-				}
-			}
-
-			if ($add_to_calendar) {
-				$agenda = new Agenda();
-				$agenda->setType('admin');
-				$agenda->addEvent(
-					$date_start,
-					$date_end,
-					false,
-					$title,
-					$original_content
-				);
-			}
-
-			return $resultId;
-
-		}
-
-		return false;
-	}
+        $current_access_url_id = 1;
+        if (api_is_multiple_url_enabled()) {
+            $current_access_url_id = api_get_current_access_url_id();
+        }
+
+        $params = [
+            'title' => $title,
+            'content' => $content,
+            'date_start' => $start,
+            'date_end' => $end,
+            'visible_teacher' => $visible_teacher,
+            'visible_student' => $visible_student,
+            'visible_guest' => $visible_guest,
+            'lang' => $lang,
+            'access_url_id' => $current_access_url_id,
+        ];
+
+        $resultId = Database::insert($db_table, $params);
+
+        if ($resultId) {
+
+            if ($sendEmailTest) {
+                SystemAnnouncementManager::send_system_announcement_by_email(
+                    $title,
+                    $content,
+                    $visible_teacher,
+                    $visible_student,
+                    $lang,
+                    true
+                );
+            } else {
+                if ($send_mail == 1) {
+                    SystemAnnouncementManager::send_system_announcement_by_email(
+                        $title,
+                        $content,
+                        $visible_teacher,
+                        $visible_student,
+                        $lang
+                    );
+                }
+            }
+
+            if ($add_to_calendar) {
+                $agenda = new Agenda();
+                $agenda->setType('admin');
+                $agenda->addEvent(
+                    $date_start,
+                    $date_end,
+                    false,
+                    $title,
+                    $original_content
+                );
+            }
+
+            return $resultId;
+
+        }
+
+        return false;
+    }
 
     /**
-    * Makes the announcement id visible only for groups in groups_array
-    * @param int announcement id
-    * @param array array of group id
-    **/
+     * Makes the announcement id visible only for groups in groups_array
+     * @param int announcement id
+     * @param array array of group id
+     **/
     public static function announcement_for_groups($announcement_id, $group_array)
     {
         $tbl_announcement_group = Database:: get_main_table(
@@ -460,10 +460,10 @@ 
     }
 
     /**
-    * Gets the groups of this announce
-    * @param int announcement id
-    * @return array array of group id
-    **/
+     * Gets the groups of this announce
+     * @param int announcement id
+     * @return array array of group id
+     **/
     public static function get_announcement_groups($announcement_id)
     {
         $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
@@ -482,15 +482,15 @@ 
         return $groups;
     }
 
-	/**
-	 * Updates an announcement to the database
-	 * @param integer $id      : id of the announcement
-	 * @param string  $title   : title of the announcement
-	 * @param string  $content : content of the announcement
-	 * @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
-	 * @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
-	 * @return	bool	True on success, false on failure
-	 */
+    /**
+     * Updates an announcement to the database
+     * @param integer $id      : id of the announcement
+     * @param string  $title   : title of the announcement
+     * @param string  $content : content of the announcement
+     * @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
+     * @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
+     * @return	bool	True on success, false on failure
+     */
     public static function update_announcement(
         $id,
         $title,
@@ -504,51 +504,51 @@ 
         $send_mail = 0,
         $sendEmailTest = false
     ) {
-		$a_dateS = explode(' ',$date_start);
-		$a_arraySD = explode('-',$a_dateS[0]);
-		$a_arraySH = explode(':',$a_dateS[1]);
-		$date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
+        $a_dateS = explode(' ',$date_start);
+        $a_arraySD = explode('-',$a_dateS[0]);
+        $a_arraySH = explode(':',$a_dateS[1]);
+        $date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
 
-		$a_dateE = explode(' ',$date_end);
-		$a_arrayED = explode('-',$a_dateE[0]);
-		$a_arrayEH = explode(':',$a_dateE[1]);
-		$date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
+        $a_dateE = explode(' ',$date_end);
+        $a_arrayED = explode('-',$a_dateE[0]);
+        $a_arrayEH = explode(':',$a_dateE[1]);
+        $date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
 
-		$langsql = is_null($lang) ? 'NULL' : "'".Database::escape_string($lang)."'";
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $langsql = is_null($lang) ? 'NULL' : "'".Database::escape_string($lang)."'";
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
 
-		if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
-			Display :: display_normal_message(get_lang('InvalidStartDate'));
-			return false;
-		}
+        if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
+            Display :: display_normal_message(get_lang('InvalidStartDate'));
+            return false;
+        }
 
-		if (($date_end_to_compare[1] ||
+        if (($date_end_to_compare[1] ||
             $date_end_to_compare[2] ||
             $date_end_to_compare[0]) &&
             !checkdate($date_end_to_compare[1], $date_end_to_compare[2], $date_end_to_compare[0])
         ) {
-			Display :: display_normal_message(get_lang('InvalidEndDate'));
-			return false;
-		}
+            Display :: display_normal_message(get_lang('InvalidEndDate'));
+            return false;
+        }
 
-		if (strlen(trim($title)) == 0) {
-			Display::display_normal_message(get_lang('InvalidTitle'));
-			return false;
-		}
+        if (strlen(trim($title)) == 0) {
+            Display::display_normal_message(get_lang('InvalidTitle'));
+            return false;
+        }
 
-	    $start    = api_get_utc_datetime($date_start);
+        $start    = api_get_utc_datetime($date_start);
         $end      = api_get_utc_datetime($date_end);
 
-		$title = Database::escape_string($title);
-		$content = Database::escape_string($content);
+        $title = Database::escape_string($title);
+        $content = Database::escape_string($content);
 
-		//Fixing urls that are sent by email
-		$content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
-		$content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
+        //Fixing urls that are sent by email
+        $content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
+        $content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
 
-		$id = intval($id);
-		$sql = "UPDATE ".$db_table." SET lang=$langsql,title='".$title."',content='".$content."',date_start='".$start."',date_end='".$end."', ";
-		$sql .= " visible_teacher = '".$visible_teacher."', visible_student = '".$visible_student."', visible_guest = '".$visible_guest."' , access_url_id = '".api_get_current_access_url_id()."'  WHERE id = ".$id;
+        $id = intval($id);
+        $sql = "UPDATE ".$db_table." SET lang=$langsql,title='".$title."',content='".$content."',date_start='".$start."',date_end='".$end."', ";
+        $sql .= " visible_teacher = '".$visible_teacher."', visible_student = '".$visible_student."', visible_guest = '".$visible_guest."' , access_url_id = '".api_get_current_access_url_id()."'  WHERE id = ".$id;
 
         if ($sendEmailTest) {
             SystemAnnouncementManager::send_system_announcement_by_email(
@@ -570,89 +570,89 @@ 
                 );
             }
         }
-		$res = Database::query($sql);
-		if ($res === false) {
+        $res = Database::query($sql);
+        if ($res === false) {
 
-			return false;
-		}
-		return true;
-	}
+            return false;
+        }
+        return true;
+    }
 
-	/**
-	 * Deletes an announcement
-	 * @param 	int $id The identifier of the announcement that should be
-	 * @return	bool	True on success, false on failure
-	 */
-	public static function delete_announcement($id)
+    /**
+     * Deletes an announcement
+     * @param 	int $id The identifier of the announcement that should be
+     * @return	bool	True on success, false on failure
+     */
+    public static function delete_announcement($id)
     {
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$id = intval($id);
-		$sql = "DELETE FROM ".$db_table." WHERE id =".$id;
-		$res = Database::query($sql);
-		if ($res === false) {
-
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Gets an announcement
-	 * @param 	int		$id The identifier of the announcement that should be
-	 * @return	object	Object of class StdClass or the required class, containing the query result row
-	 */
-	public static function get_announcement($id)
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $id = intval($id);
+        $sql = "DELETE FROM ".$db_table." WHERE id =".$id;
+        $res = Database::query($sql);
+        if ($res === false) {
+
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Gets an announcement
+     * @param 	int		$id The identifier of the announcement that should be
+     * @return	object	Object of class StdClass or the required class, containing the query result row
+     */
+    public static function get_announcement($id)
     {
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$id = intval($id);
-		$sql = "SELECT * FROM ".$db_table." WHERE id = ".$id;
-		$announcement = Database::fetch_object(Database::query($sql));
-
-		return $announcement;
-	}
-
-	/**
-	 * Change the visibility of an announcement
-	 * @param 	int $announcement_id
-	 * @param 	int $user For who should the visibility be changed
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $id = intval($id);
+        $sql = "SELECT * FROM ".$db_table." WHERE id = ".$id;
+        $announcement = Database::fetch_object(Database::query($sql));
+
+        return $announcement;
+    }
+
+    /**
+     * Change the visibility of an announcement
+     * @param 	int $announcement_id
+     * @param 	int $user For who should the visibility be changed
      * (possible values are VISIBLE_TEACHER, VISIBLE_STUDENT, VISIBLE_GUEST)
-	 * @return 	bool	True on success, false on failure
-	 */
-	public static function set_visibility($announcement_id, $user, $visible)
+     * @return 	bool	True on success, false on failure
+     */
+    public static function set_visibility($announcement_id, $user, $visible)
     {
-		$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$visible = intval($visible);
-		$announcement_id = intval($announcement_id);
+        $db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $visible = intval($visible);
+        $announcement_id = intval($announcement_id);
 
         if (!in_array($user, array(self::VISIBLE_GUEST, self::VISIBLE_STUDENT, self::VISIBLE_TEACHER))) {
             return false;
         }
 
-		$field = ($user == self::VISIBLE_TEACHER ? 'visible_teacher' : ($user == self::VISIBLE_STUDENT ? 'visible_student' : 'visible_guest'));
+        $field = ($user == self::VISIBLE_TEACHER ? 'visible_teacher' : ($user == self::VISIBLE_STUDENT ? 'visible_student' : 'visible_guest'));
 
-		$sql = "UPDATE ".$db_table." SET ".$field." = '".$visible."'
+        $sql = "UPDATE ".$db_table." SET ".$field." = '".$visible."'
 		        WHERE id='".$announcement_id."'";
-		$res = Database::query($sql);
-
-		if ($res === false) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Send a system announcement by e-mail to all teachers/students depending on parameters
-	 * @param	string	Title
-	 * @param	string	Content
-	 * @param	int		Whether to send to all teachers (1) or not (0)
-	 * @param	int		Whether to send to all students (1) or not (0)
-	 * @param	string	Language (optional, considered for all languages if left empty)
+        $res = Database::query($sql);
+
+        if ($res === false) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send a system announcement by e-mail to all teachers/students depending on parameters
+     * @param	string	Title
+     * @param	string	Content
+     * @param	int		Whether to send to all teachers (1) or not (0)
+     * @param	int		Whether to send to all students (1) or not (0)
+     * @param	string	Language (optional, considered for all languages if left empty)
      * @return  bool    True if the message was sent or there was no destination matching. False on database or e-mail sending error.
-	 */
-	public static function send_system_announcement_by_email($title, $content, $teacher, $student, $language = null, $sendEmailTest = false)
+     */
+    public static function send_system_announcement_by_email($title, $content, $teacher, $student, $language = null, $sendEmailTest = false)
     {
-		global $charset;
+        global $charset;
 
         $title = api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset);
         $content = api_html_entity_decode(stripslashes(str_replace(array('\r\n', '\n', '\r'),'', $content)), ENT_QUOTES, $charset);
@@ -671,22 +671,22 @@ 
         }
 
         if ($teacher <> 0 AND $student == 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '1' ";
-		}
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '1' ";
+        }
 
-		if ($teacher == 0 AND $student <> 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '5' ";
-		}
+        if ($teacher == 0 AND $student <> 0) {
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '5' ";
+        }
 
-		if ($teacher<> 0 AND $student <> 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE 1 = 1 ";
-		}
+        if ($teacher<> 0 AND $student <> 0) {
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE 1 = 1 ";
+        }
 
-		if (!empty($language)) { //special condition because language was already treated for SQL insert before
-			$sql .= " AND language = '".Database::escape_string($language)."' ";
-		}
+        if (!empty($language)) { //special condition because language was already treated for SQL insert before
+            $sql .= " AND language = '".Database::escape_string($language)."' ";
+        }
 
-		if (api_is_multiple_url_enabled()) {
+        if (api_is_multiple_url_enabled()) {
             $sql .= " AND access_url_id = '".$current_access_url_id."' ";
         }
 
@@ -696,25 +696,25 @@ 
         // Expiration date
         $sql .= " AND (expiration_date = '' OR expiration_date IS NULL OR expiration_date > '$now') ";
 
-		if ((empty($teacher) or $teacher == '0') AND  (empty($student) or $student == '0')) {
-			return true;
-		}
+        if ((empty($teacher) or $teacher == '0') AND  (empty($student) or $student == '0')) {
+            return true;
+        }
 
-		$result = Database::query($sql);
-		if ($result === false) {
-			return false;
-		}
+        $result = Database::query($sql);
+        if ($result === false) {
+            return false;
+        }
 
         $message_sent = false;
 
-		while ($row = Database::fetch_array($result,'ASSOC')) {
+        while ($row = Database::fetch_array($result,'ASSOC')) {
             MessageManager::send_message_simple($row['user_id'], $title, $content);
             $message_sent = true;
-		}
-		return $message_sent; //true if at least one e-mail was sent
-	}
+        }
+        return $message_sent; //true if at least one e-mail was sent
+    }
 
-	/**
+    /**
      * Displays announcements as an slideshow
      * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
      * @param int $id The identifier of the announcement to display

main/inc/lib/pear/excelreader/OLERead.inc

Indentation +86 added lines, -86 removed lines

@@ -25,12 +25,12 @@ 
 

 function GetInt4d($data, $pos)

 {

-	$value = ord($data[$pos]) | (ord($data[$pos+1])	<< 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24);

-	if ($value>=4294967294)

-	{

-		$value=-2;

-	}

-	return $value;

+    $value = ord($data[$pos]) | (ord($data[$pos+1])	<< 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24);

+    if ($value>=4294967294)

+    {

+        $value=-2;

+    }

+    return $value;

 }

 

 

@@ -45,30 +45,30 @@ 
     

     function read($sFileName){

         

-    	// check if file exist and is readable (Darko Miljanovic)

-    	if(!is_readable($sFileName)) {

-    		$this->error = 1;

-    		return false;

-    	}

+        // check if file exist and is readable (Darko Miljanovic)

+        if(!is_readable($sFileName)) {

+            $this->error = 1;

+            return false;

+        }

     	

-    	$this->data = @file_get_contents($sFileName);

-    	if (!$this->data) { 

-    		$this->error = 1; 

-    		return false; 

-   		}

-   		//echo IDENTIFIER_OLE;

-   		//echo 'start';

-   		if (substr($this->data, 0, 8) != IDENTIFIER_OLE) {

-    		$this->error = 1; 

-    		return false; 

-   		}

+        $this->data = @file_get_contents($sFileName);

+        if (!$this->data) { 

+            $this->error = 1; 

+            return false; 

+            }

+            //echo IDENTIFIER_OLE;

+            //echo 'start';

+            if (substr($this->data, 0, 8) != IDENTIFIER_OLE) {

+            $this->error = 1; 

+            return false; 

+            }

         $this->numBigBlockDepotBlocks = GetInt4d($this->data, NUM_BIG_BLOCK_DEPOT_BLOCKS_POS);

         $this->sbdStartBlock = GetInt4d($this->data, SMALL_BLOCK_DEPOT_BLOCK_POS);

         $this->rootStartBlock = GetInt4d($this->data, ROOT_START_BLOCK_POS);

         $this->extensionBlock = GetInt4d($this->data, EXTENSION_BLOCK_POS);

         $this->numExtensionBlocks = GetInt4d($this->data, NUM_EXTENSION_BLOCK_POS);

         

-	/*

+    /*

         echo $this->numBigBlockDepotBlocks." ";

         echo $this->sbdStartBlock." ";

         echo $this->rootStartBlock." ";

@@ -78,16 +78,16 @@ 
         //echo "sbdStartBlock = $this->sbdStartBlock\n";

         $bigBlockDepotBlocks = array();

         $pos = BIG_BLOCK_DEPOT_BLOCKS_POS;

-       // echo "pos = $pos";

-	$bbdBlocks = $this->numBigBlockDepotBlocks;

+        // echo "pos = $pos";

+    $bbdBlocks = $this->numBigBlockDepotBlocks;

         

             if ($this->numExtensionBlocks != 0) {

                 $bbdBlocks = (BIG_BLOCK_SIZE - BIG_BLOCK_DEPOT_BLOCKS_POS)/4; 

             }

         

         for ($i = 0; $i < $bbdBlocks; $i++) {

-              $bigBlockDepotBlocks[$i] = GetInt4d($this->data, $pos);

-              $pos += 4;

+                $bigBlockDepotBlocks[$i] = GetInt4d($this->data, $pos);

+                $pos += 4;

         }

         

         

@@ -106,7 +106,7 @@ 
             }

         }

 

-       // var_dump($bigBlockDepotBlocks);

+        // var_dump($bigBlockDepotBlocks);

         

         // readBigBlockDepot

         $pos = 0;

@@ -123,26 +123,26 @@ 
             }

         }

 

-	//var_dump($this->bigBlockChain);

+    //var_dump($this->bigBlockChain);

         //echo '=====2';

         // readSmallBlockDepot();

         $pos = 0;

-	    $index = 0;

-	    $sbdBlock = $this->sbdStartBlock;

-	    $this->smallBlockChain = array();

+        $index = 0;

+        $sbdBlock = $this->sbdStartBlock;

+        $this->smallBlockChain = array();

 	

-	    while ($sbdBlock != -2) {

+        while ($sbdBlock != -2) {

 	

-	      $pos = ($sbdBlock + 1) * BIG_BLOCK_SIZE;

+            $pos = ($sbdBlock + 1) * BIG_BLOCK_SIZE;

 	

-	      for ($j = 0; $j < BIG_BLOCK_SIZE / 4; $j++) {

-	        $this->smallBlockChain[$index] = GetInt4d($this->data, $pos);

-	        $pos += 4;

-	        $index++;

-	      }

+            for ($j = 0; $j < BIG_BLOCK_SIZE / 4; $j++) {

+            $this->smallBlockChain[$index] = GetInt4d($this->data, $pos);

+            $pos += 4;

+            $index++;

+            }

 	

-	      $sbdBlock = $this->bigBlockChain[$sbdBlock];

-	    }

+            $sbdBlock = $this->bigBlockChain[$sbdBlock];

+        }

 

         

         // readData(rootStartBlock)

@@ -162,7 +162,7 @@ 
 

     }

     

-     function __readData($bl) {

+        function __readData($bl) {

         $block = $bl;

         $pos = 0;

         $data = '';

@@ -171,28 +171,28 @@ 
             $pos = ($block + 1) * BIG_BLOCK_SIZE;

             $data = $data.substr($this->data, $pos, BIG_BLOCK_SIZE);

             //echo "pos = $pos data=$data\n";	

-	    $block = $this->bigBlockChain[$block];

+        $block = $this->bigBlockChain[$block];

+        }

+        return $data;

         }

-		return $data;

-     }

         

     function __readPropertySets(){

         $offset = 0;

         //var_dump($this->entry);

         while ($offset < strlen($this->entry)) {

-              $d = substr($this->entry, $offset, PROPERTY_STORAGE_BLOCK_SIZE);

+                $d = substr($this->entry, $offset, PROPERTY_STORAGE_BLOCK_SIZE);

             

-              $nameSize = ord($d[SIZE_OF_NAME_POS]) | (ord($d[SIZE_OF_NAME_POS+1]) << 8);

+                $nameSize = ord($d[SIZE_OF_NAME_POS]) | (ord($d[SIZE_OF_NAME_POS+1]) << 8);

               

-              $type = ord($d[TYPE_POS]);

-              //$maxBlock = strlen($d) / BIG_BLOCK_SIZE - 1;

+                $type = ord($d[TYPE_POS]);

+                //$maxBlock = strlen($d) / BIG_BLOCK_SIZE - 1;

         

-              $startBlock = GetInt4d($d, START_BLOCK_POS);

-              $size = GetInt4d($d, SIZE_POS);

+                $startBlock = GetInt4d($d, START_BLOCK_POS);

+                $size = GetInt4d($d, SIZE_POS);

         

             $name = '';

             for ($i = 0; $i < $nameSize ; $i++) {

-              $name .= $d[$i];

+                $name .= $d[$i];

             }

             

             $name = str_replace("\x00", "", $name);

@@ -221,50 +221,50 @@ 
     

     

     function getWorkBook(){

-    	if ($this->props[$this->wrkbook]['size'] < SMALL_BLOCK_THRESHOLD){

+        if ($this->props[$this->wrkbook]['size'] < SMALL_BLOCK_THRESHOLD){

 //    	  getSmallBlockStream(PropertyStorage ps)

 

-			$rootdata = $this->__readData($this->props[$this->rootentry]['startBlock']);

+            $rootdata = $this->__readData($this->props[$this->rootentry]['startBlock']);

 	        

-			$streamData = '';

-	        $block = $this->props[$this->wrkbook]['startBlock'];

-	        //$count = 0;

-	        $pos = 0;

-		    while ($block != -2) {

-      	          $pos = $block * SMALL_BLOCK_SIZE;

-		          $streamData .= substr($rootdata, $pos, SMALL_BLOCK_SIZE);

+            $streamData = '';

+            $block = $this->props[$this->wrkbook]['startBlock'];

+            //$count = 0;

+            $pos = 0;

+            while ($block != -2) {

+                    $pos = $block * SMALL_BLOCK_SIZE;

+                    $streamData .= substr($rootdata, $pos, SMALL_BLOCK_SIZE);

 

-			      $block = $this->smallBlockChain[$block];

-		    }

+                    $block = $this->smallBlockChain[$block];

+            }

 			

-		    return $streamData;

+            return $streamData;

     		

 

-    	}else{

+        }else{

     	

-	        $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE;

-	        if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) {

-	            $numBlocks++;

-	        }

+            $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE;

+            if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) {

+                $numBlocks++;

+            }

 	        

-	        if ($numBlocks == 0) return '';

+            if ($numBlocks == 0) return '';

 	        

-	        //echo "numBlocks = $numBlocks\n";

-	    //byte[] streamData = new byte[numBlocks * BIG_BLOCK_SIZE];

-	        //print_r($this->wrkbook);

-	        $streamData = '';

-	        $block = $this->props[$this->wrkbook]['startBlock'];

-	        //$count = 0;

-	        $pos = 0;

-	        //echo "block = $block";

-	        while ($block != -2) {

-	          $pos = ($block + 1) * BIG_BLOCK_SIZE;

-	          $streamData .= substr($this->data, $pos, BIG_BLOCK_SIZE);

-	          $block = $this->bigBlockChain[$block];

-	        }   

-	        //echo 'stream'.$streamData;

-	        return $streamData;

-    	}

+            //echo "numBlocks = $numBlocks\n";

+        //byte[] streamData = new byte[numBlocks * BIG_BLOCK_SIZE];

+            //print_r($this->wrkbook);

+            $streamData = '';

+            $block = $this->props[$this->wrkbook]['startBlock'];

+            //$count = 0;

+            $pos = 0;

+            //echo "block = $block";

+            while ($block != -2) {

+                $pos = ($block + 1) * BIG_BLOCK_SIZE;

+                $streamData .= substr($this->data, $pos, BIG_BLOCK_SIZE);

+                $block = $this->bigBlockChain[$block];

+            }   

+            //echo 'stream'.$streamData;

+            return $streamData;

+        }

     }

     

 }

main/inc/lib/pear/excelreader/reader.php

Indentation +36 added lines, -36 removed lines

@@ -464,10 +464,10 @@ 
                 case SPREADSHEET_EXCEL_READER_TYPE_SST:
                     //echo "Type_SST\n";
                      $spos = $pos + 4;
-                     $limitpos = $spos + $length;
-                     $uniqueStrings = $this->_GetInt4d($this->data, $spos+4);
+                        $limitpos = $spos + $length;
+                        $uniqueStrings = $this->_GetInt4d($this->data, $spos+4);
                                                 $spos += 8;
-                                       for ($i = 0; $i < $uniqueStrings; $i++) {
+                                        for ($i = 0; $i < $uniqueStrings; $i++) {
         // Read in the number of characters
                                                 if ($spos == $limitpos) {
                                                 $opcode = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
@@ -496,9 +496,9 @@ 
                                                 }
 
                                                 if ($extendedString) {
-                                                  // Read in cchExtRst
-                                                  $extendedRunLength = $this->_GetInt4d($this->data, $spos);
-                                                  $spos += 4;
+                                                    // Read in cchExtRst
+                                                    $extendedRunLength = $this->_GetInt4d($this->data, $spos);
+                                                    $spos += 4;
                                                 }
 
                                                 $len = ($asciiEncoding)? $numChars : $numChars*2;
@@ -512,7 +512,7 @@ 
                                                         $charsLeft = $numChars - (($asciiEncoding) ? $bytesRead : ($bytesRead / 2));
                                                         $spos = $limitpos;
 
-                                                         while ($charsLeft > 0){
+                                                            while ($charsLeft > 0){
                                                                 $opcode = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
                                                                 $conlength = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
                                                                         if ($opcode != 0x3c) {
@@ -522,29 +522,29 @@ 
                                                                 $limitpos = $spos + $conlength;
                                                                 $option = ord($this->data[$spos]);
                                                                 $spos += 1;
-                                                                  if ($asciiEncoding && ($option == 0)) {
+                                                                    if ($asciiEncoding && ($option == 0)) {
                                                                                 $len = min($charsLeft, $limitpos - $spos); // min($charsLeft, $conlength);
                                                                     $retstr .= substr($this->data, $spos, $len);
                                                                     $charsLeft -= $len;
                                                                     $asciiEncoding = true;
-                                                                  }elseif (!$asciiEncoding && ($option != 0)){
+                                                                    }elseif (!$asciiEncoding && ($option != 0)){
                                                                                 $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength);
                                                                     $retstr .= substr($this->data, $spos, $len);
                                                                     $charsLeft -= $len/2;
                                                                     $asciiEncoding = false;
-                                                                  }elseif (!$asciiEncoding && ($option == 0)) {
+                                                                    }elseif (!$asciiEncoding && ($option == 0)) {
                                                                 // Bummer - the string starts off as Unicode, but after the
                                                                 // continuation it is in straightforward ASCII encoding
                                                                                 $len = min($charsLeft, $limitpos - $spos); // min($charsLeft, $conlength);
                                                                         for ($j = 0; $j < $len; $j++) {
-                                                                 $retstr .= $this->data[$spos + $j].chr(0);
+                                                                    $retstr .= $this->data[$spos + $j].chr(0);
                                                                 }
                                                             $charsLeft -= $len;
                                                                 $asciiEncoding = false;
-                                                                  }else{
+                                                                    }else{
                                                             $newstr = '';
                                                                     for ($j = 0; $j < strlen($retstr); $j++) {
-                                                                      $newstr = $retstr[$j].chr(0);
+                                                                        $newstr = $retstr[$j].chr(0);
                                                                     }
                                                                     $retstr = $newstr;
                                                                                 $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength);
@@ -552,28 +552,28 @@ 
                                                                     $charsLeft -= $len/2;
                                                                     $asciiEncoding = false;
                                                                         //echo "Izavrat\n";
-                                                                  }
-                                                          $spos += $len;
+                                                                    }
+                                                            $spos += $len;
 
-                                                         }
+                                                            }
                                                 }
                                                 //We check the string before send it check the _encodeUTF16
                                                 //$retstr = ($asciiEncoding) ? $retstr : $this->_encodeUTF16($retstr);
                                                 $retstr = ($asciiEncoding) ? $this->_encodeUTF16($retstr, true) : $this->_encodeUTF16($retstr);
 //                                              echo "Str $i = $retstr\n";
                                         if ($richString){
-                                                  $spos += 4 * $formattingRuns;
+                                                    $spos += 4 * $formattingRuns;
                                                 }
 
                                                 // For extended strings, skip over the extended string data
                                                 if ($extendedString) {
-                                                  $spos += $extendedRunLength;
+                                                    $spos += $extendedRunLength;
                                                 }
                                                         //if ($retstr == 'Derby'){
                                                         //      echo "bb\n";
                                                         //}
                                                 $this->sst[]=$retstr;
-                                       }
+                                        }
                     /*$continueRecords = array();
                     while ($this->getNextCode() == Type_CONTINUE) {
                         $continueRecords[] = &$this->nextRecord();
@@ -582,7 +582,7 @@ 
                     $this->shareStrings = new SSTRecord($r, $continueRecords);
                     //print_r($this->shareStrings->strings);
                      */
-                     // echo 'SST read: '.($time_end-$time_start)."\n";
+                        // echo 'SST read: '.($time_end-$time_start)."\n";
                     break;
 
                 case SPREADSHEET_EXCEL_READER_TYPE_FILEPASS:
@@ -607,7 +607,7 @@ 
                         }
 
                     $this->formatRecords[$indexCode] = $formatString;
-                   // echo "Type.FORMAT\n";
+                    // echo "Type.FORMAT\n";
                     break;
                 case SPREADSHEET_EXCEL_READER_TYPE_XF:
                         //global $dateFormats, $numberFormats;
@@ -678,7 +678,7 @@ 
                                 $rec_name    = substr($this->data, $pos+11, $rec_length);
                         }
                     $this->boundsheets[] = array('name'=>$rec_name,
-                                                 'offset'=>$rec_offset);
+                                                    'offset'=>$rec_offset);
 
                     break;
 
@@ -820,14 +820,14 @@ 
                                 }
                             $string = sprintf($this->curformat, $numValue * $this->multiplier);
                         }
-                      //$rec['rknumbers'][$i]['xfindex'] = ord($rec['data'][$pos]) | ord($rec['data'][$pos+1]) << 8;
-                      $tmppos += 6;
-                      $this->addcell($row, $colFirst + $i, $string, $raw);
-                      //echo "MULRK $row ".($colFirst + $i)." $string\n";
+                        //$rec['rknumbers'][$i]['xfindex'] = ord($rec['data'][$pos]) | ord($rec['data'][$pos+1]) << 8;
+                        $tmppos += 6;
+                        $this->addcell($row, $colFirst + $i, $string, $raw);
+                        //echo "MULRK $row ".($colFirst + $i)." $string\n";
                     }
-                     //MulRKRecord($r);
+                        //MulRKRecord($r);
                     // Get the individual cell records from the multiple record
-                     //$num = ;
+                        //$num = ;
 
                     break;
                 case SPREADSHEET_EXCEL_READER_TYPE_NUMBER:
@@ -836,7 +836,7 @@ 
                     $tmp = unpack("ddouble", substr($this->data, $spos + 6, 8)); // It machine machine dependent
                     if ($this->isDate($spos)) {
                         list($string, $raw) = $this->createDate($tmp['double']);
-                     //   $this->addcell(DateRecord($r, 1));
+                        //   $this->addcell(DateRecord($r, 1));
                     }else{
                         //$raw = $tmp[''];
                         if (isset($this->_columnsFormat[$column + 1])){
@@ -845,7 +845,7 @@ 
                         $raw = $this->createNumber($spos);
                         $string = sprintf($this->curformat, $raw * $this->multiplier);
 
-                     //   $this->addcell(NumberRecord($r));
+                        //   $this->addcell(NumberRecord($r));
                     }
                     $this->addcell($row, $column, $string, $raw);
                     //echo "Number $row $column $string\n";
@@ -868,7 +868,7 @@ 
                         $tmp = unpack("ddouble", substr($this->data, $spos + 6, 8)); // It machine machine dependent
                         if ($this->isDate($spos)) {
                             list($string, $raw) = $this->createDate($tmp['double']);
-                         //   $this->addcell(DateRecord($r, 1));
+                            //   $this->addcell(DateRecord($r, 1));
                         }else{
                             //$raw = $tmp[''];
                             if (isset($this->_columnsFormat[$column + 1])){
@@ -877,7 +877,7 @@ 
                             $raw = $this->createNumber($spos);
                             $string = sprintf($this->curformat, $raw * $this->multiplier);
 
-                         //   $this->addcell(NumberRecord($r));
+                            //   $this->addcell(NumberRecord($r));
                         }
                         $this->addcell($row, $column, $string, $raw);
                         //echo "Number $row $column $string\n";
@@ -899,7 +899,7 @@ 
                     $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
                     $this->addcell($row, $column, substr($this->data, $spos + 8, ord($this->data[$spos + 6]) | ord($this->data[$spos + 7])<<8));
 
-                   // $this->addcell(LabelRecord($r));
+                    // $this->addcell(LabelRecord($r));
                     break;
 
                 case SPREADSHEET_EXCEL_READER_TYPE_EOF:
@@ -914,9 +914,9 @@ 
         }
 
         if (!isset($this->sheets[$this->sn]['numRows']))
-             $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow'];
+                $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow'];
         if (!isset($this->sheets[$this->sn]['numCols']))
-             $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol'];
+                $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol'];
 
     }
 
@@ -1033,7 +1033,7 @@ 
 // The RK format calls for using only the most significant 30 bits of the
 // 64 bit floating point value. The other 34 bits are assumed to be 0
 // So, we use the upper 30 bits of $rknum as follows...
-         $sign = ($rknum & 0x80000000) >> 31;
+            $sign = ($rknum & 0x80000000) >> 31;
         $exp = ($rknum & 0x7ff00000) >> 20;
         $mantissa = (0x100000 | ($rknum & 0x000ffffc));
         $value = $mantissa / pow( 2 , (20- ($exp - 1023)));