chamilo / chamilo-lms

main/cron/lang/list_unused_langvars.php

Indentation +10 added lines, -10 removed lines

@@ -68,18 +68,18 @@ 
 // defined terms, and this should prove the concept that there are much
 // more variables than what we really use
 if (count($usedTerms)<1) {
-  die("No used terms<br />\n");
+    die("No used terms<br />\n");
 } else {
-  echo "The following terms were defined but never used: <br />\n<table>";
+    echo "The following terms were defined but never used: <br />\n<table>";
 }
 $i = 1;
 foreach ($defined_terms as $term => $file) {
-  // remove "lang" prefix just in case
-  if (substr($term,0,4)=='lang') { $term = substr($term,4); }
-  if (!isset($usedTerms[$term])) {
+    // remove "lang" prefix just in case
+    if (substr($term,0,4)=='lang') { $term = substr($term,4); }
+    if (!isset($usedTerms[$term])) {
     echo "<tr><td>$i</td><td>$term</td></tr>\n";
     $i++;
-  }
+    }
 }
 echo "</table>\n";
 
@@ -88,17 +88,17 @@ 
     $list = scandir($base_path);
     $files = array();
     foreach ($list as $item) {
-    	if (substr($item,0,1)=='.') {continue;}
+        if (substr($item,0,1)=='.') {continue;}
         $special_dirs = array(api_get_path(SYS_TEST_PATH),api_get_path(SYS_COURSE_PATH),api_get_path(SYS_LANG_PATH),api_get_path(SYS_ARCHIVE_PATH));
         if (in_array($base_path.$item.'/',$special_dirs)) {continue;}
         if (is_dir($base_path.$item)) {
-        	$files = array_merge($files,get_all_php_files($base_path.$item.'/'));
+            $files = array_merge($files,get_all_php_files($base_path.$item.'/'));
         } else {
             //only analyse php files
                 $sub = substr($item,-4);
-        	if ($sub == '.php' or $sub == '.tpl') {
+            if ($sub == '.php' or $sub == '.tpl') {
                     $files[] = $base_path.$item;
-        	}
+            }
         }
     }
     $list = null;

plugin/openmeetings/lib/openmeetings_gateway.php

Indentation +3 added lines, -3 removed lines

@@ -351,9 +351,9 @@
                 . '&externalRoomType=' . $room->externalRoomType;
         if ($room->allowRecording) {
             $url .= '&allowUserQuestions=' . $this->var_to_str($room->allowUserQuestions)
-                 . '&isAudioOnly=' . $this->var_to_str($room->isAudioOnly)
-                 . '&waitForRecording=' . $this->var_to_str($room->waitForRecording)
-                 . '&allowRecording=' . $this->var_to_str($room->allowRecording);
+                    . '&isAudioOnly=' . $this->var_to_str($room->isAudioOnly)
+                    . '&waitForRecording=' . $this->var_to_str($room->waitForRecording)
+                    . '&allowRecording=' . $this->var_to_str($room->allowRecording);
         } elseif ($room->isAudioOnly) {
             $url .= '&isAudioOnly=' . $this->var_to_str($room->isAudioOnly);
         }

main/inc/lib/phpdocx/lib/log4php/renderers/LoggerRendererMap.php

Indentation +100 added lines, -100 removed lines

@@ -36,114 +36,114 @@
  */
 class LoggerRendererMap {
 
-	/**
-	 * @var array
-	 */
-	private $map;
+    /**
+     * @var array
+     */
+    private $map;
 
-	/**
-	 * @var LoggerDefaultRenderer
-	 */
-	private $defaultRenderer;
+    /**
+     * @var LoggerDefaultRenderer
+     */
+    private $defaultRenderer;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->map = array();
-		$this->defaultRenderer = new LoggerRendererDefault();
-	}
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->map = array();
+        $this->defaultRenderer = new LoggerRendererDefault();
+    }
 
-	/**
-	 * Add a renderer to a hierarchy passed as parameter.
-	 * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
-	 *
-	 * @param LoggerHierarchy $repository a logger repository.
-	 * @param string $renderedClassName
-	 * @param string $renderingClassName
-	 * @static
-	 */
-	public function addRenderer($renderedClassName, $renderingClassName) {
-		$renderer = LoggerReflectionUtils::createObject($renderingClassName);
-		if($renderer == null) {
-			return;
-		} else {
-			$this->put($renderedClassName, $renderer);
-		}
-	}
+    /**
+     * Add a renderer to a hierarchy passed as parameter.
+     * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
+     *
+     * @param LoggerHierarchy $repository a logger repository.
+     * @param string $renderedClassName
+     * @param string $renderingClassName
+     * @static
+     */
+    public function addRenderer($renderedClassName, $renderingClassName) {
+        $renderer = LoggerReflectionUtils::createObject($renderingClassName);
+        if($renderer == null) {
+            return;
+        } else {
+            $this->put($renderedClassName, $renderer);
+        }
+    }
 
 
-	/**
-	 * Find the appropriate renderer for the class type of the
-	 * <var>o</var> parameter. 
-	 *
-	 * This is accomplished by calling the {@link getByObject()} 
-	 * method if <var>o</var> is object or using {@link LoggerRendererDefault}. 
-	 * Once a renderer is found, it is applied on the object <var>o</var> and 
-	 * the result is returned as a string.
-	 *
-	 * @param mixed $o
-	 * @return string 
-	 */
-	public function findAndRender($o) {
-		if($o == null) {
-			return null;
-		} else {
-			if(is_object($o)) {
-				$renderer = $this->getByObject($o);
-				if($renderer !== null) {
-					return $renderer->render($o);
-				} else {
-					return null;
-				}
-			} else {
-				$renderer = $this->defaultRenderer;
-				return $renderer->render($o);
-			}
-		}
-	}
+    /**
+     * Find the appropriate renderer for the class type of the
+     * <var>o</var> parameter. 
+     *
+     * This is accomplished by calling the {@link getByObject()} 
+     * method if <var>o</var> is object or using {@link LoggerRendererDefault}. 
+     * Once a renderer is found, it is applied on the object <var>o</var> and 
+     * the result is returned as a string.
+     *
+     * @param mixed $o
+     * @return string 
+     */
+    public function findAndRender($o) {
+        if($o == null) {
+            return null;
+        } else {
+            if(is_object($o)) {
+                $renderer = $this->getByObject($o);
+                if($renderer !== null) {
+                    return $renderer->render($o);
+                } else {
+                    return null;
+                }
+            } else {
+                $renderer = $this->defaultRenderer;
+                return $renderer->render($o);
+            }
+        }
+    }
 
-	/**
-	 * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the
-	 * class of the object parameter.
-	 * 
-	 * @param mixed $o
-	 * @return string
-	 */
-	public function getByObject($o) {
-		return ($o == null) ? null : $this->getByClassName(get_class($o));
-	}
+    /**
+     * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the
+     * class of the object parameter.
+     * 
+     * @param mixed $o
+     * @return string
+     */
+    public function getByObject($o) {
+        return ($o == null) ? null : $this->getByClassName(get_class($o));
+    }
 
 
-	/**
-	 * Search the parents of <var>clazz</var> for a renderer. 
-	 *
-	 * The renderer closest in the hierarchy will be returned. If no
-	 * renderers could be found, then the default renderer is returned.
-	 *
-	 * @param string $class
-	 * @return LoggerRendererObject
-	 */
-	public function getByClassName($class) {
-		$r = null;
-		for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) {
-			if(isset($this->map[$c])) {
-				return $this->map[$c];
-			}
-		}
-		return $this->defaultRenderer;
-	}
+    /**
+     * Search the parents of <var>clazz</var> for a renderer. 
+     *
+     * The renderer closest in the hierarchy will be returned. If no
+     * renderers could be found, then the default renderer is returned.
+     *
+     * @param string $class
+     * @return LoggerRendererObject
+     */
+    public function getByClassName($class) {
+        $r = null;
+        for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) {
+            if(isset($this->map[$c])) {
+                return $this->map[$c];
+            }
+        }
+        return $this->defaultRenderer;
+    }
 
-	public function clear() {
-		$this->map = array();
-	}
+    public function clear() {
+        $this->map = array();
+    }
 
-	/**
-	 * Register a {@link LoggerRendererObject} for <var>clazz</var>.
-	 * @param string $class
-	 * @param LoggerRendererObject $or
-	 */
-	private function put($class, $or) {
-		$this->map[strtolower($class)] = $or;
-	}
+    /**
+     * Register a {@link LoggerRendererObject} for <var>clazz</var>.
+     * @param string $class
+     * @param LoggerRendererObject $or
+     */
+    private function put($class, $or) {
+        $this->map[strtolower($class)] = $or;
+    }
 }

plugin/dashboard/block_teacher/block_teacher.class.php

Indentation +98 added lines, -98 removed lines

@@ -24,32 +24,32 @@ 
     private $path;
     private $permission = array(DRH);
 
-	/**
-	 * Controller
-	 */
+    /**
+     * Controller
+     */
     public function __construct ($user_id)
     {
-    	$this->user_id  = $user_id;
-    	$this->path 	= 'block_teacher';
-    	if ($this->is_block_visible_for_user($user_id)) {
-	        $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
-    	}
+        $this->user_id  = $user_id;
+        $this->path 	= 'block_teacher';
+        if ($this->is_block_visible_for_user($user_id)) {
+            $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
+        }
     }
 
     /**
-	 * This method check if a user is allowed to see the block inside dashboard interface
-	 * @param	int		User id
-	 * @return	bool	Is block visible for user
-	 */
+     * This method check if a user is allowed to see the block inside dashboard interface
+     * @param	int		User id
+     * @return	bool	Is block visible for user
+     */
     public function is_block_visible_for_user($user_id)
     {
-    	$user_info = api_get_user_info($user_id);
-		$user_status = $user_info['status'];
-		$is_block_visible_for_user = false;
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
-    		$is_block_visible_for_user = true;
-    	}
-    	return $is_block_visible_for_user;
+        $user_info = api_get_user_info($user_id);
+        $user_status = $user_info['status'];
+        $is_block_visible_for_user = false;
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
+            $is_block_visible_for_user = true;
+        }
+        return $is_block_visible_for_user;
     }
 
     /**
@@ -60,12 +60,12 @@ 
     public function get_block()
     {
 
-    	global $charset;
-    	$column = 1;
-    	$data = array();
-		$teacher_content_html = $this->get_teachers_content_html_for_drh();
+        global $charset;
+        $column = 1;
+        $data = array();
+        $teacher_content_html = $this->get_teachers_content_html_for_drh();
 
-		$html = '
+        $html = '
                 <div class="panel panel-default" id="intro">
                     <div class="panel-heading">
                         '.get_lang('TeachersInformationsList').'
@@ -79,27 +79,27 @@ 
                 </div>
 				';
 
-    	$data['column'] = $column;
-    	$data['content_html'] = $html;
+        $data['column'] = $column;
+        $data['content_html'] = $html;
 
-    	return $data;
+        return $data;
 
     }
 
     /**
- 	 * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
- 	 * @return string  content html
- 	 */
+     * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
+     * @return string  content html
+     */
     public function get_teachers_content_html_for_platform_admin()
     {
-	 	$teachers = $this->teachers;
-		//$content = '<div style="margin:10px;">';
-		$content = '<h4>'.get_lang('YourTeachers').'</h4>';
+            $teachers = $this->teachers;
+        //$content = '<div style="margin:10px;">';
+        $content = '<h4>'.get_lang('YourTeachers').'</h4>';
 
         $teachers_table = null;
-		if (count($teachers) > 0) {
-	 		$teachers_table .= '<table class="data_table" width:"95%">';
-	 		$teachers_table .= '
+        if (count($teachers) > 0) {
+                $teachers_table .= '<table class="data_table" width:"95%">';
+                $teachers_table .= '
 								<tr>
 									<th>'.get_lang('User').'</th>
 									<th>'.get_lang('TimeSpentOnThePlatform').'</th>
@@ -107,103 +107,103 @@ 
 								</tr>
 							';
 
-	 		$i = 1;
-	 		foreach ($teachers as $teacher) {
+                $i = 1;
+                foreach ($teachers as $teacher) {
 
-	 			$teacher_id = $teacher['user_id'];
-	 			$firstname 	= $teacher['firstname'];
-	 			$lastname 	= $teacher['lastname'];
-	 			$username	= $teacher['username'];
+                    $teacher_id = $teacher['user_id'];
+                    $firstname 	= $teacher['firstname'];
+                    $lastname 	= $teacher['lastname'];
+                    $username	= $teacher['username'];
 
-	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id));
-	 			$last_connection = Tracking :: get_last_connection_date($teacher_id);
+                    $time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id));
+                    $last_connection = Tracking :: get_last_connection_date($teacher_id);
 
-				if ($i%2 == 0) $class_tr = 'row_odd';
-			    else $class_tr = 'row_even';
+                if ($i%2 == 0) $class_tr = 'row_odd';
+                else $class_tr = 'row_even';
 
-				$teachers_table .= '
+                $teachers_table .= '
 									<tr class="'.$class_tr.'">
 										<td>'.api_get_person_name($firstname,$lastname).' ('.$username.')</td>
 										<td align="right">'.$time_on_platform.'</td>
 										<td align="right">'.$last_connection.'</td>
 									</tr>
 									';
-	 			$i++;
-	 		}
-	 		$teachers_table .= '</table>';
-		} else {
-			$teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
-		}
+                    $i++;
+                }
+                $teachers_table .= '</table>';
+        } else {
+            $teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
+        }
 
-	 	$content .= $teachers_table;
+            $content .= $teachers_table;
 
- 		if (count($teachers) > 0) {
-			$content .= '<div style="text-align:right;margin-top:10px;">
+            if (count($teachers) > 0) {
+            $content .= '<div style="text-align:right;margin-top:10px;">
 			<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin">'.get_lang('SeeMore').'</a></div>';
-		}
+        }
 
-		//$content .= '</div>';
+        //$content .= '</div>';
 
- 		return $content;
-	}
+            return $content;
+    }
 
-	public function get_teachers_content_html_for_drh()
+    public function get_teachers_content_html_for_drh()
     {
-  		$teachers = $this->teachers;
- 		//$content = '<div style="margin:10px;">';
- 		$content = '<h4>'.get_lang('YourTeachers').'</h4>';
+            $teachers = $this->teachers;
+            //$content = '<div style="margin:10px;">';
+            $content = '<h4>'.get_lang('YourTeachers').'</h4>';
         $teachers_table = null;
- 		if (count($teachers) > 0) {
- 			$a_last_week = get_last_week();
- 			$last_week 	 = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
+            if (count($teachers) > 0) {
+                $a_last_week = get_last_week();
+                $last_week 	 = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
 
-	 		$teachers_table .= '<table class="data_table" width:"95%">';
-	 		$teachers_table .= '
+                $teachers_table .= '<table class="data_table" width:"95%">';
+                $teachers_table .= '
 								<tr>
 									<th>'.get_lang('User').'</th>
 									<th>'.get_lang('TimeSpentLastWeek').'<br />'.$last_week.'</th>
 								</tr>
 							';
 
-	 		$i = 1;
-	 		foreach ($teachers as $teacher) {
+                $i = 1;
+                foreach ($teachers as $teacher) {
 
-	 			$teacher_id = $teacher['user_id'];
-	 			$firstname  = $teacher['firstname'];
-	 			$lastname   = $teacher['lastname'];
-				$username	= $teacher['username'];
-	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id,true));
+                    $teacher_id = $teacher['user_id'];
+                    $firstname  = $teacher['firstname'];
+                    $lastname   = $teacher['lastname'];
+                $username	= $teacher['username'];
+                    $time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id,true));
 
-	 			if ($i%2 == 0) $class_tr = 'row_odd';
-	    		else $class_tr = 'row_even';
-	    		$teachers_table .= '<tr class="'.$class_tr.'">
+                    if ($i%2 == 0) $class_tr = 'row_odd';
+                else $class_tr = 'row_even';
+                $teachers_table .= '<tr class="'.$class_tr.'">
 										<td>'.api_get_person_name($firstname,$lastname).' ('.$username.')</td>
 										<td align="right">'.$time_on_platform.'</td>
 									</tr>';
 
-	 			$i++;
-	 		}
-	 		$teachers_table .= '</table>';
- 		} else {
- 			$teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
- 		}
+                    $i++;
+                }
+                $teachers_table .= '</table>';
+            } else {
+                $teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
+            }
 
-  		$content .= $teachers_table;
+            $content .= $teachers_table;
 
- 		if (count($teachers) > 0) {
-			$content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/teachers.php">'.get_lang('SeeMore').'</a></div>';
-		}
-		//$content .= '</div>';
+            if (count($teachers) > 0) {
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/teachers.php">'.get_lang('SeeMore').'</a></div>';
+        }
+        //$content .= '</div>';
 
-  		return $content;
-  	}
+            return $content;
+        }
 
     /**
-	 * Get number of teachers
-	 * @return int
-	 */
-	function get_number_of_teachers()
+     * Get number of teachers
+     * @return int
+     */
+    function get_number_of_teachers()
     {
-		return count($this->teachers);
-	}
+        return count($this->teachers);
+    }
 }

main/inc/lib/phpdocx/lib/log4php/filters/LoggerFilterLevelRange.php

Indentation +70 added lines, -70 removed lines

@@ -64,83 +64,83 @@
  */
 class LoggerFilterLevelRange extends LoggerFilter {
 
-	/**
-	 * @var boolean
-	 */
-	private $acceptOnMatch = true;
+    /**
+     * @var boolean
+     */
+    private $acceptOnMatch = true;
 
-	/**
-	 * @var LoggerLevel
-	 */
-	private $levelMin;
+    /**
+     * @var LoggerLevel
+     */
+    private $levelMin;
   
-	/**
-	 * @var LoggerLevel
-	 */
-	private $levelMax;
+    /**
+     * @var LoggerLevel
+     */
+    private $levelMax;
 
-	/**
-	 * @param boolean $acceptOnMatch
-	 */
-	public function setAcceptOnMatch($acceptOnMatch) {
-		$this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); 
-	}
+    /**
+     * @param boolean $acceptOnMatch
+     */
+    public function setAcceptOnMatch($acceptOnMatch) {
+        $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); 
+    }
 	
-	/**
-	 * @param string $l the level min to match
-	 */
-	public function setLevelMin($l) {
-		if($l instanceof LoggerLevel) {
-		    $this->levelMin = $l;
-		} else {
-			$this->levelMin = LoggerOptionConverter::toLevel($l, null);
-		}
-	}
+    /**
+     * @param string $l the level min to match
+     */
+    public function setLevelMin($l) {
+        if($l instanceof LoggerLevel) {
+            $this->levelMin = $l;
+        } else {
+            $this->levelMin = LoggerOptionConverter::toLevel($l, null);
+        }
+    }
 
-	/**
-	 * @param string $l the level max to match
-	 */
-	public function setLevelMax($l) {
-		if($l instanceof LoggerLevel) {
-		    $this->levelMax = $l;
-		} else {
-			$this->levelMax = LoggerOptionConverter::toLevel($l, null);
-		}
-	}
+    /**
+     * @param string $l the level max to match
+     */
+    public function setLevelMax($l) {
+        if($l instanceof LoggerLevel) {
+            $this->levelMax = $l;
+        } else {
+            $this->levelMax = LoggerOptionConverter::toLevel($l, null);
+        }
+    }
 
-	/**
-	 * Return the decision of this filter.
-	 *
-	 * @param LoggerLoggingEvent $event
-	 * @return integer
-	 */
-	public function decide(LoggerLoggingEvent $event) {
-		$level = $event->getLevel();
+    /**
+     * Return the decision of this filter.
+     *
+     * @param LoggerLoggingEvent $event
+     * @return integer
+     */
+    public function decide(LoggerLoggingEvent $event) {
+        $level = $event->getLevel();
 		
-		if($this->levelMin !== null) {
-			if($level->isGreaterOrEqual($this->levelMin) == false) {
-				// level of event is less than minimum
-				return LoggerFilter::DENY;
-			}
-		}
+        if($this->levelMin !== null) {
+            if($level->isGreaterOrEqual($this->levelMin) == false) {
+                // level of event is less than minimum
+                return LoggerFilter::DENY;
+            }
+        }
 
-		if($this->levelMax !== null) {
-			if($level->toInt() > $this->levelMax->toInt()) {
-				// level of event is greater than maximum
-				// Alas, there is no Level.isGreater method. and using
-				// a combo of isGreaterOrEqual && !Equal seems worse than
-				// checking the int values of the level objects..
-				return LoggerFilter::DENY;
-			}
-		}
+        if($this->levelMax !== null) {
+            if($level->toInt() > $this->levelMax->toInt()) {
+                // level of event is greater than maximum
+                // Alas, there is no Level.isGreater method. and using
+                // a combo of isGreaterOrEqual && !Equal seems worse than
+                // checking the int values of the level objects..
+                return LoggerFilter::DENY;
+            }
+        }
 
-		if($this->acceptOnMatch) {
-			// this filter set up to bypass later filters and always return
-			// accept if level in range
-			return LoggerFilter::ACCEPT;
-		} else {
-			// event is ok for this filter; allow later filters to have a look..
-			return LoggerFilter::NEUTRAL;
-		}
-	}
+        if($this->acceptOnMatch) {
+            // this filter set up to bypass later filters and always return
+            // accept if level in range
+            return LoggerFilter::ACCEPT;
+        } else {
+            // event is ok for this filter; allow later filters to have a look..
+            return LoggerFilter::NEUTRAL;
+        }
+    }
 }

main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php

Indentation +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
             while ($session = Database :: fetch_array($rs)) {
                 $i++;
                 if ($i<=10) {
-                     $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
+                        $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
                 } else {
                     $return .= '...<br />';
                 }

main/inc/lib/add_many_session_to_category_functions.lib.php

Indentation +21 added lines, -21 removed lines

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

main/inc/lib/system_announcements.lib.php

Indentation +422 added lines, -422 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,
@@ -506,43 +506,43 @@ 
     ) {
         $em = Database::getManager();
 
-		$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);
 
         $lang = is_null($lang) ? '' : $lang;
 
-		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);
 
-		//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);
 
@@ -591,84 +591,84 @@ 
         $em->merge($announcement);
         $em->flush();
 
-		return true;
-	}
+        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);
@@ -687,22 +687,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."' ";
         }
 
@@ -712,25 +712,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/phpdocx/lib/log4php/filters/LoggerFilterStringMatch.php

Indentation +33 added lines, -33 removed lines

@@ -47,43 +47,43 @@
  */
 class LoggerFilterStringMatch extends LoggerFilter {
 
-	/**
-	 * @var boolean
-	 */
-	private $acceptOnMatch = true;
+    /**
+     * @var boolean
+     */
+    private $acceptOnMatch = true;
 
-	/**
-	 * @var string
-	 */
-	private $stringToMatch = null;
+    /**
+     * @var string
+     */
+    private $stringToMatch = null;
 
-	/**
-	 * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false')
-	 */
-	public function setAcceptOnMatch($acceptOnMatch) {
-		$this->acceptOnMatch = is_bool($acceptOnMatch) ? $acceptOnMatch : (bool)(strtolower($acceptOnMatch) == 'true');
-	}
+    /**
+     * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false')
+     */
+    public function setAcceptOnMatch($acceptOnMatch) {
+        $this->acceptOnMatch = is_bool($acceptOnMatch) ? $acceptOnMatch : (bool)(strtolower($acceptOnMatch) == 'true');
+    }
 	
-	/**
-	 * @param string $s the string to match
-	 */
-	public function setStringToMatch($s) {
-		$this->stringToMatch = $s;
-	}
+    /**
+     * @param string $s the string to match
+     */
+    public function setStringToMatch($s) {
+        $this->stringToMatch = $s;
+    }
 
-	/**
-	 * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match.
-	 */
-	public function decide(LoggerLoggingEvent $event) {
-		$msg = $event->getRenderedMessage();
+    /**
+     * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match.
+     */
+    public function decide(LoggerLoggingEvent $event) {
+        $msg = $event->getRenderedMessage();
 		
-		if($msg === null or $this->stringToMatch === null) {
-			return LoggerFilter::NEUTRAL;
-		}
+        if($msg === null or $this->stringToMatch === null) {
+            return LoggerFilter::NEUTRAL;
+        }
 		
-		if(strpos($msg, $this->stringToMatch) !== false ) {
-			return ($this->acceptOnMatch) ? LoggerFilter::ACCEPT : LoggerFilter::DENY;
-		}
-		return LoggerFilter::NEUTRAL;
-	}
+        if(strpos($msg, $this->stringToMatch) !== false ) {
+            return ($this->acceptOnMatch) ? LoggerFilter::ACCEPT : LoggerFilter::DENY;
+        }
+        return LoggerFilter::NEUTRAL;
+    }
 }